diff --git a/src/afd/sprites/back-cosmetic/Rhyhorn--Female.png b/src/afd/sprites/back-cosmetic/111--0--Rhyhorn--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Rhyhorn--Female.png rename to src/afd/sprites/back-cosmetic/111--0--Rhyhorn--Female.png diff --git a/src/afd/sprites/back-cosmetic/Rhydon--Female.png b/src/afd/sprites/back-cosmetic/112--0--Rhydon--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Rhydon--Female.png rename to src/afd/sprites/back-cosmetic/112--0--Rhydon--Female.png diff --git a/src/afd/sprites/back-cosmetic/Goldeen--Female.png b/src/afd/sprites/back-cosmetic/118--0--Goldeen--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Goldeen--Female.png rename to src/afd/sprites/back-cosmetic/118--0--Goldeen--Female.png diff --git a/src/afd/sprites/back-cosmetic/Butterfree--Female.png b/src/afd/sprites/back-cosmetic/12--0--Butterfree--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Butterfree--Female.png rename to src/afd/sprites/back-cosmetic/12--0--Butterfree--Female.png diff --git a/src/afd/sprites/back-cosmetic/Scyther--Female.png b/src/afd/sprites/back-cosmetic/123--0--Scyther--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Scyther--Female.png rename to src/afd/sprites/back-cosmetic/123--0--Scyther--Female.png diff --git a/src/afd/sprites/back-cosmetic/Magikarp--Female.png b/src/afd/sprites/back-cosmetic/129--0--Magikarp--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Magikarp--Female.png rename to src/afd/sprites/back-cosmetic/129--0--Magikarp--Female.png diff --git a/src/afd/sprites/back-cosmetic/Arghonaut--Female.png b/src/afd/sprites/back-cosmetic/13--0--Arghonaut--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Arghonaut--Female.png rename to src/afd/sprites/back-cosmetic/13--0--Arghonaut--Female.png diff --git a/src/afd/sprites/back-cosmetic/Gyarados--Female.png b/src/afd/sprites/back-cosmetic/130--0--Gyarados--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Gyarados--Female.png rename to src/afd/sprites/back-cosmetic/130--0--Gyarados--Female.png diff --git a/src/afd/sprites/back-cosmetic/Kitsunoh--Female.png b/src/afd/sprites/back-cosmetic/14--0--Kitsunoh--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Kitsunoh--Female.png rename to src/afd/sprites/back-cosmetic/14--0--Kitsunoh--Female.png diff --git a/src/afd/sprites/back-cosmetic/Cyclohm--Female.png b/src/afd/sprites/back-cosmetic/15--0--Cyclohm--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Cyclohm--Female.png rename to src/afd/sprites/back-cosmetic/15--0--Cyclohm--Female.png diff --git a/src/afd/sprites/back-cosmetic/Meganium--Female.png b/src/afd/sprites/back-cosmetic/154--0--Meganium--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Meganium--Female.png rename to src/afd/sprites/back-cosmetic/154--0--Meganium--Female.png diff --git a/src/afd/sprites/back-cosmetic/Colossoil--Female.png b/src/afd/sprites/back-cosmetic/16--0--Colossoil--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Colossoil--Female.png rename to src/afd/sprites/back-cosmetic/16--0--Colossoil--Female.png diff --git a/src/afd/sprites/back-cosmetic/Ledyba--Female.png b/src/afd/sprites/back-cosmetic/165--0--Ledyba--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Ledyba--Female.png rename to src/afd/sprites/back-cosmetic/165--0--Ledyba--Female.png diff --git a/src/afd/sprites/back-cosmetic/Ledian--Female.png b/src/afd/sprites/back-cosmetic/166--0--Ledian--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Ledian--Female.png rename to src/afd/sprites/back-cosmetic/166--0--Ledian--Female.png diff --git a/src/afd/sprites/back-cosmetic/Krilowatt--Female.png b/src/afd/sprites/back-cosmetic/17--0--Krilowatt--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Krilowatt--Female.png rename to src/afd/sprites/back-cosmetic/17--0--Krilowatt--Female.png diff --git a/src/afd/sprites/back-cosmetic/Xatu--Female.png b/src/afd/sprites/back-cosmetic/178--0--Xatu--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Xatu--Female.png rename to src/afd/sprites/back-cosmetic/178--0--Xatu--Female.png diff --git a/src/afd/sprites/back-cosmetic/Sudowoodo--Female.png b/src/afd/sprites/back-cosmetic/185--0--Sudowoodo--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Sudowoodo--Female.png rename to src/afd/sprites/back-cosmetic/185--0--Sudowoodo--Female.png diff --git a/src/afd/sprites/back-cosmetic/Politoed--Female.png b/src/afd/sprites/back-cosmetic/186--0--Politoed--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Politoed--Female.png rename to src/afd/sprites/back-cosmetic/186--0--Politoed--Female.png diff --git a/src/afd/sprites/back-cosmetic/Rattata--Female.png b/src/afd/sprites/back-cosmetic/19--0--Rattata--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Rattata--Female.png rename to src/afd/sprites/back-cosmetic/19--0--Rattata--Female.png diff --git a/src/afd/sprites/back-cosmetic/Voodoom--Female.png b/src/afd/sprites/back-cosmetic/19--0--Voodoom--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Voodoom--Female.png rename to src/afd/sprites/back-cosmetic/19--0--Voodoom--Female.png diff --git a/src/afd/sprites/back-cosmetic/Aipom--Female.png b/src/afd/sprites/back-cosmetic/190--0--Aipom--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Aipom--Female.png rename to src/afd/sprites/back-cosmetic/190--0--Aipom--Female.png diff --git a/src/afd/sprites/back-cosmetic/Wooper--Female.png b/src/afd/sprites/back-cosmetic/194--0--Wooper--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Wooper--Female.png rename to src/afd/sprites/back-cosmetic/194--0--Wooper--Female.png diff --git a/src/afd/sprites/back-cosmetic/Quagsire--Female.png b/src/afd/sprites/back-cosmetic/195--0--Quagsire--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Quagsire--Female.png rename to src/afd/sprites/back-cosmetic/195--0--Quagsire--Female.png diff --git a/src/afd/sprites/back-cosmetic/Murkrow--Female.png b/src/afd/sprites/back-cosmetic/198--0--Murkrow--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Murkrow--Female.png rename to src/afd/sprites/back-cosmetic/198--0--Murkrow--Female.png diff --git a/src/afd/sprites/back-cosmetic/Syclant--Female.png b/src/afd/sprites/back-cosmetic/2--0--Syclant--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Syclant--Female.png rename to src/afd/sprites/back-cosmetic/2--0--Syclant--Female.png diff --git a/src/afd/sprites/back-cosmetic/Raticate--Female.png b/src/afd/sprites/back-cosmetic/20--0--Raticate--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Raticate--Female.png rename to src/afd/sprites/back-cosmetic/20--0--Raticate--Female.png diff --git a/src/afd/sprites/back-cosmetic/Wobbuffet--Female.png b/src/afd/sprites/back-cosmetic/202--0--Wobbuffet--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Wobbuffet--Female.png rename to src/afd/sprites/back-cosmetic/202--0--Wobbuffet--Female.png diff --git a/src/afd/sprites/back-cosmetic/Girafarig--Female.png b/src/afd/sprites/back-cosmetic/203--0--Girafarig--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Girafarig--Female.png rename to src/afd/sprites/back-cosmetic/203--0--Girafarig--Female.png diff --git a/src/afd/sprites/back-cosmetic/Gligar--Female.png b/src/afd/sprites/back-cosmetic/207--0--Gligar--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Gligar--Female.png rename to src/afd/sprites/back-cosmetic/207--0--Gligar--Female.png diff --git a/src/afd/sprites/back-cosmetic/Steelix--Female.png b/src/afd/sprites/back-cosmetic/208--0--Steelix--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Steelix--Female.png rename to src/afd/sprites/back-cosmetic/208--0--Steelix--Female.png diff --git a/src/afd/sprites/back-cosmetic/Tomohawk--Female.png b/src/afd/sprites/back-cosmetic/21--0--Tomohawk--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Tomohawk--Female.png rename to src/afd/sprites/back-cosmetic/21--0--Tomohawk--Female.png diff --git a/src/afd/sprites/back-cosmetic/Scizor--Female.png b/src/afd/sprites/back-cosmetic/212--0--Scizor--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Scizor--Female.png rename to src/afd/sprites/back-cosmetic/212--0--Scizor--Female.png diff --git a/src/afd/sprites/back-cosmetic/Heracross--Female.png b/src/afd/sprites/back-cosmetic/214--0--Heracross--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Heracross--Female.png rename to src/afd/sprites/back-cosmetic/214--0--Heracross--Female.png diff --git a/src/afd/sprites/back-cosmetic/Sneasel--Female.png b/src/afd/sprites/back-cosmetic/215--0--Sneasel--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Sneasel--Female.png rename to src/afd/sprites/back-cosmetic/215--0--Sneasel--Female.png diff --git a/src/afd/sprites/back-cosmetic/Ursaring--Female.png b/src/afd/sprites/back-cosmetic/217--0--Ursaring--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Ursaring--Female.png rename to src/afd/sprites/back-cosmetic/217--0--Ursaring--Female.png diff --git a/src/afd/sprites/back-cosmetic/Piloswine--Female.png b/src/afd/sprites/back-cosmetic/221--0--Piloswine--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Piloswine--Female.png rename to src/afd/sprites/back-cosmetic/221--0--Piloswine--Female.png diff --git a/src/afd/sprites/back-cosmetic/Octillery--Female.png b/src/afd/sprites/back-cosmetic/224--0--Octillery--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Octillery--Female.png rename to src/afd/sprites/back-cosmetic/224--0--Octillery--Female.png diff --git a/src/afd/sprites/back-cosmetic/Houndoom--Female.png b/src/afd/sprites/back-cosmetic/229--0--Houndoom--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Houndoom--Female.png rename to src/afd/sprites/back-cosmetic/229--0--Houndoom--Female.png diff --git a/src/afd/sprites/back-cosmetic/Donphan--Female.png b/src/afd/sprites/back-cosmetic/232--0--Donphan--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Donphan--Female.png rename to src/afd/sprites/back-cosmetic/232--0--Donphan--Female.png diff --git a/src/afd/sprites/back-cosmetic/Pikachu--Female.png b/src/afd/sprites/back-cosmetic/25--0--Pikachu--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Pikachu--Female.png rename to src/afd/sprites/back-cosmetic/25--0--Pikachu--Female.png diff --git a/src/afd/sprites/back-cosmetic/Torchic--Female.png b/src/afd/sprites/back-cosmetic/255--0--Torchic--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Torchic--Female.png rename to src/afd/sprites/back-cosmetic/255--0--Torchic--Female.png diff --git a/src/afd/sprites/back-cosmetic/Combusken--Female.png b/src/afd/sprites/back-cosmetic/256--0--Combusken--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Combusken--Female.png rename to src/afd/sprites/back-cosmetic/256--0--Combusken--Female.png diff --git a/src/afd/sprites/back-cosmetic/Blaziken--Female.png b/src/afd/sprites/back-cosmetic/257--0--Blaziken--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Blaziken--Female.png rename to src/afd/sprites/back-cosmetic/257--0--Blaziken--Female.png diff --git a/src/afd/sprites/back-cosmetic/Raichu--Female.png b/src/afd/sprites/back-cosmetic/26--0--Raichu--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Raichu--Female.png rename to src/afd/sprites/back-cosmetic/26--0--Raichu--Female.png diff --git a/src/afd/sprites/back-cosmetic/Beautifly--Female.png b/src/afd/sprites/back-cosmetic/267--0--Beautifly--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Beautifly--Female.png rename to src/afd/sprites/back-cosmetic/267--0--Beautifly--Female.png diff --git a/src/afd/sprites/back-cosmetic/Dustox--Female.png b/src/afd/sprites/back-cosmetic/269--0--Dustox--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Dustox--Female.png rename to src/afd/sprites/back-cosmetic/269--0--Dustox--Female.png diff --git a/src/afd/sprites/back-cosmetic/Ludicolo--Female.png b/src/afd/sprites/back-cosmetic/272--0--Ludicolo--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Ludicolo--Female.png rename to src/afd/sprites/back-cosmetic/272--0--Ludicolo--Female.png diff --git a/src/afd/sprites/back-cosmetic/Nuzleaf--Female.png b/src/afd/sprites/back-cosmetic/274--0--Nuzleaf--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Nuzleaf--Female.png rename to src/afd/sprites/back-cosmetic/274--0--Nuzleaf--Female.png diff --git a/src/afd/sprites/back-cosmetic/Shiftry--Female.png b/src/afd/sprites/back-cosmetic/275--0--Shiftry--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Shiftry--Female.png rename to src/afd/sprites/back-cosmetic/275--0--Shiftry--Female.png diff --git a/src/afd/sprites/back-cosmetic/Revenankh--Female.png b/src/afd/sprites/back-cosmetic/3--0--Revenankh--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Revenankh--Female.png rename to src/afd/sprites/back-cosmetic/3--0--Revenankh--Female.png diff --git a/src/afd/sprites/back-cosmetic/Venusaur--Female.png b/src/afd/sprites/back-cosmetic/3--0--Venusaur--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Venusaur--Female.png rename to src/afd/sprites/back-cosmetic/3--0--Venusaur--Female.png diff --git a/src/afd/sprites/back-cosmetic/Meditite--Female.png b/src/afd/sprites/back-cosmetic/307--0--Meditite--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Meditite--Female.png rename to src/afd/sprites/back-cosmetic/307--0--Meditite--Female.png diff --git a/src/afd/sprites/back-cosmetic/Medicham--Female.png b/src/afd/sprites/back-cosmetic/308--0--Medicham--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Medicham--Female.png rename to src/afd/sprites/back-cosmetic/308--0--Medicham--Female.png diff --git a/src/afd/sprites/back-cosmetic/Roselia--Female.png b/src/afd/sprites/back-cosmetic/315--0--Roselia--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Roselia--Female.png rename to src/afd/sprites/back-cosmetic/315--0--Roselia--Female.png diff --git a/src/afd/sprites/back-cosmetic/Gulpin--Female.png b/src/afd/sprites/back-cosmetic/316--0--Gulpin--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Gulpin--Female.png rename to src/afd/sprites/back-cosmetic/316--0--Gulpin--Female.png diff --git a/src/afd/sprites/back-cosmetic/Swalot--Female.png b/src/afd/sprites/back-cosmetic/317--0--Swalot--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Swalot--Female.png rename to src/afd/sprites/back-cosmetic/317--0--Swalot--Female.png diff --git a/src/afd/sprites/back-cosmetic/Numel--Female.png b/src/afd/sprites/back-cosmetic/322--0--Numel--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Numel--Female.png rename to src/afd/sprites/back-cosmetic/322--0--Numel--Female.png diff --git a/src/afd/sprites/back-cosmetic/Camerupt--Female.png b/src/afd/sprites/back-cosmetic/323--0--Camerupt--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Camerupt--Female.png rename to src/afd/sprites/back-cosmetic/323--0--Camerupt--Female.png diff --git a/src/afd/sprites/back-cosmetic/Cacturne--Female.png b/src/afd/sprites/back-cosmetic/332--0--Cacturne--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Cacturne--Female.png rename to src/afd/sprites/back-cosmetic/332--0--Cacturne--Female.png diff --git a/src/afd/sprites/back-cosmetic/Milotic--Female.png b/src/afd/sprites/back-cosmetic/350--0--Milotic--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Milotic--Female.png rename to src/afd/sprites/back-cosmetic/350--0--Milotic--Female.png diff --git a/src/afd/sprites/back-cosmetic/Relicanth--Female.png b/src/afd/sprites/back-cosmetic/369--0--Relicanth--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Relicanth--Female.png rename to src/afd/sprites/back-cosmetic/369--0--Relicanth--Female.png diff --git a/src/afd/sprites/back-cosmetic/Starly--Female.png b/src/afd/sprites/back-cosmetic/396--0--Starly--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Starly--Female.png rename to src/afd/sprites/back-cosmetic/396--0--Starly--Female.png diff --git a/src/afd/sprites/back-cosmetic/Staravia--Female.png b/src/afd/sprites/back-cosmetic/397--0--Staravia--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Staravia--Female.png rename to src/afd/sprites/back-cosmetic/397--0--Staravia--Female.png diff --git a/src/afd/sprites/back-cosmetic/Staraptor--Female.png b/src/afd/sprites/back-cosmetic/398--0--Staraptor--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Staraptor--Female.png rename to src/afd/sprites/back-cosmetic/398--0--Staraptor--Female.png diff --git a/src/afd/sprites/back-cosmetic/Bidoof--Female.png b/src/afd/sprites/back-cosmetic/399--0--Bidoof--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Bidoof--Female.png rename to src/afd/sprites/back-cosmetic/399--0--Bidoof--Female.png diff --git a/src/afd/sprites/back-cosmetic/Bibarel--Female.png b/src/afd/sprites/back-cosmetic/400--0--Bibarel--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Bibarel--Female.png rename to src/afd/sprites/back-cosmetic/400--0--Bibarel--Female.png diff --git a/src/afd/sprites/back-cosmetic/Kricketot--Female.png b/src/afd/sprites/back-cosmetic/401--0--Kricketot--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Kricketot--Female.png rename to src/afd/sprites/back-cosmetic/401--0--Kricketot--Female.png diff --git a/src/afd/sprites/back-cosmetic/Kricketune--Female.png b/src/afd/sprites/back-cosmetic/402--0--Kricketune--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Kricketune--Female.png rename to src/afd/sprites/back-cosmetic/402--0--Kricketune--Female.png diff --git a/src/afd/sprites/back-cosmetic/Shinx--Female.png b/src/afd/sprites/back-cosmetic/403--0--Shinx--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Shinx--Female.png rename to src/afd/sprites/back-cosmetic/403--0--Shinx--Female.png diff --git a/src/afd/sprites/back-cosmetic/Luxio--Female.png b/src/afd/sprites/back-cosmetic/404--0--Luxio--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Luxio--Female.png rename to src/afd/sprites/back-cosmetic/404--0--Luxio--Female.png diff --git a/src/afd/sprites/back-cosmetic/Luxray--Female.png b/src/afd/sprites/back-cosmetic/405--0--Luxray--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Luxray--Female.png rename to src/afd/sprites/back-cosmetic/405--0--Luxray--Female.png diff --git a/src/afd/sprites/back-cosmetic/Roserade--Female.png b/src/afd/sprites/back-cosmetic/407--0--Roserade--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Roserade--Female.png rename to src/afd/sprites/back-cosmetic/407--0--Roserade--Female.png diff --git a/src/afd/sprites/back-cosmetic/Zubat--Female.png b/src/afd/sprites/back-cosmetic/41--0--Zubat--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Zubat--Female.png rename to src/afd/sprites/back-cosmetic/41--0--Zubat--Female.png diff --git a/src/afd/sprites/back-cosmetic/Burmy--Sandy.png b/src/afd/sprites/back-cosmetic/412--420--Burmy--Sandy.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Burmy--Sandy.png rename to src/afd/sprites/back-cosmetic/412--420--Burmy--Sandy.png diff --git a/src/afd/sprites/back-cosmetic/Burmy--Trash.png b/src/afd/sprites/back-cosmetic/412--420--Burmy--Trash.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Burmy--Trash.png rename to src/afd/sprites/back-cosmetic/412--420--Burmy--Trash.png diff --git a/src/afd/sprites/back-cosmetic/Combee--Female.png b/src/afd/sprites/back-cosmetic/415--0--Combee--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Combee--Female.png rename to src/afd/sprites/back-cosmetic/415--0--Combee--Female.png diff --git a/src/afd/sprites/back-cosmetic/Pachirisu--Female.png b/src/afd/sprites/back-cosmetic/417--0--Pachirisu--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Pachirisu--Female.png rename to src/afd/sprites/back-cosmetic/417--0--Pachirisu--Female.png diff --git a/src/afd/sprites/back-cosmetic/Buizel--Female.png b/src/afd/sprites/back-cosmetic/418--0--Buizel--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Buizel--Female.png rename to src/afd/sprites/back-cosmetic/418--0--Buizel--Female.png diff --git a/src/afd/sprites/back-cosmetic/Floatzel--Female.png b/src/afd/sprites/back-cosmetic/419--0--Floatzel--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Floatzel--Female.png rename to src/afd/sprites/back-cosmetic/419--0--Floatzel--Female.png diff --git a/src/afd/sprites/back-cosmetic/Golbat--Female.png b/src/afd/sprites/back-cosmetic/42--0--Golbat--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Golbat--Female.png rename to src/afd/sprites/back-cosmetic/42--0--Golbat--Female.png diff --git a/src/afd/sprites/back-cosmetic/Ambipom--Female.png b/src/afd/sprites/back-cosmetic/424--0--Ambipom--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Ambipom--Female.png rename to src/afd/sprites/back-cosmetic/424--0--Ambipom--Female.png diff --git a/src/afd/sprites/back-cosmetic/Gloom--Female.png b/src/afd/sprites/back-cosmetic/44--0--Gloom--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Gloom--Female.png rename to src/afd/sprites/back-cosmetic/44--0--Gloom--Female.png diff --git a/src/afd/sprites/back-cosmetic/Gible--Female.png b/src/afd/sprites/back-cosmetic/443--0--Gible--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Gible--Female.png rename to src/afd/sprites/back-cosmetic/443--0--Gible--Female.png diff --git a/src/afd/sprites/back-cosmetic/Garchomp--Female.png b/src/afd/sprites/back-cosmetic/445--0--Garchomp--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Garchomp--Female.png rename to src/afd/sprites/back-cosmetic/445--0--Garchomp--Female.png diff --git a/src/afd/sprites/back-cosmetic/Hippopotas--Female.png b/src/afd/sprites/back-cosmetic/449--0--Hippopotas--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Hippopotas--Female.png rename to src/afd/sprites/back-cosmetic/449--0--Hippopotas--Female.png diff --git a/src/afd/sprites/back-cosmetic/Vileplume--Female.png b/src/afd/sprites/back-cosmetic/45--0--Vileplume--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Vileplume--Female.png rename to src/afd/sprites/back-cosmetic/45--0--Vileplume--Female.png diff --git a/src/afd/sprites/back-cosmetic/Hippowdon--Female.png b/src/afd/sprites/back-cosmetic/450--0--Hippowdon--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Hippowdon--Female.png rename to src/afd/sprites/back-cosmetic/450--0--Hippowdon--Female.png diff --git a/src/afd/sprites/back-cosmetic/Croagunk--Female.png b/src/afd/sprites/back-cosmetic/453--0--Croagunk--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Croagunk--Female.png rename to src/afd/sprites/back-cosmetic/453--0--Croagunk--Female.png diff --git a/src/afd/sprites/back-cosmetic/Toxicroak--Female.png b/src/afd/sprites/back-cosmetic/454--0--Toxicroak--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Toxicroak--Female.png rename to src/afd/sprites/back-cosmetic/454--0--Toxicroak--Female.png diff --git a/src/afd/sprites/back-cosmetic/Finneon--Female.png b/src/afd/sprites/back-cosmetic/456--0--Finneon--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Finneon--Female.png rename to src/afd/sprites/back-cosmetic/456--0--Finneon--Female.png diff --git a/src/afd/sprites/back-cosmetic/Lumineon--Female.png b/src/afd/sprites/back-cosmetic/457--0--Lumineon--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Lumineon--Female.png rename to src/afd/sprites/back-cosmetic/457--0--Lumineon--Female.png diff --git a/src/afd/sprites/back-cosmetic/Snover--Female.png b/src/afd/sprites/back-cosmetic/459--0--Snover--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Snover--Female.png rename to src/afd/sprites/back-cosmetic/459--0--Snover--Female.png diff --git a/src/afd/sprites/back-cosmetic/Abomasnow--Female.png b/src/afd/sprites/back-cosmetic/460--0--Abomasnow--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Abomasnow--Female.png rename to src/afd/sprites/back-cosmetic/460--0--Abomasnow--Female.png diff --git a/src/afd/sprites/back-cosmetic/Weavile--Female.png b/src/afd/sprites/back-cosmetic/461--0--Weavile--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Weavile--Female.png rename to src/afd/sprites/back-cosmetic/461--0--Weavile--Female.png diff --git a/src/afd/sprites/back-cosmetic/Rhyperior--Female.png b/src/afd/sprites/back-cosmetic/464--0--Rhyperior--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Rhyperior--Female.png rename to src/afd/sprites/back-cosmetic/464--0--Rhyperior--Female.png diff --git a/src/afd/sprites/back-cosmetic/Tangrowth--Female.png b/src/afd/sprites/back-cosmetic/465--0--Tangrowth--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Tangrowth--Female.png rename to src/afd/sprites/back-cosmetic/465--0--Tangrowth--Female.png diff --git a/src/afd/sprites/back-cosmetic/Mamoswine--Female.png b/src/afd/sprites/back-cosmetic/473--0--Mamoswine--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Mamoswine--Female.png rename to src/afd/sprites/back-cosmetic/473--0--Mamoswine--Female.png diff --git a/src/afd/sprites/back-cosmetic/Unfezant--Female.png b/src/afd/sprites/back-cosmetic/521--0--Unfezant--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Unfezant--Female.png rename to src/afd/sprites/back-cosmetic/521--0--Unfezant--Female.png diff --git a/src/afd/sprites/back-cosmetic/Frillish--Female.png b/src/afd/sprites/back-cosmetic/592--0--Frillish--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Frillish--Female.png rename to src/afd/sprites/back-cosmetic/592--0--Frillish--Female.png diff --git a/src/afd/sprites/back-cosmetic/Jellicent--Female.png b/src/afd/sprites/back-cosmetic/593--0--Jellicent--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Jellicent--Female.png rename to src/afd/sprites/back-cosmetic/593--0--Jellicent--Female.png diff --git a/src/afd/sprites/back-cosmetic/Pyroak--Female.png b/src/afd/sprites/back-cosmetic/6--0--Pyroak--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Pyroak--Female.png rename to src/afd/sprites/back-cosmetic/6--0--Pyroak--Female.png diff --git a/src/afd/sprites/back-cosmetic/Kadabra--Female.png b/src/afd/sprites/back-cosmetic/64--0--Kadabra--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Kadabra--Female.png rename to src/afd/sprites/back-cosmetic/64--0--Kadabra--Female.png diff --git a/src/afd/sprites/back-cosmetic/Alakazam--Female.png b/src/afd/sprites/back-cosmetic/65--0--Alakazam--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Alakazam--Female.png rename to src/afd/sprites/back-cosmetic/65--0--Alakazam--Female.png diff --git a/src/afd/sprites/back-cosmetic/Pyroar--Female.png b/src/afd/sprites/back-cosmetic/668--0--Pyroar--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Pyroar--Female.png rename to src/afd/sprites/back-cosmetic/668--0--Pyroar--Female.png diff --git a/src/afd/sprites/back-cosmetic/Fidgit--Female.png b/src/afd/sprites/back-cosmetic/8--0--Fidgit--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Fidgit--Female.png rename to src/afd/sprites/back-cosmetic/8--0--Fidgit--Female.png diff --git a/src/afd/sprites/back-cosmetic/Magearna--Original.png b/src/afd/sprites/back-cosmetic/801--420--Magearna--Original.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Magearna--Original.png rename to src/afd/sprites/back-cosmetic/801--420--Magearna--Original.png diff --git a/src/afd/sprites/back-cosmetic/Doduo--Female.png b/src/afd/sprites/back-cosmetic/84--0--Doduo--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Doduo--Female.png rename to src/afd/sprites/back-cosmetic/84--0--Doduo--Female.png diff --git a/src/afd/sprites/back-cosmetic/Dodrio--Female.png b/src/afd/sprites/back-cosmetic/85--0--Dodrio--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Dodrio--Female.png rename to src/afd/sprites/back-cosmetic/85--0--Dodrio--Female.png diff --git a/src/afd/sprites/back-cosmetic/Alcremie--Caramel_Swirl.png b/src/afd/sprites/back-cosmetic/869--420--Alcremie--Caramel_Swirl.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Alcremie--Caramel_Swirl.png rename to src/afd/sprites/back-cosmetic/869--420--Alcremie--Caramel_Swirl.png diff --git a/src/afd/sprites/back-cosmetic/Alcremie--Lemon_Cream.png b/src/afd/sprites/back-cosmetic/869--420--Alcremie--Lemon_Cream.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Alcremie--Lemon_Cream.png rename to src/afd/sprites/back-cosmetic/869--420--Alcremie--Lemon_Cream.png diff --git a/src/afd/sprites/back-cosmetic/Alcremie--Matcha_Cream.png b/src/afd/sprites/back-cosmetic/869--420--Alcremie--Matcha_Cream.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Alcremie--Matcha_Cream.png rename to src/afd/sprites/back-cosmetic/869--420--Alcremie--Matcha_Cream.png diff --git a/src/afd/sprites/back-cosmetic/Alcremie--Mint_Cream.png b/src/afd/sprites/back-cosmetic/869--420--Alcremie--Mint_Cream.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Alcremie--Mint_Cream.png rename to src/afd/sprites/back-cosmetic/869--420--Alcremie--Mint_Cream.png diff --git a/src/afd/sprites/back-cosmetic/Alcremie--Rainbow_Swirl.png b/src/afd/sprites/back-cosmetic/869--420--Alcremie--Rainbow_Swirl.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Alcremie--Rainbow_Swirl.png rename to src/afd/sprites/back-cosmetic/869--420--Alcremie--Rainbow_Swirl.png diff --git a/src/afd/sprites/back-cosmetic/Alcremie--Ruby_Cream.png b/src/afd/sprites/back-cosmetic/869--420--Alcremie--Ruby_Cream.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Alcremie--Ruby_Cream.png rename to src/afd/sprites/back-cosmetic/869--420--Alcremie--Ruby_Cream.png diff --git a/src/afd/sprites/back-cosmetic/Alcremie--Ruby_Swirl.png b/src/afd/sprites/back-cosmetic/869--420--Alcremie--Ruby_Swirl.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Alcremie--Ruby_Swirl.png rename to src/afd/sprites/back-cosmetic/869--420--Alcremie--Ruby_Swirl.png diff --git a/src/afd/sprites/back-cosmetic/Alcremie--Salted_Cream.png b/src/afd/sprites/back-cosmetic/869--420--Alcremie--Salted_Cream.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Alcremie--Salted_Cream.png rename to src/afd/sprites/back-cosmetic/869--420--Alcremie--Salted_Cream.png diff --git a/src/afd/sprites/back-cosmetic/Hypno--Female.png b/src/afd/sprites/back-cosmetic/97--0--Hypno--Female.png similarity index 100% rename from src/afd/sprites/back-cosmetic/Hypno--Female.png rename to src/afd/sprites/back-cosmetic/97--0--Hypno--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Rhyhorn--Female.png b/src/afd/sprites/back-shiny-cosmetic/111--0--Rhyhorn--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Rhyhorn--Female.png rename to src/afd/sprites/back-shiny-cosmetic/111--0--Rhyhorn--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Rhydon--Female.png b/src/afd/sprites/back-shiny-cosmetic/112--0--Rhydon--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Rhydon--Female.png rename to src/afd/sprites/back-shiny-cosmetic/112--0--Rhydon--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Goldeen--Female.png b/src/afd/sprites/back-shiny-cosmetic/118--0--Goldeen--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Goldeen--Female.png rename to src/afd/sprites/back-shiny-cosmetic/118--0--Goldeen--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Butterfree--Female.png b/src/afd/sprites/back-shiny-cosmetic/12--0--Butterfree--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Butterfree--Female.png rename to src/afd/sprites/back-shiny-cosmetic/12--0--Butterfree--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Scyther--Female.png b/src/afd/sprites/back-shiny-cosmetic/123--0--Scyther--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Scyther--Female.png rename to src/afd/sprites/back-shiny-cosmetic/123--0--Scyther--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Magikarp--Female.png b/src/afd/sprites/back-shiny-cosmetic/129--0--Magikarp--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Magikarp--Female.png rename to src/afd/sprites/back-shiny-cosmetic/129--0--Magikarp--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Arghonaut--Female.png b/src/afd/sprites/back-shiny-cosmetic/13--0--Arghonaut--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Arghonaut--Female.png rename to src/afd/sprites/back-shiny-cosmetic/13--0--Arghonaut--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Gyarados--Female.png b/src/afd/sprites/back-shiny-cosmetic/130--0--Gyarados--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Gyarados--Female.png rename to src/afd/sprites/back-shiny-cosmetic/130--0--Gyarados--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Kitsunoh--Female.png b/src/afd/sprites/back-shiny-cosmetic/14--0--Kitsunoh--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Kitsunoh--Female.png rename to src/afd/sprites/back-shiny-cosmetic/14--0--Kitsunoh--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Cyclohm--Female.png b/src/afd/sprites/back-shiny-cosmetic/15--0--Cyclohm--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Cyclohm--Female.png rename to src/afd/sprites/back-shiny-cosmetic/15--0--Cyclohm--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Meganium--Female.png b/src/afd/sprites/back-shiny-cosmetic/154--0--Meganium--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Meganium--Female.png rename to src/afd/sprites/back-shiny-cosmetic/154--0--Meganium--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Colossoil--Female.png b/src/afd/sprites/back-shiny-cosmetic/16--0--Colossoil--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Colossoil--Female.png rename to src/afd/sprites/back-shiny-cosmetic/16--0--Colossoil--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Ledyba--Female.png b/src/afd/sprites/back-shiny-cosmetic/165--0--Ledyba--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Ledyba--Female.png rename to src/afd/sprites/back-shiny-cosmetic/165--0--Ledyba--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Ledian--Female.png b/src/afd/sprites/back-shiny-cosmetic/166--0--Ledian--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Ledian--Female.png rename to src/afd/sprites/back-shiny-cosmetic/166--0--Ledian--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Krilowatt--Female.png b/src/afd/sprites/back-shiny-cosmetic/17--0--Krilowatt--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Krilowatt--Female.png rename to src/afd/sprites/back-shiny-cosmetic/17--0--Krilowatt--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Xatu--Female.png b/src/afd/sprites/back-shiny-cosmetic/178--0--Xatu--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Xatu--Female.png rename to src/afd/sprites/back-shiny-cosmetic/178--0--Xatu--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Sudowoodo--Female.png b/src/afd/sprites/back-shiny-cosmetic/185--0--Sudowoodo--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Sudowoodo--Female.png rename to src/afd/sprites/back-shiny-cosmetic/185--0--Sudowoodo--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Politoed--Female.png b/src/afd/sprites/back-shiny-cosmetic/186--0--Politoed--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Politoed--Female.png rename to src/afd/sprites/back-shiny-cosmetic/186--0--Politoed--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Rattata--Female.png b/src/afd/sprites/back-shiny-cosmetic/19--0--Rattata--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Rattata--Female.png rename to src/afd/sprites/back-shiny-cosmetic/19--0--Rattata--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Voodoom--Female.png b/src/afd/sprites/back-shiny-cosmetic/19--0--Voodoom--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Voodoom--Female.png rename to src/afd/sprites/back-shiny-cosmetic/19--0--Voodoom--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Aipom--Female.png b/src/afd/sprites/back-shiny-cosmetic/190--0--Aipom--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Aipom--Female.png rename to src/afd/sprites/back-shiny-cosmetic/190--0--Aipom--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Wooper--Female.png b/src/afd/sprites/back-shiny-cosmetic/194--0--Wooper--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Wooper--Female.png rename to src/afd/sprites/back-shiny-cosmetic/194--0--Wooper--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Quagsire--Female.png b/src/afd/sprites/back-shiny-cosmetic/195--0--Quagsire--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Quagsire--Female.png rename to src/afd/sprites/back-shiny-cosmetic/195--0--Quagsire--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Murkrow--Female.png b/src/afd/sprites/back-shiny-cosmetic/198--0--Murkrow--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Murkrow--Female.png rename to src/afd/sprites/back-shiny-cosmetic/198--0--Murkrow--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Syclant--Female.png b/src/afd/sprites/back-shiny-cosmetic/2--0--Syclant--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Syclant--Female.png rename to src/afd/sprites/back-shiny-cosmetic/2--0--Syclant--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Raticate--Female.png b/src/afd/sprites/back-shiny-cosmetic/20--0--Raticate--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Raticate--Female.png rename to src/afd/sprites/back-shiny-cosmetic/20--0--Raticate--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Wobbuffet--Female.png b/src/afd/sprites/back-shiny-cosmetic/202--0--Wobbuffet--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Wobbuffet--Female.png rename to src/afd/sprites/back-shiny-cosmetic/202--0--Wobbuffet--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Girafarig--Female.png b/src/afd/sprites/back-shiny-cosmetic/203--0--Girafarig--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Girafarig--Female.png rename to src/afd/sprites/back-shiny-cosmetic/203--0--Girafarig--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Gligar--Female.png b/src/afd/sprites/back-shiny-cosmetic/207--0--Gligar--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Gligar--Female.png rename to src/afd/sprites/back-shiny-cosmetic/207--0--Gligar--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Steelix--Female.png b/src/afd/sprites/back-shiny-cosmetic/208--0--Steelix--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Steelix--Female.png rename to src/afd/sprites/back-shiny-cosmetic/208--0--Steelix--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Tomohawk--Female.png b/src/afd/sprites/back-shiny-cosmetic/21--0--Tomohawk--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Tomohawk--Female.png rename to src/afd/sprites/back-shiny-cosmetic/21--0--Tomohawk--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Scizor--Female.png b/src/afd/sprites/back-shiny-cosmetic/212--0--Scizor--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Scizor--Female.png rename to src/afd/sprites/back-shiny-cosmetic/212--0--Scizor--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Heracross--Female.png b/src/afd/sprites/back-shiny-cosmetic/214--0--Heracross--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Heracross--Female.png rename to src/afd/sprites/back-shiny-cosmetic/214--0--Heracross--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Sneasel--Female.png b/src/afd/sprites/back-shiny-cosmetic/215--0--Sneasel--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Sneasel--Female.png rename to src/afd/sprites/back-shiny-cosmetic/215--0--Sneasel--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Ursaring--Female.png b/src/afd/sprites/back-shiny-cosmetic/217--0--Ursaring--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Ursaring--Female.png rename to src/afd/sprites/back-shiny-cosmetic/217--0--Ursaring--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Piloswine--Female.png b/src/afd/sprites/back-shiny-cosmetic/221--0--Piloswine--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Piloswine--Female.png rename to src/afd/sprites/back-shiny-cosmetic/221--0--Piloswine--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Octillery--Female.png b/src/afd/sprites/back-shiny-cosmetic/224--0--Octillery--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Octillery--Female.png rename to src/afd/sprites/back-shiny-cosmetic/224--0--Octillery--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Houndoom--Female.png b/src/afd/sprites/back-shiny-cosmetic/229--0--Houndoom--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Houndoom--Female.png rename to src/afd/sprites/back-shiny-cosmetic/229--0--Houndoom--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Donphan--Female.png b/src/afd/sprites/back-shiny-cosmetic/232--0--Donphan--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Donphan--Female.png rename to src/afd/sprites/back-shiny-cosmetic/232--0--Donphan--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Pikachu--Female.png b/src/afd/sprites/back-shiny-cosmetic/25--0--Pikachu--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Pikachu--Female.png rename to src/afd/sprites/back-shiny-cosmetic/25--0--Pikachu--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Torchic--Female.png b/src/afd/sprites/back-shiny-cosmetic/255--0--Torchic--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Torchic--Female.png rename to src/afd/sprites/back-shiny-cosmetic/255--0--Torchic--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Combusken--Female.png b/src/afd/sprites/back-shiny-cosmetic/256--0--Combusken--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Combusken--Female.png rename to src/afd/sprites/back-shiny-cosmetic/256--0--Combusken--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Blaziken--Female.png b/src/afd/sprites/back-shiny-cosmetic/257--0--Blaziken--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Blaziken--Female.png rename to src/afd/sprites/back-shiny-cosmetic/257--0--Blaziken--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Raichu--Female.png b/src/afd/sprites/back-shiny-cosmetic/26--0--Raichu--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Raichu--Female.png rename to src/afd/sprites/back-shiny-cosmetic/26--0--Raichu--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Beautifly--Female.png b/src/afd/sprites/back-shiny-cosmetic/267--0--Beautifly--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Beautifly--Female.png rename to src/afd/sprites/back-shiny-cosmetic/267--0--Beautifly--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Dustox--Female.png b/src/afd/sprites/back-shiny-cosmetic/269--0--Dustox--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Dustox--Female.png rename to src/afd/sprites/back-shiny-cosmetic/269--0--Dustox--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Ludicolo--Female.png b/src/afd/sprites/back-shiny-cosmetic/272--0--Ludicolo--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Ludicolo--Female.png rename to src/afd/sprites/back-shiny-cosmetic/272--0--Ludicolo--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Nuzleaf--Female.png b/src/afd/sprites/back-shiny-cosmetic/274--0--Nuzleaf--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Nuzleaf--Female.png rename to src/afd/sprites/back-shiny-cosmetic/274--0--Nuzleaf--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Shiftry--Female.png b/src/afd/sprites/back-shiny-cosmetic/275--0--Shiftry--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Shiftry--Female.png rename to src/afd/sprites/back-shiny-cosmetic/275--0--Shiftry--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Revenankh--Female.png b/src/afd/sprites/back-shiny-cosmetic/3--0--Revenankh--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Revenankh--Female.png rename to src/afd/sprites/back-shiny-cosmetic/3--0--Revenankh--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Venusaur--Female.png b/src/afd/sprites/back-shiny-cosmetic/3--0--Venusaur--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Venusaur--Female.png rename to src/afd/sprites/back-shiny-cosmetic/3--0--Venusaur--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Meditite--Female.png b/src/afd/sprites/back-shiny-cosmetic/307--0--Meditite--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Meditite--Female.png rename to src/afd/sprites/back-shiny-cosmetic/307--0--Meditite--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Medicham--Female.png b/src/afd/sprites/back-shiny-cosmetic/308--0--Medicham--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Medicham--Female.png rename to src/afd/sprites/back-shiny-cosmetic/308--0--Medicham--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Roselia--Female.png b/src/afd/sprites/back-shiny-cosmetic/315--0--Roselia--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Roselia--Female.png rename to src/afd/sprites/back-shiny-cosmetic/315--0--Roselia--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Gulpin--Female.png b/src/afd/sprites/back-shiny-cosmetic/316--0--Gulpin--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Gulpin--Female.png rename to src/afd/sprites/back-shiny-cosmetic/316--0--Gulpin--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Swalot--Female.png b/src/afd/sprites/back-shiny-cosmetic/317--0--Swalot--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Swalot--Female.png rename to src/afd/sprites/back-shiny-cosmetic/317--0--Swalot--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Numel--Female.png b/src/afd/sprites/back-shiny-cosmetic/322--0--Numel--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Numel--Female.png rename to src/afd/sprites/back-shiny-cosmetic/322--0--Numel--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Camerupt--Female.png b/src/afd/sprites/back-shiny-cosmetic/323--0--Camerupt--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Camerupt--Female.png rename to src/afd/sprites/back-shiny-cosmetic/323--0--Camerupt--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Cacturne--Female.png b/src/afd/sprites/back-shiny-cosmetic/332--0--Cacturne--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Cacturne--Female.png rename to src/afd/sprites/back-shiny-cosmetic/332--0--Cacturne--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Milotic--Female.png b/src/afd/sprites/back-shiny-cosmetic/350--0--Milotic--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Milotic--Female.png rename to src/afd/sprites/back-shiny-cosmetic/350--0--Milotic--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Relicanth--Female.png b/src/afd/sprites/back-shiny-cosmetic/369--0--Relicanth--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Relicanth--Female.png rename to src/afd/sprites/back-shiny-cosmetic/369--0--Relicanth--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Starly--Female.png b/src/afd/sprites/back-shiny-cosmetic/396--0--Starly--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Starly--Female.png rename to src/afd/sprites/back-shiny-cosmetic/396--0--Starly--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Staravia--Female.png b/src/afd/sprites/back-shiny-cosmetic/397--0--Staravia--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Staravia--Female.png rename to src/afd/sprites/back-shiny-cosmetic/397--0--Staravia--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Staraptor--Female.png b/src/afd/sprites/back-shiny-cosmetic/398--0--Staraptor--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Staraptor--Female.png rename to src/afd/sprites/back-shiny-cosmetic/398--0--Staraptor--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Bidoof--Female.png b/src/afd/sprites/back-shiny-cosmetic/399--0--Bidoof--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Bidoof--Female.png rename to src/afd/sprites/back-shiny-cosmetic/399--0--Bidoof--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Bibarel--Female.png b/src/afd/sprites/back-shiny-cosmetic/400--0--Bibarel--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Bibarel--Female.png rename to src/afd/sprites/back-shiny-cosmetic/400--0--Bibarel--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Kricketot--Female.png b/src/afd/sprites/back-shiny-cosmetic/401--0--Kricketot--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Kricketot--Female.png rename to src/afd/sprites/back-shiny-cosmetic/401--0--Kricketot--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Kricketune--Female.png b/src/afd/sprites/back-shiny-cosmetic/402--0--Kricketune--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Kricketune--Female.png rename to src/afd/sprites/back-shiny-cosmetic/402--0--Kricketune--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Shinx--Female.png b/src/afd/sprites/back-shiny-cosmetic/403--0--Shinx--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Shinx--Female.png rename to src/afd/sprites/back-shiny-cosmetic/403--0--Shinx--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Luxio--Female.png b/src/afd/sprites/back-shiny-cosmetic/404--0--Luxio--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Luxio--Female.png rename to src/afd/sprites/back-shiny-cosmetic/404--0--Luxio--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Luxray--Female.png b/src/afd/sprites/back-shiny-cosmetic/405--0--Luxray--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Luxray--Female.png rename to src/afd/sprites/back-shiny-cosmetic/405--0--Luxray--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Roserade--Female.png b/src/afd/sprites/back-shiny-cosmetic/407--0--Roserade--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Roserade--Female.png rename to src/afd/sprites/back-shiny-cosmetic/407--0--Roserade--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Zubat--Female.png b/src/afd/sprites/back-shiny-cosmetic/41--0--Zubat--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Zubat--Female.png rename to src/afd/sprites/back-shiny-cosmetic/41--0--Zubat--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Burmy--Sandy.png b/src/afd/sprites/back-shiny-cosmetic/412--420--Burmy--Sandy.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Burmy--Sandy.png rename to src/afd/sprites/back-shiny-cosmetic/412--420--Burmy--Sandy.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Burmy--Trash.png b/src/afd/sprites/back-shiny-cosmetic/412--420--Burmy--Trash.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Burmy--Trash.png rename to src/afd/sprites/back-shiny-cosmetic/412--420--Burmy--Trash.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Combee--Female.png b/src/afd/sprites/back-shiny-cosmetic/415--0--Combee--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Combee--Female.png rename to src/afd/sprites/back-shiny-cosmetic/415--0--Combee--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Pachirisu--Female.png b/src/afd/sprites/back-shiny-cosmetic/417--0--Pachirisu--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Pachirisu--Female.png rename to src/afd/sprites/back-shiny-cosmetic/417--0--Pachirisu--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Buizel--Female.png b/src/afd/sprites/back-shiny-cosmetic/418--0--Buizel--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Buizel--Female.png rename to src/afd/sprites/back-shiny-cosmetic/418--0--Buizel--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Floatzel--Female.png b/src/afd/sprites/back-shiny-cosmetic/419--0--Floatzel--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Floatzel--Female.png rename to src/afd/sprites/back-shiny-cosmetic/419--0--Floatzel--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Golbat--Female.png b/src/afd/sprites/back-shiny-cosmetic/42--0--Golbat--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Golbat--Female.png rename to src/afd/sprites/back-shiny-cosmetic/42--0--Golbat--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Ambipom--Female.png b/src/afd/sprites/back-shiny-cosmetic/424--0--Ambipom--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Ambipom--Female.png rename to src/afd/sprites/back-shiny-cosmetic/424--0--Ambipom--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Gloom--Female.png b/src/afd/sprites/back-shiny-cosmetic/44--0--Gloom--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Gloom--Female.png rename to src/afd/sprites/back-shiny-cosmetic/44--0--Gloom--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Gible--Female.png b/src/afd/sprites/back-shiny-cosmetic/443--0--Gible--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Gible--Female.png rename to src/afd/sprites/back-shiny-cosmetic/443--0--Gible--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Garchomp--Female.png b/src/afd/sprites/back-shiny-cosmetic/445--0--Garchomp--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Garchomp--Female.png rename to src/afd/sprites/back-shiny-cosmetic/445--0--Garchomp--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Hippopotas--Female.png b/src/afd/sprites/back-shiny-cosmetic/449--0--Hippopotas--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Hippopotas--Female.png rename to src/afd/sprites/back-shiny-cosmetic/449--0--Hippopotas--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Vileplume--Female.png b/src/afd/sprites/back-shiny-cosmetic/45--0--Vileplume--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Vileplume--Female.png rename to src/afd/sprites/back-shiny-cosmetic/45--0--Vileplume--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Hippowdon--Female.png b/src/afd/sprites/back-shiny-cosmetic/450--0--Hippowdon--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Hippowdon--Female.png rename to src/afd/sprites/back-shiny-cosmetic/450--0--Hippowdon--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Croagunk--Female.png b/src/afd/sprites/back-shiny-cosmetic/453--0--Croagunk--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Croagunk--Female.png rename to src/afd/sprites/back-shiny-cosmetic/453--0--Croagunk--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Toxicroak--Female.png b/src/afd/sprites/back-shiny-cosmetic/454--0--Toxicroak--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Toxicroak--Female.png rename to src/afd/sprites/back-shiny-cosmetic/454--0--Toxicroak--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Finneon--Female.png b/src/afd/sprites/back-shiny-cosmetic/456--0--Finneon--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Finneon--Female.png rename to src/afd/sprites/back-shiny-cosmetic/456--0--Finneon--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Lumineon--Female.png b/src/afd/sprites/back-shiny-cosmetic/457--0--Lumineon--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Lumineon--Female.png rename to src/afd/sprites/back-shiny-cosmetic/457--0--Lumineon--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Snover--Female.png b/src/afd/sprites/back-shiny-cosmetic/459--0--Snover--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Snover--Female.png rename to src/afd/sprites/back-shiny-cosmetic/459--0--Snover--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Abomasnow--Female.png b/src/afd/sprites/back-shiny-cosmetic/460--0--Abomasnow--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Abomasnow--Female.png rename to src/afd/sprites/back-shiny-cosmetic/460--0--Abomasnow--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Weavile--Female.png b/src/afd/sprites/back-shiny-cosmetic/461--0--Weavile--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Weavile--Female.png rename to src/afd/sprites/back-shiny-cosmetic/461--0--Weavile--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Rhyperior--Female.png b/src/afd/sprites/back-shiny-cosmetic/464--0--Rhyperior--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Rhyperior--Female.png rename to src/afd/sprites/back-shiny-cosmetic/464--0--Rhyperior--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Tangrowth--Female.png b/src/afd/sprites/back-shiny-cosmetic/465--0--Tangrowth--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Tangrowth--Female.png rename to src/afd/sprites/back-shiny-cosmetic/465--0--Tangrowth--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Mamoswine--Female.png b/src/afd/sprites/back-shiny-cosmetic/473--0--Mamoswine--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Mamoswine--Female.png rename to src/afd/sprites/back-shiny-cosmetic/473--0--Mamoswine--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Unfezant--Female.png b/src/afd/sprites/back-shiny-cosmetic/521--0--Unfezant--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Unfezant--Female.png rename to src/afd/sprites/back-shiny-cosmetic/521--0--Unfezant--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Frillish--Female.png b/src/afd/sprites/back-shiny-cosmetic/592--0--Frillish--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Frillish--Female.png rename to src/afd/sprites/back-shiny-cosmetic/592--0--Frillish--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Jellicent--Female.png b/src/afd/sprites/back-shiny-cosmetic/593--0--Jellicent--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Jellicent--Female.png rename to src/afd/sprites/back-shiny-cosmetic/593--0--Jellicent--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Pyroak--Female.png b/src/afd/sprites/back-shiny-cosmetic/6--0--Pyroak--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Pyroak--Female.png rename to src/afd/sprites/back-shiny-cosmetic/6--0--Pyroak--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Kadabra--Female.png b/src/afd/sprites/back-shiny-cosmetic/64--0--Kadabra--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Kadabra--Female.png rename to src/afd/sprites/back-shiny-cosmetic/64--0--Kadabra--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Alakazam--Female.png b/src/afd/sprites/back-shiny-cosmetic/65--0--Alakazam--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Alakazam--Female.png rename to src/afd/sprites/back-shiny-cosmetic/65--0--Alakazam--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Pyroar--Female.png b/src/afd/sprites/back-shiny-cosmetic/668--0--Pyroar--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Pyroar--Female.png rename to src/afd/sprites/back-shiny-cosmetic/668--0--Pyroar--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Fidgit--Female.png b/src/afd/sprites/back-shiny-cosmetic/8--0--Fidgit--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Fidgit--Female.png rename to src/afd/sprites/back-shiny-cosmetic/8--0--Fidgit--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Magearna--Original.png b/src/afd/sprites/back-shiny-cosmetic/801--420--Magearna--Original.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Magearna--Original.png rename to src/afd/sprites/back-shiny-cosmetic/801--420--Magearna--Original.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Doduo--Female.png b/src/afd/sprites/back-shiny-cosmetic/84--0--Doduo--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Doduo--Female.png rename to src/afd/sprites/back-shiny-cosmetic/84--0--Doduo--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Dodrio--Female.png b/src/afd/sprites/back-shiny-cosmetic/85--0--Dodrio--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Dodrio--Female.png rename to src/afd/sprites/back-shiny-cosmetic/85--0--Dodrio--Female.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Alcremie--Caramel_Swirl.png b/src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Caramel_Swirl.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Alcremie--Caramel_Swirl.png rename to src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Caramel_Swirl.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Alcremie--Lemon_Cream.png b/src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Lemon_Cream.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Alcremie--Lemon_Cream.png rename to src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Lemon_Cream.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Alcremie--Matcha_Cream.png b/src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Matcha_Cream.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Alcremie--Matcha_Cream.png rename to src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Matcha_Cream.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Alcremie--Mint_Cream.png b/src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Mint_Cream.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Alcremie--Mint_Cream.png rename to src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Mint_Cream.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Alcremie--Rainbow_Swirl.png b/src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Rainbow_Swirl.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Alcremie--Rainbow_Swirl.png rename to src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Rainbow_Swirl.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Alcremie--Ruby_Cream.png b/src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Ruby_Cream.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Alcremie--Ruby_Cream.png rename to src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Ruby_Cream.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Alcremie--Ruby_Swirl.png b/src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Ruby_Swirl.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Alcremie--Ruby_Swirl.png rename to src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Ruby_Swirl.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Alcremie--Salted_Cream.png b/src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Salted_Cream.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Alcremie--Salted_Cream.png rename to src/afd/sprites/back-shiny-cosmetic/869--420--Alcremie--Salted_Cream.png diff --git a/src/afd/sprites/back-shiny-cosmetic/Hypno--Female.png b/src/afd/sprites/back-shiny-cosmetic/97--0--Hypno--Female.png similarity index 100% rename from src/afd/sprites/back-shiny-cosmetic/Hypno--Female.png rename to src/afd/sprites/back-shiny-cosmetic/97--0--Hypno--Female.png diff --git a/src/afd/sprites/back-shiny/Missingno..png b/src/afd/sprites/back-shiny/0--0--Missingno..png similarity index 100% rename from src/afd/sprites/back-shiny/Missingno..png rename to src/afd/sprites/back-shiny/0--0--Missingno..png diff --git a/src/afd/sprites/back-shiny/Bulbasaur.png b/src/afd/sprites/back-shiny/1--0--Bulbasaur.png similarity index 100% rename from src/afd/sprites/back-shiny/Bulbasaur.png rename to src/afd/sprites/back-shiny/1--0--Bulbasaur.png diff --git a/src/afd/sprites/back-shiny/Caterpie.png b/src/afd/sprites/back-shiny/10--0--Caterpie.png similarity index 100% rename from src/afd/sprites/back-shiny/Caterpie.png rename to src/afd/sprites/back-shiny/10--0--Caterpie.png diff --git a/src/afd/sprites/back-shiny/Voltorb.png b/src/afd/sprites/back-shiny/100--0--Voltorb.png similarity index 100% rename from src/afd/sprites/back-shiny/Voltorb.png rename to src/afd/sprites/back-shiny/100--0--Voltorb.png diff --git a/src/afd/sprites/back-shiny/Electrode.png b/src/afd/sprites/back-shiny/101--0--Electrode.png similarity index 100% rename from src/afd/sprites/back-shiny/Electrode.png rename to src/afd/sprites/back-shiny/101--0--Electrode.png diff --git a/src/afd/sprites/back-shiny/Exeggcute.png b/src/afd/sprites/back-shiny/102--0--Exeggcute.png similarity index 100% rename from src/afd/sprites/back-shiny/Exeggcute.png rename to src/afd/sprites/back-shiny/102--0--Exeggcute.png diff --git a/src/afd/sprites/back-shiny/Exeggutor.png b/src/afd/sprites/back-shiny/103--0--Exeggutor.png similarity index 100% rename from src/afd/sprites/back-shiny/Exeggutor.png rename to src/afd/sprites/back-shiny/103--0--Exeggutor.png diff --git a/src/afd/sprites/back-shiny/Exeggutor--Alola.png b/src/afd/sprites/back-shiny/103--420--Exeggutor--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Exeggutor--Alola.png rename to src/afd/sprites/back-shiny/103--420--Exeggutor--Alola.png diff --git a/src/afd/sprites/back-shiny/Cubone.png b/src/afd/sprites/back-shiny/104--0--Cubone.png similarity index 100% rename from src/afd/sprites/back-shiny/Cubone.png rename to src/afd/sprites/back-shiny/104--0--Cubone.png diff --git a/src/afd/sprites/back-shiny/Marowak.png b/src/afd/sprites/back-shiny/105--0--Marowak.png similarity index 100% rename from src/afd/sprites/back-shiny/Marowak.png rename to src/afd/sprites/back-shiny/105--0--Marowak.png diff --git a/src/afd/sprites/back-shiny/Marowak--Alola.png b/src/afd/sprites/back-shiny/105--420--Marowak--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Marowak--Alola.png rename to src/afd/sprites/back-shiny/105--420--Marowak--Alola.png diff --git a/src/afd/sprites/back-shiny/Hitmonlee.png b/src/afd/sprites/back-shiny/106--0--Hitmonlee.png similarity index 100% rename from src/afd/sprites/back-shiny/Hitmonlee.png rename to src/afd/sprites/back-shiny/106--0--Hitmonlee.png diff --git a/src/afd/sprites/back-shiny/Hitmonchan.png b/src/afd/sprites/back-shiny/107--0--Hitmonchan.png similarity index 100% rename from src/afd/sprites/back-shiny/Hitmonchan.png rename to src/afd/sprites/back-shiny/107--0--Hitmonchan.png diff --git a/src/afd/sprites/back-shiny/Lickitung.png b/src/afd/sprites/back-shiny/108--0--Lickitung.png similarity index 100% rename from src/afd/sprites/back-shiny/Lickitung.png rename to src/afd/sprites/back-shiny/108--0--Lickitung.png diff --git a/src/afd/sprites/back-shiny/Koffing.png b/src/afd/sprites/back-shiny/109--0--Koffing.png similarity index 100% rename from src/afd/sprites/back-shiny/Koffing.png rename to src/afd/sprites/back-shiny/109--0--Koffing.png diff --git a/src/afd/sprites/back-shiny/Metapod.png b/src/afd/sprites/back-shiny/11--0--Metapod.png similarity index 100% rename from src/afd/sprites/back-shiny/Metapod.png rename to src/afd/sprites/back-shiny/11--0--Metapod.png diff --git a/src/afd/sprites/back-shiny/Stratagem.png b/src/afd/sprites/back-shiny/11--0--Stratagem.png similarity index 100% rename from src/afd/sprites/back-shiny/Stratagem.png rename to src/afd/sprites/back-shiny/11--0--Stratagem.png diff --git a/src/afd/sprites/back-shiny/Weezing.png b/src/afd/sprites/back-shiny/110--0--Weezing.png similarity index 100% rename from src/afd/sprites/back-shiny/Weezing.png rename to src/afd/sprites/back-shiny/110--0--Weezing.png diff --git a/src/afd/sprites/back-shiny/Weezing--Galar.png b/src/afd/sprites/back-shiny/110--420--Weezing--Galar.png similarity index 100% rename from src/afd/sprites/back-shiny/Weezing--Galar.png rename to src/afd/sprites/back-shiny/110--420--Weezing--Galar.png diff --git a/src/afd/sprites/back-shiny/Rhyhorn.png b/src/afd/sprites/back-shiny/111--0--Rhyhorn.png similarity index 100% rename from src/afd/sprites/back-shiny/Rhyhorn.png rename to src/afd/sprites/back-shiny/111--0--Rhyhorn.png diff --git a/src/afd/sprites/back-shiny/Rhydon.png b/src/afd/sprites/back-shiny/112--0--Rhydon.png similarity index 100% rename from src/afd/sprites/back-shiny/Rhydon.png rename to src/afd/sprites/back-shiny/112--0--Rhydon.png diff --git a/src/afd/sprites/back-shiny/Chansey.png b/src/afd/sprites/back-shiny/113--0--Chansey.png similarity index 100% rename from src/afd/sprites/back-shiny/Chansey.png rename to src/afd/sprites/back-shiny/113--0--Chansey.png diff --git a/src/afd/sprites/back-shiny/Tangela.png b/src/afd/sprites/back-shiny/114--0--Tangela.png similarity index 100% rename from src/afd/sprites/back-shiny/Tangela.png rename to src/afd/sprites/back-shiny/114--0--Tangela.png diff --git a/src/afd/sprites/back-shiny/Kangaskhan.png b/src/afd/sprites/back-shiny/115--0--Kangaskhan.png similarity index 100% rename from src/afd/sprites/back-shiny/Kangaskhan.png rename to src/afd/sprites/back-shiny/115--0--Kangaskhan.png diff --git a/src/afd/sprites/back-shiny/Kangaskhan--Mega.png b/src/afd/sprites/back-shiny/115--420--Kangaskhan--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Kangaskhan--Mega.png rename to src/afd/sprites/back-shiny/115--420--Kangaskhan--Mega.png diff --git a/src/afd/sprites/back-shiny/Horsea.png b/src/afd/sprites/back-shiny/116--0--Horsea.png similarity index 100% rename from src/afd/sprites/back-shiny/Horsea.png rename to src/afd/sprites/back-shiny/116--0--Horsea.png diff --git a/src/afd/sprites/back-shiny/Seadra.png b/src/afd/sprites/back-shiny/117--0--Seadra.png similarity index 100% rename from src/afd/sprites/back-shiny/Seadra.png rename to src/afd/sprites/back-shiny/117--0--Seadra.png diff --git a/src/afd/sprites/back-shiny/Goldeen.png b/src/afd/sprites/back-shiny/118--0--Goldeen.png similarity index 100% rename from src/afd/sprites/back-shiny/Goldeen.png rename to src/afd/sprites/back-shiny/118--0--Goldeen.png diff --git a/src/afd/sprites/back-shiny/Seaking.png b/src/afd/sprites/back-shiny/119--0--Seaking.png similarity index 100% rename from src/afd/sprites/back-shiny/Seaking.png rename to src/afd/sprites/back-shiny/119--0--Seaking.png diff --git a/src/afd/sprites/back-shiny/Butterfree.png b/src/afd/sprites/back-shiny/12--0--Butterfree.png similarity index 100% rename from src/afd/sprites/back-shiny/Butterfree.png rename to src/afd/sprites/back-shiny/12--0--Butterfree.png diff --git a/src/afd/sprites/back-shiny/Butterfree--Gmax.png b/src/afd/sprites/back-shiny/12--420--Butterfree--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Butterfree--Gmax.png rename to src/afd/sprites/back-shiny/12--420--Butterfree--Gmax.png diff --git a/src/afd/sprites/back-shiny/Staryu.png b/src/afd/sprites/back-shiny/120--0--Staryu.png similarity index 100% rename from src/afd/sprites/back-shiny/Staryu.png rename to src/afd/sprites/back-shiny/120--0--Staryu.png diff --git a/src/afd/sprites/back-shiny/Starmie.png b/src/afd/sprites/back-shiny/121--0--Starmie.png similarity index 100% rename from src/afd/sprites/back-shiny/Starmie.png rename to src/afd/sprites/back-shiny/121--0--Starmie.png diff --git a/src/afd/sprites/back-shiny/Mr._Mime.png b/src/afd/sprites/back-shiny/122--0--Mr._Mime.png similarity index 100% rename from src/afd/sprites/back-shiny/Mr._Mime.png rename to src/afd/sprites/back-shiny/122--0--Mr._Mime.png diff --git a/src/afd/sprites/back-shiny/Mr._Mime--Galar.png b/src/afd/sprites/back-shiny/122--420--Mr._Mime--Galar.png similarity index 100% rename from src/afd/sprites/back-shiny/Mr._Mime--Galar.png rename to src/afd/sprites/back-shiny/122--420--Mr._Mime--Galar.png diff --git a/src/afd/sprites/back-shiny/Scyther.png b/src/afd/sprites/back-shiny/123--0--Scyther.png similarity index 100% rename from src/afd/sprites/back-shiny/Scyther.png rename to src/afd/sprites/back-shiny/123--0--Scyther.png diff --git a/src/afd/sprites/back-shiny/Jynx.png b/src/afd/sprites/back-shiny/124--0--Jynx.png similarity index 100% rename from src/afd/sprites/back-shiny/Jynx.png rename to src/afd/sprites/back-shiny/124--0--Jynx.png diff --git a/src/afd/sprites/back-shiny/Electabuzz.png b/src/afd/sprites/back-shiny/125--0--Electabuzz.png similarity index 100% rename from src/afd/sprites/back-shiny/Electabuzz.png rename to src/afd/sprites/back-shiny/125--0--Electabuzz.png diff --git a/src/afd/sprites/back-shiny/Magmar.png b/src/afd/sprites/back-shiny/126--0--Magmar.png similarity index 100% rename from src/afd/sprites/back-shiny/Magmar.png rename to src/afd/sprites/back-shiny/126--0--Magmar.png diff --git a/src/afd/sprites/back-shiny/Pinsir.png b/src/afd/sprites/back-shiny/127--0--Pinsir.png similarity index 100% rename from src/afd/sprites/back-shiny/Pinsir.png rename to src/afd/sprites/back-shiny/127--0--Pinsir.png diff --git a/src/afd/sprites/back-shiny/Pinsir--Mega.png b/src/afd/sprites/back-shiny/127--420--Pinsir--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Pinsir--Mega.png rename to src/afd/sprites/back-shiny/127--420--Pinsir--Mega.png diff --git a/src/afd/sprites/back-shiny/Tauros.png b/src/afd/sprites/back-shiny/128--0--Tauros.png similarity index 100% rename from src/afd/sprites/back-shiny/Tauros.png rename to src/afd/sprites/back-shiny/128--0--Tauros.png diff --git a/src/afd/sprites/back-shiny/Magikarp.png b/src/afd/sprites/back-shiny/129--0--Magikarp.png similarity index 100% rename from src/afd/sprites/back-shiny/Magikarp.png rename to src/afd/sprites/back-shiny/129--0--Magikarp.png diff --git a/src/afd/sprites/back-shiny/Arghonaut.png b/src/afd/sprites/back-shiny/13--0--Arghonaut.png similarity index 100% rename from src/afd/sprites/back-shiny/Arghonaut.png rename to src/afd/sprites/back-shiny/13--0--Arghonaut.png diff --git a/src/afd/sprites/back-shiny/Weedle.png b/src/afd/sprites/back-shiny/13--0--Weedle.png similarity index 100% rename from src/afd/sprites/back-shiny/Weedle.png rename to src/afd/sprites/back-shiny/13--0--Weedle.png diff --git a/src/afd/sprites/back-shiny/Gyarados.png b/src/afd/sprites/back-shiny/130--0--Gyarados.png similarity index 100% rename from src/afd/sprites/back-shiny/Gyarados.png rename to src/afd/sprites/back-shiny/130--0--Gyarados.png diff --git a/src/afd/sprites/back-shiny/Gyarados--Mega.png b/src/afd/sprites/back-shiny/130--420--Gyarados--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Gyarados--Mega.png rename to src/afd/sprites/back-shiny/130--420--Gyarados--Mega.png diff --git a/src/afd/sprites/back-shiny/Lapras.png b/src/afd/sprites/back-shiny/131--0--Lapras.png similarity index 100% rename from src/afd/sprites/back-shiny/Lapras.png rename to src/afd/sprites/back-shiny/131--0--Lapras.png diff --git a/src/afd/sprites/back-shiny/Lapras--Gmax.png b/src/afd/sprites/back-shiny/131--420--Lapras--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Lapras--Gmax.png rename to src/afd/sprites/back-shiny/131--420--Lapras--Gmax.png diff --git a/src/afd/sprites/back-shiny/Ditto.png b/src/afd/sprites/back-shiny/132--0--Ditto.png similarity index 100% rename from src/afd/sprites/back-shiny/Ditto.png rename to src/afd/sprites/back-shiny/132--0--Ditto.png diff --git a/src/afd/sprites/back-shiny/Eevee.png b/src/afd/sprites/back-shiny/133--0--Eevee.png similarity index 100% rename from src/afd/sprites/back-shiny/Eevee.png rename to src/afd/sprites/back-shiny/133--0--Eevee.png diff --git a/src/afd/sprites/back-shiny/Eevee--Gmax.png b/src/afd/sprites/back-shiny/133--420--Eevee--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Eevee--Gmax.png rename to src/afd/sprites/back-shiny/133--420--Eevee--Gmax.png diff --git a/src/afd/sprites/back-shiny/Eevee--Starter.png b/src/afd/sprites/back-shiny/133--420--Eevee--Starter.png similarity index 100% rename from src/afd/sprites/back-shiny/Eevee--Starter.png rename to src/afd/sprites/back-shiny/133--420--Eevee--Starter.png diff --git a/src/afd/sprites/back-shiny/Vaporeon.png b/src/afd/sprites/back-shiny/134--0--Vaporeon.png similarity index 100% rename from src/afd/sprites/back-shiny/Vaporeon.png rename to src/afd/sprites/back-shiny/134--0--Vaporeon.png diff --git a/src/afd/sprites/back-shiny/Jolteon.png b/src/afd/sprites/back-shiny/135--0--Jolteon.png similarity index 100% rename from src/afd/sprites/back-shiny/Jolteon.png rename to src/afd/sprites/back-shiny/135--0--Jolteon.png diff --git a/src/afd/sprites/back-shiny/Flareon.png b/src/afd/sprites/back-shiny/136--0--Flareon.png similarity index 100% rename from src/afd/sprites/back-shiny/Flareon.png rename to src/afd/sprites/back-shiny/136--0--Flareon.png diff --git a/src/afd/sprites/back-shiny/Porygon.png b/src/afd/sprites/back-shiny/137--0--Porygon.png similarity index 100% rename from src/afd/sprites/back-shiny/Porygon.png rename to src/afd/sprites/back-shiny/137--0--Porygon.png diff --git a/src/afd/sprites/back-shiny/Omanyte.png b/src/afd/sprites/back-shiny/138--0--Omanyte.png similarity index 100% rename from src/afd/sprites/back-shiny/Omanyte.png rename to src/afd/sprites/back-shiny/138--0--Omanyte.png diff --git a/src/afd/sprites/back-shiny/Omastar.png b/src/afd/sprites/back-shiny/139--0--Omastar.png similarity index 100% rename from src/afd/sprites/back-shiny/Omastar.png rename to src/afd/sprites/back-shiny/139--0--Omastar.png diff --git a/src/afd/sprites/back-shiny/Kakuna.png b/src/afd/sprites/back-shiny/14--0--Kakuna.png similarity index 100% rename from src/afd/sprites/back-shiny/Kakuna.png rename to src/afd/sprites/back-shiny/14--0--Kakuna.png diff --git a/src/afd/sprites/back-shiny/Kitsunoh.png b/src/afd/sprites/back-shiny/14--0--Kitsunoh.png similarity index 100% rename from src/afd/sprites/back-shiny/Kitsunoh.png rename to src/afd/sprites/back-shiny/14--0--Kitsunoh.png diff --git a/src/afd/sprites/back-shiny/Kabuto.png b/src/afd/sprites/back-shiny/140--0--Kabuto.png similarity index 100% rename from src/afd/sprites/back-shiny/Kabuto.png rename to src/afd/sprites/back-shiny/140--0--Kabuto.png diff --git a/src/afd/sprites/back-shiny/Kabutops.png b/src/afd/sprites/back-shiny/141--0--Kabutops.png similarity index 100% rename from src/afd/sprites/back-shiny/Kabutops.png rename to src/afd/sprites/back-shiny/141--0--Kabutops.png diff --git a/src/afd/sprites/back-shiny/Aerodactyl--Mega.png b/src/afd/sprites/back-shiny/142--420--Aerodactyl--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Aerodactyl--Mega.png rename to src/afd/sprites/back-shiny/142--420--Aerodactyl--Mega.png diff --git a/src/afd/sprites/back-shiny/Snorlax.png b/src/afd/sprites/back-shiny/143--0--Snorlax.png similarity index 100% rename from src/afd/sprites/back-shiny/Snorlax.png rename to src/afd/sprites/back-shiny/143--0--Snorlax.png diff --git a/src/afd/sprites/back-shiny/Snorlax--Gmax.png b/src/afd/sprites/back-shiny/143--420--Snorlax--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Snorlax--Gmax.png rename to src/afd/sprites/back-shiny/143--420--Snorlax--Gmax.png diff --git a/src/afd/sprites/back-shiny/Articuno.png b/src/afd/sprites/back-shiny/144--0--Articuno.png similarity index 100% rename from src/afd/sprites/back-shiny/Articuno.png rename to src/afd/sprites/back-shiny/144--0--Articuno.png diff --git a/src/afd/sprites/back-shiny/Zapdos.png b/src/afd/sprites/back-shiny/145--0--Zapdos.png similarity index 100% rename from src/afd/sprites/back-shiny/Zapdos.png rename to src/afd/sprites/back-shiny/145--0--Zapdos.png diff --git a/src/afd/sprites/back-shiny/Moltres.png b/src/afd/sprites/back-shiny/146--0--Moltres.png similarity index 100% rename from src/afd/sprites/back-shiny/Moltres.png rename to src/afd/sprites/back-shiny/146--0--Moltres.png diff --git a/src/afd/sprites/back-shiny/Dratini.png b/src/afd/sprites/back-shiny/147--0--Dratini.png similarity index 100% rename from src/afd/sprites/back-shiny/Dratini.png rename to src/afd/sprites/back-shiny/147--0--Dratini.png diff --git a/src/afd/sprites/back-shiny/Dragonair.png b/src/afd/sprites/back-shiny/148--0--Dragonair.png similarity index 100% rename from src/afd/sprites/back-shiny/Dragonair.png rename to src/afd/sprites/back-shiny/148--0--Dragonair.png diff --git a/src/afd/sprites/back-shiny/Dragonite.png b/src/afd/sprites/back-shiny/149--0--Dragonite.png similarity index 100% rename from src/afd/sprites/back-shiny/Dragonite.png rename to src/afd/sprites/back-shiny/149--0--Dragonite.png diff --git a/src/afd/sprites/back-shiny/Beedrill.png b/src/afd/sprites/back-shiny/15--0--Beedrill.png similarity index 100% rename from src/afd/sprites/back-shiny/Beedrill.png rename to src/afd/sprites/back-shiny/15--0--Beedrill.png diff --git a/src/afd/sprites/back-shiny/Cyclohm.png b/src/afd/sprites/back-shiny/15--0--Cyclohm.png similarity index 100% rename from src/afd/sprites/back-shiny/Cyclohm.png rename to src/afd/sprites/back-shiny/15--0--Cyclohm.png diff --git a/src/afd/sprites/back-shiny/Beedrill--Mega.png b/src/afd/sprites/back-shiny/15--420--Beedrill--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Beedrill--Mega.png rename to src/afd/sprites/back-shiny/15--420--Beedrill--Mega.png diff --git a/src/afd/sprites/back-shiny/Mewtwo.png b/src/afd/sprites/back-shiny/150--0--Mewtwo.png similarity index 100% rename from src/afd/sprites/back-shiny/Mewtwo.png rename to src/afd/sprites/back-shiny/150--0--Mewtwo.png diff --git a/src/afd/sprites/back-shiny/Mewtwo--Mega-X.png b/src/afd/sprites/back-shiny/150--420--Mewtwo--Mega-X.png similarity index 100% rename from src/afd/sprites/back-shiny/Mewtwo--Mega-X.png rename to src/afd/sprites/back-shiny/150--420--Mewtwo--Mega-X.png diff --git a/src/afd/sprites/back-shiny/Mewtwo--Mega-Y.png b/src/afd/sprites/back-shiny/150--420--Mewtwo--Mega-Y.png similarity index 100% rename from src/afd/sprites/back-shiny/Mewtwo--Mega-Y.png rename to src/afd/sprites/back-shiny/150--420--Mewtwo--Mega-Y.png diff --git a/src/afd/sprites/back-shiny/Mew.png b/src/afd/sprites/back-shiny/151--0--Mew.png similarity index 100% rename from src/afd/sprites/back-shiny/Mew.png rename to src/afd/sprites/back-shiny/151--0--Mew.png diff --git a/src/afd/sprites/back-shiny/Chikorita.png b/src/afd/sprites/back-shiny/152--0--Chikorita.png similarity index 100% rename from src/afd/sprites/back-shiny/Chikorita.png rename to src/afd/sprites/back-shiny/152--0--Chikorita.png diff --git a/src/afd/sprites/back-shiny/Bayleef.png b/src/afd/sprites/back-shiny/153--0--Bayleef.png similarity index 100% rename from src/afd/sprites/back-shiny/Bayleef.png rename to src/afd/sprites/back-shiny/153--0--Bayleef.png diff --git a/src/afd/sprites/back-shiny/Meganium.png b/src/afd/sprites/back-shiny/154--0--Meganium.png similarity index 100% rename from src/afd/sprites/back-shiny/Meganium.png rename to src/afd/sprites/back-shiny/154--0--Meganium.png diff --git a/src/afd/sprites/back-shiny/Cyndaquil.png b/src/afd/sprites/back-shiny/155--0--Cyndaquil.png similarity index 100% rename from src/afd/sprites/back-shiny/Cyndaquil.png rename to src/afd/sprites/back-shiny/155--0--Cyndaquil.png diff --git a/src/afd/sprites/back-shiny/Quilava.png b/src/afd/sprites/back-shiny/156--0--Quilava.png similarity index 100% rename from src/afd/sprites/back-shiny/Quilava.png rename to src/afd/sprites/back-shiny/156--0--Quilava.png diff --git a/src/afd/sprites/back-shiny/Typhlosion.png b/src/afd/sprites/back-shiny/157--0--Typhlosion.png similarity index 100% rename from src/afd/sprites/back-shiny/Typhlosion.png rename to src/afd/sprites/back-shiny/157--0--Typhlosion.png diff --git a/src/afd/sprites/back-shiny/Totodile.png b/src/afd/sprites/back-shiny/158--0--Totodile.png similarity index 100% rename from src/afd/sprites/back-shiny/Totodile.png rename to src/afd/sprites/back-shiny/158--0--Totodile.png diff --git a/src/afd/sprites/back-shiny/Croconaw.png b/src/afd/sprites/back-shiny/159--0--Croconaw.png similarity index 100% rename from src/afd/sprites/back-shiny/Croconaw.png rename to src/afd/sprites/back-shiny/159--0--Croconaw.png diff --git a/src/afd/sprites/back-shiny/Colossoil.png b/src/afd/sprites/back-shiny/16--0--Colossoil.png similarity index 100% rename from src/afd/sprites/back-shiny/Colossoil.png rename to src/afd/sprites/back-shiny/16--0--Colossoil.png diff --git a/src/afd/sprites/back-shiny/Pidgey.png b/src/afd/sprites/back-shiny/16--0--Pidgey.png similarity index 100% rename from src/afd/sprites/back-shiny/Pidgey.png rename to src/afd/sprites/back-shiny/16--0--Pidgey.png diff --git a/src/afd/sprites/back-shiny/Feraligatr.png b/src/afd/sprites/back-shiny/160--0--Feraligatr.png similarity index 100% rename from src/afd/sprites/back-shiny/Feraligatr.png rename to src/afd/sprites/back-shiny/160--0--Feraligatr.png diff --git a/src/afd/sprites/back-shiny/Sentret.png b/src/afd/sprites/back-shiny/161--0--Sentret.png similarity index 100% rename from src/afd/sprites/back-shiny/Sentret.png rename to src/afd/sprites/back-shiny/161--0--Sentret.png diff --git a/src/afd/sprites/back-shiny/Furret.png b/src/afd/sprites/back-shiny/162--0--Furret.png similarity index 100% rename from src/afd/sprites/back-shiny/Furret.png rename to src/afd/sprites/back-shiny/162--0--Furret.png diff --git a/src/afd/sprites/back-shiny/Hoothoot.png b/src/afd/sprites/back-shiny/163--0--Hoothoot.png similarity index 100% rename from src/afd/sprites/back-shiny/Hoothoot.png rename to src/afd/sprites/back-shiny/163--0--Hoothoot.png diff --git a/src/afd/sprites/back-shiny/Noctowl.png b/src/afd/sprites/back-shiny/164--0--Noctowl.png similarity index 100% rename from src/afd/sprites/back-shiny/Noctowl.png rename to src/afd/sprites/back-shiny/164--0--Noctowl.png diff --git a/src/afd/sprites/back-shiny/Ledyba.png b/src/afd/sprites/back-shiny/165--0--Ledyba.png similarity index 100% rename from src/afd/sprites/back-shiny/Ledyba.png rename to src/afd/sprites/back-shiny/165--0--Ledyba.png diff --git a/src/afd/sprites/back-shiny/Ledian.png b/src/afd/sprites/back-shiny/166--0--Ledian.png similarity index 100% rename from src/afd/sprites/back-shiny/Ledian.png rename to src/afd/sprites/back-shiny/166--0--Ledian.png diff --git a/src/afd/sprites/back-shiny/Spinarak.png b/src/afd/sprites/back-shiny/167--0--Spinarak.png similarity index 100% rename from src/afd/sprites/back-shiny/Spinarak.png rename to src/afd/sprites/back-shiny/167--0--Spinarak.png diff --git a/src/afd/sprites/back-shiny/Ariados.png b/src/afd/sprites/back-shiny/168--0--Ariados.png similarity index 100% rename from src/afd/sprites/back-shiny/Ariados.png rename to src/afd/sprites/back-shiny/168--0--Ariados.png diff --git a/src/afd/sprites/back-shiny/Crobat.png b/src/afd/sprites/back-shiny/169--0--Crobat.png similarity index 100% rename from src/afd/sprites/back-shiny/Crobat.png rename to src/afd/sprites/back-shiny/169--0--Crobat.png diff --git a/src/afd/sprites/back-shiny/Krilowatt.png b/src/afd/sprites/back-shiny/17--0--Krilowatt.png similarity index 100% rename from src/afd/sprites/back-shiny/Krilowatt.png rename to src/afd/sprites/back-shiny/17--0--Krilowatt.png diff --git a/src/afd/sprites/back-shiny/Pidgeotto.png b/src/afd/sprites/back-shiny/17--0--Pidgeotto.png similarity index 100% rename from src/afd/sprites/back-shiny/Pidgeotto.png rename to src/afd/sprites/back-shiny/17--0--Pidgeotto.png diff --git a/src/afd/sprites/back-shiny/Chinchou.png b/src/afd/sprites/back-shiny/170--0--Chinchou.png similarity index 100% rename from src/afd/sprites/back-shiny/Chinchou.png rename to src/afd/sprites/back-shiny/170--0--Chinchou.png diff --git a/src/afd/sprites/back-shiny/Lanturn.png b/src/afd/sprites/back-shiny/171--0--Lanturn.png similarity index 100% rename from src/afd/sprites/back-shiny/Lanturn.png rename to src/afd/sprites/back-shiny/171--0--Lanturn.png diff --git a/src/afd/sprites/back-shiny/Pichu.png b/src/afd/sprites/back-shiny/172--0--Pichu.png similarity index 100% rename from src/afd/sprites/back-shiny/Pichu.png rename to src/afd/sprites/back-shiny/172--0--Pichu.png diff --git a/src/afd/sprites/back-shiny/Cleffa.png b/src/afd/sprites/back-shiny/173--0--Cleffa.png similarity index 100% rename from src/afd/sprites/back-shiny/Cleffa.png rename to src/afd/sprites/back-shiny/173--0--Cleffa.png diff --git a/src/afd/sprites/back-shiny/Igglybuff.png b/src/afd/sprites/back-shiny/174--0--Igglybuff.png similarity index 100% rename from src/afd/sprites/back-shiny/Igglybuff.png rename to src/afd/sprites/back-shiny/174--0--Igglybuff.png diff --git a/src/afd/sprites/back-shiny/Togepi.png b/src/afd/sprites/back-shiny/175--0--Togepi.png similarity index 100% rename from src/afd/sprites/back-shiny/Togepi.png rename to src/afd/sprites/back-shiny/175--0--Togepi.png diff --git a/src/afd/sprites/back-shiny/Togetic.png b/src/afd/sprites/back-shiny/176--0--Togetic.png similarity index 100% rename from src/afd/sprites/back-shiny/Togetic.png rename to src/afd/sprites/back-shiny/176--0--Togetic.png diff --git a/src/afd/sprites/back-shiny/Natu.png b/src/afd/sprites/back-shiny/177--0--Natu.png similarity index 100% rename from src/afd/sprites/back-shiny/Natu.png rename to src/afd/sprites/back-shiny/177--0--Natu.png diff --git a/src/afd/sprites/back-shiny/Xatu.png b/src/afd/sprites/back-shiny/178--0--Xatu.png similarity index 100% rename from src/afd/sprites/back-shiny/Xatu.png rename to src/afd/sprites/back-shiny/178--0--Xatu.png diff --git a/src/afd/sprites/back-shiny/Mareep.png b/src/afd/sprites/back-shiny/179--0--Mareep.png similarity index 100% rename from src/afd/sprites/back-shiny/Mareep.png rename to src/afd/sprites/back-shiny/179--0--Mareep.png diff --git a/src/afd/sprites/back-shiny/Pidgeot.png b/src/afd/sprites/back-shiny/18--0--Pidgeot.png similarity index 100% rename from src/afd/sprites/back-shiny/Pidgeot.png rename to src/afd/sprites/back-shiny/18--0--Pidgeot.png diff --git a/src/afd/sprites/back-shiny/Pidgeot--Mega.png b/src/afd/sprites/back-shiny/18--420--Pidgeot--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Pidgeot--Mega.png rename to src/afd/sprites/back-shiny/18--420--Pidgeot--Mega.png diff --git a/src/afd/sprites/back-shiny/Ampharos.png b/src/afd/sprites/back-shiny/181--0--Ampharos.png similarity index 100% rename from src/afd/sprites/back-shiny/Ampharos.png rename to src/afd/sprites/back-shiny/181--0--Ampharos.png diff --git a/src/afd/sprites/back-shiny/Ampharos--Mega.png b/src/afd/sprites/back-shiny/181--420--Ampharos--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Ampharos--Mega.png rename to src/afd/sprites/back-shiny/181--420--Ampharos--Mega.png diff --git a/src/afd/sprites/back-shiny/Bellossom.png b/src/afd/sprites/back-shiny/182--0--Bellossom.png similarity index 100% rename from src/afd/sprites/back-shiny/Bellossom.png rename to src/afd/sprites/back-shiny/182--0--Bellossom.png diff --git a/src/afd/sprites/back-shiny/Marill.png b/src/afd/sprites/back-shiny/183--0--Marill.png similarity index 100% rename from src/afd/sprites/back-shiny/Marill.png rename to src/afd/sprites/back-shiny/183--0--Marill.png diff --git a/src/afd/sprites/back-shiny/Azumarill.png b/src/afd/sprites/back-shiny/184--0--Azumarill.png similarity index 100% rename from src/afd/sprites/back-shiny/Azumarill.png rename to src/afd/sprites/back-shiny/184--0--Azumarill.png diff --git a/src/afd/sprites/back-shiny/Sudowoodo.png b/src/afd/sprites/back-shiny/185--0--Sudowoodo.png similarity index 100% rename from src/afd/sprites/back-shiny/Sudowoodo.png rename to src/afd/sprites/back-shiny/185--0--Sudowoodo.png diff --git a/src/afd/sprites/back-shiny/Politoed.png b/src/afd/sprites/back-shiny/186--0--Politoed.png similarity index 100% rename from src/afd/sprites/back-shiny/Politoed.png rename to src/afd/sprites/back-shiny/186--0--Politoed.png diff --git a/src/afd/sprites/back-shiny/Hoppip.png b/src/afd/sprites/back-shiny/187--0--Hoppip.png similarity index 100% rename from src/afd/sprites/back-shiny/Hoppip.png rename to src/afd/sprites/back-shiny/187--0--Hoppip.png diff --git a/src/afd/sprites/back-shiny/Skiploom.png b/src/afd/sprites/back-shiny/188--0--Skiploom.png similarity index 100% rename from src/afd/sprites/back-shiny/Skiploom.png rename to src/afd/sprites/back-shiny/188--0--Skiploom.png diff --git a/src/afd/sprites/back-shiny/Jumpluff.png b/src/afd/sprites/back-shiny/189--0--Jumpluff.png similarity index 100% rename from src/afd/sprites/back-shiny/Jumpluff.png rename to src/afd/sprites/back-shiny/189--0--Jumpluff.png diff --git a/src/afd/sprites/back-shiny/Rattata.png b/src/afd/sprites/back-shiny/19--0--Rattata.png similarity index 100% rename from src/afd/sprites/back-shiny/Rattata.png rename to src/afd/sprites/back-shiny/19--0--Rattata.png diff --git a/src/afd/sprites/back-shiny/Voodoom.png b/src/afd/sprites/back-shiny/19--0--Voodoom.png similarity index 100% rename from src/afd/sprites/back-shiny/Voodoom.png rename to src/afd/sprites/back-shiny/19--0--Voodoom.png diff --git a/src/afd/sprites/back-shiny/Rattata--Alola.png b/src/afd/sprites/back-shiny/19--420--Rattata--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Rattata--Alola.png rename to src/afd/sprites/back-shiny/19--420--Rattata--Alola.png diff --git a/src/afd/sprites/back-shiny/Aipom.png b/src/afd/sprites/back-shiny/190--0--Aipom.png similarity index 100% rename from src/afd/sprites/back-shiny/Aipom.png rename to src/afd/sprites/back-shiny/190--0--Aipom.png diff --git a/src/afd/sprites/back-shiny/Sunkern.png b/src/afd/sprites/back-shiny/191--0--Sunkern.png similarity index 100% rename from src/afd/sprites/back-shiny/Sunkern.png rename to src/afd/sprites/back-shiny/191--0--Sunkern.png diff --git a/src/afd/sprites/back-shiny/Sunflora.png b/src/afd/sprites/back-shiny/192--0--Sunflora.png similarity index 100% rename from src/afd/sprites/back-shiny/Sunflora.png rename to src/afd/sprites/back-shiny/192--0--Sunflora.png diff --git a/src/afd/sprites/back-shiny/Yanma.png b/src/afd/sprites/back-shiny/193--0--Yanma.png similarity index 100% rename from src/afd/sprites/back-shiny/Yanma.png rename to src/afd/sprites/back-shiny/193--0--Yanma.png diff --git a/src/afd/sprites/back-shiny/Wooper.png b/src/afd/sprites/back-shiny/194--0--Wooper.png similarity index 100% rename from src/afd/sprites/back-shiny/Wooper.png rename to src/afd/sprites/back-shiny/194--0--Wooper.png diff --git a/src/afd/sprites/back-shiny/Quagsire.png b/src/afd/sprites/back-shiny/195--0--Quagsire.png similarity index 100% rename from src/afd/sprites/back-shiny/Quagsire.png rename to src/afd/sprites/back-shiny/195--0--Quagsire.png diff --git a/src/afd/sprites/back-shiny/Espeon.png b/src/afd/sprites/back-shiny/196--0--Espeon.png similarity index 100% rename from src/afd/sprites/back-shiny/Espeon.png rename to src/afd/sprites/back-shiny/196--0--Espeon.png diff --git a/src/afd/sprites/back-shiny/Umbreon.png b/src/afd/sprites/back-shiny/197--0--Umbreon.png similarity index 100% rename from src/afd/sprites/back-shiny/Umbreon.png rename to src/afd/sprites/back-shiny/197--0--Umbreon.png diff --git a/src/afd/sprites/back-shiny/Murkrow.png b/src/afd/sprites/back-shiny/198--0--Murkrow.png similarity index 100% rename from src/afd/sprites/back-shiny/Murkrow.png rename to src/afd/sprites/back-shiny/198--0--Murkrow.png diff --git a/src/afd/sprites/back-shiny/Slowking.png b/src/afd/sprites/back-shiny/199--0--Slowking.png similarity index 100% rename from src/afd/sprites/back-shiny/Slowking.png rename to src/afd/sprites/back-shiny/199--0--Slowking.png diff --git a/src/afd/sprites/back-shiny/Ivysaur.png b/src/afd/sprites/back-shiny/2--0--Ivysaur.png similarity index 100% rename from src/afd/sprites/back-shiny/Ivysaur.png rename to src/afd/sprites/back-shiny/2--0--Ivysaur.png diff --git a/src/afd/sprites/back-shiny/Syclant.png b/src/afd/sprites/back-shiny/2--0--Syclant.png similarity index 100% rename from src/afd/sprites/back-shiny/Syclant.png rename to src/afd/sprites/back-shiny/2--0--Syclant.png diff --git a/src/afd/sprites/back-shiny/Raticate.png b/src/afd/sprites/back-shiny/20--0--Raticate.png similarity index 100% rename from src/afd/sprites/back-shiny/Raticate.png rename to src/afd/sprites/back-shiny/20--0--Raticate.png diff --git a/src/afd/sprites/back-shiny/Raticate--Alola.png b/src/afd/sprites/back-shiny/20--420--Raticate--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Raticate--Alola.png rename to src/afd/sprites/back-shiny/20--420--Raticate--Alola.png diff --git a/src/afd/sprites/back-shiny/Misdreavus.png b/src/afd/sprites/back-shiny/200--0--Misdreavus.png similarity index 100% rename from src/afd/sprites/back-shiny/Misdreavus.png rename to src/afd/sprites/back-shiny/200--0--Misdreavus.png diff --git a/src/afd/sprites/back-shiny/Unown.png b/src/afd/sprites/back-shiny/201--0--Unown.png similarity index 100% rename from src/afd/sprites/back-shiny/Unown.png rename to src/afd/sprites/back-shiny/201--0--Unown.png diff --git a/src/afd/sprites/back-shiny/Wobbuffet.png b/src/afd/sprites/back-shiny/202--0--Wobbuffet.png similarity index 100% rename from src/afd/sprites/back-shiny/Wobbuffet.png rename to src/afd/sprites/back-shiny/202--0--Wobbuffet.png diff --git a/src/afd/sprites/back-shiny/Girafarig.png b/src/afd/sprites/back-shiny/203--0--Girafarig.png similarity index 100% rename from src/afd/sprites/back-shiny/Girafarig.png rename to src/afd/sprites/back-shiny/203--0--Girafarig.png diff --git a/src/afd/sprites/back-shiny/Pineco.png b/src/afd/sprites/back-shiny/204--0--Pineco.png similarity index 100% rename from src/afd/sprites/back-shiny/Pineco.png rename to src/afd/sprites/back-shiny/204--0--Pineco.png diff --git a/src/afd/sprites/back-shiny/Forretress.png b/src/afd/sprites/back-shiny/205--0--Forretress.png similarity index 100% rename from src/afd/sprites/back-shiny/Forretress.png rename to src/afd/sprites/back-shiny/205--0--Forretress.png diff --git a/src/afd/sprites/back-shiny/Dunsparce.png b/src/afd/sprites/back-shiny/206--0--Dunsparce.png similarity index 100% rename from src/afd/sprites/back-shiny/Dunsparce.png rename to src/afd/sprites/back-shiny/206--0--Dunsparce.png diff --git a/src/afd/sprites/back-shiny/Gligar.png b/src/afd/sprites/back-shiny/207--0--Gligar.png similarity index 100% rename from src/afd/sprites/back-shiny/Gligar.png rename to src/afd/sprites/back-shiny/207--0--Gligar.png diff --git a/src/afd/sprites/back-shiny/Steelix.png b/src/afd/sprites/back-shiny/208--0--Steelix.png similarity index 100% rename from src/afd/sprites/back-shiny/Steelix.png rename to src/afd/sprites/back-shiny/208--0--Steelix.png diff --git a/src/afd/sprites/back-shiny/Steelix--Mega.png b/src/afd/sprites/back-shiny/208--420--Steelix--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Steelix--Mega.png rename to src/afd/sprites/back-shiny/208--420--Steelix--Mega.png diff --git a/src/afd/sprites/back-shiny/Snubbull.png b/src/afd/sprites/back-shiny/209--0--Snubbull.png similarity index 100% rename from src/afd/sprites/back-shiny/Snubbull.png rename to src/afd/sprites/back-shiny/209--0--Snubbull.png diff --git a/src/afd/sprites/back-shiny/Spearow.png b/src/afd/sprites/back-shiny/21--0--Spearow.png similarity index 100% rename from src/afd/sprites/back-shiny/Spearow.png rename to src/afd/sprites/back-shiny/21--0--Spearow.png diff --git a/src/afd/sprites/back-shiny/Tomohawk.png b/src/afd/sprites/back-shiny/21--0--Tomohawk.png similarity index 100% rename from src/afd/sprites/back-shiny/Tomohawk.png rename to src/afd/sprites/back-shiny/21--0--Tomohawk.png diff --git a/src/afd/sprites/back-shiny/Granbull.png b/src/afd/sprites/back-shiny/210--0--Granbull.png similarity index 100% rename from src/afd/sprites/back-shiny/Granbull.png rename to src/afd/sprites/back-shiny/210--0--Granbull.png diff --git a/src/afd/sprites/back-shiny/Qwilfish.png b/src/afd/sprites/back-shiny/211--0--Qwilfish.png similarity index 100% rename from src/afd/sprites/back-shiny/Qwilfish.png rename to src/afd/sprites/back-shiny/211--0--Qwilfish.png diff --git a/src/afd/sprites/back-shiny/Scizor.png b/src/afd/sprites/back-shiny/212--0--Scizor.png similarity index 100% rename from src/afd/sprites/back-shiny/Scizor.png rename to src/afd/sprites/back-shiny/212--0--Scizor.png diff --git a/src/afd/sprites/back-shiny/Scizor--Mega.png b/src/afd/sprites/back-shiny/212--420--Scizor--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Scizor--Mega.png rename to src/afd/sprites/back-shiny/212--420--Scizor--Mega.png diff --git a/src/afd/sprites/back-shiny/Shuckle.png b/src/afd/sprites/back-shiny/213--0--Shuckle.png similarity index 100% rename from src/afd/sprites/back-shiny/Shuckle.png rename to src/afd/sprites/back-shiny/213--0--Shuckle.png diff --git a/src/afd/sprites/back-shiny/Heracross.png b/src/afd/sprites/back-shiny/214--0--Heracross.png similarity index 100% rename from src/afd/sprites/back-shiny/Heracross.png rename to src/afd/sprites/back-shiny/214--0--Heracross.png diff --git a/src/afd/sprites/back-shiny/Heracross--Mega.png b/src/afd/sprites/back-shiny/214--420--Heracross--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Heracross--Mega.png rename to src/afd/sprites/back-shiny/214--420--Heracross--Mega.png diff --git a/src/afd/sprites/back-shiny/Sneasel.png b/src/afd/sprites/back-shiny/215--0--Sneasel.png similarity index 100% rename from src/afd/sprites/back-shiny/Sneasel.png rename to src/afd/sprites/back-shiny/215--0--Sneasel.png diff --git a/src/afd/sprites/back-shiny/Teddiursa.png b/src/afd/sprites/back-shiny/216--0--Teddiursa.png similarity index 100% rename from src/afd/sprites/back-shiny/Teddiursa.png rename to src/afd/sprites/back-shiny/216--0--Teddiursa.png diff --git a/src/afd/sprites/back-shiny/Ursaring.png b/src/afd/sprites/back-shiny/217--0--Ursaring.png similarity index 100% rename from src/afd/sprites/back-shiny/Ursaring.png rename to src/afd/sprites/back-shiny/217--0--Ursaring.png diff --git a/src/afd/sprites/back-shiny/Slugma.png b/src/afd/sprites/back-shiny/218--0--Slugma.png similarity index 100% rename from src/afd/sprites/back-shiny/Slugma.png rename to src/afd/sprites/back-shiny/218--0--Slugma.png diff --git a/src/afd/sprites/back-shiny/Magcargo.png b/src/afd/sprites/back-shiny/219--0--Magcargo.png similarity index 100% rename from src/afd/sprites/back-shiny/Magcargo.png rename to src/afd/sprites/back-shiny/219--0--Magcargo.png diff --git a/src/afd/sprites/back-shiny/Fearow.png b/src/afd/sprites/back-shiny/22--0--Fearow.png similarity index 100% rename from src/afd/sprites/back-shiny/Fearow.png rename to src/afd/sprites/back-shiny/22--0--Fearow.png diff --git a/src/afd/sprites/back-shiny/Swinub.png b/src/afd/sprites/back-shiny/220--0--Swinub.png similarity index 100% rename from src/afd/sprites/back-shiny/Swinub.png rename to src/afd/sprites/back-shiny/220--0--Swinub.png diff --git a/src/afd/sprites/back-shiny/Piloswine.png b/src/afd/sprites/back-shiny/221--0--Piloswine.png similarity index 100% rename from src/afd/sprites/back-shiny/Piloswine.png rename to src/afd/sprites/back-shiny/221--0--Piloswine.png diff --git a/src/afd/sprites/back-shiny/Corsola.png b/src/afd/sprites/back-shiny/222--0--Corsola.png similarity index 100% rename from src/afd/sprites/back-shiny/Corsola.png rename to src/afd/sprites/back-shiny/222--0--Corsola.png diff --git a/src/afd/sprites/back-shiny/Corsola--Galar.png b/src/afd/sprites/back-shiny/222--420--Corsola--Galar.png similarity index 100% rename from src/afd/sprites/back-shiny/Corsola--Galar.png rename to src/afd/sprites/back-shiny/222--420--Corsola--Galar.png diff --git a/src/afd/sprites/back-shiny/Remoraid.png b/src/afd/sprites/back-shiny/223--0--Remoraid.png similarity index 100% rename from src/afd/sprites/back-shiny/Remoraid.png rename to src/afd/sprites/back-shiny/223--0--Remoraid.png diff --git a/src/afd/sprites/back-shiny/Octillery.png b/src/afd/sprites/back-shiny/224--0--Octillery.png similarity index 100% rename from src/afd/sprites/back-shiny/Octillery.png rename to src/afd/sprites/back-shiny/224--0--Octillery.png diff --git a/src/afd/sprites/back-shiny/Delibird.png b/src/afd/sprites/back-shiny/225--0--Delibird.png similarity index 100% rename from src/afd/sprites/back-shiny/Delibird.png rename to src/afd/sprites/back-shiny/225--0--Delibird.png diff --git a/src/afd/sprites/back-shiny/Mantine.png b/src/afd/sprites/back-shiny/226--0--Mantine.png similarity index 100% rename from src/afd/sprites/back-shiny/Mantine.png rename to src/afd/sprites/back-shiny/226--0--Mantine.png diff --git a/src/afd/sprites/back-shiny/Skarmory.png b/src/afd/sprites/back-shiny/227--0--Skarmory.png similarity index 100% rename from src/afd/sprites/back-shiny/Skarmory.png rename to src/afd/sprites/back-shiny/227--0--Skarmory.png diff --git a/src/afd/sprites/back-shiny/Houndour.png b/src/afd/sprites/back-shiny/228--0--Houndour.png similarity index 100% rename from src/afd/sprites/back-shiny/Houndour.png rename to src/afd/sprites/back-shiny/228--0--Houndour.png diff --git a/src/afd/sprites/back-shiny/Houndoom.png b/src/afd/sprites/back-shiny/229--0--Houndoom.png similarity index 100% rename from src/afd/sprites/back-shiny/Houndoom.png rename to src/afd/sprites/back-shiny/229--0--Houndoom.png diff --git a/src/afd/sprites/back-shiny/Houndoom--Mega.png b/src/afd/sprites/back-shiny/229--420--Houndoom--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Houndoom--Mega.png rename to src/afd/sprites/back-shiny/229--420--Houndoom--Mega.png diff --git a/src/afd/sprites/back-shiny/Ekans.png b/src/afd/sprites/back-shiny/23--0--Ekans.png similarity index 100% rename from src/afd/sprites/back-shiny/Ekans.png rename to src/afd/sprites/back-shiny/23--0--Ekans.png diff --git a/src/afd/sprites/back-shiny/Necturna.png b/src/afd/sprites/back-shiny/23--0--Necturna.png similarity index 100% rename from src/afd/sprites/back-shiny/Necturna.png rename to src/afd/sprites/back-shiny/23--0--Necturna.png diff --git a/src/afd/sprites/back-shiny/Phanpy.png b/src/afd/sprites/back-shiny/231--0--Phanpy.png similarity index 100% rename from src/afd/sprites/back-shiny/Phanpy.png rename to src/afd/sprites/back-shiny/231--0--Phanpy.png diff --git a/src/afd/sprites/back-shiny/Donphan.png b/src/afd/sprites/back-shiny/232--0--Donphan.png similarity index 100% rename from src/afd/sprites/back-shiny/Donphan.png rename to src/afd/sprites/back-shiny/232--0--Donphan.png diff --git a/src/afd/sprites/back-shiny/Porygon2.png b/src/afd/sprites/back-shiny/233--0--Porygon2.png similarity index 100% rename from src/afd/sprites/back-shiny/Porygon2.png rename to src/afd/sprites/back-shiny/233--0--Porygon2.png diff --git a/src/afd/sprites/back-shiny/Stantler.png b/src/afd/sprites/back-shiny/234--0--Stantler.png similarity index 100% rename from src/afd/sprites/back-shiny/Stantler.png rename to src/afd/sprites/back-shiny/234--0--Stantler.png diff --git a/src/afd/sprites/back-shiny/Smeargle.png b/src/afd/sprites/back-shiny/235--0--Smeargle.png similarity index 100% rename from src/afd/sprites/back-shiny/Smeargle.png rename to src/afd/sprites/back-shiny/235--0--Smeargle.png diff --git a/src/afd/sprites/back-shiny/Tyrogue.png b/src/afd/sprites/back-shiny/236--0--Tyrogue.png similarity index 100% rename from src/afd/sprites/back-shiny/Tyrogue.png rename to src/afd/sprites/back-shiny/236--0--Tyrogue.png diff --git a/src/afd/sprites/back-shiny/Hitmontop.png b/src/afd/sprites/back-shiny/237--0--Hitmontop.png similarity index 100% rename from src/afd/sprites/back-shiny/Hitmontop.png rename to src/afd/sprites/back-shiny/237--0--Hitmontop.png diff --git a/src/afd/sprites/back-shiny/Smoochum.png b/src/afd/sprites/back-shiny/238--0--Smoochum.png similarity index 100% rename from src/afd/sprites/back-shiny/Smoochum.png rename to src/afd/sprites/back-shiny/238--0--Smoochum.png diff --git a/src/afd/sprites/back-shiny/Elekid.png b/src/afd/sprites/back-shiny/239--0--Elekid.png similarity index 100% rename from src/afd/sprites/back-shiny/Elekid.png rename to src/afd/sprites/back-shiny/239--0--Elekid.png diff --git a/src/afd/sprites/back-shiny/Arbok.png b/src/afd/sprites/back-shiny/24--0--Arbok.png similarity index 100% rename from src/afd/sprites/back-shiny/Arbok.png rename to src/afd/sprites/back-shiny/24--0--Arbok.png diff --git a/src/afd/sprites/back-shiny/Mollux.png b/src/afd/sprites/back-shiny/24--0--Mollux.png similarity index 100% rename from src/afd/sprites/back-shiny/Mollux.png rename to src/afd/sprites/back-shiny/24--0--Mollux.png diff --git a/src/afd/sprites/back-shiny/Magby.png b/src/afd/sprites/back-shiny/240--0--Magby.png similarity index 100% rename from src/afd/sprites/back-shiny/Magby.png rename to src/afd/sprites/back-shiny/240--0--Magby.png diff --git a/src/afd/sprites/back-shiny/Miltank.png b/src/afd/sprites/back-shiny/241--0--Miltank.png similarity index 100% rename from src/afd/sprites/back-shiny/Miltank.png rename to src/afd/sprites/back-shiny/241--0--Miltank.png diff --git a/src/afd/sprites/back-shiny/Blissey.png b/src/afd/sprites/back-shiny/242--0--Blissey.png similarity index 100% rename from src/afd/sprites/back-shiny/Blissey.png rename to src/afd/sprites/back-shiny/242--0--Blissey.png diff --git a/src/afd/sprites/back-shiny/Raikou.png b/src/afd/sprites/back-shiny/243--0--Raikou.png similarity index 100% rename from src/afd/sprites/back-shiny/Raikou.png rename to src/afd/sprites/back-shiny/243--0--Raikou.png diff --git a/src/afd/sprites/back-shiny/Entei.png b/src/afd/sprites/back-shiny/244--0--Entei.png similarity index 100% rename from src/afd/sprites/back-shiny/Entei.png rename to src/afd/sprites/back-shiny/244--0--Entei.png diff --git a/src/afd/sprites/back-shiny/Suicune.png b/src/afd/sprites/back-shiny/245--0--Suicune.png similarity index 100% rename from src/afd/sprites/back-shiny/Suicune.png rename to src/afd/sprites/back-shiny/245--0--Suicune.png diff --git a/src/afd/sprites/back-shiny/Larvitar.png b/src/afd/sprites/back-shiny/246--0--Larvitar.png similarity index 100% rename from src/afd/sprites/back-shiny/Larvitar.png rename to src/afd/sprites/back-shiny/246--0--Larvitar.png diff --git a/src/afd/sprites/back-shiny/Pupitar.png b/src/afd/sprites/back-shiny/247--0--Pupitar.png similarity index 100% rename from src/afd/sprites/back-shiny/Pupitar.png rename to src/afd/sprites/back-shiny/247--0--Pupitar.png diff --git a/src/afd/sprites/back-shiny/Tyranitar.png b/src/afd/sprites/back-shiny/248--0--Tyranitar.png similarity index 100% rename from src/afd/sprites/back-shiny/Tyranitar.png rename to src/afd/sprites/back-shiny/248--0--Tyranitar.png diff --git a/src/afd/sprites/back-shiny/Tyranitar--Mega.png b/src/afd/sprites/back-shiny/248--420--Tyranitar--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Tyranitar--Mega.png rename to src/afd/sprites/back-shiny/248--420--Tyranitar--Mega.png diff --git a/src/afd/sprites/back-shiny/Lugia.png b/src/afd/sprites/back-shiny/249--0--Lugia.png similarity index 100% rename from src/afd/sprites/back-shiny/Lugia.png rename to src/afd/sprites/back-shiny/249--0--Lugia.png diff --git a/src/afd/sprites/back-shiny/Pikachu.png b/src/afd/sprites/back-shiny/25--0--Pikachu.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu.png rename to src/afd/sprites/back-shiny/25--0--Pikachu.png diff --git a/src/afd/sprites/back-shiny/Pikachu--Alola.png b/src/afd/sprites/back-shiny/25--420--Pikachu--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu--Alola.png rename to src/afd/sprites/back-shiny/25--420--Pikachu--Alola.png diff --git a/src/afd/sprites/back-shiny/Pikachu--Belle.png b/src/afd/sprites/back-shiny/25--420--Pikachu--Belle.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu--Belle.png rename to src/afd/sprites/back-shiny/25--420--Pikachu--Belle.png diff --git a/src/afd/sprites/back-shiny/Pikachu--Gmax.png b/src/afd/sprites/back-shiny/25--420--Pikachu--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu--Gmax.png rename to src/afd/sprites/back-shiny/25--420--Pikachu--Gmax.png diff --git a/src/afd/sprites/back-shiny/Pikachu--Hoenn.png b/src/afd/sprites/back-shiny/25--420--Pikachu--Hoenn.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu--Hoenn.png rename to src/afd/sprites/back-shiny/25--420--Pikachu--Hoenn.png diff --git a/src/afd/sprites/back-shiny/Pikachu--Kalos.png b/src/afd/sprites/back-shiny/25--420--Pikachu--Kalos.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu--Kalos.png rename to src/afd/sprites/back-shiny/25--420--Pikachu--Kalos.png diff --git a/src/afd/sprites/back-shiny/Pikachu--Libre.png b/src/afd/sprites/back-shiny/25--420--Pikachu--Libre.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu--Libre.png rename to src/afd/sprites/back-shiny/25--420--Pikachu--Libre.png diff --git a/src/afd/sprites/back-shiny/Pikachu--Original.png b/src/afd/sprites/back-shiny/25--420--Pikachu--Original.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu--Original.png rename to src/afd/sprites/back-shiny/25--420--Pikachu--Original.png diff --git a/src/afd/sprites/back-shiny/Pikachu--Partner.png b/src/afd/sprites/back-shiny/25--420--Pikachu--Partner.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu--Partner.png rename to src/afd/sprites/back-shiny/25--420--Pikachu--Partner.png diff --git a/src/afd/sprites/back-shiny/Pikachu--PhD.png b/src/afd/sprites/back-shiny/25--420--Pikachu--PhD.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu--PhD.png rename to src/afd/sprites/back-shiny/25--420--Pikachu--PhD.png diff --git a/src/afd/sprites/back-shiny/Pikachu--Pop-Star.png b/src/afd/sprites/back-shiny/25--420--Pikachu--Pop-Star.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu--Pop-Star.png rename to src/afd/sprites/back-shiny/25--420--Pikachu--Pop-Star.png diff --git a/src/afd/sprites/back-shiny/Pikachu--Rock-Star.png b/src/afd/sprites/back-shiny/25--420--Pikachu--Rock-Star.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu--Rock-Star.png rename to src/afd/sprites/back-shiny/25--420--Pikachu--Rock-Star.png diff --git a/src/afd/sprites/back-shiny/Pikachu--Sinnoh.png b/src/afd/sprites/back-shiny/25--420--Pikachu--Sinnoh.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu--Sinnoh.png rename to src/afd/sprites/back-shiny/25--420--Pikachu--Sinnoh.png diff --git a/src/afd/sprites/back-shiny/Pikachu--Starter.png b/src/afd/sprites/back-shiny/25--420--Pikachu--Starter.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu--Starter.png rename to src/afd/sprites/back-shiny/25--420--Pikachu--Starter.png diff --git a/src/afd/sprites/back-shiny/Pikachu--Unova.png b/src/afd/sprites/back-shiny/25--420--Pikachu--Unova.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikachu--Unova.png rename to src/afd/sprites/back-shiny/25--420--Pikachu--Unova.png diff --git a/src/afd/sprites/back-shiny/Ho-Oh.png b/src/afd/sprites/back-shiny/250--0--Ho-Oh.png similarity index 100% rename from src/afd/sprites/back-shiny/Ho-Oh.png rename to src/afd/sprites/back-shiny/250--0--Ho-Oh.png diff --git a/src/afd/sprites/back-shiny/Celebi.gif b/src/afd/sprites/back-shiny/251--0--Celebi.gif similarity index 100% rename from src/afd/sprites/back-shiny/Celebi.gif rename to src/afd/sprites/back-shiny/251--0--Celebi.gif diff --git a/src/afd/sprites/back-shiny/Treecko.png b/src/afd/sprites/back-shiny/252--0--Treecko.png similarity index 100% rename from src/afd/sprites/back-shiny/Treecko.png rename to src/afd/sprites/back-shiny/252--0--Treecko.png diff --git a/src/afd/sprites/back-shiny/Grovyle.png b/src/afd/sprites/back-shiny/253--0--Grovyle.png similarity index 100% rename from src/afd/sprites/back-shiny/Grovyle.png rename to src/afd/sprites/back-shiny/253--0--Grovyle.png diff --git a/src/afd/sprites/back-shiny/Sceptile.png b/src/afd/sprites/back-shiny/254--0--Sceptile.png similarity index 100% rename from src/afd/sprites/back-shiny/Sceptile.png rename to src/afd/sprites/back-shiny/254--0--Sceptile.png diff --git a/src/afd/sprites/back-shiny/Sceptile--Mega.png b/src/afd/sprites/back-shiny/254--420--Sceptile--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Sceptile--Mega.png rename to src/afd/sprites/back-shiny/254--420--Sceptile--Mega.png diff --git a/src/afd/sprites/back-shiny/Torchic.png b/src/afd/sprites/back-shiny/255--0--Torchic.png similarity index 100% rename from src/afd/sprites/back-shiny/Torchic.png rename to src/afd/sprites/back-shiny/255--0--Torchic.png diff --git a/src/afd/sprites/back-shiny/Combusken.png b/src/afd/sprites/back-shiny/256--0--Combusken.png similarity index 100% rename from src/afd/sprites/back-shiny/Combusken.png rename to src/afd/sprites/back-shiny/256--0--Combusken.png diff --git a/src/afd/sprites/back-shiny/Blaziken.png b/src/afd/sprites/back-shiny/257--0--Blaziken.png similarity index 100% rename from src/afd/sprites/back-shiny/Blaziken.png rename to src/afd/sprites/back-shiny/257--0--Blaziken.png diff --git a/src/afd/sprites/back-shiny/Blaziken--Mega.png b/src/afd/sprites/back-shiny/257--420--Blaziken--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Blaziken--Mega.png rename to src/afd/sprites/back-shiny/257--420--Blaziken--Mega.png diff --git a/src/afd/sprites/back-shiny/Mudkip.png b/src/afd/sprites/back-shiny/258--0--Mudkip.png similarity index 100% rename from src/afd/sprites/back-shiny/Mudkip.png rename to src/afd/sprites/back-shiny/258--0--Mudkip.png diff --git a/src/afd/sprites/back-shiny/Marshtomp.png b/src/afd/sprites/back-shiny/259--0--Marshtomp.png similarity index 100% rename from src/afd/sprites/back-shiny/Marshtomp.png rename to src/afd/sprites/back-shiny/259--0--Marshtomp.png diff --git a/src/afd/sprites/back-shiny/Raichu.png b/src/afd/sprites/back-shiny/26--0--Raichu.png similarity index 100% rename from src/afd/sprites/back-shiny/Raichu.png rename to src/afd/sprites/back-shiny/26--0--Raichu.png diff --git a/src/afd/sprites/back-shiny/Raichu--Alola.png b/src/afd/sprites/back-shiny/26--420--Raichu--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Raichu--Alola.png rename to src/afd/sprites/back-shiny/26--420--Raichu--Alola.png diff --git a/src/afd/sprites/back-shiny/Swampert.png b/src/afd/sprites/back-shiny/260--0--Swampert.png similarity index 100% rename from src/afd/sprites/back-shiny/Swampert.png rename to src/afd/sprites/back-shiny/260--0--Swampert.png diff --git a/src/afd/sprites/back-shiny/Swampert--Mega.png b/src/afd/sprites/back-shiny/260--420--Swampert--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Swampert--Mega.png rename to src/afd/sprites/back-shiny/260--420--Swampert--Mega.png diff --git a/src/afd/sprites/back-shiny/Poochyena.png b/src/afd/sprites/back-shiny/261--0--Poochyena.png similarity index 100% rename from src/afd/sprites/back-shiny/Poochyena.png rename to src/afd/sprites/back-shiny/261--0--Poochyena.png diff --git a/src/afd/sprites/back-shiny/Mightyena.png b/src/afd/sprites/back-shiny/262--0--Mightyena.png similarity index 100% rename from src/afd/sprites/back-shiny/Mightyena.png rename to src/afd/sprites/back-shiny/262--0--Mightyena.png diff --git a/src/afd/sprites/back-shiny/Zigzagoon.png b/src/afd/sprites/back-shiny/263--0--Zigzagoon.png similarity index 100% rename from src/afd/sprites/back-shiny/Zigzagoon.png rename to src/afd/sprites/back-shiny/263--0--Zigzagoon.png diff --git a/src/afd/sprites/back-shiny/Zigzagoon--Galar.png b/src/afd/sprites/back-shiny/263--420--Zigzagoon--Galar.png similarity index 100% rename from src/afd/sprites/back-shiny/Zigzagoon--Galar.png rename to src/afd/sprites/back-shiny/263--420--Zigzagoon--Galar.png diff --git a/src/afd/sprites/back-shiny/Linoone.png b/src/afd/sprites/back-shiny/264--0--Linoone.png similarity index 100% rename from src/afd/sprites/back-shiny/Linoone.png rename to src/afd/sprites/back-shiny/264--0--Linoone.png diff --git a/src/afd/sprites/back-shiny/Linoone--Galar.png b/src/afd/sprites/back-shiny/264--420--Linoone--Galar.png similarity index 100% rename from src/afd/sprites/back-shiny/Linoone--Galar.png rename to src/afd/sprites/back-shiny/264--420--Linoone--Galar.png diff --git a/src/afd/sprites/back-shiny/Wurmple.png b/src/afd/sprites/back-shiny/265--0--Wurmple.png similarity index 100% rename from src/afd/sprites/back-shiny/Wurmple.png rename to src/afd/sprites/back-shiny/265--0--Wurmple.png diff --git a/src/afd/sprites/back-shiny/Silcoon.png b/src/afd/sprites/back-shiny/266--0--Silcoon.png similarity index 100% rename from src/afd/sprites/back-shiny/Silcoon.png rename to src/afd/sprites/back-shiny/266--0--Silcoon.png diff --git a/src/afd/sprites/back-shiny/Beautifly.png b/src/afd/sprites/back-shiny/267--0--Beautifly.png similarity index 100% rename from src/afd/sprites/back-shiny/Beautifly.png rename to src/afd/sprites/back-shiny/267--0--Beautifly.png diff --git a/src/afd/sprites/back-shiny/Cascoon.png b/src/afd/sprites/back-shiny/268--0--Cascoon.png similarity index 100% rename from src/afd/sprites/back-shiny/Cascoon.png rename to src/afd/sprites/back-shiny/268--0--Cascoon.png diff --git a/src/afd/sprites/back-shiny/Dustox.png b/src/afd/sprites/back-shiny/269--0--Dustox.png similarity index 100% rename from src/afd/sprites/back-shiny/Dustox.png rename to src/afd/sprites/back-shiny/269--0--Dustox.png diff --git a/src/afd/sprites/back-shiny/Aurumoth.png b/src/afd/sprites/back-shiny/27--0--Aurumoth.png similarity index 100% rename from src/afd/sprites/back-shiny/Aurumoth.png rename to src/afd/sprites/back-shiny/27--0--Aurumoth.png diff --git a/src/afd/sprites/back-shiny/Sandshrew.png b/src/afd/sprites/back-shiny/27--0--Sandshrew.png similarity index 100% rename from src/afd/sprites/back-shiny/Sandshrew.png rename to src/afd/sprites/back-shiny/27--0--Sandshrew.png diff --git a/src/afd/sprites/back-shiny/Sandshrew--Alola.png b/src/afd/sprites/back-shiny/27--420--Sandshrew--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Sandshrew--Alola.png rename to src/afd/sprites/back-shiny/27--420--Sandshrew--Alola.png diff --git a/src/afd/sprites/back-shiny/Lotad.png b/src/afd/sprites/back-shiny/270--0--Lotad.png similarity index 100% rename from src/afd/sprites/back-shiny/Lotad.png rename to src/afd/sprites/back-shiny/270--0--Lotad.png diff --git a/src/afd/sprites/back-shiny/Lombre.png b/src/afd/sprites/back-shiny/271--0--Lombre.png similarity index 100% rename from src/afd/sprites/back-shiny/Lombre.png rename to src/afd/sprites/back-shiny/271--0--Lombre.png diff --git a/src/afd/sprites/back-shiny/Ludicolo.png b/src/afd/sprites/back-shiny/272--0--Ludicolo.png similarity index 100% rename from src/afd/sprites/back-shiny/Ludicolo.png rename to src/afd/sprites/back-shiny/272--0--Ludicolo.png diff --git a/src/afd/sprites/back-shiny/Seedot.png b/src/afd/sprites/back-shiny/273--0--Seedot.png similarity index 100% rename from src/afd/sprites/back-shiny/Seedot.png rename to src/afd/sprites/back-shiny/273--0--Seedot.png diff --git a/src/afd/sprites/back-shiny/Nuzleaf.png b/src/afd/sprites/back-shiny/274--0--Nuzleaf.png similarity index 100% rename from src/afd/sprites/back-shiny/Nuzleaf.png rename to src/afd/sprites/back-shiny/274--0--Nuzleaf.png diff --git a/src/afd/sprites/back-shiny/Shiftry.png b/src/afd/sprites/back-shiny/275--0--Shiftry.png similarity index 100% rename from src/afd/sprites/back-shiny/Shiftry.png rename to src/afd/sprites/back-shiny/275--0--Shiftry.png diff --git a/src/afd/sprites/back-shiny/Taillow.png b/src/afd/sprites/back-shiny/276--0--Taillow.png similarity index 100% rename from src/afd/sprites/back-shiny/Taillow.png rename to src/afd/sprites/back-shiny/276--0--Taillow.png diff --git a/src/afd/sprites/back-shiny/Swellow.png b/src/afd/sprites/back-shiny/277--0--Swellow.png similarity index 100% rename from src/afd/sprites/back-shiny/Swellow.png rename to src/afd/sprites/back-shiny/277--0--Swellow.png diff --git a/src/afd/sprites/back-shiny/Wingull.png b/src/afd/sprites/back-shiny/278--0--Wingull.png similarity index 100% rename from src/afd/sprites/back-shiny/Wingull.png rename to src/afd/sprites/back-shiny/278--0--Wingull.png diff --git a/src/afd/sprites/back-shiny/Pelipper.png b/src/afd/sprites/back-shiny/279--0--Pelipper.png similarity index 100% rename from src/afd/sprites/back-shiny/Pelipper.png rename to src/afd/sprites/back-shiny/279--0--Pelipper.png diff --git a/src/afd/sprites/back-shiny/Sandslash.png b/src/afd/sprites/back-shiny/28--0--Sandslash.png similarity index 100% rename from src/afd/sprites/back-shiny/Sandslash.png rename to src/afd/sprites/back-shiny/28--0--Sandslash.png diff --git a/src/afd/sprites/back-shiny/Sandslash--Alola.png b/src/afd/sprites/back-shiny/28--420--Sandslash--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Sandslash--Alola.png rename to src/afd/sprites/back-shiny/28--420--Sandslash--Alola.png diff --git a/src/afd/sprites/back-shiny/Ralts.png b/src/afd/sprites/back-shiny/280--0--Ralts.png similarity index 100% rename from src/afd/sprites/back-shiny/Ralts.png rename to src/afd/sprites/back-shiny/280--0--Ralts.png diff --git a/src/afd/sprites/back-shiny/Kirlia.png b/src/afd/sprites/back-shiny/281--0--Kirlia.png similarity index 100% rename from src/afd/sprites/back-shiny/Kirlia.png rename to src/afd/sprites/back-shiny/281--0--Kirlia.png diff --git a/src/afd/sprites/back-shiny/Gardevoir.png b/src/afd/sprites/back-shiny/282--0--Gardevoir.png similarity index 100% rename from src/afd/sprites/back-shiny/Gardevoir.png rename to src/afd/sprites/back-shiny/282--0--Gardevoir.png diff --git a/src/afd/sprites/back-shiny/Gardevoir--Mega.png b/src/afd/sprites/back-shiny/282--420--Gardevoir--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Gardevoir--Mega.png rename to src/afd/sprites/back-shiny/282--420--Gardevoir--Mega.png diff --git a/src/afd/sprites/back-shiny/Surskit.png b/src/afd/sprites/back-shiny/283--0--Surskit.png similarity index 100% rename from src/afd/sprites/back-shiny/Surskit.png rename to src/afd/sprites/back-shiny/283--0--Surskit.png diff --git a/src/afd/sprites/back-shiny/Masquerain.png b/src/afd/sprites/back-shiny/284--0--Masquerain.png similarity index 100% rename from src/afd/sprites/back-shiny/Masquerain.png rename to src/afd/sprites/back-shiny/284--0--Masquerain.png diff --git a/src/afd/sprites/back-shiny/Shroomish.png b/src/afd/sprites/back-shiny/285--0--Shroomish.png similarity index 100% rename from src/afd/sprites/back-shiny/Shroomish.png rename to src/afd/sprites/back-shiny/285--0--Shroomish.png diff --git a/src/afd/sprites/back-shiny/Breloom.png b/src/afd/sprites/back-shiny/286--0--Breloom.png similarity index 100% rename from src/afd/sprites/back-shiny/Breloom.png rename to src/afd/sprites/back-shiny/286--0--Breloom.png diff --git a/src/afd/sprites/back-shiny/Slakoth.png b/src/afd/sprites/back-shiny/287--0--Slakoth.png similarity index 100% rename from src/afd/sprites/back-shiny/Slakoth.png rename to src/afd/sprites/back-shiny/287--0--Slakoth.png diff --git a/src/afd/sprites/back-shiny/Vigoroth.png b/src/afd/sprites/back-shiny/288--0--Vigoroth.png similarity index 100% rename from src/afd/sprites/back-shiny/Vigoroth.png rename to src/afd/sprites/back-shiny/288--0--Vigoroth.png diff --git a/src/afd/sprites/back-shiny/Slaking.png b/src/afd/sprites/back-shiny/289--0--Slaking.png similarity index 100% rename from src/afd/sprites/back-shiny/Slaking.png rename to src/afd/sprites/back-shiny/289--0--Slaking.png diff --git a/src/afd/sprites/back-shiny/Malaconda.png b/src/afd/sprites/back-shiny/29--0--Malaconda.png similarity index 100% rename from src/afd/sprites/back-shiny/Malaconda.png rename to src/afd/sprites/back-shiny/29--0--Malaconda.png diff --git a/src/afd/sprites/back-shiny/Nidoran-F.png b/src/afd/sprites/back-shiny/29--0--Nidoran-F.png similarity index 100% rename from src/afd/sprites/back-shiny/Nidoran-F.png rename to src/afd/sprites/back-shiny/29--0--Nidoran-F.png diff --git a/src/afd/sprites/back-shiny/Nincada.png b/src/afd/sprites/back-shiny/290--0--Nincada.png similarity index 100% rename from src/afd/sprites/back-shiny/Nincada.png rename to src/afd/sprites/back-shiny/290--0--Nincada.png diff --git a/src/afd/sprites/back-shiny/Ninjask.png b/src/afd/sprites/back-shiny/291--0--Ninjask.png similarity index 100% rename from src/afd/sprites/back-shiny/Ninjask.png rename to src/afd/sprites/back-shiny/291--0--Ninjask.png diff --git a/src/afd/sprites/back-shiny/Shedinja.png b/src/afd/sprites/back-shiny/292--0--Shedinja.png similarity index 100% rename from src/afd/sprites/back-shiny/Shedinja.png rename to src/afd/sprites/back-shiny/292--0--Shedinja.png diff --git a/src/afd/sprites/back-shiny/Whismur.png b/src/afd/sprites/back-shiny/293--0--Whismur.png similarity index 100% rename from src/afd/sprites/back-shiny/Whismur.png rename to src/afd/sprites/back-shiny/293--0--Whismur.png diff --git a/src/afd/sprites/back-shiny/Loudred.png b/src/afd/sprites/back-shiny/294--0--Loudred.png similarity index 100% rename from src/afd/sprites/back-shiny/Loudred.png rename to src/afd/sprites/back-shiny/294--0--Loudred.png diff --git a/src/afd/sprites/back-shiny/Exploud.png b/src/afd/sprites/back-shiny/295--0--Exploud.png similarity index 100% rename from src/afd/sprites/back-shiny/Exploud.png rename to src/afd/sprites/back-shiny/295--0--Exploud.png diff --git a/src/afd/sprites/back-shiny/Makuhita.png b/src/afd/sprites/back-shiny/296--0--Makuhita.png similarity index 100% rename from src/afd/sprites/back-shiny/Makuhita.png rename to src/afd/sprites/back-shiny/296--0--Makuhita.png diff --git a/src/afd/sprites/back-shiny/Hariyama.png b/src/afd/sprites/back-shiny/297--0--Hariyama.png similarity index 100% rename from src/afd/sprites/back-shiny/Hariyama.png rename to src/afd/sprites/back-shiny/297--0--Hariyama.png diff --git a/src/afd/sprites/back-shiny/Azurill.png b/src/afd/sprites/back-shiny/298--0--Azurill.png similarity index 100% rename from src/afd/sprites/back-shiny/Azurill.png rename to src/afd/sprites/back-shiny/298--0--Azurill.png diff --git a/src/afd/sprites/back-shiny/Nosepass.png b/src/afd/sprites/back-shiny/299--0--Nosepass.png similarity index 100% rename from src/afd/sprites/back-shiny/Nosepass.png rename to src/afd/sprites/back-shiny/299--0--Nosepass.png diff --git a/src/afd/sprites/back-shiny/Revenankh.png b/src/afd/sprites/back-shiny/3--0--Revenankh.png similarity index 100% rename from src/afd/sprites/back-shiny/Revenankh.png rename to src/afd/sprites/back-shiny/3--0--Revenankh.png diff --git a/src/afd/sprites/back-shiny/Venusaur.png b/src/afd/sprites/back-shiny/3--0--Venusaur.png similarity index 100% rename from src/afd/sprites/back-shiny/Venusaur.png rename to src/afd/sprites/back-shiny/3--0--Venusaur.png diff --git a/src/afd/sprites/back-shiny/Venusaur--Mega.png b/src/afd/sprites/back-shiny/3--420--Venusaur--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Venusaur--Mega.png rename to src/afd/sprites/back-shiny/3--420--Venusaur--Mega.png diff --git a/src/afd/sprites/back-shiny/Nidorina.png b/src/afd/sprites/back-shiny/30--0--Nidorina.png similarity index 100% rename from src/afd/sprites/back-shiny/Nidorina.png rename to src/afd/sprites/back-shiny/30--0--Nidorina.png diff --git a/src/afd/sprites/back-shiny/Skitty.png b/src/afd/sprites/back-shiny/300--0--Skitty.png similarity index 100% rename from src/afd/sprites/back-shiny/Skitty.png rename to src/afd/sprites/back-shiny/300--0--Skitty.png diff --git a/src/afd/sprites/back-shiny/Delcatty.png b/src/afd/sprites/back-shiny/301--0--Delcatty.png similarity index 100% rename from src/afd/sprites/back-shiny/Delcatty.png rename to src/afd/sprites/back-shiny/301--0--Delcatty.png diff --git a/src/afd/sprites/back-shiny/Sableye.png b/src/afd/sprites/back-shiny/302--0--Sableye.png similarity index 100% rename from src/afd/sprites/back-shiny/Sableye.png rename to src/afd/sprites/back-shiny/302--0--Sableye.png diff --git a/src/afd/sprites/back-shiny/Sableye--Mega.png b/src/afd/sprites/back-shiny/302--420--Sableye--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Sableye--Mega.png rename to src/afd/sprites/back-shiny/302--420--Sableye--Mega.png diff --git a/src/afd/sprites/back-shiny/Mawile.png b/src/afd/sprites/back-shiny/303--0--Mawile.png similarity index 100% rename from src/afd/sprites/back-shiny/Mawile.png rename to src/afd/sprites/back-shiny/303--0--Mawile.png diff --git a/src/afd/sprites/back-shiny/Mawile--Mega.png b/src/afd/sprites/back-shiny/303--420--Mawile--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Mawile--Mega.png rename to src/afd/sprites/back-shiny/303--420--Mawile--Mega.png diff --git a/src/afd/sprites/back-shiny/Aron.png b/src/afd/sprites/back-shiny/304--0--Aron.png similarity index 100% rename from src/afd/sprites/back-shiny/Aron.png rename to src/afd/sprites/back-shiny/304--0--Aron.png diff --git a/src/afd/sprites/back-shiny/Lairon.png b/src/afd/sprites/back-shiny/305--0--Lairon.png similarity index 100% rename from src/afd/sprites/back-shiny/Lairon.png rename to src/afd/sprites/back-shiny/305--0--Lairon.png diff --git a/src/afd/sprites/back-shiny/Aggron.png b/src/afd/sprites/back-shiny/306--0--Aggron.png similarity index 100% rename from src/afd/sprites/back-shiny/Aggron.png rename to src/afd/sprites/back-shiny/306--0--Aggron.png diff --git a/src/afd/sprites/back-shiny/Aggron--Mega.png b/src/afd/sprites/back-shiny/306--420--Aggron--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Aggron--Mega.png rename to src/afd/sprites/back-shiny/306--420--Aggron--Mega.png diff --git a/src/afd/sprites/back-shiny/Meditite.png b/src/afd/sprites/back-shiny/307--0--Meditite.png similarity index 100% rename from src/afd/sprites/back-shiny/Meditite.png rename to src/afd/sprites/back-shiny/307--0--Meditite.png diff --git a/src/afd/sprites/back-shiny/Medicham.png b/src/afd/sprites/back-shiny/308--0--Medicham.png similarity index 100% rename from src/afd/sprites/back-shiny/Medicham.png rename to src/afd/sprites/back-shiny/308--0--Medicham.png diff --git a/src/afd/sprites/back-shiny/Medicham--Mega.png b/src/afd/sprites/back-shiny/308--420--Medicham--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Medicham--Mega.png rename to src/afd/sprites/back-shiny/308--420--Medicham--Mega.png diff --git a/src/afd/sprites/back-shiny/Electrike.png b/src/afd/sprites/back-shiny/309--0--Electrike.png similarity index 100% rename from src/afd/sprites/back-shiny/Electrike.png rename to src/afd/sprites/back-shiny/309--0--Electrike.png diff --git a/src/afd/sprites/back-shiny/Cawmodore.png b/src/afd/sprites/back-shiny/31--0--Cawmodore.png similarity index 100% rename from src/afd/sprites/back-shiny/Cawmodore.png rename to src/afd/sprites/back-shiny/31--0--Cawmodore.png diff --git a/src/afd/sprites/back-shiny/Nidoqueen.png b/src/afd/sprites/back-shiny/31--0--Nidoqueen.png similarity index 100% rename from src/afd/sprites/back-shiny/Nidoqueen.png rename to src/afd/sprites/back-shiny/31--0--Nidoqueen.png diff --git a/src/afd/sprites/back-shiny/Manectric.png b/src/afd/sprites/back-shiny/310--0--Manectric.png similarity index 100% rename from src/afd/sprites/back-shiny/Manectric.png rename to src/afd/sprites/back-shiny/310--0--Manectric.png diff --git a/src/afd/sprites/back-shiny/Manectric--Mega.png b/src/afd/sprites/back-shiny/310--420--Manectric--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Manectric--Mega.png rename to src/afd/sprites/back-shiny/310--420--Manectric--Mega.png diff --git a/src/afd/sprites/back-shiny/Plusle.png b/src/afd/sprites/back-shiny/311--0--Plusle.png similarity index 100% rename from src/afd/sprites/back-shiny/Plusle.png rename to src/afd/sprites/back-shiny/311--0--Plusle.png diff --git a/src/afd/sprites/back-shiny/Minun.png b/src/afd/sprites/back-shiny/312--0--Minun.png similarity index 100% rename from src/afd/sprites/back-shiny/Minun.png rename to src/afd/sprites/back-shiny/312--0--Minun.png diff --git a/src/afd/sprites/back-shiny/Volbeat.png b/src/afd/sprites/back-shiny/313--0--Volbeat.png similarity index 100% rename from src/afd/sprites/back-shiny/Volbeat.png rename to src/afd/sprites/back-shiny/313--0--Volbeat.png diff --git a/src/afd/sprites/back-shiny/Illumise.png b/src/afd/sprites/back-shiny/314--0--Illumise.png similarity index 100% rename from src/afd/sprites/back-shiny/Illumise.png rename to src/afd/sprites/back-shiny/314--0--Illumise.png diff --git a/src/afd/sprites/back-shiny/Roselia.png b/src/afd/sprites/back-shiny/315--0--Roselia.png similarity index 100% rename from src/afd/sprites/back-shiny/Roselia.png rename to src/afd/sprites/back-shiny/315--0--Roselia.png diff --git a/src/afd/sprites/back-shiny/Gulpin.png b/src/afd/sprites/back-shiny/316--0--Gulpin.png similarity index 100% rename from src/afd/sprites/back-shiny/Gulpin.png rename to src/afd/sprites/back-shiny/316--0--Gulpin.png diff --git a/src/afd/sprites/back-shiny/Swalot.png b/src/afd/sprites/back-shiny/317--0--Swalot.png similarity index 100% rename from src/afd/sprites/back-shiny/Swalot.png rename to src/afd/sprites/back-shiny/317--0--Swalot.png diff --git a/src/afd/sprites/back-shiny/Carvanha.png b/src/afd/sprites/back-shiny/318--0--Carvanha.png similarity index 100% rename from src/afd/sprites/back-shiny/Carvanha.png rename to src/afd/sprites/back-shiny/318--0--Carvanha.png diff --git a/src/afd/sprites/back-shiny/Sharpedo.png b/src/afd/sprites/back-shiny/319--0--Sharpedo.png similarity index 100% rename from src/afd/sprites/back-shiny/Sharpedo.png rename to src/afd/sprites/back-shiny/319--0--Sharpedo.png diff --git a/src/afd/sprites/back-shiny/Sharpedo--Mega.png b/src/afd/sprites/back-shiny/319--420--Sharpedo--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Sharpedo--Mega.png rename to src/afd/sprites/back-shiny/319--420--Sharpedo--Mega.png diff --git a/src/afd/sprites/back-shiny/Nidoran-M.png b/src/afd/sprites/back-shiny/32--0--Nidoran-M.png similarity index 100% rename from src/afd/sprites/back-shiny/Nidoran-M.png rename to src/afd/sprites/back-shiny/32--0--Nidoran-M.png diff --git a/src/afd/sprites/back-shiny/Wailmer.png b/src/afd/sprites/back-shiny/320--0--Wailmer.png similarity index 100% rename from src/afd/sprites/back-shiny/Wailmer.png rename to src/afd/sprites/back-shiny/320--0--Wailmer.png diff --git a/src/afd/sprites/back-shiny/Wailord.png b/src/afd/sprites/back-shiny/321--0--Wailord.png similarity index 100% rename from src/afd/sprites/back-shiny/Wailord.png rename to src/afd/sprites/back-shiny/321--0--Wailord.png diff --git a/src/afd/sprites/back-shiny/Numel.png b/src/afd/sprites/back-shiny/322--0--Numel.png similarity index 100% rename from src/afd/sprites/back-shiny/Numel.png rename to src/afd/sprites/back-shiny/322--0--Numel.png diff --git a/src/afd/sprites/back-shiny/Camerupt.png b/src/afd/sprites/back-shiny/323--0--Camerupt.png similarity index 100% rename from src/afd/sprites/back-shiny/Camerupt.png rename to src/afd/sprites/back-shiny/323--0--Camerupt.png diff --git a/src/afd/sprites/back-shiny/Camerupt--Mega.png b/src/afd/sprites/back-shiny/323--420--Camerupt--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Camerupt--Mega.png rename to src/afd/sprites/back-shiny/323--420--Camerupt--Mega.png diff --git a/src/afd/sprites/back-shiny/Torkoal.png b/src/afd/sprites/back-shiny/324--0--Torkoal.png similarity index 100% rename from src/afd/sprites/back-shiny/Torkoal.png rename to src/afd/sprites/back-shiny/324--0--Torkoal.png diff --git a/src/afd/sprites/back-shiny/Spoink.png b/src/afd/sprites/back-shiny/325--0--Spoink.png similarity index 100% rename from src/afd/sprites/back-shiny/Spoink.png rename to src/afd/sprites/back-shiny/325--0--Spoink.png diff --git a/src/afd/sprites/back-shiny/Grumpig.png b/src/afd/sprites/back-shiny/326--0--Grumpig.png similarity index 100% rename from src/afd/sprites/back-shiny/Grumpig.png rename to src/afd/sprites/back-shiny/326--0--Grumpig.png diff --git a/src/afd/sprites/back-shiny/Spinda.png b/src/afd/sprites/back-shiny/327--0--Spinda.png similarity index 100% rename from src/afd/sprites/back-shiny/Spinda.png rename to src/afd/sprites/back-shiny/327--0--Spinda.png diff --git a/src/afd/sprites/back-shiny/Trapinch.png b/src/afd/sprites/back-shiny/328--0--Trapinch.png similarity index 100% rename from src/afd/sprites/back-shiny/Trapinch.png rename to src/afd/sprites/back-shiny/328--0--Trapinch.png diff --git a/src/afd/sprites/back-shiny/Vibrava.png b/src/afd/sprites/back-shiny/329--0--Vibrava.png similarity index 100% rename from src/afd/sprites/back-shiny/Vibrava.png rename to src/afd/sprites/back-shiny/329--0--Vibrava.png diff --git a/src/afd/sprites/back-shiny/Nidorino.png b/src/afd/sprites/back-shiny/33--0--Nidorino.png similarity index 100% rename from src/afd/sprites/back-shiny/Nidorino.png rename to src/afd/sprites/back-shiny/33--0--Nidorino.png diff --git a/src/afd/sprites/back-shiny/Flygon.png b/src/afd/sprites/back-shiny/330--0--Flygon.png similarity index 100% rename from src/afd/sprites/back-shiny/Flygon.png rename to src/afd/sprites/back-shiny/330--0--Flygon.png diff --git a/src/afd/sprites/back-shiny/Cacnea.png b/src/afd/sprites/back-shiny/331--0--Cacnea.png similarity index 100% rename from src/afd/sprites/back-shiny/Cacnea.png rename to src/afd/sprites/back-shiny/331--0--Cacnea.png diff --git a/src/afd/sprites/back-shiny/Cacturne.png b/src/afd/sprites/back-shiny/332--0--Cacturne.png similarity index 100% rename from src/afd/sprites/back-shiny/Cacturne.png rename to src/afd/sprites/back-shiny/332--0--Cacturne.png diff --git a/src/afd/sprites/back-shiny/Swablu.png b/src/afd/sprites/back-shiny/333--0--Swablu.png similarity index 100% rename from src/afd/sprites/back-shiny/Swablu.png rename to src/afd/sprites/back-shiny/333--0--Swablu.png diff --git a/src/afd/sprites/back-shiny/Altaria.png b/src/afd/sprites/back-shiny/334--0--Altaria.png similarity index 100% rename from src/afd/sprites/back-shiny/Altaria.png rename to src/afd/sprites/back-shiny/334--0--Altaria.png diff --git a/src/afd/sprites/back-shiny/Altaria--Mega.png b/src/afd/sprites/back-shiny/334--420--Altaria--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Altaria--Mega.png rename to src/afd/sprites/back-shiny/334--420--Altaria--Mega.png diff --git a/src/afd/sprites/back-shiny/Zangoose.png b/src/afd/sprites/back-shiny/335--0--Zangoose.png similarity index 100% rename from src/afd/sprites/back-shiny/Zangoose.png rename to src/afd/sprites/back-shiny/335--0--Zangoose.png diff --git a/src/afd/sprites/back-shiny/Seviper.png b/src/afd/sprites/back-shiny/336--0--Seviper.png similarity index 100% rename from src/afd/sprites/back-shiny/Seviper.png rename to src/afd/sprites/back-shiny/336--0--Seviper.png diff --git a/src/afd/sprites/back-shiny/Lunatone.png b/src/afd/sprites/back-shiny/337--0--Lunatone.png similarity index 100% rename from src/afd/sprites/back-shiny/Lunatone.png rename to src/afd/sprites/back-shiny/337--0--Lunatone.png diff --git a/src/afd/sprites/back-shiny/Solrock.png b/src/afd/sprites/back-shiny/338--0--Solrock.png similarity index 100% rename from src/afd/sprites/back-shiny/Solrock.png rename to src/afd/sprites/back-shiny/338--0--Solrock.png diff --git a/src/afd/sprites/back-shiny/Barboach.png b/src/afd/sprites/back-shiny/339--0--Barboach.png similarity index 100% rename from src/afd/sprites/back-shiny/Barboach.png rename to src/afd/sprites/back-shiny/339--0--Barboach.png diff --git a/src/afd/sprites/back-shiny/Nidoking.png b/src/afd/sprites/back-shiny/34--0--Nidoking.png similarity index 100% rename from src/afd/sprites/back-shiny/Nidoking.png rename to src/afd/sprites/back-shiny/34--0--Nidoking.png diff --git a/src/afd/sprites/back-shiny/Whiscash.png b/src/afd/sprites/back-shiny/340--0--Whiscash.png similarity index 100% rename from src/afd/sprites/back-shiny/Whiscash.png rename to src/afd/sprites/back-shiny/340--0--Whiscash.png diff --git a/src/afd/sprites/back-shiny/Corphish.png b/src/afd/sprites/back-shiny/341--0--Corphish.png similarity index 100% rename from src/afd/sprites/back-shiny/Corphish.png rename to src/afd/sprites/back-shiny/341--0--Corphish.png diff --git a/src/afd/sprites/back-shiny/Crawdaunt.png b/src/afd/sprites/back-shiny/342--0--Crawdaunt.png similarity index 100% rename from src/afd/sprites/back-shiny/Crawdaunt.png rename to src/afd/sprites/back-shiny/342--0--Crawdaunt.png diff --git a/src/afd/sprites/back-shiny/Baltoy.png b/src/afd/sprites/back-shiny/343--0--Baltoy.png similarity index 100% rename from src/afd/sprites/back-shiny/Baltoy.png rename to src/afd/sprites/back-shiny/343--0--Baltoy.png diff --git a/src/afd/sprites/back-shiny/Claydol.png b/src/afd/sprites/back-shiny/344--0--Claydol.png similarity index 100% rename from src/afd/sprites/back-shiny/Claydol.png rename to src/afd/sprites/back-shiny/344--0--Claydol.png diff --git a/src/afd/sprites/back-shiny/Lileep.png b/src/afd/sprites/back-shiny/345--0--Lileep.png similarity index 100% rename from src/afd/sprites/back-shiny/Lileep.png rename to src/afd/sprites/back-shiny/345--0--Lileep.png diff --git a/src/afd/sprites/back-shiny/Cradily.png b/src/afd/sprites/back-shiny/346--0--Cradily.png similarity index 100% rename from src/afd/sprites/back-shiny/Cradily.png rename to src/afd/sprites/back-shiny/346--0--Cradily.png diff --git a/src/afd/sprites/back-shiny/Anorith.png b/src/afd/sprites/back-shiny/347--0--Anorith.png similarity index 100% rename from src/afd/sprites/back-shiny/Anorith.png rename to src/afd/sprites/back-shiny/347--0--Anorith.png diff --git a/src/afd/sprites/back-shiny/Armaldo.png b/src/afd/sprites/back-shiny/348--0--Armaldo.png similarity index 100% rename from src/afd/sprites/back-shiny/Armaldo.png rename to src/afd/sprites/back-shiny/348--0--Armaldo.png diff --git a/src/afd/sprites/back-shiny/Feebas.png b/src/afd/sprites/back-shiny/349--0--Feebas.png similarity index 100% rename from src/afd/sprites/back-shiny/Feebas.png rename to src/afd/sprites/back-shiny/349--0--Feebas.png diff --git a/src/afd/sprites/back-shiny/Clefairy.png b/src/afd/sprites/back-shiny/35--0--Clefairy.png similarity index 100% rename from src/afd/sprites/back-shiny/Clefairy.png rename to src/afd/sprites/back-shiny/35--0--Clefairy.png diff --git a/src/afd/sprites/back-shiny/Plasmanta.png b/src/afd/sprites/back-shiny/35--0--Plasmanta.png similarity index 100% rename from src/afd/sprites/back-shiny/Plasmanta.png rename to src/afd/sprites/back-shiny/35--0--Plasmanta.png diff --git a/src/afd/sprites/back-shiny/Milotic.png b/src/afd/sprites/back-shiny/350--0--Milotic.png similarity index 100% rename from src/afd/sprites/back-shiny/Milotic.png rename to src/afd/sprites/back-shiny/350--0--Milotic.png diff --git a/src/afd/sprites/back-shiny/Castform.png b/src/afd/sprites/back-shiny/351--0--Castform.png similarity index 100% rename from src/afd/sprites/back-shiny/Castform.png rename to src/afd/sprites/back-shiny/351--0--Castform.png diff --git a/src/afd/sprites/back-shiny/Castform--Rainy.png b/src/afd/sprites/back-shiny/351--420--Castform--Rainy.png similarity index 100% rename from src/afd/sprites/back-shiny/Castform--Rainy.png rename to src/afd/sprites/back-shiny/351--420--Castform--Rainy.png diff --git a/src/afd/sprites/back-shiny/Castform--Snowy.png b/src/afd/sprites/back-shiny/351--420--Castform--Snowy.png similarity index 100% rename from src/afd/sprites/back-shiny/Castform--Snowy.png rename to src/afd/sprites/back-shiny/351--420--Castform--Snowy.png diff --git a/src/afd/sprites/back-shiny/Castform--Sunny.png b/src/afd/sprites/back-shiny/351--420--Castform--Sunny.png similarity index 100% rename from src/afd/sprites/back-shiny/Castform--Sunny.png rename to src/afd/sprites/back-shiny/351--420--Castform--Sunny.png diff --git a/src/afd/sprites/back-shiny/Kecleon.png b/src/afd/sprites/back-shiny/352--0--Kecleon.png similarity index 100% rename from src/afd/sprites/back-shiny/Kecleon.png rename to src/afd/sprites/back-shiny/352--0--Kecleon.png diff --git a/src/afd/sprites/back-shiny/Shuppet.png b/src/afd/sprites/back-shiny/353--0--Shuppet.png similarity index 100% rename from src/afd/sprites/back-shiny/Shuppet.png rename to src/afd/sprites/back-shiny/353--0--Shuppet.png diff --git a/src/afd/sprites/back-shiny/Banette.png b/src/afd/sprites/back-shiny/354--0--Banette.png similarity index 100% rename from src/afd/sprites/back-shiny/Banette.png rename to src/afd/sprites/back-shiny/354--0--Banette.png diff --git a/src/afd/sprites/back-shiny/Banette--Mega.png b/src/afd/sprites/back-shiny/354--420--Banette--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Banette--Mega.png rename to src/afd/sprites/back-shiny/354--420--Banette--Mega.png diff --git a/src/afd/sprites/back-shiny/Duskull.png b/src/afd/sprites/back-shiny/355--0--Duskull.png similarity index 100% rename from src/afd/sprites/back-shiny/Duskull.png rename to src/afd/sprites/back-shiny/355--0--Duskull.png diff --git a/src/afd/sprites/back-shiny/Dusclops.png b/src/afd/sprites/back-shiny/356--0--Dusclops.png similarity index 100% rename from src/afd/sprites/back-shiny/Dusclops.png rename to src/afd/sprites/back-shiny/356--0--Dusclops.png diff --git a/src/afd/sprites/back-shiny/Tropius.png b/src/afd/sprites/back-shiny/357--0--Tropius.png similarity index 100% rename from src/afd/sprites/back-shiny/Tropius.png rename to src/afd/sprites/back-shiny/357--0--Tropius.png diff --git a/src/afd/sprites/back-shiny/Chimecho.png b/src/afd/sprites/back-shiny/358--0--Chimecho.png similarity index 100% rename from src/afd/sprites/back-shiny/Chimecho.png rename to src/afd/sprites/back-shiny/358--0--Chimecho.png diff --git a/src/afd/sprites/back-shiny/Absol.png b/src/afd/sprites/back-shiny/359--0--Absol.png similarity index 100% rename from src/afd/sprites/back-shiny/Absol.png rename to src/afd/sprites/back-shiny/359--0--Absol.png diff --git a/src/afd/sprites/back-shiny/Absol--Mega.png b/src/afd/sprites/back-shiny/359--420--Absol--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Absol--Mega.png rename to src/afd/sprites/back-shiny/359--420--Absol--Mega.png diff --git a/src/afd/sprites/back-shiny/Clefable.png b/src/afd/sprites/back-shiny/36--0--Clefable.png similarity index 100% rename from src/afd/sprites/back-shiny/Clefable.png rename to src/afd/sprites/back-shiny/36--0--Clefable.png diff --git a/src/afd/sprites/back-shiny/Wynaut.png b/src/afd/sprites/back-shiny/360--0--Wynaut.png similarity index 100% rename from src/afd/sprites/back-shiny/Wynaut.png rename to src/afd/sprites/back-shiny/360--0--Wynaut.png diff --git a/src/afd/sprites/back-shiny/Glalie.png b/src/afd/sprites/back-shiny/362--0--Glalie.png similarity index 100% rename from src/afd/sprites/back-shiny/Glalie.png rename to src/afd/sprites/back-shiny/362--0--Glalie.png diff --git a/src/afd/sprites/back-shiny/Spheal.png b/src/afd/sprites/back-shiny/363--0--Spheal.png similarity index 100% rename from src/afd/sprites/back-shiny/Spheal.png rename to src/afd/sprites/back-shiny/363--0--Spheal.png diff --git a/src/afd/sprites/back-shiny/Sealeo.png b/src/afd/sprites/back-shiny/364--0--Sealeo.png similarity index 100% rename from src/afd/sprites/back-shiny/Sealeo.png rename to src/afd/sprites/back-shiny/364--0--Sealeo.png diff --git a/src/afd/sprites/back-shiny/Walrein.png b/src/afd/sprites/back-shiny/365--0--Walrein.png similarity index 100% rename from src/afd/sprites/back-shiny/Walrein.png rename to src/afd/sprites/back-shiny/365--0--Walrein.png diff --git a/src/afd/sprites/back-shiny/Clamperl.png b/src/afd/sprites/back-shiny/366--0--Clamperl.png similarity index 100% rename from src/afd/sprites/back-shiny/Clamperl.png rename to src/afd/sprites/back-shiny/366--0--Clamperl.png diff --git a/src/afd/sprites/back-shiny/Huntail.png b/src/afd/sprites/back-shiny/367--0--Huntail.png similarity index 100% rename from src/afd/sprites/back-shiny/Huntail.png rename to src/afd/sprites/back-shiny/367--0--Huntail.png diff --git a/src/afd/sprites/back-shiny/Gorebyss.png b/src/afd/sprites/back-shiny/368--0--Gorebyss.png similarity index 100% rename from src/afd/sprites/back-shiny/Gorebyss.png rename to src/afd/sprites/back-shiny/368--0--Gorebyss.png diff --git a/src/afd/sprites/back-shiny/Relicanth.png b/src/afd/sprites/back-shiny/369--0--Relicanth.png similarity index 100% rename from src/afd/sprites/back-shiny/Relicanth.png rename to src/afd/sprites/back-shiny/369--0--Relicanth.png diff --git a/src/afd/sprites/back-shiny/Vulpix.png b/src/afd/sprites/back-shiny/37--0--Vulpix.png similarity index 100% rename from src/afd/sprites/back-shiny/Vulpix.png rename to src/afd/sprites/back-shiny/37--0--Vulpix.png diff --git a/src/afd/sprites/back-shiny/Vulpix--Alola.png b/src/afd/sprites/back-shiny/37--420--Vulpix--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Vulpix--Alola.png rename to src/afd/sprites/back-shiny/37--420--Vulpix--Alola.png diff --git a/src/afd/sprites/back-shiny/Luvdisc.png b/src/afd/sprites/back-shiny/370--0--Luvdisc.png similarity index 100% rename from src/afd/sprites/back-shiny/Luvdisc.png rename to src/afd/sprites/back-shiny/370--0--Luvdisc.png diff --git a/src/afd/sprites/back-shiny/Bagon.png b/src/afd/sprites/back-shiny/371--0--Bagon.png similarity index 100% rename from src/afd/sprites/back-shiny/Bagon.png rename to src/afd/sprites/back-shiny/371--0--Bagon.png diff --git a/src/afd/sprites/back-shiny/Shelgon.png b/src/afd/sprites/back-shiny/372--0--Shelgon.png similarity index 100% rename from src/afd/sprites/back-shiny/Shelgon.png rename to src/afd/sprites/back-shiny/372--0--Shelgon.png diff --git a/src/afd/sprites/back-shiny/Salamence.png b/src/afd/sprites/back-shiny/373--0--Salamence.png similarity index 100% rename from src/afd/sprites/back-shiny/Salamence.png rename to src/afd/sprites/back-shiny/373--0--Salamence.png diff --git a/src/afd/sprites/back-shiny/Salamence--Mega.png b/src/afd/sprites/back-shiny/373--420--Salamence--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Salamence--Mega.png rename to src/afd/sprites/back-shiny/373--420--Salamence--Mega.png diff --git a/src/afd/sprites/back-shiny/Beldum.png b/src/afd/sprites/back-shiny/374--0--Beldum.png similarity index 100% rename from src/afd/sprites/back-shiny/Beldum.png rename to src/afd/sprites/back-shiny/374--0--Beldum.png diff --git a/src/afd/sprites/back-shiny/Metang.png b/src/afd/sprites/back-shiny/375--0--Metang.png similarity index 100% rename from src/afd/sprites/back-shiny/Metang.png rename to src/afd/sprites/back-shiny/375--0--Metang.png diff --git a/src/afd/sprites/back-shiny/Metagross.png b/src/afd/sprites/back-shiny/376--0--Metagross.png similarity index 100% rename from src/afd/sprites/back-shiny/Metagross.png rename to src/afd/sprites/back-shiny/376--0--Metagross.png diff --git a/src/afd/sprites/back-shiny/Metagross--Mega.png b/src/afd/sprites/back-shiny/376--420--Metagross--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Metagross--Mega.png rename to src/afd/sprites/back-shiny/376--420--Metagross--Mega.png diff --git a/src/afd/sprites/back-shiny/Regirock.png b/src/afd/sprites/back-shiny/377--0--Regirock.png similarity index 100% rename from src/afd/sprites/back-shiny/Regirock.png rename to src/afd/sprites/back-shiny/377--0--Regirock.png diff --git a/src/afd/sprites/back-shiny/Regice.png b/src/afd/sprites/back-shiny/378--0--Regice.png similarity index 100% rename from src/afd/sprites/back-shiny/Regice.png rename to src/afd/sprites/back-shiny/378--0--Regice.png diff --git a/src/afd/sprites/back-shiny/Registeel.png b/src/afd/sprites/back-shiny/379--0--Registeel.png similarity index 100% rename from src/afd/sprites/back-shiny/Registeel.png rename to src/afd/sprites/back-shiny/379--0--Registeel.png diff --git a/src/afd/sprites/back-shiny/Ninetales--Alola.png b/src/afd/sprites/back-shiny/38--420--Ninetales--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Ninetales--Alola.png rename to src/afd/sprites/back-shiny/38--420--Ninetales--Alola.png diff --git a/src/afd/sprites/back-shiny/Latias.png b/src/afd/sprites/back-shiny/380--0--Latias.png similarity index 100% rename from src/afd/sprites/back-shiny/Latias.png rename to src/afd/sprites/back-shiny/380--0--Latias.png diff --git a/src/afd/sprites/back-shiny/Latias--Mega.png b/src/afd/sprites/back-shiny/380--420--Latias--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Latias--Mega.png rename to src/afd/sprites/back-shiny/380--420--Latias--Mega.png diff --git a/src/afd/sprites/back-shiny/Latios.png b/src/afd/sprites/back-shiny/381--0--Latios.png similarity index 100% rename from src/afd/sprites/back-shiny/Latios.png rename to src/afd/sprites/back-shiny/381--0--Latios.png diff --git a/src/afd/sprites/back-shiny/Latios--Mega.png b/src/afd/sprites/back-shiny/381--420--Latios--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Latios--Mega.png rename to src/afd/sprites/back-shiny/381--420--Latios--Mega.png diff --git a/src/afd/sprites/back-shiny/Kyogre.png b/src/afd/sprites/back-shiny/382--0--Kyogre.png similarity index 100% rename from src/afd/sprites/back-shiny/Kyogre.png rename to src/afd/sprites/back-shiny/382--0--Kyogre.png diff --git a/src/afd/sprites/back-shiny/Kyogre--Primal.png b/src/afd/sprites/back-shiny/382--420--Kyogre--Primal.png similarity index 100% rename from src/afd/sprites/back-shiny/Kyogre--Primal.png rename to src/afd/sprites/back-shiny/382--420--Kyogre--Primal.png diff --git a/src/afd/sprites/back-shiny/Groudon.png b/src/afd/sprites/back-shiny/383--0--Groudon.png similarity index 100% rename from src/afd/sprites/back-shiny/Groudon.png rename to src/afd/sprites/back-shiny/383--0--Groudon.png diff --git a/src/afd/sprites/back-shiny/Groudon--Primal.png b/src/afd/sprites/back-shiny/383--420--Groudon--Primal.png similarity index 100% rename from src/afd/sprites/back-shiny/Groudon--Primal.png rename to src/afd/sprites/back-shiny/383--420--Groudon--Primal.png diff --git a/src/afd/sprites/back-shiny/Rayquaza.png b/src/afd/sprites/back-shiny/384--0--Rayquaza.png similarity index 100% rename from src/afd/sprites/back-shiny/Rayquaza.png rename to src/afd/sprites/back-shiny/384--0--Rayquaza.png diff --git a/src/afd/sprites/back-shiny/Rayquaza--Mega.png b/src/afd/sprites/back-shiny/384--420--Rayquaza--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Rayquaza--Mega.png rename to src/afd/sprites/back-shiny/384--420--Rayquaza--Mega.png diff --git a/src/afd/sprites/back-shiny/Jirachi.png b/src/afd/sprites/back-shiny/385--0--Jirachi.png similarity index 100% rename from src/afd/sprites/back-shiny/Jirachi.png rename to src/afd/sprites/back-shiny/385--0--Jirachi.png diff --git a/src/afd/sprites/back-shiny/Deoxys.png b/src/afd/sprites/back-shiny/386--0--Deoxys.png similarity index 100% rename from src/afd/sprites/back-shiny/Deoxys.png rename to src/afd/sprites/back-shiny/386--0--Deoxys.png diff --git a/src/afd/sprites/back-shiny/Deoxys--Attack.png b/src/afd/sprites/back-shiny/386--420--Deoxys--Attack.png similarity index 100% rename from src/afd/sprites/back-shiny/Deoxys--Attack.png rename to src/afd/sprites/back-shiny/386--420--Deoxys--Attack.png diff --git a/src/afd/sprites/back-shiny/Deoxys--Defense.png b/src/afd/sprites/back-shiny/386--420--Deoxys--Defense.png similarity index 100% rename from src/afd/sprites/back-shiny/Deoxys--Defense.png rename to src/afd/sprites/back-shiny/386--420--Deoxys--Defense.png diff --git a/src/afd/sprites/back-shiny/Deoxys--Speed.png b/src/afd/sprites/back-shiny/386--420--Deoxys--Speed.png similarity index 100% rename from src/afd/sprites/back-shiny/Deoxys--Speed.png rename to src/afd/sprites/back-shiny/386--420--Deoxys--Speed.png diff --git a/src/afd/sprites/back-shiny/Turtwig.png b/src/afd/sprites/back-shiny/387--0--Turtwig.png similarity index 100% rename from src/afd/sprites/back-shiny/Turtwig.png rename to src/afd/sprites/back-shiny/387--0--Turtwig.png diff --git a/src/afd/sprites/back-shiny/Grotle.png b/src/afd/sprites/back-shiny/388--0--Grotle.png similarity index 100% rename from src/afd/sprites/back-shiny/Grotle.png rename to src/afd/sprites/back-shiny/388--0--Grotle.png diff --git a/src/afd/sprites/back-shiny/Torterra.png b/src/afd/sprites/back-shiny/389--0--Torterra.png similarity index 100% rename from src/afd/sprites/back-shiny/Torterra.png rename to src/afd/sprites/back-shiny/389--0--Torterra.png diff --git a/src/afd/sprites/back-shiny/Jigglypuff.png b/src/afd/sprites/back-shiny/39--0--Jigglypuff.png similarity index 100% rename from src/afd/sprites/back-shiny/Jigglypuff.png rename to src/afd/sprites/back-shiny/39--0--Jigglypuff.png diff --git a/src/afd/sprites/back-shiny/Chimchar.png b/src/afd/sprites/back-shiny/390--0--Chimchar.png similarity index 100% rename from src/afd/sprites/back-shiny/Chimchar.png rename to src/afd/sprites/back-shiny/390--0--Chimchar.png diff --git a/src/afd/sprites/back-shiny/Monferno.png b/src/afd/sprites/back-shiny/391--0--Monferno.png similarity index 100% rename from src/afd/sprites/back-shiny/Monferno.png rename to src/afd/sprites/back-shiny/391--0--Monferno.png diff --git a/src/afd/sprites/back-shiny/Infernape.png b/src/afd/sprites/back-shiny/392--0--Infernape.png similarity index 100% rename from src/afd/sprites/back-shiny/Infernape.png rename to src/afd/sprites/back-shiny/392--0--Infernape.png diff --git a/src/afd/sprites/back-shiny/Piplup.png b/src/afd/sprites/back-shiny/393--0--Piplup.png similarity index 100% rename from src/afd/sprites/back-shiny/Piplup.png rename to src/afd/sprites/back-shiny/393--0--Piplup.png diff --git a/src/afd/sprites/back-shiny/Prinplup.png b/src/afd/sprites/back-shiny/394--0--Prinplup.png similarity index 100% rename from src/afd/sprites/back-shiny/Prinplup.png rename to src/afd/sprites/back-shiny/394--0--Prinplup.png diff --git a/src/afd/sprites/back-shiny/Empoleon.png b/src/afd/sprites/back-shiny/395--0--Empoleon.png similarity index 100% rename from src/afd/sprites/back-shiny/Empoleon.png rename to src/afd/sprites/back-shiny/395--0--Empoleon.png diff --git a/src/afd/sprites/back-shiny/Starly.png b/src/afd/sprites/back-shiny/396--0--Starly.png similarity index 100% rename from src/afd/sprites/back-shiny/Starly.png rename to src/afd/sprites/back-shiny/396--0--Starly.png diff --git a/src/afd/sprites/back-shiny/Staravia.png b/src/afd/sprites/back-shiny/397--0--Staravia.png similarity index 100% rename from src/afd/sprites/back-shiny/Staravia.png rename to src/afd/sprites/back-shiny/397--0--Staravia.png diff --git a/src/afd/sprites/back-shiny/Staraptor.png b/src/afd/sprites/back-shiny/398--0--Staraptor.png similarity index 100% rename from src/afd/sprites/back-shiny/Staraptor.png rename to src/afd/sprites/back-shiny/398--0--Staraptor.png diff --git a/src/afd/sprites/back-shiny/Bidoof.png b/src/afd/sprites/back-shiny/399--0--Bidoof.png similarity index 100% rename from src/afd/sprites/back-shiny/Bidoof.png rename to src/afd/sprites/back-shiny/399--0--Bidoof.png diff --git a/src/afd/sprites/back-shiny/Charmander.png b/src/afd/sprites/back-shiny/4--0--Charmander.png similarity index 100% rename from src/afd/sprites/back-shiny/Charmander.png rename to src/afd/sprites/back-shiny/4--0--Charmander.png diff --git a/src/afd/sprites/back-shiny/Wigglytuff.png b/src/afd/sprites/back-shiny/40--0--Wigglytuff.png similarity index 100% rename from src/afd/sprites/back-shiny/Wigglytuff.png rename to src/afd/sprites/back-shiny/40--0--Wigglytuff.png diff --git a/src/afd/sprites/back-shiny/Bibarel.png b/src/afd/sprites/back-shiny/400--0--Bibarel.png similarity index 100% rename from src/afd/sprites/back-shiny/Bibarel.png rename to src/afd/sprites/back-shiny/400--0--Bibarel.png diff --git a/src/afd/sprites/back-shiny/Kricketot.png b/src/afd/sprites/back-shiny/401--0--Kricketot.png similarity index 100% rename from src/afd/sprites/back-shiny/Kricketot.png rename to src/afd/sprites/back-shiny/401--0--Kricketot.png diff --git a/src/afd/sprites/back-shiny/Kricketune.png b/src/afd/sprites/back-shiny/402--0--Kricketune.png similarity index 100% rename from src/afd/sprites/back-shiny/Kricketune.png rename to src/afd/sprites/back-shiny/402--0--Kricketune.png diff --git a/src/afd/sprites/back-shiny/Shinx.png b/src/afd/sprites/back-shiny/403--0--Shinx.png similarity index 100% rename from src/afd/sprites/back-shiny/Shinx.png rename to src/afd/sprites/back-shiny/403--0--Shinx.png diff --git a/src/afd/sprites/back-shiny/Luxio.png b/src/afd/sprites/back-shiny/404--0--Luxio.png similarity index 100% rename from src/afd/sprites/back-shiny/Luxio.png rename to src/afd/sprites/back-shiny/404--0--Luxio.png diff --git a/src/afd/sprites/back-shiny/Luxray.png b/src/afd/sprites/back-shiny/405--0--Luxray.png similarity index 100% rename from src/afd/sprites/back-shiny/Luxray.png rename to src/afd/sprites/back-shiny/405--0--Luxray.png diff --git a/src/afd/sprites/back-shiny/Budew.png b/src/afd/sprites/back-shiny/406--0--Budew.png similarity index 100% rename from src/afd/sprites/back-shiny/Budew.png rename to src/afd/sprites/back-shiny/406--0--Budew.png diff --git a/src/afd/sprites/back-shiny/Roserade.png b/src/afd/sprites/back-shiny/407--0--Roserade.png similarity index 100% rename from src/afd/sprites/back-shiny/Roserade.png rename to src/afd/sprites/back-shiny/407--0--Roserade.png diff --git a/src/afd/sprites/back-shiny/Rampardos.png b/src/afd/sprites/back-shiny/409--0--Rampardos.png similarity index 100% rename from src/afd/sprites/back-shiny/Rampardos.png rename to src/afd/sprites/back-shiny/409--0--Rampardos.png diff --git a/src/afd/sprites/back-shiny/Zubat.png b/src/afd/sprites/back-shiny/41--0--Zubat.png similarity index 100% rename from src/afd/sprites/back-shiny/Zubat.png rename to src/afd/sprites/back-shiny/41--0--Zubat.png diff --git a/src/afd/sprites/back-shiny/Shieldon.png b/src/afd/sprites/back-shiny/410--0--Shieldon.png similarity index 100% rename from src/afd/sprites/back-shiny/Shieldon.png rename to src/afd/sprites/back-shiny/410--0--Shieldon.png diff --git a/src/afd/sprites/back-shiny/Bastiodon.png b/src/afd/sprites/back-shiny/411--0--Bastiodon.png similarity index 100% rename from src/afd/sprites/back-shiny/Bastiodon.png rename to src/afd/sprites/back-shiny/411--0--Bastiodon.png diff --git a/src/afd/sprites/back-shiny/Burmy.png b/src/afd/sprites/back-shiny/412--0--Burmy.png similarity index 100% rename from src/afd/sprites/back-shiny/Burmy.png rename to src/afd/sprites/back-shiny/412--0--Burmy.png diff --git a/src/afd/sprites/back-shiny/Wormadam.png b/src/afd/sprites/back-shiny/413--0--Wormadam.png similarity index 100% rename from src/afd/sprites/back-shiny/Wormadam.png rename to src/afd/sprites/back-shiny/413--0--Wormadam.png diff --git a/src/afd/sprites/back-shiny/Wormadam--Sandy.png b/src/afd/sprites/back-shiny/413--420--Wormadam--Sandy.png similarity index 100% rename from src/afd/sprites/back-shiny/Wormadam--Sandy.png rename to src/afd/sprites/back-shiny/413--420--Wormadam--Sandy.png diff --git a/src/afd/sprites/back-shiny/Wormadam--Trash.png b/src/afd/sprites/back-shiny/413--420--Wormadam--Trash.png similarity index 100% rename from src/afd/sprites/back-shiny/Wormadam--Trash.png rename to src/afd/sprites/back-shiny/413--420--Wormadam--Trash.png diff --git a/src/afd/sprites/back-shiny/Mothim.png b/src/afd/sprites/back-shiny/414--0--Mothim.png similarity index 100% rename from src/afd/sprites/back-shiny/Mothim.png rename to src/afd/sprites/back-shiny/414--0--Mothim.png diff --git a/src/afd/sprites/back-shiny/Combee.png b/src/afd/sprites/back-shiny/415--0--Combee.png similarity index 100% rename from src/afd/sprites/back-shiny/Combee.png rename to src/afd/sprites/back-shiny/415--0--Combee.png diff --git a/src/afd/sprites/back-shiny/Vespiquen.png b/src/afd/sprites/back-shiny/416--0--Vespiquen.png similarity index 100% rename from src/afd/sprites/back-shiny/Vespiquen.png rename to src/afd/sprites/back-shiny/416--0--Vespiquen.png diff --git a/src/afd/sprites/back-shiny/Pachirisu.png b/src/afd/sprites/back-shiny/417--0--Pachirisu.png similarity index 100% rename from src/afd/sprites/back-shiny/Pachirisu.png rename to src/afd/sprites/back-shiny/417--0--Pachirisu.png diff --git a/src/afd/sprites/back-shiny/Buizel.png b/src/afd/sprites/back-shiny/418--0--Buizel.png similarity index 100% rename from src/afd/sprites/back-shiny/Buizel.png rename to src/afd/sprites/back-shiny/418--0--Buizel.png diff --git a/src/afd/sprites/back-shiny/Floatzel.png b/src/afd/sprites/back-shiny/419--0--Floatzel.png similarity index 100% rename from src/afd/sprites/back-shiny/Floatzel.png rename to src/afd/sprites/back-shiny/419--0--Floatzel.png diff --git a/src/afd/sprites/back-shiny/Golbat.png b/src/afd/sprites/back-shiny/42--0--Golbat.png similarity index 100% rename from src/afd/sprites/back-shiny/Golbat.png rename to src/afd/sprites/back-shiny/42--0--Golbat.png diff --git a/src/afd/sprites/back-shiny/Cherubi.png b/src/afd/sprites/back-shiny/420--0--Cherubi.png similarity index 100% rename from src/afd/sprites/back-shiny/Cherubi.png rename to src/afd/sprites/back-shiny/420--0--Cherubi.png diff --git a/src/afd/sprites/back-shiny/Cherrim.png b/src/afd/sprites/back-shiny/421--0--Cherrim.png similarity index 100% rename from src/afd/sprites/back-shiny/Cherrim.png rename to src/afd/sprites/back-shiny/421--0--Cherrim.png diff --git a/src/afd/sprites/back-shiny/Cherrim--Sunshine.png b/src/afd/sprites/back-shiny/421--420--Cherrim--Sunshine.png similarity index 100% rename from src/afd/sprites/back-shiny/Cherrim--Sunshine.png rename to src/afd/sprites/back-shiny/421--420--Cherrim--Sunshine.png diff --git a/src/afd/sprites/back-shiny/Shellos.png b/src/afd/sprites/back-shiny/422--0--Shellos.png similarity index 100% rename from src/afd/sprites/back-shiny/Shellos.png rename to src/afd/sprites/back-shiny/422--0--Shellos.png diff --git a/src/afd/sprites/back-shiny/Gastrodon.png b/src/afd/sprites/back-shiny/423--0--Gastrodon.png similarity index 100% rename from src/afd/sprites/back-shiny/Gastrodon.png rename to src/afd/sprites/back-shiny/423--0--Gastrodon.png diff --git a/src/afd/sprites/back-shiny/Ambipom.png b/src/afd/sprites/back-shiny/424--0--Ambipom.png similarity index 100% rename from src/afd/sprites/back-shiny/Ambipom.png rename to src/afd/sprites/back-shiny/424--0--Ambipom.png diff --git a/src/afd/sprites/back-shiny/Drifloon.png b/src/afd/sprites/back-shiny/425--0--Drifloon.png similarity index 100% rename from src/afd/sprites/back-shiny/Drifloon.png rename to src/afd/sprites/back-shiny/425--0--Drifloon.png diff --git a/src/afd/sprites/back-shiny/Drifblim.png b/src/afd/sprites/back-shiny/426--0--Drifblim.png similarity index 100% rename from src/afd/sprites/back-shiny/Drifblim.png rename to src/afd/sprites/back-shiny/426--0--Drifblim.png diff --git a/src/afd/sprites/back-shiny/Buneary.png b/src/afd/sprites/back-shiny/427--0--Buneary.png similarity index 100% rename from src/afd/sprites/back-shiny/Buneary.png rename to src/afd/sprites/back-shiny/427--0--Buneary.png diff --git a/src/afd/sprites/back-shiny/Lopunny.png b/src/afd/sprites/back-shiny/428--0--Lopunny.png similarity index 100% rename from src/afd/sprites/back-shiny/Lopunny.png rename to src/afd/sprites/back-shiny/428--0--Lopunny.png diff --git a/src/afd/sprites/back-shiny/Lopunny--Mega.png b/src/afd/sprites/back-shiny/428--420--Lopunny--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Lopunny--Mega.png rename to src/afd/sprites/back-shiny/428--420--Lopunny--Mega.png diff --git a/src/afd/sprites/back-shiny/Mismagius.png b/src/afd/sprites/back-shiny/429--0--Mismagius.png similarity index 100% rename from src/afd/sprites/back-shiny/Mismagius.png rename to src/afd/sprites/back-shiny/429--0--Mismagius.png diff --git a/src/afd/sprites/back-shiny/Oddish.png b/src/afd/sprites/back-shiny/43--0--Oddish.png similarity index 100% rename from src/afd/sprites/back-shiny/Oddish.png rename to src/afd/sprites/back-shiny/43--0--Oddish.png diff --git a/src/afd/sprites/back-shiny/Honchkrow.png b/src/afd/sprites/back-shiny/430--0--Honchkrow.png similarity index 100% rename from src/afd/sprites/back-shiny/Honchkrow.png rename to src/afd/sprites/back-shiny/430--0--Honchkrow.png diff --git a/src/afd/sprites/back-shiny/Glameow.png b/src/afd/sprites/back-shiny/431--0--Glameow.png similarity index 100% rename from src/afd/sprites/back-shiny/Glameow.png rename to src/afd/sprites/back-shiny/431--0--Glameow.png diff --git a/src/afd/sprites/back-shiny/Purugly.png b/src/afd/sprites/back-shiny/432--0--Purugly.png similarity index 100% rename from src/afd/sprites/back-shiny/Purugly.png rename to src/afd/sprites/back-shiny/432--0--Purugly.png diff --git a/src/afd/sprites/back-shiny/Chingling.png b/src/afd/sprites/back-shiny/433--0--Chingling.png similarity index 100% rename from src/afd/sprites/back-shiny/Chingling.png rename to src/afd/sprites/back-shiny/433--0--Chingling.png diff --git a/src/afd/sprites/back-shiny/Stunky.png b/src/afd/sprites/back-shiny/434--0--Stunky.png similarity index 100% rename from src/afd/sprites/back-shiny/Stunky.png rename to src/afd/sprites/back-shiny/434--0--Stunky.png diff --git a/src/afd/sprites/back-shiny/Bronzor.png b/src/afd/sprites/back-shiny/436--0--Bronzor.png similarity index 100% rename from src/afd/sprites/back-shiny/Bronzor.png rename to src/afd/sprites/back-shiny/436--0--Bronzor.png diff --git a/src/afd/sprites/back-shiny/Bronzong.png b/src/afd/sprites/back-shiny/437--0--Bronzong.png similarity index 100% rename from src/afd/sprites/back-shiny/Bronzong.png rename to src/afd/sprites/back-shiny/437--0--Bronzong.png diff --git a/src/afd/sprites/back-shiny/Bonsly.png b/src/afd/sprites/back-shiny/438--0--Bonsly.png similarity index 100% rename from src/afd/sprites/back-shiny/Bonsly.png rename to src/afd/sprites/back-shiny/438--0--Bonsly.png diff --git a/src/afd/sprites/back-shiny/Mime_Jr..png b/src/afd/sprites/back-shiny/439--0--Mime_Jr..png similarity index 100% rename from src/afd/sprites/back-shiny/Mime_Jr..png rename to src/afd/sprites/back-shiny/439--0--Mime_Jr..png diff --git a/src/afd/sprites/back-shiny/Gloom.png b/src/afd/sprites/back-shiny/44--0--Gloom.png similarity index 100% rename from src/afd/sprites/back-shiny/Gloom.png rename to src/afd/sprites/back-shiny/44--0--Gloom.png diff --git a/src/afd/sprites/back-shiny/Happiny.png b/src/afd/sprites/back-shiny/440--0--Happiny.png similarity index 100% rename from src/afd/sprites/back-shiny/Happiny.png rename to src/afd/sprites/back-shiny/440--0--Happiny.png diff --git a/src/afd/sprites/back-shiny/Chatot.png b/src/afd/sprites/back-shiny/441--0--Chatot.png similarity index 100% rename from src/afd/sprites/back-shiny/Chatot.png rename to src/afd/sprites/back-shiny/441--0--Chatot.png diff --git a/src/afd/sprites/back-shiny/Spiritomb.png b/src/afd/sprites/back-shiny/442--0--Spiritomb.png similarity index 100% rename from src/afd/sprites/back-shiny/Spiritomb.png rename to src/afd/sprites/back-shiny/442--0--Spiritomb.png diff --git a/src/afd/sprites/back-shiny/Gible.png b/src/afd/sprites/back-shiny/443--0--Gible.png similarity index 100% rename from src/afd/sprites/back-shiny/Gible.png rename to src/afd/sprites/back-shiny/443--0--Gible.png diff --git a/src/afd/sprites/back-shiny/Gabite.png b/src/afd/sprites/back-shiny/444--0--Gabite.png similarity index 100% rename from src/afd/sprites/back-shiny/Gabite.png rename to src/afd/sprites/back-shiny/444--0--Gabite.png diff --git a/src/afd/sprites/back-shiny/Garchomp.png b/src/afd/sprites/back-shiny/445--0--Garchomp.png similarity index 100% rename from src/afd/sprites/back-shiny/Garchomp.png rename to src/afd/sprites/back-shiny/445--0--Garchomp.png diff --git a/src/afd/sprites/back-shiny/Garchomp--Mega.png b/src/afd/sprites/back-shiny/445--420--Garchomp--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Garchomp--Mega.png rename to src/afd/sprites/back-shiny/445--420--Garchomp--Mega.png diff --git a/src/afd/sprites/back-shiny/Munchlax.png b/src/afd/sprites/back-shiny/446--0--Munchlax.png similarity index 100% rename from src/afd/sprites/back-shiny/Munchlax.png rename to src/afd/sprites/back-shiny/446--0--Munchlax.png diff --git a/src/afd/sprites/back-shiny/Riolu.png b/src/afd/sprites/back-shiny/447--0--Riolu.png similarity index 100% rename from src/afd/sprites/back-shiny/Riolu.png rename to src/afd/sprites/back-shiny/447--0--Riolu.png diff --git a/src/afd/sprites/back-shiny/Lucario.png b/src/afd/sprites/back-shiny/448--0--Lucario.png similarity index 100% rename from src/afd/sprites/back-shiny/Lucario.png rename to src/afd/sprites/back-shiny/448--0--Lucario.png diff --git a/src/afd/sprites/back-shiny/Lucario--Mega.png b/src/afd/sprites/back-shiny/448--420--Lucario--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Lucario--Mega.png rename to src/afd/sprites/back-shiny/448--420--Lucario--Mega.png diff --git a/src/afd/sprites/back-shiny/Hippopotas.png b/src/afd/sprites/back-shiny/449--0--Hippopotas.png similarity index 100% rename from src/afd/sprites/back-shiny/Hippopotas.png rename to src/afd/sprites/back-shiny/449--0--Hippopotas.png diff --git a/src/afd/sprites/back-shiny/Vileplume.png b/src/afd/sprites/back-shiny/45--0--Vileplume.png similarity index 100% rename from src/afd/sprites/back-shiny/Vileplume.png rename to src/afd/sprites/back-shiny/45--0--Vileplume.png diff --git a/src/afd/sprites/back-shiny/Hippowdon.png b/src/afd/sprites/back-shiny/450--0--Hippowdon.png similarity index 100% rename from src/afd/sprites/back-shiny/Hippowdon.png rename to src/afd/sprites/back-shiny/450--0--Hippowdon.png diff --git a/src/afd/sprites/back-shiny/Skorupi.png b/src/afd/sprites/back-shiny/451--0--Skorupi.png similarity index 100% rename from src/afd/sprites/back-shiny/Skorupi.png rename to src/afd/sprites/back-shiny/451--0--Skorupi.png diff --git a/src/afd/sprites/back-shiny/Drapion.png b/src/afd/sprites/back-shiny/452--0--Drapion.png similarity index 100% rename from src/afd/sprites/back-shiny/Drapion.png rename to src/afd/sprites/back-shiny/452--0--Drapion.png diff --git a/src/afd/sprites/back-shiny/Croagunk.png b/src/afd/sprites/back-shiny/453--0--Croagunk.png similarity index 100% rename from src/afd/sprites/back-shiny/Croagunk.png rename to src/afd/sprites/back-shiny/453--0--Croagunk.png diff --git a/src/afd/sprites/back-shiny/Toxicroak.png b/src/afd/sprites/back-shiny/454--0--Toxicroak.png similarity index 100% rename from src/afd/sprites/back-shiny/Toxicroak.png rename to src/afd/sprites/back-shiny/454--0--Toxicroak.png diff --git a/src/afd/sprites/back-shiny/Carnivine.png b/src/afd/sprites/back-shiny/455--0--Carnivine.png similarity index 100% rename from src/afd/sprites/back-shiny/Carnivine.png rename to src/afd/sprites/back-shiny/455--0--Carnivine.png diff --git a/src/afd/sprites/back-shiny/Finneon.png b/src/afd/sprites/back-shiny/456--0--Finneon.png similarity index 100% rename from src/afd/sprites/back-shiny/Finneon.png rename to src/afd/sprites/back-shiny/456--0--Finneon.png diff --git a/src/afd/sprites/back-shiny/Lumineon.png b/src/afd/sprites/back-shiny/457--0--Lumineon.png similarity index 100% rename from src/afd/sprites/back-shiny/Lumineon.png rename to src/afd/sprites/back-shiny/457--0--Lumineon.png diff --git a/src/afd/sprites/back-shiny/Mantyke.png b/src/afd/sprites/back-shiny/458--0--Mantyke.png similarity index 100% rename from src/afd/sprites/back-shiny/Mantyke.png rename to src/afd/sprites/back-shiny/458--0--Mantyke.png diff --git a/src/afd/sprites/back-shiny/Snover.png b/src/afd/sprites/back-shiny/459--0--Snover.png similarity index 100% rename from src/afd/sprites/back-shiny/Snover.png rename to src/afd/sprites/back-shiny/459--0--Snover.png diff --git a/src/afd/sprites/back-shiny/Paras.png b/src/afd/sprites/back-shiny/46--0--Paras.png similarity index 100% rename from src/afd/sprites/back-shiny/Paras.png rename to src/afd/sprites/back-shiny/46--0--Paras.png diff --git a/src/afd/sprites/back-shiny/Abomasnow.png b/src/afd/sprites/back-shiny/460--0--Abomasnow.png similarity index 100% rename from src/afd/sprites/back-shiny/Abomasnow.png rename to src/afd/sprites/back-shiny/460--0--Abomasnow.png diff --git a/src/afd/sprites/back-shiny/Abomasnow--Mega.png b/src/afd/sprites/back-shiny/460--420--Abomasnow--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Abomasnow--Mega.png rename to src/afd/sprites/back-shiny/460--420--Abomasnow--Mega.png diff --git a/src/afd/sprites/back-shiny/Weavile.png b/src/afd/sprites/back-shiny/461--0--Weavile.png similarity index 100% rename from src/afd/sprites/back-shiny/Weavile.png rename to src/afd/sprites/back-shiny/461--0--Weavile.png diff --git a/src/afd/sprites/back-shiny/Magnezone.png b/src/afd/sprites/back-shiny/462--0--Magnezone.png similarity index 100% rename from src/afd/sprites/back-shiny/Magnezone.png rename to src/afd/sprites/back-shiny/462--0--Magnezone.png diff --git a/src/afd/sprites/back-shiny/Lickilicky.png b/src/afd/sprites/back-shiny/463--0--Lickilicky.png similarity index 100% rename from src/afd/sprites/back-shiny/Lickilicky.png rename to src/afd/sprites/back-shiny/463--0--Lickilicky.png diff --git a/src/afd/sprites/back-shiny/Rhyperior.png b/src/afd/sprites/back-shiny/464--0--Rhyperior.png similarity index 100% rename from src/afd/sprites/back-shiny/Rhyperior.png rename to src/afd/sprites/back-shiny/464--0--Rhyperior.png diff --git a/src/afd/sprites/back-shiny/Tangrowth.png b/src/afd/sprites/back-shiny/465--0--Tangrowth.png similarity index 100% rename from src/afd/sprites/back-shiny/Tangrowth.png rename to src/afd/sprites/back-shiny/465--0--Tangrowth.png diff --git a/src/afd/sprites/back-shiny/Electivire.png b/src/afd/sprites/back-shiny/466--0--Electivire.png similarity index 100% rename from src/afd/sprites/back-shiny/Electivire.png rename to src/afd/sprites/back-shiny/466--0--Electivire.png diff --git a/src/afd/sprites/back-shiny/Togekiss.png b/src/afd/sprites/back-shiny/468--0--Togekiss.png similarity index 100% rename from src/afd/sprites/back-shiny/Togekiss.png rename to src/afd/sprites/back-shiny/468--0--Togekiss.png diff --git a/src/afd/sprites/back-shiny/Yanmega.png b/src/afd/sprites/back-shiny/469--0--Yanmega.png similarity index 100% rename from src/afd/sprites/back-shiny/Yanmega.png rename to src/afd/sprites/back-shiny/469--0--Yanmega.png diff --git a/src/afd/sprites/back-shiny/Parasect.png b/src/afd/sprites/back-shiny/47--0--Parasect.png similarity index 100% rename from src/afd/sprites/back-shiny/Parasect.png rename to src/afd/sprites/back-shiny/47--0--Parasect.png diff --git a/src/afd/sprites/back-shiny/Leafeon.png b/src/afd/sprites/back-shiny/470--0--Leafeon.png similarity index 100% rename from src/afd/sprites/back-shiny/Leafeon.png rename to src/afd/sprites/back-shiny/470--0--Leafeon.png diff --git a/src/afd/sprites/back-shiny/Glaceon.png b/src/afd/sprites/back-shiny/471--0--Glaceon.png similarity index 100% rename from src/afd/sprites/back-shiny/Glaceon.png rename to src/afd/sprites/back-shiny/471--0--Glaceon.png diff --git a/src/afd/sprites/back-shiny/Gliscor.png b/src/afd/sprites/back-shiny/472--0--Gliscor.png similarity index 100% rename from src/afd/sprites/back-shiny/Gliscor.png rename to src/afd/sprites/back-shiny/472--0--Gliscor.png diff --git a/src/afd/sprites/back-shiny/Mamoswine.png b/src/afd/sprites/back-shiny/473--0--Mamoswine.png similarity index 100% rename from src/afd/sprites/back-shiny/Mamoswine.png rename to src/afd/sprites/back-shiny/473--0--Mamoswine.png diff --git a/src/afd/sprites/back-shiny/Porygon-Z.png b/src/afd/sprites/back-shiny/474--0--Porygon-Z.png similarity index 100% rename from src/afd/sprites/back-shiny/Porygon-Z.png rename to src/afd/sprites/back-shiny/474--0--Porygon-Z.png diff --git a/src/afd/sprites/back-shiny/Gallade.png b/src/afd/sprites/back-shiny/475--0--Gallade.png similarity index 100% rename from src/afd/sprites/back-shiny/Gallade.png rename to src/afd/sprites/back-shiny/475--0--Gallade.png diff --git a/src/afd/sprites/back-shiny/Gallade--Mega.png b/src/afd/sprites/back-shiny/475--420--Gallade--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Gallade--Mega.png rename to src/afd/sprites/back-shiny/475--420--Gallade--Mega.png diff --git a/src/afd/sprites/back-shiny/Probopass.png b/src/afd/sprites/back-shiny/476--0--Probopass.png similarity index 100% rename from src/afd/sprites/back-shiny/Probopass.png rename to src/afd/sprites/back-shiny/476--0--Probopass.png diff --git a/src/afd/sprites/back-shiny/Dusknoir.png b/src/afd/sprites/back-shiny/477--0--Dusknoir.png similarity index 100% rename from src/afd/sprites/back-shiny/Dusknoir.png rename to src/afd/sprites/back-shiny/477--0--Dusknoir.png diff --git a/src/afd/sprites/back-shiny/Froslass.png b/src/afd/sprites/back-shiny/478--0--Froslass.png similarity index 100% rename from src/afd/sprites/back-shiny/Froslass.png rename to src/afd/sprites/back-shiny/478--0--Froslass.png diff --git a/src/afd/sprites/back-shiny/Rotom.png b/src/afd/sprites/back-shiny/479--0--Rotom.png similarity index 100% rename from src/afd/sprites/back-shiny/Rotom.png rename to src/afd/sprites/back-shiny/479--0--Rotom.png diff --git a/src/afd/sprites/back-shiny/Rotom--Fan.png b/src/afd/sprites/back-shiny/479--420--Rotom--Fan.png similarity index 100% rename from src/afd/sprites/back-shiny/Rotom--Fan.png rename to src/afd/sprites/back-shiny/479--420--Rotom--Fan.png diff --git a/src/afd/sprites/back-shiny/Rotom--Frost.png b/src/afd/sprites/back-shiny/479--420--Rotom--Frost.png similarity index 100% rename from src/afd/sprites/back-shiny/Rotom--Frost.png rename to src/afd/sprites/back-shiny/479--420--Rotom--Frost.png diff --git a/src/afd/sprites/back-shiny/Rotom--Heat.png b/src/afd/sprites/back-shiny/479--420--Rotom--Heat.png similarity index 100% rename from src/afd/sprites/back-shiny/Rotom--Heat.png rename to src/afd/sprites/back-shiny/479--420--Rotom--Heat.png diff --git a/src/afd/sprites/back-shiny/Rotom--Mow.png b/src/afd/sprites/back-shiny/479--420--Rotom--Mow.png similarity index 100% rename from src/afd/sprites/back-shiny/Rotom--Mow.png rename to src/afd/sprites/back-shiny/479--420--Rotom--Mow.png diff --git a/src/afd/sprites/back-shiny/Rotom--Wash.png b/src/afd/sprites/back-shiny/479--420--Rotom--Wash.png similarity index 100% rename from src/afd/sprites/back-shiny/Rotom--Wash.png rename to src/afd/sprites/back-shiny/479--420--Rotom--Wash.png diff --git a/src/afd/sprites/back-shiny/Venonat.png b/src/afd/sprites/back-shiny/48--0--Venonat.png similarity index 100% rename from src/afd/sprites/back-shiny/Venonat.png rename to src/afd/sprites/back-shiny/48--0--Venonat.png diff --git a/src/afd/sprites/back-shiny/Uxie.png b/src/afd/sprites/back-shiny/480--0--Uxie.png similarity index 100% rename from src/afd/sprites/back-shiny/Uxie.png rename to src/afd/sprites/back-shiny/480--0--Uxie.png diff --git a/src/afd/sprites/back-shiny/Mesprit.png b/src/afd/sprites/back-shiny/481--0--Mesprit.png similarity index 100% rename from src/afd/sprites/back-shiny/Mesprit.png rename to src/afd/sprites/back-shiny/481--0--Mesprit.png diff --git a/src/afd/sprites/back-shiny/Azelf.png b/src/afd/sprites/back-shiny/482--0--Azelf.png similarity index 100% rename from src/afd/sprites/back-shiny/Azelf.png rename to src/afd/sprites/back-shiny/482--0--Azelf.png diff --git a/src/afd/sprites/back-shiny/Dialga.png b/src/afd/sprites/back-shiny/483--0--Dialga.png similarity index 100% rename from src/afd/sprites/back-shiny/Dialga.png rename to src/afd/sprites/back-shiny/483--0--Dialga.png diff --git a/src/afd/sprites/back-shiny/Palkia.png b/src/afd/sprites/back-shiny/484--0--Palkia.png similarity index 100% rename from src/afd/sprites/back-shiny/Palkia.png rename to src/afd/sprites/back-shiny/484--0--Palkia.png diff --git a/src/afd/sprites/back-shiny/Heatran.png b/src/afd/sprites/back-shiny/485--0--Heatran.png similarity index 100% rename from src/afd/sprites/back-shiny/Heatran.png rename to src/afd/sprites/back-shiny/485--0--Heatran.png diff --git a/src/afd/sprites/back-shiny/Regigigas.png b/src/afd/sprites/back-shiny/486--0--Regigigas.png similarity index 100% rename from src/afd/sprites/back-shiny/Regigigas.png rename to src/afd/sprites/back-shiny/486--0--Regigigas.png diff --git a/src/afd/sprites/back-shiny/Giratina.png b/src/afd/sprites/back-shiny/487--0--Giratina.png similarity index 100% rename from src/afd/sprites/back-shiny/Giratina.png rename to src/afd/sprites/back-shiny/487--0--Giratina.png diff --git a/src/afd/sprites/back-shiny/Giratina--Origin.png b/src/afd/sprites/back-shiny/487--420--Giratina--Origin.png similarity index 100% rename from src/afd/sprites/back-shiny/Giratina--Origin.png rename to src/afd/sprites/back-shiny/487--420--Giratina--Origin.png diff --git a/src/afd/sprites/back-shiny/Cresselia.png b/src/afd/sprites/back-shiny/488--0--Cresselia.png similarity index 100% rename from src/afd/sprites/back-shiny/Cresselia.png rename to src/afd/sprites/back-shiny/488--0--Cresselia.png diff --git a/src/afd/sprites/back-shiny/Phione.png b/src/afd/sprites/back-shiny/489--0--Phione.png similarity index 100% rename from src/afd/sprites/back-shiny/Phione.png rename to src/afd/sprites/back-shiny/489--0--Phione.png diff --git a/src/afd/sprites/back-shiny/Venomoth.png b/src/afd/sprites/back-shiny/49--0--Venomoth.png similarity index 100% rename from src/afd/sprites/back-shiny/Venomoth.png rename to src/afd/sprites/back-shiny/49--0--Venomoth.png diff --git a/src/afd/sprites/back-shiny/Manaphy.png b/src/afd/sprites/back-shiny/490--0--Manaphy.png similarity index 100% rename from src/afd/sprites/back-shiny/Manaphy.png rename to src/afd/sprites/back-shiny/490--0--Manaphy.png diff --git a/src/afd/sprites/back-shiny/Darkrai.png b/src/afd/sprites/back-shiny/491--0--Darkrai.png similarity index 100% rename from src/afd/sprites/back-shiny/Darkrai.png rename to src/afd/sprites/back-shiny/491--0--Darkrai.png diff --git a/src/afd/sprites/back-shiny/Shaymin.png b/src/afd/sprites/back-shiny/492--0--Shaymin.png similarity index 100% rename from src/afd/sprites/back-shiny/Shaymin.png rename to src/afd/sprites/back-shiny/492--0--Shaymin.png diff --git a/src/afd/sprites/back-shiny/Shaymin--Sky.png b/src/afd/sprites/back-shiny/492--420--Shaymin--Sky.png similarity index 100% rename from src/afd/sprites/back-shiny/Shaymin--Sky.png rename to src/afd/sprites/back-shiny/492--420--Shaymin--Sky.png diff --git a/src/afd/sprites/back-shiny/Arceus.png b/src/afd/sprites/back-shiny/493--0--Arceus.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus.png rename to src/afd/sprites/back-shiny/493--0--Arceus.png diff --git a/src/afd/sprites/back-shiny/Arceus--Bug.png b/src/afd/sprites/back-shiny/493--420--Arceus--Bug.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Bug.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Bug.png diff --git a/src/afd/sprites/back-shiny/Arceus--Dark.png b/src/afd/sprites/back-shiny/493--420--Arceus--Dark.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Dark.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Dark.png diff --git a/src/afd/sprites/back-shiny/Arceus--Dragon.png b/src/afd/sprites/back-shiny/493--420--Arceus--Dragon.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Dragon.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Dragon.png diff --git a/src/afd/sprites/back-shiny/Arceus--Electric.png b/src/afd/sprites/back-shiny/493--420--Arceus--Electric.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Electric.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Electric.png diff --git a/src/afd/sprites/back-shiny/Arceus--Fairy.png b/src/afd/sprites/back-shiny/493--420--Arceus--Fairy.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Fairy.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Fairy.png diff --git a/src/afd/sprites/back-shiny/Arceus--Fighting.png b/src/afd/sprites/back-shiny/493--420--Arceus--Fighting.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Fighting.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Fighting.png diff --git a/src/afd/sprites/back-shiny/Arceus--Fire.png b/src/afd/sprites/back-shiny/493--420--Arceus--Fire.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Fire.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Fire.png diff --git a/src/afd/sprites/back-shiny/Arceus--Flying.png b/src/afd/sprites/back-shiny/493--420--Arceus--Flying.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Flying.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Flying.png diff --git a/src/afd/sprites/back-shiny/Arceus--Ghost.png b/src/afd/sprites/back-shiny/493--420--Arceus--Ghost.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Ghost.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Ghost.png diff --git a/src/afd/sprites/back-shiny/Arceus--Grass.png b/src/afd/sprites/back-shiny/493--420--Arceus--Grass.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Grass.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Grass.png diff --git a/src/afd/sprites/back-shiny/Arceus--Ground.png b/src/afd/sprites/back-shiny/493--420--Arceus--Ground.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Ground.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Ground.png diff --git a/src/afd/sprites/back-shiny/Arceus--Ice.png b/src/afd/sprites/back-shiny/493--420--Arceus--Ice.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Ice.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Ice.png diff --git a/src/afd/sprites/back-shiny/Arceus--Poison.png b/src/afd/sprites/back-shiny/493--420--Arceus--Poison.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Poison.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Poison.png diff --git a/src/afd/sprites/back-shiny/Arceus--Psychic.png b/src/afd/sprites/back-shiny/493--420--Arceus--Psychic.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Psychic.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Psychic.png diff --git a/src/afd/sprites/back-shiny/Arceus--Rock.png b/src/afd/sprites/back-shiny/493--420--Arceus--Rock.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Rock.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Rock.png diff --git a/src/afd/sprites/back-shiny/Arceus--Steel.png b/src/afd/sprites/back-shiny/493--420--Arceus--Steel.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Steel.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Steel.png diff --git a/src/afd/sprites/back-shiny/Arceus--Water.png b/src/afd/sprites/back-shiny/493--420--Arceus--Water.png similarity index 100% rename from src/afd/sprites/back-shiny/Arceus--Water.png rename to src/afd/sprites/back-shiny/493--420--Arceus--Water.png diff --git a/src/afd/sprites/back-shiny/Victini.png b/src/afd/sprites/back-shiny/494--0--Victini.png similarity index 100% rename from src/afd/sprites/back-shiny/Victini.png rename to src/afd/sprites/back-shiny/494--0--Victini.png diff --git a/src/afd/sprites/back-shiny/Snivy.png b/src/afd/sprites/back-shiny/495--0--Snivy.png similarity index 100% rename from src/afd/sprites/back-shiny/Snivy.png rename to src/afd/sprites/back-shiny/495--0--Snivy.png diff --git a/src/afd/sprites/back-shiny/Servine.png b/src/afd/sprites/back-shiny/496--0--Servine.png similarity index 100% rename from src/afd/sprites/back-shiny/Servine.png rename to src/afd/sprites/back-shiny/496--0--Servine.png diff --git a/src/afd/sprites/back-shiny/Serperior.png b/src/afd/sprites/back-shiny/497--0--Serperior.png similarity index 100% rename from src/afd/sprites/back-shiny/Serperior.png rename to src/afd/sprites/back-shiny/497--0--Serperior.png diff --git a/src/afd/sprites/back-shiny/Tepig.png b/src/afd/sprites/back-shiny/498--0--Tepig.png similarity index 100% rename from src/afd/sprites/back-shiny/Tepig.png rename to src/afd/sprites/back-shiny/498--0--Tepig.png diff --git a/src/afd/sprites/back-shiny/Pignite.png b/src/afd/sprites/back-shiny/499--0--Pignite.png similarity index 100% rename from src/afd/sprites/back-shiny/Pignite.png rename to src/afd/sprites/back-shiny/499--0--Pignite.png diff --git a/src/afd/sprites/back-shiny/Charmeleon.png b/src/afd/sprites/back-shiny/5--0--Charmeleon.png similarity index 100% rename from src/afd/sprites/back-shiny/Charmeleon.png rename to src/afd/sprites/back-shiny/5--0--Charmeleon.png diff --git a/src/afd/sprites/back-shiny/Diglett.png b/src/afd/sprites/back-shiny/50--0--Diglett.png similarity index 100% rename from src/afd/sprites/back-shiny/Diglett.png rename to src/afd/sprites/back-shiny/50--0--Diglett.png diff --git a/src/afd/sprites/back-shiny/Diglett--Alola.png b/src/afd/sprites/back-shiny/50--420--Diglett--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Diglett--Alola.png rename to src/afd/sprites/back-shiny/50--420--Diglett--Alola.png diff --git a/src/afd/sprites/back-shiny/Emboar.png b/src/afd/sprites/back-shiny/500--0--Emboar.png similarity index 100% rename from src/afd/sprites/back-shiny/Emboar.png rename to src/afd/sprites/back-shiny/500--0--Emboar.png diff --git a/src/afd/sprites/back-shiny/Oshawott.png b/src/afd/sprites/back-shiny/501--0--Oshawott.png similarity index 100% rename from src/afd/sprites/back-shiny/Oshawott.png rename to src/afd/sprites/back-shiny/501--0--Oshawott.png diff --git a/src/afd/sprites/back-shiny/Dewott.png b/src/afd/sprites/back-shiny/502--0--Dewott.png similarity index 100% rename from src/afd/sprites/back-shiny/Dewott.png rename to src/afd/sprites/back-shiny/502--0--Dewott.png diff --git a/src/afd/sprites/back-shiny/Samurott.png b/src/afd/sprites/back-shiny/503--0--Samurott.png similarity index 100% rename from src/afd/sprites/back-shiny/Samurott.png rename to src/afd/sprites/back-shiny/503--0--Samurott.png diff --git a/src/afd/sprites/back-shiny/Patrat.png b/src/afd/sprites/back-shiny/504--0--Patrat.png similarity index 100% rename from src/afd/sprites/back-shiny/Patrat.png rename to src/afd/sprites/back-shiny/504--0--Patrat.png diff --git a/src/afd/sprites/back-shiny/Watchog.png b/src/afd/sprites/back-shiny/505--0--Watchog.png similarity index 100% rename from src/afd/sprites/back-shiny/Watchog.png rename to src/afd/sprites/back-shiny/505--0--Watchog.png diff --git a/src/afd/sprites/back-shiny/Lillipup.png b/src/afd/sprites/back-shiny/506--0--Lillipup.png similarity index 100% rename from src/afd/sprites/back-shiny/Lillipup.png rename to src/afd/sprites/back-shiny/506--0--Lillipup.png diff --git a/src/afd/sprites/back-shiny/Herdier.png b/src/afd/sprites/back-shiny/507--0--Herdier.png similarity index 100% rename from src/afd/sprites/back-shiny/Herdier.png rename to src/afd/sprites/back-shiny/507--0--Herdier.png diff --git a/src/afd/sprites/back-shiny/Stoutland.png b/src/afd/sprites/back-shiny/508--0--Stoutland.png similarity index 100% rename from src/afd/sprites/back-shiny/Stoutland.png rename to src/afd/sprites/back-shiny/508--0--Stoutland.png diff --git a/src/afd/sprites/back-shiny/Purrloin.png b/src/afd/sprites/back-shiny/509--0--Purrloin.png similarity index 100% rename from src/afd/sprites/back-shiny/Purrloin.png rename to src/afd/sprites/back-shiny/509--0--Purrloin.png diff --git a/src/afd/sprites/back-shiny/Dugtrio.png b/src/afd/sprites/back-shiny/51--0--Dugtrio.png similarity index 100% rename from src/afd/sprites/back-shiny/Dugtrio.png rename to src/afd/sprites/back-shiny/51--0--Dugtrio.png diff --git a/src/afd/sprites/back-shiny/Dugtrio--Alola.png b/src/afd/sprites/back-shiny/51--420--Dugtrio--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Dugtrio--Alola.png rename to src/afd/sprites/back-shiny/51--420--Dugtrio--Alola.png diff --git a/src/afd/sprites/back-shiny/Liepard.png b/src/afd/sprites/back-shiny/510--0--Liepard.png similarity index 100% rename from src/afd/sprites/back-shiny/Liepard.png rename to src/afd/sprites/back-shiny/510--0--Liepard.png diff --git a/src/afd/sprites/back-shiny/Pansage.png b/src/afd/sprites/back-shiny/511--0--Pansage.png similarity index 100% rename from src/afd/sprites/back-shiny/Pansage.png rename to src/afd/sprites/back-shiny/511--0--Pansage.png diff --git a/src/afd/sprites/back-shiny/Simisage.png b/src/afd/sprites/back-shiny/512--0--Simisage.png similarity index 100% rename from src/afd/sprites/back-shiny/Simisage.png rename to src/afd/sprites/back-shiny/512--0--Simisage.png diff --git a/src/afd/sprites/back-shiny/Pansear.png b/src/afd/sprites/back-shiny/513--0--Pansear.png similarity index 100% rename from src/afd/sprites/back-shiny/Pansear.png rename to src/afd/sprites/back-shiny/513--0--Pansear.png diff --git a/src/afd/sprites/back-shiny/Simisear.png b/src/afd/sprites/back-shiny/514--0--Simisear.png similarity index 100% rename from src/afd/sprites/back-shiny/Simisear.png rename to src/afd/sprites/back-shiny/514--0--Simisear.png diff --git a/src/afd/sprites/back-shiny/Panpour.png b/src/afd/sprites/back-shiny/515--0--Panpour.png similarity index 100% rename from src/afd/sprites/back-shiny/Panpour.png rename to src/afd/sprites/back-shiny/515--0--Panpour.png diff --git a/src/afd/sprites/back-shiny/Simipour.png b/src/afd/sprites/back-shiny/516--0--Simipour.png similarity index 100% rename from src/afd/sprites/back-shiny/Simipour.png rename to src/afd/sprites/back-shiny/516--0--Simipour.png diff --git a/src/afd/sprites/back-shiny/Munna.png b/src/afd/sprites/back-shiny/517--0--Munna.png similarity index 100% rename from src/afd/sprites/back-shiny/Munna.png rename to src/afd/sprites/back-shiny/517--0--Munna.png diff --git a/src/afd/sprites/back-shiny/Musharna.png b/src/afd/sprites/back-shiny/518--0--Musharna.png similarity index 100% rename from src/afd/sprites/back-shiny/Musharna.png rename to src/afd/sprites/back-shiny/518--0--Musharna.png diff --git a/src/afd/sprites/back-shiny/Pidove.png b/src/afd/sprites/back-shiny/519--0--Pidove.png similarity index 100% rename from src/afd/sprites/back-shiny/Pidove.png rename to src/afd/sprites/back-shiny/519--0--Pidove.png diff --git a/src/afd/sprites/back-shiny/Meowth.png b/src/afd/sprites/back-shiny/52--0--Meowth.png similarity index 100% rename from src/afd/sprites/back-shiny/Meowth.png rename to src/afd/sprites/back-shiny/52--0--Meowth.png diff --git a/src/afd/sprites/back-shiny/Meowth--Alola.png b/src/afd/sprites/back-shiny/52--420--Meowth--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Meowth--Alola.png rename to src/afd/sprites/back-shiny/52--420--Meowth--Alola.png diff --git a/src/afd/sprites/back-shiny/Meowth--Galar.png b/src/afd/sprites/back-shiny/52--420--Meowth--Galar.png similarity index 100% rename from src/afd/sprites/back-shiny/Meowth--Galar.png rename to src/afd/sprites/back-shiny/52--420--Meowth--Galar.png diff --git a/src/afd/sprites/back-shiny/Meowth--Gmax.png b/src/afd/sprites/back-shiny/52--420--Meowth--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Meowth--Gmax.png rename to src/afd/sprites/back-shiny/52--420--Meowth--Gmax.png diff --git a/src/afd/sprites/back-shiny/Tranquill.png b/src/afd/sprites/back-shiny/520--0--Tranquill.png similarity index 100% rename from src/afd/sprites/back-shiny/Tranquill.png rename to src/afd/sprites/back-shiny/520--0--Tranquill.png diff --git a/src/afd/sprites/back-shiny/Unfezant.png b/src/afd/sprites/back-shiny/521--0--Unfezant.png similarity index 100% rename from src/afd/sprites/back-shiny/Unfezant.png rename to src/afd/sprites/back-shiny/521--0--Unfezant.png diff --git a/src/afd/sprites/back-shiny/Blitzle.png b/src/afd/sprites/back-shiny/522--0--Blitzle.png similarity index 100% rename from src/afd/sprites/back-shiny/Blitzle.png rename to src/afd/sprites/back-shiny/522--0--Blitzle.png diff --git a/src/afd/sprites/back-shiny/Zebstrika.png b/src/afd/sprites/back-shiny/523--0--Zebstrika.png similarity index 100% rename from src/afd/sprites/back-shiny/Zebstrika.png rename to src/afd/sprites/back-shiny/523--0--Zebstrika.png diff --git a/src/afd/sprites/back-shiny/Roggenrola.png b/src/afd/sprites/back-shiny/524--0--Roggenrola.png similarity index 100% rename from src/afd/sprites/back-shiny/Roggenrola.png rename to src/afd/sprites/back-shiny/524--0--Roggenrola.png diff --git a/src/afd/sprites/back-shiny/Boldore.png b/src/afd/sprites/back-shiny/525--0--Boldore.png similarity index 100% rename from src/afd/sprites/back-shiny/Boldore.png rename to src/afd/sprites/back-shiny/525--0--Boldore.png diff --git a/src/afd/sprites/back-shiny/Gigalith.png b/src/afd/sprites/back-shiny/526--0--Gigalith.png similarity index 100% rename from src/afd/sprites/back-shiny/Gigalith.png rename to src/afd/sprites/back-shiny/526--0--Gigalith.png diff --git a/src/afd/sprites/back-shiny/Woobat.png b/src/afd/sprites/back-shiny/527--0--Woobat.png similarity index 100% rename from src/afd/sprites/back-shiny/Woobat.png rename to src/afd/sprites/back-shiny/527--0--Woobat.png diff --git a/src/afd/sprites/back-shiny/Swoobat.png b/src/afd/sprites/back-shiny/528--0--Swoobat.png similarity index 100% rename from src/afd/sprites/back-shiny/Swoobat.png rename to src/afd/sprites/back-shiny/528--0--Swoobat.png diff --git a/src/afd/sprites/back-shiny/Drilbur.png b/src/afd/sprites/back-shiny/529--0--Drilbur.png similarity index 100% rename from src/afd/sprites/back-shiny/Drilbur.png rename to src/afd/sprites/back-shiny/529--0--Drilbur.png diff --git a/src/afd/sprites/back-shiny/Persian.png b/src/afd/sprites/back-shiny/53--0--Persian.png similarity index 100% rename from src/afd/sprites/back-shiny/Persian.png rename to src/afd/sprites/back-shiny/53--0--Persian.png diff --git a/src/afd/sprites/back-shiny/Persian--Alola.png b/src/afd/sprites/back-shiny/53--420--Persian--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Persian--Alola.png rename to src/afd/sprites/back-shiny/53--420--Persian--Alola.png diff --git a/src/afd/sprites/back-shiny/Excadrill.png b/src/afd/sprites/back-shiny/530--0--Excadrill.png similarity index 100% rename from src/afd/sprites/back-shiny/Excadrill.png rename to src/afd/sprites/back-shiny/530--0--Excadrill.png diff --git a/src/afd/sprites/back-shiny/Audino.png b/src/afd/sprites/back-shiny/531--0--Audino.png similarity index 100% rename from src/afd/sprites/back-shiny/Audino.png rename to src/afd/sprites/back-shiny/531--0--Audino.png diff --git a/src/afd/sprites/back-shiny/Audino--Mega.png b/src/afd/sprites/back-shiny/531--420--Audino--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Audino--Mega.png rename to src/afd/sprites/back-shiny/531--420--Audino--Mega.png diff --git a/src/afd/sprites/back-shiny/Timburr.png b/src/afd/sprites/back-shiny/532--0--Timburr.png similarity index 100% rename from src/afd/sprites/back-shiny/Timburr.png rename to src/afd/sprites/back-shiny/532--0--Timburr.png diff --git a/src/afd/sprites/back-shiny/Gurdurr.png b/src/afd/sprites/back-shiny/533--0--Gurdurr.png similarity index 100% rename from src/afd/sprites/back-shiny/Gurdurr.png rename to src/afd/sprites/back-shiny/533--0--Gurdurr.png diff --git a/src/afd/sprites/back-shiny/Conkeldurr.png b/src/afd/sprites/back-shiny/534--0--Conkeldurr.png similarity index 100% rename from src/afd/sprites/back-shiny/Conkeldurr.png rename to src/afd/sprites/back-shiny/534--0--Conkeldurr.png diff --git a/src/afd/sprites/back-shiny/Tympole.png b/src/afd/sprites/back-shiny/535--0--Tympole.png similarity index 100% rename from src/afd/sprites/back-shiny/Tympole.png rename to src/afd/sprites/back-shiny/535--0--Tympole.png diff --git a/src/afd/sprites/back-shiny/Palpitoad.png b/src/afd/sprites/back-shiny/536--0--Palpitoad.png similarity index 100% rename from src/afd/sprites/back-shiny/Palpitoad.png rename to src/afd/sprites/back-shiny/536--0--Palpitoad.png diff --git a/src/afd/sprites/back-shiny/Seismitoad.png b/src/afd/sprites/back-shiny/537--0--Seismitoad.png similarity index 100% rename from src/afd/sprites/back-shiny/Seismitoad.png rename to src/afd/sprites/back-shiny/537--0--Seismitoad.png diff --git a/src/afd/sprites/back-shiny/Throh.png b/src/afd/sprites/back-shiny/538--0--Throh.png similarity index 100% rename from src/afd/sprites/back-shiny/Throh.png rename to src/afd/sprites/back-shiny/538--0--Throh.png diff --git a/src/afd/sprites/back-shiny/Sawk.png b/src/afd/sprites/back-shiny/539--0--Sawk.png similarity index 100% rename from src/afd/sprites/back-shiny/Sawk.png rename to src/afd/sprites/back-shiny/539--0--Sawk.png diff --git a/src/afd/sprites/back-shiny/Psyduck.png b/src/afd/sprites/back-shiny/54--0--Psyduck.png similarity index 100% rename from src/afd/sprites/back-shiny/Psyduck.png rename to src/afd/sprites/back-shiny/54--0--Psyduck.png diff --git a/src/afd/sprites/back-shiny/Sewaddle.png b/src/afd/sprites/back-shiny/540--0--Sewaddle.png similarity index 100% rename from src/afd/sprites/back-shiny/Sewaddle.png rename to src/afd/sprites/back-shiny/540--0--Sewaddle.png diff --git a/src/afd/sprites/back-shiny/Swadloon.png b/src/afd/sprites/back-shiny/541--0--Swadloon.png similarity index 100% rename from src/afd/sprites/back-shiny/Swadloon.png rename to src/afd/sprites/back-shiny/541--0--Swadloon.png diff --git a/src/afd/sprites/back-shiny/Leavanny.png b/src/afd/sprites/back-shiny/542--0--Leavanny.png similarity index 100% rename from src/afd/sprites/back-shiny/Leavanny.png rename to src/afd/sprites/back-shiny/542--0--Leavanny.png diff --git a/src/afd/sprites/back-shiny/Venipede.png b/src/afd/sprites/back-shiny/543--0--Venipede.png similarity index 100% rename from src/afd/sprites/back-shiny/Venipede.png rename to src/afd/sprites/back-shiny/543--0--Venipede.png diff --git a/src/afd/sprites/back-shiny/Whirlipede.png b/src/afd/sprites/back-shiny/544--0--Whirlipede.png similarity index 100% rename from src/afd/sprites/back-shiny/Whirlipede.png rename to src/afd/sprites/back-shiny/544--0--Whirlipede.png diff --git a/src/afd/sprites/back-shiny/Scolipede.png b/src/afd/sprites/back-shiny/545--0--Scolipede.png similarity index 100% rename from src/afd/sprites/back-shiny/Scolipede.png rename to src/afd/sprites/back-shiny/545--0--Scolipede.png diff --git a/src/afd/sprites/back-shiny/Cottonee.png b/src/afd/sprites/back-shiny/546--0--Cottonee.png similarity index 100% rename from src/afd/sprites/back-shiny/Cottonee.png rename to src/afd/sprites/back-shiny/546--0--Cottonee.png diff --git a/src/afd/sprites/back-shiny/Whimsicott.png b/src/afd/sprites/back-shiny/547--0--Whimsicott.png similarity index 100% rename from src/afd/sprites/back-shiny/Whimsicott.png rename to src/afd/sprites/back-shiny/547--0--Whimsicott.png diff --git a/src/afd/sprites/back-shiny/Petilil.png b/src/afd/sprites/back-shiny/548--0--Petilil.png similarity index 100% rename from src/afd/sprites/back-shiny/Petilil.png rename to src/afd/sprites/back-shiny/548--0--Petilil.png diff --git a/src/afd/sprites/back-shiny/Lilligant.png b/src/afd/sprites/back-shiny/549--0--Lilligant.png similarity index 100% rename from src/afd/sprites/back-shiny/Lilligant.png rename to src/afd/sprites/back-shiny/549--0--Lilligant.png diff --git a/src/afd/sprites/back-shiny/Golduck.png b/src/afd/sprites/back-shiny/55--0--Golduck.png similarity index 100% rename from src/afd/sprites/back-shiny/Golduck.png rename to src/afd/sprites/back-shiny/55--0--Golduck.png diff --git a/src/afd/sprites/back-shiny/Basculin.png b/src/afd/sprites/back-shiny/550--0--Basculin.png similarity index 100% rename from src/afd/sprites/back-shiny/Basculin.png rename to src/afd/sprites/back-shiny/550--0--Basculin.png diff --git a/src/afd/sprites/back-shiny/Sandile.png b/src/afd/sprites/back-shiny/551--0--Sandile.png similarity index 100% rename from src/afd/sprites/back-shiny/Sandile.png rename to src/afd/sprites/back-shiny/551--0--Sandile.png diff --git a/src/afd/sprites/back-shiny/Krokorok.png b/src/afd/sprites/back-shiny/552--0--Krokorok.png similarity index 100% rename from src/afd/sprites/back-shiny/Krokorok.png rename to src/afd/sprites/back-shiny/552--0--Krokorok.png diff --git a/src/afd/sprites/back-shiny/Krookodile.png b/src/afd/sprites/back-shiny/553--0--Krookodile.png similarity index 100% rename from src/afd/sprites/back-shiny/Krookodile.png rename to src/afd/sprites/back-shiny/553--0--Krookodile.png diff --git a/src/afd/sprites/back-shiny/Darumaka.png b/src/afd/sprites/back-shiny/554--0--Darumaka.png similarity index 100% rename from src/afd/sprites/back-shiny/Darumaka.png rename to src/afd/sprites/back-shiny/554--0--Darumaka.png diff --git a/src/afd/sprites/back-shiny/Darumaka--Galar.png b/src/afd/sprites/back-shiny/554--420--Darumaka--Galar.png similarity index 100% rename from src/afd/sprites/back-shiny/Darumaka--Galar.png rename to src/afd/sprites/back-shiny/554--420--Darumaka--Galar.png diff --git a/src/afd/sprites/back-shiny/Darmanitan.png b/src/afd/sprites/back-shiny/555--0--Darmanitan.png similarity index 100% rename from src/afd/sprites/back-shiny/Darmanitan.png rename to src/afd/sprites/back-shiny/555--0--Darmanitan.png diff --git a/src/afd/sprites/back-shiny/Darmanitan--Galar-Zen.png b/src/afd/sprites/back-shiny/555--420--Darmanitan--Galar-Zen.png similarity index 100% rename from src/afd/sprites/back-shiny/Darmanitan--Galar-Zen.png rename to src/afd/sprites/back-shiny/555--420--Darmanitan--Galar-Zen.png diff --git a/src/afd/sprites/back-shiny/Darmanitan--Galar.png b/src/afd/sprites/back-shiny/555--420--Darmanitan--Galar.png similarity index 100% rename from src/afd/sprites/back-shiny/Darmanitan--Galar.png rename to src/afd/sprites/back-shiny/555--420--Darmanitan--Galar.png diff --git a/src/afd/sprites/back-shiny/Darmanitan--Zen.png b/src/afd/sprites/back-shiny/555--420--Darmanitan--Zen.png similarity index 100% rename from src/afd/sprites/back-shiny/Darmanitan--Zen.png rename to src/afd/sprites/back-shiny/555--420--Darmanitan--Zen.png diff --git a/src/afd/sprites/back-shiny/Maractus.png b/src/afd/sprites/back-shiny/556--0--Maractus.png similarity index 100% rename from src/afd/sprites/back-shiny/Maractus.png rename to src/afd/sprites/back-shiny/556--0--Maractus.png diff --git a/src/afd/sprites/back-shiny/Dwebble.png b/src/afd/sprites/back-shiny/557--0--Dwebble.png similarity index 100% rename from src/afd/sprites/back-shiny/Dwebble.png rename to src/afd/sprites/back-shiny/557--0--Dwebble.png diff --git a/src/afd/sprites/back-shiny/Crustle.png b/src/afd/sprites/back-shiny/558--0--Crustle.png similarity index 100% rename from src/afd/sprites/back-shiny/Crustle.png rename to src/afd/sprites/back-shiny/558--0--Crustle.png diff --git a/src/afd/sprites/back-shiny/Scraggy.png b/src/afd/sprites/back-shiny/559--0--Scraggy.png similarity index 100% rename from src/afd/sprites/back-shiny/Scraggy.png rename to src/afd/sprites/back-shiny/559--0--Scraggy.png diff --git a/src/afd/sprites/back-shiny/Mankey.png b/src/afd/sprites/back-shiny/56--0--Mankey.png similarity index 100% rename from src/afd/sprites/back-shiny/Mankey.png rename to src/afd/sprites/back-shiny/56--0--Mankey.png diff --git a/src/afd/sprites/back-shiny/Scrafty.png b/src/afd/sprites/back-shiny/560--0--Scrafty.png similarity index 100% rename from src/afd/sprites/back-shiny/Scrafty.png rename to src/afd/sprites/back-shiny/560--0--Scrafty.png diff --git a/src/afd/sprites/back-shiny/Sigilyph.png b/src/afd/sprites/back-shiny/561--0--Sigilyph.png similarity index 100% rename from src/afd/sprites/back-shiny/Sigilyph.png rename to src/afd/sprites/back-shiny/561--0--Sigilyph.png diff --git a/src/afd/sprites/back-shiny/Yamask.png b/src/afd/sprites/back-shiny/562--0--Yamask.png similarity index 100% rename from src/afd/sprites/back-shiny/Yamask.png rename to src/afd/sprites/back-shiny/562--0--Yamask.png diff --git a/src/afd/sprites/back-shiny/Yamask--Galar.png b/src/afd/sprites/back-shiny/562--420--Yamask--Galar.png similarity index 100% rename from src/afd/sprites/back-shiny/Yamask--Galar.png rename to src/afd/sprites/back-shiny/562--420--Yamask--Galar.png diff --git a/src/afd/sprites/back-shiny/Cofagrigus.png b/src/afd/sprites/back-shiny/563--0--Cofagrigus.png similarity index 100% rename from src/afd/sprites/back-shiny/Cofagrigus.png rename to src/afd/sprites/back-shiny/563--0--Cofagrigus.png diff --git a/src/afd/sprites/back-shiny/Tirtouga.png b/src/afd/sprites/back-shiny/564--0--Tirtouga.png similarity index 100% rename from src/afd/sprites/back-shiny/Tirtouga.png rename to src/afd/sprites/back-shiny/564--0--Tirtouga.png diff --git a/src/afd/sprites/back-shiny/Carracosta.png b/src/afd/sprites/back-shiny/565--0--Carracosta.png similarity index 100% rename from src/afd/sprites/back-shiny/Carracosta.png rename to src/afd/sprites/back-shiny/565--0--Carracosta.png diff --git a/src/afd/sprites/back-shiny/Archen.png b/src/afd/sprites/back-shiny/566--0--Archen.png similarity index 100% rename from src/afd/sprites/back-shiny/Archen.png rename to src/afd/sprites/back-shiny/566--0--Archen.png diff --git a/src/afd/sprites/back-shiny/Archeops.png b/src/afd/sprites/back-shiny/567--0--Archeops.png similarity index 100% rename from src/afd/sprites/back-shiny/Archeops.png rename to src/afd/sprites/back-shiny/567--0--Archeops.png diff --git a/src/afd/sprites/back-shiny/Trubbish.png b/src/afd/sprites/back-shiny/568--0--Trubbish.png similarity index 100% rename from src/afd/sprites/back-shiny/Trubbish.png rename to src/afd/sprites/back-shiny/568--0--Trubbish.png diff --git a/src/afd/sprites/back-shiny/Garbodor.png b/src/afd/sprites/back-shiny/569--0--Garbodor.png similarity index 100% rename from src/afd/sprites/back-shiny/Garbodor.png rename to src/afd/sprites/back-shiny/569--0--Garbodor.png diff --git a/src/afd/sprites/back-shiny/Garbodor--Gmax.png b/src/afd/sprites/back-shiny/569--420--Garbodor--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Garbodor--Gmax.png rename to src/afd/sprites/back-shiny/569--420--Garbodor--Gmax.png diff --git a/src/afd/sprites/back-shiny/Primeape.png b/src/afd/sprites/back-shiny/57--0--Primeape.png similarity index 100% rename from src/afd/sprites/back-shiny/Primeape.png rename to src/afd/sprites/back-shiny/57--0--Primeape.png diff --git a/src/afd/sprites/back-shiny/Zorua.png b/src/afd/sprites/back-shiny/570--0--Zorua.png similarity index 100% rename from src/afd/sprites/back-shiny/Zorua.png rename to src/afd/sprites/back-shiny/570--0--Zorua.png diff --git a/src/afd/sprites/back-shiny/Zoroark.png b/src/afd/sprites/back-shiny/571--0--Zoroark.png similarity index 100% rename from src/afd/sprites/back-shiny/Zoroark.png rename to src/afd/sprites/back-shiny/571--0--Zoroark.png diff --git a/src/afd/sprites/back-shiny/Minccino.png b/src/afd/sprites/back-shiny/572--0--Minccino.png similarity index 100% rename from src/afd/sprites/back-shiny/Minccino.png rename to src/afd/sprites/back-shiny/572--0--Minccino.png diff --git a/src/afd/sprites/back-shiny/Cinccino.png b/src/afd/sprites/back-shiny/573--0--Cinccino.png similarity index 100% rename from src/afd/sprites/back-shiny/Cinccino.png rename to src/afd/sprites/back-shiny/573--0--Cinccino.png diff --git a/src/afd/sprites/back-shiny/Gothita.png b/src/afd/sprites/back-shiny/574--0--Gothita.png similarity index 100% rename from src/afd/sprites/back-shiny/Gothita.png rename to src/afd/sprites/back-shiny/574--0--Gothita.png diff --git a/src/afd/sprites/back-shiny/Gothorita.png b/src/afd/sprites/back-shiny/575--0--Gothorita.png similarity index 100% rename from src/afd/sprites/back-shiny/Gothorita.png rename to src/afd/sprites/back-shiny/575--0--Gothorita.png diff --git a/src/afd/sprites/back-shiny/Gothitelle.png b/src/afd/sprites/back-shiny/576--0--Gothitelle.png similarity index 100% rename from src/afd/sprites/back-shiny/Gothitelle.png rename to src/afd/sprites/back-shiny/576--0--Gothitelle.png diff --git a/src/afd/sprites/back-shiny/Solosis.png b/src/afd/sprites/back-shiny/577--0--Solosis.png similarity index 100% rename from src/afd/sprites/back-shiny/Solosis.png rename to src/afd/sprites/back-shiny/577--0--Solosis.png diff --git a/src/afd/sprites/back-shiny/Duosion.png b/src/afd/sprites/back-shiny/578--0--Duosion.png similarity index 100% rename from src/afd/sprites/back-shiny/Duosion.png rename to src/afd/sprites/back-shiny/578--0--Duosion.png diff --git a/src/afd/sprites/back-shiny/Reuniclus.png b/src/afd/sprites/back-shiny/579--0--Reuniclus.png similarity index 100% rename from src/afd/sprites/back-shiny/Reuniclus.png rename to src/afd/sprites/back-shiny/579--0--Reuniclus.png diff --git a/src/afd/sprites/back-shiny/Growlithe.png b/src/afd/sprites/back-shiny/58--0--Growlithe.png similarity index 100% rename from src/afd/sprites/back-shiny/Growlithe.png rename to src/afd/sprites/back-shiny/58--0--Growlithe.png diff --git a/src/afd/sprites/back-shiny/Ducklett.png b/src/afd/sprites/back-shiny/580--0--Ducklett.png similarity index 100% rename from src/afd/sprites/back-shiny/Ducklett.png rename to src/afd/sprites/back-shiny/580--0--Ducklett.png diff --git a/src/afd/sprites/back-shiny/Swanna.png b/src/afd/sprites/back-shiny/581--0--Swanna.png similarity index 100% rename from src/afd/sprites/back-shiny/Swanna.png rename to src/afd/sprites/back-shiny/581--0--Swanna.png diff --git a/src/afd/sprites/back-shiny/Vanillite.png b/src/afd/sprites/back-shiny/582--0--Vanillite.png similarity index 100% rename from src/afd/sprites/back-shiny/Vanillite.png rename to src/afd/sprites/back-shiny/582--0--Vanillite.png diff --git a/src/afd/sprites/back-shiny/Vanillish.png b/src/afd/sprites/back-shiny/583--0--Vanillish.png similarity index 100% rename from src/afd/sprites/back-shiny/Vanillish.png rename to src/afd/sprites/back-shiny/583--0--Vanillish.png diff --git a/src/afd/sprites/back-shiny/Vanilluxe.png b/src/afd/sprites/back-shiny/584--0--Vanilluxe.png similarity index 100% rename from src/afd/sprites/back-shiny/Vanilluxe.png rename to src/afd/sprites/back-shiny/584--0--Vanilluxe.png diff --git a/src/afd/sprites/back-shiny/Deerling.png b/src/afd/sprites/back-shiny/585--0--Deerling.png similarity index 100% rename from src/afd/sprites/back-shiny/Deerling.png rename to src/afd/sprites/back-shiny/585--0--Deerling.png diff --git a/src/afd/sprites/back-shiny/Sawsbuck.png b/src/afd/sprites/back-shiny/586--0--Sawsbuck.png similarity index 100% rename from src/afd/sprites/back-shiny/Sawsbuck.png rename to src/afd/sprites/back-shiny/586--0--Sawsbuck.png diff --git a/src/afd/sprites/back-shiny/Emolga.png b/src/afd/sprites/back-shiny/587--0--Emolga.png similarity index 100% rename from src/afd/sprites/back-shiny/Emolga.png rename to src/afd/sprites/back-shiny/587--0--Emolga.png diff --git a/src/afd/sprites/back-shiny/Karrablast.png b/src/afd/sprites/back-shiny/588--0--Karrablast.png similarity index 100% rename from src/afd/sprites/back-shiny/Karrablast.png rename to src/afd/sprites/back-shiny/588--0--Karrablast.png diff --git a/src/afd/sprites/back-shiny/Escavalier.png b/src/afd/sprites/back-shiny/589--0--Escavalier.png similarity index 100% rename from src/afd/sprites/back-shiny/Escavalier.png rename to src/afd/sprites/back-shiny/589--0--Escavalier.png diff --git a/src/afd/sprites/back-shiny/Arcanine.png b/src/afd/sprites/back-shiny/59--0--Arcanine.png similarity index 100% rename from src/afd/sprites/back-shiny/Arcanine.png rename to src/afd/sprites/back-shiny/59--0--Arcanine.png diff --git a/src/afd/sprites/back-shiny/Foongus.png b/src/afd/sprites/back-shiny/590--0--Foongus.png similarity index 100% rename from src/afd/sprites/back-shiny/Foongus.png rename to src/afd/sprites/back-shiny/590--0--Foongus.png diff --git a/src/afd/sprites/back-shiny/Amoonguss.png b/src/afd/sprites/back-shiny/591--0--Amoonguss.png similarity index 100% rename from src/afd/sprites/back-shiny/Amoonguss.png rename to src/afd/sprites/back-shiny/591--0--Amoonguss.png diff --git a/src/afd/sprites/back-shiny/Frillish.png b/src/afd/sprites/back-shiny/592--0--Frillish.png similarity index 100% rename from src/afd/sprites/back-shiny/Frillish.png rename to src/afd/sprites/back-shiny/592--0--Frillish.png diff --git a/src/afd/sprites/back-shiny/Jellicent.png b/src/afd/sprites/back-shiny/593--0--Jellicent.png similarity index 100% rename from src/afd/sprites/back-shiny/Jellicent.png rename to src/afd/sprites/back-shiny/593--0--Jellicent.png diff --git a/src/afd/sprites/back-shiny/Alomomola.png b/src/afd/sprites/back-shiny/594--0--Alomomola.png similarity index 100% rename from src/afd/sprites/back-shiny/Alomomola.png rename to src/afd/sprites/back-shiny/594--0--Alomomola.png diff --git a/src/afd/sprites/back-shiny/Joltik.png b/src/afd/sprites/back-shiny/595--0--Joltik.png similarity index 100% rename from src/afd/sprites/back-shiny/Joltik.png rename to src/afd/sprites/back-shiny/595--0--Joltik.png diff --git a/src/afd/sprites/back-shiny/Galvantula.png b/src/afd/sprites/back-shiny/596--0--Galvantula.png similarity index 100% rename from src/afd/sprites/back-shiny/Galvantula.png rename to src/afd/sprites/back-shiny/596--0--Galvantula.png diff --git a/src/afd/sprites/back-shiny/Ferroseed.png b/src/afd/sprites/back-shiny/597--0--Ferroseed.png similarity index 100% rename from src/afd/sprites/back-shiny/Ferroseed.png rename to src/afd/sprites/back-shiny/597--0--Ferroseed.png diff --git a/src/afd/sprites/back-shiny/Ferrothorn.png b/src/afd/sprites/back-shiny/598--0--Ferrothorn.png similarity index 100% rename from src/afd/sprites/back-shiny/Ferrothorn.png rename to src/afd/sprites/back-shiny/598--0--Ferrothorn.png diff --git a/src/afd/sprites/back-shiny/Klink.png b/src/afd/sprites/back-shiny/599--0--Klink.png similarity index 100% rename from src/afd/sprites/back-shiny/Klink.png rename to src/afd/sprites/back-shiny/599--0--Klink.png diff --git a/src/afd/sprites/back-shiny/Charizard.png b/src/afd/sprites/back-shiny/6--0--Charizard.png similarity index 100% rename from src/afd/sprites/back-shiny/Charizard.png rename to src/afd/sprites/back-shiny/6--0--Charizard.png diff --git a/src/afd/sprites/back-shiny/Pyroak.png b/src/afd/sprites/back-shiny/6--0--Pyroak.png similarity index 100% rename from src/afd/sprites/back-shiny/Pyroak.png rename to src/afd/sprites/back-shiny/6--0--Pyroak.png diff --git a/src/afd/sprites/back-shiny/Charizard--Gmax.png b/src/afd/sprites/back-shiny/6--420--Charizard--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Charizard--Gmax.png rename to src/afd/sprites/back-shiny/6--420--Charizard--Gmax.png diff --git a/src/afd/sprites/back-shiny/Charizard--Mega-X.png b/src/afd/sprites/back-shiny/6--420--Charizard--Mega-X.png similarity index 100% rename from src/afd/sprites/back-shiny/Charizard--Mega-X.png rename to src/afd/sprites/back-shiny/6--420--Charizard--Mega-X.png diff --git a/src/afd/sprites/back-shiny/Charizard--Mega-Y.png b/src/afd/sprites/back-shiny/6--420--Charizard--Mega-Y.png similarity index 100% rename from src/afd/sprites/back-shiny/Charizard--Mega-Y.png rename to src/afd/sprites/back-shiny/6--420--Charizard--Mega-Y.png diff --git a/src/afd/sprites/back-shiny/Poliwag.png b/src/afd/sprites/back-shiny/60--0--Poliwag.png similarity index 100% rename from src/afd/sprites/back-shiny/Poliwag.png rename to src/afd/sprites/back-shiny/60--0--Poliwag.png diff --git a/src/afd/sprites/back-shiny/Klang.png b/src/afd/sprites/back-shiny/600--0--Klang.png similarity index 100% rename from src/afd/sprites/back-shiny/Klang.png rename to src/afd/sprites/back-shiny/600--0--Klang.png diff --git a/src/afd/sprites/back-shiny/Klinklang.png b/src/afd/sprites/back-shiny/601--0--Klinklang.png similarity index 100% rename from src/afd/sprites/back-shiny/Klinklang.png rename to src/afd/sprites/back-shiny/601--0--Klinklang.png diff --git a/src/afd/sprites/back-shiny/Tynamo.png b/src/afd/sprites/back-shiny/602--0--Tynamo.png similarity index 100% rename from src/afd/sprites/back-shiny/Tynamo.png rename to src/afd/sprites/back-shiny/602--0--Tynamo.png diff --git a/src/afd/sprites/back-shiny/Eelektrik.png b/src/afd/sprites/back-shiny/603--0--Eelektrik.png similarity index 100% rename from src/afd/sprites/back-shiny/Eelektrik.png rename to src/afd/sprites/back-shiny/603--0--Eelektrik.png diff --git a/src/afd/sprites/back-shiny/Eelektross.png b/src/afd/sprites/back-shiny/604--0--Eelektross.png similarity index 100% rename from src/afd/sprites/back-shiny/Eelektross.png rename to src/afd/sprites/back-shiny/604--0--Eelektross.png diff --git a/src/afd/sprites/back-shiny/Elgyem.png b/src/afd/sprites/back-shiny/605--0--Elgyem.png similarity index 100% rename from src/afd/sprites/back-shiny/Elgyem.png rename to src/afd/sprites/back-shiny/605--0--Elgyem.png diff --git a/src/afd/sprites/back-shiny/Beheeyem.png b/src/afd/sprites/back-shiny/606--0--Beheeyem.png similarity index 100% rename from src/afd/sprites/back-shiny/Beheeyem.png rename to src/afd/sprites/back-shiny/606--0--Beheeyem.png diff --git a/src/afd/sprites/back-shiny/Litwick.png b/src/afd/sprites/back-shiny/607--0--Litwick.png similarity index 100% rename from src/afd/sprites/back-shiny/Litwick.png rename to src/afd/sprites/back-shiny/607--0--Litwick.png diff --git a/src/afd/sprites/back-shiny/Lampent.png b/src/afd/sprites/back-shiny/608--0--Lampent.png similarity index 100% rename from src/afd/sprites/back-shiny/Lampent.png rename to src/afd/sprites/back-shiny/608--0--Lampent.png diff --git a/src/afd/sprites/back-shiny/Chandelure.png b/src/afd/sprites/back-shiny/609--0--Chandelure.png similarity index 100% rename from src/afd/sprites/back-shiny/Chandelure.png rename to src/afd/sprites/back-shiny/609--0--Chandelure.png diff --git a/src/afd/sprites/back-shiny/Poliwhirl.png b/src/afd/sprites/back-shiny/61--0--Poliwhirl.png similarity index 100% rename from src/afd/sprites/back-shiny/Poliwhirl.png rename to src/afd/sprites/back-shiny/61--0--Poliwhirl.png diff --git a/src/afd/sprites/back-shiny/Axew.png b/src/afd/sprites/back-shiny/610--0--Axew.png similarity index 100% rename from src/afd/sprites/back-shiny/Axew.png rename to src/afd/sprites/back-shiny/610--0--Axew.png diff --git a/src/afd/sprites/back-shiny/Fraxure.png b/src/afd/sprites/back-shiny/611--0--Fraxure.png similarity index 100% rename from src/afd/sprites/back-shiny/Fraxure.png rename to src/afd/sprites/back-shiny/611--0--Fraxure.png diff --git a/src/afd/sprites/back-shiny/Haxorus.png b/src/afd/sprites/back-shiny/612--0--Haxorus.png similarity index 100% rename from src/afd/sprites/back-shiny/Haxorus.png rename to src/afd/sprites/back-shiny/612--0--Haxorus.png diff --git a/src/afd/sprites/back-shiny/Cubchoo.png b/src/afd/sprites/back-shiny/613--0--Cubchoo.png similarity index 100% rename from src/afd/sprites/back-shiny/Cubchoo.png rename to src/afd/sprites/back-shiny/613--0--Cubchoo.png diff --git a/src/afd/sprites/back-shiny/Beartic.png b/src/afd/sprites/back-shiny/614--0--Beartic.png similarity index 100% rename from src/afd/sprites/back-shiny/Beartic.png rename to src/afd/sprites/back-shiny/614--0--Beartic.png diff --git a/src/afd/sprites/back-shiny/Cryogonal.png b/src/afd/sprites/back-shiny/615--0--Cryogonal.png similarity index 100% rename from src/afd/sprites/back-shiny/Cryogonal.png rename to src/afd/sprites/back-shiny/615--0--Cryogonal.png diff --git a/src/afd/sprites/back-shiny/Shelmet.png b/src/afd/sprites/back-shiny/616--0--Shelmet.png similarity index 100% rename from src/afd/sprites/back-shiny/Shelmet.png rename to src/afd/sprites/back-shiny/616--0--Shelmet.png diff --git a/src/afd/sprites/back-shiny/Accelgor.png b/src/afd/sprites/back-shiny/617--0--Accelgor.png similarity index 100% rename from src/afd/sprites/back-shiny/Accelgor.png rename to src/afd/sprites/back-shiny/617--0--Accelgor.png diff --git a/src/afd/sprites/back-shiny/Stunfisk.png b/src/afd/sprites/back-shiny/618--0--Stunfisk.png similarity index 100% rename from src/afd/sprites/back-shiny/Stunfisk.png rename to src/afd/sprites/back-shiny/618--0--Stunfisk.png diff --git a/src/afd/sprites/back-shiny/Stunfisk--Galar.png b/src/afd/sprites/back-shiny/618--420--Stunfisk--Galar.png similarity index 100% rename from src/afd/sprites/back-shiny/Stunfisk--Galar.png rename to src/afd/sprites/back-shiny/618--420--Stunfisk--Galar.png diff --git a/src/afd/sprites/back-shiny/Mienfoo.png b/src/afd/sprites/back-shiny/619--0--Mienfoo.png similarity index 100% rename from src/afd/sprites/back-shiny/Mienfoo.png rename to src/afd/sprites/back-shiny/619--0--Mienfoo.png diff --git a/src/afd/sprites/back-shiny/Poliwrath.png b/src/afd/sprites/back-shiny/62--0--Poliwrath.png similarity index 100% rename from src/afd/sprites/back-shiny/Poliwrath.png rename to src/afd/sprites/back-shiny/62--0--Poliwrath.png diff --git a/src/afd/sprites/back-shiny/Mienshao.png b/src/afd/sprites/back-shiny/620--0--Mienshao.png similarity index 100% rename from src/afd/sprites/back-shiny/Mienshao.png rename to src/afd/sprites/back-shiny/620--0--Mienshao.png diff --git a/src/afd/sprites/back-shiny/Druddigon.png b/src/afd/sprites/back-shiny/621--0--Druddigon.png similarity index 100% rename from src/afd/sprites/back-shiny/Druddigon.png rename to src/afd/sprites/back-shiny/621--0--Druddigon.png diff --git a/src/afd/sprites/back-shiny/Golett.png b/src/afd/sprites/back-shiny/622--0--Golett.png similarity index 100% rename from src/afd/sprites/back-shiny/Golett.png rename to src/afd/sprites/back-shiny/622--0--Golett.png diff --git a/src/afd/sprites/back-shiny/Golurk.png b/src/afd/sprites/back-shiny/623--0--Golurk.png similarity index 100% rename from src/afd/sprites/back-shiny/Golurk.png rename to src/afd/sprites/back-shiny/623--0--Golurk.png diff --git a/src/afd/sprites/back-shiny/Pawniard.png b/src/afd/sprites/back-shiny/624--0--Pawniard.png similarity index 100% rename from src/afd/sprites/back-shiny/Pawniard.png rename to src/afd/sprites/back-shiny/624--0--Pawniard.png diff --git a/src/afd/sprites/back-shiny/Bisharp.png b/src/afd/sprites/back-shiny/625--0--Bisharp.png similarity index 100% rename from src/afd/sprites/back-shiny/Bisharp.png rename to src/afd/sprites/back-shiny/625--0--Bisharp.png diff --git a/src/afd/sprites/back-shiny/Bouffalant.png b/src/afd/sprites/back-shiny/626--0--Bouffalant.png similarity index 100% rename from src/afd/sprites/back-shiny/Bouffalant.png rename to src/afd/sprites/back-shiny/626--0--Bouffalant.png diff --git a/src/afd/sprites/back-shiny/Rufflet.png b/src/afd/sprites/back-shiny/627--0--Rufflet.png similarity index 100% rename from src/afd/sprites/back-shiny/Rufflet.png rename to src/afd/sprites/back-shiny/627--0--Rufflet.png diff --git a/src/afd/sprites/back-shiny/Braviary.png b/src/afd/sprites/back-shiny/628--0--Braviary.png similarity index 100% rename from src/afd/sprites/back-shiny/Braviary.png rename to src/afd/sprites/back-shiny/628--0--Braviary.png diff --git a/src/afd/sprites/back-shiny/Vullaby.png b/src/afd/sprites/back-shiny/629--0--Vullaby.png similarity index 100% rename from src/afd/sprites/back-shiny/Vullaby.png rename to src/afd/sprites/back-shiny/629--0--Vullaby.png diff --git a/src/afd/sprites/back-shiny/Abra.png b/src/afd/sprites/back-shiny/63--0--Abra.png similarity index 100% rename from src/afd/sprites/back-shiny/Abra.png rename to src/afd/sprites/back-shiny/63--0--Abra.png diff --git a/src/afd/sprites/back-shiny/Mandibuzz.png b/src/afd/sprites/back-shiny/630--0--Mandibuzz.png similarity index 100% rename from src/afd/sprites/back-shiny/Mandibuzz.png rename to src/afd/sprites/back-shiny/630--0--Mandibuzz.png diff --git a/src/afd/sprites/back-shiny/Heatmor.png b/src/afd/sprites/back-shiny/631--0--Heatmor.png similarity index 100% rename from src/afd/sprites/back-shiny/Heatmor.png rename to src/afd/sprites/back-shiny/631--0--Heatmor.png diff --git a/src/afd/sprites/back-shiny/Durant.png b/src/afd/sprites/back-shiny/632--0--Durant.png similarity index 100% rename from src/afd/sprites/back-shiny/Durant.png rename to src/afd/sprites/back-shiny/632--0--Durant.png diff --git a/src/afd/sprites/back-shiny/Deino.png b/src/afd/sprites/back-shiny/633--0--Deino.png similarity index 100% rename from src/afd/sprites/back-shiny/Deino.png rename to src/afd/sprites/back-shiny/633--0--Deino.png diff --git a/src/afd/sprites/back-shiny/Zweilous.png b/src/afd/sprites/back-shiny/634--0--Zweilous.png similarity index 100% rename from src/afd/sprites/back-shiny/Zweilous.png rename to src/afd/sprites/back-shiny/634--0--Zweilous.png diff --git a/src/afd/sprites/back-shiny/Hydreigon.png b/src/afd/sprites/back-shiny/635--0--Hydreigon.png similarity index 100% rename from src/afd/sprites/back-shiny/Hydreigon.png rename to src/afd/sprites/back-shiny/635--0--Hydreigon.png diff --git a/src/afd/sprites/back-shiny/Larvesta.png b/src/afd/sprites/back-shiny/636--0--Larvesta.png similarity index 100% rename from src/afd/sprites/back-shiny/Larvesta.png rename to src/afd/sprites/back-shiny/636--0--Larvesta.png diff --git a/src/afd/sprites/back-shiny/Volcarona.png b/src/afd/sprites/back-shiny/637--0--Volcarona.png similarity index 100% rename from src/afd/sprites/back-shiny/Volcarona.png rename to src/afd/sprites/back-shiny/637--0--Volcarona.png diff --git a/src/afd/sprites/back-shiny/Cobalion.png b/src/afd/sprites/back-shiny/638--0--Cobalion.png similarity index 100% rename from src/afd/sprites/back-shiny/Cobalion.png rename to src/afd/sprites/back-shiny/638--0--Cobalion.png diff --git a/src/afd/sprites/back-shiny/Terrakion.png b/src/afd/sprites/back-shiny/639--0--Terrakion.png similarity index 100% rename from src/afd/sprites/back-shiny/Terrakion.png rename to src/afd/sprites/back-shiny/639--0--Terrakion.png diff --git a/src/afd/sprites/back-shiny/Kadabra.png b/src/afd/sprites/back-shiny/64--0--Kadabra.png similarity index 100% rename from src/afd/sprites/back-shiny/Kadabra.png rename to src/afd/sprites/back-shiny/64--0--Kadabra.png diff --git a/src/afd/sprites/back-shiny/Virizion.png b/src/afd/sprites/back-shiny/640--0--Virizion.png similarity index 100% rename from src/afd/sprites/back-shiny/Virizion.png rename to src/afd/sprites/back-shiny/640--0--Virizion.png diff --git a/src/afd/sprites/back-shiny/Tornadus.png b/src/afd/sprites/back-shiny/641--0--Tornadus.png similarity index 100% rename from src/afd/sprites/back-shiny/Tornadus.png rename to src/afd/sprites/back-shiny/641--0--Tornadus.png diff --git a/src/afd/sprites/back-shiny/Thundurus.png b/src/afd/sprites/back-shiny/642--0--Thundurus.png similarity index 100% rename from src/afd/sprites/back-shiny/Thundurus.png rename to src/afd/sprites/back-shiny/642--0--Thundurus.png diff --git a/src/afd/sprites/back-shiny/Thundurus--Therian.png b/src/afd/sprites/back-shiny/642--420--Thundurus--Therian.png similarity index 100% rename from src/afd/sprites/back-shiny/Thundurus--Therian.png rename to src/afd/sprites/back-shiny/642--420--Thundurus--Therian.png diff --git a/src/afd/sprites/back-shiny/Reshiram.png b/src/afd/sprites/back-shiny/643--0--Reshiram.png similarity index 100% rename from src/afd/sprites/back-shiny/Reshiram.png rename to src/afd/sprites/back-shiny/643--0--Reshiram.png diff --git a/src/afd/sprites/back-shiny/Zekrom.png b/src/afd/sprites/back-shiny/644--0--Zekrom.png similarity index 100% rename from src/afd/sprites/back-shiny/Zekrom.png rename to src/afd/sprites/back-shiny/644--0--Zekrom.png diff --git a/src/afd/sprites/back-shiny/Landorus.png b/src/afd/sprites/back-shiny/645--0--Landorus.png similarity index 100% rename from src/afd/sprites/back-shiny/Landorus.png rename to src/afd/sprites/back-shiny/645--0--Landorus.png diff --git a/src/afd/sprites/back-shiny/Landorus--Therian.png b/src/afd/sprites/back-shiny/645--420--Landorus--Therian.png similarity index 100% rename from src/afd/sprites/back-shiny/Landorus--Therian.png rename to src/afd/sprites/back-shiny/645--420--Landorus--Therian.png diff --git a/src/afd/sprites/back-shiny/Kyurem.png b/src/afd/sprites/back-shiny/646--0--Kyurem.png similarity index 100% rename from src/afd/sprites/back-shiny/Kyurem.png rename to src/afd/sprites/back-shiny/646--0--Kyurem.png diff --git a/src/afd/sprites/back-shiny/Kyurem--Black.png b/src/afd/sprites/back-shiny/646--420--Kyurem--Black.png similarity index 100% rename from src/afd/sprites/back-shiny/Kyurem--Black.png rename to src/afd/sprites/back-shiny/646--420--Kyurem--Black.png diff --git a/src/afd/sprites/back-shiny/Kyurem--White.png b/src/afd/sprites/back-shiny/646--420--Kyurem--White.png similarity index 100% rename from src/afd/sprites/back-shiny/Kyurem--White.png rename to src/afd/sprites/back-shiny/646--420--Kyurem--White.png diff --git a/src/afd/sprites/back-shiny/Keldeo.png b/src/afd/sprites/back-shiny/647--0--Keldeo.png similarity index 100% rename from src/afd/sprites/back-shiny/Keldeo.png rename to src/afd/sprites/back-shiny/647--0--Keldeo.png diff --git a/src/afd/sprites/back-shiny/Keldeo--Resolute.png b/src/afd/sprites/back-shiny/647--420--Keldeo--Resolute.png similarity index 100% rename from src/afd/sprites/back-shiny/Keldeo--Resolute.png rename to src/afd/sprites/back-shiny/647--420--Keldeo--Resolute.png diff --git a/src/afd/sprites/back-shiny/Meloetta.png b/src/afd/sprites/back-shiny/648--0--Meloetta.png similarity index 100% rename from src/afd/sprites/back-shiny/Meloetta.png rename to src/afd/sprites/back-shiny/648--0--Meloetta.png diff --git a/src/afd/sprites/back-shiny/Meloetta--Pirouette.png b/src/afd/sprites/back-shiny/648--420--Meloetta--Pirouette.png similarity index 100% rename from src/afd/sprites/back-shiny/Meloetta--Pirouette.png rename to src/afd/sprites/back-shiny/648--420--Meloetta--Pirouette.png diff --git a/src/afd/sprites/back-shiny/Genesect.png b/src/afd/sprites/back-shiny/649--0--Genesect.png similarity index 100% rename from src/afd/sprites/back-shiny/Genesect.png rename to src/afd/sprites/back-shiny/649--0--Genesect.png diff --git a/src/afd/sprites/back-shiny/Genesect--Burn.png b/src/afd/sprites/back-shiny/649--420--Genesect--Burn.png similarity index 100% rename from src/afd/sprites/back-shiny/Genesect--Burn.png rename to src/afd/sprites/back-shiny/649--420--Genesect--Burn.png diff --git a/src/afd/sprites/back-shiny/Genesect--Chill.png b/src/afd/sprites/back-shiny/649--420--Genesect--Chill.png similarity index 100% rename from src/afd/sprites/back-shiny/Genesect--Chill.png rename to src/afd/sprites/back-shiny/649--420--Genesect--Chill.png diff --git a/src/afd/sprites/back-shiny/Genesect--Douse.png b/src/afd/sprites/back-shiny/649--420--Genesect--Douse.png similarity index 100% rename from src/afd/sprites/back-shiny/Genesect--Douse.png rename to src/afd/sprites/back-shiny/649--420--Genesect--Douse.png diff --git a/src/afd/sprites/back-shiny/Genesect--Shock.png b/src/afd/sprites/back-shiny/649--420--Genesect--Shock.png similarity index 100% rename from src/afd/sprites/back-shiny/Genesect--Shock.png rename to src/afd/sprites/back-shiny/649--420--Genesect--Shock.png diff --git a/src/afd/sprites/back-shiny/Alakazam.png b/src/afd/sprites/back-shiny/65--0--Alakazam.png similarity index 100% rename from src/afd/sprites/back-shiny/Alakazam.png rename to src/afd/sprites/back-shiny/65--0--Alakazam.png diff --git a/src/afd/sprites/back-shiny/Alakazam--Mega.png b/src/afd/sprites/back-shiny/65--420--Alakazam--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Alakazam--Mega.png rename to src/afd/sprites/back-shiny/65--420--Alakazam--Mega.png diff --git a/src/afd/sprites/back-shiny/Chespin.png b/src/afd/sprites/back-shiny/650--0--Chespin.png similarity index 100% rename from src/afd/sprites/back-shiny/Chespin.png rename to src/afd/sprites/back-shiny/650--0--Chespin.png diff --git a/src/afd/sprites/back-shiny/Quilladin.png b/src/afd/sprites/back-shiny/651--0--Quilladin.png similarity index 100% rename from src/afd/sprites/back-shiny/Quilladin.png rename to src/afd/sprites/back-shiny/651--0--Quilladin.png diff --git a/src/afd/sprites/back-shiny/Chesnaught.png b/src/afd/sprites/back-shiny/652--0--Chesnaught.png similarity index 100% rename from src/afd/sprites/back-shiny/Chesnaught.png rename to src/afd/sprites/back-shiny/652--0--Chesnaught.png diff --git a/src/afd/sprites/back-shiny/Fennekin.png b/src/afd/sprites/back-shiny/653--0--Fennekin.png similarity index 100% rename from src/afd/sprites/back-shiny/Fennekin.png rename to src/afd/sprites/back-shiny/653--0--Fennekin.png diff --git a/src/afd/sprites/back-shiny/Braixen.png b/src/afd/sprites/back-shiny/654--0--Braixen.png similarity index 100% rename from src/afd/sprites/back-shiny/Braixen.png rename to src/afd/sprites/back-shiny/654--0--Braixen.png diff --git a/src/afd/sprites/back-shiny/Delphox.png b/src/afd/sprites/back-shiny/655--0--Delphox.png similarity index 100% rename from src/afd/sprites/back-shiny/Delphox.png rename to src/afd/sprites/back-shiny/655--0--Delphox.png diff --git a/src/afd/sprites/back-shiny/Froakie.png b/src/afd/sprites/back-shiny/656--0--Froakie.png similarity index 100% rename from src/afd/sprites/back-shiny/Froakie.png rename to src/afd/sprites/back-shiny/656--0--Froakie.png diff --git a/src/afd/sprites/back-shiny/Frogadier.png b/src/afd/sprites/back-shiny/657--0--Frogadier.png similarity index 100% rename from src/afd/sprites/back-shiny/Frogadier.png rename to src/afd/sprites/back-shiny/657--0--Frogadier.png diff --git a/src/afd/sprites/back-shiny/Greninja.png b/src/afd/sprites/back-shiny/658--0--Greninja.png similarity index 100% rename from src/afd/sprites/back-shiny/Greninja.png rename to src/afd/sprites/back-shiny/658--0--Greninja.png diff --git a/src/afd/sprites/back-shiny/Greninja--Ash.png b/src/afd/sprites/back-shiny/658--420--Greninja--Ash.png similarity index 100% rename from src/afd/sprites/back-shiny/Greninja--Ash.png rename to src/afd/sprites/back-shiny/658--420--Greninja--Ash.png diff --git a/src/afd/sprites/back-shiny/Bunnelby.png b/src/afd/sprites/back-shiny/659--0--Bunnelby.png similarity index 100% rename from src/afd/sprites/back-shiny/Bunnelby.png rename to src/afd/sprites/back-shiny/659--0--Bunnelby.png diff --git a/src/afd/sprites/back-shiny/Machop.png b/src/afd/sprites/back-shiny/66--0--Machop.png similarity index 100% rename from src/afd/sprites/back-shiny/Machop.png rename to src/afd/sprites/back-shiny/66--0--Machop.png diff --git a/src/afd/sprites/back-shiny/Diggersby.png b/src/afd/sprites/back-shiny/660--0--Diggersby.png similarity index 100% rename from src/afd/sprites/back-shiny/Diggersby.png rename to src/afd/sprites/back-shiny/660--0--Diggersby.png diff --git a/src/afd/sprites/back-shiny/Fletchling.png b/src/afd/sprites/back-shiny/661--0--Fletchling.png similarity index 100% rename from src/afd/sprites/back-shiny/Fletchling.png rename to src/afd/sprites/back-shiny/661--0--Fletchling.png diff --git a/src/afd/sprites/back-shiny/Fletchinder.png b/src/afd/sprites/back-shiny/662--0--Fletchinder.png similarity index 100% rename from src/afd/sprites/back-shiny/Fletchinder.png rename to src/afd/sprites/back-shiny/662--0--Fletchinder.png diff --git a/src/afd/sprites/back-shiny/Talonflame.png b/src/afd/sprites/back-shiny/663--0--Talonflame.png similarity index 100% rename from src/afd/sprites/back-shiny/Talonflame.png rename to src/afd/sprites/back-shiny/663--0--Talonflame.png diff --git a/src/afd/sprites/back-shiny/Scatterbug.png b/src/afd/sprites/back-shiny/664--0--Scatterbug.png similarity index 100% rename from src/afd/sprites/back-shiny/Scatterbug.png rename to src/afd/sprites/back-shiny/664--0--Scatterbug.png diff --git a/src/afd/sprites/back-shiny/Spewpa.png b/src/afd/sprites/back-shiny/665--0--Spewpa.png similarity index 100% rename from src/afd/sprites/back-shiny/Spewpa.png rename to src/afd/sprites/back-shiny/665--0--Spewpa.png diff --git a/src/afd/sprites/back-shiny/Vivillon.png b/src/afd/sprites/back-shiny/666--0--Vivillon.png similarity index 100% rename from src/afd/sprites/back-shiny/Vivillon.png rename to src/afd/sprites/back-shiny/666--0--Vivillon.png diff --git a/src/afd/sprites/back-shiny/Litleo.png b/src/afd/sprites/back-shiny/667--0--Litleo.png similarity index 100% rename from src/afd/sprites/back-shiny/Litleo.png rename to src/afd/sprites/back-shiny/667--0--Litleo.png diff --git a/src/afd/sprites/back-shiny/Pyroar.png b/src/afd/sprites/back-shiny/668--0--Pyroar.png similarity index 100% rename from src/afd/sprites/back-shiny/Pyroar.png rename to src/afd/sprites/back-shiny/668--0--Pyroar.png diff --git a/src/afd/sprites/back-shiny/Flabe__0301be__0301.png b/src/afd/sprites/back-shiny/669--0--Flabe__0301be__0301.png similarity index 100% rename from src/afd/sprites/back-shiny/Flabe__0301be__0301.png rename to src/afd/sprites/back-shiny/669--0--Flabe__0301be__0301.png diff --git a/src/afd/sprites/back-shiny/Machoke.png b/src/afd/sprites/back-shiny/67--0--Machoke.png similarity index 100% rename from src/afd/sprites/back-shiny/Machoke.png rename to src/afd/sprites/back-shiny/67--0--Machoke.png diff --git a/src/afd/sprites/back-shiny/Floette.png b/src/afd/sprites/back-shiny/670--0--Floette.png similarity index 100% rename from src/afd/sprites/back-shiny/Floette.png rename to src/afd/sprites/back-shiny/670--0--Floette.png diff --git a/src/afd/sprites/back-shiny/Floette--Eternal.png b/src/afd/sprites/back-shiny/670--420--Floette--Eternal.png similarity index 100% rename from src/afd/sprites/back-shiny/Floette--Eternal.png rename to src/afd/sprites/back-shiny/670--420--Floette--Eternal.png diff --git a/src/afd/sprites/back-shiny/Florges.png b/src/afd/sprites/back-shiny/671--0--Florges.png similarity index 100% rename from src/afd/sprites/back-shiny/Florges.png rename to src/afd/sprites/back-shiny/671--0--Florges.png diff --git a/src/afd/sprites/back-shiny/Skiddo.png b/src/afd/sprites/back-shiny/672--0--Skiddo.png similarity index 100% rename from src/afd/sprites/back-shiny/Skiddo.png rename to src/afd/sprites/back-shiny/672--0--Skiddo.png diff --git a/src/afd/sprites/back-shiny/Gogoat.png b/src/afd/sprites/back-shiny/673--0--Gogoat.png similarity index 100% rename from src/afd/sprites/back-shiny/Gogoat.png rename to src/afd/sprites/back-shiny/673--0--Gogoat.png diff --git a/src/afd/sprites/back-shiny/Pancham.png b/src/afd/sprites/back-shiny/674--0--Pancham.png similarity index 100% rename from src/afd/sprites/back-shiny/Pancham.png rename to src/afd/sprites/back-shiny/674--0--Pancham.png diff --git a/src/afd/sprites/back-shiny/Pangoro.png b/src/afd/sprites/back-shiny/675--0--Pangoro.png similarity index 100% rename from src/afd/sprites/back-shiny/Pangoro.png rename to src/afd/sprites/back-shiny/675--0--Pangoro.png diff --git a/src/afd/sprites/back-shiny/Furfrou.png b/src/afd/sprites/back-shiny/676--0--Furfrou.png similarity index 100% rename from src/afd/sprites/back-shiny/Furfrou.png rename to src/afd/sprites/back-shiny/676--0--Furfrou.png diff --git a/src/afd/sprites/back-shiny/Espurr.png b/src/afd/sprites/back-shiny/677--0--Espurr.png similarity index 100% rename from src/afd/sprites/back-shiny/Espurr.png rename to src/afd/sprites/back-shiny/677--0--Espurr.png diff --git a/src/afd/sprites/back-shiny/Meowstic.png b/src/afd/sprites/back-shiny/678--0--Meowstic.png similarity index 100% rename from src/afd/sprites/back-shiny/Meowstic.png rename to src/afd/sprites/back-shiny/678--0--Meowstic.png diff --git a/src/afd/sprites/back-shiny/Meowstic--F.png b/src/afd/sprites/back-shiny/678--420--Meowstic--F.png similarity index 100% rename from src/afd/sprites/back-shiny/Meowstic--F.png rename to src/afd/sprites/back-shiny/678--420--Meowstic--F.png diff --git a/src/afd/sprites/back-shiny/Honedge.png b/src/afd/sprites/back-shiny/679--0--Honedge.png similarity index 100% rename from src/afd/sprites/back-shiny/Honedge.png rename to src/afd/sprites/back-shiny/679--0--Honedge.png diff --git a/src/afd/sprites/back-shiny/Machamp.png b/src/afd/sprites/back-shiny/68--0--Machamp.png similarity index 100% rename from src/afd/sprites/back-shiny/Machamp.png rename to src/afd/sprites/back-shiny/68--0--Machamp.png diff --git a/src/afd/sprites/back-shiny/Machamp--Gmax.png b/src/afd/sprites/back-shiny/68--420--Machamp--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Machamp--Gmax.png rename to src/afd/sprites/back-shiny/68--420--Machamp--Gmax.png diff --git a/src/afd/sprites/back-shiny/Doublade.png b/src/afd/sprites/back-shiny/680--0--Doublade.png similarity index 100% rename from src/afd/sprites/back-shiny/Doublade.png rename to src/afd/sprites/back-shiny/680--0--Doublade.png diff --git a/src/afd/sprites/back-shiny/Aegislash.png b/src/afd/sprites/back-shiny/681--0--Aegislash.png similarity index 100% rename from src/afd/sprites/back-shiny/Aegislash.png rename to src/afd/sprites/back-shiny/681--0--Aegislash.png diff --git a/src/afd/sprites/back-shiny/Aegislash--Blade.png b/src/afd/sprites/back-shiny/681--420--Aegislash--Blade.png similarity index 100% rename from src/afd/sprites/back-shiny/Aegislash--Blade.png rename to src/afd/sprites/back-shiny/681--420--Aegislash--Blade.png diff --git a/src/afd/sprites/back-shiny/Spritzee.png b/src/afd/sprites/back-shiny/682--0--Spritzee.png similarity index 100% rename from src/afd/sprites/back-shiny/Spritzee.png rename to src/afd/sprites/back-shiny/682--0--Spritzee.png diff --git a/src/afd/sprites/back-shiny/Aromatisse.png b/src/afd/sprites/back-shiny/683--0--Aromatisse.png similarity index 100% rename from src/afd/sprites/back-shiny/Aromatisse.png rename to src/afd/sprites/back-shiny/683--0--Aromatisse.png diff --git a/src/afd/sprites/back-shiny/Swirlix.png b/src/afd/sprites/back-shiny/684--0--Swirlix.png similarity index 100% rename from src/afd/sprites/back-shiny/Swirlix.png rename to src/afd/sprites/back-shiny/684--0--Swirlix.png diff --git a/src/afd/sprites/back-shiny/Slurpuff.png b/src/afd/sprites/back-shiny/685--0--Slurpuff.png similarity index 100% rename from src/afd/sprites/back-shiny/Slurpuff.png rename to src/afd/sprites/back-shiny/685--0--Slurpuff.png diff --git a/src/afd/sprites/back-shiny/Inkay.png b/src/afd/sprites/back-shiny/686--0--Inkay.png similarity index 100% rename from src/afd/sprites/back-shiny/Inkay.png rename to src/afd/sprites/back-shiny/686--0--Inkay.png diff --git a/src/afd/sprites/back-shiny/Malamar.png b/src/afd/sprites/back-shiny/687--0--Malamar.png similarity index 100% rename from src/afd/sprites/back-shiny/Malamar.png rename to src/afd/sprites/back-shiny/687--0--Malamar.png diff --git a/src/afd/sprites/back-shiny/Binacle.png b/src/afd/sprites/back-shiny/688--0--Binacle.png similarity index 100% rename from src/afd/sprites/back-shiny/Binacle.png rename to src/afd/sprites/back-shiny/688--0--Binacle.png diff --git a/src/afd/sprites/back-shiny/Barbaracle.png b/src/afd/sprites/back-shiny/689--0--Barbaracle.png similarity index 100% rename from src/afd/sprites/back-shiny/Barbaracle.png rename to src/afd/sprites/back-shiny/689--0--Barbaracle.png diff --git a/src/afd/sprites/back-shiny/Bellsprout.png b/src/afd/sprites/back-shiny/69--0--Bellsprout.png similarity index 100% rename from src/afd/sprites/back-shiny/Bellsprout.png rename to src/afd/sprites/back-shiny/69--0--Bellsprout.png diff --git a/src/afd/sprites/back-shiny/Skrelp.png b/src/afd/sprites/back-shiny/690--0--Skrelp.png similarity index 100% rename from src/afd/sprites/back-shiny/Skrelp.png rename to src/afd/sprites/back-shiny/690--0--Skrelp.png diff --git a/src/afd/sprites/back-shiny/Dragalge.png b/src/afd/sprites/back-shiny/691--0--Dragalge.png similarity index 100% rename from src/afd/sprites/back-shiny/Dragalge.png rename to src/afd/sprites/back-shiny/691--0--Dragalge.png diff --git a/src/afd/sprites/back-shiny/Clauncher.png b/src/afd/sprites/back-shiny/692--0--Clauncher.png similarity index 100% rename from src/afd/sprites/back-shiny/Clauncher.png rename to src/afd/sprites/back-shiny/692--0--Clauncher.png diff --git a/src/afd/sprites/back-shiny/Clawitzer.png b/src/afd/sprites/back-shiny/693--0--Clawitzer.png similarity index 100% rename from src/afd/sprites/back-shiny/Clawitzer.png rename to src/afd/sprites/back-shiny/693--0--Clawitzer.png diff --git a/src/afd/sprites/back-shiny/Helioptile.png b/src/afd/sprites/back-shiny/694--0--Helioptile.png similarity index 100% rename from src/afd/sprites/back-shiny/Helioptile.png rename to src/afd/sprites/back-shiny/694--0--Helioptile.png diff --git a/src/afd/sprites/back-shiny/Heliolisk.png b/src/afd/sprites/back-shiny/695--0--Heliolisk.png similarity index 100% rename from src/afd/sprites/back-shiny/Heliolisk.png rename to src/afd/sprites/back-shiny/695--0--Heliolisk.png diff --git a/src/afd/sprites/back-shiny/Tyrunt.png b/src/afd/sprites/back-shiny/696--0--Tyrunt.png similarity index 100% rename from src/afd/sprites/back-shiny/Tyrunt.png rename to src/afd/sprites/back-shiny/696--0--Tyrunt.png diff --git a/src/afd/sprites/back-shiny/Tyrantrum.png b/src/afd/sprites/back-shiny/697--0--Tyrantrum.png similarity index 100% rename from src/afd/sprites/back-shiny/Tyrantrum.png rename to src/afd/sprites/back-shiny/697--0--Tyrantrum.png diff --git a/src/afd/sprites/back-shiny/Amaura.png b/src/afd/sprites/back-shiny/698--0--Amaura.png similarity index 100% rename from src/afd/sprites/back-shiny/Amaura.png rename to src/afd/sprites/back-shiny/698--0--Amaura.png diff --git a/src/afd/sprites/back-shiny/Aurorus.png b/src/afd/sprites/back-shiny/699--0--Aurorus.png similarity index 100% rename from src/afd/sprites/back-shiny/Aurorus.png rename to src/afd/sprites/back-shiny/699--0--Aurorus.png diff --git a/src/afd/sprites/back-shiny/Squirtle.png b/src/afd/sprites/back-shiny/7--0--Squirtle.png similarity index 100% rename from src/afd/sprites/back-shiny/Squirtle.png rename to src/afd/sprites/back-shiny/7--0--Squirtle.png diff --git a/src/afd/sprites/back-shiny/Weepinbell.png b/src/afd/sprites/back-shiny/70--0--Weepinbell.png similarity index 100% rename from src/afd/sprites/back-shiny/Weepinbell.png rename to src/afd/sprites/back-shiny/70--0--Weepinbell.png diff --git a/src/afd/sprites/back-shiny/Sylveon.png b/src/afd/sprites/back-shiny/700--0--Sylveon.png similarity index 100% rename from src/afd/sprites/back-shiny/Sylveon.png rename to src/afd/sprites/back-shiny/700--0--Sylveon.png diff --git a/src/afd/sprites/back-shiny/Hawlucha.png b/src/afd/sprites/back-shiny/701--0--Hawlucha.png similarity index 100% rename from src/afd/sprites/back-shiny/Hawlucha.png rename to src/afd/sprites/back-shiny/701--0--Hawlucha.png diff --git a/src/afd/sprites/back-shiny/Dedenne.png b/src/afd/sprites/back-shiny/702--0--Dedenne.png similarity index 100% rename from src/afd/sprites/back-shiny/Dedenne.png rename to src/afd/sprites/back-shiny/702--0--Dedenne.png diff --git a/src/afd/sprites/back-shiny/Carbink.png b/src/afd/sprites/back-shiny/703--0--Carbink.png similarity index 100% rename from src/afd/sprites/back-shiny/Carbink.png rename to src/afd/sprites/back-shiny/703--0--Carbink.png diff --git a/src/afd/sprites/back-shiny/Goomy.png b/src/afd/sprites/back-shiny/704--0--Goomy.png similarity index 100% rename from src/afd/sprites/back-shiny/Goomy.png rename to src/afd/sprites/back-shiny/704--0--Goomy.png diff --git a/src/afd/sprites/back-shiny/Sliggoo.png b/src/afd/sprites/back-shiny/705--0--Sliggoo.png similarity index 100% rename from src/afd/sprites/back-shiny/Sliggoo.png rename to src/afd/sprites/back-shiny/705--0--Sliggoo.png diff --git a/src/afd/sprites/back-shiny/Goodra.png b/src/afd/sprites/back-shiny/706--0--Goodra.png similarity index 100% rename from src/afd/sprites/back-shiny/Goodra.png rename to src/afd/sprites/back-shiny/706--0--Goodra.png diff --git a/src/afd/sprites/back-shiny/Klefki.png b/src/afd/sprites/back-shiny/707--0--Klefki.png similarity index 100% rename from src/afd/sprites/back-shiny/Klefki.png rename to src/afd/sprites/back-shiny/707--0--Klefki.png diff --git a/src/afd/sprites/back-shiny/Phantump.png b/src/afd/sprites/back-shiny/708--0--Phantump.png similarity index 100% rename from src/afd/sprites/back-shiny/Phantump.png rename to src/afd/sprites/back-shiny/708--0--Phantump.png diff --git a/src/afd/sprites/back-shiny/Trevenant.png b/src/afd/sprites/back-shiny/709--0--Trevenant.png similarity index 100% rename from src/afd/sprites/back-shiny/Trevenant.png rename to src/afd/sprites/back-shiny/709--0--Trevenant.png diff --git a/src/afd/sprites/back-shiny/Victreebel.png b/src/afd/sprites/back-shiny/71--0--Victreebel.png similarity index 100% rename from src/afd/sprites/back-shiny/Victreebel.png rename to src/afd/sprites/back-shiny/71--0--Victreebel.png diff --git a/src/afd/sprites/back-shiny/Pumpkaboo.png b/src/afd/sprites/back-shiny/710--0--Pumpkaboo.png similarity index 100% rename from src/afd/sprites/back-shiny/Pumpkaboo.png rename to src/afd/sprites/back-shiny/710--0--Pumpkaboo.png diff --git a/src/afd/sprites/back-shiny/Pumpkaboo--Large.png b/src/afd/sprites/back-shiny/710--420--Pumpkaboo--Large.png similarity index 100% rename from src/afd/sprites/back-shiny/Pumpkaboo--Large.png rename to src/afd/sprites/back-shiny/710--420--Pumpkaboo--Large.png diff --git a/src/afd/sprites/back-shiny/Pumpkaboo--Small.png b/src/afd/sprites/back-shiny/710--420--Pumpkaboo--Small.png similarity index 100% rename from src/afd/sprites/back-shiny/Pumpkaboo--Small.png rename to src/afd/sprites/back-shiny/710--420--Pumpkaboo--Small.png diff --git a/src/afd/sprites/back-shiny/Pumpkaboo--Super.png b/src/afd/sprites/back-shiny/710--420--Pumpkaboo--Super.png similarity index 100% rename from src/afd/sprites/back-shiny/Pumpkaboo--Super.png rename to src/afd/sprites/back-shiny/710--420--Pumpkaboo--Super.png diff --git a/src/afd/sprites/back-shiny/Gourgeist.png b/src/afd/sprites/back-shiny/711--0--Gourgeist.png similarity index 100% rename from src/afd/sprites/back-shiny/Gourgeist.png rename to src/afd/sprites/back-shiny/711--0--Gourgeist.png diff --git a/src/afd/sprites/back-shiny/Gourgeist--Large.png b/src/afd/sprites/back-shiny/711--420--Gourgeist--Large.png similarity index 100% rename from src/afd/sprites/back-shiny/Gourgeist--Large.png rename to src/afd/sprites/back-shiny/711--420--Gourgeist--Large.png diff --git a/src/afd/sprites/back-shiny/Gourgeist--Small.png b/src/afd/sprites/back-shiny/711--420--Gourgeist--Small.png similarity index 100% rename from src/afd/sprites/back-shiny/Gourgeist--Small.png rename to src/afd/sprites/back-shiny/711--420--Gourgeist--Small.png diff --git a/src/afd/sprites/back-shiny/Gourgeist--Super.png b/src/afd/sprites/back-shiny/711--420--Gourgeist--Super.png similarity index 100% rename from src/afd/sprites/back-shiny/Gourgeist--Super.png rename to src/afd/sprites/back-shiny/711--420--Gourgeist--Super.png diff --git a/src/afd/sprites/back-shiny/Bergmite.png b/src/afd/sprites/back-shiny/712--0--Bergmite.png similarity index 100% rename from src/afd/sprites/back-shiny/Bergmite.png rename to src/afd/sprites/back-shiny/712--0--Bergmite.png diff --git a/src/afd/sprites/back-shiny/Avalugg.png b/src/afd/sprites/back-shiny/713--0--Avalugg.png similarity index 100% rename from src/afd/sprites/back-shiny/Avalugg.png rename to src/afd/sprites/back-shiny/713--0--Avalugg.png diff --git a/src/afd/sprites/back-shiny/Noibat.png b/src/afd/sprites/back-shiny/714--0--Noibat.png similarity index 100% rename from src/afd/sprites/back-shiny/Noibat.png rename to src/afd/sprites/back-shiny/714--0--Noibat.png diff --git a/src/afd/sprites/back-shiny/Noivern.png b/src/afd/sprites/back-shiny/715--0--Noivern.png similarity index 100% rename from src/afd/sprites/back-shiny/Noivern.png rename to src/afd/sprites/back-shiny/715--0--Noivern.png diff --git a/src/afd/sprites/back-shiny/Xerneas.png b/src/afd/sprites/back-shiny/716--0--Xerneas.png similarity index 100% rename from src/afd/sprites/back-shiny/Xerneas.png rename to src/afd/sprites/back-shiny/716--0--Xerneas.png diff --git a/src/afd/sprites/back-shiny/Yveltal.png b/src/afd/sprites/back-shiny/717--0--Yveltal.png similarity index 100% rename from src/afd/sprites/back-shiny/Yveltal.png rename to src/afd/sprites/back-shiny/717--0--Yveltal.png diff --git a/src/afd/sprites/back-shiny/Zygarde.png b/src/afd/sprites/back-shiny/718--0--Zygarde.png similarity index 100% rename from src/afd/sprites/back-shiny/Zygarde.png rename to src/afd/sprites/back-shiny/718--0--Zygarde.png diff --git a/src/afd/sprites/back-shiny/Zygarde--10__0025.png b/src/afd/sprites/back-shiny/718--420--Zygarde--10__0025.png similarity index 100% rename from src/afd/sprites/back-shiny/Zygarde--10__0025.png rename to src/afd/sprites/back-shiny/718--420--Zygarde--10__0025.png diff --git a/src/afd/sprites/back-shiny/Zygarde--Complete.png b/src/afd/sprites/back-shiny/718--420--Zygarde--Complete.png similarity index 100% rename from src/afd/sprites/back-shiny/Zygarde--Complete.png rename to src/afd/sprites/back-shiny/718--420--Zygarde--Complete.png diff --git a/src/afd/sprites/back-shiny/Diancie.png b/src/afd/sprites/back-shiny/719--0--Diancie.png similarity index 100% rename from src/afd/sprites/back-shiny/Diancie.png rename to src/afd/sprites/back-shiny/719--0--Diancie.png diff --git a/src/afd/sprites/back-shiny/Diancie--Mega.png b/src/afd/sprites/back-shiny/719--420--Diancie--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Diancie--Mega.png rename to src/afd/sprites/back-shiny/719--420--Diancie--Mega.png diff --git a/src/afd/sprites/back-shiny/Tentacool.png b/src/afd/sprites/back-shiny/72--0--Tentacool.png similarity index 100% rename from src/afd/sprites/back-shiny/Tentacool.png rename to src/afd/sprites/back-shiny/72--0--Tentacool.png diff --git a/src/afd/sprites/back-shiny/Hoopa.png b/src/afd/sprites/back-shiny/720--0--Hoopa.png similarity index 100% rename from src/afd/sprites/back-shiny/Hoopa.png rename to src/afd/sprites/back-shiny/720--0--Hoopa.png diff --git a/src/afd/sprites/back-shiny/Hoopa--Unbound.png b/src/afd/sprites/back-shiny/720--420--Hoopa--Unbound.png similarity index 100% rename from src/afd/sprites/back-shiny/Hoopa--Unbound.png rename to src/afd/sprites/back-shiny/720--420--Hoopa--Unbound.png diff --git a/src/afd/sprites/back-shiny/Volcanion.png b/src/afd/sprites/back-shiny/721--0--Volcanion.png similarity index 100% rename from src/afd/sprites/back-shiny/Volcanion.png rename to src/afd/sprites/back-shiny/721--0--Volcanion.png diff --git a/src/afd/sprites/back-shiny/Rowlet.png b/src/afd/sprites/back-shiny/722--0--Rowlet.png similarity index 100% rename from src/afd/sprites/back-shiny/Rowlet.png rename to src/afd/sprites/back-shiny/722--0--Rowlet.png diff --git a/src/afd/sprites/back-shiny/Dartrix.png b/src/afd/sprites/back-shiny/723--0--Dartrix.png similarity index 100% rename from src/afd/sprites/back-shiny/Dartrix.png rename to src/afd/sprites/back-shiny/723--0--Dartrix.png diff --git a/src/afd/sprites/back-shiny/Decidueye.png b/src/afd/sprites/back-shiny/724--0--Decidueye.png similarity index 100% rename from src/afd/sprites/back-shiny/Decidueye.png rename to src/afd/sprites/back-shiny/724--0--Decidueye.png diff --git a/src/afd/sprites/back-shiny/Litten.png b/src/afd/sprites/back-shiny/725--0--Litten.png similarity index 100% rename from src/afd/sprites/back-shiny/Litten.png rename to src/afd/sprites/back-shiny/725--0--Litten.png diff --git a/src/afd/sprites/back-shiny/Torracat.png b/src/afd/sprites/back-shiny/726--0--Torracat.png similarity index 100% rename from src/afd/sprites/back-shiny/Torracat.png rename to src/afd/sprites/back-shiny/726--0--Torracat.png diff --git a/src/afd/sprites/back-shiny/Incineroar.png b/src/afd/sprites/back-shiny/727--0--Incineroar.png similarity index 100% rename from src/afd/sprites/back-shiny/Incineroar.png rename to src/afd/sprites/back-shiny/727--0--Incineroar.png diff --git a/src/afd/sprites/back-shiny/Popplio.png b/src/afd/sprites/back-shiny/728--0--Popplio.png similarity index 100% rename from src/afd/sprites/back-shiny/Popplio.png rename to src/afd/sprites/back-shiny/728--0--Popplio.png diff --git a/src/afd/sprites/back-shiny/Brionne.png b/src/afd/sprites/back-shiny/729--0--Brionne.png similarity index 100% rename from src/afd/sprites/back-shiny/Brionne.png rename to src/afd/sprites/back-shiny/729--0--Brionne.png diff --git a/src/afd/sprites/back-shiny/Tentacruel.png b/src/afd/sprites/back-shiny/73--0--Tentacruel.png similarity index 100% rename from src/afd/sprites/back-shiny/Tentacruel.png rename to src/afd/sprites/back-shiny/73--0--Tentacruel.png diff --git a/src/afd/sprites/back-shiny/Primarina.png b/src/afd/sprites/back-shiny/730--0--Primarina.png similarity index 100% rename from src/afd/sprites/back-shiny/Primarina.png rename to src/afd/sprites/back-shiny/730--0--Primarina.png diff --git a/src/afd/sprites/back-shiny/Pikipek.png b/src/afd/sprites/back-shiny/731--0--Pikipek.png similarity index 100% rename from src/afd/sprites/back-shiny/Pikipek.png rename to src/afd/sprites/back-shiny/731--0--Pikipek.png diff --git a/src/afd/sprites/back-shiny/Trumbeak.png b/src/afd/sprites/back-shiny/732--0--Trumbeak.png similarity index 100% rename from src/afd/sprites/back-shiny/Trumbeak.png rename to src/afd/sprites/back-shiny/732--0--Trumbeak.png diff --git a/src/afd/sprites/back-shiny/Toucannon.png b/src/afd/sprites/back-shiny/733--0--Toucannon.png similarity index 100% rename from src/afd/sprites/back-shiny/Toucannon.png rename to src/afd/sprites/back-shiny/733--0--Toucannon.png diff --git a/src/afd/sprites/back-shiny/Yungoos.png b/src/afd/sprites/back-shiny/734--0--Yungoos.png similarity index 100% rename from src/afd/sprites/back-shiny/Yungoos.png rename to src/afd/sprites/back-shiny/734--0--Yungoos.png diff --git a/src/afd/sprites/back-shiny/Gumshoos.png b/src/afd/sprites/back-shiny/735--0--Gumshoos.png similarity index 100% rename from src/afd/sprites/back-shiny/Gumshoos.png rename to src/afd/sprites/back-shiny/735--0--Gumshoos.png diff --git a/src/afd/sprites/back-shiny/Grubbin.png b/src/afd/sprites/back-shiny/736--0--Grubbin.png similarity index 100% rename from src/afd/sprites/back-shiny/Grubbin.png rename to src/afd/sprites/back-shiny/736--0--Grubbin.png diff --git a/src/afd/sprites/back-shiny/Charjabug.png b/src/afd/sprites/back-shiny/737--0--Charjabug.png similarity index 100% rename from src/afd/sprites/back-shiny/Charjabug.png rename to src/afd/sprites/back-shiny/737--0--Charjabug.png diff --git a/src/afd/sprites/back-shiny/Vikavolt.png b/src/afd/sprites/back-shiny/738--0--Vikavolt.png similarity index 100% rename from src/afd/sprites/back-shiny/Vikavolt.png rename to src/afd/sprites/back-shiny/738--0--Vikavolt.png diff --git a/src/afd/sprites/back-shiny/Crabrawler.png b/src/afd/sprites/back-shiny/739--0--Crabrawler.png similarity index 100% rename from src/afd/sprites/back-shiny/Crabrawler.png rename to src/afd/sprites/back-shiny/739--0--Crabrawler.png diff --git a/src/afd/sprites/back-shiny/Geodude.png b/src/afd/sprites/back-shiny/74--0--Geodude.png similarity index 100% rename from src/afd/sprites/back-shiny/Geodude.png rename to src/afd/sprites/back-shiny/74--0--Geodude.png diff --git a/src/afd/sprites/back-shiny/Geodude--Alola.png b/src/afd/sprites/back-shiny/74--420--Geodude--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Geodude--Alola.png rename to src/afd/sprites/back-shiny/74--420--Geodude--Alola.png diff --git a/src/afd/sprites/back-shiny/Crabominable.png b/src/afd/sprites/back-shiny/740--0--Crabominable.png similarity index 100% rename from src/afd/sprites/back-shiny/Crabominable.png rename to src/afd/sprites/back-shiny/740--0--Crabominable.png diff --git a/src/afd/sprites/back-shiny/Oricorio.png b/src/afd/sprites/back-shiny/741--0--Oricorio.png similarity index 100% rename from src/afd/sprites/back-shiny/Oricorio.png rename to src/afd/sprites/back-shiny/741--0--Oricorio.png diff --git a/src/afd/sprites/back-shiny/Oricorio--Pa__0027u.png b/src/afd/sprites/back-shiny/741--420--Oricorio--Pa__0027u.png similarity index 100% rename from src/afd/sprites/back-shiny/Oricorio--Pa__0027u.png rename to src/afd/sprites/back-shiny/741--420--Oricorio--Pa__0027u.png diff --git a/src/afd/sprites/back-shiny/Oricorio--Pom-Pom.png b/src/afd/sprites/back-shiny/741--420--Oricorio--Pom-Pom.png similarity index 100% rename from src/afd/sprites/back-shiny/Oricorio--Pom-Pom.png rename to src/afd/sprites/back-shiny/741--420--Oricorio--Pom-Pom.png diff --git a/src/afd/sprites/back-shiny/Oricorio--Sensu.png b/src/afd/sprites/back-shiny/741--420--Oricorio--Sensu.png similarity index 100% rename from src/afd/sprites/back-shiny/Oricorio--Sensu.png rename to src/afd/sprites/back-shiny/741--420--Oricorio--Sensu.png diff --git a/src/afd/sprites/back-shiny/Cutiefly.png b/src/afd/sprites/back-shiny/742--0--Cutiefly.png similarity index 100% rename from src/afd/sprites/back-shiny/Cutiefly.png rename to src/afd/sprites/back-shiny/742--0--Cutiefly.png diff --git a/src/afd/sprites/back-shiny/Ribombee.png b/src/afd/sprites/back-shiny/743--0--Ribombee.png similarity index 100% rename from src/afd/sprites/back-shiny/Ribombee.png rename to src/afd/sprites/back-shiny/743--0--Ribombee.png diff --git a/src/afd/sprites/back-shiny/Rockruff.png b/src/afd/sprites/back-shiny/744--0--Rockruff.png similarity index 100% rename from src/afd/sprites/back-shiny/Rockruff.png rename to src/afd/sprites/back-shiny/744--0--Rockruff.png diff --git a/src/afd/sprites/back-shiny/Lycanroc.png b/src/afd/sprites/back-shiny/745--0--Lycanroc.png similarity index 100% rename from src/afd/sprites/back-shiny/Lycanroc.png rename to src/afd/sprites/back-shiny/745--0--Lycanroc.png diff --git a/src/afd/sprites/back-shiny/Lycanroc--Dusk.png b/src/afd/sprites/back-shiny/745--420--Lycanroc--Dusk.png similarity index 100% rename from src/afd/sprites/back-shiny/Lycanroc--Dusk.png rename to src/afd/sprites/back-shiny/745--420--Lycanroc--Dusk.png diff --git a/src/afd/sprites/back-shiny/Lycanroc--Midnight.png b/src/afd/sprites/back-shiny/745--420--Lycanroc--Midnight.png similarity index 100% rename from src/afd/sprites/back-shiny/Lycanroc--Midnight.png rename to src/afd/sprites/back-shiny/745--420--Lycanroc--Midnight.png diff --git a/src/afd/sprites/back-shiny/Wishiwashi.png b/src/afd/sprites/back-shiny/746--0--Wishiwashi.png similarity index 100% rename from src/afd/sprites/back-shiny/Wishiwashi.png rename to src/afd/sprites/back-shiny/746--0--Wishiwashi.png diff --git a/src/afd/sprites/back-shiny/Wishiwashi--School.png b/src/afd/sprites/back-shiny/746--420--Wishiwashi--School.png similarity index 100% rename from src/afd/sprites/back-shiny/Wishiwashi--School.png rename to src/afd/sprites/back-shiny/746--420--Wishiwashi--School.png diff --git a/src/afd/sprites/back-shiny/Mareanie.png b/src/afd/sprites/back-shiny/747--0--Mareanie.png similarity index 100% rename from src/afd/sprites/back-shiny/Mareanie.png rename to src/afd/sprites/back-shiny/747--0--Mareanie.png diff --git a/src/afd/sprites/back-shiny/Toxapex.png b/src/afd/sprites/back-shiny/748--0--Toxapex.png similarity index 100% rename from src/afd/sprites/back-shiny/Toxapex.png rename to src/afd/sprites/back-shiny/748--0--Toxapex.png diff --git a/src/afd/sprites/back-shiny/Mudbray.png b/src/afd/sprites/back-shiny/749--0--Mudbray.png similarity index 100% rename from src/afd/sprites/back-shiny/Mudbray.png rename to src/afd/sprites/back-shiny/749--0--Mudbray.png diff --git a/src/afd/sprites/back-shiny/Graveler.png b/src/afd/sprites/back-shiny/75--0--Graveler.png similarity index 100% rename from src/afd/sprites/back-shiny/Graveler.png rename to src/afd/sprites/back-shiny/75--0--Graveler.png diff --git a/src/afd/sprites/back-shiny/Graveler--Alola.png b/src/afd/sprites/back-shiny/75--420--Graveler--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Graveler--Alola.png rename to src/afd/sprites/back-shiny/75--420--Graveler--Alola.png diff --git a/src/afd/sprites/back-shiny/Mudsdale.png b/src/afd/sprites/back-shiny/750--0--Mudsdale.png similarity index 100% rename from src/afd/sprites/back-shiny/Mudsdale.png rename to src/afd/sprites/back-shiny/750--0--Mudsdale.png diff --git a/src/afd/sprites/back-shiny/Dewpider.png b/src/afd/sprites/back-shiny/751--0--Dewpider.png similarity index 100% rename from src/afd/sprites/back-shiny/Dewpider.png rename to src/afd/sprites/back-shiny/751--0--Dewpider.png diff --git a/src/afd/sprites/back-shiny/Araquanid.png b/src/afd/sprites/back-shiny/752--0--Araquanid.png similarity index 100% rename from src/afd/sprites/back-shiny/Araquanid.png rename to src/afd/sprites/back-shiny/752--0--Araquanid.png diff --git a/src/afd/sprites/back-shiny/Fomantis.png b/src/afd/sprites/back-shiny/753--0--Fomantis.png similarity index 100% rename from src/afd/sprites/back-shiny/Fomantis.png rename to src/afd/sprites/back-shiny/753--0--Fomantis.png diff --git a/src/afd/sprites/back-shiny/Lurantis.png b/src/afd/sprites/back-shiny/754--0--Lurantis.png similarity index 100% rename from src/afd/sprites/back-shiny/Lurantis.png rename to src/afd/sprites/back-shiny/754--0--Lurantis.png diff --git a/src/afd/sprites/back-shiny/Morelull.png b/src/afd/sprites/back-shiny/755--0--Morelull.png similarity index 100% rename from src/afd/sprites/back-shiny/Morelull.png rename to src/afd/sprites/back-shiny/755--0--Morelull.png diff --git a/src/afd/sprites/back-shiny/Shiinotic.png b/src/afd/sprites/back-shiny/756--0--Shiinotic.png similarity index 100% rename from src/afd/sprites/back-shiny/Shiinotic.png rename to src/afd/sprites/back-shiny/756--0--Shiinotic.png diff --git a/src/afd/sprites/back-shiny/Salandit.png b/src/afd/sprites/back-shiny/757--0--Salandit.png similarity index 100% rename from src/afd/sprites/back-shiny/Salandit.png rename to src/afd/sprites/back-shiny/757--0--Salandit.png diff --git a/src/afd/sprites/back-shiny/Salazzle.png b/src/afd/sprites/back-shiny/758--0--Salazzle.png similarity index 100% rename from src/afd/sprites/back-shiny/Salazzle.png rename to src/afd/sprites/back-shiny/758--0--Salazzle.png diff --git a/src/afd/sprites/back-shiny/Stufful.png b/src/afd/sprites/back-shiny/759--0--Stufful.png similarity index 100% rename from src/afd/sprites/back-shiny/Stufful.png rename to src/afd/sprites/back-shiny/759--0--Stufful.png diff --git a/src/afd/sprites/back-shiny/Golem.png b/src/afd/sprites/back-shiny/76--0--Golem.png similarity index 100% rename from src/afd/sprites/back-shiny/Golem.png rename to src/afd/sprites/back-shiny/76--0--Golem.png diff --git a/src/afd/sprites/back-shiny/Golem--Alola.png b/src/afd/sprites/back-shiny/76--420--Golem--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Golem--Alola.png rename to src/afd/sprites/back-shiny/76--420--Golem--Alola.png diff --git a/src/afd/sprites/back-shiny/Bewear.png b/src/afd/sprites/back-shiny/760--0--Bewear.png similarity index 100% rename from src/afd/sprites/back-shiny/Bewear.png rename to src/afd/sprites/back-shiny/760--0--Bewear.png diff --git a/src/afd/sprites/back-shiny/Bounsweet.png b/src/afd/sprites/back-shiny/761--0--Bounsweet.png similarity index 100% rename from src/afd/sprites/back-shiny/Bounsweet.png rename to src/afd/sprites/back-shiny/761--0--Bounsweet.png diff --git a/src/afd/sprites/back-shiny/Steenee.png b/src/afd/sprites/back-shiny/762--0--Steenee.png similarity index 100% rename from src/afd/sprites/back-shiny/Steenee.png rename to src/afd/sprites/back-shiny/762--0--Steenee.png diff --git a/src/afd/sprites/back-shiny/Tsareena.png b/src/afd/sprites/back-shiny/763--0--Tsareena.png similarity index 100% rename from src/afd/sprites/back-shiny/Tsareena.png rename to src/afd/sprites/back-shiny/763--0--Tsareena.png diff --git a/src/afd/sprites/back-shiny/Comfey.png b/src/afd/sprites/back-shiny/764--0--Comfey.png similarity index 100% rename from src/afd/sprites/back-shiny/Comfey.png rename to src/afd/sprites/back-shiny/764--0--Comfey.png diff --git a/src/afd/sprites/back-shiny/Oranguru.png b/src/afd/sprites/back-shiny/765--0--Oranguru.png similarity index 100% rename from src/afd/sprites/back-shiny/Oranguru.png rename to src/afd/sprites/back-shiny/765--0--Oranguru.png diff --git a/src/afd/sprites/back-shiny/Passimian.png b/src/afd/sprites/back-shiny/766--0--Passimian.png similarity index 100% rename from src/afd/sprites/back-shiny/Passimian.png rename to src/afd/sprites/back-shiny/766--0--Passimian.png diff --git a/src/afd/sprites/back-shiny/Wimpod.png b/src/afd/sprites/back-shiny/767--0--Wimpod.png similarity index 100% rename from src/afd/sprites/back-shiny/Wimpod.png rename to src/afd/sprites/back-shiny/767--0--Wimpod.png diff --git a/src/afd/sprites/back-shiny/Golisopod.png b/src/afd/sprites/back-shiny/768--0--Golisopod.png similarity index 100% rename from src/afd/sprites/back-shiny/Golisopod.png rename to src/afd/sprites/back-shiny/768--0--Golisopod.png diff --git a/src/afd/sprites/back-shiny/Sandygast.png b/src/afd/sprites/back-shiny/769--0--Sandygast.png similarity index 100% rename from src/afd/sprites/back-shiny/Sandygast.png rename to src/afd/sprites/back-shiny/769--0--Sandygast.png diff --git a/src/afd/sprites/back-shiny/Ponyta.png b/src/afd/sprites/back-shiny/77--0--Ponyta.png similarity index 100% rename from src/afd/sprites/back-shiny/Ponyta.png rename to src/afd/sprites/back-shiny/77--0--Ponyta.png diff --git a/src/afd/sprites/back-shiny/Ponyta--Galar.png b/src/afd/sprites/back-shiny/77--420--Ponyta--Galar.png similarity index 100% rename from src/afd/sprites/back-shiny/Ponyta--Galar.png rename to src/afd/sprites/back-shiny/77--420--Ponyta--Galar.png diff --git a/src/afd/sprites/back-shiny/Palossand.png b/src/afd/sprites/back-shiny/770--0--Palossand.png similarity index 100% rename from src/afd/sprites/back-shiny/Palossand.png rename to src/afd/sprites/back-shiny/770--0--Palossand.png diff --git a/src/afd/sprites/back-shiny/Pyukumuku.png b/src/afd/sprites/back-shiny/771--0--Pyukumuku.png similarity index 100% rename from src/afd/sprites/back-shiny/Pyukumuku.png rename to src/afd/sprites/back-shiny/771--0--Pyukumuku.png diff --git a/src/afd/sprites/back-shiny/Type__003a_Null.png b/src/afd/sprites/back-shiny/772--0--Type__003a_Null.png similarity index 100% rename from src/afd/sprites/back-shiny/Type__003a_Null.png rename to src/afd/sprites/back-shiny/772--0--Type__003a_Null.png diff --git a/src/afd/sprites/back-shiny/Silvally.png b/src/afd/sprites/back-shiny/773--0--Silvally.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally.png rename to src/afd/sprites/back-shiny/773--0--Silvally.png diff --git a/src/afd/sprites/back-shiny/Silvally--Bug.png b/src/afd/sprites/back-shiny/773--420--Silvally--Bug.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Bug.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Bug.png diff --git a/src/afd/sprites/back-shiny/Silvally--Dark.png b/src/afd/sprites/back-shiny/773--420--Silvally--Dark.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Dark.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Dark.png diff --git a/src/afd/sprites/back-shiny/Silvally--Dragon.png b/src/afd/sprites/back-shiny/773--420--Silvally--Dragon.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Dragon.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Dragon.png diff --git a/src/afd/sprites/back-shiny/Silvally--Electric.png b/src/afd/sprites/back-shiny/773--420--Silvally--Electric.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Electric.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Electric.png diff --git a/src/afd/sprites/back-shiny/Silvally--Fairy.png b/src/afd/sprites/back-shiny/773--420--Silvally--Fairy.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Fairy.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Fairy.png diff --git a/src/afd/sprites/back-shiny/Silvally--Fighting.png b/src/afd/sprites/back-shiny/773--420--Silvally--Fighting.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Fighting.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Fighting.png diff --git a/src/afd/sprites/back-shiny/Silvally--Fire.png b/src/afd/sprites/back-shiny/773--420--Silvally--Fire.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Fire.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Fire.png diff --git a/src/afd/sprites/back-shiny/Silvally--Flying.png b/src/afd/sprites/back-shiny/773--420--Silvally--Flying.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Flying.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Flying.png diff --git a/src/afd/sprites/back-shiny/Silvally--Ghost.png b/src/afd/sprites/back-shiny/773--420--Silvally--Ghost.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Ghost.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Ghost.png diff --git a/src/afd/sprites/back-shiny/Silvally--Grass.png b/src/afd/sprites/back-shiny/773--420--Silvally--Grass.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Grass.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Grass.png diff --git a/src/afd/sprites/back-shiny/Silvally--Ground.png b/src/afd/sprites/back-shiny/773--420--Silvally--Ground.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Ground.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Ground.png diff --git a/src/afd/sprites/back-shiny/Silvally--Ice.png b/src/afd/sprites/back-shiny/773--420--Silvally--Ice.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Ice.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Ice.png diff --git a/src/afd/sprites/back-shiny/Silvally--Poison.png b/src/afd/sprites/back-shiny/773--420--Silvally--Poison.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Poison.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Poison.png diff --git a/src/afd/sprites/back-shiny/Silvally--Psychic.png b/src/afd/sprites/back-shiny/773--420--Silvally--Psychic.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Psychic.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Psychic.png diff --git a/src/afd/sprites/back-shiny/Silvally--Rock.png b/src/afd/sprites/back-shiny/773--420--Silvally--Rock.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Rock.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Rock.png diff --git a/src/afd/sprites/back-shiny/Silvally--Steel.png b/src/afd/sprites/back-shiny/773--420--Silvally--Steel.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Steel.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Steel.png diff --git a/src/afd/sprites/back-shiny/Silvally--Water.png b/src/afd/sprites/back-shiny/773--420--Silvally--Water.png similarity index 100% rename from src/afd/sprites/back-shiny/Silvally--Water.png rename to src/afd/sprites/back-shiny/773--420--Silvally--Water.png diff --git a/src/afd/sprites/back-shiny/Minior.png b/src/afd/sprites/back-shiny/774--0--Minior.png similarity index 100% rename from src/afd/sprites/back-shiny/Minior.png rename to src/afd/sprites/back-shiny/774--0--Minior.png diff --git a/src/afd/sprites/back-shiny/Minior--Meteor.png b/src/afd/sprites/back-shiny/774--420--Minior--Meteor.png similarity index 100% rename from src/afd/sprites/back-shiny/Minior--Meteor.png rename to src/afd/sprites/back-shiny/774--420--Minior--Meteor.png diff --git a/src/afd/sprites/back-shiny/Komala.png b/src/afd/sprites/back-shiny/775--0--Komala.png similarity index 100% rename from src/afd/sprites/back-shiny/Komala.png rename to src/afd/sprites/back-shiny/775--0--Komala.png diff --git a/src/afd/sprites/back-shiny/Turtonator.png b/src/afd/sprites/back-shiny/776--0--Turtonator.png similarity index 100% rename from src/afd/sprites/back-shiny/Turtonator.png rename to src/afd/sprites/back-shiny/776--0--Turtonator.png diff --git a/src/afd/sprites/back-shiny/Togedemaru.png b/src/afd/sprites/back-shiny/777--0--Togedemaru.png similarity index 100% rename from src/afd/sprites/back-shiny/Togedemaru.png rename to src/afd/sprites/back-shiny/777--0--Togedemaru.png diff --git a/src/afd/sprites/back-shiny/Mimikyu.png b/src/afd/sprites/back-shiny/778--0--Mimikyu.png similarity index 100% rename from src/afd/sprites/back-shiny/Mimikyu.png rename to src/afd/sprites/back-shiny/778--0--Mimikyu.png diff --git a/src/afd/sprites/back-shiny/Mimikyu--Busted.png b/src/afd/sprites/back-shiny/778--420--Mimikyu--Busted.png similarity index 100% rename from src/afd/sprites/back-shiny/Mimikyu--Busted.png rename to src/afd/sprites/back-shiny/778--420--Mimikyu--Busted.png diff --git a/src/afd/sprites/back-shiny/Bruxish.png b/src/afd/sprites/back-shiny/779--0--Bruxish.png similarity index 100% rename from src/afd/sprites/back-shiny/Bruxish.png rename to src/afd/sprites/back-shiny/779--0--Bruxish.png diff --git a/src/afd/sprites/back-shiny/Rapidash.png b/src/afd/sprites/back-shiny/78--0--Rapidash.png similarity index 100% rename from src/afd/sprites/back-shiny/Rapidash.png rename to src/afd/sprites/back-shiny/78--0--Rapidash.png diff --git a/src/afd/sprites/back-shiny/Rapidash--Galar.png b/src/afd/sprites/back-shiny/78--420--Rapidash--Galar.png similarity index 100% rename from src/afd/sprites/back-shiny/Rapidash--Galar.png rename to src/afd/sprites/back-shiny/78--420--Rapidash--Galar.png diff --git a/src/afd/sprites/back-shiny/Drampa.png b/src/afd/sprites/back-shiny/780--0--Drampa.png similarity index 100% rename from src/afd/sprites/back-shiny/Drampa.png rename to src/afd/sprites/back-shiny/780--0--Drampa.png diff --git a/src/afd/sprites/back-shiny/Dhelmise.png b/src/afd/sprites/back-shiny/781--0--Dhelmise.png similarity index 100% rename from src/afd/sprites/back-shiny/Dhelmise.png rename to src/afd/sprites/back-shiny/781--0--Dhelmise.png diff --git a/src/afd/sprites/back-shiny/Jangmo-o.png b/src/afd/sprites/back-shiny/782--0--Jangmo-o.png similarity index 100% rename from src/afd/sprites/back-shiny/Jangmo-o.png rename to src/afd/sprites/back-shiny/782--0--Jangmo-o.png diff --git a/src/afd/sprites/back-shiny/Hakamo-o.png b/src/afd/sprites/back-shiny/783--0--Hakamo-o.png similarity index 100% rename from src/afd/sprites/back-shiny/Hakamo-o.png rename to src/afd/sprites/back-shiny/783--0--Hakamo-o.png diff --git a/src/afd/sprites/back-shiny/Kommo-o.png b/src/afd/sprites/back-shiny/784--0--Kommo-o.png similarity index 100% rename from src/afd/sprites/back-shiny/Kommo-o.png rename to src/afd/sprites/back-shiny/784--0--Kommo-o.png diff --git a/src/afd/sprites/back-shiny/Tapu_Koko.png b/src/afd/sprites/back-shiny/785--0--Tapu_Koko.png similarity index 100% rename from src/afd/sprites/back-shiny/Tapu_Koko.png rename to src/afd/sprites/back-shiny/785--0--Tapu_Koko.png diff --git a/src/afd/sprites/back-shiny/Tapu_Lele.png b/src/afd/sprites/back-shiny/786--0--Tapu_Lele.png similarity index 100% rename from src/afd/sprites/back-shiny/Tapu_Lele.png rename to src/afd/sprites/back-shiny/786--0--Tapu_Lele.png diff --git a/src/afd/sprites/back-shiny/Tapu_Bulu.png b/src/afd/sprites/back-shiny/787--0--Tapu_Bulu.png similarity index 100% rename from src/afd/sprites/back-shiny/Tapu_Bulu.png rename to src/afd/sprites/back-shiny/787--0--Tapu_Bulu.png diff --git a/src/afd/sprites/back-shiny/Tapu_Fini.png b/src/afd/sprites/back-shiny/788--0--Tapu_Fini.png similarity index 100% rename from src/afd/sprites/back-shiny/Tapu_Fini.png rename to src/afd/sprites/back-shiny/788--0--Tapu_Fini.png diff --git a/src/afd/sprites/back-shiny/Cosmog.png b/src/afd/sprites/back-shiny/789--0--Cosmog.png similarity index 100% rename from src/afd/sprites/back-shiny/Cosmog.png rename to src/afd/sprites/back-shiny/789--0--Cosmog.png diff --git a/src/afd/sprites/back-shiny/Slowpoke.png b/src/afd/sprites/back-shiny/79--0--Slowpoke.png similarity index 100% rename from src/afd/sprites/back-shiny/Slowpoke.png rename to src/afd/sprites/back-shiny/79--0--Slowpoke.png diff --git a/src/afd/sprites/back-shiny/Slowpoke--Galar.png b/src/afd/sprites/back-shiny/79--420--Slowpoke--Galar.png similarity index 100% rename from src/afd/sprites/back-shiny/Slowpoke--Galar.png rename to src/afd/sprites/back-shiny/79--420--Slowpoke--Galar.png diff --git a/src/afd/sprites/back-shiny/Cosmoem.png b/src/afd/sprites/back-shiny/790--0--Cosmoem.png similarity index 100% rename from src/afd/sprites/back-shiny/Cosmoem.png rename to src/afd/sprites/back-shiny/790--0--Cosmoem.png diff --git a/src/afd/sprites/back-shiny/Solgaleo.png b/src/afd/sprites/back-shiny/791--0--Solgaleo.png similarity index 100% rename from src/afd/sprites/back-shiny/Solgaleo.png rename to src/afd/sprites/back-shiny/791--0--Solgaleo.png diff --git a/src/afd/sprites/back-shiny/Lunala.png b/src/afd/sprites/back-shiny/792--0--Lunala.png similarity index 100% rename from src/afd/sprites/back-shiny/Lunala.png rename to src/afd/sprites/back-shiny/792--0--Lunala.png diff --git a/src/afd/sprites/back-shiny/Nihilego.png b/src/afd/sprites/back-shiny/793--0--Nihilego.png similarity index 100% rename from src/afd/sprites/back-shiny/Nihilego.png rename to src/afd/sprites/back-shiny/793--0--Nihilego.png diff --git a/src/afd/sprites/back-shiny/Buzzwole.png b/src/afd/sprites/back-shiny/794--0--Buzzwole.png similarity index 100% rename from src/afd/sprites/back-shiny/Buzzwole.png rename to src/afd/sprites/back-shiny/794--0--Buzzwole.png diff --git a/src/afd/sprites/back-shiny/Pheromosa.png b/src/afd/sprites/back-shiny/795--0--Pheromosa.png similarity index 100% rename from src/afd/sprites/back-shiny/Pheromosa.png rename to src/afd/sprites/back-shiny/795--0--Pheromosa.png diff --git a/src/afd/sprites/back-shiny/Xurkitree.png b/src/afd/sprites/back-shiny/796--0--Xurkitree.png similarity index 100% rename from src/afd/sprites/back-shiny/Xurkitree.png rename to src/afd/sprites/back-shiny/796--0--Xurkitree.png diff --git a/src/afd/sprites/back-shiny/Celesteela.png b/src/afd/sprites/back-shiny/797--0--Celesteela.png similarity index 100% rename from src/afd/sprites/back-shiny/Celesteela.png rename to src/afd/sprites/back-shiny/797--0--Celesteela.png diff --git a/src/afd/sprites/back-shiny/Kartana.png b/src/afd/sprites/back-shiny/798--0--Kartana.png similarity index 100% rename from src/afd/sprites/back-shiny/Kartana.png rename to src/afd/sprites/back-shiny/798--0--Kartana.png diff --git a/src/afd/sprites/back-shiny/Guzzlord.png b/src/afd/sprites/back-shiny/799--0--Guzzlord.png similarity index 100% rename from src/afd/sprites/back-shiny/Guzzlord.png rename to src/afd/sprites/back-shiny/799--0--Guzzlord.png diff --git a/src/afd/sprites/back-shiny/Fidgit.png b/src/afd/sprites/back-shiny/8--0--Fidgit.png similarity index 100% rename from src/afd/sprites/back-shiny/Fidgit.png rename to src/afd/sprites/back-shiny/8--0--Fidgit.png diff --git a/src/afd/sprites/back-shiny/Wartortle.png b/src/afd/sprites/back-shiny/8--0--Wartortle.png similarity index 100% rename from src/afd/sprites/back-shiny/Wartortle.png rename to src/afd/sprites/back-shiny/8--0--Wartortle.png diff --git a/src/afd/sprites/back-shiny/Slowbro.png b/src/afd/sprites/back-shiny/80--0--Slowbro.png similarity index 100% rename from src/afd/sprites/back-shiny/Slowbro.png rename to src/afd/sprites/back-shiny/80--0--Slowbro.png diff --git a/src/afd/sprites/back-shiny/Slowbro--Mega.png b/src/afd/sprites/back-shiny/80--420--Slowbro--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Slowbro--Mega.png rename to src/afd/sprites/back-shiny/80--420--Slowbro--Mega.png diff --git a/src/afd/sprites/back-shiny/Necrozma.png b/src/afd/sprites/back-shiny/800--0--Necrozma.png similarity index 100% rename from src/afd/sprites/back-shiny/Necrozma.png rename to src/afd/sprites/back-shiny/800--0--Necrozma.png diff --git a/src/afd/sprites/back-shiny/Necrozma--Dawn-Wings.png b/src/afd/sprites/back-shiny/800--420--Necrozma--Dawn-Wings.png similarity index 100% rename from src/afd/sprites/back-shiny/Necrozma--Dawn-Wings.png rename to src/afd/sprites/back-shiny/800--420--Necrozma--Dawn-Wings.png diff --git a/src/afd/sprites/back-shiny/Necrozma--Dusk-Mane.png b/src/afd/sprites/back-shiny/800--420--Necrozma--Dusk-Mane.png similarity index 100% rename from src/afd/sprites/back-shiny/Necrozma--Dusk-Mane.png rename to src/afd/sprites/back-shiny/800--420--Necrozma--Dusk-Mane.png diff --git a/src/afd/sprites/back-shiny/Necrozma--Ultra.png b/src/afd/sprites/back-shiny/800--420--Necrozma--Ultra.png similarity index 100% rename from src/afd/sprites/back-shiny/Necrozma--Ultra.png rename to src/afd/sprites/back-shiny/800--420--Necrozma--Ultra.png diff --git a/src/afd/sprites/back-shiny/Magearna.png b/src/afd/sprites/back-shiny/801--0--Magearna.png similarity index 100% rename from src/afd/sprites/back-shiny/Magearna.png rename to src/afd/sprites/back-shiny/801--0--Magearna.png diff --git a/src/afd/sprites/back-shiny/Marshadow.png b/src/afd/sprites/back-shiny/802--0--Marshadow.png similarity index 100% rename from src/afd/sprites/back-shiny/Marshadow.png rename to src/afd/sprites/back-shiny/802--0--Marshadow.png diff --git a/src/afd/sprites/back-shiny/Poipole.png b/src/afd/sprites/back-shiny/803--0--Poipole.png similarity index 100% rename from src/afd/sprites/back-shiny/Poipole.png rename to src/afd/sprites/back-shiny/803--0--Poipole.png diff --git a/src/afd/sprites/back-shiny/Naganadel.png b/src/afd/sprites/back-shiny/804--0--Naganadel.png similarity index 100% rename from src/afd/sprites/back-shiny/Naganadel.png rename to src/afd/sprites/back-shiny/804--0--Naganadel.png diff --git a/src/afd/sprites/back-shiny/Stakataka.png b/src/afd/sprites/back-shiny/805--0--Stakataka.png similarity index 100% rename from src/afd/sprites/back-shiny/Stakataka.png rename to src/afd/sprites/back-shiny/805--0--Stakataka.png diff --git a/src/afd/sprites/back-shiny/Blacephalon.png b/src/afd/sprites/back-shiny/806--0--Blacephalon.png similarity index 100% rename from src/afd/sprites/back-shiny/Blacephalon.png rename to src/afd/sprites/back-shiny/806--0--Blacephalon.png diff --git a/src/afd/sprites/back-shiny/Zeraora.png b/src/afd/sprites/back-shiny/807--0--Zeraora.png similarity index 100% rename from src/afd/sprites/back-shiny/Zeraora.png rename to src/afd/sprites/back-shiny/807--0--Zeraora.png diff --git a/src/afd/sprites/back-shiny/Meltan.png b/src/afd/sprites/back-shiny/808--0--Meltan.png similarity index 100% rename from src/afd/sprites/back-shiny/Meltan.png rename to src/afd/sprites/back-shiny/808--0--Meltan.png diff --git a/src/afd/sprites/back-shiny/Melmetal.png b/src/afd/sprites/back-shiny/809--0--Melmetal.png similarity index 100% rename from src/afd/sprites/back-shiny/Melmetal.png rename to src/afd/sprites/back-shiny/809--0--Melmetal.png diff --git a/src/afd/sprites/back-shiny/Melmetal--Gmax.png b/src/afd/sprites/back-shiny/809--420--Melmetal--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Melmetal--Gmax.png rename to src/afd/sprites/back-shiny/809--420--Melmetal--Gmax.png diff --git a/src/afd/sprites/back-shiny/Magnemite.png b/src/afd/sprites/back-shiny/81--0--Magnemite.png similarity index 100% rename from src/afd/sprites/back-shiny/Magnemite.png rename to src/afd/sprites/back-shiny/81--0--Magnemite.png diff --git a/src/afd/sprites/back-shiny/Grookey.png b/src/afd/sprites/back-shiny/810--0--Grookey.png similarity index 100% rename from src/afd/sprites/back-shiny/Grookey.png rename to src/afd/sprites/back-shiny/810--0--Grookey.png diff --git a/src/afd/sprites/back-shiny/Thwackey.png b/src/afd/sprites/back-shiny/811--0--Thwackey.png similarity index 100% rename from src/afd/sprites/back-shiny/Thwackey.png rename to src/afd/sprites/back-shiny/811--0--Thwackey.png diff --git a/src/afd/sprites/back-shiny/Rillaboom.png b/src/afd/sprites/back-shiny/812--0--Rillaboom.png similarity index 100% rename from src/afd/sprites/back-shiny/Rillaboom.png rename to src/afd/sprites/back-shiny/812--0--Rillaboom.png diff --git a/src/afd/sprites/back-shiny/Scorbunny.png b/src/afd/sprites/back-shiny/813--0--Scorbunny.png similarity index 100% rename from src/afd/sprites/back-shiny/Scorbunny.png rename to src/afd/sprites/back-shiny/813--0--Scorbunny.png diff --git a/src/afd/sprites/back-shiny/Raboot.png b/src/afd/sprites/back-shiny/814--0--Raboot.png similarity index 100% rename from src/afd/sprites/back-shiny/Raboot.png rename to src/afd/sprites/back-shiny/814--0--Raboot.png diff --git a/src/afd/sprites/back-shiny/Cinderace.png b/src/afd/sprites/back-shiny/815--0--Cinderace.png similarity index 100% rename from src/afd/sprites/back-shiny/Cinderace.png rename to src/afd/sprites/back-shiny/815--0--Cinderace.png diff --git a/src/afd/sprites/back-shiny/Sobble.png b/src/afd/sprites/back-shiny/816--0--Sobble.png similarity index 100% rename from src/afd/sprites/back-shiny/Sobble.png rename to src/afd/sprites/back-shiny/816--0--Sobble.png diff --git a/src/afd/sprites/back-shiny/Drizzile.png b/src/afd/sprites/back-shiny/817--0--Drizzile.png similarity index 100% rename from src/afd/sprites/back-shiny/Drizzile.png rename to src/afd/sprites/back-shiny/817--0--Drizzile.png diff --git a/src/afd/sprites/back-shiny/Inteleon.png b/src/afd/sprites/back-shiny/818--0--Inteleon.png similarity index 100% rename from src/afd/sprites/back-shiny/Inteleon.png rename to src/afd/sprites/back-shiny/818--0--Inteleon.png diff --git a/src/afd/sprites/back-shiny/Skwovet.png b/src/afd/sprites/back-shiny/819--0--Skwovet.png similarity index 100% rename from src/afd/sprites/back-shiny/Skwovet.png rename to src/afd/sprites/back-shiny/819--0--Skwovet.png diff --git a/src/afd/sprites/back-shiny/Magneton.png b/src/afd/sprites/back-shiny/82--0--Magneton.png similarity index 100% rename from src/afd/sprites/back-shiny/Magneton.png rename to src/afd/sprites/back-shiny/82--0--Magneton.png diff --git a/src/afd/sprites/back-shiny/Greedent.png b/src/afd/sprites/back-shiny/820--0--Greedent.png similarity index 100% rename from src/afd/sprites/back-shiny/Greedent.png rename to src/afd/sprites/back-shiny/820--0--Greedent.png diff --git a/src/afd/sprites/back-shiny/Rookidee.png b/src/afd/sprites/back-shiny/821--0--Rookidee.png similarity index 100% rename from src/afd/sprites/back-shiny/Rookidee.png rename to src/afd/sprites/back-shiny/821--0--Rookidee.png diff --git a/src/afd/sprites/back-shiny/Corvisquire.png b/src/afd/sprites/back-shiny/822--0--Corvisquire.png similarity index 100% rename from src/afd/sprites/back-shiny/Corvisquire.png rename to src/afd/sprites/back-shiny/822--0--Corvisquire.png diff --git a/src/afd/sprites/back-shiny/Corviknight.png b/src/afd/sprites/back-shiny/823--0--Corviknight.png similarity index 100% rename from src/afd/sprites/back-shiny/Corviknight.png rename to src/afd/sprites/back-shiny/823--0--Corviknight.png diff --git a/src/afd/sprites/back-shiny/Corviknight--Gmax.png b/src/afd/sprites/back-shiny/823--420--Corviknight--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Corviknight--Gmax.png rename to src/afd/sprites/back-shiny/823--420--Corviknight--Gmax.png diff --git a/src/afd/sprites/back-shiny/Blipbug.png b/src/afd/sprites/back-shiny/824--0--Blipbug.png similarity index 100% rename from src/afd/sprites/back-shiny/Blipbug.png rename to src/afd/sprites/back-shiny/824--0--Blipbug.png diff --git a/src/afd/sprites/back-shiny/Dottler.png b/src/afd/sprites/back-shiny/825--0--Dottler.png similarity index 100% rename from src/afd/sprites/back-shiny/Dottler.png rename to src/afd/sprites/back-shiny/825--0--Dottler.png diff --git a/src/afd/sprites/back-shiny/Orbeetle.png b/src/afd/sprites/back-shiny/826--0--Orbeetle.png similarity index 100% rename from src/afd/sprites/back-shiny/Orbeetle.png rename to src/afd/sprites/back-shiny/826--0--Orbeetle.png diff --git a/src/afd/sprites/back-shiny/Orbeetle--Gmax.png b/src/afd/sprites/back-shiny/826--420--Orbeetle--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Orbeetle--Gmax.png rename to src/afd/sprites/back-shiny/826--420--Orbeetle--Gmax.png diff --git a/src/afd/sprites/back-shiny/Nickit.png b/src/afd/sprites/back-shiny/827--0--Nickit.png similarity index 100% rename from src/afd/sprites/back-shiny/Nickit.png rename to src/afd/sprites/back-shiny/827--0--Nickit.png diff --git a/src/afd/sprites/back-shiny/Thievul.png b/src/afd/sprites/back-shiny/828--0--Thievul.png similarity index 100% rename from src/afd/sprites/back-shiny/Thievul.png rename to src/afd/sprites/back-shiny/828--0--Thievul.png diff --git a/src/afd/sprites/back-shiny/Gossifleur.png b/src/afd/sprites/back-shiny/829--0--Gossifleur.png similarity index 100% rename from src/afd/sprites/back-shiny/Gossifleur.png rename to src/afd/sprites/back-shiny/829--0--Gossifleur.png diff --git a/src/afd/sprites/back-shiny/Farfetch__0027d.png b/src/afd/sprites/back-shiny/83--0--Farfetch__0027d.png similarity index 100% rename from src/afd/sprites/back-shiny/Farfetch__0027d.png rename to src/afd/sprites/back-shiny/83--0--Farfetch__0027d.png diff --git a/src/afd/sprites/back-shiny/Farfetch__0027d--Galar.png b/src/afd/sprites/back-shiny/83--420--Farfetch__0027d--Galar.png similarity index 100% rename from src/afd/sprites/back-shiny/Farfetch__0027d--Galar.png rename to src/afd/sprites/back-shiny/83--420--Farfetch__0027d--Galar.png diff --git a/src/afd/sprites/back-shiny/Eldegoss.png b/src/afd/sprites/back-shiny/830--0--Eldegoss.png similarity index 100% rename from src/afd/sprites/back-shiny/Eldegoss.png rename to src/afd/sprites/back-shiny/830--0--Eldegoss.png diff --git a/src/afd/sprites/back-shiny/Wooloo.png b/src/afd/sprites/back-shiny/831--0--Wooloo.png similarity index 100% rename from src/afd/sprites/back-shiny/Wooloo.png rename to src/afd/sprites/back-shiny/831--0--Wooloo.png diff --git a/src/afd/sprites/back-shiny/Dubwool.png b/src/afd/sprites/back-shiny/832--0--Dubwool.png similarity index 100% rename from src/afd/sprites/back-shiny/Dubwool.png rename to src/afd/sprites/back-shiny/832--0--Dubwool.png diff --git a/src/afd/sprites/back-shiny/Chewtle.png b/src/afd/sprites/back-shiny/833--0--Chewtle.png similarity index 100% rename from src/afd/sprites/back-shiny/Chewtle.png rename to src/afd/sprites/back-shiny/833--0--Chewtle.png diff --git a/src/afd/sprites/back-shiny/Drednaw.png b/src/afd/sprites/back-shiny/834--0--Drednaw.png similarity index 100% rename from src/afd/sprites/back-shiny/Drednaw.png rename to src/afd/sprites/back-shiny/834--0--Drednaw.png diff --git a/src/afd/sprites/back-shiny/Drednaw--Gmax.png b/src/afd/sprites/back-shiny/834--420--Drednaw--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Drednaw--Gmax.png rename to src/afd/sprites/back-shiny/834--420--Drednaw--Gmax.png diff --git a/src/afd/sprites/back-shiny/Yamper.png b/src/afd/sprites/back-shiny/835--0--Yamper.png similarity index 100% rename from src/afd/sprites/back-shiny/Yamper.png rename to src/afd/sprites/back-shiny/835--0--Yamper.png diff --git a/src/afd/sprites/back-shiny/Boltund.png b/src/afd/sprites/back-shiny/836--0--Boltund.png similarity index 100% rename from src/afd/sprites/back-shiny/Boltund.png rename to src/afd/sprites/back-shiny/836--0--Boltund.png diff --git a/src/afd/sprites/back-shiny/Rolycoly.png b/src/afd/sprites/back-shiny/837--0--Rolycoly.png similarity index 100% rename from src/afd/sprites/back-shiny/Rolycoly.png rename to src/afd/sprites/back-shiny/837--0--Rolycoly.png diff --git a/src/afd/sprites/back-shiny/Carkol.png b/src/afd/sprites/back-shiny/838--0--Carkol.png similarity index 100% rename from src/afd/sprites/back-shiny/Carkol.png rename to src/afd/sprites/back-shiny/838--0--Carkol.png diff --git a/src/afd/sprites/back-shiny/Coalossal.png b/src/afd/sprites/back-shiny/839--0--Coalossal.png similarity index 100% rename from src/afd/sprites/back-shiny/Coalossal.png rename to src/afd/sprites/back-shiny/839--0--Coalossal.png diff --git a/src/afd/sprites/back-shiny/Coalossal--Gmax.png b/src/afd/sprites/back-shiny/839--420--Coalossal--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Coalossal--Gmax.png rename to src/afd/sprites/back-shiny/839--420--Coalossal--Gmax.png diff --git a/src/afd/sprites/back-shiny/Doduo.png b/src/afd/sprites/back-shiny/84--0--Doduo.png similarity index 100% rename from src/afd/sprites/back-shiny/Doduo.png rename to src/afd/sprites/back-shiny/84--0--Doduo.png diff --git a/src/afd/sprites/back-shiny/Applin.png b/src/afd/sprites/back-shiny/840--0--Applin.png similarity index 100% rename from src/afd/sprites/back-shiny/Applin.png rename to src/afd/sprites/back-shiny/840--0--Applin.png diff --git a/src/afd/sprites/back-shiny/Flapple.png b/src/afd/sprites/back-shiny/841--0--Flapple.png similarity index 100% rename from src/afd/sprites/back-shiny/Flapple.png rename to src/afd/sprites/back-shiny/841--0--Flapple.png diff --git a/src/afd/sprites/back-shiny/Appletun--Gmax.png b/src/afd/sprites/back-shiny/841--420--Flapple--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Appletun--Gmax.png rename to src/afd/sprites/back-shiny/841--420--Flapple--Gmax.png diff --git a/src/afd/sprites/back-shiny/Appletun.png b/src/afd/sprites/back-shiny/842--0--Appletun.png similarity index 100% rename from src/afd/sprites/back-shiny/Appletun.png rename to src/afd/sprites/back-shiny/842--0--Appletun.png diff --git a/src/afd/sprites/back-shiny/Flapple--Gmax.png b/src/afd/sprites/back-shiny/842--420--Appletun--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Flapple--Gmax.png rename to src/afd/sprites/back-shiny/842--420--Appletun--Gmax.png diff --git a/src/afd/sprites/back-shiny/Silicobra.png b/src/afd/sprites/back-shiny/843--0--Silicobra.png similarity index 100% rename from src/afd/sprites/back-shiny/Silicobra.png rename to src/afd/sprites/back-shiny/843--0--Silicobra.png diff --git a/src/afd/sprites/back-shiny/Sandaconda.png b/src/afd/sprites/back-shiny/844--0--Sandaconda.png similarity index 100% rename from src/afd/sprites/back-shiny/Sandaconda.png rename to src/afd/sprites/back-shiny/844--0--Sandaconda.png diff --git a/src/afd/sprites/back-shiny/Sandaconda--Gmax.png b/src/afd/sprites/back-shiny/844--420--Sandaconda--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Sandaconda--Gmax.png rename to src/afd/sprites/back-shiny/844--420--Sandaconda--Gmax.png diff --git a/src/afd/sprites/back-shiny/Cramorant.png b/src/afd/sprites/back-shiny/845--0--Cramorant.png similarity index 100% rename from src/afd/sprites/back-shiny/Cramorant.png rename to src/afd/sprites/back-shiny/845--0--Cramorant.png diff --git a/src/afd/sprites/back-shiny/Cramorant--Gorging.png b/src/afd/sprites/back-shiny/845--420--Cramorant--Gorging.png similarity index 100% rename from src/afd/sprites/back-shiny/Cramorant--Gorging.png rename to src/afd/sprites/back-shiny/845--420--Cramorant--Gorging.png diff --git a/src/afd/sprites/back-shiny/Cramorant--Gulping.png b/src/afd/sprites/back-shiny/845--420--Cramorant--Gulping.png similarity index 100% rename from src/afd/sprites/back-shiny/Cramorant--Gulping.png rename to src/afd/sprites/back-shiny/845--420--Cramorant--Gulping.png diff --git a/src/afd/sprites/back-shiny/Arrokuda.png b/src/afd/sprites/back-shiny/846--0--Arrokuda.png similarity index 100% rename from src/afd/sprites/back-shiny/Arrokuda.png rename to src/afd/sprites/back-shiny/846--0--Arrokuda.png diff --git a/src/afd/sprites/back-shiny/Barraskewda.png b/src/afd/sprites/back-shiny/847--0--Barraskewda.png similarity index 100% rename from src/afd/sprites/back-shiny/Barraskewda.png rename to src/afd/sprites/back-shiny/847--0--Barraskewda.png diff --git a/src/afd/sprites/back-shiny/Toxel.png b/src/afd/sprites/back-shiny/848--0--Toxel.png similarity index 100% rename from src/afd/sprites/back-shiny/Toxel.png rename to src/afd/sprites/back-shiny/848--0--Toxel.png diff --git a/src/afd/sprites/back-shiny/Toxtricity.png b/src/afd/sprites/back-shiny/849--0--Toxtricity.png similarity index 100% rename from src/afd/sprites/back-shiny/Toxtricity.png rename to src/afd/sprites/back-shiny/849--0--Toxtricity.png diff --git a/src/afd/sprites/back-shiny/Toxtricity--Gmax.png b/src/afd/sprites/back-shiny/849--420--Toxtricity--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Toxtricity--Gmax.png rename to src/afd/sprites/back-shiny/849--420--Toxtricity--Gmax.png diff --git a/src/afd/sprites/back-shiny/Toxtricity--Low-Key-Gmax.png b/src/afd/sprites/back-shiny/849--420--Toxtricity--Low-Key-Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Toxtricity--Low-Key-Gmax.png rename to src/afd/sprites/back-shiny/849--420--Toxtricity--Low-Key-Gmax.png diff --git a/src/afd/sprites/back-shiny/Toxtricity--Low-Key.png b/src/afd/sprites/back-shiny/849--420--Toxtricity--Low-Key.png similarity index 100% rename from src/afd/sprites/back-shiny/Toxtricity--Low-Key.png rename to src/afd/sprites/back-shiny/849--420--Toxtricity--Low-Key.png diff --git a/src/afd/sprites/back-shiny/Dodrio.png b/src/afd/sprites/back-shiny/85--0--Dodrio.png similarity index 100% rename from src/afd/sprites/back-shiny/Dodrio.png rename to src/afd/sprites/back-shiny/85--0--Dodrio.png diff --git a/src/afd/sprites/back-shiny/Sizzlipede.png b/src/afd/sprites/back-shiny/850--0--Sizzlipede.png similarity index 100% rename from src/afd/sprites/back-shiny/Sizzlipede.png rename to src/afd/sprites/back-shiny/850--0--Sizzlipede.png diff --git a/src/afd/sprites/back-shiny/Centiskorch.png b/src/afd/sprites/back-shiny/851--0--Centiskorch.png similarity index 100% rename from src/afd/sprites/back-shiny/Centiskorch.png rename to src/afd/sprites/back-shiny/851--0--Centiskorch.png diff --git a/src/afd/sprites/back-shiny/Centiskorch--Gmax.png b/src/afd/sprites/back-shiny/851--420--Centiskorch--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Centiskorch--Gmax.png rename to src/afd/sprites/back-shiny/851--420--Centiskorch--Gmax.png diff --git a/src/afd/sprites/back-shiny/Clobbopus.png b/src/afd/sprites/back-shiny/852--0--Clobbopus.png similarity index 100% rename from src/afd/sprites/back-shiny/Clobbopus.png rename to src/afd/sprites/back-shiny/852--0--Clobbopus.png diff --git a/src/afd/sprites/back-shiny/Grapploct.png b/src/afd/sprites/back-shiny/853--0--Grapploct.png similarity index 100% rename from src/afd/sprites/back-shiny/Grapploct.png rename to src/afd/sprites/back-shiny/853--0--Grapploct.png diff --git a/src/afd/sprites/back-shiny/Sinistea.png b/src/afd/sprites/back-shiny/854--0--Sinistea.png similarity index 100% rename from src/afd/sprites/back-shiny/Sinistea.png rename to src/afd/sprites/back-shiny/854--0--Sinistea.png diff --git a/src/afd/sprites/back-shiny/Polteageist.png b/src/afd/sprites/back-shiny/855--0--Polteageist.png similarity index 100% rename from src/afd/sprites/back-shiny/Polteageist.png rename to src/afd/sprites/back-shiny/855--0--Polteageist.png diff --git a/src/afd/sprites/back-shiny/Hatenna.png b/src/afd/sprites/back-shiny/856--0--Hatenna.png similarity index 100% rename from src/afd/sprites/back-shiny/Hatenna.png rename to src/afd/sprites/back-shiny/856--0--Hatenna.png diff --git a/src/afd/sprites/back-shiny/Hattrem.png b/src/afd/sprites/back-shiny/857--0--Hattrem.png similarity index 100% rename from src/afd/sprites/back-shiny/Hattrem.png rename to src/afd/sprites/back-shiny/857--0--Hattrem.png diff --git a/src/afd/sprites/back-shiny/Hatterene.png b/src/afd/sprites/back-shiny/858--0--Hatterene.png similarity index 100% rename from src/afd/sprites/back-shiny/Hatterene.png rename to src/afd/sprites/back-shiny/858--0--Hatterene.png diff --git a/src/afd/sprites/back-shiny/Hatterene--Gmax.png b/src/afd/sprites/back-shiny/858--420--Hatterene--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Hatterene--Gmax.png rename to src/afd/sprites/back-shiny/858--420--Hatterene--Gmax.png diff --git a/src/afd/sprites/back-shiny/Impidimp.png b/src/afd/sprites/back-shiny/859--0--Impidimp.png similarity index 100% rename from src/afd/sprites/back-shiny/Impidimp.png rename to src/afd/sprites/back-shiny/859--0--Impidimp.png diff --git a/src/afd/sprites/back-shiny/Seel.png b/src/afd/sprites/back-shiny/86--0--Seel.png similarity index 100% rename from src/afd/sprites/back-shiny/Seel.png rename to src/afd/sprites/back-shiny/86--0--Seel.png diff --git a/src/afd/sprites/back-shiny/Morgrem.png b/src/afd/sprites/back-shiny/860--0--Morgrem.png similarity index 100% rename from src/afd/sprites/back-shiny/Morgrem.png rename to src/afd/sprites/back-shiny/860--0--Morgrem.png diff --git a/src/afd/sprites/back-shiny/Grimmsnarl.png b/src/afd/sprites/back-shiny/861--0--Grimmsnarl.png similarity index 100% rename from src/afd/sprites/back-shiny/Grimmsnarl.png rename to src/afd/sprites/back-shiny/861--0--Grimmsnarl.png diff --git a/src/afd/sprites/back-shiny/Grimmsnarl--Gmax.png b/src/afd/sprites/back-shiny/861--420--Grimmsnarl--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Grimmsnarl--Gmax.png rename to src/afd/sprites/back-shiny/861--420--Grimmsnarl--Gmax.png diff --git a/src/afd/sprites/back-shiny/Obstagoon.png b/src/afd/sprites/back-shiny/862--0--Obstagoon.png similarity index 100% rename from src/afd/sprites/back-shiny/Obstagoon.png rename to src/afd/sprites/back-shiny/862--0--Obstagoon.png diff --git a/src/afd/sprites/back-shiny/Perrserker.png b/src/afd/sprites/back-shiny/863--0--Perrserker.png similarity index 100% rename from src/afd/sprites/back-shiny/Perrserker.png rename to src/afd/sprites/back-shiny/863--0--Perrserker.png diff --git a/src/afd/sprites/back-shiny/Cursola.png b/src/afd/sprites/back-shiny/864--0--Cursola.png similarity index 100% rename from src/afd/sprites/back-shiny/Cursola.png rename to src/afd/sprites/back-shiny/864--0--Cursola.png diff --git a/src/afd/sprites/back-shiny/Sirfetch__0027d.png b/src/afd/sprites/back-shiny/865--0--Sirfetch__0027d.png similarity index 100% rename from src/afd/sprites/back-shiny/Sirfetch__0027d.png rename to src/afd/sprites/back-shiny/865--0--Sirfetch__0027d.png diff --git a/src/afd/sprites/back-shiny/Mr._Rime.png b/src/afd/sprites/back-shiny/866--0--Mr._Rime.png similarity index 100% rename from src/afd/sprites/back-shiny/Mr._Rime.png rename to src/afd/sprites/back-shiny/866--0--Mr._Rime.png diff --git a/src/afd/sprites/back-shiny/Runerigus.png b/src/afd/sprites/back-shiny/867--0--Runerigus.png similarity index 100% rename from src/afd/sprites/back-shiny/Runerigus.png rename to src/afd/sprites/back-shiny/867--0--Runerigus.png diff --git a/src/afd/sprites/back-shiny/Milcery.png b/src/afd/sprites/back-shiny/868--0--Milcery.png similarity index 100% rename from src/afd/sprites/back-shiny/Milcery.png rename to src/afd/sprites/back-shiny/868--0--Milcery.png diff --git a/src/afd/sprites/back-shiny/Alcremie.png b/src/afd/sprites/back-shiny/869--0--Alcremie.png similarity index 100% rename from src/afd/sprites/back-shiny/Alcremie.png rename to src/afd/sprites/back-shiny/869--0--Alcremie.png diff --git a/src/afd/sprites/back-shiny/Alcremie--Gmax.png b/src/afd/sprites/back-shiny/869--420--Alcremie--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Alcremie--Gmax.png rename to src/afd/sprites/back-shiny/869--420--Alcremie--Gmax.png diff --git a/src/afd/sprites/back-shiny/Dewgong.png b/src/afd/sprites/back-shiny/87--0--Dewgong.png similarity index 100% rename from src/afd/sprites/back-shiny/Dewgong.png rename to src/afd/sprites/back-shiny/87--0--Dewgong.png diff --git a/src/afd/sprites/back-shiny/Falinks.png b/src/afd/sprites/back-shiny/870--0--Falinks.png similarity index 100% rename from src/afd/sprites/back-shiny/Falinks.png rename to src/afd/sprites/back-shiny/870--0--Falinks.png diff --git a/src/afd/sprites/back-shiny/Pincurchin.png b/src/afd/sprites/back-shiny/871--0--Pincurchin.png similarity index 100% rename from src/afd/sprites/back-shiny/Pincurchin.png rename to src/afd/sprites/back-shiny/871--0--Pincurchin.png diff --git a/src/afd/sprites/back-shiny/Snom.png b/src/afd/sprites/back-shiny/872--0--Snom.png similarity index 100% rename from src/afd/sprites/back-shiny/Snom.png rename to src/afd/sprites/back-shiny/872--0--Snom.png diff --git a/src/afd/sprites/back-shiny/Frosmoth.png b/src/afd/sprites/back-shiny/873--0--Frosmoth.png similarity index 100% rename from src/afd/sprites/back-shiny/Frosmoth.png rename to src/afd/sprites/back-shiny/873--0--Frosmoth.png diff --git a/src/afd/sprites/back-shiny/Stonjourner.png b/src/afd/sprites/back-shiny/874--0--Stonjourner.png similarity index 100% rename from src/afd/sprites/back-shiny/Stonjourner.png rename to src/afd/sprites/back-shiny/874--0--Stonjourner.png diff --git a/src/afd/sprites/back-shiny/Eiscue.png b/src/afd/sprites/back-shiny/875--0--Eiscue.png similarity index 100% rename from src/afd/sprites/back-shiny/Eiscue.png rename to src/afd/sprites/back-shiny/875--0--Eiscue.png diff --git a/src/afd/sprites/back-shiny/Eiscue--Noice.png b/src/afd/sprites/back-shiny/875--420--Eiscue--Noice.png similarity index 100% rename from src/afd/sprites/back-shiny/Eiscue--Noice.png rename to src/afd/sprites/back-shiny/875--420--Eiscue--Noice.png diff --git a/src/afd/sprites/back-shiny/Indeedee.png b/src/afd/sprites/back-shiny/876--0--Indeedee.png similarity index 100% rename from src/afd/sprites/back-shiny/Indeedee.png rename to src/afd/sprites/back-shiny/876--0--Indeedee.png diff --git a/src/afd/sprites/back-shiny/Indeedee--F.png b/src/afd/sprites/back-shiny/876--420--Indeedee--F.png similarity index 100% rename from src/afd/sprites/back-shiny/Indeedee--F.png rename to src/afd/sprites/back-shiny/876--420--Indeedee--F.png diff --git a/src/afd/sprites/back-shiny/Morpeko.png b/src/afd/sprites/back-shiny/877--0--Morpeko.png similarity index 100% rename from src/afd/sprites/back-shiny/Morpeko.png rename to src/afd/sprites/back-shiny/877--0--Morpeko.png diff --git a/src/afd/sprites/back-shiny/Morpeko--Hangry.png b/src/afd/sprites/back-shiny/877--420--Morpeko--Hangry.png similarity index 100% rename from src/afd/sprites/back-shiny/Morpeko--Hangry.png rename to src/afd/sprites/back-shiny/877--420--Morpeko--Hangry.png diff --git a/src/afd/sprites/back-shiny/Cufant.png b/src/afd/sprites/back-shiny/878--0--Cufant.png similarity index 100% rename from src/afd/sprites/back-shiny/Cufant.png rename to src/afd/sprites/back-shiny/878--0--Cufant.png diff --git a/src/afd/sprites/back-shiny/Copperajah.png b/src/afd/sprites/back-shiny/879--0--Copperajah.png similarity index 100% rename from src/afd/sprites/back-shiny/Copperajah.png rename to src/afd/sprites/back-shiny/879--0--Copperajah.png diff --git a/src/afd/sprites/back-shiny/Copperajah--Gmax.png b/src/afd/sprites/back-shiny/879--420--Copperajah--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Copperajah--Gmax.png rename to src/afd/sprites/back-shiny/879--420--Copperajah--Gmax.png diff --git a/src/afd/sprites/back-shiny/Grimer.png b/src/afd/sprites/back-shiny/88--0--Grimer.png similarity index 100% rename from src/afd/sprites/back-shiny/Grimer.png rename to src/afd/sprites/back-shiny/88--0--Grimer.png diff --git a/src/afd/sprites/back-shiny/Grimer--Alola.png b/src/afd/sprites/back-shiny/88--420--Grimer--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Grimer--Alola.png rename to src/afd/sprites/back-shiny/88--420--Grimer--Alola.png diff --git a/src/afd/sprites/back-shiny/Dracozolt.png b/src/afd/sprites/back-shiny/880--0--Dracozolt.png similarity index 100% rename from src/afd/sprites/back-shiny/Dracozolt.png rename to src/afd/sprites/back-shiny/880--0--Dracozolt.png diff --git a/src/afd/sprites/back-shiny/Arctozolt.png b/src/afd/sprites/back-shiny/881--0--Arctozolt.png similarity index 100% rename from src/afd/sprites/back-shiny/Arctozolt.png rename to src/afd/sprites/back-shiny/881--0--Arctozolt.png diff --git a/src/afd/sprites/back-shiny/Dracovish.png b/src/afd/sprites/back-shiny/882--0--Dracovish.png similarity index 100% rename from src/afd/sprites/back-shiny/Dracovish.png rename to src/afd/sprites/back-shiny/882--0--Dracovish.png diff --git a/src/afd/sprites/back-shiny/Arctovish.png b/src/afd/sprites/back-shiny/883--0--Arctovish.png similarity index 100% rename from src/afd/sprites/back-shiny/Arctovish.png rename to src/afd/sprites/back-shiny/883--0--Arctovish.png diff --git a/src/afd/sprites/back-shiny/Duraludon.png b/src/afd/sprites/back-shiny/884--0--Duraludon.png similarity index 100% rename from src/afd/sprites/back-shiny/Duraludon.png rename to src/afd/sprites/back-shiny/884--0--Duraludon.png diff --git a/src/afd/sprites/back-shiny/Duraludon--Gmax.png b/src/afd/sprites/back-shiny/884--420--Duraludon--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Duraludon--Gmax.png rename to src/afd/sprites/back-shiny/884--420--Duraludon--Gmax.png diff --git a/src/afd/sprites/back-shiny/Dreepy.png b/src/afd/sprites/back-shiny/885--0--Dreepy.png similarity index 100% rename from src/afd/sprites/back-shiny/Dreepy.png rename to src/afd/sprites/back-shiny/885--0--Dreepy.png diff --git a/src/afd/sprites/back-shiny/Drakloak.png b/src/afd/sprites/back-shiny/886--0--Drakloak.png similarity index 100% rename from src/afd/sprites/back-shiny/Drakloak.png rename to src/afd/sprites/back-shiny/886--0--Drakloak.png diff --git a/src/afd/sprites/back-shiny/Dragapult.png b/src/afd/sprites/back-shiny/887--0--Dragapult.png similarity index 100% rename from src/afd/sprites/back-shiny/Dragapult.png rename to src/afd/sprites/back-shiny/887--0--Dragapult.png diff --git a/src/afd/sprites/back-shiny/Zacian.png b/src/afd/sprites/back-shiny/888--0--Zacian.png similarity index 100% rename from src/afd/sprites/back-shiny/Zacian.png rename to src/afd/sprites/back-shiny/888--0--Zacian.png diff --git a/src/afd/sprites/back-shiny/Zacian--Crowned.png b/src/afd/sprites/back-shiny/888--420--Zacian--Crowned.png similarity index 100% rename from src/afd/sprites/back-shiny/Zacian--Crowned.png rename to src/afd/sprites/back-shiny/888--420--Zacian--Crowned.png diff --git a/src/afd/sprites/back-shiny/Zamazenta.png b/src/afd/sprites/back-shiny/889--0--Zamazenta.png similarity index 100% rename from src/afd/sprites/back-shiny/Zamazenta.png rename to src/afd/sprites/back-shiny/889--0--Zamazenta.png diff --git a/src/afd/sprites/back-shiny/Zamazenta--Crowned.png b/src/afd/sprites/back-shiny/889--420--Zamazenta--Crowned.png similarity index 100% rename from src/afd/sprites/back-shiny/Zamazenta--Crowned.png rename to src/afd/sprites/back-shiny/889--420--Zamazenta--Crowned.png diff --git a/src/afd/sprites/back-shiny/Muk.png b/src/afd/sprites/back-shiny/89--0--Muk.png similarity index 100% rename from src/afd/sprites/back-shiny/Muk.png rename to src/afd/sprites/back-shiny/89--0--Muk.png diff --git a/src/afd/sprites/back-shiny/Muk--Alola.png b/src/afd/sprites/back-shiny/89--420--Muk--Alola.png similarity index 100% rename from src/afd/sprites/back-shiny/Muk--Alola.png rename to src/afd/sprites/back-shiny/89--420--Muk--Alola.png diff --git a/src/afd/sprites/back-shiny/Eternatus.png b/src/afd/sprites/back-shiny/890--0--Eternatus.png similarity index 100% rename from src/afd/sprites/back-shiny/Eternatus.png rename to src/afd/sprites/back-shiny/890--0--Eternatus.png diff --git a/src/afd/sprites/back-shiny/Eternatus--Eternamax.png b/src/afd/sprites/back-shiny/890--420--Eternatus--Eternamax.png similarity index 100% rename from src/afd/sprites/back-shiny/Eternatus--Eternamax.png rename to src/afd/sprites/back-shiny/890--420--Eternatus--Eternamax.png diff --git a/src/afd/sprites/back-shiny/Blastoise.png b/src/afd/sprites/back-shiny/9--0--Blastoise.png similarity index 100% rename from src/afd/sprites/back-shiny/Blastoise.png rename to src/afd/sprites/back-shiny/9--0--Blastoise.png diff --git a/src/afd/sprites/back-shiny/Blastoise--Mega.png b/src/afd/sprites/back-shiny/9--420--Blastoise--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Blastoise--Mega.png rename to src/afd/sprites/back-shiny/9--420--Blastoise--Mega.png diff --git a/src/afd/sprites/back-shiny/Shellder.png b/src/afd/sprites/back-shiny/90--0--Shellder.png similarity index 100% rename from src/afd/sprites/back-shiny/Shellder.png rename to src/afd/sprites/back-shiny/90--0--Shellder.png diff --git a/src/afd/sprites/back-shiny/Cloyster.png b/src/afd/sprites/back-shiny/91--0--Cloyster.png similarity index 100% rename from src/afd/sprites/back-shiny/Cloyster.png rename to src/afd/sprites/back-shiny/91--0--Cloyster.png diff --git a/src/afd/sprites/back-shiny/Gastly.png b/src/afd/sprites/back-shiny/92--0--Gastly.png similarity index 100% rename from src/afd/sprites/back-shiny/Gastly.png rename to src/afd/sprites/back-shiny/92--0--Gastly.png diff --git a/src/afd/sprites/back-shiny/Haunter.png b/src/afd/sprites/back-shiny/93--0--Haunter.png similarity index 100% rename from src/afd/sprites/back-shiny/Haunter.png rename to src/afd/sprites/back-shiny/93--0--Haunter.png diff --git a/src/afd/sprites/back-shiny/Gengar.png b/src/afd/sprites/back-shiny/94--0--Gengar.png similarity index 100% rename from src/afd/sprites/back-shiny/Gengar.png rename to src/afd/sprites/back-shiny/94--0--Gengar.png diff --git a/src/afd/sprites/back-shiny/Gengar--Gmax.png b/src/afd/sprites/back-shiny/94--420--Gengar--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Gengar--Gmax.png rename to src/afd/sprites/back-shiny/94--420--Gengar--Gmax.png diff --git a/src/afd/sprites/back-shiny/Gengar--Mega.png b/src/afd/sprites/back-shiny/94--420--Gengar--Mega.png similarity index 100% rename from src/afd/sprites/back-shiny/Gengar--Mega.png rename to src/afd/sprites/back-shiny/94--420--Gengar--Mega.png diff --git a/src/afd/sprites/back-shiny/Onix.png b/src/afd/sprites/back-shiny/95--0--Onix.png similarity index 100% rename from src/afd/sprites/back-shiny/Onix.png rename to src/afd/sprites/back-shiny/95--0--Onix.png diff --git a/src/afd/sprites/back-shiny/Drowzee.png b/src/afd/sprites/back-shiny/96--0--Drowzee.png similarity index 100% rename from src/afd/sprites/back-shiny/Drowzee.png rename to src/afd/sprites/back-shiny/96--0--Drowzee.png diff --git a/src/afd/sprites/back-shiny/Hypno.png b/src/afd/sprites/back-shiny/97--0--Hypno.png similarity index 100% rename from src/afd/sprites/back-shiny/Hypno.png rename to src/afd/sprites/back-shiny/97--0--Hypno.png diff --git a/src/afd/sprites/back-shiny/Krabby.png b/src/afd/sprites/back-shiny/98--0--Krabby.png similarity index 100% rename from src/afd/sprites/back-shiny/Krabby.png rename to src/afd/sprites/back-shiny/98--0--Krabby.png diff --git a/src/afd/sprites/back-shiny/Kingler.png b/src/afd/sprites/back-shiny/99--0--Kingler.png similarity index 100% rename from src/afd/sprites/back-shiny/Kingler.png rename to src/afd/sprites/back-shiny/99--0--Kingler.png diff --git a/src/afd/sprites/back-shiny/Kingler--Gmax.png b/src/afd/sprites/back-shiny/99--420--Kingler--Gmax.png similarity index 100% rename from src/afd/sprites/back-shiny/Kingler--Gmax.png rename to src/afd/sprites/back-shiny/99--420--Kingler--Gmax.png diff --git a/src/afd/sprites/back/Missingno..png b/src/afd/sprites/back/0--0--Missingno..png similarity index 100% rename from src/afd/sprites/back/Missingno..png rename to src/afd/sprites/back/0--0--Missingno..png diff --git a/src/afd/sprites/back/Bulbasaur.png b/src/afd/sprites/back/1--0--Bulbasaur.png similarity index 100% rename from src/afd/sprites/back/Bulbasaur.png rename to src/afd/sprites/back/1--0--Bulbasaur.png diff --git a/src/afd/sprites/back/Caterpie.png b/src/afd/sprites/back/10--0--Caterpie.png similarity index 100% rename from src/afd/sprites/back/Caterpie.png rename to src/afd/sprites/back/10--0--Caterpie.png diff --git a/src/afd/sprites/back/Voltorb.png b/src/afd/sprites/back/100--0--Voltorb.png similarity index 100% rename from src/afd/sprites/back/Voltorb.png rename to src/afd/sprites/back/100--0--Voltorb.png diff --git a/src/afd/sprites/back/Electrode.png b/src/afd/sprites/back/101--0--Electrode.png similarity index 100% rename from src/afd/sprites/back/Electrode.png rename to src/afd/sprites/back/101--0--Electrode.png diff --git a/src/afd/sprites/back/Exeggcute.png b/src/afd/sprites/back/102--0--Exeggcute.png similarity index 100% rename from src/afd/sprites/back/Exeggcute.png rename to src/afd/sprites/back/102--0--Exeggcute.png diff --git a/src/afd/sprites/back/Exeggutor.png b/src/afd/sprites/back/103--0--Exeggutor.png similarity index 100% rename from src/afd/sprites/back/Exeggutor.png rename to src/afd/sprites/back/103--0--Exeggutor.png diff --git a/src/afd/sprites/back/Exeggutor--Alola.png b/src/afd/sprites/back/103--420--Exeggutor--Alola.png similarity index 100% rename from src/afd/sprites/back/Exeggutor--Alola.png rename to src/afd/sprites/back/103--420--Exeggutor--Alola.png diff --git a/src/afd/sprites/back/Cubone.png b/src/afd/sprites/back/104--0--Cubone.png similarity index 100% rename from src/afd/sprites/back/Cubone.png rename to src/afd/sprites/back/104--0--Cubone.png diff --git a/src/afd/sprites/back/Marowak.png b/src/afd/sprites/back/105--0--Marowak.png similarity index 100% rename from src/afd/sprites/back/Marowak.png rename to src/afd/sprites/back/105--0--Marowak.png diff --git a/src/afd/sprites/back/Marowak--Alola.png b/src/afd/sprites/back/105--420--Marowak--Alola.png similarity index 100% rename from src/afd/sprites/back/Marowak--Alola.png rename to src/afd/sprites/back/105--420--Marowak--Alola.png diff --git a/src/afd/sprites/back/Hitmonlee.png b/src/afd/sprites/back/106--0--Hitmonlee.png similarity index 100% rename from src/afd/sprites/back/Hitmonlee.png rename to src/afd/sprites/back/106--0--Hitmonlee.png diff --git a/src/afd/sprites/back/Hitmonchan.png b/src/afd/sprites/back/107--0--Hitmonchan.png similarity index 100% rename from src/afd/sprites/back/Hitmonchan.png rename to src/afd/sprites/back/107--0--Hitmonchan.png diff --git a/src/afd/sprites/back/Lickitung.png b/src/afd/sprites/back/108--0--Lickitung.png similarity index 100% rename from src/afd/sprites/back/Lickitung.png rename to src/afd/sprites/back/108--0--Lickitung.png diff --git a/src/afd/sprites/back/Koffing.png b/src/afd/sprites/back/109--0--Koffing.png similarity index 100% rename from src/afd/sprites/back/Koffing.png rename to src/afd/sprites/back/109--0--Koffing.png diff --git a/src/afd/sprites/back/Metapod.png b/src/afd/sprites/back/11--0--Metapod.png similarity index 100% rename from src/afd/sprites/back/Metapod.png rename to src/afd/sprites/back/11--0--Metapod.png diff --git a/src/afd/sprites/back/Stratagem.png b/src/afd/sprites/back/11--0--Stratagem.png similarity index 100% rename from src/afd/sprites/back/Stratagem.png rename to src/afd/sprites/back/11--0--Stratagem.png diff --git a/src/afd/sprites/back/Weezing.png b/src/afd/sprites/back/110--0--Weezing.png similarity index 100% rename from src/afd/sprites/back/Weezing.png rename to src/afd/sprites/back/110--0--Weezing.png diff --git a/src/afd/sprites/back/Weezing--Galar.png b/src/afd/sprites/back/110--420--Weezing--Galar.png similarity index 100% rename from src/afd/sprites/back/Weezing--Galar.png rename to src/afd/sprites/back/110--420--Weezing--Galar.png diff --git a/src/afd/sprites/back/Rhyhorn.png b/src/afd/sprites/back/111--0--Rhyhorn.png similarity index 100% rename from src/afd/sprites/back/Rhyhorn.png rename to src/afd/sprites/back/111--0--Rhyhorn.png diff --git a/src/afd/sprites/back/Rhydon.png b/src/afd/sprites/back/112--0--Rhydon.png similarity index 100% rename from src/afd/sprites/back/Rhydon.png rename to src/afd/sprites/back/112--0--Rhydon.png diff --git a/src/afd/sprites/back/Chansey.png b/src/afd/sprites/back/113--0--Chansey.png similarity index 100% rename from src/afd/sprites/back/Chansey.png rename to src/afd/sprites/back/113--0--Chansey.png diff --git a/src/afd/sprites/back/Tangela.png b/src/afd/sprites/back/114--0--Tangela.png similarity index 100% rename from src/afd/sprites/back/Tangela.png rename to src/afd/sprites/back/114--0--Tangela.png diff --git a/src/afd/sprites/back/Kangaskhan.png b/src/afd/sprites/back/115--0--Kangaskhan.png similarity index 100% rename from src/afd/sprites/back/Kangaskhan.png rename to src/afd/sprites/back/115--0--Kangaskhan.png diff --git a/src/afd/sprites/back/Kangaskhan--Mega.png b/src/afd/sprites/back/115--420--Kangaskhan--Mega.png similarity index 100% rename from src/afd/sprites/back/Kangaskhan--Mega.png rename to src/afd/sprites/back/115--420--Kangaskhan--Mega.png diff --git a/src/afd/sprites/back/Horsea.png b/src/afd/sprites/back/116--0--Horsea.png similarity index 100% rename from src/afd/sprites/back/Horsea.png rename to src/afd/sprites/back/116--0--Horsea.png diff --git a/src/afd/sprites/back/Seadra.png b/src/afd/sprites/back/117--0--Seadra.png similarity index 100% rename from src/afd/sprites/back/Seadra.png rename to src/afd/sprites/back/117--0--Seadra.png diff --git a/src/afd/sprites/back/Goldeen.png b/src/afd/sprites/back/118--0--Goldeen.png similarity index 100% rename from src/afd/sprites/back/Goldeen.png rename to src/afd/sprites/back/118--0--Goldeen.png diff --git a/src/afd/sprites/back/Seaking.png b/src/afd/sprites/back/119--0--Seaking.png similarity index 100% rename from src/afd/sprites/back/Seaking.png rename to src/afd/sprites/back/119--0--Seaking.png diff --git a/src/afd/sprites/back/Butterfree.png b/src/afd/sprites/back/12--0--Butterfree.png similarity index 100% rename from src/afd/sprites/back/Butterfree.png rename to src/afd/sprites/back/12--0--Butterfree.png diff --git a/src/afd/sprites/back/Butterfree--Gmax.png b/src/afd/sprites/back/12--420--Butterfree--Gmax.png similarity index 100% rename from src/afd/sprites/back/Butterfree--Gmax.png rename to src/afd/sprites/back/12--420--Butterfree--Gmax.png diff --git a/src/afd/sprites/back/Staryu.png b/src/afd/sprites/back/120--0--Staryu.png similarity index 100% rename from src/afd/sprites/back/Staryu.png rename to src/afd/sprites/back/120--0--Staryu.png diff --git a/src/afd/sprites/back/Starmie.png b/src/afd/sprites/back/121--0--Starmie.png similarity index 100% rename from src/afd/sprites/back/Starmie.png rename to src/afd/sprites/back/121--0--Starmie.png diff --git a/src/afd/sprites/back/Mr._Mime.png b/src/afd/sprites/back/122--0--Mr._Mime.png similarity index 100% rename from src/afd/sprites/back/Mr._Mime.png rename to src/afd/sprites/back/122--0--Mr._Mime.png diff --git a/src/afd/sprites/back/Mr._Mime--Galar.png b/src/afd/sprites/back/122--420--Mr._Mime--Galar.png similarity index 100% rename from src/afd/sprites/back/Mr._Mime--Galar.png rename to src/afd/sprites/back/122--420--Mr._Mime--Galar.png diff --git a/src/afd/sprites/back/Scyther.png b/src/afd/sprites/back/123--0--Scyther.png similarity index 100% rename from src/afd/sprites/back/Scyther.png rename to src/afd/sprites/back/123--0--Scyther.png diff --git a/src/afd/sprites/back/Jynx.png b/src/afd/sprites/back/124--0--Jynx.png similarity index 100% rename from src/afd/sprites/back/Jynx.png rename to src/afd/sprites/back/124--0--Jynx.png diff --git a/src/afd/sprites/back/Electabuzz.png b/src/afd/sprites/back/125--0--Electabuzz.png similarity index 100% rename from src/afd/sprites/back/Electabuzz.png rename to src/afd/sprites/back/125--0--Electabuzz.png diff --git a/src/afd/sprites/back/Magmar.png b/src/afd/sprites/back/126--0--Magmar.png similarity index 100% rename from src/afd/sprites/back/Magmar.png rename to src/afd/sprites/back/126--0--Magmar.png diff --git a/src/afd/sprites/back/Pinsir.png b/src/afd/sprites/back/127--0--Pinsir.png similarity index 100% rename from src/afd/sprites/back/Pinsir.png rename to src/afd/sprites/back/127--0--Pinsir.png diff --git a/src/afd/sprites/back/Pinsir--Mega.png b/src/afd/sprites/back/127--420--Pinsir--Mega.png similarity index 100% rename from src/afd/sprites/back/Pinsir--Mega.png rename to src/afd/sprites/back/127--420--Pinsir--Mega.png diff --git a/src/afd/sprites/back/Tauros.png b/src/afd/sprites/back/128--0--Tauros.png similarity index 100% rename from src/afd/sprites/back/Tauros.png rename to src/afd/sprites/back/128--0--Tauros.png diff --git a/src/afd/sprites/back/Magikarp.png b/src/afd/sprites/back/129--0--Magikarp.png similarity index 100% rename from src/afd/sprites/back/Magikarp.png rename to src/afd/sprites/back/129--0--Magikarp.png diff --git a/src/afd/sprites/back/Arghonaut.png b/src/afd/sprites/back/13--0--Arghonaut.png similarity index 100% rename from src/afd/sprites/back/Arghonaut.png rename to src/afd/sprites/back/13--0--Arghonaut.png diff --git a/src/afd/sprites/back/Weedle.png b/src/afd/sprites/back/13--0--Weedle.png similarity index 100% rename from src/afd/sprites/back/Weedle.png rename to src/afd/sprites/back/13--0--Weedle.png diff --git a/src/afd/sprites/back/Gyarados.png b/src/afd/sprites/back/130--0--Gyarados.png similarity index 100% rename from src/afd/sprites/back/Gyarados.png rename to src/afd/sprites/back/130--0--Gyarados.png diff --git a/src/afd/sprites/back/Gyarados--Mega.png b/src/afd/sprites/back/130--420--Gyarados--Mega.png similarity index 100% rename from src/afd/sprites/back/Gyarados--Mega.png rename to src/afd/sprites/back/130--420--Gyarados--Mega.png diff --git a/src/afd/sprites/back/Lapras.png b/src/afd/sprites/back/131--0--Lapras.png similarity index 100% rename from src/afd/sprites/back/Lapras.png rename to src/afd/sprites/back/131--0--Lapras.png diff --git a/src/afd/sprites/back/Lapras--Gmax.png b/src/afd/sprites/back/131--420--Lapras--Gmax.png similarity index 100% rename from src/afd/sprites/back/Lapras--Gmax.png rename to src/afd/sprites/back/131--420--Lapras--Gmax.png diff --git a/src/afd/sprites/back/Ditto.png b/src/afd/sprites/back/132--0--Ditto.png similarity index 100% rename from src/afd/sprites/back/Ditto.png rename to src/afd/sprites/back/132--0--Ditto.png diff --git a/src/afd/sprites/back/Eevee.png b/src/afd/sprites/back/133--0--Eevee.png similarity index 100% rename from src/afd/sprites/back/Eevee.png rename to src/afd/sprites/back/133--0--Eevee.png diff --git a/src/afd/sprites/back/Eevee--Gmax.png b/src/afd/sprites/back/133--420--Eevee--Gmax.png similarity index 100% rename from src/afd/sprites/back/Eevee--Gmax.png rename to src/afd/sprites/back/133--420--Eevee--Gmax.png diff --git a/src/afd/sprites/back/Eevee--Starter.png b/src/afd/sprites/back/133--420--Eevee--Starter.png similarity index 100% rename from src/afd/sprites/back/Eevee--Starter.png rename to src/afd/sprites/back/133--420--Eevee--Starter.png diff --git a/src/afd/sprites/back/Vaporeon.png b/src/afd/sprites/back/134--0--Vaporeon.png similarity index 100% rename from src/afd/sprites/back/Vaporeon.png rename to src/afd/sprites/back/134--0--Vaporeon.png diff --git a/src/afd/sprites/back/Jolteon.png b/src/afd/sprites/back/135--0--Jolteon.png similarity index 100% rename from src/afd/sprites/back/Jolteon.png rename to src/afd/sprites/back/135--0--Jolteon.png diff --git a/src/afd/sprites/back/Flareon.png b/src/afd/sprites/back/136--0--Flareon.png similarity index 100% rename from src/afd/sprites/back/Flareon.png rename to src/afd/sprites/back/136--0--Flareon.png diff --git a/src/afd/sprites/back/Porygon.png b/src/afd/sprites/back/137--0--Porygon.png similarity index 100% rename from src/afd/sprites/back/Porygon.png rename to src/afd/sprites/back/137--0--Porygon.png diff --git a/src/afd/sprites/back/Omanyte.png b/src/afd/sprites/back/138--0--Omanyte.png similarity index 100% rename from src/afd/sprites/back/Omanyte.png rename to src/afd/sprites/back/138--0--Omanyte.png diff --git a/src/afd/sprites/back/Omastar.png b/src/afd/sprites/back/139--0--Omastar.png similarity index 100% rename from src/afd/sprites/back/Omastar.png rename to src/afd/sprites/back/139--0--Omastar.png diff --git a/src/afd/sprites/back/Kakuna.png b/src/afd/sprites/back/14--0--Kakuna.png similarity index 100% rename from src/afd/sprites/back/Kakuna.png rename to src/afd/sprites/back/14--0--Kakuna.png diff --git a/src/afd/sprites/back/Kitsunoh.png b/src/afd/sprites/back/14--0--Kitsunoh.png similarity index 100% rename from src/afd/sprites/back/Kitsunoh.png rename to src/afd/sprites/back/14--0--Kitsunoh.png diff --git a/src/afd/sprites/back/Kabuto.png b/src/afd/sprites/back/140--0--Kabuto.png similarity index 100% rename from src/afd/sprites/back/Kabuto.png rename to src/afd/sprites/back/140--0--Kabuto.png diff --git a/src/afd/sprites/back/Kabutops.png b/src/afd/sprites/back/141--0--Kabutops.png similarity index 100% rename from src/afd/sprites/back/Kabutops.png rename to src/afd/sprites/back/141--0--Kabutops.png diff --git a/src/afd/sprites/back/Aerodactyl.png b/src/afd/sprites/back/142--0--Aerodactyl.png similarity index 100% rename from src/afd/sprites/back/Aerodactyl.png rename to src/afd/sprites/back/142--0--Aerodactyl.png diff --git a/src/afd/sprites/back/Aerodactyl--Mega.png b/src/afd/sprites/back/142--420--Aerodactyl--Mega.png similarity index 100% rename from src/afd/sprites/back/Aerodactyl--Mega.png rename to src/afd/sprites/back/142--420--Aerodactyl--Mega.png diff --git a/src/afd/sprites/back/Snorlax.png b/src/afd/sprites/back/143--0--Snorlax.png similarity index 100% rename from src/afd/sprites/back/Snorlax.png rename to src/afd/sprites/back/143--0--Snorlax.png diff --git a/src/afd/sprites/back/Snorlax--Gmax.png b/src/afd/sprites/back/143--420--Snorlax--Gmax.png similarity index 100% rename from src/afd/sprites/back/Snorlax--Gmax.png rename to src/afd/sprites/back/143--420--Snorlax--Gmax.png diff --git a/src/afd/sprites/back/Articuno.png b/src/afd/sprites/back/144--0--Articuno.png similarity index 100% rename from src/afd/sprites/back/Articuno.png rename to src/afd/sprites/back/144--0--Articuno.png diff --git a/src/afd/sprites/back/Zapdos.png b/src/afd/sprites/back/145--0--Zapdos.png similarity index 100% rename from src/afd/sprites/back/Zapdos.png rename to src/afd/sprites/back/145--0--Zapdos.png diff --git a/src/afd/sprites/back/Moltres.png b/src/afd/sprites/back/146--0--Moltres.png similarity index 100% rename from src/afd/sprites/back/Moltres.png rename to src/afd/sprites/back/146--0--Moltres.png diff --git a/src/afd/sprites/back/Dratini.png b/src/afd/sprites/back/147--0--Dratini.png similarity index 100% rename from src/afd/sprites/back/Dratini.png rename to src/afd/sprites/back/147--0--Dratini.png diff --git a/src/afd/sprites/back/Dragonair.png b/src/afd/sprites/back/148--0--Dragonair.png similarity index 100% rename from src/afd/sprites/back/Dragonair.png rename to src/afd/sprites/back/148--0--Dragonair.png diff --git a/src/afd/sprites/back/Dragonite.png b/src/afd/sprites/back/149--0--Dragonite.png similarity index 100% rename from src/afd/sprites/back/Dragonite.png rename to src/afd/sprites/back/149--0--Dragonite.png diff --git a/src/afd/sprites/back/Beedrill.png b/src/afd/sprites/back/15--0--Beedrill.png similarity index 100% rename from src/afd/sprites/back/Beedrill.png rename to src/afd/sprites/back/15--0--Beedrill.png diff --git a/src/afd/sprites/back/Cyclohm.png b/src/afd/sprites/back/15--0--Cyclohm.png similarity index 100% rename from src/afd/sprites/back/Cyclohm.png rename to src/afd/sprites/back/15--0--Cyclohm.png diff --git a/src/afd/sprites/back/Beedrill--Mega.png b/src/afd/sprites/back/15--420--Beedrill--Mega.png similarity index 100% rename from src/afd/sprites/back/Beedrill--Mega.png rename to src/afd/sprites/back/15--420--Beedrill--Mega.png diff --git a/src/afd/sprites/back/Mewtwo.png b/src/afd/sprites/back/150--0--Mewtwo.png similarity index 100% rename from src/afd/sprites/back/Mewtwo.png rename to src/afd/sprites/back/150--0--Mewtwo.png diff --git a/src/afd/sprites/back/Mewtwo--Mega-X.png b/src/afd/sprites/back/150--420--Mewtwo--Mega-X.png similarity index 100% rename from src/afd/sprites/back/Mewtwo--Mega-X.png rename to src/afd/sprites/back/150--420--Mewtwo--Mega-X.png diff --git a/src/afd/sprites/back/Mewtwo--Mega-Y.png b/src/afd/sprites/back/150--420--Mewtwo--Mega-Y.png similarity index 100% rename from src/afd/sprites/back/Mewtwo--Mega-Y.png rename to src/afd/sprites/back/150--420--Mewtwo--Mega-Y.png diff --git a/src/afd/sprites/back/Mew.png b/src/afd/sprites/back/151--0--Mew.png similarity index 100% rename from src/afd/sprites/back/Mew.png rename to src/afd/sprites/back/151--0--Mew.png diff --git a/src/afd/sprites/back/Chikorita.png b/src/afd/sprites/back/152--0--Chikorita.png similarity index 100% rename from src/afd/sprites/back/Chikorita.png rename to src/afd/sprites/back/152--0--Chikorita.png diff --git a/src/afd/sprites/back/Bayleef.png b/src/afd/sprites/back/153--0--Bayleef.png similarity index 100% rename from src/afd/sprites/back/Bayleef.png rename to src/afd/sprites/back/153--0--Bayleef.png diff --git a/src/afd/sprites/back/Meganium.png b/src/afd/sprites/back/154--0--Meganium.png similarity index 100% rename from src/afd/sprites/back/Meganium.png rename to src/afd/sprites/back/154--0--Meganium.png diff --git a/src/afd/sprites/back/Cyndaquil.png b/src/afd/sprites/back/155--0--Cyndaquil.png similarity index 100% rename from src/afd/sprites/back/Cyndaquil.png rename to src/afd/sprites/back/155--0--Cyndaquil.png diff --git a/src/afd/sprites/back/Quilava.png b/src/afd/sprites/back/156--0--Quilava.png similarity index 100% rename from src/afd/sprites/back/Quilava.png rename to src/afd/sprites/back/156--0--Quilava.png diff --git a/src/afd/sprites/back/Typhlosion.png b/src/afd/sprites/back/157--0--Typhlosion.png similarity index 100% rename from src/afd/sprites/back/Typhlosion.png rename to src/afd/sprites/back/157--0--Typhlosion.png diff --git a/src/afd/sprites/back/Totodile.png b/src/afd/sprites/back/158--0--Totodile.png similarity index 100% rename from src/afd/sprites/back/Totodile.png rename to src/afd/sprites/back/158--0--Totodile.png diff --git a/src/afd/sprites/back/Croconaw.png b/src/afd/sprites/back/159--0--Croconaw.png similarity index 100% rename from src/afd/sprites/back/Croconaw.png rename to src/afd/sprites/back/159--0--Croconaw.png diff --git a/src/afd/sprites/back/Colossoil.png b/src/afd/sprites/back/16--0--Colossoil.png similarity index 100% rename from src/afd/sprites/back/Colossoil.png rename to src/afd/sprites/back/16--0--Colossoil.png diff --git a/src/afd/sprites/back/Pidgey.png b/src/afd/sprites/back/16--0--Pidgey.png similarity index 100% rename from src/afd/sprites/back/Pidgey.png rename to src/afd/sprites/back/16--0--Pidgey.png diff --git a/src/afd/sprites/back/Feraligatr.png b/src/afd/sprites/back/160--0--Feraligatr.png similarity index 100% rename from src/afd/sprites/back/Feraligatr.png rename to src/afd/sprites/back/160--0--Feraligatr.png diff --git a/src/afd/sprites/back/Sentret.png b/src/afd/sprites/back/161--0--Sentret.png similarity index 100% rename from src/afd/sprites/back/Sentret.png rename to src/afd/sprites/back/161--0--Sentret.png diff --git a/src/afd/sprites/back/Furret.png b/src/afd/sprites/back/162--0--Furret.png similarity index 100% rename from src/afd/sprites/back/Furret.png rename to src/afd/sprites/back/162--0--Furret.png diff --git a/src/afd/sprites/back/Hoothoot.png b/src/afd/sprites/back/163--0--Hoothoot.png similarity index 100% rename from src/afd/sprites/back/Hoothoot.png rename to src/afd/sprites/back/163--0--Hoothoot.png diff --git a/src/afd/sprites/back/Noctowl.png b/src/afd/sprites/back/164--0--Noctowl.png similarity index 100% rename from src/afd/sprites/back/Noctowl.png rename to src/afd/sprites/back/164--0--Noctowl.png diff --git a/src/afd/sprites/back/Ledyba.png b/src/afd/sprites/back/165--0--Ledyba.png similarity index 100% rename from src/afd/sprites/back/Ledyba.png rename to src/afd/sprites/back/165--0--Ledyba.png diff --git a/src/afd/sprites/back/Ledian.png b/src/afd/sprites/back/166--0--Ledian.png similarity index 100% rename from src/afd/sprites/back/Ledian.png rename to src/afd/sprites/back/166--0--Ledian.png diff --git a/src/afd/sprites/back/Spinarak.png b/src/afd/sprites/back/167--0--Spinarak.png similarity index 100% rename from src/afd/sprites/back/Spinarak.png rename to src/afd/sprites/back/167--0--Spinarak.png diff --git a/src/afd/sprites/back/Ariados.png b/src/afd/sprites/back/168--0--Ariados.png similarity index 100% rename from src/afd/sprites/back/Ariados.png rename to src/afd/sprites/back/168--0--Ariados.png diff --git a/src/afd/sprites/back/Crobat.png b/src/afd/sprites/back/169--0--Crobat.png similarity index 100% rename from src/afd/sprites/back/Crobat.png rename to src/afd/sprites/back/169--0--Crobat.png diff --git a/src/afd/sprites/back/Krilowatt.png b/src/afd/sprites/back/17--0--Krilowatt.png similarity index 100% rename from src/afd/sprites/back/Krilowatt.png rename to src/afd/sprites/back/17--0--Krilowatt.png diff --git a/src/afd/sprites/back/Pidgeotto.png b/src/afd/sprites/back/17--0--Pidgeotto.png similarity index 100% rename from src/afd/sprites/back/Pidgeotto.png rename to src/afd/sprites/back/17--0--Pidgeotto.png diff --git a/src/afd/sprites/back/Chinchou.png b/src/afd/sprites/back/170--0--Chinchou.png similarity index 100% rename from src/afd/sprites/back/Chinchou.png rename to src/afd/sprites/back/170--0--Chinchou.png diff --git a/src/afd/sprites/back/Lanturn.png b/src/afd/sprites/back/171--0--Lanturn.png similarity index 100% rename from src/afd/sprites/back/Lanturn.png rename to src/afd/sprites/back/171--0--Lanturn.png diff --git a/src/afd/sprites/back/Pichu.png b/src/afd/sprites/back/172--0--Pichu.png similarity index 100% rename from src/afd/sprites/back/Pichu.png rename to src/afd/sprites/back/172--0--Pichu.png diff --git a/src/afd/sprites/back/Cleffa.png b/src/afd/sprites/back/173--0--Cleffa.png similarity index 100% rename from src/afd/sprites/back/Cleffa.png rename to src/afd/sprites/back/173--0--Cleffa.png diff --git a/src/afd/sprites/back/Igglybuff.png b/src/afd/sprites/back/174--0--Igglybuff.png similarity index 100% rename from src/afd/sprites/back/Igglybuff.png rename to src/afd/sprites/back/174--0--Igglybuff.png diff --git a/src/afd/sprites/back/Togepi.png b/src/afd/sprites/back/175--0--Togepi.png similarity index 100% rename from src/afd/sprites/back/Togepi.png rename to src/afd/sprites/back/175--0--Togepi.png diff --git a/src/afd/sprites/back/Togetic.png b/src/afd/sprites/back/176--0--Togetic.png similarity index 100% rename from src/afd/sprites/back/Togetic.png rename to src/afd/sprites/back/176--0--Togetic.png diff --git a/src/afd/sprites/back/Natu.png b/src/afd/sprites/back/177--0--Natu.png similarity index 100% rename from src/afd/sprites/back/Natu.png rename to src/afd/sprites/back/177--0--Natu.png diff --git a/src/afd/sprites/back/Xatu.png b/src/afd/sprites/back/178--0--Xatu.png similarity index 100% rename from src/afd/sprites/back/Xatu.png rename to src/afd/sprites/back/178--0--Xatu.png diff --git a/src/afd/sprites/back/Mareep.png b/src/afd/sprites/back/179--0--Mareep.png similarity index 100% rename from src/afd/sprites/back/Mareep.png rename to src/afd/sprites/back/179--0--Mareep.png diff --git a/src/afd/sprites/back/Pidgeot.png b/src/afd/sprites/back/18--0--Pidgeot.png similarity index 100% rename from src/afd/sprites/back/Pidgeot.png rename to src/afd/sprites/back/18--0--Pidgeot.png diff --git a/src/afd/sprites/back/Pidgeot--Mega.png b/src/afd/sprites/back/18--420--Pidgeot--Mega.png similarity index 100% rename from src/afd/sprites/back/Pidgeot--Mega.png rename to src/afd/sprites/back/18--420--Pidgeot--Mega.png diff --git a/src/afd/sprites/back/Flaaffy.png b/src/afd/sprites/back/180--0--Flaaffy.png similarity index 100% rename from src/afd/sprites/back/Flaaffy.png rename to src/afd/sprites/back/180--0--Flaaffy.png diff --git a/src/afd/sprites/back/Ampharos.png b/src/afd/sprites/back/181--0--Ampharos.png similarity index 100% rename from src/afd/sprites/back/Ampharos.png rename to src/afd/sprites/back/181--0--Ampharos.png diff --git a/src/afd/sprites/back/Ampharos--Mega.png b/src/afd/sprites/back/181--420--Ampharos--Mega.png similarity index 100% rename from src/afd/sprites/back/Ampharos--Mega.png rename to src/afd/sprites/back/181--420--Ampharos--Mega.png diff --git a/src/afd/sprites/back/Bellossom.png b/src/afd/sprites/back/182--0--Bellossom.png similarity index 100% rename from src/afd/sprites/back/Bellossom.png rename to src/afd/sprites/back/182--0--Bellossom.png diff --git a/src/afd/sprites/back/Marill.png b/src/afd/sprites/back/183--0--Marill.png similarity index 100% rename from src/afd/sprites/back/Marill.png rename to src/afd/sprites/back/183--0--Marill.png diff --git a/src/afd/sprites/back/Azumarill.png b/src/afd/sprites/back/184--0--Azumarill.png similarity index 100% rename from src/afd/sprites/back/Azumarill.png rename to src/afd/sprites/back/184--0--Azumarill.png diff --git a/src/afd/sprites/back/Sudowoodo.png b/src/afd/sprites/back/185--0--Sudowoodo.png similarity index 100% rename from src/afd/sprites/back/Sudowoodo.png rename to src/afd/sprites/back/185--0--Sudowoodo.png diff --git a/src/afd/sprites/back/Politoed.png b/src/afd/sprites/back/186--0--Politoed.png similarity index 100% rename from src/afd/sprites/back/Politoed.png rename to src/afd/sprites/back/186--0--Politoed.png diff --git a/src/afd/sprites/back/Hoppip.png b/src/afd/sprites/back/187--0--Hoppip.png similarity index 100% rename from src/afd/sprites/back/Hoppip.png rename to src/afd/sprites/back/187--0--Hoppip.png diff --git a/src/afd/sprites/back/Skiploom.png b/src/afd/sprites/back/188--0--Skiploom.png similarity index 100% rename from src/afd/sprites/back/Skiploom.png rename to src/afd/sprites/back/188--0--Skiploom.png diff --git a/src/afd/sprites/back/Jumpluff.png b/src/afd/sprites/back/189--0--Jumpluff.png similarity index 100% rename from src/afd/sprites/back/Jumpluff.png rename to src/afd/sprites/back/189--0--Jumpluff.png diff --git a/src/afd/sprites/back/Rattata.png b/src/afd/sprites/back/19--0--Rattata.png similarity index 100% rename from src/afd/sprites/back/Rattata.png rename to src/afd/sprites/back/19--0--Rattata.png diff --git a/src/afd/sprites/back/Voodoom.png b/src/afd/sprites/back/19--0--Voodoom.png similarity index 100% rename from src/afd/sprites/back/Voodoom.png rename to src/afd/sprites/back/19--0--Voodoom.png diff --git a/src/afd/sprites/back/Rattata--Alola.png b/src/afd/sprites/back/19--420--Rattata--Alola.png similarity index 100% rename from src/afd/sprites/back/Rattata--Alola.png rename to src/afd/sprites/back/19--420--Rattata--Alola.png diff --git a/src/afd/sprites/back/Aipom.png b/src/afd/sprites/back/190--0--Aipom.png similarity index 100% rename from src/afd/sprites/back/Aipom.png rename to src/afd/sprites/back/190--0--Aipom.png diff --git a/src/afd/sprites/back/Sunkern.png b/src/afd/sprites/back/191--0--Sunkern.png similarity index 100% rename from src/afd/sprites/back/Sunkern.png rename to src/afd/sprites/back/191--0--Sunkern.png diff --git a/src/afd/sprites/back/Sunflora.png b/src/afd/sprites/back/192--0--Sunflora.png similarity index 100% rename from src/afd/sprites/back/Sunflora.png rename to src/afd/sprites/back/192--0--Sunflora.png diff --git a/src/afd/sprites/back/Yanma.png b/src/afd/sprites/back/193--0--Yanma.png similarity index 100% rename from src/afd/sprites/back/Yanma.png rename to src/afd/sprites/back/193--0--Yanma.png diff --git a/src/afd/sprites/back/Wooper.png b/src/afd/sprites/back/194--0--Wooper.png similarity index 100% rename from src/afd/sprites/back/Wooper.png rename to src/afd/sprites/back/194--0--Wooper.png diff --git a/src/afd/sprites/back/Quagsire.png b/src/afd/sprites/back/195--0--Quagsire.png similarity index 100% rename from src/afd/sprites/back/Quagsire.png rename to src/afd/sprites/back/195--0--Quagsire.png diff --git a/src/afd/sprites/back/Espeon.png b/src/afd/sprites/back/196--0--Espeon.png similarity index 100% rename from src/afd/sprites/back/Espeon.png rename to src/afd/sprites/back/196--0--Espeon.png diff --git a/src/afd/sprites/back/Umbreon.png b/src/afd/sprites/back/197--0--Umbreon.png similarity index 100% rename from src/afd/sprites/back/Umbreon.png rename to src/afd/sprites/back/197--0--Umbreon.png diff --git a/src/afd/sprites/back/Murkrow.png b/src/afd/sprites/back/198--0--Murkrow.png similarity index 100% rename from src/afd/sprites/back/Murkrow.png rename to src/afd/sprites/back/198--0--Murkrow.png diff --git a/src/afd/sprites/back/Slowking.png b/src/afd/sprites/back/199--0--Slowking.png similarity index 100% rename from src/afd/sprites/back/Slowking.png rename to src/afd/sprites/back/199--0--Slowking.png diff --git a/src/afd/sprites/back/Ivysaur.png b/src/afd/sprites/back/2--0--Ivysaur.png similarity index 100% rename from src/afd/sprites/back/Ivysaur.png rename to src/afd/sprites/back/2--0--Ivysaur.png diff --git a/src/afd/sprites/back/Syclant.png b/src/afd/sprites/back/2--0--Syclant.png similarity index 100% rename from src/afd/sprites/back/Syclant.png rename to src/afd/sprites/back/2--0--Syclant.png diff --git a/src/afd/sprites/back/Raticate.png b/src/afd/sprites/back/20--0--Raticate.png similarity index 100% rename from src/afd/sprites/back/Raticate.png rename to src/afd/sprites/back/20--0--Raticate.png diff --git a/src/afd/sprites/back/Raticate--Alola.png b/src/afd/sprites/back/20--420--Raticate--Alola.png similarity index 100% rename from src/afd/sprites/back/Raticate--Alola.png rename to src/afd/sprites/back/20--420--Raticate--Alola.png diff --git a/src/afd/sprites/back/Misdreavus.png b/src/afd/sprites/back/200--0--Misdreavus.png similarity index 100% rename from src/afd/sprites/back/Misdreavus.png rename to src/afd/sprites/back/200--0--Misdreavus.png diff --git a/src/afd/sprites/back/Unown.png b/src/afd/sprites/back/201--0--Unown.png similarity index 100% rename from src/afd/sprites/back/Unown.png rename to src/afd/sprites/back/201--0--Unown.png diff --git a/src/afd/sprites/back/Wobbuffet.png b/src/afd/sprites/back/202--0--Wobbuffet.png similarity index 100% rename from src/afd/sprites/back/Wobbuffet.png rename to src/afd/sprites/back/202--0--Wobbuffet.png diff --git a/src/afd/sprites/back/Girafarig.png b/src/afd/sprites/back/203--0--Girafarig.png similarity index 100% rename from src/afd/sprites/back/Girafarig.png rename to src/afd/sprites/back/203--0--Girafarig.png diff --git a/src/afd/sprites/back/Pineco.png b/src/afd/sprites/back/204--0--Pineco.png similarity index 100% rename from src/afd/sprites/back/Pineco.png rename to src/afd/sprites/back/204--0--Pineco.png diff --git a/src/afd/sprites/back/Forretress.png b/src/afd/sprites/back/205--0--Forretress.png similarity index 100% rename from src/afd/sprites/back/Forretress.png rename to src/afd/sprites/back/205--0--Forretress.png diff --git a/src/afd/sprites/back/Dunsparce.png b/src/afd/sprites/back/206--0--Dunsparce.png similarity index 100% rename from src/afd/sprites/back/Dunsparce.png rename to src/afd/sprites/back/206--0--Dunsparce.png diff --git a/src/afd/sprites/back/Gligar.png b/src/afd/sprites/back/207--0--Gligar.png similarity index 100% rename from src/afd/sprites/back/Gligar.png rename to src/afd/sprites/back/207--0--Gligar.png diff --git a/src/afd/sprites/back/Steelix.png b/src/afd/sprites/back/208--0--Steelix.png similarity index 100% rename from src/afd/sprites/back/Steelix.png rename to src/afd/sprites/back/208--0--Steelix.png diff --git a/src/afd/sprites/back/Steelix--Mega.png b/src/afd/sprites/back/208--420--Steelix--Mega.png similarity index 100% rename from src/afd/sprites/back/Steelix--Mega.png rename to src/afd/sprites/back/208--420--Steelix--Mega.png diff --git a/src/afd/sprites/back/Snubbull.png b/src/afd/sprites/back/209--0--Snubbull.png similarity index 100% rename from src/afd/sprites/back/Snubbull.png rename to src/afd/sprites/back/209--0--Snubbull.png diff --git a/src/afd/sprites/back/Spearow.png b/src/afd/sprites/back/21--0--Spearow.png similarity index 100% rename from src/afd/sprites/back/Spearow.png rename to src/afd/sprites/back/21--0--Spearow.png diff --git a/src/afd/sprites/back/Tomohawk.png b/src/afd/sprites/back/21--0--Tomohawk.png similarity index 100% rename from src/afd/sprites/back/Tomohawk.png rename to src/afd/sprites/back/21--0--Tomohawk.png diff --git a/src/afd/sprites/back/Granbull.png b/src/afd/sprites/back/210--0--Granbull.png similarity index 100% rename from src/afd/sprites/back/Granbull.png rename to src/afd/sprites/back/210--0--Granbull.png diff --git a/src/afd/sprites/back/Qwilfish.png b/src/afd/sprites/back/211--0--Qwilfish.png similarity index 100% rename from src/afd/sprites/back/Qwilfish.png rename to src/afd/sprites/back/211--0--Qwilfish.png diff --git a/src/afd/sprites/back/Scizor.png b/src/afd/sprites/back/212--0--Scizor.png similarity index 100% rename from src/afd/sprites/back/Scizor.png rename to src/afd/sprites/back/212--0--Scizor.png diff --git a/src/afd/sprites/back/Scizor--Mega.png b/src/afd/sprites/back/212--420--Scizor--Mega.png similarity index 100% rename from src/afd/sprites/back/Scizor--Mega.png rename to src/afd/sprites/back/212--420--Scizor--Mega.png diff --git a/src/afd/sprites/back/Shuckle.png b/src/afd/sprites/back/213--0--Shuckle.png similarity index 100% rename from src/afd/sprites/back/Shuckle.png rename to src/afd/sprites/back/213--0--Shuckle.png diff --git a/src/afd/sprites/back/Heracross.png b/src/afd/sprites/back/214--0--Heracross.png similarity index 100% rename from src/afd/sprites/back/Heracross.png rename to src/afd/sprites/back/214--0--Heracross.png diff --git a/src/afd/sprites/back/Heracross--Mega.png b/src/afd/sprites/back/214--420--Heracross--Mega.png similarity index 100% rename from src/afd/sprites/back/Heracross--Mega.png rename to src/afd/sprites/back/214--420--Heracross--Mega.png diff --git a/src/afd/sprites/back/Sneasel.png b/src/afd/sprites/back/215--0--Sneasel.png similarity index 100% rename from src/afd/sprites/back/Sneasel.png rename to src/afd/sprites/back/215--0--Sneasel.png diff --git a/src/afd/sprites/back/Teddiursa.png b/src/afd/sprites/back/216--0--Teddiursa.png similarity index 100% rename from src/afd/sprites/back/Teddiursa.png rename to src/afd/sprites/back/216--0--Teddiursa.png diff --git a/src/afd/sprites/back/Ursaring.png b/src/afd/sprites/back/217--0--Ursaring.png similarity index 100% rename from src/afd/sprites/back/Ursaring.png rename to src/afd/sprites/back/217--0--Ursaring.png diff --git a/src/afd/sprites/back/Slugma.png b/src/afd/sprites/back/218--0--Slugma.png similarity index 100% rename from src/afd/sprites/back/Slugma.png rename to src/afd/sprites/back/218--0--Slugma.png diff --git a/src/afd/sprites/back/Magcargo.png b/src/afd/sprites/back/219--0--Magcargo.png similarity index 100% rename from src/afd/sprites/back/Magcargo.png rename to src/afd/sprites/back/219--0--Magcargo.png diff --git a/src/afd/sprites/back/Fearow.png b/src/afd/sprites/back/22--0--Fearow.png similarity index 100% rename from src/afd/sprites/back/Fearow.png rename to src/afd/sprites/back/22--0--Fearow.png diff --git a/src/afd/sprites/back/Swinub.png b/src/afd/sprites/back/220--0--Swinub.png similarity index 100% rename from src/afd/sprites/back/Swinub.png rename to src/afd/sprites/back/220--0--Swinub.png diff --git a/src/afd/sprites/back/Piloswine.png b/src/afd/sprites/back/221--0--Piloswine.png similarity index 100% rename from src/afd/sprites/back/Piloswine.png rename to src/afd/sprites/back/221--0--Piloswine.png diff --git a/src/afd/sprites/back/Corsola.png b/src/afd/sprites/back/222--0--Corsola.png similarity index 100% rename from src/afd/sprites/back/Corsola.png rename to src/afd/sprites/back/222--0--Corsola.png diff --git a/src/afd/sprites/back/Corsola--Galar.png b/src/afd/sprites/back/222--420--Corsola--Galar.png similarity index 100% rename from src/afd/sprites/back/Corsola--Galar.png rename to src/afd/sprites/back/222--420--Corsola--Galar.png diff --git a/src/afd/sprites/back/Remoraid.png b/src/afd/sprites/back/223--0--Remoraid.png similarity index 100% rename from src/afd/sprites/back/Remoraid.png rename to src/afd/sprites/back/223--0--Remoraid.png diff --git a/src/afd/sprites/back/Octillery.png b/src/afd/sprites/back/224--0--Octillery.png similarity index 100% rename from src/afd/sprites/back/Octillery.png rename to src/afd/sprites/back/224--0--Octillery.png diff --git a/src/afd/sprites/back/Delibird.png b/src/afd/sprites/back/225--0--Delibird.png similarity index 100% rename from src/afd/sprites/back/Delibird.png rename to src/afd/sprites/back/225--0--Delibird.png diff --git a/src/afd/sprites/back/Mantine.png b/src/afd/sprites/back/226--0--Mantine.png similarity index 100% rename from src/afd/sprites/back/Mantine.png rename to src/afd/sprites/back/226--0--Mantine.png diff --git a/src/afd/sprites/back/Skarmory.png b/src/afd/sprites/back/227--0--Skarmory.png similarity index 100% rename from src/afd/sprites/back/Skarmory.png rename to src/afd/sprites/back/227--0--Skarmory.png diff --git a/src/afd/sprites/back/Houndour.png b/src/afd/sprites/back/228--0--Houndour.png similarity index 100% rename from src/afd/sprites/back/Houndour.png rename to src/afd/sprites/back/228--0--Houndour.png diff --git a/src/afd/sprites/back/Houndoom.png b/src/afd/sprites/back/229--0--Houndoom.png similarity index 100% rename from src/afd/sprites/back/Houndoom.png rename to src/afd/sprites/back/229--0--Houndoom.png diff --git a/src/afd/sprites/back/Houndoom--Mega.png b/src/afd/sprites/back/229--420--Houndoom--Mega.png similarity index 100% rename from src/afd/sprites/back/Houndoom--Mega.png rename to src/afd/sprites/back/229--420--Houndoom--Mega.png diff --git a/src/afd/sprites/back/Ekans.png b/src/afd/sprites/back/23--0--Ekans.png similarity index 100% rename from src/afd/sprites/back/Ekans.png rename to src/afd/sprites/back/23--0--Ekans.png diff --git a/src/afd/sprites/back/Necturna.png b/src/afd/sprites/back/23--0--Necturna.png similarity index 100% rename from src/afd/sprites/back/Necturna.png rename to src/afd/sprites/back/23--0--Necturna.png diff --git a/src/afd/sprites/back/Kingdra.png b/src/afd/sprites/back/230--0--Kingdra.png similarity index 100% rename from src/afd/sprites/back/Kingdra.png rename to src/afd/sprites/back/230--0--Kingdra.png diff --git a/src/afd/sprites/back/Phanpy.png b/src/afd/sprites/back/231--0--Phanpy.png similarity index 100% rename from src/afd/sprites/back/Phanpy.png rename to src/afd/sprites/back/231--0--Phanpy.png diff --git a/src/afd/sprites/back/Donphan.png b/src/afd/sprites/back/232--0--Donphan.png similarity index 100% rename from src/afd/sprites/back/Donphan.png rename to src/afd/sprites/back/232--0--Donphan.png diff --git a/src/afd/sprites/back/Porygon2.png b/src/afd/sprites/back/233--0--Porygon2.png similarity index 100% rename from src/afd/sprites/back/Porygon2.png rename to src/afd/sprites/back/233--0--Porygon2.png diff --git a/src/afd/sprites/back/Stantler.png b/src/afd/sprites/back/234--0--Stantler.png similarity index 100% rename from src/afd/sprites/back/Stantler.png rename to src/afd/sprites/back/234--0--Stantler.png diff --git a/src/afd/sprites/back/Smeargle.png b/src/afd/sprites/back/235--0--Smeargle.png similarity index 100% rename from src/afd/sprites/back/Smeargle.png rename to src/afd/sprites/back/235--0--Smeargle.png diff --git a/src/afd/sprites/back/Tyrogue.png b/src/afd/sprites/back/236--0--Tyrogue.png similarity index 100% rename from src/afd/sprites/back/Tyrogue.png rename to src/afd/sprites/back/236--0--Tyrogue.png diff --git a/src/afd/sprites/back/Hitmontop.png b/src/afd/sprites/back/237--0--Hitmontop.png similarity index 100% rename from src/afd/sprites/back/Hitmontop.png rename to src/afd/sprites/back/237--0--Hitmontop.png diff --git a/src/afd/sprites/back/Smoochum.png b/src/afd/sprites/back/238--0--Smoochum.png similarity index 100% rename from src/afd/sprites/back/Smoochum.png rename to src/afd/sprites/back/238--0--Smoochum.png diff --git a/src/afd/sprites/back/Elekid.png b/src/afd/sprites/back/239--0--Elekid.png similarity index 100% rename from src/afd/sprites/back/Elekid.png rename to src/afd/sprites/back/239--0--Elekid.png diff --git a/src/afd/sprites/back/Arbok.png b/src/afd/sprites/back/24--0--Arbok.png similarity index 100% rename from src/afd/sprites/back/Arbok.png rename to src/afd/sprites/back/24--0--Arbok.png diff --git a/src/afd/sprites/back/Mollux.png b/src/afd/sprites/back/24--0--Mollux.png similarity index 100% rename from src/afd/sprites/back/Mollux.png rename to src/afd/sprites/back/24--0--Mollux.png diff --git a/src/afd/sprites/back/Magby.png b/src/afd/sprites/back/240--0--Magby.png similarity index 100% rename from src/afd/sprites/back/Magby.png rename to src/afd/sprites/back/240--0--Magby.png diff --git a/src/afd/sprites/back/Miltank.png b/src/afd/sprites/back/241--0--Miltank.png similarity index 100% rename from src/afd/sprites/back/Miltank.png rename to src/afd/sprites/back/241--0--Miltank.png diff --git a/src/afd/sprites/back/Blissey.png b/src/afd/sprites/back/242--0--Blissey.png similarity index 100% rename from src/afd/sprites/back/Blissey.png rename to src/afd/sprites/back/242--0--Blissey.png diff --git a/src/afd/sprites/back/Raikou.png b/src/afd/sprites/back/243--0--Raikou.png similarity index 100% rename from src/afd/sprites/back/Raikou.png rename to src/afd/sprites/back/243--0--Raikou.png diff --git a/src/afd/sprites/back/Entei.png b/src/afd/sprites/back/244--0--Entei.png similarity index 100% rename from src/afd/sprites/back/Entei.png rename to src/afd/sprites/back/244--0--Entei.png diff --git a/src/afd/sprites/back/Suicune.png b/src/afd/sprites/back/245--0--Suicune.png similarity index 100% rename from src/afd/sprites/back/Suicune.png rename to src/afd/sprites/back/245--0--Suicune.png diff --git a/src/afd/sprites/back/Larvitar.png b/src/afd/sprites/back/246--0--Larvitar.png similarity index 100% rename from src/afd/sprites/back/Larvitar.png rename to src/afd/sprites/back/246--0--Larvitar.png diff --git a/src/afd/sprites/back/Pupitar.png b/src/afd/sprites/back/247--0--Pupitar.png similarity index 100% rename from src/afd/sprites/back/Pupitar.png rename to src/afd/sprites/back/247--0--Pupitar.png diff --git a/src/afd/sprites/back/Tyranitar.png b/src/afd/sprites/back/248--0--Tyranitar.png similarity index 100% rename from src/afd/sprites/back/Tyranitar.png rename to src/afd/sprites/back/248--0--Tyranitar.png diff --git a/src/afd/sprites/back/Tyranitar--Mega.png b/src/afd/sprites/back/248--420--Tyranitar--Mega.png similarity index 100% rename from src/afd/sprites/back/Tyranitar--Mega.png rename to src/afd/sprites/back/248--420--Tyranitar--Mega.png diff --git a/src/afd/sprites/back/Lugia.png b/src/afd/sprites/back/249--0--Lugia.png similarity index 100% rename from src/afd/sprites/back/Lugia.png rename to src/afd/sprites/back/249--0--Lugia.png diff --git a/src/afd/sprites/back/Pikachu.png b/src/afd/sprites/back/25--0--Pikachu.png similarity index 100% rename from src/afd/sprites/back/Pikachu.png rename to src/afd/sprites/back/25--0--Pikachu.png diff --git a/src/afd/sprites/back/Pikachu--Alola.png b/src/afd/sprites/back/25--420--Pikachu--Alola.png similarity index 100% rename from src/afd/sprites/back/Pikachu--Alola.png rename to src/afd/sprites/back/25--420--Pikachu--Alola.png diff --git a/src/afd/sprites/back/Pikachu--Belle.png b/src/afd/sprites/back/25--420--Pikachu--Belle.png similarity index 100% rename from src/afd/sprites/back/Pikachu--Belle.png rename to src/afd/sprites/back/25--420--Pikachu--Belle.png diff --git a/src/afd/sprites/back/Pikachu--Gmax.png b/src/afd/sprites/back/25--420--Pikachu--Gmax.png similarity index 100% rename from src/afd/sprites/back/Pikachu--Gmax.png rename to src/afd/sprites/back/25--420--Pikachu--Gmax.png diff --git a/src/afd/sprites/back/Pikachu--Hoenn.png b/src/afd/sprites/back/25--420--Pikachu--Hoenn.png similarity index 100% rename from src/afd/sprites/back/Pikachu--Hoenn.png rename to src/afd/sprites/back/25--420--Pikachu--Hoenn.png diff --git a/src/afd/sprites/back/Pikachu--Kalos.png b/src/afd/sprites/back/25--420--Pikachu--Kalos.png similarity index 100% rename from src/afd/sprites/back/Pikachu--Kalos.png rename to src/afd/sprites/back/25--420--Pikachu--Kalos.png diff --git a/src/afd/sprites/back/Pikachu--Libre.png b/src/afd/sprites/back/25--420--Pikachu--Libre.png similarity index 100% rename from src/afd/sprites/back/Pikachu--Libre.png rename to src/afd/sprites/back/25--420--Pikachu--Libre.png diff --git a/src/afd/sprites/back/Pikachu--Original.png b/src/afd/sprites/back/25--420--Pikachu--Original.png similarity index 100% rename from src/afd/sprites/back/Pikachu--Original.png rename to src/afd/sprites/back/25--420--Pikachu--Original.png diff --git a/src/afd/sprites/back/Pikachu--Partner.png b/src/afd/sprites/back/25--420--Pikachu--Partner.png similarity index 100% rename from src/afd/sprites/back/Pikachu--Partner.png rename to src/afd/sprites/back/25--420--Pikachu--Partner.png diff --git a/src/afd/sprites/back/Pikachu--PhD.png b/src/afd/sprites/back/25--420--Pikachu--PhD.png similarity index 100% rename from src/afd/sprites/back/Pikachu--PhD.png rename to src/afd/sprites/back/25--420--Pikachu--PhD.png diff --git a/src/afd/sprites/back/Pikachu--Pop-Star.png b/src/afd/sprites/back/25--420--Pikachu--Pop-Star.png similarity index 100% rename from src/afd/sprites/back/Pikachu--Pop-Star.png rename to src/afd/sprites/back/25--420--Pikachu--Pop-Star.png diff --git a/src/afd/sprites/back/Pikachu--Rock-Star.png b/src/afd/sprites/back/25--420--Pikachu--Rock-Star.png similarity index 100% rename from src/afd/sprites/back/Pikachu--Rock-Star.png rename to src/afd/sprites/back/25--420--Pikachu--Rock-Star.png diff --git a/src/afd/sprites/back/Pikachu--Sinnoh.png b/src/afd/sprites/back/25--420--Pikachu--Sinnoh.png similarity index 100% rename from src/afd/sprites/back/Pikachu--Sinnoh.png rename to src/afd/sprites/back/25--420--Pikachu--Sinnoh.png diff --git a/src/afd/sprites/back/Pikachu--Starter.png b/src/afd/sprites/back/25--420--Pikachu--Starter.png similarity index 100% rename from src/afd/sprites/back/Pikachu--Starter.png rename to src/afd/sprites/back/25--420--Pikachu--Starter.png diff --git a/src/afd/sprites/back/Pikachu--Unova.png b/src/afd/sprites/back/25--420--Pikachu--Unova.png similarity index 100% rename from src/afd/sprites/back/Pikachu--Unova.png rename to src/afd/sprites/back/25--420--Pikachu--Unova.png diff --git a/src/afd/sprites/back/Ho-Oh.png b/src/afd/sprites/back/250--0--Ho-Oh.png similarity index 100% rename from src/afd/sprites/back/Ho-Oh.png rename to src/afd/sprites/back/250--0--Ho-Oh.png diff --git a/src/afd/sprites/back/Celebi.gif b/src/afd/sprites/back/251--0--Celebi.gif similarity index 100% rename from src/afd/sprites/back/Celebi.gif rename to src/afd/sprites/back/251--0--Celebi.gif diff --git a/src/afd/sprites/back/Treecko.png b/src/afd/sprites/back/252--0--Treecko.png similarity index 100% rename from src/afd/sprites/back/Treecko.png rename to src/afd/sprites/back/252--0--Treecko.png diff --git a/src/afd/sprites/back/Grovyle.png b/src/afd/sprites/back/253--0--Grovyle.png similarity index 100% rename from src/afd/sprites/back/Grovyle.png rename to src/afd/sprites/back/253--0--Grovyle.png diff --git a/src/afd/sprites/back/Sceptile.png b/src/afd/sprites/back/254--0--Sceptile.png similarity index 100% rename from src/afd/sprites/back/Sceptile.png rename to src/afd/sprites/back/254--0--Sceptile.png diff --git a/src/afd/sprites/back/Sceptile--Mega.png b/src/afd/sprites/back/254--420--Sceptile--Mega.png similarity index 100% rename from src/afd/sprites/back/Sceptile--Mega.png rename to src/afd/sprites/back/254--420--Sceptile--Mega.png diff --git a/src/afd/sprites/back/Torchic.png b/src/afd/sprites/back/255--0--Torchic.png similarity index 100% rename from src/afd/sprites/back/Torchic.png rename to src/afd/sprites/back/255--0--Torchic.png diff --git a/src/afd/sprites/back/Combusken.png b/src/afd/sprites/back/256--0--Combusken.png similarity index 100% rename from src/afd/sprites/back/Combusken.png rename to src/afd/sprites/back/256--0--Combusken.png diff --git a/src/afd/sprites/back/Blaziken.png b/src/afd/sprites/back/257--0--Blaziken.png similarity index 100% rename from src/afd/sprites/back/Blaziken.png rename to src/afd/sprites/back/257--0--Blaziken.png diff --git a/src/afd/sprites/back/Blaziken--Mega.png b/src/afd/sprites/back/257--420--Blaziken--Mega.png similarity index 100% rename from src/afd/sprites/back/Blaziken--Mega.png rename to src/afd/sprites/back/257--420--Blaziken--Mega.png diff --git a/src/afd/sprites/back/Mudkip.png b/src/afd/sprites/back/258--0--Mudkip.png similarity index 100% rename from src/afd/sprites/back/Mudkip.png rename to src/afd/sprites/back/258--0--Mudkip.png diff --git a/src/afd/sprites/back/Marshtomp.png b/src/afd/sprites/back/259--0--Marshtomp.png similarity index 100% rename from src/afd/sprites/back/Marshtomp.png rename to src/afd/sprites/back/259--0--Marshtomp.png diff --git a/src/afd/sprites/back/Raichu.png b/src/afd/sprites/back/26--0--Raichu.png similarity index 100% rename from src/afd/sprites/back/Raichu.png rename to src/afd/sprites/back/26--0--Raichu.png diff --git a/src/afd/sprites/back/Raichu--Alola.png b/src/afd/sprites/back/26--420--Raichu--Alola.png similarity index 100% rename from src/afd/sprites/back/Raichu--Alola.png rename to src/afd/sprites/back/26--420--Raichu--Alola.png diff --git a/src/afd/sprites/back/Swampert.png b/src/afd/sprites/back/260--0--Swampert.png similarity index 100% rename from src/afd/sprites/back/Swampert.png rename to src/afd/sprites/back/260--0--Swampert.png diff --git a/src/afd/sprites/back/Swampert--Mega.png b/src/afd/sprites/back/260--420--Swampert--Mega.png similarity index 100% rename from src/afd/sprites/back/Swampert--Mega.png rename to src/afd/sprites/back/260--420--Swampert--Mega.png diff --git a/src/afd/sprites/back/Poochyena.png b/src/afd/sprites/back/261--0--Poochyena.png similarity index 100% rename from src/afd/sprites/back/Poochyena.png rename to src/afd/sprites/back/261--0--Poochyena.png diff --git a/src/afd/sprites/back/Mightyena.png b/src/afd/sprites/back/262--0--Mightyena.png similarity index 100% rename from src/afd/sprites/back/Mightyena.png rename to src/afd/sprites/back/262--0--Mightyena.png diff --git a/src/afd/sprites/back/Zigzagoon.png b/src/afd/sprites/back/263--0--Zigzagoon.png similarity index 100% rename from src/afd/sprites/back/Zigzagoon.png rename to src/afd/sprites/back/263--0--Zigzagoon.png diff --git a/src/afd/sprites/back/Zigzagoon--Galar.png b/src/afd/sprites/back/263--420--Zigzagoon--Galar.png similarity index 100% rename from src/afd/sprites/back/Zigzagoon--Galar.png rename to src/afd/sprites/back/263--420--Zigzagoon--Galar.png diff --git a/src/afd/sprites/back/Linoone.png b/src/afd/sprites/back/264--0--Linoone.png similarity index 100% rename from src/afd/sprites/back/Linoone.png rename to src/afd/sprites/back/264--0--Linoone.png diff --git a/src/afd/sprites/back/Linoone--Galar.png b/src/afd/sprites/back/264--420--Linoone--Galar.png similarity index 100% rename from src/afd/sprites/back/Linoone--Galar.png rename to src/afd/sprites/back/264--420--Linoone--Galar.png diff --git a/src/afd/sprites/back/Wurmple.png b/src/afd/sprites/back/265--0--Wurmple.png similarity index 100% rename from src/afd/sprites/back/Wurmple.png rename to src/afd/sprites/back/265--0--Wurmple.png diff --git a/src/afd/sprites/back/Silcoon.png b/src/afd/sprites/back/266--0--Silcoon.png similarity index 100% rename from src/afd/sprites/back/Silcoon.png rename to src/afd/sprites/back/266--0--Silcoon.png diff --git a/src/afd/sprites/back/Beautifly.png b/src/afd/sprites/back/267--0--Beautifly.png similarity index 100% rename from src/afd/sprites/back/Beautifly.png rename to src/afd/sprites/back/267--0--Beautifly.png diff --git a/src/afd/sprites/back/Cascoon.png b/src/afd/sprites/back/268--0--Cascoon.png similarity index 100% rename from src/afd/sprites/back/Cascoon.png rename to src/afd/sprites/back/268--0--Cascoon.png diff --git a/src/afd/sprites/back/Dustox.png b/src/afd/sprites/back/269--0--Dustox.png similarity index 100% rename from src/afd/sprites/back/Dustox.png rename to src/afd/sprites/back/269--0--Dustox.png diff --git a/src/afd/sprites/back/Aurumoth.png b/src/afd/sprites/back/27--0--Aurumoth.png similarity index 100% rename from src/afd/sprites/back/Aurumoth.png rename to src/afd/sprites/back/27--0--Aurumoth.png diff --git a/src/afd/sprites/back/Sandshrew.png b/src/afd/sprites/back/27--0--Sandshrew.png similarity index 100% rename from src/afd/sprites/back/Sandshrew.png rename to src/afd/sprites/back/27--0--Sandshrew.png diff --git a/src/afd/sprites/back/Sandshrew--Alola.png b/src/afd/sprites/back/27--420--Sandshrew--Alola.png similarity index 100% rename from src/afd/sprites/back/Sandshrew--Alola.png rename to src/afd/sprites/back/27--420--Sandshrew--Alola.png diff --git a/src/afd/sprites/back/Lotad.png b/src/afd/sprites/back/270--0--Lotad.png similarity index 100% rename from src/afd/sprites/back/Lotad.png rename to src/afd/sprites/back/270--0--Lotad.png diff --git a/src/afd/sprites/back/Lombre.png b/src/afd/sprites/back/271--0--Lombre.png similarity index 100% rename from src/afd/sprites/back/Lombre.png rename to src/afd/sprites/back/271--0--Lombre.png diff --git a/src/afd/sprites/back/Ludicolo.png b/src/afd/sprites/back/272--0--Ludicolo.png similarity index 100% rename from src/afd/sprites/back/Ludicolo.png rename to src/afd/sprites/back/272--0--Ludicolo.png diff --git a/src/afd/sprites/back/Seedot.png b/src/afd/sprites/back/273--0--Seedot.png similarity index 100% rename from src/afd/sprites/back/Seedot.png rename to src/afd/sprites/back/273--0--Seedot.png diff --git a/src/afd/sprites/back/Nuzleaf.png b/src/afd/sprites/back/274--0--Nuzleaf.png similarity index 100% rename from src/afd/sprites/back/Nuzleaf.png rename to src/afd/sprites/back/274--0--Nuzleaf.png diff --git a/src/afd/sprites/back/Shiftry.png b/src/afd/sprites/back/275--0--Shiftry.png similarity index 100% rename from src/afd/sprites/back/Shiftry.png rename to src/afd/sprites/back/275--0--Shiftry.png diff --git a/src/afd/sprites/back/Taillow.png b/src/afd/sprites/back/276--0--Taillow.png similarity index 100% rename from src/afd/sprites/back/Taillow.png rename to src/afd/sprites/back/276--0--Taillow.png diff --git a/src/afd/sprites/back/Swellow.png b/src/afd/sprites/back/277--0--Swellow.png similarity index 100% rename from src/afd/sprites/back/Swellow.png rename to src/afd/sprites/back/277--0--Swellow.png diff --git a/src/afd/sprites/back/Wingull.png b/src/afd/sprites/back/278--0--Wingull.png similarity index 100% rename from src/afd/sprites/back/Wingull.png rename to src/afd/sprites/back/278--0--Wingull.png diff --git a/src/afd/sprites/back/Pelipper.png b/src/afd/sprites/back/279--0--Pelipper.png similarity index 100% rename from src/afd/sprites/back/Pelipper.png rename to src/afd/sprites/back/279--0--Pelipper.png diff --git a/src/afd/sprites/back/Sandslash.png b/src/afd/sprites/back/28--0--Sandslash.png similarity index 100% rename from src/afd/sprites/back/Sandslash.png rename to src/afd/sprites/back/28--0--Sandslash.png diff --git a/src/afd/sprites/back/Sandslash--Alola.png b/src/afd/sprites/back/28--420--Sandslash--Alola.png similarity index 100% rename from src/afd/sprites/back/Sandslash--Alola.png rename to src/afd/sprites/back/28--420--Sandslash--Alola.png diff --git a/src/afd/sprites/back/Ralts.png b/src/afd/sprites/back/280--0--Ralts.png similarity index 100% rename from src/afd/sprites/back/Ralts.png rename to src/afd/sprites/back/280--0--Ralts.png diff --git a/src/afd/sprites/back/Kirlia.png b/src/afd/sprites/back/281--0--Kirlia.png similarity index 100% rename from src/afd/sprites/back/Kirlia.png rename to src/afd/sprites/back/281--0--Kirlia.png diff --git a/src/afd/sprites/back/Gardevoir.png b/src/afd/sprites/back/282--0--Gardevoir.png similarity index 100% rename from src/afd/sprites/back/Gardevoir.png rename to src/afd/sprites/back/282--0--Gardevoir.png diff --git a/src/afd/sprites/back/Gardevoir--Mega.png b/src/afd/sprites/back/282--420--Gardevoir--Mega.png similarity index 100% rename from src/afd/sprites/back/Gardevoir--Mega.png rename to src/afd/sprites/back/282--420--Gardevoir--Mega.png diff --git a/src/afd/sprites/back/Surskit.png b/src/afd/sprites/back/283--0--Surskit.png similarity index 100% rename from src/afd/sprites/back/Surskit.png rename to src/afd/sprites/back/283--0--Surskit.png diff --git a/src/afd/sprites/back/Masquerain.png b/src/afd/sprites/back/284--0--Masquerain.png similarity index 100% rename from src/afd/sprites/back/Masquerain.png rename to src/afd/sprites/back/284--0--Masquerain.png diff --git a/src/afd/sprites/back/Shroomish.png b/src/afd/sprites/back/285--0--Shroomish.png similarity index 100% rename from src/afd/sprites/back/Shroomish.png rename to src/afd/sprites/back/285--0--Shroomish.png diff --git a/src/afd/sprites/back/Breloom.png b/src/afd/sprites/back/286--0--Breloom.png similarity index 100% rename from src/afd/sprites/back/Breloom.png rename to src/afd/sprites/back/286--0--Breloom.png diff --git a/src/afd/sprites/back/Slakoth.png b/src/afd/sprites/back/287--0--Slakoth.png similarity index 100% rename from src/afd/sprites/back/Slakoth.png rename to src/afd/sprites/back/287--0--Slakoth.png diff --git a/src/afd/sprites/back/Vigoroth.png b/src/afd/sprites/back/288--0--Vigoroth.png similarity index 100% rename from src/afd/sprites/back/Vigoroth.png rename to src/afd/sprites/back/288--0--Vigoroth.png diff --git a/src/afd/sprites/back/Slaking.png b/src/afd/sprites/back/289--0--Slaking.png similarity index 100% rename from src/afd/sprites/back/Slaking.png rename to src/afd/sprites/back/289--0--Slaking.png diff --git a/src/afd/sprites/back/Malaconda.png b/src/afd/sprites/back/29--0--Malaconda.png similarity index 100% rename from src/afd/sprites/back/Malaconda.png rename to src/afd/sprites/back/29--0--Malaconda.png diff --git a/src/afd/sprites/back/Nidoran-F.png b/src/afd/sprites/back/29--0--Nidoran-F.png similarity index 100% rename from src/afd/sprites/back/Nidoran-F.png rename to src/afd/sprites/back/29--0--Nidoran-F.png diff --git a/src/afd/sprites/back/Nincada.png b/src/afd/sprites/back/290--0--Nincada.png similarity index 100% rename from src/afd/sprites/back/Nincada.png rename to src/afd/sprites/back/290--0--Nincada.png diff --git a/src/afd/sprites/back/Ninjask.png b/src/afd/sprites/back/291--0--Ninjask.png similarity index 100% rename from src/afd/sprites/back/Ninjask.png rename to src/afd/sprites/back/291--0--Ninjask.png diff --git a/src/afd/sprites/back/Shedinja.png b/src/afd/sprites/back/292--0--Shedinja.png similarity index 100% rename from src/afd/sprites/back/Shedinja.png rename to src/afd/sprites/back/292--0--Shedinja.png diff --git a/src/afd/sprites/back/Whismur.png b/src/afd/sprites/back/293--0--Whismur.png similarity index 100% rename from src/afd/sprites/back/Whismur.png rename to src/afd/sprites/back/293--0--Whismur.png diff --git a/src/afd/sprites/back/Loudred.png b/src/afd/sprites/back/294--0--Loudred.png similarity index 100% rename from src/afd/sprites/back/Loudred.png rename to src/afd/sprites/back/294--0--Loudred.png diff --git a/src/afd/sprites/back/Exploud.png b/src/afd/sprites/back/295--0--Exploud.png similarity index 100% rename from src/afd/sprites/back/Exploud.png rename to src/afd/sprites/back/295--0--Exploud.png diff --git a/src/afd/sprites/back/Makuhita.png b/src/afd/sprites/back/296--0--Makuhita.png similarity index 100% rename from src/afd/sprites/back/Makuhita.png rename to src/afd/sprites/back/296--0--Makuhita.png diff --git a/src/afd/sprites/back/Hariyama.png b/src/afd/sprites/back/297--0--Hariyama.png similarity index 100% rename from src/afd/sprites/back/Hariyama.png rename to src/afd/sprites/back/297--0--Hariyama.png diff --git a/src/afd/sprites/back/Azurill.png b/src/afd/sprites/back/298--0--Azurill.png similarity index 100% rename from src/afd/sprites/back/Azurill.png rename to src/afd/sprites/back/298--0--Azurill.png diff --git a/src/afd/sprites/back/Nosepass.png b/src/afd/sprites/back/299--0--Nosepass.png similarity index 100% rename from src/afd/sprites/back/Nosepass.png rename to src/afd/sprites/back/299--0--Nosepass.png diff --git a/src/afd/sprites/back/Revenankh.png b/src/afd/sprites/back/3--0--Revenankh.png similarity index 100% rename from src/afd/sprites/back/Revenankh.png rename to src/afd/sprites/back/3--0--Revenankh.png diff --git a/src/afd/sprites/back/Venusaur.png b/src/afd/sprites/back/3--0--Venusaur.png similarity index 100% rename from src/afd/sprites/back/Venusaur.png rename to src/afd/sprites/back/3--0--Venusaur.png diff --git a/src/afd/sprites/back/Venusaur--Mega.png b/src/afd/sprites/back/3--420--Venusaur--Mega.png similarity index 100% rename from src/afd/sprites/back/Venusaur--Mega.png rename to src/afd/sprites/back/3--420--Venusaur--Mega.png diff --git a/src/afd/sprites/back/Nidorina.png b/src/afd/sprites/back/30--0--Nidorina.png similarity index 100% rename from src/afd/sprites/back/Nidorina.png rename to src/afd/sprites/back/30--0--Nidorina.png diff --git a/src/afd/sprites/back/Skitty.png b/src/afd/sprites/back/300--0--Skitty.png similarity index 100% rename from src/afd/sprites/back/Skitty.png rename to src/afd/sprites/back/300--0--Skitty.png diff --git a/src/afd/sprites/back/Delcatty.png b/src/afd/sprites/back/301--0--Delcatty.png similarity index 100% rename from src/afd/sprites/back/Delcatty.png rename to src/afd/sprites/back/301--0--Delcatty.png diff --git a/src/afd/sprites/back/Sableye.png b/src/afd/sprites/back/302--0--Sableye.png similarity index 100% rename from src/afd/sprites/back/Sableye.png rename to src/afd/sprites/back/302--0--Sableye.png diff --git a/src/afd/sprites/back/Sableye--Mega.png b/src/afd/sprites/back/302--420--Sableye--Mega.png similarity index 100% rename from src/afd/sprites/back/Sableye--Mega.png rename to src/afd/sprites/back/302--420--Sableye--Mega.png diff --git a/src/afd/sprites/back/Mawile.png b/src/afd/sprites/back/303--0--Mawile.png similarity index 100% rename from src/afd/sprites/back/Mawile.png rename to src/afd/sprites/back/303--0--Mawile.png diff --git a/src/afd/sprites/back/Mawile--Mega.png b/src/afd/sprites/back/303--420--Mawile--Mega.png similarity index 100% rename from src/afd/sprites/back/Mawile--Mega.png rename to src/afd/sprites/back/303--420--Mawile--Mega.png diff --git a/src/afd/sprites/back/Aron.png b/src/afd/sprites/back/304--0--Aron.png similarity index 100% rename from src/afd/sprites/back/Aron.png rename to src/afd/sprites/back/304--0--Aron.png diff --git a/src/afd/sprites/back/Lairon.png b/src/afd/sprites/back/305--0--Lairon.png similarity index 100% rename from src/afd/sprites/back/Lairon.png rename to src/afd/sprites/back/305--0--Lairon.png diff --git a/src/afd/sprites/back/Aggron.png b/src/afd/sprites/back/306--0--Aggron.png similarity index 100% rename from src/afd/sprites/back/Aggron.png rename to src/afd/sprites/back/306--0--Aggron.png diff --git a/src/afd/sprites/back/Aggron--Mega.png b/src/afd/sprites/back/306--420--Aggron--Mega.png similarity index 100% rename from src/afd/sprites/back/Aggron--Mega.png rename to src/afd/sprites/back/306--420--Aggron--Mega.png diff --git a/src/afd/sprites/back/Meditite.png b/src/afd/sprites/back/307--0--Meditite.png similarity index 100% rename from src/afd/sprites/back/Meditite.png rename to src/afd/sprites/back/307--0--Meditite.png diff --git a/src/afd/sprites/back/Medicham.png b/src/afd/sprites/back/308--0--Medicham.png similarity index 100% rename from src/afd/sprites/back/Medicham.png rename to src/afd/sprites/back/308--0--Medicham.png diff --git a/src/afd/sprites/back/Medicham--Mega.png b/src/afd/sprites/back/308--420--Medicham--Mega.png similarity index 100% rename from src/afd/sprites/back/Medicham--Mega.png rename to src/afd/sprites/back/308--420--Medicham--Mega.png diff --git a/src/afd/sprites/back/Electrike.png b/src/afd/sprites/back/309--0--Electrike.png similarity index 100% rename from src/afd/sprites/back/Electrike.png rename to src/afd/sprites/back/309--0--Electrike.png diff --git a/src/afd/sprites/back/Cawmodore.png b/src/afd/sprites/back/31--0--Cawmodore.png similarity index 100% rename from src/afd/sprites/back/Cawmodore.png rename to src/afd/sprites/back/31--0--Cawmodore.png diff --git a/src/afd/sprites/back/Nidoqueen.png b/src/afd/sprites/back/31--0--Nidoqueen.png similarity index 100% rename from src/afd/sprites/back/Nidoqueen.png rename to src/afd/sprites/back/31--0--Nidoqueen.png diff --git a/src/afd/sprites/back/Manectric.png b/src/afd/sprites/back/310--0--Manectric.png similarity index 100% rename from src/afd/sprites/back/Manectric.png rename to src/afd/sprites/back/310--0--Manectric.png diff --git a/src/afd/sprites/back/Manectric--Mega.png b/src/afd/sprites/back/310--420--Manectric--Mega.png similarity index 100% rename from src/afd/sprites/back/Manectric--Mega.png rename to src/afd/sprites/back/310--420--Manectric--Mega.png diff --git a/src/afd/sprites/back/Plusle.png b/src/afd/sprites/back/311--0--Plusle.png similarity index 100% rename from src/afd/sprites/back/Plusle.png rename to src/afd/sprites/back/311--0--Plusle.png diff --git a/src/afd/sprites/back/Minun.png b/src/afd/sprites/back/312--0--Minun.png similarity index 100% rename from src/afd/sprites/back/Minun.png rename to src/afd/sprites/back/312--0--Minun.png diff --git a/src/afd/sprites/back/Volbeat.png b/src/afd/sprites/back/313--0--Volbeat.png similarity index 100% rename from src/afd/sprites/back/Volbeat.png rename to src/afd/sprites/back/313--0--Volbeat.png diff --git a/src/afd/sprites/back/Illumise.png b/src/afd/sprites/back/314--0--Illumise.png similarity index 100% rename from src/afd/sprites/back/Illumise.png rename to src/afd/sprites/back/314--0--Illumise.png diff --git a/src/afd/sprites/back/Roselia.png b/src/afd/sprites/back/315--0--Roselia.png similarity index 100% rename from src/afd/sprites/back/Roselia.png rename to src/afd/sprites/back/315--0--Roselia.png diff --git a/src/afd/sprites/back/Gulpin.png b/src/afd/sprites/back/316--0--Gulpin.png similarity index 100% rename from src/afd/sprites/back/Gulpin.png rename to src/afd/sprites/back/316--0--Gulpin.png diff --git a/src/afd/sprites/back/Swalot.png b/src/afd/sprites/back/317--0--Swalot.png similarity index 100% rename from src/afd/sprites/back/Swalot.png rename to src/afd/sprites/back/317--0--Swalot.png diff --git a/src/afd/sprites/back/Carvanha.png b/src/afd/sprites/back/318--0--Carvanha.png similarity index 100% rename from src/afd/sprites/back/Carvanha.png rename to src/afd/sprites/back/318--0--Carvanha.png diff --git a/src/afd/sprites/back/Sharpedo.png b/src/afd/sprites/back/319--0--Sharpedo.png similarity index 100% rename from src/afd/sprites/back/Sharpedo.png rename to src/afd/sprites/back/319--0--Sharpedo.png diff --git a/src/afd/sprites/back/Sharpedo--Mega.png b/src/afd/sprites/back/319--420--Sharpedo--Mega.png similarity index 100% rename from src/afd/sprites/back/Sharpedo--Mega.png rename to src/afd/sprites/back/319--420--Sharpedo--Mega.png diff --git a/src/afd/sprites/back/Nidoran-M.png b/src/afd/sprites/back/32--0--Nidoran-M.png similarity index 100% rename from src/afd/sprites/back/Nidoran-M.png rename to src/afd/sprites/back/32--0--Nidoran-M.png diff --git a/src/afd/sprites/back/Wailmer.png b/src/afd/sprites/back/320--0--Wailmer.png similarity index 100% rename from src/afd/sprites/back/Wailmer.png rename to src/afd/sprites/back/320--0--Wailmer.png diff --git a/src/afd/sprites/back/Wailord.png b/src/afd/sprites/back/321--0--Wailord.png similarity index 100% rename from src/afd/sprites/back/Wailord.png rename to src/afd/sprites/back/321--0--Wailord.png diff --git a/src/afd/sprites/back/Numel.png b/src/afd/sprites/back/322--0--Numel.png similarity index 100% rename from src/afd/sprites/back/Numel.png rename to src/afd/sprites/back/322--0--Numel.png diff --git a/src/afd/sprites/back/Camerupt.png b/src/afd/sprites/back/323--0--Camerupt.png similarity index 100% rename from src/afd/sprites/back/Camerupt.png rename to src/afd/sprites/back/323--0--Camerupt.png diff --git a/src/afd/sprites/back/Camerupt--Mega.png b/src/afd/sprites/back/323--420--Camerupt--Mega.png similarity index 100% rename from src/afd/sprites/back/Camerupt--Mega.png rename to src/afd/sprites/back/323--420--Camerupt--Mega.png diff --git a/src/afd/sprites/back/Torkoal.png b/src/afd/sprites/back/324--0--Torkoal.png similarity index 100% rename from src/afd/sprites/back/Torkoal.png rename to src/afd/sprites/back/324--0--Torkoal.png diff --git a/src/afd/sprites/back/Spoink.png b/src/afd/sprites/back/325--0--Spoink.png similarity index 100% rename from src/afd/sprites/back/Spoink.png rename to src/afd/sprites/back/325--0--Spoink.png diff --git a/src/afd/sprites/back/Grumpig.png b/src/afd/sprites/back/326--0--Grumpig.png similarity index 100% rename from src/afd/sprites/back/Grumpig.png rename to src/afd/sprites/back/326--0--Grumpig.png diff --git a/src/afd/sprites/back/Spinda.png b/src/afd/sprites/back/327--0--Spinda.png similarity index 100% rename from src/afd/sprites/back/Spinda.png rename to src/afd/sprites/back/327--0--Spinda.png diff --git a/src/afd/sprites/back/Trapinch.png b/src/afd/sprites/back/328--0--Trapinch.png similarity index 100% rename from src/afd/sprites/back/Trapinch.png rename to src/afd/sprites/back/328--0--Trapinch.png diff --git a/src/afd/sprites/back/Vibrava.png b/src/afd/sprites/back/329--0--Vibrava.png similarity index 100% rename from src/afd/sprites/back/Vibrava.png rename to src/afd/sprites/back/329--0--Vibrava.png diff --git a/src/afd/sprites/back/Nidorino.png b/src/afd/sprites/back/33--0--Nidorino.png similarity index 100% rename from src/afd/sprites/back/Nidorino.png rename to src/afd/sprites/back/33--0--Nidorino.png diff --git a/src/afd/sprites/back/Flygon.png b/src/afd/sprites/back/330--0--Flygon.png similarity index 100% rename from src/afd/sprites/back/Flygon.png rename to src/afd/sprites/back/330--0--Flygon.png diff --git a/src/afd/sprites/back/Cacnea.png b/src/afd/sprites/back/331--0--Cacnea.png similarity index 100% rename from src/afd/sprites/back/Cacnea.png rename to src/afd/sprites/back/331--0--Cacnea.png diff --git a/src/afd/sprites/back/Cacturne.png b/src/afd/sprites/back/332--0--Cacturne.png similarity index 100% rename from src/afd/sprites/back/Cacturne.png rename to src/afd/sprites/back/332--0--Cacturne.png diff --git a/src/afd/sprites/back/Swablu.png b/src/afd/sprites/back/333--0--Swablu.png similarity index 100% rename from src/afd/sprites/back/Swablu.png rename to src/afd/sprites/back/333--0--Swablu.png diff --git a/src/afd/sprites/back/Altaria.png b/src/afd/sprites/back/334--0--Altaria.png similarity index 100% rename from src/afd/sprites/back/Altaria.png rename to src/afd/sprites/back/334--0--Altaria.png diff --git a/src/afd/sprites/back/Altaria--Mega.png b/src/afd/sprites/back/334--420--Altaria--Mega.png similarity index 100% rename from src/afd/sprites/back/Altaria--Mega.png rename to src/afd/sprites/back/334--420--Altaria--Mega.png diff --git a/src/afd/sprites/back/Zangoose.png b/src/afd/sprites/back/335--0--Zangoose.png similarity index 100% rename from src/afd/sprites/back/Zangoose.png rename to src/afd/sprites/back/335--0--Zangoose.png diff --git a/src/afd/sprites/back/Seviper.png b/src/afd/sprites/back/336--0--Seviper.png similarity index 100% rename from src/afd/sprites/back/Seviper.png rename to src/afd/sprites/back/336--0--Seviper.png diff --git a/src/afd/sprites/back/Lunatone.png b/src/afd/sprites/back/337--0--Lunatone.png similarity index 100% rename from src/afd/sprites/back/Lunatone.png rename to src/afd/sprites/back/337--0--Lunatone.png diff --git a/src/afd/sprites/back/Solrock.png b/src/afd/sprites/back/338--0--Solrock.png similarity index 100% rename from src/afd/sprites/back/Solrock.png rename to src/afd/sprites/back/338--0--Solrock.png diff --git a/src/afd/sprites/back/Barboach.png b/src/afd/sprites/back/339--0--Barboach.png similarity index 100% rename from src/afd/sprites/back/Barboach.png rename to src/afd/sprites/back/339--0--Barboach.png diff --git a/src/afd/sprites/back/Nidoking.png b/src/afd/sprites/back/34--0--Nidoking.png similarity index 100% rename from src/afd/sprites/back/Nidoking.png rename to src/afd/sprites/back/34--0--Nidoking.png diff --git a/src/afd/sprites/back/Whiscash.png b/src/afd/sprites/back/340--0--Whiscash.png similarity index 100% rename from src/afd/sprites/back/Whiscash.png rename to src/afd/sprites/back/340--0--Whiscash.png diff --git a/src/afd/sprites/back/Corphish.png b/src/afd/sprites/back/341--0--Corphish.png similarity index 100% rename from src/afd/sprites/back/Corphish.png rename to src/afd/sprites/back/341--0--Corphish.png diff --git a/src/afd/sprites/back/Crawdaunt.png b/src/afd/sprites/back/342--0--Crawdaunt.png similarity index 100% rename from src/afd/sprites/back/Crawdaunt.png rename to src/afd/sprites/back/342--0--Crawdaunt.png diff --git a/src/afd/sprites/back/Baltoy.png b/src/afd/sprites/back/343--0--Baltoy.png similarity index 100% rename from src/afd/sprites/back/Baltoy.png rename to src/afd/sprites/back/343--0--Baltoy.png diff --git a/src/afd/sprites/back/Claydol.png b/src/afd/sprites/back/344--0--Claydol.png similarity index 100% rename from src/afd/sprites/back/Claydol.png rename to src/afd/sprites/back/344--0--Claydol.png diff --git a/src/afd/sprites/back/Lileep.png b/src/afd/sprites/back/345--0--Lileep.png similarity index 100% rename from src/afd/sprites/back/Lileep.png rename to src/afd/sprites/back/345--0--Lileep.png diff --git a/src/afd/sprites/back/Cradily.png b/src/afd/sprites/back/346--0--Cradily.png similarity index 100% rename from src/afd/sprites/back/Cradily.png rename to src/afd/sprites/back/346--0--Cradily.png diff --git a/src/afd/sprites/back/Anorith.png b/src/afd/sprites/back/347--0--Anorith.png similarity index 100% rename from src/afd/sprites/back/Anorith.png rename to src/afd/sprites/back/347--0--Anorith.png diff --git a/src/afd/sprites/back/Armaldo.png b/src/afd/sprites/back/348--0--Armaldo.png similarity index 100% rename from src/afd/sprites/back/Armaldo.png rename to src/afd/sprites/back/348--0--Armaldo.png diff --git a/src/afd/sprites/back/Feebas.png b/src/afd/sprites/back/349--0--Feebas.png similarity index 100% rename from src/afd/sprites/back/Feebas.png rename to src/afd/sprites/back/349--0--Feebas.png diff --git a/src/afd/sprites/back/Clefairy.png b/src/afd/sprites/back/35--0--Clefairy.png similarity index 100% rename from src/afd/sprites/back/Clefairy.png rename to src/afd/sprites/back/35--0--Clefairy.png diff --git a/src/afd/sprites/back/Plasmanta.png b/src/afd/sprites/back/35--0--Plasmanta.png similarity index 100% rename from src/afd/sprites/back/Plasmanta.png rename to src/afd/sprites/back/35--0--Plasmanta.png diff --git a/src/afd/sprites/back/Milotic.png b/src/afd/sprites/back/350--0--Milotic.png similarity index 100% rename from src/afd/sprites/back/Milotic.png rename to src/afd/sprites/back/350--0--Milotic.png diff --git a/src/afd/sprites/back/Castform.png b/src/afd/sprites/back/351--0--Castform.png similarity index 100% rename from src/afd/sprites/back/Castform.png rename to src/afd/sprites/back/351--0--Castform.png diff --git a/src/afd/sprites/back/Castform--Rainy.png b/src/afd/sprites/back/351--420--Castform--Rainy.png similarity index 100% rename from src/afd/sprites/back/Castform--Rainy.png rename to src/afd/sprites/back/351--420--Castform--Rainy.png diff --git a/src/afd/sprites/back/Castform--Snowy.png b/src/afd/sprites/back/351--420--Castform--Snowy.png similarity index 100% rename from src/afd/sprites/back/Castform--Snowy.png rename to src/afd/sprites/back/351--420--Castform--Snowy.png diff --git a/src/afd/sprites/back/Castform--Sunny.png b/src/afd/sprites/back/351--420--Castform--Sunny.png similarity index 100% rename from src/afd/sprites/back/Castform--Sunny.png rename to src/afd/sprites/back/351--420--Castform--Sunny.png diff --git a/src/afd/sprites/back/Kecleon.png b/src/afd/sprites/back/352--0--Kecleon.png similarity index 100% rename from src/afd/sprites/back/Kecleon.png rename to src/afd/sprites/back/352--0--Kecleon.png diff --git a/src/afd/sprites/back/Shuppet.png b/src/afd/sprites/back/353--0--Shuppet.png similarity index 100% rename from src/afd/sprites/back/Shuppet.png rename to src/afd/sprites/back/353--0--Shuppet.png diff --git a/src/afd/sprites/back/Banette.png b/src/afd/sprites/back/354--0--Banette.png similarity index 100% rename from src/afd/sprites/back/Banette.png rename to src/afd/sprites/back/354--0--Banette.png diff --git a/src/afd/sprites/back/Banette--Mega.png b/src/afd/sprites/back/354--420--Banette--Mega.png similarity index 100% rename from src/afd/sprites/back/Banette--Mega.png rename to src/afd/sprites/back/354--420--Banette--Mega.png diff --git a/src/afd/sprites/back/Duskull.png b/src/afd/sprites/back/355--0--Duskull.png similarity index 100% rename from src/afd/sprites/back/Duskull.png rename to src/afd/sprites/back/355--0--Duskull.png diff --git a/src/afd/sprites/back/Dusclops.png b/src/afd/sprites/back/356--0--Dusclops.png similarity index 100% rename from src/afd/sprites/back/Dusclops.png rename to src/afd/sprites/back/356--0--Dusclops.png diff --git a/src/afd/sprites/back/Tropius.png b/src/afd/sprites/back/357--0--Tropius.png similarity index 100% rename from src/afd/sprites/back/Tropius.png rename to src/afd/sprites/back/357--0--Tropius.png diff --git a/src/afd/sprites/back/Chimecho.png b/src/afd/sprites/back/358--0--Chimecho.png similarity index 100% rename from src/afd/sprites/back/Chimecho.png rename to src/afd/sprites/back/358--0--Chimecho.png diff --git a/src/afd/sprites/back/Absol.png b/src/afd/sprites/back/359--0--Absol.png similarity index 100% rename from src/afd/sprites/back/Absol.png rename to src/afd/sprites/back/359--0--Absol.png diff --git a/src/afd/sprites/back/Absol--Mega.png b/src/afd/sprites/back/359--420--Absol--Mega.png similarity index 100% rename from src/afd/sprites/back/Absol--Mega.png rename to src/afd/sprites/back/359--420--Absol--Mega.png diff --git a/src/afd/sprites/back/Clefable.png b/src/afd/sprites/back/36--0--Clefable.png similarity index 100% rename from src/afd/sprites/back/Clefable.png rename to src/afd/sprites/back/36--0--Clefable.png diff --git a/src/afd/sprites/back/Wynaut.png b/src/afd/sprites/back/360--0--Wynaut.png similarity index 100% rename from src/afd/sprites/back/Wynaut.png rename to src/afd/sprites/back/360--0--Wynaut.png diff --git a/src/afd/sprites/back/Snorunt.png b/src/afd/sprites/back/361--0--Snorunt.png similarity index 100% rename from src/afd/sprites/back/Snorunt.png rename to src/afd/sprites/back/361--0--Snorunt.png diff --git a/src/afd/sprites/back/Glalie.png b/src/afd/sprites/back/362--0--Glalie.png similarity index 100% rename from src/afd/sprites/back/Glalie.png rename to src/afd/sprites/back/362--0--Glalie.png diff --git a/src/afd/sprites/back/Spheal.png b/src/afd/sprites/back/363--0--Spheal.png similarity index 100% rename from src/afd/sprites/back/Spheal.png rename to src/afd/sprites/back/363--0--Spheal.png diff --git a/src/afd/sprites/back/Sealeo.png b/src/afd/sprites/back/364--0--Sealeo.png similarity index 100% rename from src/afd/sprites/back/Sealeo.png rename to src/afd/sprites/back/364--0--Sealeo.png diff --git a/src/afd/sprites/back/Walrein.png b/src/afd/sprites/back/365--0--Walrein.png similarity index 100% rename from src/afd/sprites/back/Walrein.png rename to src/afd/sprites/back/365--0--Walrein.png diff --git a/src/afd/sprites/back/Clamperl.png b/src/afd/sprites/back/366--0--Clamperl.png similarity index 100% rename from src/afd/sprites/back/Clamperl.png rename to src/afd/sprites/back/366--0--Clamperl.png diff --git a/src/afd/sprites/back/Huntail.png b/src/afd/sprites/back/367--0--Huntail.png similarity index 100% rename from src/afd/sprites/back/Huntail.png rename to src/afd/sprites/back/367--0--Huntail.png diff --git a/src/afd/sprites/back/Gorebyss.png b/src/afd/sprites/back/368--0--Gorebyss.png similarity index 100% rename from src/afd/sprites/back/Gorebyss.png rename to src/afd/sprites/back/368--0--Gorebyss.png diff --git a/src/afd/sprites/back/Relicanth.png b/src/afd/sprites/back/369--0--Relicanth.png similarity index 100% rename from src/afd/sprites/back/Relicanth.png rename to src/afd/sprites/back/369--0--Relicanth.png diff --git a/src/afd/sprites/back/Vulpix.png b/src/afd/sprites/back/37--0--Vulpix.png similarity index 100% rename from src/afd/sprites/back/Vulpix.png rename to src/afd/sprites/back/37--0--Vulpix.png diff --git a/src/afd/sprites/back/Vulpix--Alola.png b/src/afd/sprites/back/37--420--Vulpix--Alola.png similarity index 100% rename from src/afd/sprites/back/Vulpix--Alola.png rename to src/afd/sprites/back/37--420--Vulpix--Alola.png diff --git a/src/afd/sprites/back/Luvdisc.png b/src/afd/sprites/back/370--0--Luvdisc.png similarity index 100% rename from src/afd/sprites/back/Luvdisc.png rename to src/afd/sprites/back/370--0--Luvdisc.png diff --git a/src/afd/sprites/back/Bagon.png b/src/afd/sprites/back/371--0--Bagon.png similarity index 100% rename from src/afd/sprites/back/Bagon.png rename to src/afd/sprites/back/371--0--Bagon.png diff --git a/src/afd/sprites/back/Shelgon.png b/src/afd/sprites/back/372--0--Shelgon.png similarity index 100% rename from src/afd/sprites/back/Shelgon.png rename to src/afd/sprites/back/372--0--Shelgon.png diff --git a/src/afd/sprites/back/Salamence.png b/src/afd/sprites/back/373--0--Salamence.png similarity index 100% rename from src/afd/sprites/back/Salamence.png rename to src/afd/sprites/back/373--0--Salamence.png diff --git a/src/afd/sprites/back/Salamence--Mega.png b/src/afd/sprites/back/373--420--Salamence--Mega.png similarity index 100% rename from src/afd/sprites/back/Salamence--Mega.png rename to src/afd/sprites/back/373--420--Salamence--Mega.png diff --git a/src/afd/sprites/back/Beldum.png b/src/afd/sprites/back/374--0--Beldum.png similarity index 100% rename from src/afd/sprites/back/Beldum.png rename to src/afd/sprites/back/374--0--Beldum.png diff --git a/src/afd/sprites/back/Metang.png b/src/afd/sprites/back/375--0--Metang.png similarity index 100% rename from src/afd/sprites/back/Metang.png rename to src/afd/sprites/back/375--0--Metang.png diff --git a/src/afd/sprites/back/Metagross.png b/src/afd/sprites/back/376--0--Metagross.png similarity index 100% rename from src/afd/sprites/back/Metagross.png rename to src/afd/sprites/back/376--0--Metagross.png diff --git a/src/afd/sprites/back/Metagross--Mega.png b/src/afd/sprites/back/376--420--Metagross--Mega.png similarity index 100% rename from src/afd/sprites/back/Metagross--Mega.png rename to src/afd/sprites/back/376--420--Metagross--Mega.png diff --git a/src/afd/sprites/back/Regirock.png b/src/afd/sprites/back/377--0--Regirock.png similarity index 100% rename from src/afd/sprites/back/Regirock.png rename to src/afd/sprites/back/377--0--Regirock.png diff --git a/src/afd/sprites/back/Regice.png b/src/afd/sprites/back/378--0--Regice.png similarity index 100% rename from src/afd/sprites/back/Regice.png rename to src/afd/sprites/back/378--0--Regice.png diff --git a/src/afd/sprites/back/Registeel.png b/src/afd/sprites/back/379--0--Registeel.png similarity index 100% rename from src/afd/sprites/back/Registeel.png rename to src/afd/sprites/back/379--0--Registeel.png diff --git a/src/afd/sprites/back/Ninetales.png b/src/afd/sprites/back/38--0--Ninetales.png similarity index 100% rename from src/afd/sprites/back/Ninetales.png rename to src/afd/sprites/back/38--0--Ninetales.png diff --git a/src/afd/sprites/back/Ninetales--Alola.png b/src/afd/sprites/back/38--420--Ninetales--Alola.png similarity index 100% rename from src/afd/sprites/back/Ninetales--Alola.png rename to src/afd/sprites/back/38--420--Ninetales--Alola.png diff --git a/src/afd/sprites/back/Latias.png b/src/afd/sprites/back/380--0--Latias.png similarity index 100% rename from src/afd/sprites/back/Latias.png rename to src/afd/sprites/back/380--0--Latias.png diff --git a/src/afd/sprites/back/Latias--Mega.png b/src/afd/sprites/back/380--420--Latias--Mega.png similarity index 100% rename from src/afd/sprites/back/Latias--Mega.png rename to src/afd/sprites/back/380--420--Latias--Mega.png diff --git a/src/afd/sprites/back/Latios.png b/src/afd/sprites/back/381--0--Latios.png similarity index 100% rename from src/afd/sprites/back/Latios.png rename to src/afd/sprites/back/381--0--Latios.png diff --git a/src/afd/sprites/back/Latios--Mega.png b/src/afd/sprites/back/381--420--Latios--Mega.png similarity index 100% rename from src/afd/sprites/back/Latios--Mega.png rename to src/afd/sprites/back/381--420--Latios--Mega.png diff --git a/src/afd/sprites/back/Kyogre.png b/src/afd/sprites/back/382--0--Kyogre.png similarity index 100% rename from src/afd/sprites/back/Kyogre.png rename to src/afd/sprites/back/382--0--Kyogre.png diff --git a/src/afd/sprites/back/Kyogre--Primal.png b/src/afd/sprites/back/382--420--Kyogre--Primal.png similarity index 100% rename from src/afd/sprites/back/Kyogre--Primal.png rename to src/afd/sprites/back/382--420--Kyogre--Primal.png diff --git a/src/afd/sprites/back/Groudon.png b/src/afd/sprites/back/383--0--Groudon.png similarity index 100% rename from src/afd/sprites/back/Groudon.png rename to src/afd/sprites/back/383--0--Groudon.png diff --git a/src/afd/sprites/back/Groudon--Primal.png b/src/afd/sprites/back/383--420--Groudon--Primal.png similarity index 100% rename from src/afd/sprites/back/Groudon--Primal.png rename to src/afd/sprites/back/383--420--Groudon--Primal.png diff --git a/src/afd/sprites/back/Rayquaza.png b/src/afd/sprites/back/384--0--Rayquaza.png similarity index 100% rename from src/afd/sprites/back/Rayquaza.png rename to src/afd/sprites/back/384--0--Rayquaza.png diff --git a/src/afd/sprites/back/Rayquaza--Mega.png b/src/afd/sprites/back/384--420--Rayquaza--Mega.png similarity index 100% rename from src/afd/sprites/back/Rayquaza--Mega.png rename to src/afd/sprites/back/384--420--Rayquaza--Mega.png diff --git a/src/afd/sprites/back/Jirachi.png b/src/afd/sprites/back/385--0--Jirachi.png similarity index 100% rename from src/afd/sprites/back/Jirachi.png rename to src/afd/sprites/back/385--0--Jirachi.png diff --git a/src/afd/sprites/back/Deoxys.png b/src/afd/sprites/back/386--0--Deoxys.png similarity index 100% rename from src/afd/sprites/back/Deoxys.png rename to src/afd/sprites/back/386--0--Deoxys.png diff --git a/src/afd/sprites/back/Deoxys--Attack.png b/src/afd/sprites/back/386--420--Deoxys--Attack.png similarity index 100% rename from src/afd/sprites/back/Deoxys--Attack.png rename to src/afd/sprites/back/386--420--Deoxys--Attack.png diff --git a/src/afd/sprites/back/Deoxys--Defense.png b/src/afd/sprites/back/386--420--Deoxys--Defense.png similarity index 100% rename from src/afd/sprites/back/Deoxys--Defense.png rename to src/afd/sprites/back/386--420--Deoxys--Defense.png diff --git a/src/afd/sprites/back/Deoxys--Speed.png b/src/afd/sprites/back/386--420--Deoxys--Speed.png similarity index 100% rename from src/afd/sprites/back/Deoxys--Speed.png rename to src/afd/sprites/back/386--420--Deoxys--Speed.png diff --git a/src/afd/sprites/back/Turtwig.png b/src/afd/sprites/back/387--0--Turtwig.png similarity index 100% rename from src/afd/sprites/back/Turtwig.png rename to src/afd/sprites/back/387--0--Turtwig.png diff --git a/src/afd/sprites/back/Grotle.png b/src/afd/sprites/back/388--0--Grotle.png similarity index 100% rename from src/afd/sprites/back/Grotle.png rename to src/afd/sprites/back/388--0--Grotle.png diff --git a/src/afd/sprites/back/Torterra.png b/src/afd/sprites/back/389--0--Torterra.png similarity index 100% rename from src/afd/sprites/back/Torterra.png rename to src/afd/sprites/back/389--0--Torterra.png diff --git a/src/afd/sprites/back/Jigglypuff.png b/src/afd/sprites/back/39--0--Jigglypuff.png similarity index 100% rename from src/afd/sprites/back/Jigglypuff.png rename to src/afd/sprites/back/39--0--Jigglypuff.png diff --git a/src/afd/sprites/back/Chimchar.png b/src/afd/sprites/back/390--0--Chimchar.png similarity index 100% rename from src/afd/sprites/back/Chimchar.png rename to src/afd/sprites/back/390--0--Chimchar.png diff --git a/src/afd/sprites/back/Monferno.png b/src/afd/sprites/back/391--0--Monferno.png similarity index 100% rename from src/afd/sprites/back/Monferno.png rename to src/afd/sprites/back/391--0--Monferno.png diff --git a/src/afd/sprites/back/Infernape.png b/src/afd/sprites/back/392--0--Infernape.png similarity index 100% rename from src/afd/sprites/back/Infernape.png rename to src/afd/sprites/back/392--0--Infernape.png diff --git a/src/afd/sprites/back/Piplup.png b/src/afd/sprites/back/393--0--Piplup.png similarity index 100% rename from src/afd/sprites/back/Piplup.png rename to src/afd/sprites/back/393--0--Piplup.png diff --git a/src/afd/sprites/back/Prinplup.png b/src/afd/sprites/back/394--0--Prinplup.png similarity index 100% rename from src/afd/sprites/back/Prinplup.png rename to src/afd/sprites/back/394--0--Prinplup.png diff --git a/src/afd/sprites/back/Empoleon.png b/src/afd/sprites/back/395--0--Empoleon.png similarity index 100% rename from src/afd/sprites/back/Empoleon.png rename to src/afd/sprites/back/395--0--Empoleon.png diff --git a/src/afd/sprites/back/Starly.png b/src/afd/sprites/back/396--0--Starly.png similarity index 100% rename from src/afd/sprites/back/Starly.png rename to src/afd/sprites/back/396--0--Starly.png diff --git a/src/afd/sprites/back/Staravia.png b/src/afd/sprites/back/397--0--Staravia.png similarity index 100% rename from src/afd/sprites/back/Staravia.png rename to src/afd/sprites/back/397--0--Staravia.png diff --git a/src/afd/sprites/back/Staraptor.png b/src/afd/sprites/back/398--0--Staraptor.png similarity index 100% rename from src/afd/sprites/back/Staraptor.png rename to src/afd/sprites/back/398--0--Staraptor.png diff --git a/src/afd/sprites/back/Bidoof.png b/src/afd/sprites/back/399--0--Bidoof.png similarity index 100% rename from src/afd/sprites/back/Bidoof.png rename to src/afd/sprites/back/399--0--Bidoof.png diff --git a/src/afd/sprites/back/Charmander.png b/src/afd/sprites/back/4--0--Charmander.png similarity index 100% rename from src/afd/sprites/back/Charmander.png rename to src/afd/sprites/back/4--0--Charmander.png diff --git a/src/afd/sprites/back/Wigglytuff.png b/src/afd/sprites/back/40--0--Wigglytuff.png similarity index 100% rename from src/afd/sprites/back/Wigglytuff.png rename to src/afd/sprites/back/40--0--Wigglytuff.png diff --git a/src/afd/sprites/back/Bibarel.png b/src/afd/sprites/back/400--0--Bibarel.png similarity index 100% rename from src/afd/sprites/back/Bibarel.png rename to src/afd/sprites/back/400--0--Bibarel.png diff --git a/src/afd/sprites/back/Kricketot.png b/src/afd/sprites/back/401--0--Kricketot.png similarity index 100% rename from src/afd/sprites/back/Kricketot.png rename to src/afd/sprites/back/401--0--Kricketot.png diff --git a/src/afd/sprites/back/Kricketune.png b/src/afd/sprites/back/402--0--Kricketune.png similarity index 100% rename from src/afd/sprites/back/Kricketune.png rename to src/afd/sprites/back/402--0--Kricketune.png diff --git a/src/afd/sprites/back/Shinx.png b/src/afd/sprites/back/403--0--Shinx.png similarity index 100% rename from src/afd/sprites/back/Shinx.png rename to src/afd/sprites/back/403--0--Shinx.png diff --git a/src/afd/sprites/back/Luxio.png b/src/afd/sprites/back/404--0--Luxio.png similarity index 100% rename from src/afd/sprites/back/Luxio.png rename to src/afd/sprites/back/404--0--Luxio.png diff --git a/src/afd/sprites/back/Luxray.png b/src/afd/sprites/back/405--0--Luxray.png similarity index 100% rename from src/afd/sprites/back/Luxray.png rename to src/afd/sprites/back/405--0--Luxray.png diff --git a/src/afd/sprites/back/Budew.png b/src/afd/sprites/back/406--0--Budew.png similarity index 100% rename from src/afd/sprites/back/Budew.png rename to src/afd/sprites/back/406--0--Budew.png diff --git a/src/afd/sprites/back/Roserade.png b/src/afd/sprites/back/407--0--Roserade.png similarity index 100% rename from src/afd/sprites/back/Roserade.png rename to src/afd/sprites/back/407--0--Roserade.png diff --git a/src/afd/sprites/back/Cranidos.png b/src/afd/sprites/back/408--0--Cranidos.png similarity index 100% rename from src/afd/sprites/back/Cranidos.png rename to src/afd/sprites/back/408--0--Cranidos.png diff --git a/src/afd/sprites/back/Rampardos.png b/src/afd/sprites/back/409--0--Rampardos.png similarity index 100% rename from src/afd/sprites/back/Rampardos.png rename to src/afd/sprites/back/409--0--Rampardos.png diff --git a/src/afd/sprites/back/Zubat.png b/src/afd/sprites/back/41--0--Zubat.png similarity index 100% rename from src/afd/sprites/back/Zubat.png rename to src/afd/sprites/back/41--0--Zubat.png diff --git a/src/afd/sprites/back/Shieldon.png b/src/afd/sprites/back/410--0--Shieldon.png similarity index 100% rename from src/afd/sprites/back/Shieldon.png rename to src/afd/sprites/back/410--0--Shieldon.png diff --git a/src/afd/sprites/back/Bastiodon.png b/src/afd/sprites/back/411--0--Bastiodon.png similarity index 100% rename from src/afd/sprites/back/Bastiodon.png rename to src/afd/sprites/back/411--0--Bastiodon.png diff --git a/src/afd/sprites/back/Burmy.png b/src/afd/sprites/back/412--0--Burmy.png similarity index 100% rename from src/afd/sprites/back/Burmy.png rename to src/afd/sprites/back/412--0--Burmy.png diff --git a/src/afd/sprites/back/Wormadam.png b/src/afd/sprites/back/413--0--Wormadam.png similarity index 100% rename from src/afd/sprites/back/Wormadam.png rename to src/afd/sprites/back/413--0--Wormadam.png diff --git a/src/afd/sprites/back/Wormadam--Sandy.png b/src/afd/sprites/back/413--420--Wormadam--Sandy.png similarity index 100% rename from src/afd/sprites/back/Wormadam--Sandy.png rename to src/afd/sprites/back/413--420--Wormadam--Sandy.png diff --git a/src/afd/sprites/back/Wormadam--Trash.png b/src/afd/sprites/back/413--420--Wormadam--Trash.png similarity index 100% rename from src/afd/sprites/back/Wormadam--Trash.png rename to src/afd/sprites/back/413--420--Wormadam--Trash.png diff --git a/src/afd/sprites/back/Mothim.png b/src/afd/sprites/back/414--0--Mothim.png similarity index 100% rename from src/afd/sprites/back/Mothim.png rename to src/afd/sprites/back/414--0--Mothim.png diff --git a/src/afd/sprites/back/Combee.png b/src/afd/sprites/back/415--0--Combee.png similarity index 100% rename from src/afd/sprites/back/Combee.png rename to src/afd/sprites/back/415--0--Combee.png diff --git a/src/afd/sprites/back/Vespiquen.png b/src/afd/sprites/back/416--0--Vespiquen.png similarity index 100% rename from src/afd/sprites/back/Vespiquen.png rename to src/afd/sprites/back/416--0--Vespiquen.png diff --git a/src/afd/sprites/back/Pachirisu.png b/src/afd/sprites/back/417--0--Pachirisu.png similarity index 100% rename from src/afd/sprites/back/Pachirisu.png rename to src/afd/sprites/back/417--0--Pachirisu.png diff --git a/src/afd/sprites/back/Buizel.png b/src/afd/sprites/back/418--0--Buizel.png similarity index 100% rename from src/afd/sprites/back/Buizel.png rename to src/afd/sprites/back/418--0--Buizel.png diff --git a/src/afd/sprites/back/Floatzel.png b/src/afd/sprites/back/419--0--Floatzel.png similarity index 100% rename from src/afd/sprites/back/Floatzel.png rename to src/afd/sprites/back/419--0--Floatzel.png diff --git a/src/afd/sprites/back/Golbat.png b/src/afd/sprites/back/42--0--Golbat.png similarity index 100% rename from src/afd/sprites/back/Golbat.png rename to src/afd/sprites/back/42--0--Golbat.png diff --git a/src/afd/sprites/back/Cherubi.png b/src/afd/sprites/back/420--0--Cherubi.png similarity index 100% rename from src/afd/sprites/back/Cherubi.png rename to src/afd/sprites/back/420--0--Cherubi.png diff --git a/src/afd/sprites/back/Cherrim.png b/src/afd/sprites/back/421--0--Cherrim.png similarity index 100% rename from src/afd/sprites/back/Cherrim.png rename to src/afd/sprites/back/421--0--Cherrim.png diff --git a/src/afd/sprites/back/Cherrim--Sunshine.png b/src/afd/sprites/back/421--420--Cherrim--Sunshine.png similarity index 100% rename from src/afd/sprites/back/Cherrim--Sunshine.png rename to src/afd/sprites/back/421--420--Cherrim--Sunshine.png diff --git a/src/afd/sprites/back/Shellos.png b/src/afd/sprites/back/422--0--Shellos.png similarity index 100% rename from src/afd/sprites/back/Shellos.png rename to src/afd/sprites/back/422--0--Shellos.png diff --git a/src/afd/sprites/back/Gastrodon.png b/src/afd/sprites/back/423--0--Gastrodon.png similarity index 100% rename from src/afd/sprites/back/Gastrodon.png rename to src/afd/sprites/back/423--0--Gastrodon.png diff --git a/src/afd/sprites/back/Ambipom.png b/src/afd/sprites/back/424--0--Ambipom.png similarity index 100% rename from src/afd/sprites/back/Ambipom.png rename to src/afd/sprites/back/424--0--Ambipom.png diff --git a/src/afd/sprites/back/Drifloon.png b/src/afd/sprites/back/425--0--Drifloon.png similarity index 100% rename from src/afd/sprites/back/Drifloon.png rename to src/afd/sprites/back/425--0--Drifloon.png diff --git a/src/afd/sprites/back/Drifblim.png b/src/afd/sprites/back/426--0--Drifblim.png similarity index 100% rename from src/afd/sprites/back/Drifblim.png rename to src/afd/sprites/back/426--0--Drifblim.png diff --git a/src/afd/sprites/back/Buneary.png b/src/afd/sprites/back/427--0--Buneary.png similarity index 100% rename from src/afd/sprites/back/Buneary.png rename to src/afd/sprites/back/427--0--Buneary.png diff --git a/src/afd/sprites/back/Lopunny.png b/src/afd/sprites/back/428--0--Lopunny.png similarity index 100% rename from src/afd/sprites/back/Lopunny.png rename to src/afd/sprites/back/428--0--Lopunny.png diff --git a/src/afd/sprites/back/Lopunny--Mega.png b/src/afd/sprites/back/428--420--Lopunny--Mega.png similarity index 100% rename from src/afd/sprites/back/Lopunny--Mega.png rename to src/afd/sprites/back/428--420--Lopunny--Mega.png diff --git a/src/afd/sprites/back/Mismagius.png b/src/afd/sprites/back/429--0--Mismagius.png similarity index 100% rename from src/afd/sprites/back/Mismagius.png rename to src/afd/sprites/back/429--0--Mismagius.png diff --git a/src/afd/sprites/back/Oddish.png b/src/afd/sprites/back/43--0--Oddish.png similarity index 100% rename from src/afd/sprites/back/Oddish.png rename to src/afd/sprites/back/43--0--Oddish.png diff --git a/src/afd/sprites/back/Honchkrow.png b/src/afd/sprites/back/430--0--Honchkrow.png similarity index 100% rename from src/afd/sprites/back/Honchkrow.png rename to src/afd/sprites/back/430--0--Honchkrow.png diff --git a/src/afd/sprites/back/Glameow.png b/src/afd/sprites/back/431--0--Glameow.png similarity index 100% rename from src/afd/sprites/back/Glameow.png rename to src/afd/sprites/back/431--0--Glameow.png diff --git a/src/afd/sprites/back/Purugly.png b/src/afd/sprites/back/432--0--Purugly.png similarity index 100% rename from src/afd/sprites/back/Purugly.png rename to src/afd/sprites/back/432--0--Purugly.png diff --git a/src/afd/sprites/back/Chingling.png b/src/afd/sprites/back/433--0--Chingling.png similarity index 100% rename from src/afd/sprites/back/Chingling.png rename to src/afd/sprites/back/433--0--Chingling.png diff --git a/src/afd/sprites/back/Stunky.png b/src/afd/sprites/back/434--0--Stunky.png similarity index 100% rename from src/afd/sprites/back/Stunky.png rename to src/afd/sprites/back/434--0--Stunky.png diff --git a/src/afd/sprites/back/Skuntank.png b/src/afd/sprites/back/435--0--Skuntank.png similarity index 100% rename from src/afd/sprites/back/Skuntank.png rename to src/afd/sprites/back/435--0--Skuntank.png diff --git a/src/afd/sprites/back/Bronzor.png b/src/afd/sprites/back/436--0--Bronzor.png similarity index 100% rename from src/afd/sprites/back/Bronzor.png rename to src/afd/sprites/back/436--0--Bronzor.png diff --git a/src/afd/sprites/back/Bronzong.png b/src/afd/sprites/back/437--0--Bronzong.png similarity index 100% rename from src/afd/sprites/back/Bronzong.png rename to src/afd/sprites/back/437--0--Bronzong.png diff --git a/src/afd/sprites/back/Bonsly.png b/src/afd/sprites/back/438--0--Bonsly.png similarity index 100% rename from src/afd/sprites/back/Bonsly.png rename to src/afd/sprites/back/438--0--Bonsly.png diff --git a/src/afd/sprites/back/Mime_Jr..png b/src/afd/sprites/back/439--0--Mime_Jr..png similarity index 100% rename from src/afd/sprites/back/Mime_Jr..png rename to src/afd/sprites/back/439--0--Mime_Jr..png diff --git a/src/afd/sprites/back/Gloom.png b/src/afd/sprites/back/44--0--Gloom.png similarity index 100% rename from src/afd/sprites/back/Gloom.png rename to src/afd/sprites/back/44--0--Gloom.png diff --git a/src/afd/sprites/back/Happiny.png b/src/afd/sprites/back/440--0--Happiny.png similarity index 100% rename from src/afd/sprites/back/Happiny.png rename to src/afd/sprites/back/440--0--Happiny.png diff --git a/src/afd/sprites/back/Chatot.png b/src/afd/sprites/back/441--0--Chatot.png similarity index 100% rename from src/afd/sprites/back/Chatot.png rename to src/afd/sprites/back/441--0--Chatot.png diff --git a/src/afd/sprites/back/Spiritomb.png b/src/afd/sprites/back/442--0--Spiritomb.png similarity index 100% rename from src/afd/sprites/back/Spiritomb.png rename to src/afd/sprites/back/442--0--Spiritomb.png diff --git a/src/afd/sprites/back/Gible.png b/src/afd/sprites/back/443--0--Gible.png similarity index 100% rename from src/afd/sprites/back/Gible.png rename to src/afd/sprites/back/443--0--Gible.png diff --git a/src/afd/sprites/back/Gabite.png b/src/afd/sprites/back/444--0--Gabite.png similarity index 100% rename from src/afd/sprites/back/Gabite.png rename to src/afd/sprites/back/444--0--Gabite.png diff --git a/src/afd/sprites/back/Garchomp.png b/src/afd/sprites/back/445--0--Garchomp.png similarity index 100% rename from src/afd/sprites/back/Garchomp.png rename to src/afd/sprites/back/445--0--Garchomp.png diff --git a/src/afd/sprites/back/Garchomp--Mega.png b/src/afd/sprites/back/445--420--Garchomp--Mega.png similarity index 100% rename from src/afd/sprites/back/Garchomp--Mega.png rename to src/afd/sprites/back/445--420--Garchomp--Mega.png diff --git a/src/afd/sprites/back/Munchlax.png b/src/afd/sprites/back/446--0--Munchlax.png similarity index 100% rename from src/afd/sprites/back/Munchlax.png rename to src/afd/sprites/back/446--0--Munchlax.png diff --git a/src/afd/sprites/back/Riolu.png b/src/afd/sprites/back/447--0--Riolu.png similarity index 100% rename from src/afd/sprites/back/Riolu.png rename to src/afd/sprites/back/447--0--Riolu.png diff --git a/src/afd/sprites/back/Lucario.png b/src/afd/sprites/back/448--0--Lucario.png similarity index 100% rename from src/afd/sprites/back/Lucario.png rename to src/afd/sprites/back/448--0--Lucario.png diff --git a/src/afd/sprites/back/Lucario--Mega.png b/src/afd/sprites/back/448--420--Lucario--Mega.png similarity index 100% rename from src/afd/sprites/back/Lucario--Mega.png rename to src/afd/sprites/back/448--420--Lucario--Mega.png diff --git a/src/afd/sprites/back/Hippopotas.png b/src/afd/sprites/back/449--0--Hippopotas.png similarity index 100% rename from src/afd/sprites/back/Hippopotas.png rename to src/afd/sprites/back/449--0--Hippopotas.png diff --git a/src/afd/sprites/back/Vileplume.png b/src/afd/sprites/back/45--0--Vileplume.png similarity index 100% rename from src/afd/sprites/back/Vileplume.png rename to src/afd/sprites/back/45--0--Vileplume.png diff --git a/src/afd/sprites/back/Hippowdon.png b/src/afd/sprites/back/450--0--Hippowdon.png similarity index 100% rename from src/afd/sprites/back/Hippowdon.png rename to src/afd/sprites/back/450--0--Hippowdon.png diff --git a/src/afd/sprites/back/Skorupi.png b/src/afd/sprites/back/451--0--Skorupi.png similarity index 100% rename from src/afd/sprites/back/Skorupi.png rename to src/afd/sprites/back/451--0--Skorupi.png diff --git a/src/afd/sprites/back/Drapion.png b/src/afd/sprites/back/452--0--Drapion.png similarity index 100% rename from src/afd/sprites/back/Drapion.png rename to src/afd/sprites/back/452--0--Drapion.png diff --git a/src/afd/sprites/back/Croagunk.png b/src/afd/sprites/back/453--0--Croagunk.png similarity index 100% rename from src/afd/sprites/back/Croagunk.png rename to src/afd/sprites/back/453--0--Croagunk.png diff --git a/src/afd/sprites/back/Toxicroak.png b/src/afd/sprites/back/454--0--Toxicroak.png similarity index 100% rename from src/afd/sprites/back/Toxicroak.png rename to src/afd/sprites/back/454--0--Toxicroak.png diff --git a/src/afd/sprites/back/Carnivine.png b/src/afd/sprites/back/455--0--Carnivine.png similarity index 100% rename from src/afd/sprites/back/Carnivine.png rename to src/afd/sprites/back/455--0--Carnivine.png diff --git a/src/afd/sprites/back/Finneon.png b/src/afd/sprites/back/456--0--Finneon.png similarity index 100% rename from src/afd/sprites/back/Finneon.png rename to src/afd/sprites/back/456--0--Finneon.png diff --git a/src/afd/sprites/back/Lumineon.png b/src/afd/sprites/back/457--0--Lumineon.png similarity index 100% rename from src/afd/sprites/back/Lumineon.png rename to src/afd/sprites/back/457--0--Lumineon.png diff --git a/src/afd/sprites/back/Mantyke.png b/src/afd/sprites/back/458--0--Mantyke.png similarity index 100% rename from src/afd/sprites/back/Mantyke.png rename to src/afd/sprites/back/458--0--Mantyke.png diff --git a/src/afd/sprites/back/Snover.png b/src/afd/sprites/back/459--0--Snover.png similarity index 100% rename from src/afd/sprites/back/Snover.png rename to src/afd/sprites/back/459--0--Snover.png diff --git a/src/afd/sprites/back/Paras.png b/src/afd/sprites/back/46--0--Paras.png similarity index 100% rename from src/afd/sprites/back/Paras.png rename to src/afd/sprites/back/46--0--Paras.png diff --git a/src/afd/sprites/back/Abomasnow.png b/src/afd/sprites/back/460--0--Abomasnow.png similarity index 100% rename from src/afd/sprites/back/Abomasnow.png rename to src/afd/sprites/back/460--0--Abomasnow.png diff --git a/src/afd/sprites/back/Abomasnow--Mega.png b/src/afd/sprites/back/460--420--Abomasnow--Mega.png similarity index 100% rename from src/afd/sprites/back/Abomasnow--Mega.png rename to src/afd/sprites/back/460--420--Abomasnow--Mega.png diff --git a/src/afd/sprites/back/Weavile.png b/src/afd/sprites/back/461--0--Weavile.png similarity index 100% rename from src/afd/sprites/back/Weavile.png rename to src/afd/sprites/back/461--0--Weavile.png diff --git a/src/afd/sprites/back/Magnezone.png b/src/afd/sprites/back/462--0--Magnezone.png similarity index 100% rename from src/afd/sprites/back/Magnezone.png rename to src/afd/sprites/back/462--0--Magnezone.png diff --git a/src/afd/sprites/back/Lickilicky.png b/src/afd/sprites/back/463--0--Lickilicky.png similarity index 100% rename from src/afd/sprites/back/Lickilicky.png rename to src/afd/sprites/back/463--0--Lickilicky.png diff --git a/src/afd/sprites/back/Rhyperior.png b/src/afd/sprites/back/464--0--Rhyperior.png similarity index 100% rename from src/afd/sprites/back/Rhyperior.png rename to src/afd/sprites/back/464--0--Rhyperior.png diff --git a/src/afd/sprites/back/Tangrowth.png b/src/afd/sprites/back/465--0--Tangrowth.png similarity index 100% rename from src/afd/sprites/back/Tangrowth.png rename to src/afd/sprites/back/465--0--Tangrowth.png diff --git a/src/afd/sprites/back/Electivire.png b/src/afd/sprites/back/466--0--Electivire.png similarity index 100% rename from src/afd/sprites/back/Electivire.png rename to src/afd/sprites/back/466--0--Electivire.png diff --git a/src/afd/sprites/back/Magmortar.png b/src/afd/sprites/back/467--0--Magmortar.png similarity index 100% rename from src/afd/sprites/back/Magmortar.png rename to src/afd/sprites/back/467--0--Magmortar.png diff --git a/src/afd/sprites/back/Togekiss.png b/src/afd/sprites/back/468--0--Togekiss.png similarity index 100% rename from src/afd/sprites/back/Togekiss.png rename to src/afd/sprites/back/468--0--Togekiss.png diff --git a/src/afd/sprites/back/Yanmega.png b/src/afd/sprites/back/469--0--Yanmega.png similarity index 100% rename from src/afd/sprites/back/Yanmega.png rename to src/afd/sprites/back/469--0--Yanmega.png diff --git a/src/afd/sprites/back/Parasect.png b/src/afd/sprites/back/47--0--Parasect.png similarity index 100% rename from src/afd/sprites/back/Parasect.png rename to src/afd/sprites/back/47--0--Parasect.png diff --git a/src/afd/sprites/back/Leafeon.png b/src/afd/sprites/back/470--0--Leafeon.png similarity index 100% rename from src/afd/sprites/back/Leafeon.png rename to src/afd/sprites/back/470--0--Leafeon.png diff --git a/src/afd/sprites/back/Glaceon.png b/src/afd/sprites/back/471--0--Glaceon.png similarity index 100% rename from src/afd/sprites/back/Glaceon.png rename to src/afd/sprites/back/471--0--Glaceon.png diff --git a/src/afd/sprites/back/Gliscor.png b/src/afd/sprites/back/472--0--Gliscor.png similarity index 100% rename from src/afd/sprites/back/Gliscor.png rename to src/afd/sprites/back/472--0--Gliscor.png diff --git a/src/afd/sprites/back/Mamoswine.png b/src/afd/sprites/back/473--0--Mamoswine.png similarity index 100% rename from src/afd/sprites/back/Mamoswine.png rename to src/afd/sprites/back/473--0--Mamoswine.png diff --git a/src/afd/sprites/back/Porygon-Z.png b/src/afd/sprites/back/474--0--Porygon-Z.png similarity index 100% rename from src/afd/sprites/back/Porygon-Z.png rename to src/afd/sprites/back/474--0--Porygon-Z.png diff --git a/src/afd/sprites/back/Gallade.png b/src/afd/sprites/back/475--0--Gallade.png similarity index 100% rename from src/afd/sprites/back/Gallade.png rename to src/afd/sprites/back/475--0--Gallade.png diff --git a/src/afd/sprites/back/Gallade--Mega.png b/src/afd/sprites/back/475--420--Gallade--Mega.png similarity index 100% rename from src/afd/sprites/back/Gallade--Mega.png rename to src/afd/sprites/back/475--420--Gallade--Mega.png diff --git a/src/afd/sprites/back/Probopass.png b/src/afd/sprites/back/476--0--Probopass.png similarity index 100% rename from src/afd/sprites/back/Probopass.png rename to src/afd/sprites/back/476--0--Probopass.png diff --git a/src/afd/sprites/back/Dusknoir.png b/src/afd/sprites/back/477--0--Dusknoir.png similarity index 100% rename from src/afd/sprites/back/Dusknoir.png rename to src/afd/sprites/back/477--0--Dusknoir.png diff --git a/src/afd/sprites/back/Froslass.png b/src/afd/sprites/back/478--0--Froslass.png similarity index 100% rename from src/afd/sprites/back/Froslass.png rename to src/afd/sprites/back/478--0--Froslass.png diff --git a/src/afd/sprites/back/Rotom.png b/src/afd/sprites/back/479--0--Rotom.png similarity index 100% rename from src/afd/sprites/back/Rotom.png rename to src/afd/sprites/back/479--0--Rotom.png diff --git a/src/afd/sprites/back/Rotom--Fan.png b/src/afd/sprites/back/479--420--Rotom--Fan.png similarity index 100% rename from src/afd/sprites/back/Rotom--Fan.png rename to src/afd/sprites/back/479--420--Rotom--Fan.png diff --git a/src/afd/sprites/back/Rotom--Frost.png b/src/afd/sprites/back/479--420--Rotom--Frost.png similarity index 100% rename from src/afd/sprites/back/Rotom--Frost.png rename to src/afd/sprites/back/479--420--Rotom--Frost.png diff --git a/src/afd/sprites/back/Rotom--Heat.png b/src/afd/sprites/back/479--420--Rotom--Heat.png similarity index 100% rename from src/afd/sprites/back/Rotom--Heat.png rename to src/afd/sprites/back/479--420--Rotom--Heat.png diff --git a/src/afd/sprites/back/Rotom--Mow.png b/src/afd/sprites/back/479--420--Rotom--Mow.png similarity index 100% rename from src/afd/sprites/back/Rotom--Mow.png rename to src/afd/sprites/back/479--420--Rotom--Mow.png diff --git a/src/afd/sprites/back/Rotom--Wash.png b/src/afd/sprites/back/479--420--Rotom--Wash.png similarity index 100% rename from src/afd/sprites/back/Rotom--Wash.png rename to src/afd/sprites/back/479--420--Rotom--Wash.png diff --git a/src/afd/sprites/back/Venonat.png b/src/afd/sprites/back/48--0--Venonat.png similarity index 100% rename from src/afd/sprites/back/Venonat.png rename to src/afd/sprites/back/48--0--Venonat.png diff --git a/src/afd/sprites/back/Uxie.png b/src/afd/sprites/back/480--0--Uxie.png similarity index 100% rename from src/afd/sprites/back/Uxie.png rename to src/afd/sprites/back/480--0--Uxie.png diff --git a/src/afd/sprites/back/Mesprit.png b/src/afd/sprites/back/481--0--Mesprit.png similarity index 100% rename from src/afd/sprites/back/Mesprit.png rename to src/afd/sprites/back/481--0--Mesprit.png diff --git a/src/afd/sprites/back/Azelf.png b/src/afd/sprites/back/482--0--Azelf.png similarity index 100% rename from src/afd/sprites/back/Azelf.png rename to src/afd/sprites/back/482--0--Azelf.png diff --git a/src/afd/sprites/back/Dialga.png b/src/afd/sprites/back/483--0--Dialga.png similarity index 100% rename from src/afd/sprites/back/Dialga.png rename to src/afd/sprites/back/483--0--Dialga.png diff --git a/src/afd/sprites/back/Palkia.png b/src/afd/sprites/back/484--0--Palkia.png similarity index 100% rename from src/afd/sprites/back/Palkia.png rename to src/afd/sprites/back/484--0--Palkia.png diff --git a/src/afd/sprites/back/Heatran.png b/src/afd/sprites/back/485--0--Heatran.png similarity index 100% rename from src/afd/sprites/back/Heatran.png rename to src/afd/sprites/back/485--0--Heatran.png diff --git a/src/afd/sprites/back/Regigigas.png b/src/afd/sprites/back/486--0--Regigigas.png similarity index 100% rename from src/afd/sprites/back/Regigigas.png rename to src/afd/sprites/back/486--0--Regigigas.png diff --git a/src/afd/sprites/back/Giratina.png b/src/afd/sprites/back/487--0--Giratina.png similarity index 100% rename from src/afd/sprites/back/Giratina.png rename to src/afd/sprites/back/487--0--Giratina.png diff --git a/src/afd/sprites/back/Giratina--Origin.png b/src/afd/sprites/back/487--420--Giratina--Origin.png similarity index 100% rename from src/afd/sprites/back/Giratina--Origin.png rename to src/afd/sprites/back/487--420--Giratina--Origin.png diff --git a/src/afd/sprites/back/Cresselia.png b/src/afd/sprites/back/488--0--Cresselia.png similarity index 100% rename from src/afd/sprites/back/Cresselia.png rename to src/afd/sprites/back/488--0--Cresselia.png diff --git a/src/afd/sprites/back/Phione.png b/src/afd/sprites/back/489--0--Phione.png similarity index 100% rename from src/afd/sprites/back/Phione.png rename to src/afd/sprites/back/489--0--Phione.png diff --git a/src/afd/sprites/back/Venomoth.png b/src/afd/sprites/back/49--0--Venomoth.png similarity index 100% rename from src/afd/sprites/back/Venomoth.png rename to src/afd/sprites/back/49--0--Venomoth.png diff --git a/src/afd/sprites/back/Manaphy.png b/src/afd/sprites/back/490--0--Manaphy.png similarity index 100% rename from src/afd/sprites/back/Manaphy.png rename to src/afd/sprites/back/490--0--Manaphy.png diff --git a/src/afd/sprites/back/Darkrai.png b/src/afd/sprites/back/491--0--Darkrai.png similarity index 100% rename from src/afd/sprites/back/Darkrai.png rename to src/afd/sprites/back/491--0--Darkrai.png diff --git a/src/afd/sprites/back/Shaymin.png b/src/afd/sprites/back/492--0--Shaymin.png similarity index 100% rename from src/afd/sprites/back/Shaymin.png rename to src/afd/sprites/back/492--0--Shaymin.png diff --git a/src/afd/sprites/back/Shaymin--Sky.png b/src/afd/sprites/back/492--420--Shaymin--Sky.png similarity index 100% rename from src/afd/sprites/back/Shaymin--Sky.png rename to src/afd/sprites/back/492--420--Shaymin--Sky.png diff --git a/src/afd/sprites/back/Arceus.png b/src/afd/sprites/back/493--0--Arceus.png similarity index 100% rename from src/afd/sprites/back/Arceus.png rename to src/afd/sprites/back/493--0--Arceus.png diff --git a/src/afd/sprites/back/Arceus--Bug.png b/src/afd/sprites/back/493--420--Arceus--Bug.png similarity index 100% rename from src/afd/sprites/back/Arceus--Bug.png rename to src/afd/sprites/back/493--420--Arceus--Bug.png diff --git a/src/afd/sprites/back/Arceus--Dark.png b/src/afd/sprites/back/493--420--Arceus--Dark.png similarity index 100% rename from src/afd/sprites/back/Arceus--Dark.png rename to src/afd/sprites/back/493--420--Arceus--Dark.png diff --git a/src/afd/sprites/back/Arceus--Dragon.png b/src/afd/sprites/back/493--420--Arceus--Dragon.png similarity index 100% rename from src/afd/sprites/back/Arceus--Dragon.png rename to src/afd/sprites/back/493--420--Arceus--Dragon.png diff --git a/src/afd/sprites/back/Arceus--Electric.png b/src/afd/sprites/back/493--420--Arceus--Electric.png similarity index 100% rename from src/afd/sprites/back/Arceus--Electric.png rename to src/afd/sprites/back/493--420--Arceus--Electric.png diff --git a/src/afd/sprites/back/Arceus--Fairy.png b/src/afd/sprites/back/493--420--Arceus--Fairy.png similarity index 100% rename from src/afd/sprites/back/Arceus--Fairy.png rename to src/afd/sprites/back/493--420--Arceus--Fairy.png diff --git a/src/afd/sprites/back/Arceus--Fighting.png b/src/afd/sprites/back/493--420--Arceus--Fighting.png similarity index 100% rename from src/afd/sprites/back/Arceus--Fighting.png rename to src/afd/sprites/back/493--420--Arceus--Fighting.png diff --git a/src/afd/sprites/back/Arceus--Fire.png b/src/afd/sprites/back/493--420--Arceus--Fire.png similarity index 100% rename from src/afd/sprites/back/Arceus--Fire.png rename to src/afd/sprites/back/493--420--Arceus--Fire.png diff --git a/src/afd/sprites/back/Arceus--Flying.png b/src/afd/sprites/back/493--420--Arceus--Flying.png similarity index 100% rename from src/afd/sprites/back/Arceus--Flying.png rename to src/afd/sprites/back/493--420--Arceus--Flying.png diff --git a/src/afd/sprites/back/Arceus--Ghost.png b/src/afd/sprites/back/493--420--Arceus--Ghost.png similarity index 100% rename from src/afd/sprites/back/Arceus--Ghost.png rename to src/afd/sprites/back/493--420--Arceus--Ghost.png diff --git a/src/afd/sprites/back/Arceus--Grass.png b/src/afd/sprites/back/493--420--Arceus--Grass.png similarity index 100% rename from src/afd/sprites/back/Arceus--Grass.png rename to src/afd/sprites/back/493--420--Arceus--Grass.png diff --git a/src/afd/sprites/back/Arceus--Ground.png b/src/afd/sprites/back/493--420--Arceus--Ground.png similarity index 100% rename from src/afd/sprites/back/Arceus--Ground.png rename to src/afd/sprites/back/493--420--Arceus--Ground.png diff --git a/src/afd/sprites/back/Arceus--Ice.png b/src/afd/sprites/back/493--420--Arceus--Ice.png similarity index 100% rename from src/afd/sprites/back/Arceus--Ice.png rename to src/afd/sprites/back/493--420--Arceus--Ice.png diff --git a/src/afd/sprites/back/Arceus--Poison.png b/src/afd/sprites/back/493--420--Arceus--Poison.png similarity index 100% rename from src/afd/sprites/back/Arceus--Poison.png rename to src/afd/sprites/back/493--420--Arceus--Poison.png diff --git a/src/afd/sprites/back/Arceus--Psychic.png b/src/afd/sprites/back/493--420--Arceus--Psychic.png similarity index 100% rename from src/afd/sprites/back/Arceus--Psychic.png rename to src/afd/sprites/back/493--420--Arceus--Psychic.png diff --git a/src/afd/sprites/back/Arceus--Rock.png b/src/afd/sprites/back/493--420--Arceus--Rock.png similarity index 100% rename from src/afd/sprites/back/Arceus--Rock.png rename to src/afd/sprites/back/493--420--Arceus--Rock.png diff --git a/src/afd/sprites/back/Arceus--Steel.png b/src/afd/sprites/back/493--420--Arceus--Steel.png similarity index 100% rename from src/afd/sprites/back/Arceus--Steel.png rename to src/afd/sprites/back/493--420--Arceus--Steel.png diff --git a/src/afd/sprites/back/Arceus--Water.png b/src/afd/sprites/back/493--420--Arceus--Water.png similarity index 100% rename from src/afd/sprites/back/Arceus--Water.png rename to src/afd/sprites/back/493--420--Arceus--Water.png diff --git a/src/afd/sprites/back/Victini.png b/src/afd/sprites/back/494--0--Victini.png similarity index 100% rename from src/afd/sprites/back/Victini.png rename to src/afd/sprites/back/494--0--Victini.png diff --git a/src/afd/sprites/back/Snivy.png b/src/afd/sprites/back/495--0--Snivy.png similarity index 100% rename from src/afd/sprites/back/Snivy.png rename to src/afd/sprites/back/495--0--Snivy.png diff --git a/src/afd/sprites/back/Servine.png b/src/afd/sprites/back/496--0--Servine.png similarity index 100% rename from src/afd/sprites/back/Servine.png rename to src/afd/sprites/back/496--0--Servine.png diff --git a/src/afd/sprites/back/Serperior.png b/src/afd/sprites/back/497--0--Serperior.png similarity index 100% rename from src/afd/sprites/back/Serperior.png rename to src/afd/sprites/back/497--0--Serperior.png diff --git a/src/afd/sprites/back/Tepig.png b/src/afd/sprites/back/498--0--Tepig.png similarity index 100% rename from src/afd/sprites/back/Tepig.png rename to src/afd/sprites/back/498--0--Tepig.png diff --git a/src/afd/sprites/back/Pignite.png b/src/afd/sprites/back/499--0--Pignite.png similarity index 100% rename from src/afd/sprites/back/Pignite.png rename to src/afd/sprites/back/499--0--Pignite.png diff --git a/src/afd/sprites/back/Charmeleon.png b/src/afd/sprites/back/5--0--Charmeleon.png similarity index 100% rename from src/afd/sprites/back/Charmeleon.png rename to src/afd/sprites/back/5--0--Charmeleon.png diff --git a/src/afd/sprites/back/Diglett.png b/src/afd/sprites/back/50--0--Diglett.png similarity index 100% rename from src/afd/sprites/back/Diglett.png rename to src/afd/sprites/back/50--0--Diglett.png diff --git a/src/afd/sprites/back/Diglett--Alola.png b/src/afd/sprites/back/50--420--Diglett--Alola.png similarity index 100% rename from src/afd/sprites/back/Diglett--Alola.png rename to src/afd/sprites/back/50--420--Diglett--Alola.png diff --git a/src/afd/sprites/back/Emboar.png b/src/afd/sprites/back/500--0--Emboar.png similarity index 100% rename from src/afd/sprites/back/Emboar.png rename to src/afd/sprites/back/500--0--Emboar.png diff --git a/src/afd/sprites/back/Oshawott.png b/src/afd/sprites/back/501--0--Oshawott.png similarity index 100% rename from src/afd/sprites/back/Oshawott.png rename to src/afd/sprites/back/501--0--Oshawott.png diff --git a/src/afd/sprites/back/Dewott.png b/src/afd/sprites/back/502--0--Dewott.png similarity index 100% rename from src/afd/sprites/back/Dewott.png rename to src/afd/sprites/back/502--0--Dewott.png diff --git a/src/afd/sprites/back/Samurott.png b/src/afd/sprites/back/503--0--Samurott.png similarity index 100% rename from src/afd/sprites/back/Samurott.png rename to src/afd/sprites/back/503--0--Samurott.png diff --git a/src/afd/sprites/back/Patrat.png b/src/afd/sprites/back/504--0--Patrat.png similarity index 100% rename from src/afd/sprites/back/Patrat.png rename to src/afd/sprites/back/504--0--Patrat.png diff --git a/src/afd/sprites/back/Watchog.png b/src/afd/sprites/back/505--0--Watchog.png similarity index 100% rename from src/afd/sprites/back/Watchog.png rename to src/afd/sprites/back/505--0--Watchog.png diff --git a/src/afd/sprites/back/Lillipup.png b/src/afd/sprites/back/506--0--Lillipup.png similarity index 100% rename from src/afd/sprites/back/Lillipup.png rename to src/afd/sprites/back/506--0--Lillipup.png diff --git a/src/afd/sprites/back/Herdier.png b/src/afd/sprites/back/507--0--Herdier.png similarity index 100% rename from src/afd/sprites/back/Herdier.png rename to src/afd/sprites/back/507--0--Herdier.png diff --git a/src/afd/sprites/back/Stoutland.png b/src/afd/sprites/back/508--0--Stoutland.png similarity index 100% rename from src/afd/sprites/back/Stoutland.png rename to src/afd/sprites/back/508--0--Stoutland.png diff --git a/src/afd/sprites/back/Purrloin.png b/src/afd/sprites/back/509--0--Purrloin.png similarity index 100% rename from src/afd/sprites/back/Purrloin.png rename to src/afd/sprites/back/509--0--Purrloin.png diff --git a/src/afd/sprites/back/Dugtrio.png b/src/afd/sprites/back/51--0--Dugtrio.png similarity index 100% rename from src/afd/sprites/back/Dugtrio.png rename to src/afd/sprites/back/51--0--Dugtrio.png diff --git a/src/afd/sprites/back/Dugtrio--Alola.png b/src/afd/sprites/back/51--420--Dugtrio--Alola.png similarity index 100% rename from src/afd/sprites/back/Dugtrio--Alola.png rename to src/afd/sprites/back/51--420--Dugtrio--Alola.png diff --git a/src/afd/sprites/back/Liepard.png b/src/afd/sprites/back/510--0--Liepard.png similarity index 100% rename from src/afd/sprites/back/Liepard.png rename to src/afd/sprites/back/510--0--Liepard.png diff --git a/src/afd/sprites/back/Pansage.png b/src/afd/sprites/back/511--0--Pansage.png similarity index 100% rename from src/afd/sprites/back/Pansage.png rename to src/afd/sprites/back/511--0--Pansage.png diff --git a/src/afd/sprites/back/Simisage.png b/src/afd/sprites/back/512--0--Simisage.png similarity index 100% rename from src/afd/sprites/back/Simisage.png rename to src/afd/sprites/back/512--0--Simisage.png diff --git a/src/afd/sprites/back/Pansear.png b/src/afd/sprites/back/513--0--Pansear.png similarity index 100% rename from src/afd/sprites/back/Pansear.png rename to src/afd/sprites/back/513--0--Pansear.png diff --git a/src/afd/sprites/back/Simisear.png b/src/afd/sprites/back/514--0--Simisear.png similarity index 100% rename from src/afd/sprites/back/Simisear.png rename to src/afd/sprites/back/514--0--Simisear.png diff --git a/src/afd/sprites/back/Panpour.png b/src/afd/sprites/back/515--0--Panpour.png similarity index 100% rename from src/afd/sprites/back/Panpour.png rename to src/afd/sprites/back/515--0--Panpour.png diff --git a/src/afd/sprites/back/Simipour.png b/src/afd/sprites/back/516--0--Simipour.png similarity index 100% rename from src/afd/sprites/back/Simipour.png rename to src/afd/sprites/back/516--0--Simipour.png diff --git a/src/afd/sprites/back/Munna.png b/src/afd/sprites/back/517--0--Munna.png similarity index 100% rename from src/afd/sprites/back/Munna.png rename to src/afd/sprites/back/517--0--Munna.png diff --git a/src/afd/sprites/back/Musharna.png b/src/afd/sprites/back/518--0--Musharna.png similarity index 100% rename from src/afd/sprites/back/Musharna.png rename to src/afd/sprites/back/518--0--Musharna.png diff --git a/src/afd/sprites/back/Pidove.png b/src/afd/sprites/back/519--0--Pidove.png similarity index 100% rename from src/afd/sprites/back/Pidove.png rename to src/afd/sprites/back/519--0--Pidove.png diff --git a/src/afd/sprites/back/Meowth.png b/src/afd/sprites/back/52--0--Meowth.png similarity index 100% rename from src/afd/sprites/back/Meowth.png rename to src/afd/sprites/back/52--0--Meowth.png diff --git a/src/afd/sprites/back/Meowth--Alola.png b/src/afd/sprites/back/52--420--Meowth--Alola.png similarity index 100% rename from src/afd/sprites/back/Meowth--Alola.png rename to src/afd/sprites/back/52--420--Meowth--Alola.png diff --git a/src/afd/sprites/back/Meowth--Galar.png b/src/afd/sprites/back/52--420--Meowth--Galar.png similarity index 100% rename from src/afd/sprites/back/Meowth--Galar.png rename to src/afd/sprites/back/52--420--Meowth--Galar.png diff --git a/src/afd/sprites/back/Meowth--Gmax.png b/src/afd/sprites/back/52--420--Meowth--Gmax.png similarity index 100% rename from src/afd/sprites/back/Meowth--Gmax.png rename to src/afd/sprites/back/52--420--Meowth--Gmax.png diff --git a/src/afd/sprites/back/Tranquill.png b/src/afd/sprites/back/520--0--Tranquill.png similarity index 100% rename from src/afd/sprites/back/Tranquill.png rename to src/afd/sprites/back/520--0--Tranquill.png diff --git a/src/afd/sprites/back/Unfezant.png b/src/afd/sprites/back/521--0--Unfezant.png similarity index 100% rename from src/afd/sprites/back/Unfezant.png rename to src/afd/sprites/back/521--0--Unfezant.png diff --git a/src/afd/sprites/back/Blitzle.png b/src/afd/sprites/back/522--0--Blitzle.png similarity index 100% rename from src/afd/sprites/back/Blitzle.png rename to src/afd/sprites/back/522--0--Blitzle.png diff --git a/src/afd/sprites/back/Zebstrika.png b/src/afd/sprites/back/523--0--Zebstrika.png similarity index 100% rename from src/afd/sprites/back/Zebstrika.png rename to src/afd/sprites/back/523--0--Zebstrika.png diff --git a/src/afd/sprites/back/Roggenrola.png b/src/afd/sprites/back/524--0--Roggenrola.png similarity index 100% rename from src/afd/sprites/back/Roggenrola.png rename to src/afd/sprites/back/524--0--Roggenrola.png diff --git a/src/afd/sprites/back/Boldore.png b/src/afd/sprites/back/525--0--Boldore.png similarity index 100% rename from src/afd/sprites/back/Boldore.png rename to src/afd/sprites/back/525--0--Boldore.png diff --git a/src/afd/sprites/back/Gigalith.png b/src/afd/sprites/back/526--0--Gigalith.png similarity index 100% rename from src/afd/sprites/back/Gigalith.png rename to src/afd/sprites/back/526--0--Gigalith.png diff --git a/src/afd/sprites/back/Woobat.png b/src/afd/sprites/back/527--0--Woobat.png similarity index 100% rename from src/afd/sprites/back/Woobat.png rename to src/afd/sprites/back/527--0--Woobat.png diff --git a/src/afd/sprites/back/Swoobat.png b/src/afd/sprites/back/528--0--Swoobat.png similarity index 100% rename from src/afd/sprites/back/Swoobat.png rename to src/afd/sprites/back/528--0--Swoobat.png diff --git a/src/afd/sprites/back/Drilbur.png b/src/afd/sprites/back/529--0--Drilbur.png similarity index 100% rename from src/afd/sprites/back/Drilbur.png rename to src/afd/sprites/back/529--0--Drilbur.png diff --git a/src/afd/sprites/back/Persian.png b/src/afd/sprites/back/53--0--Persian.png similarity index 100% rename from src/afd/sprites/back/Persian.png rename to src/afd/sprites/back/53--0--Persian.png diff --git a/src/afd/sprites/back/Persian--Alola.png b/src/afd/sprites/back/53--420--Persian--Alola.png similarity index 100% rename from src/afd/sprites/back/Persian--Alola.png rename to src/afd/sprites/back/53--420--Persian--Alola.png diff --git a/src/afd/sprites/back/Excadrill.png b/src/afd/sprites/back/530--0--Excadrill.png similarity index 100% rename from src/afd/sprites/back/Excadrill.png rename to src/afd/sprites/back/530--0--Excadrill.png diff --git a/src/afd/sprites/back/Audino.png b/src/afd/sprites/back/531--0--Audino.png similarity index 100% rename from src/afd/sprites/back/Audino.png rename to src/afd/sprites/back/531--0--Audino.png diff --git a/src/afd/sprites/back/Audino--Mega.png b/src/afd/sprites/back/531--420--Audino--Mega.png similarity index 100% rename from src/afd/sprites/back/Audino--Mega.png rename to src/afd/sprites/back/531--420--Audino--Mega.png diff --git a/src/afd/sprites/back/Timburr.png b/src/afd/sprites/back/532--0--Timburr.png similarity index 100% rename from src/afd/sprites/back/Timburr.png rename to src/afd/sprites/back/532--0--Timburr.png diff --git a/src/afd/sprites/back/Gurdurr.png b/src/afd/sprites/back/533--0--Gurdurr.png similarity index 100% rename from src/afd/sprites/back/Gurdurr.png rename to src/afd/sprites/back/533--0--Gurdurr.png diff --git a/src/afd/sprites/back/Conkeldurr.png b/src/afd/sprites/back/534--0--Conkeldurr.png similarity index 100% rename from src/afd/sprites/back/Conkeldurr.png rename to src/afd/sprites/back/534--0--Conkeldurr.png diff --git a/src/afd/sprites/back/Tympole.png b/src/afd/sprites/back/535--0--Tympole.png similarity index 100% rename from src/afd/sprites/back/Tympole.png rename to src/afd/sprites/back/535--0--Tympole.png diff --git a/src/afd/sprites/back/Palpitoad.png b/src/afd/sprites/back/536--0--Palpitoad.png similarity index 100% rename from src/afd/sprites/back/Palpitoad.png rename to src/afd/sprites/back/536--0--Palpitoad.png diff --git a/src/afd/sprites/back/Seismitoad.png b/src/afd/sprites/back/537--0--Seismitoad.png similarity index 100% rename from src/afd/sprites/back/Seismitoad.png rename to src/afd/sprites/back/537--0--Seismitoad.png diff --git a/src/afd/sprites/back/Throh.png b/src/afd/sprites/back/538--0--Throh.png similarity index 100% rename from src/afd/sprites/back/Throh.png rename to src/afd/sprites/back/538--0--Throh.png diff --git a/src/afd/sprites/back/Sawk.png b/src/afd/sprites/back/539--0--Sawk.png similarity index 100% rename from src/afd/sprites/back/Sawk.png rename to src/afd/sprites/back/539--0--Sawk.png diff --git a/src/afd/sprites/back/Psyduck.png b/src/afd/sprites/back/54--0--Psyduck.png similarity index 100% rename from src/afd/sprites/back/Psyduck.png rename to src/afd/sprites/back/54--0--Psyduck.png diff --git a/src/afd/sprites/back/Sewaddle.png b/src/afd/sprites/back/540--0--Sewaddle.png similarity index 100% rename from src/afd/sprites/back/Sewaddle.png rename to src/afd/sprites/back/540--0--Sewaddle.png diff --git a/src/afd/sprites/back/Swadloon.png b/src/afd/sprites/back/541--0--Swadloon.png similarity index 100% rename from src/afd/sprites/back/Swadloon.png rename to src/afd/sprites/back/541--0--Swadloon.png diff --git a/src/afd/sprites/back/Leavanny.png b/src/afd/sprites/back/542--0--Leavanny.png similarity index 100% rename from src/afd/sprites/back/Leavanny.png rename to src/afd/sprites/back/542--0--Leavanny.png diff --git a/src/afd/sprites/back/Venipede.png b/src/afd/sprites/back/543--0--Venipede.png similarity index 100% rename from src/afd/sprites/back/Venipede.png rename to src/afd/sprites/back/543--0--Venipede.png diff --git a/src/afd/sprites/back/Whirlipede.png b/src/afd/sprites/back/544--0--Whirlipede.png similarity index 100% rename from src/afd/sprites/back/Whirlipede.png rename to src/afd/sprites/back/544--0--Whirlipede.png diff --git a/src/afd/sprites/back/Scolipede.png b/src/afd/sprites/back/545--0--Scolipede.png similarity index 100% rename from src/afd/sprites/back/Scolipede.png rename to src/afd/sprites/back/545--0--Scolipede.png diff --git a/src/afd/sprites/back/Cottonee.png b/src/afd/sprites/back/546--0--Cottonee.png similarity index 100% rename from src/afd/sprites/back/Cottonee.png rename to src/afd/sprites/back/546--0--Cottonee.png diff --git a/src/afd/sprites/back/Whimsicott.png b/src/afd/sprites/back/547--0--Whimsicott.png similarity index 100% rename from src/afd/sprites/back/Whimsicott.png rename to src/afd/sprites/back/547--0--Whimsicott.png diff --git a/src/afd/sprites/back/Petilil.png b/src/afd/sprites/back/548--0--Petilil.png similarity index 100% rename from src/afd/sprites/back/Petilil.png rename to src/afd/sprites/back/548--0--Petilil.png diff --git a/src/afd/sprites/back/Lilligant.png b/src/afd/sprites/back/549--0--Lilligant.png similarity index 100% rename from src/afd/sprites/back/Lilligant.png rename to src/afd/sprites/back/549--0--Lilligant.png diff --git a/src/afd/sprites/back/Golduck.png b/src/afd/sprites/back/55--0--Golduck.png similarity index 100% rename from src/afd/sprites/back/Golduck.png rename to src/afd/sprites/back/55--0--Golduck.png diff --git a/src/afd/sprites/back/Basculin.png b/src/afd/sprites/back/550--0--Basculin.png similarity index 100% rename from src/afd/sprites/back/Basculin.png rename to src/afd/sprites/back/550--0--Basculin.png diff --git a/src/afd/sprites/back/Basculin--Blue-Striped.png b/src/afd/sprites/back/550--420--Basculin--Blue-Striped.png similarity index 100% rename from src/afd/sprites/back/Basculin--Blue-Striped.png rename to src/afd/sprites/back/550--420--Basculin--Blue-Striped.png diff --git a/src/afd/sprites/back/Sandile.png b/src/afd/sprites/back/551--0--Sandile.png similarity index 100% rename from src/afd/sprites/back/Sandile.png rename to src/afd/sprites/back/551--0--Sandile.png diff --git a/src/afd/sprites/back/Krokorok.png b/src/afd/sprites/back/552--0--Krokorok.png similarity index 100% rename from src/afd/sprites/back/Krokorok.png rename to src/afd/sprites/back/552--0--Krokorok.png diff --git a/src/afd/sprites/back/Krookodile.png b/src/afd/sprites/back/553--0--Krookodile.png similarity index 100% rename from src/afd/sprites/back/Krookodile.png rename to src/afd/sprites/back/553--0--Krookodile.png diff --git a/src/afd/sprites/back/Darumaka.png b/src/afd/sprites/back/554--0--Darumaka.png similarity index 100% rename from src/afd/sprites/back/Darumaka.png rename to src/afd/sprites/back/554--0--Darumaka.png diff --git a/src/afd/sprites/back/Darumaka--Galar.png b/src/afd/sprites/back/554--420--Darumaka--Galar.png similarity index 100% rename from src/afd/sprites/back/Darumaka--Galar.png rename to src/afd/sprites/back/554--420--Darumaka--Galar.png diff --git a/src/afd/sprites/back/Darmanitan.png b/src/afd/sprites/back/555--0--Darmanitan.png similarity index 100% rename from src/afd/sprites/back/Darmanitan.png rename to src/afd/sprites/back/555--0--Darmanitan.png diff --git a/src/afd/sprites/back/Darmanitan--Galar-Zen.png b/src/afd/sprites/back/555--420--Darmanitan--Galar-Zen.png similarity index 100% rename from src/afd/sprites/back/Darmanitan--Galar-Zen.png rename to src/afd/sprites/back/555--420--Darmanitan--Galar-Zen.png diff --git a/src/afd/sprites/back/Darmanitan--Galar.png b/src/afd/sprites/back/555--420--Darmanitan--Galar.png similarity index 100% rename from src/afd/sprites/back/Darmanitan--Galar.png rename to src/afd/sprites/back/555--420--Darmanitan--Galar.png diff --git a/src/afd/sprites/back/Darmanitan--Zen.png b/src/afd/sprites/back/555--420--Darmanitan--Zen.png similarity index 100% rename from src/afd/sprites/back/Darmanitan--Zen.png rename to src/afd/sprites/back/555--420--Darmanitan--Zen.png diff --git a/src/afd/sprites/back/Maractus.png b/src/afd/sprites/back/556--0--Maractus.png similarity index 100% rename from src/afd/sprites/back/Maractus.png rename to src/afd/sprites/back/556--0--Maractus.png diff --git a/src/afd/sprites/back/Dwebble.png b/src/afd/sprites/back/557--0--Dwebble.png similarity index 100% rename from src/afd/sprites/back/Dwebble.png rename to src/afd/sprites/back/557--0--Dwebble.png diff --git a/src/afd/sprites/back/Crustle.png b/src/afd/sprites/back/558--0--Crustle.png similarity index 100% rename from src/afd/sprites/back/Crustle.png rename to src/afd/sprites/back/558--0--Crustle.png diff --git a/src/afd/sprites/back/Scraggy.png b/src/afd/sprites/back/559--0--Scraggy.png similarity index 100% rename from src/afd/sprites/back/Scraggy.png rename to src/afd/sprites/back/559--0--Scraggy.png diff --git a/src/afd/sprites/back/Mankey.png b/src/afd/sprites/back/56--0--Mankey.png similarity index 100% rename from src/afd/sprites/back/Mankey.png rename to src/afd/sprites/back/56--0--Mankey.png diff --git a/src/afd/sprites/back/Scrafty.png b/src/afd/sprites/back/560--0--Scrafty.png similarity index 100% rename from src/afd/sprites/back/Scrafty.png rename to src/afd/sprites/back/560--0--Scrafty.png diff --git a/src/afd/sprites/back/Sigilyph.png b/src/afd/sprites/back/561--0--Sigilyph.png similarity index 100% rename from src/afd/sprites/back/Sigilyph.png rename to src/afd/sprites/back/561--0--Sigilyph.png diff --git a/src/afd/sprites/back/Yamask.png b/src/afd/sprites/back/562--0--Yamask.png similarity index 100% rename from src/afd/sprites/back/Yamask.png rename to src/afd/sprites/back/562--0--Yamask.png diff --git a/src/afd/sprites/back/Yamask--Galar.png b/src/afd/sprites/back/562--420--Yamask--Galar.png similarity index 100% rename from src/afd/sprites/back/Yamask--Galar.png rename to src/afd/sprites/back/562--420--Yamask--Galar.png diff --git a/src/afd/sprites/back/Cofagrigus.png b/src/afd/sprites/back/563--0--Cofagrigus.png similarity index 100% rename from src/afd/sprites/back/Cofagrigus.png rename to src/afd/sprites/back/563--0--Cofagrigus.png diff --git a/src/afd/sprites/back/Tirtouga.png b/src/afd/sprites/back/564--0--Tirtouga.png similarity index 100% rename from src/afd/sprites/back/Tirtouga.png rename to src/afd/sprites/back/564--0--Tirtouga.png diff --git a/src/afd/sprites/back/Carracosta.png b/src/afd/sprites/back/565--0--Carracosta.png similarity index 100% rename from src/afd/sprites/back/Carracosta.png rename to src/afd/sprites/back/565--0--Carracosta.png diff --git a/src/afd/sprites/back/Archen.png b/src/afd/sprites/back/566--0--Archen.png similarity index 100% rename from src/afd/sprites/back/Archen.png rename to src/afd/sprites/back/566--0--Archen.png diff --git a/src/afd/sprites/back/Archeops.png b/src/afd/sprites/back/567--0--Archeops.png similarity index 100% rename from src/afd/sprites/back/Archeops.png rename to src/afd/sprites/back/567--0--Archeops.png diff --git a/src/afd/sprites/back/Trubbish.png b/src/afd/sprites/back/568--0--Trubbish.png similarity index 100% rename from src/afd/sprites/back/Trubbish.png rename to src/afd/sprites/back/568--0--Trubbish.png diff --git a/src/afd/sprites/back/Garbodor.png b/src/afd/sprites/back/569--0--Garbodor.png similarity index 100% rename from src/afd/sprites/back/Garbodor.png rename to src/afd/sprites/back/569--0--Garbodor.png diff --git a/src/afd/sprites/back/Garbodor--Gmax.png b/src/afd/sprites/back/569--420--Garbodor--Gmax.png similarity index 100% rename from src/afd/sprites/back/Garbodor--Gmax.png rename to src/afd/sprites/back/569--420--Garbodor--Gmax.png diff --git a/src/afd/sprites/back/Primeape.png b/src/afd/sprites/back/57--0--Primeape.png similarity index 100% rename from src/afd/sprites/back/Primeape.png rename to src/afd/sprites/back/57--0--Primeape.png diff --git a/src/afd/sprites/back/Zorua.png b/src/afd/sprites/back/570--0--Zorua.png similarity index 100% rename from src/afd/sprites/back/Zorua.png rename to src/afd/sprites/back/570--0--Zorua.png diff --git a/src/afd/sprites/back/Zoroark.png b/src/afd/sprites/back/571--0--Zoroark.png similarity index 100% rename from src/afd/sprites/back/Zoroark.png rename to src/afd/sprites/back/571--0--Zoroark.png diff --git a/src/afd/sprites/back/Minccino.png b/src/afd/sprites/back/572--0--Minccino.png similarity index 100% rename from src/afd/sprites/back/Minccino.png rename to src/afd/sprites/back/572--0--Minccino.png diff --git a/src/afd/sprites/back/Cinccino.png b/src/afd/sprites/back/573--0--Cinccino.png similarity index 100% rename from src/afd/sprites/back/Cinccino.png rename to src/afd/sprites/back/573--0--Cinccino.png diff --git a/src/afd/sprites/back/Gothita.png b/src/afd/sprites/back/574--0--Gothita.png similarity index 100% rename from src/afd/sprites/back/Gothita.png rename to src/afd/sprites/back/574--0--Gothita.png diff --git a/src/afd/sprites/back/Gothorita.png b/src/afd/sprites/back/575--0--Gothorita.png similarity index 100% rename from src/afd/sprites/back/Gothorita.png rename to src/afd/sprites/back/575--0--Gothorita.png diff --git a/src/afd/sprites/back/Gothitelle.png b/src/afd/sprites/back/576--0--Gothitelle.png similarity index 100% rename from src/afd/sprites/back/Gothitelle.png rename to src/afd/sprites/back/576--0--Gothitelle.png diff --git a/src/afd/sprites/back/Solosis.png b/src/afd/sprites/back/577--0--Solosis.png similarity index 100% rename from src/afd/sprites/back/Solosis.png rename to src/afd/sprites/back/577--0--Solosis.png diff --git a/src/afd/sprites/back/Duosion.png b/src/afd/sprites/back/578--0--Duosion.png similarity index 100% rename from src/afd/sprites/back/Duosion.png rename to src/afd/sprites/back/578--0--Duosion.png diff --git a/src/afd/sprites/back/Reuniclus.png b/src/afd/sprites/back/579--0--Reuniclus.png similarity index 100% rename from src/afd/sprites/back/Reuniclus.png rename to src/afd/sprites/back/579--0--Reuniclus.png diff --git a/src/afd/sprites/back/Growlithe.png b/src/afd/sprites/back/58--0--Growlithe.png similarity index 100% rename from src/afd/sprites/back/Growlithe.png rename to src/afd/sprites/back/58--0--Growlithe.png diff --git a/src/afd/sprites/back/Ducklett.png b/src/afd/sprites/back/580--0--Ducklett.png similarity index 100% rename from src/afd/sprites/back/Ducklett.png rename to src/afd/sprites/back/580--0--Ducklett.png diff --git a/src/afd/sprites/back/Swanna.png b/src/afd/sprites/back/581--0--Swanna.png similarity index 100% rename from src/afd/sprites/back/Swanna.png rename to src/afd/sprites/back/581--0--Swanna.png diff --git a/src/afd/sprites/back/Vanillite.png b/src/afd/sprites/back/582--0--Vanillite.png similarity index 100% rename from src/afd/sprites/back/Vanillite.png rename to src/afd/sprites/back/582--0--Vanillite.png diff --git a/src/afd/sprites/back/Vanillish.png b/src/afd/sprites/back/583--0--Vanillish.png similarity index 100% rename from src/afd/sprites/back/Vanillish.png rename to src/afd/sprites/back/583--0--Vanillish.png diff --git a/src/afd/sprites/back/Vanilluxe.png b/src/afd/sprites/back/584--0--Vanilluxe.png similarity index 100% rename from src/afd/sprites/back/Vanilluxe.png rename to src/afd/sprites/back/584--0--Vanilluxe.png diff --git a/src/afd/sprites/back/Deerling.png b/src/afd/sprites/back/585--0--Deerling.png similarity index 100% rename from src/afd/sprites/back/Deerling.png rename to src/afd/sprites/back/585--0--Deerling.png diff --git a/src/afd/sprites/back/Sawsbuck.png b/src/afd/sprites/back/586--0--Sawsbuck.png similarity index 100% rename from src/afd/sprites/back/Sawsbuck.png rename to src/afd/sprites/back/586--0--Sawsbuck.png diff --git a/src/afd/sprites/back/Emolga.png b/src/afd/sprites/back/587--0--Emolga.png similarity index 100% rename from src/afd/sprites/back/Emolga.png rename to src/afd/sprites/back/587--0--Emolga.png diff --git a/src/afd/sprites/back/Karrablast.png b/src/afd/sprites/back/588--0--Karrablast.png similarity index 100% rename from src/afd/sprites/back/Karrablast.png rename to src/afd/sprites/back/588--0--Karrablast.png diff --git a/src/afd/sprites/back/Escavalier.png b/src/afd/sprites/back/589--0--Escavalier.png similarity index 100% rename from src/afd/sprites/back/Escavalier.png rename to src/afd/sprites/back/589--0--Escavalier.png diff --git a/src/afd/sprites/back/Arcanine.png b/src/afd/sprites/back/59--0--Arcanine.png similarity index 100% rename from src/afd/sprites/back/Arcanine.png rename to src/afd/sprites/back/59--0--Arcanine.png diff --git a/src/afd/sprites/back/Foongus.png b/src/afd/sprites/back/590--0--Foongus.png similarity index 100% rename from src/afd/sprites/back/Foongus.png rename to src/afd/sprites/back/590--0--Foongus.png diff --git a/src/afd/sprites/back/Amoonguss.png b/src/afd/sprites/back/591--0--Amoonguss.png similarity index 100% rename from src/afd/sprites/back/Amoonguss.png rename to src/afd/sprites/back/591--0--Amoonguss.png diff --git a/src/afd/sprites/back/Frillish.png b/src/afd/sprites/back/592--0--Frillish.png similarity index 100% rename from src/afd/sprites/back/Frillish.png rename to src/afd/sprites/back/592--0--Frillish.png diff --git a/src/afd/sprites/back/Jellicent.png b/src/afd/sprites/back/593--0--Jellicent.png similarity index 100% rename from src/afd/sprites/back/Jellicent.png rename to src/afd/sprites/back/593--0--Jellicent.png diff --git a/src/afd/sprites/back/Alomomola.png b/src/afd/sprites/back/594--0--Alomomola.png similarity index 100% rename from src/afd/sprites/back/Alomomola.png rename to src/afd/sprites/back/594--0--Alomomola.png diff --git a/src/afd/sprites/back/Joltik.png b/src/afd/sprites/back/595--0--Joltik.png similarity index 100% rename from src/afd/sprites/back/Joltik.png rename to src/afd/sprites/back/595--0--Joltik.png diff --git a/src/afd/sprites/back/Galvantula.png b/src/afd/sprites/back/596--0--Galvantula.png similarity index 100% rename from src/afd/sprites/back/Galvantula.png rename to src/afd/sprites/back/596--0--Galvantula.png diff --git a/src/afd/sprites/back/Ferroseed.png b/src/afd/sprites/back/597--0--Ferroseed.png similarity index 100% rename from src/afd/sprites/back/Ferroseed.png rename to src/afd/sprites/back/597--0--Ferroseed.png diff --git a/src/afd/sprites/back/Ferrothorn.png b/src/afd/sprites/back/598--0--Ferrothorn.png similarity index 100% rename from src/afd/sprites/back/Ferrothorn.png rename to src/afd/sprites/back/598--0--Ferrothorn.png diff --git a/src/afd/sprites/back/Klink.png b/src/afd/sprites/back/599--0--Klink.png similarity index 100% rename from src/afd/sprites/back/Klink.png rename to src/afd/sprites/back/599--0--Klink.png diff --git a/src/afd/sprites/back/Charizard.png b/src/afd/sprites/back/6--0--Charizard.png similarity index 100% rename from src/afd/sprites/back/Charizard.png rename to src/afd/sprites/back/6--0--Charizard.png diff --git a/src/afd/sprites/back/Pyroak.png b/src/afd/sprites/back/6--0--Pyroak.png similarity index 100% rename from src/afd/sprites/back/Pyroak.png rename to src/afd/sprites/back/6--0--Pyroak.png diff --git a/src/afd/sprites/back/Charizard--Gmax.png b/src/afd/sprites/back/6--420--Charizard--Gmax.png similarity index 100% rename from src/afd/sprites/back/Charizard--Gmax.png rename to src/afd/sprites/back/6--420--Charizard--Gmax.png diff --git a/src/afd/sprites/back/Charizard--Mega-X.png b/src/afd/sprites/back/6--420--Charizard--Mega-X.png similarity index 100% rename from src/afd/sprites/back/Charizard--Mega-X.png rename to src/afd/sprites/back/6--420--Charizard--Mega-X.png diff --git a/src/afd/sprites/back/Charizard--Mega-Y.png b/src/afd/sprites/back/6--420--Charizard--Mega-Y.png similarity index 100% rename from src/afd/sprites/back/Charizard--Mega-Y.png rename to src/afd/sprites/back/6--420--Charizard--Mega-Y.png diff --git a/src/afd/sprites/back/Poliwag.png b/src/afd/sprites/back/60--0--Poliwag.png similarity index 100% rename from src/afd/sprites/back/Poliwag.png rename to src/afd/sprites/back/60--0--Poliwag.png diff --git a/src/afd/sprites/back/Klang.png b/src/afd/sprites/back/600--0--Klang.png similarity index 100% rename from src/afd/sprites/back/Klang.png rename to src/afd/sprites/back/600--0--Klang.png diff --git a/src/afd/sprites/back/Klinklang.png b/src/afd/sprites/back/601--0--Klinklang.png similarity index 100% rename from src/afd/sprites/back/Klinklang.png rename to src/afd/sprites/back/601--0--Klinklang.png diff --git a/src/afd/sprites/back/Tynamo.png b/src/afd/sprites/back/602--0--Tynamo.png similarity index 100% rename from src/afd/sprites/back/Tynamo.png rename to src/afd/sprites/back/602--0--Tynamo.png diff --git a/src/afd/sprites/back/Eelektrik.png b/src/afd/sprites/back/603--0--Eelektrik.png similarity index 100% rename from src/afd/sprites/back/Eelektrik.png rename to src/afd/sprites/back/603--0--Eelektrik.png diff --git a/src/afd/sprites/back/Eelektross.png b/src/afd/sprites/back/604--0--Eelektross.png similarity index 100% rename from src/afd/sprites/back/Eelektross.png rename to src/afd/sprites/back/604--0--Eelektross.png diff --git a/src/afd/sprites/back/Elgyem.png b/src/afd/sprites/back/605--0--Elgyem.png similarity index 100% rename from src/afd/sprites/back/Elgyem.png rename to src/afd/sprites/back/605--0--Elgyem.png diff --git a/src/afd/sprites/back/Beheeyem.png b/src/afd/sprites/back/606--0--Beheeyem.png similarity index 100% rename from src/afd/sprites/back/Beheeyem.png rename to src/afd/sprites/back/606--0--Beheeyem.png diff --git a/src/afd/sprites/back/Litwick.png b/src/afd/sprites/back/607--0--Litwick.png similarity index 100% rename from src/afd/sprites/back/Litwick.png rename to src/afd/sprites/back/607--0--Litwick.png diff --git a/src/afd/sprites/back/Lampent.png b/src/afd/sprites/back/608--0--Lampent.png similarity index 100% rename from src/afd/sprites/back/Lampent.png rename to src/afd/sprites/back/608--0--Lampent.png diff --git a/src/afd/sprites/back/Chandelure.png b/src/afd/sprites/back/609--0--Chandelure.png similarity index 100% rename from src/afd/sprites/back/Chandelure.png rename to src/afd/sprites/back/609--0--Chandelure.png diff --git a/src/afd/sprites/back/Poliwhirl.png b/src/afd/sprites/back/61--0--Poliwhirl.png similarity index 100% rename from src/afd/sprites/back/Poliwhirl.png rename to src/afd/sprites/back/61--0--Poliwhirl.png diff --git a/src/afd/sprites/back/Axew.png b/src/afd/sprites/back/610--0--Axew.png similarity index 100% rename from src/afd/sprites/back/Axew.png rename to src/afd/sprites/back/610--0--Axew.png diff --git a/src/afd/sprites/back/Fraxure.png b/src/afd/sprites/back/611--0--Fraxure.png similarity index 100% rename from src/afd/sprites/back/Fraxure.png rename to src/afd/sprites/back/611--0--Fraxure.png diff --git a/src/afd/sprites/back/Haxorus.png b/src/afd/sprites/back/612--0--Haxorus.png similarity index 100% rename from src/afd/sprites/back/Haxorus.png rename to src/afd/sprites/back/612--0--Haxorus.png diff --git a/src/afd/sprites/back/Cubchoo.png b/src/afd/sprites/back/613--0--Cubchoo.png similarity index 100% rename from src/afd/sprites/back/Cubchoo.png rename to src/afd/sprites/back/613--0--Cubchoo.png diff --git a/src/afd/sprites/back/Beartic.png b/src/afd/sprites/back/614--0--Beartic.png similarity index 100% rename from src/afd/sprites/back/Beartic.png rename to src/afd/sprites/back/614--0--Beartic.png diff --git a/src/afd/sprites/back/Cryogonal.png b/src/afd/sprites/back/615--0--Cryogonal.png similarity index 100% rename from src/afd/sprites/back/Cryogonal.png rename to src/afd/sprites/back/615--0--Cryogonal.png diff --git a/src/afd/sprites/back/Shelmet.png b/src/afd/sprites/back/616--0--Shelmet.png similarity index 100% rename from src/afd/sprites/back/Shelmet.png rename to src/afd/sprites/back/616--0--Shelmet.png diff --git a/src/afd/sprites/back/Accelgor.png b/src/afd/sprites/back/617--0--Accelgor.png similarity index 100% rename from src/afd/sprites/back/Accelgor.png rename to src/afd/sprites/back/617--0--Accelgor.png diff --git a/src/afd/sprites/back/Stunfisk.png b/src/afd/sprites/back/618--0--Stunfisk.png similarity index 100% rename from src/afd/sprites/back/Stunfisk.png rename to src/afd/sprites/back/618--0--Stunfisk.png diff --git a/src/afd/sprites/back/Stunfisk--Galar.png b/src/afd/sprites/back/618--420--Stunfisk--Galar.png similarity index 100% rename from src/afd/sprites/back/Stunfisk--Galar.png rename to src/afd/sprites/back/618--420--Stunfisk--Galar.png diff --git a/src/afd/sprites/back/Mienfoo.png b/src/afd/sprites/back/619--0--Mienfoo.png similarity index 100% rename from src/afd/sprites/back/Mienfoo.png rename to src/afd/sprites/back/619--0--Mienfoo.png diff --git a/src/afd/sprites/back/Poliwrath.png b/src/afd/sprites/back/62--0--Poliwrath.png similarity index 100% rename from src/afd/sprites/back/Poliwrath.png rename to src/afd/sprites/back/62--0--Poliwrath.png diff --git a/src/afd/sprites/back/Mienshao.png b/src/afd/sprites/back/620--0--Mienshao.png similarity index 100% rename from src/afd/sprites/back/Mienshao.png rename to src/afd/sprites/back/620--0--Mienshao.png diff --git a/src/afd/sprites/back/Druddigon.png b/src/afd/sprites/back/621--0--Druddigon.png similarity index 100% rename from src/afd/sprites/back/Druddigon.png rename to src/afd/sprites/back/621--0--Druddigon.png diff --git a/src/afd/sprites/back/Golett.png b/src/afd/sprites/back/622--0--Golett.png similarity index 100% rename from src/afd/sprites/back/Golett.png rename to src/afd/sprites/back/622--0--Golett.png diff --git a/src/afd/sprites/back/Golurk.png b/src/afd/sprites/back/623--0--Golurk.png similarity index 100% rename from src/afd/sprites/back/Golurk.png rename to src/afd/sprites/back/623--0--Golurk.png diff --git a/src/afd/sprites/back/Pawniard.png b/src/afd/sprites/back/624--0--Pawniard.png similarity index 100% rename from src/afd/sprites/back/Pawniard.png rename to src/afd/sprites/back/624--0--Pawniard.png diff --git a/src/afd/sprites/back/Bisharp.png b/src/afd/sprites/back/625--0--Bisharp.png similarity index 100% rename from src/afd/sprites/back/Bisharp.png rename to src/afd/sprites/back/625--0--Bisharp.png diff --git a/src/afd/sprites/back/Bouffalant.png b/src/afd/sprites/back/626--0--Bouffalant.png similarity index 100% rename from src/afd/sprites/back/Bouffalant.png rename to src/afd/sprites/back/626--0--Bouffalant.png diff --git a/src/afd/sprites/back/Rufflet.png b/src/afd/sprites/back/627--0--Rufflet.png similarity index 100% rename from src/afd/sprites/back/Rufflet.png rename to src/afd/sprites/back/627--0--Rufflet.png diff --git a/src/afd/sprites/back/Braviary.png b/src/afd/sprites/back/628--0--Braviary.png similarity index 100% rename from src/afd/sprites/back/Braviary.png rename to src/afd/sprites/back/628--0--Braviary.png diff --git a/src/afd/sprites/back/Vullaby.png b/src/afd/sprites/back/629--0--Vullaby.png similarity index 100% rename from src/afd/sprites/back/Vullaby.png rename to src/afd/sprites/back/629--0--Vullaby.png diff --git a/src/afd/sprites/back/Abra.png b/src/afd/sprites/back/63--0--Abra.png similarity index 100% rename from src/afd/sprites/back/Abra.png rename to src/afd/sprites/back/63--0--Abra.png diff --git a/src/afd/sprites/back/Mandibuzz.png b/src/afd/sprites/back/630--0--Mandibuzz.png similarity index 100% rename from src/afd/sprites/back/Mandibuzz.png rename to src/afd/sprites/back/630--0--Mandibuzz.png diff --git a/src/afd/sprites/back/Heatmor.png b/src/afd/sprites/back/631--0--Heatmor.png similarity index 100% rename from src/afd/sprites/back/Heatmor.png rename to src/afd/sprites/back/631--0--Heatmor.png diff --git a/src/afd/sprites/back/Durant.png b/src/afd/sprites/back/632--0--Durant.png similarity index 100% rename from src/afd/sprites/back/Durant.png rename to src/afd/sprites/back/632--0--Durant.png diff --git a/src/afd/sprites/back/Deino.png b/src/afd/sprites/back/633--0--Deino.png similarity index 100% rename from src/afd/sprites/back/Deino.png rename to src/afd/sprites/back/633--0--Deino.png diff --git a/src/afd/sprites/back/Zweilous.png b/src/afd/sprites/back/634--0--Zweilous.png similarity index 100% rename from src/afd/sprites/back/Zweilous.png rename to src/afd/sprites/back/634--0--Zweilous.png diff --git a/src/afd/sprites/back/Hydreigon.png b/src/afd/sprites/back/635--0--Hydreigon.png similarity index 100% rename from src/afd/sprites/back/Hydreigon.png rename to src/afd/sprites/back/635--0--Hydreigon.png diff --git a/src/afd/sprites/back/Larvesta.png b/src/afd/sprites/back/636--0--Larvesta.png similarity index 100% rename from src/afd/sprites/back/Larvesta.png rename to src/afd/sprites/back/636--0--Larvesta.png diff --git a/src/afd/sprites/back/Volcarona.png b/src/afd/sprites/back/637--0--Volcarona.png similarity index 100% rename from src/afd/sprites/back/Volcarona.png rename to src/afd/sprites/back/637--0--Volcarona.png diff --git a/src/afd/sprites/back/Cobalion.png b/src/afd/sprites/back/638--0--Cobalion.png similarity index 100% rename from src/afd/sprites/back/Cobalion.png rename to src/afd/sprites/back/638--0--Cobalion.png diff --git a/src/afd/sprites/back/Terrakion.png b/src/afd/sprites/back/639--0--Terrakion.png similarity index 100% rename from src/afd/sprites/back/Terrakion.png rename to src/afd/sprites/back/639--0--Terrakion.png diff --git a/src/afd/sprites/back/Kadabra.png b/src/afd/sprites/back/64--0--Kadabra.png similarity index 100% rename from src/afd/sprites/back/Kadabra.png rename to src/afd/sprites/back/64--0--Kadabra.png diff --git a/src/afd/sprites/back/Virizion.png b/src/afd/sprites/back/640--0--Virizion.png similarity index 100% rename from src/afd/sprites/back/Virizion.png rename to src/afd/sprites/back/640--0--Virizion.png diff --git a/src/afd/sprites/back/Tornadus.png b/src/afd/sprites/back/641--0--Tornadus.png similarity index 100% rename from src/afd/sprites/back/Tornadus.png rename to src/afd/sprites/back/641--0--Tornadus.png diff --git a/src/afd/sprites/back/Tornadus--Therian.png b/src/afd/sprites/back/641--420--Tornadus--Therian.png similarity index 100% rename from src/afd/sprites/back/Tornadus--Therian.png rename to src/afd/sprites/back/641--420--Tornadus--Therian.png diff --git a/src/afd/sprites/back/Thundurus.png b/src/afd/sprites/back/642--0--Thundurus.png similarity index 100% rename from src/afd/sprites/back/Thundurus.png rename to src/afd/sprites/back/642--0--Thundurus.png diff --git a/src/afd/sprites/back/Thundurus--Therian.png b/src/afd/sprites/back/642--420--Thundurus--Therian.png similarity index 100% rename from src/afd/sprites/back/Thundurus--Therian.png rename to src/afd/sprites/back/642--420--Thundurus--Therian.png diff --git a/src/afd/sprites/back/Reshiram.png b/src/afd/sprites/back/643--0--Reshiram.png similarity index 100% rename from src/afd/sprites/back/Reshiram.png rename to src/afd/sprites/back/643--0--Reshiram.png diff --git a/src/afd/sprites/back/Zekrom.png b/src/afd/sprites/back/644--0--Zekrom.png similarity index 100% rename from src/afd/sprites/back/Zekrom.png rename to src/afd/sprites/back/644--0--Zekrom.png diff --git a/src/afd/sprites/back/Landorus.png b/src/afd/sprites/back/645--0--Landorus.png similarity index 100% rename from src/afd/sprites/back/Landorus.png rename to src/afd/sprites/back/645--0--Landorus.png diff --git a/src/afd/sprites/back/Landorus--Therian.png b/src/afd/sprites/back/645--420--Landorus--Therian.png similarity index 100% rename from src/afd/sprites/back/Landorus--Therian.png rename to src/afd/sprites/back/645--420--Landorus--Therian.png diff --git a/src/afd/sprites/back/Kyurem.png b/src/afd/sprites/back/646--0--Kyurem.png similarity index 100% rename from src/afd/sprites/back/Kyurem.png rename to src/afd/sprites/back/646--0--Kyurem.png diff --git a/src/afd/sprites/back/Kyurem--Black.png b/src/afd/sprites/back/646--420--Kyurem--Black.png similarity index 100% rename from src/afd/sprites/back/Kyurem--Black.png rename to src/afd/sprites/back/646--420--Kyurem--Black.png diff --git a/src/afd/sprites/back/Kyurem--White.png b/src/afd/sprites/back/646--420--Kyurem--White.png similarity index 100% rename from src/afd/sprites/back/Kyurem--White.png rename to src/afd/sprites/back/646--420--Kyurem--White.png diff --git a/src/afd/sprites/back/Keldeo.png b/src/afd/sprites/back/647--0--Keldeo.png similarity index 100% rename from src/afd/sprites/back/Keldeo.png rename to src/afd/sprites/back/647--0--Keldeo.png diff --git a/src/afd/sprites/back/Keldeo--Resolute.png b/src/afd/sprites/back/647--420--Keldeo--Resolute.png similarity index 100% rename from src/afd/sprites/back/Keldeo--Resolute.png rename to src/afd/sprites/back/647--420--Keldeo--Resolute.png diff --git a/src/afd/sprites/back/Meloetta.png b/src/afd/sprites/back/648--0--Meloetta.png similarity index 100% rename from src/afd/sprites/back/Meloetta.png rename to src/afd/sprites/back/648--0--Meloetta.png diff --git a/src/afd/sprites/back/Meloetta--Pirouette.png b/src/afd/sprites/back/648--420--Meloetta--Pirouette.png similarity index 100% rename from src/afd/sprites/back/Meloetta--Pirouette.png rename to src/afd/sprites/back/648--420--Meloetta--Pirouette.png diff --git a/src/afd/sprites/back/Genesect.png b/src/afd/sprites/back/649--0--Genesect.png similarity index 100% rename from src/afd/sprites/back/Genesect.png rename to src/afd/sprites/back/649--0--Genesect.png diff --git a/src/afd/sprites/back/Genesect--Burn.png b/src/afd/sprites/back/649--420--Genesect--Burn.png similarity index 100% rename from src/afd/sprites/back/Genesect--Burn.png rename to src/afd/sprites/back/649--420--Genesect--Burn.png diff --git a/src/afd/sprites/back/Genesect--Chill.png b/src/afd/sprites/back/649--420--Genesect--Chill.png similarity index 100% rename from src/afd/sprites/back/Genesect--Chill.png rename to src/afd/sprites/back/649--420--Genesect--Chill.png diff --git a/src/afd/sprites/back/Genesect--Douse.png b/src/afd/sprites/back/649--420--Genesect--Douse.png similarity index 100% rename from src/afd/sprites/back/Genesect--Douse.png rename to src/afd/sprites/back/649--420--Genesect--Douse.png diff --git a/src/afd/sprites/back/Genesect--Shock.png b/src/afd/sprites/back/649--420--Genesect--Shock.png similarity index 100% rename from src/afd/sprites/back/Genesect--Shock.png rename to src/afd/sprites/back/649--420--Genesect--Shock.png diff --git a/src/afd/sprites/back/Alakazam.png b/src/afd/sprites/back/65--0--Alakazam.png similarity index 100% rename from src/afd/sprites/back/Alakazam.png rename to src/afd/sprites/back/65--0--Alakazam.png diff --git a/src/afd/sprites/back/Alakazam--Mega.png b/src/afd/sprites/back/65--420--Alakazam--Mega.png similarity index 100% rename from src/afd/sprites/back/Alakazam--Mega.png rename to src/afd/sprites/back/65--420--Alakazam--Mega.png diff --git a/src/afd/sprites/back/Chespin.png b/src/afd/sprites/back/650--0--Chespin.png similarity index 100% rename from src/afd/sprites/back/Chespin.png rename to src/afd/sprites/back/650--0--Chespin.png diff --git a/src/afd/sprites/back/Quilladin.png b/src/afd/sprites/back/651--0--Quilladin.png similarity index 100% rename from src/afd/sprites/back/Quilladin.png rename to src/afd/sprites/back/651--0--Quilladin.png diff --git a/src/afd/sprites/back/Chesnaught.png b/src/afd/sprites/back/652--0--Chesnaught.png similarity index 100% rename from src/afd/sprites/back/Chesnaught.png rename to src/afd/sprites/back/652--0--Chesnaught.png diff --git a/src/afd/sprites/back/Fennekin.png b/src/afd/sprites/back/653--0--Fennekin.png similarity index 100% rename from src/afd/sprites/back/Fennekin.png rename to src/afd/sprites/back/653--0--Fennekin.png diff --git a/src/afd/sprites/back/Braixen.png b/src/afd/sprites/back/654--0--Braixen.png similarity index 100% rename from src/afd/sprites/back/Braixen.png rename to src/afd/sprites/back/654--0--Braixen.png diff --git a/src/afd/sprites/back/Delphox.png b/src/afd/sprites/back/655--0--Delphox.png similarity index 100% rename from src/afd/sprites/back/Delphox.png rename to src/afd/sprites/back/655--0--Delphox.png diff --git a/src/afd/sprites/back/Froakie.png b/src/afd/sprites/back/656--0--Froakie.png similarity index 100% rename from src/afd/sprites/back/Froakie.png rename to src/afd/sprites/back/656--0--Froakie.png diff --git a/src/afd/sprites/back/Frogadier.png b/src/afd/sprites/back/657--0--Frogadier.png similarity index 100% rename from src/afd/sprites/back/Frogadier.png rename to src/afd/sprites/back/657--0--Frogadier.png diff --git a/src/afd/sprites/back/Greninja.png b/src/afd/sprites/back/658--0--Greninja.png similarity index 100% rename from src/afd/sprites/back/Greninja.png rename to src/afd/sprites/back/658--0--Greninja.png diff --git a/src/afd/sprites/back/Greninja--Ash.png b/src/afd/sprites/back/658--420--Greninja--Ash.png similarity index 100% rename from src/afd/sprites/back/Greninja--Ash.png rename to src/afd/sprites/back/658--420--Greninja--Ash.png diff --git a/src/afd/sprites/back/Bunnelby.png b/src/afd/sprites/back/659--0--Bunnelby.png similarity index 100% rename from src/afd/sprites/back/Bunnelby.png rename to src/afd/sprites/back/659--0--Bunnelby.png diff --git a/src/afd/sprites/back/Machop.png b/src/afd/sprites/back/66--0--Machop.png similarity index 100% rename from src/afd/sprites/back/Machop.png rename to src/afd/sprites/back/66--0--Machop.png diff --git a/src/afd/sprites/back/Diggersby.png b/src/afd/sprites/back/660--0--Diggersby.png similarity index 100% rename from src/afd/sprites/back/Diggersby.png rename to src/afd/sprites/back/660--0--Diggersby.png diff --git a/src/afd/sprites/back/Fletchling.png b/src/afd/sprites/back/661--0--Fletchling.png similarity index 100% rename from src/afd/sprites/back/Fletchling.png rename to src/afd/sprites/back/661--0--Fletchling.png diff --git a/src/afd/sprites/back/Fletchinder.png b/src/afd/sprites/back/662--0--Fletchinder.png similarity index 100% rename from src/afd/sprites/back/Fletchinder.png rename to src/afd/sprites/back/662--0--Fletchinder.png diff --git a/src/afd/sprites/back/Talonflame.png b/src/afd/sprites/back/663--0--Talonflame.png similarity index 100% rename from src/afd/sprites/back/Talonflame.png rename to src/afd/sprites/back/663--0--Talonflame.png diff --git a/src/afd/sprites/back/Scatterbug.png b/src/afd/sprites/back/664--0--Scatterbug.png similarity index 100% rename from src/afd/sprites/back/Scatterbug.png rename to src/afd/sprites/back/664--0--Scatterbug.png diff --git a/src/afd/sprites/back/Spewpa.png b/src/afd/sprites/back/665--0--Spewpa.png similarity index 100% rename from src/afd/sprites/back/Spewpa.png rename to src/afd/sprites/back/665--0--Spewpa.png diff --git a/src/afd/sprites/back/Vivillon.png b/src/afd/sprites/back/666--0--Vivillon.png similarity index 100% rename from src/afd/sprites/back/Vivillon.png rename to src/afd/sprites/back/666--0--Vivillon.png diff --git a/src/afd/sprites/back/Litleo.png b/src/afd/sprites/back/667--0--Litleo.png similarity index 100% rename from src/afd/sprites/back/Litleo.png rename to src/afd/sprites/back/667--0--Litleo.png diff --git a/src/afd/sprites/back/Pyroar.png b/src/afd/sprites/back/668--0--Pyroar.png similarity index 100% rename from src/afd/sprites/back/Pyroar.png rename to src/afd/sprites/back/668--0--Pyroar.png diff --git a/src/afd/sprites/back/Flabe__0301be__0301.png b/src/afd/sprites/back/669--0--Flabe__0301be__0301.png similarity index 100% rename from src/afd/sprites/back/Flabe__0301be__0301.png rename to src/afd/sprites/back/669--0--Flabe__0301be__0301.png diff --git a/src/afd/sprites/back/Machoke.png b/src/afd/sprites/back/67--0--Machoke.png similarity index 100% rename from src/afd/sprites/back/Machoke.png rename to src/afd/sprites/back/67--0--Machoke.png diff --git a/src/afd/sprites/back/Floette.png b/src/afd/sprites/back/670--0--Floette.png similarity index 100% rename from src/afd/sprites/back/Floette.png rename to src/afd/sprites/back/670--0--Floette.png diff --git a/src/afd/sprites/back/Floette--Eternal.png b/src/afd/sprites/back/670--420--Floette--Eternal.png similarity index 100% rename from src/afd/sprites/back/Floette--Eternal.png rename to src/afd/sprites/back/670--420--Floette--Eternal.png diff --git a/src/afd/sprites/back/Florges.png b/src/afd/sprites/back/671--0--Florges.png similarity index 100% rename from src/afd/sprites/back/Florges.png rename to src/afd/sprites/back/671--0--Florges.png diff --git a/src/afd/sprites/back/Skiddo.png b/src/afd/sprites/back/672--0--Skiddo.png similarity index 100% rename from src/afd/sprites/back/Skiddo.png rename to src/afd/sprites/back/672--0--Skiddo.png diff --git a/src/afd/sprites/back/Gogoat.png b/src/afd/sprites/back/673--0--Gogoat.png similarity index 100% rename from src/afd/sprites/back/Gogoat.png rename to src/afd/sprites/back/673--0--Gogoat.png diff --git a/src/afd/sprites/back/Pancham.png b/src/afd/sprites/back/674--0--Pancham.png similarity index 100% rename from src/afd/sprites/back/Pancham.png rename to src/afd/sprites/back/674--0--Pancham.png diff --git a/src/afd/sprites/back/Pangoro.png b/src/afd/sprites/back/675--0--Pangoro.png similarity index 100% rename from src/afd/sprites/back/Pangoro.png rename to src/afd/sprites/back/675--0--Pangoro.png diff --git a/src/afd/sprites/back/Furfrou.png b/src/afd/sprites/back/676--0--Furfrou.png similarity index 100% rename from src/afd/sprites/back/Furfrou.png rename to src/afd/sprites/back/676--0--Furfrou.png diff --git a/src/afd/sprites/back/Espurr.png b/src/afd/sprites/back/677--0--Espurr.png similarity index 100% rename from src/afd/sprites/back/Espurr.png rename to src/afd/sprites/back/677--0--Espurr.png diff --git a/src/afd/sprites/back/Meowstic.png b/src/afd/sprites/back/678--0--Meowstic.png similarity index 100% rename from src/afd/sprites/back/Meowstic.png rename to src/afd/sprites/back/678--0--Meowstic.png diff --git a/src/afd/sprites/back/Meowstic--F.png b/src/afd/sprites/back/678--420--Meowstic--F.png similarity index 100% rename from src/afd/sprites/back/Meowstic--F.png rename to src/afd/sprites/back/678--420--Meowstic--F.png diff --git a/src/afd/sprites/back/Honedge.png b/src/afd/sprites/back/679--0--Honedge.png similarity index 100% rename from src/afd/sprites/back/Honedge.png rename to src/afd/sprites/back/679--0--Honedge.png diff --git a/src/afd/sprites/back/Machamp.png b/src/afd/sprites/back/68--0--Machamp.png similarity index 100% rename from src/afd/sprites/back/Machamp.png rename to src/afd/sprites/back/68--0--Machamp.png diff --git a/src/afd/sprites/back/Machamp--Gmax.png b/src/afd/sprites/back/68--420--Machamp--Gmax.png similarity index 100% rename from src/afd/sprites/back/Machamp--Gmax.png rename to src/afd/sprites/back/68--420--Machamp--Gmax.png diff --git a/src/afd/sprites/back/Doublade.png b/src/afd/sprites/back/680--0--Doublade.png similarity index 100% rename from src/afd/sprites/back/Doublade.png rename to src/afd/sprites/back/680--0--Doublade.png diff --git a/src/afd/sprites/back/Aegislash.png b/src/afd/sprites/back/681--0--Aegislash.png similarity index 100% rename from src/afd/sprites/back/Aegislash.png rename to src/afd/sprites/back/681--0--Aegislash.png diff --git a/src/afd/sprites/back/Aegislash--Blade.png b/src/afd/sprites/back/681--420--Aegislash--Blade.png similarity index 100% rename from src/afd/sprites/back/Aegislash--Blade.png rename to src/afd/sprites/back/681--420--Aegislash--Blade.png diff --git a/src/afd/sprites/back/Spritzee.png b/src/afd/sprites/back/682--0--Spritzee.png similarity index 100% rename from src/afd/sprites/back/Spritzee.png rename to src/afd/sprites/back/682--0--Spritzee.png diff --git a/src/afd/sprites/back/Aromatisse.png b/src/afd/sprites/back/683--0--Aromatisse.png similarity index 100% rename from src/afd/sprites/back/Aromatisse.png rename to src/afd/sprites/back/683--0--Aromatisse.png diff --git a/src/afd/sprites/back/Swirlix.png b/src/afd/sprites/back/684--0--Swirlix.png similarity index 100% rename from src/afd/sprites/back/Swirlix.png rename to src/afd/sprites/back/684--0--Swirlix.png diff --git a/src/afd/sprites/back/Slurpuff.png b/src/afd/sprites/back/685--0--Slurpuff.png similarity index 100% rename from src/afd/sprites/back/Slurpuff.png rename to src/afd/sprites/back/685--0--Slurpuff.png diff --git a/src/afd/sprites/back/Inkay.png b/src/afd/sprites/back/686--0--Inkay.png similarity index 100% rename from src/afd/sprites/back/Inkay.png rename to src/afd/sprites/back/686--0--Inkay.png diff --git a/src/afd/sprites/back/Malamar.png b/src/afd/sprites/back/687--0--Malamar.png similarity index 100% rename from src/afd/sprites/back/Malamar.png rename to src/afd/sprites/back/687--0--Malamar.png diff --git a/src/afd/sprites/back/Binacle.png b/src/afd/sprites/back/688--0--Binacle.png similarity index 100% rename from src/afd/sprites/back/Binacle.png rename to src/afd/sprites/back/688--0--Binacle.png diff --git a/src/afd/sprites/back/Barbaracle.png b/src/afd/sprites/back/689--0--Barbaracle.png similarity index 100% rename from src/afd/sprites/back/Barbaracle.png rename to src/afd/sprites/back/689--0--Barbaracle.png diff --git a/src/afd/sprites/back/Bellsprout.png b/src/afd/sprites/back/69--0--Bellsprout.png similarity index 100% rename from src/afd/sprites/back/Bellsprout.png rename to src/afd/sprites/back/69--0--Bellsprout.png diff --git a/src/afd/sprites/back/Skrelp.png b/src/afd/sprites/back/690--0--Skrelp.png similarity index 100% rename from src/afd/sprites/back/Skrelp.png rename to src/afd/sprites/back/690--0--Skrelp.png diff --git a/src/afd/sprites/back/Dragalge.png b/src/afd/sprites/back/691--0--Dragalge.png similarity index 100% rename from src/afd/sprites/back/Dragalge.png rename to src/afd/sprites/back/691--0--Dragalge.png diff --git a/src/afd/sprites/back/Clauncher.png b/src/afd/sprites/back/692--0--Clauncher.png similarity index 100% rename from src/afd/sprites/back/Clauncher.png rename to src/afd/sprites/back/692--0--Clauncher.png diff --git a/src/afd/sprites/back/Clawitzer.png b/src/afd/sprites/back/693--0--Clawitzer.png similarity index 100% rename from src/afd/sprites/back/Clawitzer.png rename to src/afd/sprites/back/693--0--Clawitzer.png diff --git a/src/afd/sprites/back/Helioptile.png b/src/afd/sprites/back/694--0--Helioptile.png similarity index 100% rename from src/afd/sprites/back/Helioptile.png rename to src/afd/sprites/back/694--0--Helioptile.png diff --git a/src/afd/sprites/back/Heliolisk.png b/src/afd/sprites/back/695--0--Heliolisk.png similarity index 100% rename from src/afd/sprites/back/Heliolisk.png rename to src/afd/sprites/back/695--0--Heliolisk.png diff --git a/src/afd/sprites/back/Tyrunt.png b/src/afd/sprites/back/696--0--Tyrunt.png similarity index 100% rename from src/afd/sprites/back/Tyrunt.png rename to src/afd/sprites/back/696--0--Tyrunt.png diff --git a/src/afd/sprites/back/Tyrantrum.png b/src/afd/sprites/back/697--0--Tyrantrum.png similarity index 100% rename from src/afd/sprites/back/Tyrantrum.png rename to src/afd/sprites/back/697--0--Tyrantrum.png diff --git a/src/afd/sprites/back/Amaura.png b/src/afd/sprites/back/698--0--Amaura.png similarity index 100% rename from src/afd/sprites/back/Amaura.png rename to src/afd/sprites/back/698--0--Amaura.png diff --git a/src/afd/sprites/back/Aurorus.png b/src/afd/sprites/back/699--0--Aurorus.png similarity index 100% rename from src/afd/sprites/back/Aurorus.png rename to src/afd/sprites/back/699--0--Aurorus.png diff --git a/src/afd/sprites/back/Squirtle.png b/src/afd/sprites/back/7--0--Squirtle.png similarity index 100% rename from src/afd/sprites/back/Squirtle.png rename to src/afd/sprites/back/7--0--Squirtle.png diff --git a/src/afd/sprites/back/Weepinbell.png b/src/afd/sprites/back/70--0--Weepinbell.png similarity index 100% rename from src/afd/sprites/back/Weepinbell.png rename to src/afd/sprites/back/70--0--Weepinbell.png diff --git a/src/afd/sprites/back/Sylveon.png b/src/afd/sprites/back/700--0--Sylveon.png similarity index 100% rename from src/afd/sprites/back/Sylveon.png rename to src/afd/sprites/back/700--0--Sylveon.png diff --git a/src/afd/sprites/back/Hawlucha.png b/src/afd/sprites/back/701--0--Hawlucha.png similarity index 100% rename from src/afd/sprites/back/Hawlucha.png rename to src/afd/sprites/back/701--0--Hawlucha.png diff --git a/src/afd/sprites/back/Dedenne.png b/src/afd/sprites/back/702--0--Dedenne.png similarity index 100% rename from src/afd/sprites/back/Dedenne.png rename to src/afd/sprites/back/702--0--Dedenne.png diff --git a/src/afd/sprites/back/Carbink.png b/src/afd/sprites/back/703--0--Carbink.png similarity index 100% rename from src/afd/sprites/back/Carbink.png rename to src/afd/sprites/back/703--0--Carbink.png diff --git a/src/afd/sprites/back/Goomy.png b/src/afd/sprites/back/704--0--Goomy.png similarity index 100% rename from src/afd/sprites/back/Goomy.png rename to src/afd/sprites/back/704--0--Goomy.png diff --git a/src/afd/sprites/back/Sliggoo.png b/src/afd/sprites/back/705--0--Sliggoo.png similarity index 100% rename from src/afd/sprites/back/Sliggoo.png rename to src/afd/sprites/back/705--0--Sliggoo.png diff --git a/src/afd/sprites/back/Goodra.png b/src/afd/sprites/back/706--0--Goodra.png similarity index 100% rename from src/afd/sprites/back/Goodra.png rename to src/afd/sprites/back/706--0--Goodra.png diff --git a/src/afd/sprites/back/Klefki.png b/src/afd/sprites/back/707--0--Klefki.png similarity index 100% rename from src/afd/sprites/back/Klefki.png rename to src/afd/sprites/back/707--0--Klefki.png diff --git a/src/afd/sprites/back/Phantump.png b/src/afd/sprites/back/708--0--Phantump.png similarity index 100% rename from src/afd/sprites/back/Phantump.png rename to src/afd/sprites/back/708--0--Phantump.png diff --git a/src/afd/sprites/back/Trevenant.png b/src/afd/sprites/back/709--0--Trevenant.png similarity index 100% rename from src/afd/sprites/back/Trevenant.png rename to src/afd/sprites/back/709--0--Trevenant.png diff --git a/src/afd/sprites/back/Victreebel.png b/src/afd/sprites/back/71--0--Victreebel.png similarity index 100% rename from src/afd/sprites/back/Victreebel.png rename to src/afd/sprites/back/71--0--Victreebel.png diff --git a/src/afd/sprites/back/Pumpkaboo.png b/src/afd/sprites/back/710--0--Pumpkaboo.png similarity index 100% rename from src/afd/sprites/back/Pumpkaboo.png rename to src/afd/sprites/back/710--0--Pumpkaboo.png diff --git a/src/afd/sprites/back/Pumpkaboo--Large.png b/src/afd/sprites/back/710--420--Pumpkaboo--Large.png similarity index 100% rename from src/afd/sprites/back/Pumpkaboo--Large.png rename to src/afd/sprites/back/710--420--Pumpkaboo--Large.png diff --git a/src/afd/sprites/back/Pumpkaboo--Small.png b/src/afd/sprites/back/710--420--Pumpkaboo--Small.png similarity index 100% rename from src/afd/sprites/back/Pumpkaboo--Small.png rename to src/afd/sprites/back/710--420--Pumpkaboo--Small.png diff --git a/src/afd/sprites/back/Pumpkaboo--Super.png b/src/afd/sprites/back/710--420--Pumpkaboo--Super.png similarity index 100% rename from src/afd/sprites/back/Pumpkaboo--Super.png rename to src/afd/sprites/back/710--420--Pumpkaboo--Super.png diff --git a/src/afd/sprites/back/Gourgeist.png b/src/afd/sprites/back/711--0--Gourgeist.png similarity index 100% rename from src/afd/sprites/back/Gourgeist.png rename to src/afd/sprites/back/711--0--Gourgeist.png diff --git a/src/afd/sprites/back/Gourgeist--Large.png b/src/afd/sprites/back/711--420--Gourgeist--Large.png similarity index 100% rename from src/afd/sprites/back/Gourgeist--Large.png rename to src/afd/sprites/back/711--420--Gourgeist--Large.png diff --git a/src/afd/sprites/back/Gourgeist--Small.png b/src/afd/sprites/back/711--420--Gourgeist--Small.png similarity index 100% rename from src/afd/sprites/back/Gourgeist--Small.png rename to src/afd/sprites/back/711--420--Gourgeist--Small.png diff --git a/src/afd/sprites/back/Gourgeist--Super.png b/src/afd/sprites/back/711--420--Gourgeist--Super.png similarity index 100% rename from src/afd/sprites/back/Gourgeist--Super.png rename to src/afd/sprites/back/711--420--Gourgeist--Super.png diff --git a/src/afd/sprites/back/Bergmite.png b/src/afd/sprites/back/712--0--Bergmite.png similarity index 100% rename from src/afd/sprites/back/Bergmite.png rename to src/afd/sprites/back/712--0--Bergmite.png diff --git a/src/afd/sprites/back/Avalugg.png b/src/afd/sprites/back/713--0--Avalugg.png similarity index 100% rename from src/afd/sprites/back/Avalugg.png rename to src/afd/sprites/back/713--0--Avalugg.png diff --git a/src/afd/sprites/back/Noibat.png b/src/afd/sprites/back/714--0--Noibat.png similarity index 100% rename from src/afd/sprites/back/Noibat.png rename to src/afd/sprites/back/714--0--Noibat.png diff --git a/src/afd/sprites/back/Noivern.png b/src/afd/sprites/back/715--0--Noivern.png similarity index 100% rename from src/afd/sprites/back/Noivern.png rename to src/afd/sprites/back/715--0--Noivern.png diff --git a/src/afd/sprites/back/Xerneas.png b/src/afd/sprites/back/716--0--Xerneas.png similarity index 100% rename from src/afd/sprites/back/Xerneas.png rename to src/afd/sprites/back/716--0--Xerneas.png diff --git a/src/afd/sprites/back/Yveltal.png b/src/afd/sprites/back/717--0--Yveltal.png similarity index 100% rename from src/afd/sprites/back/Yveltal.png rename to src/afd/sprites/back/717--0--Yveltal.png diff --git a/src/afd/sprites/back/Zygarde.png b/src/afd/sprites/back/718--0--Zygarde.png similarity index 100% rename from src/afd/sprites/back/Zygarde.png rename to src/afd/sprites/back/718--0--Zygarde.png diff --git a/src/afd/sprites/back/Zygarde--10__0025.png b/src/afd/sprites/back/718--420--Zygarde--10__0025.png similarity index 100% rename from src/afd/sprites/back/Zygarde--10__0025.png rename to src/afd/sprites/back/718--420--Zygarde--10__0025.png diff --git a/src/afd/sprites/back/Zygarde--Complete.png b/src/afd/sprites/back/718--420--Zygarde--Complete.png similarity index 100% rename from src/afd/sprites/back/Zygarde--Complete.png rename to src/afd/sprites/back/718--420--Zygarde--Complete.png diff --git a/src/afd/sprites/back/Diancie.png b/src/afd/sprites/back/719--0--Diancie.png similarity index 100% rename from src/afd/sprites/back/Diancie.png rename to src/afd/sprites/back/719--0--Diancie.png diff --git a/src/afd/sprites/back/Diancie--Mega.png b/src/afd/sprites/back/719--420--Diancie--Mega.png similarity index 100% rename from src/afd/sprites/back/Diancie--Mega.png rename to src/afd/sprites/back/719--420--Diancie--Mega.png diff --git a/src/afd/sprites/back/Tentacool.png b/src/afd/sprites/back/72--0--Tentacool.png similarity index 100% rename from src/afd/sprites/back/Tentacool.png rename to src/afd/sprites/back/72--0--Tentacool.png diff --git a/src/afd/sprites/back/Hoopa.png b/src/afd/sprites/back/720--0--Hoopa.png similarity index 100% rename from src/afd/sprites/back/Hoopa.png rename to src/afd/sprites/back/720--0--Hoopa.png diff --git a/src/afd/sprites/back/Hoopa--Unbound.png b/src/afd/sprites/back/720--420--Hoopa--Unbound.png similarity index 100% rename from src/afd/sprites/back/Hoopa--Unbound.png rename to src/afd/sprites/back/720--420--Hoopa--Unbound.png diff --git a/src/afd/sprites/back/Volcanion.png b/src/afd/sprites/back/721--0--Volcanion.png similarity index 100% rename from src/afd/sprites/back/Volcanion.png rename to src/afd/sprites/back/721--0--Volcanion.png diff --git a/src/afd/sprites/back/Rowlet.png b/src/afd/sprites/back/722--0--Rowlet.png similarity index 100% rename from src/afd/sprites/back/Rowlet.png rename to src/afd/sprites/back/722--0--Rowlet.png diff --git a/src/afd/sprites/back/Dartrix.png b/src/afd/sprites/back/723--0--Dartrix.png similarity index 100% rename from src/afd/sprites/back/Dartrix.png rename to src/afd/sprites/back/723--0--Dartrix.png diff --git a/src/afd/sprites/back/Decidueye.png b/src/afd/sprites/back/724--0--Decidueye.png similarity index 100% rename from src/afd/sprites/back/Decidueye.png rename to src/afd/sprites/back/724--0--Decidueye.png diff --git a/src/afd/sprites/back/Litten.png b/src/afd/sprites/back/725--0--Litten.png similarity index 100% rename from src/afd/sprites/back/Litten.png rename to src/afd/sprites/back/725--0--Litten.png diff --git a/src/afd/sprites/back/Torracat.png b/src/afd/sprites/back/726--0--Torracat.png similarity index 100% rename from src/afd/sprites/back/Torracat.png rename to src/afd/sprites/back/726--0--Torracat.png diff --git a/src/afd/sprites/back/Incineroar.png b/src/afd/sprites/back/727--0--Incineroar.png similarity index 100% rename from src/afd/sprites/back/Incineroar.png rename to src/afd/sprites/back/727--0--Incineroar.png diff --git a/src/afd/sprites/back/Popplio.png b/src/afd/sprites/back/728--0--Popplio.png similarity index 100% rename from src/afd/sprites/back/Popplio.png rename to src/afd/sprites/back/728--0--Popplio.png diff --git a/src/afd/sprites/back/Brionne.png b/src/afd/sprites/back/729--0--Brionne.png similarity index 100% rename from src/afd/sprites/back/Brionne.png rename to src/afd/sprites/back/729--0--Brionne.png diff --git a/src/afd/sprites/back/Tentacruel.png b/src/afd/sprites/back/73--0--Tentacruel.png similarity index 100% rename from src/afd/sprites/back/Tentacruel.png rename to src/afd/sprites/back/73--0--Tentacruel.png diff --git a/src/afd/sprites/back/Primarina.png b/src/afd/sprites/back/730--0--Primarina.png similarity index 100% rename from src/afd/sprites/back/Primarina.png rename to src/afd/sprites/back/730--0--Primarina.png diff --git a/src/afd/sprites/back/Pikipek.png b/src/afd/sprites/back/731--0--Pikipek.png similarity index 100% rename from src/afd/sprites/back/Pikipek.png rename to src/afd/sprites/back/731--0--Pikipek.png diff --git a/src/afd/sprites/back/Trumbeak.png b/src/afd/sprites/back/732--0--Trumbeak.png similarity index 100% rename from src/afd/sprites/back/Trumbeak.png rename to src/afd/sprites/back/732--0--Trumbeak.png diff --git a/src/afd/sprites/back/Toucannon.png b/src/afd/sprites/back/733--0--Toucannon.png similarity index 100% rename from src/afd/sprites/back/Toucannon.png rename to src/afd/sprites/back/733--0--Toucannon.png diff --git a/src/afd/sprites/back/Yungoos.png b/src/afd/sprites/back/734--0--Yungoos.png similarity index 100% rename from src/afd/sprites/back/Yungoos.png rename to src/afd/sprites/back/734--0--Yungoos.png diff --git a/src/afd/sprites/back/Gumshoos.png b/src/afd/sprites/back/735--0--Gumshoos.png similarity index 100% rename from src/afd/sprites/back/Gumshoos.png rename to src/afd/sprites/back/735--0--Gumshoos.png diff --git a/src/afd/sprites/back/Grubbin.png b/src/afd/sprites/back/736--0--Grubbin.png similarity index 100% rename from src/afd/sprites/back/Grubbin.png rename to src/afd/sprites/back/736--0--Grubbin.png diff --git a/src/afd/sprites/back/Charjabug.png b/src/afd/sprites/back/737--0--Charjabug.png similarity index 100% rename from src/afd/sprites/back/Charjabug.png rename to src/afd/sprites/back/737--0--Charjabug.png diff --git a/src/afd/sprites/back/Vikavolt.png b/src/afd/sprites/back/738--0--Vikavolt.png similarity index 100% rename from src/afd/sprites/back/Vikavolt.png rename to src/afd/sprites/back/738--0--Vikavolt.png diff --git a/src/afd/sprites/back/Crabrawler.png b/src/afd/sprites/back/739--0--Crabrawler.png similarity index 100% rename from src/afd/sprites/back/Crabrawler.png rename to src/afd/sprites/back/739--0--Crabrawler.png diff --git a/src/afd/sprites/back/Geodude.png b/src/afd/sprites/back/74--0--Geodude.png similarity index 100% rename from src/afd/sprites/back/Geodude.png rename to src/afd/sprites/back/74--0--Geodude.png diff --git a/src/afd/sprites/back/Geodude--Alola.png b/src/afd/sprites/back/74--420--Geodude--Alola.png similarity index 100% rename from src/afd/sprites/back/Geodude--Alola.png rename to src/afd/sprites/back/74--420--Geodude--Alola.png diff --git a/src/afd/sprites/back/Crabominable.png b/src/afd/sprites/back/740--0--Crabominable.png similarity index 100% rename from src/afd/sprites/back/Crabominable.png rename to src/afd/sprites/back/740--0--Crabominable.png diff --git a/src/afd/sprites/back/Oricorio.png b/src/afd/sprites/back/741--0--Oricorio.png similarity index 100% rename from src/afd/sprites/back/Oricorio.png rename to src/afd/sprites/back/741--0--Oricorio.png diff --git a/src/afd/sprites/back/Oricorio--Pa__0027u.png b/src/afd/sprites/back/741--420--Oricorio--Pa__0027u.png similarity index 100% rename from src/afd/sprites/back/Oricorio--Pa__0027u.png rename to src/afd/sprites/back/741--420--Oricorio--Pa__0027u.png diff --git a/src/afd/sprites/back/Oricorio--Pom-Pom.png b/src/afd/sprites/back/741--420--Oricorio--Pom-Pom.png similarity index 100% rename from src/afd/sprites/back/Oricorio--Pom-Pom.png rename to src/afd/sprites/back/741--420--Oricorio--Pom-Pom.png diff --git a/src/afd/sprites/back/Oricorio--Sensu.png b/src/afd/sprites/back/741--420--Oricorio--Sensu.png similarity index 100% rename from src/afd/sprites/back/Oricorio--Sensu.png rename to src/afd/sprites/back/741--420--Oricorio--Sensu.png diff --git a/src/afd/sprites/back/Cutiefly.png b/src/afd/sprites/back/742--0--Cutiefly.png similarity index 100% rename from src/afd/sprites/back/Cutiefly.png rename to src/afd/sprites/back/742--0--Cutiefly.png diff --git a/src/afd/sprites/back/Ribombee.png b/src/afd/sprites/back/743--0--Ribombee.png similarity index 100% rename from src/afd/sprites/back/Ribombee.png rename to src/afd/sprites/back/743--0--Ribombee.png diff --git a/src/afd/sprites/back/Rockruff.png b/src/afd/sprites/back/744--0--Rockruff.png similarity index 100% rename from src/afd/sprites/back/Rockruff.png rename to src/afd/sprites/back/744--0--Rockruff.png diff --git a/src/afd/sprites/back/Lycanroc.png b/src/afd/sprites/back/745--0--Lycanroc.png similarity index 100% rename from src/afd/sprites/back/Lycanroc.png rename to src/afd/sprites/back/745--0--Lycanroc.png diff --git a/src/afd/sprites/back/Lycanroc--Dusk.png b/src/afd/sprites/back/745--420--Lycanroc--Dusk.png similarity index 100% rename from src/afd/sprites/back/Lycanroc--Dusk.png rename to src/afd/sprites/back/745--420--Lycanroc--Dusk.png diff --git a/src/afd/sprites/back/Lycanroc--Midnight.png b/src/afd/sprites/back/745--420--Lycanroc--Midnight.png similarity index 100% rename from src/afd/sprites/back/Lycanroc--Midnight.png rename to src/afd/sprites/back/745--420--Lycanroc--Midnight.png diff --git a/src/afd/sprites/back/Wishiwashi.png b/src/afd/sprites/back/746--0--Wishiwashi.png similarity index 100% rename from src/afd/sprites/back/Wishiwashi.png rename to src/afd/sprites/back/746--0--Wishiwashi.png diff --git a/src/afd/sprites/back/Wishiwashi--School.png b/src/afd/sprites/back/746--420--Wishiwashi--School.png similarity index 100% rename from src/afd/sprites/back/Wishiwashi--School.png rename to src/afd/sprites/back/746--420--Wishiwashi--School.png diff --git a/src/afd/sprites/back/Mareanie.png b/src/afd/sprites/back/747--0--Mareanie.png similarity index 100% rename from src/afd/sprites/back/Mareanie.png rename to src/afd/sprites/back/747--0--Mareanie.png diff --git a/src/afd/sprites/back/Toxapex.png b/src/afd/sprites/back/748--0--Toxapex.png similarity index 100% rename from src/afd/sprites/back/Toxapex.png rename to src/afd/sprites/back/748--0--Toxapex.png diff --git a/src/afd/sprites/back/Mudbray.png b/src/afd/sprites/back/749--0--Mudbray.png similarity index 100% rename from src/afd/sprites/back/Mudbray.png rename to src/afd/sprites/back/749--0--Mudbray.png diff --git a/src/afd/sprites/back/Graveler.png b/src/afd/sprites/back/75--0--Graveler.png similarity index 100% rename from src/afd/sprites/back/Graveler.png rename to src/afd/sprites/back/75--0--Graveler.png diff --git a/src/afd/sprites/back/Graveler--Alola.png b/src/afd/sprites/back/75--420--Graveler--Alola.png similarity index 100% rename from src/afd/sprites/back/Graveler--Alola.png rename to src/afd/sprites/back/75--420--Graveler--Alola.png diff --git a/src/afd/sprites/back/Mudsdale.png b/src/afd/sprites/back/750--0--Mudsdale.png similarity index 100% rename from src/afd/sprites/back/Mudsdale.png rename to src/afd/sprites/back/750--0--Mudsdale.png diff --git a/src/afd/sprites/back/Dewpider.png b/src/afd/sprites/back/751--0--Dewpider.png similarity index 100% rename from src/afd/sprites/back/Dewpider.png rename to src/afd/sprites/back/751--0--Dewpider.png diff --git a/src/afd/sprites/back/Araquanid.png b/src/afd/sprites/back/752--0--Araquanid.png similarity index 100% rename from src/afd/sprites/back/Araquanid.png rename to src/afd/sprites/back/752--0--Araquanid.png diff --git a/src/afd/sprites/back/Fomantis.png b/src/afd/sprites/back/753--0--Fomantis.png similarity index 100% rename from src/afd/sprites/back/Fomantis.png rename to src/afd/sprites/back/753--0--Fomantis.png diff --git a/src/afd/sprites/back/Lurantis.png b/src/afd/sprites/back/754--0--Lurantis.png similarity index 100% rename from src/afd/sprites/back/Lurantis.png rename to src/afd/sprites/back/754--0--Lurantis.png diff --git a/src/afd/sprites/back/Morelull.png b/src/afd/sprites/back/755--0--Morelull.png similarity index 100% rename from src/afd/sprites/back/Morelull.png rename to src/afd/sprites/back/755--0--Morelull.png diff --git a/src/afd/sprites/back/Shiinotic.png b/src/afd/sprites/back/756--0--Shiinotic.png similarity index 100% rename from src/afd/sprites/back/Shiinotic.png rename to src/afd/sprites/back/756--0--Shiinotic.png diff --git a/src/afd/sprites/back/Salandit.png b/src/afd/sprites/back/757--0--Salandit.png similarity index 100% rename from src/afd/sprites/back/Salandit.png rename to src/afd/sprites/back/757--0--Salandit.png diff --git a/src/afd/sprites/back/Salazzle.png b/src/afd/sprites/back/758--0--Salazzle.png similarity index 100% rename from src/afd/sprites/back/Salazzle.png rename to src/afd/sprites/back/758--0--Salazzle.png diff --git a/src/afd/sprites/back/Stufful.png b/src/afd/sprites/back/759--0--Stufful.png similarity index 100% rename from src/afd/sprites/back/Stufful.png rename to src/afd/sprites/back/759--0--Stufful.png diff --git a/src/afd/sprites/back/Golem.png b/src/afd/sprites/back/76--0--Golem.png similarity index 100% rename from src/afd/sprites/back/Golem.png rename to src/afd/sprites/back/76--0--Golem.png diff --git a/src/afd/sprites/back/Golem--Alola.png b/src/afd/sprites/back/76--420--Golem--Alola.png similarity index 100% rename from src/afd/sprites/back/Golem--Alola.png rename to src/afd/sprites/back/76--420--Golem--Alola.png diff --git a/src/afd/sprites/back/Bewear.png b/src/afd/sprites/back/760--0--Bewear.png similarity index 100% rename from src/afd/sprites/back/Bewear.png rename to src/afd/sprites/back/760--0--Bewear.png diff --git a/src/afd/sprites/back/Bounsweet.png b/src/afd/sprites/back/761--0--Bounsweet.png similarity index 100% rename from src/afd/sprites/back/Bounsweet.png rename to src/afd/sprites/back/761--0--Bounsweet.png diff --git a/src/afd/sprites/back/Steenee.png b/src/afd/sprites/back/762--0--Steenee.png similarity index 100% rename from src/afd/sprites/back/Steenee.png rename to src/afd/sprites/back/762--0--Steenee.png diff --git a/src/afd/sprites/back/Tsareena.png b/src/afd/sprites/back/763--0--Tsareena.png similarity index 100% rename from src/afd/sprites/back/Tsareena.png rename to src/afd/sprites/back/763--0--Tsareena.png diff --git a/src/afd/sprites/back/Comfey.png b/src/afd/sprites/back/764--0--Comfey.png similarity index 100% rename from src/afd/sprites/back/Comfey.png rename to src/afd/sprites/back/764--0--Comfey.png diff --git a/src/afd/sprites/back/Oranguru.png b/src/afd/sprites/back/765--0--Oranguru.png similarity index 100% rename from src/afd/sprites/back/Oranguru.png rename to src/afd/sprites/back/765--0--Oranguru.png diff --git a/src/afd/sprites/back/Passimian.png b/src/afd/sprites/back/766--0--Passimian.png similarity index 100% rename from src/afd/sprites/back/Passimian.png rename to src/afd/sprites/back/766--0--Passimian.png diff --git a/src/afd/sprites/back/Wimpod.png b/src/afd/sprites/back/767--0--Wimpod.png similarity index 100% rename from src/afd/sprites/back/Wimpod.png rename to src/afd/sprites/back/767--0--Wimpod.png diff --git a/src/afd/sprites/back/Golisopod.png b/src/afd/sprites/back/768--0--Golisopod.png similarity index 100% rename from src/afd/sprites/back/Golisopod.png rename to src/afd/sprites/back/768--0--Golisopod.png diff --git a/src/afd/sprites/back/Sandygast.png b/src/afd/sprites/back/769--0--Sandygast.png similarity index 100% rename from src/afd/sprites/back/Sandygast.png rename to src/afd/sprites/back/769--0--Sandygast.png diff --git a/src/afd/sprites/back/Ponyta.png b/src/afd/sprites/back/77--0--Ponyta.png similarity index 100% rename from src/afd/sprites/back/Ponyta.png rename to src/afd/sprites/back/77--0--Ponyta.png diff --git a/src/afd/sprites/back/Ponyta--Galar.png b/src/afd/sprites/back/77--420--Ponyta--Galar.png similarity index 100% rename from src/afd/sprites/back/Ponyta--Galar.png rename to src/afd/sprites/back/77--420--Ponyta--Galar.png diff --git a/src/afd/sprites/back/Palossand.png b/src/afd/sprites/back/770--0--Palossand.png similarity index 100% rename from src/afd/sprites/back/Palossand.png rename to src/afd/sprites/back/770--0--Palossand.png diff --git a/src/afd/sprites/back/Pyukumuku.png b/src/afd/sprites/back/771--0--Pyukumuku.png similarity index 100% rename from src/afd/sprites/back/Pyukumuku.png rename to src/afd/sprites/back/771--0--Pyukumuku.png diff --git a/src/afd/sprites/back/Type__003a_Null.png b/src/afd/sprites/back/772--0--Type__003a_Null.png similarity index 100% rename from src/afd/sprites/back/Type__003a_Null.png rename to src/afd/sprites/back/772--0--Type__003a_Null.png diff --git a/src/afd/sprites/back/Silvally.png b/src/afd/sprites/back/773--0--Silvally.png similarity index 100% rename from src/afd/sprites/back/Silvally.png rename to src/afd/sprites/back/773--0--Silvally.png diff --git a/src/afd/sprites/back/Silvally--Bug.png b/src/afd/sprites/back/773--420--Silvally--Bug.png similarity index 100% rename from src/afd/sprites/back/Silvally--Bug.png rename to src/afd/sprites/back/773--420--Silvally--Bug.png diff --git a/src/afd/sprites/back/Silvally--Dark.png b/src/afd/sprites/back/773--420--Silvally--Dark.png similarity index 100% rename from src/afd/sprites/back/Silvally--Dark.png rename to src/afd/sprites/back/773--420--Silvally--Dark.png diff --git a/src/afd/sprites/back/Silvally--Dragon.png b/src/afd/sprites/back/773--420--Silvally--Dragon.png similarity index 100% rename from src/afd/sprites/back/Silvally--Dragon.png rename to src/afd/sprites/back/773--420--Silvally--Dragon.png diff --git a/src/afd/sprites/back/Silvally--Electric.png b/src/afd/sprites/back/773--420--Silvally--Electric.png similarity index 100% rename from src/afd/sprites/back/Silvally--Electric.png rename to src/afd/sprites/back/773--420--Silvally--Electric.png diff --git a/src/afd/sprites/back/Silvally--Fairy.png b/src/afd/sprites/back/773--420--Silvally--Fairy.png similarity index 100% rename from src/afd/sprites/back/Silvally--Fairy.png rename to src/afd/sprites/back/773--420--Silvally--Fairy.png diff --git a/src/afd/sprites/back/Silvally--Fighting.png b/src/afd/sprites/back/773--420--Silvally--Fighting.png similarity index 100% rename from src/afd/sprites/back/Silvally--Fighting.png rename to src/afd/sprites/back/773--420--Silvally--Fighting.png diff --git a/src/afd/sprites/back/Silvally--Fire.png b/src/afd/sprites/back/773--420--Silvally--Fire.png similarity index 100% rename from src/afd/sprites/back/Silvally--Fire.png rename to src/afd/sprites/back/773--420--Silvally--Fire.png diff --git a/src/afd/sprites/back/Silvally--Flying.png b/src/afd/sprites/back/773--420--Silvally--Flying.png similarity index 100% rename from src/afd/sprites/back/Silvally--Flying.png rename to src/afd/sprites/back/773--420--Silvally--Flying.png diff --git a/src/afd/sprites/back/Silvally--Ghost.png b/src/afd/sprites/back/773--420--Silvally--Ghost.png similarity index 100% rename from src/afd/sprites/back/Silvally--Ghost.png rename to src/afd/sprites/back/773--420--Silvally--Ghost.png diff --git a/src/afd/sprites/back/Silvally--Grass.png b/src/afd/sprites/back/773--420--Silvally--Grass.png similarity index 100% rename from src/afd/sprites/back/Silvally--Grass.png rename to src/afd/sprites/back/773--420--Silvally--Grass.png diff --git a/src/afd/sprites/back/Silvally--Ground.png b/src/afd/sprites/back/773--420--Silvally--Ground.png similarity index 100% rename from src/afd/sprites/back/Silvally--Ground.png rename to src/afd/sprites/back/773--420--Silvally--Ground.png diff --git a/src/afd/sprites/back/Silvally--Ice.png b/src/afd/sprites/back/773--420--Silvally--Ice.png similarity index 100% rename from src/afd/sprites/back/Silvally--Ice.png rename to src/afd/sprites/back/773--420--Silvally--Ice.png diff --git a/src/afd/sprites/back/Silvally--Poison.png b/src/afd/sprites/back/773--420--Silvally--Poison.png similarity index 100% rename from src/afd/sprites/back/Silvally--Poison.png rename to src/afd/sprites/back/773--420--Silvally--Poison.png diff --git a/src/afd/sprites/back/Silvally--Psychic.png b/src/afd/sprites/back/773--420--Silvally--Psychic.png similarity index 100% rename from src/afd/sprites/back/Silvally--Psychic.png rename to src/afd/sprites/back/773--420--Silvally--Psychic.png diff --git a/src/afd/sprites/back/Silvally--Rock.png b/src/afd/sprites/back/773--420--Silvally--Rock.png similarity index 100% rename from src/afd/sprites/back/Silvally--Rock.png rename to src/afd/sprites/back/773--420--Silvally--Rock.png diff --git a/src/afd/sprites/back/Silvally--Steel.png b/src/afd/sprites/back/773--420--Silvally--Steel.png similarity index 100% rename from src/afd/sprites/back/Silvally--Steel.png rename to src/afd/sprites/back/773--420--Silvally--Steel.png diff --git a/src/afd/sprites/back/Silvally--Water.png b/src/afd/sprites/back/773--420--Silvally--Water.png similarity index 100% rename from src/afd/sprites/back/Silvally--Water.png rename to src/afd/sprites/back/773--420--Silvally--Water.png diff --git a/src/afd/sprites/back/Minior.png b/src/afd/sprites/back/774--0--Minior.png similarity index 100% rename from src/afd/sprites/back/Minior.png rename to src/afd/sprites/back/774--0--Minior.png diff --git a/src/afd/sprites/back/Minior--Meteor.png b/src/afd/sprites/back/774--420--Minior--Meteor.png similarity index 100% rename from src/afd/sprites/back/Minior--Meteor.png rename to src/afd/sprites/back/774--420--Minior--Meteor.png diff --git a/src/afd/sprites/back/Komala.png b/src/afd/sprites/back/775--0--Komala.png similarity index 100% rename from src/afd/sprites/back/Komala.png rename to src/afd/sprites/back/775--0--Komala.png diff --git a/src/afd/sprites/back/Turtonator.png b/src/afd/sprites/back/776--0--Turtonator.png similarity index 100% rename from src/afd/sprites/back/Turtonator.png rename to src/afd/sprites/back/776--0--Turtonator.png diff --git a/src/afd/sprites/back/Togedemaru.png b/src/afd/sprites/back/777--0--Togedemaru.png similarity index 100% rename from src/afd/sprites/back/Togedemaru.png rename to src/afd/sprites/back/777--0--Togedemaru.png diff --git a/src/afd/sprites/back/Mimikyu.png b/src/afd/sprites/back/778--0--Mimikyu.png similarity index 100% rename from src/afd/sprites/back/Mimikyu.png rename to src/afd/sprites/back/778--0--Mimikyu.png diff --git a/src/afd/sprites/back/Mimikyu--Busted.png b/src/afd/sprites/back/778--420--Mimikyu--Busted.png similarity index 100% rename from src/afd/sprites/back/Mimikyu--Busted.png rename to src/afd/sprites/back/778--420--Mimikyu--Busted.png diff --git a/src/afd/sprites/back/Bruxish.png b/src/afd/sprites/back/779--0--Bruxish.png similarity index 100% rename from src/afd/sprites/back/Bruxish.png rename to src/afd/sprites/back/779--0--Bruxish.png diff --git a/src/afd/sprites/back/Rapidash.png b/src/afd/sprites/back/78--0--Rapidash.png similarity index 100% rename from src/afd/sprites/back/Rapidash.png rename to src/afd/sprites/back/78--0--Rapidash.png diff --git a/src/afd/sprites/back/Rapidash--Galar.png b/src/afd/sprites/back/78--420--Rapidash--Galar.png similarity index 100% rename from src/afd/sprites/back/Rapidash--Galar.png rename to src/afd/sprites/back/78--420--Rapidash--Galar.png diff --git a/src/afd/sprites/back/Drampa.png b/src/afd/sprites/back/780--0--Drampa.png similarity index 100% rename from src/afd/sprites/back/Drampa.png rename to src/afd/sprites/back/780--0--Drampa.png diff --git a/src/afd/sprites/back/Dhelmise.png b/src/afd/sprites/back/781--0--Dhelmise.png similarity index 100% rename from src/afd/sprites/back/Dhelmise.png rename to src/afd/sprites/back/781--0--Dhelmise.png diff --git a/src/afd/sprites/back/Jangmo-o.png b/src/afd/sprites/back/782--0--Jangmo-o.png similarity index 100% rename from src/afd/sprites/back/Jangmo-o.png rename to src/afd/sprites/back/782--0--Jangmo-o.png diff --git a/src/afd/sprites/back/Hakamo-o.png b/src/afd/sprites/back/783--0--Hakamo-o.png similarity index 100% rename from src/afd/sprites/back/Hakamo-o.png rename to src/afd/sprites/back/783--0--Hakamo-o.png diff --git a/src/afd/sprites/back/Kommo-o.png b/src/afd/sprites/back/784--0--Kommo-o.png similarity index 100% rename from src/afd/sprites/back/Kommo-o.png rename to src/afd/sprites/back/784--0--Kommo-o.png diff --git a/src/afd/sprites/back/Tapu_Koko.png b/src/afd/sprites/back/785--0--Tapu_Koko.png similarity index 100% rename from src/afd/sprites/back/Tapu_Koko.png rename to src/afd/sprites/back/785--0--Tapu_Koko.png diff --git a/src/afd/sprites/back/Tapu_Lele.png b/src/afd/sprites/back/786--0--Tapu_Lele.png similarity index 100% rename from src/afd/sprites/back/Tapu_Lele.png rename to src/afd/sprites/back/786--0--Tapu_Lele.png diff --git a/src/afd/sprites/back/Tapu_Bulu.png b/src/afd/sprites/back/787--0--Tapu_Bulu.png similarity index 100% rename from src/afd/sprites/back/Tapu_Bulu.png rename to src/afd/sprites/back/787--0--Tapu_Bulu.png diff --git a/src/afd/sprites/back/Tapu_Fini.png b/src/afd/sprites/back/788--0--Tapu_Fini.png similarity index 100% rename from src/afd/sprites/back/Tapu_Fini.png rename to src/afd/sprites/back/788--0--Tapu_Fini.png diff --git a/src/afd/sprites/back/Cosmog.png b/src/afd/sprites/back/789--0--Cosmog.png similarity index 100% rename from src/afd/sprites/back/Cosmog.png rename to src/afd/sprites/back/789--0--Cosmog.png diff --git a/src/afd/sprites/back/Slowpoke.png b/src/afd/sprites/back/79--0--Slowpoke.png similarity index 100% rename from src/afd/sprites/back/Slowpoke.png rename to src/afd/sprites/back/79--0--Slowpoke.png diff --git a/src/afd/sprites/back/Slowpoke--Galar.png b/src/afd/sprites/back/79--420--Slowpoke--Galar.png similarity index 100% rename from src/afd/sprites/back/Slowpoke--Galar.png rename to src/afd/sprites/back/79--420--Slowpoke--Galar.png diff --git a/src/afd/sprites/back/Cosmoem.png b/src/afd/sprites/back/790--0--Cosmoem.png similarity index 100% rename from src/afd/sprites/back/Cosmoem.png rename to src/afd/sprites/back/790--0--Cosmoem.png diff --git a/src/afd/sprites/back/Solgaleo.png b/src/afd/sprites/back/791--0--Solgaleo.png similarity index 100% rename from src/afd/sprites/back/Solgaleo.png rename to src/afd/sprites/back/791--0--Solgaleo.png diff --git a/src/afd/sprites/back/Lunala.png b/src/afd/sprites/back/792--0--Lunala.png similarity index 100% rename from src/afd/sprites/back/Lunala.png rename to src/afd/sprites/back/792--0--Lunala.png diff --git a/src/afd/sprites/back/Nihilego.png b/src/afd/sprites/back/793--0--Nihilego.png similarity index 100% rename from src/afd/sprites/back/Nihilego.png rename to src/afd/sprites/back/793--0--Nihilego.png diff --git a/src/afd/sprites/back/Buzzwole.png b/src/afd/sprites/back/794--0--Buzzwole.png similarity index 100% rename from src/afd/sprites/back/Buzzwole.png rename to src/afd/sprites/back/794--0--Buzzwole.png diff --git a/src/afd/sprites/back/Pheromosa.png b/src/afd/sprites/back/795--0--Pheromosa.png similarity index 100% rename from src/afd/sprites/back/Pheromosa.png rename to src/afd/sprites/back/795--0--Pheromosa.png diff --git a/src/afd/sprites/back/Xurkitree.png b/src/afd/sprites/back/796--0--Xurkitree.png similarity index 100% rename from src/afd/sprites/back/Xurkitree.png rename to src/afd/sprites/back/796--0--Xurkitree.png diff --git a/src/afd/sprites/back/Celesteela.png b/src/afd/sprites/back/797--0--Celesteela.png similarity index 100% rename from src/afd/sprites/back/Celesteela.png rename to src/afd/sprites/back/797--0--Celesteela.png diff --git a/src/afd/sprites/back/Kartana.png b/src/afd/sprites/back/798--0--Kartana.png similarity index 100% rename from src/afd/sprites/back/Kartana.png rename to src/afd/sprites/back/798--0--Kartana.png diff --git a/src/afd/sprites/back/Guzzlord.png b/src/afd/sprites/back/799--0--Guzzlord.png similarity index 100% rename from src/afd/sprites/back/Guzzlord.png rename to src/afd/sprites/back/799--0--Guzzlord.png diff --git a/src/afd/sprites/back/Fidgit.png b/src/afd/sprites/back/8--0--Fidgit.png similarity index 100% rename from src/afd/sprites/back/Fidgit.png rename to src/afd/sprites/back/8--0--Fidgit.png diff --git a/src/afd/sprites/back/Wartortle.png b/src/afd/sprites/back/8--0--Wartortle.png similarity index 100% rename from src/afd/sprites/back/Wartortle.png rename to src/afd/sprites/back/8--0--Wartortle.png diff --git a/src/afd/sprites/back/Slowbro.png b/src/afd/sprites/back/80--0--Slowbro.png similarity index 100% rename from src/afd/sprites/back/Slowbro.png rename to src/afd/sprites/back/80--0--Slowbro.png diff --git a/src/afd/sprites/back/Slowbro--Mega.png b/src/afd/sprites/back/80--420--Slowbro--Mega.png similarity index 100% rename from src/afd/sprites/back/Slowbro--Mega.png rename to src/afd/sprites/back/80--420--Slowbro--Mega.png diff --git a/src/afd/sprites/back/Necrozma.png b/src/afd/sprites/back/800--0--Necrozma.png similarity index 100% rename from src/afd/sprites/back/Necrozma.png rename to src/afd/sprites/back/800--0--Necrozma.png diff --git a/src/afd/sprites/back/Necrozma--Dawn-Wings.png b/src/afd/sprites/back/800--420--Necrozma--Dawn-Wings.png similarity index 100% rename from src/afd/sprites/back/Necrozma--Dawn-Wings.png rename to src/afd/sprites/back/800--420--Necrozma--Dawn-Wings.png diff --git a/src/afd/sprites/back/Necrozma--Dusk-Mane.png b/src/afd/sprites/back/800--420--Necrozma--Dusk-Mane.png similarity index 100% rename from src/afd/sprites/back/Necrozma--Dusk-Mane.png rename to src/afd/sprites/back/800--420--Necrozma--Dusk-Mane.png diff --git a/src/afd/sprites/back/Necrozma--Ultra.png b/src/afd/sprites/back/800--420--Necrozma--Ultra.png similarity index 100% rename from src/afd/sprites/back/Necrozma--Ultra.png rename to src/afd/sprites/back/800--420--Necrozma--Ultra.png diff --git a/src/afd/sprites/back/Magearna.png b/src/afd/sprites/back/801--0--Magearna.png similarity index 100% rename from src/afd/sprites/back/Magearna.png rename to src/afd/sprites/back/801--0--Magearna.png diff --git a/src/afd/sprites/back/Marshadow.png b/src/afd/sprites/back/802--0--Marshadow.png similarity index 100% rename from src/afd/sprites/back/Marshadow.png rename to src/afd/sprites/back/802--0--Marshadow.png diff --git a/src/afd/sprites/back/Poipole.png b/src/afd/sprites/back/803--0--Poipole.png similarity index 100% rename from src/afd/sprites/back/Poipole.png rename to src/afd/sprites/back/803--0--Poipole.png diff --git a/src/afd/sprites/back/Naganadel.png b/src/afd/sprites/back/804--0--Naganadel.png similarity index 100% rename from src/afd/sprites/back/Naganadel.png rename to src/afd/sprites/back/804--0--Naganadel.png diff --git a/src/afd/sprites/back/Stakataka.png b/src/afd/sprites/back/805--0--Stakataka.png similarity index 100% rename from src/afd/sprites/back/Stakataka.png rename to src/afd/sprites/back/805--0--Stakataka.png diff --git a/src/afd/sprites/back/Blacephalon.png b/src/afd/sprites/back/806--0--Blacephalon.png similarity index 100% rename from src/afd/sprites/back/Blacephalon.png rename to src/afd/sprites/back/806--0--Blacephalon.png diff --git a/src/afd/sprites/back/Zeraora.png b/src/afd/sprites/back/807--0--Zeraora.png similarity index 100% rename from src/afd/sprites/back/Zeraora.png rename to src/afd/sprites/back/807--0--Zeraora.png diff --git a/src/afd/sprites/back/Meltan.png b/src/afd/sprites/back/808--0--Meltan.png similarity index 100% rename from src/afd/sprites/back/Meltan.png rename to src/afd/sprites/back/808--0--Meltan.png diff --git a/src/afd/sprites/back/Melmetal.png b/src/afd/sprites/back/809--0--Melmetal.png similarity index 100% rename from src/afd/sprites/back/Melmetal.png rename to src/afd/sprites/back/809--0--Melmetal.png diff --git a/src/afd/sprites/back/Melmetal--Gmax.png b/src/afd/sprites/back/809--420--Melmetal--Gmax.png similarity index 100% rename from src/afd/sprites/back/Melmetal--Gmax.png rename to src/afd/sprites/back/809--420--Melmetal--Gmax.png diff --git a/src/afd/sprites/back/Magnemite.png b/src/afd/sprites/back/81--0--Magnemite.png similarity index 100% rename from src/afd/sprites/back/Magnemite.png rename to src/afd/sprites/back/81--0--Magnemite.png diff --git a/src/afd/sprites/back/Grookey.png b/src/afd/sprites/back/810--0--Grookey.png similarity index 100% rename from src/afd/sprites/back/Grookey.png rename to src/afd/sprites/back/810--0--Grookey.png diff --git a/src/afd/sprites/back/Thwackey.png b/src/afd/sprites/back/811--0--Thwackey.png similarity index 100% rename from src/afd/sprites/back/Thwackey.png rename to src/afd/sprites/back/811--0--Thwackey.png diff --git a/src/afd/sprites/back/Rillaboom.png b/src/afd/sprites/back/812--0--Rillaboom.png similarity index 100% rename from src/afd/sprites/back/Rillaboom.png rename to src/afd/sprites/back/812--0--Rillaboom.png diff --git a/src/afd/sprites/back/Scorbunny.png b/src/afd/sprites/back/813--0--Scorbunny.png similarity index 100% rename from src/afd/sprites/back/Scorbunny.png rename to src/afd/sprites/back/813--0--Scorbunny.png diff --git a/src/afd/sprites/back/Raboot.png b/src/afd/sprites/back/814--0--Raboot.png similarity index 100% rename from src/afd/sprites/back/Raboot.png rename to src/afd/sprites/back/814--0--Raboot.png diff --git a/src/afd/sprites/back/Cinderace.png b/src/afd/sprites/back/815--0--Cinderace.png similarity index 100% rename from src/afd/sprites/back/Cinderace.png rename to src/afd/sprites/back/815--0--Cinderace.png diff --git a/src/afd/sprites/back/Sobble.png b/src/afd/sprites/back/816--0--Sobble.png similarity index 100% rename from src/afd/sprites/back/Sobble.png rename to src/afd/sprites/back/816--0--Sobble.png diff --git a/src/afd/sprites/back/Drizzile.png b/src/afd/sprites/back/817--0--Drizzile.png similarity index 100% rename from src/afd/sprites/back/Drizzile.png rename to src/afd/sprites/back/817--0--Drizzile.png diff --git a/src/afd/sprites/back/Inteleon.png b/src/afd/sprites/back/818--0--Inteleon.png similarity index 100% rename from src/afd/sprites/back/Inteleon.png rename to src/afd/sprites/back/818--0--Inteleon.png diff --git a/src/afd/sprites/back/Skwovet.png b/src/afd/sprites/back/819--0--Skwovet.png similarity index 100% rename from src/afd/sprites/back/Skwovet.png rename to src/afd/sprites/back/819--0--Skwovet.png diff --git a/src/afd/sprites/back/Magneton.png b/src/afd/sprites/back/82--0--Magneton.png similarity index 100% rename from src/afd/sprites/back/Magneton.png rename to src/afd/sprites/back/82--0--Magneton.png diff --git a/src/afd/sprites/back/Greedent.png b/src/afd/sprites/back/820--0--Greedent.png similarity index 100% rename from src/afd/sprites/back/Greedent.png rename to src/afd/sprites/back/820--0--Greedent.png diff --git a/src/afd/sprites/back/Rookidee.png b/src/afd/sprites/back/821--0--Rookidee.png similarity index 100% rename from src/afd/sprites/back/Rookidee.png rename to src/afd/sprites/back/821--0--Rookidee.png diff --git a/src/afd/sprites/back/Corvisquire.png b/src/afd/sprites/back/822--0--Corvisquire.png similarity index 100% rename from src/afd/sprites/back/Corvisquire.png rename to src/afd/sprites/back/822--0--Corvisquire.png diff --git a/src/afd/sprites/back/Corviknight.png b/src/afd/sprites/back/823--0--Corviknight.png similarity index 100% rename from src/afd/sprites/back/Corviknight.png rename to src/afd/sprites/back/823--0--Corviknight.png diff --git a/src/afd/sprites/back/Corviknight--Gmax.png b/src/afd/sprites/back/823--420--Corviknight--Gmax.png similarity index 100% rename from src/afd/sprites/back/Corviknight--Gmax.png rename to src/afd/sprites/back/823--420--Corviknight--Gmax.png diff --git a/src/afd/sprites/back/Blipbug.png b/src/afd/sprites/back/824--0--Blipbug.png similarity index 100% rename from src/afd/sprites/back/Blipbug.png rename to src/afd/sprites/back/824--0--Blipbug.png diff --git a/src/afd/sprites/back/Dottler.png b/src/afd/sprites/back/825--0--Dottler.png similarity index 100% rename from src/afd/sprites/back/Dottler.png rename to src/afd/sprites/back/825--0--Dottler.png diff --git a/src/afd/sprites/back/Orbeetle.png b/src/afd/sprites/back/826--0--Orbeetle.png similarity index 100% rename from src/afd/sprites/back/Orbeetle.png rename to src/afd/sprites/back/826--0--Orbeetle.png diff --git a/src/afd/sprites/back/Orbeetle--Gmax.png b/src/afd/sprites/back/826--420--Orbeetle--Gmax.png similarity index 100% rename from src/afd/sprites/back/Orbeetle--Gmax.png rename to src/afd/sprites/back/826--420--Orbeetle--Gmax.png diff --git a/src/afd/sprites/back/Nickit.png b/src/afd/sprites/back/827--0--Nickit.png similarity index 100% rename from src/afd/sprites/back/Nickit.png rename to src/afd/sprites/back/827--0--Nickit.png diff --git a/src/afd/sprites/back/Thievul.png b/src/afd/sprites/back/828--0--Thievul.png similarity index 100% rename from src/afd/sprites/back/Thievul.png rename to src/afd/sprites/back/828--0--Thievul.png diff --git a/src/afd/sprites/back/Gossifleur.png b/src/afd/sprites/back/829--0--Gossifleur.png similarity index 100% rename from src/afd/sprites/back/Gossifleur.png rename to src/afd/sprites/back/829--0--Gossifleur.png diff --git a/src/afd/sprites/back/Farfetch__0027d.png b/src/afd/sprites/back/83--0--Farfetch__0027d.png similarity index 100% rename from src/afd/sprites/back/Farfetch__0027d.png rename to src/afd/sprites/back/83--0--Farfetch__0027d.png diff --git a/src/afd/sprites/back/Farfetch__0027d--Galar.png b/src/afd/sprites/back/83--420--Farfetch__0027d--Galar.png similarity index 100% rename from src/afd/sprites/back/Farfetch__0027d--Galar.png rename to src/afd/sprites/back/83--420--Farfetch__0027d--Galar.png diff --git a/src/afd/sprites/back/Eldegoss.png b/src/afd/sprites/back/830--0--Eldegoss.png similarity index 100% rename from src/afd/sprites/back/Eldegoss.png rename to src/afd/sprites/back/830--0--Eldegoss.png diff --git a/src/afd/sprites/back/Wooloo.png b/src/afd/sprites/back/831--0--Wooloo.png similarity index 100% rename from src/afd/sprites/back/Wooloo.png rename to src/afd/sprites/back/831--0--Wooloo.png diff --git a/src/afd/sprites/back/Dubwool.png b/src/afd/sprites/back/832--0--Dubwool.png similarity index 100% rename from src/afd/sprites/back/Dubwool.png rename to src/afd/sprites/back/832--0--Dubwool.png diff --git a/src/afd/sprites/back/Chewtle.png b/src/afd/sprites/back/833--0--Chewtle.png similarity index 100% rename from src/afd/sprites/back/Chewtle.png rename to src/afd/sprites/back/833--0--Chewtle.png diff --git a/src/afd/sprites/back/Drednaw.png b/src/afd/sprites/back/834--0--Drednaw.png similarity index 100% rename from src/afd/sprites/back/Drednaw.png rename to src/afd/sprites/back/834--0--Drednaw.png diff --git a/src/afd/sprites/back/Drednaw--Gmax.png b/src/afd/sprites/back/834--420--Drednaw--Gmax.png similarity index 100% rename from src/afd/sprites/back/Drednaw--Gmax.png rename to src/afd/sprites/back/834--420--Drednaw--Gmax.png diff --git a/src/afd/sprites/back/Yamper.png b/src/afd/sprites/back/835--0--Yamper.png similarity index 100% rename from src/afd/sprites/back/Yamper.png rename to src/afd/sprites/back/835--0--Yamper.png diff --git a/src/afd/sprites/back/Boltund.png b/src/afd/sprites/back/836--0--Boltund.png similarity index 100% rename from src/afd/sprites/back/Boltund.png rename to src/afd/sprites/back/836--0--Boltund.png diff --git a/src/afd/sprites/back/Rolycoly.png b/src/afd/sprites/back/837--0--Rolycoly.png similarity index 100% rename from src/afd/sprites/back/Rolycoly.png rename to src/afd/sprites/back/837--0--Rolycoly.png diff --git a/src/afd/sprites/back/Carkol.png b/src/afd/sprites/back/838--0--Carkol.png similarity index 100% rename from src/afd/sprites/back/Carkol.png rename to src/afd/sprites/back/838--0--Carkol.png diff --git a/src/afd/sprites/back/Coalossal.png b/src/afd/sprites/back/839--0--Coalossal.png similarity index 100% rename from src/afd/sprites/back/Coalossal.png rename to src/afd/sprites/back/839--0--Coalossal.png diff --git a/src/afd/sprites/back/Coalossal--Gmax.png b/src/afd/sprites/back/839--420--Coalossal--Gmax.png similarity index 100% rename from src/afd/sprites/back/Coalossal--Gmax.png rename to src/afd/sprites/back/839--420--Coalossal--Gmax.png diff --git a/src/afd/sprites/back/Doduo.png b/src/afd/sprites/back/84--0--Doduo.png similarity index 100% rename from src/afd/sprites/back/Doduo.png rename to src/afd/sprites/back/84--0--Doduo.png diff --git a/src/afd/sprites/back/Applin.png b/src/afd/sprites/back/840--0--Applin.png similarity index 100% rename from src/afd/sprites/back/Applin.png rename to src/afd/sprites/back/840--0--Applin.png diff --git a/src/afd/sprites/back/Flapple.png b/src/afd/sprites/back/841--0--Flapple.png similarity index 100% rename from src/afd/sprites/back/Flapple.png rename to src/afd/sprites/back/841--0--Flapple.png diff --git a/src/afd/sprites/back/Appletun--Gmax.png b/src/afd/sprites/back/841--420--Flapple--Gmax.png similarity index 100% rename from src/afd/sprites/back/Appletun--Gmax.png rename to src/afd/sprites/back/841--420--Flapple--Gmax.png diff --git a/src/afd/sprites/back/Appletun.png b/src/afd/sprites/back/842--0--Appletun.png similarity index 100% rename from src/afd/sprites/back/Appletun.png rename to src/afd/sprites/back/842--0--Appletun.png diff --git a/src/afd/sprites/back/Flapple--Gmax.png b/src/afd/sprites/back/842--420--Appletun--Gmax.png similarity index 100% rename from src/afd/sprites/back/Flapple--Gmax.png rename to src/afd/sprites/back/842--420--Appletun--Gmax.png diff --git a/src/afd/sprites/back/Silicobra.png b/src/afd/sprites/back/843--0--Silicobra.png similarity index 100% rename from src/afd/sprites/back/Silicobra.png rename to src/afd/sprites/back/843--0--Silicobra.png diff --git a/src/afd/sprites/back/Sandaconda.png b/src/afd/sprites/back/844--0--Sandaconda.png similarity index 100% rename from src/afd/sprites/back/Sandaconda.png rename to src/afd/sprites/back/844--0--Sandaconda.png diff --git a/src/afd/sprites/back/Sandaconda--Gmax.png b/src/afd/sprites/back/844--420--Sandaconda--Gmax.png similarity index 100% rename from src/afd/sprites/back/Sandaconda--Gmax.png rename to src/afd/sprites/back/844--420--Sandaconda--Gmax.png diff --git a/src/afd/sprites/back/Cramorant.png b/src/afd/sprites/back/845--0--Cramorant.png similarity index 100% rename from src/afd/sprites/back/Cramorant.png rename to src/afd/sprites/back/845--0--Cramorant.png diff --git a/src/afd/sprites/back/Cramorant--Gorging.png b/src/afd/sprites/back/845--420--Cramorant--Gorging.png similarity index 100% rename from src/afd/sprites/back/Cramorant--Gorging.png rename to src/afd/sprites/back/845--420--Cramorant--Gorging.png diff --git a/src/afd/sprites/back/Cramorant--Gulping.png b/src/afd/sprites/back/845--420--Cramorant--Gulping.png similarity index 100% rename from src/afd/sprites/back/Cramorant--Gulping.png rename to src/afd/sprites/back/845--420--Cramorant--Gulping.png diff --git a/src/afd/sprites/back/Arrokuda.png b/src/afd/sprites/back/846--0--Arrokuda.png similarity index 100% rename from src/afd/sprites/back/Arrokuda.png rename to src/afd/sprites/back/846--0--Arrokuda.png diff --git a/src/afd/sprites/back/Barraskewda.png b/src/afd/sprites/back/847--0--Barraskewda.png similarity index 100% rename from src/afd/sprites/back/Barraskewda.png rename to src/afd/sprites/back/847--0--Barraskewda.png diff --git a/src/afd/sprites/back/Toxel.png b/src/afd/sprites/back/848--0--Toxel.png similarity index 100% rename from src/afd/sprites/back/Toxel.png rename to src/afd/sprites/back/848--0--Toxel.png diff --git a/src/afd/sprites/back/Toxtricity.png b/src/afd/sprites/back/849--0--Toxtricity.png similarity index 100% rename from src/afd/sprites/back/Toxtricity.png rename to src/afd/sprites/back/849--0--Toxtricity.png diff --git a/src/afd/sprites/back/Toxtricity--Gmax.png b/src/afd/sprites/back/849--420--Toxtricity--Gmax.png similarity index 100% rename from src/afd/sprites/back/Toxtricity--Gmax.png rename to src/afd/sprites/back/849--420--Toxtricity--Gmax.png diff --git a/src/afd/sprites/back/Toxtricity--Low-Key-Gmax.png b/src/afd/sprites/back/849--420--Toxtricity--Low-Key-Gmax.png similarity index 100% rename from src/afd/sprites/back/Toxtricity--Low-Key-Gmax.png rename to src/afd/sprites/back/849--420--Toxtricity--Low-Key-Gmax.png diff --git a/src/afd/sprites/back/Toxtricity--Low-Key.png b/src/afd/sprites/back/849--420--Toxtricity--Low-Key.png similarity index 100% rename from src/afd/sprites/back/Toxtricity--Low-Key.png rename to src/afd/sprites/back/849--420--Toxtricity--Low-Key.png diff --git a/src/afd/sprites/back/Dodrio.png b/src/afd/sprites/back/85--0--Dodrio.png similarity index 100% rename from src/afd/sprites/back/Dodrio.png rename to src/afd/sprites/back/85--0--Dodrio.png diff --git a/src/afd/sprites/back/Sizzlipede.png b/src/afd/sprites/back/850--0--Sizzlipede.png similarity index 100% rename from src/afd/sprites/back/Sizzlipede.png rename to src/afd/sprites/back/850--0--Sizzlipede.png diff --git a/src/afd/sprites/back/Centiskorch.png b/src/afd/sprites/back/851--0--Centiskorch.png similarity index 100% rename from src/afd/sprites/back/Centiskorch.png rename to src/afd/sprites/back/851--0--Centiskorch.png diff --git a/src/afd/sprites/back/Centiskorch--Gmax.png b/src/afd/sprites/back/851--420--Centiskorch--Gmax.png similarity index 100% rename from src/afd/sprites/back/Centiskorch--Gmax.png rename to src/afd/sprites/back/851--420--Centiskorch--Gmax.png diff --git a/src/afd/sprites/back/Clobbopus.png b/src/afd/sprites/back/852--0--Clobbopus.png similarity index 100% rename from src/afd/sprites/back/Clobbopus.png rename to src/afd/sprites/back/852--0--Clobbopus.png diff --git a/src/afd/sprites/back/Grapploct.png b/src/afd/sprites/back/853--0--Grapploct.png similarity index 100% rename from src/afd/sprites/back/Grapploct.png rename to src/afd/sprites/back/853--0--Grapploct.png diff --git a/src/afd/sprites/back/Sinistea.png b/src/afd/sprites/back/854--0--Sinistea.png similarity index 100% rename from src/afd/sprites/back/Sinistea.png rename to src/afd/sprites/back/854--0--Sinistea.png diff --git a/src/afd/sprites/back/Polteageist.png b/src/afd/sprites/back/855--0--Polteageist.png similarity index 100% rename from src/afd/sprites/back/Polteageist.png rename to src/afd/sprites/back/855--0--Polteageist.png diff --git a/src/afd/sprites/back/Hatenna.png b/src/afd/sprites/back/856--0--Hatenna.png similarity index 100% rename from src/afd/sprites/back/Hatenna.png rename to src/afd/sprites/back/856--0--Hatenna.png diff --git a/src/afd/sprites/back/Hattrem.png b/src/afd/sprites/back/857--0--Hattrem.png similarity index 100% rename from src/afd/sprites/back/Hattrem.png rename to src/afd/sprites/back/857--0--Hattrem.png diff --git a/src/afd/sprites/back/Hatterene.png b/src/afd/sprites/back/858--0--Hatterene.png similarity index 100% rename from src/afd/sprites/back/Hatterene.png rename to src/afd/sprites/back/858--0--Hatterene.png diff --git a/src/afd/sprites/back/Hatterene--Gmax.png b/src/afd/sprites/back/858--420--Hatterene--Gmax.png similarity index 100% rename from src/afd/sprites/back/Hatterene--Gmax.png rename to src/afd/sprites/back/858--420--Hatterene--Gmax.png diff --git a/src/afd/sprites/back/Impidimp.png b/src/afd/sprites/back/859--0--Impidimp.png similarity index 100% rename from src/afd/sprites/back/Impidimp.png rename to src/afd/sprites/back/859--0--Impidimp.png diff --git a/src/afd/sprites/back/Seel.png b/src/afd/sprites/back/86--0--Seel.png similarity index 100% rename from src/afd/sprites/back/Seel.png rename to src/afd/sprites/back/86--0--Seel.png diff --git a/src/afd/sprites/back/Morgrem.png b/src/afd/sprites/back/860--0--Morgrem.png similarity index 100% rename from src/afd/sprites/back/Morgrem.png rename to src/afd/sprites/back/860--0--Morgrem.png diff --git a/src/afd/sprites/back/Grimmsnarl.png b/src/afd/sprites/back/861--0--Grimmsnarl.png similarity index 100% rename from src/afd/sprites/back/Grimmsnarl.png rename to src/afd/sprites/back/861--0--Grimmsnarl.png diff --git a/src/afd/sprites/back/Grimmsnarl--Gmax.png b/src/afd/sprites/back/861--420--Grimmsnarl--Gmax.png similarity index 100% rename from src/afd/sprites/back/Grimmsnarl--Gmax.png rename to src/afd/sprites/back/861--420--Grimmsnarl--Gmax.png diff --git a/src/afd/sprites/back/Obstagoon.png b/src/afd/sprites/back/862--0--Obstagoon.png similarity index 100% rename from src/afd/sprites/back/Obstagoon.png rename to src/afd/sprites/back/862--0--Obstagoon.png diff --git a/src/afd/sprites/back/Perrserker.png b/src/afd/sprites/back/863--0--Perrserker.png similarity index 100% rename from src/afd/sprites/back/Perrserker.png rename to src/afd/sprites/back/863--0--Perrserker.png diff --git a/src/afd/sprites/back/Cursola.png b/src/afd/sprites/back/864--0--Cursola.png similarity index 100% rename from src/afd/sprites/back/Cursola.png rename to src/afd/sprites/back/864--0--Cursola.png diff --git a/src/afd/sprites/back/Sirfetch__0027d.png b/src/afd/sprites/back/865--0--Sirfetch__0027d.png similarity index 100% rename from src/afd/sprites/back/Sirfetch__0027d.png rename to src/afd/sprites/back/865--0--Sirfetch__0027d.png diff --git a/src/afd/sprites/back/Mr._Rime.png b/src/afd/sprites/back/866--0--Mr._Rime.png similarity index 100% rename from src/afd/sprites/back/Mr._Rime.png rename to src/afd/sprites/back/866--0--Mr._Rime.png diff --git a/src/afd/sprites/back/Runerigus.png b/src/afd/sprites/back/867--0--Runerigus.png similarity index 100% rename from src/afd/sprites/back/Runerigus.png rename to src/afd/sprites/back/867--0--Runerigus.png diff --git a/src/afd/sprites/back/Milcery.png b/src/afd/sprites/back/868--0--Milcery.png similarity index 100% rename from src/afd/sprites/back/Milcery.png rename to src/afd/sprites/back/868--0--Milcery.png diff --git a/src/afd/sprites/back/Alcremie.png b/src/afd/sprites/back/869--0--Alcremie.png similarity index 100% rename from src/afd/sprites/back/Alcremie.png rename to src/afd/sprites/back/869--0--Alcremie.png diff --git a/src/afd/sprites/back/Alcremie--Gmax.png b/src/afd/sprites/back/869--420--Alcremie--Gmax.png similarity index 100% rename from src/afd/sprites/back/Alcremie--Gmax.png rename to src/afd/sprites/back/869--420--Alcremie--Gmax.png diff --git a/src/afd/sprites/back/Dewgong.png b/src/afd/sprites/back/87--0--Dewgong.png similarity index 100% rename from src/afd/sprites/back/Dewgong.png rename to src/afd/sprites/back/87--0--Dewgong.png diff --git a/src/afd/sprites/back/Falinks.png b/src/afd/sprites/back/870--0--Falinks.png similarity index 100% rename from src/afd/sprites/back/Falinks.png rename to src/afd/sprites/back/870--0--Falinks.png diff --git a/src/afd/sprites/back/Pincurchin.png b/src/afd/sprites/back/871--0--Pincurchin.png similarity index 100% rename from src/afd/sprites/back/Pincurchin.png rename to src/afd/sprites/back/871--0--Pincurchin.png diff --git a/src/afd/sprites/back/Snom.png b/src/afd/sprites/back/872--0--Snom.png similarity index 100% rename from src/afd/sprites/back/Snom.png rename to src/afd/sprites/back/872--0--Snom.png diff --git a/src/afd/sprites/back/Frosmoth.png b/src/afd/sprites/back/873--0--Frosmoth.png similarity index 100% rename from src/afd/sprites/back/Frosmoth.png rename to src/afd/sprites/back/873--0--Frosmoth.png diff --git a/src/afd/sprites/back/Stonjourner.png b/src/afd/sprites/back/874--0--Stonjourner.png similarity index 100% rename from src/afd/sprites/back/Stonjourner.png rename to src/afd/sprites/back/874--0--Stonjourner.png diff --git a/src/afd/sprites/back/Eiscue.png b/src/afd/sprites/back/875--0--Eiscue.png similarity index 100% rename from src/afd/sprites/back/Eiscue.png rename to src/afd/sprites/back/875--0--Eiscue.png diff --git a/src/afd/sprites/back/Eiscue--Noice.png b/src/afd/sprites/back/875--420--Eiscue--Noice.png similarity index 100% rename from src/afd/sprites/back/Eiscue--Noice.png rename to src/afd/sprites/back/875--420--Eiscue--Noice.png diff --git a/src/afd/sprites/back/Indeedee.png b/src/afd/sprites/back/876--0--Indeedee.png similarity index 100% rename from src/afd/sprites/back/Indeedee.png rename to src/afd/sprites/back/876--0--Indeedee.png diff --git a/src/afd/sprites/back/Indeedee--F.png b/src/afd/sprites/back/876--420--Indeedee--F.png similarity index 100% rename from src/afd/sprites/back/Indeedee--F.png rename to src/afd/sprites/back/876--420--Indeedee--F.png diff --git a/src/afd/sprites/back/Morpeko.png b/src/afd/sprites/back/877--0--Morpeko.png similarity index 100% rename from src/afd/sprites/back/Morpeko.png rename to src/afd/sprites/back/877--0--Morpeko.png diff --git a/src/afd/sprites/back/Morpeko--Hangry.png b/src/afd/sprites/back/877--420--Morpeko--Hangry.png similarity index 100% rename from src/afd/sprites/back/Morpeko--Hangry.png rename to src/afd/sprites/back/877--420--Morpeko--Hangry.png diff --git a/src/afd/sprites/back/Cufant.png b/src/afd/sprites/back/878--0--Cufant.png similarity index 100% rename from src/afd/sprites/back/Cufant.png rename to src/afd/sprites/back/878--0--Cufant.png diff --git a/src/afd/sprites/back/Copperajah.png b/src/afd/sprites/back/879--0--Copperajah.png similarity index 100% rename from src/afd/sprites/back/Copperajah.png rename to src/afd/sprites/back/879--0--Copperajah.png diff --git a/src/afd/sprites/back/Copperajah--Gmax.png b/src/afd/sprites/back/879--420--Copperajah--Gmax.png similarity index 100% rename from src/afd/sprites/back/Copperajah--Gmax.png rename to src/afd/sprites/back/879--420--Copperajah--Gmax.png diff --git a/src/afd/sprites/back/Grimer.png b/src/afd/sprites/back/88--0--Grimer.png similarity index 100% rename from src/afd/sprites/back/Grimer.png rename to src/afd/sprites/back/88--0--Grimer.png diff --git a/src/afd/sprites/back/Grimer--Alola.png b/src/afd/sprites/back/88--420--Grimer--Alola.png similarity index 100% rename from src/afd/sprites/back/Grimer--Alola.png rename to src/afd/sprites/back/88--420--Grimer--Alola.png diff --git a/src/afd/sprites/back/Dracozolt.png b/src/afd/sprites/back/880--0--Dracozolt.png similarity index 100% rename from src/afd/sprites/back/Dracozolt.png rename to src/afd/sprites/back/880--0--Dracozolt.png diff --git a/src/afd/sprites/back/Arctozolt.png b/src/afd/sprites/back/881--0--Arctozolt.png similarity index 100% rename from src/afd/sprites/back/Arctozolt.png rename to src/afd/sprites/back/881--0--Arctozolt.png diff --git a/src/afd/sprites/back/Dracovish.png b/src/afd/sprites/back/882--0--Dracovish.png similarity index 100% rename from src/afd/sprites/back/Dracovish.png rename to src/afd/sprites/back/882--0--Dracovish.png diff --git a/src/afd/sprites/back/Arctovish.png b/src/afd/sprites/back/883--0--Arctovish.png similarity index 100% rename from src/afd/sprites/back/Arctovish.png rename to src/afd/sprites/back/883--0--Arctovish.png diff --git a/src/afd/sprites/back/Duraludon.png b/src/afd/sprites/back/884--0--Duraludon.png similarity index 100% rename from src/afd/sprites/back/Duraludon.png rename to src/afd/sprites/back/884--0--Duraludon.png diff --git a/src/afd/sprites/back/Duraludon--Gmax.png b/src/afd/sprites/back/884--420--Duraludon--Gmax.png similarity index 100% rename from src/afd/sprites/back/Duraludon--Gmax.png rename to src/afd/sprites/back/884--420--Duraludon--Gmax.png diff --git a/src/afd/sprites/back/Dreepy.png b/src/afd/sprites/back/885--0--Dreepy.png similarity index 100% rename from src/afd/sprites/back/Dreepy.png rename to src/afd/sprites/back/885--0--Dreepy.png diff --git a/src/afd/sprites/back/Drakloak.png b/src/afd/sprites/back/886--0--Drakloak.png similarity index 100% rename from src/afd/sprites/back/Drakloak.png rename to src/afd/sprites/back/886--0--Drakloak.png diff --git a/src/afd/sprites/back/Dragapult.png b/src/afd/sprites/back/887--0--Dragapult.png similarity index 100% rename from src/afd/sprites/back/Dragapult.png rename to src/afd/sprites/back/887--0--Dragapult.png diff --git a/src/afd/sprites/back/Zacian.png b/src/afd/sprites/back/888--0--Zacian.png similarity index 100% rename from src/afd/sprites/back/Zacian.png rename to src/afd/sprites/back/888--0--Zacian.png diff --git a/src/afd/sprites/back/Zacian--Crowned.png b/src/afd/sprites/back/888--420--Zacian--Crowned.png similarity index 100% rename from src/afd/sprites/back/Zacian--Crowned.png rename to src/afd/sprites/back/888--420--Zacian--Crowned.png diff --git a/src/afd/sprites/back/Zamazenta.png b/src/afd/sprites/back/889--0--Zamazenta.png similarity index 100% rename from src/afd/sprites/back/Zamazenta.png rename to src/afd/sprites/back/889--0--Zamazenta.png diff --git a/src/afd/sprites/back/Zamazenta--Crowned.png b/src/afd/sprites/back/889--420--Zamazenta--Crowned.png similarity index 100% rename from src/afd/sprites/back/Zamazenta--Crowned.png rename to src/afd/sprites/back/889--420--Zamazenta--Crowned.png diff --git a/src/afd/sprites/back/Muk.png b/src/afd/sprites/back/89--0--Muk.png similarity index 100% rename from src/afd/sprites/back/Muk.png rename to src/afd/sprites/back/89--0--Muk.png diff --git a/src/afd/sprites/back/Muk--Alola.png b/src/afd/sprites/back/89--420--Muk--Alola.png similarity index 100% rename from src/afd/sprites/back/Muk--Alola.png rename to src/afd/sprites/back/89--420--Muk--Alola.png diff --git a/src/afd/sprites/back/Eternatus.png b/src/afd/sprites/back/890--0--Eternatus.png similarity index 100% rename from src/afd/sprites/back/Eternatus.png rename to src/afd/sprites/back/890--0--Eternatus.png diff --git a/src/afd/sprites/back/Eternatus--Eternamax.png b/src/afd/sprites/back/890--420--Eternatus--Eternamax.png similarity index 100% rename from src/afd/sprites/back/Eternatus--Eternamax.png rename to src/afd/sprites/back/890--420--Eternatus--Eternamax.png diff --git a/src/afd/sprites/back/Blastoise.png b/src/afd/sprites/back/9--0--Blastoise.png similarity index 100% rename from src/afd/sprites/back/Blastoise.png rename to src/afd/sprites/back/9--0--Blastoise.png diff --git a/src/afd/sprites/back/Blastoise--Mega.png b/src/afd/sprites/back/9--420--Blastoise--Mega.png similarity index 100% rename from src/afd/sprites/back/Blastoise--Mega.png rename to src/afd/sprites/back/9--420--Blastoise--Mega.png diff --git a/src/afd/sprites/back/Shellder.png b/src/afd/sprites/back/90--0--Shellder.png similarity index 100% rename from src/afd/sprites/back/Shellder.png rename to src/afd/sprites/back/90--0--Shellder.png diff --git a/src/afd/sprites/back/Cloyster.png b/src/afd/sprites/back/91--0--Cloyster.png similarity index 100% rename from src/afd/sprites/back/Cloyster.png rename to src/afd/sprites/back/91--0--Cloyster.png diff --git a/src/afd/sprites/back/Gastly.png b/src/afd/sprites/back/92--0--Gastly.png similarity index 100% rename from src/afd/sprites/back/Gastly.png rename to src/afd/sprites/back/92--0--Gastly.png diff --git a/src/afd/sprites/back/Haunter.png b/src/afd/sprites/back/93--0--Haunter.png similarity index 100% rename from src/afd/sprites/back/Haunter.png rename to src/afd/sprites/back/93--0--Haunter.png diff --git a/src/afd/sprites/back/Gengar.png b/src/afd/sprites/back/94--0--Gengar.png similarity index 100% rename from src/afd/sprites/back/Gengar.png rename to src/afd/sprites/back/94--0--Gengar.png diff --git a/src/afd/sprites/back/Gengar--Gmax.png b/src/afd/sprites/back/94--420--Gengar--Gmax.png similarity index 100% rename from src/afd/sprites/back/Gengar--Gmax.png rename to src/afd/sprites/back/94--420--Gengar--Gmax.png diff --git a/src/afd/sprites/back/Gengar--Mega.png b/src/afd/sprites/back/94--420--Gengar--Mega.png similarity index 100% rename from src/afd/sprites/back/Gengar--Mega.png rename to src/afd/sprites/back/94--420--Gengar--Mega.png diff --git a/src/afd/sprites/back/Onix.png b/src/afd/sprites/back/95--0--Onix.png similarity index 100% rename from src/afd/sprites/back/Onix.png rename to src/afd/sprites/back/95--0--Onix.png diff --git a/src/afd/sprites/back/Drowzee.png b/src/afd/sprites/back/96--0--Drowzee.png similarity index 100% rename from src/afd/sprites/back/Drowzee.png rename to src/afd/sprites/back/96--0--Drowzee.png diff --git a/src/afd/sprites/back/Hypno.png b/src/afd/sprites/back/97--0--Hypno.png similarity index 100% rename from src/afd/sprites/back/Hypno.png rename to src/afd/sprites/back/97--0--Hypno.png diff --git a/src/afd/sprites/back/Krabby.png b/src/afd/sprites/back/98--0--Krabby.png similarity index 100% rename from src/afd/sprites/back/Krabby.png rename to src/afd/sprites/back/98--0--Krabby.png diff --git a/src/afd/sprites/back/Kingler.png b/src/afd/sprites/back/99--0--Kingler.png similarity index 100% rename from src/afd/sprites/back/Kingler.png rename to src/afd/sprites/back/99--0--Kingler.png diff --git a/src/afd/sprites/back/Kingler--Gmax.png b/src/afd/sprites/back/99--420--Kingler--Gmax.png similarity index 100% rename from src/afd/sprites/back/Kingler--Gmax.png rename to src/afd/sprites/back/99--420--Kingler--Gmax.png diff --git a/src/afd/sprites/front-cosmetic/Rhyhorn--Female.png b/src/afd/sprites/front-cosmetic/111--0--Rhyhorn--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Rhyhorn--Female.png rename to src/afd/sprites/front-cosmetic/111--0--Rhyhorn--Female.png diff --git a/src/afd/sprites/front-cosmetic/Rhydon--Female.png b/src/afd/sprites/front-cosmetic/112--0--Rhydon--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Rhydon--Female.png rename to src/afd/sprites/front-cosmetic/112--0--Rhydon--Female.png diff --git a/src/afd/sprites/front-cosmetic/Goldeen--Female.png b/src/afd/sprites/front-cosmetic/118--0--Goldeen--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Goldeen--Female.png rename to src/afd/sprites/front-cosmetic/118--0--Goldeen--Female.png diff --git a/src/afd/sprites/front-cosmetic/Butterfree--Female.png b/src/afd/sprites/front-cosmetic/12--0--Butterfree--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Butterfree--Female.png rename to src/afd/sprites/front-cosmetic/12--0--Butterfree--Female.png diff --git a/src/afd/sprites/front-cosmetic/Scyther--Female.png b/src/afd/sprites/front-cosmetic/123--0--Scyther--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Scyther--Female.png rename to src/afd/sprites/front-cosmetic/123--0--Scyther--Female.png diff --git a/src/afd/sprites/front-cosmetic/Magikarp--Female.png b/src/afd/sprites/front-cosmetic/129--0--Magikarp--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Magikarp--Female.png rename to src/afd/sprites/front-cosmetic/129--0--Magikarp--Female.png diff --git a/src/afd/sprites/front-cosmetic/Arghonaut--Female.png b/src/afd/sprites/front-cosmetic/13--0--Arghonaut--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Arghonaut--Female.png rename to src/afd/sprites/front-cosmetic/13--0--Arghonaut--Female.png diff --git a/src/afd/sprites/front-cosmetic/Gyarados--Female.png b/src/afd/sprites/front-cosmetic/130--0--Gyarados--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Gyarados--Female.png rename to src/afd/sprites/front-cosmetic/130--0--Gyarados--Female.png diff --git a/src/afd/sprites/front-cosmetic/Kitsunoh--Female.png b/src/afd/sprites/front-cosmetic/14--0--Kitsunoh--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Kitsunoh--Female.png rename to src/afd/sprites/front-cosmetic/14--0--Kitsunoh--Female.png diff --git a/src/afd/sprites/front-cosmetic/Cyclohm--Female.png b/src/afd/sprites/front-cosmetic/15--0--Cyclohm--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Cyclohm--Female.png rename to src/afd/sprites/front-cosmetic/15--0--Cyclohm--Female.png diff --git a/src/afd/sprites/front-cosmetic/Meganium--Female.png b/src/afd/sprites/front-cosmetic/154--0--Meganium--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Meganium--Female.png rename to src/afd/sprites/front-cosmetic/154--0--Meganium--Female.png diff --git a/src/afd/sprites/front-cosmetic/Colossoil--Female.png b/src/afd/sprites/front-cosmetic/16--0--Colossoil--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Colossoil--Female.png rename to src/afd/sprites/front-cosmetic/16--0--Colossoil--Female.png diff --git a/src/afd/sprites/front-cosmetic/Ledyba--Female.png b/src/afd/sprites/front-cosmetic/165--0--Ledyba--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Ledyba--Female.png rename to src/afd/sprites/front-cosmetic/165--0--Ledyba--Female.png diff --git a/src/afd/sprites/front-cosmetic/Ledian--Female.png b/src/afd/sprites/front-cosmetic/166--0--Ledian--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Ledian--Female.png rename to src/afd/sprites/front-cosmetic/166--0--Ledian--Female.png diff --git a/src/afd/sprites/front-cosmetic/Krilowatt--Female.png b/src/afd/sprites/front-cosmetic/17--0--Krilowatt--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Krilowatt--Female.png rename to src/afd/sprites/front-cosmetic/17--0--Krilowatt--Female.png diff --git a/src/afd/sprites/front-cosmetic/Xatu--Female.png b/src/afd/sprites/front-cosmetic/178--0--Xatu--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Xatu--Female.png rename to src/afd/sprites/front-cosmetic/178--0--Xatu--Female.png diff --git a/src/afd/sprites/front-cosmetic/Sudowoodo--Female.png b/src/afd/sprites/front-cosmetic/185--0--Sudowoodo--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Sudowoodo--Female.png rename to src/afd/sprites/front-cosmetic/185--0--Sudowoodo--Female.png diff --git a/src/afd/sprites/front-cosmetic/Politoed--Female.png b/src/afd/sprites/front-cosmetic/186--0--Politoed--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Politoed--Female.png rename to src/afd/sprites/front-cosmetic/186--0--Politoed--Female.png diff --git a/src/afd/sprites/front-cosmetic/Rattata--Female.png b/src/afd/sprites/front-cosmetic/19--0--Rattata--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Rattata--Female.png rename to src/afd/sprites/front-cosmetic/19--0--Rattata--Female.png diff --git a/src/afd/sprites/front-cosmetic/Voodoom--Female.png b/src/afd/sprites/front-cosmetic/19--0--Voodoom--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Voodoom--Female.png rename to src/afd/sprites/front-cosmetic/19--0--Voodoom--Female.png diff --git a/src/afd/sprites/front-cosmetic/Aipom--Female.png b/src/afd/sprites/front-cosmetic/190--0--Aipom--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Aipom--Female.png rename to src/afd/sprites/front-cosmetic/190--0--Aipom--Female.png diff --git a/src/afd/sprites/front-cosmetic/Wooper--Female.png b/src/afd/sprites/front-cosmetic/194--0--Wooper--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Wooper--Female.png rename to src/afd/sprites/front-cosmetic/194--0--Wooper--Female.png diff --git a/src/afd/sprites/front-cosmetic/Quagsire--Female.png b/src/afd/sprites/front-cosmetic/195--0--Quagsire--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Quagsire--Female.png rename to src/afd/sprites/front-cosmetic/195--0--Quagsire--Female.png diff --git a/src/afd/sprites/front-cosmetic/Murkrow--Female.png b/src/afd/sprites/front-cosmetic/198--0--Murkrow--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Murkrow--Female.png rename to src/afd/sprites/front-cosmetic/198--0--Murkrow--Female.png diff --git a/src/afd/sprites/front-cosmetic/Syclant--Female.png b/src/afd/sprites/front-cosmetic/2--0--Syclant--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Syclant--Female.png rename to src/afd/sprites/front-cosmetic/2--0--Syclant--Female.png diff --git a/src/afd/sprites/front-cosmetic/Raticate--Female.png b/src/afd/sprites/front-cosmetic/20--0--Raticate--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Raticate--Female.png rename to src/afd/sprites/front-cosmetic/20--0--Raticate--Female.png diff --git a/src/afd/sprites/front-cosmetic/Wobbuffet--Female.png b/src/afd/sprites/front-cosmetic/202--0--Wobbuffet--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Wobbuffet--Female.png rename to src/afd/sprites/front-cosmetic/202--0--Wobbuffet--Female.png diff --git a/src/afd/sprites/front-cosmetic/Girafarig--Female.png b/src/afd/sprites/front-cosmetic/203--0--Girafarig--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Girafarig--Female.png rename to src/afd/sprites/front-cosmetic/203--0--Girafarig--Female.png diff --git a/src/afd/sprites/front-cosmetic/Gligar--Female.png b/src/afd/sprites/front-cosmetic/207--0--Gligar--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Gligar--Female.png rename to src/afd/sprites/front-cosmetic/207--0--Gligar--Female.png diff --git a/src/afd/sprites/front-cosmetic/Steelix--Female.png b/src/afd/sprites/front-cosmetic/208--0--Steelix--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Steelix--Female.png rename to src/afd/sprites/front-cosmetic/208--0--Steelix--Female.png diff --git a/src/afd/sprites/front-cosmetic/Tomohawk--Female.png b/src/afd/sprites/front-cosmetic/21--0--Tomohawk--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Tomohawk--Female.png rename to src/afd/sprites/front-cosmetic/21--0--Tomohawk--Female.png diff --git a/src/afd/sprites/front-cosmetic/Scizor--Female.png b/src/afd/sprites/front-cosmetic/212--0--Scizor--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Scizor--Female.png rename to src/afd/sprites/front-cosmetic/212--0--Scizor--Female.png diff --git a/src/afd/sprites/front-cosmetic/Heracross--Female.png b/src/afd/sprites/front-cosmetic/214--0--Heracross--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Heracross--Female.png rename to src/afd/sprites/front-cosmetic/214--0--Heracross--Female.png diff --git a/src/afd/sprites/front-cosmetic/Sneasel--Female.png b/src/afd/sprites/front-cosmetic/215--0--Sneasel--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Sneasel--Female.png rename to src/afd/sprites/front-cosmetic/215--0--Sneasel--Female.png diff --git a/src/afd/sprites/front-cosmetic/Ursaring--Female.png b/src/afd/sprites/front-cosmetic/217--0--Ursaring--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Ursaring--Female.png rename to src/afd/sprites/front-cosmetic/217--0--Ursaring--Female.png diff --git a/src/afd/sprites/front-cosmetic/Piloswine--Female.png b/src/afd/sprites/front-cosmetic/221--0--Piloswine--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Piloswine--Female.png rename to src/afd/sprites/front-cosmetic/221--0--Piloswine--Female.png diff --git a/src/afd/sprites/front-cosmetic/Octillery--Female.png b/src/afd/sprites/front-cosmetic/224--0--Octillery--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Octillery--Female.png rename to src/afd/sprites/front-cosmetic/224--0--Octillery--Female.png diff --git a/src/afd/sprites/front-cosmetic/Houndoom--Female.png b/src/afd/sprites/front-cosmetic/229--0--Houndoom--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Houndoom--Female.png rename to src/afd/sprites/front-cosmetic/229--0--Houndoom--Female.png diff --git a/src/afd/sprites/front-cosmetic/Donphan--Female.png b/src/afd/sprites/front-cosmetic/232--0--Donphan--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Donphan--Female.png rename to src/afd/sprites/front-cosmetic/232--0--Donphan--Female.png diff --git a/src/afd/sprites/front-cosmetic/Pikachu--Female.png b/src/afd/sprites/front-cosmetic/25--0--Pikachu--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Pikachu--Female.png rename to src/afd/sprites/front-cosmetic/25--0--Pikachu--Female.png diff --git a/src/afd/sprites/front-cosmetic/Torchic--Female.png b/src/afd/sprites/front-cosmetic/255--0--Torchic--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Torchic--Female.png rename to src/afd/sprites/front-cosmetic/255--0--Torchic--Female.png diff --git a/src/afd/sprites/front-cosmetic/Combusken--Female.png b/src/afd/sprites/front-cosmetic/256--0--Combusken--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Combusken--Female.png rename to src/afd/sprites/front-cosmetic/256--0--Combusken--Female.png diff --git a/src/afd/sprites/front-cosmetic/Blaziken--Female.png b/src/afd/sprites/front-cosmetic/257--0--Blaziken--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Blaziken--Female.png rename to src/afd/sprites/front-cosmetic/257--0--Blaziken--Female.png diff --git a/src/afd/sprites/front-cosmetic/Raichu--Female.png b/src/afd/sprites/front-cosmetic/26--0--Raichu--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Raichu--Female.png rename to src/afd/sprites/front-cosmetic/26--0--Raichu--Female.png diff --git a/src/afd/sprites/front-cosmetic/Beautifly--Female.png b/src/afd/sprites/front-cosmetic/267--0--Beautifly--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Beautifly--Female.png rename to src/afd/sprites/front-cosmetic/267--0--Beautifly--Female.png diff --git a/src/afd/sprites/front-cosmetic/Dustox--Female.png b/src/afd/sprites/front-cosmetic/269--0--Dustox--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Dustox--Female.png rename to src/afd/sprites/front-cosmetic/269--0--Dustox--Female.png diff --git a/src/afd/sprites/front-cosmetic/Ludicolo--Female.png b/src/afd/sprites/front-cosmetic/272--0--Ludicolo--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Ludicolo--Female.png rename to src/afd/sprites/front-cosmetic/272--0--Ludicolo--Female.png diff --git a/src/afd/sprites/front-cosmetic/Nuzleaf--Female.png b/src/afd/sprites/front-cosmetic/274--0--Nuzleaf--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Nuzleaf--Female.png rename to src/afd/sprites/front-cosmetic/274--0--Nuzleaf--Female.png diff --git a/src/afd/sprites/front-cosmetic/Shiftry--Female.png b/src/afd/sprites/front-cosmetic/275--0--Shiftry--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Shiftry--Female.png rename to src/afd/sprites/front-cosmetic/275--0--Shiftry--Female.png diff --git a/src/afd/sprites/front-cosmetic/Revenankh--Female.png b/src/afd/sprites/front-cosmetic/3--0--Revenankh--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Revenankh--Female.png rename to src/afd/sprites/front-cosmetic/3--0--Revenankh--Female.png diff --git a/src/afd/sprites/front-cosmetic/Venusaur--Female.png b/src/afd/sprites/front-cosmetic/3--0--Venusaur--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Venusaur--Female.png rename to src/afd/sprites/front-cosmetic/3--0--Venusaur--Female.png diff --git a/src/afd/sprites/front-cosmetic/Meditite--Female.png b/src/afd/sprites/front-cosmetic/307--0--Meditite--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Meditite--Female.png rename to src/afd/sprites/front-cosmetic/307--0--Meditite--Female.png diff --git a/src/afd/sprites/front-cosmetic/Medicham--Female.png b/src/afd/sprites/front-cosmetic/308--0--Medicham--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Medicham--Female.png rename to src/afd/sprites/front-cosmetic/308--0--Medicham--Female.png diff --git a/src/afd/sprites/front-cosmetic/Roselia--Female.png b/src/afd/sprites/front-cosmetic/315--0--Roselia--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Roselia--Female.png rename to src/afd/sprites/front-cosmetic/315--0--Roselia--Female.png diff --git a/src/afd/sprites/front-cosmetic/Gulpin--Female.png b/src/afd/sprites/front-cosmetic/316--0--Gulpin--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Gulpin--Female.png rename to src/afd/sprites/front-cosmetic/316--0--Gulpin--Female.png diff --git a/src/afd/sprites/front-cosmetic/Swalot--Female.png b/src/afd/sprites/front-cosmetic/317--0--Swalot--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Swalot--Female.png rename to src/afd/sprites/front-cosmetic/317--0--Swalot--Female.png diff --git a/src/afd/sprites/front-cosmetic/Numel--Female.png b/src/afd/sprites/front-cosmetic/322--0--Numel--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Numel--Female.png rename to src/afd/sprites/front-cosmetic/322--0--Numel--Female.png diff --git a/src/afd/sprites/front-cosmetic/Camerupt--Female.png b/src/afd/sprites/front-cosmetic/323--0--Camerupt--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Camerupt--Female.png rename to src/afd/sprites/front-cosmetic/323--0--Camerupt--Female.png diff --git a/src/afd/sprites/front-cosmetic/Cacturne--Female.png b/src/afd/sprites/front-cosmetic/332--0--Cacturne--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Cacturne--Female.png rename to src/afd/sprites/front-cosmetic/332--0--Cacturne--Female.png diff --git a/src/afd/sprites/front-cosmetic/Milotic--Female.png b/src/afd/sprites/front-cosmetic/350--0--Milotic--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Milotic--Female.png rename to src/afd/sprites/front-cosmetic/350--0--Milotic--Female.png diff --git a/src/afd/sprites/front-cosmetic/Relicanth--Female.png b/src/afd/sprites/front-cosmetic/369--0--Relicanth--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Relicanth--Female.png rename to src/afd/sprites/front-cosmetic/369--0--Relicanth--Female.png diff --git a/src/afd/sprites/front-cosmetic/Starly--Female.png b/src/afd/sprites/front-cosmetic/396--0--Starly--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Starly--Female.png rename to src/afd/sprites/front-cosmetic/396--0--Starly--Female.png diff --git a/src/afd/sprites/front-cosmetic/Staravia--Female.png b/src/afd/sprites/front-cosmetic/397--0--Staravia--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Staravia--Female.png rename to src/afd/sprites/front-cosmetic/397--0--Staravia--Female.png diff --git a/src/afd/sprites/front-cosmetic/Staraptor--Female.png b/src/afd/sprites/front-cosmetic/398--0--Staraptor--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Staraptor--Female.png rename to src/afd/sprites/front-cosmetic/398--0--Staraptor--Female.png diff --git a/src/afd/sprites/front-cosmetic/Bidoof--Female.png b/src/afd/sprites/front-cosmetic/399--0--Bidoof--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Bidoof--Female.png rename to src/afd/sprites/front-cosmetic/399--0--Bidoof--Female.png diff --git a/src/afd/sprites/front-cosmetic/Bibarel--Female.png b/src/afd/sprites/front-cosmetic/400--0--Bibarel--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Bibarel--Female.png rename to src/afd/sprites/front-cosmetic/400--0--Bibarel--Female.png diff --git a/src/afd/sprites/front-cosmetic/Kricketot--Female.png b/src/afd/sprites/front-cosmetic/401--0--Kricketot--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Kricketot--Female.png rename to src/afd/sprites/front-cosmetic/401--0--Kricketot--Female.png diff --git a/src/afd/sprites/front-cosmetic/Kricketune--Female.png b/src/afd/sprites/front-cosmetic/402--0--Kricketune--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Kricketune--Female.png rename to src/afd/sprites/front-cosmetic/402--0--Kricketune--Female.png diff --git a/src/afd/sprites/front-cosmetic/Shinx--Female.png b/src/afd/sprites/front-cosmetic/403--0--Shinx--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Shinx--Female.png rename to src/afd/sprites/front-cosmetic/403--0--Shinx--Female.png diff --git a/src/afd/sprites/front-cosmetic/Luxio--Female.png b/src/afd/sprites/front-cosmetic/404--0--Luxio--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Luxio--Female.png rename to src/afd/sprites/front-cosmetic/404--0--Luxio--Female.png diff --git a/src/afd/sprites/front-cosmetic/Luxray--Female.png b/src/afd/sprites/front-cosmetic/405--0--Luxray--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Luxray--Female.png rename to src/afd/sprites/front-cosmetic/405--0--Luxray--Female.png diff --git a/src/afd/sprites/front-cosmetic/Roserade--Female.png b/src/afd/sprites/front-cosmetic/407--0--Roserade--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Roserade--Female.png rename to src/afd/sprites/front-cosmetic/407--0--Roserade--Female.png diff --git a/src/afd/sprites/front-cosmetic/Zubat--Female.png b/src/afd/sprites/front-cosmetic/41--0--Zubat--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Zubat--Female.png rename to src/afd/sprites/front-cosmetic/41--0--Zubat--Female.png diff --git a/src/afd/sprites/front-cosmetic/Burmy--Sandy.png b/src/afd/sprites/front-cosmetic/412--420--Burmy--Sandy.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Burmy--Sandy.png rename to src/afd/sprites/front-cosmetic/412--420--Burmy--Sandy.png diff --git a/src/afd/sprites/front-cosmetic/Burmy--Trash.png b/src/afd/sprites/front-cosmetic/412--420--Burmy--Trash.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Burmy--Trash.png rename to src/afd/sprites/front-cosmetic/412--420--Burmy--Trash.png diff --git a/src/afd/sprites/front-cosmetic/Combee--Female.png b/src/afd/sprites/front-cosmetic/415--0--Combee--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Combee--Female.png rename to src/afd/sprites/front-cosmetic/415--0--Combee--Female.png diff --git a/src/afd/sprites/front-cosmetic/Pachirisu--Female.png b/src/afd/sprites/front-cosmetic/417--0--Pachirisu--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Pachirisu--Female.png rename to src/afd/sprites/front-cosmetic/417--0--Pachirisu--Female.png diff --git a/src/afd/sprites/front-cosmetic/Buizel--Female.png b/src/afd/sprites/front-cosmetic/418--0--Buizel--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Buizel--Female.png rename to src/afd/sprites/front-cosmetic/418--0--Buizel--Female.png diff --git a/src/afd/sprites/front-cosmetic/Floatzel--Female.png b/src/afd/sprites/front-cosmetic/419--0--Floatzel--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Floatzel--Female.png rename to src/afd/sprites/front-cosmetic/419--0--Floatzel--Female.png diff --git a/src/afd/sprites/front-cosmetic/Golbat--Female.png b/src/afd/sprites/front-cosmetic/42--0--Golbat--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Golbat--Female.png rename to src/afd/sprites/front-cosmetic/42--0--Golbat--Female.png diff --git a/src/afd/sprites/front-cosmetic/Ambipom--Female.png b/src/afd/sprites/front-cosmetic/424--0--Ambipom--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Ambipom--Female.png rename to src/afd/sprites/front-cosmetic/424--0--Ambipom--Female.png diff --git a/src/afd/sprites/front-cosmetic/Gloom--Female.png b/src/afd/sprites/front-cosmetic/44--0--Gloom--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Gloom--Female.png rename to src/afd/sprites/front-cosmetic/44--0--Gloom--Female.png diff --git a/src/afd/sprites/front-cosmetic/Gible--Female.png b/src/afd/sprites/front-cosmetic/443--0--Gible--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Gible--Female.png rename to src/afd/sprites/front-cosmetic/443--0--Gible--Female.png diff --git a/src/afd/sprites/front-cosmetic/Garchomp--Female.png b/src/afd/sprites/front-cosmetic/445--0--Garchomp--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Garchomp--Female.png rename to src/afd/sprites/front-cosmetic/445--0--Garchomp--Female.png diff --git a/src/afd/sprites/front-cosmetic/Hippopotas--Female.png b/src/afd/sprites/front-cosmetic/449--0--Hippopotas--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Hippopotas--Female.png rename to src/afd/sprites/front-cosmetic/449--0--Hippopotas--Female.png diff --git a/src/afd/sprites/front-cosmetic/Vileplume--Female.png b/src/afd/sprites/front-cosmetic/45--0--Vileplume--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Vileplume--Female.png rename to src/afd/sprites/front-cosmetic/45--0--Vileplume--Female.png diff --git a/src/afd/sprites/front-cosmetic/Hippowdon--Female.png b/src/afd/sprites/front-cosmetic/450--0--Hippowdon--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Hippowdon--Female.png rename to src/afd/sprites/front-cosmetic/450--0--Hippowdon--Female.png diff --git a/src/afd/sprites/front-cosmetic/Croagunk--Female.png b/src/afd/sprites/front-cosmetic/453--0--Croagunk--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Croagunk--Female.png rename to src/afd/sprites/front-cosmetic/453--0--Croagunk--Female.png diff --git a/src/afd/sprites/front-cosmetic/Toxicroak--Female.png b/src/afd/sprites/front-cosmetic/454--0--Toxicroak--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Toxicroak--Female.png rename to src/afd/sprites/front-cosmetic/454--0--Toxicroak--Female.png diff --git a/src/afd/sprites/front-cosmetic/Finneon--Female.png b/src/afd/sprites/front-cosmetic/456--0--Finneon--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Finneon--Female.png rename to src/afd/sprites/front-cosmetic/456--0--Finneon--Female.png diff --git a/src/afd/sprites/front-cosmetic/Lumineon--Female.png b/src/afd/sprites/front-cosmetic/457--0--Lumineon--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Lumineon--Female.png rename to src/afd/sprites/front-cosmetic/457--0--Lumineon--Female.png diff --git a/src/afd/sprites/front-cosmetic/Snover--Female.png b/src/afd/sprites/front-cosmetic/459--0--Snover--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Snover--Female.png rename to src/afd/sprites/front-cosmetic/459--0--Snover--Female.png diff --git a/src/afd/sprites/front-cosmetic/Abomasnow--Female.png b/src/afd/sprites/front-cosmetic/460--0--Abomasnow--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Abomasnow--Female.png rename to src/afd/sprites/front-cosmetic/460--0--Abomasnow--Female.png diff --git a/src/afd/sprites/front-cosmetic/Weavile--Female.png b/src/afd/sprites/front-cosmetic/461--0--Weavile--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Weavile--Female.png rename to src/afd/sprites/front-cosmetic/461--0--Weavile--Female.png diff --git a/src/afd/sprites/front-cosmetic/Rhyperior--Female.png b/src/afd/sprites/front-cosmetic/464--0--Rhyperior--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Rhyperior--Female.png rename to src/afd/sprites/front-cosmetic/464--0--Rhyperior--Female.png diff --git a/src/afd/sprites/front-cosmetic/Tangrowth--Female.png b/src/afd/sprites/front-cosmetic/465--0--Tangrowth--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Tangrowth--Female.png rename to src/afd/sprites/front-cosmetic/465--0--Tangrowth--Female.png diff --git a/src/afd/sprites/front-cosmetic/Mamoswine--Female.png b/src/afd/sprites/front-cosmetic/473--0--Mamoswine--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Mamoswine--Female.png rename to src/afd/sprites/front-cosmetic/473--0--Mamoswine--Female.png diff --git a/src/afd/sprites/front-cosmetic/Unfezant--Female.png b/src/afd/sprites/front-cosmetic/521--0--Unfezant--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Unfezant--Female.png rename to src/afd/sprites/front-cosmetic/521--0--Unfezant--Female.png diff --git a/src/afd/sprites/front-cosmetic/Frillish--Female.png b/src/afd/sprites/front-cosmetic/592--0--Frillish--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Frillish--Female.png rename to src/afd/sprites/front-cosmetic/592--0--Frillish--Female.png diff --git a/src/afd/sprites/front-cosmetic/Jellicent--Female.png b/src/afd/sprites/front-cosmetic/593--0--Jellicent--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Jellicent--Female.png rename to src/afd/sprites/front-cosmetic/593--0--Jellicent--Female.png diff --git a/src/afd/sprites/front-cosmetic/Pyroak--Female.png b/src/afd/sprites/front-cosmetic/6--0--Pyroak--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Pyroak--Female.png rename to src/afd/sprites/front-cosmetic/6--0--Pyroak--Female.png diff --git a/src/afd/sprites/front-cosmetic/Kadabra--Female.png b/src/afd/sprites/front-cosmetic/64--0--Kadabra--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Kadabra--Female.png rename to src/afd/sprites/front-cosmetic/64--0--Kadabra--Female.png diff --git a/src/afd/sprites/front-cosmetic/Alakazam--Female.png b/src/afd/sprites/front-cosmetic/65--0--Alakazam--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Alakazam--Female.png rename to src/afd/sprites/front-cosmetic/65--0--Alakazam--Female.png diff --git a/src/afd/sprites/front-cosmetic/Pyroar--Female.png b/src/afd/sprites/front-cosmetic/668--0--Pyroar--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Pyroar--Female.png rename to src/afd/sprites/front-cosmetic/668--0--Pyroar--Female.png diff --git a/src/afd/sprites/front-cosmetic/Fidgit--Female.png b/src/afd/sprites/front-cosmetic/8--0--Fidgit--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Fidgit--Female.png rename to src/afd/sprites/front-cosmetic/8--0--Fidgit--Female.png diff --git a/src/afd/sprites/front-cosmetic/Magearna--Original.png b/src/afd/sprites/front-cosmetic/801--420--Magearna--Original.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Magearna--Original.png rename to src/afd/sprites/front-cosmetic/801--420--Magearna--Original.png diff --git a/src/afd/sprites/front-cosmetic/Doduo--Female.png b/src/afd/sprites/front-cosmetic/84--0--Doduo--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Doduo--Female.png rename to src/afd/sprites/front-cosmetic/84--0--Doduo--Female.png diff --git a/src/afd/sprites/front-cosmetic/Dodrio--Female.png b/src/afd/sprites/front-cosmetic/85--0--Dodrio--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Dodrio--Female.png rename to src/afd/sprites/front-cosmetic/85--0--Dodrio--Female.png diff --git a/src/afd/sprites/front-cosmetic/Alcremie--Caramel_Swirl.png b/src/afd/sprites/front-cosmetic/869--420--Alcremie--Caramel_Swirl.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Alcremie--Caramel_Swirl.png rename to src/afd/sprites/front-cosmetic/869--420--Alcremie--Caramel_Swirl.png diff --git a/src/afd/sprites/front-cosmetic/Alcremie--Lemon_Cream.png b/src/afd/sprites/front-cosmetic/869--420--Alcremie--Lemon_Cream.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Alcremie--Lemon_Cream.png rename to src/afd/sprites/front-cosmetic/869--420--Alcremie--Lemon_Cream.png diff --git a/src/afd/sprites/front-cosmetic/Alcremie--Matcha_Cream.png b/src/afd/sprites/front-cosmetic/869--420--Alcremie--Matcha_Cream.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Alcremie--Matcha_Cream.png rename to src/afd/sprites/front-cosmetic/869--420--Alcremie--Matcha_Cream.png diff --git a/src/afd/sprites/front-cosmetic/Alcremie--Mint_Cream.png b/src/afd/sprites/front-cosmetic/869--420--Alcremie--Mint_Cream.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Alcremie--Mint_Cream.png rename to src/afd/sprites/front-cosmetic/869--420--Alcremie--Mint_Cream.png diff --git a/src/afd/sprites/front-cosmetic/Alcremie--Rainbow_Swirl.png b/src/afd/sprites/front-cosmetic/869--420--Alcremie--Rainbow_Swirl.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Alcremie--Rainbow_Swirl.png rename to src/afd/sprites/front-cosmetic/869--420--Alcremie--Rainbow_Swirl.png diff --git a/src/afd/sprites/front-cosmetic/Alcremie--Ruby_Cream.png b/src/afd/sprites/front-cosmetic/869--420--Alcremie--Ruby_Cream.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Alcremie--Ruby_Cream.png rename to src/afd/sprites/front-cosmetic/869--420--Alcremie--Ruby_Cream.png diff --git a/src/afd/sprites/front-cosmetic/Alcremie--Ruby_Swirl.png b/src/afd/sprites/front-cosmetic/869--420--Alcremie--Ruby_Swirl.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Alcremie--Ruby_Swirl.png rename to src/afd/sprites/front-cosmetic/869--420--Alcremie--Ruby_Swirl.png diff --git a/src/afd/sprites/front-cosmetic/Alcremie--Salted_Cream.png b/src/afd/sprites/front-cosmetic/869--420--Alcremie--Salted_Cream.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Alcremie--Salted_Cream.png rename to src/afd/sprites/front-cosmetic/869--420--Alcremie--Salted_Cream.png diff --git a/src/afd/sprites/front-cosmetic/Hypno--Female.png b/src/afd/sprites/front-cosmetic/97--0--Hypno--Female.png similarity index 100% rename from src/afd/sprites/front-cosmetic/Hypno--Female.png rename to src/afd/sprites/front-cosmetic/97--0--Hypno--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Rhyhorn--Female.png b/src/afd/sprites/front-shiny-cosmetic/111--0--Rhyhorn--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Rhyhorn--Female.png rename to src/afd/sprites/front-shiny-cosmetic/111--0--Rhyhorn--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Rhydon--Female.png b/src/afd/sprites/front-shiny-cosmetic/112--0--Rhydon--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Rhydon--Female.png rename to src/afd/sprites/front-shiny-cosmetic/112--0--Rhydon--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Goldeen--Female.png b/src/afd/sprites/front-shiny-cosmetic/118--0--Goldeen--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Goldeen--Female.png rename to src/afd/sprites/front-shiny-cosmetic/118--0--Goldeen--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Butterfree--Female.png b/src/afd/sprites/front-shiny-cosmetic/12--0--Butterfree--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Butterfree--Female.png rename to src/afd/sprites/front-shiny-cosmetic/12--0--Butterfree--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Scyther--Female.png b/src/afd/sprites/front-shiny-cosmetic/123--0--Scyther--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Scyther--Female.png rename to src/afd/sprites/front-shiny-cosmetic/123--0--Scyther--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Magikarp--Female.png b/src/afd/sprites/front-shiny-cosmetic/129--0--Magikarp--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Magikarp--Female.png rename to src/afd/sprites/front-shiny-cosmetic/129--0--Magikarp--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Arghonaut--Female.png b/src/afd/sprites/front-shiny-cosmetic/13--0--Arghonaut--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Arghonaut--Female.png rename to src/afd/sprites/front-shiny-cosmetic/13--0--Arghonaut--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Gyarados--Female.png b/src/afd/sprites/front-shiny-cosmetic/130--0--Gyarados--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Gyarados--Female.png rename to src/afd/sprites/front-shiny-cosmetic/130--0--Gyarados--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Kitsunoh--Female.png b/src/afd/sprites/front-shiny-cosmetic/14--0--Kitsunoh--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Kitsunoh--Female.png rename to src/afd/sprites/front-shiny-cosmetic/14--0--Kitsunoh--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Cyclohm--Female.png b/src/afd/sprites/front-shiny-cosmetic/15--0--Cyclohm--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Cyclohm--Female.png rename to src/afd/sprites/front-shiny-cosmetic/15--0--Cyclohm--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Meganium--Female.png b/src/afd/sprites/front-shiny-cosmetic/154--0--Meganium--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Meganium--Female.png rename to src/afd/sprites/front-shiny-cosmetic/154--0--Meganium--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Colossoil--Female.png b/src/afd/sprites/front-shiny-cosmetic/16--0--Colossoil--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Colossoil--Female.png rename to src/afd/sprites/front-shiny-cosmetic/16--0--Colossoil--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Ledyba--Female.png b/src/afd/sprites/front-shiny-cosmetic/165--0--Ledyba--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Ledyba--Female.png rename to src/afd/sprites/front-shiny-cosmetic/165--0--Ledyba--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Ledian--Female.png b/src/afd/sprites/front-shiny-cosmetic/166--0--Ledian--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Ledian--Female.png rename to src/afd/sprites/front-shiny-cosmetic/166--0--Ledian--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Krilowatt--Female.png b/src/afd/sprites/front-shiny-cosmetic/17--0--Krilowatt--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Krilowatt--Female.png rename to src/afd/sprites/front-shiny-cosmetic/17--0--Krilowatt--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Xatu--Female.png b/src/afd/sprites/front-shiny-cosmetic/178--0--Xatu--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Xatu--Female.png rename to src/afd/sprites/front-shiny-cosmetic/178--0--Xatu--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Sudowoodo--Female.png b/src/afd/sprites/front-shiny-cosmetic/185--0--Sudowoodo--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Sudowoodo--Female.png rename to src/afd/sprites/front-shiny-cosmetic/185--0--Sudowoodo--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Politoed--Female.png b/src/afd/sprites/front-shiny-cosmetic/186--0--Politoed--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Politoed--Female.png rename to src/afd/sprites/front-shiny-cosmetic/186--0--Politoed--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Rattata--Female.png b/src/afd/sprites/front-shiny-cosmetic/19--0--Rattata--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Rattata--Female.png rename to src/afd/sprites/front-shiny-cosmetic/19--0--Rattata--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Voodoom--Female.png b/src/afd/sprites/front-shiny-cosmetic/19--0--Voodoom--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Voodoom--Female.png rename to src/afd/sprites/front-shiny-cosmetic/19--0--Voodoom--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Aipom--Female.png b/src/afd/sprites/front-shiny-cosmetic/190--0--Aipom--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Aipom--Female.png rename to src/afd/sprites/front-shiny-cosmetic/190--0--Aipom--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Wooper--Female.png b/src/afd/sprites/front-shiny-cosmetic/194--0--Wooper--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Wooper--Female.png rename to src/afd/sprites/front-shiny-cosmetic/194--0--Wooper--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Quagsire--Female.png b/src/afd/sprites/front-shiny-cosmetic/195--0--Quagsire--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Quagsire--Female.png rename to src/afd/sprites/front-shiny-cosmetic/195--0--Quagsire--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Murkrow--Female.png b/src/afd/sprites/front-shiny-cosmetic/198--0--Murkrow--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Murkrow--Female.png rename to src/afd/sprites/front-shiny-cosmetic/198--0--Murkrow--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Syclant--Female.png b/src/afd/sprites/front-shiny-cosmetic/2--0--Syclant--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Syclant--Female.png rename to src/afd/sprites/front-shiny-cosmetic/2--0--Syclant--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Raticate--Female.png b/src/afd/sprites/front-shiny-cosmetic/20--0--Raticate--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Raticate--Female.png rename to src/afd/sprites/front-shiny-cosmetic/20--0--Raticate--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Wobbuffet--Female.png b/src/afd/sprites/front-shiny-cosmetic/202--0--Wobbuffet--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Wobbuffet--Female.png rename to src/afd/sprites/front-shiny-cosmetic/202--0--Wobbuffet--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Girafarig--Female.png b/src/afd/sprites/front-shiny-cosmetic/203--0--Girafarig--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Girafarig--Female.png rename to src/afd/sprites/front-shiny-cosmetic/203--0--Girafarig--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Gligar--Female.png b/src/afd/sprites/front-shiny-cosmetic/207--0--Gligar--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Gligar--Female.png rename to src/afd/sprites/front-shiny-cosmetic/207--0--Gligar--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Steelix--Female.png b/src/afd/sprites/front-shiny-cosmetic/208--0--Steelix--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Steelix--Female.png rename to src/afd/sprites/front-shiny-cosmetic/208--0--Steelix--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Tomohawk--Female.png b/src/afd/sprites/front-shiny-cosmetic/21--0--Tomohawk--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Tomohawk--Female.png rename to src/afd/sprites/front-shiny-cosmetic/21--0--Tomohawk--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Scizor--Female.png b/src/afd/sprites/front-shiny-cosmetic/212--0--Scizor--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Scizor--Female.png rename to src/afd/sprites/front-shiny-cosmetic/212--0--Scizor--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Heracross--Female.png b/src/afd/sprites/front-shiny-cosmetic/214--0--Heracross--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Heracross--Female.png rename to src/afd/sprites/front-shiny-cosmetic/214--0--Heracross--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Sneasel--Female.png b/src/afd/sprites/front-shiny-cosmetic/215--0--Sneasel--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Sneasel--Female.png rename to src/afd/sprites/front-shiny-cosmetic/215--0--Sneasel--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Ursaring--Female.png b/src/afd/sprites/front-shiny-cosmetic/217--0--Ursaring--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Ursaring--Female.png rename to src/afd/sprites/front-shiny-cosmetic/217--0--Ursaring--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Piloswine--Female.png b/src/afd/sprites/front-shiny-cosmetic/221--0--Piloswine--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Piloswine--Female.png rename to src/afd/sprites/front-shiny-cosmetic/221--0--Piloswine--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Octillery--Female.png b/src/afd/sprites/front-shiny-cosmetic/224--0--Octillery--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Octillery--Female.png rename to src/afd/sprites/front-shiny-cosmetic/224--0--Octillery--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Houndoom--Female.png b/src/afd/sprites/front-shiny-cosmetic/229--0--Houndoom--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Houndoom--Female.png rename to src/afd/sprites/front-shiny-cosmetic/229--0--Houndoom--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Donphan--Female.png b/src/afd/sprites/front-shiny-cosmetic/232--0--Donphan--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Donphan--Female.png rename to src/afd/sprites/front-shiny-cosmetic/232--0--Donphan--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Pikachu--Female.png b/src/afd/sprites/front-shiny-cosmetic/25--0--Pikachu--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Pikachu--Female.png rename to src/afd/sprites/front-shiny-cosmetic/25--0--Pikachu--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Torchic--Female.png b/src/afd/sprites/front-shiny-cosmetic/255--0--Torchic--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Torchic--Female.png rename to src/afd/sprites/front-shiny-cosmetic/255--0--Torchic--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Combusken--Female.png b/src/afd/sprites/front-shiny-cosmetic/256--0--Combusken--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Combusken--Female.png rename to src/afd/sprites/front-shiny-cosmetic/256--0--Combusken--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Blaziken--Female.png b/src/afd/sprites/front-shiny-cosmetic/257--0--Blaziken--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Blaziken--Female.png rename to src/afd/sprites/front-shiny-cosmetic/257--0--Blaziken--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Raichu--Female.png b/src/afd/sprites/front-shiny-cosmetic/26--0--Raichu--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Raichu--Female.png rename to src/afd/sprites/front-shiny-cosmetic/26--0--Raichu--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Beautifly--Female.png b/src/afd/sprites/front-shiny-cosmetic/267--0--Beautifly--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Beautifly--Female.png rename to src/afd/sprites/front-shiny-cosmetic/267--0--Beautifly--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Dustox--Female.png b/src/afd/sprites/front-shiny-cosmetic/269--0--Dustox--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Dustox--Female.png rename to src/afd/sprites/front-shiny-cosmetic/269--0--Dustox--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Ludicolo--Female.png b/src/afd/sprites/front-shiny-cosmetic/272--0--Ludicolo--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Ludicolo--Female.png rename to src/afd/sprites/front-shiny-cosmetic/272--0--Ludicolo--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Nuzleaf--Female.png b/src/afd/sprites/front-shiny-cosmetic/274--0--Nuzleaf--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Nuzleaf--Female.png rename to src/afd/sprites/front-shiny-cosmetic/274--0--Nuzleaf--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Shiftry--Female.png b/src/afd/sprites/front-shiny-cosmetic/275--0--Shiftry--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Shiftry--Female.png rename to src/afd/sprites/front-shiny-cosmetic/275--0--Shiftry--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Revenankh--Female.png b/src/afd/sprites/front-shiny-cosmetic/3--0--Revenankh--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Revenankh--Female.png rename to src/afd/sprites/front-shiny-cosmetic/3--0--Revenankh--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Venusaur--Female.png b/src/afd/sprites/front-shiny-cosmetic/3--0--Venusaur--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Venusaur--Female.png rename to src/afd/sprites/front-shiny-cosmetic/3--0--Venusaur--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Meditite--Female.png b/src/afd/sprites/front-shiny-cosmetic/307--0--Meditite--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Meditite--Female.png rename to src/afd/sprites/front-shiny-cosmetic/307--0--Meditite--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Medicham--Female.png b/src/afd/sprites/front-shiny-cosmetic/308--0--Medicham--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Medicham--Female.png rename to src/afd/sprites/front-shiny-cosmetic/308--0--Medicham--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Roselia--Female.png b/src/afd/sprites/front-shiny-cosmetic/315--0--Roselia--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Roselia--Female.png rename to src/afd/sprites/front-shiny-cosmetic/315--0--Roselia--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Gulpin--Female.png b/src/afd/sprites/front-shiny-cosmetic/316--0--Gulpin--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Gulpin--Female.png rename to src/afd/sprites/front-shiny-cosmetic/316--0--Gulpin--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Swalot--Female.png b/src/afd/sprites/front-shiny-cosmetic/317--0--Swalot--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Swalot--Female.png rename to src/afd/sprites/front-shiny-cosmetic/317--0--Swalot--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Numel--Female.png b/src/afd/sprites/front-shiny-cosmetic/322--0--Numel--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Numel--Female.png rename to src/afd/sprites/front-shiny-cosmetic/322--0--Numel--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Camerupt--Female.png b/src/afd/sprites/front-shiny-cosmetic/323--0--Camerupt--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Camerupt--Female.png rename to src/afd/sprites/front-shiny-cosmetic/323--0--Camerupt--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Cacturne--Female.png b/src/afd/sprites/front-shiny-cosmetic/332--0--Cacturne--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Cacturne--Female.png rename to src/afd/sprites/front-shiny-cosmetic/332--0--Cacturne--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Milotic--Female.png b/src/afd/sprites/front-shiny-cosmetic/350--0--Milotic--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Milotic--Female.png rename to src/afd/sprites/front-shiny-cosmetic/350--0--Milotic--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Relicanth--Female.png b/src/afd/sprites/front-shiny-cosmetic/369--0--Relicanth--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Relicanth--Female.png rename to src/afd/sprites/front-shiny-cosmetic/369--0--Relicanth--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Starly--Female.png b/src/afd/sprites/front-shiny-cosmetic/396--0--Starly--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Starly--Female.png rename to src/afd/sprites/front-shiny-cosmetic/396--0--Starly--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Staravia--Female.png b/src/afd/sprites/front-shiny-cosmetic/397--0--Staravia--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Staravia--Female.png rename to src/afd/sprites/front-shiny-cosmetic/397--0--Staravia--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Staraptor--Female.png b/src/afd/sprites/front-shiny-cosmetic/398--0--Staraptor--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Staraptor--Female.png rename to src/afd/sprites/front-shiny-cosmetic/398--0--Staraptor--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Bidoof--Female.png b/src/afd/sprites/front-shiny-cosmetic/399--0--Bidoof--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Bidoof--Female.png rename to src/afd/sprites/front-shiny-cosmetic/399--0--Bidoof--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Bibarel--Female.png b/src/afd/sprites/front-shiny-cosmetic/400--0--Bibarel--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Bibarel--Female.png rename to src/afd/sprites/front-shiny-cosmetic/400--0--Bibarel--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Kricketot--Female.png b/src/afd/sprites/front-shiny-cosmetic/401--0--Kricketot--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Kricketot--Female.png rename to src/afd/sprites/front-shiny-cosmetic/401--0--Kricketot--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Kricketune--Female.png b/src/afd/sprites/front-shiny-cosmetic/402--0--Kricketune--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Kricketune--Female.png rename to src/afd/sprites/front-shiny-cosmetic/402--0--Kricketune--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Shinx--Female.png b/src/afd/sprites/front-shiny-cosmetic/403--0--Shinx--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Shinx--Female.png rename to src/afd/sprites/front-shiny-cosmetic/403--0--Shinx--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Luxio--Female.png b/src/afd/sprites/front-shiny-cosmetic/404--0--Luxio--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Luxio--Female.png rename to src/afd/sprites/front-shiny-cosmetic/404--0--Luxio--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Luxray--Female.png b/src/afd/sprites/front-shiny-cosmetic/405--0--Luxray--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Luxray--Female.png rename to src/afd/sprites/front-shiny-cosmetic/405--0--Luxray--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Roserade--Female.png b/src/afd/sprites/front-shiny-cosmetic/407--0--Roserade--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Roserade--Female.png rename to src/afd/sprites/front-shiny-cosmetic/407--0--Roserade--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Zubat--Female.png b/src/afd/sprites/front-shiny-cosmetic/41--0--Zubat--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Zubat--Female.png rename to src/afd/sprites/front-shiny-cosmetic/41--0--Zubat--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Burmy--Sandy.png b/src/afd/sprites/front-shiny-cosmetic/412--420--Burmy--Sandy.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Burmy--Sandy.png rename to src/afd/sprites/front-shiny-cosmetic/412--420--Burmy--Sandy.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Burmy--Trash.png b/src/afd/sprites/front-shiny-cosmetic/412--420--Burmy--Trash.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Burmy--Trash.png rename to src/afd/sprites/front-shiny-cosmetic/412--420--Burmy--Trash.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Combee--Female.png b/src/afd/sprites/front-shiny-cosmetic/415--0--Combee--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Combee--Female.png rename to src/afd/sprites/front-shiny-cosmetic/415--0--Combee--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Pachirisu--Female.png b/src/afd/sprites/front-shiny-cosmetic/417--0--Pachirisu--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Pachirisu--Female.png rename to src/afd/sprites/front-shiny-cosmetic/417--0--Pachirisu--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Buizel--Female.png b/src/afd/sprites/front-shiny-cosmetic/418--0--Buizel--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Buizel--Female.png rename to src/afd/sprites/front-shiny-cosmetic/418--0--Buizel--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Floatzel--Female.png b/src/afd/sprites/front-shiny-cosmetic/419--0--Floatzel--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Floatzel--Female.png rename to src/afd/sprites/front-shiny-cosmetic/419--0--Floatzel--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Golbat--Female.png b/src/afd/sprites/front-shiny-cosmetic/42--0--Golbat--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Golbat--Female.png rename to src/afd/sprites/front-shiny-cosmetic/42--0--Golbat--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Ambipom--Female.png b/src/afd/sprites/front-shiny-cosmetic/424--0--Ambipom--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Ambipom--Female.png rename to src/afd/sprites/front-shiny-cosmetic/424--0--Ambipom--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Gloom--Female.png b/src/afd/sprites/front-shiny-cosmetic/44--0--Gloom--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Gloom--Female.png rename to src/afd/sprites/front-shiny-cosmetic/44--0--Gloom--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Gible--Female.png b/src/afd/sprites/front-shiny-cosmetic/443--0--Gible--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Gible--Female.png rename to src/afd/sprites/front-shiny-cosmetic/443--0--Gible--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Garchomp--Female.png b/src/afd/sprites/front-shiny-cosmetic/445--0--Garchomp--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Garchomp--Female.png rename to src/afd/sprites/front-shiny-cosmetic/445--0--Garchomp--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Hippopotas--Female.png b/src/afd/sprites/front-shiny-cosmetic/449--0--Hippopotas--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Hippopotas--Female.png rename to src/afd/sprites/front-shiny-cosmetic/449--0--Hippopotas--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Vileplume--Female.png b/src/afd/sprites/front-shiny-cosmetic/45--0--Vileplume--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Vileplume--Female.png rename to src/afd/sprites/front-shiny-cosmetic/45--0--Vileplume--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Hippowdon--Female.png b/src/afd/sprites/front-shiny-cosmetic/450--0--Hippowdon--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Hippowdon--Female.png rename to src/afd/sprites/front-shiny-cosmetic/450--0--Hippowdon--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Croagunk--Female.png b/src/afd/sprites/front-shiny-cosmetic/453--0--Croagunk--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Croagunk--Female.png rename to src/afd/sprites/front-shiny-cosmetic/453--0--Croagunk--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Toxicroak--Female.png b/src/afd/sprites/front-shiny-cosmetic/454--0--Toxicroak--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Toxicroak--Female.png rename to src/afd/sprites/front-shiny-cosmetic/454--0--Toxicroak--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Finneon--Female.png b/src/afd/sprites/front-shiny-cosmetic/456--0--Finneon--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Finneon--Female.png rename to src/afd/sprites/front-shiny-cosmetic/456--0--Finneon--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Lumineon--Female.png b/src/afd/sprites/front-shiny-cosmetic/457--0--Lumineon--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Lumineon--Female.png rename to src/afd/sprites/front-shiny-cosmetic/457--0--Lumineon--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Snover--Female.png b/src/afd/sprites/front-shiny-cosmetic/459--0--Snover--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Snover--Female.png rename to src/afd/sprites/front-shiny-cosmetic/459--0--Snover--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Abomasnow--Female.png b/src/afd/sprites/front-shiny-cosmetic/460--0--Abomasnow--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Abomasnow--Female.png rename to src/afd/sprites/front-shiny-cosmetic/460--0--Abomasnow--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Weavile--Female.png b/src/afd/sprites/front-shiny-cosmetic/461--0--Weavile--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Weavile--Female.png rename to src/afd/sprites/front-shiny-cosmetic/461--0--Weavile--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Rhyperior--Female.png b/src/afd/sprites/front-shiny-cosmetic/464--0--Rhyperior--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Rhyperior--Female.png rename to src/afd/sprites/front-shiny-cosmetic/464--0--Rhyperior--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Tangrowth--Female.png b/src/afd/sprites/front-shiny-cosmetic/465--0--Tangrowth--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Tangrowth--Female.png rename to src/afd/sprites/front-shiny-cosmetic/465--0--Tangrowth--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Mamoswine--Female.png b/src/afd/sprites/front-shiny-cosmetic/473--0--Mamoswine--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Mamoswine--Female.png rename to src/afd/sprites/front-shiny-cosmetic/473--0--Mamoswine--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Unfezant--Female.png b/src/afd/sprites/front-shiny-cosmetic/521--0--Unfezant--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Unfezant--Female.png rename to src/afd/sprites/front-shiny-cosmetic/521--0--Unfezant--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Frillish--Female.png b/src/afd/sprites/front-shiny-cosmetic/592--0--Frillish--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Frillish--Female.png rename to src/afd/sprites/front-shiny-cosmetic/592--0--Frillish--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Jellicent--Female.png b/src/afd/sprites/front-shiny-cosmetic/593--0--Jellicent--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Jellicent--Female.png rename to src/afd/sprites/front-shiny-cosmetic/593--0--Jellicent--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Pyroak--Female.png b/src/afd/sprites/front-shiny-cosmetic/6--0--Pyroak--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Pyroak--Female.png rename to src/afd/sprites/front-shiny-cosmetic/6--0--Pyroak--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Kadabra--Female.png b/src/afd/sprites/front-shiny-cosmetic/64--0--Kadabra--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Kadabra--Female.png rename to src/afd/sprites/front-shiny-cosmetic/64--0--Kadabra--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Alakazam--Female.png b/src/afd/sprites/front-shiny-cosmetic/65--0--Alakazam--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Alakazam--Female.png rename to src/afd/sprites/front-shiny-cosmetic/65--0--Alakazam--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Pyroar--Female.png b/src/afd/sprites/front-shiny-cosmetic/668--0--Pyroar--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Pyroar--Female.png rename to src/afd/sprites/front-shiny-cosmetic/668--0--Pyroar--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Fidgit--Female.png b/src/afd/sprites/front-shiny-cosmetic/8--0--Fidgit--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Fidgit--Female.png rename to src/afd/sprites/front-shiny-cosmetic/8--0--Fidgit--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Magearna--Original.png b/src/afd/sprites/front-shiny-cosmetic/801--420--Magearna--Original.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Magearna--Original.png rename to src/afd/sprites/front-shiny-cosmetic/801--420--Magearna--Original.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Doduo--Female.png b/src/afd/sprites/front-shiny-cosmetic/84--0--Doduo--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Doduo--Female.png rename to src/afd/sprites/front-shiny-cosmetic/84--0--Doduo--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Dodrio--Female.png b/src/afd/sprites/front-shiny-cosmetic/85--0--Dodrio--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Dodrio--Female.png rename to src/afd/sprites/front-shiny-cosmetic/85--0--Dodrio--Female.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Alcremie--Caramel_Swirl.png b/src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Caramel_Swirl.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Alcremie--Caramel_Swirl.png rename to src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Caramel_Swirl.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Alcremie--Lemon_Cream.png b/src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Lemon_Cream.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Alcremie--Lemon_Cream.png rename to src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Lemon_Cream.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Alcremie--Matcha_Cream.png b/src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Matcha_Cream.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Alcremie--Matcha_Cream.png rename to src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Matcha_Cream.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Alcremie--Mint_Cream.png b/src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Mint_Cream.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Alcremie--Mint_Cream.png rename to src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Mint_Cream.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Alcremie--Rainbow_Swirl.png b/src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Rainbow_Swirl.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Alcremie--Rainbow_Swirl.png rename to src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Rainbow_Swirl.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Alcremie--Ruby_Cream.png b/src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Ruby_Cream.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Alcremie--Ruby_Cream.png rename to src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Ruby_Cream.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Alcremie--Ruby_Swirl.png b/src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Ruby_Swirl.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Alcremie--Ruby_Swirl.png rename to src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Ruby_Swirl.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Alcremie--Salted_Cream.png b/src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Salted_Cream.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Alcremie--Salted_Cream.png rename to src/afd/sprites/front-shiny-cosmetic/869--420--Alcremie--Salted_Cream.png diff --git a/src/afd/sprites/front-shiny-cosmetic/Hypno--Female.png b/src/afd/sprites/front-shiny-cosmetic/97--0--Hypno--Female.png similarity index 100% rename from src/afd/sprites/front-shiny-cosmetic/Hypno--Female.png rename to src/afd/sprites/front-shiny-cosmetic/97--0--Hypno--Female.png diff --git a/src/afd/sprites/front-shiny/Missingno..png b/src/afd/sprites/front-shiny/0--0--Missingno..png similarity index 100% rename from src/afd/sprites/front-shiny/Missingno..png rename to src/afd/sprites/front-shiny/0--0--Missingno..png diff --git a/src/afd/sprites/front-shiny/Bulbasaur.png b/src/afd/sprites/front-shiny/1--0--Bulbasaur.png similarity index 100% rename from src/afd/sprites/front-shiny/Bulbasaur.png rename to src/afd/sprites/front-shiny/1--0--Bulbasaur.png diff --git a/src/afd/sprites/front-shiny/Caterpie.png b/src/afd/sprites/front-shiny/10--0--Caterpie.png similarity index 100% rename from src/afd/sprites/front-shiny/Caterpie.png rename to src/afd/sprites/front-shiny/10--0--Caterpie.png diff --git a/src/afd/sprites/front-shiny/Voltorb.png b/src/afd/sprites/front-shiny/100--0--Voltorb.png similarity index 100% rename from src/afd/sprites/front-shiny/Voltorb.png rename to src/afd/sprites/front-shiny/100--0--Voltorb.png diff --git a/src/afd/sprites/front-shiny/Electrode.png b/src/afd/sprites/front-shiny/101--0--Electrode.png similarity index 100% rename from src/afd/sprites/front-shiny/Electrode.png rename to src/afd/sprites/front-shiny/101--0--Electrode.png diff --git a/src/afd/sprites/front-shiny/Exeggcute.png b/src/afd/sprites/front-shiny/102--0--Exeggcute.png similarity index 100% rename from src/afd/sprites/front-shiny/Exeggcute.png rename to src/afd/sprites/front-shiny/102--0--Exeggcute.png diff --git a/src/afd/sprites/front-shiny/Exeggutor.png b/src/afd/sprites/front-shiny/103--0--Exeggutor.png similarity index 100% rename from src/afd/sprites/front-shiny/Exeggutor.png rename to src/afd/sprites/front-shiny/103--0--Exeggutor.png diff --git a/src/afd/sprites/front-shiny/Exeggutor--Alola.png b/src/afd/sprites/front-shiny/103--420--Exeggutor--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Exeggutor--Alola.png rename to src/afd/sprites/front-shiny/103--420--Exeggutor--Alola.png diff --git a/src/afd/sprites/front-shiny/Cubone.png b/src/afd/sprites/front-shiny/104--0--Cubone.png similarity index 100% rename from src/afd/sprites/front-shiny/Cubone.png rename to src/afd/sprites/front-shiny/104--0--Cubone.png diff --git a/src/afd/sprites/front-shiny/Marowak.png b/src/afd/sprites/front-shiny/105--0--Marowak.png similarity index 100% rename from src/afd/sprites/front-shiny/Marowak.png rename to src/afd/sprites/front-shiny/105--0--Marowak.png diff --git a/src/afd/sprites/front-shiny/Marowak--Alola.png b/src/afd/sprites/front-shiny/105--420--Marowak--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Marowak--Alola.png rename to src/afd/sprites/front-shiny/105--420--Marowak--Alola.png diff --git a/src/afd/sprites/front-shiny/Hitmonlee.png b/src/afd/sprites/front-shiny/106--0--Hitmonlee.png similarity index 100% rename from src/afd/sprites/front-shiny/Hitmonlee.png rename to src/afd/sprites/front-shiny/106--0--Hitmonlee.png diff --git a/src/afd/sprites/front-shiny/Hitmonchan.png b/src/afd/sprites/front-shiny/107--0--Hitmonchan.png similarity index 100% rename from src/afd/sprites/front-shiny/Hitmonchan.png rename to src/afd/sprites/front-shiny/107--0--Hitmonchan.png diff --git a/src/afd/sprites/front-shiny/Lickitung.png b/src/afd/sprites/front-shiny/108--0--Lickitung.png similarity index 100% rename from src/afd/sprites/front-shiny/Lickitung.png rename to src/afd/sprites/front-shiny/108--0--Lickitung.png diff --git a/src/afd/sprites/front-shiny/Koffing.png b/src/afd/sprites/front-shiny/109--0--Koffing.png similarity index 100% rename from src/afd/sprites/front-shiny/Koffing.png rename to src/afd/sprites/front-shiny/109--0--Koffing.png diff --git a/src/afd/sprites/front-shiny/Metapod.png b/src/afd/sprites/front-shiny/11--0--Metapod.png similarity index 100% rename from src/afd/sprites/front-shiny/Metapod.png rename to src/afd/sprites/front-shiny/11--0--Metapod.png diff --git a/src/afd/sprites/front-shiny/Stratagem.png b/src/afd/sprites/front-shiny/11--0--Stratagem.png similarity index 100% rename from src/afd/sprites/front-shiny/Stratagem.png rename to src/afd/sprites/front-shiny/11--0--Stratagem.png diff --git a/src/afd/sprites/front-shiny/Weezing.png b/src/afd/sprites/front-shiny/110--0--Weezing.png similarity index 100% rename from src/afd/sprites/front-shiny/Weezing.png rename to src/afd/sprites/front-shiny/110--0--Weezing.png diff --git a/src/afd/sprites/front-shiny/Weezing--Galar.png b/src/afd/sprites/front-shiny/110--420--Weezing--Galar.png similarity index 100% rename from src/afd/sprites/front-shiny/Weezing--Galar.png rename to src/afd/sprites/front-shiny/110--420--Weezing--Galar.png diff --git a/src/afd/sprites/front-shiny/Rhyhorn.png b/src/afd/sprites/front-shiny/111--0--Rhyhorn.png similarity index 100% rename from src/afd/sprites/front-shiny/Rhyhorn.png rename to src/afd/sprites/front-shiny/111--0--Rhyhorn.png diff --git a/src/afd/sprites/front-shiny/Rhydon.png b/src/afd/sprites/front-shiny/112--0--Rhydon.png similarity index 100% rename from src/afd/sprites/front-shiny/Rhydon.png rename to src/afd/sprites/front-shiny/112--0--Rhydon.png diff --git a/src/afd/sprites/front-shiny/Chansey.png b/src/afd/sprites/front-shiny/113--0--Chansey.png similarity index 100% rename from src/afd/sprites/front-shiny/Chansey.png rename to src/afd/sprites/front-shiny/113--0--Chansey.png diff --git a/src/afd/sprites/front-shiny/Tangela.png b/src/afd/sprites/front-shiny/114--0--Tangela.png similarity index 100% rename from src/afd/sprites/front-shiny/Tangela.png rename to src/afd/sprites/front-shiny/114--0--Tangela.png diff --git a/src/afd/sprites/front-shiny/Kangaskhan.png b/src/afd/sprites/front-shiny/115--0--Kangaskhan.png similarity index 100% rename from src/afd/sprites/front-shiny/Kangaskhan.png rename to src/afd/sprites/front-shiny/115--0--Kangaskhan.png diff --git a/src/afd/sprites/front-shiny/Kangaskhan--Mega.png b/src/afd/sprites/front-shiny/115--420--Kangaskhan--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Kangaskhan--Mega.png rename to src/afd/sprites/front-shiny/115--420--Kangaskhan--Mega.png diff --git a/src/afd/sprites/front-shiny/Horsea.png b/src/afd/sprites/front-shiny/116--0--Horsea.png similarity index 100% rename from src/afd/sprites/front-shiny/Horsea.png rename to src/afd/sprites/front-shiny/116--0--Horsea.png diff --git a/src/afd/sprites/front-shiny/Seadra.png b/src/afd/sprites/front-shiny/117--0--Seadra.png similarity index 100% rename from src/afd/sprites/front-shiny/Seadra.png rename to src/afd/sprites/front-shiny/117--0--Seadra.png diff --git a/src/afd/sprites/front-shiny/Goldeen.png b/src/afd/sprites/front-shiny/118--0--Goldeen.png similarity index 100% rename from src/afd/sprites/front-shiny/Goldeen.png rename to src/afd/sprites/front-shiny/118--0--Goldeen.png diff --git a/src/afd/sprites/front-shiny/Seaking.png b/src/afd/sprites/front-shiny/119--0--Seaking.png similarity index 100% rename from src/afd/sprites/front-shiny/Seaking.png rename to src/afd/sprites/front-shiny/119--0--Seaking.png diff --git a/src/afd/sprites/front-shiny/Butterfree.png b/src/afd/sprites/front-shiny/12--0--Butterfree.png similarity index 100% rename from src/afd/sprites/front-shiny/Butterfree.png rename to src/afd/sprites/front-shiny/12--0--Butterfree.png diff --git a/src/afd/sprites/front-shiny/Butterfree--Gmax.png b/src/afd/sprites/front-shiny/12--420--Butterfree--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Butterfree--Gmax.png rename to src/afd/sprites/front-shiny/12--420--Butterfree--Gmax.png diff --git a/src/afd/sprites/front-shiny/Staryu.png b/src/afd/sprites/front-shiny/120--0--Staryu.png similarity index 100% rename from src/afd/sprites/front-shiny/Staryu.png rename to src/afd/sprites/front-shiny/120--0--Staryu.png diff --git a/src/afd/sprites/front-shiny/Starmie.png b/src/afd/sprites/front-shiny/121--0--Starmie.png similarity index 100% rename from src/afd/sprites/front-shiny/Starmie.png rename to src/afd/sprites/front-shiny/121--0--Starmie.png diff --git a/src/afd/sprites/front-shiny/Mr._Mime.png b/src/afd/sprites/front-shiny/122--0--Mr._Mime.png similarity index 100% rename from src/afd/sprites/front-shiny/Mr._Mime.png rename to src/afd/sprites/front-shiny/122--0--Mr._Mime.png diff --git a/src/afd/sprites/front-shiny/Mr._Mime--Galar.png b/src/afd/sprites/front-shiny/122--420--Mr._Mime--Galar.png similarity index 100% rename from src/afd/sprites/front-shiny/Mr._Mime--Galar.png rename to src/afd/sprites/front-shiny/122--420--Mr._Mime--Galar.png diff --git a/src/afd/sprites/front-shiny/Scyther.png b/src/afd/sprites/front-shiny/123--0--Scyther.png similarity index 100% rename from src/afd/sprites/front-shiny/Scyther.png rename to src/afd/sprites/front-shiny/123--0--Scyther.png diff --git a/src/afd/sprites/front-shiny/Jynx.png b/src/afd/sprites/front-shiny/124--0--Jynx.png similarity index 100% rename from src/afd/sprites/front-shiny/Jynx.png rename to src/afd/sprites/front-shiny/124--0--Jynx.png diff --git a/src/afd/sprites/front-shiny/Electabuzz.png b/src/afd/sprites/front-shiny/125--0--Electabuzz.png similarity index 100% rename from src/afd/sprites/front-shiny/Electabuzz.png rename to src/afd/sprites/front-shiny/125--0--Electabuzz.png diff --git a/src/afd/sprites/front-shiny/Magmar.png b/src/afd/sprites/front-shiny/126--0--Magmar.png similarity index 100% rename from src/afd/sprites/front-shiny/Magmar.png rename to src/afd/sprites/front-shiny/126--0--Magmar.png diff --git a/src/afd/sprites/front-shiny/Pinsir.png b/src/afd/sprites/front-shiny/127--0--Pinsir.png similarity index 100% rename from src/afd/sprites/front-shiny/Pinsir.png rename to src/afd/sprites/front-shiny/127--0--Pinsir.png diff --git a/src/afd/sprites/front-shiny/Pinsir--Mega.png b/src/afd/sprites/front-shiny/127--420--Pinsir--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Pinsir--Mega.png rename to src/afd/sprites/front-shiny/127--420--Pinsir--Mega.png diff --git a/src/afd/sprites/front-shiny/Tauros.png b/src/afd/sprites/front-shiny/128--0--Tauros.png similarity index 100% rename from src/afd/sprites/front-shiny/Tauros.png rename to src/afd/sprites/front-shiny/128--0--Tauros.png diff --git a/src/afd/sprites/front-shiny/Magikarp.png b/src/afd/sprites/front-shiny/129--0--Magikarp.png similarity index 100% rename from src/afd/sprites/front-shiny/Magikarp.png rename to src/afd/sprites/front-shiny/129--0--Magikarp.png diff --git a/src/afd/sprites/front-shiny/Arghonaut.png b/src/afd/sprites/front-shiny/13--0--Arghonaut.png similarity index 100% rename from src/afd/sprites/front-shiny/Arghonaut.png rename to src/afd/sprites/front-shiny/13--0--Arghonaut.png diff --git a/src/afd/sprites/front-shiny/Weedle.png b/src/afd/sprites/front-shiny/13--0--Weedle.png similarity index 100% rename from src/afd/sprites/front-shiny/Weedle.png rename to src/afd/sprites/front-shiny/13--0--Weedle.png diff --git a/src/afd/sprites/front-shiny/Gyarados.png b/src/afd/sprites/front-shiny/130--0--Gyarados.png similarity index 100% rename from src/afd/sprites/front-shiny/Gyarados.png rename to src/afd/sprites/front-shiny/130--0--Gyarados.png diff --git a/src/afd/sprites/front-shiny/Gyarados--Mega.png b/src/afd/sprites/front-shiny/130--420--Gyarados--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Gyarados--Mega.png rename to src/afd/sprites/front-shiny/130--420--Gyarados--Mega.png diff --git a/src/afd/sprites/front-shiny/Lapras.png b/src/afd/sprites/front-shiny/131--0--Lapras.png similarity index 100% rename from src/afd/sprites/front-shiny/Lapras.png rename to src/afd/sprites/front-shiny/131--0--Lapras.png diff --git a/src/afd/sprites/front-shiny/Lapras--Gmax.png b/src/afd/sprites/front-shiny/131--420--Lapras--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Lapras--Gmax.png rename to src/afd/sprites/front-shiny/131--420--Lapras--Gmax.png diff --git a/src/afd/sprites/front-shiny/Ditto.png b/src/afd/sprites/front-shiny/132--0--Ditto.png similarity index 100% rename from src/afd/sprites/front-shiny/Ditto.png rename to src/afd/sprites/front-shiny/132--0--Ditto.png diff --git a/src/afd/sprites/front-shiny/Eevee.png b/src/afd/sprites/front-shiny/133--0--Eevee.png similarity index 100% rename from src/afd/sprites/front-shiny/Eevee.png rename to src/afd/sprites/front-shiny/133--0--Eevee.png diff --git a/src/afd/sprites/front-shiny/Eevee--Gmax.png b/src/afd/sprites/front-shiny/133--420--Eevee--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Eevee--Gmax.png rename to src/afd/sprites/front-shiny/133--420--Eevee--Gmax.png diff --git a/src/afd/sprites/front-shiny/Eevee--Starter.png b/src/afd/sprites/front-shiny/133--420--Eevee--Starter.png similarity index 100% rename from src/afd/sprites/front-shiny/Eevee--Starter.png rename to src/afd/sprites/front-shiny/133--420--Eevee--Starter.png diff --git a/src/afd/sprites/front-shiny/Vaporeon.png b/src/afd/sprites/front-shiny/134--0--Vaporeon.png similarity index 100% rename from src/afd/sprites/front-shiny/Vaporeon.png rename to src/afd/sprites/front-shiny/134--0--Vaporeon.png diff --git a/src/afd/sprites/front-shiny/Jolteon.png b/src/afd/sprites/front-shiny/135--0--Jolteon.png similarity index 100% rename from src/afd/sprites/front-shiny/Jolteon.png rename to src/afd/sprites/front-shiny/135--0--Jolteon.png diff --git a/src/afd/sprites/front-shiny/Flareon.png b/src/afd/sprites/front-shiny/136--0--Flareon.png similarity index 100% rename from src/afd/sprites/front-shiny/Flareon.png rename to src/afd/sprites/front-shiny/136--0--Flareon.png diff --git a/src/afd/sprites/front-shiny/Porygon.png b/src/afd/sprites/front-shiny/137--0--Porygon.png similarity index 100% rename from src/afd/sprites/front-shiny/Porygon.png rename to src/afd/sprites/front-shiny/137--0--Porygon.png diff --git a/src/afd/sprites/front-shiny/Omanyte.png b/src/afd/sprites/front-shiny/138--0--Omanyte.png similarity index 100% rename from src/afd/sprites/front-shiny/Omanyte.png rename to src/afd/sprites/front-shiny/138--0--Omanyte.png diff --git a/src/afd/sprites/front-shiny/Omastar.png b/src/afd/sprites/front-shiny/139--0--Omastar.png similarity index 100% rename from src/afd/sprites/front-shiny/Omastar.png rename to src/afd/sprites/front-shiny/139--0--Omastar.png diff --git a/src/afd/sprites/front-shiny/Kakuna.png b/src/afd/sprites/front-shiny/14--0--Kakuna.png similarity index 100% rename from src/afd/sprites/front-shiny/Kakuna.png rename to src/afd/sprites/front-shiny/14--0--Kakuna.png diff --git a/src/afd/sprites/front-shiny/Kitsunoh.png b/src/afd/sprites/front-shiny/14--0--Kitsunoh.png similarity index 100% rename from src/afd/sprites/front-shiny/Kitsunoh.png rename to src/afd/sprites/front-shiny/14--0--Kitsunoh.png diff --git a/src/afd/sprites/front-shiny/Kabuto.png b/src/afd/sprites/front-shiny/140--0--Kabuto.png similarity index 100% rename from src/afd/sprites/front-shiny/Kabuto.png rename to src/afd/sprites/front-shiny/140--0--Kabuto.png diff --git a/src/afd/sprites/front-shiny/Kabutops.png b/src/afd/sprites/front-shiny/141--0--Kabutops.png similarity index 100% rename from src/afd/sprites/front-shiny/Kabutops.png rename to src/afd/sprites/front-shiny/141--0--Kabutops.png diff --git a/src/afd/sprites/front-shiny/Aerodactyl--Mega.png b/src/afd/sprites/front-shiny/142--420--Aerodactyl--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Aerodactyl--Mega.png rename to src/afd/sprites/front-shiny/142--420--Aerodactyl--Mega.png diff --git a/src/afd/sprites/front-shiny/Snorlax.png b/src/afd/sprites/front-shiny/143--0--Snorlax.png similarity index 100% rename from src/afd/sprites/front-shiny/Snorlax.png rename to src/afd/sprites/front-shiny/143--0--Snorlax.png diff --git a/src/afd/sprites/front-shiny/Snorlax--Gmax.png b/src/afd/sprites/front-shiny/143--420--Snorlax--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Snorlax--Gmax.png rename to src/afd/sprites/front-shiny/143--420--Snorlax--Gmax.png diff --git a/src/afd/sprites/front-shiny/Articuno.png b/src/afd/sprites/front-shiny/144--0--Articuno.png similarity index 100% rename from src/afd/sprites/front-shiny/Articuno.png rename to src/afd/sprites/front-shiny/144--0--Articuno.png diff --git a/src/afd/sprites/front-shiny/Zapdos.png b/src/afd/sprites/front-shiny/145--0--Zapdos.png similarity index 100% rename from src/afd/sprites/front-shiny/Zapdos.png rename to src/afd/sprites/front-shiny/145--0--Zapdos.png diff --git a/src/afd/sprites/front-shiny/Moltres.png b/src/afd/sprites/front-shiny/146--0--Moltres.png similarity index 100% rename from src/afd/sprites/front-shiny/Moltres.png rename to src/afd/sprites/front-shiny/146--0--Moltres.png diff --git a/src/afd/sprites/front-shiny/Dratini.png b/src/afd/sprites/front-shiny/147--0--Dratini.png similarity index 100% rename from src/afd/sprites/front-shiny/Dratini.png rename to src/afd/sprites/front-shiny/147--0--Dratini.png diff --git a/src/afd/sprites/front-shiny/Dragonair.png b/src/afd/sprites/front-shiny/148--0--Dragonair.png similarity index 100% rename from src/afd/sprites/front-shiny/Dragonair.png rename to src/afd/sprites/front-shiny/148--0--Dragonair.png diff --git a/src/afd/sprites/front-shiny/Dragonite.png b/src/afd/sprites/front-shiny/149--0--Dragonite.png similarity index 100% rename from src/afd/sprites/front-shiny/Dragonite.png rename to src/afd/sprites/front-shiny/149--0--Dragonite.png diff --git a/src/afd/sprites/front-shiny/Beedrill.png b/src/afd/sprites/front-shiny/15--0--Beedrill.png similarity index 100% rename from src/afd/sprites/front-shiny/Beedrill.png rename to src/afd/sprites/front-shiny/15--0--Beedrill.png diff --git a/src/afd/sprites/front-shiny/Cyclohm.png b/src/afd/sprites/front-shiny/15--0--Cyclohm.png similarity index 100% rename from src/afd/sprites/front-shiny/Cyclohm.png rename to src/afd/sprites/front-shiny/15--0--Cyclohm.png diff --git a/src/afd/sprites/front-shiny/Beedrill--Mega.png b/src/afd/sprites/front-shiny/15--420--Beedrill--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Beedrill--Mega.png rename to src/afd/sprites/front-shiny/15--420--Beedrill--Mega.png diff --git a/src/afd/sprites/front-shiny/Mewtwo.png b/src/afd/sprites/front-shiny/150--0--Mewtwo.png similarity index 100% rename from src/afd/sprites/front-shiny/Mewtwo.png rename to src/afd/sprites/front-shiny/150--0--Mewtwo.png diff --git a/src/afd/sprites/front-shiny/Mewtwo--Mega-X.png b/src/afd/sprites/front-shiny/150--420--Mewtwo--Mega-X.png similarity index 100% rename from src/afd/sprites/front-shiny/Mewtwo--Mega-X.png rename to src/afd/sprites/front-shiny/150--420--Mewtwo--Mega-X.png diff --git a/src/afd/sprites/front-shiny/Mewtwo--Mega-Y.png b/src/afd/sprites/front-shiny/150--420--Mewtwo--Mega-Y.png similarity index 100% rename from src/afd/sprites/front-shiny/Mewtwo--Mega-Y.png rename to src/afd/sprites/front-shiny/150--420--Mewtwo--Mega-Y.png diff --git a/src/afd/sprites/front-shiny/Mew.png b/src/afd/sprites/front-shiny/151--0--Mew.png similarity index 100% rename from src/afd/sprites/front-shiny/Mew.png rename to src/afd/sprites/front-shiny/151--0--Mew.png diff --git a/src/afd/sprites/front-shiny/Chikorita.png b/src/afd/sprites/front-shiny/152--0--Chikorita.png similarity index 100% rename from src/afd/sprites/front-shiny/Chikorita.png rename to src/afd/sprites/front-shiny/152--0--Chikorita.png diff --git a/src/afd/sprites/front-shiny/Bayleef.png b/src/afd/sprites/front-shiny/153--0--Bayleef.png similarity index 100% rename from src/afd/sprites/front-shiny/Bayleef.png rename to src/afd/sprites/front-shiny/153--0--Bayleef.png diff --git a/src/afd/sprites/front-shiny/Meganium.png b/src/afd/sprites/front-shiny/154--0--Meganium.png similarity index 100% rename from src/afd/sprites/front-shiny/Meganium.png rename to src/afd/sprites/front-shiny/154--0--Meganium.png diff --git a/src/afd/sprites/front-shiny/Cyndaquil.png b/src/afd/sprites/front-shiny/155--0--Cyndaquil.png similarity index 100% rename from src/afd/sprites/front-shiny/Cyndaquil.png rename to src/afd/sprites/front-shiny/155--0--Cyndaquil.png diff --git a/src/afd/sprites/front-shiny/Quilava.png b/src/afd/sprites/front-shiny/156--0--Quilava.png similarity index 100% rename from src/afd/sprites/front-shiny/Quilava.png rename to src/afd/sprites/front-shiny/156--0--Quilava.png diff --git a/src/afd/sprites/front-shiny/Typhlosion.png b/src/afd/sprites/front-shiny/157--0--Typhlosion.png similarity index 100% rename from src/afd/sprites/front-shiny/Typhlosion.png rename to src/afd/sprites/front-shiny/157--0--Typhlosion.png diff --git a/src/afd/sprites/front-shiny/Totodile.png b/src/afd/sprites/front-shiny/158--0--Totodile.png similarity index 100% rename from src/afd/sprites/front-shiny/Totodile.png rename to src/afd/sprites/front-shiny/158--0--Totodile.png diff --git a/src/afd/sprites/front-shiny/Croconaw.png b/src/afd/sprites/front-shiny/159--0--Croconaw.png similarity index 100% rename from src/afd/sprites/front-shiny/Croconaw.png rename to src/afd/sprites/front-shiny/159--0--Croconaw.png diff --git a/src/afd/sprites/front-shiny/Colossoil.png b/src/afd/sprites/front-shiny/16--0--Colossoil.png similarity index 100% rename from src/afd/sprites/front-shiny/Colossoil.png rename to src/afd/sprites/front-shiny/16--0--Colossoil.png diff --git a/src/afd/sprites/front-shiny/Pidgey.png b/src/afd/sprites/front-shiny/16--0--Pidgey.png similarity index 100% rename from src/afd/sprites/front-shiny/Pidgey.png rename to src/afd/sprites/front-shiny/16--0--Pidgey.png diff --git a/src/afd/sprites/front-shiny/Feraligatr.png b/src/afd/sprites/front-shiny/160--0--Feraligatr.png similarity index 100% rename from src/afd/sprites/front-shiny/Feraligatr.png rename to src/afd/sprites/front-shiny/160--0--Feraligatr.png diff --git a/src/afd/sprites/front-shiny/Sentret.png b/src/afd/sprites/front-shiny/161--0--Sentret.png similarity index 100% rename from src/afd/sprites/front-shiny/Sentret.png rename to src/afd/sprites/front-shiny/161--0--Sentret.png diff --git a/src/afd/sprites/front-shiny/Furret.png b/src/afd/sprites/front-shiny/162--0--Furret.png similarity index 100% rename from src/afd/sprites/front-shiny/Furret.png rename to src/afd/sprites/front-shiny/162--0--Furret.png diff --git a/src/afd/sprites/front-shiny/Hoothoot.png b/src/afd/sprites/front-shiny/163--0--Hoothoot.png similarity index 100% rename from src/afd/sprites/front-shiny/Hoothoot.png rename to src/afd/sprites/front-shiny/163--0--Hoothoot.png diff --git a/src/afd/sprites/front-shiny/Noctowl.png b/src/afd/sprites/front-shiny/164--0--Noctowl.png similarity index 100% rename from src/afd/sprites/front-shiny/Noctowl.png rename to src/afd/sprites/front-shiny/164--0--Noctowl.png diff --git a/src/afd/sprites/front-shiny/Ledyba.png b/src/afd/sprites/front-shiny/165--0--Ledyba.png similarity index 100% rename from src/afd/sprites/front-shiny/Ledyba.png rename to src/afd/sprites/front-shiny/165--0--Ledyba.png diff --git a/src/afd/sprites/front-shiny/Ledian.png b/src/afd/sprites/front-shiny/166--0--Ledian.png similarity index 100% rename from src/afd/sprites/front-shiny/Ledian.png rename to src/afd/sprites/front-shiny/166--0--Ledian.png diff --git a/src/afd/sprites/front-shiny/Spinarak.png b/src/afd/sprites/front-shiny/167--0--Spinarak.png similarity index 100% rename from src/afd/sprites/front-shiny/Spinarak.png rename to src/afd/sprites/front-shiny/167--0--Spinarak.png diff --git a/src/afd/sprites/front-shiny/Ariados.png b/src/afd/sprites/front-shiny/168--0--Ariados.png similarity index 100% rename from src/afd/sprites/front-shiny/Ariados.png rename to src/afd/sprites/front-shiny/168--0--Ariados.png diff --git a/src/afd/sprites/front-shiny/Crobat.png b/src/afd/sprites/front-shiny/169--0--Crobat.png similarity index 100% rename from src/afd/sprites/front-shiny/Crobat.png rename to src/afd/sprites/front-shiny/169--0--Crobat.png diff --git a/src/afd/sprites/front-shiny/Krilowatt.png b/src/afd/sprites/front-shiny/17--0--Krilowatt.png similarity index 100% rename from src/afd/sprites/front-shiny/Krilowatt.png rename to src/afd/sprites/front-shiny/17--0--Krilowatt.png diff --git a/src/afd/sprites/front-shiny/Pidgeotto.png b/src/afd/sprites/front-shiny/17--0--Pidgeotto.png similarity index 100% rename from src/afd/sprites/front-shiny/Pidgeotto.png rename to src/afd/sprites/front-shiny/17--0--Pidgeotto.png diff --git a/src/afd/sprites/front-shiny/Chinchou.png b/src/afd/sprites/front-shiny/170--0--Chinchou.png similarity index 100% rename from src/afd/sprites/front-shiny/Chinchou.png rename to src/afd/sprites/front-shiny/170--0--Chinchou.png diff --git a/src/afd/sprites/front-shiny/Lanturn.png b/src/afd/sprites/front-shiny/171--0--Lanturn.png similarity index 100% rename from src/afd/sprites/front-shiny/Lanturn.png rename to src/afd/sprites/front-shiny/171--0--Lanturn.png diff --git a/src/afd/sprites/front-shiny/Pichu.png b/src/afd/sprites/front-shiny/172--0--Pichu.png similarity index 100% rename from src/afd/sprites/front-shiny/Pichu.png rename to src/afd/sprites/front-shiny/172--0--Pichu.png diff --git a/src/afd/sprites/front-shiny/Cleffa.png b/src/afd/sprites/front-shiny/173--0--Cleffa.png similarity index 100% rename from src/afd/sprites/front-shiny/Cleffa.png rename to src/afd/sprites/front-shiny/173--0--Cleffa.png diff --git a/src/afd/sprites/front-shiny/Igglybuff.png b/src/afd/sprites/front-shiny/174--0--Igglybuff.png similarity index 100% rename from src/afd/sprites/front-shiny/Igglybuff.png rename to src/afd/sprites/front-shiny/174--0--Igglybuff.png diff --git a/src/afd/sprites/front-shiny/Togepi.png b/src/afd/sprites/front-shiny/175--0--Togepi.png similarity index 100% rename from src/afd/sprites/front-shiny/Togepi.png rename to src/afd/sprites/front-shiny/175--0--Togepi.png diff --git a/src/afd/sprites/front-shiny/Togetic.png b/src/afd/sprites/front-shiny/176--0--Togetic.png similarity index 100% rename from src/afd/sprites/front-shiny/Togetic.png rename to src/afd/sprites/front-shiny/176--0--Togetic.png diff --git a/src/afd/sprites/front-shiny/Natu.png b/src/afd/sprites/front-shiny/177--0--Natu.png similarity index 100% rename from src/afd/sprites/front-shiny/Natu.png rename to src/afd/sprites/front-shiny/177--0--Natu.png diff --git a/src/afd/sprites/front-shiny/Xatu.png b/src/afd/sprites/front-shiny/178--0--Xatu.png similarity index 100% rename from src/afd/sprites/front-shiny/Xatu.png rename to src/afd/sprites/front-shiny/178--0--Xatu.png diff --git a/src/afd/sprites/front-shiny/Mareep.png b/src/afd/sprites/front-shiny/179--0--Mareep.png similarity index 100% rename from src/afd/sprites/front-shiny/Mareep.png rename to src/afd/sprites/front-shiny/179--0--Mareep.png diff --git a/src/afd/sprites/front-shiny/Pidgeot.png b/src/afd/sprites/front-shiny/18--0--Pidgeot.png similarity index 100% rename from src/afd/sprites/front-shiny/Pidgeot.png rename to src/afd/sprites/front-shiny/18--0--Pidgeot.png diff --git a/src/afd/sprites/front-shiny/Pidgeot--Mega.gif b/src/afd/sprites/front-shiny/18--420--Pidgeot--Mega.gif similarity index 100% rename from src/afd/sprites/front-shiny/Pidgeot--Mega.gif rename to src/afd/sprites/front-shiny/18--420--Pidgeot--Mega.gif diff --git a/src/afd/sprites/front-shiny/Ampharos.png b/src/afd/sprites/front-shiny/181--0--Ampharos.png similarity index 100% rename from src/afd/sprites/front-shiny/Ampharos.png rename to src/afd/sprites/front-shiny/181--0--Ampharos.png diff --git a/src/afd/sprites/front-shiny/Ampharos--Mega.png b/src/afd/sprites/front-shiny/181--420--Ampharos--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Ampharos--Mega.png rename to src/afd/sprites/front-shiny/181--420--Ampharos--Mega.png diff --git a/src/afd/sprites/front-shiny/Bellossom.png b/src/afd/sprites/front-shiny/182--0--Bellossom.png similarity index 100% rename from src/afd/sprites/front-shiny/Bellossom.png rename to src/afd/sprites/front-shiny/182--0--Bellossom.png diff --git a/src/afd/sprites/front-shiny/Marill.png b/src/afd/sprites/front-shiny/183--0--Marill.png similarity index 100% rename from src/afd/sprites/front-shiny/Marill.png rename to src/afd/sprites/front-shiny/183--0--Marill.png diff --git a/src/afd/sprites/front-shiny/Azumarill.png b/src/afd/sprites/front-shiny/184--0--Azumarill.png similarity index 100% rename from src/afd/sprites/front-shiny/Azumarill.png rename to src/afd/sprites/front-shiny/184--0--Azumarill.png diff --git a/src/afd/sprites/front-shiny/Sudowoodo.png b/src/afd/sprites/front-shiny/185--0--Sudowoodo.png similarity index 100% rename from src/afd/sprites/front-shiny/Sudowoodo.png rename to src/afd/sprites/front-shiny/185--0--Sudowoodo.png diff --git a/src/afd/sprites/front-shiny/Politoed.png b/src/afd/sprites/front-shiny/186--0--Politoed.png similarity index 100% rename from src/afd/sprites/front-shiny/Politoed.png rename to src/afd/sprites/front-shiny/186--0--Politoed.png diff --git a/src/afd/sprites/front-shiny/Hoppip.png b/src/afd/sprites/front-shiny/187--0--Hoppip.png similarity index 100% rename from src/afd/sprites/front-shiny/Hoppip.png rename to src/afd/sprites/front-shiny/187--0--Hoppip.png diff --git a/src/afd/sprites/front-shiny/Skiploom.png b/src/afd/sprites/front-shiny/188--0--Skiploom.png similarity index 100% rename from src/afd/sprites/front-shiny/Skiploom.png rename to src/afd/sprites/front-shiny/188--0--Skiploom.png diff --git a/src/afd/sprites/front-shiny/Jumpluff.png b/src/afd/sprites/front-shiny/189--0--Jumpluff.png similarity index 100% rename from src/afd/sprites/front-shiny/Jumpluff.png rename to src/afd/sprites/front-shiny/189--0--Jumpluff.png diff --git a/src/afd/sprites/front-shiny/Rattata.png b/src/afd/sprites/front-shiny/19--0--Rattata.png similarity index 100% rename from src/afd/sprites/front-shiny/Rattata.png rename to src/afd/sprites/front-shiny/19--0--Rattata.png diff --git a/src/afd/sprites/front-shiny/Voodoom.png b/src/afd/sprites/front-shiny/19--0--Voodoom.png similarity index 100% rename from src/afd/sprites/front-shiny/Voodoom.png rename to src/afd/sprites/front-shiny/19--0--Voodoom.png diff --git a/src/afd/sprites/front-shiny/Rattata--Alola.png b/src/afd/sprites/front-shiny/19--420--Rattata--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Rattata--Alola.png rename to src/afd/sprites/front-shiny/19--420--Rattata--Alola.png diff --git a/src/afd/sprites/front-shiny/Aipom.png b/src/afd/sprites/front-shiny/190--0--Aipom.png similarity index 100% rename from src/afd/sprites/front-shiny/Aipom.png rename to src/afd/sprites/front-shiny/190--0--Aipom.png diff --git a/src/afd/sprites/front-shiny/Sunkern.png b/src/afd/sprites/front-shiny/191--0--Sunkern.png similarity index 100% rename from src/afd/sprites/front-shiny/Sunkern.png rename to src/afd/sprites/front-shiny/191--0--Sunkern.png diff --git a/src/afd/sprites/front-shiny/Sunflora.png b/src/afd/sprites/front-shiny/192--0--Sunflora.png similarity index 100% rename from src/afd/sprites/front-shiny/Sunflora.png rename to src/afd/sprites/front-shiny/192--0--Sunflora.png diff --git a/src/afd/sprites/front-shiny/Yanma.png b/src/afd/sprites/front-shiny/193--0--Yanma.png similarity index 100% rename from src/afd/sprites/front-shiny/Yanma.png rename to src/afd/sprites/front-shiny/193--0--Yanma.png diff --git a/src/afd/sprites/front-shiny/Wooper.png b/src/afd/sprites/front-shiny/194--0--Wooper.png similarity index 100% rename from src/afd/sprites/front-shiny/Wooper.png rename to src/afd/sprites/front-shiny/194--0--Wooper.png diff --git a/src/afd/sprites/front-shiny/Quagsire.png b/src/afd/sprites/front-shiny/195--0--Quagsire.png similarity index 100% rename from src/afd/sprites/front-shiny/Quagsire.png rename to src/afd/sprites/front-shiny/195--0--Quagsire.png diff --git a/src/afd/sprites/front-shiny/Espeon.png b/src/afd/sprites/front-shiny/196--0--Espeon.png similarity index 100% rename from src/afd/sprites/front-shiny/Espeon.png rename to src/afd/sprites/front-shiny/196--0--Espeon.png diff --git a/src/afd/sprites/front-shiny/Umbreon.png b/src/afd/sprites/front-shiny/197--0--Umbreon.png similarity index 100% rename from src/afd/sprites/front-shiny/Umbreon.png rename to src/afd/sprites/front-shiny/197--0--Umbreon.png diff --git a/src/afd/sprites/front-shiny/Murkrow.png b/src/afd/sprites/front-shiny/198--0--Murkrow.png similarity index 100% rename from src/afd/sprites/front-shiny/Murkrow.png rename to src/afd/sprites/front-shiny/198--0--Murkrow.png diff --git a/src/afd/sprites/front-shiny/Slowking.png b/src/afd/sprites/front-shiny/199--0--Slowking.png similarity index 100% rename from src/afd/sprites/front-shiny/Slowking.png rename to src/afd/sprites/front-shiny/199--0--Slowking.png diff --git a/src/afd/sprites/front-shiny/Ivysaur.png b/src/afd/sprites/front-shiny/2--0--Ivysaur.png similarity index 100% rename from src/afd/sprites/front-shiny/Ivysaur.png rename to src/afd/sprites/front-shiny/2--0--Ivysaur.png diff --git a/src/afd/sprites/front-shiny/Syclant.png b/src/afd/sprites/front-shiny/2--0--Syclant.png similarity index 100% rename from src/afd/sprites/front-shiny/Syclant.png rename to src/afd/sprites/front-shiny/2--0--Syclant.png diff --git a/src/afd/sprites/front-shiny/Raticate.png b/src/afd/sprites/front-shiny/20--0--Raticate.png similarity index 100% rename from src/afd/sprites/front-shiny/Raticate.png rename to src/afd/sprites/front-shiny/20--0--Raticate.png diff --git a/src/afd/sprites/front-shiny/Raticate--Alola.png b/src/afd/sprites/front-shiny/20--420--Raticate--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Raticate--Alola.png rename to src/afd/sprites/front-shiny/20--420--Raticate--Alola.png diff --git a/src/afd/sprites/front-shiny/Misdreavus.png b/src/afd/sprites/front-shiny/200--0--Misdreavus.png similarity index 100% rename from src/afd/sprites/front-shiny/Misdreavus.png rename to src/afd/sprites/front-shiny/200--0--Misdreavus.png diff --git a/src/afd/sprites/front-shiny/Unown.png b/src/afd/sprites/front-shiny/201--0--Unown.png similarity index 100% rename from src/afd/sprites/front-shiny/Unown.png rename to src/afd/sprites/front-shiny/201--0--Unown.png diff --git a/src/afd/sprites/front-shiny/Wobbuffet.png b/src/afd/sprites/front-shiny/202--0--Wobbuffet.png similarity index 100% rename from src/afd/sprites/front-shiny/Wobbuffet.png rename to src/afd/sprites/front-shiny/202--0--Wobbuffet.png diff --git a/src/afd/sprites/front-shiny/Girafarig.png b/src/afd/sprites/front-shiny/203--0--Girafarig.png similarity index 100% rename from src/afd/sprites/front-shiny/Girafarig.png rename to src/afd/sprites/front-shiny/203--0--Girafarig.png diff --git a/src/afd/sprites/front-shiny/Pineco.png b/src/afd/sprites/front-shiny/204--0--Pineco.png similarity index 100% rename from src/afd/sprites/front-shiny/Pineco.png rename to src/afd/sprites/front-shiny/204--0--Pineco.png diff --git a/src/afd/sprites/front-shiny/Forretress.png b/src/afd/sprites/front-shiny/205--0--Forretress.png similarity index 100% rename from src/afd/sprites/front-shiny/Forretress.png rename to src/afd/sprites/front-shiny/205--0--Forretress.png diff --git a/src/afd/sprites/front-shiny/Dunsparce.png b/src/afd/sprites/front-shiny/206--0--Dunsparce.png similarity index 100% rename from src/afd/sprites/front-shiny/Dunsparce.png rename to src/afd/sprites/front-shiny/206--0--Dunsparce.png diff --git a/src/afd/sprites/front-shiny/Gligar.png b/src/afd/sprites/front-shiny/207--0--Gligar.png similarity index 100% rename from src/afd/sprites/front-shiny/Gligar.png rename to src/afd/sprites/front-shiny/207--0--Gligar.png diff --git a/src/afd/sprites/front-shiny/Steelix.png b/src/afd/sprites/front-shiny/208--0--Steelix.png similarity index 100% rename from src/afd/sprites/front-shiny/Steelix.png rename to src/afd/sprites/front-shiny/208--0--Steelix.png diff --git a/src/afd/sprites/front-shiny/Steelix--Mega.png b/src/afd/sprites/front-shiny/208--420--Steelix--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Steelix--Mega.png rename to src/afd/sprites/front-shiny/208--420--Steelix--Mega.png diff --git a/src/afd/sprites/front-shiny/Snubbull.png b/src/afd/sprites/front-shiny/209--0--Snubbull.png similarity index 100% rename from src/afd/sprites/front-shiny/Snubbull.png rename to src/afd/sprites/front-shiny/209--0--Snubbull.png diff --git a/src/afd/sprites/front-shiny/Spearow.png b/src/afd/sprites/front-shiny/21--0--Spearow.png similarity index 100% rename from src/afd/sprites/front-shiny/Spearow.png rename to src/afd/sprites/front-shiny/21--0--Spearow.png diff --git a/src/afd/sprites/front-shiny/Tomohawk.png b/src/afd/sprites/front-shiny/21--0--Tomohawk.png similarity index 100% rename from src/afd/sprites/front-shiny/Tomohawk.png rename to src/afd/sprites/front-shiny/21--0--Tomohawk.png diff --git a/src/afd/sprites/front-shiny/Granbull.png b/src/afd/sprites/front-shiny/210--0--Granbull.png similarity index 100% rename from src/afd/sprites/front-shiny/Granbull.png rename to src/afd/sprites/front-shiny/210--0--Granbull.png diff --git a/src/afd/sprites/front-shiny/Qwilfish.png b/src/afd/sprites/front-shiny/211--0--Qwilfish.png similarity index 100% rename from src/afd/sprites/front-shiny/Qwilfish.png rename to src/afd/sprites/front-shiny/211--0--Qwilfish.png diff --git a/src/afd/sprites/front-shiny/Scizor.png b/src/afd/sprites/front-shiny/212--0--Scizor.png similarity index 100% rename from src/afd/sprites/front-shiny/Scizor.png rename to src/afd/sprites/front-shiny/212--0--Scizor.png diff --git a/src/afd/sprites/front-shiny/Scizor--Mega.png b/src/afd/sprites/front-shiny/212--420--Scizor--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Scizor--Mega.png rename to src/afd/sprites/front-shiny/212--420--Scizor--Mega.png diff --git a/src/afd/sprites/front-shiny/Shuckle.png b/src/afd/sprites/front-shiny/213--0--Shuckle.png similarity index 100% rename from src/afd/sprites/front-shiny/Shuckle.png rename to src/afd/sprites/front-shiny/213--0--Shuckle.png diff --git a/src/afd/sprites/front-shiny/Heracross.png b/src/afd/sprites/front-shiny/214--0--Heracross.png similarity index 100% rename from src/afd/sprites/front-shiny/Heracross.png rename to src/afd/sprites/front-shiny/214--0--Heracross.png diff --git a/src/afd/sprites/front-shiny/Heracross--Mega.png b/src/afd/sprites/front-shiny/214--420--Heracross--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Heracross--Mega.png rename to src/afd/sprites/front-shiny/214--420--Heracross--Mega.png diff --git a/src/afd/sprites/front-shiny/Sneasel.png b/src/afd/sprites/front-shiny/215--0--Sneasel.png similarity index 100% rename from src/afd/sprites/front-shiny/Sneasel.png rename to src/afd/sprites/front-shiny/215--0--Sneasel.png diff --git a/src/afd/sprites/front-shiny/Teddiursa.png b/src/afd/sprites/front-shiny/216--0--Teddiursa.png similarity index 100% rename from src/afd/sprites/front-shiny/Teddiursa.png rename to src/afd/sprites/front-shiny/216--0--Teddiursa.png diff --git a/src/afd/sprites/front-shiny/Ursaring.png b/src/afd/sprites/front-shiny/217--0--Ursaring.png similarity index 100% rename from src/afd/sprites/front-shiny/Ursaring.png rename to src/afd/sprites/front-shiny/217--0--Ursaring.png diff --git a/src/afd/sprites/front-shiny/Slugma.png b/src/afd/sprites/front-shiny/218--0--Slugma.png similarity index 100% rename from src/afd/sprites/front-shiny/Slugma.png rename to src/afd/sprites/front-shiny/218--0--Slugma.png diff --git a/src/afd/sprites/front-shiny/Magcargo.png b/src/afd/sprites/front-shiny/219--0--Magcargo.png similarity index 100% rename from src/afd/sprites/front-shiny/Magcargo.png rename to src/afd/sprites/front-shiny/219--0--Magcargo.png diff --git a/src/afd/sprites/front-shiny/Fearow.png b/src/afd/sprites/front-shiny/22--0--Fearow.png similarity index 100% rename from src/afd/sprites/front-shiny/Fearow.png rename to src/afd/sprites/front-shiny/22--0--Fearow.png diff --git a/src/afd/sprites/front-shiny/Swinub.png b/src/afd/sprites/front-shiny/220--0--Swinub.png similarity index 100% rename from src/afd/sprites/front-shiny/Swinub.png rename to src/afd/sprites/front-shiny/220--0--Swinub.png diff --git a/src/afd/sprites/front-shiny/Piloswine.png b/src/afd/sprites/front-shiny/221--0--Piloswine.png similarity index 100% rename from src/afd/sprites/front-shiny/Piloswine.png rename to src/afd/sprites/front-shiny/221--0--Piloswine.png diff --git a/src/afd/sprites/front-shiny/Corsola.png b/src/afd/sprites/front-shiny/222--0--Corsola.png similarity index 100% rename from src/afd/sprites/front-shiny/Corsola.png rename to src/afd/sprites/front-shiny/222--0--Corsola.png diff --git a/src/afd/sprites/front-shiny/Corsola--Galar.png b/src/afd/sprites/front-shiny/222--420--Corsola--Galar.png similarity index 100% rename from src/afd/sprites/front-shiny/Corsola--Galar.png rename to src/afd/sprites/front-shiny/222--420--Corsola--Galar.png diff --git a/src/afd/sprites/front-shiny/Remoraid.png b/src/afd/sprites/front-shiny/223--0--Remoraid.png similarity index 100% rename from src/afd/sprites/front-shiny/Remoraid.png rename to src/afd/sprites/front-shiny/223--0--Remoraid.png diff --git a/src/afd/sprites/front-shiny/Octillery.png b/src/afd/sprites/front-shiny/224--0--Octillery.png similarity index 100% rename from src/afd/sprites/front-shiny/Octillery.png rename to src/afd/sprites/front-shiny/224--0--Octillery.png diff --git a/src/afd/sprites/front-shiny/Delibird.png b/src/afd/sprites/front-shiny/225--0--Delibird.png similarity index 100% rename from src/afd/sprites/front-shiny/Delibird.png rename to src/afd/sprites/front-shiny/225--0--Delibird.png diff --git a/src/afd/sprites/front-shiny/Mantine.png b/src/afd/sprites/front-shiny/226--0--Mantine.png similarity index 100% rename from src/afd/sprites/front-shiny/Mantine.png rename to src/afd/sprites/front-shiny/226--0--Mantine.png diff --git a/src/afd/sprites/front-shiny/Skarmory.png b/src/afd/sprites/front-shiny/227--0--Skarmory.png similarity index 100% rename from src/afd/sprites/front-shiny/Skarmory.png rename to src/afd/sprites/front-shiny/227--0--Skarmory.png diff --git a/src/afd/sprites/front-shiny/Houndour.png b/src/afd/sprites/front-shiny/228--0--Houndour.png similarity index 100% rename from src/afd/sprites/front-shiny/Houndour.png rename to src/afd/sprites/front-shiny/228--0--Houndour.png diff --git a/src/afd/sprites/front-shiny/Houndoom.png b/src/afd/sprites/front-shiny/229--0--Houndoom.png similarity index 100% rename from src/afd/sprites/front-shiny/Houndoom.png rename to src/afd/sprites/front-shiny/229--0--Houndoom.png diff --git a/src/afd/sprites/front-shiny/Houndoom--Mega.png b/src/afd/sprites/front-shiny/229--420--Houndoom--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Houndoom--Mega.png rename to src/afd/sprites/front-shiny/229--420--Houndoom--Mega.png diff --git a/src/afd/sprites/front-shiny/Ekans.png b/src/afd/sprites/front-shiny/23--0--Ekans.png similarity index 100% rename from src/afd/sprites/front-shiny/Ekans.png rename to src/afd/sprites/front-shiny/23--0--Ekans.png diff --git a/src/afd/sprites/front-shiny/Necturna.png b/src/afd/sprites/front-shiny/23--0--Necturna.png similarity index 100% rename from src/afd/sprites/front-shiny/Necturna.png rename to src/afd/sprites/front-shiny/23--0--Necturna.png diff --git a/src/afd/sprites/front-shiny/Phanpy.png b/src/afd/sprites/front-shiny/231--0--Phanpy.png similarity index 100% rename from src/afd/sprites/front-shiny/Phanpy.png rename to src/afd/sprites/front-shiny/231--0--Phanpy.png diff --git a/src/afd/sprites/front-shiny/Donphan.png b/src/afd/sprites/front-shiny/232--0--Donphan.png similarity index 100% rename from src/afd/sprites/front-shiny/Donphan.png rename to src/afd/sprites/front-shiny/232--0--Donphan.png diff --git a/src/afd/sprites/front-shiny/Porygon2.png b/src/afd/sprites/front-shiny/233--0--Porygon2.png similarity index 100% rename from src/afd/sprites/front-shiny/Porygon2.png rename to src/afd/sprites/front-shiny/233--0--Porygon2.png diff --git a/src/afd/sprites/front-shiny/Stantler.png b/src/afd/sprites/front-shiny/234--0--Stantler.png similarity index 100% rename from src/afd/sprites/front-shiny/Stantler.png rename to src/afd/sprites/front-shiny/234--0--Stantler.png diff --git a/src/afd/sprites/front-shiny/Smeargle.png b/src/afd/sprites/front-shiny/235--0--Smeargle.png similarity index 100% rename from src/afd/sprites/front-shiny/Smeargle.png rename to src/afd/sprites/front-shiny/235--0--Smeargle.png diff --git a/src/afd/sprites/front-shiny/Tyrogue.png b/src/afd/sprites/front-shiny/236--0--Tyrogue.png similarity index 100% rename from src/afd/sprites/front-shiny/Tyrogue.png rename to src/afd/sprites/front-shiny/236--0--Tyrogue.png diff --git a/src/afd/sprites/front-shiny/Hitmontop.png b/src/afd/sprites/front-shiny/237--0--Hitmontop.png similarity index 100% rename from src/afd/sprites/front-shiny/Hitmontop.png rename to src/afd/sprites/front-shiny/237--0--Hitmontop.png diff --git a/src/afd/sprites/front-shiny/Smoochum.png b/src/afd/sprites/front-shiny/238--0--Smoochum.png similarity index 100% rename from src/afd/sprites/front-shiny/Smoochum.png rename to src/afd/sprites/front-shiny/238--0--Smoochum.png diff --git a/src/afd/sprites/front-shiny/Elekid.png b/src/afd/sprites/front-shiny/239--0--Elekid.png similarity index 100% rename from src/afd/sprites/front-shiny/Elekid.png rename to src/afd/sprites/front-shiny/239--0--Elekid.png diff --git a/src/afd/sprites/front-shiny/Arbok.png b/src/afd/sprites/front-shiny/24--0--Arbok.png similarity index 100% rename from src/afd/sprites/front-shiny/Arbok.png rename to src/afd/sprites/front-shiny/24--0--Arbok.png diff --git a/src/afd/sprites/front-shiny/Mollux.png b/src/afd/sprites/front-shiny/24--0--Mollux.png similarity index 100% rename from src/afd/sprites/front-shiny/Mollux.png rename to src/afd/sprites/front-shiny/24--0--Mollux.png diff --git a/src/afd/sprites/front-shiny/Magby.png b/src/afd/sprites/front-shiny/240--0--Magby.png similarity index 100% rename from src/afd/sprites/front-shiny/Magby.png rename to src/afd/sprites/front-shiny/240--0--Magby.png diff --git a/src/afd/sprites/front-shiny/Miltank.png b/src/afd/sprites/front-shiny/241--0--Miltank.png similarity index 100% rename from src/afd/sprites/front-shiny/Miltank.png rename to src/afd/sprites/front-shiny/241--0--Miltank.png diff --git a/src/afd/sprites/front-shiny/Blissey.png b/src/afd/sprites/front-shiny/242--0--Blissey.png similarity index 100% rename from src/afd/sprites/front-shiny/Blissey.png rename to src/afd/sprites/front-shiny/242--0--Blissey.png diff --git a/src/afd/sprites/front-shiny/Raikou.png b/src/afd/sprites/front-shiny/243--0--Raikou.png similarity index 100% rename from src/afd/sprites/front-shiny/Raikou.png rename to src/afd/sprites/front-shiny/243--0--Raikou.png diff --git a/src/afd/sprites/front-shiny/Entei.png b/src/afd/sprites/front-shiny/244--0--Entei.png similarity index 100% rename from src/afd/sprites/front-shiny/Entei.png rename to src/afd/sprites/front-shiny/244--0--Entei.png diff --git a/src/afd/sprites/front-shiny/Suicune.png b/src/afd/sprites/front-shiny/245--0--Suicune.png similarity index 100% rename from src/afd/sprites/front-shiny/Suicune.png rename to src/afd/sprites/front-shiny/245--0--Suicune.png diff --git a/src/afd/sprites/front-shiny/Larvitar.png b/src/afd/sprites/front-shiny/246--0--Larvitar.png similarity index 100% rename from src/afd/sprites/front-shiny/Larvitar.png rename to src/afd/sprites/front-shiny/246--0--Larvitar.png diff --git a/src/afd/sprites/front-shiny/Pupitar.png b/src/afd/sprites/front-shiny/247--0--Pupitar.png similarity index 100% rename from src/afd/sprites/front-shiny/Pupitar.png rename to src/afd/sprites/front-shiny/247--0--Pupitar.png diff --git a/src/afd/sprites/front-shiny/Tyranitar.png b/src/afd/sprites/front-shiny/248--0--Tyranitar.png similarity index 100% rename from src/afd/sprites/front-shiny/Tyranitar.png rename to src/afd/sprites/front-shiny/248--0--Tyranitar.png diff --git a/src/afd/sprites/front-shiny/Tyranitar--Mega.png b/src/afd/sprites/front-shiny/248--420--Tyranitar--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Tyranitar--Mega.png rename to src/afd/sprites/front-shiny/248--420--Tyranitar--Mega.png diff --git a/src/afd/sprites/front-shiny/Lugia.png b/src/afd/sprites/front-shiny/249--0--Lugia.png similarity index 100% rename from src/afd/sprites/front-shiny/Lugia.png rename to src/afd/sprites/front-shiny/249--0--Lugia.png diff --git a/src/afd/sprites/front-shiny/Pikachu.png b/src/afd/sprites/front-shiny/25--0--Pikachu.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu.png rename to src/afd/sprites/front-shiny/25--0--Pikachu.png diff --git a/src/afd/sprites/front-shiny/Pikachu--Alola.png b/src/afd/sprites/front-shiny/25--420--Pikachu--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu--Alola.png rename to src/afd/sprites/front-shiny/25--420--Pikachu--Alola.png diff --git a/src/afd/sprites/front-shiny/Pikachu--Belle.png b/src/afd/sprites/front-shiny/25--420--Pikachu--Belle.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu--Belle.png rename to src/afd/sprites/front-shiny/25--420--Pikachu--Belle.png diff --git a/src/afd/sprites/front-shiny/Pikachu--Gmax.png b/src/afd/sprites/front-shiny/25--420--Pikachu--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu--Gmax.png rename to src/afd/sprites/front-shiny/25--420--Pikachu--Gmax.png diff --git a/src/afd/sprites/front-shiny/Pikachu--Hoenn.png b/src/afd/sprites/front-shiny/25--420--Pikachu--Hoenn.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu--Hoenn.png rename to src/afd/sprites/front-shiny/25--420--Pikachu--Hoenn.png diff --git a/src/afd/sprites/front-shiny/Pikachu--Kalos.png b/src/afd/sprites/front-shiny/25--420--Pikachu--Kalos.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu--Kalos.png rename to src/afd/sprites/front-shiny/25--420--Pikachu--Kalos.png diff --git a/src/afd/sprites/front-shiny/Pikachu--Libre.png b/src/afd/sprites/front-shiny/25--420--Pikachu--Libre.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu--Libre.png rename to src/afd/sprites/front-shiny/25--420--Pikachu--Libre.png diff --git a/src/afd/sprites/front-shiny/Pikachu--Original.png b/src/afd/sprites/front-shiny/25--420--Pikachu--Original.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu--Original.png rename to src/afd/sprites/front-shiny/25--420--Pikachu--Original.png diff --git a/src/afd/sprites/front-shiny/Pikachu--Partner.png b/src/afd/sprites/front-shiny/25--420--Pikachu--Partner.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu--Partner.png rename to src/afd/sprites/front-shiny/25--420--Pikachu--Partner.png diff --git a/src/afd/sprites/front-shiny/Pikachu--PhD.png b/src/afd/sprites/front-shiny/25--420--Pikachu--PhD.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu--PhD.png rename to src/afd/sprites/front-shiny/25--420--Pikachu--PhD.png diff --git a/src/afd/sprites/front-shiny/Pikachu--Pop-Star.png b/src/afd/sprites/front-shiny/25--420--Pikachu--Pop-Star.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu--Pop-Star.png rename to src/afd/sprites/front-shiny/25--420--Pikachu--Pop-Star.png diff --git a/src/afd/sprites/front-shiny/Pikachu--Rock-Star.png b/src/afd/sprites/front-shiny/25--420--Pikachu--Rock-Star.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu--Rock-Star.png rename to src/afd/sprites/front-shiny/25--420--Pikachu--Rock-Star.png diff --git a/src/afd/sprites/front-shiny/Pikachu--Sinnoh.png b/src/afd/sprites/front-shiny/25--420--Pikachu--Sinnoh.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu--Sinnoh.png rename to src/afd/sprites/front-shiny/25--420--Pikachu--Sinnoh.png diff --git a/src/afd/sprites/front-shiny/Pikachu--Starter.png b/src/afd/sprites/front-shiny/25--420--Pikachu--Starter.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu--Starter.png rename to src/afd/sprites/front-shiny/25--420--Pikachu--Starter.png diff --git a/src/afd/sprites/front-shiny/Pikachu--Unova.png b/src/afd/sprites/front-shiny/25--420--Pikachu--Unova.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikachu--Unova.png rename to src/afd/sprites/front-shiny/25--420--Pikachu--Unova.png diff --git a/src/afd/sprites/front-shiny/Ho-Oh.png b/src/afd/sprites/front-shiny/250--0--Ho-Oh.png similarity index 100% rename from src/afd/sprites/front-shiny/Ho-Oh.png rename to src/afd/sprites/front-shiny/250--0--Ho-Oh.png diff --git a/src/afd/sprites/front-shiny/Celebi.gif b/src/afd/sprites/front-shiny/251--0--Celebi.gif similarity index 100% rename from src/afd/sprites/front-shiny/Celebi.gif rename to src/afd/sprites/front-shiny/251--0--Celebi.gif diff --git a/src/afd/sprites/front-shiny/Treecko.png b/src/afd/sprites/front-shiny/252--0--Treecko.png similarity index 100% rename from src/afd/sprites/front-shiny/Treecko.png rename to src/afd/sprites/front-shiny/252--0--Treecko.png diff --git a/src/afd/sprites/front-shiny/Grovyle.png b/src/afd/sprites/front-shiny/253--0--Grovyle.png similarity index 100% rename from src/afd/sprites/front-shiny/Grovyle.png rename to src/afd/sprites/front-shiny/253--0--Grovyle.png diff --git a/src/afd/sprites/front-shiny/Sceptile.png b/src/afd/sprites/front-shiny/254--0--Sceptile.png similarity index 100% rename from src/afd/sprites/front-shiny/Sceptile.png rename to src/afd/sprites/front-shiny/254--0--Sceptile.png diff --git a/src/afd/sprites/front-shiny/Sceptile--Mega.gif b/src/afd/sprites/front-shiny/254--420--Sceptile--Mega.gif similarity index 100% rename from src/afd/sprites/front-shiny/Sceptile--Mega.gif rename to src/afd/sprites/front-shiny/254--420--Sceptile--Mega.gif diff --git a/src/afd/sprites/front-shiny/Torchic.png b/src/afd/sprites/front-shiny/255--0--Torchic.png similarity index 100% rename from src/afd/sprites/front-shiny/Torchic.png rename to src/afd/sprites/front-shiny/255--0--Torchic.png diff --git a/src/afd/sprites/front-shiny/Combusken.png b/src/afd/sprites/front-shiny/256--0--Combusken.png similarity index 100% rename from src/afd/sprites/front-shiny/Combusken.png rename to src/afd/sprites/front-shiny/256--0--Combusken.png diff --git a/src/afd/sprites/front-shiny/Blaziken.png b/src/afd/sprites/front-shiny/257--0--Blaziken.png similarity index 100% rename from src/afd/sprites/front-shiny/Blaziken.png rename to src/afd/sprites/front-shiny/257--0--Blaziken.png diff --git a/src/afd/sprites/front-shiny/Blaziken--Mega.png b/src/afd/sprites/front-shiny/257--420--Blaziken--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Blaziken--Mega.png rename to src/afd/sprites/front-shiny/257--420--Blaziken--Mega.png diff --git a/src/afd/sprites/front-shiny/Mudkip.png b/src/afd/sprites/front-shiny/258--0--Mudkip.png similarity index 100% rename from src/afd/sprites/front-shiny/Mudkip.png rename to src/afd/sprites/front-shiny/258--0--Mudkip.png diff --git a/src/afd/sprites/front-shiny/Marshtomp.png b/src/afd/sprites/front-shiny/259--0--Marshtomp.png similarity index 100% rename from src/afd/sprites/front-shiny/Marshtomp.png rename to src/afd/sprites/front-shiny/259--0--Marshtomp.png diff --git a/src/afd/sprites/front-shiny/Raichu.png b/src/afd/sprites/front-shiny/26--0--Raichu.png similarity index 100% rename from src/afd/sprites/front-shiny/Raichu.png rename to src/afd/sprites/front-shiny/26--0--Raichu.png diff --git a/src/afd/sprites/front-shiny/Raichu--Alola.png b/src/afd/sprites/front-shiny/26--420--Raichu--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Raichu--Alola.png rename to src/afd/sprites/front-shiny/26--420--Raichu--Alola.png diff --git a/src/afd/sprites/front-shiny/Swampert.png b/src/afd/sprites/front-shiny/260--0--Swampert.png similarity index 100% rename from src/afd/sprites/front-shiny/Swampert.png rename to src/afd/sprites/front-shiny/260--0--Swampert.png diff --git a/src/afd/sprites/front-shiny/Swampert--Mega.png b/src/afd/sprites/front-shiny/260--420--Swampert--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Swampert--Mega.png rename to src/afd/sprites/front-shiny/260--420--Swampert--Mega.png diff --git a/src/afd/sprites/front-shiny/Poochyena.png b/src/afd/sprites/front-shiny/261--0--Poochyena.png similarity index 100% rename from src/afd/sprites/front-shiny/Poochyena.png rename to src/afd/sprites/front-shiny/261--0--Poochyena.png diff --git a/src/afd/sprites/front-shiny/Mightyena.png b/src/afd/sprites/front-shiny/262--0--Mightyena.png similarity index 100% rename from src/afd/sprites/front-shiny/Mightyena.png rename to src/afd/sprites/front-shiny/262--0--Mightyena.png diff --git a/src/afd/sprites/front-shiny/Zigzagoon.png b/src/afd/sprites/front-shiny/263--0--Zigzagoon.png similarity index 100% rename from src/afd/sprites/front-shiny/Zigzagoon.png rename to src/afd/sprites/front-shiny/263--0--Zigzagoon.png diff --git a/src/afd/sprites/front-shiny/Zigzagoon--Galar.png b/src/afd/sprites/front-shiny/263--420--Zigzagoon--Galar.png similarity index 100% rename from src/afd/sprites/front-shiny/Zigzagoon--Galar.png rename to src/afd/sprites/front-shiny/263--420--Zigzagoon--Galar.png diff --git a/src/afd/sprites/front-shiny/Linoone.png b/src/afd/sprites/front-shiny/264--0--Linoone.png similarity index 100% rename from src/afd/sprites/front-shiny/Linoone.png rename to src/afd/sprites/front-shiny/264--0--Linoone.png diff --git a/src/afd/sprites/front-shiny/Linoone--Galar.png b/src/afd/sprites/front-shiny/264--420--Linoone--Galar.png similarity index 100% rename from src/afd/sprites/front-shiny/Linoone--Galar.png rename to src/afd/sprites/front-shiny/264--420--Linoone--Galar.png diff --git a/src/afd/sprites/front-shiny/Wurmple.png b/src/afd/sprites/front-shiny/265--0--Wurmple.png similarity index 100% rename from src/afd/sprites/front-shiny/Wurmple.png rename to src/afd/sprites/front-shiny/265--0--Wurmple.png diff --git a/src/afd/sprites/front-shiny/Silcoon.png b/src/afd/sprites/front-shiny/266--0--Silcoon.png similarity index 100% rename from src/afd/sprites/front-shiny/Silcoon.png rename to src/afd/sprites/front-shiny/266--0--Silcoon.png diff --git a/src/afd/sprites/front-shiny/Beautifly.png b/src/afd/sprites/front-shiny/267--0--Beautifly.png similarity index 100% rename from src/afd/sprites/front-shiny/Beautifly.png rename to src/afd/sprites/front-shiny/267--0--Beautifly.png diff --git a/src/afd/sprites/front-shiny/Cascoon.png b/src/afd/sprites/front-shiny/268--0--Cascoon.png similarity index 100% rename from src/afd/sprites/front-shiny/Cascoon.png rename to src/afd/sprites/front-shiny/268--0--Cascoon.png diff --git a/src/afd/sprites/front-shiny/Dustox.png b/src/afd/sprites/front-shiny/269--0--Dustox.png similarity index 100% rename from src/afd/sprites/front-shiny/Dustox.png rename to src/afd/sprites/front-shiny/269--0--Dustox.png diff --git a/src/afd/sprites/front-shiny/Aurumoth.png b/src/afd/sprites/front-shiny/27--0--Aurumoth.png similarity index 100% rename from src/afd/sprites/front-shiny/Aurumoth.png rename to src/afd/sprites/front-shiny/27--0--Aurumoth.png diff --git a/src/afd/sprites/front-shiny/Sandshrew.png b/src/afd/sprites/front-shiny/27--0--Sandshrew.png similarity index 100% rename from src/afd/sprites/front-shiny/Sandshrew.png rename to src/afd/sprites/front-shiny/27--0--Sandshrew.png diff --git a/src/afd/sprites/front-shiny/Sandshrew--Alola.png b/src/afd/sprites/front-shiny/27--420--Sandshrew--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Sandshrew--Alola.png rename to src/afd/sprites/front-shiny/27--420--Sandshrew--Alola.png diff --git a/src/afd/sprites/front-shiny/Lotad.png b/src/afd/sprites/front-shiny/270--0--Lotad.png similarity index 100% rename from src/afd/sprites/front-shiny/Lotad.png rename to src/afd/sprites/front-shiny/270--0--Lotad.png diff --git a/src/afd/sprites/front-shiny/Lombre.png b/src/afd/sprites/front-shiny/271--0--Lombre.png similarity index 100% rename from src/afd/sprites/front-shiny/Lombre.png rename to src/afd/sprites/front-shiny/271--0--Lombre.png diff --git a/src/afd/sprites/front-shiny/Ludicolo.png b/src/afd/sprites/front-shiny/272--0--Ludicolo.png similarity index 100% rename from src/afd/sprites/front-shiny/Ludicolo.png rename to src/afd/sprites/front-shiny/272--0--Ludicolo.png diff --git a/src/afd/sprites/front-shiny/Seedot.png b/src/afd/sprites/front-shiny/273--0--Seedot.png similarity index 100% rename from src/afd/sprites/front-shiny/Seedot.png rename to src/afd/sprites/front-shiny/273--0--Seedot.png diff --git a/src/afd/sprites/front-shiny/Nuzleaf.png b/src/afd/sprites/front-shiny/274--0--Nuzleaf.png similarity index 100% rename from src/afd/sprites/front-shiny/Nuzleaf.png rename to src/afd/sprites/front-shiny/274--0--Nuzleaf.png diff --git a/src/afd/sprites/front-shiny/Shiftry.png b/src/afd/sprites/front-shiny/275--0--Shiftry.png similarity index 100% rename from src/afd/sprites/front-shiny/Shiftry.png rename to src/afd/sprites/front-shiny/275--0--Shiftry.png diff --git a/src/afd/sprites/front-shiny/Taillow.png b/src/afd/sprites/front-shiny/276--0--Taillow.png similarity index 100% rename from src/afd/sprites/front-shiny/Taillow.png rename to src/afd/sprites/front-shiny/276--0--Taillow.png diff --git a/src/afd/sprites/front-shiny/Swellow.png b/src/afd/sprites/front-shiny/277--0--Swellow.png similarity index 100% rename from src/afd/sprites/front-shiny/Swellow.png rename to src/afd/sprites/front-shiny/277--0--Swellow.png diff --git a/src/afd/sprites/front-shiny/Wingull.png b/src/afd/sprites/front-shiny/278--0--Wingull.png similarity index 100% rename from src/afd/sprites/front-shiny/Wingull.png rename to src/afd/sprites/front-shiny/278--0--Wingull.png diff --git a/src/afd/sprites/front-shiny/Pelipper.png b/src/afd/sprites/front-shiny/279--0--Pelipper.png similarity index 100% rename from src/afd/sprites/front-shiny/Pelipper.png rename to src/afd/sprites/front-shiny/279--0--Pelipper.png diff --git a/src/afd/sprites/front-shiny/Sandslash.png b/src/afd/sprites/front-shiny/28--0--Sandslash.png similarity index 100% rename from src/afd/sprites/front-shiny/Sandslash.png rename to src/afd/sprites/front-shiny/28--0--Sandslash.png diff --git a/src/afd/sprites/front-shiny/Sandslash--Alola.png b/src/afd/sprites/front-shiny/28--420--Sandslash--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Sandslash--Alola.png rename to src/afd/sprites/front-shiny/28--420--Sandslash--Alola.png diff --git a/src/afd/sprites/front-shiny/Ralts.png b/src/afd/sprites/front-shiny/280--0--Ralts.png similarity index 100% rename from src/afd/sprites/front-shiny/Ralts.png rename to src/afd/sprites/front-shiny/280--0--Ralts.png diff --git a/src/afd/sprites/front-shiny/Kirlia.png b/src/afd/sprites/front-shiny/281--0--Kirlia.png similarity index 100% rename from src/afd/sprites/front-shiny/Kirlia.png rename to src/afd/sprites/front-shiny/281--0--Kirlia.png diff --git a/src/afd/sprites/front-shiny/Gardevoir.png b/src/afd/sprites/front-shiny/282--0--Gardevoir.png similarity index 100% rename from src/afd/sprites/front-shiny/Gardevoir.png rename to src/afd/sprites/front-shiny/282--0--Gardevoir.png diff --git a/src/afd/sprites/front-shiny/Gardevoir--Mega.png b/src/afd/sprites/front-shiny/282--420--Gardevoir--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Gardevoir--Mega.png rename to src/afd/sprites/front-shiny/282--420--Gardevoir--Mega.png diff --git a/src/afd/sprites/front-shiny/Surskit.png b/src/afd/sprites/front-shiny/283--0--Surskit.png similarity index 100% rename from src/afd/sprites/front-shiny/Surskit.png rename to src/afd/sprites/front-shiny/283--0--Surskit.png diff --git a/src/afd/sprites/front-shiny/Masquerain.png b/src/afd/sprites/front-shiny/284--0--Masquerain.png similarity index 100% rename from src/afd/sprites/front-shiny/Masquerain.png rename to src/afd/sprites/front-shiny/284--0--Masquerain.png diff --git a/src/afd/sprites/front-shiny/Shroomish.png b/src/afd/sprites/front-shiny/285--0--Shroomish.png similarity index 100% rename from src/afd/sprites/front-shiny/Shroomish.png rename to src/afd/sprites/front-shiny/285--0--Shroomish.png diff --git a/src/afd/sprites/front-shiny/Breloom.png b/src/afd/sprites/front-shiny/286--0--Breloom.png similarity index 100% rename from src/afd/sprites/front-shiny/Breloom.png rename to src/afd/sprites/front-shiny/286--0--Breloom.png diff --git a/src/afd/sprites/front-shiny/Slakoth.png b/src/afd/sprites/front-shiny/287--0--Slakoth.png similarity index 100% rename from src/afd/sprites/front-shiny/Slakoth.png rename to src/afd/sprites/front-shiny/287--0--Slakoth.png diff --git a/src/afd/sprites/front-shiny/Vigoroth.png b/src/afd/sprites/front-shiny/288--0--Vigoroth.png similarity index 100% rename from src/afd/sprites/front-shiny/Vigoroth.png rename to src/afd/sprites/front-shiny/288--0--Vigoroth.png diff --git a/src/afd/sprites/front-shiny/Slaking.png b/src/afd/sprites/front-shiny/289--0--Slaking.png similarity index 100% rename from src/afd/sprites/front-shiny/Slaking.png rename to src/afd/sprites/front-shiny/289--0--Slaking.png diff --git a/src/afd/sprites/front-shiny/Malaconda.png b/src/afd/sprites/front-shiny/29--0--Malaconda.png similarity index 100% rename from src/afd/sprites/front-shiny/Malaconda.png rename to src/afd/sprites/front-shiny/29--0--Malaconda.png diff --git a/src/afd/sprites/front-shiny/Nidoran-F.png b/src/afd/sprites/front-shiny/29--0--Nidoran-F.png similarity index 100% rename from src/afd/sprites/front-shiny/Nidoran-F.png rename to src/afd/sprites/front-shiny/29--0--Nidoran-F.png diff --git a/src/afd/sprites/front-shiny/Nincada.png b/src/afd/sprites/front-shiny/290--0--Nincada.png similarity index 100% rename from src/afd/sprites/front-shiny/Nincada.png rename to src/afd/sprites/front-shiny/290--0--Nincada.png diff --git a/src/afd/sprites/front-shiny/Ninjask.png b/src/afd/sprites/front-shiny/291--0--Ninjask.png similarity index 100% rename from src/afd/sprites/front-shiny/Ninjask.png rename to src/afd/sprites/front-shiny/291--0--Ninjask.png diff --git a/src/afd/sprites/front-shiny/Shedinja.png b/src/afd/sprites/front-shiny/292--0--Shedinja.png similarity index 100% rename from src/afd/sprites/front-shiny/Shedinja.png rename to src/afd/sprites/front-shiny/292--0--Shedinja.png diff --git a/src/afd/sprites/front-shiny/Whismur.png b/src/afd/sprites/front-shiny/293--0--Whismur.png similarity index 100% rename from src/afd/sprites/front-shiny/Whismur.png rename to src/afd/sprites/front-shiny/293--0--Whismur.png diff --git a/src/afd/sprites/front-shiny/Loudred.png b/src/afd/sprites/front-shiny/294--0--Loudred.png similarity index 100% rename from src/afd/sprites/front-shiny/Loudred.png rename to src/afd/sprites/front-shiny/294--0--Loudred.png diff --git a/src/afd/sprites/front-shiny/Exploud.png b/src/afd/sprites/front-shiny/295--0--Exploud.png similarity index 100% rename from src/afd/sprites/front-shiny/Exploud.png rename to src/afd/sprites/front-shiny/295--0--Exploud.png diff --git a/src/afd/sprites/front-shiny/Makuhita.png b/src/afd/sprites/front-shiny/296--0--Makuhita.png similarity index 100% rename from src/afd/sprites/front-shiny/Makuhita.png rename to src/afd/sprites/front-shiny/296--0--Makuhita.png diff --git a/src/afd/sprites/front-shiny/Hariyama.png b/src/afd/sprites/front-shiny/297--0--Hariyama.png similarity index 100% rename from src/afd/sprites/front-shiny/Hariyama.png rename to src/afd/sprites/front-shiny/297--0--Hariyama.png diff --git a/src/afd/sprites/front-shiny/Azurill.png b/src/afd/sprites/front-shiny/298--0--Azurill.png similarity index 100% rename from src/afd/sprites/front-shiny/Azurill.png rename to src/afd/sprites/front-shiny/298--0--Azurill.png diff --git a/src/afd/sprites/front-shiny/Nosepass.png b/src/afd/sprites/front-shiny/299--0--Nosepass.png similarity index 100% rename from src/afd/sprites/front-shiny/Nosepass.png rename to src/afd/sprites/front-shiny/299--0--Nosepass.png diff --git a/src/afd/sprites/front-shiny/Revenankh.png b/src/afd/sprites/front-shiny/3--0--Revenankh.png similarity index 100% rename from src/afd/sprites/front-shiny/Revenankh.png rename to src/afd/sprites/front-shiny/3--0--Revenankh.png diff --git a/src/afd/sprites/front-shiny/Venusaur.png b/src/afd/sprites/front-shiny/3--0--Venusaur.png similarity index 100% rename from src/afd/sprites/front-shiny/Venusaur.png rename to src/afd/sprites/front-shiny/3--0--Venusaur.png diff --git a/src/afd/sprites/front-shiny/Venusaur--Mega.png b/src/afd/sprites/front-shiny/3--420--Venusaur--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Venusaur--Mega.png rename to src/afd/sprites/front-shiny/3--420--Venusaur--Mega.png diff --git a/src/afd/sprites/front-shiny/Nidorina.png b/src/afd/sprites/front-shiny/30--0--Nidorina.png similarity index 100% rename from src/afd/sprites/front-shiny/Nidorina.png rename to src/afd/sprites/front-shiny/30--0--Nidorina.png diff --git a/src/afd/sprites/front-shiny/Skitty.png b/src/afd/sprites/front-shiny/300--0--Skitty.png similarity index 100% rename from src/afd/sprites/front-shiny/Skitty.png rename to src/afd/sprites/front-shiny/300--0--Skitty.png diff --git a/src/afd/sprites/front-shiny/Delcatty.png b/src/afd/sprites/front-shiny/301--0--Delcatty.png similarity index 100% rename from src/afd/sprites/front-shiny/Delcatty.png rename to src/afd/sprites/front-shiny/301--0--Delcatty.png diff --git a/src/afd/sprites/front-shiny/Sableye.png b/src/afd/sprites/front-shiny/302--0--Sableye.png similarity index 100% rename from src/afd/sprites/front-shiny/Sableye.png rename to src/afd/sprites/front-shiny/302--0--Sableye.png diff --git a/src/afd/sprites/front-shiny/Sableye--Mega.png b/src/afd/sprites/front-shiny/302--420--Sableye--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Sableye--Mega.png rename to src/afd/sprites/front-shiny/302--420--Sableye--Mega.png diff --git a/src/afd/sprites/front-shiny/Mawile.png b/src/afd/sprites/front-shiny/303--0--Mawile.png similarity index 100% rename from src/afd/sprites/front-shiny/Mawile.png rename to src/afd/sprites/front-shiny/303--0--Mawile.png diff --git a/src/afd/sprites/front-shiny/Mawile--Mega.png b/src/afd/sprites/front-shiny/303--420--Mawile--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Mawile--Mega.png rename to src/afd/sprites/front-shiny/303--420--Mawile--Mega.png diff --git a/src/afd/sprites/front-shiny/Aron.png b/src/afd/sprites/front-shiny/304--0--Aron.png similarity index 100% rename from src/afd/sprites/front-shiny/Aron.png rename to src/afd/sprites/front-shiny/304--0--Aron.png diff --git a/src/afd/sprites/front-shiny/Lairon.png b/src/afd/sprites/front-shiny/305--0--Lairon.png similarity index 100% rename from src/afd/sprites/front-shiny/Lairon.png rename to src/afd/sprites/front-shiny/305--0--Lairon.png diff --git a/src/afd/sprites/front-shiny/Aggron.png b/src/afd/sprites/front-shiny/306--0--Aggron.png similarity index 100% rename from src/afd/sprites/front-shiny/Aggron.png rename to src/afd/sprites/front-shiny/306--0--Aggron.png diff --git a/src/afd/sprites/front-shiny/Aggron--Mega.png b/src/afd/sprites/front-shiny/306--420--Aggron--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Aggron--Mega.png rename to src/afd/sprites/front-shiny/306--420--Aggron--Mega.png diff --git a/src/afd/sprites/front-shiny/Meditite.png b/src/afd/sprites/front-shiny/307--0--Meditite.png similarity index 100% rename from src/afd/sprites/front-shiny/Meditite.png rename to src/afd/sprites/front-shiny/307--0--Meditite.png diff --git a/src/afd/sprites/front-shiny/Medicham.png b/src/afd/sprites/front-shiny/308--0--Medicham.png similarity index 100% rename from src/afd/sprites/front-shiny/Medicham.png rename to src/afd/sprites/front-shiny/308--0--Medicham.png diff --git a/src/afd/sprites/front-shiny/Medicham--Mega.png b/src/afd/sprites/front-shiny/308--420--Medicham--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Medicham--Mega.png rename to src/afd/sprites/front-shiny/308--420--Medicham--Mega.png diff --git a/src/afd/sprites/front-shiny/Electrike.png b/src/afd/sprites/front-shiny/309--0--Electrike.png similarity index 100% rename from src/afd/sprites/front-shiny/Electrike.png rename to src/afd/sprites/front-shiny/309--0--Electrike.png diff --git a/src/afd/sprites/front-shiny/Cawmodore.png b/src/afd/sprites/front-shiny/31--0--Cawmodore.png similarity index 100% rename from src/afd/sprites/front-shiny/Cawmodore.png rename to src/afd/sprites/front-shiny/31--0--Cawmodore.png diff --git a/src/afd/sprites/front-shiny/Nidoqueen.png b/src/afd/sprites/front-shiny/31--0--Nidoqueen.png similarity index 100% rename from src/afd/sprites/front-shiny/Nidoqueen.png rename to src/afd/sprites/front-shiny/31--0--Nidoqueen.png diff --git a/src/afd/sprites/front-shiny/Manectric.png b/src/afd/sprites/front-shiny/310--0--Manectric.png similarity index 100% rename from src/afd/sprites/front-shiny/Manectric.png rename to src/afd/sprites/front-shiny/310--0--Manectric.png diff --git a/src/afd/sprites/front-shiny/Manectric--Mega.png b/src/afd/sprites/front-shiny/310--420--Manectric--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Manectric--Mega.png rename to src/afd/sprites/front-shiny/310--420--Manectric--Mega.png diff --git a/src/afd/sprites/front-shiny/Plusle.png b/src/afd/sprites/front-shiny/311--0--Plusle.png similarity index 100% rename from src/afd/sprites/front-shiny/Plusle.png rename to src/afd/sprites/front-shiny/311--0--Plusle.png diff --git a/src/afd/sprites/front-shiny/Minun.png b/src/afd/sprites/front-shiny/312--0--Minun.png similarity index 100% rename from src/afd/sprites/front-shiny/Minun.png rename to src/afd/sprites/front-shiny/312--0--Minun.png diff --git a/src/afd/sprites/front-shiny/Volbeat.png b/src/afd/sprites/front-shiny/313--0--Volbeat.png similarity index 100% rename from src/afd/sprites/front-shiny/Volbeat.png rename to src/afd/sprites/front-shiny/313--0--Volbeat.png diff --git a/src/afd/sprites/front-shiny/Illumise.png b/src/afd/sprites/front-shiny/314--0--Illumise.png similarity index 100% rename from src/afd/sprites/front-shiny/Illumise.png rename to src/afd/sprites/front-shiny/314--0--Illumise.png diff --git a/src/afd/sprites/front-shiny/Roselia.png b/src/afd/sprites/front-shiny/315--0--Roselia.png similarity index 100% rename from src/afd/sprites/front-shiny/Roselia.png rename to src/afd/sprites/front-shiny/315--0--Roselia.png diff --git a/src/afd/sprites/front-shiny/Gulpin.png b/src/afd/sprites/front-shiny/316--0--Gulpin.png similarity index 100% rename from src/afd/sprites/front-shiny/Gulpin.png rename to src/afd/sprites/front-shiny/316--0--Gulpin.png diff --git a/src/afd/sprites/front-shiny/Swalot.png b/src/afd/sprites/front-shiny/317--0--Swalot.png similarity index 100% rename from src/afd/sprites/front-shiny/Swalot.png rename to src/afd/sprites/front-shiny/317--0--Swalot.png diff --git a/src/afd/sprites/front-shiny/Carvanha.png b/src/afd/sprites/front-shiny/318--0--Carvanha.png similarity index 100% rename from src/afd/sprites/front-shiny/Carvanha.png rename to src/afd/sprites/front-shiny/318--0--Carvanha.png diff --git a/src/afd/sprites/front-shiny/Sharpedo.png b/src/afd/sprites/front-shiny/319--0--Sharpedo.png similarity index 100% rename from src/afd/sprites/front-shiny/Sharpedo.png rename to src/afd/sprites/front-shiny/319--0--Sharpedo.png diff --git a/src/afd/sprites/front-shiny/Sharpedo--Mega.png b/src/afd/sprites/front-shiny/319--420--Sharpedo--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Sharpedo--Mega.png rename to src/afd/sprites/front-shiny/319--420--Sharpedo--Mega.png diff --git a/src/afd/sprites/front-shiny/Nidoran-M.png b/src/afd/sprites/front-shiny/32--0--Nidoran-M.png similarity index 100% rename from src/afd/sprites/front-shiny/Nidoran-M.png rename to src/afd/sprites/front-shiny/32--0--Nidoran-M.png diff --git a/src/afd/sprites/front-shiny/Wailmer.png b/src/afd/sprites/front-shiny/320--0--Wailmer.png similarity index 100% rename from src/afd/sprites/front-shiny/Wailmer.png rename to src/afd/sprites/front-shiny/320--0--Wailmer.png diff --git a/src/afd/sprites/front-shiny/Wailord.png b/src/afd/sprites/front-shiny/321--0--Wailord.png similarity index 100% rename from src/afd/sprites/front-shiny/Wailord.png rename to src/afd/sprites/front-shiny/321--0--Wailord.png diff --git a/src/afd/sprites/front-shiny/Numel.png b/src/afd/sprites/front-shiny/322--0--Numel.png similarity index 100% rename from src/afd/sprites/front-shiny/Numel.png rename to src/afd/sprites/front-shiny/322--0--Numel.png diff --git a/src/afd/sprites/front-shiny/Camerupt.png b/src/afd/sprites/front-shiny/323--0--Camerupt.png similarity index 100% rename from src/afd/sprites/front-shiny/Camerupt.png rename to src/afd/sprites/front-shiny/323--0--Camerupt.png diff --git a/src/afd/sprites/front-shiny/Camerupt--Mega.png b/src/afd/sprites/front-shiny/323--420--Camerupt--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Camerupt--Mega.png rename to src/afd/sprites/front-shiny/323--420--Camerupt--Mega.png diff --git a/src/afd/sprites/front-shiny/Torkoal.png b/src/afd/sprites/front-shiny/324--0--Torkoal.png similarity index 100% rename from src/afd/sprites/front-shiny/Torkoal.png rename to src/afd/sprites/front-shiny/324--0--Torkoal.png diff --git a/src/afd/sprites/front-shiny/Spoink.png b/src/afd/sprites/front-shiny/325--0--Spoink.png similarity index 100% rename from src/afd/sprites/front-shiny/Spoink.png rename to src/afd/sprites/front-shiny/325--0--Spoink.png diff --git a/src/afd/sprites/front-shiny/Grumpig.png b/src/afd/sprites/front-shiny/326--0--Grumpig.png similarity index 100% rename from src/afd/sprites/front-shiny/Grumpig.png rename to src/afd/sprites/front-shiny/326--0--Grumpig.png diff --git a/src/afd/sprites/front-shiny/Spinda.png b/src/afd/sprites/front-shiny/327--0--Spinda.png similarity index 100% rename from src/afd/sprites/front-shiny/Spinda.png rename to src/afd/sprites/front-shiny/327--0--Spinda.png diff --git a/src/afd/sprites/front-shiny/Trapinch.png b/src/afd/sprites/front-shiny/328--0--Trapinch.png similarity index 100% rename from src/afd/sprites/front-shiny/Trapinch.png rename to src/afd/sprites/front-shiny/328--0--Trapinch.png diff --git a/src/afd/sprites/front-shiny/Vibrava.png b/src/afd/sprites/front-shiny/329--0--Vibrava.png similarity index 100% rename from src/afd/sprites/front-shiny/Vibrava.png rename to src/afd/sprites/front-shiny/329--0--Vibrava.png diff --git a/src/afd/sprites/front-shiny/Nidorino.png b/src/afd/sprites/front-shiny/33--0--Nidorino.png similarity index 100% rename from src/afd/sprites/front-shiny/Nidorino.png rename to src/afd/sprites/front-shiny/33--0--Nidorino.png diff --git a/src/afd/sprites/front-shiny/Flygon.png b/src/afd/sprites/front-shiny/330--0--Flygon.png similarity index 100% rename from src/afd/sprites/front-shiny/Flygon.png rename to src/afd/sprites/front-shiny/330--0--Flygon.png diff --git a/src/afd/sprites/front-shiny/Cacnea.png b/src/afd/sprites/front-shiny/331--0--Cacnea.png similarity index 100% rename from src/afd/sprites/front-shiny/Cacnea.png rename to src/afd/sprites/front-shiny/331--0--Cacnea.png diff --git a/src/afd/sprites/front-shiny/Cacturne.png b/src/afd/sprites/front-shiny/332--0--Cacturne.png similarity index 100% rename from src/afd/sprites/front-shiny/Cacturne.png rename to src/afd/sprites/front-shiny/332--0--Cacturne.png diff --git a/src/afd/sprites/front-shiny/Swablu.png b/src/afd/sprites/front-shiny/333--0--Swablu.png similarity index 100% rename from src/afd/sprites/front-shiny/Swablu.png rename to src/afd/sprites/front-shiny/333--0--Swablu.png diff --git a/src/afd/sprites/front-shiny/Altaria.png b/src/afd/sprites/front-shiny/334--0--Altaria.png similarity index 100% rename from src/afd/sprites/front-shiny/Altaria.png rename to src/afd/sprites/front-shiny/334--0--Altaria.png diff --git a/src/afd/sprites/front-shiny/Altaria--Mega.png b/src/afd/sprites/front-shiny/334--420--Altaria--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Altaria--Mega.png rename to src/afd/sprites/front-shiny/334--420--Altaria--Mega.png diff --git a/src/afd/sprites/front-shiny/Zangoose.png b/src/afd/sprites/front-shiny/335--0--Zangoose.png similarity index 100% rename from src/afd/sprites/front-shiny/Zangoose.png rename to src/afd/sprites/front-shiny/335--0--Zangoose.png diff --git a/src/afd/sprites/front-shiny/Seviper.png b/src/afd/sprites/front-shiny/336--0--Seviper.png similarity index 100% rename from src/afd/sprites/front-shiny/Seviper.png rename to src/afd/sprites/front-shiny/336--0--Seviper.png diff --git a/src/afd/sprites/front-shiny/Lunatone.png b/src/afd/sprites/front-shiny/337--0--Lunatone.png similarity index 100% rename from src/afd/sprites/front-shiny/Lunatone.png rename to src/afd/sprites/front-shiny/337--0--Lunatone.png diff --git a/src/afd/sprites/front-shiny/Solrock.png b/src/afd/sprites/front-shiny/338--0--Solrock.png similarity index 100% rename from src/afd/sprites/front-shiny/Solrock.png rename to src/afd/sprites/front-shiny/338--0--Solrock.png diff --git a/src/afd/sprites/front-shiny/Barboach.png b/src/afd/sprites/front-shiny/339--0--Barboach.png similarity index 100% rename from src/afd/sprites/front-shiny/Barboach.png rename to src/afd/sprites/front-shiny/339--0--Barboach.png diff --git a/src/afd/sprites/front-shiny/Nidoking.png b/src/afd/sprites/front-shiny/34--0--Nidoking.png similarity index 100% rename from src/afd/sprites/front-shiny/Nidoking.png rename to src/afd/sprites/front-shiny/34--0--Nidoking.png diff --git a/src/afd/sprites/front-shiny/Whiscash.png b/src/afd/sprites/front-shiny/340--0--Whiscash.png similarity index 100% rename from src/afd/sprites/front-shiny/Whiscash.png rename to src/afd/sprites/front-shiny/340--0--Whiscash.png diff --git a/src/afd/sprites/front-shiny/Corphish.png b/src/afd/sprites/front-shiny/341--0--Corphish.png similarity index 100% rename from src/afd/sprites/front-shiny/Corphish.png rename to src/afd/sprites/front-shiny/341--0--Corphish.png diff --git a/src/afd/sprites/front-shiny/Crawdaunt.png b/src/afd/sprites/front-shiny/342--0--Crawdaunt.png similarity index 100% rename from src/afd/sprites/front-shiny/Crawdaunt.png rename to src/afd/sprites/front-shiny/342--0--Crawdaunt.png diff --git a/src/afd/sprites/front-shiny/Baltoy.png b/src/afd/sprites/front-shiny/343--0--Baltoy.png similarity index 100% rename from src/afd/sprites/front-shiny/Baltoy.png rename to src/afd/sprites/front-shiny/343--0--Baltoy.png diff --git a/src/afd/sprites/front-shiny/Claydol.png b/src/afd/sprites/front-shiny/344--0--Claydol.png similarity index 100% rename from src/afd/sprites/front-shiny/Claydol.png rename to src/afd/sprites/front-shiny/344--0--Claydol.png diff --git a/src/afd/sprites/front-shiny/Lileep.png b/src/afd/sprites/front-shiny/345--0--Lileep.png similarity index 100% rename from src/afd/sprites/front-shiny/Lileep.png rename to src/afd/sprites/front-shiny/345--0--Lileep.png diff --git a/src/afd/sprites/front-shiny/Cradily.png b/src/afd/sprites/front-shiny/346--0--Cradily.png similarity index 100% rename from src/afd/sprites/front-shiny/Cradily.png rename to src/afd/sprites/front-shiny/346--0--Cradily.png diff --git a/src/afd/sprites/front-shiny/Anorith.png b/src/afd/sprites/front-shiny/347--0--Anorith.png similarity index 100% rename from src/afd/sprites/front-shiny/Anorith.png rename to src/afd/sprites/front-shiny/347--0--Anorith.png diff --git a/src/afd/sprites/front-shiny/Armaldo.png b/src/afd/sprites/front-shiny/348--0--Armaldo.png similarity index 100% rename from src/afd/sprites/front-shiny/Armaldo.png rename to src/afd/sprites/front-shiny/348--0--Armaldo.png diff --git a/src/afd/sprites/front-shiny/Feebas.png b/src/afd/sprites/front-shiny/349--0--Feebas.png similarity index 100% rename from src/afd/sprites/front-shiny/Feebas.png rename to src/afd/sprites/front-shiny/349--0--Feebas.png diff --git a/src/afd/sprites/front-shiny/Clefairy.png b/src/afd/sprites/front-shiny/35--0--Clefairy.png similarity index 100% rename from src/afd/sprites/front-shiny/Clefairy.png rename to src/afd/sprites/front-shiny/35--0--Clefairy.png diff --git a/src/afd/sprites/front-shiny/Plasmanta.png b/src/afd/sprites/front-shiny/35--0--Plasmanta.png similarity index 100% rename from src/afd/sprites/front-shiny/Plasmanta.png rename to src/afd/sprites/front-shiny/35--0--Plasmanta.png diff --git a/src/afd/sprites/front-shiny/Milotic.png b/src/afd/sprites/front-shiny/350--0--Milotic.png similarity index 100% rename from src/afd/sprites/front-shiny/Milotic.png rename to src/afd/sprites/front-shiny/350--0--Milotic.png diff --git a/src/afd/sprites/front-shiny/Castform.png b/src/afd/sprites/front-shiny/351--0--Castform.png similarity index 100% rename from src/afd/sprites/front-shiny/Castform.png rename to src/afd/sprites/front-shiny/351--0--Castform.png diff --git a/src/afd/sprites/front-shiny/Castform--Rainy.png b/src/afd/sprites/front-shiny/351--420--Castform--Rainy.png similarity index 100% rename from src/afd/sprites/front-shiny/Castform--Rainy.png rename to src/afd/sprites/front-shiny/351--420--Castform--Rainy.png diff --git a/src/afd/sprites/front-shiny/Castform--Snowy.png b/src/afd/sprites/front-shiny/351--420--Castform--Snowy.png similarity index 100% rename from src/afd/sprites/front-shiny/Castform--Snowy.png rename to src/afd/sprites/front-shiny/351--420--Castform--Snowy.png diff --git a/src/afd/sprites/front-shiny/Castform--Sunny.png b/src/afd/sprites/front-shiny/351--420--Castform--Sunny.png similarity index 100% rename from src/afd/sprites/front-shiny/Castform--Sunny.png rename to src/afd/sprites/front-shiny/351--420--Castform--Sunny.png diff --git a/src/afd/sprites/front-shiny/Kecleon.png b/src/afd/sprites/front-shiny/352--0--Kecleon.png similarity index 100% rename from src/afd/sprites/front-shiny/Kecleon.png rename to src/afd/sprites/front-shiny/352--0--Kecleon.png diff --git a/src/afd/sprites/front-shiny/Shuppet.png b/src/afd/sprites/front-shiny/353--0--Shuppet.png similarity index 100% rename from src/afd/sprites/front-shiny/Shuppet.png rename to src/afd/sprites/front-shiny/353--0--Shuppet.png diff --git a/src/afd/sprites/front-shiny/Banette.png b/src/afd/sprites/front-shiny/354--0--Banette.png similarity index 100% rename from src/afd/sprites/front-shiny/Banette.png rename to src/afd/sprites/front-shiny/354--0--Banette.png diff --git a/src/afd/sprites/front-shiny/Banette--Mega.png b/src/afd/sprites/front-shiny/354--420--Banette--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Banette--Mega.png rename to src/afd/sprites/front-shiny/354--420--Banette--Mega.png diff --git a/src/afd/sprites/front-shiny/Duskull.png b/src/afd/sprites/front-shiny/355--0--Duskull.png similarity index 100% rename from src/afd/sprites/front-shiny/Duskull.png rename to src/afd/sprites/front-shiny/355--0--Duskull.png diff --git a/src/afd/sprites/front-shiny/Dusclops.png b/src/afd/sprites/front-shiny/356--0--Dusclops.png similarity index 100% rename from src/afd/sprites/front-shiny/Dusclops.png rename to src/afd/sprites/front-shiny/356--0--Dusclops.png diff --git a/src/afd/sprites/front-shiny/Tropius.png b/src/afd/sprites/front-shiny/357--0--Tropius.png similarity index 100% rename from src/afd/sprites/front-shiny/Tropius.png rename to src/afd/sprites/front-shiny/357--0--Tropius.png diff --git a/src/afd/sprites/front-shiny/Chimecho.png b/src/afd/sprites/front-shiny/358--0--Chimecho.png similarity index 100% rename from src/afd/sprites/front-shiny/Chimecho.png rename to src/afd/sprites/front-shiny/358--0--Chimecho.png diff --git a/src/afd/sprites/front-shiny/Absol.png b/src/afd/sprites/front-shiny/359--0--Absol.png similarity index 100% rename from src/afd/sprites/front-shiny/Absol.png rename to src/afd/sprites/front-shiny/359--0--Absol.png diff --git a/src/afd/sprites/front-shiny/Absol--Mega.png b/src/afd/sprites/front-shiny/359--420--Absol--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Absol--Mega.png rename to src/afd/sprites/front-shiny/359--420--Absol--Mega.png diff --git a/src/afd/sprites/front-shiny/Clefable.png b/src/afd/sprites/front-shiny/36--0--Clefable.png similarity index 100% rename from src/afd/sprites/front-shiny/Clefable.png rename to src/afd/sprites/front-shiny/36--0--Clefable.png diff --git a/src/afd/sprites/front-shiny/Wynaut.png b/src/afd/sprites/front-shiny/360--0--Wynaut.png similarity index 100% rename from src/afd/sprites/front-shiny/Wynaut.png rename to src/afd/sprites/front-shiny/360--0--Wynaut.png diff --git a/src/afd/sprites/front-shiny/Glalie.png b/src/afd/sprites/front-shiny/362--0--Glalie.png similarity index 100% rename from src/afd/sprites/front-shiny/Glalie.png rename to src/afd/sprites/front-shiny/362--0--Glalie.png diff --git a/src/afd/sprites/front-shiny/Spheal.png b/src/afd/sprites/front-shiny/363--0--Spheal.png similarity index 100% rename from src/afd/sprites/front-shiny/Spheal.png rename to src/afd/sprites/front-shiny/363--0--Spheal.png diff --git a/src/afd/sprites/front-shiny/Sealeo.png b/src/afd/sprites/front-shiny/364--0--Sealeo.png similarity index 100% rename from src/afd/sprites/front-shiny/Sealeo.png rename to src/afd/sprites/front-shiny/364--0--Sealeo.png diff --git a/src/afd/sprites/front-shiny/Walrein.png b/src/afd/sprites/front-shiny/365--0--Walrein.png similarity index 100% rename from src/afd/sprites/front-shiny/Walrein.png rename to src/afd/sprites/front-shiny/365--0--Walrein.png diff --git a/src/afd/sprites/front-shiny/Clamperl.png b/src/afd/sprites/front-shiny/366--0--Clamperl.png similarity index 100% rename from src/afd/sprites/front-shiny/Clamperl.png rename to src/afd/sprites/front-shiny/366--0--Clamperl.png diff --git a/src/afd/sprites/front-shiny/Huntail.png b/src/afd/sprites/front-shiny/367--0--Huntail.png similarity index 100% rename from src/afd/sprites/front-shiny/Huntail.png rename to src/afd/sprites/front-shiny/367--0--Huntail.png diff --git a/src/afd/sprites/front-shiny/Gorebyss.png b/src/afd/sprites/front-shiny/368--0--Gorebyss.png similarity index 100% rename from src/afd/sprites/front-shiny/Gorebyss.png rename to src/afd/sprites/front-shiny/368--0--Gorebyss.png diff --git a/src/afd/sprites/front-shiny/Relicanth.png b/src/afd/sprites/front-shiny/369--0--Relicanth.png similarity index 100% rename from src/afd/sprites/front-shiny/Relicanth.png rename to src/afd/sprites/front-shiny/369--0--Relicanth.png diff --git a/src/afd/sprites/front-shiny/Vulpix.png b/src/afd/sprites/front-shiny/37--0--Vulpix.png similarity index 100% rename from src/afd/sprites/front-shiny/Vulpix.png rename to src/afd/sprites/front-shiny/37--0--Vulpix.png diff --git a/src/afd/sprites/front-shiny/Vulpix--Alola.png b/src/afd/sprites/front-shiny/37--420--Vulpix--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Vulpix--Alola.png rename to src/afd/sprites/front-shiny/37--420--Vulpix--Alola.png diff --git a/src/afd/sprites/front-shiny/Luvdisc.png b/src/afd/sprites/front-shiny/370--0--Luvdisc.png similarity index 100% rename from src/afd/sprites/front-shiny/Luvdisc.png rename to src/afd/sprites/front-shiny/370--0--Luvdisc.png diff --git a/src/afd/sprites/front-shiny/Bagon.png b/src/afd/sprites/front-shiny/371--0--Bagon.png similarity index 100% rename from src/afd/sprites/front-shiny/Bagon.png rename to src/afd/sprites/front-shiny/371--0--Bagon.png diff --git a/src/afd/sprites/front-shiny/Shelgon.png b/src/afd/sprites/front-shiny/372--0--Shelgon.png similarity index 100% rename from src/afd/sprites/front-shiny/Shelgon.png rename to src/afd/sprites/front-shiny/372--0--Shelgon.png diff --git a/src/afd/sprites/front-shiny/Salamence.png b/src/afd/sprites/front-shiny/373--0--Salamence.png similarity index 100% rename from src/afd/sprites/front-shiny/Salamence.png rename to src/afd/sprites/front-shiny/373--0--Salamence.png diff --git a/src/afd/sprites/front-shiny/Salamence--Mega.png b/src/afd/sprites/front-shiny/373--420--Salamence--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Salamence--Mega.png rename to src/afd/sprites/front-shiny/373--420--Salamence--Mega.png diff --git a/src/afd/sprites/front-shiny/Beldum.png b/src/afd/sprites/front-shiny/374--0--Beldum.png similarity index 100% rename from src/afd/sprites/front-shiny/Beldum.png rename to src/afd/sprites/front-shiny/374--0--Beldum.png diff --git a/src/afd/sprites/front-shiny/Metang.png b/src/afd/sprites/front-shiny/375--0--Metang.png similarity index 100% rename from src/afd/sprites/front-shiny/Metang.png rename to src/afd/sprites/front-shiny/375--0--Metang.png diff --git a/src/afd/sprites/front-shiny/Metagross.png b/src/afd/sprites/front-shiny/376--0--Metagross.png similarity index 100% rename from src/afd/sprites/front-shiny/Metagross.png rename to src/afd/sprites/front-shiny/376--0--Metagross.png diff --git a/src/afd/sprites/front-shiny/Metagross--Mega.png b/src/afd/sprites/front-shiny/376--420--Metagross--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Metagross--Mega.png rename to src/afd/sprites/front-shiny/376--420--Metagross--Mega.png diff --git a/src/afd/sprites/front-shiny/Regirock.png b/src/afd/sprites/front-shiny/377--0--Regirock.png similarity index 100% rename from src/afd/sprites/front-shiny/Regirock.png rename to src/afd/sprites/front-shiny/377--0--Regirock.png diff --git a/src/afd/sprites/front-shiny/Regice.png b/src/afd/sprites/front-shiny/378--0--Regice.png similarity index 100% rename from src/afd/sprites/front-shiny/Regice.png rename to src/afd/sprites/front-shiny/378--0--Regice.png diff --git a/src/afd/sprites/front-shiny/Registeel.png b/src/afd/sprites/front-shiny/379--0--Registeel.png similarity index 100% rename from src/afd/sprites/front-shiny/Registeel.png rename to src/afd/sprites/front-shiny/379--0--Registeel.png diff --git a/src/afd/sprites/front-shiny/Ninetales--Alola.png b/src/afd/sprites/front-shiny/38--420--Ninetales--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Ninetales--Alola.png rename to src/afd/sprites/front-shiny/38--420--Ninetales--Alola.png diff --git a/src/afd/sprites/front-shiny/Latias.png b/src/afd/sprites/front-shiny/380--0--Latias.png similarity index 100% rename from src/afd/sprites/front-shiny/Latias.png rename to src/afd/sprites/front-shiny/380--0--Latias.png diff --git a/src/afd/sprites/front-shiny/Latias--Mega.png b/src/afd/sprites/front-shiny/380--420--Latias--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Latias--Mega.png rename to src/afd/sprites/front-shiny/380--420--Latias--Mega.png diff --git a/src/afd/sprites/front-shiny/Latios.png b/src/afd/sprites/front-shiny/381--0--Latios.png similarity index 100% rename from src/afd/sprites/front-shiny/Latios.png rename to src/afd/sprites/front-shiny/381--0--Latios.png diff --git a/src/afd/sprites/front-shiny/Latios--Mega.png b/src/afd/sprites/front-shiny/381--420--Latios--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Latios--Mega.png rename to src/afd/sprites/front-shiny/381--420--Latios--Mega.png diff --git a/src/afd/sprites/front-shiny/Kyogre.png b/src/afd/sprites/front-shiny/382--0--Kyogre.png similarity index 100% rename from src/afd/sprites/front-shiny/Kyogre.png rename to src/afd/sprites/front-shiny/382--0--Kyogre.png diff --git a/src/afd/sprites/front-shiny/Kyogre--Primal.png b/src/afd/sprites/front-shiny/382--420--Kyogre--Primal.png similarity index 100% rename from src/afd/sprites/front-shiny/Kyogre--Primal.png rename to src/afd/sprites/front-shiny/382--420--Kyogre--Primal.png diff --git a/src/afd/sprites/front-shiny/Groudon.png b/src/afd/sprites/front-shiny/383--0--Groudon.png similarity index 100% rename from src/afd/sprites/front-shiny/Groudon.png rename to src/afd/sprites/front-shiny/383--0--Groudon.png diff --git a/src/afd/sprites/front-shiny/Groudon--Primal.png b/src/afd/sprites/front-shiny/383--420--Groudon--Primal.png similarity index 100% rename from src/afd/sprites/front-shiny/Groudon--Primal.png rename to src/afd/sprites/front-shiny/383--420--Groudon--Primal.png diff --git a/src/afd/sprites/front-shiny/Rayquaza.png b/src/afd/sprites/front-shiny/384--0--Rayquaza.png similarity index 100% rename from src/afd/sprites/front-shiny/Rayquaza.png rename to src/afd/sprites/front-shiny/384--0--Rayquaza.png diff --git a/src/afd/sprites/front-shiny/Rayquaza--Mega.png b/src/afd/sprites/front-shiny/384--420--Rayquaza--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Rayquaza--Mega.png rename to src/afd/sprites/front-shiny/384--420--Rayquaza--Mega.png diff --git a/src/afd/sprites/front-shiny/Jirachi.png b/src/afd/sprites/front-shiny/385--0--Jirachi.png similarity index 100% rename from src/afd/sprites/front-shiny/Jirachi.png rename to src/afd/sprites/front-shiny/385--0--Jirachi.png diff --git a/src/afd/sprites/front-shiny/Deoxys.png b/src/afd/sprites/front-shiny/386--0--Deoxys.png similarity index 100% rename from src/afd/sprites/front-shiny/Deoxys.png rename to src/afd/sprites/front-shiny/386--0--Deoxys.png diff --git a/src/afd/sprites/front-shiny/Deoxys--Attack.png b/src/afd/sprites/front-shiny/386--420--Deoxys--Attack.png similarity index 100% rename from src/afd/sprites/front-shiny/Deoxys--Attack.png rename to src/afd/sprites/front-shiny/386--420--Deoxys--Attack.png diff --git a/src/afd/sprites/front-shiny/Deoxys--Defense.png b/src/afd/sprites/front-shiny/386--420--Deoxys--Defense.png similarity index 100% rename from src/afd/sprites/front-shiny/Deoxys--Defense.png rename to src/afd/sprites/front-shiny/386--420--Deoxys--Defense.png diff --git a/src/afd/sprites/front-shiny/Deoxys--Speed.png b/src/afd/sprites/front-shiny/386--420--Deoxys--Speed.png similarity index 100% rename from src/afd/sprites/front-shiny/Deoxys--Speed.png rename to src/afd/sprites/front-shiny/386--420--Deoxys--Speed.png diff --git a/src/afd/sprites/front-shiny/Turtwig.png b/src/afd/sprites/front-shiny/387--0--Turtwig.png similarity index 100% rename from src/afd/sprites/front-shiny/Turtwig.png rename to src/afd/sprites/front-shiny/387--0--Turtwig.png diff --git a/src/afd/sprites/front-shiny/Grotle.png b/src/afd/sprites/front-shiny/388--0--Grotle.png similarity index 100% rename from src/afd/sprites/front-shiny/Grotle.png rename to src/afd/sprites/front-shiny/388--0--Grotle.png diff --git a/src/afd/sprites/front-shiny/Torterra.png b/src/afd/sprites/front-shiny/389--0--Torterra.png similarity index 100% rename from src/afd/sprites/front-shiny/Torterra.png rename to src/afd/sprites/front-shiny/389--0--Torterra.png diff --git a/src/afd/sprites/front-shiny/Jigglypuff.png b/src/afd/sprites/front-shiny/39--0--Jigglypuff.png similarity index 100% rename from src/afd/sprites/front-shiny/Jigglypuff.png rename to src/afd/sprites/front-shiny/39--0--Jigglypuff.png diff --git a/src/afd/sprites/front-shiny/Chimchar.png b/src/afd/sprites/front-shiny/390--0--Chimchar.png similarity index 100% rename from src/afd/sprites/front-shiny/Chimchar.png rename to src/afd/sprites/front-shiny/390--0--Chimchar.png diff --git a/src/afd/sprites/front-shiny/Monferno.png b/src/afd/sprites/front-shiny/391--0--Monferno.png similarity index 100% rename from src/afd/sprites/front-shiny/Monferno.png rename to src/afd/sprites/front-shiny/391--0--Monferno.png diff --git a/src/afd/sprites/front-shiny/Infernape.png b/src/afd/sprites/front-shiny/392--0--Infernape.png similarity index 100% rename from src/afd/sprites/front-shiny/Infernape.png rename to src/afd/sprites/front-shiny/392--0--Infernape.png diff --git a/src/afd/sprites/front-shiny/Piplup.png b/src/afd/sprites/front-shiny/393--0--Piplup.png similarity index 100% rename from src/afd/sprites/front-shiny/Piplup.png rename to src/afd/sprites/front-shiny/393--0--Piplup.png diff --git a/src/afd/sprites/front-shiny/Prinplup.png b/src/afd/sprites/front-shiny/394--0--Prinplup.png similarity index 100% rename from src/afd/sprites/front-shiny/Prinplup.png rename to src/afd/sprites/front-shiny/394--0--Prinplup.png diff --git a/src/afd/sprites/front-shiny/Empoleon.png b/src/afd/sprites/front-shiny/395--0--Empoleon.png similarity index 100% rename from src/afd/sprites/front-shiny/Empoleon.png rename to src/afd/sprites/front-shiny/395--0--Empoleon.png diff --git a/src/afd/sprites/front-shiny/Starly.png b/src/afd/sprites/front-shiny/396--0--Starly.png similarity index 100% rename from src/afd/sprites/front-shiny/Starly.png rename to src/afd/sprites/front-shiny/396--0--Starly.png diff --git a/src/afd/sprites/front-shiny/Staravia.png b/src/afd/sprites/front-shiny/397--0--Staravia.png similarity index 100% rename from src/afd/sprites/front-shiny/Staravia.png rename to src/afd/sprites/front-shiny/397--0--Staravia.png diff --git a/src/afd/sprites/front-shiny/Staraptor.png b/src/afd/sprites/front-shiny/398--0--Staraptor.png similarity index 100% rename from src/afd/sprites/front-shiny/Staraptor.png rename to src/afd/sprites/front-shiny/398--0--Staraptor.png diff --git a/src/afd/sprites/front-shiny/Bidoof.png b/src/afd/sprites/front-shiny/399--0--Bidoof.png similarity index 100% rename from src/afd/sprites/front-shiny/Bidoof.png rename to src/afd/sprites/front-shiny/399--0--Bidoof.png diff --git a/src/afd/sprites/front-shiny/Charmander.png b/src/afd/sprites/front-shiny/4--0--Charmander.png similarity index 100% rename from src/afd/sprites/front-shiny/Charmander.png rename to src/afd/sprites/front-shiny/4--0--Charmander.png diff --git a/src/afd/sprites/front-shiny/Wigglytuff.png b/src/afd/sprites/front-shiny/40--0--Wigglytuff.png similarity index 100% rename from src/afd/sprites/front-shiny/Wigglytuff.png rename to src/afd/sprites/front-shiny/40--0--Wigglytuff.png diff --git a/src/afd/sprites/front-shiny/Bibarel.png b/src/afd/sprites/front-shiny/400--0--Bibarel.png similarity index 100% rename from src/afd/sprites/front-shiny/Bibarel.png rename to src/afd/sprites/front-shiny/400--0--Bibarel.png diff --git a/src/afd/sprites/front-shiny/Kricketot.png b/src/afd/sprites/front-shiny/401--0--Kricketot.png similarity index 100% rename from src/afd/sprites/front-shiny/Kricketot.png rename to src/afd/sprites/front-shiny/401--0--Kricketot.png diff --git a/src/afd/sprites/front-shiny/Kricketune.png b/src/afd/sprites/front-shiny/402--0--Kricketune.png similarity index 100% rename from src/afd/sprites/front-shiny/Kricketune.png rename to src/afd/sprites/front-shiny/402--0--Kricketune.png diff --git a/src/afd/sprites/front-shiny/Shinx.png b/src/afd/sprites/front-shiny/403--0--Shinx.png similarity index 100% rename from src/afd/sprites/front-shiny/Shinx.png rename to src/afd/sprites/front-shiny/403--0--Shinx.png diff --git a/src/afd/sprites/front-shiny/Luxio.png b/src/afd/sprites/front-shiny/404--0--Luxio.png similarity index 100% rename from src/afd/sprites/front-shiny/Luxio.png rename to src/afd/sprites/front-shiny/404--0--Luxio.png diff --git a/src/afd/sprites/front-shiny/Luxray.png b/src/afd/sprites/front-shiny/405--0--Luxray.png similarity index 100% rename from src/afd/sprites/front-shiny/Luxray.png rename to src/afd/sprites/front-shiny/405--0--Luxray.png diff --git a/src/afd/sprites/front-shiny/Budew.gif b/src/afd/sprites/front-shiny/406--0--Budew.gif similarity index 100% rename from src/afd/sprites/front-shiny/Budew.gif rename to src/afd/sprites/front-shiny/406--0--Budew.gif diff --git a/src/afd/sprites/front-shiny/Roserade.png b/src/afd/sprites/front-shiny/407--0--Roserade.png similarity index 100% rename from src/afd/sprites/front-shiny/Roserade.png rename to src/afd/sprites/front-shiny/407--0--Roserade.png diff --git a/src/afd/sprites/front-shiny/Rampardos.png b/src/afd/sprites/front-shiny/409--0--Rampardos.png similarity index 100% rename from src/afd/sprites/front-shiny/Rampardos.png rename to src/afd/sprites/front-shiny/409--0--Rampardos.png diff --git a/src/afd/sprites/front-shiny/Zubat.png b/src/afd/sprites/front-shiny/41--0--Zubat.png similarity index 100% rename from src/afd/sprites/front-shiny/Zubat.png rename to src/afd/sprites/front-shiny/41--0--Zubat.png diff --git a/src/afd/sprites/front-shiny/Shieldon.png b/src/afd/sprites/front-shiny/410--0--Shieldon.png similarity index 100% rename from src/afd/sprites/front-shiny/Shieldon.png rename to src/afd/sprites/front-shiny/410--0--Shieldon.png diff --git a/src/afd/sprites/front-shiny/Bastiodon.png b/src/afd/sprites/front-shiny/411--0--Bastiodon.png similarity index 100% rename from src/afd/sprites/front-shiny/Bastiodon.png rename to src/afd/sprites/front-shiny/411--0--Bastiodon.png diff --git a/src/afd/sprites/front-shiny/Burmy.png b/src/afd/sprites/front-shiny/412--0--Burmy.png similarity index 100% rename from src/afd/sprites/front-shiny/Burmy.png rename to src/afd/sprites/front-shiny/412--0--Burmy.png diff --git a/src/afd/sprites/front-shiny/Wormadam.png b/src/afd/sprites/front-shiny/413--0--Wormadam.png similarity index 100% rename from src/afd/sprites/front-shiny/Wormadam.png rename to src/afd/sprites/front-shiny/413--0--Wormadam.png diff --git a/src/afd/sprites/front-shiny/Wormadam--Sandy.png b/src/afd/sprites/front-shiny/413--420--Wormadam--Sandy.png similarity index 100% rename from src/afd/sprites/front-shiny/Wormadam--Sandy.png rename to src/afd/sprites/front-shiny/413--420--Wormadam--Sandy.png diff --git a/src/afd/sprites/front-shiny/Wormadam--Trash.png b/src/afd/sprites/front-shiny/413--420--Wormadam--Trash.png similarity index 100% rename from src/afd/sprites/front-shiny/Wormadam--Trash.png rename to src/afd/sprites/front-shiny/413--420--Wormadam--Trash.png diff --git a/src/afd/sprites/front-shiny/Mothim.png b/src/afd/sprites/front-shiny/414--0--Mothim.png similarity index 100% rename from src/afd/sprites/front-shiny/Mothim.png rename to src/afd/sprites/front-shiny/414--0--Mothim.png diff --git a/src/afd/sprites/front-shiny/Combee.png b/src/afd/sprites/front-shiny/415--0--Combee.png similarity index 100% rename from src/afd/sprites/front-shiny/Combee.png rename to src/afd/sprites/front-shiny/415--0--Combee.png diff --git a/src/afd/sprites/front-shiny/Vespiquen.png b/src/afd/sprites/front-shiny/416--0--Vespiquen.png similarity index 100% rename from src/afd/sprites/front-shiny/Vespiquen.png rename to src/afd/sprites/front-shiny/416--0--Vespiquen.png diff --git a/src/afd/sprites/front-shiny/Pachirisu.png b/src/afd/sprites/front-shiny/417--0--Pachirisu.png similarity index 100% rename from src/afd/sprites/front-shiny/Pachirisu.png rename to src/afd/sprites/front-shiny/417--0--Pachirisu.png diff --git a/src/afd/sprites/front-shiny/Buizel.png b/src/afd/sprites/front-shiny/418--0--Buizel.png similarity index 100% rename from src/afd/sprites/front-shiny/Buizel.png rename to src/afd/sprites/front-shiny/418--0--Buizel.png diff --git a/src/afd/sprites/front-shiny/Floatzel.png b/src/afd/sprites/front-shiny/419--0--Floatzel.png similarity index 100% rename from src/afd/sprites/front-shiny/Floatzel.png rename to src/afd/sprites/front-shiny/419--0--Floatzel.png diff --git a/src/afd/sprites/front-shiny/Golbat.png b/src/afd/sprites/front-shiny/42--0--Golbat.png similarity index 100% rename from src/afd/sprites/front-shiny/Golbat.png rename to src/afd/sprites/front-shiny/42--0--Golbat.png diff --git a/src/afd/sprites/front-shiny/Cherubi.png b/src/afd/sprites/front-shiny/420--0--Cherubi.png similarity index 100% rename from src/afd/sprites/front-shiny/Cherubi.png rename to src/afd/sprites/front-shiny/420--0--Cherubi.png diff --git a/src/afd/sprites/front-shiny/Cherrim.png b/src/afd/sprites/front-shiny/421--0--Cherrim.png similarity index 100% rename from src/afd/sprites/front-shiny/Cherrim.png rename to src/afd/sprites/front-shiny/421--0--Cherrim.png diff --git a/src/afd/sprites/front-shiny/Cherrim--Sunshine.png b/src/afd/sprites/front-shiny/421--420--Cherrim--Sunshine.png similarity index 100% rename from src/afd/sprites/front-shiny/Cherrim--Sunshine.png rename to src/afd/sprites/front-shiny/421--420--Cherrim--Sunshine.png diff --git a/src/afd/sprites/front-shiny/Shellos.png b/src/afd/sprites/front-shiny/422--0--Shellos.png similarity index 100% rename from src/afd/sprites/front-shiny/Shellos.png rename to src/afd/sprites/front-shiny/422--0--Shellos.png diff --git a/src/afd/sprites/front-shiny/Gastrodon.png b/src/afd/sprites/front-shiny/423--0--Gastrodon.png similarity index 100% rename from src/afd/sprites/front-shiny/Gastrodon.png rename to src/afd/sprites/front-shiny/423--0--Gastrodon.png diff --git a/src/afd/sprites/front-shiny/Ambipom.png b/src/afd/sprites/front-shiny/424--0--Ambipom.png similarity index 100% rename from src/afd/sprites/front-shiny/Ambipom.png rename to src/afd/sprites/front-shiny/424--0--Ambipom.png diff --git a/src/afd/sprites/front-shiny/Drifloon.png b/src/afd/sprites/front-shiny/425--0--Drifloon.png similarity index 100% rename from src/afd/sprites/front-shiny/Drifloon.png rename to src/afd/sprites/front-shiny/425--0--Drifloon.png diff --git a/src/afd/sprites/front-shiny/Drifblim.png b/src/afd/sprites/front-shiny/426--0--Drifblim.png similarity index 100% rename from src/afd/sprites/front-shiny/Drifblim.png rename to src/afd/sprites/front-shiny/426--0--Drifblim.png diff --git a/src/afd/sprites/front-shiny/Buneary.png b/src/afd/sprites/front-shiny/427--0--Buneary.png similarity index 100% rename from src/afd/sprites/front-shiny/Buneary.png rename to src/afd/sprites/front-shiny/427--0--Buneary.png diff --git a/src/afd/sprites/front-shiny/Lopunny.png b/src/afd/sprites/front-shiny/428--0--Lopunny.png similarity index 100% rename from src/afd/sprites/front-shiny/Lopunny.png rename to src/afd/sprites/front-shiny/428--0--Lopunny.png diff --git a/src/afd/sprites/front-shiny/Lopunny--Mega.png b/src/afd/sprites/front-shiny/428--420--Lopunny--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Lopunny--Mega.png rename to src/afd/sprites/front-shiny/428--420--Lopunny--Mega.png diff --git a/src/afd/sprites/front-shiny/Mismagius.png b/src/afd/sprites/front-shiny/429--0--Mismagius.png similarity index 100% rename from src/afd/sprites/front-shiny/Mismagius.png rename to src/afd/sprites/front-shiny/429--0--Mismagius.png diff --git a/src/afd/sprites/front-shiny/Oddish.png b/src/afd/sprites/front-shiny/43--0--Oddish.png similarity index 100% rename from src/afd/sprites/front-shiny/Oddish.png rename to src/afd/sprites/front-shiny/43--0--Oddish.png diff --git a/src/afd/sprites/front-shiny/Honchkrow.png b/src/afd/sprites/front-shiny/430--0--Honchkrow.png similarity index 100% rename from src/afd/sprites/front-shiny/Honchkrow.png rename to src/afd/sprites/front-shiny/430--0--Honchkrow.png diff --git a/src/afd/sprites/front-shiny/Glameow.png b/src/afd/sprites/front-shiny/431--0--Glameow.png similarity index 100% rename from src/afd/sprites/front-shiny/Glameow.png rename to src/afd/sprites/front-shiny/431--0--Glameow.png diff --git a/src/afd/sprites/front-shiny/Purugly.png b/src/afd/sprites/front-shiny/432--0--Purugly.png similarity index 100% rename from src/afd/sprites/front-shiny/Purugly.png rename to src/afd/sprites/front-shiny/432--0--Purugly.png diff --git a/src/afd/sprites/front-shiny/Chingling.png b/src/afd/sprites/front-shiny/433--0--Chingling.png similarity index 100% rename from src/afd/sprites/front-shiny/Chingling.png rename to src/afd/sprites/front-shiny/433--0--Chingling.png diff --git a/src/afd/sprites/front-shiny/Stunky.png b/src/afd/sprites/front-shiny/434--0--Stunky.png similarity index 100% rename from src/afd/sprites/front-shiny/Stunky.png rename to src/afd/sprites/front-shiny/434--0--Stunky.png diff --git a/src/afd/sprites/front-shiny/Bronzor.png b/src/afd/sprites/front-shiny/436--0--Bronzor.png similarity index 100% rename from src/afd/sprites/front-shiny/Bronzor.png rename to src/afd/sprites/front-shiny/436--0--Bronzor.png diff --git a/src/afd/sprites/front-shiny/Bronzong.png b/src/afd/sprites/front-shiny/437--0--Bronzong.png similarity index 100% rename from src/afd/sprites/front-shiny/Bronzong.png rename to src/afd/sprites/front-shiny/437--0--Bronzong.png diff --git a/src/afd/sprites/front-shiny/Bonsly.png b/src/afd/sprites/front-shiny/438--0--Bonsly.png similarity index 100% rename from src/afd/sprites/front-shiny/Bonsly.png rename to src/afd/sprites/front-shiny/438--0--Bonsly.png diff --git a/src/afd/sprites/front-shiny/Mime_Jr..png b/src/afd/sprites/front-shiny/439--0--Mime_Jr..png similarity index 100% rename from src/afd/sprites/front-shiny/Mime_Jr..png rename to src/afd/sprites/front-shiny/439--0--Mime_Jr..png diff --git a/src/afd/sprites/front-shiny/Gloom.png b/src/afd/sprites/front-shiny/44--0--Gloom.png similarity index 100% rename from src/afd/sprites/front-shiny/Gloom.png rename to src/afd/sprites/front-shiny/44--0--Gloom.png diff --git a/src/afd/sprites/front-shiny/Happiny.png b/src/afd/sprites/front-shiny/440--0--Happiny.png similarity index 100% rename from src/afd/sprites/front-shiny/Happiny.png rename to src/afd/sprites/front-shiny/440--0--Happiny.png diff --git a/src/afd/sprites/front-shiny/Chatot.png b/src/afd/sprites/front-shiny/441--0--Chatot.png similarity index 100% rename from src/afd/sprites/front-shiny/Chatot.png rename to src/afd/sprites/front-shiny/441--0--Chatot.png diff --git a/src/afd/sprites/front-shiny/Spiritomb.png b/src/afd/sprites/front-shiny/442--0--Spiritomb.png similarity index 100% rename from src/afd/sprites/front-shiny/Spiritomb.png rename to src/afd/sprites/front-shiny/442--0--Spiritomb.png diff --git a/src/afd/sprites/front-shiny/Gible.png b/src/afd/sprites/front-shiny/443--0--Gible.png similarity index 100% rename from src/afd/sprites/front-shiny/Gible.png rename to src/afd/sprites/front-shiny/443--0--Gible.png diff --git a/src/afd/sprites/front-shiny/Gabite.png b/src/afd/sprites/front-shiny/444--0--Gabite.png similarity index 100% rename from src/afd/sprites/front-shiny/Gabite.png rename to src/afd/sprites/front-shiny/444--0--Gabite.png diff --git a/src/afd/sprites/front-shiny/Garchomp.png b/src/afd/sprites/front-shiny/445--0--Garchomp.png similarity index 100% rename from src/afd/sprites/front-shiny/Garchomp.png rename to src/afd/sprites/front-shiny/445--0--Garchomp.png diff --git a/src/afd/sprites/front-shiny/Garchomp--Mega.png b/src/afd/sprites/front-shiny/445--420--Garchomp--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Garchomp--Mega.png rename to src/afd/sprites/front-shiny/445--420--Garchomp--Mega.png diff --git a/src/afd/sprites/front-shiny/Munchlax.png b/src/afd/sprites/front-shiny/446--0--Munchlax.png similarity index 100% rename from src/afd/sprites/front-shiny/Munchlax.png rename to src/afd/sprites/front-shiny/446--0--Munchlax.png diff --git a/src/afd/sprites/front-shiny/Riolu.png b/src/afd/sprites/front-shiny/447--0--Riolu.png similarity index 100% rename from src/afd/sprites/front-shiny/Riolu.png rename to src/afd/sprites/front-shiny/447--0--Riolu.png diff --git a/src/afd/sprites/front-shiny/Lucario.png b/src/afd/sprites/front-shiny/448--0--Lucario.png similarity index 100% rename from src/afd/sprites/front-shiny/Lucario.png rename to src/afd/sprites/front-shiny/448--0--Lucario.png diff --git a/src/afd/sprites/front-shiny/Lucario--Mega.png b/src/afd/sprites/front-shiny/448--420--Lucario--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Lucario--Mega.png rename to src/afd/sprites/front-shiny/448--420--Lucario--Mega.png diff --git a/src/afd/sprites/front-shiny/Hippopotas.png b/src/afd/sprites/front-shiny/449--0--Hippopotas.png similarity index 100% rename from src/afd/sprites/front-shiny/Hippopotas.png rename to src/afd/sprites/front-shiny/449--0--Hippopotas.png diff --git a/src/afd/sprites/front-shiny/Vileplume.png b/src/afd/sprites/front-shiny/45--0--Vileplume.png similarity index 100% rename from src/afd/sprites/front-shiny/Vileplume.png rename to src/afd/sprites/front-shiny/45--0--Vileplume.png diff --git a/src/afd/sprites/front-shiny/Hippowdon.png b/src/afd/sprites/front-shiny/450--0--Hippowdon.png similarity index 100% rename from src/afd/sprites/front-shiny/Hippowdon.png rename to src/afd/sprites/front-shiny/450--0--Hippowdon.png diff --git a/src/afd/sprites/front-shiny/Skorupi.png b/src/afd/sprites/front-shiny/451--0--Skorupi.png similarity index 100% rename from src/afd/sprites/front-shiny/Skorupi.png rename to src/afd/sprites/front-shiny/451--0--Skorupi.png diff --git a/src/afd/sprites/front-shiny/Drapion.png b/src/afd/sprites/front-shiny/452--0--Drapion.png similarity index 100% rename from src/afd/sprites/front-shiny/Drapion.png rename to src/afd/sprites/front-shiny/452--0--Drapion.png diff --git a/src/afd/sprites/front-shiny/Croagunk.png b/src/afd/sprites/front-shiny/453--0--Croagunk.png similarity index 100% rename from src/afd/sprites/front-shiny/Croagunk.png rename to src/afd/sprites/front-shiny/453--0--Croagunk.png diff --git a/src/afd/sprites/front-shiny/Toxicroak.png b/src/afd/sprites/front-shiny/454--0--Toxicroak.png similarity index 100% rename from src/afd/sprites/front-shiny/Toxicroak.png rename to src/afd/sprites/front-shiny/454--0--Toxicroak.png diff --git a/src/afd/sprites/front-shiny/Carnivine.png b/src/afd/sprites/front-shiny/455--0--Carnivine.png similarity index 100% rename from src/afd/sprites/front-shiny/Carnivine.png rename to src/afd/sprites/front-shiny/455--0--Carnivine.png diff --git a/src/afd/sprites/front-shiny/Finneon.png b/src/afd/sprites/front-shiny/456--0--Finneon.png similarity index 100% rename from src/afd/sprites/front-shiny/Finneon.png rename to src/afd/sprites/front-shiny/456--0--Finneon.png diff --git a/src/afd/sprites/front-shiny/Lumineon.png b/src/afd/sprites/front-shiny/457--0--Lumineon.png similarity index 100% rename from src/afd/sprites/front-shiny/Lumineon.png rename to src/afd/sprites/front-shiny/457--0--Lumineon.png diff --git a/src/afd/sprites/front-shiny/Mantyke.png b/src/afd/sprites/front-shiny/458--0--Mantyke.png similarity index 100% rename from src/afd/sprites/front-shiny/Mantyke.png rename to src/afd/sprites/front-shiny/458--0--Mantyke.png diff --git a/src/afd/sprites/front-shiny/Snover.png b/src/afd/sprites/front-shiny/459--0--Snover.png similarity index 100% rename from src/afd/sprites/front-shiny/Snover.png rename to src/afd/sprites/front-shiny/459--0--Snover.png diff --git a/src/afd/sprites/front-shiny/Paras.png b/src/afd/sprites/front-shiny/46--0--Paras.png similarity index 100% rename from src/afd/sprites/front-shiny/Paras.png rename to src/afd/sprites/front-shiny/46--0--Paras.png diff --git a/src/afd/sprites/front-shiny/Abomasnow.png b/src/afd/sprites/front-shiny/460--0--Abomasnow.png similarity index 100% rename from src/afd/sprites/front-shiny/Abomasnow.png rename to src/afd/sprites/front-shiny/460--0--Abomasnow.png diff --git a/src/afd/sprites/front-shiny/Abomasnow--Mega.png b/src/afd/sprites/front-shiny/460--420--Abomasnow--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Abomasnow--Mega.png rename to src/afd/sprites/front-shiny/460--420--Abomasnow--Mega.png diff --git a/src/afd/sprites/front-shiny/Weavile.png b/src/afd/sprites/front-shiny/461--0--Weavile.png similarity index 100% rename from src/afd/sprites/front-shiny/Weavile.png rename to src/afd/sprites/front-shiny/461--0--Weavile.png diff --git a/src/afd/sprites/front-shiny/Magnezone.png b/src/afd/sprites/front-shiny/462--0--Magnezone.png similarity index 100% rename from src/afd/sprites/front-shiny/Magnezone.png rename to src/afd/sprites/front-shiny/462--0--Magnezone.png diff --git a/src/afd/sprites/front-shiny/Lickilicky.png b/src/afd/sprites/front-shiny/463--0--Lickilicky.png similarity index 100% rename from src/afd/sprites/front-shiny/Lickilicky.png rename to src/afd/sprites/front-shiny/463--0--Lickilicky.png diff --git a/src/afd/sprites/front-shiny/Rhyperior.png b/src/afd/sprites/front-shiny/464--0--Rhyperior.png similarity index 100% rename from src/afd/sprites/front-shiny/Rhyperior.png rename to src/afd/sprites/front-shiny/464--0--Rhyperior.png diff --git a/src/afd/sprites/front-shiny/Tangrowth.png b/src/afd/sprites/front-shiny/465--0--Tangrowth.png similarity index 100% rename from src/afd/sprites/front-shiny/Tangrowth.png rename to src/afd/sprites/front-shiny/465--0--Tangrowth.png diff --git a/src/afd/sprites/front-shiny/Electivire.png b/src/afd/sprites/front-shiny/466--0--Electivire.png similarity index 100% rename from src/afd/sprites/front-shiny/Electivire.png rename to src/afd/sprites/front-shiny/466--0--Electivire.png diff --git a/src/afd/sprites/front-shiny/Togekiss.png b/src/afd/sprites/front-shiny/468--0--Togekiss.png similarity index 100% rename from src/afd/sprites/front-shiny/Togekiss.png rename to src/afd/sprites/front-shiny/468--0--Togekiss.png diff --git a/src/afd/sprites/front-shiny/Yanmega.png b/src/afd/sprites/front-shiny/469--0--Yanmega.png similarity index 100% rename from src/afd/sprites/front-shiny/Yanmega.png rename to src/afd/sprites/front-shiny/469--0--Yanmega.png diff --git a/src/afd/sprites/front-shiny/Parasect.png b/src/afd/sprites/front-shiny/47--0--Parasect.png similarity index 100% rename from src/afd/sprites/front-shiny/Parasect.png rename to src/afd/sprites/front-shiny/47--0--Parasect.png diff --git a/src/afd/sprites/front-shiny/Leafeon.png b/src/afd/sprites/front-shiny/470--0--Leafeon.png similarity index 100% rename from src/afd/sprites/front-shiny/Leafeon.png rename to src/afd/sprites/front-shiny/470--0--Leafeon.png diff --git a/src/afd/sprites/front-shiny/Glaceon.png b/src/afd/sprites/front-shiny/471--0--Glaceon.png similarity index 100% rename from src/afd/sprites/front-shiny/Glaceon.png rename to src/afd/sprites/front-shiny/471--0--Glaceon.png diff --git a/src/afd/sprites/front-shiny/Gliscor.png b/src/afd/sprites/front-shiny/472--0--Gliscor.png similarity index 100% rename from src/afd/sprites/front-shiny/Gliscor.png rename to src/afd/sprites/front-shiny/472--0--Gliscor.png diff --git a/src/afd/sprites/front-shiny/Mamoswine.png b/src/afd/sprites/front-shiny/473--0--Mamoswine.png similarity index 100% rename from src/afd/sprites/front-shiny/Mamoswine.png rename to src/afd/sprites/front-shiny/473--0--Mamoswine.png diff --git a/src/afd/sprites/front-shiny/Porygon-Z.png b/src/afd/sprites/front-shiny/474--0--Porygon-Z.png similarity index 100% rename from src/afd/sprites/front-shiny/Porygon-Z.png rename to src/afd/sprites/front-shiny/474--0--Porygon-Z.png diff --git a/src/afd/sprites/front-shiny/Gallade.png b/src/afd/sprites/front-shiny/475--0--Gallade.png similarity index 100% rename from src/afd/sprites/front-shiny/Gallade.png rename to src/afd/sprites/front-shiny/475--0--Gallade.png diff --git a/src/afd/sprites/front-shiny/Gallade--Mega.png b/src/afd/sprites/front-shiny/475--420--Gallade--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Gallade--Mega.png rename to src/afd/sprites/front-shiny/475--420--Gallade--Mega.png diff --git a/src/afd/sprites/front-shiny/Probopass.png b/src/afd/sprites/front-shiny/476--0--Probopass.png similarity index 100% rename from src/afd/sprites/front-shiny/Probopass.png rename to src/afd/sprites/front-shiny/476--0--Probopass.png diff --git a/src/afd/sprites/front-shiny/Dusknoir.png b/src/afd/sprites/front-shiny/477--0--Dusknoir.png similarity index 100% rename from src/afd/sprites/front-shiny/Dusknoir.png rename to src/afd/sprites/front-shiny/477--0--Dusknoir.png diff --git a/src/afd/sprites/front-shiny/Froslass.png b/src/afd/sprites/front-shiny/478--0--Froslass.png similarity index 100% rename from src/afd/sprites/front-shiny/Froslass.png rename to src/afd/sprites/front-shiny/478--0--Froslass.png diff --git a/src/afd/sprites/front-shiny/Rotom.png b/src/afd/sprites/front-shiny/479--0--Rotom.png similarity index 100% rename from src/afd/sprites/front-shiny/Rotom.png rename to src/afd/sprites/front-shiny/479--0--Rotom.png diff --git a/src/afd/sprites/front-shiny/Rotom--Fan.png b/src/afd/sprites/front-shiny/479--420--Rotom--Fan.png similarity index 100% rename from src/afd/sprites/front-shiny/Rotom--Fan.png rename to src/afd/sprites/front-shiny/479--420--Rotom--Fan.png diff --git a/src/afd/sprites/front-shiny/Rotom--Frost.png b/src/afd/sprites/front-shiny/479--420--Rotom--Frost.png similarity index 100% rename from src/afd/sprites/front-shiny/Rotom--Frost.png rename to src/afd/sprites/front-shiny/479--420--Rotom--Frost.png diff --git a/src/afd/sprites/front-shiny/Rotom--Heat.png b/src/afd/sprites/front-shiny/479--420--Rotom--Heat.png similarity index 100% rename from src/afd/sprites/front-shiny/Rotom--Heat.png rename to src/afd/sprites/front-shiny/479--420--Rotom--Heat.png diff --git a/src/afd/sprites/front-shiny/Rotom--Mow.png b/src/afd/sprites/front-shiny/479--420--Rotom--Mow.png similarity index 100% rename from src/afd/sprites/front-shiny/Rotom--Mow.png rename to src/afd/sprites/front-shiny/479--420--Rotom--Mow.png diff --git a/src/afd/sprites/front-shiny/Rotom--Wash.png b/src/afd/sprites/front-shiny/479--420--Rotom--Wash.png similarity index 100% rename from src/afd/sprites/front-shiny/Rotom--Wash.png rename to src/afd/sprites/front-shiny/479--420--Rotom--Wash.png diff --git a/src/afd/sprites/front-shiny/Venonat.png b/src/afd/sprites/front-shiny/48--0--Venonat.png similarity index 100% rename from src/afd/sprites/front-shiny/Venonat.png rename to src/afd/sprites/front-shiny/48--0--Venonat.png diff --git a/src/afd/sprites/front-shiny/Uxie.png b/src/afd/sprites/front-shiny/480--0--Uxie.png similarity index 100% rename from src/afd/sprites/front-shiny/Uxie.png rename to src/afd/sprites/front-shiny/480--0--Uxie.png diff --git a/src/afd/sprites/front-shiny/Mesprit.png b/src/afd/sprites/front-shiny/481--0--Mesprit.png similarity index 100% rename from src/afd/sprites/front-shiny/Mesprit.png rename to src/afd/sprites/front-shiny/481--0--Mesprit.png diff --git a/src/afd/sprites/front-shiny/Azelf.png b/src/afd/sprites/front-shiny/482--0--Azelf.png similarity index 100% rename from src/afd/sprites/front-shiny/Azelf.png rename to src/afd/sprites/front-shiny/482--0--Azelf.png diff --git a/src/afd/sprites/front-shiny/Dialga.png b/src/afd/sprites/front-shiny/483--0--Dialga.png similarity index 100% rename from src/afd/sprites/front-shiny/Dialga.png rename to src/afd/sprites/front-shiny/483--0--Dialga.png diff --git a/src/afd/sprites/front-shiny/Palkia.png b/src/afd/sprites/front-shiny/484--0--Palkia.png similarity index 100% rename from src/afd/sprites/front-shiny/Palkia.png rename to src/afd/sprites/front-shiny/484--0--Palkia.png diff --git a/src/afd/sprites/front-shiny/Heatran.png b/src/afd/sprites/front-shiny/485--0--Heatran.png similarity index 100% rename from src/afd/sprites/front-shiny/Heatran.png rename to src/afd/sprites/front-shiny/485--0--Heatran.png diff --git a/src/afd/sprites/front-shiny/Regigigas.png b/src/afd/sprites/front-shiny/486--0--Regigigas.png similarity index 100% rename from src/afd/sprites/front-shiny/Regigigas.png rename to src/afd/sprites/front-shiny/486--0--Regigigas.png diff --git a/src/afd/sprites/front-shiny/Giratina.png b/src/afd/sprites/front-shiny/487--0--Giratina.png similarity index 100% rename from src/afd/sprites/front-shiny/Giratina.png rename to src/afd/sprites/front-shiny/487--0--Giratina.png diff --git a/src/afd/sprites/front-shiny/Giratina--Origin.png b/src/afd/sprites/front-shiny/487--420--Giratina--Origin.png similarity index 100% rename from src/afd/sprites/front-shiny/Giratina--Origin.png rename to src/afd/sprites/front-shiny/487--420--Giratina--Origin.png diff --git a/src/afd/sprites/front-shiny/Cresselia.png b/src/afd/sprites/front-shiny/488--0--Cresselia.png similarity index 100% rename from src/afd/sprites/front-shiny/Cresselia.png rename to src/afd/sprites/front-shiny/488--0--Cresselia.png diff --git a/src/afd/sprites/front-shiny/Phione.png b/src/afd/sprites/front-shiny/489--0--Phione.png similarity index 100% rename from src/afd/sprites/front-shiny/Phione.png rename to src/afd/sprites/front-shiny/489--0--Phione.png diff --git a/src/afd/sprites/front-shiny/Venomoth.png b/src/afd/sprites/front-shiny/49--0--Venomoth.png similarity index 100% rename from src/afd/sprites/front-shiny/Venomoth.png rename to src/afd/sprites/front-shiny/49--0--Venomoth.png diff --git a/src/afd/sprites/front-shiny/Manaphy.png b/src/afd/sprites/front-shiny/490--0--Manaphy.png similarity index 100% rename from src/afd/sprites/front-shiny/Manaphy.png rename to src/afd/sprites/front-shiny/490--0--Manaphy.png diff --git a/src/afd/sprites/front-shiny/Darkrai.png b/src/afd/sprites/front-shiny/491--0--Darkrai.png similarity index 100% rename from src/afd/sprites/front-shiny/Darkrai.png rename to src/afd/sprites/front-shiny/491--0--Darkrai.png diff --git a/src/afd/sprites/front-shiny/Shaymin.png b/src/afd/sprites/front-shiny/492--0--Shaymin.png similarity index 100% rename from src/afd/sprites/front-shiny/Shaymin.png rename to src/afd/sprites/front-shiny/492--0--Shaymin.png diff --git a/src/afd/sprites/front-shiny/Shaymin--Sky.png b/src/afd/sprites/front-shiny/492--420--Shaymin--Sky.png similarity index 100% rename from src/afd/sprites/front-shiny/Shaymin--Sky.png rename to src/afd/sprites/front-shiny/492--420--Shaymin--Sky.png diff --git a/src/afd/sprites/front-shiny/Arceus.png b/src/afd/sprites/front-shiny/493--0--Arceus.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus.png rename to src/afd/sprites/front-shiny/493--0--Arceus.png diff --git a/src/afd/sprites/front-shiny/Arceus--Bug.png b/src/afd/sprites/front-shiny/493--420--Arceus--Bug.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Bug.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Bug.png diff --git a/src/afd/sprites/front-shiny/Arceus--Dark.png b/src/afd/sprites/front-shiny/493--420--Arceus--Dark.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Dark.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Dark.png diff --git a/src/afd/sprites/front-shiny/Arceus--Dragon.png b/src/afd/sprites/front-shiny/493--420--Arceus--Dragon.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Dragon.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Dragon.png diff --git a/src/afd/sprites/front-shiny/Arceus--Electric.png b/src/afd/sprites/front-shiny/493--420--Arceus--Electric.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Electric.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Electric.png diff --git a/src/afd/sprites/front-shiny/Arceus--Fairy.png b/src/afd/sprites/front-shiny/493--420--Arceus--Fairy.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Fairy.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Fairy.png diff --git a/src/afd/sprites/front-shiny/Arceus--Fighting.png b/src/afd/sprites/front-shiny/493--420--Arceus--Fighting.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Fighting.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Fighting.png diff --git a/src/afd/sprites/front-shiny/Arceus--Fire.png b/src/afd/sprites/front-shiny/493--420--Arceus--Fire.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Fire.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Fire.png diff --git a/src/afd/sprites/front-shiny/Arceus--Flying.png b/src/afd/sprites/front-shiny/493--420--Arceus--Flying.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Flying.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Flying.png diff --git a/src/afd/sprites/front-shiny/Arceus--Ghost.png b/src/afd/sprites/front-shiny/493--420--Arceus--Ghost.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Ghost.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Ghost.png diff --git a/src/afd/sprites/front-shiny/Arceus--Grass.png b/src/afd/sprites/front-shiny/493--420--Arceus--Grass.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Grass.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Grass.png diff --git a/src/afd/sprites/front-shiny/Arceus--Ground.png b/src/afd/sprites/front-shiny/493--420--Arceus--Ground.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Ground.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Ground.png diff --git a/src/afd/sprites/front-shiny/Arceus--Ice.png b/src/afd/sprites/front-shiny/493--420--Arceus--Ice.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Ice.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Ice.png diff --git a/src/afd/sprites/front-shiny/Arceus--Poison.png b/src/afd/sprites/front-shiny/493--420--Arceus--Poison.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Poison.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Poison.png diff --git a/src/afd/sprites/front-shiny/Arceus--Psychic.png b/src/afd/sprites/front-shiny/493--420--Arceus--Psychic.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Psychic.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Psychic.png diff --git a/src/afd/sprites/front-shiny/Arceus--Rock.png b/src/afd/sprites/front-shiny/493--420--Arceus--Rock.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Rock.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Rock.png diff --git a/src/afd/sprites/front-shiny/Arceus--Steel.png b/src/afd/sprites/front-shiny/493--420--Arceus--Steel.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Steel.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Steel.png diff --git a/src/afd/sprites/front-shiny/Arceus--Water.png b/src/afd/sprites/front-shiny/493--420--Arceus--Water.png similarity index 100% rename from src/afd/sprites/front-shiny/Arceus--Water.png rename to src/afd/sprites/front-shiny/493--420--Arceus--Water.png diff --git a/src/afd/sprites/front-shiny/Victini.png b/src/afd/sprites/front-shiny/494--0--Victini.png similarity index 100% rename from src/afd/sprites/front-shiny/Victini.png rename to src/afd/sprites/front-shiny/494--0--Victini.png diff --git a/src/afd/sprites/front-shiny/Snivy.png b/src/afd/sprites/front-shiny/495--0--Snivy.png similarity index 100% rename from src/afd/sprites/front-shiny/Snivy.png rename to src/afd/sprites/front-shiny/495--0--Snivy.png diff --git a/src/afd/sprites/front-shiny/Servine.png b/src/afd/sprites/front-shiny/496--0--Servine.png similarity index 100% rename from src/afd/sprites/front-shiny/Servine.png rename to src/afd/sprites/front-shiny/496--0--Servine.png diff --git a/src/afd/sprites/front-shiny/Serperior.png b/src/afd/sprites/front-shiny/497--0--Serperior.png similarity index 100% rename from src/afd/sprites/front-shiny/Serperior.png rename to src/afd/sprites/front-shiny/497--0--Serperior.png diff --git a/src/afd/sprites/front-shiny/Tepig.png b/src/afd/sprites/front-shiny/498--0--Tepig.png similarity index 100% rename from src/afd/sprites/front-shiny/Tepig.png rename to src/afd/sprites/front-shiny/498--0--Tepig.png diff --git a/src/afd/sprites/front-shiny/Pignite.png b/src/afd/sprites/front-shiny/499--0--Pignite.png similarity index 100% rename from src/afd/sprites/front-shiny/Pignite.png rename to src/afd/sprites/front-shiny/499--0--Pignite.png diff --git a/src/afd/sprites/front-shiny/Charmeleon.png b/src/afd/sprites/front-shiny/5--0--Charmeleon.png similarity index 100% rename from src/afd/sprites/front-shiny/Charmeleon.png rename to src/afd/sprites/front-shiny/5--0--Charmeleon.png diff --git a/src/afd/sprites/front-shiny/Diglett.png b/src/afd/sprites/front-shiny/50--0--Diglett.png similarity index 100% rename from src/afd/sprites/front-shiny/Diglett.png rename to src/afd/sprites/front-shiny/50--0--Diglett.png diff --git a/src/afd/sprites/front-shiny/Diglett--Alola.png b/src/afd/sprites/front-shiny/50--420--Diglett--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Diglett--Alola.png rename to src/afd/sprites/front-shiny/50--420--Diglett--Alola.png diff --git a/src/afd/sprites/front-shiny/Emboar.png b/src/afd/sprites/front-shiny/500--0--Emboar.png similarity index 100% rename from src/afd/sprites/front-shiny/Emboar.png rename to src/afd/sprites/front-shiny/500--0--Emboar.png diff --git a/src/afd/sprites/front-shiny/Oshawott.png b/src/afd/sprites/front-shiny/501--0--Oshawott.png similarity index 100% rename from src/afd/sprites/front-shiny/Oshawott.png rename to src/afd/sprites/front-shiny/501--0--Oshawott.png diff --git a/src/afd/sprites/front-shiny/Dewott.png b/src/afd/sprites/front-shiny/502--0--Dewott.png similarity index 100% rename from src/afd/sprites/front-shiny/Dewott.png rename to src/afd/sprites/front-shiny/502--0--Dewott.png diff --git a/src/afd/sprites/front-shiny/Samurott.png b/src/afd/sprites/front-shiny/503--0--Samurott.png similarity index 100% rename from src/afd/sprites/front-shiny/Samurott.png rename to src/afd/sprites/front-shiny/503--0--Samurott.png diff --git a/src/afd/sprites/front-shiny/Patrat.png b/src/afd/sprites/front-shiny/504--0--Patrat.png similarity index 100% rename from src/afd/sprites/front-shiny/Patrat.png rename to src/afd/sprites/front-shiny/504--0--Patrat.png diff --git a/src/afd/sprites/front-shiny/Watchog.png b/src/afd/sprites/front-shiny/505--0--Watchog.png similarity index 100% rename from src/afd/sprites/front-shiny/Watchog.png rename to src/afd/sprites/front-shiny/505--0--Watchog.png diff --git a/src/afd/sprites/front-shiny/Lillipup.png b/src/afd/sprites/front-shiny/506--0--Lillipup.png similarity index 100% rename from src/afd/sprites/front-shiny/Lillipup.png rename to src/afd/sprites/front-shiny/506--0--Lillipup.png diff --git a/src/afd/sprites/front-shiny/Herdier.png b/src/afd/sprites/front-shiny/507--0--Herdier.png similarity index 100% rename from src/afd/sprites/front-shiny/Herdier.png rename to src/afd/sprites/front-shiny/507--0--Herdier.png diff --git a/src/afd/sprites/front-shiny/Stoutland.png b/src/afd/sprites/front-shiny/508--0--Stoutland.png similarity index 100% rename from src/afd/sprites/front-shiny/Stoutland.png rename to src/afd/sprites/front-shiny/508--0--Stoutland.png diff --git a/src/afd/sprites/front-shiny/Purrloin.png b/src/afd/sprites/front-shiny/509--0--Purrloin.png similarity index 100% rename from src/afd/sprites/front-shiny/Purrloin.png rename to src/afd/sprites/front-shiny/509--0--Purrloin.png diff --git a/src/afd/sprites/front-shiny/Dugtrio.png b/src/afd/sprites/front-shiny/51--0--Dugtrio.png similarity index 100% rename from src/afd/sprites/front-shiny/Dugtrio.png rename to src/afd/sprites/front-shiny/51--0--Dugtrio.png diff --git a/src/afd/sprites/front-shiny/Dugtrio--Alola.png b/src/afd/sprites/front-shiny/51--420--Dugtrio--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Dugtrio--Alola.png rename to src/afd/sprites/front-shiny/51--420--Dugtrio--Alola.png diff --git a/src/afd/sprites/front-shiny/Liepard.png b/src/afd/sprites/front-shiny/510--0--Liepard.png similarity index 100% rename from src/afd/sprites/front-shiny/Liepard.png rename to src/afd/sprites/front-shiny/510--0--Liepard.png diff --git a/src/afd/sprites/front-shiny/Pansage.png b/src/afd/sprites/front-shiny/511--0--Pansage.png similarity index 100% rename from src/afd/sprites/front-shiny/Pansage.png rename to src/afd/sprites/front-shiny/511--0--Pansage.png diff --git a/src/afd/sprites/front-shiny/Simisage.png b/src/afd/sprites/front-shiny/512--0--Simisage.png similarity index 100% rename from src/afd/sprites/front-shiny/Simisage.png rename to src/afd/sprites/front-shiny/512--0--Simisage.png diff --git a/src/afd/sprites/front-shiny/Pansear.png b/src/afd/sprites/front-shiny/513--0--Pansear.png similarity index 100% rename from src/afd/sprites/front-shiny/Pansear.png rename to src/afd/sprites/front-shiny/513--0--Pansear.png diff --git a/src/afd/sprites/front-shiny/Simisear.png b/src/afd/sprites/front-shiny/514--0--Simisear.png similarity index 100% rename from src/afd/sprites/front-shiny/Simisear.png rename to src/afd/sprites/front-shiny/514--0--Simisear.png diff --git a/src/afd/sprites/front-shiny/Panpour.png b/src/afd/sprites/front-shiny/515--0--Panpour.png similarity index 100% rename from src/afd/sprites/front-shiny/Panpour.png rename to src/afd/sprites/front-shiny/515--0--Panpour.png diff --git a/src/afd/sprites/front-shiny/Simipour.png b/src/afd/sprites/front-shiny/516--0--Simipour.png similarity index 100% rename from src/afd/sprites/front-shiny/Simipour.png rename to src/afd/sprites/front-shiny/516--0--Simipour.png diff --git a/src/afd/sprites/front-shiny/Munna.png b/src/afd/sprites/front-shiny/517--0--Munna.png similarity index 100% rename from src/afd/sprites/front-shiny/Munna.png rename to src/afd/sprites/front-shiny/517--0--Munna.png diff --git a/src/afd/sprites/front-shiny/Musharna.png b/src/afd/sprites/front-shiny/518--0--Musharna.png similarity index 100% rename from src/afd/sprites/front-shiny/Musharna.png rename to src/afd/sprites/front-shiny/518--0--Musharna.png diff --git a/src/afd/sprites/front-shiny/Pidove.png b/src/afd/sprites/front-shiny/519--0--Pidove.png similarity index 100% rename from src/afd/sprites/front-shiny/Pidove.png rename to src/afd/sprites/front-shiny/519--0--Pidove.png diff --git a/src/afd/sprites/front-shiny/Meowth.png b/src/afd/sprites/front-shiny/52--0--Meowth.png similarity index 100% rename from src/afd/sprites/front-shiny/Meowth.png rename to src/afd/sprites/front-shiny/52--0--Meowth.png diff --git a/src/afd/sprites/front-shiny/Meowth--Alola.png b/src/afd/sprites/front-shiny/52--420--Meowth--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Meowth--Alola.png rename to src/afd/sprites/front-shiny/52--420--Meowth--Alola.png diff --git a/src/afd/sprites/front-shiny/Meowth--Galar.png b/src/afd/sprites/front-shiny/52--420--Meowth--Galar.png similarity index 100% rename from src/afd/sprites/front-shiny/Meowth--Galar.png rename to src/afd/sprites/front-shiny/52--420--Meowth--Galar.png diff --git a/src/afd/sprites/front-shiny/Meowth--Gmax.png b/src/afd/sprites/front-shiny/52--420--Meowth--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Meowth--Gmax.png rename to src/afd/sprites/front-shiny/52--420--Meowth--Gmax.png diff --git a/src/afd/sprites/front-shiny/Tranquill.png b/src/afd/sprites/front-shiny/520--0--Tranquill.png similarity index 100% rename from src/afd/sprites/front-shiny/Tranquill.png rename to src/afd/sprites/front-shiny/520--0--Tranquill.png diff --git a/src/afd/sprites/front-shiny/Unfezant.png b/src/afd/sprites/front-shiny/521--0--Unfezant.png similarity index 100% rename from src/afd/sprites/front-shiny/Unfezant.png rename to src/afd/sprites/front-shiny/521--0--Unfezant.png diff --git a/src/afd/sprites/front-shiny/Blitzle.png b/src/afd/sprites/front-shiny/522--0--Blitzle.png similarity index 100% rename from src/afd/sprites/front-shiny/Blitzle.png rename to src/afd/sprites/front-shiny/522--0--Blitzle.png diff --git a/src/afd/sprites/front-shiny/Zebstrika.png b/src/afd/sprites/front-shiny/523--0--Zebstrika.png similarity index 100% rename from src/afd/sprites/front-shiny/Zebstrika.png rename to src/afd/sprites/front-shiny/523--0--Zebstrika.png diff --git a/src/afd/sprites/front-shiny/Roggenrola.png b/src/afd/sprites/front-shiny/524--0--Roggenrola.png similarity index 100% rename from src/afd/sprites/front-shiny/Roggenrola.png rename to src/afd/sprites/front-shiny/524--0--Roggenrola.png diff --git a/src/afd/sprites/front-shiny/Boldore.png b/src/afd/sprites/front-shiny/525--0--Boldore.png similarity index 100% rename from src/afd/sprites/front-shiny/Boldore.png rename to src/afd/sprites/front-shiny/525--0--Boldore.png diff --git a/src/afd/sprites/front-shiny/Gigalith.png b/src/afd/sprites/front-shiny/526--0--Gigalith.png similarity index 100% rename from src/afd/sprites/front-shiny/Gigalith.png rename to src/afd/sprites/front-shiny/526--0--Gigalith.png diff --git a/src/afd/sprites/front-shiny/Woobat.png b/src/afd/sprites/front-shiny/527--0--Woobat.png similarity index 100% rename from src/afd/sprites/front-shiny/Woobat.png rename to src/afd/sprites/front-shiny/527--0--Woobat.png diff --git a/src/afd/sprites/front-shiny/Swoobat.png b/src/afd/sprites/front-shiny/528--0--Swoobat.png similarity index 100% rename from src/afd/sprites/front-shiny/Swoobat.png rename to src/afd/sprites/front-shiny/528--0--Swoobat.png diff --git a/src/afd/sprites/front-shiny/Drilbur.png b/src/afd/sprites/front-shiny/529--0--Drilbur.png similarity index 100% rename from src/afd/sprites/front-shiny/Drilbur.png rename to src/afd/sprites/front-shiny/529--0--Drilbur.png diff --git a/src/afd/sprites/front-shiny/Persian.png b/src/afd/sprites/front-shiny/53--0--Persian.png similarity index 100% rename from src/afd/sprites/front-shiny/Persian.png rename to src/afd/sprites/front-shiny/53--0--Persian.png diff --git a/src/afd/sprites/front-shiny/Persian--Alola.png b/src/afd/sprites/front-shiny/53--420--Persian--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Persian--Alola.png rename to src/afd/sprites/front-shiny/53--420--Persian--Alola.png diff --git a/src/afd/sprites/front-shiny/Excadrill.png b/src/afd/sprites/front-shiny/530--0--Excadrill.png similarity index 100% rename from src/afd/sprites/front-shiny/Excadrill.png rename to src/afd/sprites/front-shiny/530--0--Excadrill.png diff --git a/src/afd/sprites/front-shiny/Audino.png b/src/afd/sprites/front-shiny/531--0--Audino.png similarity index 100% rename from src/afd/sprites/front-shiny/Audino.png rename to src/afd/sprites/front-shiny/531--0--Audino.png diff --git a/src/afd/sprites/front-shiny/Audino--Mega.png b/src/afd/sprites/front-shiny/531--420--Audino--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Audino--Mega.png rename to src/afd/sprites/front-shiny/531--420--Audino--Mega.png diff --git a/src/afd/sprites/front-shiny/Timburr.png b/src/afd/sprites/front-shiny/532--0--Timburr.png similarity index 100% rename from src/afd/sprites/front-shiny/Timburr.png rename to src/afd/sprites/front-shiny/532--0--Timburr.png diff --git a/src/afd/sprites/front-shiny/Gurdurr.png b/src/afd/sprites/front-shiny/533--0--Gurdurr.png similarity index 100% rename from src/afd/sprites/front-shiny/Gurdurr.png rename to src/afd/sprites/front-shiny/533--0--Gurdurr.png diff --git a/src/afd/sprites/front-shiny/Conkeldurr.png b/src/afd/sprites/front-shiny/534--0--Conkeldurr.png similarity index 100% rename from src/afd/sprites/front-shiny/Conkeldurr.png rename to src/afd/sprites/front-shiny/534--0--Conkeldurr.png diff --git a/src/afd/sprites/front-shiny/Tympole.png b/src/afd/sprites/front-shiny/535--0--Tympole.png similarity index 100% rename from src/afd/sprites/front-shiny/Tympole.png rename to src/afd/sprites/front-shiny/535--0--Tympole.png diff --git a/src/afd/sprites/front-shiny/Palpitoad.png b/src/afd/sprites/front-shiny/536--0--Palpitoad.png similarity index 100% rename from src/afd/sprites/front-shiny/Palpitoad.png rename to src/afd/sprites/front-shiny/536--0--Palpitoad.png diff --git a/src/afd/sprites/front-shiny/Seismitoad.png b/src/afd/sprites/front-shiny/537--0--Seismitoad.png similarity index 100% rename from src/afd/sprites/front-shiny/Seismitoad.png rename to src/afd/sprites/front-shiny/537--0--Seismitoad.png diff --git a/src/afd/sprites/front-shiny/Throh.png b/src/afd/sprites/front-shiny/538--0--Throh.png similarity index 100% rename from src/afd/sprites/front-shiny/Throh.png rename to src/afd/sprites/front-shiny/538--0--Throh.png diff --git a/src/afd/sprites/front-shiny/Sawk.png b/src/afd/sprites/front-shiny/539--0--Sawk.png similarity index 100% rename from src/afd/sprites/front-shiny/Sawk.png rename to src/afd/sprites/front-shiny/539--0--Sawk.png diff --git a/src/afd/sprites/front-shiny/Psyduck.png b/src/afd/sprites/front-shiny/54--0--Psyduck.png similarity index 100% rename from src/afd/sprites/front-shiny/Psyduck.png rename to src/afd/sprites/front-shiny/54--0--Psyduck.png diff --git a/src/afd/sprites/front-shiny/Sewaddle.png b/src/afd/sprites/front-shiny/540--0--Sewaddle.png similarity index 100% rename from src/afd/sprites/front-shiny/Sewaddle.png rename to src/afd/sprites/front-shiny/540--0--Sewaddle.png diff --git a/src/afd/sprites/front-shiny/Swadloon.png b/src/afd/sprites/front-shiny/541--0--Swadloon.png similarity index 100% rename from src/afd/sprites/front-shiny/Swadloon.png rename to src/afd/sprites/front-shiny/541--0--Swadloon.png diff --git a/src/afd/sprites/front-shiny/Leavanny.png b/src/afd/sprites/front-shiny/542--0--Leavanny.png similarity index 100% rename from src/afd/sprites/front-shiny/Leavanny.png rename to src/afd/sprites/front-shiny/542--0--Leavanny.png diff --git a/src/afd/sprites/front-shiny/Venipede.png b/src/afd/sprites/front-shiny/543--0--Venipede.png similarity index 100% rename from src/afd/sprites/front-shiny/Venipede.png rename to src/afd/sprites/front-shiny/543--0--Venipede.png diff --git a/src/afd/sprites/front-shiny/Whirlipede.png b/src/afd/sprites/front-shiny/544--0--Whirlipede.png similarity index 100% rename from src/afd/sprites/front-shiny/Whirlipede.png rename to src/afd/sprites/front-shiny/544--0--Whirlipede.png diff --git a/src/afd/sprites/front-shiny/Scolipede.png b/src/afd/sprites/front-shiny/545--0--Scolipede.png similarity index 100% rename from src/afd/sprites/front-shiny/Scolipede.png rename to src/afd/sprites/front-shiny/545--0--Scolipede.png diff --git a/src/afd/sprites/front-shiny/Cottonee.png b/src/afd/sprites/front-shiny/546--0--Cottonee.png similarity index 100% rename from src/afd/sprites/front-shiny/Cottonee.png rename to src/afd/sprites/front-shiny/546--0--Cottonee.png diff --git a/src/afd/sprites/front-shiny/Whimsicott.png b/src/afd/sprites/front-shiny/547--0--Whimsicott.png similarity index 100% rename from src/afd/sprites/front-shiny/Whimsicott.png rename to src/afd/sprites/front-shiny/547--0--Whimsicott.png diff --git a/src/afd/sprites/front-shiny/Petilil.png b/src/afd/sprites/front-shiny/548--0--Petilil.png similarity index 100% rename from src/afd/sprites/front-shiny/Petilil.png rename to src/afd/sprites/front-shiny/548--0--Petilil.png diff --git a/src/afd/sprites/front-shiny/Lilligant.png b/src/afd/sprites/front-shiny/549--0--Lilligant.png similarity index 100% rename from src/afd/sprites/front-shiny/Lilligant.png rename to src/afd/sprites/front-shiny/549--0--Lilligant.png diff --git a/src/afd/sprites/front-shiny/Golduck.png b/src/afd/sprites/front-shiny/55--0--Golduck.png similarity index 100% rename from src/afd/sprites/front-shiny/Golduck.png rename to src/afd/sprites/front-shiny/55--0--Golduck.png diff --git a/src/afd/sprites/front-shiny/Basculin.png b/src/afd/sprites/front-shiny/550--0--Basculin.png similarity index 100% rename from src/afd/sprites/front-shiny/Basculin.png rename to src/afd/sprites/front-shiny/550--0--Basculin.png diff --git a/src/afd/sprites/front-shiny/Sandile.png b/src/afd/sprites/front-shiny/551--0--Sandile.png similarity index 100% rename from src/afd/sprites/front-shiny/Sandile.png rename to src/afd/sprites/front-shiny/551--0--Sandile.png diff --git a/src/afd/sprites/front-shiny/Krokorok.png b/src/afd/sprites/front-shiny/552--0--Krokorok.png similarity index 100% rename from src/afd/sprites/front-shiny/Krokorok.png rename to src/afd/sprites/front-shiny/552--0--Krokorok.png diff --git a/src/afd/sprites/front-shiny/Krookodile.png b/src/afd/sprites/front-shiny/553--0--Krookodile.png similarity index 100% rename from src/afd/sprites/front-shiny/Krookodile.png rename to src/afd/sprites/front-shiny/553--0--Krookodile.png diff --git a/src/afd/sprites/front-shiny/Darumaka.png b/src/afd/sprites/front-shiny/554--0--Darumaka.png similarity index 100% rename from src/afd/sprites/front-shiny/Darumaka.png rename to src/afd/sprites/front-shiny/554--0--Darumaka.png diff --git a/src/afd/sprites/front-shiny/Darumaka--Galar.png b/src/afd/sprites/front-shiny/554--420--Darumaka--Galar.png similarity index 100% rename from src/afd/sprites/front-shiny/Darumaka--Galar.png rename to src/afd/sprites/front-shiny/554--420--Darumaka--Galar.png diff --git a/src/afd/sprites/front-shiny/Darmanitan.png b/src/afd/sprites/front-shiny/555--0--Darmanitan.png similarity index 100% rename from src/afd/sprites/front-shiny/Darmanitan.png rename to src/afd/sprites/front-shiny/555--0--Darmanitan.png diff --git a/src/afd/sprites/front-shiny/Darmanitan--Galar-Zen.png b/src/afd/sprites/front-shiny/555--420--Darmanitan--Galar-Zen.png similarity index 100% rename from src/afd/sprites/front-shiny/Darmanitan--Galar-Zen.png rename to src/afd/sprites/front-shiny/555--420--Darmanitan--Galar-Zen.png diff --git a/src/afd/sprites/front-shiny/Darmanitan--Galar.png b/src/afd/sprites/front-shiny/555--420--Darmanitan--Galar.png similarity index 100% rename from src/afd/sprites/front-shiny/Darmanitan--Galar.png rename to src/afd/sprites/front-shiny/555--420--Darmanitan--Galar.png diff --git a/src/afd/sprites/front-shiny/Darmanitan--Zen.png b/src/afd/sprites/front-shiny/555--420--Darmanitan--Zen.png similarity index 100% rename from src/afd/sprites/front-shiny/Darmanitan--Zen.png rename to src/afd/sprites/front-shiny/555--420--Darmanitan--Zen.png diff --git a/src/afd/sprites/front-shiny/Maractus.png b/src/afd/sprites/front-shiny/556--0--Maractus.png similarity index 100% rename from src/afd/sprites/front-shiny/Maractus.png rename to src/afd/sprites/front-shiny/556--0--Maractus.png diff --git a/src/afd/sprites/front-shiny/Dwebble.png b/src/afd/sprites/front-shiny/557--0--Dwebble.png similarity index 100% rename from src/afd/sprites/front-shiny/Dwebble.png rename to src/afd/sprites/front-shiny/557--0--Dwebble.png diff --git a/src/afd/sprites/front-shiny/Crustle.png b/src/afd/sprites/front-shiny/558--0--Crustle.png similarity index 100% rename from src/afd/sprites/front-shiny/Crustle.png rename to src/afd/sprites/front-shiny/558--0--Crustle.png diff --git a/src/afd/sprites/front-shiny/Scraggy.png b/src/afd/sprites/front-shiny/559--0--Scraggy.png similarity index 100% rename from src/afd/sprites/front-shiny/Scraggy.png rename to src/afd/sprites/front-shiny/559--0--Scraggy.png diff --git a/src/afd/sprites/front-shiny/Mankey.png b/src/afd/sprites/front-shiny/56--0--Mankey.png similarity index 100% rename from src/afd/sprites/front-shiny/Mankey.png rename to src/afd/sprites/front-shiny/56--0--Mankey.png diff --git a/src/afd/sprites/front-shiny/Scrafty.png b/src/afd/sprites/front-shiny/560--0--Scrafty.png similarity index 100% rename from src/afd/sprites/front-shiny/Scrafty.png rename to src/afd/sprites/front-shiny/560--0--Scrafty.png diff --git a/src/afd/sprites/front-shiny/Sigilyph.png b/src/afd/sprites/front-shiny/561--0--Sigilyph.png similarity index 100% rename from src/afd/sprites/front-shiny/Sigilyph.png rename to src/afd/sprites/front-shiny/561--0--Sigilyph.png diff --git a/src/afd/sprites/front-shiny/Yamask.png b/src/afd/sprites/front-shiny/562--0--Yamask.png similarity index 100% rename from src/afd/sprites/front-shiny/Yamask.png rename to src/afd/sprites/front-shiny/562--0--Yamask.png diff --git a/src/afd/sprites/front-shiny/Yamask--Galar.png b/src/afd/sprites/front-shiny/562--420--Yamask--Galar.png similarity index 100% rename from src/afd/sprites/front-shiny/Yamask--Galar.png rename to src/afd/sprites/front-shiny/562--420--Yamask--Galar.png diff --git a/src/afd/sprites/front-shiny/Cofagrigus.png b/src/afd/sprites/front-shiny/563--0--Cofagrigus.png similarity index 100% rename from src/afd/sprites/front-shiny/Cofagrigus.png rename to src/afd/sprites/front-shiny/563--0--Cofagrigus.png diff --git a/src/afd/sprites/front-shiny/Tirtouga.png b/src/afd/sprites/front-shiny/564--0--Tirtouga.png similarity index 100% rename from src/afd/sprites/front-shiny/Tirtouga.png rename to src/afd/sprites/front-shiny/564--0--Tirtouga.png diff --git a/src/afd/sprites/front-shiny/Carracosta.png b/src/afd/sprites/front-shiny/565--0--Carracosta.png similarity index 100% rename from src/afd/sprites/front-shiny/Carracosta.png rename to src/afd/sprites/front-shiny/565--0--Carracosta.png diff --git a/src/afd/sprites/front-shiny/Archen.png b/src/afd/sprites/front-shiny/566--0--Archen.png similarity index 100% rename from src/afd/sprites/front-shiny/Archen.png rename to src/afd/sprites/front-shiny/566--0--Archen.png diff --git a/src/afd/sprites/front-shiny/Archeops.png b/src/afd/sprites/front-shiny/567--0--Archeops.png similarity index 100% rename from src/afd/sprites/front-shiny/Archeops.png rename to src/afd/sprites/front-shiny/567--0--Archeops.png diff --git a/src/afd/sprites/front-shiny/Trubbish.png b/src/afd/sprites/front-shiny/568--0--Trubbish.png similarity index 100% rename from src/afd/sprites/front-shiny/Trubbish.png rename to src/afd/sprites/front-shiny/568--0--Trubbish.png diff --git a/src/afd/sprites/front-shiny/Garbodor.png b/src/afd/sprites/front-shiny/569--0--Garbodor.png similarity index 100% rename from src/afd/sprites/front-shiny/Garbodor.png rename to src/afd/sprites/front-shiny/569--0--Garbodor.png diff --git a/src/afd/sprites/front-shiny/Garbodor--Gmax.png b/src/afd/sprites/front-shiny/569--420--Garbodor--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Garbodor--Gmax.png rename to src/afd/sprites/front-shiny/569--420--Garbodor--Gmax.png diff --git a/src/afd/sprites/front-shiny/Primeape.png b/src/afd/sprites/front-shiny/57--0--Primeape.png similarity index 100% rename from src/afd/sprites/front-shiny/Primeape.png rename to src/afd/sprites/front-shiny/57--0--Primeape.png diff --git a/src/afd/sprites/front-shiny/Zorua.png b/src/afd/sprites/front-shiny/570--0--Zorua.png similarity index 100% rename from src/afd/sprites/front-shiny/Zorua.png rename to src/afd/sprites/front-shiny/570--0--Zorua.png diff --git a/src/afd/sprites/front-shiny/Zoroark.png b/src/afd/sprites/front-shiny/571--0--Zoroark.png similarity index 100% rename from src/afd/sprites/front-shiny/Zoroark.png rename to src/afd/sprites/front-shiny/571--0--Zoroark.png diff --git a/src/afd/sprites/front-shiny/Minccino.png b/src/afd/sprites/front-shiny/572--0--Minccino.png similarity index 100% rename from src/afd/sprites/front-shiny/Minccino.png rename to src/afd/sprites/front-shiny/572--0--Minccino.png diff --git a/src/afd/sprites/front-shiny/Cinccino.png b/src/afd/sprites/front-shiny/573--0--Cinccino.png similarity index 100% rename from src/afd/sprites/front-shiny/Cinccino.png rename to src/afd/sprites/front-shiny/573--0--Cinccino.png diff --git a/src/afd/sprites/front-shiny/Gothita.png b/src/afd/sprites/front-shiny/574--0--Gothita.png similarity index 100% rename from src/afd/sprites/front-shiny/Gothita.png rename to src/afd/sprites/front-shiny/574--0--Gothita.png diff --git a/src/afd/sprites/front-shiny/Gothorita.png b/src/afd/sprites/front-shiny/575--0--Gothorita.png similarity index 100% rename from src/afd/sprites/front-shiny/Gothorita.png rename to src/afd/sprites/front-shiny/575--0--Gothorita.png diff --git a/src/afd/sprites/front-shiny/Gothitelle.png b/src/afd/sprites/front-shiny/576--0--Gothitelle.png similarity index 100% rename from src/afd/sprites/front-shiny/Gothitelle.png rename to src/afd/sprites/front-shiny/576--0--Gothitelle.png diff --git a/src/afd/sprites/front-shiny/Solosis.png b/src/afd/sprites/front-shiny/577--0--Solosis.png similarity index 100% rename from src/afd/sprites/front-shiny/Solosis.png rename to src/afd/sprites/front-shiny/577--0--Solosis.png diff --git a/src/afd/sprites/front-shiny/Duosion.png b/src/afd/sprites/front-shiny/578--0--Duosion.png similarity index 100% rename from src/afd/sprites/front-shiny/Duosion.png rename to src/afd/sprites/front-shiny/578--0--Duosion.png diff --git a/src/afd/sprites/front-shiny/Reuniclus.png b/src/afd/sprites/front-shiny/579--0--Reuniclus.png similarity index 100% rename from src/afd/sprites/front-shiny/Reuniclus.png rename to src/afd/sprites/front-shiny/579--0--Reuniclus.png diff --git a/src/afd/sprites/front-shiny/Growlithe.png b/src/afd/sprites/front-shiny/58--0--Growlithe.png similarity index 100% rename from src/afd/sprites/front-shiny/Growlithe.png rename to src/afd/sprites/front-shiny/58--0--Growlithe.png diff --git a/src/afd/sprites/front-shiny/Ducklett.png b/src/afd/sprites/front-shiny/580--0--Ducklett.png similarity index 100% rename from src/afd/sprites/front-shiny/Ducklett.png rename to src/afd/sprites/front-shiny/580--0--Ducklett.png diff --git a/src/afd/sprites/front-shiny/Swanna.png b/src/afd/sprites/front-shiny/581--0--Swanna.png similarity index 100% rename from src/afd/sprites/front-shiny/Swanna.png rename to src/afd/sprites/front-shiny/581--0--Swanna.png diff --git a/src/afd/sprites/front-shiny/Vanillite.png b/src/afd/sprites/front-shiny/582--0--Vanillite.png similarity index 100% rename from src/afd/sprites/front-shiny/Vanillite.png rename to src/afd/sprites/front-shiny/582--0--Vanillite.png diff --git a/src/afd/sprites/front-shiny/Vanillish.png b/src/afd/sprites/front-shiny/583--0--Vanillish.png similarity index 100% rename from src/afd/sprites/front-shiny/Vanillish.png rename to src/afd/sprites/front-shiny/583--0--Vanillish.png diff --git a/src/afd/sprites/front-shiny/Vanilluxe.png b/src/afd/sprites/front-shiny/584--0--Vanilluxe.png similarity index 100% rename from src/afd/sprites/front-shiny/Vanilluxe.png rename to src/afd/sprites/front-shiny/584--0--Vanilluxe.png diff --git a/src/afd/sprites/front-shiny/Deerling.png b/src/afd/sprites/front-shiny/585--0--Deerling.png similarity index 100% rename from src/afd/sprites/front-shiny/Deerling.png rename to src/afd/sprites/front-shiny/585--0--Deerling.png diff --git a/src/afd/sprites/front-shiny/Sawsbuck.png b/src/afd/sprites/front-shiny/586--0--Sawsbuck.png similarity index 100% rename from src/afd/sprites/front-shiny/Sawsbuck.png rename to src/afd/sprites/front-shiny/586--0--Sawsbuck.png diff --git a/src/afd/sprites/front-shiny/Emolga.png b/src/afd/sprites/front-shiny/587--0--Emolga.png similarity index 100% rename from src/afd/sprites/front-shiny/Emolga.png rename to src/afd/sprites/front-shiny/587--0--Emolga.png diff --git a/src/afd/sprites/front-shiny/Karrablast.png b/src/afd/sprites/front-shiny/588--0--Karrablast.png similarity index 100% rename from src/afd/sprites/front-shiny/Karrablast.png rename to src/afd/sprites/front-shiny/588--0--Karrablast.png diff --git a/src/afd/sprites/front-shiny/Escavalier.png b/src/afd/sprites/front-shiny/589--0--Escavalier.png similarity index 100% rename from src/afd/sprites/front-shiny/Escavalier.png rename to src/afd/sprites/front-shiny/589--0--Escavalier.png diff --git a/src/afd/sprites/front-shiny/Arcanine.png b/src/afd/sprites/front-shiny/59--0--Arcanine.png similarity index 100% rename from src/afd/sprites/front-shiny/Arcanine.png rename to src/afd/sprites/front-shiny/59--0--Arcanine.png diff --git a/src/afd/sprites/front-shiny/Foongus.png b/src/afd/sprites/front-shiny/590--0--Foongus.png similarity index 100% rename from src/afd/sprites/front-shiny/Foongus.png rename to src/afd/sprites/front-shiny/590--0--Foongus.png diff --git a/src/afd/sprites/front-shiny/Amoonguss.png b/src/afd/sprites/front-shiny/591--0--Amoonguss.png similarity index 100% rename from src/afd/sprites/front-shiny/Amoonguss.png rename to src/afd/sprites/front-shiny/591--0--Amoonguss.png diff --git a/src/afd/sprites/front-shiny/Frillish.png b/src/afd/sprites/front-shiny/592--0--Frillish.png similarity index 100% rename from src/afd/sprites/front-shiny/Frillish.png rename to src/afd/sprites/front-shiny/592--0--Frillish.png diff --git a/src/afd/sprites/front-shiny/Jellicent.png b/src/afd/sprites/front-shiny/593--0--Jellicent.png similarity index 100% rename from src/afd/sprites/front-shiny/Jellicent.png rename to src/afd/sprites/front-shiny/593--0--Jellicent.png diff --git a/src/afd/sprites/front-shiny/Alomomola.png b/src/afd/sprites/front-shiny/594--0--Alomomola.png similarity index 100% rename from src/afd/sprites/front-shiny/Alomomola.png rename to src/afd/sprites/front-shiny/594--0--Alomomola.png diff --git a/src/afd/sprites/front-shiny/Joltik.png b/src/afd/sprites/front-shiny/595--0--Joltik.png similarity index 100% rename from src/afd/sprites/front-shiny/Joltik.png rename to src/afd/sprites/front-shiny/595--0--Joltik.png diff --git a/src/afd/sprites/front-shiny/Galvantula.png b/src/afd/sprites/front-shiny/596--0--Galvantula.png similarity index 100% rename from src/afd/sprites/front-shiny/Galvantula.png rename to src/afd/sprites/front-shiny/596--0--Galvantula.png diff --git a/src/afd/sprites/front-shiny/Ferroseed.png b/src/afd/sprites/front-shiny/597--0--Ferroseed.png similarity index 100% rename from src/afd/sprites/front-shiny/Ferroseed.png rename to src/afd/sprites/front-shiny/597--0--Ferroseed.png diff --git a/src/afd/sprites/front-shiny/Ferrothorn.png b/src/afd/sprites/front-shiny/598--0--Ferrothorn.png similarity index 100% rename from src/afd/sprites/front-shiny/Ferrothorn.png rename to src/afd/sprites/front-shiny/598--0--Ferrothorn.png diff --git a/src/afd/sprites/front-shiny/Klink.png b/src/afd/sprites/front-shiny/599--0--Klink.png similarity index 100% rename from src/afd/sprites/front-shiny/Klink.png rename to src/afd/sprites/front-shiny/599--0--Klink.png diff --git a/src/afd/sprites/front-shiny/Charizard.png b/src/afd/sprites/front-shiny/6--0--Charizard.png similarity index 100% rename from src/afd/sprites/front-shiny/Charizard.png rename to src/afd/sprites/front-shiny/6--0--Charizard.png diff --git a/src/afd/sprites/front-shiny/Pyroak.png b/src/afd/sprites/front-shiny/6--0--Pyroak.png similarity index 100% rename from src/afd/sprites/front-shiny/Pyroak.png rename to src/afd/sprites/front-shiny/6--0--Pyroak.png diff --git a/src/afd/sprites/front-shiny/Charizard--Gmax.png b/src/afd/sprites/front-shiny/6--420--Charizard--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Charizard--Gmax.png rename to src/afd/sprites/front-shiny/6--420--Charizard--Gmax.png diff --git a/src/afd/sprites/front-shiny/Charizard--Mega-X.png b/src/afd/sprites/front-shiny/6--420--Charizard--Mega-X.png similarity index 100% rename from src/afd/sprites/front-shiny/Charizard--Mega-X.png rename to src/afd/sprites/front-shiny/6--420--Charizard--Mega-X.png diff --git a/src/afd/sprites/front-shiny/Charizard--Mega-Y.png b/src/afd/sprites/front-shiny/6--420--Charizard--Mega-Y.png similarity index 100% rename from src/afd/sprites/front-shiny/Charizard--Mega-Y.png rename to src/afd/sprites/front-shiny/6--420--Charizard--Mega-Y.png diff --git a/src/afd/sprites/front-shiny/Poliwag.png b/src/afd/sprites/front-shiny/60--0--Poliwag.png similarity index 100% rename from src/afd/sprites/front-shiny/Poliwag.png rename to src/afd/sprites/front-shiny/60--0--Poliwag.png diff --git a/src/afd/sprites/front-shiny/Klang.png b/src/afd/sprites/front-shiny/600--0--Klang.png similarity index 100% rename from src/afd/sprites/front-shiny/Klang.png rename to src/afd/sprites/front-shiny/600--0--Klang.png diff --git a/src/afd/sprites/front-shiny/Klinklang.png b/src/afd/sprites/front-shiny/601--0--Klinklang.png similarity index 100% rename from src/afd/sprites/front-shiny/Klinklang.png rename to src/afd/sprites/front-shiny/601--0--Klinklang.png diff --git a/src/afd/sprites/front-shiny/Tynamo.png b/src/afd/sprites/front-shiny/602--0--Tynamo.png similarity index 100% rename from src/afd/sprites/front-shiny/Tynamo.png rename to src/afd/sprites/front-shiny/602--0--Tynamo.png diff --git a/src/afd/sprites/front-shiny/Eelektrik.png b/src/afd/sprites/front-shiny/603--0--Eelektrik.png similarity index 100% rename from src/afd/sprites/front-shiny/Eelektrik.png rename to src/afd/sprites/front-shiny/603--0--Eelektrik.png diff --git a/src/afd/sprites/front-shiny/Eelektross.png b/src/afd/sprites/front-shiny/604--0--Eelektross.png similarity index 100% rename from src/afd/sprites/front-shiny/Eelektross.png rename to src/afd/sprites/front-shiny/604--0--Eelektross.png diff --git a/src/afd/sprites/front-shiny/Elgyem.png b/src/afd/sprites/front-shiny/605--0--Elgyem.png similarity index 100% rename from src/afd/sprites/front-shiny/Elgyem.png rename to src/afd/sprites/front-shiny/605--0--Elgyem.png diff --git a/src/afd/sprites/front-shiny/Beheeyem.png b/src/afd/sprites/front-shiny/606--0--Beheeyem.png similarity index 100% rename from src/afd/sprites/front-shiny/Beheeyem.png rename to src/afd/sprites/front-shiny/606--0--Beheeyem.png diff --git a/src/afd/sprites/front-shiny/Litwick.png b/src/afd/sprites/front-shiny/607--0--Litwick.png similarity index 100% rename from src/afd/sprites/front-shiny/Litwick.png rename to src/afd/sprites/front-shiny/607--0--Litwick.png diff --git a/src/afd/sprites/front-shiny/Lampent.png b/src/afd/sprites/front-shiny/608--0--Lampent.png similarity index 100% rename from src/afd/sprites/front-shiny/Lampent.png rename to src/afd/sprites/front-shiny/608--0--Lampent.png diff --git a/src/afd/sprites/front-shiny/Chandelure.png b/src/afd/sprites/front-shiny/609--0--Chandelure.png similarity index 100% rename from src/afd/sprites/front-shiny/Chandelure.png rename to src/afd/sprites/front-shiny/609--0--Chandelure.png diff --git a/src/afd/sprites/front-shiny/Poliwhirl.png b/src/afd/sprites/front-shiny/61--0--Poliwhirl.png similarity index 100% rename from src/afd/sprites/front-shiny/Poliwhirl.png rename to src/afd/sprites/front-shiny/61--0--Poliwhirl.png diff --git a/src/afd/sprites/front-shiny/Axew.png b/src/afd/sprites/front-shiny/610--0--Axew.png similarity index 100% rename from src/afd/sprites/front-shiny/Axew.png rename to src/afd/sprites/front-shiny/610--0--Axew.png diff --git a/src/afd/sprites/front-shiny/Fraxure.png b/src/afd/sprites/front-shiny/611--0--Fraxure.png similarity index 100% rename from src/afd/sprites/front-shiny/Fraxure.png rename to src/afd/sprites/front-shiny/611--0--Fraxure.png diff --git a/src/afd/sprites/front-shiny/Haxorus.png b/src/afd/sprites/front-shiny/612--0--Haxorus.png similarity index 100% rename from src/afd/sprites/front-shiny/Haxorus.png rename to src/afd/sprites/front-shiny/612--0--Haxorus.png diff --git a/src/afd/sprites/front-shiny/Cubchoo.png b/src/afd/sprites/front-shiny/613--0--Cubchoo.png similarity index 100% rename from src/afd/sprites/front-shiny/Cubchoo.png rename to src/afd/sprites/front-shiny/613--0--Cubchoo.png diff --git a/src/afd/sprites/front-shiny/Beartic.png b/src/afd/sprites/front-shiny/614--0--Beartic.png similarity index 100% rename from src/afd/sprites/front-shiny/Beartic.png rename to src/afd/sprites/front-shiny/614--0--Beartic.png diff --git a/src/afd/sprites/front-shiny/Cryogonal.png b/src/afd/sprites/front-shiny/615--0--Cryogonal.png similarity index 100% rename from src/afd/sprites/front-shiny/Cryogonal.png rename to src/afd/sprites/front-shiny/615--0--Cryogonal.png diff --git a/src/afd/sprites/front-shiny/Shelmet.png b/src/afd/sprites/front-shiny/616--0--Shelmet.png similarity index 100% rename from src/afd/sprites/front-shiny/Shelmet.png rename to src/afd/sprites/front-shiny/616--0--Shelmet.png diff --git a/src/afd/sprites/front-shiny/Accelgor.png b/src/afd/sprites/front-shiny/617--0--Accelgor.png similarity index 100% rename from src/afd/sprites/front-shiny/Accelgor.png rename to src/afd/sprites/front-shiny/617--0--Accelgor.png diff --git a/src/afd/sprites/front-shiny/Stunfisk.png b/src/afd/sprites/front-shiny/618--0--Stunfisk.png similarity index 100% rename from src/afd/sprites/front-shiny/Stunfisk.png rename to src/afd/sprites/front-shiny/618--0--Stunfisk.png diff --git a/src/afd/sprites/front-shiny/Stunfisk--Galar.png b/src/afd/sprites/front-shiny/618--420--Stunfisk--Galar.png similarity index 100% rename from src/afd/sprites/front-shiny/Stunfisk--Galar.png rename to src/afd/sprites/front-shiny/618--420--Stunfisk--Galar.png diff --git a/src/afd/sprites/front-shiny/Mienfoo.png b/src/afd/sprites/front-shiny/619--0--Mienfoo.png similarity index 100% rename from src/afd/sprites/front-shiny/Mienfoo.png rename to src/afd/sprites/front-shiny/619--0--Mienfoo.png diff --git a/src/afd/sprites/front-shiny/Poliwrath.png b/src/afd/sprites/front-shiny/62--0--Poliwrath.png similarity index 100% rename from src/afd/sprites/front-shiny/Poliwrath.png rename to src/afd/sprites/front-shiny/62--0--Poliwrath.png diff --git a/src/afd/sprites/front-shiny/Mienshao.png b/src/afd/sprites/front-shiny/620--0--Mienshao.png similarity index 100% rename from src/afd/sprites/front-shiny/Mienshao.png rename to src/afd/sprites/front-shiny/620--0--Mienshao.png diff --git a/src/afd/sprites/front-shiny/Druddigon.png b/src/afd/sprites/front-shiny/621--0--Druddigon.png similarity index 100% rename from src/afd/sprites/front-shiny/Druddigon.png rename to src/afd/sprites/front-shiny/621--0--Druddigon.png diff --git a/src/afd/sprites/front-shiny/Golett.png b/src/afd/sprites/front-shiny/622--0--Golett.png similarity index 100% rename from src/afd/sprites/front-shiny/Golett.png rename to src/afd/sprites/front-shiny/622--0--Golett.png diff --git a/src/afd/sprites/front-shiny/Golurk.png b/src/afd/sprites/front-shiny/623--0--Golurk.png similarity index 100% rename from src/afd/sprites/front-shiny/Golurk.png rename to src/afd/sprites/front-shiny/623--0--Golurk.png diff --git a/src/afd/sprites/front-shiny/Pawniard.png b/src/afd/sprites/front-shiny/624--0--Pawniard.png similarity index 100% rename from src/afd/sprites/front-shiny/Pawniard.png rename to src/afd/sprites/front-shiny/624--0--Pawniard.png diff --git a/src/afd/sprites/front-shiny/Bisharp.png b/src/afd/sprites/front-shiny/625--0--Bisharp.png similarity index 100% rename from src/afd/sprites/front-shiny/Bisharp.png rename to src/afd/sprites/front-shiny/625--0--Bisharp.png diff --git a/src/afd/sprites/front-shiny/Bouffalant.png b/src/afd/sprites/front-shiny/626--0--Bouffalant.png similarity index 100% rename from src/afd/sprites/front-shiny/Bouffalant.png rename to src/afd/sprites/front-shiny/626--0--Bouffalant.png diff --git a/src/afd/sprites/front-shiny/Rufflet.png b/src/afd/sprites/front-shiny/627--0--Rufflet.png similarity index 100% rename from src/afd/sprites/front-shiny/Rufflet.png rename to src/afd/sprites/front-shiny/627--0--Rufflet.png diff --git a/src/afd/sprites/front-shiny/Braviary.png b/src/afd/sprites/front-shiny/628--0--Braviary.png similarity index 100% rename from src/afd/sprites/front-shiny/Braviary.png rename to src/afd/sprites/front-shiny/628--0--Braviary.png diff --git a/src/afd/sprites/front-shiny/Vullaby.png b/src/afd/sprites/front-shiny/629--0--Vullaby.png similarity index 100% rename from src/afd/sprites/front-shiny/Vullaby.png rename to src/afd/sprites/front-shiny/629--0--Vullaby.png diff --git a/src/afd/sprites/front-shiny/Abra.png b/src/afd/sprites/front-shiny/63--0--Abra.png similarity index 100% rename from src/afd/sprites/front-shiny/Abra.png rename to src/afd/sprites/front-shiny/63--0--Abra.png diff --git a/src/afd/sprites/front-shiny/Mandibuzz.png b/src/afd/sprites/front-shiny/630--0--Mandibuzz.png similarity index 100% rename from src/afd/sprites/front-shiny/Mandibuzz.png rename to src/afd/sprites/front-shiny/630--0--Mandibuzz.png diff --git a/src/afd/sprites/front-shiny/Heatmor.png b/src/afd/sprites/front-shiny/631--0--Heatmor.png similarity index 100% rename from src/afd/sprites/front-shiny/Heatmor.png rename to src/afd/sprites/front-shiny/631--0--Heatmor.png diff --git a/src/afd/sprites/front-shiny/Durant.png b/src/afd/sprites/front-shiny/632--0--Durant.png similarity index 100% rename from src/afd/sprites/front-shiny/Durant.png rename to src/afd/sprites/front-shiny/632--0--Durant.png diff --git a/src/afd/sprites/front-shiny/Deino.png b/src/afd/sprites/front-shiny/633--0--Deino.png similarity index 100% rename from src/afd/sprites/front-shiny/Deino.png rename to src/afd/sprites/front-shiny/633--0--Deino.png diff --git a/src/afd/sprites/front-shiny/Zweilous.png b/src/afd/sprites/front-shiny/634--0--Zweilous.png similarity index 100% rename from src/afd/sprites/front-shiny/Zweilous.png rename to src/afd/sprites/front-shiny/634--0--Zweilous.png diff --git a/src/afd/sprites/front-shiny/Hydreigon.png b/src/afd/sprites/front-shiny/635--0--Hydreigon.png similarity index 100% rename from src/afd/sprites/front-shiny/Hydreigon.png rename to src/afd/sprites/front-shiny/635--0--Hydreigon.png diff --git a/src/afd/sprites/front-shiny/Larvesta.png b/src/afd/sprites/front-shiny/636--0--Larvesta.png similarity index 100% rename from src/afd/sprites/front-shiny/Larvesta.png rename to src/afd/sprites/front-shiny/636--0--Larvesta.png diff --git a/src/afd/sprites/front-shiny/Volcarona.png b/src/afd/sprites/front-shiny/637--0--Volcarona.png similarity index 100% rename from src/afd/sprites/front-shiny/Volcarona.png rename to src/afd/sprites/front-shiny/637--0--Volcarona.png diff --git a/src/afd/sprites/front-shiny/Cobalion.png b/src/afd/sprites/front-shiny/638--0--Cobalion.png similarity index 100% rename from src/afd/sprites/front-shiny/Cobalion.png rename to src/afd/sprites/front-shiny/638--0--Cobalion.png diff --git a/src/afd/sprites/front-shiny/Terrakion.png b/src/afd/sprites/front-shiny/639--0--Terrakion.png similarity index 100% rename from src/afd/sprites/front-shiny/Terrakion.png rename to src/afd/sprites/front-shiny/639--0--Terrakion.png diff --git a/src/afd/sprites/front-shiny/Kadabra.png b/src/afd/sprites/front-shiny/64--0--Kadabra.png similarity index 100% rename from src/afd/sprites/front-shiny/Kadabra.png rename to src/afd/sprites/front-shiny/64--0--Kadabra.png diff --git a/src/afd/sprites/front-shiny/Virizion.png b/src/afd/sprites/front-shiny/640--0--Virizion.png similarity index 100% rename from src/afd/sprites/front-shiny/Virizion.png rename to src/afd/sprites/front-shiny/640--0--Virizion.png diff --git a/src/afd/sprites/front-shiny/Tornadus.png b/src/afd/sprites/front-shiny/641--0--Tornadus.png similarity index 100% rename from src/afd/sprites/front-shiny/Tornadus.png rename to src/afd/sprites/front-shiny/641--0--Tornadus.png diff --git a/src/afd/sprites/front-shiny/Thundurus.png b/src/afd/sprites/front-shiny/642--0--Thundurus.png similarity index 100% rename from src/afd/sprites/front-shiny/Thundurus.png rename to src/afd/sprites/front-shiny/642--0--Thundurus.png diff --git a/src/afd/sprites/front-shiny/Thundurus--Therian.png b/src/afd/sprites/front-shiny/642--420--Thundurus--Therian.png similarity index 100% rename from src/afd/sprites/front-shiny/Thundurus--Therian.png rename to src/afd/sprites/front-shiny/642--420--Thundurus--Therian.png diff --git a/src/afd/sprites/front-shiny/Reshiram.png b/src/afd/sprites/front-shiny/643--0--Reshiram.png similarity index 100% rename from src/afd/sprites/front-shiny/Reshiram.png rename to src/afd/sprites/front-shiny/643--0--Reshiram.png diff --git a/src/afd/sprites/front-shiny/Zekrom.png b/src/afd/sprites/front-shiny/644--0--Zekrom.png similarity index 100% rename from src/afd/sprites/front-shiny/Zekrom.png rename to src/afd/sprites/front-shiny/644--0--Zekrom.png diff --git a/src/afd/sprites/front-shiny/Landorus.png b/src/afd/sprites/front-shiny/645--0--Landorus.png similarity index 100% rename from src/afd/sprites/front-shiny/Landorus.png rename to src/afd/sprites/front-shiny/645--0--Landorus.png diff --git a/src/afd/sprites/front-shiny/Landorus--Therian.png b/src/afd/sprites/front-shiny/645--420--Landorus--Therian.png similarity index 100% rename from src/afd/sprites/front-shiny/Landorus--Therian.png rename to src/afd/sprites/front-shiny/645--420--Landorus--Therian.png diff --git a/src/afd/sprites/front-shiny/Kyurem.png b/src/afd/sprites/front-shiny/646--0--Kyurem.png similarity index 100% rename from src/afd/sprites/front-shiny/Kyurem.png rename to src/afd/sprites/front-shiny/646--0--Kyurem.png diff --git a/src/afd/sprites/front-shiny/Kyurem--Black.png b/src/afd/sprites/front-shiny/646--420--Kyurem--Black.png similarity index 100% rename from src/afd/sprites/front-shiny/Kyurem--Black.png rename to src/afd/sprites/front-shiny/646--420--Kyurem--Black.png diff --git a/src/afd/sprites/front-shiny/Kyurem--White.png b/src/afd/sprites/front-shiny/646--420--Kyurem--White.png similarity index 100% rename from src/afd/sprites/front-shiny/Kyurem--White.png rename to src/afd/sprites/front-shiny/646--420--Kyurem--White.png diff --git a/src/afd/sprites/front-shiny/Keldeo.png b/src/afd/sprites/front-shiny/647--0--Keldeo.png similarity index 100% rename from src/afd/sprites/front-shiny/Keldeo.png rename to src/afd/sprites/front-shiny/647--0--Keldeo.png diff --git a/src/afd/sprites/front-shiny/Keldeo--Resolute.png b/src/afd/sprites/front-shiny/647--420--Keldeo--Resolute.png similarity index 100% rename from src/afd/sprites/front-shiny/Keldeo--Resolute.png rename to src/afd/sprites/front-shiny/647--420--Keldeo--Resolute.png diff --git a/src/afd/sprites/front-shiny/Meloetta.png b/src/afd/sprites/front-shiny/648--0--Meloetta.png similarity index 100% rename from src/afd/sprites/front-shiny/Meloetta.png rename to src/afd/sprites/front-shiny/648--0--Meloetta.png diff --git a/src/afd/sprites/front-shiny/Meloetta--Pirouette.png b/src/afd/sprites/front-shiny/648--420--Meloetta--Pirouette.png similarity index 100% rename from src/afd/sprites/front-shiny/Meloetta--Pirouette.png rename to src/afd/sprites/front-shiny/648--420--Meloetta--Pirouette.png diff --git a/src/afd/sprites/front-shiny/Genesect.png b/src/afd/sprites/front-shiny/649--0--Genesect.png similarity index 100% rename from src/afd/sprites/front-shiny/Genesect.png rename to src/afd/sprites/front-shiny/649--0--Genesect.png diff --git a/src/afd/sprites/front-shiny/Genesect--Burn.png b/src/afd/sprites/front-shiny/649--420--Genesect--Burn.png similarity index 100% rename from src/afd/sprites/front-shiny/Genesect--Burn.png rename to src/afd/sprites/front-shiny/649--420--Genesect--Burn.png diff --git a/src/afd/sprites/front-shiny/Genesect--Chill.png b/src/afd/sprites/front-shiny/649--420--Genesect--Chill.png similarity index 100% rename from src/afd/sprites/front-shiny/Genesect--Chill.png rename to src/afd/sprites/front-shiny/649--420--Genesect--Chill.png diff --git a/src/afd/sprites/front-shiny/Genesect--Douse.png b/src/afd/sprites/front-shiny/649--420--Genesect--Douse.png similarity index 100% rename from src/afd/sprites/front-shiny/Genesect--Douse.png rename to src/afd/sprites/front-shiny/649--420--Genesect--Douse.png diff --git a/src/afd/sprites/front-shiny/Genesect--Shock.png b/src/afd/sprites/front-shiny/649--420--Genesect--Shock.png similarity index 100% rename from src/afd/sprites/front-shiny/Genesect--Shock.png rename to src/afd/sprites/front-shiny/649--420--Genesect--Shock.png diff --git a/src/afd/sprites/front-shiny/Alakazam.png b/src/afd/sprites/front-shiny/65--0--Alakazam.png similarity index 100% rename from src/afd/sprites/front-shiny/Alakazam.png rename to src/afd/sprites/front-shiny/65--0--Alakazam.png diff --git a/src/afd/sprites/front-shiny/Alakazam--Mega.png b/src/afd/sprites/front-shiny/65--420--Alakazam--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Alakazam--Mega.png rename to src/afd/sprites/front-shiny/65--420--Alakazam--Mega.png diff --git a/src/afd/sprites/front-shiny/Chespin.png b/src/afd/sprites/front-shiny/650--0--Chespin.png similarity index 100% rename from src/afd/sprites/front-shiny/Chespin.png rename to src/afd/sprites/front-shiny/650--0--Chespin.png diff --git a/src/afd/sprites/front-shiny/Quilladin.png b/src/afd/sprites/front-shiny/651--0--Quilladin.png similarity index 100% rename from src/afd/sprites/front-shiny/Quilladin.png rename to src/afd/sprites/front-shiny/651--0--Quilladin.png diff --git a/src/afd/sprites/front-shiny/Chesnaught.png b/src/afd/sprites/front-shiny/652--0--Chesnaught.png similarity index 100% rename from src/afd/sprites/front-shiny/Chesnaught.png rename to src/afd/sprites/front-shiny/652--0--Chesnaught.png diff --git a/src/afd/sprites/front-shiny/Fennekin.png b/src/afd/sprites/front-shiny/653--0--Fennekin.png similarity index 100% rename from src/afd/sprites/front-shiny/Fennekin.png rename to src/afd/sprites/front-shiny/653--0--Fennekin.png diff --git a/src/afd/sprites/front-shiny/Braixen.png b/src/afd/sprites/front-shiny/654--0--Braixen.png similarity index 100% rename from src/afd/sprites/front-shiny/Braixen.png rename to src/afd/sprites/front-shiny/654--0--Braixen.png diff --git a/src/afd/sprites/front-shiny/Delphox.png b/src/afd/sprites/front-shiny/655--0--Delphox.png similarity index 100% rename from src/afd/sprites/front-shiny/Delphox.png rename to src/afd/sprites/front-shiny/655--0--Delphox.png diff --git a/src/afd/sprites/front-shiny/Froakie.png b/src/afd/sprites/front-shiny/656--0--Froakie.png similarity index 100% rename from src/afd/sprites/front-shiny/Froakie.png rename to src/afd/sprites/front-shiny/656--0--Froakie.png diff --git a/src/afd/sprites/front-shiny/Frogadier.png b/src/afd/sprites/front-shiny/657--0--Frogadier.png similarity index 100% rename from src/afd/sprites/front-shiny/Frogadier.png rename to src/afd/sprites/front-shiny/657--0--Frogadier.png diff --git a/src/afd/sprites/front-shiny/Greninja.png b/src/afd/sprites/front-shiny/658--0--Greninja.png similarity index 100% rename from src/afd/sprites/front-shiny/Greninja.png rename to src/afd/sprites/front-shiny/658--0--Greninja.png diff --git a/src/afd/sprites/front-shiny/Greninja--Ash.png b/src/afd/sprites/front-shiny/658--420--Greninja--Ash.png similarity index 100% rename from src/afd/sprites/front-shiny/Greninja--Ash.png rename to src/afd/sprites/front-shiny/658--420--Greninja--Ash.png diff --git a/src/afd/sprites/front-shiny/Bunnelby.png b/src/afd/sprites/front-shiny/659--0--Bunnelby.png similarity index 100% rename from src/afd/sprites/front-shiny/Bunnelby.png rename to src/afd/sprites/front-shiny/659--0--Bunnelby.png diff --git a/src/afd/sprites/front-shiny/Machop.png b/src/afd/sprites/front-shiny/66--0--Machop.png similarity index 100% rename from src/afd/sprites/front-shiny/Machop.png rename to src/afd/sprites/front-shiny/66--0--Machop.png diff --git a/src/afd/sprites/front-shiny/Diggersby.png b/src/afd/sprites/front-shiny/660--0--Diggersby.png similarity index 100% rename from src/afd/sprites/front-shiny/Diggersby.png rename to src/afd/sprites/front-shiny/660--0--Diggersby.png diff --git a/src/afd/sprites/front-shiny/Fletchling.png b/src/afd/sprites/front-shiny/661--0--Fletchling.png similarity index 100% rename from src/afd/sprites/front-shiny/Fletchling.png rename to src/afd/sprites/front-shiny/661--0--Fletchling.png diff --git a/src/afd/sprites/front-shiny/Fletchinder.png b/src/afd/sprites/front-shiny/662--0--Fletchinder.png similarity index 100% rename from src/afd/sprites/front-shiny/Fletchinder.png rename to src/afd/sprites/front-shiny/662--0--Fletchinder.png diff --git a/src/afd/sprites/front-shiny/Talonflame.png b/src/afd/sprites/front-shiny/663--0--Talonflame.png similarity index 100% rename from src/afd/sprites/front-shiny/Talonflame.png rename to src/afd/sprites/front-shiny/663--0--Talonflame.png diff --git a/src/afd/sprites/front-shiny/Scatterbug.png b/src/afd/sprites/front-shiny/664--0--Scatterbug.png similarity index 100% rename from src/afd/sprites/front-shiny/Scatterbug.png rename to src/afd/sprites/front-shiny/664--0--Scatterbug.png diff --git a/src/afd/sprites/front-shiny/Spewpa.png b/src/afd/sprites/front-shiny/665--0--Spewpa.png similarity index 100% rename from src/afd/sprites/front-shiny/Spewpa.png rename to src/afd/sprites/front-shiny/665--0--Spewpa.png diff --git a/src/afd/sprites/front-shiny/Vivillon.png b/src/afd/sprites/front-shiny/666--0--Vivillon.png similarity index 100% rename from src/afd/sprites/front-shiny/Vivillon.png rename to src/afd/sprites/front-shiny/666--0--Vivillon.png diff --git a/src/afd/sprites/front-shiny/Litleo.png b/src/afd/sprites/front-shiny/667--0--Litleo.png similarity index 100% rename from src/afd/sprites/front-shiny/Litleo.png rename to src/afd/sprites/front-shiny/667--0--Litleo.png diff --git a/src/afd/sprites/front-shiny/Pyroar.png b/src/afd/sprites/front-shiny/668--0--Pyroar.png similarity index 100% rename from src/afd/sprites/front-shiny/Pyroar.png rename to src/afd/sprites/front-shiny/668--0--Pyroar.png diff --git a/src/afd/sprites/front-shiny/Flabe__0301be__0301.png b/src/afd/sprites/front-shiny/669--0--Flabe__0301be__0301.png similarity index 100% rename from src/afd/sprites/front-shiny/Flabe__0301be__0301.png rename to src/afd/sprites/front-shiny/669--0--Flabe__0301be__0301.png diff --git a/src/afd/sprites/front-shiny/Machoke.png b/src/afd/sprites/front-shiny/67--0--Machoke.png similarity index 100% rename from src/afd/sprites/front-shiny/Machoke.png rename to src/afd/sprites/front-shiny/67--0--Machoke.png diff --git a/src/afd/sprites/front-shiny/Floette.png b/src/afd/sprites/front-shiny/670--0--Floette.png similarity index 100% rename from src/afd/sprites/front-shiny/Floette.png rename to src/afd/sprites/front-shiny/670--0--Floette.png diff --git a/src/afd/sprites/front-shiny/Floette--Eternal.png b/src/afd/sprites/front-shiny/670--420--Floette--Eternal.png similarity index 100% rename from src/afd/sprites/front-shiny/Floette--Eternal.png rename to src/afd/sprites/front-shiny/670--420--Floette--Eternal.png diff --git a/src/afd/sprites/front-shiny/Florges.png b/src/afd/sprites/front-shiny/671--0--Florges.png similarity index 100% rename from src/afd/sprites/front-shiny/Florges.png rename to src/afd/sprites/front-shiny/671--0--Florges.png diff --git a/src/afd/sprites/front-shiny/Skiddo.png b/src/afd/sprites/front-shiny/672--0--Skiddo.png similarity index 100% rename from src/afd/sprites/front-shiny/Skiddo.png rename to src/afd/sprites/front-shiny/672--0--Skiddo.png diff --git a/src/afd/sprites/front-shiny/Gogoat.png b/src/afd/sprites/front-shiny/673--0--Gogoat.png similarity index 100% rename from src/afd/sprites/front-shiny/Gogoat.png rename to src/afd/sprites/front-shiny/673--0--Gogoat.png diff --git a/src/afd/sprites/front-shiny/Pancham.png b/src/afd/sprites/front-shiny/674--0--Pancham.png similarity index 100% rename from src/afd/sprites/front-shiny/Pancham.png rename to src/afd/sprites/front-shiny/674--0--Pancham.png diff --git a/src/afd/sprites/front-shiny/Pangoro.png b/src/afd/sprites/front-shiny/675--0--Pangoro.png similarity index 100% rename from src/afd/sprites/front-shiny/Pangoro.png rename to src/afd/sprites/front-shiny/675--0--Pangoro.png diff --git a/src/afd/sprites/front-shiny/Furfrou.png b/src/afd/sprites/front-shiny/676--0--Furfrou.png similarity index 100% rename from src/afd/sprites/front-shiny/Furfrou.png rename to src/afd/sprites/front-shiny/676--0--Furfrou.png diff --git a/src/afd/sprites/front-shiny/Espurr.png b/src/afd/sprites/front-shiny/677--0--Espurr.png similarity index 100% rename from src/afd/sprites/front-shiny/Espurr.png rename to src/afd/sprites/front-shiny/677--0--Espurr.png diff --git a/src/afd/sprites/front-shiny/Meowstic.png b/src/afd/sprites/front-shiny/678--0--Meowstic.png similarity index 100% rename from src/afd/sprites/front-shiny/Meowstic.png rename to src/afd/sprites/front-shiny/678--0--Meowstic.png diff --git a/src/afd/sprites/front-shiny/Meowstic--F.png b/src/afd/sprites/front-shiny/678--420--Meowstic--F.png similarity index 100% rename from src/afd/sprites/front-shiny/Meowstic--F.png rename to src/afd/sprites/front-shiny/678--420--Meowstic--F.png diff --git a/src/afd/sprites/front-shiny/Honedge.png b/src/afd/sprites/front-shiny/679--0--Honedge.png similarity index 100% rename from src/afd/sprites/front-shiny/Honedge.png rename to src/afd/sprites/front-shiny/679--0--Honedge.png diff --git a/src/afd/sprites/front-shiny/Machamp.png b/src/afd/sprites/front-shiny/68--0--Machamp.png similarity index 100% rename from src/afd/sprites/front-shiny/Machamp.png rename to src/afd/sprites/front-shiny/68--0--Machamp.png diff --git a/src/afd/sprites/front-shiny/Machamp--Gmax.png b/src/afd/sprites/front-shiny/68--420--Machamp--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Machamp--Gmax.png rename to src/afd/sprites/front-shiny/68--420--Machamp--Gmax.png diff --git a/src/afd/sprites/front-shiny/Doublade.png b/src/afd/sprites/front-shiny/680--0--Doublade.png similarity index 100% rename from src/afd/sprites/front-shiny/Doublade.png rename to src/afd/sprites/front-shiny/680--0--Doublade.png diff --git a/src/afd/sprites/front-shiny/Aegislash.png b/src/afd/sprites/front-shiny/681--0--Aegislash.png similarity index 100% rename from src/afd/sprites/front-shiny/Aegislash.png rename to src/afd/sprites/front-shiny/681--0--Aegislash.png diff --git a/src/afd/sprites/front-shiny/Aegislash--Blade.png b/src/afd/sprites/front-shiny/681--420--Aegislash--Blade.png similarity index 100% rename from src/afd/sprites/front-shiny/Aegislash--Blade.png rename to src/afd/sprites/front-shiny/681--420--Aegislash--Blade.png diff --git a/src/afd/sprites/front-shiny/Spritzee.png b/src/afd/sprites/front-shiny/682--0--Spritzee.png similarity index 100% rename from src/afd/sprites/front-shiny/Spritzee.png rename to src/afd/sprites/front-shiny/682--0--Spritzee.png diff --git a/src/afd/sprites/front-shiny/Aromatisse.png b/src/afd/sprites/front-shiny/683--0--Aromatisse.png similarity index 100% rename from src/afd/sprites/front-shiny/Aromatisse.png rename to src/afd/sprites/front-shiny/683--0--Aromatisse.png diff --git a/src/afd/sprites/front-shiny/Swirlix.png b/src/afd/sprites/front-shiny/684--0--Swirlix.png similarity index 100% rename from src/afd/sprites/front-shiny/Swirlix.png rename to src/afd/sprites/front-shiny/684--0--Swirlix.png diff --git a/src/afd/sprites/front-shiny/Slurpuff.png b/src/afd/sprites/front-shiny/685--0--Slurpuff.png similarity index 100% rename from src/afd/sprites/front-shiny/Slurpuff.png rename to src/afd/sprites/front-shiny/685--0--Slurpuff.png diff --git a/src/afd/sprites/front-shiny/Inkay.png b/src/afd/sprites/front-shiny/686--0--Inkay.png similarity index 100% rename from src/afd/sprites/front-shiny/Inkay.png rename to src/afd/sprites/front-shiny/686--0--Inkay.png diff --git a/src/afd/sprites/front-shiny/Malamar.png b/src/afd/sprites/front-shiny/687--0--Malamar.png similarity index 100% rename from src/afd/sprites/front-shiny/Malamar.png rename to src/afd/sprites/front-shiny/687--0--Malamar.png diff --git a/src/afd/sprites/front-shiny/Binacle.png b/src/afd/sprites/front-shiny/688--0--Binacle.png similarity index 100% rename from src/afd/sprites/front-shiny/Binacle.png rename to src/afd/sprites/front-shiny/688--0--Binacle.png diff --git a/src/afd/sprites/front-shiny/Barbaracle.png b/src/afd/sprites/front-shiny/689--0--Barbaracle.png similarity index 100% rename from src/afd/sprites/front-shiny/Barbaracle.png rename to src/afd/sprites/front-shiny/689--0--Barbaracle.png diff --git a/src/afd/sprites/front-shiny/Bellsprout.png b/src/afd/sprites/front-shiny/69--0--Bellsprout.png similarity index 100% rename from src/afd/sprites/front-shiny/Bellsprout.png rename to src/afd/sprites/front-shiny/69--0--Bellsprout.png diff --git a/src/afd/sprites/front-shiny/Skrelp.png b/src/afd/sprites/front-shiny/690--0--Skrelp.png similarity index 100% rename from src/afd/sprites/front-shiny/Skrelp.png rename to src/afd/sprites/front-shiny/690--0--Skrelp.png diff --git a/src/afd/sprites/front-shiny/Dragalge.png b/src/afd/sprites/front-shiny/691--0--Dragalge.png similarity index 100% rename from src/afd/sprites/front-shiny/Dragalge.png rename to src/afd/sprites/front-shiny/691--0--Dragalge.png diff --git a/src/afd/sprites/front-shiny/Clauncher.png b/src/afd/sprites/front-shiny/692--0--Clauncher.png similarity index 100% rename from src/afd/sprites/front-shiny/Clauncher.png rename to src/afd/sprites/front-shiny/692--0--Clauncher.png diff --git a/src/afd/sprites/front-shiny/Clawitzer.png b/src/afd/sprites/front-shiny/693--0--Clawitzer.png similarity index 100% rename from src/afd/sprites/front-shiny/Clawitzer.png rename to src/afd/sprites/front-shiny/693--0--Clawitzer.png diff --git a/src/afd/sprites/front-shiny/Helioptile.png b/src/afd/sprites/front-shiny/694--0--Helioptile.png similarity index 100% rename from src/afd/sprites/front-shiny/Helioptile.png rename to src/afd/sprites/front-shiny/694--0--Helioptile.png diff --git a/src/afd/sprites/front-shiny/Heliolisk.png b/src/afd/sprites/front-shiny/695--0--Heliolisk.png similarity index 100% rename from src/afd/sprites/front-shiny/Heliolisk.png rename to src/afd/sprites/front-shiny/695--0--Heliolisk.png diff --git a/src/afd/sprites/front-shiny/Tyrunt.png b/src/afd/sprites/front-shiny/696--0--Tyrunt.png similarity index 100% rename from src/afd/sprites/front-shiny/Tyrunt.png rename to src/afd/sprites/front-shiny/696--0--Tyrunt.png diff --git a/src/afd/sprites/front-shiny/Tyrantrum.png b/src/afd/sprites/front-shiny/697--0--Tyrantrum.png similarity index 100% rename from src/afd/sprites/front-shiny/Tyrantrum.png rename to src/afd/sprites/front-shiny/697--0--Tyrantrum.png diff --git a/src/afd/sprites/front-shiny/Amaura.png b/src/afd/sprites/front-shiny/698--0--Amaura.png similarity index 100% rename from src/afd/sprites/front-shiny/Amaura.png rename to src/afd/sprites/front-shiny/698--0--Amaura.png diff --git a/src/afd/sprites/front-shiny/Aurorus.png b/src/afd/sprites/front-shiny/699--0--Aurorus.png similarity index 100% rename from src/afd/sprites/front-shiny/Aurorus.png rename to src/afd/sprites/front-shiny/699--0--Aurorus.png diff --git a/src/afd/sprites/front-shiny/Squirtle.png b/src/afd/sprites/front-shiny/7--0--Squirtle.png similarity index 100% rename from src/afd/sprites/front-shiny/Squirtle.png rename to src/afd/sprites/front-shiny/7--0--Squirtle.png diff --git a/src/afd/sprites/front-shiny/Weepinbell.png b/src/afd/sprites/front-shiny/70--0--Weepinbell.png similarity index 100% rename from src/afd/sprites/front-shiny/Weepinbell.png rename to src/afd/sprites/front-shiny/70--0--Weepinbell.png diff --git a/src/afd/sprites/front-shiny/Sylveon.png b/src/afd/sprites/front-shiny/700--0--Sylveon.png similarity index 100% rename from src/afd/sprites/front-shiny/Sylveon.png rename to src/afd/sprites/front-shiny/700--0--Sylveon.png diff --git a/src/afd/sprites/front-shiny/Hawlucha.png b/src/afd/sprites/front-shiny/701--0--Hawlucha.png similarity index 100% rename from src/afd/sprites/front-shiny/Hawlucha.png rename to src/afd/sprites/front-shiny/701--0--Hawlucha.png diff --git a/src/afd/sprites/front-shiny/Dedenne.png b/src/afd/sprites/front-shiny/702--0--Dedenne.png similarity index 100% rename from src/afd/sprites/front-shiny/Dedenne.png rename to src/afd/sprites/front-shiny/702--0--Dedenne.png diff --git a/src/afd/sprites/front-shiny/Carbink.png b/src/afd/sprites/front-shiny/703--0--Carbink.png similarity index 100% rename from src/afd/sprites/front-shiny/Carbink.png rename to src/afd/sprites/front-shiny/703--0--Carbink.png diff --git a/src/afd/sprites/front-shiny/Goomy.png b/src/afd/sprites/front-shiny/704--0--Goomy.png similarity index 100% rename from src/afd/sprites/front-shiny/Goomy.png rename to src/afd/sprites/front-shiny/704--0--Goomy.png diff --git a/src/afd/sprites/front-shiny/Sliggoo.png b/src/afd/sprites/front-shiny/705--0--Sliggoo.png similarity index 100% rename from src/afd/sprites/front-shiny/Sliggoo.png rename to src/afd/sprites/front-shiny/705--0--Sliggoo.png diff --git a/src/afd/sprites/front-shiny/Goodra.png b/src/afd/sprites/front-shiny/706--0--Goodra.png similarity index 100% rename from src/afd/sprites/front-shiny/Goodra.png rename to src/afd/sprites/front-shiny/706--0--Goodra.png diff --git a/src/afd/sprites/front-shiny/Klefki.png b/src/afd/sprites/front-shiny/707--0--Klefki.png similarity index 100% rename from src/afd/sprites/front-shiny/Klefki.png rename to src/afd/sprites/front-shiny/707--0--Klefki.png diff --git a/src/afd/sprites/front-shiny/Phantump.png b/src/afd/sprites/front-shiny/708--0--Phantump.png similarity index 100% rename from src/afd/sprites/front-shiny/Phantump.png rename to src/afd/sprites/front-shiny/708--0--Phantump.png diff --git a/src/afd/sprites/front-shiny/Trevenant.png b/src/afd/sprites/front-shiny/709--0--Trevenant.png similarity index 100% rename from src/afd/sprites/front-shiny/Trevenant.png rename to src/afd/sprites/front-shiny/709--0--Trevenant.png diff --git a/src/afd/sprites/front-shiny/Victreebel.png b/src/afd/sprites/front-shiny/71--0--Victreebel.png similarity index 100% rename from src/afd/sprites/front-shiny/Victreebel.png rename to src/afd/sprites/front-shiny/71--0--Victreebel.png diff --git a/src/afd/sprites/front-shiny/Pumpkaboo.png b/src/afd/sprites/front-shiny/710--0--Pumpkaboo.png similarity index 100% rename from src/afd/sprites/front-shiny/Pumpkaboo.png rename to src/afd/sprites/front-shiny/710--0--Pumpkaboo.png diff --git a/src/afd/sprites/front-shiny/Pumpkaboo--Large.png b/src/afd/sprites/front-shiny/710--420--Pumpkaboo--Large.png similarity index 100% rename from src/afd/sprites/front-shiny/Pumpkaboo--Large.png rename to src/afd/sprites/front-shiny/710--420--Pumpkaboo--Large.png diff --git a/src/afd/sprites/front-shiny/Pumpkaboo--Small.png b/src/afd/sprites/front-shiny/710--420--Pumpkaboo--Small.png similarity index 100% rename from src/afd/sprites/front-shiny/Pumpkaboo--Small.png rename to src/afd/sprites/front-shiny/710--420--Pumpkaboo--Small.png diff --git a/src/afd/sprites/front-shiny/Pumpkaboo--Super.png b/src/afd/sprites/front-shiny/710--420--Pumpkaboo--Super.png similarity index 100% rename from src/afd/sprites/front-shiny/Pumpkaboo--Super.png rename to src/afd/sprites/front-shiny/710--420--Pumpkaboo--Super.png diff --git a/src/afd/sprites/front-shiny/Gourgeist.png b/src/afd/sprites/front-shiny/711--0--Gourgeist.png similarity index 100% rename from src/afd/sprites/front-shiny/Gourgeist.png rename to src/afd/sprites/front-shiny/711--0--Gourgeist.png diff --git a/src/afd/sprites/front-shiny/Gourgeist--Large.png b/src/afd/sprites/front-shiny/711--420--Gourgeist--Large.png similarity index 100% rename from src/afd/sprites/front-shiny/Gourgeist--Large.png rename to src/afd/sprites/front-shiny/711--420--Gourgeist--Large.png diff --git a/src/afd/sprites/front-shiny/Gourgeist--Small.png b/src/afd/sprites/front-shiny/711--420--Gourgeist--Small.png similarity index 100% rename from src/afd/sprites/front-shiny/Gourgeist--Small.png rename to src/afd/sprites/front-shiny/711--420--Gourgeist--Small.png diff --git a/src/afd/sprites/front-shiny/Gourgeist--Super.png b/src/afd/sprites/front-shiny/711--420--Gourgeist--Super.png similarity index 100% rename from src/afd/sprites/front-shiny/Gourgeist--Super.png rename to src/afd/sprites/front-shiny/711--420--Gourgeist--Super.png diff --git a/src/afd/sprites/front-shiny/Bergmite.png b/src/afd/sprites/front-shiny/712--0--Bergmite.png similarity index 100% rename from src/afd/sprites/front-shiny/Bergmite.png rename to src/afd/sprites/front-shiny/712--0--Bergmite.png diff --git a/src/afd/sprites/front-shiny/Avalugg.png b/src/afd/sprites/front-shiny/713--0--Avalugg.png similarity index 100% rename from src/afd/sprites/front-shiny/Avalugg.png rename to src/afd/sprites/front-shiny/713--0--Avalugg.png diff --git a/src/afd/sprites/front-shiny/Noibat.png b/src/afd/sprites/front-shiny/714--0--Noibat.png similarity index 100% rename from src/afd/sprites/front-shiny/Noibat.png rename to src/afd/sprites/front-shiny/714--0--Noibat.png diff --git a/src/afd/sprites/front-shiny/Noivern.png b/src/afd/sprites/front-shiny/715--0--Noivern.png similarity index 100% rename from src/afd/sprites/front-shiny/Noivern.png rename to src/afd/sprites/front-shiny/715--0--Noivern.png diff --git a/src/afd/sprites/front-shiny/Xerneas.png b/src/afd/sprites/front-shiny/716--0--Xerneas.png similarity index 100% rename from src/afd/sprites/front-shiny/Xerneas.png rename to src/afd/sprites/front-shiny/716--0--Xerneas.png diff --git a/src/afd/sprites/front-shiny/Yveltal.png b/src/afd/sprites/front-shiny/717--0--Yveltal.png similarity index 100% rename from src/afd/sprites/front-shiny/Yveltal.png rename to src/afd/sprites/front-shiny/717--0--Yveltal.png diff --git a/src/afd/sprites/front-shiny/Zygarde.png b/src/afd/sprites/front-shiny/718--0--Zygarde.png similarity index 100% rename from src/afd/sprites/front-shiny/Zygarde.png rename to src/afd/sprites/front-shiny/718--0--Zygarde.png diff --git a/src/afd/sprites/front-shiny/Zygarde--10__0025.png b/src/afd/sprites/front-shiny/718--420--Zygarde--10__0025.png similarity index 100% rename from src/afd/sprites/front-shiny/Zygarde--10__0025.png rename to src/afd/sprites/front-shiny/718--420--Zygarde--10__0025.png diff --git a/src/afd/sprites/front-shiny/Zygarde--Complete.png b/src/afd/sprites/front-shiny/718--420--Zygarde--Complete.png similarity index 100% rename from src/afd/sprites/front-shiny/Zygarde--Complete.png rename to src/afd/sprites/front-shiny/718--420--Zygarde--Complete.png diff --git a/src/afd/sprites/front-shiny/Diancie.png b/src/afd/sprites/front-shiny/719--0--Diancie.png similarity index 100% rename from src/afd/sprites/front-shiny/Diancie.png rename to src/afd/sprites/front-shiny/719--0--Diancie.png diff --git a/src/afd/sprites/front-shiny/Diancie--Mega.png b/src/afd/sprites/front-shiny/719--420--Diancie--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Diancie--Mega.png rename to src/afd/sprites/front-shiny/719--420--Diancie--Mega.png diff --git a/src/afd/sprites/front-shiny/Tentacool.png b/src/afd/sprites/front-shiny/72--0--Tentacool.png similarity index 100% rename from src/afd/sprites/front-shiny/Tentacool.png rename to src/afd/sprites/front-shiny/72--0--Tentacool.png diff --git a/src/afd/sprites/front-shiny/Hoopa.png b/src/afd/sprites/front-shiny/720--0--Hoopa.png similarity index 100% rename from src/afd/sprites/front-shiny/Hoopa.png rename to src/afd/sprites/front-shiny/720--0--Hoopa.png diff --git a/src/afd/sprites/front-shiny/Hoopa--Unbound.png b/src/afd/sprites/front-shiny/720--420--Hoopa--Unbound.png similarity index 100% rename from src/afd/sprites/front-shiny/Hoopa--Unbound.png rename to src/afd/sprites/front-shiny/720--420--Hoopa--Unbound.png diff --git a/src/afd/sprites/front-shiny/Volcanion.png b/src/afd/sprites/front-shiny/721--0--Volcanion.png similarity index 100% rename from src/afd/sprites/front-shiny/Volcanion.png rename to src/afd/sprites/front-shiny/721--0--Volcanion.png diff --git a/src/afd/sprites/front-shiny/Rowlet.png b/src/afd/sprites/front-shiny/722--0--Rowlet.png similarity index 100% rename from src/afd/sprites/front-shiny/Rowlet.png rename to src/afd/sprites/front-shiny/722--0--Rowlet.png diff --git a/src/afd/sprites/front-shiny/Dartrix.png b/src/afd/sprites/front-shiny/723--0--Dartrix.png similarity index 100% rename from src/afd/sprites/front-shiny/Dartrix.png rename to src/afd/sprites/front-shiny/723--0--Dartrix.png diff --git a/src/afd/sprites/front-shiny/Decidueye.png b/src/afd/sprites/front-shiny/724--0--Decidueye.png similarity index 100% rename from src/afd/sprites/front-shiny/Decidueye.png rename to src/afd/sprites/front-shiny/724--0--Decidueye.png diff --git a/src/afd/sprites/front-shiny/Litten.png b/src/afd/sprites/front-shiny/725--0--Litten.png similarity index 100% rename from src/afd/sprites/front-shiny/Litten.png rename to src/afd/sprites/front-shiny/725--0--Litten.png diff --git a/src/afd/sprites/front-shiny/Torracat.png b/src/afd/sprites/front-shiny/726--0--Torracat.png similarity index 100% rename from src/afd/sprites/front-shiny/Torracat.png rename to src/afd/sprites/front-shiny/726--0--Torracat.png diff --git a/src/afd/sprites/front-shiny/Incineroar.png b/src/afd/sprites/front-shiny/727--0--Incineroar.png similarity index 100% rename from src/afd/sprites/front-shiny/Incineroar.png rename to src/afd/sprites/front-shiny/727--0--Incineroar.png diff --git a/src/afd/sprites/front-shiny/Popplio.png b/src/afd/sprites/front-shiny/728--0--Popplio.png similarity index 100% rename from src/afd/sprites/front-shiny/Popplio.png rename to src/afd/sprites/front-shiny/728--0--Popplio.png diff --git a/src/afd/sprites/front-shiny/Brionne.png b/src/afd/sprites/front-shiny/729--0--Brionne.png similarity index 100% rename from src/afd/sprites/front-shiny/Brionne.png rename to src/afd/sprites/front-shiny/729--0--Brionne.png diff --git a/src/afd/sprites/front-shiny/Tentacruel.png b/src/afd/sprites/front-shiny/73--0--Tentacruel.png similarity index 100% rename from src/afd/sprites/front-shiny/Tentacruel.png rename to src/afd/sprites/front-shiny/73--0--Tentacruel.png diff --git a/src/afd/sprites/front-shiny/Primarina.png b/src/afd/sprites/front-shiny/730--0--Primarina.png similarity index 100% rename from src/afd/sprites/front-shiny/Primarina.png rename to src/afd/sprites/front-shiny/730--0--Primarina.png diff --git a/src/afd/sprites/front-shiny/Pikipek.png b/src/afd/sprites/front-shiny/731--0--Pikipek.png similarity index 100% rename from src/afd/sprites/front-shiny/Pikipek.png rename to src/afd/sprites/front-shiny/731--0--Pikipek.png diff --git a/src/afd/sprites/front-shiny/Trumbeak.png b/src/afd/sprites/front-shiny/732--0--Trumbeak.png similarity index 100% rename from src/afd/sprites/front-shiny/Trumbeak.png rename to src/afd/sprites/front-shiny/732--0--Trumbeak.png diff --git a/src/afd/sprites/front-shiny/Toucannon.png b/src/afd/sprites/front-shiny/733--0--Toucannon.png similarity index 100% rename from src/afd/sprites/front-shiny/Toucannon.png rename to src/afd/sprites/front-shiny/733--0--Toucannon.png diff --git a/src/afd/sprites/front-shiny/Yungoos.png b/src/afd/sprites/front-shiny/734--0--Yungoos.png similarity index 100% rename from src/afd/sprites/front-shiny/Yungoos.png rename to src/afd/sprites/front-shiny/734--0--Yungoos.png diff --git a/src/afd/sprites/front-shiny/Gumshoos.png b/src/afd/sprites/front-shiny/735--0--Gumshoos.png similarity index 100% rename from src/afd/sprites/front-shiny/Gumshoos.png rename to src/afd/sprites/front-shiny/735--0--Gumshoos.png diff --git a/src/afd/sprites/front-shiny/Grubbin.png b/src/afd/sprites/front-shiny/736--0--Grubbin.png similarity index 100% rename from src/afd/sprites/front-shiny/Grubbin.png rename to src/afd/sprites/front-shiny/736--0--Grubbin.png diff --git a/src/afd/sprites/front-shiny/Charjabug.png b/src/afd/sprites/front-shiny/737--0--Charjabug.png similarity index 100% rename from src/afd/sprites/front-shiny/Charjabug.png rename to src/afd/sprites/front-shiny/737--0--Charjabug.png diff --git a/src/afd/sprites/front-shiny/Vikavolt.png b/src/afd/sprites/front-shiny/738--0--Vikavolt.png similarity index 100% rename from src/afd/sprites/front-shiny/Vikavolt.png rename to src/afd/sprites/front-shiny/738--0--Vikavolt.png diff --git a/src/afd/sprites/front-shiny/Crabrawler.png b/src/afd/sprites/front-shiny/739--0--Crabrawler.png similarity index 100% rename from src/afd/sprites/front-shiny/Crabrawler.png rename to src/afd/sprites/front-shiny/739--0--Crabrawler.png diff --git a/src/afd/sprites/front-shiny/Geodude.png b/src/afd/sprites/front-shiny/74--0--Geodude.png similarity index 100% rename from src/afd/sprites/front-shiny/Geodude.png rename to src/afd/sprites/front-shiny/74--0--Geodude.png diff --git a/src/afd/sprites/front-shiny/Geodude--Alola.png b/src/afd/sprites/front-shiny/74--420--Geodude--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Geodude--Alola.png rename to src/afd/sprites/front-shiny/74--420--Geodude--Alola.png diff --git a/src/afd/sprites/front-shiny/Crabominable.png b/src/afd/sprites/front-shiny/740--0--Crabominable.png similarity index 100% rename from src/afd/sprites/front-shiny/Crabominable.png rename to src/afd/sprites/front-shiny/740--0--Crabominable.png diff --git a/src/afd/sprites/front-shiny/Oricorio.png b/src/afd/sprites/front-shiny/741--0--Oricorio.png similarity index 100% rename from src/afd/sprites/front-shiny/Oricorio.png rename to src/afd/sprites/front-shiny/741--0--Oricorio.png diff --git a/src/afd/sprites/front-shiny/Oricorio--Pa__0027u.png b/src/afd/sprites/front-shiny/741--420--Oricorio--Pa__0027u.png similarity index 100% rename from src/afd/sprites/front-shiny/Oricorio--Pa__0027u.png rename to src/afd/sprites/front-shiny/741--420--Oricorio--Pa__0027u.png diff --git a/src/afd/sprites/front-shiny/Oricorio--Pom-Pom.png b/src/afd/sprites/front-shiny/741--420--Oricorio--Pom-Pom.png similarity index 100% rename from src/afd/sprites/front-shiny/Oricorio--Pom-Pom.png rename to src/afd/sprites/front-shiny/741--420--Oricorio--Pom-Pom.png diff --git a/src/afd/sprites/front-shiny/Oricorio--Sensu.png b/src/afd/sprites/front-shiny/741--420--Oricorio--Sensu.png similarity index 100% rename from src/afd/sprites/front-shiny/Oricorio--Sensu.png rename to src/afd/sprites/front-shiny/741--420--Oricorio--Sensu.png diff --git a/src/afd/sprites/front-shiny/Cutiefly.png b/src/afd/sprites/front-shiny/742--0--Cutiefly.png similarity index 100% rename from src/afd/sprites/front-shiny/Cutiefly.png rename to src/afd/sprites/front-shiny/742--0--Cutiefly.png diff --git a/src/afd/sprites/front-shiny/Ribombee.png b/src/afd/sprites/front-shiny/743--0--Ribombee.png similarity index 100% rename from src/afd/sprites/front-shiny/Ribombee.png rename to src/afd/sprites/front-shiny/743--0--Ribombee.png diff --git a/src/afd/sprites/front-shiny/Rockruff.png b/src/afd/sprites/front-shiny/744--0--Rockruff.png similarity index 100% rename from src/afd/sprites/front-shiny/Rockruff.png rename to src/afd/sprites/front-shiny/744--0--Rockruff.png diff --git a/src/afd/sprites/front-shiny/Lycanroc.png b/src/afd/sprites/front-shiny/745--0--Lycanroc.png similarity index 100% rename from src/afd/sprites/front-shiny/Lycanroc.png rename to src/afd/sprites/front-shiny/745--0--Lycanroc.png diff --git a/src/afd/sprites/front-shiny/Lycanroc--Dusk.png b/src/afd/sprites/front-shiny/745--420--Lycanroc--Dusk.png similarity index 100% rename from src/afd/sprites/front-shiny/Lycanroc--Dusk.png rename to src/afd/sprites/front-shiny/745--420--Lycanroc--Dusk.png diff --git a/src/afd/sprites/front-shiny/Lycanroc--Midnight.png b/src/afd/sprites/front-shiny/745--420--Lycanroc--Midnight.png similarity index 100% rename from src/afd/sprites/front-shiny/Lycanroc--Midnight.png rename to src/afd/sprites/front-shiny/745--420--Lycanroc--Midnight.png diff --git a/src/afd/sprites/front-shiny/Wishiwashi.png b/src/afd/sprites/front-shiny/746--0--Wishiwashi.png similarity index 100% rename from src/afd/sprites/front-shiny/Wishiwashi.png rename to src/afd/sprites/front-shiny/746--0--Wishiwashi.png diff --git a/src/afd/sprites/front-shiny/Wishiwashi--School.png b/src/afd/sprites/front-shiny/746--420--Wishiwashi--School.png similarity index 100% rename from src/afd/sprites/front-shiny/Wishiwashi--School.png rename to src/afd/sprites/front-shiny/746--420--Wishiwashi--School.png diff --git a/src/afd/sprites/front-shiny/Mareanie.png b/src/afd/sprites/front-shiny/747--0--Mareanie.png similarity index 100% rename from src/afd/sprites/front-shiny/Mareanie.png rename to src/afd/sprites/front-shiny/747--0--Mareanie.png diff --git a/src/afd/sprites/front-shiny/Toxapex.png b/src/afd/sprites/front-shiny/748--0--Toxapex.png similarity index 100% rename from src/afd/sprites/front-shiny/Toxapex.png rename to src/afd/sprites/front-shiny/748--0--Toxapex.png diff --git a/src/afd/sprites/front-shiny/Mudbray.png b/src/afd/sprites/front-shiny/749--0--Mudbray.png similarity index 100% rename from src/afd/sprites/front-shiny/Mudbray.png rename to src/afd/sprites/front-shiny/749--0--Mudbray.png diff --git a/src/afd/sprites/front-shiny/Graveler.png b/src/afd/sprites/front-shiny/75--0--Graveler.png similarity index 100% rename from src/afd/sprites/front-shiny/Graveler.png rename to src/afd/sprites/front-shiny/75--0--Graveler.png diff --git a/src/afd/sprites/front-shiny/Graveler--Alola.png b/src/afd/sprites/front-shiny/75--420--Graveler--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Graveler--Alola.png rename to src/afd/sprites/front-shiny/75--420--Graveler--Alola.png diff --git a/src/afd/sprites/front-shiny/Mudsdale.png b/src/afd/sprites/front-shiny/750--0--Mudsdale.png similarity index 100% rename from src/afd/sprites/front-shiny/Mudsdale.png rename to src/afd/sprites/front-shiny/750--0--Mudsdale.png diff --git a/src/afd/sprites/front-shiny/Dewpider.png b/src/afd/sprites/front-shiny/751--0--Dewpider.png similarity index 100% rename from src/afd/sprites/front-shiny/Dewpider.png rename to src/afd/sprites/front-shiny/751--0--Dewpider.png diff --git a/src/afd/sprites/front-shiny/Araquanid.png b/src/afd/sprites/front-shiny/752--0--Araquanid.png similarity index 100% rename from src/afd/sprites/front-shiny/Araquanid.png rename to src/afd/sprites/front-shiny/752--0--Araquanid.png diff --git a/src/afd/sprites/front-shiny/Lurantis.png b/src/afd/sprites/front-shiny/754--0--Lurantis.png similarity index 100% rename from src/afd/sprites/front-shiny/Lurantis.png rename to src/afd/sprites/front-shiny/754--0--Lurantis.png diff --git a/src/afd/sprites/front-shiny/Morelull.png b/src/afd/sprites/front-shiny/755--0--Morelull.png similarity index 100% rename from src/afd/sprites/front-shiny/Morelull.png rename to src/afd/sprites/front-shiny/755--0--Morelull.png diff --git a/src/afd/sprites/front-shiny/Shiinotic.png b/src/afd/sprites/front-shiny/756--0--Shiinotic.png similarity index 100% rename from src/afd/sprites/front-shiny/Shiinotic.png rename to src/afd/sprites/front-shiny/756--0--Shiinotic.png diff --git a/src/afd/sprites/front-shiny/Salandit.png b/src/afd/sprites/front-shiny/757--0--Salandit.png similarity index 100% rename from src/afd/sprites/front-shiny/Salandit.png rename to src/afd/sprites/front-shiny/757--0--Salandit.png diff --git a/src/afd/sprites/front-shiny/Salazzle.png b/src/afd/sprites/front-shiny/758--0--Salazzle.png similarity index 100% rename from src/afd/sprites/front-shiny/Salazzle.png rename to src/afd/sprites/front-shiny/758--0--Salazzle.png diff --git a/src/afd/sprites/front-shiny/Stufful.png b/src/afd/sprites/front-shiny/759--0--Stufful.png similarity index 100% rename from src/afd/sprites/front-shiny/Stufful.png rename to src/afd/sprites/front-shiny/759--0--Stufful.png diff --git a/src/afd/sprites/front-shiny/Golem.png b/src/afd/sprites/front-shiny/76--0--Golem.png similarity index 100% rename from src/afd/sprites/front-shiny/Golem.png rename to src/afd/sprites/front-shiny/76--0--Golem.png diff --git a/src/afd/sprites/front-shiny/Golem--Alola.png b/src/afd/sprites/front-shiny/76--420--Golem--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Golem--Alola.png rename to src/afd/sprites/front-shiny/76--420--Golem--Alola.png diff --git a/src/afd/sprites/front-shiny/Bewear.png b/src/afd/sprites/front-shiny/760--0--Bewear.png similarity index 100% rename from src/afd/sprites/front-shiny/Bewear.png rename to src/afd/sprites/front-shiny/760--0--Bewear.png diff --git a/src/afd/sprites/front-shiny/Bounsweet.png b/src/afd/sprites/front-shiny/761--0--Bounsweet.png similarity index 100% rename from src/afd/sprites/front-shiny/Bounsweet.png rename to src/afd/sprites/front-shiny/761--0--Bounsweet.png diff --git a/src/afd/sprites/front-shiny/Steenee.png b/src/afd/sprites/front-shiny/762--0--Steenee.png similarity index 100% rename from src/afd/sprites/front-shiny/Steenee.png rename to src/afd/sprites/front-shiny/762--0--Steenee.png diff --git a/src/afd/sprites/front-shiny/Tsareena.png b/src/afd/sprites/front-shiny/763--0--Tsareena.png similarity index 100% rename from src/afd/sprites/front-shiny/Tsareena.png rename to src/afd/sprites/front-shiny/763--0--Tsareena.png diff --git a/src/afd/sprites/front-shiny/Comfey.png b/src/afd/sprites/front-shiny/764--0--Comfey.png similarity index 100% rename from src/afd/sprites/front-shiny/Comfey.png rename to src/afd/sprites/front-shiny/764--0--Comfey.png diff --git a/src/afd/sprites/front-shiny/Oranguru.png b/src/afd/sprites/front-shiny/765--0--Oranguru.png similarity index 100% rename from src/afd/sprites/front-shiny/Oranguru.png rename to src/afd/sprites/front-shiny/765--0--Oranguru.png diff --git a/src/afd/sprites/front-shiny/Passimian.png b/src/afd/sprites/front-shiny/766--0--Passimian.png similarity index 100% rename from src/afd/sprites/front-shiny/Passimian.png rename to src/afd/sprites/front-shiny/766--0--Passimian.png diff --git a/src/afd/sprites/front-shiny/Wimpod.png b/src/afd/sprites/front-shiny/767--0--Wimpod.png similarity index 100% rename from src/afd/sprites/front-shiny/Wimpod.png rename to src/afd/sprites/front-shiny/767--0--Wimpod.png diff --git a/src/afd/sprites/front-shiny/Golisopod.png b/src/afd/sprites/front-shiny/768--0--Golisopod.png similarity index 100% rename from src/afd/sprites/front-shiny/Golisopod.png rename to src/afd/sprites/front-shiny/768--0--Golisopod.png diff --git a/src/afd/sprites/front-shiny/Sandygast.png b/src/afd/sprites/front-shiny/769--0--Sandygast.png similarity index 100% rename from src/afd/sprites/front-shiny/Sandygast.png rename to src/afd/sprites/front-shiny/769--0--Sandygast.png diff --git a/src/afd/sprites/front-shiny/Ponyta.png b/src/afd/sprites/front-shiny/77--0--Ponyta.png similarity index 100% rename from src/afd/sprites/front-shiny/Ponyta.png rename to src/afd/sprites/front-shiny/77--0--Ponyta.png diff --git a/src/afd/sprites/front-shiny/Ponyta--Galar.png b/src/afd/sprites/front-shiny/77--420--Ponyta--Galar.png similarity index 100% rename from src/afd/sprites/front-shiny/Ponyta--Galar.png rename to src/afd/sprites/front-shiny/77--420--Ponyta--Galar.png diff --git a/src/afd/sprites/front-shiny/Palossand.png b/src/afd/sprites/front-shiny/770--0--Palossand.png similarity index 100% rename from src/afd/sprites/front-shiny/Palossand.png rename to src/afd/sprites/front-shiny/770--0--Palossand.png diff --git a/src/afd/sprites/front-shiny/Pyukumuku.png b/src/afd/sprites/front-shiny/771--0--Pyukumuku.png similarity index 100% rename from src/afd/sprites/front-shiny/Pyukumuku.png rename to src/afd/sprites/front-shiny/771--0--Pyukumuku.png diff --git a/src/afd/sprites/front-shiny/Type__003a_Null.png b/src/afd/sprites/front-shiny/772--0--Type__003a_Null.png similarity index 100% rename from src/afd/sprites/front-shiny/Type__003a_Null.png rename to src/afd/sprites/front-shiny/772--0--Type__003a_Null.png diff --git a/src/afd/sprites/front-shiny/Silvally.png b/src/afd/sprites/front-shiny/773--0--Silvally.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally.png rename to src/afd/sprites/front-shiny/773--0--Silvally.png diff --git a/src/afd/sprites/front-shiny/Silvally--Bug.png b/src/afd/sprites/front-shiny/773--420--Silvally--Bug.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Bug.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Bug.png diff --git a/src/afd/sprites/front-shiny/Silvally--Dark.png b/src/afd/sprites/front-shiny/773--420--Silvally--Dark.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Dark.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Dark.png diff --git a/src/afd/sprites/front-shiny/Silvally--Dragon.png b/src/afd/sprites/front-shiny/773--420--Silvally--Dragon.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Dragon.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Dragon.png diff --git a/src/afd/sprites/front-shiny/Silvally--Electric.png b/src/afd/sprites/front-shiny/773--420--Silvally--Electric.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Electric.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Electric.png diff --git a/src/afd/sprites/front-shiny/Silvally--Fairy.png b/src/afd/sprites/front-shiny/773--420--Silvally--Fairy.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Fairy.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Fairy.png diff --git a/src/afd/sprites/front-shiny/Silvally--Fighting.png b/src/afd/sprites/front-shiny/773--420--Silvally--Fighting.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Fighting.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Fighting.png diff --git a/src/afd/sprites/front-shiny/Silvally--Fire.png b/src/afd/sprites/front-shiny/773--420--Silvally--Fire.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Fire.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Fire.png diff --git a/src/afd/sprites/front-shiny/Silvally--Flying.png b/src/afd/sprites/front-shiny/773--420--Silvally--Flying.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Flying.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Flying.png diff --git a/src/afd/sprites/front-shiny/Silvally--Ghost.png b/src/afd/sprites/front-shiny/773--420--Silvally--Ghost.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Ghost.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Ghost.png diff --git a/src/afd/sprites/front-shiny/Silvally--Grass.png b/src/afd/sprites/front-shiny/773--420--Silvally--Grass.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Grass.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Grass.png diff --git a/src/afd/sprites/front-shiny/Silvally--Ground.png b/src/afd/sprites/front-shiny/773--420--Silvally--Ground.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Ground.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Ground.png diff --git a/src/afd/sprites/front-shiny/Silvally--Ice.png b/src/afd/sprites/front-shiny/773--420--Silvally--Ice.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Ice.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Ice.png diff --git a/src/afd/sprites/front-shiny/Silvally--Poison.png b/src/afd/sprites/front-shiny/773--420--Silvally--Poison.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Poison.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Poison.png diff --git a/src/afd/sprites/front-shiny/Silvally--Psychic.png b/src/afd/sprites/front-shiny/773--420--Silvally--Psychic.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Psychic.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Psychic.png diff --git a/src/afd/sprites/front-shiny/Silvally--Rock.png b/src/afd/sprites/front-shiny/773--420--Silvally--Rock.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Rock.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Rock.png diff --git a/src/afd/sprites/front-shiny/Silvally--Steel.png b/src/afd/sprites/front-shiny/773--420--Silvally--Steel.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Steel.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Steel.png diff --git a/src/afd/sprites/front-shiny/Silvally--Water.png b/src/afd/sprites/front-shiny/773--420--Silvally--Water.png similarity index 100% rename from src/afd/sprites/front-shiny/Silvally--Water.png rename to src/afd/sprites/front-shiny/773--420--Silvally--Water.png diff --git a/src/afd/sprites/front-shiny/Minior.png b/src/afd/sprites/front-shiny/774--0--Minior.png similarity index 100% rename from src/afd/sprites/front-shiny/Minior.png rename to src/afd/sprites/front-shiny/774--0--Minior.png diff --git a/src/afd/sprites/front-shiny/Minior--Meteor.png b/src/afd/sprites/front-shiny/774--420--Minior--Meteor.png similarity index 100% rename from src/afd/sprites/front-shiny/Minior--Meteor.png rename to src/afd/sprites/front-shiny/774--420--Minior--Meteor.png diff --git a/src/afd/sprites/front-shiny/Komala.png b/src/afd/sprites/front-shiny/775--0--Komala.png similarity index 100% rename from src/afd/sprites/front-shiny/Komala.png rename to src/afd/sprites/front-shiny/775--0--Komala.png diff --git a/src/afd/sprites/front-shiny/Turtonator.png b/src/afd/sprites/front-shiny/776--0--Turtonator.png similarity index 100% rename from src/afd/sprites/front-shiny/Turtonator.png rename to src/afd/sprites/front-shiny/776--0--Turtonator.png diff --git a/src/afd/sprites/front-shiny/Togedemaru.png b/src/afd/sprites/front-shiny/777--0--Togedemaru.png similarity index 100% rename from src/afd/sprites/front-shiny/Togedemaru.png rename to src/afd/sprites/front-shiny/777--0--Togedemaru.png diff --git a/src/afd/sprites/front-shiny/Mimikyu.png b/src/afd/sprites/front-shiny/778--0--Mimikyu.png similarity index 100% rename from src/afd/sprites/front-shiny/Mimikyu.png rename to src/afd/sprites/front-shiny/778--0--Mimikyu.png diff --git a/src/afd/sprites/front-shiny/Mimikyu--Busted.png b/src/afd/sprites/front-shiny/778--420--Mimikyu--Busted.png similarity index 100% rename from src/afd/sprites/front-shiny/Mimikyu--Busted.png rename to src/afd/sprites/front-shiny/778--420--Mimikyu--Busted.png diff --git a/src/afd/sprites/front-shiny/Bruxish.png b/src/afd/sprites/front-shiny/779--0--Bruxish.png similarity index 100% rename from src/afd/sprites/front-shiny/Bruxish.png rename to src/afd/sprites/front-shiny/779--0--Bruxish.png diff --git a/src/afd/sprites/front-shiny/Rapidash.png b/src/afd/sprites/front-shiny/78--0--Rapidash.png similarity index 100% rename from src/afd/sprites/front-shiny/Rapidash.png rename to src/afd/sprites/front-shiny/78--0--Rapidash.png diff --git a/src/afd/sprites/front-shiny/Rapidash--Galar.png b/src/afd/sprites/front-shiny/78--420--Rapidash--Galar.png similarity index 100% rename from src/afd/sprites/front-shiny/Rapidash--Galar.png rename to src/afd/sprites/front-shiny/78--420--Rapidash--Galar.png diff --git a/src/afd/sprites/front-shiny/Drampa.png b/src/afd/sprites/front-shiny/780--0--Drampa.png similarity index 100% rename from src/afd/sprites/front-shiny/Drampa.png rename to src/afd/sprites/front-shiny/780--0--Drampa.png diff --git a/src/afd/sprites/front-shiny/Dhelmise.png b/src/afd/sprites/front-shiny/781--0--Dhelmise.png similarity index 100% rename from src/afd/sprites/front-shiny/Dhelmise.png rename to src/afd/sprites/front-shiny/781--0--Dhelmise.png diff --git a/src/afd/sprites/front-shiny/Jangmo-o.png b/src/afd/sprites/front-shiny/782--0--Jangmo-o.png similarity index 100% rename from src/afd/sprites/front-shiny/Jangmo-o.png rename to src/afd/sprites/front-shiny/782--0--Jangmo-o.png diff --git a/src/afd/sprites/front-shiny/Hakamo-o.png b/src/afd/sprites/front-shiny/783--0--Hakamo-o.png similarity index 100% rename from src/afd/sprites/front-shiny/Hakamo-o.png rename to src/afd/sprites/front-shiny/783--0--Hakamo-o.png diff --git a/src/afd/sprites/front-shiny/Kommo-o.png b/src/afd/sprites/front-shiny/784--0--Kommo-o.png similarity index 100% rename from src/afd/sprites/front-shiny/Kommo-o.png rename to src/afd/sprites/front-shiny/784--0--Kommo-o.png diff --git a/src/afd/sprites/front-shiny/Tapu_Koko.png b/src/afd/sprites/front-shiny/785--0--Tapu_Koko.png similarity index 100% rename from src/afd/sprites/front-shiny/Tapu_Koko.png rename to src/afd/sprites/front-shiny/785--0--Tapu_Koko.png diff --git a/src/afd/sprites/front-shiny/Tapu_Lele.png b/src/afd/sprites/front-shiny/786--0--Tapu_Lele.png similarity index 100% rename from src/afd/sprites/front-shiny/Tapu_Lele.png rename to src/afd/sprites/front-shiny/786--0--Tapu_Lele.png diff --git a/src/afd/sprites/front-shiny/Tapu_Bulu.png b/src/afd/sprites/front-shiny/787--0--Tapu_Bulu.png similarity index 100% rename from src/afd/sprites/front-shiny/Tapu_Bulu.png rename to src/afd/sprites/front-shiny/787--0--Tapu_Bulu.png diff --git a/src/afd/sprites/front-shiny/Tapu_Fini.png b/src/afd/sprites/front-shiny/788--0--Tapu_Fini.png similarity index 100% rename from src/afd/sprites/front-shiny/Tapu_Fini.png rename to src/afd/sprites/front-shiny/788--0--Tapu_Fini.png diff --git a/src/afd/sprites/front-shiny/Cosmog.png b/src/afd/sprites/front-shiny/789--0--Cosmog.png similarity index 100% rename from src/afd/sprites/front-shiny/Cosmog.png rename to src/afd/sprites/front-shiny/789--0--Cosmog.png diff --git a/src/afd/sprites/front-shiny/Slowpoke.png b/src/afd/sprites/front-shiny/79--0--Slowpoke.png similarity index 100% rename from src/afd/sprites/front-shiny/Slowpoke.png rename to src/afd/sprites/front-shiny/79--0--Slowpoke.png diff --git a/src/afd/sprites/front-shiny/Slowpoke--Galar.png b/src/afd/sprites/front-shiny/79--420--Slowpoke--Galar.png similarity index 100% rename from src/afd/sprites/front-shiny/Slowpoke--Galar.png rename to src/afd/sprites/front-shiny/79--420--Slowpoke--Galar.png diff --git a/src/afd/sprites/front-shiny/Cosmoem.png b/src/afd/sprites/front-shiny/790--0--Cosmoem.png similarity index 100% rename from src/afd/sprites/front-shiny/Cosmoem.png rename to src/afd/sprites/front-shiny/790--0--Cosmoem.png diff --git a/src/afd/sprites/front-shiny/Solgaleo.png b/src/afd/sprites/front-shiny/791--0--Solgaleo.png similarity index 100% rename from src/afd/sprites/front-shiny/Solgaleo.png rename to src/afd/sprites/front-shiny/791--0--Solgaleo.png diff --git a/src/afd/sprites/front-shiny/Lunala.png b/src/afd/sprites/front-shiny/792--0--Lunala.png similarity index 100% rename from src/afd/sprites/front-shiny/Lunala.png rename to src/afd/sprites/front-shiny/792--0--Lunala.png diff --git a/src/afd/sprites/front-shiny/Nihilego.png b/src/afd/sprites/front-shiny/793--0--Nihilego.png similarity index 100% rename from src/afd/sprites/front-shiny/Nihilego.png rename to src/afd/sprites/front-shiny/793--0--Nihilego.png diff --git a/src/afd/sprites/front-shiny/Buzzwole.png b/src/afd/sprites/front-shiny/794--0--Buzzwole.png similarity index 100% rename from src/afd/sprites/front-shiny/Buzzwole.png rename to src/afd/sprites/front-shiny/794--0--Buzzwole.png diff --git a/src/afd/sprites/front-shiny/Pheromosa.png b/src/afd/sprites/front-shiny/795--0--Pheromosa.png similarity index 100% rename from src/afd/sprites/front-shiny/Pheromosa.png rename to src/afd/sprites/front-shiny/795--0--Pheromosa.png diff --git a/src/afd/sprites/front-shiny/Xurkitree.png b/src/afd/sprites/front-shiny/796--0--Xurkitree.png similarity index 100% rename from src/afd/sprites/front-shiny/Xurkitree.png rename to src/afd/sprites/front-shiny/796--0--Xurkitree.png diff --git a/src/afd/sprites/front-shiny/Celesteela.png b/src/afd/sprites/front-shiny/797--0--Celesteela.png similarity index 100% rename from src/afd/sprites/front-shiny/Celesteela.png rename to src/afd/sprites/front-shiny/797--0--Celesteela.png diff --git a/src/afd/sprites/front-shiny/Kartana.png b/src/afd/sprites/front-shiny/798--0--Kartana.png similarity index 100% rename from src/afd/sprites/front-shiny/Kartana.png rename to src/afd/sprites/front-shiny/798--0--Kartana.png diff --git a/src/afd/sprites/front-shiny/Guzzlord.png b/src/afd/sprites/front-shiny/799--0--Guzzlord.png similarity index 100% rename from src/afd/sprites/front-shiny/Guzzlord.png rename to src/afd/sprites/front-shiny/799--0--Guzzlord.png diff --git a/src/afd/sprites/front-shiny/Fidgit.png b/src/afd/sprites/front-shiny/8--0--Fidgit.png similarity index 100% rename from src/afd/sprites/front-shiny/Fidgit.png rename to src/afd/sprites/front-shiny/8--0--Fidgit.png diff --git a/src/afd/sprites/front-shiny/Wartortle.png b/src/afd/sprites/front-shiny/8--0--Wartortle.png similarity index 100% rename from src/afd/sprites/front-shiny/Wartortle.png rename to src/afd/sprites/front-shiny/8--0--Wartortle.png diff --git a/src/afd/sprites/front-shiny/Slowbro.png b/src/afd/sprites/front-shiny/80--0--Slowbro.png similarity index 100% rename from src/afd/sprites/front-shiny/Slowbro.png rename to src/afd/sprites/front-shiny/80--0--Slowbro.png diff --git a/src/afd/sprites/front-shiny/Slowbro--Mega.png b/src/afd/sprites/front-shiny/80--420--Slowbro--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Slowbro--Mega.png rename to src/afd/sprites/front-shiny/80--420--Slowbro--Mega.png diff --git a/src/afd/sprites/front-shiny/Necrozma.png b/src/afd/sprites/front-shiny/800--0--Necrozma.png similarity index 100% rename from src/afd/sprites/front-shiny/Necrozma.png rename to src/afd/sprites/front-shiny/800--0--Necrozma.png diff --git a/src/afd/sprites/front-shiny/Necrozma--Dawn-Wings.png b/src/afd/sprites/front-shiny/800--420--Necrozma--Dawn-Wings.png similarity index 100% rename from src/afd/sprites/front-shiny/Necrozma--Dawn-Wings.png rename to src/afd/sprites/front-shiny/800--420--Necrozma--Dawn-Wings.png diff --git a/src/afd/sprites/front-shiny/Necrozma--Dusk-Mane.png b/src/afd/sprites/front-shiny/800--420--Necrozma--Dusk-Mane.png similarity index 100% rename from src/afd/sprites/front-shiny/Necrozma--Dusk-Mane.png rename to src/afd/sprites/front-shiny/800--420--Necrozma--Dusk-Mane.png diff --git a/src/afd/sprites/front-shiny/Necrozma--Ultra.png b/src/afd/sprites/front-shiny/800--420--Necrozma--Ultra.png similarity index 100% rename from src/afd/sprites/front-shiny/Necrozma--Ultra.png rename to src/afd/sprites/front-shiny/800--420--Necrozma--Ultra.png diff --git a/src/afd/sprites/front-shiny/Magearna.png b/src/afd/sprites/front-shiny/801--0--Magearna.png similarity index 100% rename from src/afd/sprites/front-shiny/Magearna.png rename to src/afd/sprites/front-shiny/801--0--Magearna.png diff --git a/src/afd/sprites/front-shiny/Marshadow.png b/src/afd/sprites/front-shiny/802--0--Marshadow.png similarity index 100% rename from src/afd/sprites/front-shiny/Marshadow.png rename to src/afd/sprites/front-shiny/802--0--Marshadow.png diff --git a/src/afd/sprites/front-shiny/Poipole.png b/src/afd/sprites/front-shiny/803--0--Poipole.png similarity index 100% rename from src/afd/sprites/front-shiny/Poipole.png rename to src/afd/sprites/front-shiny/803--0--Poipole.png diff --git a/src/afd/sprites/front-shiny/Naganadel.png b/src/afd/sprites/front-shiny/804--0--Naganadel.png similarity index 100% rename from src/afd/sprites/front-shiny/Naganadel.png rename to src/afd/sprites/front-shiny/804--0--Naganadel.png diff --git a/src/afd/sprites/front-shiny/Stakataka.png b/src/afd/sprites/front-shiny/805--0--Stakataka.png similarity index 100% rename from src/afd/sprites/front-shiny/Stakataka.png rename to src/afd/sprites/front-shiny/805--0--Stakataka.png diff --git a/src/afd/sprites/front-shiny/Blacephalon.png b/src/afd/sprites/front-shiny/806--0--Blacephalon.png similarity index 100% rename from src/afd/sprites/front-shiny/Blacephalon.png rename to src/afd/sprites/front-shiny/806--0--Blacephalon.png diff --git a/src/afd/sprites/front-shiny/Zeraora.png b/src/afd/sprites/front-shiny/807--0--Zeraora.png similarity index 100% rename from src/afd/sprites/front-shiny/Zeraora.png rename to src/afd/sprites/front-shiny/807--0--Zeraora.png diff --git a/src/afd/sprites/front-shiny/Meltan.png b/src/afd/sprites/front-shiny/808--0--Meltan.png similarity index 100% rename from src/afd/sprites/front-shiny/Meltan.png rename to src/afd/sprites/front-shiny/808--0--Meltan.png diff --git a/src/afd/sprites/front-shiny/Melmetal.png b/src/afd/sprites/front-shiny/809--0--Melmetal.png similarity index 100% rename from src/afd/sprites/front-shiny/Melmetal.png rename to src/afd/sprites/front-shiny/809--0--Melmetal.png diff --git a/src/afd/sprites/front-shiny/Melmetal--Gmax.png b/src/afd/sprites/front-shiny/809--420--Melmetal--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Melmetal--Gmax.png rename to src/afd/sprites/front-shiny/809--420--Melmetal--Gmax.png diff --git a/src/afd/sprites/front-shiny/Magnemite.png b/src/afd/sprites/front-shiny/81--0--Magnemite.png similarity index 100% rename from src/afd/sprites/front-shiny/Magnemite.png rename to src/afd/sprites/front-shiny/81--0--Magnemite.png diff --git a/src/afd/sprites/front-shiny/Grookey.png b/src/afd/sprites/front-shiny/810--0--Grookey.png similarity index 100% rename from src/afd/sprites/front-shiny/Grookey.png rename to src/afd/sprites/front-shiny/810--0--Grookey.png diff --git a/src/afd/sprites/front-shiny/Thwackey.png b/src/afd/sprites/front-shiny/811--0--Thwackey.png similarity index 100% rename from src/afd/sprites/front-shiny/Thwackey.png rename to src/afd/sprites/front-shiny/811--0--Thwackey.png diff --git a/src/afd/sprites/front-shiny/Rillaboom.png b/src/afd/sprites/front-shiny/812--0--Rillaboom.png similarity index 100% rename from src/afd/sprites/front-shiny/Rillaboom.png rename to src/afd/sprites/front-shiny/812--0--Rillaboom.png diff --git a/src/afd/sprites/front-shiny/Scorbunny.png b/src/afd/sprites/front-shiny/813--0--Scorbunny.png similarity index 100% rename from src/afd/sprites/front-shiny/Scorbunny.png rename to src/afd/sprites/front-shiny/813--0--Scorbunny.png diff --git a/src/afd/sprites/front-shiny/Raboot.png b/src/afd/sprites/front-shiny/814--0--Raboot.png similarity index 100% rename from src/afd/sprites/front-shiny/Raboot.png rename to src/afd/sprites/front-shiny/814--0--Raboot.png diff --git a/src/afd/sprites/front-shiny/Cinderace.png b/src/afd/sprites/front-shiny/815--0--Cinderace.png similarity index 100% rename from src/afd/sprites/front-shiny/Cinderace.png rename to src/afd/sprites/front-shiny/815--0--Cinderace.png diff --git a/src/afd/sprites/front-shiny/Sobble.png b/src/afd/sprites/front-shiny/816--0--Sobble.png similarity index 100% rename from src/afd/sprites/front-shiny/Sobble.png rename to src/afd/sprites/front-shiny/816--0--Sobble.png diff --git a/src/afd/sprites/front-shiny/Drizzile.png b/src/afd/sprites/front-shiny/817--0--Drizzile.png similarity index 100% rename from src/afd/sprites/front-shiny/Drizzile.png rename to src/afd/sprites/front-shiny/817--0--Drizzile.png diff --git a/src/afd/sprites/front-shiny/Inteleon.png b/src/afd/sprites/front-shiny/818--0--Inteleon.png similarity index 100% rename from src/afd/sprites/front-shiny/Inteleon.png rename to src/afd/sprites/front-shiny/818--0--Inteleon.png diff --git a/src/afd/sprites/front-shiny/Skwovet.png b/src/afd/sprites/front-shiny/819--0--Skwovet.png similarity index 100% rename from src/afd/sprites/front-shiny/Skwovet.png rename to src/afd/sprites/front-shiny/819--0--Skwovet.png diff --git a/src/afd/sprites/front-shiny/Magneton.png b/src/afd/sprites/front-shiny/82--0--Magneton.png similarity index 100% rename from src/afd/sprites/front-shiny/Magneton.png rename to src/afd/sprites/front-shiny/82--0--Magneton.png diff --git a/src/afd/sprites/front-shiny/Greedent.png b/src/afd/sprites/front-shiny/820--0--Greedent.png similarity index 100% rename from src/afd/sprites/front-shiny/Greedent.png rename to src/afd/sprites/front-shiny/820--0--Greedent.png diff --git a/src/afd/sprites/front-shiny/Rookidee.png b/src/afd/sprites/front-shiny/821--0--Rookidee.png similarity index 100% rename from src/afd/sprites/front-shiny/Rookidee.png rename to src/afd/sprites/front-shiny/821--0--Rookidee.png diff --git a/src/afd/sprites/front-shiny/Corvisquire.png b/src/afd/sprites/front-shiny/822--0--Corvisquire.png similarity index 100% rename from src/afd/sprites/front-shiny/Corvisquire.png rename to src/afd/sprites/front-shiny/822--0--Corvisquire.png diff --git a/src/afd/sprites/front-shiny/Corviknight.png b/src/afd/sprites/front-shiny/823--0--Corviknight.png similarity index 100% rename from src/afd/sprites/front-shiny/Corviknight.png rename to src/afd/sprites/front-shiny/823--0--Corviknight.png diff --git a/src/afd/sprites/front-shiny/Corviknight--Gmax.png b/src/afd/sprites/front-shiny/823--420--Corviknight--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Corviknight--Gmax.png rename to src/afd/sprites/front-shiny/823--420--Corviknight--Gmax.png diff --git a/src/afd/sprites/front-shiny/Blipbug.png b/src/afd/sprites/front-shiny/824--0--Blipbug.png similarity index 100% rename from src/afd/sprites/front-shiny/Blipbug.png rename to src/afd/sprites/front-shiny/824--0--Blipbug.png diff --git a/src/afd/sprites/front-shiny/Dottler.png b/src/afd/sprites/front-shiny/825--0--Dottler.png similarity index 100% rename from src/afd/sprites/front-shiny/Dottler.png rename to src/afd/sprites/front-shiny/825--0--Dottler.png diff --git a/src/afd/sprites/front-shiny/Orbeetle.png b/src/afd/sprites/front-shiny/826--0--Orbeetle.png similarity index 100% rename from src/afd/sprites/front-shiny/Orbeetle.png rename to src/afd/sprites/front-shiny/826--0--Orbeetle.png diff --git a/src/afd/sprites/front-shiny/Orbeetle--Gmax.png b/src/afd/sprites/front-shiny/826--420--Orbeetle--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Orbeetle--Gmax.png rename to src/afd/sprites/front-shiny/826--420--Orbeetle--Gmax.png diff --git a/src/afd/sprites/front-shiny/Nickit.png b/src/afd/sprites/front-shiny/827--0--Nickit.png similarity index 100% rename from src/afd/sprites/front-shiny/Nickit.png rename to src/afd/sprites/front-shiny/827--0--Nickit.png diff --git a/src/afd/sprites/front-shiny/Thievul.png b/src/afd/sprites/front-shiny/828--0--Thievul.png similarity index 100% rename from src/afd/sprites/front-shiny/Thievul.png rename to src/afd/sprites/front-shiny/828--0--Thievul.png diff --git a/src/afd/sprites/front-shiny/Gossifleur.png b/src/afd/sprites/front-shiny/829--0--Gossifleur.png similarity index 100% rename from src/afd/sprites/front-shiny/Gossifleur.png rename to src/afd/sprites/front-shiny/829--0--Gossifleur.png diff --git a/src/afd/sprites/front-shiny/Farfetch__0027d.png b/src/afd/sprites/front-shiny/83--0--Farfetch__0027d.png similarity index 100% rename from src/afd/sprites/front-shiny/Farfetch__0027d.png rename to src/afd/sprites/front-shiny/83--0--Farfetch__0027d.png diff --git a/src/afd/sprites/front-shiny/Farfetch__0027d--Galar.png b/src/afd/sprites/front-shiny/83--420--Farfetch__0027d--Galar.png similarity index 100% rename from src/afd/sprites/front-shiny/Farfetch__0027d--Galar.png rename to src/afd/sprites/front-shiny/83--420--Farfetch__0027d--Galar.png diff --git a/src/afd/sprites/front-shiny/Eldegoss.png b/src/afd/sprites/front-shiny/830--0--Eldegoss.png similarity index 100% rename from src/afd/sprites/front-shiny/Eldegoss.png rename to src/afd/sprites/front-shiny/830--0--Eldegoss.png diff --git a/src/afd/sprites/front-shiny/Wooloo.png b/src/afd/sprites/front-shiny/831--0--Wooloo.png similarity index 100% rename from src/afd/sprites/front-shiny/Wooloo.png rename to src/afd/sprites/front-shiny/831--0--Wooloo.png diff --git a/src/afd/sprites/front-shiny/Dubwool.png b/src/afd/sprites/front-shiny/832--0--Dubwool.png similarity index 100% rename from src/afd/sprites/front-shiny/Dubwool.png rename to src/afd/sprites/front-shiny/832--0--Dubwool.png diff --git a/src/afd/sprites/front-shiny/Chewtle.png b/src/afd/sprites/front-shiny/833--0--Chewtle.png similarity index 100% rename from src/afd/sprites/front-shiny/Chewtle.png rename to src/afd/sprites/front-shiny/833--0--Chewtle.png diff --git a/src/afd/sprites/front-shiny/Drednaw.png b/src/afd/sprites/front-shiny/834--0--Drednaw.png similarity index 100% rename from src/afd/sprites/front-shiny/Drednaw.png rename to src/afd/sprites/front-shiny/834--0--Drednaw.png diff --git a/src/afd/sprites/front-shiny/Drednaw--Gmax.png b/src/afd/sprites/front-shiny/834--420--Drednaw--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Drednaw--Gmax.png rename to src/afd/sprites/front-shiny/834--420--Drednaw--Gmax.png diff --git a/src/afd/sprites/front-shiny/Yamper.png b/src/afd/sprites/front-shiny/835--0--Yamper.png similarity index 100% rename from src/afd/sprites/front-shiny/Yamper.png rename to src/afd/sprites/front-shiny/835--0--Yamper.png diff --git a/src/afd/sprites/front-shiny/Boltund.png b/src/afd/sprites/front-shiny/836--0--Boltund.png similarity index 100% rename from src/afd/sprites/front-shiny/Boltund.png rename to src/afd/sprites/front-shiny/836--0--Boltund.png diff --git a/src/afd/sprites/front-shiny/Rolycoly.png b/src/afd/sprites/front-shiny/837--0--Rolycoly.png similarity index 100% rename from src/afd/sprites/front-shiny/Rolycoly.png rename to src/afd/sprites/front-shiny/837--0--Rolycoly.png diff --git a/src/afd/sprites/front-shiny/Carkol.png b/src/afd/sprites/front-shiny/838--0--Carkol.png similarity index 100% rename from src/afd/sprites/front-shiny/Carkol.png rename to src/afd/sprites/front-shiny/838--0--Carkol.png diff --git a/src/afd/sprites/front-shiny/Coalossal.png b/src/afd/sprites/front-shiny/839--0--Coalossal.png similarity index 100% rename from src/afd/sprites/front-shiny/Coalossal.png rename to src/afd/sprites/front-shiny/839--0--Coalossal.png diff --git a/src/afd/sprites/front-shiny/Coalossal--Gmax.png b/src/afd/sprites/front-shiny/839--420--Coalossal--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Coalossal--Gmax.png rename to src/afd/sprites/front-shiny/839--420--Coalossal--Gmax.png diff --git a/src/afd/sprites/front-shiny/Doduo.png b/src/afd/sprites/front-shiny/84--0--Doduo.png similarity index 100% rename from src/afd/sprites/front-shiny/Doduo.png rename to src/afd/sprites/front-shiny/84--0--Doduo.png diff --git a/src/afd/sprites/front-shiny/Applin.png b/src/afd/sprites/front-shiny/840--0--Applin.png similarity index 100% rename from src/afd/sprites/front-shiny/Applin.png rename to src/afd/sprites/front-shiny/840--0--Applin.png diff --git a/src/afd/sprites/front-shiny/Flapple.png b/src/afd/sprites/front-shiny/841--0--Flapple.png similarity index 100% rename from src/afd/sprites/front-shiny/Flapple.png rename to src/afd/sprites/front-shiny/841--0--Flapple.png diff --git a/src/afd/sprites/front-shiny/Appletun--Gmax.png b/src/afd/sprites/front-shiny/841--420--Flapple--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Appletun--Gmax.png rename to src/afd/sprites/front-shiny/841--420--Flapple--Gmax.png diff --git a/src/afd/sprites/front-shiny/Appletun.png b/src/afd/sprites/front-shiny/842--0--Appletun.png similarity index 100% rename from src/afd/sprites/front-shiny/Appletun.png rename to src/afd/sprites/front-shiny/842--0--Appletun.png diff --git a/src/afd/sprites/front-shiny/Flapple--Gmax.png b/src/afd/sprites/front-shiny/842--420--Appletun--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Flapple--Gmax.png rename to src/afd/sprites/front-shiny/842--420--Appletun--Gmax.png diff --git a/src/afd/sprites/front-shiny/Silicobra.png b/src/afd/sprites/front-shiny/843--0--Silicobra.png similarity index 100% rename from src/afd/sprites/front-shiny/Silicobra.png rename to src/afd/sprites/front-shiny/843--0--Silicobra.png diff --git a/src/afd/sprites/front-shiny/Sandaconda.png b/src/afd/sprites/front-shiny/844--0--Sandaconda.png similarity index 100% rename from src/afd/sprites/front-shiny/Sandaconda.png rename to src/afd/sprites/front-shiny/844--0--Sandaconda.png diff --git a/src/afd/sprites/front-shiny/Sandaconda--Gmax.png b/src/afd/sprites/front-shiny/844--420--Sandaconda--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Sandaconda--Gmax.png rename to src/afd/sprites/front-shiny/844--420--Sandaconda--Gmax.png diff --git a/src/afd/sprites/front-shiny/Cramorant.png b/src/afd/sprites/front-shiny/845--0--Cramorant.png similarity index 100% rename from src/afd/sprites/front-shiny/Cramorant.png rename to src/afd/sprites/front-shiny/845--0--Cramorant.png diff --git a/src/afd/sprites/front-shiny/Cramorant--Gorging.png b/src/afd/sprites/front-shiny/845--420--Cramorant--Gorging.png similarity index 100% rename from src/afd/sprites/front-shiny/Cramorant--Gorging.png rename to src/afd/sprites/front-shiny/845--420--Cramorant--Gorging.png diff --git a/src/afd/sprites/front-shiny/Cramorant--Gulping.png b/src/afd/sprites/front-shiny/845--420--Cramorant--Gulping.png similarity index 100% rename from src/afd/sprites/front-shiny/Cramorant--Gulping.png rename to src/afd/sprites/front-shiny/845--420--Cramorant--Gulping.png diff --git a/src/afd/sprites/front-shiny/Arrokuda.png b/src/afd/sprites/front-shiny/846--0--Arrokuda.png similarity index 100% rename from src/afd/sprites/front-shiny/Arrokuda.png rename to src/afd/sprites/front-shiny/846--0--Arrokuda.png diff --git a/src/afd/sprites/front-shiny/Barraskewda.png b/src/afd/sprites/front-shiny/847--0--Barraskewda.png similarity index 100% rename from src/afd/sprites/front-shiny/Barraskewda.png rename to src/afd/sprites/front-shiny/847--0--Barraskewda.png diff --git a/src/afd/sprites/front-shiny/Toxel.png b/src/afd/sprites/front-shiny/848--0--Toxel.png similarity index 100% rename from src/afd/sprites/front-shiny/Toxel.png rename to src/afd/sprites/front-shiny/848--0--Toxel.png diff --git a/src/afd/sprites/front-shiny/Toxtricity.png b/src/afd/sprites/front-shiny/849--0--Toxtricity.png similarity index 100% rename from src/afd/sprites/front-shiny/Toxtricity.png rename to src/afd/sprites/front-shiny/849--0--Toxtricity.png diff --git a/src/afd/sprites/front-shiny/Toxtricity--Gmax.png b/src/afd/sprites/front-shiny/849--420--Toxtricity--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Toxtricity--Gmax.png rename to src/afd/sprites/front-shiny/849--420--Toxtricity--Gmax.png diff --git a/src/afd/sprites/front-shiny/Toxtricity--Low-Key-Gmax.png b/src/afd/sprites/front-shiny/849--420--Toxtricity--Low-Key-Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Toxtricity--Low-Key-Gmax.png rename to src/afd/sprites/front-shiny/849--420--Toxtricity--Low-Key-Gmax.png diff --git a/src/afd/sprites/front-shiny/Toxtricity--Low-Key.png b/src/afd/sprites/front-shiny/849--420--Toxtricity--Low-Key.png similarity index 100% rename from src/afd/sprites/front-shiny/Toxtricity--Low-Key.png rename to src/afd/sprites/front-shiny/849--420--Toxtricity--Low-Key.png diff --git a/src/afd/sprites/front-shiny/Dodrio.png b/src/afd/sprites/front-shiny/85--0--Dodrio.png similarity index 100% rename from src/afd/sprites/front-shiny/Dodrio.png rename to src/afd/sprites/front-shiny/85--0--Dodrio.png diff --git a/src/afd/sprites/front-shiny/Sizzlipede.png b/src/afd/sprites/front-shiny/850--0--Sizzlipede.png similarity index 100% rename from src/afd/sprites/front-shiny/Sizzlipede.png rename to src/afd/sprites/front-shiny/850--0--Sizzlipede.png diff --git a/src/afd/sprites/front-shiny/Centiskorch.png b/src/afd/sprites/front-shiny/851--0--Centiskorch.png similarity index 100% rename from src/afd/sprites/front-shiny/Centiskorch.png rename to src/afd/sprites/front-shiny/851--0--Centiskorch.png diff --git a/src/afd/sprites/front-shiny/Centiskorch--Gmax.png b/src/afd/sprites/front-shiny/851--420--Centiskorch--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Centiskorch--Gmax.png rename to src/afd/sprites/front-shiny/851--420--Centiskorch--Gmax.png diff --git a/src/afd/sprites/front-shiny/Clobbopus.png b/src/afd/sprites/front-shiny/852--0--Clobbopus.png similarity index 100% rename from src/afd/sprites/front-shiny/Clobbopus.png rename to src/afd/sprites/front-shiny/852--0--Clobbopus.png diff --git a/src/afd/sprites/front-shiny/Grapploct.png b/src/afd/sprites/front-shiny/853--0--Grapploct.png similarity index 100% rename from src/afd/sprites/front-shiny/Grapploct.png rename to src/afd/sprites/front-shiny/853--0--Grapploct.png diff --git a/src/afd/sprites/front-shiny/Sinistea.png b/src/afd/sprites/front-shiny/854--0--Sinistea.png similarity index 100% rename from src/afd/sprites/front-shiny/Sinistea.png rename to src/afd/sprites/front-shiny/854--0--Sinistea.png diff --git a/src/afd/sprites/front-shiny/Polteageist.png b/src/afd/sprites/front-shiny/855--0--Polteageist.png similarity index 100% rename from src/afd/sprites/front-shiny/Polteageist.png rename to src/afd/sprites/front-shiny/855--0--Polteageist.png diff --git a/src/afd/sprites/front-shiny/Hatenna.png b/src/afd/sprites/front-shiny/856--0--Hatenna.png similarity index 100% rename from src/afd/sprites/front-shiny/Hatenna.png rename to src/afd/sprites/front-shiny/856--0--Hatenna.png diff --git a/src/afd/sprites/front-shiny/Hattrem.png b/src/afd/sprites/front-shiny/857--0--Hattrem.png similarity index 100% rename from src/afd/sprites/front-shiny/Hattrem.png rename to src/afd/sprites/front-shiny/857--0--Hattrem.png diff --git a/src/afd/sprites/front-shiny/Hatterene.png b/src/afd/sprites/front-shiny/858--0--Hatterene.png similarity index 100% rename from src/afd/sprites/front-shiny/Hatterene.png rename to src/afd/sprites/front-shiny/858--0--Hatterene.png diff --git a/src/afd/sprites/front-shiny/Hatterene--Gmax.png b/src/afd/sprites/front-shiny/858--420--Hatterene--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Hatterene--Gmax.png rename to src/afd/sprites/front-shiny/858--420--Hatterene--Gmax.png diff --git a/src/afd/sprites/front-shiny/Impidimp.png b/src/afd/sprites/front-shiny/859--0--Impidimp.png similarity index 100% rename from src/afd/sprites/front-shiny/Impidimp.png rename to src/afd/sprites/front-shiny/859--0--Impidimp.png diff --git a/src/afd/sprites/front-shiny/Seel.png b/src/afd/sprites/front-shiny/86--0--Seel.png similarity index 100% rename from src/afd/sprites/front-shiny/Seel.png rename to src/afd/sprites/front-shiny/86--0--Seel.png diff --git a/src/afd/sprites/front-shiny/Morgrem.png b/src/afd/sprites/front-shiny/860--0--Morgrem.png similarity index 100% rename from src/afd/sprites/front-shiny/Morgrem.png rename to src/afd/sprites/front-shiny/860--0--Morgrem.png diff --git a/src/afd/sprites/front-shiny/Grimmsnarl.png b/src/afd/sprites/front-shiny/861--0--Grimmsnarl.png similarity index 100% rename from src/afd/sprites/front-shiny/Grimmsnarl.png rename to src/afd/sprites/front-shiny/861--0--Grimmsnarl.png diff --git a/src/afd/sprites/front-shiny/Grimmsnarl--Gmax.png b/src/afd/sprites/front-shiny/861--420--Grimmsnarl--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Grimmsnarl--Gmax.png rename to src/afd/sprites/front-shiny/861--420--Grimmsnarl--Gmax.png diff --git a/src/afd/sprites/front-shiny/Obstagoon.png b/src/afd/sprites/front-shiny/862--0--Obstagoon.png similarity index 100% rename from src/afd/sprites/front-shiny/Obstagoon.png rename to src/afd/sprites/front-shiny/862--0--Obstagoon.png diff --git a/src/afd/sprites/front-shiny/Perrserker.png b/src/afd/sprites/front-shiny/863--0--Perrserker.png similarity index 100% rename from src/afd/sprites/front-shiny/Perrserker.png rename to src/afd/sprites/front-shiny/863--0--Perrserker.png diff --git a/src/afd/sprites/front-shiny/Cursola.png b/src/afd/sprites/front-shiny/864--0--Cursola.png similarity index 100% rename from src/afd/sprites/front-shiny/Cursola.png rename to src/afd/sprites/front-shiny/864--0--Cursola.png diff --git a/src/afd/sprites/front-shiny/Sirfetch__0027d.png b/src/afd/sprites/front-shiny/865--0--Sirfetch__0027d.png similarity index 100% rename from src/afd/sprites/front-shiny/Sirfetch__0027d.png rename to src/afd/sprites/front-shiny/865--0--Sirfetch__0027d.png diff --git a/src/afd/sprites/front-shiny/Mr._Rime.png b/src/afd/sprites/front-shiny/866--0--Mr._Rime.png similarity index 100% rename from src/afd/sprites/front-shiny/Mr._Rime.png rename to src/afd/sprites/front-shiny/866--0--Mr._Rime.png diff --git a/src/afd/sprites/front-shiny/Runerigus.png b/src/afd/sprites/front-shiny/867--0--Runerigus.png similarity index 100% rename from src/afd/sprites/front-shiny/Runerigus.png rename to src/afd/sprites/front-shiny/867--0--Runerigus.png diff --git a/src/afd/sprites/front-shiny/Milcery.png b/src/afd/sprites/front-shiny/868--0--Milcery.png similarity index 100% rename from src/afd/sprites/front-shiny/Milcery.png rename to src/afd/sprites/front-shiny/868--0--Milcery.png diff --git a/src/afd/sprites/front-shiny/Alcremie.png b/src/afd/sprites/front-shiny/869--0--Alcremie.png similarity index 100% rename from src/afd/sprites/front-shiny/Alcremie.png rename to src/afd/sprites/front-shiny/869--0--Alcremie.png diff --git a/src/afd/sprites/front-shiny/Alcremie--Gmax.png b/src/afd/sprites/front-shiny/869--420--Alcremie--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Alcremie--Gmax.png rename to src/afd/sprites/front-shiny/869--420--Alcremie--Gmax.png diff --git a/src/afd/sprites/front-shiny/Dewgong.png b/src/afd/sprites/front-shiny/87--0--Dewgong.png similarity index 100% rename from src/afd/sprites/front-shiny/Dewgong.png rename to src/afd/sprites/front-shiny/87--0--Dewgong.png diff --git a/src/afd/sprites/front-shiny/Falinks.png b/src/afd/sprites/front-shiny/870--0--Falinks.png similarity index 100% rename from src/afd/sprites/front-shiny/Falinks.png rename to src/afd/sprites/front-shiny/870--0--Falinks.png diff --git a/src/afd/sprites/front-shiny/Pincurchin.png b/src/afd/sprites/front-shiny/871--0--Pincurchin.png similarity index 100% rename from src/afd/sprites/front-shiny/Pincurchin.png rename to src/afd/sprites/front-shiny/871--0--Pincurchin.png diff --git a/src/afd/sprites/front-shiny/Snom.png b/src/afd/sprites/front-shiny/872--0--Snom.png similarity index 100% rename from src/afd/sprites/front-shiny/Snom.png rename to src/afd/sprites/front-shiny/872--0--Snom.png diff --git a/src/afd/sprites/front-shiny/Frosmoth.png b/src/afd/sprites/front-shiny/873--0--Frosmoth.png similarity index 100% rename from src/afd/sprites/front-shiny/Frosmoth.png rename to src/afd/sprites/front-shiny/873--0--Frosmoth.png diff --git a/src/afd/sprites/front-shiny/Stonjourner.png b/src/afd/sprites/front-shiny/874--0--Stonjourner.png similarity index 100% rename from src/afd/sprites/front-shiny/Stonjourner.png rename to src/afd/sprites/front-shiny/874--0--Stonjourner.png diff --git a/src/afd/sprites/front-shiny/Eiscue.png b/src/afd/sprites/front-shiny/875--0--Eiscue.png similarity index 100% rename from src/afd/sprites/front-shiny/Eiscue.png rename to src/afd/sprites/front-shiny/875--0--Eiscue.png diff --git a/src/afd/sprites/front-shiny/Eiscue--Noice.png b/src/afd/sprites/front-shiny/875--420--Eiscue--Noice.png similarity index 100% rename from src/afd/sprites/front-shiny/Eiscue--Noice.png rename to src/afd/sprites/front-shiny/875--420--Eiscue--Noice.png diff --git a/src/afd/sprites/front-shiny/Indeedee.png b/src/afd/sprites/front-shiny/876--0--Indeedee.png similarity index 100% rename from src/afd/sprites/front-shiny/Indeedee.png rename to src/afd/sprites/front-shiny/876--0--Indeedee.png diff --git a/src/afd/sprites/front-shiny/Indeedee--F.png b/src/afd/sprites/front-shiny/876--420--Indeedee--F.png similarity index 100% rename from src/afd/sprites/front-shiny/Indeedee--F.png rename to src/afd/sprites/front-shiny/876--420--Indeedee--F.png diff --git a/src/afd/sprites/front-shiny/Morpeko.png b/src/afd/sprites/front-shiny/877--0--Morpeko.png similarity index 100% rename from src/afd/sprites/front-shiny/Morpeko.png rename to src/afd/sprites/front-shiny/877--0--Morpeko.png diff --git a/src/afd/sprites/front-shiny/Morpeko--Hangry.png b/src/afd/sprites/front-shiny/877--420--Morpeko--Hangry.png similarity index 100% rename from src/afd/sprites/front-shiny/Morpeko--Hangry.png rename to src/afd/sprites/front-shiny/877--420--Morpeko--Hangry.png diff --git a/src/afd/sprites/front-shiny/Cufant.png b/src/afd/sprites/front-shiny/878--0--Cufant.png similarity index 100% rename from src/afd/sprites/front-shiny/Cufant.png rename to src/afd/sprites/front-shiny/878--0--Cufant.png diff --git a/src/afd/sprites/front-shiny/Copperajah.png b/src/afd/sprites/front-shiny/879--0--Copperajah.png similarity index 100% rename from src/afd/sprites/front-shiny/Copperajah.png rename to src/afd/sprites/front-shiny/879--0--Copperajah.png diff --git a/src/afd/sprites/front-shiny/Copperajah--Gmax.png b/src/afd/sprites/front-shiny/879--420--Copperajah--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Copperajah--Gmax.png rename to src/afd/sprites/front-shiny/879--420--Copperajah--Gmax.png diff --git a/src/afd/sprites/front-shiny/Grimer.png b/src/afd/sprites/front-shiny/88--0--Grimer.png similarity index 100% rename from src/afd/sprites/front-shiny/Grimer.png rename to src/afd/sprites/front-shiny/88--0--Grimer.png diff --git a/src/afd/sprites/front-shiny/Grimer--Alola.png b/src/afd/sprites/front-shiny/88--420--Grimer--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Grimer--Alola.png rename to src/afd/sprites/front-shiny/88--420--Grimer--Alola.png diff --git a/src/afd/sprites/front-shiny/Dracozolt.png b/src/afd/sprites/front-shiny/880--0--Dracozolt.png similarity index 100% rename from src/afd/sprites/front-shiny/Dracozolt.png rename to src/afd/sprites/front-shiny/880--0--Dracozolt.png diff --git a/src/afd/sprites/front-shiny/Arctozolt.png b/src/afd/sprites/front-shiny/881--0--Arctozolt.png similarity index 100% rename from src/afd/sprites/front-shiny/Arctozolt.png rename to src/afd/sprites/front-shiny/881--0--Arctozolt.png diff --git a/src/afd/sprites/front-shiny/Dracovish.png b/src/afd/sprites/front-shiny/882--0--Dracovish.png similarity index 100% rename from src/afd/sprites/front-shiny/Dracovish.png rename to src/afd/sprites/front-shiny/882--0--Dracovish.png diff --git a/src/afd/sprites/front-shiny/Arctovish.png b/src/afd/sprites/front-shiny/883--0--Arctovish.png similarity index 100% rename from src/afd/sprites/front-shiny/Arctovish.png rename to src/afd/sprites/front-shiny/883--0--Arctovish.png diff --git a/src/afd/sprites/front-shiny/Duraludon.png b/src/afd/sprites/front-shiny/884--0--Duraludon.png similarity index 100% rename from src/afd/sprites/front-shiny/Duraludon.png rename to src/afd/sprites/front-shiny/884--0--Duraludon.png diff --git a/src/afd/sprites/front-shiny/Duraludon--Gmax.png b/src/afd/sprites/front-shiny/884--420--Duraludon--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Duraludon--Gmax.png rename to src/afd/sprites/front-shiny/884--420--Duraludon--Gmax.png diff --git a/src/afd/sprites/front-shiny/Dreepy.png b/src/afd/sprites/front-shiny/885--0--Dreepy.png similarity index 100% rename from src/afd/sprites/front-shiny/Dreepy.png rename to src/afd/sprites/front-shiny/885--0--Dreepy.png diff --git a/src/afd/sprites/front-shiny/Drakloak.png b/src/afd/sprites/front-shiny/886--0--Drakloak.png similarity index 100% rename from src/afd/sprites/front-shiny/Drakloak.png rename to src/afd/sprites/front-shiny/886--0--Drakloak.png diff --git a/src/afd/sprites/front-shiny/Dragapult.png b/src/afd/sprites/front-shiny/887--0--Dragapult.png similarity index 100% rename from src/afd/sprites/front-shiny/Dragapult.png rename to src/afd/sprites/front-shiny/887--0--Dragapult.png diff --git a/src/afd/sprites/front-shiny/Zacian.png b/src/afd/sprites/front-shiny/888--0--Zacian.png similarity index 100% rename from src/afd/sprites/front-shiny/Zacian.png rename to src/afd/sprites/front-shiny/888--0--Zacian.png diff --git a/src/afd/sprites/front-shiny/Zacian--Crowned.png b/src/afd/sprites/front-shiny/888--420--Zacian--Crowned.png similarity index 100% rename from src/afd/sprites/front-shiny/Zacian--Crowned.png rename to src/afd/sprites/front-shiny/888--420--Zacian--Crowned.png diff --git a/src/afd/sprites/front-shiny/Zamazenta.png b/src/afd/sprites/front-shiny/889--0--Zamazenta.png similarity index 100% rename from src/afd/sprites/front-shiny/Zamazenta.png rename to src/afd/sprites/front-shiny/889--0--Zamazenta.png diff --git a/src/afd/sprites/front-shiny/Zamazenta--Crowned.png b/src/afd/sprites/front-shiny/889--420--Zamazenta--Crowned.png similarity index 100% rename from src/afd/sprites/front-shiny/Zamazenta--Crowned.png rename to src/afd/sprites/front-shiny/889--420--Zamazenta--Crowned.png diff --git a/src/afd/sprites/front-shiny/Muk.png b/src/afd/sprites/front-shiny/89--0--Muk.png similarity index 100% rename from src/afd/sprites/front-shiny/Muk.png rename to src/afd/sprites/front-shiny/89--0--Muk.png diff --git a/src/afd/sprites/front-shiny/Muk--Alola.png b/src/afd/sprites/front-shiny/89--420--Muk--Alola.png similarity index 100% rename from src/afd/sprites/front-shiny/Muk--Alola.png rename to src/afd/sprites/front-shiny/89--420--Muk--Alola.png diff --git a/src/afd/sprites/front-shiny/Eternatus.png b/src/afd/sprites/front-shiny/890--0--Eternatus.png similarity index 100% rename from src/afd/sprites/front-shiny/Eternatus.png rename to src/afd/sprites/front-shiny/890--0--Eternatus.png diff --git a/src/afd/sprites/front-shiny/Eternatus--Eternamax.png b/src/afd/sprites/front-shiny/890--420--Eternatus--Eternamax.png similarity index 100% rename from src/afd/sprites/front-shiny/Eternatus--Eternamax.png rename to src/afd/sprites/front-shiny/890--420--Eternatus--Eternamax.png diff --git a/src/afd/sprites/front-shiny/Blastoise.png b/src/afd/sprites/front-shiny/9--0--Blastoise.png similarity index 100% rename from src/afd/sprites/front-shiny/Blastoise.png rename to src/afd/sprites/front-shiny/9--0--Blastoise.png diff --git a/src/afd/sprites/front-shiny/Blastoise--Mega.png b/src/afd/sprites/front-shiny/9--420--Blastoise--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Blastoise--Mega.png rename to src/afd/sprites/front-shiny/9--420--Blastoise--Mega.png diff --git a/src/afd/sprites/front-shiny/Shellder.png b/src/afd/sprites/front-shiny/90--0--Shellder.png similarity index 100% rename from src/afd/sprites/front-shiny/Shellder.png rename to src/afd/sprites/front-shiny/90--0--Shellder.png diff --git a/src/afd/sprites/front-shiny/Cloyster.png b/src/afd/sprites/front-shiny/91--0--Cloyster.png similarity index 100% rename from src/afd/sprites/front-shiny/Cloyster.png rename to src/afd/sprites/front-shiny/91--0--Cloyster.png diff --git a/src/afd/sprites/front-shiny/Gastly.png b/src/afd/sprites/front-shiny/92--0--Gastly.png similarity index 100% rename from src/afd/sprites/front-shiny/Gastly.png rename to src/afd/sprites/front-shiny/92--0--Gastly.png diff --git a/src/afd/sprites/front-shiny/Haunter.png b/src/afd/sprites/front-shiny/93--0--Haunter.png similarity index 100% rename from src/afd/sprites/front-shiny/Haunter.png rename to src/afd/sprites/front-shiny/93--0--Haunter.png diff --git a/src/afd/sprites/front-shiny/Gengar.png b/src/afd/sprites/front-shiny/94--0--Gengar.png similarity index 100% rename from src/afd/sprites/front-shiny/Gengar.png rename to src/afd/sprites/front-shiny/94--0--Gengar.png diff --git a/src/afd/sprites/front-shiny/Gengar--Gmax.png b/src/afd/sprites/front-shiny/94--420--Gengar--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Gengar--Gmax.png rename to src/afd/sprites/front-shiny/94--420--Gengar--Gmax.png diff --git a/src/afd/sprites/front-shiny/Gengar--Mega.png b/src/afd/sprites/front-shiny/94--420--Gengar--Mega.png similarity index 100% rename from src/afd/sprites/front-shiny/Gengar--Mega.png rename to src/afd/sprites/front-shiny/94--420--Gengar--Mega.png diff --git a/src/afd/sprites/front-shiny/Onix.png b/src/afd/sprites/front-shiny/95--0--Onix.png similarity index 100% rename from src/afd/sprites/front-shiny/Onix.png rename to src/afd/sprites/front-shiny/95--0--Onix.png diff --git a/src/afd/sprites/front-shiny/Drowzee.png b/src/afd/sprites/front-shiny/96--0--Drowzee.png similarity index 100% rename from src/afd/sprites/front-shiny/Drowzee.png rename to src/afd/sprites/front-shiny/96--0--Drowzee.png diff --git a/src/afd/sprites/front-shiny/Hypno.png b/src/afd/sprites/front-shiny/97--0--Hypno.png similarity index 100% rename from src/afd/sprites/front-shiny/Hypno.png rename to src/afd/sprites/front-shiny/97--0--Hypno.png diff --git a/src/afd/sprites/front-shiny/Krabby.png b/src/afd/sprites/front-shiny/98--0--Krabby.png similarity index 100% rename from src/afd/sprites/front-shiny/Krabby.png rename to src/afd/sprites/front-shiny/98--0--Krabby.png diff --git a/src/afd/sprites/front-shiny/Kingler.png b/src/afd/sprites/front-shiny/99--0--Kingler.png similarity index 100% rename from src/afd/sprites/front-shiny/Kingler.png rename to src/afd/sprites/front-shiny/99--0--Kingler.png diff --git a/src/afd/sprites/front-shiny/Kingler--Gmax.png b/src/afd/sprites/front-shiny/99--420--Kingler--Gmax.png similarity index 100% rename from src/afd/sprites/front-shiny/Kingler--Gmax.png rename to src/afd/sprites/front-shiny/99--420--Kingler--Gmax.png diff --git a/src/afd/sprites/front/Missingno..png b/src/afd/sprites/front/0--0--Missingno..png similarity index 100% rename from src/afd/sprites/front/Missingno..png rename to src/afd/sprites/front/0--0--Missingno..png diff --git a/src/afd/sprites/front/Bulbasaur.png b/src/afd/sprites/front/1--0--Bulbasaur.png similarity index 100% rename from src/afd/sprites/front/Bulbasaur.png rename to src/afd/sprites/front/1--0--Bulbasaur.png diff --git a/src/afd/sprites/front/Caterpie.png b/src/afd/sprites/front/10--0--Caterpie.png similarity index 100% rename from src/afd/sprites/front/Caterpie.png rename to src/afd/sprites/front/10--0--Caterpie.png diff --git a/src/afd/sprites/front/Voltorb.png b/src/afd/sprites/front/100--0--Voltorb.png similarity index 100% rename from src/afd/sprites/front/Voltorb.png rename to src/afd/sprites/front/100--0--Voltorb.png diff --git a/src/afd/sprites/front/Electrode.png b/src/afd/sprites/front/101--0--Electrode.png similarity index 100% rename from src/afd/sprites/front/Electrode.png rename to src/afd/sprites/front/101--0--Electrode.png diff --git a/src/afd/sprites/front/Exeggcute.png b/src/afd/sprites/front/102--0--Exeggcute.png similarity index 100% rename from src/afd/sprites/front/Exeggcute.png rename to src/afd/sprites/front/102--0--Exeggcute.png diff --git a/src/afd/sprites/front/Exeggutor.png b/src/afd/sprites/front/103--0--Exeggutor.png similarity index 100% rename from src/afd/sprites/front/Exeggutor.png rename to src/afd/sprites/front/103--0--Exeggutor.png diff --git a/src/afd/sprites/front/Exeggutor--Alola.png b/src/afd/sprites/front/103--420--Exeggutor--Alola.png similarity index 100% rename from src/afd/sprites/front/Exeggutor--Alola.png rename to src/afd/sprites/front/103--420--Exeggutor--Alola.png diff --git a/src/afd/sprites/front/Cubone.png b/src/afd/sprites/front/104--0--Cubone.png similarity index 100% rename from src/afd/sprites/front/Cubone.png rename to src/afd/sprites/front/104--0--Cubone.png diff --git a/src/afd/sprites/front/Marowak.png b/src/afd/sprites/front/105--0--Marowak.png similarity index 100% rename from src/afd/sprites/front/Marowak.png rename to src/afd/sprites/front/105--0--Marowak.png diff --git a/src/afd/sprites/front/Marowak--Alola.png b/src/afd/sprites/front/105--420--Marowak--Alola.png similarity index 100% rename from src/afd/sprites/front/Marowak--Alola.png rename to src/afd/sprites/front/105--420--Marowak--Alola.png diff --git a/src/afd/sprites/front/Hitmonlee.png b/src/afd/sprites/front/106--0--Hitmonlee.png similarity index 100% rename from src/afd/sprites/front/Hitmonlee.png rename to src/afd/sprites/front/106--0--Hitmonlee.png diff --git a/src/afd/sprites/front/Hitmonchan.png b/src/afd/sprites/front/107--0--Hitmonchan.png similarity index 100% rename from src/afd/sprites/front/Hitmonchan.png rename to src/afd/sprites/front/107--0--Hitmonchan.png diff --git a/src/afd/sprites/front/Lickitung.png b/src/afd/sprites/front/108--0--Lickitung.png similarity index 100% rename from src/afd/sprites/front/Lickitung.png rename to src/afd/sprites/front/108--0--Lickitung.png diff --git a/src/afd/sprites/front/Koffing.png b/src/afd/sprites/front/109--0--Koffing.png similarity index 100% rename from src/afd/sprites/front/Koffing.png rename to src/afd/sprites/front/109--0--Koffing.png diff --git a/src/afd/sprites/front/Metapod.png b/src/afd/sprites/front/11--0--Metapod.png similarity index 100% rename from src/afd/sprites/front/Metapod.png rename to src/afd/sprites/front/11--0--Metapod.png diff --git a/src/afd/sprites/front/Stratagem.png b/src/afd/sprites/front/11--0--Stratagem.png similarity index 100% rename from src/afd/sprites/front/Stratagem.png rename to src/afd/sprites/front/11--0--Stratagem.png diff --git a/src/afd/sprites/front/Weezing.png b/src/afd/sprites/front/110--0--Weezing.png similarity index 100% rename from src/afd/sprites/front/Weezing.png rename to src/afd/sprites/front/110--0--Weezing.png diff --git a/src/afd/sprites/front/Weezing--Galar.png b/src/afd/sprites/front/110--420--Weezing--Galar.png similarity index 100% rename from src/afd/sprites/front/Weezing--Galar.png rename to src/afd/sprites/front/110--420--Weezing--Galar.png diff --git a/src/afd/sprites/front/Rhyhorn.png b/src/afd/sprites/front/111--0--Rhyhorn.png similarity index 100% rename from src/afd/sprites/front/Rhyhorn.png rename to src/afd/sprites/front/111--0--Rhyhorn.png diff --git a/src/afd/sprites/front/Rhydon.png b/src/afd/sprites/front/112--0--Rhydon.png similarity index 100% rename from src/afd/sprites/front/Rhydon.png rename to src/afd/sprites/front/112--0--Rhydon.png diff --git a/src/afd/sprites/front/Chansey.png b/src/afd/sprites/front/113--0--Chansey.png similarity index 100% rename from src/afd/sprites/front/Chansey.png rename to src/afd/sprites/front/113--0--Chansey.png diff --git a/src/afd/sprites/front/Tangela.png b/src/afd/sprites/front/114--0--Tangela.png similarity index 100% rename from src/afd/sprites/front/Tangela.png rename to src/afd/sprites/front/114--0--Tangela.png diff --git a/src/afd/sprites/front/Kangaskhan.png b/src/afd/sprites/front/115--0--Kangaskhan.png similarity index 100% rename from src/afd/sprites/front/Kangaskhan.png rename to src/afd/sprites/front/115--0--Kangaskhan.png diff --git a/src/afd/sprites/front/Kangaskhan--Mega.png b/src/afd/sprites/front/115--420--Kangaskhan--Mega.png similarity index 100% rename from src/afd/sprites/front/Kangaskhan--Mega.png rename to src/afd/sprites/front/115--420--Kangaskhan--Mega.png diff --git a/src/afd/sprites/front/Horsea.png b/src/afd/sprites/front/116--0--Horsea.png similarity index 100% rename from src/afd/sprites/front/Horsea.png rename to src/afd/sprites/front/116--0--Horsea.png diff --git a/src/afd/sprites/front/Seadra.png b/src/afd/sprites/front/117--0--Seadra.png similarity index 100% rename from src/afd/sprites/front/Seadra.png rename to src/afd/sprites/front/117--0--Seadra.png diff --git a/src/afd/sprites/front/Goldeen.png b/src/afd/sprites/front/118--0--Goldeen.png similarity index 100% rename from src/afd/sprites/front/Goldeen.png rename to src/afd/sprites/front/118--0--Goldeen.png diff --git a/src/afd/sprites/front/Seaking.png b/src/afd/sprites/front/119--0--Seaking.png similarity index 100% rename from src/afd/sprites/front/Seaking.png rename to src/afd/sprites/front/119--0--Seaking.png diff --git a/src/afd/sprites/front/Butterfree.png b/src/afd/sprites/front/12--0--Butterfree.png similarity index 100% rename from src/afd/sprites/front/Butterfree.png rename to src/afd/sprites/front/12--0--Butterfree.png diff --git a/src/afd/sprites/front/Butterfree--Gmax.png b/src/afd/sprites/front/12--420--Butterfree--Gmax.png similarity index 100% rename from src/afd/sprites/front/Butterfree--Gmax.png rename to src/afd/sprites/front/12--420--Butterfree--Gmax.png diff --git a/src/afd/sprites/front/Staryu.png b/src/afd/sprites/front/120--0--Staryu.png similarity index 100% rename from src/afd/sprites/front/Staryu.png rename to src/afd/sprites/front/120--0--Staryu.png diff --git a/src/afd/sprites/front/Starmie.png b/src/afd/sprites/front/121--0--Starmie.png similarity index 100% rename from src/afd/sprites/front/Starmie.png rename to src/afd/sprites/front/121--0--Starmie.png diff --git a/src/afd/sprites/front/Mr._Mime.png b/src/afd/sprites/front/122--0--Mr._Mime.png similarity index 100% rename from src/afd/sprites/front/Mr._Mime.png rename to src/afd/sprites/front/122--0--Mr._Mime.png diff --git a/src/afd/sprites/front/Mr._Mime--Galar.png b/src/afd/sprites/front/122--420--Mr._Mime--Galar.png similarity index 100% rename from src/afd/sprites/front/Mr._Mime--Galar.png rename to src/afd/sprites/front/122--420--Mr._Mime--Galar.png diff --git a/src/afd/sprites/front/Scyther.png b/src/afd/sprites/front/123--0--Scyther.png similarity index 100% rename from src/afd/sprites/front/Scyther.png rename to src/afd/sprites/front/123--0--Scyther.png diff --git a/src/afd/sprites/front/Jynx.png b/src/afd/sprites/front/124--0--Jynx.png similarity index 100% rename from src/afd/sprites/front/Jynx.png rename to src/afd/sprites/front/124--0--Jynx.png diff --git a/src/afd/sprites/front/Electabuzz.png b/src/afd/sprites/front/125--0--Electabuzz.png similarity index 100% rename from src/afd/sprites/front/Electabuzz.png rename to src/afd/sprites/front/125--0--Electabuzz.png diff --git a/src/afd/sprites/front/Magmar.png b/src/afd/sprites/front/126--0--Magmar.png similarity index 100% rename from src/afd/sprites/front/Magmar.png rename to src/afd/sprites/front/126--0--Magmar.png diff --git a/src/afd/sprites/front/Pinsir.png b/src/afd/sprites/front/127--0--Pinsir.png similarity index 100% rename from src/afd/sprites/front/Pinsir.png rename to src/afd/sprites/front/127--0--Pinsir.png diff --git a/src/afd/sprites/front/Pinsir--Mega.png b/src/afd/sprites/front/127--420--Pinsir--Mega.png similarity index 100% rename from src/afd/sprites/front/Pinsir--Mega.png rename to src/afd/sprites/front/127--420--Pinsir--Mega.png diff --git a/src/afd/sprites/front/Tauros.png b/src/afd/sprites/front/128--0--Tauros.png similarity index 100% rename from src/afd/sprites/front/Tauros.png rename to src/afd/sprites/front/128--0--Tauros.png diff --git a/src/afd/sprites/front/Magikarp.png b/src/afd/sprites/front/129--0--Magikarp.png similarity index 100% rename from src/afd/sprites/front/Magikarp.png rename to src/afd/sprites/front/129--0--Magikarp.png diff --git a/src/afd/sprites/front/Arghonaut.png b/src/afd/sprites/front/13--0--Arghonaut.png similarity index 100% rename from src/afd/sprites/front/Arghonaut.png rename to src/afd/sprites/front/13--0--Arghonaut.png diff --git a/src/afd/sprites/front/Weedle.png b/src/afd/sprites/front/13--0--Weedle.png similarity index 100% rename from src/afd/sprites/front/Weedle.png rename to src/afd/sprites/front/13--0--Weedle.png diff --git a/src/afd/sprites/front/Gyarados.png b/src/afd/sprites/front/130--0--Gyarados.png similarity index 100% rename from src/afd/sprites/front/Gyarados.png rename to src/afd/sprites/front/130--0--Gyarados.png diff --git a/src/afd/sprites/front/Gyarados--Mega.png b/src/afd/sprites/front/130--420--Gyarados--Mega.png similarity index 100% rename from src/afd/sprites/front/Gyarados--Mega.png rename to src/afd/sprites/front/130--420--Gyarados--Mega.png diff --git a/src/afd/sprites/front/Lapras.png b/src/afd/sprites/front/131--0--Lapras.png similarity index 100% rename from src/afd/sprites/front/Lapras.png rename to src/afd/sprites/front/131--0--Lapras.png diff --git a/src/afd/sprites/front/Lapras--Gmax.png b/src/afd/sprites/front/131--420--Lapras--Gmax.png similarity index 100% rename from src/afd/sprites/front/Lapras--Gmax.png rename to src/afd/sprites/front/131--420--Lapras--Gmax.png diff --git a/src/afd/sprites/front/Ditto.png b/src/afd/sprites/front/132--0--Ditto.png similarity index 100% rename from src/afd/sprites/front/Ditto.png rename to src/afd/sprites/front/132--0--Ditto.png diff --git a/src/afd/sprites/front/Eevee.png b/src/afd/sprites/front/133--0--Eevee.png similarity index 100% rename from src/afd/sprites/front/Eevee.png rename to src/afd/sprites/front/133--0--Eevee.png diff --git a/src/afd/sprites/front/Eevee--Gmax.png b/src/afd/sprites/front/133--420--Eevee--Gmax.png similarity index 100% rename from src/afd/sprites/front/Eevee--Gmax.png rename to src/afd/sprites/front/133--420--Eevee--Gmax.png diff --git a/src/afd/sprites/front/Eevee--Starter.png b/src/afd/sprites/front/133--420--Eevee--Starter.png similarity index 100% rename from src/afd/sprites/front/Eevee--Starter.png rename to src/afd/sprites/front/133--420--Eevee--Starter.png diff --git a/src/afd/sprites/front/Vaporeon.png b/src/afd/sprites/front/134--0--Vaporeon.png similarity index 100% rename from src/afd/sprites/front/Vaporeon.png rename to src/afd/sprites/front/134--0--Vaporeon.png diff --git a/src/afd/sprites/front/Jolteon.png b/src/afd/sprites/front/135--0--Jolteon.png similarity index 100% rename from src/afd/sprites/front/Jolteon.png rename to src/afd/sprites/front/135--0--Jolteon.png diff --git a/src/afd/sprites/front/Flareon.png b/src/afd/sprites/front/136--0--Flareon.png similarity index 100% rename from src/afd/sprites/front/Flareon.png rename to src/afd/sprites/front/136--0--Flareon.png diff --git a/src/afd/sprites/front/Porygon.png b/src/afd/sprites/front/137--0--Porygon.png similarity index 100% rename from src/afd/sprites/front/Porygon.png rename to src/afd/sprites/front/137--0--Porygon.png diff --git a/src/afd/sprites/front/Omanyte.png b/src/afd/sprites/front/138--0--Omanyte.png similarity index 100% rename from src/afd/sprites/front/Omanyte.png rename to src/afd/sprites/front/138--0--Omanyte.png diff --git a/src/afd/sprites/front/Omastar.png b/src/afd/sprites/front/139--0--Omastar.png similarity index 100% rename from src/afd/sprites/front/Omastar.png rename to src/afd/sprites/front/139--0--Omastar.png diff --git a/src/afd/sprites/front/Kakuna.png b/src/afd/sprites/front/14--0--Kakuna.png similarity index 100% rename from src/afd/sprites/front/Kakuna.png rename to src/afd/sprites/front/14--0--Kakuna.png diff --git a/src/afd/sprites/front/Kitsunoh.png b/src/afd/sprites/front/14--0--Kitsunoh.png similarity index 100% rename from src/afd/sprites/front/Kitsunoh.png rename to src/afd/sprites/front/14--0--Kitsunoh.png diff --git a/src/afd/sprites/front/Kabuto.png b/src/afd/sprites/front/140--0--Kabuto.png similarity index 100% rename from src/afd/sprites/front/Kabuto.png rename to src/afd/sprites/front/140--0--Kabuto.png diff --git a/src/afd/sprites/front/Kabutops.png b/src/afd/sprites/front/141--0--Kabutops.png similarity index 100% rename from src/afd/sprites/front/Kabutops.png rename to src/afd/sprites/front/141--0--Kabutops.png diff --git a/src/afd/sprites/front/Aerodactyl.png b/src/afd/sprites/front/142--0--Aerodactyl.png similarity index 100% rename from src/afd/sprites/front/Aerodactyl.png rename to src/afd/sprites/front/142--0--Aerodactyl.png diff --git a/src/afd/sprites/front/Aerodactyl--Mega.png b/src/afd/sprites/front/142--420--Aerodactyl--Mega.png similarity index 100% rename from src/afd/sprites/front/Aerodactyl--Mega.png rename to src/afd/sprites/front/142--420--Aerodactyl--Mega.png diff --git a/src/afd/sprites/front/Snorlax.png b/src/afd/sprites/front/143--0--Snorlax.png similarity index 100% rename from src/afd/sprites/front/Snorlax.png rename to src/afd/sprites/front/143--0--Snorlax.png diff --git a/src/afd/sprites/front/Snorlax--Gmax.png b/src/afd/sprites/front/143--420--Snorlax--Gmax.png similarity index 100% rename from src/afd/sprites/front/Snorlax--Gmax.png rename to src/afd/sprites/front/143--420--Snorlax--Gmax.png diff --git a/src/afd/sprites/front/Articuno.png b/src/afd/sprites/front/144--0--Articuno.png similarity index 100% rename from src/afd/sprites/front/Articuno.png rename to src/afd/sprites/front/144--0--Articuno.png diff --git a/src/afd/sprites/front/Zapdos.png b/src/afd/sprites/front/145--0--Zapdos.png similarity index 100% rename from src/afd/sprites/front/Zapdos.png rename to src/afd/sprites/front/145--0--Zapdos.png diff --git a/src/afd/sprites/front/Moltres.png b/src/afd/sprites/front/146--0--Moltres.png similarity index 100% rename from src/afd/sprites/front/Moltres.png rename to src/afd/sprites/front/146--0--Moltres.png diff --git a/src/afd/sprites/front/Dratini.png b/src/afd/sprites/front/147--0--Dratini.png similarity index 100% rename from src/afd/sprites/front/Dratini.png rename to src/afd/sprites/front/147--0--Dratini.png diff --git a/src/afd/sprites/front/Dragonair.png b/src/afd/sprites/front/148--0--Dragonair.png similarity index 100% rename from src/afd/sprites/front/Dragonair.png rename to src/afd/sprites/front/148--0--Dragonair.png diff --git a/src/afd/sprites/front/Dragonite.png b/src/afd/sprites/front/149--0--Dragonite.png similarity index 100% rename from src/afd/sprites/front/Dragonite.png rename to src/afd/sprites/front/149--0--Dragonite.png diff --git a/src/afd/sprites/front/Beedrill.png b/src/afd/sprites/front/15--0--Beedrill.png similarity index 100% rename from src/afd/sprites/front/Beedrill.png rename to src/afd/sprites/front/15--0--Beedrill.png diff --git a/src/afd/sprites/front/Cyclohm.png b/src/afd/sprites/front/15--0--Cyclohm.png similarity index 100% rename from src/afd/sprites/front/Cyclohm.png rename to src/afd/sprites/front/15--0--Cyclohm.png diff --git a/src/afd/sprites/front/Beedrill--Mega.png b/src/afd/sprites/front/15--420--Beedrill--Mega.png similarity index 100% rename from src/afd/sprites/front/Beedrill--Mega.png rename to src/afd/sprites/front/15--420--Beedrill--Mega.png diff --git a/src/afd/sprites/front/Mewtwo.png b/src/afd/sprites/front/150--0--Mewtwo.png similarity index 100% rename from src/afd/sprites/front/Mewtwo.png rename to src/afd/sprites/front/150--0--Mewtwo.png diff --git a/src/afd/sprites/front/Mewtwo--Mega-X.png b/src/afd/sprites/front/150--420--Mewtwo--Mega-X.png similarity index 100% rename from src/afd/sprites/front/Mewtwo--Mega-X.png rename to src/afd/sprites/front/150--420--Mewtwo--Mega-X.png diff --git a/src/afd/sprites/front/Mewtwo--Mega-Y.png b/src/afd/sprites/front/150--420--Mewtwo--Mega-Y.png similarity index 100% rename from src/afd/sprites/front/Mewtwo--Mega-Y.png rename to src/afd/sprites/front/150--420--Mewtwo--Mega-Y.png diff --git a/src/afd/sprites/front/Mew.png b/src/afd/sprites/front/151--0--Mew.png similarity index 100% rename from src/afd/sprites/front/Mew.png rename to src/afd/sprites/front/151--0--Mew.png diff --git a/src/afd/sprites/front/Chikorita.png b/src/afd/sprites/front/152--0--Chikorita.png similarity index 100% rename from src/afd/sprites/front/Chikorita.png rename to src/afd/sprites/front/152--0--Chikorita.png diff --git a/src/afd/sprites/front/Bayleef.png b/src/afd/sprites/front/153--0--Bayleef.png similarity index 100% rename from src/afd/sprites/front/Bayleef.png rename to src/afd/sprites/front/153--0--Bayleef.png diff --git a/src/afd/sprites/front/Meganium.png b/src/afd/sprites/front/154--0--Meganium.png similarity index 100% rename from src/afd/sprites/front/Meganium.png rename to src/afd/sprites/front/154--0--Meganium.png diff --git a/src/afd/sprites/front/Cyndaquil.png b/src/afd/sprites/front/155--0--Cyndaquil.png similarity index 100% rename from src/afd/sprites/front/Cyndaquil.png rename to src/afd/sprites/front/155--0--Cyndaquil.png diff --git a/src/afd/sprites/front/Quilava.png b/src/afd/sprites/front/156--0--Quilava.png similarity index 100% rename from src/afd/sprites/front/Quilava.png rename to src/afd/sprites/front/156--0--Quilava.png diff --git a/src/afd/sprites/front/Typhlosion.png b/src/afd/sprites/front/157--0--Typhlosion.png similarity index 100% rename from src/afd/sprites/front/Typhlosion.png rename to src/afd/sprites/front/157--0--Typhlosion.png diff --git a/src/afd/sprites/front/Totodile.png b/src/afd/sprites/front/158--0--Totodile.png similarity index 100% rename from src/afd/sprites/front/Totodile.png rename to src/afd/sprites/front/158--0--Totodile.png diff --git a/src/afd/sprites/front/Croconaw.png b/src/afd/sprites/front/159--0--Croconaw.png similarity index 100% rename from src/afd/sprites/front/Croconaw.png rename to src/afd/sprites/front/159--0--Croconaw.png diff --git a/src/afd/sprites/front/Colossoil.png b/src/afd/sprites/front/16--0--Colossoil.png similarity index 100% rename from src/afd/sprites/front/Colossoil.png rename to src/afd/sprites/front/16--0--Colossoil.png diff --git a/src/afd/sprites/front/Pidgey.png b/src/afd/sprites/front/16--0--Pidgey.png similarity index 100% rename from src/afd/sprites/front/Pidgey.png rename to src/afd/sprites/front/16--0--Pidgey.png diff --git a/src/afd/sprites/front/Feraligatr.png b/src/afd/sprites/front/160--0--Feraligatr.png similarity index 100% rename from src/afd/sprites/front/Feraligatr.png rename to src/afd/sprites/front/160--0--Feraligatr.png diff --git a/src/afd/sprites/front/Sentret.png b/src/afd/sprites/front/161--0--Sentret.png similarity index 100% rename from src/afd/sprites/front/Sentret.png rename to src/afd/sprites/front/161--0--Sentret.png diff --git a/src/afd/sprites/front/Furret.png b/src/afd/sprites/front/162--0--Furret.png similarity index 100% rename from src/afd/sprites/front/Furret.png rename to src/afd/sprites/front/162--0--Furret.png diff --git a/src/afd/sprites/front/Hoothoot.png b/src/afd/sprites/front/163--0--Hoothoot.png similarity index 100% rename from src/afd/sprites/front/Hoothoot.png rename to src/afd/sprites/front/163--0--Hoothoot.png diff --git a/src/afd/sprites/front/Noctowl.png b/src/afd/sprites/front/164--0--Noctowl.png similarity index 100% rename from src/afd/sprites/front/Noctowl.png rename to src/afd/sprites/front/164--0--Noctowl.png diff --git a/src/afd/sprites/front/Ledyba.png b/src/afd/sprites/front/165--0--Ledyba.png similarity index 100% rename from src/afd/sprites/front/Ledyba.png rename to src/afd/sprites/front/165--0--Ledyba.png diff --git a/src/afd/sprites/front/Ledian.png b/src/afd/sprites/front/166--0--Ledian.png similarity index 100% rename from src/afd/sprites/front/Ledian.png rename to src/afd/sprites/front/166--0--Ledian.png diff --git a/src/afd/sprites/front/Spinarak.png b/src/afd/sprites/front/167--0--Spinarak.png similarity index 100% rename from src/afd/sprites/front/Spinarak.png rename to src/afd/sprites/front/167--0--Spinarak.png diff --git a/src/afd/sprites/front/Ariados.png b/src/afd/sprites/front/168--0--Ariados.png similarity index 100% rename from src/afd/sprites/front/Ariados.png rename to src/afd/sprites/front/168--0--Ariados.png diff --git a/src/afd/sprites/front/Crobat.png b/src/afd/sprites/front/169--0--Crobat.png similarity index 100% rename from src/afd/sprites/front/Crobat.png rename to src/afd/sprites/front/169--0--Crobat.png diff --git a/src/afd/sprites/front/Krilowatt.png b/src/afd/sprites/front/17--0--Krilowatt.png similarity index 100% rename from src/afd/sprites/front/Krilowatt.png rename to src/afd/sprites/front/17--0--Krilowatt.png diff --git a/src/afd/sprites/front/Pidgeotto.png b/src/afd/sprites/front/17--0--Pidgeotto.png similarity index 100% rename from src/afd/sprites/front/Pidgeotto.png rename to src/afd/sprites/front/17--0--Pidgeotto.png diff --git a/src/afd/sprites/front/Chinchou.png b/src/afd/sprites/front/170--0--Chinchou.png similarity index 100% rename from src/afd/sprites/front/Chinchou.png rename to src/afd/sprites/front/170--0--Chinchou.png diff --git a/src/afd/sprites/front/Lanturn.png b/src/afd/sprites/front/171--0--Lanturn.png similarity index 100% rename from src/afd/sprites/front/Lanturn.png rename to src/afd/sprites/front/171--0--Lanturn.png diff --git a/src/afd/sprites/front/Pichu.png b/src/afd/sprites/front/172--0--Pichu.png similarity index 100% rename from src/afd/sprites/front/Pichu.png rename to src/afd/sprites/front/172--0--Pichu.png diff --git a/src/afd/sprites/front/Cleffa.png b/src/afd/sprites/front/173--0--Cleffa.png similarity index 100% rename from src/afd/sprites/front/Cleffa.png rename to src/afd/sprites/front/173--0--Cleffa.png diff --git a/src/afd/sprites/front/Igglybuff.png b/src/afd/sprites/front/174--0--Igglybuff.png similarity index 100% rename from src/afd/sprites/front/Igglybuff.png rename to src/afd/sprites/front/174--0--Igglybuff.png diff --git a/src/afd/sprites/front/Togepi.png b/src/afd/sprites/front/175--0--Togepi.png similarity index 100% rename from src/afd/sprites/front/Togepi.png rename to src/afd/sprites/front/175--0--Togepi.png diff --git a/src/afd/sprites/front/Togetic.png b/src/afd/sprites/front/176--0--Togetic.png similarity index 100% rename from src/afd/sprites/front/Togetic.png rename to src/afd/sprites/front/176--0--Togetic.png diff --git a/src/afd/sprites/front/Natu.png b/src/afd/sprites/front/177--0--Natu.png similarity index 100% rename from src/afd/sprites/front/Natu.png rename to src/afd/sprites/front/177--0--Natu.png diff --git a/src/afd/sprites/front/Xatu.png b/src/afd/sprites/front/178--0--Xatu.png similarity index 100% rename from src/afd/sprites/front/Xatu.png rename to src/afd/sprites/front/178--0--Xatu.png diff --git a/src/afd/sprites/front/Mareep.png b/src/afd/sprites/front/179--0--Mareep.png similarity index 100% rename from src/afd/sprites/front/Mareep.png rename to src/afd/sprites/front/179--0--Mareep.png diff --git a/src/afd/sprites/front/Pidgeot.png b/src/afd/sprites/front/18--0--Pidgeot.png similarity index 100% rename from src/afd/sprites/front/Pidgeot.png rename to src/afd/sprites/front/18--0--Pidgeot.png diff --git a/src/afd/sprites/front/Pidgeot--Mega.gif b/src/afd/sprites/front/18--420--Pidgeot--Mega.gif similarity index 100% rename from src/afd/sprites/front/Pidgeot--Mega.gif rename to src/afd/sprites/front/18--420--Pidgeot--Mega.gif diff --git a/src/afd/sprites/front/Flaaffy.png b/src/afd/sprites/front/180--0--Flaaffy.png similarity index 100% rename from src/afd/sprites/front/Flaaffy.png rename to src/afd/sprites/front/180--0--Flaaffy.png diff --git a/src/afd/sprites/front/Ampharos.png b/src/afd/sprites/front/181--0--Ampharos.png similarity index 100% rename from src/afd/sprites/front/Ampharos.png rename to src/afd/sprites/front/181--0--Ampharos.png diff --git a/src/afd/sprites/front/Ampharos--Mega.png b/src/afd/sprites/front/181--420--Ampharos--Mega.png similarity index 100% rename from src/afd/sprites/front/Ampharos--Mega.png rename to src/afd/sprites/front/181--420--Ampharos--Mega.png diff --git a/src/afd/sprites/front/Bellossom.png b/src/afd/sprites/front/182--0--Bellossom.png similarity index 100% rename from src/afd/sprites/front/Bellossom.png rename to src/afd/sprites/front/182--0--Bellossom.png diff --git a/src/afd/sprites/front/Marill.png b/src/afd/sprites/front/183--0--Marill.png similarity index 100% rename from src/afd/sprites/front/Marill.png rename to src/afd/sprites/front/183--0--Marill.png diff --git a/src/afd/sprites/front/Azumarill.png b/src/afd/sprites/front/184--0--Azumarill.png similarity index 100% rename from src/afd/sprites/front/Azumarill.png rename to src/afd/sprites/front/184--0--Azumarill.png diff --git a/src/afd/sprites/front/Sudowoodo.png b/src/afd/sprites/front/185--0--Sudowoodo.png similarity index 100% rename from src/afd/sprites/front/Sudowoodo.png rename to src/afd/sprites/front/185--0--Sudowoodo.png diff --git a/src/afd/sprites/front/Politoed.png b/src/afd/sprites/front/186--0--Politoed.png similarity index 100% rename from src/afd/sprites/front/Politoed.png rename to src/afd/sprites/front/186--0--Politoed.png diff --git a/src/afd/sprites/front/Hoppip.png b/src/afd/sprites/front/187--0--Hoppip.png similarity index 100% rename from src/afd/sprites/front/Hoppip.png rename to src/afd/sprites/front/187--0--Hoppip.png diff --git a/src/afd/sprites/front/Skiploom.png b/src/afd/sprites/front/188--0--Skiploom.png similarity index 100% rename from src/afd/sprites/front/Skiploom.png rename to src/afd/sprites/front/188--0--Skiploom.png diff --git a/src/afd/sprites/front/Jumpluff.png b/src/afd/sprites/front/189--0--Jumpluff.png similarity index 100% rename from src/afd/sprites/front/Jumpluff.png rename to src/afd/sprites/front/189--0--Jumpluff.png diff --git a/src/afd/sprites/front/Rattata.png b/src/afd/sprites/front/19--0--Rattata.png similarity index 100% rename from src/afd/sprites/front/Rattata.png rename to src/afd/sprites/front/19--0--Rattata.png diff --git a/src/afd/sprites/front/Voodoom.png b/src/afd/sprites/front/19--0--Voodoom.png similarity index 100% rename from src/afd/sprites/front/Voodoom.png rename to src/afd/sprites/front/19--0--Voodoom.png diff --git a/src/afd/sprites/front/Rattata--Alola.png b/src/afd/sprites/front/19--420--Rattata--Alola.png similarity index 100% rename from src/afd/sprites/front/Rattata--Alola.png rename to src/afd/sprites/front/19--420--Rattata--Alola.png diff --git a/src/afd/sprites/front/Aipom.png b/src/afd/sprites/front/190--0--Aipom.png similarity index 100% rename from src/afd/sprites/front/Aipom.png rename to src/afd/sprites/front/190--0--Aipom.png diff --git a/src/afd/sprites/front/Sunkern.png b/src/afd/sprites/front/191--0--Sunkern.png similarity index 100% rename from src/afd/sprites/front/Sunkern.png rename to src/afd/sprites/front/191--0--Sunkern.png diff --git a/src/afd/sprites/front/Sunflora.png b/src/afd/sprites/front/192--0--Sunflora.png similarity index 100% rename from src/afd/sprites/front/Sunflora.png rename to src/afd/sprites/front/192--0--Sunflora.png diff --git a/src/afd/sprites/front/Yanma.png b/src/afd/sprites/front/193--0--Yanma.png similarity index 100% rename from src/afd/sprites/front/Yanma.png rename to src/afd/sprites/front/193--0--Yanma.png diff --git a/src/afd/sprites/front/Wooper.png b/src/afd/sprites/front/194--0--Wooper.png similarity index 100% rename from src/afd/sprites/front/Wooper.png rename to src/afd/sprites/front/194--0--Wooper.png diff --git a/src/afd/sprites/front/Quagsire.png b/src/afd/sprites/front/195--0--Quagsire.png similarity index 100% rename from src/afd/sprites/front/Quagsire.png rename to src/afd/sprites/front/195--0--Quagsire.png diff --git a/src/afd/sprites/front/Espeon.png b/src/afd/sprites/front/196--0--Espeon.png similarity index 100% rename from src/afd/sprites/front/Espeon.png rename to src/afd/sprites/front/196--0--Espeon.png diff --git a/src/afd/sprites/front/Umbreon.png b/src/afd/sprites/front/197--0--Umbreon.png similarity index 100% rename from src/afd/sprites/front/Umbreon.png rename to src/afd/sprites/front/197--0--Umbreon.png diff --git a/src/afd/sprites/front/Murkrow.png b/src/afd/sprites/front/198--0--Murkrow.png similarity index 100% rename from src/afd/sprites/front/Murkrow.png rename to src/afd/sprites/front/198--0--Murkrow.png diff --git a/src/afd/sprites/front/Slowking.png b/src/afd/sprites/front/199--0--Slowking.png similarity index 100% rename from src/afd/sprites/front/Slowking.png rename to src/afd/sprites/front/199--0--Slowking.png diff --git a/src/afd/sprites/front/Ivysaur.png b/src/afd/sprites/front/2--0--Ivysaur.png similarity index 100% rename from src/afd/sprites/front/Ivysaur.png rename to src/afd/sprites/front/2--0--Ivysaur.png diff --git a/src/afd/sprites/front/Syclant.png b/src/afd/sprites/front/2--0--Syclant.png similarity index 100% rename from src/afd/sprites/front/Syclant.png rename to src/afd/sprites/front/2--0--Syclant.png diff --git a/src/afd/sprites/front/Raticate.png b/src/afd/sprites/front/20--0--Raticate.png similarity index 100% rename from src/afd/sprites/front/Raticate.png rename to src/afd/sprites/front/20--0--Raticate.png diff --git a/src/afd/sprites/front/Raticate--Alola.png b/src/afd/sprites/front/20--420--Raticate--Alola.png similarity index 100% rename from src/afd/sprites/front/Raticate--Alola.png rename to src/afd/sprites/front/20--420--Raticate--Alola.png diff --git a/src/afd/sprites/front/Misdreavus.png b/src/afd/sprites/front/200--0--Misdreavus.png similarity index 100% rename from src/afd/sprites/front/Misdreavus.png rename to src/afd/sprites/front/200--0--Misdreavus.png diff --git a/src/afd/sprites/front/Unown.png b/src/afd/sprites/front/201--0--Unown.png similarity index 100% rename from src/afd/sprites/front/Unown.png rename to src/afd/sprites/front/201--0--Unown.png diff --git a/src/afd/sprites/front/Wobbuffet.png b/src/afd/sprites/front/202--0--Wobbuffet.png similarity index 100% rename from src/afd/sprites/front/Wobbuffet.png rename to src/afd/sprites/front/202--0--Wobbuffet.png diff --git a/src/afd/sprites/front/Girafarig.png b/src/afd/sprites/front/203--0--Girafarig.png similarity index 100% rename from src/afd/sprites/front/Girafarig.png rename to src/afd/sprites/front/203--0--Girafarig.png diff --git a/src/afd/sprites/front/Pineco.png b/src/afd/sprites/front/204--0--Pineco.png similarity index 100% rename from src/afd/sprites/front/Pineco.png rename to src/afd/sprites/front/204--0--Pineco.png diff --git a/src/afd/sprites/front/Forretress.png b/src/afd/sprites/front/205--0--Forretress.png similarity index 100% rename from src/afd/sprites/front/Forretress.png rename to src/afd/sprites/front/205--0--Forretress.png diff --git a/src/afd/sprites/front/Dunsparce.png b/src/afd/sprites/front/206--0--Dunsparce.png similarity index 100% rename from src/afd/sprites/front/Dunsparce.png rename to src/afd/sprites/front/206--0--Dunsparce.png diff --git a/src/afd/sprites/front/Gligar.png b/src/afd/sprites/front/207--0--Gligar.png similarity index 100% rename from src/afd/sprites/front/Gligar.png rename to src/afd/sprites/front/207--0--Gligar.png diff --git a/src/afd/sprites/front/Steelix.png b/src/afd/sprites/front/208--0--Steelix.png similarity index 100% rename from src/afd/sprites/front/Steelix.png rename to src/afd/sprites/front/208--0--Steelix.png diff --git a/src/afd/sprites/front/Steelix--Mega.png b/src/afd/sprites/front/208--420--Steelix--Mega.png similarity index 100% rename from src/afd/sprites/front/Steelix--Mega.png rename to src/afd/sprites/front/208--420--Steelix--Mega.png diff --git a/src/afd/sprites/front/Snubbull.png b/src/afd/sprites/front/209--0--Snubbull.png similarity index 100% rename from src/afd/sprites/front/Snubbull.png rename to src/afd/sprites/front/209--0--Snubbull.png diff --git a/src/afd/sprites/front/Spearow.png b/src/afd/sprites/front/21--0--Spearow.png similarity index 100% rename from src/afd/sprites/front/Spearow.png rename to src/afd/sprites/front/21--0--Spearow.png diff --git a/src/afd/sprites/front/Tomohawk.png b/src/afd/sprites/front/21--0--Tomohawk.png similarity index 100% rename from src/afd/sprites/front/Tomohawk.png rename to src/afd/sprites/front/21--0--Tomohawk.png diff --git a/src/afd/sprites/front/Granbull.png b/src/afd/sprites/front/210--0--Granbull.png similarity index 100% rename from src/afd/sprites/front/Granbull.png rename to src/afd/sprites/front/210--0--Granbull.png diff --git a/src/afd/sprites/front/Qwilfish.png b/src/afd/sprites/front/211--0--Qwilfish.png similarity index 100% rename from src/afd/sprites/front/Qwilfish.png rename to src/afd/sprites/front/211--0--Qwilfish.png diff --git a/src/afd/sprites/front/Scizor.png b/src/afd/sprites/front/212--0--Scizor.png similarity index 100% rename from src/afd/sprites/front/Scizor.png rename to src/afd/sprites/front/212--0--Scizor.png diff --git a/src/afd/sprites/front/Scizor--Mega.png b/src/afd/sprites/front/212--420--Scizor--Mega.png similarity index 100% rename from src/afd/sprites/front/Scizor--Mega.png rename to src/afd/sprites/front/212--420--Scizor--Mega.png diff --git a/src/afd/sprites/front/Shuckle.png b/src/afd/sprites/front/213--0--Shuckle.png similarity index 100% rename from src/afd/sprites/front/Shuckle.png rename to src/afd/sprites/front/213--0--Shuckle.png diff --git a/src/afd/sprites/front/Heracross.png b/src/afd/sprites/front/214--0--Heracross.png similarity index 100% rename from src/afd/sprites/front/Heracross.png rename to src/afd/sprites/front/214--0--Heracross.png diff --git a/src/afd/sprites/front/Heracross--Mega.png b/src/afd/sprites/front/214--420--Heracross--Mega.png similarity index 100% rename from src/afd/sprites/front/Heracross--Mega.png rename to src/afd/sprites/front/214--420--Heracross--Mega.png diff --git a/src/afd/sprites/front/Sneasel.png b/src/afd/sprites/front/215--0--Sneasel.png similarity index 100% rename from src/afd/sprites/front/Sneasel.png rename to src/afd/sprites/front/215--0--Sneasel.png diff --git a/src/afd/sprites/front/Teddiursa.png b/src/afd/sprites/front/216--0--Teddiursa.png similarity index 100% rename from src/afd/sprites/front/Teddiursa.png rename to src/afd/sprites/front/216--0--Teddiursa.png diff --git a/src/afd/sprites/front/Ursaring.png b/src/afd/sprites/front/217--0--Ursaring.png similarity index 100% rename from src/afd/sprites/front/Ursaring.png rename to src/afd/sprites/front/217--0--Ursaring.png diff --git a/src/afd/sprites/front/Slugma.png b/src/afd/sprites/front/218--0--Slugma.png similarity index 100% rename from src/afd/sprites/front/Slugma.png rename to src/afd/sprites/front/218--0--Slugma.png diff --git a/src/afd/sprites/front/Magcargo.png b/src/afd/sprites/front/219--0--Magcargo.png similarity index 100% rename from src/afd/sprites/front/Magcargo.png rename to src/afd/sprites/front/219--0--Magcargo.png diff --git a/src/afd/sprites/front/Fearow.png b/src/afd/sprites/front/22--0--Fearow.png similarity index 100% rename from src/afd/sprites/front/Fearow.png rename to src/afd/sprites/front/22--0--Fearow.png diff --git a/src/afd/sprites/front/Swinub.png b/src/afd/sprites/front/220--0--Swinub.png similarity index 100% rename from src/afd/sprites/front/Swinub.png rename to src/afd/sprites/front/220--0--Swinub.png diff --git a/src/afd/sprites/front/Piloswine.png b/src/afd/sprites/front/221--0--Piloswine.png similarity index 100% rename from src/afd/sprites/front/Piloswine.png rename to src/afd/sprites/front/221--0--Piloswine.png diff --git a/src/afd/sprites/front/Corsola.png b/src/afd/sprites/front/222--0--Corsola.png similarity index 100% rename from src/afd/sprites/front/Corsola.png rename to src/afd/sprites/front/222--0--Corsola.png diff --git a/src/afd/sprites/front/Corsola--Galar.png b/src/afd/sprites/front/222--420--Corsola--Galar.png similarity index 100% rename from src/afd/sprites/front/Corsola--Galar.png rename to src/afd/sprites/front/222--420--Corsola--Galar.png diff --git a/src/afd/sprites/front/Remoraid.png b/src/afd/sprites/front/223--0--Remoraid.png similarity index 100% rename from src/afd/sprites/front/Remoraid.png rename to src/afd/sprites/front/223--0--Remoraid.png diff --git a/src/afd/sprites/front/Octillery.png b/src/afd/sprites/front/224--0--Octillery.png similarity index 100% rename from src/afd/sprites/front/Octillery.png rename to src/afd/sprites/front/224--0--Octillery.png diff --git a/src/afd/sprites/front/Delibird.png b/src/afd/sprites/front/225--0--Delibird.png similarity index 100% rename from src/afd/sprites/front/Delibird.png rename to src/afd/sprites/front/225--0--Delibird.png diff --git a/src/afd/sprites/front/Mantine.png b/src/afd/sprites/front/226--0--Mantine.png similarity index 100% rename from src/afd/sprites/front/Mantine.png rename to src/afd/sprites/front/226--0--Mantine.png diff --git a/src/afd/sprites/front/Skarmory.png b/src/afd/sprites/front/227--0--Skarmory.png similarity index 100% rename from src/afd/sprites/front/Skarmory.png rename to src/afd/sprites/front/227--0--Skarmory.png diff --git a/src/afd/sprites/front/Houndour.png b/src/afd/sprites/front/228--0--Houndour.png similarity index 100% rename from src/afd/sprites/front/Houndour.png rename to src/afd/sprites/front/228--0--Houndour.png diff --git a/src/afd/sprites/front/Houndoom.png b/src/afd/sprites/front/229--0--Houndoom.png similarity index 100% rename from src/afd/sprites/front/Houndoom.png rename to src/afd/sprites/front/229--0--Houndoom.png diff --git a/src/afd/sprites/front/Houndoom--Mega.png b/src/afd/sprites/front/229--420--Houndoom--Mega.png similarity index 100% rename from src/afd/sprites/front/Houndoom--Mega.png rename to src/afd/sprites/front/229--420--Houndoom--Mega.png diff --git a/src/afd/sprites/front/Ekans.png b/src/afd/sprites/front/23--0--Ekans.png similarity index 100% rename from src/afd/sprites/front/Ekans.png rename to src/afd/sprites/front/23--0--Ekans.png diff --git a/src/afd/sprites/front/Necturna.png b/src/afd/sprites/front/23--0--Necturna.png similarity index 100% rename from src/afd/sprites/front/Necturna.png rename to src/afd/sprites/front/23--0--Necturna.png diff --git a/src/afd/sprites/front/Kingdra.png b/src/afd/sprites/front/230--0--Kingdra.png similarity index 100% rename from src/afd/sprites/front/Kingdra.png rename to src/afd/sprites/front/230--0--Kingdra.png diff --git a/src/afd/sprites/front/Phanpy.png b/src/afd/sprites/front/231--0--Phanpy.png similarity index 100% rename from src/afd/sprites/front/Phanpy.png rename to src/afd/sprites/front/231--0--Phanpy.png diff --git a/src/afd/sprites/front/Donphan.png b/src/afd/sprites/front/232--0--Donphan.png similarity index 100% rename from src/afd/sprites/front/Donphan.png rename to src/afd/sprites/front/232--0--Donphan.png diff --git a/src/afd/sprites/front/Porygon2.png b/src/afd/sprites/front/233--0--Porygon2.png similarity index 100% rename from src/afd/sprites/front/Porygon2.png rename to src/afd/sprites/front/233--0--Porygon2.png diff --git a/src/afd/sprites/front/Stantler.png b/src/afd/sprites/front/234--0--Stantler.png similarity index 100% rename from src/afd/sprites/front/Stantler.png rename to src/afd/sprites/front/234--0--Stantler.png diff --git a/src/afd/sprites/front/Smeargle.png b/src/afd/sprites/front/235--0--Smeargle.png similarity index 100% rename from src/afd/sprites/front/Smeargle.png rename to src/afd/sprites/front/235--0--Smeargle.png diff --git a/src/afd/sprites/front/Tyrogue.png b/src/afd/sprites/front/236--0--Tyrogue.png similarity index 100% rename from src/afd/sprites/front/Tyrogue.png rename to src/afd/sprites/front/236--0--Tyrogue.png diff --git a/src/afd/sprites/front/Hitmontop.png b/src/afd/sprites/front/237--0--Hitmontop.png similarity index 100% rename from src/afd/sprites/front/Hitmontop.png rename to src/afd/sprites/front/237--0--Hitmontop.png diff --git a/src/afd/sprites/front/Smoochum.png b/src/afd/sprites/front/238--0--Smoochum.png similarity index 100% rename from src/afd/sprites/front/Smoochum.png rename to src/afd/sprites/front/238--0--Smoochum.png diff --git a/src/afd/sprites/front/Elekid.png b/src/afd/sprites/front/239--0--Elekid.png similarity index 100% rename from src/afd/sprites/front/Elekid.png rename to src/afd/sprites/front/239--0--Elekid.png diff --git a/src/afd/sprites/front/Arbok.png b/src/afd/sprites/front/24--0--Arbok.png similarity index 100% rename from src/afd/sprites/front/Arbok.png rename to src/afd/sprites/front/24--0--Arbok.png diff --git a/src/afd/sprites/front/Mollux.png b/src/afd/sprites/front/24--0--Mollux.png similarity index 100% rename from src/afd/sprites/front/Mollux.png rename to src/afd/sprites/front/24--0--Mollux.png diff --git a/src/afd/sprites/front/Magby.png b/src/afd/sprites/front/240--0--Magby.png similarity index 100% rename from src/afd/sprites/front/Magby.png rename to src/afd/sprites/front/240--0--Magby.png diff --git a/src/afd/sprites/front/Miltank.png b/src/afd/sprites/front/241--0--Miltank.png similarity index 100% rename from src/afd/sprites/front/Miltank.png rename to src/afd/sprites/front/241--0--Miltank.png diff --git a/src/afd/sprites/front/Blissey.png b/src/afd/sprites/front/242--0--Blissey.png similarity index 100% rename from src/afd/sprites/front/Blissey.png rename to src/afd/sprites/front/242--0--Blissey.png diff --git a/src/afd/sprites/front/Raikou.png b/src/afd/sprites/front/243--0--Raikou.png similarity index 100% rename from src/afd/sprites/front/Raikou.png rename to src/afd/sprites/front/243--0--Raikou.png diff --git a/src/afd/sprites/front/Entei.png b/src/afd/sprites/front/244--0--Entei.png similarity index 100% rename from src/afd/sprites/front/Entei.png rename to src/afd/sprites/front/244--0--Entei.png diff --git a/src/afd/sprites/front/Suicune.png b/src/afd/sprites/front/245--0--Suicune.png similarity index 100% rename from src/afd/sprites/front/Suicune.png rename to src/afd/sprites/front/245--0--Suicune.png diff --git a/src/afd/sprites/front/Larvitar.png b/src/afd/sprites/front/246--0--Larvitar.png similarity index 100% rename from src/afd/sprites/front/Larvitar.png rename to src/afd/sprites/front/246--0--Larvitar.png diff --git a/src/afd/sprites/front/Pupitar.png b/src/afd/sprites/front/247--0--Pupitar.png similarity index 100% rename from src/afd/sprites/front/Pupitar.png rename to src/afd/sprites/front/247--0--Pupitar.png diff --git a/src/afd/sprites/front/Tyranitar.png b/src/afd/sprites/front/248--0--Tyranitar.png similarity index 100% rename from src/afd/sprites/front/Tyranitar.png rename to src/afd/sprites/front/248--0--Tyranitar.png diff --git a/src/afd/sprites/front/Tyranitar--Mega.png b/src/afd/sprites/front/248--420--Tyranitar--Mega.png similarity index 100% rename from src/afd/sprites/front/Tyranitar--Mega.png rename to src/afd/sprites/front/248--420--Tyranitar--Mega.png diff --git a/src/afd/sprites/front/Lugia.png b/src/afd/sprites/front/249--0--Lugia.png similarity index 100% rename from src/afd/sprites/front/Lugia.png rename to src/afd/sprites/front/249--0--Lugia.png diff --git a/src/afd/sprites/front/Pikachu.png b/src/afd/sprites/front/25--0--Pikachu.png similarity index 100% rename from src/afd/sprites/front/Pikachu.png rename to src/afd/sprites/front/25--0--Pikachu.png diff --git a/src/afd/sprites/front/Pikachu--Alola.png b/src/afd/sprites/front/25--420--Pikachu--Alola.png similarity index 100% rename from src/afd/sprites/front/Pikachu--Alola.png rename to src/afd/sprites/front/25--420--Pikachu--Alola.png diff --git a/src/afd/sprites/front/Pikachu--Belle.png b/src/afd/sprites/front/25--420--Pikachu--Belle.png similarity index 100% rename from src/afd/sprites/front/Pikachu--Belle.png rename to src/afd/sprites/front/25--420--Pikachu--Belle.png diff --git a/src/afd/sprites/front/Pikachu--Gmax.png b/src/afd/sprites/front/25--420--Pikachu--Gmax.png similarity index 100% rename from src/afd/sprites/front/Pikachu--Gmax.png rename to src/afd/sprites/front/25--420--Pikachu--Gmax.png diff --git a/src/afd/sprites/front/Pikachu--Hoenn.png b/src/afd/sprites/front/25--420--Pikachu--Hoenn.png similarity index 100% rename from src/afd/sprites/front/Pikachu--Hoenn.png rename to src/afd/sprites/front/25--420--Pikachu--Hoenn.png diff --git a/src/afd/sprites/front/Pikachu--Kalos.png b/src/afd/sprites/front/25--420--Pikachu--Kalos.png similarity index 100% rename from src/afd/sprites/front/Pikachu--Kalos.png rename to src/afd/sprites/front/25--420--Pikachu--Kalos.png diff --git a/src/afd/sprites/front/Pikachu--Libre.png b/src/afd/sprites/front/25--420--Pikachu--Libre.png similarity index 100% rename from src/afd/sprites/front/Pikachu--Libre.png rename to src/afd/sprites/front/25--420--Pikachu--Libre.png diff --git a/src/afd/sprites/front/Pikachu--Original.png b/src/afd/sprites/front/25--420--Pikachu--Original.png similarity index 100% rename from src/afd/sprites/front/Pikachu--Original.png rename to src/afd/sprites/front/25--420--Pikachu--Original.png diff --git a/src/afd/sprites/front/Pikachu--Partner.png b/src/afd/sprites/front/25--420--Pikachu--Partner.png similarity index 100% rename from src/afd/sprites/front/Pikachu--Partner.png rename to src/afd/sprites/front/25--420--Pikachu--Partner.png diff --git a/src/afd/sprites/front/Pikachu--PhD.png b/src/afd/sprites/front/25--420--Pikachu--PhD.png similarity index 100% rename from src/afd/sprites/front/Pikachu--PhD.png rename to src/afd/sprites/front/25--420--Pikachu--PhD.png diff --git a/src/afd/sprites/front/Pikachu--Pop-Star.png b/src/afd/sprites/front/25--420--Pikachu--Pop-Star.png similarity index 100% rename from src/afd/sprites/front/Pikachu--Pop-Star.png rename to src/afd/sprites/front/25--420--Pikachu--Pop-Star.png diff --git a/src/afd/sprites/front/Pikachu--Rock-Star.png b/src/afd/sprites/front/25--420--Pikachu--Rock-Star.png similarity index 100% rename from src/afd/sprites/front/Pikachu--Rock-Star.png rename to src/afd/sprites/front/25--420--Pikachu--Rock-Star.png diff --git a/src/afd/sprites/front/Pikachu--Sinnoh.png b/src/afd/sprites/front/25--420--Pikachu--Sinnoh.png similarity index 100% rename from src/afd/sprites/front/Pikachu--Sinnoh.png rename to src/afd/sprites/front/25--420--Pikachu--Sinnoh.png diff --git a/src/afd/sprites/front/Pikachu--Starter.png b/src/afd/sprites/front/25--420--Pikachu--Starter.png similarity index 100% rename from src/afd/sprites/front/Pikachu--Starter.png rename to src/afd/sprites/front/25--420--Pikachu--Starter.png diff --git a/src/afd/sprites/front/Pikachu--Unova.png b/src/afd/sprites/front/25--420--Pikachu--Unova.png similarity index 100% rename from src/afd/sprites/front/Pikachu--Unova.png rename to src/afd/sprites/front/25--420--Pikachu--Unova.png diff --git a/src/afd/sprites/front/Ho-Oh.png b/src/afd/sprites/front/250--0--Ho-Oh.png similarity index 100% rename from src/afd/sprites/front/Ho-Oh.png rename to src/afd/sprites/front/250--0--Ho-Oh.png diff --git a/src/afd/sprites/front/Celebi.gif b/src/afd/sprites/front/251--0--Celebi.gif similarity index 100% rename from src/afd/sprites/front/Celebi.gif rename to src/afd/sprites/front/251--0--Celebi.gif diff --git a/src/afd/sprites/front/Treecko.png b/src/afd/sprites/front/252--0--Treecko.png similarity index 100% rename from src/afd/sprites/front/Treecko.png rename to src/afd/sprites/front/252--0--Treecko.png diff --git a/src/afd/sprites/front/Grovyle.png b/src/afd/sprites/front/253--0--Grovyle.png similarity index 100% rename from src/afd/sprites/front/Grovyle.png rename to src/afd/sprites/front/253--0--Grovyle.png diff --git a/src/afd/sprites/front/Sceptile.png b/src/afd/sprites/front/254--0--Sceptile.png similarity index 100% rename from src/afd/sprites/front/Sceptile.png rename to src/afd/sprites/front/254--0--Sceptile.png diff --git a/src/afd/sprites/front/Sceptile--Mega.gif b/src/afd/sprites/front/254--420--Sceptile--Mega.gif similarity index 100% rename from src/afd/sprites/front/Sceptile--Mega.gif rename to src/afd/sprites/front/254--420--Sceptile--Mega.gif diff --git a/src/afd/sprites/front/Sceptile--Mega.png b/src/afd/sprites/front/254--420--Sceptile--Mega.png similarity index 100% rename from src/afd/sprites/front/Sceptile--Mega.png rename to src/afd/sprites/front/254--420--Sceptile--Mega.png diff --git a/src/afd/sprites/front/Torchic.png b/src/afd/sprites/front/255--0--Torchic.png similarity index 100% rename from src/afd/sprites/front/Torchic.png rename to src/afd/sprites/front/255--0--Torchic.png diff --git a/src/afd/sprites/front/Combusken.png b/src/afd/sprites/front/256--0--Combusken.png similarity index 100% rename from src/afd/sprites/front/Combusken.png rename to src/afd/sprites/front/256--0--Combusken.png diff --git a/src/afd/sprites/front/Blaziken.png b/src/afd/sprites/front/257--0--Blaziken.png similarity index 100% rename from src/afd/sprites/front/Blaziken.png rename to src/afd/sprites/front/257--0--Blaziken.png diff --git a/src/afd/sprites/front/Blaziken--Mega.png b/src/afd/sprites/front/257--420--Blaziken--Mega.png similarity index 100% rename from src/afd/sprites/front/Blaziken--Mega.png rename to src/afd/sprites/front/257--420--Blaziken--Mega.png diff --git a/src/afd/sprites/front/Mudkip.png b/src/afd/sprites/front/258--0--Mudkip.png similarity index 100% rename from src/afd/sprites/front/Mudkip.png rename to src/afd/sprites/front/258--0--Mudkip.png diff --git a/src/afd/sprites/front/Marshtomp.png b/src/afd/sprites/front/259--0--Marshtomp.png similarity index 100% rename from src/afd/sprites/front/Marshtomp.png rename to src/afd/sprites/front/259--0--Marshtomp.png diff --git a/src/afd/sprites/front/Raichu.png b/src/afd/sprites/front/26--0--Raichu.png similarity index 100% rename from src/afd/sprites/front/Raichu.png rename to src/afd/sprites/front/26--0--Raichu.png diff --git a/src/afd/sprites/front/Raichu--Alola.png b/src/afd/sprites/front/26--420--Raichu--Alola.png similarity index 100% rename from src/afd/sprites/front/Raichu--Alola.png rename to src/afd/sprites/front/26--420--Raichu--Alola.png diff --git a/src/afd/sprites/front/Swampert.png b/src/afd/sprites/front/260--0--Swampert.png similarity index 100% rename from src/afd/sprites/front/Swampert.png rename to src/afd/sprites/front/260--0--Swampert.png diff --git a/src/afd/sprites/front/Swampert--Mega.png b/src/afd/sprites/front/260--420--Swampert--Mega.png similarity index 100% rename from src/afd/sprites/front/Swampert--Mega.png rename to src/afd/sprites/front/260--420--Swampert--Mega.png diff --git a/src/afd/sprites/front/Poochyena.png b/src/afd/sprites/front/261--0--Poochyena.png similarity index 100% rename from src/afd/sprites/front/Poochyena.png rename to src/afd/sprites/front/261--0--Poochyena.png diff --git a/src/afd/sprites/front/Mightyena.png b/src/afd/sprites/front/262--0--Mightyena.png similarity index 100% rename from src/afd/sprites/front/Mightyena.png rename to src/afd/sprites/front/262--0--Mightyena.png diff --git a/src/afd/sprites/front/Zigzagoon.png b/src/afd/sprites/front/263--0--Zigzagoon.png similarity index 100% rename from src/afd/sprites/front/Zigzagoon.png rename to src/afd/sprites/front/263--0--Zigzagoon.png diff --git a/src/afd/sprites/front/Zigzagoon--Galar.png b/src/afd/sprites/front/263--420--Zigzagoon--Galar.png similarity index 100% rename from src/afd/sprites/front/Zigzagoon--Galar.png rename to src/afd/sprites/front/263--420--Zigzagoon--Galar.png diff --git a/src/afd/sprites/front/Linoone.png b/src/afd/sprites/front/264--0--Linoone.png similarity index 100% rename from src/afd/sprites/front/Linoone.png rename to src/afd/sprites/front/264--0--Linoone.png diff --git a/src/afd/sprites/front/Linoone--Galar.png b/src/afd/sprites/front/264--420--Linoone--Galar.png similarity index 100% rename from src/afd/sprites/front/Linoone--Galar.png rename to src/afd/sprites/front/264--420--Linoone--Galar.png diff --git a/src/afd/sprites/front/Wurmple.png b/src/afd/sprites/front/265--0--Wurmple.png similarity index 100% rename from src/afd/sprites/front/Wurmple.png rename to src/afd/sprites/front/265--0--Wurmple.png diff --git a/src/afd/sprites/front/Silcoon.png b/src/afd/sprites/front/266--0--Silcoon.png similarity index 100% rename from src/afd/sprites/front/Silcoon.png rename to src/afd/sprites/front/266--0--Silcoon.png diff --git a/src/afd/sprites/front/Beautifly.png b/src/afd/sprites/front/267--0--Beautifly.png similarity index 100% rename from src/afd/sprites/front/Beautifly.png rename to src/afd/sprites/front/267--0--Beautifly.png diff --git a/src/afd/sprites/front/Cascoon.png b/src/afd/sprites/front/268--0--Cascoon.png similarity index 100% rename from src/afd/sprites/front/Cascoon.png rename to src/afd/sprites/front/268--0--Cascoon.png diff --git a/src/afd/sprites/front/Dustox.png b/src/afd/sprites/front/269--0--Dustox.png similarity index 100% rename from src/afd/sprites/front/Dustox.png rename to src/afd/sprites/front/269--0--Dustox.png diff --git a/src/afd/sprites/front/Aurumoth.png b/src/afd/sprites/front/27--0--Aurumoth.png similarity index 100% rename from src/afd/sprites/front/Aurumoth.png rename to src/afd/sprites/front/27--0--Aurumoth.png diff --git a/src/afd/sprites/front/Sandshrew.png b/src/afd/sprites/front/27--0--Sandshrew.png similarity index 100% rename from src/afd/sprites/front/Sandshrew.png rename to src/afd/sprites/front/27--0--Sandshrew.png diff --git a/src/afd/sprites/front/Sandshrew--Alola.png b/src/afd/sprites/front/27--420--Sandshrew--Alola.png similarity index 100% rename from src/afd/sprites/front/Sandshrew--Alola.png rename to src/afd/sprites/front/27--420--Sandshrew--Alola.png diff --git a/src/afd/sprites/front/Lotad.png b/src/afd/sprites/front/270--0--Lotad.png similarity index 100% rename from src/afd/sprites/front/Lotad.png rename to src/afd/sprites/front/270--0--Lotad.png diff --git a/src/afd/sprites/front/Lombre.png b/src/afd/sprites/front/271--0--Lombre.png similarity index 100% rename from src/afd/sprites/front/Lombre.png rename to src/afd/sprites/front/271--0--Lombre.png diff --git a/src/afd/sprites/front/Ludicolo.png b/src/afd/sprites/front/272--0--Ludicolo.png similarity index 100% rename from src/afd/sprites/front/Ludicolo.png rename to src/afd/sprites/front/272--0--Ludicolo.png diff --git a/src/afd/sprites/front/Seedot.png b/src/afd/sprites/front/273--0--Seedot.png similarity index 100% rename from src/afd/sprites/front/Seedot.png rename to src/afd/sprites/front/273--0--Seedot.png diff --git a/src/afd/sprites/front/Nuzleaf.png b/src/afd/sprites/front/274--0--Nuzleaf.png similarity index 100% rename from src/afd/sprites/front/Nuzleaf.png rename to src/afd/sprites/front/274--0--Nuzleaf.png diff --git a/src/afd/sprites/front/Shiftry.png b/src/afd/sprites/front/275--0--Shiftry.png similarity index 100% rename from src/afd/sprites/front/Shiftry.png rename to src/afd/sprites/front/275--0--Shiftry.png diff --git a/src/afd/sprites/front/Taillow.png b/src/afd/sprites/front/276--0--Taillow.png similarity index 100% rename from src/afd/sprites/front/Taillow.png rename to src/afd/sprites/front/276--0--Taillow.png diff --git a/src/afd/sprites/front/Swellow.png b/src/afd/sprites/front/277--0--Swellow.png similarity index 100% rename from src/afd/sprites/front/Swellow.png rename to src/afd/sprites/front/277--0--Swellow.png diff --git a/src/afd/sprites/front/Wingull.png b/src/afd/sprites/front/278--0--Wingull.png similarity index 100% rename from src/afd/sprites/front/Wingull.png rename to src/afd/sprites/front/278--0--Wingull.png diff --git a/src/afd/sprites/front/Pelipper.png b/src/afd/sprites/front/279--0--Pelipper.png similarity index 100% rename from src/afd/sprites/front/Pelipper.png rename to src/afd/sprites/front/279--0--Pelipper.png diff --git a/src/afd/sprites/front/Sandslash.png b/src/afd/sprites/front/28--0--Sandslash.png similarity index 100% rename from src/afd/sprites/front/Sandslash.png rename to src/afd/sprites/front/28--0--Sandslash.png diff --git a/src/afd/sprites/front/Sandslash--Alola.png b/src/afd/sprites/front/28--420--Sandslash--Alola.png similarity index 100% rename from src/afd/sprites/front/Sandslash--Alola.png rename to src/afd/sprites/front/28--420--Sandslash--Alola.png diff --git a/src/afd/sprites/front/Ralts.png b/src/afd/sprites/front/280--0--Ralts.png similarity index 100% rename from src/afd/sprites/front/Ralts.png rename to src/afd/sprites/front/280--0--Ralts.png diff --git a/src/afd/sprites/front/Kirlia.png b/src/afd/sprites/front/281--0--Kirlia.png similarity index 100% rename from src/afd/sprites/front/Kirlia.png rename to src/afd/sprites/front/281--0--Kirlia.png diff --git a/src/afd/sprites/front/Gardevoir.png b/src/afd/sprites/front/282--0--Gardevoir.png similarity index 100% rename from src/afd/sprites/front/Gardevoir.png rename to src/afd/sprites/front/282--0--Gardevoir.png diff --git a/src/afd/sprites/front/Gardevoir--Mega.png b/src/afd/sprites/front/282--420--Gardevoir--Mega.png similarity index 100% rename from src/afd/sprites/front/Gardevoir--Mega.png rename to src/afd/sprites/front/282--420--Gardevoir--Mega.png diff --git a/src/afd/sprites/front/Surskit.png b/src/afd/sprites/front/283--0--Surskit.png similarity index 100% rename from src/afd/sprites/front/Surskit.png rename to src/afd/sprites/front/283--0--Surskit.png diff --git a/src/afd/sprites/front/Masquerain.png b/src/afd/sprites/front/284--0--Masquerain.png similarity index 100% rename from src/afd/sprites/front/Masquerain.png rename to src/afd/sprites/front/284--0--Masquerain.png diff --git a/src/afd/sprites/front/Shroomish.png b/src/afd/sprites/front/285--0--Shroomish.png similarity index 100% rename from src/afd/sprites/front/Shroomish.png rename to src/afd/sprites/front/285--0--Shroomish.png diff --git a/src/afd/sprites/front/Breloom.png b/src/afd/sprites/front/286--0--Breloom.png similarity index 100% rename from src/afd/sprites/front/Breloom.png rename to src/afd/sprites/front/286--0--Breloom.png diff --git a/src/afd/sprites/front/Slakoth.png b/src/afd/sprites/front/287--0--Slakoth.png similarity index 100% rename from src/afd/sprites/front/Slakoth.png rename to src/afd/sprites/front/287--0--Slakoth.png diff --git a/src/afd/sprites/front/Vigoroth.png b/src/afd/sprites/front/288--0--Vigoroth.png similarity index 100% rename from src/afd/sprites/front/Vigoroth.png rename to src/afd/sprites/front/288--0--Vigoroth.png diff --git a/src/afd/sprites/front/Slaking.png b/src/afd/sprites/front/289--0--Slaking.png similarity index 100% rename from src/afd/sprites/front/Slaking.png rename to src/afd/sprites/front/289--0--Slaking.png diff --git a/src/afd/sprites/front/Malaconda.png b/src/afd/sprites/front/29--0--Malaconda.png similarity index 100% rename from src/afd/sprites/front/Malaconda.png rename to src/afd/sprites/front/29--0--Malaconda.png diff --git a/src/afd/sprites/front/Nidoran-F.png b/src/afd/sprites/front/29--0--Nidoran-F.png similarity index 100% rename from src/afd/sprites/front/Nidoran-F.png rename to src/afd/sprites/front/29--0--Nidoran-F.png diff --git a/src/afd/sprites/front/Nincada.png b/src/afd/sprites/front/290--0--Nincada.png similarity index 100% rename from src/afd/sprites/front/Nincada.png rename to src/afd/sprites/front/290--0--Nincada.png diff --git a/src/afd/sprites/front/Ninjask.png b/src/afd/sprites/front/291--0--Ninjask.png similarity index 100% rename from src/afd/sprites/front/Ninjask.png rename to src/afd/sprites/front/291--0--Ninjask.png diff --git a/src/afd/sprites/front/Shedinja.png b/src/afd/sprites/front/292--0--Shedinja.png similarity index 100% rename from src/afd/sprites/front/Shedinja.png rename to src/afd/sprites/front/292--0--Shedinja.png diff --git a/src/afd/sprites/front/Whismur.png b/src/afd/sprites/front/293--0--Whismur.png similarity index 100% rename from src/afd/sprites/front/Whismur.png rename to src/afd/sprites/front/293--0--Whismur.png diff --git a/src/afd/sprites/front/Loudred.png b/src/afd/sprites/front/294--0--Loudred.png similarity index 100% rename from src/afd/sprites/front/Loudred.png rename to src/afd/sprites/front/294--0--Loudred.png diff --git a/src/afd/sprites/front/Exploud.png b/src/afd/sprites/front/295--0--Exploud.png similarity index 100% rename from src/afd/sprites/front/Exploud.png rename to src/afd/sprites/front/295--0--Exploud.png diff --git a/src/afd/sprites/front/Makuhita.png b/src/afd/sprites/front/296--0--Makuhita.png similarity index 100% rename from src/afd/sprites/front/Makuhita.png rename to src/afd/sprites/front/296--0--Makuhita.png diff --git a/src/afd/sprites/front/Hariyama.png b/src/afd/sprites/front/297--0--Hariyama.png similarity index 100% rename from src/afd/sprites/front/Hariyama.png rename to src/afd/sprites/front/297--0--Hariyama.png diff --git a/src/afd/sprites/front/Azurill.png b/src/afd/sprites/front/298--0--Azurill.png similarity index 100% rename from src/afd/sprites/front/Azurill.png rename to src/afd/sprites/front/298--0--Azurill.png diff --git a/src/afd/sprites/front/Nosepass.png b/src/afd/sprites/front/299--0--Nosepass.png similarity index 100% rename from src/afd/sprites/front/Nosepass.png rename to src/afd/sprites/front/299--0--Nosepass.png diff --git a/src/afd/sprites/front/Revenankh.png b/src/afd/sprites/front/3--0--Revenankh.png similarity index 100% rename from src/afd/sprites/front/Revenankh.png rename to src/afd/sprites/front/3--0--Revenankh.png diff --git a/src/afd/sprites/front/Venusaur.png b/src/afd/sprites/front/3--0--Venusaur.png similarity index 100% rename from src/afd/sprites/front/Venusaur.png rename to src/afd/sprites/front/3--0--Venusaur.png diff --git a/src/afd/sprites/front/Venusaur--Mega.png b/src/afd/sprites/front/3--420--Venusaur--Mega.png similarity index 100% rename from src/afd/sprites/front/Venusaur--Mega.png rename to src/afd/sprites/front/3--420--Venusaur--Mega.png diff --git a/src/afd/sprites/front/Nidorina.png b/src/afd/sprites/front/30--0--Nidorina.png similarity index 100% rename from src/afd/sprites/front/Nidorina.png rename to src/afd/sprites/front/30--0--Nidorina.png diff --git a/src/afd/sprites/front/Skitty.png b/src/afd/sprites/front/300--0--Skitty.png similarity index 100% rename from src/afd/sprites/front/Skitty.png rename to src/afd/sprites/front/300--0--Skitty.png diff --git a/src/afd/sprites/front/Delcatty.png b/src/afd/sprites/front/301--0--Delcatty.png similarity index 100% rename from src/afd/sprites/front/Delcatty.png rename to src/afd/sprites/front/301--0--Delcatty.png diff --git a/src/afd/sprites/front/Sableye.png b/src/afd/sprites/front/302--0--Sableye.png similarity index 100% rename from src/afd/sprites/front/Sableye.png rename to src/afd/sprites/front/302--0--Sableye.png diff --git a/src/afd/sprites/front/Sableye--Mega.png b/src/afd/sprites/front/302--420--Sableye--Mega.png similarity index 100% rename from src/afd/sprites/front/Sableye--Mega.png rename to src/afd/sprites/front/302--420--Sableye--Mega.png diff --git a/src/afd/sprites/front/Mawile.png b/src/afd/sprites/front/303--0--Mawile.png similarity index 100% rename from src/afd/sprites/front/Mawile.png rename to src/afd/sprites/front/303--0--Mawile.png diff --git a/src/afd/sprites/front/Mawile--Mega.png b/src/afd/sprites/front/303--420--Mawile--Mega.png similarity index 100% rename from src/afd/sprites/front/Mawile--Mega.png rename to src/afd/sprites/front/303--420--Mawile--Mega.png diff --git a/src/afd/sprites/front/Aron.png b/src/afd/sprites/front/304--0--Aron.png similarity index 100% rename from src/afd/sprites/front/Aron.png rename to src/afd/sprites/front/304--0--Aron.png diff --git a/src/afd/sprites/front/Lairon.png b/src/afd/sprites/front/305--0--Lairon.png similarity index 100% rename from src/afd/sprites/front/Lairon.png rename to src/afd/sprites/front/305--0--Lairon.png diff --git a/src/afd/sprites/front/Aggron.png b/src/afd/sprites/front/306--0--Aggron.png similarity index 100% rename from src/afd/sprites/front/Aggron.png rename to src/afd/sprites/front/306--0--Aggron.png diff --git a/src/afd/sprites/front/Aggron--Mega.png b/src/afd/sprites/front/306--420--Aggron--Mega.png similarity index 100% rename from src/afd/sprites/front/Aggron--Mega.png rename to src/afd/sprites/front/306--420--Aggron--Mega.png diff --git a/src/afd/sprites/front/Meditite.png b/src/afd/sprites/front/307--0--Meditite.png similarity index 100% rename from src/afd/sprites/front/Meditite.png rename to src/afd/sprites/front/307--0--Meditite.png diff --git a/src/afd/sprites/front/Medicham.png b/src/afd/sprites/front/308--0--Medicham.png similarity index 100% rename from src/afd/sprites/front/Medicham.png rename to src/afd/sprites/front/308--0--Medicham.png diff --git a/src/afd/sprites/front/Medicham--Mega.png b/src/afd/sprites/front/308--420--Medicham--Mega.png similarity index 100% rename from src/afd/sprites/front/Medicham--Mega.png rename to src/afd/sprites/front/308--420--Medicham--Mega.png diff --git a/src/afd/sprites/front/Electrike.png b/src/afd/sprites/front/309--0--Electrike.png similarity index 100% rename from src/afd/sprites/front/Electrike.png rename to src/afd/sprites/front/309--0--Electrike.png diff --git a/src/afd/sprites/front/Cawmodore.png b/src/afd/sprites/front/31--0--Cawmodore.png similarity index 100% rename from src/afd/sprites/front/Cawmodore.png rename to src/afd/sprites/front/31--0--Cawmodore.png diff --git a/src/afd/sprites/front/Nidoqueen.png b/src/afd/sprites/front/31--0--Nidoqueen.png similarity index 100% rename from src/afd/sprites/front/Nidoqueen.png rename to src/afd/sprites/front/31--0--Nidoqueen.png diff --git a/src/afd/sprites/front/Manectric.png b/src/afd/sprites/front/310--0--Manectric.png similarity index 100% rename from src/afd/sprites/front/Manectric.png rename to src/afd/sprites/front/310--0--Manectric.png diff --git a/src/afd/sprites/front/Manectric--Mega.png b/src/afd/sprites/front/310--420--Manectric--Mega.png similarity index 100% rename from src/afd/sprites/front/Manectric--Mega.png rename to src/afd/sprites/front/310--420--Manectric--Mega.png diff --git a/src/afd/sprites/front/Plusle.png b/src/afd/sprites/front/311--0--Plusle.png similarity index 100% rename from src/afd/sprites/front/Plusle.png rename to src/afd/sprites/front/311--0--Plusle.png diff --git a/src/afd/sprites/front/Minun.png b/src/afd/sprites/front/312--0--Minun.png similarity index 100% rename from src/afd/sprites/front/Minun.png rename to src/afd/sprites/front/312--0--Minun.png diff --git a/src/afd/sprites/front/Volbeat.png b/src/afd/sprites/front/313--0--Volbeat.png similarity index 100% rename from src/afd/sprites/front/Volbeat.png rename to src/afd/sprites/front/313--0--Volbeat.png diff --git a/src/afd/sprites/front/Illumise.png b/src/afd/sprites/front/314--0--Illumise.png similarity index 100% rename from src/afd/sprites/front/Illumise.png rename to src/afd/sprites/front/314--0--Illumise.png diff --git a/src/afd/sprites/front/Roselia.png b/src/afd/sprites/front/315--0--Roselia.png similarity index 100% rename from src/afd/sprites/front/Roselia.png rename to src/afd/sprites/front/315--0--Roselia.png diff --git a/src/afd/sprites/front/Gulpin.png b/src/afd/sprites/front/316--0--Gulpin.png similarity index 100% rename from src/afd/sprites/front/Gulpin.png rename to src/afd/sprites/front/316--0--Gulpin.png diff --git a/src/afd/sprites/front/Swalot.png b/src/afd/sprites/front/317--0--Swalot.png similarity index 100% rename from src/afd/sprites/front/Swalot.png rename to src/afd/sprites/front/317--0--Swalot.png diff --git a/src/afd/sprites/front/Carvanha.png b/src/afd/sprites/front/318--0--Carvanha.png similarity index 100% rename from src/afd/sprites/front/Carvanha.png rename to src/afd/sprites/front/318--0--Carvanha.png diff --git a/src/afd/sprites/front/Sharpedo.png b/src/afd/sprites/front/319--0--Sharpedo.png similarity index 100% rename from src/afd/sprites/front/Sharpedo.png rename to src/afd/sprites/front/319--0--Sharpedo.png diff --git a/src/afd/sprites/front/Sharpedo--Mega.png b/src/afd/sprites/front/319--420--Sharpedo--Mega.png similarity index 100% rename from src/afd/sprites/front/Sharpedo--Mega.png rename to src/afd/sprites/front/319--420--Sharpedo--Mega.png diff --git a/src/afd/sprites/front/Nidoran-M.png b/src/afd/sprites/front/32--0--Nidoran-M.png similarity index 100% rename from src/afd/sprites/front/Nidoran-M.png rename to src/afd/sprites/front/32--0--Nidoran-M.png diff --git a/src/afd/sprites/front/Wailmer.png b/src/afd/sprites/front/320--0--Wailmer.png similarity index 100% rename from src/afd/sprites/front/Wailmer.png rename to src/afd/sprites/front/320--0--Wailmer.png diff --git a/src/afd/sprites/front/Wailord.png b/src/afd/sprites/front/321--0--Wailord.png similarity index 100% rename from src/afd/sprites/front/Wailord.png rename to src/afd/sprites/front/321--0--Wailord.png diff --git a/src/afd/sprites/front/Numel.png b/src/afd/sprites/front/322--0--Numel.png similarity index 100% rename from src/afd/sprites/front/Numel.png rename to src/afd/sprites/front/322--0--Numel.png diff --git a/src/afd/sprites/front/Camerupt.png b/src/afd/sprites/front/323--0--Camerupt.png similarity index 100% rename from src/afd/sprites/front/Camerupt.png rename to src/afd/sprites/front/323--0--Camerupt.png diff --git a/src/afd/sprites/front/Camerupt--Mega.png b/src/afd/sprites/front/323--420--Camerupt--Mega.png similarity index 100% rename from src/afd/sprites/front/Camerupt--Mega.png rename to src/afd/sprites/front/323--420--Camerupt--Mega.png diff --git a/src/afd/sprites/front/Torkoal.png b/src/afd/sprites/front/324--0--Torkoal.png similarity index 100% rename from src/afd/sprites/front/Torkoal.png rename to src/afd/sprites/front/324--0--Torkoal.png diff --git a/src/afd/sprites/front/Spoink.png b/src/afd/sprites/front/325--0--Spoink.png similarity index 100% rename from src/afd/sprites/front/Spoink.png rename to src/afd/sprites/front/325--0--Spoink.png diff --git a/src/afd/sprites/front/Grumpig.png b/src/afd/sprites/front/326--0--Grumpig.png similarity index 100% rename from src/afd/sprites/front/Grumpig.png rename to src/afd/sprites/front/326--0--Grumpig.png diff --git a/src/afd/sprites/front/Spinda.png b/src/afd/sprites/front/327--0--Spinda.png similarity index 100% rename from src/afd/sprites/front/Spinda.png rename to src/afd/sprites/front/327--0--Spinda.png diff --git a/src/afd/sprites/front/Trapinch.png b/src/afd/sprites/front/328--0--Trapinch.png similarity index 100% rename from src/afd/sprites/front/Trapinch.png rename to src/afd/sprites/front/328--0--Trapinch.png diff --git a/src/afd/sprites/front/Vibrava.png b/src/afd/sprites/front/329--0--Vibrava.png similarity index 100% rename from src/afd/sprites/front/Vibrava.png rename to src/afd/sprites/front/329--0--Vibrava.png diff --git a/src/afd/sprites/front/Nidorino.png b/src/afd/sprites/front/33--0--Nidorino.png similarity index 100% rename from src/afd/sprites/front/Nidorino.png rename to src/afd/sprites/front/33--0--Nidorino.png diff --git a/src/afd/sprites/front/Flygon.png b/src/afd/sprites/front/330--0--Flygon.png similarity index 100% rename from src/afd/sprites/front/Flygon.png rename to src/afd/sprites/front/330--0--Flygon.png diff --git a/src/afd/sprites/front/Cacnea.png b/src/afd/sprites/front/331--0--Cacnea.png similarity index 100% rename from src/afd/sprites/front/Cacnea.png rename to src/afd/sprites/front/331--0--Cacnea.png diff --git a/src/afd/sprites/front/Cacturne.png b/src/afd/sprites/front/332--0--Cacturne.png similarity index 100% rename from src/afd/sprites/front/Cacturne.png rename to src/afd/sprites/front/332--0--Cacturne.png diff --git a/src/afd/sprites/front/Swablu.png b/src/afd/sprites/front/333--0--Swablu.png similarity index 100% rename from src/afd/sprites/front/Swablu.png rename to src/afd/sprites/front/333--0--Swablu.png diff --git a/src/afd/sprites/front/Altaria.png b/src/afd/sprites/front/334--0--Altaria.png similarity index 100% rename from src/afd/sprites/front/Altaria.png rename to src/afd/sprites/front/334--0--Altaria.png diff --git a/src/afd/sprites/front/Altaria--Mega.png b/src/afd/sprites/front/334--420--Altaria--Mega.png similarity index 100% rename from src/afd/sprites/front/Altaria--Mega.png rename to src/afd/sprites/front/334--420--Altaria--Mega.png diff --git a/src/afd/sprites/front/Zangoose.png b/src/afd/sprites/front/335--0--Zangoose.png similarity index 100% rename from src/afd/sprites/front/Zangoose.png rename to src/afd/sprites/front/335--0--Zangoose.png diff --git a/src/afd/sprites/front/Seviper.png b/src/afd/sprites/front/336--0--Seviper.png similarity index 100% rename from src/afd/sprites/front/Seviper.png rename to src/afd/sprites/front/336--0--Seviper.png diff --git a/src/afd/sprites/front/Lunatone.png b/src/afd/sprites/front/337--0--Lunatone.png similarity index 100% rename from src/afd/sprites/front/Lunatone.png rename to src/afd/sprites/front/337--0--Lunatone.png diff --git a/src/afd/sprites/front/Solrock.png b/src/afd/sprites/front/338--0--Solrock.png similarity index 100% rename from src/afd/sprites/front/Solrock.png rename to src/afd/sprites/front/338--0--Solrock.png diff --git a/src/afd/sprites/front/Barboach.png b/src/afd/sprites/front/339--0--Barboach.png similarity index 100% rename from src/afd/sprites/front/Barboach.png rename to src/afd/sprites/front/339--0--Barboach.png diff --git a/src/afd/sprites/front/Nidoking.png b/src/afd/sprites/front/34--0--Nidoking.png similarity index 100% rename from src/afd/sprites/front/Nidoking.png rename to src/afd/sprites/front/34--0--Nidoking.png diff --git a/src/afd/sprites/front/Whiscash.png b/src/afd/sprites/front/340--0--Whiscash.png similarity index 100% rename from src/afd/sprites/front/Whiscash.png rename to src/afd/sprites/front/340--0--Whiscash.png diff --git a/src/afd/sprites/front/Corphish.png b/src/afd/sprites/front/341--0--Corphish.png similarity index 100% rename from src/afd/sprites/front/Corphish.png rename to src/afd/sprites/front/341--0--Corphish.png diff --git a/src/afd/sprites/front/Crawdaunt.png b/src/afd/sprites/front/342--0--Crawdaunt.png similarity index 100% rename from src/afd/sprites/front/Crawdaunt.png rename to src/afd/sprites/front/342--0--Crawdaunt.png diff --git a/src/afd/sprites/front/Baltoy.png b/src/afd/sprites/front/343--0--Baltoy.png similarity index 100% rename from src/afd/sprites/front/Baltoy.png rename to src/afd/sprites/front/343--0--Baltoy.png diff --git a/src/afd/sprites/front/Claydol.png b/src/afd/sprites/front/344--0--Claydol.png similarity index 100% rename from src/afd/sprites/front/Claydol.png rename to src/afd/sprites/front/344--0--Claydol.png diff --git a/src/afd/sprites/front/Lileep.png b/src/afd/sprites/front/345--0--Lileep.png similarity index 100% rename from src/afd/sprites/front/Lileep.png rename to src/afd/sprites/front/345--0--Lileep.png diff --git a/src/afd/sprites/front/Cradily.png b/src/afd/sprites/front/346--0--Cradily.png similarity index 100% rename from src/afd/sprites/front/Cradily.png rename to src/afd/sprites/front/346--0--Cradily.png diff --git a/src/afd/sprites/front/Anorith.png b/src/afd/sprites/front/347--0--Anorith.png similarity index 100% rename from src/afd/sprites/front/Anorith.png rename to src/afd/sprites/front/347--0--Anorith.png diff --git a/src/afd/sprites/front/Armaldo.png b/src/afd/sprites/front/348--0--Armaldo.png similarity index 100% rename from src/afd/sprites/front/Armaldo.png rename to src/afd/sprites/front/348--0--Armaldo.png diff --git a/src/afd/sprites/front/Feebas.png b/src/afd/sprites/front/349--0--Feebas.png similarity index 100% rename from src/afd/sprites/front/Feebas.png rename to src/afd/sprites/front/349--0--Feebas.png diff --git a/src/afd/sprites/front/Clefairy.png b/src/afd/sprites/front/35--0--Clefairy.png similarity index 100% rename from src/afd/sprites/front/Clefairy.png rename to src/afd/sprites/front/35--0--Clefairy.png diff --git a/src/afd/sprites/front/Plasmanta.png b/src/afd/sprites/front/35--0--Plasmanta.png similarity index 100% rename from src/afd/sprites/front/Plasmanta.png rename to src/afd/sprites/front/35--0--Plasmanta.png diff --git a/src/afd/sprites/front/Milotic.png b/src/afd/sprites/front/350--0--Milotic.png similarity index 100% rename from src/afd/sprites/front/Milotic.png rename to src/afd/sprites/front/350--0--Milotic.png diff --git a/src/afd/sprites/front/Castform.png b/src/afd/sprites/front/351--0--Castform.png similarity index 100% rename from src/afd/sprites/front/Castform.png rename to src/afd/sprites/front/351--0--Castform.png diff --git a/src/afd/sprites/front/Castform--Rainy.png b/src/afd/sprites/front/351--420--Castform--Rainy.png similarity index 100% rename from src/afd/sprites/front/Castform--Rainy.png rename to src/afd/sprites/front/351--420--Castform--Rainy.png diff --git a/src/afd/sprites/front/Castform--Snowy.png b/src/afd/sprites/front/351--420--Castform--Snowy.png similarity index 100% rename from src/afd/sprites/front/Castform--Snowy.png rename to src/afd/sprites/front/351--420--Castform--Snowy.png diff --git a/src/afd/sprites/front/Castform--Sunny.png b/src/afd/sprites/front/351--420--Castform--Sunny.png similarity index 100% rename from src/afd/sprites/front/Castform--Sunny.png rename to src/afd/sprites/front/351--420--Castform--Sunny.png diff --git a/src/afd/sprites/front/Kecleon.png b/src/afd/sprites/front/352--0--Kecleon.png similarity index 100% rename from src/afd/sprites/front/Kecleon.png rename to src/afd/sprites/front/352--0--Kecleon.png diff --git a/src/afd/sprites/front/Shuppet.png b/src/afd/sprites/front/353--0--Shuppet.png similarity index 100% rename from src/afd/sprites/front/Shuppet.png rename to src/afd/sprites/front/353--0--Shuppet.png diff --git a/src/afd/sprites/front/Banette.png b/src/afd/sprites/front/354--0--Banette.png similarity index 100% rename from src/afd/sprites/front/Banette.png rename to src/afd/sprites/front/354--0--Banette.png diff --git a/src/afd/sprites/front/Banette--Mega.png b/src/afd/sprites/front/354--420--Banette--Mega.png similarity index 100% rename from src/afd/sprites/front/Banette--Mega.png rename to src/afd/sprites/front/354--420--Banette--Mega.png diff --git a/src/afd/sprites/front/Duskull.png b/src/afd/sprites/front/355--0--Duskull.png similarity index 100% rename from src/afd/sprites/front/Duskull.png rename to src/afd/sprites/front/355--0--Duskull.png diff --git a/src/afd/sprites/front/Dusclops.png b/src/afd/sprites/front/356--0--Dusclops.png similarity index 100% rename from src/afd/sprites/front/Dusclops.png rename to src/afd/sprites/front/356--0--Dusclops.png diff --git a/src/afd/sprites/front/Tropius.png b/src/afd/sprites/front/357--0--Tropius.png similarity index 100% rename from src/afd/sprites/front/Tropius.png rename to src/afd/sprites/front/357--0--Tropius.png diff --git a/src/afd/sprites/front/Chimecho.png b/src/afd/sprites/front/358--0--Chimecho.png similarity index 100% rename from src/afd/sprites/front/Chimecho.png rename to src/afd/sprites/front/358--0--Chimecho.png diff --git a/src/afd/sprites/front/Absol.png b/src/afd/sprites/front/359--0--Absol.png similarity index 100% rename from src/afd/sprites/front/Absol.png rename to src/afd/sprites/front/359--0--Absol.png diff --git a/src/afd/sprites/front/Absol--Mega.png b/src/afd/sprites/front/359--420--Absol--Mega.png similarity index 100% rename from src/afd/sprites/front/Absol--Mega.png rename to src/afd/sprites/front/359--420--Absol--Mega.png diff --git a/src/afd/sprites/front/Clefable.png b/src/afd/sprites/front/36--0--Clefable.png similarity index 100% rename from src/afd/sprites/front/Clefable.png rename to src/afd/sprites/front/36--0--Clefable.png diff --git a/src/afd/sprites/front/Wynaut.png b/src/afd/sprites/front/360--0--Wynaut.png similarity index 100% rename from src/afd/sprites/front/Wynaut.png rename to src/afd/sprites/front/360--0--Wynaut.png diff --git a/src/afd/sprites/front/Snorunt.png b/src/afd/sprites/front/361--0--Snorunt.png similarity index 100% rename from src/afd/sprites/front/Snorunt.png rename to src/afd/sprites/front/361--0--Snorunt.png diff --git a/src/afd/sprites/front/Glalie.png b/src/afd/sprites/front/362--0--Glalie.png similarity index 100% rename from src/afd/sprites/front/Glalie.png rename to src/afd/sprites/front/362--0--Glalie.png diff --git a/src/afd/sprites/front/Spheal.png b/src/afd/sprites/front/363--0--Spheal.png similarity index 100% rename from src/afd/sprites/front/Spheal.png rename to src/afd/sprites/front/363--0--Spheal.png diff --git a/src/afd/sprites/front/Sealeo.png b/src/afd/sprites/front/364--0--Sealeo.png similarity index 100% rename from src/afd/sprites/front/Sealeo.png rename to src/afd/sprites/front/364--0--Sealeo.png diff --git a/src/afd/sprites/front/Walrein.png b/src/afd/sprites/front/365--0--Walrein.png similarity index 100% rename from src/afd/sprites/front/Walrein.png rename to src/afd/sprites/front/365--0--Walrein.png diff --git a/src/afd/sprites/front/Clamperl.png b/src/afd/sprites/front/366--0--Clamperl.png similarity index 100% rename from src/afd/sprites/front/Clamperl.png rename to src/afd/sprites/front/366--0--Clamperl.png diff --git a/src/afd/sprites/front/Huntail.png b/src/afd/sprites/front/367--0--Huntail.png similarity index 100% rename from src/afd/sprites/front/Huntail.png rename to src/afd/sprites/front/367--0--Huntail.png diff --git a/src/afd/sprites/front/Gorebyss.png b/src/afd/sprites/front/368--0--Gorebyss.png similarity index 100% rename from src/afd/sprites/front/Gorebyss.png rename to src/afd/sprites/front/368--0--Gorebyss.png diff --git a/src/afd/sprites/front/Relicanth.png b/src/afd/sprites/front/369--0--Relicanth.png similarity index 100% rename from src/afd/sprites/front/Relicanth.png rename to src/afd/sprites/front/369--0--Relicanth.png diff --git a/src/afd/sprites/front/Vulpix.png b/src/afd/sprites/front/37--0--Vulpix.png similarity index 100% rename from src/afd/sprites/front/Vulpix.png rename to src/afd/sprites/front/37--0--Vulpix.png diff --git a/src/afd/sprites/front/Vulpix--Alola.png b/src/afd/sprites/front/37--420--Vulpix--Alola.png similarity index 100% rename from src/afd/sprites/front/Vulpix--Alola.png rename to src/afd/sprites/front/37--420--Vulpix--Alola.png diff --git a/src/afd/sprites/front/Luvdisc.png b/src/afd/sprites/front/370--0--Luvdisc.png similarity index 100% rename from src/afd/sprites/front/Luvdisc.png rename to src/afd/sprites/front/370--0--Luvdisc.png diff --git a/src/afd/sprites/front/Bagon.png b/src/afd/sprites/front/371--0--Bagon.png similarity index 100% rename from src/afd/sprites/front/Bagon.png rename to src/afd/sprites/front/371--0--Bagon.png diff --git a/src/afd/sprites/front/Shelgon.png b/src/afd/sprites/front/372--0--Shelgon.png similarity index 100% rename from src/afd/sprites/front/Shelgon.png rename to src/afd/sprites/front/372--0--Shelgon.png diff --git a/src/afd/sprites/front/Salamence.png b/src/afd/sprites/front/373--0--Salamence.png similarity index 100% rename from src/afd/sprites/front/Salamence.png rename to src/afd/sprites/front/373--0--Salamence.png diff --git a/src/afd/sprites/front/Salamence--Mega.png b/src/afd/sprites/front/373--420--Salamence--Mega.png similarity index 100% rename from src/afd/sprites/front/Salamence--Mega.png rename to src/afd/sprites/front/373--420--Salamence--Mega.png diff --git a/src/afd/sprites/front/Beldum.png b/src/afd/sprites/front/374--0--Beldum.png similarity index 100% rename from src/afd/sprites/front/Beldum.png rename to src/afd/sprites/front/374--0--Beldum.png diff --git a/src/afd/sprites/front/Metang.png b/src/afd/sprites/front/375--0--Metang.png similarity index 100% rename from src/afd/sprites/front/Metang.png rename to src/afd/sprites/front/375--0--Metang.png diff --git a/src/afd/sprites/front/Metagross.png b/src/afd/sprites/front/376--0--Metagross.png similarity index 100% rename from src/afd/sprites/front/Metagross.png rename to src/afd/sprites/front/376--0--Metagross.png diff --git a/src/afd/sprites/front/Metagross--Mega.png b/src/afd/sprites/front/376--420--Metagross--Mega.png similarity index 100% rename from src/afd/sprites/front/Metagross--Mega.png rename to src/afd/sprites/front/376--420--Metagross--Mega.png diff --git a/src/afd/sprites/front/Regirock.png b/src/afd/sprites/front/377--0--Regirock.png similarity index 100% rename from src/afd/sprites/front/Regirock.png rename to src/afd/sprites/front/377--0--Regirock.png diff --git a/src/afd/sprites/front/Regice.png b/src/afd/sprites/front/378--0--Regice.png similarity index 100% rename from src/afd/sprites/front/Regice.png rename to src/afd/sprites/front/378--0--Regice.png diff --git a/src/afd/sprites/front/Registeel.png b/src/afd/sprites/front/379--0--Registeel.png similarity index 100% rename from src/afd/sprites/front/Registeel.png rename to src/afd/sprites/front/379--0--Registeel.png diff --git a/src/afd/sprites/front/Ninetales.png b/src/afd/sprites/front/38--0--Ninetales.png similarity index 100% rename from src/afd/sprites/front/Ninetales.png rename to src/afd/sprites/front/38--0--Ninetales.png diff --git a/src/afd/sprites/front/Ninetales--Alola.png b/src/afd/sprites/front/38--420--Ninetales--Alola.png similarity index 100% rename from src/afd/sprites/front/Ninetales--Alola.png rename to src/afd/sprites/front/38--420--Ninetales--Alola.png diff --git a/src/afd/sprites/front/Latias.png b/src/afd/sprites/front/380--0--Latias.png similarity index 100% rename from src/afd/sprites/front/Latias.png rename to src/afd/sprites/front/380--0--Latias.png diff --git a/src/afd/sprites/front/Latias--Mega.png b/src/afd/sprites/front/380--420--Latias--Mega.png similarity index 100% rename from src/afd/sprites/front/Latias--Mega.png rename to src/afd/sprites/front/380--420--Latias--Mega.png diff --git a/src/afd/sprites/front/Latios.png b/src/afd/sprites/front/381--0--Latios.png similarity index 100% rename from src/afd/sprites/front/Latios.png rename to src/afd/sprites/front/381--0--Latios.png diff --git a/src/afd/sprites/front/Latios--Mega.png b/src/afd/sprites/front/381--420--Latios--Mega.png similarity index 100% rename from src/afd/sprites/front/Latios--Mega.png rename to src/afd/sprites/front/381--420--Latios--Mega.png diff --git a/src/afd/sprites/front/Kyogre.png b/src/afd/sprites/front/382--0--Kyogre.png similarity index 100% rename from src/afd/sprites/front/Kyogre.png rename to src/afd/sprites/front/382--0--Kyogre.png diff --git a/src/afd/sprites/front/Kyogre--Primal.png b/src/afd/sprites/front/382--420--Kyogre--Primal.png similarity index 100% rename from src/afd/sprites/front/Kyogre--Primal.png rename to src/afd/sprites/front/382--420--Kyogre--Primal.png diff --git a/src/afd/sprites/front/Groudon.png b/src/afd/sprites/front/383--0--Groudon.png similarity index 100% rename from src/afd/sprites/front/Groudon.png rename to src/afd/sprites/front/383--0--Groudon.png diff --git a/src/afd/sprites/front/Groudon--Primal.png b/src/afd/sprites/front/383--420--Groudon--Primal.png similarity index 100% rename from src/afd/sprites/front/Groudon--Primal.png rename to src/afd/sprites/front/383--420--Groudon--Primal.png diff --git a/src/afd/sprites/front/Rayquaza.png b/src/afd/sprites/front/384--0--Rayquaza.png similarity index 100% rename from src/afd/sprites/front/Rayquaza.png rename to src/afd/sprites/front/384--0--Rayquaza.png diff --git a/src/afd/sprites/front/Rayquaza--Mega.png b/src/afd/sprites/front/384--420--Rayquaza--Mega.png similarity index 100% rename from src/afd/sprites/front/Rayquaza--Mega.png rename to src/afd/sprites/front/384--420--Rayquaza--Mega.png diff --git a/src/afd/sprites/front/Jirachi.png b/src/afd/sprites/front/385--0--Jirachi.png similarity index 100% rename from src/afd/sprites/front/Jirachi.png rename to src/afd/sprites/front/385--0--Jirachi.png diff --git a/src/afd/sprites/front/Deoxys.png b/src/afd/sprites/front/386--0--Deoxys.png similarity index 100% rename from src/afd/sprites/front/Deoxys.png rename to src/afd/sprites/front/386--0--Deoxys.png diff --git a/src/afd/sprites/front/Deoxys--Attack.png b/src/afd/sprites/front/386--420--Deoxys--Attack.png similarity index 100% rename from src/afd/sprites/front/Deoxys--Attack.png rename to src/afd/sprites/front/386--420--Deoxys--Attack.png diff --git a/src/afd/sprites/front/Deoxys--Defense.png b/src/afd/sprites/front/386--420--Deoxys--Defense.png similarity index 100% rename from src/afd/sprites/front/Deoxys--Defense.png rename to src/afd/sprites/front/386--420--Deoxys--Defense.png diff --git a/src/afd/sprites/front/Deoxys--Speed.png b/src/afd/sprites/front/386--420--Deoxys--Speed.png similarity index 100% rename from src/afd/sprites/front/Deoxys--Speed.png rename to src/afd/sprites/front/386--420--Deoxys--Speed.png diff --git a/src/afd/sprites/front/Turtwig.png b/src/afd/sprites/front/387--0--Turtwig.png similarity index 100% rename from src/afd/sprites/front/Turtwig.png rename to src/afd/sprites/front/387--0--Turtwig.png diff --git a/src/afd/sprites/front/Grotle.png b/src/afd/sprites/front/388--0--Grotle.png similarity index 100% rename from src/afd/sprites/front/Grotle.png rename to src/afd/sprites/front/388--0--Grotle.png diff --git a/src/afd/sprites/front/Torterra.png b/src/afd/sprites/front/389--0--Torterra.png similarity index 100% rename from src/afd/sprites/front/Torterra.png rename to src/afd/sprites/front/389--0--Torterra.png diff --git a/src/afd/sprites/front/Jigglypuff.png b/src/afd/sprites/front/39--0--Jigglypuff.png similarity index 100% rename from src/afd/sprites/front/Jigglypuff.png rename to src/afd/sprites/front/39--0--Jigglypuff.png diff --git a/src/afd/sprites/front/Chimchar.png b/src/afd/sprites/front/390--0--Chimchar.png similarity index 100% rename from src/afd/sprites/front/Chimchar.png rename to src/afd/sprites/front/390--0--Chimchar.png diff --git a/src/afd/sprites/front/Monferno.png b/src/afd/sprites/front/391--0--Monferno.png similarity index 100% rename from src/afd/sprites/front/Monferno.png rename to src/afd/sprites/front/391--0--Monferno.png diff --git a/src/afd/sprites/front/Infernape.png b/src/afd/sprites/front/392--0--Infernape.png similarity index 100% rename from src/afd/sprites/front/Infernape.png rename to src/afd/sprites/front/392--0--Infernape.png diff --git a/src/afd/sprites/front/Piplup.png b/src/afd/sprites/front/393--0--Piplup.png similarity index 100% rename from src/afd/sprites/front/Piplup.png rename to src/afd/sprites/front/393--0--Piplup.png diff --git a/src/afd/sprites/front/Prinplup.png b/src/afd/sprites/front/394--0--Prinplup.png similarity index 100% rename from src/afd/sprites/front/Prinplup.png rename to src/afd/sprites/front/394--0--Prinplup.png diff --git a/src/afd/sprites/front/Empoleon.png b/src/afd/sprites/front/395--0--Empoleon.png similarity index 100% rename from src/afd/sprites/front/Empoleon.png rename to src/afd/sprites/front/395--0--Empoleon.png diff --git a/src/afd/sprites/front/Starly.png b/src/afd/sprites/front/396--0--Starly.png similarity index 100% rename from src/afd/sprites/front/Starly.png rename to src/afd/sprites/front/396--0--Starly.png diff --git a/src/afd/sprites/front/Staravia.png b/src/afd/sprites/front/397--0--Staravia.png similarity index 100% rename from src/afd/sprites/front/Staravia.png rename to src/afd/sprites/front/397--0--Staravia.png diff --git a/src/afd/sprites/front/Staraptor.png b/src/afd/sprites/front/398--0--Staraptor.png similarity index 100% rename from src/afd/sprites/front/Staraptor.png rename to src/afd/sprites/front/398--0--Staraptor.png diff --git a/src/afd/sprites/front/Bidoof.png b/src/afd/sprites/front/399--0--Bidoof.png similarity index 100% rename from src/afd/sprites/front/Bidoof.png rename to src/afd/sprites/front/399--0--Bidoof.png diff --git a/src/afd/sprites/front/Charmander.png b/src/afd/sprites/front/4--0--Charmander.png similarity index 100% rename from src/afd/sprites/front/Charmander.png rename to src/afd/sprites/front/4--0--Charmander.png diff --git a/src/afd/sprites/front/Wigglytuff.png b/src/afd/sprites/front/40--0--Wigglytuff.png similarity index 100% rename from src/afd/sprites/front/Wigglytuff.png rename to src/afd/sprites/front/40--0--Wigglytuff.png diff --git a/src/afd/sprites/front/Bibarel.png b/src/afd/sprites/front/400--0--Bibarel.png similarity index 100% rename from src/afd/sprites/front/Bibarel.png rename to src/afd/sprites/front/400--0--Bibarel.png diff --git a/src/afd/sprites/front/Kricketot.png b/src/afd/sprites/front/401--0--Kricketot.png similarity index 100% rename from src/afd/sprites/front/Kricketot.png rename to src/afd/sprites/front/401--0--Kricketot.png diff --git a/src/afd/sprites/front/Kricketune.png b/src/afd/sprites/front/402--0--Kricketune.png similarity index 100% rename from src/afd/sprites/front/Kricketune.png rename to src/afd/sprites/front/402--0--Kricketune.png diff --git a/src/afd/sprites/front/Shinx.png b/src/afd/sprites/front/403--0--Shinx.png similarity index 100% rename from src/afd/sprites/front/Shinx.png rename to src/afd/sprites/front/403--0--Shinx.png diff --git a/src/afd/sprites/front/Luxio.png b/src/afd/sprites/front/404--0--Luxio.png similarity index 100% rename from src/afd/sprites/front/Luxio.png rename to src/afd/sprites/front/404--0--Luxio.png diff --git a/src/afd/sprites/front/Luxray.png b/src/afd/sprites/front/405--0--Luxray.png similarity index 100% rename from src/afd/sprites/front/Luxray.png rename to src/afd/sprites/front/405--0--Luxray.png diff --git a/src/afd/sprites/front/Budew.gif b/src/afd/sprites/front/406--0--Budew.gif similarity index 100% rename from src/afd/sprites/front/Budew.gif rename to src/afd/sprites/front/406--0--Budew.gif diff --git a/src/afd/sprites/front/Roserade.png b/src/afd/sprites/front/407--0--Roserade.png similarity index 100% rename from src/afd/sprites/front/Roserade.png rename to src/afd/sprites/front/407--0--Roserade.png diff --git a/src/afd/sprites/front/Cranidos.png b/src/afd/sprites/front/408--0--Cranidos.png similarity index 100% rename from src/afd/sprites/front/Cranidos.png rename to src/afd/sprites/front/408--0--Cranidos.png diff --git a/src/afd/sprites/front/Rampardos.png b/src/afd/sprites/front/409--0--Rampardos.png similarity index 100% rename from src/afd/sprites/front/Rampardos.png rename to src/afd/sprites/front/409--0--Rampardos.png diff --git a/src/afd/sprites/front/Zubat.png b/src/afd/sprites/front/41--0--Zubat.png similarity index 100% rename from src/afd/sprites/front/Zubat.png rename to src/afd/sprites/front/41--0--Zubat.png diff --git a/src/afd/sprites/front/Shieldon.png b/src/afd/sprites/front/410--0--Shieldon.png similarity index 100% rename from src/afd/sprites/front/Shieldon.png rename to src/afd/sprites/front/410--0--Shieldon.png diff --git a/src/afd/sprites/front/Bastiodon.png b/src/afd/sprites/front/411--0--Bastiodon.png similarity index 100% rename from src/afd/sprites/front/Bastiodon.png rename to src/afd/sprites/front/411--0--Bastiodon.png diff --git a/src/afd/sprites/front/Burmy.png b/src/afd/sprites/front/412--0--Burmy.png similarity index 100% rename from src/afd/sprites/front/Burmy.png rename to src/afd/sprites/front/412--0--Burmy.png diff --git a/src/afd/sprites/front/Wormadam.png b/src/afd/sprites/front/413--0--Wormadam.png similarity index 100% rename from src/afd/sprites/front/Wormadam.png rename to src/afd/sprites/front/413--0--Wormadam.png diff --git a/src/afd/sprites/front/Wormadam--Sandy.png b/src/afd/sprites/front/413--420--Wormadam--Sandy.png similarity index 100% rename from src/afd/sprites/front/Wormadam--Sandy.png rename to src/afd/sprites/front/413--420--Wormadam--Sandy.png diff --git a/src/afd/sprites/front/Wormadam--Trash.png b/src/afd/sprites/front/413--420--Wormadam--Trash.png similarity index 100% rename from src/afd/sprites/front/Wormadam--Trash.png rename to src/afd/sprites/front/413--420--Wormadam--Trash.png diff --git a/src/afd/sprites/front/Mothim.png b/src/afd/sprites/front/414--0--Mothim.png similarity index 100% rename from src/afd/sprites/front/Mothim.png rename to src/afd/sprites/front/414--0--Mothim.png diff --git a/src/afd/sprites/front/Combee.png b/src/afd/sprites/front/415--0--Combee.png similarity index 100% rename from src/afd/sprites/front/Combee.png rename to src/afd/sprites/front/415--0--Combee.png diff --git a/src/afd/sprites/front/Vespiquen.png b/src/afd/sprites/front/416--0--Vespiquen.png similarity index 100% rename from src/afd/sprites/front/Vespiquen.png rename to src/afd/sprites/front/416--0--Vespiquen.png diff --git a/src/afd/sprites/front/Pachirisu.png b/src/afd/sprites/front/417--0--Pachirisu.png similarity index 100% rename from src/afd/sprites/front/Pachirisu.png rename to src/afd/sprites/front/417--0--Pachirisu.png diff --git a/src/afd/sprites/front/Buizel.png b/src/afd/sprites/front/418--0--Buizel.png similarity index 100% rename from src/afd/sprites/front/Buizel.png rename to src/afd/sprites/front/418--0--Buizel.png diff --git a/src/afd/sprites/front/Floatzel.png b/src/afd/sprites/front/419--0--Floatzel.png similarity index 100% rename from src/afd/sprites/front/Floatzel.png rename to src/afd/sprites/front/419--0--Floatzel.png diff --git a/src/afd/sprites/front/Golbat.png b/src/afd/sprites/front/42--0--Golbat.png similarity index 100% rename from src/afd/sprites/front/Golbat.png rename to src/afd/sprites/front/42--0--Golbat.png diff --git a/src/afd/sprites/front/Cherubi.png b/src/afd/sprites/front/420--0--Cherubi.png similarity index 100% rename from src/afd/sprites/front/Cherubi.png rename to src/afd/sprites/front/420--0--Cherubi.png diff --git a/src/afd/sprites/front/Cherrim.png b/src/afd/sprites/front/421--0--Cherrim.png similarity index 100% rename from src/afd/sprites/front/Cherrim.png rename to src/afd/sprites/front/421--0--Cherrim.png diff --git a/src/afd/sprites/front/Cherrim--Sunshine.png b/src/afd/sprites/front/421--420--Cherrim--Sunshine.png similarity index 100% rename from src/afd/sprites/front/Cherrim--Sunshine.png rename to src/afd/sprites/front/421--420--Cherrim--Sunshine.png diff --git a/src/afd/sprites/front/Shellos.png b/src/afd/sprites/front/422--0--Shellos.png similarity index 100% rename from src/afd/sprites/front/Shellos.png rename to src/afd/sprites/front/422--0--Shellos.png diff --git a/src/afd/sprites/front/Gastrodon.png b/src/afd/sprites/front/423--0--Gastrodon.png similarity index 100% rename from src/afd/sprites/front/Gastrodon.png rename to src/afd/sprites/front/423--0--Gastrodon.png diff --git a/src/afd/sprites/front/Ambipom.png b/src/afd/sprites/front/424--0--Ambipom.png similarity index 100% rename from src/afd/sprites/front/Ambipom.png rename to src/afd/sprites/front/424--0--Ambipom.png diff --git a/src/afd/sprites/front/Drifloon.png b/src/afd/sprites/front/425--0--Drifloon.png similarity index 100% rename from src/afd/sprites/front/Drifloon.png rename to src/afd/sprites/front/425--0--Drifloon.png diff --git a/src/afd/sprites/front/Drifblim.png b/src/afd/sprites/front/426--0--Drifblim.png similarity index 100% rename from src/afd/sprites/front/Drifblim.png rename to src/afd/sprites/front/426--0--Drifblim.png diff --git a/src/afd/sprites/front/Buneary.png b/src/afd/sprites/front/427--0--Buneary.png similarity index 100% rename from src/afd/sprites/front/Buneary.png rename to src/afd/sprites/front/427--0--Buneary.png diff --git a/src/afd/sprites/front/Lopunny.png b/src/afd/sprites/front/428--0--Lopunny.png similarity index 100% rename from src/afd/sprites/front/Lopunny.png rename to src/afd/sprites/front/428--0--Lopunny.png diff --git a/src/afd/sprites/front/Lopunny--Mega.png b/src/afd/sprites/front/428--420--Lopunny--Mega.png similarity index 100% rename from src/afd/sprites/front/Lopunny--Mega.png rename to src/afd/sprites/front/428--420--Lopunny--Mega.png diff --git a/src/afd/sprites/front/Mismagius.png b/src/afd/sprites/front/429--0--Mismagius.png similarity index 100% rename from src/afd/sprites/front/Mismagius.png rename to src/afd/sprites/front/429--0--Mismagius.png diff --git a/src/afd/sprites/front/Oddish.png b/src/afd/sprites/front/43--0--Oddish.png similarity index 100% rename from src/afd/sprites/front/Oddish.png rename to src/afd/sprites/front/43--0--Oddish.png diff --git a/src/afd/sprites/front/Honchkrow.png b/src/afd/sprites/front/430--0--Honchkrow.png similarity index 100% rename from src/afd/sprites/front/Honchkrow.png rename to src/afd/sprites/front/430--0--Honchkrow.png diff --git a/src/afd/sprites/front/Glameow.png b/src/afd/sprites/front/431--0--Glameow.png similarity index 100% rename from src/afd/sprites/front/Glameow.png rename to src/afd/sprites/front/431--0--Glameow.png diff --git a/src/afd/sprites/front/Purugly.png b/src/afd/sprites/front/432--0--Purugly.png similarity index 100% rename from src/afd/sprites/front/Purugly.png rename to src/afd/sprites/front/432--0--Purugly.png diff --git a/src/afd/sprites/front/Chingling.png b/src/afd/sprites/front/433--0--Chingling.png similarity index 100% rename from src/afd/sprites/front/Chingling.png rename to src/afd/sprites/front/433--0--Chingling.png diff --git a/src/afd/sprites/front/Stunky.png b/src/afd/sprites/front/434--0--Stunky.png similarity index 100% rename from src/afd/sprites/front/Stunky.png rename to src/afd/sprites/front/434--0--Stunky.png diff --git a/src/afd/sprites/front/Skuntank.png b/src/afd/sprites/front/435--0--Skuntank.png similarity index 100% rename from src/afd/sprites/front/Skuntank.png rename to src/afd/sprites/front/435--0--Skuntank.png diff --git a/src/afd/sprites/front/Bronzor.png b/src/afd/sprites/front/436--0--Bronzor.png similarity index 100% rename from src/afd/sprites/front/Bronzor.png rename to src/afd/sprites/front/436--0--Bronzor.png diff --git a/src/afd/sprites/front/Bronzong.png b/src/afd/sprites/front/437--0--Bronzong.png similarity index 100% rename from src/afd/sprites/front/Bronzong.png rename to src/afd/sprites/front/437--0--Bronzong.png diff --git a/src/afd/sprites/front/Bonsly.png b/src/afd/sprites/front/438--0--Bonsly.png similarity index 100% rename from src/afd/sprites/front/Bonsly.png rename to src/afd/sprites/front/438--0--Bonsly.png diff --git a/src/afd/sprites/front/Mime_Jr..png b/src/afd/sprites/front/439--0--Mime_Jr..png similarity index 100% rename from src/afd/sprites/front/Mime_Jr..png rename to src/afd/sprites/front/439--0--Mime_Jr..png diff --git a/src/afd/sprites/front/Gloom.png b/src/afd/sprites/front/44--0--Gloom.png similarity index 100% rename from src/afd/sprites/front/Gloom.png rename to src/afd/sprites/front/44--0--Gloom.png diff --git a/src/afd/sprites/front/Happiny.png b/src/afd/sprites/front/440--0--Happiny.png similarity index 100% rename from src/afd/sprites/front/Happiny.png rename to src/afd/sprites/front/440--0--Happiny.png diff --git a/src/afd/sprites/front/Chatot.png b/src/afd/sprites/front/441--0--Chatot.png similarity index 100% rename from src/afd/sprites/front/Chatot.png rename to src/afd/sprites/front/441--0--Chatot.png diff --git a/src/afd/sprites/front/Spiritomb.png b/src/afd/sprites/front/442--0--Spiritomb.png similarity index 100% rename from src/afd/sprites/front/Spiritomb.png rename to src/afd/sprites/front/442--0--Spiritomb.png diff --git a/src/afd/sprites/front/Gible.png b/src/afd/sprites/front/443--0--Gible.png similarity index 100% rename from src/afd/sprites/front/Gible.png rename to src/afd/sprites/front/443--0--Gible.png diff --git a/src/afd/sprites/front/Gabite.png b/src/afd/sprites/front/444--0--Gabite.png similarity index 100% rename from src/afd/sprites/front/Gabite.png rename to src/afd/sprites/front/444--0--Gabite.png diff --git a/src/afd/sprites/front/Garchomp.png b/src/afd/sprites/front/445--0--Garchomp.png similarity index 100% rename from src/afd/sprites/front/Garchomp.png rename to src/afd/sprites/front/445--0--Garchomp.png diff --git a/src/afd/sprites/front/Garchomp--Mega.png b/src/afd/sprites/front/445--420--Garchomp--Mega.png similarity index 100% rename from src/afd/sprites/front/Garchomp--Mega.png rename to src/afd/sprites/front/445--420--Garchomp--Mega.png diff --git a/src/afd/sprites/front/Munchlax.png b/src/afd/sprites/front/446--0--Munchlax.png similarity index 100% rename from src/afd/sprites/front/Munchlax.png rename to src/afd/sprites/front/446--0--Munchlax.png diff --git a/src/afd/sprites/front/Riolu.png b/src/afd/sprites/front/447--0--Riolu.png similarity index 100% rename from src/afd/sprites/front/Riolu.png rename to src/afd/sprites/front/447--0--Riolu.png diff --git a/src/afd/sprites/front/Lucario.png b/src/afd/sprites/front/448--0--Lucario.png similarity index 100% rename from src/afd/sprites/front/Lucario.png rename to src/afd/sprites/front/448--0--Lucario.png diff --git a/src/afd/sprites/front/Lucario--Mega.png b/src/afd/sprites/front/448--420--Lucario--Mega.png similarity index 100% rename from src/afd/sprites/front/Lucario--Mega.png rename to src/afd/sprites/front/448--420--Lucario--Mega.png diff --git a/src/afd/sprites/front/Hippopotas.png b/src/afd/sprites/front/449--0--Hippopotas.png similarity index 100% rename from src/afd/sprites/front/Hippopotas.png rename to src/afd/sprites/front/449--0--Hippopotas.png diff --git a/src/afd/sprites/front/Vileplume.png b/src/afd/sprites/front/45--0--Vileplume.png similarity index 100% rename from src/afd/sprites/front/Vileplume.png rename to src/afd/sprites/front/45--0--Vileplume.png diff --git a/src/afd/sprites/front/Hippowdon.png b/src/afd/sprites/front/450--0--Hippowdon.png similarity index 100% rename from src/afd/sprites/front/Hippowdon.png rename to src/afd/sprites/front/450--0--Hippowdon.png diff --git a/src/afd/sprites/front/Skorupi.png b/src/afd/sprites/front/451--0--Skorupi.png similarity index 100% rename from src/afd/sprites/front/Skorupi.png rename to src/afd/sprites/front/451--0--Skorupi.png diff --git a/src/afd/sprites/front/Drapion.png b/src/afd/sprites/front/452--0--Drapion.png similarity index 100% rename from src/afd/sprites/front/Drapion.png rename to src/afd/sprites/front/452--0--Drapion.png diff --git a/src/afd/sprites/front/Croagunk.png b/src/afd/sprites/front/453--0--Croagunk.png similarity index 100% rename from src/afd/sprites/front/Croagunk.png rename to src/afd/sprites/front/453--0--Croagunk.png diff --git a/src/afd/sprites/front/Toxicroak.png b/src/afd/sprites/front/454--0--Toxicroak.png similarity index 100% rename from src/afd/sprites/front/Toxicroak.png rename to src/afd/sprites/front/454--0--Toxicroak.png diff --git a/src/afd/sprites/front/Carnivine.png b/src/afd/sprites/front/455--0--Carnivine.png similarity index 100% rename from src/afd/sprites/front/Carnivine.png rename to src/afd/sprites/front/455--0--Carnivine.png diff --git a/src/afd/sprites/front/Finneon.png b/src/afd/sprites/front/456--0--Finneon.png similarity index 100% rename from src/afd/sprites/front/Finneon.png rename to src/afd/sprites/front/456--0--Finneon.png diff --git a/src/afd/sprites/front/Lumineon.png b/src/afd/sprites/front/457--0--Lumineon.png similarity index 100% rename from src/afd/sprites/front/Lumineon.png rename to src/afd/sprites/front/457--0--Lumineon.png diff --git a/src/afd/sprites/front/Mantyke.png b/src/afd/sprites/front/458--0--Mantyke.png similarity index 100% rename from src/afd/sprites/front/Mantyke.png rename to src/afd/sprites/front/458--0--Mantyke.png diff --git a/src/afd/sprites/front/Snover.png b/src/afd/sprites/front/459--0--Snover.png similarity index 100% rename from src/afd/sprites/front/Snover.png rename to src/afd/sprites/front/459--0--Snover.png diff --git a/src/afd/sprites/front/Paras.png b/src/afd/sprites/front/46--0--Paras.png similarity index 100% rename from src/afd/sprites/front/Paras.png rename to src/afd/sprites/front/46--0--Paras.png diff --git a/src/afd/sprites/front/Abomasnow.png b/src/afd/sprites/front/460--0--Abomasnow.png similarity index 100% rename from src/afd/sprites/front/Abomasnow.png rename to src/afd/sprites/front/460--0--Abomasnow.png diff --git a/src/afd/sprites/front/Abomasnow--Mega.png b/src/afd/sprites/front/460--420--Abomasnow--Mega.png similarity index 100% rename from src/afd/sprites/front/Abomasnow--Mega.png rename to src/afd/sprites/front/460--420--Abomasnow--Mega.png diff --git a/src/afd/sprites/front/Weavile.png b/src/afd/sprites/front/461--0--Weavile.png similarity index 100% rename from src/afd/sprites/front/Weavile.png rename to src/afd/sprites/front/461--0--Weavile.png diff --git a/src/afd/sprites/front/Magnezone.png b/src/afd/sprites/front/462--0--Magnezone.png similarity index 100% rename from src/afd/sprites/front/Magnezone.png rename to src/afd/sprites/front/462--0--Magnezone.png diff --git a/src/afd/sprites/front/Lickilicky.png b/src/afd/sprites/front/463--0--Lickilicky.png similarity index 100% rename from src/afd/sprites/front/Lickilicky.png rename to src/afd/sprites/front/463--0--Lickilicky.png diff --git a/src/afd/sprites/front/Rhyperior.png b/src/afd/sprites/front/464--0--Rhyperior.png similarity index 100% rename from src/afd/sprites/front/Rhyperior.png rename to src/afd/sprites/front/464--0--Rhyperior.png diff --git a/src/afd/sprites/front/Tangrowth.png b/src/afd/sprites/front/465--0--Tangrowth.png similarity index 100% rename from src/afd/sprites/front/Tangrowth.png rename to src/afd/sprites/front/465--0--Tangrowth.png diff --git a/src/afd/sprites/front/Electivire.png b/src/afd/sprites/front/466--0--Electivire.png similarity index 100% rename from src/afd/sprites/front/Electivire.png rename to src/afd/sprites/front/466--0--Electivire.png diff --git a/src/afd/sprites/front/Magmortar.png b/src/afd/sprites/front/467--0--Magmortar.png similarity index 100% rename from src/afd/sprites/front/Magmortar.png rename to src/afd/sprites/front/467--0--Magmortar.png diff --git a/src/afd/sprites/front/Togekiss.png b/src/afd/sprites/front/468--0--Togekiss.png similarity index 100% rename from src/afd/sprites/front/Togekiss.png rename to src/afd/sprites/front/468--0--Togekiss.png diff --git a/src/afd/sprites/front/Yanmega.png b/src/afd/sprites/front/469--0--Yanmega.png similarity index 100% rename from src/afd/sprites/front/Yanmega.png rename to src/afd/sprites/front/469--0--Yanmega.png diff --git a/src/afd/sprites/front/Parasect.png b/src/afd/sprites/front/47--0--Parasect.png similarity index 100% rename from src/afd/sprites/front/Parasect.png rename to src/afd/sprites/front/47--0--Parasect.png diff --git a/src/afd/sprites/front/Leafeon.png b/src/afd/sprites/front/470--0--Leafeon.png similarity index 100% rename from src/afd/sprites/front/Leafeon.png rename to src/afd/sprites/front/470--0--Leafeon.png diff --git a/src/afd/sprites/front/Glaceon.png b/src/afd/sprites/front/471--0--Glaceon.png similarity index 100% rename from src/afd/sprites/front/Glaceon.png rename to src/afd/sprites/front/471--0--Glaceon.png diff --git a/src/afd/sprites/front/Gliscor.png b/src/afd/sprites/front/472--0--Gliscor.png similarity index 100% rename from src/afd/sprites/front/Gliscor.png rename to src/afd/sprites/front/472--0--Gliscor.png diff --git a/src/afd/sprites/front/Mamoswine.png b/src/afd/sprites/front/473--0--Mamoswine.png similarity index 100% rename from src/afd/sprites/front/Mamoswine.png rename to src/afd/sprites/front/473--0--Mamoswine.png diff --git a/src/afd/sprites/front/Porygon-Z.png b/src/afd/sprites/front/474--0--Porygon-Z.png similarity index 100% rename from src/afd/sprites/front/Porygon-Z.png rename to src/afd/sprites/front/474--0--Porygon-Z.png diff --git a/src/afd/sprites/front/Gallade.png b/src/afd/sprites/front/475--0--Gallade.png similarity index 100% rename from src/afd/sprites/front/Gallade.png rename to src/afd/sprites/front/475--0--Gallade.png diff --git a/src/afd/sprites/front/Gallade--Mega.png b/src/afd/sprites/front/475--420--Gallade--Mega.png similarity index 100% rename from src/afd/sprites/front/Gallade--Mega.png rename to src/afd/sprites/front/475--420--Gallade--Mega.png diff --git a/src/afd/sprites/front/Probopass.png b/src/afd/sprites/front/476--0--Probopass.png similarity index 100% rename from src/afd/sprites/front/Probopass.png rename to src/afd/sprites/front/476--0--Probopass.png diff --git a/src/afd/sprites/front/Dusknoir.png b/src/afd/sprites/front/477--0--Dusknoir.png similarity index 100% rename from src/afd/sprites/front/Dusknoir.png rename to src/afd/sprites/front/477--0--Dusknoir.png diff --git a/src/afd/sprites/front/Froslass.png b/src/afd/sprites/front/478--0--Froslass.png similarity index 100% rename from src/afd/sprites/front/Froslass.png rename to src/afd/sprites/front/478--0--Froslass.png diff --git a/src/afd/sprites/front/Rotom.png b/src/afd/sprites/front/479--0--Rotom.png similarity index 100% rename from src/afd/sprites/front/Rotom.png rename to src/afd/sprites/front/479--0--Rotom.png diff --git a/src/afd/sprites/front/Rotom--Fan.png b/src/afd/sprites/front/479--420--Rotom--Fan.png similarity index 100% rename from src/afd/sprites/front/Rotom--Fan.png rename to src/afd/sprites/front/479--420--Rotom--Fan.png diff --git a/src/afd/sprites/front/Rotom--Frost.png b/src/afd/sprites/front/479--420--Rotom--Frost.png similarity index 100% rename from src/afd/sprites/front/Rotom--Frost.png rename to src/afd/sprites/front/479--420--Rotom--Frost.png diff --git a/src/afd/sprites/front/Rotom--Heat.png b/src/afd/sprites/front/479--420--Rotom--Heat.png similarity index 100% rename from src/afd/sprites/front/Rotom--Heat.png rename to src/afd/sprites/front/479--420--Rotom--Heat.png diff --git a/src/afd/sprites/front/Rotom--Mow.png b/src/afd/sprites/front/479--420--Rotom--Mow.png similarity index 100% rename from src/afd/sprites/front/Rotom--Mow.png rename to src/afd/sprites/front/479--420--Rotom--Mow.png diff --git a/src/afd/sprites/front/Rotom--Wash.png b/src/afd/sprites/front/479--420--Rotom--Wash.png similarity index 100% rename from src/afd/sprites/front/Rotom--Wash.png rename to src/afd/sprites/front/479--420--Rotom--Wash.png diff --git a/src/afd/sprites/front/Venonat.png b/src/afd/sprites/front/48--0--Venonat.png similarity index 100% rename from src/afd/sprites/front/Venonat.png rename to src/afd/sprites/front/48--0--Venonat.png diff --git a/src/afd/sprites/front/Uxie.png b/src/afd/sprites/front/480--0--Uxie.png similarity index 100% rename from src/afd/sprites/front/Uxie.png rename to src/afd/sprites/front/480--0--Uxie.png diff --git a/src/afd/sprites/front/Mesprit.png b/src/afd/sprites/front/481--0--Mesprit.png similarity index 100% rename from src/afd/sprites/front/Mesprit.png rename to src/afd/sprites/front/481--0--Mesprit.png diff --git a/src/afd/sprites/front/Azelf.png b/src/afd/sprites/front/482--0--Azelf.png similarity index 100% rename from src/afd/sprites/front/Azelf.png rename to src/afd/sprites/front/482--0--Azelf.png diff --git a/src/afd/sprites/front/Dialga.png b/src/afd/sprites/front/483--0--Dialga.png similarity index 100% rename from src/afd/sprites/front/Dialga.png rename to src/afd/sprites/front/483--0--Dialga.png diff --git a/src/afd/sprites/front/Palkia.png b/src/afd/sprites/front/484--0--Palkia.png similarity index 100% rename from src/afd/sprites/front/Palkia.png rename to src/afd/sprites/front/484--0--Palkia.png diff --git a/src/afd/sprites/front/Heatran.png b/src/afd/sprites/front/485--0--Heatran.png similarity index 100% rename from src/afd/sprites/front/Heatran.png rename to src/afd/sprites/front/485--0--Heatran.png diff --git a/src/afd/sprites/front/Regigigas.png b/src/afd/sprites/front/486--0--Regigigas.png similarity index 100% rename from src/afd/sprites/front/Regigigas.png rename to src/afd/sprites/front/486--0--Regigigas.png diff --git a/src/afd/sprites/front/Giratina.png b/src/afd/sprites/front/487--0--Giratina.png similarity index 100% rename from src/afd/sprites/front/Giratina.png rename to src/afd/sprites/front/487--0--Giratina.png diff --git a/src/afd/sprites/front/Giratina--Origin.png b/src/afd/sprites/front/487--420--Giratina--Origin.png similarity index 100% rename from src/afd/sprites/front/Giratina--Origin.png rename to src/afd/sprites/front/487--420--Giratina--Origin.png diff --git a/src/afd/sprites/front/Cresselia.png b/src/afd/sprites/front/488--0--Cresselia.png similarity index 100% rename from src/afd/sprites/front/Cresselia.png rename to src/afd/sprites/front/488--0--Cresselia.png diff --git a/src/afd/sprites/front/Phione.png b/src/afd/sprites/front/489--0--Phione.png similarity index 100% rename from src/afd/sprites/front/Phione.png rename to src/afd/sprites/front/489--0--Phione.png diff --git a/src/afd/sprites/front/Venomoth.png b/src/afd/sprites/front/49--0--Venomoth.png similarity index 100% rename from src/afd/sprites/front/Venomoth.png rename to src/afd/sprites/front/49--0--Venomoth.png diff --git a/src/afd/sprites/front/Manaphy.png b/src/afd/sprites/front/490--0--Manaphy.png similarity index 100% rename from src/afd/sprites/front/Manaphy.png rename to src/afd/sprites/front/490--0--Manaphy.png diff --git a/src/afd/sprites/front/Darkrai.png b/src/afd/sprites/front/491--0--Darkrai.png similarity index 100% rename from src/afd/sprites/front/Darkrai.png rename to src/afd/sprites/front/491--0--Darkrai.png diff --git a/src/afd/sprites/front/Shaymin.png b/src/afd/sprites/front/492--0--Shaymin.png similarity index 100% rename from src/afd/sprites/front/Shaymin.png rename to src/afd/sprites/front/492--0--Shaymin.png diff --git a/src/afd/sprites/front/Shaymin--Sky.png b/src/afd/sprites/front/492--420--Shaymin--Sky.png similarity index 100% rename from src/afd/sprites/front/Shaymin--Sky.png rename to src/afd/sprites/front/492--420--Shaymin--Sky.png diff --git a/src/afd/sprites/front/Arceus.png b/src/afd/sprites/front/493--0--Arceus.png similarity index 100% rename from src/afd/sprites/front/Arceus.png rename to src/afd/sprites/front/493--0--Arceus.png diff --git a/src/afd/sprites/front/Arceus--Bug.png b/src/afd/sprites/front/493--420--Arceus--Bug.png similarity index 100% rename from src/afd/sprites/front/Arceus--Bug.png rename to src/afd/sprites/front/493--420--Arceus--Bug.png diff --git a/src/afd/sprites/front/Arceus--Dark.png b/src/afd/sprites/front/493--420--Arceus--Dark.png similarity index 100% rename from src/afd/sprites/front/Arceus--Dark.png rename to src/afd/sprites/front/493--420--Arceus--Dark.png diff --git a/src/afd/sprites/front/Arceus--Dragon.png b/src/afd/sprites/front/493--420--Arceus--Dragon.png similarity index 100% rename from src/afd/sprites/front/Arceus--Dragon.png rename to src/afd/sprites/front/493--420--Arceus--Dragon.png diff --git a/src/afd/sprites/front/Arceus--Electric.png b/src/afd/sprites/front/493--420--Arceus--Electric.png similarity index 100% rename from src/afd/sprites/front/Arceus--Electric.png rename to src/afd/sprites/front/493--420--Arceus--Electric.png diff --git a/src/afd/sprites/front/Arceus--Fairy.png b/src/afd/sprites/front/493--420--Arceus--Fairy.png similarity index 100% rename from src/afd/sprites/front/Arceus--Fairy.png rename to src/afd/sprites/front/493--420--Arceus--Fairy.png diff --git a/src/afd/sprites/front/Arceus--Fighting.png b/src/afd/sprites/front/493--420--Arceus--Fighting.png similarity index 100% rename from src/afd/sprites/front/Arceus--Fighting.png rename to src/afd/sprites/front/493--420--Arceus--Fighting.png diff --git a/src/afd/sprites/front/Arceus--Fire.png b/src/afd/sprites/front/493--420--Arceus--Fire.png similarity index 100% rename from src/afd/sprites/front/Arceus--Fire.png rename to src/afd/sprites/front/493--420--Arceus--Fire.png diff --git a/src/afd/sprites/front/Arceus--Flying.png b/src/afd/sprites/front/493--420--Arceus--Flying.png similarity index 100% rename from src/afd/sprites/front/Arceus--Flying.png rename to src/afd/sprites/front/493--420--Arceus--Flying.png diff --git a/src/afd/sprites/front/Arceus--Ghost.png b/src/afd/sprites/front/493--420--Arceus--Ghost.png similarity index 100% rename from src/afd/sprites/front/Arceus--Ghost.png rename to src/afd/sprites/front/493--420--Arceus--Ghost.png diff --git a/src/afd/sprites/front/Arceus--Grass.png b/src/afd/sprites/front/493--420--Arceus--Grass.png similarity index 100% rename from src/afd/sprites/front/Arceus--Grass.png rename to src/afd/sprites/front/493--420--Arceus--Grass.png diff --git a/src/afd/sprites/front/Arceus--Ground.png b/src/afd/sprites/front/493--420--Arceus--Ground.png similarity index 100% rename from src/afd/sprites/front/Arceus--Ground.png rename to src/afd/sprites/front/493--420--Arceus--Ground.png diff --git a/src/afd/sprites/front/Arceus--Ice.png b/src/afd/sprites/front/493--420--Arceus--Ice.png similarity index 100% rename from src/afd/sprites/front/Arceus--Ice.png rename to src/afd/sprites/front/493--420--Arceus--Ice.png diff --git a/src/afd/sprites/front/Arceus--Poison.png b/src/afd/sprites/front/493--420--Arceus--Poison.png similarity index 100% rename from src/afd/sprites/front/Arceus--Poison.png rename to src/afd/sprites/front/493--420--Arceus--Poison.png diff --git a/src/afd/sprites/front/Arceus--Psychic.png b/src/afd/sprites/front/493--420--Arceus--Psychic.png similarity index 100% rename from src/afd/sprites/front/Arceus--Psychic.png rename to src/afd/sprites/front/493--420--Arceus--Psychic.png diff --git a/src/afd/sprites/front/Arceus--Rock.png b/src/afd/sprites/front/493--420--Arceus--Rock.png similarity index 100% rename from src/afd/sprites/front/Arceus--Rock.png rename to src/afd/sprites/front/493--420--Arceus--Rock.png diff --git a/src/afd/sprites/front/Arceus--Steel.png b/src/afd/sprites/front/493--420--Arceus--Steel.png similarity index 100% rename from src/afd/sprites/front/Arceus--Steel.png rename to src/afd/sprites/front/493--420--Arceus--Steel.png diff --git a/src/afd/sprites/front/Arceus--Water.png b/src/afd/sprites/front/493--420--Arceus--Water.png similarity index 100% rename from src/afd/sprites/front/Arceus--Water.png rename to src/afd/sprites/front/493--420--Arceus--Water.png diff --git a/src/afd/sprites/front/Victini.png b/src/afd/sprites/front/494--0--Victini.png similarity index 100% rename from src/afd/sprites/front/Victini.png rename to src/afd/sprites/front/494--0--Victini.png diff --git a/src/afd/sprites/front/Snivy.png b/src/afd/sprites/front/495--0--Snivy.png similarity index 100% rename from src/afd/sprites/front/Snivy.png rename to src/afd/sprites/front/495--0--Snivy.png diff --git a/src/afd/sprites/front/Servine.png b/src/afd/sprites/front/496--0--Servine.png similarity index 100% rename from src/afd/sprites/front/Servine.png rename to src/afd/sprites/front/496--0--Servine.png diff --git a/src/afd/sprites/front/Serperior.png b/src/afd/sprites/front/497--0--Serperior.png similarity index 100% rename from src/afd/sprites/front/Serperior.png rename to src/afd/sprites/front/497--0--Serperior.png diff --git a/src/afd/sprites/front/Tepig.png b/src/afd/sprites/front/498--0--Tepig.png similarity index 100% rename from src/afd/sprites/front/Tepig.png rename to src/afd/sprites/front/498--0--Tepig.png diff --git a/src/afd/sprites/front/Pignite.png b/src/afd/sprites/front/499--0--Pignite.png similarity index 100% rename from src/afd/sprites/front/Pignite.png rename to src/afd/sprites/front/499--0--Pignite.png diff --git a/src/afd/sprites/front/Charmeleon.png b/src/afd/sprites/front/5--0--Charmeleon.png similarity index 100% rename from src/afd/sprites/front/Charmeleon.png rename to src/afd/sprites/front/5--0--Charmeleon.png diff --git a/src/afd/sprites/front/Diglett.png b/src/afd/sprites/front/50--0--Diglett.png similarity index 100% rename from src/afd/sprites/front/Diglett.png rename to src/afd/sprites/front/50--0--Diglett.png diff --git a/src/afd/sprites/front/Diglett--Alola.png b/src/afd/sprites/front/50--420--Diglett--Alola.png similarity index 100% rename from src/afd/sprites/front/Diglett--Alola.png rename to src/afd/sprites/front/50--420--Diglett--Alola.png diff --git a/src/afd/sprites/front/Emboar.png b/src/afd/sprites/front/500--0--Emboar.png similarity index 100% rename from src/afd/sprites/front/Emboar.png rename to src/afd/sprites/front/500--0--Emboar.png diff --git a/src/afd/sprites/front/Oshawott.png b/src/afd/sprites/front/501--0--Oshawott.png similarity index 100% rename from src/afd/sprites/front/Oshawott.png rename to src/afd/sprites/front/501--0--Oshawott.png diff --git a/src/afd/sprites/front/Dewott.png b/src/afd/sprites/front/502--0--Dewott.png similarity index 100% rename from src/afd/sprites/front/Dewott.png rename to src/afd/sprites/front/502--0--Dewott.png diff --git a/src/afd/sprites/front/Samurott.png b/src/afd/sprites/front/503--0--Samurott.png similarity index 100% rename from src/afd/sprites/front/Samurott.png rename to src/afd/sprites/front/503--0--Samurott.png diff --git a/src/afd/sprites/front/Patrat.png b/src/afd/sprites/front/504--0--Patrat.png similarity index 100% rename from src/afd/sprites/front/Patrat.png rename to src/afd/sprites/front/504--0--Patrat.png diff --git a/src/afd/sprites/front/Watchog.png b/src/afd/sprites/front/505--0--Watchog.png similarity index 100% rename from src/afd/sprites/front/Watchog.png rename to src/afd/sprites/front/505--0--Watchog.png diff --git a/src/afd/sprites/front/Lillipup.png b/src/afd/sprites/front/506--0--Lillipup.png similarity index 100% rename from src/afd/sprites/front/Lillipup.png rename to src/afd/sprites/front/506--0--Lillipup.png diff --git a/src/afd/sprites/front/Herdier.png b/src/afd/sprites/front/507--0--Herdier.png similarity index 100% rename from src/afd/sprites/front/Herdier.png rename to src/afd/sprites/front/507--0--Herdier.png diff --git a/src/afd/sprites/front/Stoutland.png b/src/afd/sprites/front/508--0--Stoutland.png similarity index 100% rename from src/afd/sprites/front/Stoutland.png rename to src/afd/sprites/front/508--0--Stoutland.png diff --git a/src/afd/sprites/front/Purrloin.png b/src/afd/sprites/front/509--0--Purrloin.png similarity index 100% rename from src/afd/sprites/front/Purrloin.png rename to src/afd/sprites/front/509--0--Purrloin.png diff --git a/src/afd/sprites/front/Dugtrio.png b/src/afd/sprites/front/51--0--Dugtrio.png similarity index 100% rename from src/afd/sprites/front/Dugtrio.png rename to src/afd/sprites/front/51--0--Dugtrio.png diff --git a/src/afd/sprites/front/Dugtrio--Alola.png b/src/afd/sprites/front/51--420--Dugtrio--Alola.png similarity index 100% rename from src/afd/sprites/front/Dugtrio--Alola.png rename to src/afd/sprites/front/51--420--Dugtrio--Alola.png diff --git a/src/afd/sprites/front/Liepard.png b/src/afd/sprites/front/510--0--Liepard.png similarity index 100% rename from src/afd/sprites/front/Liepard.png rename to src/afd/sprites/front/510--0--Liepard.png diff --git a/src/afd/sprites/front/Pansage.png b/src/afd/sprites/front/511--0--Pansage.png similarity index 100% rename from src/afd/sprites/front/Pansage.png rename to src/afd/sprites/front/511--0--Pansage.png diff --git a/src/afd/sprites/front/Simisage.png b/src/afd/sprites/front/512--0--Simisage.png similarity index 100% rename from src/afd/sprites/front/Simisage.png rename to src/afd/sprites/front/512--0--Simisage.png diff --git a/src/afd/sprites/front/Pansear.png b/src/afd/sprites/front/513--0--Pansear.png similarity index 100% rename from src/afd/sprites/front/Pansear.png rename to src/afd/sprites/front/513--0--Pansear.png diff --git a/src/afd/sprites/front/Simisear.png b/src/afd/sprites/front/514--0--Simisear.png similarity index 100% rename from src/afd/sprites/front/Simisear.png rename to src/afd/sprites/front/514--0--Simisear.png diff --git a/src/afd/sprites/front/Panpour.png b/src/afd/sprites/front/515--0--Panpour.png similarity index 100% rename from src/afd/sprites/front/Panpour.png rename to src/afd/sprites/front/515--0--Panpour.png diff --git a/src/afd/sprites/front/Simipour.png b/src/afd/sprites/front/516--0--Simipour.png similarity index 100% rename from src/afd/sprites/front/Simipour.png rename to src/afd/sprites/front/516--0--Simipour.png diff --git a/src/afd/sprites/front/Munna.png b/src/afd/sprites/front/517--0--Munna.png similarity index 100% rename from src/afd/sprites/front/Munna.png rename to src/afd/sprites/front/517--0--Munna.png diff --git a/src/afd/sprites/front/Musharna.png b/src/afd/sprites/front/518--0--Musharna.png similarity index 100% rename from src/afd/sprites/front/Musharna.png rename to src/afd/sprites/front/518--0--Musharna.png diff --git a/src/afd/sprites/front/Pidove.png b/src/afd/sprites/front/519--0--Pidove.png similarity index 100% rename from src/afd/sprites/front/Pidove.png rename to src/afd/sprites/front/519--0--Pidove.png diff --git a/src/afd/sprites/front/Meowth.png b/src/afd/sprites/front/52--0--Meowth.png similarity index 100% rename from src/afd/sprites/front/Meowth.png rename to src/afd/sprites/front/52--0--Meowth.png diff --git a/src/afd/sprites/front/Meowth--Alola.png b/src/afd/sprites/front/52--420--Meowth--Alola.png similarity index 100% rename from src/afd/sprites/front/Meowth--Alola.png rename to src/afd/sprites/front/52--420--Meowth--Alola.png diff --git a/src/afd/sprites/front/Meowth--Galar.png b/src/afd/sprites/front/52--420--Meowth--Galar.png similarity index 100% rename from src/afd/sprites/front/Meowth--Galar.png rename to src/afd/sprites/front/52--420--Meowth--Galar.png diff --git a/src/afd/sprites/front/Meowth--Gmax.png b/src/afd/sprites/front/52--420--Meowth--Gmax.png similarity index 100% rename from src/afd/sprites/front/Meowth--Gmax.png rename to src/afd/sprites/front/52--420--Meowth--Gmax.png diff --git a/src/afd/sprites/front/Tranquill.png b/src/afd/sprites/front/520--0--Tranquill.png similarity index 100% rename from src/afd/sprites/front/Tranquill.png rename to src/afd/sprites/front/520--0--Tranquill.png diff --git a/src/afd/sprites/front/Unfezant.png b/src/afd/sprites/front/521--0--Unfezant.png similarity index 100% rename from src/afd/sprites/front/Unfezant.png rename to src/afd/sprites/front/521--0--Unfezant.png diff --git a/src/afd/sprites/front/Blitzle.png b/src/afd/sprites/front/522--0--Blitzle.png similarity index 100% rename from src/afd/sprites/front/Blitzle.png rename to src/afd/sprites/front/522--0--Blitzle.png diff --git a/src/afd/sprites/front/Zebstrika.png b/src/afd/sprites/front/523--0--Zebstrika.png similarity index 100% rename from src/afd/sprites/front/Zebstrika.png rename to src/afd/sprites/front/523--0--Zebstrika.png diff --git a/src/afd/sprites/front/Roggenrola.png b/src/afd/sprites/front/524--0--Roggenrola.png similarity index 100% rename from src/afd/sprites/front/Roggenrola.png rename to src/afd/sprites/front/524--0--Roggenrola.png diff --git a/src/afd/sprites/front/Boldore.png b/src/afd/sprites/front/525--0--Boldore.png similarity index 100% rename from src/afd/sprites/front/Boldore.png rename to src/afd/sprites/front/525--0--Boldore.png diff --git a/src/afd/sprites/front/Gigalith.png b/src/afd/sprites/front/526--0--Gigalith.png similarity index 100% rename from src/afd/sprites/front/Gigalith.png rename to src/afd/sprites/front/526--0--Gigalith.png diff --git a/src/afd/sprites/front/Woobat.png b/src/afd/sprites/front/527--0--Woobat.png similarity index 100% rename from src/afd/sprites/front/Woobat.png rename to src/afd/sprites/front/527--0--Woobat.png diff --git a/src/afd/sprites/front/Swoobat.png b/src/afd/sprites/front/528--0--Swoobat.png similarity index 100% rename from src/afd/sprites/front/Swoobat.png rename to src/afd/sprites/front/528--0--Swoobat.png diff --git a/src/afd/sprites/front/Drilbur.png b/src/afd/sprites/front/529--0--Drilbur.png similarity index 100% rename from src/afd/sprites/front/Drilbur.png rename to src/afd/sprites/front/529--0--Drilbur.png diff --git a/src/afd/sprites/front/Persian.png b/src/afd/sprites/front/53--0--Persian.png similarity index 100% rename from src/afd/sprites/front/Persian.png rename to src/afd/sprites/front/53--0--Persian.png diff --git a/src/afd/sprites/front/Persian--Alola.png b/src/afd/sprites/front/53--420--Persian--Alola.png similarity index 100% rename from src/afd/sprites/front/Persian--Alola.png rename to src/afd/sprites/front/53--420--Persian--Alola.png diff --git a/src/afd/sprites/front/Excadrill.png b/src/afd/sprites/front/530--0--Excadrill.png similarity index 100% rename from src/afd/sprites/front/Excadrill.png rename to src/afd/sprites/front/530--0--Excadrill.png diff --git a/src/afd/sprites/front/Audino.png b/src/afd/sprites/front/531--0--Audino.png similarity index 100% rename from src/afd/sprites/front/Audino.png rename to src/afd/sprites/front/531--0--Audino.png diff --git a/src/afd/sprites/front/Audino--Mega.png b/src/afd/sprites/front/531--420--Audino--Mega.png similarity index 100% rename from src/afd/sprites/front/Audino--Mega.png rename to src/afd/sprites/front/531--420--Audino--Mega.png diff --git a/src/afd/sprites/front/Timburr.png b/src/afd/sprites/front/532--0--Timburr.png similarity index 100% rename from src/afd/sprites/front/Timburr.png rename to src/afd/sprites/front/532--0--Timburr.png diff --git a/src/afd/sprites/front/Gurdurr.png b/src/afd/sprites/front/533--0--Gurdurr.png similarity index 100% rename from src/afd/sprites/front/Gurdurr.png rename to src/afd/sprites/front/533--0--Gurdurr.png diff --git a/src/afd/sprites/front/Conkeldurr.png b/src/afd/sprites/front/534--0--Conkeldurr.png similarity index 100% rename from src/afd/sprites/front/Conkeldurr.png rename to src/afd/sprites/front/534--0--Conkeldurr.png diff --git a/src/afd/sprites/front/Tympole.png b/src/afd/sprites/front/535--0--Tympole.png similarity index 100% rename from src/afd/sprites/front/Tympole.png rename to src/afd/sprites/front/535--0--Tympole.png diff --git a/src/afd/sprites/front/Palpitoad.png b/src/afd/sprites/front/536--0--Palpitoad.png similarity index 100% rename from src/afd/sprites/front/Palpitoad.png rename to src/afd/sprites/front/536--0--Palpitoad.png diff --git a/src/afd/sprites/front/Seismitoad.png b/src/afd/sprites/front/537--0--Seismitoad.png similarity index 100% rename from src/afd/sprites/front/Seismitoad.png rename to src/afd/sprites/front/537--0--Seismitoad.png diff --git a/src/afd/sprites/front/Throh.png b/src/afd/sprites/front/538--0--Throh.png similarity index 100% rename from src/afd/sprites/front/Throh.png rename to src/afd/sprites/front/538--0--Throh.png diff --git a/src/afd/sprites/front/Sawk.png b/src/afd/sprites/front/539--0--Sawk.png similarity index 100% rename from src/afd/sprites/front/Sawk.png rename to src/afd/sprites/front/539--0--Sawk.png diff --git a/src/afd/sprites/front/Psyduck.png b/src/afd/sprites/front/54--0--Psyduck.png similarity index 100% rename from src/afd/sprites/front/Psyduck.png rename to src/afd/sprites/front/54--0--Psyduck.png diff --git a/src/afd/sprites/front/Sewaddle.png b/src/afd/sprites/front/540--0--Sewaddle.png similarity index 100% rename from src/afd/sprites/front/Sewaddle.png rename to src/afd/sprites/front/540--0--Sewaddle.png diff --git a/src/afd/sprites/front/Swadloon.png b/src/afd/sprites/front/541--0--Swadloon.png similarity index 100% rename from src/afd/sprites/front/Swadloon.png rename to src/afd/sprites/front/541--0--Swadloon.png diff --git a/src/afd/sprites/front/Leavanny.png b/src/afd/sprites/front/542--0--Leavanny.png similarity index 100% rename from src/afd/sprites/front/Leavanny.png rename to src/afd/sprites/front/542--0--Leavanny.png diff --git a/src/afd/sprites/front/Venipede.png b/src/afd/sprites/front/543--0--Venipede.png similarity index 100% rename from src/afd/sprites/front/Venipede.png rename to src/afd/sprites/front/543--0--Venipede.png diff --git a/src/afd/sprites/front/Whirlipede.png b/src/afd/sprites/front/544--0--Whirlipede.png similarity index 100% rename from src/afd/sprites/front/Whirlipede.png rename to src/afd/sprites/front/544--0--Whirlipede.png diff --git a/src/afd/sprites/front/Scolipede.png b/src/afd/sprites/front/545--0--Scolipede.png similarity index 100% rename from src/afd/sprites/front/Scolipede.png rename to src/afd/sprites/front/545--0--Scolipede.png diff --git a/src/afd/sprites/front/Cottonee.png b/src/afd/sprites/front/546--0--Cottonee.png similarity index 100% rename from src/afd/sprites/front/Cottonee.png rename to src/afd/sprites/front/546--0--Cottonee.png diff --git a/src/afd/sprites/front/Whimsicott.png b/src/afd/sprites/front/547--0--Whimsicott.png similarity index 100% rename from src/afd/sprites/front/Whimsicott.png rename to src/afd/sprites/front/547--0--Whimsicott.png diff --git a/src/afd/sprites/front/Petilil.png b/src/afd/sprites/front/548--0--Petilil.png similarity index 100% rename from src/afd/sprites/front/Petilil.png rename to src/afd/sprites/front/548--0--Petilil.png diff --git a/src/afd/sprites/front/Lilligant.png b/src/afd/sprites/front/549--0--Lilligant.png similarity index 100% rename from src/afd/sprites/front/Lilligant.png rename to src/afd/sprites/front/549--0--Lilligant.png diff --git a/src/afd/sprites/front/Golduck.png b/src/afd/sprites/front/55--0--Golduck.png similarity index 100% rename from src/afd/sprites/front/Golduck.png rename to src/afd/sprites/front/55--0--Golduck.png diff --git a/src/afd/sprites/front/Basculin.png b/src/afd/sprites/front/550--0--Basculin.png similarity index 100% rename from src/afd/sprites/front/Basculin.png rename to src/afd/sprites/front/550--0--Basculin.png diff --git a/src/afd/sprites/front/Basculin--Blue-Striped.png b/src/afd/sprites/front/550--420--Basculin--Blue-Striped.png similarity index 100% rename from src/afd/sprites/front/Basculin--Blue-Striped.png rename to src/afd/sprites/front/550--420--Basculin--Blue-Striped.png diff --git a/src/afd/sprites/front/Sandile.png b/src/afd/sprites/front/551--0--Sandile.png similarity index 100% rename from src/afd/sprites/front/Sandile.png rename to src/afd/sprites/front/551--0--Sandile.png diff --git a/src/afd/sprites/front/Krokorok.png b/src/afd/sprites/front/552--0--Krokorok.png similarity index 100% rename from src/afd/sprites/front/Krokorok.png rename to src/afd/sprites/front/552--0--Krokorok.png diff --git a/src/afd/sprites/front/Krookodile.png b/src/afd/sprites/front/553--0--Krookodile.png similarity index 100% rename from src/afd/sprites/front/Krookodile.png rename to src/afd/sprites/front/553--0--Krookodile.png diff --git a/src/afd/sprites/front/Darumaka.png b/src/afd/sprites/front/554--0--Darumaka.png similarity index 100% rename from src/afd/sprites/front/Darumaka.png rename to src/afd/sprites/front/554--0--Darumaka.png diff --git a/src/afd/sprites/front/Darumaka--Galar.png b/src/afd/sprites/front/554--420--Darumaka--Galar.png similarity index 100% rename from src/afd/sprites/front/Darumaka--Galar.png rename to src/afd/sprites/front/554--420--Darumaka--Galar.png diff --git a/src/afd/sprites/front/Darmanitan.png b/src/afd/sprites/front/555--0--Darmanitan.png similarity index 100% rename from src/afd/sprites/front/Darmanitan.png rename to src/afd/sprites/front/555--0--Darmanitan.png diff --git a/src/afd/sprites/front/Darmanitan--Galar-Zen.png b/src/afd/sprites/front/555--420--Darmanitan--Galar-Zen.png similarity index 100% rename from src/afd/sprites/front/Darmanitan--Galar-Zen.png rename to src/afd/sprites/front/555--420--Darmanitan--Galar-Zen.png diff --git a/src/afd/sprites/front/Darmanitan--Galar.png b/src/afd/sprites/front/555--420--Darmanitan--Galar.png similarity index 100% rename from src/afd/sprites/front/Darmanitan--Galar.png rename to src/afd/sprites/front/555--420--Darmanitan--Galar.png diff --git a/src/afd/sprites/front/Darmanitan--Zen.png b/src/afd/sprites/front/555--420--Darmanitan--Zen.png similarity index 100% rename from src/afd/sprites/front/Darmanitan--Zen.png rename to src/afd/sprites/front/555--420--Darmanitan--Zen.png diff --git a/src/afd/sprites/front/Maractus.png b/src/afd/sprites/front/556--0--Maractus.png similarity index 100% rename from src/afd/sprites/front/Maractus.png rename to src/afd/sprites/front/556--0--Maractus.png diff --git a/src/afd/sprites/front/Dwebble.png b/src/afd/sprites/front/557--0--Dwebble.png similarity index 100% rename from src/afd/sprites/front/Dwebble.png rename to src/afd/sprites/front/557--0--Dwebble.png diff --git a/src/afd/sprites/front/Crustle.png b/src/afd/sprites/front/558--0--Crustle.png similarity index 100% rename from src/afd/sprites/front/Crustle.png rename to src/afd/sprites/front/558--0--Crustle.png diff --git a/src/afd/sprites/front/Scraggy.png b/src/afd/sprites/front/559--0--Scraggy.png similarity index 100% rename from src/afd/sprites/front/Scraggy.png rename to src/afd/sprites/front/559--0--Scraggy.png diff --git a/src/afd/sprites/front/Mankey.png b/src/afd/sprites/front/56--0--Mankey.png similarity index 100% rename from src/afd/sprites/front/Mankey.png rename to src/afd/sprites/front/56--0--Mankey.png diff --git a/src/afd/sprites/front/Scrafty.png b/src/afd/sprites/front/560--0--Scrafty.png similarity index 100% rename from src/afd/sprites/front/Scrafty.png rename to src/afd/sprites/front/560--0--Scrafty.png diff --git a/src/afd/sprites/front/Sigilyph.png b/src/afd/sprites/front/561--0--Sigilyph.png similarity index 100% rename from src/afd/sprites/front/Sigilyph.png rename to src/afd/sprites/front/561--0--Sigilyph.png diff --git a/src/afd/sprites/front/Yamask.png b/src/afd/sprites/front/562--0--Yamask.png similarity index 100% rename from src/afd/sprites/front/Yamask.png rename to src/afd/sprites/front/562--0--Yamask.png diff --git a/src/afd/sprites/front/Yamask--Galar.png b/src/afd/sprites/front/562--420--Yamask--Galar.png similarity index 100% rename from src/afd/sprites/front/Yamask--Galar.png rename to src/afd/sprites/front/562--420--Yamask--Galar.png diff --git a/src/afd/sprites/front/Cofagrigus.png b/src/afd/sprites/front/563--0--Cofagrigus.png similarity index 100% rename from src/afd/sprites/front/Cofagrigus.png rename to src/afd/sprites/front/563--0--Cofagrigus.png diff --git a/src/afd/sprites/front/Tirtouga.png b/src/afd/sprites/front/564--0--Tirtouga.png similarity index 100% rename from src/afd/sprites/front/Tirtouga.png rename to src/afd/sprites/front/564--0--Tirtouga.png diff --git a/src/afd/sprites/front/Carracosta.png b/src/afd/sprites/front/565--0--Carracosta.png similarity index 100% rename from src/afd/sprites/front/Carracosta.png rename to src/afd/sprites/front/565--0--Carracosta.png diff --git a/src/afd/sprites/front/Archen.png b/src/afd/sprites/front/566--0--Archen.png similarity index 100% rename from src/afd/sprites/front/Archen.png rename to src/afd/sprites/front/566--0--Archen.png diff --git a/src/afd/sprites/front/Archeops.png b/src/afd/sprites/front/567--0--Archeops.png similarity index 100% rename from src/afd/sprites/front/Archeops.png rename to src/afd/sprites/front/567--0--Archeops.png diff --git a/src/afd/sprites/front/Trubbish.png b/src/afd/sprites/front/568--0--Trubbish.png similarity index 100% rename from src/afd/sprites/front/Trubbish.png rename to src/afd/sprites/front/568--0--Trubbish.png diff --git a/src/afd/sprites/front/Garbodor.png b/src/afd/sprites/front/569--0--Garbodor.png similarity index 100% rename from src/afd/sprites/front/Garbodor.png rename to src/afd/sprites/front/569--0--Garbodor.png diff --git a/src/afd/sprites/front/Garbodor--Gmax.png b/src/afd/sprites/front/569--420--Garbodor--Gmax.png similarity index 100% rename from src/afd/sprites/front/Garbodor--Gmax.png rename to src/afd/sprites/front/569--420--Garbodor--Gmax.png diff --git a/src/afd/sprites/front/Primeape.png b/src/afd/sprites/front/57--0--Primeape.png similarity index 100% rename from src/afd/sprites/front/Primeape.png rename to src/afd/sprites/front/57--0--Primeape.png diff --git a/src/afd/sprites/front/Zorua.png b/src/afd/sprites/front/570--0--Zorua.png similarity index 100% rename from src/afd/sprites/front/Zorua.png rename to src/afd/sprites/front/570--0--Zorua.png diff --git a/src/afd/sprites/front/Zoroark.png b/src/afd/sprites/front/571--0--Zoroark.png similarity index 100% rename from src/afd/sprites/front/Zoroark.png rename to src/afd/sprites/front/571--0--Zoroark.png diff --git a/src/afd/sprites/front/Minccino.png b/src/afd/sprites/front/572--0--Minccino.png similarity index 100% rename from src/afd/sprites/front/Minccino.png rename to src/afd/sprites/front/572--0--Minccino.png diff --git a/src/afd/sprites/front/Cinccino.png b/src/afd/sprites/front/573--0--Cinccino.png similarity index 100% rename from src/afd/sprites/front/Cinccino.png rename to src/afd/sprites/front/573--0--Cinccino.png diff --git a/src/afd/sprites/front/Gothita.png b/src/afd/sprites/front/574--0--Gothita.png similarity index 100% rename from src/afd/sprites/front/Gothita.png rename to src/afd/sprites/front/574--0--Gothita.png diff --git a/src/afd/sprites/front/Gothorita.png b/src/afd/sprites/front/575--0--Gothorita.png similarity index 100% rename from src/afd/sprites/front/Gothorita.png rename to src/afd/sprites/front/575--0--Gothorita.png diff --git a/src/afd/sprites/front/Gothitelle.png b/src/afd/sprites/front/576--0--Gothitelle.png similarity index 100% rename from src/afd/sprites/front/Gothitelle.png rename to src/afd/sprites/front/576--0--Gothitelle.png diff --git a/src/afd/sprites/front/Solosis.png b/src/afd/sprites/front/577--0--Solosis.png similarity index 100% rename from src/afd/sprites/front/Solosis.png rename to src/afd/sprites/front/577--0--Solosis.png diff --git a/src/afd/sprites/front/Duosion.png b/src/afd/sprites/front/578--0--Duosion.png similarity index 100% rename from src/afd/sprites/front/Duosion.png rename to src/afd/sprites/front/578--0--Duosion.png diff --git a/src/afd/sprites/front/Reuniclus.png b/src/afd/sprites/front/579--0--Reuniclus.png similarity index 100% rename from src/afd/sprites/front/Reuniclus.png rename to src/afd/sprites/front/579--0--Reuniclus.png diff --git a/src/afd/sprites/front/Growlithe.png b/src/afd/sprites/front/58--0--Growlithe.png similarity index 100% rename from src/afd/sprites/front/Growlithe.png rename to src/afd/sprites/front/58--0--Growlithe.png diff --git a/src/afd/sprites/front/Ducklett.png b/src/afd/sprites/front/580--0--Ducklett.png similarity index 100% rename from src/afd/sprites/front/Ducklett.png rename to src/afd/sprites/front/580--0--Ducklett.png diff --git a/src/afd/sprites/front/Swanna.png b/src/afd/sprites/front/581--0--Swanna.png similarity index 100% rename from src/afd/sprites/front/Swanna.png rename to src/afd/sprites/front/581--0--Swanna.png diff --git a/src/afd/sprites/front/Vanillite.png b/src/afd/sprites/front/582--0--Vanillite.png similarity index 100% rename from src/afd/sprites/front/Vanillite.png rename to src/afd/sprites/front/582--0--Vanillite.png diff --git a/src/afd/sprites/front/Vanillish.png b/src/afd/sprites/front/583--0--Vanillish.png similarity index 100% rename from src/afd/sprites/front/Vanillish.png rename to src/afd/sprites/front/583--0--Vanillish.png diff --git a/src/afd/sprites/front/Vanilluxe.png b/src/afd/sprites/front/584--0--Vanilluxe.png similarity index 100% rename from src/afd/sprites/front/Vanilluxe.png rename to src/afd/sprites/front/584--0--Vanilluxe.png diff --git a/src/afd/sprites/front/Deerling.png b/src/afd/sprites/front/585--0--Deerling.png similarity index 100% rename from src/afd/sprites/front/Deerling.png rename to src/afd/sprites/front/585--0--Deerling.png diff --git a/src/afd/sprites/front/Sawsbuck.png b/src/afd/sprites/front/586--0--Sawsbuck.png similarity index 100% rename from src/afd/sprites/front/Sawsbuck.png rename to src/afd/sprites/front/586--0--Sawsbuck.png diff --git a/src/afd/sprites/front/Emolga.png b/src/afd/sprites/front/587--0--Emolga.png similarity index 100% rename from src/afd/sprites/front/Emolga.png rename to src/afd/sprites/front/587--0--Emolga.png diff --git a/src/afd/sprites/front/Karrablast.png b/src/afd/sprites/front/588--0--Karrablast.png similarity index 100% rename from src/afd/sprites/front/Karrablast.png rename to src/afd/sprites/front/588--0--Karrablast.png diff --git a/src/afd/sprites/front/Escavalier.png b/src/afd/sprites/front/589--0--Escavalier.png similarity index 100% rename from src/afd/sprites/front/Escavalier.png rename to src/afd/sprites/front/589--0--Escavalier.png diff --git a/src/afd/sprites/front/Arcanine.png b/src/afd/sprites/front/59--0--Arcanine.png similarity index 100% rename from src/afd/sprites/front/Arcanine.png rename to src/afd/sprites/front/59--0--Arcanine.png diff --git a/src/afd/sprites/front/Foongus.png b/src/afd/sprites/front/590--0--Foongus.png similarity index 100% rename from src/afd/sprites/front/Foongus.png rename to src/afd/sprites/front/590--0--Foongus.png diff --git a/src/afd/sprites/front/Amoonguss.png b/src/afd/sprites/front/591--0--Amoonguss.png similarity index 100% rename from src/afd/sprites/front/Amoonguss.png rename to src/afd/sprites/front/591--0--Amoonguss.png diff --git a/src/afd/sprites/front/Frillish.png b/src/afd/sprites/front/592--0--Frillish.png similarity index 100% rename from src/afd/sprites/front/Frillish.png rename to src/afd/sprites/front/592--0--Frillish.png diff --git a/src/afd/sprites/front/Jellicent.png b/src/afd/sprites/front/593--0--Jellicent.png similarity index 100% rename from src/afd/sprites/front/Jellicent.png rename to src/afd/sprites/front/593--0--Jellicent.png diff --git a/src/afd/sprites/front/Alomomola.png b/src/afd/sprites/front/594--0--Alomomola.png similarity index 100% rename from src/afd/sprites/front/Alomomola.png rename to src/afd/sprites/front/594--0--Alomomola.png diff --git a/src/afd/sprites/front/Joltik.png b/src/afd/sprites/front/595--0--Joltik.png similarity index 100% rename from src/afd/sprites/front/Joltik.png rename to src/afd/sprites/front/595--0--Joltik.png diff --git a/src/afd/sprites/front/Galvantula.png b/src/afd/sprites/front/596--0--Galvantula.png similarity index 100% rename from src/afd/sprites/front/Galvantula.png rename to src/afd/sprites/front/596--0--Galvantula.png diff --git a/src/afd/sprites/front/Ferroseed.png b/src/afd/sprites/front/597--0--Ferroseed.png similarity index 100% rename from src/afd/sprites/front/Ferroseed.png rename to src/afd/sprites/front/597--0--Ferroseed.png diff --git a/src/afd/sprites/front/Ferrothorn.png b/src/afd/sprites/front/598--0--Ferrothorn.png similarity index 100% rename from src/afd/sprites/front/Ferrothorn.png rename to src/afd/sprites/front/598--0--Ferrothorn.png diff --git a/src/afd/sprites/front/Klink.png b/src/afd/sprites/front/599--0--Klink.png similarity index 100% rename from src/afd/sprites/front/Klink.png rename to src/afd/sprites/front/599--0--Klink.png diff --git a/src/afd/sprites/front/Charizard.png b/src/afd/sprites/front/6--0--Charizard.png similarity index 100% rename from src/afd/sprites/front/Charizard.png rename to src/afd/sprites/front/6--0--Charizard.png diff --git a/src/afd/sprites/front/Pyroak.png b/src/afd/sprites/front/6--0--Pyroak.png similarity index 100% rename from src/afd/sprites/front/Pyroak.png rename to src/afd/sprites/front/6--0--Pyroak.png diff --git a/src/afd/sprites/front/Charizard--Gmax.png b/src/afd/sprites/front/6--420--Charizard--Gmax.png similarity index 100% rename from src/afd/sprites/front/Charizard--Gmax.png rename to src/afd/sprites/front/6--420--Charizard--Gmax.png diff --git a/src/afd/sprites/front/Charizard--Mega-X.png b/src/afd/sprites/front/6--420--Charizard--Mega-X.png similarity index 100% rename from src/afd/sprites/front/Charizard--Mega-X.png rename to src/afd/sprites/front/6--420--Charizard--Mega-X.png diff --git a/src/afd/sprites/front/Charizard--Mega-Y.png b/src/afd/sprites/front/6--420--Charizard--Mega-Y.png similarity index 100% rename from src/afd/sprites/front/Charizard--Mega-Y.png rename to src/afd/sprites/front/6--420--Charizard--Mega-Y.png diff --git a/src/afd/sprites/front/Poliwag.png b/src/afd/sprites/front/60--0--Poliwag.png similarity index 100% rename from src/afd/sprites/front/Poliwag.png rename to src/afd/sprites/front/60--0--Poliwag.png diff --git a/src/afd/sprites/front/Klang.png b/src/afd/sprites/front/600--0--Klang.png similarity index 100% rename from src/afd/sprites/front/Klang.png rename to src/afd/sprites/front/600--0--Klang.png diff --git a/src/afd/sprites/front/Klinklang.png b/src/afd/sprites/front/601--0--Klinklang.png similarity index 100% rename from src/afd/sprites/front/Klinklang.png rename to src/afd/sprites/front/601--0--Klinklang.png diff --git a/src/afd/sprites/front/Tynamo.png b/src/afd/sprites/front/602--0--Tynamo.png similarity index 100% rename from src/afd/sprites/front/Tynamo.png rename to src/afd/sprites/front/602--0--Tynamo.png diff --git a/src/afd/sprites/front/Eelektrik.png b/src/afd/sprites/front/603--0--Eelektrik.png similarity index 100% rename from src/afd/sprites/front/Eelektrik.png rename to src/afd/sprites/front/603--0--Eelektrik.png diff --git a/src/afd/sprites/front/Eelektross.png b/src/afd/sprites/front/604--0--Eelektross.png similarity index 100% rename from src/afd/sprites/front/Eelektross.png rename to src/afd/sprites/front/604--0--Eelektross.png diff --git a/src/afd/sprites/front/Elgyem.png b/src/afd/sprites/front/605--0--Elgyem.png similarity index 100% rename from src/afd/sprites/front/Elgyem.png rename to src/afd/sprites/front/605--0--Elgyem.png diff --git a/src/afd/sprites/front/Beheeyem.png b/src/afd/sprites/front/606--0--Beheeyem.png similarity index 100% rename from src/afd/sprites/front/Beheeyem.png rename to src/afd/sprites/front/606--0--Beheeyem.png diff --git a/src/afd/sprites/front/Litwick.png b/src/afd/sprites/front/607--0--Litwick.png similarity index 100% rename from src/afd/sprites/front/Litwick.png rename to src/afd/sprites/front/607--0--Litwick.png diff --git a/src/afd/sprites/front/Lampent.png b/src/afd/sprites/front/608--0--Lampent.png similarity index 100% rename from src/afd/sprites/front/Lampent.png rename to src/afd/sprites/front/608--0--Lampent.png diff --git a/src/afd/sprites/front/Chandelure.png b/src/afd/sprites/front/609--0--Chandelure.png similarity index 100% rename from src/afd/sprites/front/Chandelure.png rename to src/afd/sprites/front/609--0--Chandelure.png diff --git a/src/afd/sprites/front/Poliwhirl.png b/src/afd/sprites/front/61--0--Poliwhirl.png similarity index 100% rename from src/afd/sprites/front/Poliwhirl.png rename to src/afd/sprites/front/61--0--Poliwhirl.png diff --git a/src/afd/sprites/front/Axew.png b/src/afd/sprites/front/610--0--Axew.png similarity index 100% rename from src/afd/sprites/front/Axew.png rename to src/afd/sprites/front/610--0--Axew.png diff --git a/src/afd/sprites/front/Fraxure.png b/src/afd/sprites/front/611--0--Fraxure.png similarity index 100% rename from src/afd/sprites/front/Fraxure.png rename to src/afd/sprites/front/611--0--Fraxure.png diff --git a/src/afd/sprites/front/Haxorus.png b/src/afd/sprites/front/612--0--Haxorus.png similarity index 100% rename from src/afd/sprites/front/Haxorus.png rename to src/afd/sprites/front/612--0--Haxorus.png diff --git a/src/afd/sprites/front/Cubchoo.png b/src/afd/sprites/front/613--0--Cubchoo.png similarity index 100% rename from src/afd/sprites/front/Cubchoo.png rename to src/afd/sprites/front/613--0--Cubchoo.png diff --git a/src/afd/sprites/front/Beartic.png b/src/afd/sprites/front/614--0--Beartic.png similarity index 100% rename from src/afd/sprites/front/Beartic.png rename to src/afd/sprites/front/614--0--Beartic.png diff --git a/src/afd/sprites/front/Cryogonal.png b/src/afd/sprites/front/615--0--Cryogonal.png similarity index 100% rename from src/afd/sprites/front/Cryogonal.png rename to src/afd/sprites/front/615--0--Cryogonal.png diff --git a/src/afd/sprites/front/Shelmet.png b/src/afd/sprites/front/616--0--Shelmet.png similarity index 100% rename from src/afd/sprites/front/Shelmet.png rename to src/afd/sprites/front/616--0--Shelmet.png diff --git a/src/afd/sprites/front/Accelgor.png b/src/afd/sprites/front/617--0--Accelgor.png similarity index 100% rename from src/afd/sprites/front/Accelgor.png rename to src/afd/sprites/front/617--0--Accelgor.png diff --git a/src/afd/sprites/front/Stunfisk.png b/src/afd/sprites/front/618--0--Stunfisk.png similarity index 100% rename from src/afd/sprites/front/Stunfisk.png rename to src/afd/sprites/front/618--0--Stunfisk.png diff --git a/src/afd/sprites/front/Stunfisk--Galar.png b/src/afd/sprites/front/618--420--Stunfisk--Galar.png similarity index 100% rename from src/afd/sprites/front/Stunfisk--Galar.png rename to src/afd/sprites/front/618--420--Stunfisk--Galar.png diff --git a/src/afd/sprites/front/Mienfoo.png b/src/afd/sprites/front/619--0--Mienfoo.png similarity index 100% rename from src/afd/sprites/front/Mienfoo.png rename to src/afd/sprites/front/619--0--Mienfoo.png diff --git a/src/afd/sprites/front/Poliwrath.png b/src/afd/sprites/front/62--0--Poliwrath.png similarity index 100% rename from src/afd/sprites/front/Poliwrath.png rename to src/afd/sprites/front/62--0--Poliwrath.png diff --git a/src/afd/sprites/front/Mienshao.png b/src/afd/sprites/front/620--0--Mienshao.png similarity index 100% rename from src/afd/sprites/front/Mienshao.png rename to src/afd/sprites/front/620--0--Mienshao.png diff --git a/src/afd/sprites/front/Druddigon.png b/src/afd/sprites/front/621--0--Druddigon.png similarity index 100% rename from src/afd/sprites/front/Druddigon.png rename to src/afd/sprites/front/621--0--Druddigon.png diff --git a/src/afd/sprites/front/Golett.png b/src/afd/sprites/front/622--0--Golett.png similarity index 100% rename from src/afd/sprites/front/Golett.png rename to src/afd/sprites/front/622--0--Golett.png diff --git a/src/afd/sprites/front/Golurk.png b/src/afd/sprites/front/623--0--Golurk.png similarity index 100% rename from src/afd/sprites/front/Golurk.png rename to src/afd/sprites/front/623--0--Golurk.png diff --git a/src/afd/sprites/front/Pawniard.png b/src/afd/sprites/front/624--0--Pawniard.png similarity index 100% rename from src/afd/sprites/front/Pawniard.png rename to src/afd/sprites/front/624--0--Pawniard.png diff --git a/src/afd/sprites/front/Bisharp.png b/src/afd/sprites/front/625--0--Bisharp.png similarity index 100% rename from src/afd/sprites/front/Bisharp.png rename to src/afd/sprites/front/625--0--Bisharp.png diff --git a/src/afd/sprites/front/Bouffalant.png b/src/afd/sprites/front/626--0--Bouffalant.png similarity index 100% rename from src/afd/sprites/front/Bouffalant.png rename to src/afd/sprites/front/626--0--Bouffalant.png diff --git a/src/afd/sprites/front/Rufflet.png b/src/afd/sprites/front/627--0--Rufflet.png similarity index 100% rename from src/afd/sprites/front/Rufflet.png rename to src/afd/sprites/front/627--0--Rufflet.png diff --git a/src/afd/sprites/front/Braviary.png b/src/afd/sprites/front/628--0--Braviary.png similarity index 100% rename from src/afd/sprites/front/Braviary.png rename to src/afd/sprites/front/628--0--Braviary.png diff --git a/src/afd/sprites/front/Vullaby.png b/src/afd/sprites/front/629--0--Vullaby.png similarity index 100% rename from src/afd/sprites/front/Vullaby.png rename to src/afd/sprites/front/629--0--Vullaby.png diff --git a/src/afd/sprites/front/Abra.png b/src/afd/sprites/front/63--0--Abra.png similarity index 100% rename from src/afd/sprites/front/Abra.png rename to src/afd/sprites/front/63--0--Abra.png diff --git a/src/afd/sprites/front/Mandibuzz.png b/src/afd/sprites/front/630--0--Mandibuzz.png similarity index 100% rename from src/afd/sprites/front/Mandibuzz.png rename to src/afd/sprites/front/630--0--Mandibuzz.png diff --git a/src/afd/sprites/front/Heatmor.png b/src/afd/sprites/front/631--0--Heatmor.png similarity index 100% rename from src/afd/sprites/front/Heatmor.png rename to src/afd/sprites/front/631--0--Heatmor.png diff --git a/src/afd/sprites/front/Durant.png b/src/afd/sprites/front/632--0--Durant.png similarity index 100% rename from src/afd/sprites/front/Durant.png rename to src/afd/sprites/front/632--0--Durant.png diff --git a/src/afd/sprites/front/Deino.png b/src/afd/sprites/front/633--0--Deino.png similarity index 100% rename from src/afd/sprites/front/Deino.png rename to src/afd/sprites/front/633--0--Deino.png diff --git a/src/afd/sprites/front/Zweilous.png b/src/afd/sprites/front/634--0--Zweilous.png similarity index 100% rename from src/afd/sprites/front/Zweilous.png rename to src/afd/sprites/front/634--0--Zweilous.png diff --git a/src/afd/sprites/front/Hydreigon.png b/src/afd/sprites/front/635--0--Hydreigon.png similarity index 100% rename from src/afd/sprites/front/Hydreigon.png rename to src/afd/sprites/front/635--0--Hydreigon.png diff --git a/src/afd/sprites/front/Larvesta.png b/src/afd/sprites/front/636--0--Larvesta.png similarity index 100% rename from src/afd/sprites/front/Larvesta.png rename to src/afd/sprites/front/636--0--Larvesta.png diff --git a/src/afd/sprites/front/Volcarona.png b/src/afd/sprites/front/637--0--Volcarona.png similarity index 100% rename from src/afd/sprites/front/Volcarona.png rename to src/afd/sprites/front/637--0--Volcarona.png diff --git a/src/afd/sprites/front/Cobalion.png b/src/afd/sprites/front/638--0--Cobalion.png similarity index 100% rename from src/afd/sprites/front/Cobalion.png rename to src/afd/sprites/front/638--0--Cobalion.png diff --git a/src/afd/sprites/front/Terrakion.png b/src/afd/sprites/front/639--0--Terrakion.png similarity index 100% rename from src/afd/sprites/front/Terrakion.png rename to src/afd/sprites/front/639--0--Terrakion.png diff --git a/src/afd/sprites/front/Kadabra.png b/src/afd/sprites/front/64--0--Kadabra.png similarity index 100% rename from src/afd/sprites/front/Kadabra.png rename to src/afd/sprites/front/64--0--Kadabra.png diff --git a/src/afd/sprites/front/Virizion.png b/src/afd/sprites/front/640--0--Virizion.png similarity index 100% rename from src/afd/sprites/front/Virizion.png rename to src/afd/sprites/front/640--0--Virizion.png diff --git a/src/afd/sprites/front/Tornadus.png b/src/afd/sprites/front/641--0--Tornadus.png similarity index 100% rename from src/afd/sprites/front/Tornadus.png rename to src/afd/sprites/front/641--0--Tornadus.png diff --git a/src/afd/sprites/front/Tornadus--Therian.png b/src/afd/sprites/front/641--420--Tornadus--Therian.png similarity index 100% rename from src/afd/sprites/front/Tornadus--Therian.png rename to src/afd/sprites/front/641--420--Tornadus--Therian.png diff --git a/src/afd/sprites/front/Thundurus.png b/src/afd/sprites/front/642--0--Thundurus.png similarity index 100% rename from src/afd/sprites/front/Thundurus.png rename to src/afd/sprites/front/642--0--Thundurus.png diff --git a/src/afd/sprites/front/Thundurus--Therian.png b/src/afd/sprites/front/642--420--Thundurus--Therian.png similarity index 100% rename from src/afd/sprites/front/Thundurus--Therian.png rename to src/afd/sprites/front/642--420--Thundurus--Therian.png diff --git a/src/afd/sprites/front/Reshiram.png b/src/afd/sprites/front/643--0--Reshiram.png similarity index 100% rename from src/afd/sprites/front/Reshiram.png rename to src/afd/sprites/front/643--0--Reshiram.png diff --git a/src/afd/sprites/front/Zekrom.png b/src/afd/sprites/front/644--0--Zekrom.png similarity index 100% rename from src/afd/sprites/front/Zekrom.png rename to src/afd/sprites/front/644--0--Zekrom.png diff --git a/src/afd/sprites/front/Landorus.png b/src/afd/sprites/front/645--0--Landorus.png similarity index 100% rename from src/afd/sprites/front/Landorus.png rename to src/afd/sprites/front/645--0--Landorus.png diff --git a/src/afd/sprites/front/Landorus--Therian.png b/src/afd/sprites/front/645--420--Landorus--Therian.png similarity index 100% rename from src/afd/sprites/front/Landorus--Therian.png rename to src/afd/sprites/front/645--420--Landorus--Therian.png diff --git a/src/afd/sprites/front/Kyurem.png b/src/afd/sprites/front/646--0--Kyurem.png similarity index 100% rename from src/afd/sprites/front/Kyurem.png rename to src/afd/sprites/front/646--0--Kyurem.png diff --git a/src/afd/sprites/front/Kyurem--Black.png b/src/afd/sprites/front/646--420--Kyurem--Black.png similarity index 100% rename from src/afd/sprites/front/Kyurem--Black.png rename to src/afd/sprites/front/646--420--Kyurem--Black.png diff --git a/src/afd/sprites/front/Kyurem--White.png b/src/afd/sprites/front/646--420--Kyurem--White.png similarity index 100% rename from src/afd/sprites/front/Kyurem--White.png rename to src/afd/sprites/front/646--420--Kyurem--White.png diff --git a/src/afd/sprites/front/Keldeo.png b/src/afd/sprites/front/647--0--Keldeo.png similarity index 100% rename from src/afd/sprites/front/Keldeo.png rename to src/afd/sprites/front/647--0--Keldeo.png diff --git a/src/afd/sprites/front/Keldeo--Resolute.png b/src/afd/sprites/front/647--420--Keldeo--Resolute.png similarity index 100% rename from src/afd/sprites/front/Keldeo--Resolute.png rename to src/afd/sprites/front/647--420--Keldeo--Resolute.png diff --git a/src/afd/sprites/front/Meloetta.png b/src/afd/sprites/front/648--0--Meloetta.png similarity index 100% rename from src/afd/sprites/front/Meloetta.png rename to src/afd/sprites/front/648--0--Meloetta.png diff --git a/src/afd/sprites/front/Meloetta--Pirouette.png b/src/afd/sprites/front/648--420--Meloetta--Pirouette.png similarity index 100% rename from src/afd/sprites/front/Meloetta--Pirouette.png rename to src/afd/sprites/front/648--420--Meloetta--Pirouette.png diff --git a/src/afd/sprites/front/Genesect.png b/src/afd/sprites/front/649--0--Genesect.png similarity index 100% rename from src/afd/sprites/front/Genesect.png rename to src/afd/sprites/front/649--0--Genesect.png diff --git a/src/afd/sprites/front/Genesect--Burn.png b/src/afd/sprites/front/649--420--Genesect--Burn.png similarity index 100% rename from src/afd/sprites/front/Genesect--Burn.png rename to src/afd/sprites/front/649--420--Genesect--Burn.png diff --git a/src/afd/sprites/front/Genesect--Chill.png b/src/afd/sprites/front/649--420--Genesect--Chill.png similarity index 100% rename from src/afd/sprites/front/Genesect--Chill.png rename to src/afd/sprites/front/649--420--Genesect--Chill.png diff --git a/src/afd/sprites/front/Genesect--Douse.png b/src/afd/sprites/front/649--420--Genesect--Douse.png similarity index 100% rename from src/afd/sprites/front/Genesect--Douse.png rename to src/afd/sprites/front/649--420--Genesect--Douse.png diff --git a/src/afd/sprites/front/Genesect--Shock.png b/src/afd/sprites/front/649--420--Genesect--Shock.png similarity index 100% rename from src/afd/sprites/front/Genesect--Shock.png rename to src/afd/sprites/front/649--420--Genesect--Shock.png diff --git a/src/afd/sprites/front/Alakazam.png b/src/afd/sprites/front/65--0--Alakazam.png similarity index 100% rename from src/afd/sprites/front/Alakazam.png rename to src/afd/sprites/front/65--0--Alakazam.png diff --git a/src/afd/sprites/front/Alakazam--Mega.png b/src/afd/sprites/front/65--420--Alakazam--Mega.png similarity index 100% rename from src/afd/sprites/front/Alakazam--Mega.png rename to src/afd/sprites/front/65--420--Alakazam--Mega.png diff --git a/src/afd/sprites/front/Chespin.png b/src/afd/sprites/front/650--0--Chespin.png similarity index 100% rename from src/afd/sprites/front/Chespin.png rename to src/afd/sprites/front/650--0--Chespin.png diff --git a/src/afd/sprites/front/Quilladin.png b/src/afd/sprites/front/651--0--Quilladin.png similarity index 100% rename from src/afd/sprites/front/Quilladin.png rename to src/afd/sprites/front/651--0--Quilladin.png diff --git a/src/afd/sprites/front/Chesnaught.png b/src/afd/sprites/front/652--0--Chesnaught.png similarity index 100% rename from src/afd/sprites/front/Chesnaught.png rename to src/afd/sprites/front/652--0--Chesnaught.png diff --git a/src/afd/sprites/front/Fennekin.png b/src/afd/sprites/front/653--0--Fennekin.png similarity index 100% rename from src/afd/sprites/front/Fennekin.png rename to src/afd/sprites/front/653--0--Fennekin.png diff --git a/src/afd/sprites/front/Braixen.png b/src/afd/sprites/front/654--0--Braixen.png similarity index 100% rename from src/afd/sprites/front/Braixen.png rename to src/afd/sprites/front/654--0--Braixen.png diff --git a/src/afd/sprites/front/Delphox.png b/src/afd/sprites/front/655--0--Delphox.png similarity index 100% rename from src/afd/sprites/front/Delphox.png rename to src/afd/sprites/front/655--0--Delphox.png diff --git a/src/afd/sprites/front/Froakie.png b/src/afd/sprites/front/656--0--Froakie.png similarity index 100% rename from src/afd/sprites/front/Froakie.png rename to src/afd/sprites/front/656--0--Froakie.png diff --git a/src/afd/sprites/front/Frogadier.png b/src/afd/sprites/front/657--0--Frogadier.png similarity index 100% rename from src/afd/sprites/front/Frogadier.png rename to src/afd/sprites/front/657--0--Frogadier.png diff --git a/src/afd/sprites/front/Greninja.png b/src/afd/sprites/front/658--0--Greninja.png similarity index 100% rename from src/afd/sprites/front/Greninja.png rename to src/afd/sprites/front/658--0--Greninja.png diff --git a/src/afd/sprites/front/Greninja--Ash.png b/src/afd/sprites/front/658--420--Greninja--Ash.png similarity index 100% rename from src/afd/sprites/front/Greninja--Ash.png rename to src/afd/sprites/front/658--420--Greninja--Ash.png diff --git a/src/afd/sprites/front/Bunnelby.png b/src/afd/sprites/front/659--0--Bunnelby.png similarity index 100% rename from src/afd/sprites/front/Bunnelby.png rename to src/afd/sprites/front/659--0--Bunnelby.png diff --git a/src/afd/sprites/front/Machop.png b/src/afd/sprites/front/66--0--Machop.png similarity index 100% rename from src/afd/sprites/front/Machop.png rename to src/afd/sprites/front/66--0--Machop.png diff --git a/src/afd/sprites/front/Diggersby.png b/src/afd/sprites/front/660--0--Diggersby.png similarity index 100% rename from src/afd/sprites/front/Diggersby.png rename to src/afd/sprites/front/660--0--Diggersby.png diff --git a/src/afd/sprites/front/Fletchling.png b/src/afd/sprites/front/661--0--Fletchling.png similarity index 100% rename from src/afd/sprites/front/Fletchling.png rename to src/afd/sprites/front/661--0--Fletchling.png diff --git a/src/afd/sprites/front/Fletchinder.png b/src/afd/sprites/front/662--0--Fletchinder.png similarity index 100% rename from src/afd/sprites/front/Fletchinder.png rename to src/afd/sprites/front/662--0--Fletchinder.png diff --git a/src/afd/sprites/front/Talonflame.png b/src/afd/sprites/front/663--0--Talonflame.png similarity index 100% rename from src/afd/sprites/front/Talonflame.png rename to src/afd/sprites/front/663--0--Talonflame.png diff --git a/src/afd/sprites/front/Scatterbug.png b/src/afd/sprites/front/664--0--Scatterbug.png similarity index 100% rename from src/afd/sprites/front/Scatterbug.png rename to src/afd/sprites/front/664--0--Scatterbug.png diff --git a/src/afd/sprites/front/Spewpa.png b/src/afd/sprites/front/665--0--Spewpa.png similarity index 100% rename from src/afd/sprites/front/Spewpa.png rename to src/afd/sprites/front/665--0--Spewpa.png diff --git a/src/afd/sprites/front/Vivillon.png b/src/afd/sprites/front/666--0--Vivillon.png similarity index 100% rename from src/afd/sprites/front/Vivillon.png rename to src/afd/sprites/front/666--0--Vivillon.png diff --git a/src/afd/sprites/front/Litleo.png b/src/afd/sprites/front/667--0--Litleo.png similarity index 100% rename from src/afd/sprites/front/Litleo.png rename to src/afd/sprites/front/667--0--Litleo.png diff --git a/src/afd/sprites/front/Pyroar.png b/src/afd/sprites/front/668--0--Pyroar.png similarity index 100% rename from src/afd/sprites/front/Pyroar.png rename to src/afd/sprites/front/668--0--Pyroar.png diff --git a/src/afd/sprites/front/Flabe__0301be__0301.png b/src/afd/sprites/front/669--0--Flabe__0301be__0301.png similarity index 100% rename from src/afd/sprites/front/Flabe__0301be__0301.png rename to src/afd/sprites/front/669--0--Flabe__0301be__0301.png diff --git a/src/afd/sprites/front/Machoke.png b/src/afd/sprites/front/67--0--Machoke.png similarity index 100% rename from src/afd/sprites/front/Machoke.png rename to src/afd/sprites/front/67--0--Machoke.png diff --git a/src/afd/sprites/front/Floette.png b/src/afd/sprites/front/670--0--Floette.png similarity index 100% rename from src/afd/sprites/front/Floette.png rename to src/afd/sprites/front/670--0--Floette.png diff --git a/src/afd/sprites/front/Floette--Eternal.png b/src/afd/sprites/front/670--420--Floette--Eternal.png similarity index 100% rename from src/afd/sprites/front/Floette--Eternal.png rename to src/afd/sprites/front/670--420--Floette--Eternal.png diff --git a/src/afd/sprites/front/Florges.png b/src/afd/sprites/front/671--0--Florges.png similarity index 100% rename from src/afd/sprites/front/Florges.png rename to src/afd/sprites/front/671--0--Florges.png diff --git a/src/afd/sprites/front/Skiddo.png b/src/afd/sprites/front/672--0--Skiddo.png similarity index 100% rename from src/afd/sprites/front/Skiddo.png rename to src/afd/sprites/front/672--0--Skiddo.png diff --git a/src/afd/sprites/front/Gogoat.png b/src/afd/sprites/front/673--0--Gogoat.png similarity index 100% rename from src/afd/sprites/front/Gogoat.png rename to src/afd/sprites/front/673--0--Gogoat.png diff --git a/src/afd/sprites/front/Pancham.png b/src/afd/sprites/front/674--0--Pancham.png similarity index 100% rename from src/afd/sprites/front/Pancham.png rename to src/afd/sprites/front/674--0--Pancham.png diff --git a/src/afd/sprites/front/Pangoro.png b/src/afd/sprites/front/675--0--Pangoro.png similarity index 100% rename from src/afd/sprites/front/Pangoro.png rename to src/afd/sprites/front/675--0--Pangoro.png diff --git a/src/afd/sprites/front/Furfrou.png b/src/afd/sprites/front/676--0--Furfrou.png similarity index 100% rename from src/afd/sprites/front/Furfrou.png rename to src/afd/sprites/front/676--0--Furfrou.png diff --git a/src/afd/sprites/front/Espurr.png b/src/afd/sprites/front/677--0--Espurr.png similarity index 100% rename from src/afd/sprites/front/Espurr.png rename to src/afd/sprites/front/677--0--Espurr.png diff --git a/src/afd/sprites/front/Meowstic.png b/src/afd/sprites/front/678--0--Meowstic.png similarity index 100% rename from src/afd/sprites/front/Meowstic.png rename to src/afd/sprites/front/678--0--Meowstic.png diff --git a/src/afd/sprites/front/Meowstic--F.png b/src/afd/sprites/front/678--420--Meowstic--F.png similarity index 100% rename from src/afd/sprites/front/Meowstic--F.png rename to src/afd/sprites/front/678--420--Meowstic--F.png diff --git a/src/afd/sprites/front/Honedge.png b/src/afd/sprites/front/679--0--Honedge.png similarity index 100% rename from src/afd/sprites/front/Honedge.png rename to src/afd/sprites/front/679--0--Honedge.png diff --git a/src/afd/sprites/front/Machamp.png b/src/afd/sprites/front/68--0--Machamp.png similarity index 100% rename from src/afd/sprites/front/Machamp.png rename to src/afd/sprites/front/68--0--Machamp.png diff --git a/src/afd/sprites/front/Machamp--Gmax.png b/src/afd/sprites/front/68--420--Machamp--Gmax.png similarity index 100% rename from src/afd/sprites/front/Machamp--Gmax.png rename to src/afd/sprites/front/68--420--Machamp--Gmax.png diff --git a/src/afd/sprites/front/Doublade.png b/src/afd/sprites/front/680--0--Doublade.png similarity index 100% rename from src/afd/sprites/front/Doublade.png rename to src/afd/sprites/front/680--0--Doublade.png diff --git a/src/afd/sprites/front/Aegislash.png b/src/afd/sprites/front/681--0--Aegislash.png similarity index 100% rename from src/afd/sprites/front/Aegislash.png rename to src/afd/sprites/front/681--0--Aegislash.png diff --git a/src/afd/sprites/front/Aegislash--Blade.png b/src/afd/sprites/front/681--420--Aegislash--Blade.png similarity index 100% rename from src/afd/sprites/front/Aegislash--Blade.png rename to src/afd/sprites/front/681--420--Aegislash--Blade.png diff --git a/src/afd/sprites/front/Spritzee.png b/src/afd/sprites/front/682--0--Spritzee.png similarity index 100% rename from src/afd/sprites/front/Spritzee.png rename to src/afd/sprites/front/682--0--Spritzee.png diff --git a/src/afd/sprites/front/Aromatisse.png b/src/afd/sprites/front/683--0--Aromatisse.png similarity index 100% rename from src/afd/sprites/front/Aromatisse.png rename to src/afd/sprites/front/683--0--Aromatisse.png diff --git a/src/afd/sprites/front/Swirlix.png b/src/afd/sprites/front/684--0--Swirlix.png similarity index 100% rename from src/afd/sprites/front/Swirlix.png rename to src/afd/sprites/front/684--0--Swirlix.png diff --git a/src/afd/sprites/front/Slurpuff.png b/src/afd/sprites/front/685--0--Slurpuff.png similarity index 100% rename from src/afd/sprites/front/Slurpuff.png rename to src/afd/sprites/front/685--0--Slurpuff.png diff --git a/src/afd/sprites/front/Inkay.png b/src/afd/sprites/front/686--0--Inkay.png similarity index 100% rename from src/afd/sprites/front/Inkay.png rename to src/afd/sprites/front/686--0--Inkay.png diff --git a/src/afd/sprites/front/Malamar.png b/src/afd/sprites/front/687--0--Malamar.png similarity index 100% rename from src/afd/sprites/front/Malamar.png rename to src/afd/sprites/front/687--0--Malamar.png diff --git a/src/afd/sprites/front/Binacle.png b/src/afd/sprites/front/688--0--Binacle.png similarity index 100% rename from src/afd/sprites/front/Binacle.png rename to src/afd/sprites/front/688--0--Binacle.png diff --git a/src/afd/sprites/front/Barbaracle.png b/src/afd/sprites/front/689--0--Barbaracle.png similarity index 100% rename from src/afd/sprites/front/Barbaracle.png rename to src/afd/sprites/front/689--0--Barbaracle.png diff --git a/src/afd/sprites/front/Bellsprout.png b/src/afd/sprites/front/69--0--Bellsprout.png similarity index 100% rename from src/afd/sprites/front/Bellsprout.png rename to src/afd/sprites/front/69--0--Bellsprout.png diff --git a/src/afd/sprites/front/Skrelp.png b/src/afd/sprites/front/690--0--Skrelp.png similarity index 100% rename from src/afd/sprites/front/Skrelp.png rename to src/afd/sprites/front/690--0--Skrelp.png diff --git a/src/afd/sprites/front/Dragalge.png b/src/afd/sprites/front/691--0--Dragalge.png similarity index 100% rename from src/afd/sprites/front/Dragalge.png rename to src/afd/sprites/front/691--0--Dragalge.png diff --git a/src/afd/sprites/front/Clauncher.png b/src/afd/sprites/front/692--0--Clauncher.png similarity index 100% rename from src/afd/sprites/front/Clauncher.png rename to src/afd/sprites/front/692--0--Clauncher.png diff --git a/src/afd/sprites/front/Clawitzer.png b/src/afd/sprites/front/693--0--Clawitzer.png similarity index 100% rename from src/afd/sprites/front/Clawitzer.png rename to src/afd/sprites/front/693--0--Clawitzer.png diff --git a/src/afd/sprites/front/Helioptile.png b/src/afd/sprites/front/694--0--Helioptile.png similarity index 100% rename from src/afd/sprites/front/Helioptile.png rename to src/afd/sprites/front/694--0--Helioptile.png diff --git a/src/afd/sprites/front/Heliolisk.png b/src/afd/sprites/front/695--0--Heliolisk.png similarity index 100% rename from src/afd/sprites/front/Heliolisk.png rename to src/afd/sprites/front/695--0--Heliolisk.png diff --git a/src/afd/sprites/front/Tyrunt.png b/src/afd/sprites/front/696--0--Tyrunt.png similarity index 100% rename from src/afd/sprites/front/Tyrunt.png rename to src/afd/sprites/front/696--0--Tyrunt.png diff --git a/src/afd/sprites/front/Tyrantrum.png b/src/afd/sprites/front/697--0--Tyrantrum.png similarity index 100% rename from src/afd/sprites/front/Tyrantrum.png rename to src/afd/sprites/front/697--0--Tyrantrum.png diff --git a/src/afd/sprites/front/Amaura.png b/src/afd/sprites/front/698--0--Amaura.png similarity index 100% rename from src/afd/sprites/front/Amaura.png rename to src/afd/sprites/front/698--0--Amaura.png diff --git a/src/afd/sprites/front/Aurorus.png b/src/afd/sprites/front/699--0--Aurorus.png similarity index 100% rename from src/afd/sprites/front/Aurorus.png rename to src/afd/sprites/front/699--0--Aurorus.png diff --git a/src/afd/sprites/front/Squirtle.png b/src/afd/sprites/front/7--0--Squirtle.png similarity index 100% rename from src/afd/sprites/front/Squirtle.png rename to src/afd/sprites/front/7--0--Squirtle.png diff --git a/src/afd/sprites/front/Weepinbell.png b/src/afd/sprites/front/70--0--Weepinbell.png similarity index 100% rename from src/afd/sprites/front/Weepinbell.png rename to src/afd/sprites/front/70--0--Weepinbell.png diff --git a/src/afd/sprites/front/Sylveon.png b/src/afd/sprites/front/700--0--Sylveon.png similarity index 100% rename from src/afd/sprites/front/Sylveon.png rename to src/afd/sprites/front/700--0--Sylveon.png diff --git a/src/afd/sprites/front/Hawlucha.png b/src/afd/sprites/front/701--0--Hawlucha.png similarity index 100% rename from src/afd/sprites/front/Hawlucha.png rename to src/afd/sprites/front/701--0--Hawlucha.png diff --git a/src/afd/sprites/front/Dedenne.png b/src/afd/sprites/front/702--0--Dedenne.png similarity index 100% rename from src/afd/sprites/front/Dedenne.png rename to src/afd/sprites/front/702--0--Dedenne.png diff --git a/src/afd/sprites/front/Carbink.png b/src/afd/sprites/front/703--0--Carbink.png similarity index 100% rename from src/afd/sprites/front/Carbink.png rename to src/afd/sprites/front/703--0--Carbink.png diff --git a/src/afd/sprites/front/Goomy.png b/src/afd/sprites/front/704--0--Goomy.png similarity index 100% rename from src/afd/sprites/front/Goomy.png rename to src/afd/sprites/front/704--0--Goomy.png diff --git a/src/afd/sprites/front/Sliggoo.png b/src/afd/sprites/front/705--0--Sliggoo.png similarity index 100% rename from src/afd/sprites/front/Sliggoo.png rename to src/afd/sprites/front/705--0--Sliggoo.png diff --git a/src/afd/sprites/front/Goodra.png b/src/afd/sprites/front/706--0--Goodra.png similarity index 100% rename from src/afd/sprites/front/Goodra.png rename to src/afd/sprites/front/706--0--Goodra.png diff --git a/src/afd/sprites/front/Klefki.png b/src/afd/sprites/front/707--0--Klefki.png similarity index 100% rename from src/afd/sprites/front/Klefki.png rename to src/afd/sprites/front/707--0--Klefki.png diff --git a/src/afd/sprites/front/Phantump.png b/src/afd/sprites/front/708--0--Phantump.png similarity index 100% rename from src/afd/sprites/front/Phantump.png rename to src/afd/sprites/front/708--0--Phantump.png diff --git a/src/afd/sprites/front/Trevenant.png b/src/afd/sprites/front/709--0--Trevenant.png similarity index 100% rename from src/afd/sprites/front/Trevenant.png rename to src/afd/sprites/front/709--0--Trevenant.png diff --git a/src/afd/sprites/front/Victreebel.png b/src/afd/sprites/front/71--0--Victreebel.png similarity index 100% rename from src/afd/sprites/front/Victreebel.png rename to src/afd/sprites/front/71--0--Victreebel.png diff --git a/src/afd/sprites/front/Pumpkaboo.png b/src/afd/sprites/front/710--0--Pumpkaboo.png similarity index 100% rename from src/afd/sprites/front/Pumpkaboo.png rename to src/afd/sprites/front/710--0--Pumpkaboo.png diff --git a/src/afd/sprites/front/Pumpkaboo--Large.png b/src/afd/sprites/front/710--420--Pumpkaboo--Large.png similarity index 100% rename from src/afd/sprites/front/Pumpkaboo--Large.png rename to src/afd/sprites/front/710--420--Pumpkaboo--Large.png diff --git a/src/afd/sprites/front/Pumpkaboo--Small.png b/src/afd/sprites/front/710--420--Pumpkaboo--Small.png similarity index 100% rename from src/afd/sprites/front/Pumpkaboo--Small.png rename to src/afd/sprites/front/710--420--Pumpkaboo--Small.png diff --git a/src/afd/sprites/front/Pumpkaboo--Super.png b/src/afd/sprites/front/710--420--Pumpkaboo--Super.png similarity index 100% rename from src/afd/sprites/front/Pumpkaboo--Super.png rename to src/afd/sprites/front/710--420--Pumpkaboo--Super.png diff --git a/src/afd/sprites/front/Gourgeist.png b/src/afd/sprites/front/711--0--Gourgeist.png similarity index 100% rename from src/afd/sprites/front/Gourgeist.png rename to src/afd/sprites/front/711--0--Gourgeist.png diff --git a/src/afd/sprites/front/Gourgeist--Large.png b/src/afd/sprites/front/711--420--Gourgeist--Large.png similarity index 100% rename from src/afd/sprites/front/Gourgeist--Large.png rename to src/afd/sprites/front/711--420--Gourgeist--Large.png diff --git a/src/afd/sprites/front/Gourgeist--Small.png b/src/afd/sprites/front/711--420--Gourgeist--Small.png similarity index 100% rename from src/afd/sprites/front/Gourgeist--Small.png rename to src/afd/sprites/front/711--420--Gourgeist--Small.png diff --git a/src/afd/sprites/front/Gourgeist--Super.png b/src/afd/sprites/front/711--420--Gourgeist--Super.png similarity index 100% rename from src/afd/sprites/front/Gourgeist--Super.png rename to src/afd/sprites/front/711--420--Gourgeist--Super.png diff --git a/src/afd/sprites/front/Bergmite.png b/src/afd/sprites/front/712--0--Bergmite.png similarity index 100% rename from src/afd/sprites/front/Bergmite.png rename to src/afd/sprites/front/712--0--Bergmite.png diff --git a/src/afd/sprites/front/Avalugg.png b/src/afd/sprites/front/713--0--Avalugg.png similarity index 100% rename from src/afd/sprites/front/Avalugg.png rename to src/afd/sprites/front/713--0--Avalugg.png diff --git a/src/afd/sprites/front/Noibat.png b/src/afd/sprites/front/714--0--Noibat.png similarity index 100% rename from src/afd/sprites/front/Noibat.png rename to src/afd/sprites/front/714--0--Noibat.png diff --git a/src/afd/sprites/front/Noivern.png b/src/afd/sprites/front/715--0--Noivern.png similarity index 100% rename from src/afd/sprites/front/Noivern.png rename to src/afd/sprites/front/715--0--Noivern.png diff --git a/src/afd/sprites/front/Xerneas.png b/src/afd/sprites/front/716--0--Xerneas.png similarity index 100% rename from src/afd/sprites/front/Xerneas.png rename to src/afd/sprites/front/716--0--Xerneas.png diff --git a/src/afd/sprites/front/Yveltal.png b/src/afd/sprites/front/717--0--Yveltal.png similarity index 100% rename from src/afd/sprites/front/Yveltal.png rename to src/afd/sprites/front/717--0--Yveltal.png diff --git a/src/afd/sprites/front/Zygarde.png b/src/afd/sprites/front/718--0--Zygarde.png similarity index 100% rename from src/afd/sprites/front/Zygarde.png rename to src/afd/sprites/front/718--0--Zygarde.png diff --git a/src/afd/sprites/front/Zygarde--10__0025.png b/src/afd/sprites/front/718--420--Zygarde--10__0025.png similarity index 100% rename from src/afd/sprites/front/Zygarde--10__0025.png rename to src/afd/sprites/front/718--420--Zygarde--10__0025.png diff --git a/src/afd/sprites/front/Zygarde--Complete.png b/src/afd/sprites/front/718--420--Zygarde--Complete.png similarity index 100% rename from src/afd/sprites/front/Zygarde--Complete.png rename to src/afd/sprites/front/718--420--Zygarde--Complete.png diff --git a/src/afd/sprites/front/Diancie.png b/src/afd/sprites/front/719--0--Diancie.png similarity index 100% rename from src/afd/sprites/front/Diancie.png rename to src/afd/sprites/front/719--0--Diancie.png diff --git a/src/afd/sprites/front/Diancie--Mega.png b/src/afd/sprites/front/719--420--Diancie--Mega.png similarity index 100% rename from src/afd/sprites/front/Diancie--Mega.png rename to src/afd/sprites/front/719--420--Diancie--Mega.png diff --git a/src/afd/sprites/front/Tentacool.png b/src/afd/sprites/front/72--0--Tentacool.png similarity index 100% rename from src/afd/sprites/front/Tentacool.png rename to src/afd/sprites/front/72--0--Tentacool.png diff --git a/src/afd/sprites/front/Hoopa.png b/src/afd/sprites/front/720--0--Hoopa.png similarity index 100% rename from src/afd/sprites/front/Hoopa.png rename to src/afd/sprites/front/720--0--Hoopa.png diff --git a/src/afd/sprites/front/Hoopa--Unbound.png b/src/afd/sprites/front/720--420--Hoopa--Unbound.png similarity index 100% rename from src/afd/sprites/front/Hoopa--Unbound.png rename to src/afd/sprites/front/720--420--Hoopa--Unbound.png diff --git a/src/afd/sprites/front/Volcanion.png b/src/afd/sprites/front/721--0--Volcanion.png similarity index 100% rename from src/afd/sprites/front/Volcanion.png rename to src/afd/sprites/front/721--0--Volcanion.png diff --git a/src/afd/sprites/front/Rowlet.png b/src/afd/sprites/front/722--0--Rowlet.png similarity index 100% rename from src/afd/sprites/front/Rowlet.png rename to src/afd/sprites/front/722--0--Rowlet.png diff --git a/src/afd/sprites/front/Dartrix.png b/src/afd/sprites/front/723--0--Dartrix.png similarity index 100% rename from src/afd/sprites/front/Dartrix.png rename to src/afd/sprites/front/723--0--Dartrix.png diff --git a/src/afd/sprites/front/Decidueye.png b/src/afd/sprites/front/724--0--Decidueye.png similarity index 100% rename from src/afd/sprites/front/Decidueye.png rename to src/afd/sprites/front/724--0--Decidueye.png diff --git a/src/afd/sprites/front/Litten.png b/src/afd/sprites/front/725--0--Litten.png similarity index 100% rename from src/afd/sprites/front/Litten.png rename to src/afd/sprites/front/725--0--Litten.png diff --git a/src/afd/sprites/front/Torracat.png b/src/afd/sprites/front/726--0--Torracat.png similarity index 100% rename from src/afd/sprites/front/Torracat.png rename to src/afd/sprites/front/726--0--Torracat.png diff --git a/src/afd/sprites/front/Incineroar.png b/src/afd/sprites/front/727--0--Incineroar.png similarity index 100% rename from src/afd/sprites/front/Incineroar.png rename to src/afd/sprites/front/727--0--Incineroar.png diff --git a/src/afd/sprites/front/Popplio.png b/src/afd/sprites/front/728--0--Popplio.png similarity index 100% rename from src/afd/sprites/front/Popplio.png rename to src/afd/sprites/front/728--0--Popplio.png diff --git a/src/afd/sprites/front/Brionne.png b/src/afd/sprites/front/729--0--Brionne.png similarity index 100% rename from src/afd/sprites/front/Brionne.png rename to src/afd/sprites/front/729--0--Brionne.png diff --git a/src/afd/sprites/front/Tentacruel.png b/src/afd/sprites/front/73--0--Tentacruel.png similarity index 100% rename from src/afd/sprites/front/Tentacruel.png rename to src/afd/sprites/front/73--0--Tentacruel.png diff --git a/src/afd/sprites/front/Primarina.png b/src/afd/sprites/front/730--0--Primarina.png similarity index 100% rename from src/afd/sprites/front/Primarina.png rename to src/afd/sprites/front/730--0--Primarina.png diff --git a/src/afd/sprites/front/Pikipek.png b/src/afd/sprites/front/731--0--Pikipek.png similarity index 100% rename from src/afd/sprites/front/Pikipek.png rename to src/afd/sprites/front/731--0--Pikipek.png diff --git a/src/afd/sprites/front/Trumbeak.png b/src/afd/sprites/front/732--0--Trumbeak.png similarity index 100% rename from src/afd/sprites/front/Trumbeak.png rename to src/afd/sprites/front/732--0--Trumbeak.png diff --git a/src/afd/sprites/front/Toucannon.png b/src/afd/sprites/front/733--0--Toucannon.png similarity index 100% rename from src/afd/sprites/front/Toucannon.png rename to src/afd/sprites/front/733--0--Toucannon.png diff --git a/src/afd/sprites/front/Yungoos.png b/src/afd/sprites/front/734--0--Yungoos.png similarity index 100% rename from src/afd/sprites/front/Yungoos.png rename to src/afd/sprites/front/734--0--Yungoos.png diff --git a/src/afd/sprites/front/Gumshoos.png b/src/afd/sprites/front/735--0--Gumshoos.png similarity index 100% rename from src/afd/sprites/front/Gumshoos.png rename to src/afd/sprites/front/735--0--Gumshoos.png diff --git a/src/afd/sprites/front/Grubbin.png b/src/afd/sprites/front/736--0--Grubbin.png similarity index 100% rename from src/afd/sprites/front/Grubbin.png rename to src/afd/sprites/front/736--0--Grubbin.png diff --git a/src/afd/sprites/front/Charjabug.png b/src/afd/sprites/front/737--0--Charjabug.png similarity index 100% rename from src/afd/sprites/front/Charjabug.png rename to src/afd/sprites/front/737--0--Charjabug.png diff --git a/src/afd/sprites/front/Vikavolt.png b/src/afd/sprites/front/738--0--Vikavolt.png similarity index 100% rename from src/afd/sprites/front/Vikavolt.png rename to src/afd/sprites/front/738--0--Vikavolt.png diff --git a/src/afd/sprites/front/Crabrawler.png b/src/afd/sprites/front/739--0--Crabrawler.png similarity index 100% rename from src/afd/sprites/front/Crabrawler.png rename to src/afd/sprites/front/739--0--Crabrawler.png diff --git a/src/afd/sprites/front/Geodude.png b/src/afd/sprites/front/74--0--Geodude.png similarity index 100% rename from src/afd/sprites/front/Geodude.png rename to src/afd/sprites/front/74--0--Geodude.png diff --git a/src/afd/sprites/front/Geodude--Alola.png b/src/afd/sprites/front/74--420--Geodude--Alola.png similarity index 100% rename from src/afd/sprites/front/Geodude--Alola.png rename to src/afd/sprites/front/74--420--Geodude--Alola.png diff --git a/src/afd/sprites/front/Crabominable.png b/src/afd/sprites/front/740--0--Crabominable.png similarity index 100% rename from src/afd/sprites/front/Crabominable.png rename to src/afd/sprites/front/740--0--Crabominable.png diff --git a/src/afd/sprites/front/Oricorio.png b/src/afd/sprites/front/741--0--Oricorio.png similarity index 100% rename from src/afd/sprites/front/Oricorio.png rename to src/afd/sprites/front/741--0--Oricorio.png diff --git a/src/afd/sprites/front/Oricorio--Pa__0027u.png b/src/afd/sprites/front/741--420--Oricorio--Pa__0027u.png similarity index 100% rename from src/afd/sprites/front/Oricorio--Pa__0027u.png rename to src/afd/sprites/front/741--420--Oricorio--Pa__0027u.png diff --git a/src/afd/sprites/front/Oricorio--Pom-Pom.png b/src/afd/sprites/front/741--420--Oricorio--Pom-Pom.png similarity index 100% rename from src/afd/sprites/front/Oricorio--Pom-Pom.png rename to src/afd/sprites/front/741--420--Oricorio--Pom-Pom.png diff --git a/src/afd/sprites/front/Oricorio--Sensu.png b/src/afd/sprites/front/741--420--Oricorio--Sensu.png similarity index 100% rename from src/afd/sprites/front/Oricorio--Sensu.png rename to src/afd/sprites/front/741--420--Oricorio--Sensu.png diff --git a/src/afd/sprites/front/Cutiefly.png b/src/afd/sprites/front/742--0--Cutiefly.png similarity index 100% rename from src/afd/sprites/front/Cutiefly.png rename to src/afd/sprites/front/742--0--Cutiefly.png diff --git a/src/afd/sprites/front/Ribombee.png b/src/afd/sprites/front/743--0--Ribombee.png similarity index 100% rename from src/afd/sprites/front/Ribombee.png rename to src/afd/sprites/front/743--0--Ribombee.png diff --git a/src/afd/sprites/front/Rockruff.png b/src/afd/sprites/front/744--0--Rockruff.png similarity index 100% rename from src/afd/sprites/front/Rockruff.png rename to src/afd/sprites/front/744--0--Rockruff.png diff --git a/src/afd/sprites/front/Lycanroc.png b/src/afd/sprites/front/745--0--Lycanroc.png similarity index 100% rename from src/afd/sprites/front/Lycanroc.png rename to src/afd/sprites/front/745--0--Lycanroc.png diff --git a/src/afd/sprites/front/Lycanroc--Dusk.png b/src/afd/sprites/front/745--420--Lycanroc--Dusk.png similarity index 100% rename from src/afd/sprites/front/Lycanroc--Dusk.png rename to src/afd/sprites/front/745--420--Lycanroc--Dusk.png diff --git a/src/afd/sprites/front/Lycanroc--Midnight.png b/src/afd/sprites/front/745--420--Lycanroc--Midnight.png similarity index 100% rename from src/afd/sprites/front/Lycanroc--Midnight.png rename to src/afd/sprites/front/745--420--Lycanroc--Midnight.png diff --git a/src/afd/sprites/front/Wishiwashi.png b/src/afd/sprites/front/746--0--Wishiwashi.png similarity index 100% rename from src/afd/sprites/front/Wishiwashi.png rename to src/afd/sprites/front/746--0--Wishiwashi.png diff --git a/src/afd/sprites/front/Wishiwashi--School.png b/src/afd/sprites/front/746--420--Wishiwashi--School.png similarity index 100% rename from src/afd/sprites/front/Wishiwashi--School.png rename to src/afd/sprites/front/746--420--Wishiwashi--School.png diff --git a/src/afd/sprites/front/Mareanie.png b/src/afd/sprites/front/747--0--Mareanie.png similarity index 100% rename from src/afd/sprites/front/Mareanie.png rename to src/afd/sprites/front/747--0--Mareanie.png diff --git a/src/afd/sprites/front/Toxapex.png b/src/afd/sprites/front/748--0--Toxapex.png similarity index 100% rename from src/afd/sprites/front/Toxapex.png rename to src/afd/sprites/front/748--0--Toxapex.png diff --git a/src/afd/sprites/front/Mudbray.png b/src/afd/sprites/front/749--0--Mudbray.png similarity index 100% rename from src/afd/sprites/front/Mudbray.png rename to src/afd/sprites/front/749--0--Mudbray.png diff --git a/src/afd/sprites/front/Graveler.png b/src/afd/sprites/front/75--0--Graveler.png similarity index 100% rename from src/afd/sprites/front/Graveler.png rename to src/afd/sprites/front/75--0--Graveler.png diff --git a/src/afd/sprites/front/Graveler--Alola.png b/src/afd/sprites/front/75--420--Graveler--Alola.png similarity index 100% rename from src/afd/sprites/front/Graveler--Alola.png rename to src/afd/sprites/front/75--420--Graveler--Alola.png diff --git a/src/afd/sprites/front/Mudsdale.png b/src/afd/sprites/front/750--0--Mudsdale.png similarity index 100% rename from src/afd/sprites/front/Mudsdale.png rename to src/afd/sprites/front/750--0--Mudsdale.png diff --git a/src/afd/sprites/front/Dewpider.png b/src/afd/sprites/front/751--0--Dewpider.png similarity index 100% rename from src/afd/sprites/front/Dewpider.png rename to src/afd/sprites/front/751--0--Dewpider.png diff --git a/src/afd/sprites/front/Araquanid.png b/src/afd/sprites/front/752--0--Araquanid.png similarity index 100% rename from src/afd/sprites/front/Araquanid.png rename to src/afd/sprites/front/752--0--Araquanid.png diff --git a/src/afd/sprites/front/Lurantis.png b/src/afd/sprites/front/754--0--Lurantis.png similarity index 100% rename from src/afd/sprites/front/Lurantis.png rename to src/afd/sprites/front/754--0--Lurantis.png diff --git a/src/afd/sprites/front/Morelull.png b/src/afd/sprites/front/755--0--Morelull.png similarity index 100% rename from src/afd/sprites/front/Morelull.png rename to src/afd/sprites/front/755--0--Morelull.png diff --git a/src/afd/sprites/front/Shiinotic.png b/src/afd/sprites/front/756--0--Shiinotic.png similarity index 100% rename from src/afd/sprites/front/Shiinotic.png rename to src/afd/sprites/front/756--0--Shiinotic.png diff --git a/src/afd/sprites/front/Salandit.png b/src/afd/sprites/front/757--0--Salandit.png similarity index 100% rename from src/afd/sprites/front/Salandit.png rename to src/afd/sprites/front/757--0--Salandit.png diff --git a/src/afd/sprites/front/Salazzle.png b/src/afd/sprites/front/758--0--Salazzle.png similarity index 100% rename from src/afd/sprites/front/Salazzle.png rename to src/afd/sprites/front/758--0--Salazzle.png diff --git a/src/afd/sprites/front/Stufful.png b/src/afd/sprites/front/759--0--Stufful.png similarity index 100% rename from src/afd/sprites/front/Stufful.png rename to src/afd/sprites/front/759--0--Stufful.png diff --git a/src/afd/sprites/front/Golem.png b/src/afd/sprites/front/76--0--Golem.png similarity index 100% rename from src/afd/sprites/front/Golem.png rename to src/afd/sprites/front/76--0--Golem.png diff --git a/src/afd/sprites/front/Golem--Alola.png b/src/afd/sprites/front/76--420--Golem--Alola.png similarity index 100% rename from src/afd/sprites/front/Golem--Alola.png rename to src/afd/sprites/front/76--420--Golem--Alola.png diff --git a/src/afd/sprites/front/Bewear.png b/src/afd/sprites/front/760--0--Bewear.png similarity index 100% rename from src/afd/sprites/front/Bewear.png rename to src/afd/sprites/front/760--0--Bewear.png diff --git a/src/afd/sprites/front/Bounsweet.png b/src/afd/sprites/front/761--0--Bounsweet.png similarity index 100% rename from src/afd/sprites/front/Bounsweet.png rename to src/afd/sprites/front/761--0--Bounsweet.png diff --git a/src/afd/sprites/front/Steenee.png b/src/afd/sprites/front/762--0--Steenee.png similarity index 100% rename from src/afd/sprites/front/Steenee.png rename to src/afd/sprites/front/762--0--Steenee.png diff --git a/src/afd/sprites/front/Tsareena.png b/src/afd/sprites/front/763--0--Tsareena.png similarity index 100% rename from src/afd/sprites/front/Tsareena.png rename to src/afd/sprites/front/763--0--Tsareena.png diff --git a/src/afd/sprites/front/Comfey.png b/src/afd/sprites/front/764--0--Comfey.png similarity index 100% rename from src/afd/sprites/front/Comfey.png rename to src/afd/sprites/front/764--0--Comfey.png diff --git a/src/afd/sprites/front/Oranguru.png b/src/afd/sprites/front/765--0--Oranguru.png similarity index 100% rename from src/afd/sprites/front/Oranguru.png rename to src/afd/sprites/front/765--0--Oranguru.png diff --git a/src/afd/sprites/front/Passimian.png b/src/afd/sprites/front/766--0--Passimian.png similarity index 100% rename from src/afd/sprites/front/Passimian.png rename to src/afd/sprites/front/766--0--Passimian.png diff --git a/src/afd/sprites/front/Wimpod.png b/src/afd/sprites/front/767--0--Wimpod.png similarity index 100% rename from src/afd/sprites/front/Wimpod.png rename to src/afd/sprites/front/767--0--Wimpod.png diff --git a/src/afd/sprites/front/Golisopod.png b/src/afd/sprites/front/768--0--Golisopod.png similarity index 100% rename from src/afd/sprites/front/Golisopod.png rename to src/afd/sprites/front/768--0--Golisopod.png diff --git a/src/afd/sprites/front/Sandygast.png b/src/afd/sprites/front/769--0--Sandygast.png similarity index 100% rename from src/afd/sprites/front/Sandygast.png rename to src/afd/sprites/front/769--0--Sandygast.png diff --git a/src/afd/sprites/front/Ponyta.png b/src/afd/sprites/front/77--0--Ponyta.png similarity index 100% rename from src/afd/sprites/front/Ponyta.png rename to src/afd/sprites/front/77--0--Ponyta.png diff --git a/src/afd/sprites/front/Ponyta--Galar.png b/src/afd/sprites/front/77--420--Ponyta--Galar.png similarity index 100% rename from src/afd/sprites/front/Ponyta--Galar.png rename to src/afd/sprites/front/77--420--Ponyta--Galar.png diff --git a/src/afd/sprites/front/Palossand.png b/src/afd/sprites/front/770--0--Palossand.png similarity index 100% rename from src/afd/sprites/front/Palossand.png rename to src/afd/sprites/front/770--0--Palossand.png diff --git a/src/afd/sprites/front/Pyukumuku.png b/src/afd/sprites/front/771--0--Pyukumuku.png similarity index 100% rename from src/afd/sprites/front/Pyukumuku.png rename to src/afd/sprites/front/771--0--Pyukumuku.png diff --git a/src/afd/sprites/front/Type__003a_Null.png b/src/afd/sprites/front/772--0--Type__003a_Null.png similarity index 100% rename from src/afd/sprites/front/Type__003a_Null.png rename to src/afd/sprites/front/772--0--Type__003a_Null.png diff --git a/src/afd/sprites/front/Silvally.png b/src/afd/sprites/front/773--0--Silvally.png similarity index 100% rename from src/afd/sprites/front/Silvally.png rename to src/afd/sprites/front/773--0--Silvally.png diff --git a/src/afd/sprites/front/Silvally--Bug.png b/src/afd/sprites/front/773--420--Silvally--Bug.png similarity index 100% rename from src/afd/sprites/front/Silvally--Bug.png rename to src/afd/sprites/front/773--420--Silvally--Bug.png diff --git a/src/afd/sprites/front/Silvally--Dark.png b/src/afd/sprites/front/773--420--Silvally--Dark.png similarity index 100% rename from src/afd/sprites/front/Silvally--Dark.png rename to src/afd/sprites/front/773--420--Silvally--Dark.png diff --git a/src/afd/sprites/front/Silvally--Dragon.png b/src/afd/sprites/front/773--420--Silvally--Dragon.png similarity index 100% rename from src/afd/sprites/front/Silvally--Dragon.png rename to src/afd/sprites/front/773--420--Silvally--Dragon.png diff --git a/src/afd/sprites/front/Silvally--Electric.png b/src/afd/sprites/front/773--420--Silvally--Electric.png similarity index 100% rename from src/afd/sprites/front/Silvally--Electric.png rename to src/afd/sprites/front/773--420--Silvally--Electric.png diff --git a/src/afd/sprites/front/Silvally--Fairy.png b/src/afd/sprites/front/773--420--Silvally--Fairy.png similarity index 100% rename from src/afd/sprites/front/Silvally--Fairy.png rename to src/afd/sprites/front/773--420--Silvally--Fairy.png diff --git a/src/afd/sprites/front/Silvally--Fighting.png b/src/afd/sprites/front/773--420--Silvally--Fighting.png similarity index 100% rename from src/afd/sprites/front/Silvally--Fighting.png rename to src/afd/sprites/front/773--420--Silvally--Fighting.png diff --git a/src/afd/sprites/front/Silvally--Fire.png b/src/afd/sprites/front/773--420--Silvally--Fire.png similarity index 100% rename from src/afd/sprites/front/Silvally--Fire.png rename to src/afd/sprites/front/773--420--Silvally--Fire.png diff --git a/src/afd/sprites/front/Silvally--Flying.png b/src/afd/sprites/front/773--420--Silvally--Flying.png similarity index 100% rename from src/afd/sprites/front/Silvally--Flying.png rename to src/afd/sprites/front/773--420--Silvally--Flying.png diff --git a/src/afd/sprites/front/Silvally--Ghost.png b/src/afd/sprites/front/773--420--Silvally--Ghost.png similarity index 100% rename from src/afd/sprites/front/Silvally--Ghost.png rename to src/afd/sprites/front/773--420--Silvally--Ghost.png diff --git a/src/afd/sprites/front/Silvally--Grass.png b/src/afd/sprites/front/773--420--Silvally--Grass.png similarity index 100% rename from src/afd/sprites/front/Silvally--Grass.png rename to src/afd/sprites/front/773--420--Silvally--Grass.png diff --git a/src/afd/sprites/front/Silvally--Ground.png b/src/afd/sprites/front/773--420--Silvally--Ground.png similarity index 100% rename from src/afd/sprites/front/Silvally--Ground.png rename to src/afd/sprites/front/773--420--Silvally--Ground.png diff --git a/src/afd/sprites/front/Silvally--Ice.png b/src/afd/sprites/front/773--420--Silvally--Ice.png similarity index 100% rename from src/afd/sprites/front/Silvally--Ice.png rename to src/afd/sprites/front/773--420--Silvally--Ice.png diff --git a/src/afd/sprites/front/Silvally--Poison.png b/src/afd/sprites/front/773--420--Silvally--Poison.png similarity index 100% rename from src/afd/sprites/front/Silvally--Poison.png rename to src/afd/sprites/front/773--420--Silvally--Poison.png diff --git a/src/afd/sprites/front/Silvally--Psychic.png b/src/afd/sprites/front/773--420--Silvally--Psychic.png similarity index 100% rename from src/afd/sprites/front/Silvally--Psychic.png rename to src/afd/sprites/front/773--420--Silvally--Psychic.png diff --git a/src/afd/sprites/front/Silvally--Rock.png b/src/afd/sprites/front/773--420--Silvally--Rock.png similarity index 100% rename from src/afd/sprites/front/Silvally--Rock.png rename to src/afd/sprites/front/773--420--Silvally--Rock.png diff --git a/src/afd/sprites/front/Silvally--Steel.png b/src/afd/sprites/front/773--420--Silvally--Steel.png similarity index 100% rename from src/afd/sprites/front/Silvally--Steel.png rename to src/afd/sprites/front/773--420--Silvally--Steel.png diff --git a/src/afd/sprites/front/Silvally--Water.png b/src/afd/sprites/front/773--420--Silvally--Water.png similarity index 100% rename from src/afd/sprites/front/Silvally--Water.png rename to src/afd/sprites/front/773--420--Silvally--Water.png diff --git a/src/afd/sprites/front/Minior.png b/src/afd/sprites/front/774--0--Minior.png similarity index 100% rename from src/afd/sprites/front/Minior.png rename to src/afd/sprites/front/774--0--Minior.png diff --git a/src/afd/sprites/front/Minior--Meteor.png b/src/afd/sprites/front/774--420--Minior--Meteor.png similarity index 100% rename from src/afd/sprites/front/Minior--Meteor.png rename to src/afd/sprites/front/774--420--Minior--Meteor.png diff --git a/src/afd/sprites/front/Komala.png b/src/afd/sprites/front/775--0--Komala.png similarity index 100% rename from src/afd/sprites/front/Komala.png rename to src/afd/sprites/front/775--0--Komala.png diff --git a/src/afd/sprites/front/Turtonator.png b/src/afd/sprites/front/776--0--Turtonator.png similarity index 100% rename from src/afd/sprites/front/Turtonator.png rename to src/afd/sprites/front/776--0--Turtonator.png diff --git a/src/afd/sprites/front/Togedemaru.png b/src/afd/sprites/front/777--0--Togedemaru.png similarity index 100% rename from src/afd/sprites/front/Togedemaru.png rename to src/afd/sprites/front/777--0--Togedemaru.png diff --git a/src/afd/sprites/front/Mimikyu.png b/src/afd/sprites/front/778--0--Mimikyu.png similarity index 100% rename from src/afd/sprites/front/Mimikyu.png rename to src/afd/sprites/front/778--0--Mimikyu.png diff --git a/src/afd/sprites/front/Mimikyu--Busted.png b/src/afd/sprites/front/778--420--Mimikyu--Busted.png similarity index 100% rename from src/afd/sprites/front/Mimikyu--Busted.png rename to src/afd/sprites/front/778--420--Mimikyu--Busted.png diff --git a/src/afd/sprites/front/Bruxish.png b/src/afd/sprites/front/779--0--Bruxish.png similarity index 100% rename from src/afd/sprites/front/Bruxish.png rename to src/afd/sprites/front/779--0--Bruxish.png diff --git a/src/afd/sprites/front/Rapidash.png b/src/afd/sprites/front/78--0--Rapidash.png similarity index 100% rename from src/afd/sprites/front/Rapidash.png rename to src/afd/sprites/front/78--0--Rapidash.png diff --git a/src/afd/sprites/front/Rapidash--Galar.png b/src/afd/sprites/front/78--420--Rapidash--Galar.png similarity index 100% rename from src/afd/sprites/front/Rapidash--Galar.png rename to src/afd/sprites/front/78--420--Rapidash--Galar.png diff --git a/src/afd/sprites/front/Drampa.png b/src/afd/sprites/front/780--0--Drampa.png similarity index 100% rename from src/afd/sprites/front/Drampa.png rename to src/afd/sprites/front/780--0--Drampa.png diff --git a/src/afd/sprites/front/Dhelmise.png b/src/afd/sprites/front/781--0--Dhelmise.png similarity index 100% rename from src/afd/sprites/front/Dhelmise.png rename to src/afd/sprites/front/781--0--Dhelmise.png diff --git a/src/afd/sprites/front/Jangmo-o.png b/src/afd/sprites/front/782--0--Jangmo-o.png similarity index 100% rename from src/afd/sprites/front/Jangmo-o.png rename to src/afd/sprites/front/782--0--Jangmo-o.png diff --git a/src/afd/sprites/front/Hakamo-o.png b/src/afd/sprites/front/783--0--Hakamo-o.png similarity index 100% rename from src/afd/sprites/front/Hakamo-o.png rename to src/afd/sprites/front/783--0--Hakamo-o.png diff --git a/src/afd/sprites/front/Kommo-o.png b/src/afd/sprites/front/784--0--Kommo-o.png similarity index 100% rename from src/afd/sprites/front/Kommo-o.png rename to src/afd/sprites/front/784--0--Kommo-o.png diff --git a/src/afd/sprites/front/Tapu_Koko.png b/src/afd/sprites/front/785--0--Tapu_Koko.png similarity index 100% rename from src/afd/sprites/front/Tapu_Koko.png rename to src/afd/sprites/front/785--0--Tapu_Koko.png diff --git a/src/afd/sprites/front/Tapu_Lele.png b/src/afd/sprites/front/786--0--Tapu_Lele.png similarity index 100% rename from src/afd/sprites/front/Tapu_Lele.png rename to src/afd/sprites/front/786--0--Tapu_Lele.png diff --git a/src/afd/sprites/front/Tapu_Bulu.png b/src/afd/sprites/front/787--0--Tapu_Bulu.png similarity index 100% rename from src/afd/sprites/front/Tapu_Bulu.png rename to src/afd/sprites/front/787--0--Tapu_Bulu.png diff --git a/src/afd/sprites/front/Tapu_Fini.png b/src/afd/sprites/front/788--0--Tapu_Fini.png similarity index 100% rename from src/afd/sprites/front/Tapu_Fini.png rename to src/afd/sprites/front/788--0--Tapu_Fini.png diff --git a/src/afd/sprites/front/Cosmog.png b/src/afd/sprites/front/789--0--Cosmog.png similarity index 100% rename from src/afd/sprites/front/Cosmog.png rename to src/afd/sprites/front/789--0--Cosmog.png diff --git a/src/afd/sprites/front/Slowpoke.png b/src/afd/sprites/front/79--0--Slowpoke.png similarity index 100% rename from src/afd/sprites/front/Slowpoke.png rename to src/afd/sprites/front/79--0--Slowpoke.png diff --git a/src/afd/sprites/front/Slowpoke--Galar.png b/src/afd/sprites/front/79--420--Slowpoke--Galar.png similarity index 100% rename from src/afd/sprites/front/Slowpoke--Galar.png rename to src/afd/sprites/front/79--420--Slowpoke--Galar.png diff --git a/src/afd/sprites/front/Cosmoem.png b/src/afd/sprites/front/790--0--Cosmoem.png similarity index 100% rename from src/afd/sprites/front/Cosmoem.png rename to src/afd/sprites/front/790--0--Cosmoem.png diff --git a/src/afd/sprites/front/Solgaleo.png b/src/afd/sprites/front/791--0--Solgaleo.png similarity index 100% rename from src/afd/sprites/front/Solgaleo.png rename to src/afd/sprites/front/791--0--Solgaleo.png diff --git a/src/afd/sprites/front/Lunala.png b/src/afd/sprites/front/792--0--Lunala.png similarity index 100% rename from src/afd/sprites/front/Lunala.png rename to src/afd/sprites/front/792--0--Lunala.png diff --git a/src/afd/sprites/front/Nihilego.png b/src/afd/sprites/front/793--0--Nihilego.png similarity index 100% rename from src/afd/sprites/front/Nihilego.png rename to src/afd/sprites/front/793--0--Nihilego.png diff --git a/src/afd/sprites/front/Buzzwole.png b/src/afd/sprites/front/794--0--Buzzwole.png similarity index 100% rename from src/afd/sprites/front/Buzzwole.png rename to src/afd/sprites/front/794--0--Buzzwole.png diff --git a/src/afd/sprites/front/Pheromosa.png b/src/afd/sprites/front/795--0--Pheromosa.png similarity index 100% rename from src/afd/sprites/front/Pheromosa.png rename to src/afd/sprites/front/795--0--Pheromosa.png diff --git a/src/afd/sprites/front/Xurkitree.png b/src/afd/sprites/front/796--0--Xurkitree.png similarity index 100% rename from src/afd/sprites/front/Xurkitree.png rename to src/afd/sprites/front/796--0--Xurkitree.png diff --git a/src/afd/sprites/front/Celesteela.png b/src/afd/sprites/front/797--0--Celesteela.png similarity index 100% rename from src/afd/sprites/front/Celesteela.png rename to src/afd/sprites/front/797--0--Celesteela.png diff --git a/src/afd/sprites/front/Kartana.png b/src/afd/sprites/front/798--0--Kartana.png similarity index 100% rename from src/afd/sprites/front/Kartana.png rename to src/afd/sprites/front/798--0--Kartana.png diff --git a/src/afd/sprites/front/Guzzlord.png b/src/afd/sprites/front/799--0--Guzzlord.png similarity index 100% rename from src/afd/sprites/front/Guzzlord.png rename to src/afd/sprites/front/799--0--Guzzlord.png diff --git a/src/afd/sprites/front/Fidgit.png b/src/afd/sprites/front/8--0--Fidgit.png similarity index 100% rename from src/afd/sprites/front/Fidgit.png rename to src/afd/sprites/front/8--0--Fidgit.png diff --git a/src/afd/sprites/front/Wartortle.png b/src/afd/sprites/front/8--0--Wartortle.png similarity index 100% rename from src/afd/sprites/front/Wartortle.png rename to src/afd/sprites/front/8--0--Wartortle.png diff --git a/src/afd/sprites/front/Slowbro.png b/src/afd/sprites/front/80--0--Slowbro.png similarity index 100% rename from src/afd/sprites/front/Slowbro.png rename to src/afd/sprites/front/80--0--Slowbro.png diff --git a/src/afd/sprites/front/Slowbro--Mega.png b/src/afd/sprites/front/80--420--Slowbro--Mega.png similarity index 100% rename from src/afd/sprites/front/Slowbro--Mega.png rename to src/afd/sprites/front/80--420--Slowbro--Mega.png diff --git a/src/afd/sprites/front/Necrozma.png b/src/afd/sprites/front/800--0--Necrozma.png similarity index 100% rename from src/afd/sprites/front/Necrozma.png rename to src/afd/sprites/front/800--0--Necrozma.png diff --git a/src/afd/sprites/front/Necrozma--Dawn-Wings.png b/src/afd/sprites/front/800--420--Necrozma--Dawn-Wings.png similarity index 100% rename from src/afd/sprites/front/Necrozma--Dawn-Wings.png rename to src/afd/sprites/front/800--420--Necrozma--Dawn-Wings.png diff --git a/src/afd/sprites/front/Necrozma--Dusk-Mane.png b/src/afd/sprites/front/800--420--Necrozma--Dusk-Mane.png similarity index 100% rename from src/afd/sprites/front/Necrozma--Dusk-Mane.png rename to src/afd/sprites/front/800--420--Necrozma--Dusk-Mane.png diff --git a/src/afd/sprites/front/Necrozma--Ultra.png b/src/afd/sprites/front/800--420--Necrozma--Ultra.png similarity index 100% rename from src/afd/sprites/front/Necrozma--Ultra.png rename to src/afd/sprites/front/800--420--Necrozma--Ultra.png diff --git a/src/afd/sprites/front/Magearna.png b/src/afd/sprites/front/801--0--Magearna.png similarity index 100% rename from src/afd/sprites/front/Magearna.png rename to src/afd/sprites/front/801--0--Magearna.png diff --git a/src/afd/sprites/front/Marshadow.png b/src/afd/sprites/front/802--0--Marshadow.png similarity index 100% rename from src/afd/sprites/front/Marshadow.png rename to src/afd/sprites/front/802--0--Marshadow.png diff --git a/src/afd/sprites/front/Poipole.png b/src/afd/sprites/front/803--0--Poipole.png similarity index 100% rename from src/afd/sprites/front/Poipole.png rename to src/afd/sprites/front/803--0--Poipole.png diff --git a/src/afd/sprites/front/Naganadel.png b/src/afd/sprites/front/804--0--Naganadel.png similarity index 100% rename from src/afd/sprites/front/Naganadel.png rename to src/afd/sprites/front/804--0--Naganadel.png diff --git a/src/afd/sprites/front/Stakataka.png b/src/afd/sprites/front/805--0--Stakataka.png similarity index 100% rename from src/afd/sprites/front/Stakataka.png rename to src/afd/sprites/front/805--0--Stakataka.png diff --git a/src/afd/sprites/front/Blacephalon.png b/src/afd/sprites/front/806--0--Blacephalon.png similarity index 100% rename from src/afd/sprites/front/Blacephalon.png rename to src/afd/sprites/front/806--0--Blacephalon.png diff --git a/src/afd/sprites/front/Zeraora.png b/src/afd/sprites/front/807--0--Zeraora.png similarity index 100% rename from src/afd/sprites/front/Zeraora.png rename to src/afd/sprites/front/807--0--Zeraora.png diff --git a/src/afd/sprites/front/Meltan.png b/src/afd/sprites/front/808--0--Meltan.png similarity index 100% rename from src/afd/sprites/front/Meltan.png rename to src/afd/sprites/front/808--0--Meltan.png diff --git a/src/afd/sprites/front/Melmetal.png b/src/afd/sprites/front/809--0--Melmetal.png similarity index 100% rename from src/afd/sprites/front/Melmetal.png rename to src/afd/sprites/front/809--0--Melmetal.png diff --git a/src/afd/sprites/front/Melmetal--Gmax.png b/src/afd/sprites/front/809--420--Melmetal--Gmax.png similarity index 100% rename from src/afd/sprites/front/Melmetal--Gmax.png rename to src/afd/sprites/front/809--420--Melmetal--Gmax.png diff --git a/src/afd/sprites/front/Magnemite.png b/src/afd/sprites/front/81--0--Magnemite.png similarity index 100% rename from src/afd/sprites/front/Magnemite.png rename to src/afd/sprites/front/81--0--Magnemite.png diff --git a/src/afd/sprites/front/Grookey.png b/src/afd/sprites/front/810--0--Grookey.png similarity index 100% rename from src/afd/sprites/front/Grookey.png rename to src/afd/sprites/front/810--0--Grookey.png diff --git a/src/afd/sprites/front/Thwackey.png b/src/afd/sprites/front/811--0--Thwackey.png similarity index 100% rename from src/afd/sprites/front/Thwackey.png rename to src/afd/sprites/front/811--0--Thwackey.png diff --git a/src/afd/sprites/front/Rillaboom.png b/src/afd/sprites/front/812--0--Rillaboom.png similarity index 100% rename from src/afd/sprites/front/Rillaboom.png rename to src/afd/sprites/front/812--0--Rillaboom.png diff --git a/src/afd/sprites/front/Scorbunny.png b/src/afd/sprites/front/813--0--Scorbunny.png similarity index 100% rename from src/afd/sprites/front/Scorbunny.png rename to src/afd/sprites/front/813--0--Scorbunny.png diff --git a/src/afd/sprites/front/Raboot.png b/src/afd/sprites/front/814--0--Raboot.png similarity index 100% rename from src/afd/sprites/front/Raboot.png rename to src/afd/sprites/front/814--0--Raboot.png diff --git a/src/afd/sprites/front/Cinderace.png b/src/afd/sprites/front/815--0--Cinderace.png similarity index 100% rename from src/afd/sprites/front/Cinderace.png rename to src/afd/sprites/front/815--0--Cinderace.png diff --git a/src/afd/sprites/front/Sobble.png b/src/afd/sprites/front/816--0--Sobble.png similarity index 100% rename from src/afd/sprites/front/Sobble.png rename to src/afd/sprites/front/816--0--Sobble.png diff --git a/src/afd/sprites/front/Drizzile.png b/src/afd/sprites/front/817--0--Drizzile.png similarity index 100% rename from src/afd/sprites/front/Drizzile.png rename to src/afd/sprites/front/817--0--Drizzile.png diff --git a/src/afd/sprites/front/Inteleon.png b/src/afd/sprites/front/818--0--Inteleon.png similarity index 100% rename from src/afd/sprites/front/Inteleon.png rename to src/afd/sprites/front/818--0--Inteleon.png diff --git a/src/afd/sprites/front/Skwovet.png b/src/afd/sprites/front/819--0--Skwovet.png similarity index 100% rename from src/afd/sprites/front/Skwovet.png rename to src/afd/sprites/front/819--0--Skwovet.png diff --git a/src/afd/sprites/front/Magneton.png b/src/afd/sprites/front/82--0--Magneton.png similarity index 100% rename from src/afd/sprites/front/Magneton.png rename to src/afd/sprites/front/82--0--Magneton.png diff --git a/src/afd/sprites/front/Greedent.png b/src/afd/sprites/front/820--0--Greedent.png similarity index 100% rename from src/afd/sprites/front/Greedent.png rename to src/afd/sprites/front/820--0--Greedent.png diff --git a/src/afd/sprites/front/Rookidee.png b/src/afd/sprites/front/821--0--Rookidee.png similarity index 100% rename from src/afd/sprites/front/Rookidee.png rename to src/afd/sprites/front/821--0--Rookidee.png diff --git a/src/afd/sprites/front/Corvisquire.png b/src/afd/sprites/front/822--0--Corvisquire.png similarity index 100% rename from src/afd/sprites/front/Corvisquire.png rename to src/afd/sprites/front/822--0--Corvisquire.png diff --git a/src/afd/sprites/front/Corviknight.png b/src/afd/sprites/front/823--0--Corviknight.png similarity index 100% rename from src/afd/sprites/front/Corviknight.png rename to src/afd/sprites/front/823--0--Corviknight.png diff --git a/src/afd/sprites/front/Corviknight--Gmax.png b/src/afd/sprites/front/823--420--Corviknight--Gmax.png similarity index 100% rename from src/afd/sprites/front/Corviknight--Gmax.png rename to src/afd/sprites/front/823--420--Corviknight--Gmax.png diff --git a/src/afd/sprites/front/Blipbug.png b/src/afd/sprites/front/824--0--Blipbug.png similarity index 100% rename from src/afd/sprites/front/Blipbug.png rename to src/afd/sprites/front/824--0--Blipbug.png diff --git a/src/afd/sprites/front/Dottler.png b/src/afd/sprites/front/825--0--Dottler.png similarity index 100% rename from src/afd/sprites/front/Dottler.png rename to src/afd/sprites/front/825--0--Dottler.png diff --git a/src/afd/sprites/front/Orbeetle.png b/src/afd/sprites/front/826--0--Orbeetle.png similarity index 100% rename from src/afd/sprites/front/Orbeetle.png rename to src/afd/sprites/front/826--0--Orbeetle.png diff --git a/src/afd/sprites/front/Orbeetle--Gmax.png b/src/afd/sprites/front/826--420--Orbeetle--Gmax.png similarity index 100% rename from src/afd/sprites/front/Orbeetle--Gmax.png rename to src/afd/sprites/front/826--420--Orbeetle--Gmax.png diff --git a/src/afd/sprites/front/Nickit.png b/src/afd/sprites/front/827--0--Nickit.png similarity index 100% rename from src/afd/sprites/front/Nickit.png rename to src/afd/sprites/front/827--0--Nickit.png diff --git a/src/afd/sprites/front/Thievul.png b/src/afd/sprites/front/828--0--Thievul.png similarity index 100% rename from src/afd/sprites/front/Thievul.png rename to src/afd/sprites/front/828--0--Thievul.png diff --git a/src/afd/sprites/front/Gossifleur.png b/src/afd/sprites/front/829--0--Gossifleur.png similarity index 100% rename from src/afd/sprites/front/Gossifleur.png rename to src/afd/sprites/front/829--0--Gossifleur.png diff --git a/src/afd/sprites/front/Farfetch__0027d.png b/src/afd/sprites/front/83--0--Farfetch__0027d.png similarity index 100% rename from src/afd/sprites/front/Farfetch__0027d.png rename to src/afd/sprites/front/83--0--Farfetch__0027d.png diff --git a/src/afd/sprites/front/Farfetch__0027d--Galar.png b/src/afd/sprites/front/83--420--Farfetch__0027d--Galar.png similarity index 100% rename from src/afd/sprites/front/Farfetch__0027d--Galar.png rename to src/afd/sprites/front/83--420--Farfetch__0027d--Galar.png diff --git a/src/afd/sprites/front/Eldegoss.png b/src/afd/sprites/front/830--0--Eldegoss.png similarity index 100% rename from src/afd/sprites/front/Eldegoss.png rename to src/afd/sprites/front/830--0--Eldegoss.png diff --git a/src/afd/sprites/front/Wooloo.png b/src/afd/sprites/front/831--0--Wooloo.png similarity index 100% rename from src/afd/sprites/front/Wooloo.png rename to src/afd/sprites/front/831--0--Wooloo.png diff --git a/src/afd/sprites/front/Dubwool.png b/src/afd/sprites/front/832--0--Dubwool.png similarity index 100% rename from src/afd/sprites/front/Dubwool.png rename to src/afd/sprites/front/832--0--Dubwool.png diff --git a/src/afd/sprites/front/Chewtle.png b/src/afd/sprites/front/833--0--Chewtle.png similarity index 100% rename from src/afd/sprites/front/Chewtle.png rename to src/afd/sprites/front/833--0--Chewtle.png diff --git a/src/afd/sprites/front/Drednaw.png b/src/afd/sprites/front/834--0--Drednaw.png similarity index 100% rename from src/afd/sprites/front/Drednaw.png rename to src/afd/sprites/front/834--0--Drednaw.png diff --git a/src/afd/sprites/front/Drednaw--Gmax.png b/src/afd/sprites/front/834--420--Drednaw--Gmax.png similarity index 100% rename from src/afd/sprites/front/Drednaw--Gmax.png rename to src/afd/sprites/front/834--420--Drednaw--Gmax.png diff --git a/src/afd/sprites/front/Yamper.png b/src/afd/sprites/front/835--0--Yamper.png similarity index 100% rename from src/afd/sprites/front/Yamper.png rename to src/afd/sprites/front/835--0--Yamper.png diff --git a/src/afd/sprites/front/Boltund.png b/src/afd/sprites/front/836--0--Boltund.png similarity index 100% rename from src/afd/sprites/front/Boltund.png rename to src/afd/sprites/front/836--0--Boltund.png diff --git a/src/afd/sprites/front/Rolycoly.png b/src/afd/sprites/front/837--0--Rolycoly.png similarity index 100% rename from src/afd/sprites/front/Rolycoly.png rename to src/afd/sprites/front/837--0--Rolycoly.png diff --git a/src/afd/sprites/front/Carkol.png b/src/afd/sprites/front/838--0--Carkol.png similarity index 100% rename from src/afd/sprites/front/Carkol.png rename to src/afd/sprites/front/838--0--Carkol.png diff --git a/src/afd/sprites/front/Coalossal.png b/src/afd/sprites/front/839--0--Coalossal.png similarity index 100% rename from src/afd/sprites/front/Coalossal.png rename to src/afd/sprites/front/839--0--Coalossal.png diff --git a/src/afd/sprites/front/Coalossal--Gmax.png b/src/afd/sprites/front/839--420--Coalossal--Gmax.png similarity index 100% rename from src/afd/sprites/front/Coalossal--Gmax.png rename to src/afd/sprites/front/839--420--Coalossal--Gmax.png diff --git a/src/afd/sprites/front/Doduo.png b/src/afd/sprites/front/84--0--Doduo.png similarity index 100% rename from src/afd/sprites/front/Doduo.png rename to src/afd/sprites/front/84--0--Doduo.png diff --git a/src/afd/sprites/front/Applin.png b/src/afd/sprites/front/840--0--Applin.png similarity index 100% rename from src/afd/sprites/front/Applin.png rename to src/afd/sprites/front/840--0--Applin.png diff --git a/src/afd/sprites/front/Flapple.png b/src/afd/sprites/front/841--0--Flapple.png similarity index 100% rename from src/afd/sprites/front/Flapple.png rename to src/afd/sprites/front/841--0--Flapple.png diff --git a/src/afd/sprites/front/Appletun--Gmax.png b/src/afd/sprites/front/841--420--Flapple--Gmax.png similarity index 100% rename from src/afd/sprites/front/Appletun--Gmax.png rename to src/afd/sprites/front/841--420--Flapple--Gmax.png diff --git a/src/afd/sprites/front/Appletun.png b/src/afd/sprites/front/842--0--Appletun.png similarity index 100% rename from src/afd/sprites/front/Appletun.png rename to src/afd/sprites/front/842--0--Appletun.png diff --git a/src/afd/sprites/front/Flapple--Gmax.png b/src/afd/sprites/front/842--420--Appletun--Gmax.png similarity index 100% rename from src/afd/sprites/front/Flapple--Gmax.png rename to src/afd/sprites/front/842--420--Appletun--Gmax.png diff --git a/src/afd/sprites/front/Silicobra.png b/src/afd/sprites/front/843--0--Silicobra.png similarity index 100% rename from src/afd/sprites/front/Silicobra.png rename to src/afd/sprites/front/843--0--Silicobra.png diff --git a/src/afd/sprites/front/Sandaconda.png b/src/afd/sprites/front/844--0--Sandaconda.png similarity index 100% rename from src/afd/sprites/front/Sandaconda.png rename to src/afd/sprites/front/844--0--Sandaconda.png diff --git a/src/afd/sprites/front/Sandaconda--Gmax.png b/src/afd/sprites/front/844--420--Sandaconda--Gmax.png similarity index 100% rename from src/afd/sprites/front/Sandaconda--Gmax.png rename to src/afd/sprites/front/844--420--Sandaconda--Gmax.png diff --git a/src/afd/sprites/front/Cramorant.png b/src/afd/sprites/front/845--0--Cramorant.png similarity index 100% rename from src/afd/sprites/front/Cramorant.png rename to src/afd/sprites/front/845--0--Cramorant.png diff --git a/src/afd/sprites/front/Cramorant--Gorging.png b/src/afd/sprites/front/845--420--Cramorant--Gorging.png similarity index 100% rename from src/afd/sprites/front/Cramorant--Gorging.png rename to src/afd/sprites/front/845--420--Cramorant--Gorging.png diff --git a/src/afd/sprites/front/Cramorant--Gulping.png b/src/afd/sprites/front/845--420--Cramorant--Gulping.png similarity index 100% rename from src/afd/sprites/front/Cramorant--Gulping.png rename to src/afd/sprites/front/845--420--Cramorant--Gulping.png diff --git a/src/afd/sprites/front/Arrokuda.png b/src/afd/sprites/front/846--0--Arrokuda.png similarity index 100% rename from src/afd/sprites/front/Arrokuda.png rename to src/afd/sprites/front/846--0--Arrokuda.png diff --git a/src/afd/sprites/front/Barraskewda.png b/src/afd/sprites/front/847--0--Barraskewda.png similarity index 100% rename from src/afd/sprites/front/Barraskewda.png rename to src/afd/sprites/front/847--0--Barraskewda.png diff --git a/src/afd/sprites/front/Toxel.png b/src/afd/sprites/front/848--0--Toxel.png similarity index 100% rename from src/afd/sprites/front/Toxel.png rename to src/afd/sprites/front/848--0--Toxel.png diff --git a/src/afd/sprites/front/Toxtricity.png b/src/afd/sprites/front/849--0--Toxtricity.png similarity index 100% rename from src/afd/sprites/front/Toxtricity.png rename to src/afd/sprites/front/849--0--Toxtricity.png diff --git a/src/afd/sprites/front/Toxtricity--Gmax.png b/src/afd/sprites/front/849--420--Toxtricity--Gmax.png similarity index 100% rename from src/afd/sprites/front/Toxtricity--Gmax.png rename to src/afd/sprites/front/849--420--Toxtricity--Gmax.png diff --git a/src/afd/sprites/front/Toxtricity--Low-Key-Gmax.png b/src/afd/sprites/front/849--420--Toxtricity--Low-Key-Gmax.png similarity index 100% rename from src/afd/sprites/front/Toxtricity--Low-Key-Gmax.png rename to src/afd/sprites/front/849--420--Toxtricity--Low-Key-Gmax.png diff --git a/src/afd/sprites/front/Toxtricity--Low-Key.png b/src/afd/sprites/front/849--420--Toxtricity--Low-Key.png similarity index 100% rename from src/afd/sprites/front/Toxtricity--Low-Key.png rename to src/afd/sprites/front/849--420--Toxtricity--Low-Key.png diff --git a/src/afd/sprites/front/Dodrio.png b/src/afd/sprites/front/85--0--Dodrio.png similarity index 100% rename from src/afd/sprites/front/Dodrio.png rename to src/afd/sprites/front/85--0--Dodrio.png diff --git a/src/afd/sprites/front/Sizzlipede.png b/src/afd/sprites/front/850--0--Sizzlipede.png similarity index 100% rename from src/afd/sprites/front/Sizzlipede.png rename to src/afd/sprites/front/850--0--Sizzlipede.png diff --git a/src/afd/sprites/front/Centiskorch.png b/src/afd/sprites/front/851--0--Centiskorch.png similarity index 100% rename from src/afd/sprites/front/Centiskorch.png rename to src/afd/sprites/front/851--0--Centiskorch.png diff --git a/src/afd/sprites/front/Centiskorch--Gmax.png b/src/afd/sprites/front/851--420--Centiskorch--Gmax.png similarity index 100% rename from src/afd/sprites/front/Centiskorch--Gmax.png rename to src/afd/sprites/front/851--420--Centiskorch--Gmax.png diff --git a/src/afd/sprites/front/Clobbopus.png b/src/afd/sprites/front/852--0--Clobbopus.png similarity index 100% rename from src/afd/sprites/front/Clobbopus.png rename to src/afd/sprites/front/852--0--Clobbopus.png diff --git a/src/afd/sprites/front/Grapploct.png b/src/afd/sprites/front/853--0--Grapploct.png similarity index 100% rename from src/afd/sprites/front/Grapploct.png rename to src/afd/sprites/front/853--0--Grapploct.png diff --git a/src/afd/sprites/front/Sinistea.png b/src/afd/sprites/front/854--0--Sinistea.png similarity index 100% rename from src/afd/sprites/front/Sinistea.png rename to src/afd/sprites/front/854--0--Sinistea.png diff --git a/src/afd/sprites/front/Polteageist.png b/src/afd/sprites/front/855--0--Polteageist.png similarity index 100% rename from src/afd/sprites/front/Polteageist.png rename to src/afd/sprites/front/855--0--Polteageist.png diff --git a/src/afd/sprites/front/Hatenna.png b/src/afd/sprites/front/856--0--Hatenna.png similarity index 100% rename from src/afd/sprites/front/Hatenna.png rename to src/afd/sprites/front/856--0--Hatenna.png diff --git a/src/afd/sprites/front/Hattrem.png b/src/afd/sprites/front/857--0--Hattrem.png similarity index 100% rename from src/afd/sprites/front/Hattrem.png rename to src/afd/sprites/front/857--0--Hattrem.png diff --git a/src/afd/sprites/front/Hatterene.png b/src/afd/sprites/front/858--0--Hatterene.png similarity index 100% rename from src/afd/sprites/front/Hatterene.png rename to src/afd/sprites/front/858--0--Hatterene.png diff --git a/src/afd/sprites/front/Hatterene--Gmax.png b/src/afd/sprites/front/858--420--Hatterene--Gmax.png similarity index 100% rename from src/afd/sprites/front/Hatterene--Gmax.png rename to src/afd/sprites/front/858--420--Hatterene--Gmax.png diff --git a/src/afd/sprites/front/Impidimp.png b/src/afd/sprites/front/859--0--Impidimp.png similarity index 100% rename from src/afd/sprites/front/Impidimp.png rename to src/afd/sprites/front/859--0--Impidimp.png diff --git a/src/afd/sprites/front/Seel.png b/src/afd/sprites/front/86--0--Seel.png similarity index 100% rename from src/afd/sprites/front/Seel.png rename to src/afd/sprites/front/86--0--Seel.png diff --git a/src/afd/sprites/front/Morgrem.png b/src/afd/sprites/front/860--0--Morgrem.png similarity index 100% rename from src/afd/sprites/front/Morgrem.png rename to src/afd/sprites/front/860--0--Morgrem.png diff --git a/src/afd/sprites/front/Grimmsnarl.png b/src/afd/sprites/front/861--0--Grimmsnarl.png similarity index 100% rename from src/afd/sprites/front/Grimmsnarl.png rename to src/afd/sprites/front/861--0--Grimmsnarl.png diff --git a/src/afd/sprites/front/Grimmsnarl--Gmax.png b/src/afd/sprites/front/861--420--Grimmsnarl--Gmax.png similarity index 100% rename from src/afd/sprites/front/Grimmsnarl--Gmax.png rename to src/afd/sprites/front/861--420--Grimmsnarl--Gmax.png diff --git a/src/afd/sprites/front/Obstagoon.png b/src/afd/sprites/front/862--0--Obstagoon.png similarity index 100% rename from src/afd/sprites/front/Obstagoon.png rename to src/afd/sprites/front/862--0--Obstagoon.png diff --git a/src/afd/sprites/front/Perrserker.png b/src/afd/sprites/front/863--0--Perrserker.png similarity index 100% rename from src/afd/sprites/front/Perrserker.png rename to src/afd/sprites/front/863--0--Perrserker.png diff --git a/src/afd/sprites/front/Cursola.png b/src/afd/sprites/front/864--0--Cursola.png similarity index 100% rename from src/afd/sprites/front/Cursola.png rename to src/afd/sprites/front/864--0--Cursola.png diff --git a/src/afd/sprites/front/Sirfetch__0027d.png b/src/afd/sprites/front/865--0--Sirfetch__0027d.png similarity index 100% rename from src/afd/sprites/front/Sirfetch__0027d.png rename to src/afd/sprites/front/865--0--Sirfetch__0027d.png diff --git a/src/afd/sprites/front/Mr._Rime.png b/src/afd/sprites/front/866--0--Mr._Rime.png similarity index 100% rename from src/afd/sprites/front/Mr._Rime.png rename to src/afd/sprites/front/866--0--Mr._Rime.png diff --git a/src/afd/sprites/front/Runerigus.png b/src/afd/sprites/front/867--0--Runerigus.png similarity index 100% rename from src/afd/sprites/front/Runerigus.png rename to src/afd/sprites/front/867--0--Runerigus.png diff --git a/src/afd/sprites/front/Milcery.png b/src/afd/sprites/front/868--0--Milcery.png similarity index 100% rename from src/afd/sprites/front/Milcery.png rename to src/afd/sprites/front/868--0--Milcery.png diff --git a/src/afd/sprites/front/Alcremie.png b/src/afd/sprites/front/869--0--Alcremie.png similarity index 100% rename from src/afd/sprites/front/Alcremie.png rename to src/afd/sprites/front/869--0--Alcremie.png diff --git a/src/afd/sprites/front/Alcremie--Gmax.png b/src/afd/sprites/front/869--420--Alcremie--Gmax.png similarity index 100% rename from src/afd/sprites/front/Alcremie--Gmax.png rename to src/afd/sprites/front/869--420--Alcremie--Gmax.png diff --git a/src/afd/sprites/front/Dewgong.png b/src/afd/sprites/front/87--0--Dewgong.png similarity index 100% rename from src/afd/sprites/front/Dewgong.png rename to src/afd/sprites/front/87--0--Dewgong.png diff --git a/src/afd/sprites/front/Falinks.png b/src/afd/sprites/front/870--0--Falinks.png similarity index 100% rename from src/afd/sprites/front/Falinks.png rename to src/afd/sprites/front/870--0--Falinks.png diff --git a/src/afd/sprites/front/Pincurchin.png b/src/afd/sprites/front/871--0--Pincurchin.png similarity index 100% rename from src/afd/sprites/front/Pincurchin.png rename to src/afd/sprites/front/871--0--Pincurchin.png diff --git a/src/afd/sprites/front/Snom.png b/src/afd/sprites/front/872--0--Snom.png similarity index 100% rename from src/afd/sprites/front/Snom.png rename to src/afd/sprites/front/872--0--Snom.png diff --git a/src/afd/sprites/front/Frosmoth.png b/src/afd/sprites/front/873--0--Frosmoth.png similarity index 100% rename from src/afd/sprites/front/Frosmoth.png rename to src/afd/sprites/front/873--0--Frosmoth.png diff --git a/src/afd/sprites/front/Stonjourner.png b/src/afd/sprites/front/874--0--Stonjourner.png similarity index 100% rename from src/afd/sprites/front/Stonjourner.png rename to src/afd/sprites/front/874--0--Stonjourner.png diff --git a/src/afd/sprites/front/Eiscue.png b/src/afd/sprites/front/875--0--Eiscue.png similarity index 100% rename from src/afd/sprites/front/Eiscue.png rename to src/afd/sprites/front/875--0--Eiscue.png diff --git a/src/afd/sprites/front/Eiscue--Noice.png b/src/afd/sprites/front/875--420--Eiscue--Noice.png similarity index 100% rename from src/afd/sprites/front/Eiscue--Noice.png rename to src/afd/sprites/front/875--420--Eiscue--Noice.png diff --git a/src/afd/sprites/front/Indeedee.png b/src/afd/sprites/front/876--0--Indeedee.png similarity index 100% rename from src/afd/sprites/front/Indeedee.png rename to src/afd/sprites/front/876--0--Indeedee.png diff --git a/src/afd/sprites/front/Indeedee--F.png b/src/afd/sprites/front/876--420--Indeedee--F.png similarity index 100% rename from src/afd/sprites/front/Indeedee--F.png rename to src/afd/sprites/front/876--420--Indeedee--F.png diff --git a/src/afd/sprites/front/Morpeko.png b/src/afd/sprites/front/877--0--Morpeko.png similarity index 100% rename from src/afd/sprites/front/Morpeko.png rename to src/afd/sprites/front/877--0--Morpeko.png diff --git a/src/afd/sprites/front/Morpeko--Hangry.png b/src/afd/sprites/front/877--420--Morpeko--Hangry.png similarity index 100% rename from src/afd/sprites/front/Morpeko--Hangry.png rename to src/afd/sprites/front/877--420--Morpeko--Hangry.png diff --git a/src/afd/sprites/front/Cufant.png b/src/afd/sprites/front/878--0--Cufant.png similarity index 100% rename from src/afd/sprites/front/Cufant.png rename to src/afd/sprites/front/878--0--Cufant.png diff --git a/src/afd/sprites/front/Copperajah.png b/src/afd/sprites/front/879--0--Copperajah.png similarity index 100% rename from src/afd/sprites/front/Copperajah.png rename to src/afd/sprites/front/879--0--Copperajah.png diff --git a/src/afd/sprites/front/Copperajah--Gmax.png b/src/afd/sprites/front/879--420--Copperajah--Gmax.png similarity index 100% rename from src/afd/sprites/front/Copperajah--Gmax.png rename to src/afd/sprites/front/879--420--Copperajah--Gmax.png diff --git a/src/afd/sprites/front/Grimer.png b/src/afd/sprites/front/88--0--Grimer.png similarity index 100% rename from src/afd/sprites/front/Grimer.png rename to src/afd/sprites/front/88--0--Grimer.png diff --git a/src/afd/sprites/front/Grimer--Alola.png b/src/afd/sprites/front/88--420--Grimer--Alola.png similarity index 100% rename from src/afd/sprites/front/Grimer--Alola.png rename to src/afd/sprites/front/88--420--Grimer--Alola.png diff --git a/src/afd/sprites/front/Dracozolt.png b/src/afd/sprites/front/880--0--Dracozolt.png similarity index 100% rename from src/afd/sprites/front/Dracozolt.png rename to src/afd/sprites/front/880--0--Dracozolt.png diff --git a/src/afd/sprites/front/Arctozolt.png b/src/afd/sprites/front/881--0--Arctozolt.png similarity index 100% rename from src/afd/sprites/front/Arctozolt.png rename to src/afd/sprites/front/881--0--Arctozolt.png diff --git a/src/afd/sprites/front/Dracovish.png b/src/afd/sprites/front/882--0--Dracovish.png similarity index 100% rename from src/afd/sprites/front/Dracovish.png rename to src/afd/sprites/front/882--0--Dracovish.png diff --git a/src/afd/sprites/front/Arctovish.png b/src/afd/sprites/front/883--0--Arctovish.png similarity index 100% rename from src/afd/sprites/front/Arctovish.png rename to src/afd/sprites/front/883--0--Arctovish.png diff --git a/src/afd/sprites/front/Duraludon.png b/src/afd/sprites/front/884--0--Duraludon.png similarity index 100% rename from src/afd/sprites/front/Duraludon.png rename to src/afd/sprites/front/884--0--Duraludon.png diff --git a/src/afd/sprites/front/Duraludon--Gmax.png b/src/afd/sprites/front/884--420--Duraludon--Gmax.png similarity index 100% rename from src/afd/sprites/front/Duraludon--Gmax.png rename to src/afd/sprites/front/884--420--Duraludon--Gmax.png diff --git a/src/afd/sprites/front/Dreepy.png b/src/afd/sprites/front/885--0--Dreepy.png similarity index 100% rename from src/afd/sprites/front/Dreepy.png rename to src/afd/sprites/front/885--0--Dreepy.png diff --git a/src/afd/sprites/front/Drakloak.png b/src/afd/sprites/front/886--0--Drakloak.png similarity index 100% rename from src/afd/sprites/front/Drakloak.png rename to src/afd/sprites/front/886--0--Drakloak.png diff --git a/src/afd/sprites/front/Dragapult.png b/src/afd/sprites/front/887--0--Dragapult.png similarity index 100% rename from src/afd/sprites/front/Dragapult.png rename to src/afd/sprites/front/887--0--Dragapult.png diff --git a/src/afd/sprites/front/Zacian.png b/src/afd/sprites/front/888--0--Zacian.png similarity index 100% rename from src/afd/sprites/front/Zacian.png rename to src/afd/sprites/front/888--0--Zacian.png diff --git a/src/afd/sprites/front/Zacian--Crowned.png b/src/afd/sprites/front/888--420--Zacian--Crowned.png similarity index 100% rename from src/afd/sprites/front/Zacian--Crowned.png rename to src/afd/sprites/front/888--420--Zacian--Crowned.png diff --git a/src/afd/sprites/front/Zamazenta.png b/src/afd/sprites/front/889--0--Zamazenta.png similarity index 100% rename from src/afd/sprites/front/Zamazenta.png rename to src/afd/sprites/front/889--0--Zamazenta.png diff --git a/src/afd/sprites/front/Zamazenta--Crowned.png b/src/afd/sprites/front/889--420--Zamazenta--Crowned.png similarity index 100% rename from src/afd/sprites/front/Zamazenta--Crowned.png rename to src/afd/sprites/front/889--420--Zamazenta--Crowned.png diff --git a/src/afd/sprites/front/Muk.png b/src/afd/sprites/front/89--0--Muk.png similarity index 100% rename from src/afd/sprites/front/Muk.png rename to src/afd/sprites/front/89--0--Muk.png diff --git a/src/afd/sprites/front/Muk--Alola.png b/src/afd/sprites/front/89--420--Muk--Alola.png similarity index 100% rename from src/afd/sprites/front/Muk--Alola.png rename to src/afd/sprites/front/89--420--Muk--Alola.png diff --git a/src/afd/sprites/front/Eternatus.png b/src/afd/sprites/front/890--0--Eternatus.png similarity index 100% rename from src/afd/sprites/front/Eternatus.png rename to src/afd/sprites/front/890--0--Eternatus.png diff --git a/src/afd/sprites/front/Eternatus--Eternamax.png b/src/afd/sprites/front/890--420--Eternatus--Eternamax.png similarity index 100% rename from src/afd/sprites/front/Eternatus--Eternamax.png rename to src/afd/sprites/front/890--420--Eternatus--Eternamax.png diff --git a/src/afd/sprites/front/Blastoise.png b/src/afd/sprites/front/9--0--Blastoise.png similarity index 100% rename from src/afd/sprites/front/Blastoise.png rename to src/afd/sprites/front/9--0--Blastoise.png diff --git a/src/afd/sprites/front/Blastoise--Mega.png b/src/afd/sprites/front/9--420--Blastoise--Mega.png similarity index 100% rename from src/afd/sprites/front/Blastoise--Mega.png rename to src/afd/sprites/front/9--420--Blastoise--Mega.png diff --git a/src/afd/sprites/front/Shellder.png b/src/afd/sprites/front/90--0--Shellder.png similarity index 100% rename from src/afd/sprites/front/Shellder.png rename to src/afd/sprites/front/90--0--Shellder.png diff --git a/src/afd/sprites/front/Cloyster.png b/src/afd/sprites/front/91--0--Cloyster.png similarity index 100% rename from src/afd/sprites/front/Cloyster.png rename to src/afd/sprites/front/91--0--Cloyster.png diff --git a/src/afd/sprites/front/Gastly.png b/src/afd/sprites/front/92--0--Gastly.png similarity index 100% rename from src/afd/sprites/front/Gastly.png rename to src/afd/sprites/front/92--0--Gastly.png diff --git a/src/afd/sprites/front/Haunter.png b/src/afd/sprites/front/93--0--Haunter.png similarity index 100% rename from src/afd/sprites/front/Haunter.png rename to src/afd/sprites/front/93--0--Haunter.png diff --git a/src/afd/sprites/front/Gengar.png b/src/afd/sprites/front/94--0--Gengar.png similarity index 100% rename from src/afd/sprites/front/Gengar.png rename to src/afd/sprites/front/94--0--Gengar.png diff --git a/src/afd/sprites/front/Gengar--Gmax.png b/src/afd/sprites/front/94--420--Gengar--Gmax.png similarity index 100% rename from src/afd/sprites/front/Gengar--Gmax.png rename to src/afd/sprites/front/94--420--Gengar--Gmax.png diff --git a/src/afd/sprites/front/Gengar--Mega.png b/src/afd/sprites/front/94--420--Gengar--Mega.png similarity index 100% rename from src/afd/sprites/front/Gengar--Mega.png rename to src/afd/sprites/front/94--420--Gengar--Mega.png diff --git a/src/afd/sprites/front/Onix.png b/src/afd/sprites/front/95--0--Onix.png similarity index 100% rename from src/afd/sprites/front/Onix.png rename to src/afd/sprites/front/95--0--Onix.png diff --git a/src/afd/sprites/front/Drowzee.png b/src/afd/sprites/front/96--0--Drowzee.png similarity index 100% rename from src/afd/sprites/front/Drowzee.png rename to src/afd/sprites/front/96--0--Drowzee.png diff --git a/src/afd/sprites/front/Hypno.png b/src/afd/sprites/front/97--0--Hypno.png similarity index 100% rename from src/afd/sprites/front/Hypno.png rename to src/afd/sprites/front/97--0--Hypno.png diff --git a/src/afd/sprites/front/Krabby.png b/src/afd/sprites/front/98--0--Krabby.png similarity index 100% rename from src/afd/sprites/front/Krabby.png rename to src/afd/sprites/front/98--0--Krabby.png diff --git a/src/afd/sprites/front/Kingler.png b/src/afd/sprites/front/99--0--Kingler.png similarity index 100% rename from src/afd/sprites/front/Kingler.png rename to src/afd/sprites/front/99--0--Kingler.png diff --git a/src/afd/sprites/front/Kingler--Gmax.png b/src/afd/sprites/front/99--420--Kingler--Gmax.png similarity index 100% rename from src/afd/sprites/front/Kingler--Gmax.png rename to src/afd/sprites/front/99--420--Kingler--Gmax.png diff --git a/src/canonical/dex/front-cosmetic/Unown--A.png b/src/canonical/dex/front-cosmetic/201--420--Unown--A.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--A.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--A.png diff --git a/src/canonical/dex/front-cosmetic/Unown--B.png b/src/canonical/dex/front-cosmetic/201--420--Unown--B.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--B.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--B.png diff --git a/src/canonical/dex/front-cosmetic/Unown--C.png b/src/canonical/dex/front-cosmetic/201--420--Unown--C.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--C.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--C.png diff --git a/src/canonical/dex/front-cosmetic/Unown--D.png b/src/canonical/dex/front-cosmetic/201--420--Unown--D.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--D.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--D.png diff --git a/src/canonical/dex/front-cosmetic/Unown--E.png b/src/canonical/dex/front-cosmetic/201--420--Unown--E.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--E.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--E.png diff --git a/src/canonical/dex/front-cosmetic/Unown--Exclamation.png b/src/canonical/dex/front-cosmetic/201--420--Unown--Exclamation.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--Exclamation.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--Exclamation.png diff --git a/src/canonical/dex/front-cosmetic/Unown--F.png b/src/canonical/dex/front-cosmetic/201--420--Unown--F.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--F.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--F.png diff --git a/src/canonical/dex/front-cosmetic/Unown--G.png b/src/canonical/dex/front-cosmetic/201--420--Unown--G.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--G.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--G.png diff --git a/src/canonical/dex/front-cosmetic/Unown--H.png b/src/canonical/dex/front-cosmetic/201--420--Unown--H.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--H.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--H.png diff --git a/src/canonical/dex/front-cosmetic/Unown--I.png b/src/canonical/dex/front-cosmetic/201--420--Unown--I.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--I.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--I.png diff --git a/src/canonical/dex/front-cosmetic/Unown--J.png b/src/canonical/dex/front-cosmetic/201--420--Unown--J.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--J.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--J.png diff --git a/src/canonical/dex/front-cosmetic/Unown--K.png b/src/canonical/dex/front-cosmetic/201--420--Unown--K.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--K.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--K.png diff --git a/src/canonical/dex/front-cosmetic/Unown--L.png b/src/canonical/dex/front-cosmetic/201--420--Unown--L.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--L.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--L.png diff --git a/src/canonical/dex/front-cosmetic/Unown--M.png b/src/canonical/dex/front-cosmetic/201--420--Unown--M.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--M.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--M.png diff --git a/src/canonical/dex/front-cosmetic/Unown--N.png b/src/canonical/dex/front-cosmetic/201--420--Unown--N.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--N.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--N.png diff --git a/src/canonical/dex/front-cosmetic/Unown--O.png b/src/canonical/dex/front-cosmetic/201--420--Unown--O.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--O.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--O.png diff --git a/src/canonical/dex/front-cosmetic/Unown--P.png b/src/canonical/dex/front-cosmetic/201--420--Unown--P.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--P.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--P.png diff --git a/src/canonical/dex/front-cosmetic/Unown--Q.png b/src/canonical/dex/front-cosmetic/201--420--Unown--Q.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--Q.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--Q.png diff --git a/src/canonical/dex/front-cosmetic/Unown--Question.png b/src/canonical/dex/front-cosmetic/201--420--Unown--Question.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--Question.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--Question.png diff --git a/src/canonical/dex/front-cosmetic/Unown--R.png b/src/canonical/dex/front-cosmetic/201--420--Unown--R.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--R.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--R.png diff --git a/src/canonical/dex/front-cosmetic/Unown--S.png b/src/canonical/dex/front-cosmetic/201--420--Unown--S.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--S.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--S.png diff --git a/src/canonical/dex/front-cosmetic/Unown--T.png b/src/canonical/dex/front-cosmetic/201--420--Unown--T.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--T.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--T.png diff --git a/src/canonical/dex/front-cosmetic/Unown--U.png b/src/canonical/dex/front-cosmetic/201--420--Unown--U.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--U.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--U.png diff --git a/src/canonical/dex/front-cosmetic/Unown--V.png b/src/canonical/dex/front-cosmetic/201--420--Unown--V.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--V.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--V.png diff --git a/src/canonical/dex/front-cosmetic/Unown--W.png b/src/canonical/dex/front-cosmetic/201--420--Unown--W.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--W.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--W.png diff --git a/src/canonical/dex/front-cosmetic/Unown--X.png b/src/canonical/dex/front-cosmetic/201--420--Unown--X.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--X.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--X.png diff --git a/src/canonical/dex/front-cosmetic/Unown--Y.png b/src/canonical/dex/front-cosmetic/201--420--Unown--Y.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--Y.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--Y.png diff --git a/src/canonical/dex/front-cosmetic/Unown--Z.png b/src/canonical/dex/front-cosmetic/201--420--Unown--Z.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Unown--Z.png rename to src/canonical/dex/front-cosmetic/201--420--Unown--Z.png diff --git a/src/canonical/dex/front-cosmetic/Pikachu--Female.png b/src/canonical/dex/front-cosmetic/25--0--Pikachu--Female.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Pikachu--Female.png rename to src/canonical/dex/front-cosmetic/25--0--Pikachu--Female.png diff --git a/src/canonical/dex/front-cosmetic/Burmy--Sandy.png b/src/canonical/dex/front-cosmetic/412--420--Burmy--Sandy.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Burmy--Sandy.png rename to src/canonical/dex/front-cosmetic/412--420--Burmy--Sandy.png diff --git a/src/canonical/dex/front-cosmetic/Burmy--Trash.png b/src/canonical/dex/front-cosmetic/412--420--Burmy--Trash.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Burmy--Trash.png rename to src/canonical/dex/front-cosmetic/412--420--Burmy--Trash.png diff --git a/src/canonical/dex/front-cosmetic/Shellos--East.png b/src/canonical/dex/front-cosmetic/422--420--Shellos--East.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Shellos--East.png rename to src/canonical/dex/front-cosmetic/422--420--Shellos--East.png diff --git a/src/canonical/dex/front-cosmetic/Gastrodon--East.png b/src/canonical/dex/front-cosmetic/423--420--Gastrodon--East.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Gastrodon--East.png rename to src/canonical/dex/front-cosmetic/423--420--Gastrodon--East.png diff --git a/src/canonical/dex/front-cosmetic/Deerling--Autumn.png b/src/canonical/dex/front-cosmetic/585--420--Deerling--Autumn.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Deerling--Autumn.png rename to src/canonical/dex/front-cosmetic/585--420--Deerling--Autumn.png diff --git a/src/canonical/dex/front-cosmetic/Deerling--Summer.png b/src/canonical/dex/front-cosmetic/585--420--Deerling--Summer.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Deerling--Summer.png rename to src/canonical/dex/front-cosmetic/585--420--Deerling--Summer.png diff --git a/src/canonical/dex/front-cosmetic/Deerling--Winter.png b/src/canonical/dex/front-cosmetic/585--420--Deerling--Winter.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Deerling--Winter.png rename to src/canonical/dex/front-cosmetic/585--420--Deerling--Winter.png diff --git a/src/canonical/dex/front-cosmetic/Sawsbuck--Autumn.png b/src/canonical/dex/front-cosmetic/586--420--Sawsbuck--Autumn.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Sawsbuck--Autumn.png rename to src/canonical/dex/front-cosmetic/586--420--Sawsbuck--Autumn.png diff --git a/src/canonical/dex/front-cosmetic/Sawsbuck--Summer.png b/src/canonical/dex/front-cosmetic/586--420--Sawsbuck--Summer.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Sawsbuck--Summer.png rename to src/canonical/dex/front-cosmetic/586--420--Sawsbuck--Summer.png diff --git a/src/canonical/dex/front-cosmetic/Sawsbuck--Winter.png b/src/canonical/dex/front-cosmetic/586--420--Sawsbuck--Winter.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Sawsbuck--Winter.png rename to src/canonical/dex/front-cosmetic/586--420--Sawsbuck--Winter.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Archipelago.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Archipelago.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Archipelago.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Archipelago.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Continental.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Continental.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Continental.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Continental.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Elegant.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Elegant.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Elegant.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Elegant.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Garden.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Garden.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Garden.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Garden.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--High_Plains.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--High_Plains.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--High_Plains.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--High_Plains.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Icy_Snow.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Icy_Snow.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Icy_Snow.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Icy_Snow.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Jungle.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Jungle.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Jungle.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Jungle.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Marine.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Marine.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Marine.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Marine.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Modern.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Modern.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Modern.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Modern.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Monsoon.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Monsoon.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Monsoon.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Monsoon.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Ocean.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Ocean.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Ocean.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Ocean.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Polar.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Polar.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Polar.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Polar.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--River.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--River.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--River.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--River.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Sandstorm.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Sandstorm.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Sandstorm.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Sandstorm.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Savanna.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Savanna.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Savanna.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Savanna.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Sun.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Sun.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Sun.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Sun.png diff --git a/src/canonical/dex/front-cosmetic/Vivillon--Tundra.png b/src/canonical/dex/front-cosmetic/666--420--Vivillon--Tundra.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Vivillon--Tundra.png rename to src/canonical/dex/front-cosmetic/666--420--Vivillon--Tundra.png diff --git a/src/canonical/dex/front-cosmetic/Flabe__0301be__0301--Blue.png b/src/canonical/dex/front-cosmetic/669--420--Flabe__0301be__0301--Blue.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Flabe__0301be__0301--Blue.png rename to src/canonical/dex/front-cosmetic/669--420--Flabe__0301be__0301--Blue.png diff --git a/src/canonical/dex/front-cosmetic/Flabe__0301be__0301--Orange.png b/src/canonical/dex/front-cosmetic/669--420--Flabe__0301be__0301--Orange.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Flabe__0301be__0301--Orange.png rename to src/canonical/dex/front-cosmetic/669--420--Flabe__0301be__0301--Orange.png diff --git a/src/canonical/dex/front-cosmetic/Flabe__0301be__0301--White.png b/src/canonical/dex/front-cosmetic/669--420--Flabe__0301be__0301--White.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Flabe__0301be__0301--White.png rename to src/canonical/dex/front-cosmetic/669--420--Flabe__0301be__0301--White.png diff --git a/src/canonical/dex/front-cosmetic/Flabe__0301be__0301--Yellow.png b/src/canonical/dex/front-cosmetic/669--420--Flabe__0301be__0301--Yellow.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Flabe__0301be__0301--Yellow.png rename to src/canonical/dex/front-cosmetic/669--420--Flabe__0301be__0301--Yellow.png diff --git a/src/canonical/dex/front-cosmetic/Floette--Blue.png b/src/canonical/dex/front-cosmetic/670--420--Floette--Blue.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Floette--Blue.png rename to src/canonical/dex/front-cosmetic/670--420--Floette--Blue.png diff --git a/src/canonical/dex/front-cosmetic/Floette--Orange.png b/src/canonical/dex/front-cosmetic/670--420--Floette--Orange.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Floette--Orange.png rename to src/canonical/dex/front-cosmetic/670--420--Floette--Orange.png diff --git a/src/canonical/dex/front-cosmetic/Floette--White.png b/src/canonical/dex/front-cosmetic/670--420--Floette--White.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Floette--White.png rename to src/canonical/dex/front-cosmetic/670--420--Floette--White.png diff --git a/src/canonical/dex/front-cosmetic/Floette--Yellow.png b/src/canonical/dex/front-cosmetic/670--420--Floette--Yellow.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Floette--Yellow.png rename to src/canonical/dex/front-cosmetic/670--420--Floette--Yellow.png diff --git a/src/canonical/dex/front-cosmetic/Florges--Blue.png b/src/canonical/dex/front-cosmetic/671--420--Florges--Blue.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Florges--Blue.png rename to src/canonical/dex/front-cosmetic/671--420--Florges--Blue.png diff --git a/src/canonical/dex/front-cosmetic/Florges--Orange.png b/src/canonical/dex/front-cosmetic/671--420--Florges--Orange.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Florges--Orange.png rename to src/canonical/dex/front-cosmetic/671--420--Florges--Orange.png diff --git a/src/canonical/dex/front-cosmetic/Florges--White.png b/src/canonical/dex/front-cosmetic/671--420--Florges--White.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Florges--White.png rename to src/canonical/dex/front-cosmetic/671--420--Florges--White.png diff --git a/src/canonical/dex/front-cosmetic/Florges--Yellow.png b/src/canonical/dex/front-cosmetic/671--420--Florges--Yellow.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Florges--Yellow.png rename to src/canonical/dex/front-cosmetic/671--420--Florges--Yellow.png diff --git a/src/canonical/dex/front-cosmetic/Furfrou--Dandy.png b/src/canonical/dex/front-cosmetic/676--420--Furfrou--Dandy.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Furfrou--Dandy.png rename to src/canonical/dex/front-cosmetic/676--420--Furfrou--Dandy.png diff --git a/src/canonical/dex/front-cosmetic/Furfrou--Debutante.png b/src/canonical/dex/front-cosmetic/676--420--Furfrou--Debutante.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Furfrou--Debutante.png rename to src/canonical/dex/front-cosmetic/676--420--Furfrou--Debutante.png diff --git a/src/canonical/dex/front-cosmetic/Furfrou--Diamond.png b/src/canonical/dex/front-cosmetic/676--420--Furfrou--Diamond.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Furfrou--Diamond.png rename to src/canonical/dex/front-cosmetic/676--420--Furfrou--Diamond.png diff --git a/src/canonical/dex/front-cosmetic/Furfrou--Heart.png b/src/canonical/dex/front-cosmetic/676--420--Furfrou--Heart.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Furfrou--Heart.png rename to src/canonical/dex/front-cosmetic/676--420--Furfrou--Heart.png diff --git a/src/canonical/dex/front-cosmetic/Furfrou--Kabuki.png b/src/canonical/dex/front-cosmetic/676--420--Furfrou--Kabuki.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Furfrou--Kabuki.png rename to src/canonical/dex/front-cosmetic/676--420--Furfrou--Kabuki.png diff --git a/src/canonical/dex/front-cosmetic/Furfrou--La_Reine.png b/src/canonical/dex/front-cosmetic/676--420--Furfrou--La_Reine.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Furfrou--La_Reine.png rename to src/canonical/dex/front-cosmetic/676--420--Furfrou--La_Reine.png diff --git a/src/canonical/dex/front-cosmetic/Furfrou--Matron.png b/src/canonical/dex/front-cosmetic/676--420--Furfrou--Matron.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Furfrou--Matron.png rename to src/canonical/dex/front-cosmetic/676--420--Furfrou--Matron.png diff --git a/src/canonical/dex/front-cosmetic/Furfrou--Pharaoh.png b/src/canonical/dex/front-cosmetic/676--420--Furfrou--Pharaoh.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Furfrou--Pharaoh.png rename to src/canonical/dex/front-cosmetic/676--420--Furfrou--Pharaoh.png diff --git a/src/canonical/dex/front-cosmetic/Furfrou--Star.png b/src/canonical/dex/front-cosmetic/676--420--Furfrou--Star.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Furfrou--Star.png rename to src/canonical/dex/front-cosmetic/676--420--Furfrou--Star.png diff --git a/src/canonical/dex/front-cosmetic/Minior--Blue.png b/src/canonical/dex/front-cosmetic/774--420--Minior--Blue.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Minior--Blue.png rename to src/canonical/dex/front-cosmetic/774--420--Minior--Blue.png diff --git a/src/canonical/dex/front-cosmetic/Minior--Green.png b/src/canonical/dex/front-cosmetic/774--420--Minior--Green.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Minior--Green.png rename to src/canonical/dex/front-cosmetic/774--420--Minior--Green.png diff --git a/src/canonical/dex/front-cosmetic/Minior--Indigo.png b/src/canonical/dex/front-cosmetic/774--420--Minior--Indigo.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Minior--Indigo.png rename to src/canonical/dex/front-cosmetic/774--420--Minior--Indigo.png diff --git a/src/canonical/dex/front-cosmetic/Minior--Orange.png b/src/canonical/dex/front-cosmetic/774--420--Minior--Orange.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Minior--Orange.png rename to src/canonical/dex/front-cosmetic/774--420--Minior--Orange.png diff --git a/src/canonical/dex/front-cosmetic/Minior--Violet.png b/src/canonical/dex/front-cosmetic/774--420--Minior--Violet.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Minior--Violet.png rename to src/canonical/dex/front-cosmetic/774--420--Minior--Violet.png diff --git a/src/canonical/dex/front-cosmetic/Minior--Yellow.png b/src/canonical/dex/front-cosmetic/774--420--Minior--Yellow.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Minior--Yellow.png rename to src/canonical/dex/front-cosmetic/774--420--Minior--Yellow.png diff --git a/src/canonical/dex/front-cosmetic/Magearna--Original.png b/src/canonical/dex/front-cosmetic/801--420--Magearna--Original.png similarity index 100% rename from src/canonical/dex/front-cosmetic/Magearna--Original.png rename to src/canonical/dex/front-cosmetic/801--420--Magearna--Original.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--B.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--B.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--B.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--B.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--C.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--C.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--C.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--C.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--D.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--D.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--D.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--D.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--E.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--E.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--E.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--E.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--Exclamation.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--Exclamation.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--Exclamation.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--Exclamation.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--F.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--F.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--F.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--F.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--G.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--G.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--G.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--G.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--H.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--H.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--H.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--H.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--I.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--I.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--I.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--I.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--J.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--J.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--J.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--J.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--K.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--K.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--K.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--K.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--L.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--L.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--L.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--L.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--M.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--M.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--M.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--M.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--N.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--N.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--N.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--N.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--O.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--O.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--O.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--O.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--P.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--P.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--P.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--P.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--Q.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--Q.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--Q.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--Q.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--Question.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--Question.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--Question.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--Question.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--R.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--R.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--R.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--R.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--S.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--S.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--S.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--S.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--T.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--T.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--T.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--T.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--U.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--U.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--U.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--U.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--V.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--V.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--V.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--V.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--W.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--W.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--W.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--W.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--X.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--X.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--X.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--X.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--Y.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--Y.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--Y.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--Y.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Unown--Z.png b/src/canonical/dex/front-shiny-cosmetic/201--420--Unown--Z.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Unown--Z.png rename to src/canonical/dex/front-shiny-cosmetic/201--420--Unown--Z.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Burmy--Sandy.png b/src/canonical/dex/front-shiny-cosmetic/412--420--Burmy--Sandy.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Burmy--Sandy.png rename to src/canonical/dex/front-shiny-cosmetic/412--420--Burmy--Sandy.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Burmy--Trash.png b/src/canonical/dex/front-shiny-cosmetic/412--420--Burmy--Trash.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Burmy--Trash.png rename to src/canonical/dex/front-shiny-cosmetic/412--420--Burmy--Trash.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Shellos--East.png b/src/canonical/dex/front-shiny-cosmetic/422--420--Shellos--East.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Shellos--East.png rename to src/canonical/dex/front-shiny-cosmetic/422--420--Shellos--East.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Gastrodon--East.png b/src/canonical/dex/front-shiny-cosmetic/423--420--Gastrodon--East.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Gastrodon--East.png rename to src/canonical/dex/front-shiny-cosmetic/423--420--Gastrodon--East.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Deerling--Autumn.png b/src/canonical/dex/front-shiny-cosmetic/585--420--Deerling--Autumn.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Deerling--Autumn.png rename to src/canonical/dex/front-shiny-cosmetic/585--420--Deerling--Autumn.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Deerling--Summer.png b/src/canonical/dex/front-shiny-cosmetic/585--420--Deerling--Summer.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Deerling--Summer.png rename to src/canonical/dex/front-shiny-cosmetic/585--420--Deerling--Summer.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Deerling--Winter.png b/src/canonical/dex/front-shiny-cosmetic/585--420--Deerling--Winter.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Deerling--Winter.png rename to src/canonical/dex/front-shiny-cosmetic/585--420--Deerling--Winter.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Sawsbuck--Autumn.png b/src/canonical/dex/front-shiny-cosmetic/586--420--Sawsbuck--Autumn.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Sawsbuck--Autumn.png rename to src/canonical/dex/front-shiny-cosmetic/586--420--Sawsbuck--Autumn.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Sawsbuck--Summer.png b/src/canonical/dex/front-shiny-cosmetic/586--420--Sawsbuck--Summer.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Sawsbuck--Summer.png rename to src/canonical/dex/front-shiny-cosmetic/586--420--Sawsbuck--Summer.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Sawsbuck--Winter.png b/src/canonical/dex/front-shiny-cosmetic/586--420--Sawsbuck--Winter.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Sawsbuck--Winter.png rename to src/canonical/dex/front-shiny-cosmetic/586--420--Sawsbuck--Winter.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--Archipelago.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Archipelago.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--Archipelago.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Archipelago.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--Continental.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Continental.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--Continental.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Continental.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--Elegant.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Elegant.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--Elegant.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Elegant.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--Garden.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Garden.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--Garden.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Garden.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--High_Plains.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--High_Plains.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--High_Plains.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--High_Plains.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--Jungle.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Jungle.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--Jungle.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Jungle.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--Marine.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Marine.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--Marine.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Marine.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--Modern.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Modern.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--Modern.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Modern.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--Monsoon.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Monsoon.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--Monsoon.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Monsoon.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--Ocean.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Ocean.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--Ocean.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Ocean.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--Polar.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Polar.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--Polar.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Polar.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--River.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--River.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--River.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--River.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--Sandstorm.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Sandstorm.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--Sandstorm.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Sandstorm.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--Savanna.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Savanna.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--Savanna.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Savanna.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--Sun.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Sun.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--Sun.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Sun.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Vivillon--Tundra.png b/src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Tundra.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Vivillon--Tundra.png rename to src/canonical/dex/front-shiny-cosmetic/666--420--Vivillon--Tundra.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Flabe__0301be__0301--Blue.png b/src/canonical/dex/front-shiny-cosmetic/669--420--Flabe__0301be__0301--Blue.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Flabe__0301be__0301--Blue.png rename to src/canonical/dex/front-shiny-cosmetic/669--420--Flabe__0301be__0301--Blue.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Flabe__0301be__0301--Orange.png b/src/canonical/dex/front-shiny-cosmetic/669--420--Flabe__0301be__0301--Orange.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Flabe__0301be__0301--Orange.png rename to src/canonical/dex/front-shiny-cosmetic/669--420--Flabe__0301be__0301--Orange.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Flabe__0301be__0301--White.png b/src/canonical/dex/front-shiny-cosmetic/669--420--Flabe__0301be__0301--White.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Flabe__0301be__0301--White.png rename to src/canonical/dex/front-shiny-cosmetic/669--420--Flabe__0301be__0301--White.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Flabe__0301be__0301--Yellow.png b/src/canonical/dex/front-shiny-cosmetic/669--420--Flabe__0301be__0301--Yellow.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Flabe__0301be__0301--Yellow.png rename to src/canonical/dex/front-shiny-cosmetic/669--420--Flabe__0301be__0301--Yellow.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Floette--Blue.png b/src/canonical/dex/front-shiny-cosmetic/670--420--Floette--Blue.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Floette--Blue.png rename to src/canonical/dex/front-shiny-cosmetic/670--420--Floette--Blue.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Floette--Orange.png b/src/canonical/dex/front-shiny-cosmetic/670--420--Floette--Orange.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Floette--Orange.png rename to src/canonical/dex/front-shiny-cosmetic/670--420--Floette--Orange.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Floette--White.png b/src/canonical/dex/front-shiny-cosmetic/670--420--Floette--White.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Floette--White.png rename to src/canonical/dex/front-shiny-cosmetic/670--420--Floette--White.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Floette--Yellow.png b/src/canonical/dex/front-shiny-cosmetic/670--420--Floette--Yellow.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Floette--Yellow.png rename to src/canonical/dex/front-shiny-cosmetic/670--420--Floette--Yellow.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Florges--Blue.png b/src/canonical/dex/front-shiny-cosmetic/671--420--Florges--Blue.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Florges--Blue.png rename to src/canonical/dex/front-shiny-cosmetic/671--420--Florges--Blue.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Florges--Orange.png b/src/canonical/dex/front-shiny-cosmetic/671--420--Florges--Orange.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Florges--Orange.png rename to src/canonical/dex/front-shiny-cosmetic/671--420--Florges--Orange.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Florges--White.png b/src/canonical/dex/front-shiny-cosmetic/671--420--Florges--White.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Florges--White.png rename to src/canonical/dex/front-shiny-cosmetic/671--420--Florges--White.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Florges--Yellow.png b/src/canonical/dex/front-shiny-cosmetic/671--420--Florges--Yellow.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Florges--Yellow.png rename to src/canonical/dex/front-shiny-cosmetic/671--420--Florges--Yellow.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Furfrou--Dandy.png b/src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Dandy.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Furfrou--Dandy.png rename to src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Dandy.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Furfrou--Debutante.png b/src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Debutante.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Furfrou--Debutante.png rename to src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Debutante.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Furfrou--Diamond.png b/src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Diamond.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Furfrou--Diamond.png rename to src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Diamond.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Furfrou--Heart.png b/src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Heart.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Furfrou--Heart.png rename to src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Heart.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Furfrou--Kabuki.png b/src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Kabuki.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Furfrou--Kabuki.png rename to src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Kabuki.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Furfrou--La_Reine.png b/src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--La_Reine.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Furfrou--La_Reine.png rename to src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--La_Reine.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Furfrou--Matron.png b/src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Matron.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Furfrou--Matron.png rename to src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Matron.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Furfrou--Pharaoh.png b/src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Pharaoh.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Furfrou--Pharaoh.png rename to src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Pharaoh.png diff --git a/src/canonical/dex/front-shiny-cosmetic/Furfrou--Star.png b/src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Star.png similarity index 100% rename from src/canonical/dex/front-shiny-cosmetic/Furfrou--Star.png rename to src/canonical/dex/front-shiny-cosmetic/676--420--Furfrou--Star.png diff --git a/src/canonical/dex/front-shiny/Bulbasaur.png b/src/canonical/dex/front-shiny/1--0--Bulbasaur.png similarity index 100% rename from src/canonical/dex/front-shiny/Bulbasaur.png rename to src/canonical/dex/front-shiny/1--0--Bulbasaur.png diff --git a/src/canonical/dex/front-shiny/Caterpie.png b/src/canonical/dex/front-shiny/10--0--Caterpie.png similarity index 100% rename from src/canonical/dex/front-shiny/Caterpie.png rename to src/canonical/dex/front-shiny/10--0--Caterpie.png diff --git a/src/canonical/dex/front-shiny/Voltorb.png b/src/canonical/dex/front-shiny/100--0--Voltorb.png similarity index 100% rename from src/canonical/dex/front-shiny/Voltorb.png rename to src/canonical/dex/front-shiny/100--0--Voltorb.png diff --git a/src/canonical/dex/front-shiny/Electrode.png b/src/canonical/dex/front-shiny/101--0--Electrode.png similarity index 100% rename from src/canonical/dex/front-shiny/Electrode.png rename to src/canonical/dex/front-shiny/101--0--Electrode.png diff --git a/src/canonical/dex/front-shiny/Exeggcute.png b/src/canonical/dex/front-shiny/102--0--Exeggcute.png similarity index 100% rename from src/canonical/dex/front-shiny/Exeggcute.png rename to src/canonical/dex/front-shiny/102--0--Exeggcute.png diff --git a/src/canonical/dex/front-shiny/Exeggutor.png b/src/canonical/dex/front-shiny/103--0--Exeggutor.png similarity index 100% rename from src/canonical/dex/front-shiny/Exeggutor.png rename to src/canonical/dex/front-shiny/103--0--Exeggutor.png diff --git a/src/canonical/dex/front-shiny/Exeggutor--Alola.png b/src/canonical/dex/front-shiny/103--420--Exeggutor--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Exeggutor--Alola.png rename to src/canonical/dex/front-shiny/103--420--Exeggutor--Alola.png diff --git a/src/canonical/dex/front-shiny/Cubone.png b/src/canonical/dex/front-shiny/104--0--Cubone.png similarity index 100% rename from src/canonical/dex/front-shiny/Cubone.png rename to src/canonical/dex/front-shiny/104--0--Cubone.png diff --git a/src/canonical/dex/front-shiny/Marowak.png b/src/canonical/dex/front-shiny/105--0--Marowak.png similarity index 100% rename from src/canonical/dex/front-shiny/Marowak.png rename to src/canonical/dex/front-shiny/105--0--Marowak.png diff --git a/src/canonical/dex/front-shiny/Marowak--Alola.png b/src/canonical/dex/front-shiny/105--420--Marowak--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Marowak--Alola.png rename to src/canonical/dex/front-shiny/105--420--Marowak--Alola.png diff --git a/src/canonical/dex/front-shiny/Hitmonlee.png b/src/canonical/dex/front-shiny/106--0--Hitmonlee.png similarity index 100% rename from src/canonical/dex/front-shiny/Hitmonlee.png rename to src/canonical/dex/front-shiny/106--0--Hitmonlee.png diff --git a/src/canonical/dex/front-shiny/Hitmonchan.png b/src/canonical/dex/front-shiny/107--0--Hitmonchan.png similarity index 100% rename from src/canonical/dex/front-shiny/Hitmonchan.png rename to src/canonical/dex/front-shiny/107--0--Hitmonchan.png diff --git a/src/canonical/dex/front-shiny/Lickitung.png b/src/canonical/dex/front-shiny/108--0--Lickitung.png similarity index 100% rename from src/canonical/dex/front-shiny/Lickitung.png rename to src/canonical/dex/front-shiny/108--0--Lickitung.png diff --git a/src/canonical/dex/front-shiny/Koffing.png b/src/canonical/dex/front-shiny/109--0--Koffing.png similarity index 100% rename from src/canonical/dex/front-shiny/Koffing.png rename to src/canonical/dex/front-shiny/109--0--Koffing.png diff --git a/src/canonical/dex/front-shiny/Metapod.png b/src/canonical/dex/front-shiny/11--0--Metapod.png similarity index 100% rename from src/canonical/dex/front-shiny/Metapod.png rename to src/canonical/dex/front-shiny/11--0--Metapod.png diff --git a/src/canonical/dex/front-shiny/Weezing.png b/src/canonical/dex/front-shiny/110--0--Weezing.png similarity index 100% rename from src/canonical/dex/front-shiny/Weezing.png rename to src/canonical/dex/front-shiny/110--0--Weezing.png diff --git a/src/canonical/dex/front-shiny/Rhyhorn.png b/src/canonical/dex/front-shiny/111--0--Rhyhorn.png similarity index 100% rename from src/canonical/dex/front-shiny/Rhyhorn.png rename to src/canonical/dex/front-shiny/111--0--Rhyhorn.png diff --git a/src/canonical/dex/front-shiny/Rhydon.png b/src/canonical/dex/front-shiny/112--0--Rhydon.png similarity index 100% rename from src/canonical/dex/front-shiny/Rhydon.png rename to src/canonical/dex/front-shiny/112--0--Rhydon.png diff --git a/src/canonical/dex/front-shiny/Chansey.png b/src/canonical/dex/front-shiny/113--0--Chansey.png similarity index 100% rename from src/canonical/dex/front-shiny/Chansey.png rename to src/canonical/dex/front-shiny/113--0--Chansey.png diff --git a/src/canonical/dex/front-shiny/Tangela.png b/src/canonical/dex/front-shiny/114--0--Tangela.png similarity index 100% rename from src/canonical/dex/front-shiny/Tangela.png rename to src/canonical/dex/front-shiny/114--0--Tangela.png diff --git a/src/canonical/dex/front-shiny/Kangaskhan.png b/src/canonical/dex/front-shiny/115--0--Kangaskhan.png similarity index 100% rename from src/canonical/dex/front-shiny/Kangaskhan.png rename to src/canonical/dex/front-shiny/115--0--Kangaskhan.png diff --git a/src/canonical/dex/front-shiny/Kangaskhan--Mega.png b/src/canonical/dex/front-shiny/115--420--Kangaskhan--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Kangaskhan--Mega.png rename to src/canonical/dex/front-shiny/115--420--Kangaskhan--Mega.png diff --git a/src/canonical/dex/front-shiny/Horsea.png b/src/canonical/dex/front-shiny/116--0--Horsea.png similarity index 100% rename from src/canonical/dex/front-shiny/Horsea.png rename to src/canonical/dex/front-shiny/116--0--Horsea.png diff --git a/src/canonical/dex/front-shiny/Seadra.png b/src/canonical/dex/front-shiny/117--0--Seadra.png similarity index 100% rename from src/canonical/dex/front-shiny/Seadra.png rename to src/canonical/dex/front-shiny/117--0--Seadra.png diff --git a/src/canonical/dex/front-shiny/Goldeen.png b/src/canonical/dex/front-shiny/118--0--Goldeen.png similarity index 100% rename from src/canonical/dex/front-shiny/Goldeen.png rename to src/canonical/dex/front-shiny/118--0--Goldeen.png diff --git a/src/canonical/dex/front-shiny/Seaking.png b/src/canonical/dex/front-shiny/119--0--Seaking.png similarity index 100% rename from src/canonical/dex/front-shiny/Seaking.png rename to src/canonical/dex/front-shiny/119--0--Seaking.png diff --git a/src/canonical/dex/front-shiny/Butterfree.png b/src/canonical/dex/front-shiny/12--0--Butterfree.png similarity index 100% rename from src/canonical/dex/front-shiny/Butterfree.png rename to src/canonical/dex/front-shiny/12--0--Butterfree.png diff --git a/src/canonical/dex/front-shiny/Staryu.png b/src/canonical/dex/front-shiny/120--0--Staryu.png similarity index 100% rename from src/canonical/dex/front-shiny/Staryu.png rename to src/canonical/dex/front-shiny/120--0--Staryu.png diff --git a/src/canonical/dex/front-shiny/Starmie.png b/src/canonical/dex/front-shiny/121--0--Starmie.png similarity index 100% rename from src/canonical/dex/front-shiny/Starmie.png rename to src/canonical/dex/front-shiny/121--0--Starmie.png diff --git a/src/canonical/dex/front-shiny/Mr._Mime.png b/src/canonical/dex/front-shiny/122--0--Mr._Mime.png similarity index 100% rename from src/canonical/dex/front-shiny/Mr._Mime.png rename to src/canonical/dex/front-shiny/122--0--Mr._Mime.png diff --git a/src/canonical/dex/front-shiny/Scyther.png b/src/canonical/dex/front-shiny/123--0--Scyther.png similarity index 100% rename from src/canonical/dex/front-shiny/Scyther.png rename to src/canonical/dex/front-shiny/123--0--Scyther.png diff --git a/src/canonical/dex/front-shiny/Jynx.png b/src/canonical/dex/front-shiny/124--0--Jynx.png similarity index 100% rename from src/canonical/dex/front-shiny/Jynx.png rename to src/canonical/dex/front-shiny/124--0--Jynx.png diff --git a/src/canonical/dex/front-shiny/Electabuzz.png b/src/canonical/dex/front-shiny/125--0--Electabuzz.png similarity index 100% rename from src/canonical/dex/front-shiny/Electabuzz.png rename to src/canonical/dex/front-shiny/125--0--Electabuzz.png diff --git a/src/canonical/dex/front-shiny/Magmar.png b/src/canonical/dex/front-shiny/126--0--Magmar.png similarity index 100% rename from src/canonical/dex/front-shiny/Magmar.png rename to src/canonical/dex/front-shiny/126--0--Magmar.png diff --git a/src/canonical/dex/front-shiny/Pinsir.png b/src/canonical/dex/front-shiny/127--0--Pinsir.png similarity index 100% rename from src/canonical/dex/front-shiny/Pinsir.png rename to src/canonical/dex/front-shiny/127--0--Pinsir.png diff --git a/src/canonical/dex/front-shiny/Pinsir--Mega.png b/src/canonical/dex/front-shiny/127--420--Pinsir--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Pinsir--Mega.png rename to src/canonical/dex/front-shiny/127--420--Pinsir--Mega.png diff --git a/src/canonical/dex/front-shiny/Tauros.png b/src/canonical/dex/front-shiny/128--0--Tauros.png similarity index 100% rename from src/canonical/dex/front-shiny/Tauros.png rename to src/canonical/dex/front-shiny/128--0--Tauros.png diff --git a/src/canonical/dex/front-shiny/Magikarp.png b/src/canonical/dex/front-shiny/129--0--Magikarp.png similarity index 100% rename from src/canonical/dex/front-shiny/Magikarp.png rename to src/canonical/dex/front-shiny/129--0--Magikarp.png diff --git a/src/canonical/dex/front-shiny/Weedle.png b/src/canonical/dex/front-shiny/13--0--Weedle.png similarity index 100% rename from src/canonical/dex/front-shiny/Weedle.png rename to src/canonical/dex/front-shiny/13--0--Weedle.png diff --git a/src/canonical/dex/front-shiny/Gyarados.png b/src/canonical/dex/front-shiny/130--0--Gyarados.png similarity index 100% rename from src/canonical/dex/front-shiny/Gyarados.png rename to src/canonical/dex/front-shiny/130--0--Gyarados.png diff --git a/src/canonical/dex/front-shiny/Gyarados--Mega.png b/src/canonical/dex/front-shiny/130--420--Gyarados--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Gyarados--Mega.png rename to src/canonical/dex/front-shiny/130--420--Gyarados--Mega.png diff --git a/src/canonical/dex/front-shiny/Lapras.png b/src/canonical/dex/front-shiny/131--0--Lapras.png similarity index 100% rename from src/canonical/dex/front-shiny/Lapras.png rename to src/canonical/dex/front-shiny/131--0--Lapras.png diff --git a/src/canonical/dex/front-shiny/Ditto.png b/src/canonical/dex/front-shiny/132--0--Ditto.png similarity index 100% rename from src/canonical/dex/front-shiny/Ditto.png rename to src/canonical/dex/front-shiny/132--0--Ditto.png diff --git a/src/canonical/dex/front-shiny/Eevee.png b/src/canonical/dex/front-shiny/133--0--Eevee.png similarity index 100% rename from src/canonical/dex/front-shiny/Eevee.png rename to src/canonical/dex/front-shiny/133--0--Eevee.png diff --git a/src/canonical/dex/front-shiny/Vaporeon.png b/src/canonical/dex/front-shiny/134--0--Vaporeon.png similarity index 100% rename from src/canonical/dex/front-shiny/Vaporeon.png rename to src/canonical/dex/front-shiny/134--0--Vaporeon.png diff --git a/src/canonical/dex/front-shiny/Jolteon.png b/src/canonical/dex/front-shiny/135--0--Jolteon.png similarity index 100% rename from src/canonical/dex/front-shiny/Jolteon.png rename to src/canonical/dex/front-shiny/135--0--Jolteon.png diff --git a/src/canonical/dex/front-shiny/Flareon.png b/src/canonical/dex/front-shiny/136--0--Flareon.png similarity index 100% rename from src/canonical/dex/front-shiny/Flareon.png rename to src/canonical/dex/front-shiny/136--0--Flareon.png diff --git a/src/canonical/dex/front-shiny/Porygon.png b/src/canonical/dex/front-shiny/137--0--Porygon.png similarity index 100% rename from src/canonical/dex/front-shiny/Porygon.png rename to src/canonical/dex/front-shiny/137--0--Porygon.png diff --git a/src/canonical/dex/front-shiny/Omanyte.png b/src/canonical/dex/front-shiny/138--0--Omanyte.png similarity index 100% rename from src/canonical/dex/front-shiny/Omanyte.png rename to src/canonical/dex/front-shiny/138--0--Omanyte.png diff --git a/src/canonical/dex/front-shiny/Omastar.png b/src/canonical/dex/front-shiny/139--0--Omastar.png similarity index 100% rename from src/canonical/dex/front-shiny/Omastar.png rename to src/canonical/dex/front-shiny/139--0--Omastar.png diff --git a/src/canonical/dex/front-shiny/Kakuna.png b/src/canonical/dex/front-shiny/14--0--Kakuna.png similarity index 100% rename from src/canonical/dex/front-shiny/Kakuna.png rename to src/canonical/dex/front-shiny/14--0--Kakuna.png diff --git a/src/canonical/dex/front-shiny/Kabuto.png b/src/canonical/dex/front-shiny/140--0--Kabuto.png similarity index 100% rename from src/canonical/dex/front-shiny/Kabuto.png rename to src/canonical/dex/front-shiny/140--0--Kabuto.png diff --git a/src/canonical/dex/front-shiny/Kabutops.png b/src/canonical/dex/front-shiny/141--0--Kabutops.png similarity index 100% rename from src/canonical/dex/front-shiny/Kabutops.png rename to src/canonical/dex/front-shiny/141--0--Kabutops.png diff --git a/src/canonical/dex/front-shiny/Aerodactyl.png b/src/canonical/dex/front-shiny/142--0--Aerodactyl.png similarity index 100% rename from src/canonical/dex/front-shiny/Aerodactyl.png rename to src/canonical/dex/front-shiny/142--0--Aerodactyl.png diff --git a/src/canonical/dex/front-shiny/Aerodactyl--Mega.png b/src/canonical/dex/front-shiny/142--420--Aerodactyl--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Aerodactyl--Mega.png rename to src/canonical/dex/front-shiny/142--420--Aerodactyl--Mega.png diff --git a/src/canonical/dex/front-shiny/Snorlax.png b/src/canonical/dex/front-shiny/143--0--Snorlax.png similarity index 100% rename from src/canonical/dex/front-shiny/Snorlax.png rename to src/canonical/dex/front-shiny/143--0--Snorlax.png diff --git a/src/canonical/dex/front-shiny/Articuno.png b/src/canonical/dex/front-shiny/144--0--Articuno.png similarity index 100% rename from src/canonical/dex/front-shiny/Articuno.png rename to src/canonical/dex/front-shiny/144--0--Articuno.png diff --git a/src/canonical/dex/front-shiny/Zapdos.png b/src/canonical/dex/front-shiny/145--0--Zapdos.png similarity index 100% rename from src/canonical/dex/front-shiny/Zapdos.png rename to src/canonical/dex/front-shiny/145--0--Zapdos.png diff --git a/src/canonical/dex/front-shiny/Moltres.png b/src/canonical/dex/front-shiny/146--0--Moltres.png similarity index 100% rename from src/canonical/dex/front-shiny/Moltres.png rename to src/canonical/dex/front-shiny/146--0--Moltres.png diff --git a/src/canonical/dex/front-shiny/Dratini.png b/src/canonical/dex/front-shiny/147--0--Dratini.png similarity index 100% rename from src/canonical/dex/front-shiny/Dratini.png rename to src/canonical/dex/front-shiny/147--0--Dratini.png diff --git a/src/canonical/dex/front-shiny/Dragonair.png b/src/canonical/dex/front-shiny/148--0--Dragonair.png similarity index 100% rename from src/canonical/dex/front-shiny/Dragonair.png rename to src/canonical/dex/front-shiny/148--0--Dragonair.png diff --git a/src/canonical/dex/front-shiny/Dragonite.png b/src/canonical/dex/front-shiny/149--0--Dragonite.png similarity index 100% rename from src/canonical/dex/front-shiny/Dragonite.png rename to src/canonical/dex/front-shiny/149--0--Dragonite.png diff --git a/src/canonical/dex/front-shiny/Beedrill.png b/src/canonical/dex/front-shiny/15--0--Beedrill.png similarity index 100% rename from src/canonical/dex/front-shiny/Beedrill.png rename to src/canonical/dex/front-shiny/15--0--Beedrill.png diff --git a/src/canonical/dex/front-shiny/Beedrill--Mega.png b/src/canonical/dex/front-shiny/15--420--Beedrill--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Beedrill--Mega.png rename to src/canonical/dex/front-shiny/15--420--Beedrill--Mega.png diff --git a/src/canonical/dex/front-shiny/Mewtwo.png b/src/canonical/dex/front-shiny/150--0--Mewtwo.png similarity index 100% rename from src/canonical/dex/front-shiny/Mewtwo.png rename to src/canonical/dex/front-shiny/150--0--Mewtwo.png diff --git a/src/canonical/dex/front-shiny/Mewtwo--Mega-X.png b/src/canonical/dex/front-shiny/150--420--Mewtwo--Mega-X.png similarity index 100% rename from src/canonical/dex/front-shiny/Mewtwo--Mega-X.png rename to src/canonical/dex/front-shiny/150--420--Mewtwo--Mega-X.png diff --git a/src/canonical/dex/front-shiny/Mewtwo--Mega-Y.png b/src/canonical/dex/front-shiny/150--420--Mewtwo--Mega-Y.png similarity index 100% rename from src/canonical/dex/front-shiny/Mewtwo--Mega-Y.png rename to src/canonical/dex/front-shiny/150--420--Mewtwo--Mega-Y.png diff --git a/src/canonical/dex/front-shiny/Mew.png b/src/canonical/dex/front-shiny/151--0--Mew.png similarity index 100% rename from src/canonical/dex/front-shiny/Mew.png rename to src/canonical/dex/front-shiny/151--0--Mew.png diff --git a/src/canonical/dex/front-shiny/Chikorita.png b/src/canonical/dex/front-shiny/152--0--Chikorita.png similarity index 100% rename from src/canonical/dex/front-shiny/Chikorita.png rename to src/canonical/dex/front-shiny/152--0--Chikorita.png diff --git a/src/canonical/dex/front-shiny/Bayleef.png b/src/canonical/dex/front-shiny/153--0--Bayleef.png similarity index 100% rename from src/canonical/dex/front-shiny/Bayleef.png rename to src/canonical/dex/front-shiny/153--0--Bayleef.png diff --git a/src/canonical/dex/front-shiny/Meganium.png b/src/canonical/dex/front-shiny/154--0--Meganium.png similarity index 100% rename from src/canonical/dex/front-shiny/Meganium.png rename to src/canonical/dex/front-shiny/154--0--Meganium.png diff --git a/src/canonical/dex/front-shiny/Cyndaquil.png b/src/canonical/dex/front-shiny/155--0--Cyndaquil.png similarity index 100% rename from src/canonical/dex/front-shiny/Cyndaquil.png rename to src/canonical/dex/front-shiny/155--0--Cyndaquil.png diff --git a/src/canonical/dex/front-shiny/Quilava.png b/src/canonical/dex/front-shiny/156--0--Quilava.png similarity index 100% rename from src/canonical/dex/front-shiny/Quilava.png rename to src/canonical/dex/front-shiny/156--0--Quilava.png diff --git a/src/canonical/dex/front-shiny/Typhlosion.png b/src/canonical/dex/front-shiny/157--0--Typhlosion.png similarity index 100% rename from src/canonical/dex/front-shiny/Typhlosion.png rename to src/canonical/dex/front-shiny/157--0--Typhlosion.png diff --git a/src/canonical/dex/front-shiny/Totodile.png b/src/canonical/dex/front-shiny/158--0--Totodile.png similarity index 100% rename from src/canonical/dex/front-shiny/Totodile.png rename to src/canonical/dex/front-shiny/158--0--Totodile.png diff --git a/src/canonical/dex/front-shiny/Croconaw.png b/src/canonical/dex/front-shiny/159--0--Croconaw.png similarity index 100% rename from src/canonical/dex/front-shiny/Croconaw.png rename to src/canonical/dex/front-shiny/159--0--Croconaw.png diff --git a/src/canonical/dex/front-shiny/Pidgey.png b/src/canonical/dex/front-shiny/16--0--Pidgey.png similarity index 100% rename from src/canonical/dex/front-shiny/Pidgey.png rename to src/canonical/dex/front-shiny/16--0--Pidgey.png diff --git a/src/canonical/dex/front-shiny/Feraligatr.png b/src/canonical/dex/front-shiny/160--0--Feraligatr.png similarity index 100% rename from src/canonical/dex/front-shiny/Feraligatr.png rename to src/canonical/dex/front-shiny/160--0--Feraligatr.png diff --git a/src/canonical/dex/front-shiny/Sentret.png b/src/canonical/dex/front-shiny/161--0--Sentret.png similarity index 100% rename from src/canonical/dex/front-shiny/Sentret.png rename to src/canonical/dex/front-shiny/161--0--Sentret.png diff --git a/src/canonical/dex/front-shiny/Furret.png b/src/canonical/dex/front-shiny/162--0--Furret.png similarity index 100% rename from src/canonical/dex/front-shiny/Furret.png rename to src/canonical/dex/front-shiny/162--0--Furret.png diff --git a/src/canonical/dex/front-shiny/Hoothoot.png b/src/canonical/dex/front-shiny/163--0--Hoothoot.png similarity index 100% rename from src/canonical/dex/front-shiny/Hoothoot.png rename to src/canonical/dex/front-shiny/163--0--Hoothoot.png diff --git a/src/canonical/dex/front-shiny/Noctowl.png b/src/canonical/dex/front-shiny/164--0--Noctowl.png similarity index 100% rename from src/canonical/dex/front-shiny/Noctowl.png rename to src/canonical/dex/front-shiny/164--0--Noctowl.png diff --git a/src/canonical/dex/front-shiny/Ledyba.png b/src/canonical/dex/front-shiny/165--0--Ledyba.png similarity index 100% rename from src/canonical/dex/front-shiny/Ledyba.png rename to src/canonical/dex/front-shiny/165--0--Ledyba.png diff --git a/src/canonical/dex/front-shiny/Ledian.png b/src/canonical/dex/front-shiny/166--0--Ledian.png similarity index 100% rename from src/canonical/dex/front-shiny/Ledian.png rename to src/canonical/dex/front-shiny/166--0--Ledian.png diff --git a/src/canonical/dex/front-shiny/Spinarak.png b/src/canonical/dex/front-shiny/167--0--Spinarak.png similarity index 100% rename from src/canonical/dex/front-shiny/Spinarak.png rename to src/canonical/dex/front-shiny/167--0--Spinarak.png diff --git a/src/canonical/dex/front-shiny/Ariados.png b/src/canonical/dex/front-shiny/168--0--Ariados.png similarity index 100% rename from src/canonical/dex/front-shiny/Ariados.png rename to src/canonical/dex/front-shiny/168--0--Ariados.png diff --git a/src/canonical/dex/front-shiny/Crobat.png b/src/canonical/dex/front-shiny/169--0--Crobat.png similarity index 100% rename from src/canonical/dex/front-shiny/Crobat.png rename to src/canonical/dex/front-shiny/169--0--Crobat.png diff --git a/src/canonical/dex/front-shiny/Pidgeotto.png b/src/canonical/dex/front-shiny/17--0--Pidgeotto.png similarity index 100% rename from src/canonical/dex/front-shiny/Pidgeotto.png rename to src/canonical/dex/front-shiny/17--0--Pidgeotto.png diff --git a/src/canonical/dex/front-shiny/Chinchou.png b/src/canonical/dex/front-shiny/170--0--Chinchou.png similarity index 100% rename from src/canonical/dex/front-shiny/Chinchou.png rename to src/canonical/dex/front-shiny/170--0--Chinchou.png diff --git a/src/canonical/dex/front-shiny/Lanturn.png b/src/canonical/dex/front-shiny/171--0--Lanturn.png similarity index 100% rename from src/canonical/dex/front-shiny/Lanturn.png rename to src/canonical/dex/front-shiny/171--0--Lanturn.png diff --git a/src/canonical/dex/front-shiny/Pichu.png b/src/canonical/dex/front-shiny/172--0--Pichu.png similarity index 100% rename from src/canonical/dex/front-shiny/Pichu.png rename to src/canonical/dex/front-shiny/172--0--Pichu.png diff --git a/src/canonical/dex/front-shiny/Cleffa.png b/src/canonical/dex/front-shiny/173--0--Cleffa.png similarity index 100% rename from src/canonical/dex/front-shiny/Cleffa.png rename to src/canonical/dex/front-shiny/173--0--Cleffa.png diff --git a/src/canonical/dex/front-shiny/Igglybuff.png b/src/canonical/dex/front-shiny/174--0--Igglybuff.png similarity index 100% rename from src/canonical/dex/front-shiny/Igglybuff.png rename to src/canonical/dex/front-shiny/174--0--Igglybuff.png diff --git a/src/canonical/dex/front-shiny/Togepi.png b/src/canonical/dex/front-shiny/175--0--Togepi.png similarity index 100% rename from src/canonical/dex/front-shiny/Togepi.png rename to src/canonical/dex/front-shiny/175--0--Togepi.png diff --git a/src/canonical/dex/front-shiny/Togetic.png b/src/canonical/dex/front-shiny/176--0--Togetic.png similarity index 100% rename from src/canonical/dex/front-shiny/Togetic.png rename to src/canonical/dex/front-shiny/176--0--Togetic.png diff --git a/src/canonical/dex/front-shiny/Natu.png b/src/canonical/dex/front-shiny/177--0--Natu.png similarity index 100% rename from src/canonical/dex/front-shiny/Natu.png rename to src/canonical/dex/front-shiny/177--0--Natu.png diff --git a/src/canonical/dex/front-shiny/Xatu.png b/src/canonical/dex/front-shiny/178--0--Xatu.png similarity index 100% rename from src/canonical/dex/front-shiny/Xatu.png rename to src/canonical/dex/front-shiny/178--0--Xatu.png diff --git a/src/canonical/dex/front-shiny/Mareep.png b/src/canonical/dex/front-shiny/179--0--Mareep.png similarity index 100% rename from src/canonical/dex/front-shiny/Mareep.png rename to src/canonical/dex/front-shiny/179--0--Mareep.png diff --git a/src/canonical/dex/front-shiny/Pidgeot.png b/src/canonical/dex/front-shiny/18--0--Pidgeot.png similarity index 100% rename from src/canonical/dex/front-shiny/Pidgeot.png rename to src/canonical/dex/front-shiny/18--0--Pidgeot.png diff --git a/src/canonical/dex/front-shiny/Pidgeot--Mega.png b/src/canonical/dex/front-shiny/18--420--Pidgeot--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Pidgeot--Mega.png rename to src/canonical/dex/front-shiny/18--420--Pidgeot--Mega.png diff --git a/src/canonical/dex/front-shiny/Flaaffy.png b/src/canonical/dex/front-shiny/180--0--Flaaffy.png similarity index 100% rename from src/canonical/dex/front-shiny/Flaaffy.png rename to src/canonical/dex/front-shiny/180--0--Flaaffy.png diff --git a/src/canonical/dex/front-shiny/Ampharos.png b/src/canonical/dex/front-shiny/181--0--Ampharos.png similarity index 100% rename from src/canonical/dex/front-shiny/Ampharos.png rename to src/canonical/dex/front-shiny/181--0--Ampharos.png diff --git a/src/canonical/dex/front-shiny/Ampharos--Mega.png b/src/canonical/dex/front-shiny/181--420--Ampharos--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Ampharos--Mega.png rename to src/canonical/dex/front-shiny/181--420--Ampharos--Mega.png diff --git a/src/canonical/dex/front-shiny/Bellossom.png b/src/canonical/dex/front-shiny/182--0--Bellossom.png similarity index 100% rename from src/canonical/dex/front-shiny/Bellossom.png rename to src/canonical/dex/front-shiny/182--0--Bellossom.png diff --git a/src/canonical/dex/front-shiny/Marill.png b/src/canonical/dex/front-shiny/183--0--Marill.png similarity index 100% rename from src/canonical/dex/front-shiny/Marill.png rename to src/canonical/dex/front-shiny/183--0--Marill.png diff --git a/src/canonical/dex/front-shiny/Azumarill.png b/src/canonical/dex/front-shiny/184--0--Azumarill.png similarity index 100% rename from src/canonical/dex/front-shiny/Azumarill.png rename to src/canonical/dex/front-shiny/184--0--Azumarill.png diff --git a/src/canonical/dex/front-shiny/Sudowoodo.png b/src/canonical/dex/front-shiny/185--0--Sudowoodo.png similarity index 100% rename from src/canonical/dex/front-shiny/Sudowoodo.png rename to src/canonical/dex/front-shiny/185--0--Sudowoodo.png diff --git a/src/canonical/dex/front-shiny/Politoed.png b/src/canonical/dex/front-shiny/186--0--Politoed.png similarity index 100% rename from src/canonical/dex/front-shiny/Politoed.png rename to src/canonical/dex/front-shiny/186--0--Politoed.png diff --git a/src/canonical/dex/front-shiny/Hoppip.png b/src/canonical/dex/front-shiny/187--0--Hoppip.png similarity index 100% rename from src/canonical/dex/front-shiny/Hoppip.png rename to src/canonical/dex/front-shiny/187--0--Hoppip.png diff --git a/src/canonical/dex/front-shiny/Skiploom.png b/src/canonical/dex/front-shiny/188--0--Skiploom.png similarity index 100% rename from src/canonical/dex/front-shiny/Skiploom.png rename to src/canonical/dex/front-shiny/188--0--Skiploom.png diff --git a/src/canonical/dex/front-shiny/Jumpluff.png b/src/canonical/dex/front-shiny/189--0--Jumpluff.png similarity index 100% rename from src/canonical/dex/front-shiny/Jumpluff.png rename to src/canonical/dex/front-shiny/189--0--Jumpluff.png diff --git a/src/canonical/dex/front-shiny/Rattata.png b/src/canonical/dex/front-shiny/19--0--Rattata.png similarity index 100% rename from src/canonical/dex/front-shiny/Rattata.png rename to src/canonical/dex/front-shiny/19--0--Rattata.png diff --git a/src/canonical/dex/front-shiny/Rattata--Alola.png b/src/canonical/dex/front-shiny/19--420--Rattata--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Rattata--Alola.png rename to src/canonical/dex/front-shiny/19--420--Rattata--Alola.png diff --git a/src/canonical/dex/front-shiny/Aipom.png b/src/canonical/dex/front-shiny/190--0--Aipom.png similarity index 100% rename from src/canonical/dex/front-shiny/Aipom.png rename to src/canonical/dex/front-shiny/190--0--Aipom.png diff --git a/src/canonical/dex/front-shiny/Sunkern.png b/src/canonical/dex/front-shiny/191--0--Sunkern.png similarity index 100% rename from src/canonical/dex/front-shiny/Sunkern.png rename to src/canonical/dex/front-shiny/191--0--Sunkern.png diff --git a/src/canonical/dex/front-shiny/Sunflora.png b/src/canonical/dex/front-shiny/192--0--Sunflora.png similarity index 100% rename from src/canonical/dex/front-shiny/Sunflora.png rename to src/canonical/dex/front-shiny/192--0--Sunflora.png diff --git a/src/canonical/dex/front-shiny/Yanma.png b/src/canonical/dex/front-shiny/193--0--Yanma.png similarity index 100% rename from src/canonical/dex/front-shiny/Yanma.png rename to src/canonical/dex/front-shiny/193--0--Yanma.png diff --git a/src/canonical/dex/front-shiny/Wooper.png b/src/canonical/dex/front-shiny/194--0--Wooper.png similarity index 100% rename from src/canonical/dex/front-shiny/Wooper.png rename to src/canonical/dex/front-shiny/194--0--Wooper.png diff --git a/src/canonical/dex/front-shiny/Quagsire.png b/src/canonical/dex/front-shiny/195--0--Quagsire.png similarity index 100% rename from src/canonical/dex/front-shiny/Quagsire.png rename to src/canonical/dex/front-shiny/195--0--Quagsire.png diff --git a/src/canonical/dex/front-shiny/Espeon.png b/src/canonical/dex/front-shiny/196--0--Espeon.png similarity index 100% rename from src/canonical/dex/front-shiny/Espeon.png rename to src/canonical/dex/front-shiny/196--0--Espeon.png diff --git a/src/canonical/dex/front-shiny/Umbreon.png b/src/canonical/dex/front-shiny/197--0--Umbreon.png similarity index 100% rename from src/canonical/dex/front-shiny/Umbreon.png rename to src/canonical/dex/front-shiny/197--0--Umbreon.png diff --git a/src/canonical/dex/front-shiny/Murkrow.png b/src/canonical/dex/front-shiny/198--0--Murkrow.png similarity index 100% rename from src/canonical/dex/front-shiny/Murkrow.png rename to src/canonical/dex/front-shiny/198--0--Murkrow.png diff --git a/src/canonical/dex/front-shiny/Slowking.png b/src/canonical/dex/front-shiny/199--0--Slowking.png similarity index 100% rename from src/canonical/dex/front-shiny/Slowking.png rename to src/canonical/dex/front-shiny/199--0--Slowking.png diff --git a/src/canonical/dex/front-shiny/Ivysaur.png b/src/canonical/dex/front-shiny/2--0--Ivysaur.png similarity index 100% rename from src/canonical/dex/front-shiny/Ivysaur.png rename to src/canonical/dex/front-shiny/2--0--Ivysaur.png diff --git a/src/canonical/dex/front-shiny/Raticate.png b/src/canonical/dex/front-shiny/20--0--Raticate.png similarity index 100% rename from src/canonical/dex/front-shiny/Raticate.png rename to src/canonical/dex/front-shiny/20--0--Raticate.png diff --git a/src/canonical/dex/front-shiny/Raticate--Alola-Totem.png b/src/canonical/dex/front-shiny/20--420--Raticate--Alola-Totem.png similarity index 100% rename from src/canonical/dex/front-shiny/Raticate--Alola-Totem.png rename to src/canonical/dex/front-shiny/20--420--Raticate--Alola-Totem.png diff --git a/src/canonical/dex/front-shiny/Raticate--Alola.png b/src/canonical/dex/front-shiny/20--420--Raticate--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Raticate--Alola.png rename to src/canonical/dex/front-shiny/20--420--Raticate--Alola.png diff --git a/src/canonical/dex/front-shiny/Misdreavus.png b/src/canonical/dex/front-shiny/200--0--Misdreavus.png similarity index 100% rename from src/canonical/dex/front-shiny/Misdreavus.png rename to src/canonical/dex/front-shiny/200--0--Misdreavus.png diff --git a/src/canonical/dex/front-shiny/Unown.png b/src/canonical/dex/front-shiny/201--0--Unown.png similarity index 100% rename from src/canonical/dex/front-shiny/Unown.png rename to src/canonical/dex/front-shiny/201--0--Unown.png diff --git a/src/canonical/dex/front-shiny/Wobbuffet.png b/src/canonical/dex/front-shiny/202--0--Wobbuffet.png similarity index 100% rename from src/canonical/dex/front-shiny/Wobbuffet.png rename to src/canonical/dex/front-shiny/202--0--Wobbuffet.png diff --git a/src/canonical/dex/front-shiny/Girafarig.png b/src/canonical/dex/front-shiny/203--0--Girafarig.png similarity index 100% rename from src/canonical/dex/front-shiny/Girafarig.png rename to src/canonical/dex/front-shiny/203--0--Girafarig.png diff --git a/src/canonical/dex/front-shiny/Pineco.png b/src/canonical/dex/front-shiny/204--0--Pineco.png similarity index 100% rename from src/canonical/dex/front-shiny/Pineco.png rename to src/canonical/dex/front-shiny/204--0--Pineco.png diff --git a/src/canonical/dex/front-shiny/Forretress.png b/src/canonical/dex/front-shiny/205--0--Forretress.png similarity index 100% rename from src/canonical/dex/front-shiny/Forretress.png rename to src/canonical/dex/front-shiny/205--0--Forretress.png diff --git a/src/canonical/dex/front-shiny/Dunsparce.png b/src/canonical/dex/front-shiny/206--0--Dunsparce.png similarity index 100% rename from src/canonical/dex/front-shiny/Dunsparce.png rename to src/canonical/dex/front-shiny/206--0--Dunsparce.png diff --git a/src/canonical/dex/front-shiny/Gligar.png b/src/canonical/dex/front-shiny/207--0--Gligar.png similarity index 100% rename from src/canonical/dex/front-shiny/Gligar.png rename to src/canonical/dex/front-shiny/207--0--Gligar.png diff --git a/src/canonical/dex/front-shiny/Steelix.png b/src/canonical/dex/front-shiny/208--0--Steelix.png similarity index 100% rename from src/canonical/dex/front-shiny/Steelix.png rename to src/canonical/dex/front-shiny/208--0--Steelix.png diff --git a/src/canonical/dex/front-shiny/Steelix--Mega.png b/src/canonical/dex/front-shiny/208--420--Steelix--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Steelix--Mega.png rename to src/canonical/dex/front-shiny/208--420--Steelix--Mega.png diff --git a/src/canonical/dex/front-shiny/Snubbull.png b/src/canonical/dex/front-shiny/209--0--Snubbull.png similarity index 100% rename from src/canonical/dex/front-shiny/Snubbull.png rename to src/canonical/dex/front-shiny/209--0--Snubbull.png diff --git a/src/canonical/dex/front-shiny/Spearow.png b/src/canonical/dex/front-shiny/21--0--Spearow.png similarity index 100% rename from src/canonical/dex/front-shiny/Spearow.png rename to src/canonical/dex/front-shiny/21--0--Spearow.png diff --git a/src/canonical/dex/front-shiny/Granbull.png b/src/canonical/dex/front-shiny/210--0--Granbull.png similarity index 100% rename from src/canonical/dex/front-shiny/Granbull.png rename to src/canonical/dex/front-shiny/210--0--Granbull.png diff --git a/src/canonical/dex/front-shiny/Qwilfish.png b/src/canonical/dex/front-shiny/211--0--Qwilfish.png similarity index 100% rename from src/canonical/dex/front-shiny/Qwilfish.png rename to src/canonical/dex/front-shiny/211--0--Qwilfish.png diff --git a/src/canonical/dex/front-shiny/Scizor.png b/src/canonical/dex/front-shiny/212--0--Scizor.png similarity index 100% rename from src/canonical/dex/front-shiny/Scizor.png rename to src/canonical/dex/front-shiny/212--0--Scizor.png diff --git a/src/canonical/dex/front-shiny/Scizor--Mega.png b/src/canonical/dex/front-shiny/212--420--Scizor--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Scizor--Mega.png rename to src/canonical/dex/front-shiny/212--420--Scizor--Mega.png diff --git a/src/canonical/dex/front-shiny/Shuckle.png b/src/canonical/dex/front-shiny/213--0--Shuckle.png similarity index 100% rename from src/canonical/dex/front-shiny/Shuckle.png rename to src/canonical/dex/front-shiny/213--0--Shuckle.png diff --git a/src/canonical/dex/front-shiny/Heracross.png b/src/canonical/dex/front-shiny/214--0--Heracross.png similarity index 100% rename from src/canonical/dex/front-shiny/Heracross.png rename to src/canonical/dex/front-shiny/214--0--Heracross.png diff --git a/src/canonical/dex/front-shiny/Heracross--Mega.png b/src/canonical/dex/front-shiny/214--420--Heracross--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Heracross--Mega.png rename to src/canonical/dex/front-shiny/214--420--Heracross--Mega.png diff --git a/src/canonical/dex/front-shiny/Sneasel.png b/src/canonical/dex/front-shiny/215--0--Sneasel.png similarity index 100% rename from src/canonical/dex/front-shiny/Sneasel.png rename to src/canonical/dex/front-shiny/215--0--Sneasel.png diff --git a/src/canonical/dex/front-shiny/Teddiursa.png b/src/canonical/dex/front-shiny/216--0--Teddiursa.png similarity index 100% rename from src/canonical/dex/front-shiny/Teddiursa.png rename to src/canonical/dex/front-shiny/216--0--Teddiursa.png diff --git a/src/canonical/dex/front-shiny/Ursaring.png b/src/canonical/dex/front-shiny/217--0--Ursaring.png similarity index 100% rename from src/canonical/dex/front-shiny/Ursaring.png rename to src/canonical/dex/front-shiny/217--0--Ursaring.png diff --git a/src/canonical/dex/front-shiny/Slugma.png b/src/canonical/dex/front-shiny/218--0--Slugma.png similarity index 100% rename from src/canonical/dex/front-shiny/Slugma.png rename to src/canonical/dex/front-shiny/218--0--Slugma.png diff --git a/src/canonical/dex/front-shiny/Magcargo.png b/src/canonical/dex/front-shiny/219--0--Magcargo.png similarity index 100% rename from src/canonical/dex/front-shiny/Magcargo.png rename to src/canonical/dex/front-shiny/219--0--Magcargo.png diff --git a/src/canonical/dex/front-shiny/Fearow.png b/src/canonical/dex/front-shiny/22--0--Fearow.png similarity index 100% rename from src/canonical/dex/front-shiny/Fearow.png rename to src/canonical/dex/front-shiny/22--0--Fearow.png diff --git a/src/canonical/dex/front-shiny/Swinub.png b/src/canonical/dex/front-shiny/220--0--Swinub.png similarity index 100% rename from src/canonical/dex/front-shiny/Swinub.png rename to src/canonical/dex/front-shiny/220--0--Swinub.png diff --git a/src/canonical/dex/front-shiny/Piloswine.png b/src/canonical/dex/front-shiny/221--0--Piloswine.png similarity index 100% rename from src/canonical/dex/front-shiny/Piloswine.png rename to src/canonical/dex/front-shiny/221--0--Piloswine.png diff --git a/src/canonical/dex/front-shiny/Corsola.png b/src/canonical/dex/front-shiny/222--0--Corsola.png similarity index 100% rename from src/canonical/dex/front-shiny/Corsola.png rename to src/canonical/dex/front-shiny/222--0--Corsola.png diff --git a/src/canonical/dex/front-shiny/Remoraid.png b/src/canonical/dex/front-shiny/223--0--Remoraid.png similarity index 100% rename from src/canonical/dex/front-shiny/Remoraid.png rename to src/canonical/dex/front-shiny/223--0--Remoraid.png diff --git a/src/canonical/dex/front-shiny/Octillery.png b/src/canonical/dex/front-shiny/224--0--Octillery.png similarity index 100% rename from src/canonical/dex/front-shiny/Octillery.png rename to src/canonical/dex/front-shiny/224--0--Octillery.png diff --git a/src/canonical/dex/front-shiny/Delibird.png b/src/canonical/dex/front-shiny/225--0--Delibird.png similarity index 100% rename from src/canonical/dex/front-shiny/Delibird.png rename to src/canonical/dex/front-shiny/225--0--Delibird.png diff --git a/src/canonical/dex/front-shiny/Mantine.png b/src/canonical/dex/front-shiny/226--0--Mantine.png similarity index 100% rename from src/canonical/dex/front-shiny/Mantine.png rename to src/canonical/dex/front-shiny/226--0--Mantine.png diff --git a/src/canonical/dex/front-shiny/Skarmory.png b/src/canonical/dex/front-shiny/227--0--Skarmory.png similarity index 100% rename from src/canonical/dex/front-shiny/Skarmory.png rename to src/canonical/dex/front-shiny/227--0--Skarmory.png diff --git a/src/canonical/dex/front-shiny/Houndour.png b/src/canonical/dex/front-shiny/228--0--Houndour.png similarity index 100% rename from src/canonical/dex/front-shiny/Houndour.png rename to src/canonical/dex/front-shiny/228--0--Houndour.png diff --git a/src/canonical/dex/front-shiny/Houndoom.png b/src/canonical/dex/front-shiny/229--0--Houndoom.png similarity index 100% rename from src/canonical/dex/front-shiny/Houndoom.png rename to src/canonical/dex/front-shiny/229--0--Houndoom.png diff --git a/src/canonical/dex/front-shiny/Houndoom--Mega.png b/src/canonical/dex/front-shiny/229--420--Houndoom--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Houndoom--Mega.png rename to src/canonical/dex/front-shiny/229--420--Houndoom--Mega.png diff --git a/src/canonical/dex/front-shiny/Ekans.png b/src/canonical/dex/front-shiny/23--0--Ekans.png similarity index 100% rename from src/canonical/dex/front-shiny/Ekans.png rename to src/canonical/dex/front-shiny/23--0--Ekans.png diff --git a/src/canonical/dex/front-shiny/Kingdra.png b/src/canonical/dex/front-shiny/230--0--Kingdra.png similarity index 100% rename from src/canonical/dex/front-shiny/Kingdra.png rename to src/canonical/dex/front-shiny/230--0--Kingdra.png diff --git a/src/canonical/dex/front-shiny/Phanpy.png b/src/canonical/dex/front-shiny/231--0--Phanpy.png similarity index 100% rename from src/canonical/dex/front-shiny/Phanpy.png rename to src/canonical/dex/front-shiny/231--0--Phanpy.png diff --git a/src/canonical/dex/front-shiny/Donphan.png b/src/canonical/dex/front-shiny/232--0--Donphan.png similarity index 100% rename from src/canonical/dex/front-shiny/Donphan.png rename to src/canonical/dex/front-shiny/232--0--Donphan.png diff --git a/src/canonical/dex/front-shiny/Porygon2.png b/src/canonical/dex/front-shiny/233--0--Porygon2.png similarity index 100% rename from src/canonical/dex/front-shiny/Porygon2.png rename to src/canonical/dex/front-shiny/233--0--Porygon2.png diff --git a/src/canonical/dex/front-shiny/Stantler.png b/src/canonical/dex/front-shiny/234--0--Stantler.png similarity index 100% rename from src/canonical/dex/front-shiny/Stantler.png rename to src/canonical/dex/front-shiny/234--0--Stantler.png diff --git a/src/canonical/dex/front-shiny/Smeargle.png b/src/canonical/dex/front-shiny/235--0--Smeargle.png similarity index 100% rename from src/canonical/dex/front-shiny/Smeargle.png rename to src/canonical/dex/front-shiny/235--0--Smeargle.png diff --git a/src/canonical/dex/front-shiny/Tyrogue.png b/src/canonical/dex/front-shiny/236--0--Tyrogue.png similarity index 100% rename from src/canonical/dex/front-shiny/Tyrogue.png rename to src/canonical/dex/front-shiny/236--0--Tyrogue.png diff --git a/src/canonical/dex/front-shiny/Hitmontop.png b/src/canonical/dex/front-shiny/237--0--Hitmontop.png similarity index 100% rename from src/canonical/dex/front-shiny/Hitmontop.png rename to src/canonical/dex/front-shiny/237--0--Hitmontop.png diff --git a/src/canonical/dex/front-shiny/Smoochum.png b/src/canonical/dex/front-shiny/238--0--Smoochum.png similarity index 100% rename from src/canonical/dex/front-shiny/Smoochum.png rename to src/canonical/dex/front-shiny/238--0--Smoochum.png diff --git a/src/canonical/dex/front-shiny/Elekid.png b/src/canonical/dex/front-shiny/239--0--Elekid.png similarity index 100% rename from src/canonical/dex/front-shiny/Elekid.png rename to src/canonical/dex/front-shiny/239--0--Elekid.png diff --git a/src/canonical/dex/front-shiny/Arbok.png b/src/canonical/dex/front-shiny/24--0--Arbok.png similarity index 100% rename from src/canonical/dex/front-shiny/Arbok.png rename to src/canonical/dex/front-shiny/24--0--Arbok.png diff --git a/src/canonical/dex/front-shiny/Magby.png b/src/canonical/dex/front-shiny/240--0--Magby.png similarity index 100% rename from src/canonical/dex/front-shiny/Magby.png rename to src/canonical/dex/front-shiny/240--0--Magby.png diff --git a/src/canonical/dex/front-shiny/Miltank.png b/src/canonical/dex/front-shiny/241--0--Miltank.png similarity index 100% rename from src/canonical/dex/front-shiny/Miltank.png rename to src/canonical/dex/front-shiny/241--0--Miltank.png diff --git a/src/canonical/dex/front-shiny/Blissey.png b/src/canonical/dex/front-shiny/242--0--Blissey.png similarity index 100% rename from src/canonical/dex/front-shiny/Blissey.png rename to src/canonical/dex/front-shiny/242--0--Blissey.png diff --git a/src/canonical/dex/front-shiny/Raikou.png b/src/canonical/dex/front-shiny/243--0--Raikou.png similarity index 100% rename from src/canonical/dex/front-shiny/Raikou.png rename to src/canonical/dex/front-shiny/243--0--Raikou.png diff --git a/src/canonical/dex/front-shiny/Entei.png b/src/canonical/dex/front-shiny/244--0--Entei.png similarity index 100% rename from src/canonical/dex/front-shiny/Entei.png rename to src/canonical/dex/front-shiny/244--0--Entei.png diff --git a/src/canonical/dex/front-shiny/Suicune.png b/src/canonical/dex/front-shiny/245--0--Suicune.png similarity index 100% rename from src/canonical/dex/front-shiny/Suicune.png rename to src/canonical/dex/front-shiny/245--0--Suicune.png diff --git a/src/canonical/dex/front-shiny/Larvitar.png b/src/canonical/dex/front-shiny/246--0--Larvitar.png similarity index 100% rename from src/canonical/dex/front-shiny/Larvitar.png rename to src/canonical/dex/front-shiny/246--0--Larvitar.png diff --git a/src/canonical/dex/front-shiny/Pupitar.png b/src/canonical/dex/front-shiny/247--0--Pupitar.png similarity index 100% rename from src/canonical/dex/front-shiny/Pupitar.png rename to src/canonical/dex/front-shiny/247--0--Pupitar.png diff --git a/src/canonical/dex/front-shiny/Tyranitar.png b/src/canonical/dex/front-shiny/248--0--Tyranitar.png similarity index 100% rename from src/canonical/dex/front-shiny/Tyranitar.png rename to src/canonical/dex/front-shiny/248--0--Tyranitar.png diff --git a/src/canonical/dex/front-shiny/Tyranitar--Mega.png b/src/canonical/dex/front-shiny/248--420--Tyranitar--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Tyranitar--Mega.png rename to src/canonical/dex/front-shiny/248--420--Tyranitar--Mega.png diff --git a/src/canonical/dex/front-shiny/Lugia.png b/src/canonical/dex/front-shiny/249--0--Lugia.png similarity index 100% rename from src/canonical/dex/front-shiny/Lugia.png rename to src/canonical/dex/front-shiny/249--0--Lugia.png diff --git a/src/canonical/dex/front-shiny/Pikachu.png b/src/canonical/dex/front-shiny/25--0--Pikachu.png similarity index 100% rename from src/canonical/dex/front-shiny/Pikachu.png rename to src/canonical/dex/front-shiny/25--0--Pikachu.png diff --git a/src/canonical/dex/front-shiny/Pikachu--Cosplay.png b/src/canonical/dex/front-shiny/25--420--Pikachu--Cosplay.png similarity index 100% rename from src/canonical/dex/front-shiny/Pikachu--Cosplay.png rename to src/canonical/dex/front-shiny/25--420--Pikachu--Cosplay.png diff --git a/src/canonical/dex/front-shiny/Pikachu--Partner.png b/src/canonical/dex/front-shiny/25--420--Pikachu--Partner.png similarity index 100% rename from src/canonical/dex/front-shiny/Pikachu--Partner.png rename to src/canonical/dex/front-shiny/25--420--Pikachu--Partner.png diff --git a/src/canonical/dex/front-shiny/Ho-Oh.png b/src/canonical/dex/front-shiny/250--0--Ho-Oh.png similarity index 100% rename from src/canonical/dex/front-shiny/Ho-Oh.png rename to src/canonical/dex/front-shiny/250--0--Ho-Oh.png diff --git a/src/canonical/dex/front-shiny/Celebi.png b/src/canonical/dex/front-shiny/251--0--Celebi.png similarity index 100% rename from src/canonical/dex/front-shiny/Celebi.png rename to src/canonical/dex/front-shiny/251--0--Celebi.png diff --git a/src/canonical/dex/front-shiny/Treecko.png b/src/canonical/dex/front-shiny/252--0--Treecko.png similarity index 100% rename from src/canonical/dex/front-shiny/Treecko.png rename to src/canonical/dex/front-shiny/252--0--Treecko.png diff --git a/src/canonical/dex/front-shiny/Grovyle.png b/src/canonical/dex/front-shiny/253--0--Grovyle.png similarity index 100% rename from src/canonical/dex/front-shiny/Grovyle.png rename to src/canonical/dex/front-shiny/253--0--Grovyle.png diff --git a/src/canonical/dex/front-shiny/Sceptile.png b/src/canonical/dex/front-shiny/254--0--Sceptile.png similarity index 100% rename from src/canonical/dex/front-shiny/Sceptile.png rename to src/canonical/dex/front-shiny/254--0--Sceptile.png diff --git a/src/canonical/dex/front-shiny/Sceptile--Mega.png b/src/canonical/dex/front-shiny/254--420--Sceptile--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Sceptile--Mega.png rename to src/canonical/dex/front-shiny/254--420--Sceptile--Mega.png diff --git a/src/canonical/dex/front-shiny/Torchic.png b/src/canonical/dex/front-shiny/255--0--Torchic.png similarity index 100% rename from src/canonical/dex/front-shiny/Torchic.png rename to src/canonical/dex/front-shiny/255--0--Torchic.png diff --git a/src/canonical/dex/front-shiny/Combusken.png b/src/canonical/dex/front-shiny/256--0--Combusken.png similarity index 100% rename from src/canonical/dex/front-shiny/Combusken.png rename to src/canonical/dex/front-shiny/256--0--Combusken.png diff --git a/src/canonical/dex/front-shiny/Blaziken.png b/src/canonical/dex/front-shiny/257--0--Blaziken.png similarity index 100% rename from src/canonical/dex/front-shiny/Blaziken.png rename to src/canonical/dex/front-shiny/257--0--Blaziken.png diff --git a/src/canonical/dex/front-shiny/Blaziken--Mega.png b/src/canonical/dex/front-shiny/257--420--Blaziken--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Blaziken--Mega.png rename to src/canonical/dex/front-shiny/257--420--Blaziken--Mega.png diff --git a/src/canonical/dex/front-shiny/Mudkip.png b/src/canonical/dex/front-shiny/258--0--Mudkip.png similarity index 100% rename from src/canonical/dex/front-shiny/Mudkip.png rename to src/canonical/dex/front-shiny/258--0--Mudkip.png diff --git a/src/canonical/dex/front-shiny/Marshtomp.png b/src/canonical/dex/front-shiny/259--0--Marshtomp.png similarity index 100% rename from src/canonical/dex/front-shiny/Marshtomp.png rename to src/canonical/dex/front-shiny/259--0--Marshtomp.png diff --git a/src/canonical/dex/front-shiny/Raichu.png b/src/canonical/dex/front-shiny/26--0--Raichu.png similarity index 100% rename from src/canonical/dex/front-shiny/Raichu.png rename to src/canonical/dex/front-shiny/26--0--Raichu.png diff --git a/src/canonical/dex/front-shiny/Raichu--Alola.png b/src/canonical/dex/front-shiny/26--420--Raichu--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Raichu--Alola.png rename to src/canonical/dex/front-shiny/26--420--Raichu--Alola.png diff --git a/src/canonical/dex/front-shiny/Swampert.png b/src/canonical/dex/front-shiny/260--0--Swampert.png similarity index 100% rename from src/canonical/dex/front-shiny/Swampert.png rename to src/canonical/dex/front-shiny/260--0--Swampert.png diff --git a/src/canonical/dex/front-shiny/Swampert--Mega.png b/src/canonical/dex/front-shiny/260--420--Swampert--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Swampert--Mega.png rename to src/canonical/dex/front-shiny/260--420--Swampert--Mega.png diff --git a/src/canonical/dex/front-shiny/Poochyena.png b/src/canonical/dex/front-shiny/261--0--Poochyena.png similarity index 100% rename from src/canonical/dex/front-shiny/Poochyena.png rename to src/canonical/dex/front-shiny/261--0--Poochyena.png diff --git a/src/canonical/dex/front-shiny/Mightyena.png b/src/canonical/dex/front-shiny/262--0--Mightyena.png similarity index 100% rename from src/canonical/dex/front-shiny/Mightyena.png rename to src/canonical/dex/front-shiny/262--0--Mightyena.png diff --git a/src/canonical/dex/front-shiny/Zigzagoon.png b/src/canonical/dex/front-shiny/263--0--Zigzagoon.png similarity index 100% rename from src/canonical/dex/front-shiny/Zigzagoon.png rename to src/canonical/dex/front-shiny/263--0--Zigzagoon.png diff --git a/src/canonical/dex/front-shiny/Linoone.png b/src/canonical/dex/front-shiny/264--0--Linoone.png similarity index 100% rename from src/canonical/dex/front-shiny/Linoone.png rename to src/canonical/dex/front-shiny/264--0--Linoone.png diff --git a/src/canonical/dex/front-shiny/Wurmple.png b/src/canonical/dex/front-shiny/265--0--Wurmple.png similarity index 100% rename from src/canonical/dex/front-shiny/Wurmple.png rename to src/canonical/dex/front-shiny/265--0--Wurmple.png diff --git a/src/canonical/dex/front-shiny/Silcoon.png b/src/canonical/dex/front-shiny/266--0--Silcoon.png similarity index 100% rename from src/canonical/dex/front-shiny/Silcoon.png rename to src/canonical/dex/front-shiny/266--0--Silcoon.png diff --git a/src/canonical/dex/front-shiny/Beautifly.png b/src/canonical/dex/front-shiny/267--0--Beautifly.png similarity index 100% rename from src/canonical/dex/front-shiny/Beautifly.png rename to src/canonical/dex/front-shiny/267--0--Beautifly.png diff --git a/src/canonical/dex/front-shiny/Cascoon.png b/src/canonical/dex/front-shiny/268--0--Cascoon.png similarity index 100% rename from src/canonical/dex/front-shiny/Cascoon.png rename to src/canonical/dex/front-shiny/268--0--Cascoon.png diff --git a/src/canonical/dex/front-shiny/Dustox.png b/src/canonical/dex/front-shiny/269--0--Dustox.png similarity index 100% rename from src/canonical/dex/front-shiny/Dustox.png rename to src/canonical/dex/front-shiny/269--0--Dustox.png diff --git a/src/canonical/dex/front-shiny/Sandshrew.png b/src/canonical/dex/front-shiny/27--0--Sandshrew.png similarity index 100% rename from src/canonical/dex/front-shiny/Sandshrew.png rename to src/canonical/dex/front-shiny/27--0--Sandshrew.png diff --git a/src/canonical/dex/front-shiny/Sandshrew--Alola.png b/src/canonical/dex/front-shiny/27--420--Sandshrew--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Sandshrew--Alola.png rename to src/canonical/dex/front-shiny/27--420--Sandshrew--Alola.png diff --git a/src/canonical/dex/front-shiny/Lotad.png b/src/canonical/dex/front-shiny/270--0--Lotad.png similarity index 100% rename from src/canonical/dex/front-shiny/Lotad.png rename to src/canonical/dex/front-shiny/270--0--Lotad.png diff --git a/src/canonical/dex/front-shiny/Lombre.png b/src/canonical/dex/front-shiny/271--0--Lombre.png similarity index 100% rename from src/canonical/dex/front-shiny/Lombre.png rename to src/canonical/dex/front-shiny/271--0--Lombre.png diff --git a/src/canonical/dex/front-shiny/Ludicolo.png b/src/canonical/dex/front-shiny/272--0--Ludicolo.png similarity index 100% rename from src/canonical/dex/front-shiny/Ludicolo.png rename to src/canonical/dex/front-shiny/272--0--Ludicolo.png diff --git a/src/canonical/dex/front-shiny/Seedot.png b/src/canonical/dex/front-shiny/273--0--Seedot.png similarity index 100% rename from src/canonical/dex/front-shiny/Seedot.png rename to src/canonical/dex/front-shiny/273--0--Seedot.png diff --git a/src/canonical/dex/front-shiny/Nuzleaf.png b/src/canonical/dex/front-shiny/274--0--Nuzleaf.png similarity index 100% rename from src/canonical/dex/front-shiny/Nuzleaf.png rename to src/canonical/dex/front-shiny/274--0--Nuzleaf.png diff --git a/src/canonical/dex/front-shiny/Shiftry.png b/src/canonical/dex/front-shiny/275--0--Shiftry.png similarity index 100% rename from src/canonical/dex/front-shiny/Shiftry.png rename to src/canonical/dex/front-shiny/275--0--Shiftry.png diff --git a/src/canonical/dex/front-shiny/Taillow.png b/src/canonical/dex/front-shiny/276--0--Taillow.png similarity index 100% rename from src/canonical/dex/front-shiny/Taillow.png rename to src/canonical/dex/front-shiny/276--0--Taillow.png diff --git a/src/canonical/dex/front-shiny/Swellow.png b/src/canonical/dex/front-shiny/277--0--Swellow.png similarity index 100% rename from src/canonical/dex/front-shiny/Swellow.png rename to src/canonical/dex/front-shiny/277--0--Swellow.png diff --git a/src/canonical/dex/front-shiny/Wingull.png b/src/canonical/dex/front-shiny/278--0--Wingull.png similarity index 100% rename from src/canonical/dex/front-shiny/Wingull.png rename to src/canonical/dex/front-shiny/278--0--Wingull.png diff --git a/src/canonical/dex/front-shiny/Pelipper.png b/src/canonical/dex/front-shiny/279--0--Pelipper.png similarity index 100% rename from src/canonical/dex/front-shiny/Pelipper.png rename to src/canonical/dex/front-shiny/279--0--Pelipper.png diff --git a/src/canonical/dex/front-shiny/Sandslash.png b/src/canonical/dex/front-shiny/28--0--Sandslash.png similarity index 100% rename from src/canonical/dex/front-shiny/Sandslash.png rename to src/canonical/dex/front-shiny/28--0--Sandslash.png diff --git a/src/canonical/dex/front-shiny/Sandslash--Alola.png b/src/canonical/dex/front-shiny/28--420--Sandslash--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Sandslash--Alola.png rename to src/canonical/dex/front-shiny/28--420--Sandslash--Alola.png diff --git a/src/canonical/dex/front-shiny/Ralts.png b/src/canonical/dex/front-shiny/280--0--Ralts.png similarity index 100% rename from src/canonical/dex/front-shiny/Ralts.png rename to src/canonical/dex/front-shiny/280--0--Ralts.png diff --git a/src/canonical/dex/front-shiny/Kirlia.png b/src/canonical/dex/front-shiny/281--0--Kirlia.png similarity index 100% rename from src/canonical/dex/front-shiny/Kirlia.png rename to src/canonical/dex/front-shiny/281--0--Kirlia.png diff --git a/src/canonical/dex/front-shiny/Gardevoir.png b/src/canonical/dex/front-shiny/282--0--Gardevoir.png similarity index 100% rename from src/canonical/dex/front-shiny/Gardevoir.png rename to src/canonical/dex/front-shiny/282--0--Gardevoir.png diff --git a/src/canonical/dex/front-shiny/Gardevoir--Mega.png b/src/canonical/dex/front-shiny/282--420--Gardevoir--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Gardevoir--Mega.png rename to src/canonical/dex/front-shiny/282--420--Gardevoir--Mega.png diff --git a/src/canonical/dex/front-shiny/Surskit.png b/src/canonical/dex/front-shiny/283--0--Surskit.png similarity index 100% rename from src/canonical/dex/front-shiny/Surskit.png rename to src/canonical/dex/front-shiny/283--0--Surskit.png diff --git a/src/canonical/dex/front-shiny/Masquerain.png b/src/canonical/dex/front-shiny/284--0--Masquerain.png similarity index 100% rename from src/canonical/dex/front-shiny/Masquerain.png rename to src/canonical/dex/front-shiny/284--0--Masquerain.png diff --git a/src/canonical/dex/front-shiny/Shroomish.png b/src/canonical/dex/front-shiny/285--0--Shroomish.png similarity index 100% rename from src/canonical/dex/front-shiny/Shroomish.png rename to src/canonical/dex/front-shiny/285--0--Shroomish.png diff --git a/src/canonical/dex/front-shiny/Breloom.png b/src/canonical/dex/front-shiny/286--0--Breloom.png similarity index 100% rename from src/canonical/dex/front-shiny/Breloom.png rename to src/canonical/dex/front-shiny/286--0--Breloom.png diff --git a/src/canonical/dex/front-shiny/Slakoth.png b/src/canonical/dex/front-shiny/287--0--Slakoth.png similarity index 100% rename from src/canonical/dex/front-shiny/Slakoth.png rename to src/canonical/dex/front-shiny/287--0--Slakoth.png diff --git a/src/canonical/dex/front-shiny/Vigoroth.png b/src/canonical/dex/front-shiny/288--0--Vigoroth.png similarity index 100% rename from src/canonical/dex/front-shiny/Vigoroth.png rename to src/canonical/dex/front-shiny/288--0--Vigoroth.png diff --git a/src/canonical/dex/front-shiny/Slaking.png b/src/canonical/dex/front-shiny/289--0--Slaking.png similarity index 100% rename from src/canonical/dex/front-shiny/Slaking.png rename to src/canonical/dex/front-shiny/289--0--Slaking.png diff --git a/src/canonical/dex/front-shiny/Nidoran-F.png b/src/canonical/dex/front-shiny/29--0--Nidoran-F.png similarity index 100% rename from src/canonical/dex/front-shiny/Nidoran-F.png rename to src/canonical/dex/front-shiny/29--0--Nidoran-F.png diff --git a/src/canonical/dex/front-shiny/Nincada.png b/src/canonical/dex/front-shiny/290--0--Nincada.png similarity index 100% rename from src/canonical/dex/front-shiny/Nincada.png rename to src/canonical/dex/front-shiny/290--0--Nincada.png diff --git a/src/canonical/dex/front-shiny/Ninjask.png b/src/canonical/dex/front-shiny/291--0--Ninjask.png similarity index 100% rename from src/canonical/dex/front-shiny/Ninjask.png rename to src/canonical/dex/front-shiny/291--0--Ninjask.png diff --git a/src/canonical/dex/front-shiny/Shedinja.png b/src/canonical/dex/front-shiny/292--0--Shedinja.png similarity index 100% rename from src/canonical/dex/front-shiny/Shedinja.png rename to src/canonical/dex/front-shiny/292--0--Shedinja.png diff --git a/src/canonical/dex/front-shiny/Whismur.png b/src/canonical/dex/front-shiny/293--0--Whismur.png similarity index 100% rename from src/canonical/dex/front-shiny/Whismur.png rename to src/canonical/dex/front-shiny/293--0--Whismur.png diff --git a/src/canonical/dex/front-shiny/Loudred.png b/src/canonical/dex/front-shiny/294--0--Loudred.png similarity index 100% rename from src/canonical/dex/front-shiny/Loudred.png rename to src/canonical/dex/front-shiny/294--0--Loudred.png diff --git a/src/canonical/dex/front-shiny/Exploud.png b/src/canonical/dex/front-shiny/295--0--Exploud.png similarity index 100% rename from src/canonical/dex/front-shiny/Exploud.png rename to src/canonical/dex/front-shiny/295--0--Exploud.png diff --git a/src/canonical/dex/front-shiny/Makuhita.png b/src/canonical/dex/front-shiny/296--0--Makuhita.png similarity index 100% rename from src/canonical/dex/front-shiny/Makuhita.png rename to src/canonical/dex/front-shiny/296--0--Makuhita.png diff --git a/src/canonical/dex/front-shiny/Hariyama.png b/src/canonical/dex/front-shiny/297--0--Hariyama.png similarity index 100% rename from src/canonical/dex/front-shiny/Hariyama.png rename to src/canonical/dex/front-shiny/297--0--Hariyama.png diff --git a/src/canonical/dex/front-shiny/Azurill.png b/src/canonical/dex/front-shiny/298--0--Azurill.png similarity index 100% rename from src/canonical/dex/front-shiny/Azurill.png rename to src/canonical/dex/front-shiny/298--0--Azurill.png diff --git a/src/canonical/dex/front-shiny/Nosepass.png b/src/canonical/dex/front-shiny/299--0--Nosepass.png similarity index 100% rename from src/canonical/dex/front-shiny/Nosepass.png rename to src/canonical/dex/front-shiny/299--0--Nosepass.png diff --git a/src/canonical/dex/front-shiny/Venusaur.png b/src/canonical/dex/front-shiny/3--0--Venusaur.png similarity index 100% rename from src/canonical/dex/front-shiny/Venusaur.png rename to src/canonical/dex/front-shiny/3--0--Venusaur.png diff --git a/src/canonical/dex/front-shiny/Venusaur--Mega.png b/src/canonical/dex/front-shiny/3--420--Venusaur--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Venusaur--Mega.png rename to src/canonical/dex/front-shiny/3--420--Venusaur--Mega.png diff --git a/src/canonical/dex/front-shiny/Nidorina.png b/src/canonical/dex/front-shiny/30--0--Nidorina.png similarity index 100% rename from src/canonical/dex/front-shiny/Nidorina.png rename to src/canonical/dex/front-shiny/30--0--Nidorina.png diff --git a/src/canonical/dex/front-shiny/Skitty.png b/src/canonical/dex/front-shiny/300--0--Skitty.png similarity index 100% rename from src/canonical/dex/front-shiny/Skitty.png rename to src/canonical/dex/front-shiny/300--0--Skitty.png diff --git a/src/canonical/dex/front-shiny/Delcatty.png b/src/canonical/dex/front-shiny/301--0--Delcatty.png similarity index 100% rename from src/canonical/dex/front-shiny/Delcatty.png rename to src/canonical/dex/front-shiny/301--0--Delcatty.png diff --git a/src/canonical/dex/front-shiny/Sableye.png b/src/canonical/dex/front-shiny/302--0--Sableye.png similarity index 100% rename from src/canonical/dex/front-shiny/Sableye.png rename to src/canonical/dex/front-shiny/302--0--Sableye.png diff --git a/src/canonical/dex/front-shiny/Sableye--Mega.png b/src/canonical/dex/front-shiny/302--420--Sableye--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Sableye--Mega.png rename to src/canonical/dex/front-shiny/302--420--Sableye--Mega.png diff --git a/src/canonical/dex/front-shiny/Mawile.png b/src/canonical/dex/front-shiny/303--0--Mawile.png similarity index 100% rename from src/canonical/dex/front-shiny/Mawile.png rename to src/canonical/dex/front-shiny/303--0--Mawile.png diff --git a/src/canonical/dex/front-shiny/Mawile--Mega.png b/src/canonical/dex/front-shiny/303--420--Mawile--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Mawile--Mega.png rename to src/canonical/dex/front-shiny/303--420--Mawile--Mega.png diff --git a/src/canonical/dex/front-shiny/Aron.png b/src/canonical/dex/front-shiny/304--0--Aron.png similarity index 100% rename from src/canonical/dex/front-shiny/Aron.png rename to src/canonical/dex/front-shiny/304--0--Aron.png diff --git a/src/canonical/dex/front-shiny/Lairon.png b/src/canonical/dex/front-shiny/305--0--Lairon.png similarity index 100% rename from src/canonical/dex/front-shiny/Lairon.png rename to src/canonical/dex/front-shiny/305--0--Lairon.png diff --git a/src/canonical/dex/front-shiny/Aggron.png b/src/canonical/dex/front-shiny/306--0--Aggron.png similarity index 100% rename from src/canonical/dex/front-shiny/Aggron.png rename to src/canonical/dex/front-shiny/306--0--Aggron.png diff --git a/src/canonical/dex/front-shiny/Aggron--Mega.png b/src/canonical/dex/front-shiny/306--420--Aggron--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Aggron--Mega.png rename to src/canonical/dex/front-shiny/306--420--Aggron--Mega.png diff --git a/src/canonical/dex/front-shiny/Meditite.png b/src/canonical/dex/front-shiny/307--0--Meditite.png similarity index 100% rename from src/canonical/dex/front-shiny/Meditite.png rename to src/canonical/dex/front-shiny/307--0--Meditite.png diff --git a/src/canonical/dex/front-shiny/Medicham.png b/src/canonical/dex/front-shiny/308--0--Medicham.png similarity index 100% rename from src/canonical/dex/front-shiny/Medicham.png rename to src/canonical/dex/front-shiny/308--0--Medicham.png diff --git a/src/canonical/dex/front-shiny/Medicham--Mega.png b/src/canonical/dex/front-shiny/308--420--Medicham--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Medicham--Mega.png rename to src/canonical/dex/front-shiny/308--420--Medicham--Mega.png diff --git a/src/canonical/dex/front-shiny/Electrike.png b/src/canonical/dex/front-shiny/309--0--Electrike.png similarity index 100% rename from src/canonical/dex/front-shiny/Electrike.png rename to src/canonical/dex/front-shiny/309--0--Electrike.png diff --git a/src/canonical/dex/front-shiny/Nidoqueen.png b/src/canonical/dex/front-shiny/31--0--Nidoqueen.png similarity index 100% rename from src/canonical/dex/front-shiny/Nidoqueen.png rename to src/canonical/dex/front-shiny/31--0--Nidoqueen.png diff --git a/src/canonical/dex/front-shiny/Manectric.png b/src/canonical/dex/front-shiny/310--0--Manectric.png similarity index 100% rename from src/canonical/dex/front-shiny/Manectric.png rename to src/canonical/dex/front-shiny/310--0--Manectric.png diff --git a/src/canonical/dex/front-shiny/Manectric--Mega.png b/src/canonical/dex/front-shiny/310--420--Manectric--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Manectric--Mega.png rename to src/canonical/dex/front-shiny/310--420--Manectric--Mega.png diff --git a/src/canonical/dex/front-shiny/Plusle.png b/src/canonical/dex/front-shiny/311--0--Plusle.png similarity index 100% rename from src/canonical/dex/front-shiny/Plusle.png rename to src/canonical/dex/front-shiny/311--0--Plusle.png diff --git a/src/canonical/dex/front-shiny/Minun.png b/src/canonical/dex/front-shiny/312--0--Minun.png similarity index 100% rename from src/canonical/dex/front-shiny/Minun.png rename to src/canonical/dex/front-shiny/312--0--Minun.png diff --git a/src/canonical/dex/front-shiny/Volbeat.png b/src/canonical/dex/front-shiny/313--0--Volbeat.png similarity index 100% rename from src/canonical/dex/front-shiny/Volbeat.png rename to src/canonical/dex/front-shiny/313--0--Volbeat.png diff --git a/src/canonical/dex/front-shiny/Illumise.png b/src/canonical/dex/front-shiny/314--0--Illumise.png similarity index 100% rename from src/canonical/dex/front-shiny/Illumise.png rename to src/canonical/dex/front-shiny/314--0--Illumise.png diff --git a/src/canonical/dex/front-shiny/Roselia.png b/src/canonical/dex/front-shiny/315--0--Roselia.png similarity index 100% rename from src/canonical/dex/front-shiny/Roselia.png rename to src/canonical/dex/front-shiny/315--0--Roselia.png diff --git a/src/canonical/dex/front-shiny/Gulpin.png b/src/canonical/dex/front-shiny/316--0--Gulpin.png similarity index 100% rename from src/canonical/dex/front-shiny/Gulpin.png rename to src/canonical/dex/front-shiny/316--0--Gulpin.png diff --git a/src/canonical/dex/front-shiny/Swalot.png b/src/canonical/dex/front-shiny/317--0--Swalot.png similarity index 100% rename from src/canonical/dex/front-shiny/Swalot.png rename to src/canonical/dex/front-shiny/317--0--Swalot.png diff --git a/src/canonical/dex/front-shiny/Carvanha.png b/src/canonical/dex/front-shiny/318--0--Carvanha.png similarity index 100% rename from src/canonical/dex/front-shiny/Carvanha.png rename to src/canonical/dex/front-shiny/318--0--Carvanha.png diff --git a/src/canonical/dex/front-shiny/Sharpedo.png b/src/canonical/dex/front-shiny/319--0--Sharpedo.png similarity index 100% rename from src/canonical/dex/front-shiny/Sharpedo.png rename to src/canonical/dex/front-shiny/319--0--Sharpedo.png diff --git a/src/canonical/dex/front-shiny/Sharpedo--Mega.png b/src/canonical/dex/front-shiny/319--420--Sharpedo--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Sharpedo--Mega.png rename to src/canonical/dex/front-shiny/319--420--Sharpedo--Mega.png diff --git a/src/canonical/dex/front-shiny/Nidoran-M.png b/src/canonical/dex/front-shiny/32--0--Nidoran-M.png similarity index 100% rename from src/canonical/dex/front-shiny/Nidoran-M.png rename to src/canonical/dex/front-shiny/32--0--Nidoran-M.png diff --git a/src/canonical/dex/front-shiny/Wailmer.png b/src/canonical/dex/front-shiny/320--0--Wailmer.png similarity index 100% rename from src/canonical/dex/front-shiny/Wailmer.png rename to src/canonical/dex/front-shiny/320--0--Wailmer.png diff --git a/src/canonical/dex/front-shiny/Wailord.png b/src/canonical/dex/front-shiny/321--0--Wailord.png similarity index 100% rename from src/canonical/dex/front-shiny/Wailord.png rename to src/canonical/dex/front-shiny/321--0--Wailord.png diff --git a/src/canonical/dex/front-shiny/Numel.png b/src/canonical/dex/front-shiny/322--0--Numel.png similarity index 100% rename from src/canonical/dex/front-shiny/Numel.png rename to src/canonical/dex/front-shiny/322--0--Numel.png diff --git a/src/canonical/dex/front-shiny/Camerupt.png b/src/canonical/dex/front-shiny/323--0--Camerupt.png similarity index 100% rename from src/canonical/dex/front-shiny/Camerupt.png rename to src/canonical/dex/front-shiny/323--0--Camerupt.png diff --git a/src/canonical/dex/front-shiny/Camerupt--Mega.png b/src/canonical/dex/front-shiny/323--420--Camerupt--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Camerupt--Mega.png rename to src/canonical/dex/front-shiny/323--420--Camerupt--Mega.png diff --git a/src/canonical/dex/front-shiny/Torkoal.png b/src/canonical/dex/front-shiny/324--0--Torkoal.png similarity index 100% rename from src/canonical/dex/front-shiny/Torkoal.png rename to src/canonical/dex/front-shiny/324--0--Torkoal.png diff --git a/src/canonical/dex/front-shiny/Spoink.png b/src/canonical/dex/front-shiny/325--0--Spoink.png similarity index 100% rename from src/canonical/dex/front-shiny/Spoink.png rename to src/canonical/dex/front-shiny/325--0--Spoink.png diff --git a/src/canonical/dex/front-shiny/Grumpig.png b/src/canonical/dex/front-shiny/326--0--Grumpig.png similarity index 100% rename from src/canonical/dex/front-shiny/Grumpig.png rename to src/canonical/dex/front-shiny/326--0--Grumpig.png diff --git a/src/canonical/dex/front-shiny/Spinda.png b/src/canonical/dex/front-shiny/327--0--Spinda.png similarity index 100% rename from src/canonical/dex/front-shiny/Spinda.png rename to src/canonical/dex/front-shiny/327--0--Spinda.png diff --git a/src/canonical/dex/front-shiny/Trapinch.png b/src/canonical/dex/front-shiny/328--0--Trapinch.png similarity index 100% rename from src/canonical/dex/front-shiny/Trapinch.png rename to src/canonical/dex/front-shiny/328--0--Trapinch.png diff --git a/src/canonical/dex/front-shiny/Vibrava.png b/src/canonical/dex/front-shiny/329--0--Vibrava.png similarity index 100% rename from src/canonical/dex/front-shiny/Vibrava.png rename to src/canonical/dex/front-shiny/329--0--Vibrava.png diff --git a/src/canonical/dex/front-shiny/Nidorino.png b/src/canonical/dex/front-shiny/33--0--Nidorino.png similarity index 100% rename from src/canonical/dex/front-shiny/Nidorino.png rename to src/canonical/dex/front-shiny/33--0--Nidorino.png diff --git a/src/canonical/dex/front-shiny/Flygon.png b/src/canonical/dex/front-shiny/330--0--Flygon.png similarity index 100% rename from src/canonical/dex/front-shiny/Flygon.png rename to src/canonical/dex/front-shiny/330--0--Flygon.png diff --git a/src/canonical/dex/front-shiny/Cacnea.png b/src/canonical/dex/front-shiny/331--0--Cacnea.png similarity index 100% rename from src/canonical/dex/front-shiny/Cacnea.png rename to src/canonical/dex/front-shiny/331--0--Cacnea.png diff --git a/src/canonical/dex/front-shiny/Cacturne.png b/src/canonical/dex/front-shiny/332--0--Cacturne.png similarity index 100% rename from src/canonical/dex/front-shiny/Cacturne.png rename to src/canonical/dex/front-shiny/332--0--Cacturne.png diff --git a/src/canonical/dex/front-shiny/Swablu.png b/src/canonical/dex/front-shiny/333--0--Swablu.png similarity index 100% rename from src/canonical/dex/front-shiny/Swablu.png rename to src/canonical/dex/front-shiny/333--0--Swablu.png diff --git a/src/canonical/dex/front-shiny/Altaria.png b/src/canonical/dex/front-shiny/334--0--Altaria.png similarity index 100% rename from src/canonical/dex/front-shiny/Altaria.png rename to src/canonical/dex/front-shiny/334--0--Altaria.png diff --git a/src/canonical/dex/front-shiny/Altaria--Mega.png b/src/canonical/dex/front-shiny/334--420--Altaria--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Altaria--Mega.png rename to src/canonical/dex/front-shiny/334--420--Altaria--Mega.png diff --git a/src/canonical/dex/front-shiny/Zangoose.png b/src/canonical/dex/front-shiny/335--0--Zangoose.png similarity index 100% rename from src/canonical/dex/front-shiny/Zangoose.png rename to src/canonical/dex/front-shiny/335--0--Zangoose.png diff --git a/src/canonical/dex/front-shiny/Seviper.png b/src/canonical/dex/front-shiny/336--0--Seviper.png similarity index 100% rename from src/canonical/dex/front-shiny/Seviper.png rename to src/canonical/dex/front-shiny/336--0--Seviper.png diff --git a/src/canonical/dex/front-shiny/Lunatone.png b/src/canonical/dex/front-shiny/337--0--Lunatone.png similarity index 100% rename from src/canonical/dex/front-shiny/Lunatone.png rename to src/canonical/dex/front-shiny/337--0--Lunatone.png diff --git a/src/canonical/dex/front-shiny/Solrock.png b/src/canonical/dex/front-shiny/338--0--Solrock.png similarity index 100% rename from src/canonical/dex/front-shiny/Solrock.png rename to src/canonical/dex/front-shiny/338--0--Solrock.png diff --git a/src/canonical/dex/front-shiny/Barboach.png b/src/canonical/dex/front-shiny/339--0--Barboach.png similarity index 100% rename from src/canonical/dex/front-shiny/Barboach.png rename to src/canonical/dex/front-shiny/339--0--Barboach.png diff --git a/src/canonical/dex/front-shiny/Nidoking.png b/src/canonical/dex/front-shiny/34--0--Nidoking.png similarity index 100% rename from src/canonical/dex/front-shiny/Nidoking.png rename to src/canonical/dex/front-shiny/34--0--Nidoking.png diff --git a/src/canonical/dex/front-shiny/Whiscash.png b/src/canonical/dex/front-shiny/340--0--Whiscash.png similarity index 100% rename from src/canonical/dex/front-shiny/Whiscash.png rename to src/canonical/dex/front-shiny/340--0--Whiscash.png diff --git a/src/canonical/dex/front-shiny/Corphish.png b/src/canonical/dex/front-shiny/341--0--Corphish.png similarity index 100% rename from src/canonical/dex/front-shiny/Corphish.png rename to src/canonical/dex/front-shiny/341--0--Corphish.png diff --git a/src/canonical/dex/front-shiny/Crawdaunt.png b/src/canonical/dex/front-shiny/342--0--Crawdaunt.png similarity index 100% rename from src/canonical/dex/front-shiny/Crawdaunt.png rename to src/canonical/dex/front-shiny/342--0--Crawdaunt.png diff --git a/src/canonical/dex/front-shiny/Baltoy.png b/src/canonical/dex/front-shiny/343--0--Baltoy.png similarity index 100% rename from src/canonical/dex/front-shiny/Baltoy.png rename to src/canonical/dex/front-shiny/343--0--Baltoy.png diff --git a/src/canonical/dex/front-shiny/Claydol.png b/src/canonical/dex/front-shiny/344--0--Claydol.png similarity index 100% rename from src/canonical/dex/front-shiny/Claydol.png rename to src/canonical/dex/front-shiny/344--0--Claydol.png diff --git a/src/canonical/dex/front-shiny/Lileep.png b/src/canonical/dex/front-shiny/345--0--Lileep.png similarity index 100% rename from src/canonical/dex/front-shiny/Lileep.png rename to src/canonical/dex/front-shiny/345--0--Lileep.png diff --git a/src/canonical/dex/front-shiny/Cradily.png b/src/canonical/dex/front-shiny/346--0--Cradily.png similarity index 100% rename from src/canonical/dex/front-shiny/Cradily.png rename to src/canonical/dex/front-shiny/346--0--Cradily.png diff --git a/src/canonical/dex/front-shiny/Anorith.png b/src/canonical/dex/front-shiny/347--0--Anorith.png similarity index 100% rename from src/canonical/dex/front-shiny/Anorith.png rename to src/canonical/dex/front-shiny/347--0--Anorith.png diff --git a/src/canonical/dex/front-shiny/Armaldo.png b/src/canonical/dex/front-shiny/348--0--Armaldo.png similarity index 100% rename from src/canonical/dex/front-shiny/Armaldo.png rename to src/canonical/dex/front-shiny/348--0--Armaldo.png diff --git a/src/canonical/dex/front-shiny/Feebas.png b/src/canonical/dex/front-shiny/349--0--Feebas.png similarity index 100% rename from src/canonical/dex/front-shiny/Feebas.png rename to src/canonical/dex/front-shiny/349--0--Feebas.png diff --git a/src/canonical/dex/front-shiny/Clefairy.png b/src/canonical/dex/front-shiny/35--0--Clefairy.png similarity index 100% rename from src/canonical/dex/front-shiny/Clefairy.png rename to src/canonical/dex/front-shiny/35--0--Clefairy.png diff --git a/src/canonical/dex/front-shiny/Milotic.png b/src/canonical/dex/front-shiny/350--0--Milotic.png similarity index 100% rename from src/canonical/dex/front-shiny/Milotic.png rename to src/canonical/dex/front-shiny/350--0--Milotic.png diff --git a/src/canonical/dex/front-shiny/Castform.png b/src/canonical/dex/front-shiny/351--0--Castform.png similarity index 100% rename from src/canonical/dex/front-shiny/Castform.png rename to src/canonical/dex/front-shiny/351--0--Castform.png diff --git a/src/canonical/dex/front-shiny/Castform--Rainy.png b/src/canonical/dex/front-shiny/351--420--Castform--Rainy.png similarity index 100% rename from src/canonical/dex/front-shiny/Castform--Rainy.png rename to src/canonical/dex/front-shiny/351--420--Castform--Rainy.png diff --git a/src/canonical/dex/front-shiny/Castform--Snowy.png b/src/canonical/dex/front-shiny/351--420--Castform--Snowy.png similarity index 100% rename from src/canonical/dex/front-shiny/Castform--Snowy.png rename to src/canonical/dex/front-shiny/351--420--Castform--Snowy.png diff --git a/src/canonical/dex/front-shiny/Castform--Sunny.png b/src/canonical/dex/front-shiny/351--420--Castform--Sunny.png similarity index 100% rename from src/canonical/dex/front-shiny/Castform--Sunny.png rename to src/canonical/dex/front-shiny/351--420--Castform--Sunny.png diff --git a/src/canonical/dex/front-shiny/Kecleon.png b/src/canonical/dex/front-shiny/352--0--Kecleon.png similarity index 100% rename from src/canonical/dex/front-shiny/Kecleon.png rename to src/canonical/dex/front-shiny/352--0--Kecleon.png diff --git a/src/canonical/dex/front-shiny/Shuppet.png b/src/canonical/dex/front-shiny/353--0--Shuppet.png similarity index 100% rename from src/canonical/dex/front-shiny/Shuppet.png rename to src/canonical/dex/front-shiny/353--0--Shuppet.png diff --git a/src/canonical/dex/front-shiny/Banette.png b/src/canonical/dex/front-shiny/354--0--Banette.png similarity index 100% rename from src/canonical/dex/front-shiny/Banette.png rename to src/canonical/dex/front-shiny/354--0--Banette.png diff --git a/src/canonical/dex/front-shiny/Banette--Mega.png b/src/canonical/dex/front-shiny/354--420--Banette--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Banette--Mega.png rename to src/canonical/dex/front-shiny/354--420--Banette--Mega.png diff --git a/src/canonical/dex/front-shiny/Duskull.png b/src/canonical/dex/front-shiny/355--0--Duskull.png similarity index 100% rename from src/canonical/dex/front-shiny/Duskull.png rename to src/canonical/dex/front-shiny/355--0--Duskull.png diff --git a/src/canonical/dex/front-shiny/Dusclops.png b/src/canonical/dex/front-shiny/356--0--Dusclops.png similarity index 100% rename from src/canonical/dex/front-shiny/Dusclops.png rename to src/canonical/dex/front-shiny/356--0--Dusclops.png diff --git a/src/canonical/dex/front-shiny/Tropius.png b/src/canonical/dex/front-shiny/357--0--Tropius.png similarity index 100% rename from src/canonical/dex/front-shiny/Tropius.png rename to src/canonical/dex/front-shiny/357--0--Tropius.png diff --git a/src/canonical/dex/front-shiny/Chimecho.png b/src/canonical/dex/front-shiny/358--0--Chimecho.png similarity index 100% rename from src/canonical/dex/front-shiny/Chimecho.png rename to src/canonical/dex/front-shiny/358--0--Chimecho.png diff --git a/src/canonical/dex/front-shiny/Absol.png b/src/canonical/dex/front-shiny/359--0--Absol.png similarity index 100% rename from src/canonical/dex/front-shiny/Absol.png rename to src/canonical/dex/front-shiny/359--0--Absol.png diff --git a/src/canonical/dex/front-shiny/Absol--Mega.png b/src/canonical/dex/front-shiny/359--420--Absol--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Absol--Mega.png rename to src/canonical/dex/front-shiny/359--420--Absol--Mega.png diff --git a/src/canonical/dex/front-shiny/Clefable.png b/src/canonical/dex/front-shiny/36--0--Clefable.png similarity index 100% rename from src/canonical/dex/front-shiny/Clefable.png rename to src/canonical/dex/front-shiny/36--0--Clefable.png diff --git a/src/canonical/dex/front-shiny/Wynaut.png b/src/canonical/dex/front-shiny/360--0--Wynaut.png similarity index 100% rename from src/canonical/dex/front-shiny/Wynaut.png rename to src/canonical/dex/front-shiny/360--0--Wynaut.png diff --git a/src/canonical/dex/front-shiny/Snorunt.png b/src/canonical/dex/front-shiny/361--0--Snorunt.png similarity index 100% rename from src/canonical/dex/front-shiny/Snorunt.png rename to src/canonical/dex/front-shiny/361--0--Snorunt.png diff --git a/src/canonical/dex/front-shiny/Glalie.png b/src/canonical/dex/front-shiny/362--0--Glalie.png similarity index 100% rename from src/canonical/dex/front-shiny/Glalie.png rename to src/canonical/dex/front-shiny/362--0--Glalie.png diff --git a/src/canonical/dex/front-shiny/Glalie--Mega.png b/src/canonical/dex/front-shiny/362--420--Glalie--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Glalie--Mega.png rename to src/canonical/dex/front-shiny/362--420--Glalie--Mega.png diff --git a/src/canonical/dex/front-shiny/Spheal.png b/src/canonical/dex/front-shiny/363--0--Spheal.png similarity index 100% rename from src/canonical/dex/front-shiny/Spheal.png rename to src/canonical/dex/front-shiny/363--0--Spheal.png diff --git a/src/canonical/dex/front-shiny/Sealeo.png b/src/canonical/dex/front-shiny/364--0--Sealeo.png similarity index 100% rename from src/canonical/dex/front-shiny/Sealeo.png rename to src/canonical/dex/front-shiny/364--0--Sealeo.png diff --git a/src/canonical/dex/front-shiny/Walrein.png b/src/canonical/dex/front-shiny/365--0--Walrein.png similarity index 100% rename from src/canonical/dex/front-shiny/Walrein.png rename to src/canonical/dex/front-shiny/365--0--Walrein.png diff --git a/src/canonical/dex/front-shiny/Clamperl.png b/src/canonical/dex/front-shiny/366--0--Clamperl.png similarity index 100% rename from src/canonical/dex/front-shiny/Clamperl.png rename to src/canonical/dex/front-shiny/366--0--Clamperl.png diff --git a/src/canonical/dex/front-shiny/Huntail.png b/src/canonical/dex/front-shiny/367--0--Huntail.png similarity index 100% rename from src/canonical/dex/front-shiny/Huntail.png rename to src/canonical/dex/front-shiny/367--0--Huntail.png diff --git a/src/canonical/dex/front-shiny/Gorebyss.png b/src/canonical/dex/front-shiny/368--0--Gorebyss.png similarity index 100% rename from src/canonical/dex/front-shiny/Gorebyss.png rename to src/canonical/dex/front-shiny/368--0--Gorebyss.png diff --git a/src/canonical/dex/front-shiny/Relicanth.png b/src/canonical/dex/front-shiny/369--0--Relicanth.png similarity index 100% rename from src/canonical/dex/front-shiny/Relicanth.png rename to src/canonical/dex/front-shiny/369--0--Relicanth.png diff --git a/src/canonical/dex/front-shiny/Vulpix.png b/src/canonical/dex/front-shiny/37--0--Vulpix.png similarity index 100% rename from src/canonical/dex/front-shiny/Vulpix.png rename to src/canonical/dex/front-shiny/37--0--Vulpix.png diff --git a/src/canonical/dex/front-shiny/Vulpix--Alola.png b/src/canonical/dex/front-shiny/37--420--Vulpix--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Vulpix--Alola.png rename to src/canonical/dex/front-shiny/37--420--Vulpix--Alola.png diff --git a/src/canonical/dex/front-shiny/Luvdisc.png b/src/canonical/dex/front-shiny/370--0--Luvdisc.png similarity index 100% rename from src/canonical/dex/front-shiny/Luvdisc.png rename to src/canonical/dex/front-shiny/370--0--Luvdisc.png diff --git a/src/canonical/dex/front-shiny/Bagon.png b/src/canonical/dex/front-shiny/371--0--Bagon.png similarity index 100% rename from src/canonical/dex/front-shiny/Bagon.png rename to src/canonical/dex/front-shiny/371--0--Bagon.png diff --git a/src/canonical/dex/front-shiny/Shelgon.png b/src/canonical/dex/front-shiny/372--0--Shelgon.png similarity index 100% rename from src/canonical/dex/front-shiny/Shelgon.png rename to src/canonical/dex/front-shiny/372--0--Shelgon.png diff --git a/src/canonical/dex/front-shiny/Salamence.png b/src/canonical/dex/front-shiny/373--0--Salamence.png similarity index 100% rename from src/canonical/dex/front-shiny/Salamence.png rename to src/canonical/dex/front-shiny/373--0--Salamence.png diff --git a/src/canonical/dex/front-shiny/Salamence--Mega.png b/src/canonical/dex/front-shiny/373--420--Salamence--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Salamence--Mega.png rename to src/canonical/dex/front-shiny/373--420--Salamence--Mega.png diff --git a/src/canonical/dex/front-shiny/Beldum.png b/src/canonical/dex/front-shiny/374--0--Beldum.png similarity index 100% rename from src/canonical/dex/front-shiny/Beldum.png rename to src/canonical/dex/front-shiny/374--0--Beldum.png diff --git a/src/canonical/dex/front-shiny/Metang.png b/src/canonical/dex/front-shiny/375--0--Metang.png similarity index 100% rename from src/canonical/dex/front-shiny/Metang.png rename to src/canonical/dex/front-shiny/375--0--Metang.png diff --git a/src/canonical/dex/front-shiny/Metagross.png b/src/canonical/dex/front-shiny/376--0--Metagross.png similarity index 100% rename from src/canonical/dex/front-shiny/Metagross.png rename to src/canonical/dex/front-shiny/376--0--Metagross.png diff --git a/src/canonical/dex/front-shiny/Metagross--Mega.png b/src/canonical/dex/front-shiny/376--420--Metagross--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Metagross--Mega.png rename to src/canonical/dex/front-shiny/376--420--Metagross--Mega.png diff --git a/src/canonical/dex/front-shiny/Regirock.png b/src/canonical/dex/front-shiny/377--0--Regirock.png similarity index 100% rename from src/canonical/dex/front-shiny/Regirock.png rename to src/canonical/dex/front-shiny/377--0--Regirock.png diff --git a/src/canonical/dex/front-shiny/Regice.png b/src/canonical/dex/front-shiny/378--0--Regice.png similarity index 100% rename from src/canonical/dex/front-shiny/Regice.png rename to src/canonical/dex/front-shiny/378--0--Regice.png diff --git a/src/canonical/dex/front-shiny/Registeel.png b/src/canonical/dex/front-shiny/379--0--Registeel.png similarity index 100% rename from src/canonical/dex/front-shiny/Registeel.png rename to src/canonical/dex/front-shiny/379--0--Registeel.png diff --git a/src/canonical/dex/front-shiny/Ninetales.png b/src/canonical/dex/front-shiny/38--0--Ninetales.png similarity index 100% rename from src/canonical/dex/front-shiny/Ninetales.png rename to src/canonical/dex/front-shiny/38--0--Ninetales.png diff --git a/src/canonical/dex/front-shiny/Ninetales--Alola.png b/src/canonical/dex/front-shiny/38--420--Ninetales--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Ninetales--Alola.png rename to src/canonical/dex/front-shiny/38--420--Ninetales--Alola.png diff --git a/src/canonical/dex/front-shiny/Latias.png b/src/canonical/dex/front-shiny/380--0--Latias.png similarity index 100% rename from src/canonical/dex/front-shiny/Latias.png rename to src/canonical/dex/front-shiny/380--0--Latias.png diff --git a/src/canonical/dex/front-shiny/Latias--Mega.png b/src/canonical/dex/front-shiny/380--420--Latias--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Latias--Mega.png rename to src/canonical/dex/front-shiny/380--420--Latias--Mega.png diff --git a/src/canonical/dex/front-shiny/Latios.png b/src/canonical/dex/front-shiny/381--0--Latios.png similarity index 100% rename from src/canonical/dex/front-shiny/Latios.png rename to src/canonical/dex/front-shiny/381--0--Latios.png diff --git a/src/canonical/dex/front-shiny/Latios--Mega.png b/src/canonical/dex/front-shiny/381--420--Latios--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Latios--Mega.png rename to src/canonical/dex/front-shiny/381--420--Latios--Mega.png diff --git a/src/canonical/dex/front-shiny/Kyogre.png b/src/canonical/dex/front-shiny/382--0--Kyogre.png similarity index 100% rename from src/canonical/dex/front-shiny/Kyogre.png rename to src/canonical/dex/front-shiny/382--0--Kyogre.png diff --git a/src/canonical/dex/front-shiny/Kyogre--Primal.png b/src/canonical/dex/front-shiny/382--420--Kyogre--Primal.png similarity index 100% rename from src/canonical/dex/front-shiny/Kyogre--Primal.png rename to src/canonical/dex/front-shiny/382--420--Kyogre--Primal.png diff --git a/src/canonical/dex/front-shiny/Groudon.png b/src/canonical/dex/front-shiny/383--0--Groudon.png similarity index 100% rename from src/canonical/dex/front-shiny/Groudon.png rename to src/canonical/dex/front-shiny/383--0--Groudon.png diff --git a/src/canonical/dex/front-shiny/Groudon--Primal.png b/src/canonical/dex/front-shiny/383--420--Groudon--Primal.png similarity index 100% rename from src/canonical/dex/front-shiny/Groudon--Primal.png rename to src/canonical/dex/front-shiny/383--420--Groudon--Primal.png diff --git a/src/canonical/dex/front-shiny/Rayquaza.png b/src/canonical/dex/front-shiny/384--0--Rayquaza.png similarity index 100% rename from src/canonical/dex/front-shiny/Rayquaza.png rename to src/canonical/dex/front-shiny/384--0--Rayquaza.png diff --git a/src/canonical/dex/front-shiny/Rayquaza--Mega.png b/src/canonical/dex/front-shiny/384--420--Rayquaza--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Rayquaza--Mega.png rename to src/canonical/dex/front-shiny/384--420--Rayquaza--Mega.png diff --git a/src/canonical/dex/front-shiny/Jirachi.png b/src/canonical/dex/front-shiny/385--0--Jirachi.png similarity index 100% rename from src/canonical/dex/front-shiny/Jirachi.png rename to src/canonical/dex/front-shiny/385--0--Jirachi.png diff --git a/src/canonical/dex/front-shiny/Deoxys.png b/src/canonical/dex/front-shiny/386--0--Deoxys.png similarity index 100% rename from src/canonical/dex/front-shiny/Deoxys.png rename to src/canonical/dex/front-shiny/386--0--Deoxys.png diff --git a/src/canonical/dex/front-shiny/Deoxys--Attack.png b/src/canonical/dex/front-shiny/386--420--Deoxys--Attack.png similarity index 100% rename from src/canonical/dex/front-shiny/Deoxys--Attack.png rename to src/canonical/dex/front-shiny/386--420--Deoxys--Attack.png diff --git a/src/canonical/dex/front-shiny/Deoxys--Defense.png b/src/canonical/dex/front-shiny/386--420--Deoxys--Defense.png similarity index 100% rename from src/canonical/dex/front-shiny/Deoxys--Defense.png rename to src/canonical/dex/front-shiny/386--420--Deoxys--Defense.png diff --git a/src/canonical/dex/front-shiny/Deoxys--Speed.png b/src/canonical/dex/front-shiny/386--420--Deoxys--Speed.png similarity index 100% rename from src/canonical/dex/front-shiny/Deoxys--Speed.png rename to src/canonical/dex/front-shiny/386--420--Deoxys--Speed.png diff --git a/src/canonical/dex/front-shiny/Turtwig.png b/src/canonical/dex/front-shiny/387--0--Turtwig.png similarity index 100% rename from src/canonical/dex/front-shiny/Turtwig.png rename to src/canonical/dex/front-shiny/387--0--Turtwig.png diff --git a/src/canonical/dex/front-shiny/Grotle.png b/src/canonical/dex/front-shiny/388--0--Grotle.png similarity index 100% rename from src/canonical/dex/front-shiny/Grotle.png rename to src/canonical/dex/front-shiny/388--0--Grotle.png diff --git a/src/canonical/dex/front-shiny/Torterra.png b/src/canonical/dex/front-shiny/389--0--Torterra.png similarity index 100% rename from src/canonical/dex/front-shiny/Torterra.png rename to src/canonical/dex/front-shiny/389--0--Torterra.png diff --git a/src/canonical/dex/front-shiny/Jigglypuff.png b/src/canonical/dex/front-shiny/39--0--Jigglypuff.png similarity index 100% rename from src/canonical/dex/front-shiny/Jigglypuff.png rename to src/canonical/dex/front-shiny/39--0--Jigglypuff.png diff --git a/src/canonical/dex/front-shiny/Chimchar.png b/src/canonical/dex/front-shiny/390--0--Chimchar.png similarity index 100% rename from src/canonical/dex/front-shiny/Chimchar.png rename to src/canonical/dex/front-shiny/390--0--Chimchar.png diff --git a/src/canonical/dex/front-shiny/Monferno.png b/src/canonical/dex/front-shiny/391--0--Monferno.png similarity index 100% rename from src/canonical/dex/front-shiny/Monferno.png rename to src/canonical/dex/front-shiny/391--0--Monferno.png diff --git a/src/canonical/dex/front-shiny/Infernape.png b/src/canonical/dex/front-shiny/392--0--Infernape.png similarity index 100% rename from src/canonical/dex/front-shiny/Infernape.png rename to src/canonical/dex/front-shiny/392--0--Infernape.png diff --git a/src/canonical/dex/front-shiny/Piplup.png b/src/canonical/dex/front-shiny/393--0--Piplup.png similarity index 100% rename from src/canonical/dex/front-shiny/Piplup.png rename to src/canonical/dex/front-shiny/393--0--Piplup.png diff --git a/src/canonical/dex/front-shiny/Prinplup.png b/src/canonical/dex/front-shiny/394--0--Prinplup.png similarity index 100% rename from src/canonical/dex/front-shiny/Prinplup.png rename to src/canonical/dex/front-shiny/394--0--Prinplup.png diff --git a/src/canonical/dex/front-shiny/Empoleon.png b/src/canonical/dex/front-shiny/395--0--Empoleon.png similarity index 100% rename from src/canonical/dex/front-shiny/Empoleon.png rename to src/canonical/dex/front-shiny/395--0--Empoleon.png diff --git a/src/canonical/dex/front-shiny/Starly.png b/src/canonical/dex/front-shiny/396--0--Starly.png similarity index 100% rename from src/canonical/dex/front-shiny/Starly.png rename to src/canonical/dex/front-shiny/396--0--Starly.png diff --git a/src/canonical/dex/front-shiny/Staravia.png b/src/canonical/dex/front-shiny/397--0--Staravia.png similarity index 100% rename from src/canonical/dex/front-shiny/Staravia.png rename to src/canonical/dex/front-shiny/397--0--Staravia.png diff --git a/src/canonical/dex/front-shiny/Staraptor.png b/src/canonical/dex/front-shiny/398--0--Staraptor.png similarity index 100% rename from src/canonical/dex/front-shiny/Staraptor.png rename to src/canonical/dex/front-shiny/398--0--Staraptor.png diff --git a/src/canonical/dex/front-shiny/Bidoof.png b/src/canonical/dex/front-shiny/399--0--Bidoof.png similarity index 100% rename from src/canonical/dex/front-shiny/Bidoof.png rename to src/canonical/dex/front-shiny/399--0--Bidoof.png diff --git a/src/canonical/dex/front-shiny/Charmander.png b/src/canonical/dex/front-shiny/4--0--Charmander.png similarity index 100% rename from src/canonical/dex/front-shiny/Charmander.png rename to src/canonical/dex/front-shiny/4--0--Charmander.png diff --git a/src/canonical/dex/front-shiny/Wigglytuff.png b/src/canonical/dex/front-shiny/40--0--Wigglytuff.png similarity index 100% rename from src/canonical/dex/front-shiny/Wigglytuff.png rename to src/canonical/dex/front-shiny/40--0--Wigglytuff.png diff --git a/src/canonical/dex/front-shiny/Bibarel.png b/src/canonical/dex/front-shiny/400--0--Bibarel.png similarity index 100% rename from src/canonical/dex/front-shiny/Bibarel.png rename to src/canonical/dex/front-shiny/400--0--Bibarel.png diff --git a/src/canonical/dex/front-shiny/Kricketot.png b/src/canonical/dex/front-shiny/401--0--Kricketot.png similarity index 100% rename from src/canonical/dex/front-shiny/Kricketot.png rename to src/canonical/dex/front-shiny/401--0--Kricketot.png diff --git a/src/canonical/dex/front-shiny/Kricketune.png b/src/canonical/dex/front-shiny/402--0--Kricketune.png similarity index 100% rename from src/canonical/dex/front-shiny/Kricketune.png rename to src/canonical/dex/front-shiny/402--0--Kricketune.png diff --git a/src/canonical/dex/front-shiny/Shinx.png b/src/canonical/dex/front-shiny/403--0--Shinx.png similarity index 100% rename from src/canonical/dex/front-shiny/Shinx.png rename to src/canonical/dex/front-shiny/403--0--Shinx.png diff --git a/src/canonical/dex/front-shiny/Luxio.png b/src/canonical/dex/front-shiny/404--0--Luxio.png similarity index 100% rename from src/canonical/dex/front-shiny/Luxio.png rename to src/canonical/dex/front-shiny/404--0--Luxio.png diff --git a/src/canonical/dex/front-shiny/Luxray.png b/src/canonical/dex/front-shiny/405--0--Luxray.png similarity index 100% rename from src/canonical/dex/front-shiny/Luxray.png rename to src/canonical/dex/front-shiny/405--0--Luxray.png diff --git a/src/canonical/dex/front-shiny/Budew.png b/src/canonical/dex/front-shiny/406--0--Budew.png similarity index 100% rename from src/canonical/dex/front-shiny/Budew.png rename to src/canonical/dex/front-shiny/406--0--Budew.png diff --git a/src/canonical/dex/front-shiny/Roserade.png b/src/canonical/dex/front-shiny/407--0--Roserade.png similarity index 100% rename from src/canonical/dex/front-shiny/Roserade.png rename to src/canonical/dex/front-shiny/407--0--Roserade.png diff --git a/src/canonical/dex/front-shiny/Cranidos.png b/src/canonical/dex/front-shiny/408--0--Cranidos.png similarity index 100% rename from src/canonical/dex/front-shiny/Cranidos.png rename to src/canonical/dex/front-shiny/408--0--Cranidos.png diff --git a/src/canonical/dex/front-shiny/Rampardos.png b/src/canonical/dex/front-shiny/409--0--Rampardos.png similarity index 100% rename from src/canonical/dex/front-shiny/Rampardos.png rename to src/canonical/dex/front-shiny/409--0--Rampardos.png diff --git a/src/canonical/dex/front-shiny/Zubat.png b/src/canonical/dex/front-shiny/41--0--Zubat.png similarity index 100% rename from src/canonical/dex/front-shiny/Zubat.png rename to src/canonical/dex/front-shiny/41--0--Zubat.png diff --git a/src/canonical/dex/front-shiny/Shieldon.png b/src/canonical/dex/front-shiny/410--0--Shieldon.png similarity index 100% rename from src/canonical/dex/front-shiny/Shieldon.png rename to src/canonical/dex/front-shiny/410--0--Shieldon.png diff --git a/src/canonical/dex/front-shiny/Bastiodon.png b/src/canonical/dex/front-shiny/411--0--Bastiodon.png similarity index 100% rename from src/canonical/dex/front-shiny/Bastiodon.png rename to src/canonical/dex/front-shiny/411--0--Bastiodon.png diff --git a/src/canonical/dex/front-shiny/Burmy.png b/src/canonical/dex/front-shiny/412--0--Burmy.png similarity index 100% rename from src/canonical/dex/front-shiny/Burmy.png rename to src/canonical/dex/front-shiny/412--0--Burmy.png diff --git a/src/canonical/dex/front-shiny/Wormadam.png b/src/canonical/dex/front-shiny/413--0--Wormadam.png similarity index 100% rename from src/canonical/dex/front-shiny/Wormadam.png rename to src/canonical/dex/front-shiny/413--0--Wormadam.png diff --git a/src/canonical/dex/front-shiny/Wormadam--Sandy.png b/src/canonical/dex/front-shiny/413--420--Wormadam--Sandy.png similarity index 100% rename from src/canonical/dex/front-shiny/Wormadam--Sandy.png rename to src/canonical/dex/front-shiny/413--420--Wormadam--Sandy.png diff --git a/src/canonical/dex/front-shiny/Wormadam--Trash.png b/src/canonical/dex/front-shiny/413--420--Wormadam--Trash.png similarity index 100% rename from src/canonical/dex/front-shiny/Wormadam--Trash.png rename to src/canonical/dex/front-shiny/413--420--Wormadam--Trash.png diff --git a/src/canonical/dex/front-shiny/Mothim.png b/src/canonical/dex/front-shiny/414--0--Mothim.png similarity index 100% rename from src/canonical/dex/front-shiny/Mothim.png rename to src/canonical/dex/front-shiny/414--0--Mothim.png diff --git a/src/canonical/dex/front-shiny/Combee.png b/src/canonical/dex/front-shiny/415--0--Combee.png similarity index 100% rename from src/canonical/dex/front-shiny/Combee.png rename to src/canonical/dex/front-shiny/415--0--Combee.png diff --git a/src/canonical/dex/front-shiny/Vespiquen.png b/src/canonical/dex/front-shiny/416--0--Vespiquen.png similarity index 100% rename from src/canonical/dex/front-shiny/Vespiquen.png rename to src/canonical/dex/front-shiny/416--0--Vespiquen.png diff --git a/src/canonical/dex/front-shiny/Pachirisu.png b/src/canonical/dex/front-shiny/417--0--Pachirisu.png similarity index 100% rename from src/canonical/dex/front-shiny/Pachirisu.png rename to src/canonical/dex/front-shiny/417--0--Pachirisu.png diff --git a/src/canonical/dex/front-shiny/Buizel.png b/src/canonical/dex/front-shiny/418--0--Buizel.png similarity index 100% rename from src/canonical/dex/front-shiny/Buizel.png rename to src/canonical/dex/front-shiny/418--0--Buizel.png diff --git a/src/canonical/dex/front-shiny/Floatzel.png b/src/canonical/dex/front-shiny/419--0--Floatzel.png similarity index 100% rename from src/canonical/dex/front-shiny/Floatzel.png rename to src/canonical/dex/front-shiny/419--0--Floatzel.png diff --git a/src/canonical/dex/front-shiny/Golbat.png b/src/canonical/dex/front-shiny/42--0--Golbat.png similarity index 100% rename from src/canonical/dex/front-shiny/Golbat.png rename to src/canonical/dex/front-shiny/42--0--Golbat.png diff --git a/src/canonical/dex/front-shiny/Cherubi.png b/src/canonical/dex/front-shiny/420--0--Cherubi.png similarity index 100% rename from src/canonical/dex/front-shiny/Cherubi.png rename to src/canonical/dex/front-shiny/420--0--Cherubi.png diff --git a/src/canonical/dex/front-shiny/Cherrim.png b/src/canonical/dex/front-shiny/421--0--Cherrim.png similarity index 100% rename from src/canonical/dex/front-shiny/Cherrim.png rename to src/canonical/dex/front-shiny/421--0--Cherrim.png diff --git a/src/canonical/dex/front-shiny/Cherrim--Sunshine.png b/src/canonical/dex/front-shiny/421--420--Cherrim--Sunshine.png similarity index 100% rename from src/canonical/dex/front-shiny/Cherrim--Sunshine.png rename to src/canonical/dex/front-shiny/421--420--Cherrim--Sunshine.png diff --git a/src/canonical/dex/front-shiny/Shellos.png b/src/canonical/dex/front-shiny/422--0--Shellos.png similarity index 100% rename from src/canonical/dex/front-shiny/Shellos.png rename to src/canonical/dex/front-shiny/422--0--Shellos.png diff --git a/src/canonical/dex/front-shiny/Gastrodon.png b/src/canonical/dex/front-shiny/423--0--Gastrodon.png similarity index 100% rename from src/canonical/dex/front-shiny/Gastrodon.png rename to src/canonical/dex/front-shiny/423--0--Gastrodon.png diff --git a/src/canonical/dex/front-shiny/Ambipom.png b/src/canonical/dex/front-shiny/424--0--Ambipom.png similarity index 100% rename from src/canonical/dex/front-shiny/Ambipom.png rename to src/canonical/dex/front-shiny/424--0--Ambipom.png diff --git a/src/canonical/dex/front-shiny/Drifloon.png b/src/canonical/dex/front-shiny/425--0--Drifloon.png similarity index 100% rename from src/canonical/dex/front-shiny/Drifloon.png rename to src/canonical/dex/front-shiny/425--0--Drifloon.png diff --git a/src/canonical/dex/front-shiny/Drifblim.png b/src/canonical/dex/front-shiny/426--0--Drifblim.png similarity index 100% rename from src/canonical/dex/front-shiny/Drifblim.png rename to src/canonical/dex/front-shiny/426--0--Drifblim.png diff --git a/src/canonical/dex/front-shiny/Buneary.png b/src/canonical/dex/front-shiny/427--0--Buneary.png similarity index 100% rename from src/canonical/dex/front-shiny/Buneary.png rename to src/canonical/dex/front-shiny/427--0--Buneary.png diff --git a/src/canonical/dex/front-shiny/Lopunny.png b/src/canonical/dex/front-shiny/428--0--Lopunny.png similarity index 100% rename from src/canonical/dex/front-shiny/Lopunny.png rename to src/canonical/dex/front-shiny/428--0--Lopunny.png diff --git a/src/canonical/dex/front-shiny/Lopunny--Mega.png b/src/canonical/dex/front-shiny/428--420--Lopunny--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Lopunny--Mega.png rename to src/canonical/dex/front-shiny/428--420--Lopunny--Mega.png diff --git a/src/canonical/dex/front-shiny/Mismagius.png b/src/canonical/dex/front-shiny/429--0--Mismagius.png similarity index 100% rename from src/canonical/dex/front-shiny/Mismagius.png rename to src/canonical/dex/front-shiny/429--0--Mismagius.png diff --git a/src/canonical/dex/front-shiny/Oddish.png b/src/canonical/dex/front-shiny/43--0--Oddish.png similarity index 100% rename from src/canonical/dex/front-shiny/Oddish.png rename to src/canonical/dex/front-shiny/43--0--Oddish.png diff --git a/src/canonical/dex/front-shiny/Honchkrow.png b/src/canonical/dex/front-shiny/430--0--Honchkrow.png similarity index 100% rename from src/canonical/dex/front-shiny/Honchkrow.png rename to src/canonical/dex/front-shiny/430--0--Honchkrow.png diff --git a/src/canonical/dex/front-shiny/Glameow.png b/src/canonical/dex/front-shiny/431--0--Glameow.png similarity index 100% rename from src/canonical/dex/front-shiny/Glameow.png rename to src/canonical/dex/front-shiny/431--0--Glameow.png diff --git a/src/canonical/dex/front-shiny/Purugly.png b/src/canonical/dex/front-shiny/432--0--Purugly.png similarity index 100% rename from src/canonical/dex/front-shiny/Purugly.png rename to src/canonical/dex/front-shiny/432--0--Purugly.png diff --git a/src/canonical/dex/front-shiny/Chingling.png b/src/canonical/dex/front-shiny/433--0--Chingling.png similarity index 100% rename from src/canonical/dex/front-shiny/Chingling.png rename to src/canonical/dex/front-shiny/433--0--Chingling.png diff --git a/src/canonical/dex/front-shiny/Stunky.png b/src/canonical/dex/front-shiny/434--0--Stunky.png similarity index 100% rename from src/canonical/dex/front-shiny/Stunky.png rename to src/canonical/dex/front-shiny/434--0--Stunky.png diff --git a/src/canonical/dex/front-shiny/Skuntank.png b/src/canonical/dex/front-shiny/435--0--Skuntank.png similarity index 100% rename from src/canonical/dex/front-shiny/Skuntank.png rename to src/canonical/dex/front-shiny/435--0--Skuntank.png diff --git a/src/canonical/dex/front-shiny/Bronzor.png b/src/canonical/dex/front-shiny/436--0--Bronzor.png similarity index 100% rename from src/canonical/dex/front-shiny/Bronzor.png rename to src/canonical/dex/front-shiny/436--0--Bronzor.png diff --git a/src/canonical/dex/front-shiny/Bronzong.png b/src/canonical/dex/front-shiny/437--0--Bronzong.png similarity index 100% rename from src/canonical/dex/front-shiny/Bronzong.png rename to src/canonical/dex/front-shiny/437--0--Bronzong.png diff --git a/src/canonical/dex/front-shiny/Bonsly.png b/src/canonical/dex/front-shiny/438--0--Bonsly.png similarity index 100% rename from src/canonical/dex/front-shiny/Bonsly.png rename to src/canonical/dex/front-shiny/438--0--Bonsly.png diff --git a/src/canonical/dex/front-shiny/Mime_Jr..png b/src/canonical/dex/front-shiny/439--0--Mime_Jr..png similarity index 100% rename from src/canonical/dex/front-shiny/Mime_Jr..png rename to src/canonical/dex/front-shiny/439--0--Mime_Jr..png diff --git a/src/canonical/dex/front-shiny/Gloom.png b/src/canonical/dex/front-shiny/44--0--Gloom.png similarity index 100% rename from src/canonical/dex/front-shiny/Gloom.png rename to src/canonical/dex/front-shiny/44--0--Gloom.png diff --git a/src/canonical/dex/front-shiny/Happiny.png b/src/canonical/dex/front-shiny/440--0--Happiny.png similarity index 100% rename from src/canonical/dex/front-shiny/Happiny.png rename to src/canonical/dex/front-shiny/440--0--Happiny.png diff --git a/src/canonical/dex/front-shiny/Chatot.png b/src/canonical/dex/front-shiny/441--0--Chatot.png similarity index 100% rename from src/canonical/dex/front-shiny/Chatot.png rename to src/canonical/dex/front-shiny/441--0--Chatot.png diff --git a/src/canonical/dex/front-shiny/Spiritomb.png b/src/canonical/dex/front-shiny/442--0--Spiritomb.png similarity index 100% rename from src/canonical/dex/front-shiny/Spiritomb.png rename to src/canonical/dex/front-shiny/442--0--Spiritomb.png diff --git a/src/canonical/dex/front-shiny/Gible.png b/src/canonical/dex/front-shiny/443--0--Gible.png similarity index 100% rename from src/canonical/dex/front-shiny/Gible.png rename to src/canonical/dex/front-shiny/443--0--Gible.png diff --git a/src/canonical/dex/front-shiny/Gabite.png b/src/canonical/dex/front-shiny/444--0--Gabite.png similarity index 100% rename from src/canonical/dex/front-shiny/Gabite.png rename to src/canonical/dex/front-shiny/444--0--Gabite.png diff --git a/src/canonical/dex/front-shiny/Garchomp.png b/src/canonical/dex/front-shiny/445--0--Garchomp.png similarity index 100% rename from src/canonical/dex/front-shiny/Garchomp.png rename to src/canonical/dex/front-shiny/445--0--Garchomp.png diff --git a/src/canonical/dex/front-shiny/Garchomp--Mega.png b/src/canonical/dex/front-shiny/445--420--Garchomp--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Garchomp--Mega.png rename to src/canonical/dex/front-shiny/445--420--Garchomp--Mega.png diff --git a/src/canonical/dex/front-shiny/Munchlax.png b/src/canonical/dex/front-shiny/446--0--Munchlax.png similarity index 100% rename from src/canonical/dex/front-shiny/Munchlax.png rename to src/canonical/dex/front-shiny/446--0--Munchlax.png diff --git a/src/canonical/dex/front-shiny/Riolu.png b/src/canonical/dex/front-shiny/447--0--Riolu.png similarity index 100% rename from src/canonical/dex/front-shiny/Riolu.png rename to src/canonical/dex/front-shiny/447--0--Riolu.png diff --git a/src/canonical/dex/front-shiny/Lucario.png b/src/canonical/dex/front-shiny/448--0--Lucario.png similarity index 100% rename from src/canonical/dex/front-shiny/Lucario.png rename to src/canonical/dex/front-shiny/448--0--Lucario.png diff --git a/src/canonical/dex/front-shiny/Lucario--Mega.png b/src/canonical/dex/front-shiny/448--420--Lucario--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Lucario--Mega.png rename to src/canonical/dex/front-shiny/448--420--Lucario--Mega.png diff --git a/src/canonical/dex/front-shiny/Hippopotas.png b/src/canonical/dex/front-shiny/449--0--Hippopotas.png similarity index 100% rename from src/canonical/dex/front-shiny/Hippopotas.png rename to src/canonical/dex/front-shiny/449--0--Hippopotas.png diff --git a/src/canonical/dex/front-shiny/Vileplume.png b/src/canonical/dex/front-shiny/45--0--Vileplume.png similarity index 100% rename from src/canonical/dex/front-shiny/Vileplume.png rename to src/canonical/dex/front-shiny/45--0--Vileplume.png diff --git a/src/canonical/dex/front-shiny/Hippowdon.png b/src/canonical/dex/front-shiny/450--0--Hippowdon.png similarity index 100% rename from src/canonical/dex/front-shiny/Hippowdon.png rename to src/canonical/dex/front-shiny/450--0--Hippowdon.png diff --git a/src/canonical/dex/front-shiny/Skorupi.png b/src/canonical/dex/front-shiny/451--0--Skorupi.png similarity index 100% rename from src/canonical/dex/front-shiny/Skorupi.png rename to src/canonical/dex/front-shiny/451--0--Skorupi.png diff --git a/src/canonical/dex/front-shiny/Drapion.png b/src/canonical/dex/front-shiny/452--0--Drapion.png similarity index 100% rename from src/canonical/dex/front-shiny/Drapion.png rename to src/canonical/dex/front-shiny/452--0--Drapion.png diff --git a/src/canonical/dex/front-shiny/Croagunk.png b/src/canonical/dex/front-shiny/453--0--Croagunk.png similarity index 100% rename from src/canonical/dex/front-shiny/Croagunk.png rename to src/canonical/dex/front-shiny/453--0--Croagunk.png diff --git a/src/canonical/dex/front-shiny/Toxicroak.png b/src/canonical/dex/front-shiny/454--0--Toxicroak.png similarity index 100% rename from src/canonical/dex/front-shiny/Toxicroak.png rename to src/canonical/dex/front-shiny/454--0--Toxicroak.png diff --git a/src/canonical/dex/front-shiny/Carnivine.png b/src/canonical/dex/front-shiny/455--0--Carnivine.png similarity index 100% rename from src/canonical/dex/front-shiny/Carnivine.png rename to src/canonical/dex/front-shiny/455--0--Carnivine.png diff --git a/src/canonical/dex/front-shiny/Finneon.png b/src/canonical/dex/front-shiny/456--0--Finneon.png similarity index 100% rename from src/canonical/dex/front-shiny/Finneon.png rename to src/canonical/dex/front-shiny/456--0--Finneon.png diff --git a/src/canonical/dex/front-shiny/Lumineon.png b/src/canonical/dex/front-shiny/457--0--Lumineon.png similarity index 100% rename from src/canonical/dex/front-shiny/Lumineon.png rename to src/canonical/dex/front-shiny/457--0--Lumineon.png diff --git a/src/canonical/dex/front-shiny/Mantyke.png b/src/canonical/dex/front-shiny/458--0--Mantyke.png similarity index 100% rename from src/canonical/dex/front-shiny/Mantyke.png rename to src/canonical/dex/front-shiny/458--0--Mantyke.png diff --git a/src/canonical/dex/front-shiny/Snover.png b/src/canonical/dex/front-shiny/459--0--Snover.png similarity index 100% rename from src/canonical/dex/front-shiny/Snover.png rename to src/canonical/dex/front-shiny/459--0--Snover.png diff --git a/src/canonical/dex/front-shiny/Paras.png b/src/canonical/dex/front-shiny/46--0--Paras.png similarity index 100% rename from src/canonical/dex/front-shiny/Paras.png rename to src/canonical/dex/front-shiny/46--0--Paras.png diff --git a/src/canonical/dex/front-shiny/Abomasnow.png b/src/canonical/dex/front-shiny/460--0--Abomasnow.png similarity index 100% rename from src/canonical/dex/front-shiny/Abomasnow.png rename to src/canonical/dex/front-shiny/460--0--Abomasnow.png diff --git a/src/canonical/dex/front-shiny/Abomasnow--Mega.png b/src/canonical/dex/front-shiny/460--420--Abomasnow--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Abomasnow--Mega.png rename to src/canonical/dex/front-shiny/460--420--Abomasnow--Mega.png diff --git a/src/canonical/dex/front-shiny/Weavile.png b/src/canonical/dex/front-shiny/461--0--Weavile.png similarity index 100% rename from src/canonical/dex/front-shiny/Weavile.png rename to src/canonical/dex/front-shiny/461--0--Weavile.png diff --git a/src/canonical/dex/front-shiny/Magnezone.png b/src/canonical/dex/front-shiny/462--0--Magnezone.png similarity index 100% rename from src/canonical/dex/front-shiny/Magnezone.png rename to src/canonical/dex/front-shiny/462--0--Magnezone.png diff --git a/src/canonical/dex/front-shiny/Lickilicky.png b/src/canonical/dex/front-shiny/463--0--Lickilicky.png similarity index 100% rename from src/canonical/dex/front-shiny/Lickilicky.png rename to src/canonical/dex/front-shiny/463--0--Lickilicky.png diff --git a/src/canonical/dex/front-shiny/Rhyperior.png b/src/canonical/dex/front-shiny/464--0--Rhyperior.png similarity index 100% rename from src/canonical/dex/front-shiny/Rhyperior.png rename to src/canonical/dex/front-shiny/464--0--Rhyperior.png diff --git a/src/canonical/dex/front-shiny/Tangrowth.png b/src/canonical/dex/front-shiny/465--0--Tangrowth.png similarity index 100% rename from src/canonical/dex/front-shiny/Tangrowth.png rename to src/canonical/dex/front-shiny/465--0--Tangrowth.png diff --git a/src/canonical/dex/front-shiny/Electivire.png b/src/canonical/dex/front-shiny/466--0--Electivire.png similarity index 100% rename from src/canonical/dex/front-shiny/Electivire.png rename to src/canonical/dex/front-shiny/466--0--Electivire.png diff --git a/src/canonical/dex/front-shiny/Magmortar.png b/src/canonical/dex/front-shiny/467--0--Magmortar.png similarity index 100% rename from src/canonical/dex/front-shiny/Magmortar.png rename to src/canonical/dex/front-shiny/467--0--Magmortar.png diff --git a/src/canonical/dex/front-shiny/Togekiss.png b/src/canonical/dex/front-shiny/468--0--Togekiss.png similarity index 100% rename from src/canonical/dex/front-shiny/Togekiss.png rename to src/canonical/dex/front-shiny/468--0--Togekiss.png diff --git a/src/canonical/dex/front-shiny/Yanmega.png b/src/canonical/dex/front-shiny/469--0--Yanmega.png similarity index 100% rename from src/canonical/dex/front-shiny/Yanmega.png rename to src/canonical/dex/front-shiny/469--0--Yanmega.png diff --git a/src/canonical/dex/front-shiny/Parasect.png b/src/canonical/dex/front-shiny/47--0--Parasect.png similarity index 100% rename from src/canonical/dex/front-shiny/Parasect.png rename to src/canonical/dex/front-shiny/47--0--Parasect.png diff --git a/src/canonical/dex/front-shiny/Leafeon.png b/src/canonical/dex/front-shiny/470--0--Leafeon.png similarity index 100% rename from src/canonical/dex/front-shiny/Leafeon.png rename to src/canonical/dex/front-shiny/470--0--Leafeon.png diff --git a/src/canonical/dex/front-shiny/Glaceon.png b/src/canonical/dex/front-shiny/471--0--Glaceon.png similarity index 100% rename from src/canonical/dex/front-shiny/Glaceon.png rename to src/canonical/dex/front-shiny/471--0--Glaceon.png diff --git a/src/canonical/dex/front-shiny/Gliscor.png b/src/canonical/dex/front-shiny/472--0--Gliscor.png similarity index 100% rename from src/canonical/dex/front-shiny/Gliscor.png rename to src/canonical/dex/front-shiny/472--0--Gliscor.png diff --git a/src/canonical/dex/front-shiny/Mamoswine.png b/src/canonical/dex/front-shiny/473--0--Mamoswine.png similarity index 100% rename from src/canonical/dex/front-shiny/Mamoswine.png rename to src/canonical/dex/front-shiny/473--0--Mamoswine.png diff --git a/src/canonical/dex/front-shiny/Porygon-Z.png b/src/canonical/dex/front-shiny/474--0--Porygon-Z.png similarity index 100% rename from src/canonical/dex/front-shiny/Porygon-Z.png rename to src/canonical/dex/front-shiny/474--0--Porygon-Z.png diff --git a/src/canonical/dex/front-shiny/Gallade.png b/src/canonical/dex/front-shiny/475--0--Gallade.png similarity index 100% rename from src/canonical/dex/front-shiny/Gallade.png rename to src/canonical/dex/front-shiny/475--0--Gallade.png diff --git a/src/canonical/dex/front-shiny/Gallade--Mega.png b/src/canonical/dex/front-shiny/475--420--Gallade--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Gallade--Mega.png rename to src/canonical/dex/front-shiny/475--420--Gallade--Mega.png diff --git a/src/canonical/dex/front-shiny/Probopass.png b/src/canonical/dex/front-shiny/476--0--Probopass.png similarity index 100% rename from src/canonical/dex/front-shiny/Probopass.png rename to src/canonical/dex/front-shiny/476--0--Probopass.png diff --git a/src/canonical/dex/front-shiny/Dusknoir.png b/src/canonical/dex/front-shiny/477--0--Dusknoir.png similarity index 100% rename from src/canonical/dex/front-shiny/Dusknoir.png rename to src/canonical/dex/front-shiny/477--0--Dusknoir.png diff --git a/src/canonical/dex/front-shiny/Froslass.png b/src/canonical/dex/front-shiny/478--0--Froslass.png similarity index 100% rename from src/canonical/dex/front-shiny/Froslass.png rename to src/canonical/dex/front-shiny/478--0--Froslass.png diff --git a/src/canonical/dex/front-shiny/Rotom.png b/src/canonical/dex/front-shiny/479--0--Rotom.png similarity index 100% rename from src/canonical/dex/front-shiny/Rotom.png rename to src/canonical/dex/front-shiny/479--0--Rotom.png diff --git a/src/canonical/dex/front-shiny/Rotom--Fan.png b/src/canonical/dex/front-shiny/479--420--Rotom--Fan.png similarity index 100% rename from src/canonical/dex/front-shiny/Rotom--Fan.png rename to src/canonical/dex/front-shiny/479--420--Rotom--Fan.png diff --git a/src/canonical/dex/front-shiny/Rotom--Frost.png b/src/canonical/dex/front-shiny/479--420--Rotom--Frost.png similarity index 100% rename from src/canonical/dex/front-shiny/Rotom--Frost.png rename to src/canonical/dex/front-shiny/479--420--Rotom--Frost.png diff --git a/src/canonical/dex/front-shiny/Rotom--Heat.png b/src/canonical/dex/front-shiny/479--420--Rotom--Heat.png similarity index 100% rename from src/canonical/dex/front-shiny/Rotom--Heat.png rename to src/canonical/dex/front-shiny/479--420--Rotom--Heat.png diff --git a/src/canonical/dex/front-shiny/Rotom--Mow.png b/src/canonical/dex/front-shiny/479--420--Rotom--Mow.png similarity index 100% rename from src/canonical/dex/front-shiny/Rotom--Mow.png rename to src/canonical/dex/front-shiny/479--420--Rotom--Mow.png diff --git a/src/canonical/dex/front-shiny/Rotom--Wash.png b/src/canonical/dex/front-shiny/479--420--Rotom--Wash.png similarity index 100% rename from src/canonical/dex/front-shiny/Rotom--Wash.png rename to src/canonical/dex/front-shiny/479--420--Rotom--Wash.png diff --git a/src/canonical/dex/front-shiny/Venonat.png b/src/canonical/dex/front-shiny/48--0--Venonat.png similarity index 100% rename from src/canonical/dex/front-shiny/Venonat.png rename to src/canonical/dex/front-shiny/48--0--Venonat.png diff --git a/src/canonical/dex/front-shiny/Uxie.png b/src/canonical/dex/front-shiny/480--0--Uxie.png similarity index 100% rename from src/canonical/dex/front-shiny/Uxie.png rename to src/canonical/dex/front-shiny/480--0--Uxie.png diff --git a/src/canonical/dex/front-shiny/Mesprit.png b/src/canonical/dex/front-shiny/481--0--Mesprit.png similarity index 100% rename from src/canonical/dex/front-shiny/Mesprit.png rename to src/canonical/dex/front-shiny/481--0--Mesprit.png diff --git a/src/canonical/dex/front-shiny/Azelf.png b/src/canonical/dex/front-shiny/482--0--Azelf.png similarity index 100% rename from src/canonical/dex/front-shiny/Azelf.png rename to src/canonical/dex/front-shiny/482--0--Azelf.png diff --git a/src/canonical/dex/front-shiny/Dialga.png b/src/canonical/dex/front-shiny/483--0--Dialga.png similarity index 100% rename from src/canonical/dex/front-shiny/Dialga.png rename to src/canonical/dex/front-shiny/483--0--Dialga.png diff --git a/src/canonical/dex/front-shiny/Palkia.png b/src/canonical/dex/front-shiny/484--0--Palkia.png similarity index 100% rename from src/canonical/dex/front-shiny/Palkia.png rename to src/canonical/dex/front-shiny/484--0--Palkia.png diff --git a/src/canonical/dex/front-shiny/Heatran.png b/src/canonical/dex/front-shiny/485--0--Heatran.png similarity index 100% rename from src/canonical/dex/front-shiny/Heatran.png rename to src/canonical/dex/front-shiny/485--0--Heatran.png diff --git a/src/canonical/dex/front-shiny/Regigigas.png b/src/canonical/dex/front-shiny/486--0--Regigigas.png similarity index 100% rename from src/canonical/dex/front-shiny/Regigigas.png rename to src/canonical/dex/front-shiny/486--0--Regigigas.png diff --git a/src/canonical/dex/front-shiny/Giratina.png b/src/canonical/dex/front-shiny/487--0--Giratina.png similarity index 100% rename from src/canonical/dex/front-shiny/Giratina.png rename to src/canonical/dex/front-shiny/487--0--Giratina.png diff --git a/src/canonical/dex/front-shiny/Giratina--Origin.png b/src/canonical/dex/front-shiny/487--420--Giratina--Origin.png similarity index 100% rename from src/canonical/dex/front-shiny/Giratina--Origin.png rename to src/canonical/dex/front-shiny/487--420--Giratina--Origin.png diff --git a/src/canonical/dex/front-shiny/Cresselia.png b/src/canonical/dex/front-shiny/488--0--Cresselia.png similarity index 100% rename from src/canonical/dex/front-shiny/Cresselia.png rename to src/canonical/dex/front-shiny/488--0--Cresselia.png diff --git a/src/canonical/dex/front-shiny/Phione.png b/src/canonical/dex/front-shiny/489--0--Phione.png similarity index 100% rename from src/canonical/dex/front-shiny/Phione.png rename to src/canonical/dex/front-shiny/489--0--Phione.png diff --git a/src/canonical/dex/front-shiny/Venomoth.png b/src/canonical/dex/front-shiny/49--0--Venomoth.png similarity index 100% rename from src/canonical/dex/front-shiny/Venomoth.png rename to src/canonical/dex/front-shiny/49--0--Venomoth.png diff --git a/src/canonical/dex/front-shiny/Manaphy.png b/src/canonical/dex/front-shiny/490--0--Manaphy.png similarity index 100% rename from src/canonical/dex/front-shiny/Manaphy.png rename to src/canonical/dex/front-shiny/490--0--Manaphy.png diff --git a/src/canonical/dex/front-shiny/Darkrai.png b/src/canonical/dex/front-shiny/491--0--Darkrai.png similarity index 100% rename from src/canonical/dex/front-shiny/Darkrai.png rename to src/canonical/dex/front-shiny/491--0--Darkrai.png diff --git a/src/canonical/dex/front-shiny/Shaymin.png b/src/canonical/dex/front-shiny/492--0--Shaymin.png similarity index 100% rename from src/canonical/dex/front-shiny/Shaymin.png rename to src/canonical/dex/front-shiny/492--0--Shaymin.png diff --git a/src/canonical/dex/front-shiny/Shaymin--Sky.png b/src/canonical/dex/front-shiny/492--420--Shaymin--Sky.png similarity index 100% rename from src/canonical/dex/front-shiny/Shaymin--Sky.png rename to src/canonical/dex/front-shiny/492--420--Shaymin--Sky.png diff --git a/src/canonical/dex/front-shiny/Arceus.png b/src/canonical/dex/front-shiny/493--0--Arceus.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus.png rename to src/canonical/dex/front-shiny/493--0--Arceus.png diff --git a/src/canonical/dex/front-shiny/Arceus--Bug.png b/src/canonical/dex/front-shiny/493--420--Arceus--Bug.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Bug.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Bug.png diff --git a/src/canonical/dex/front-shiny/Arceus--Dark.png b/src/canonical/dex/front-shiny/493--420--Arceus--Dark.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Dark.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Dark.png diff --git a/src/canonical/dex/front-shiny/Arceus--Dragon.png b/src/canonical/dex/front-shiny/493--420--Arceus--Dragon.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Dragon.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Dragon.png diff --git a/src/canonical/dex/front-shiny/Arceus--Electric.png b/src/canonical/dex/front-shiny/493--420--Arceus--Electric.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Electric.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Electric.png diff --git a/src/canonical/dex/front-shiny/Arceus--Fairy.png b/src/canonical/dex/front-shiny/493--420--Arceus--Fairy.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Fairy.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Fairy.png diff --git a/src/canonical/dex/front-shiny/Arceus--Fighting.png b/src/canonical/dex/front-shiny/493--420--Arceus--Fighting.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Fighting.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Fighting.png diff --git a/src/canonical/dex/front-shiny/Arceus--Fire.png b/src/canonical/dex/front-shiny/493--420--Arceus--Fire.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Fire.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Fire.png diff --git a/src/canonical/dex/front-shiny/Arceus--Flying.png b/src/canonical/dex/front-shiny/493--420--Arceus--Flying.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Flying.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Flying.png diff --git a/src/canonical/dex/front-shiny/Arceus--Ghost.png b/src/canonical/dex/front-shiny/493--420--Arceus--Ghost.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Ghost.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Ghost.png diff --git a/src/canonical/dex/front-shiny/Arceus--Grass.png b/src/canonical/dex/front-shiny/493--420--Arceus--Grass.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Grass.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Grass.png diff --git a/src/canonical/dex/front-shiny/Arceus--Ground.png b/src/canonical/dex/front-shiny/493--420--Arceus--Ground.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Ground.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Ground.png diff --git a/src/canonical/dex/front-shiny/Arceus--Ice.png b/src/canonical/dex/front-shiny/493--420--Arceus--Ice.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Ice.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Ice.png diff --git a/src/canonical/dex/front-shiny/Arceus--Poison.png b/src/canonical/dex/front-shiny/493--420--Arceus--Poison.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Poison.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Poison.png diff --git a/src/canonical/dex/front-shiny/Arceus--Psychic.png b/src/canonical/dex/front-shiny/493--420--Arceus--Psychic.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Psychic.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Psychic.png diff --git a/src/canonical/dex/front-shiny/Arceus--Rock.png b/src/canonical/dex/front-shiny/493--420--Arceus--Rock.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Rock.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Rock.png diff --git a/src/canonical/dex/front-shiny/Arceus--Steel.png b/src/canonical/dex/front-shiny/493--420--Arceus--Steel.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Steel.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Steel.png diff --git a/src/canonical/dex/front-shiny/Arceus--Water.png b/src/canonical/dex/front-shiny/493--420--Arceus--Water.png similarity index 100% rename from src/canonical/dex/front-shiny/Arceus--Water.png rename to src/canonical/dex/front-shiny/493--420--Arceus--Water.png diff --git a/src/canonical/dex/front-shiny/Victini.png b/src/canonical/dex/front-shiny/494--0--Victini.png similarity index 100% rename from src/canonical/dex/front-shiny/Victini.png rename to src/canonical/dex/front-shiny/494--0--Victini.png diff --git a/src/canonical/dex/front-shiny/Snivy.png b/src/canonical/dex/front-shiny/495--0--Snivy.png similarity index 100% rename from src/canonical/dex/front-shiny/Snivy.png rename to src/canonical/dex/front-shiny/495--0--Snivy.png diff --git a/src/canonical/dex/front-shiny/Servine.png b/src/canonical/dex/front-shiny/496--0--Servine.png similarity index 100% rename from src/canonical/dex/front-shiny/Servine.png rename to src/canonical/dex/front-shiny/496--0--Servine.png diff --git a/src/canonical/dex/front-shiny/Serperior.png b/src/canonical/dex/front-shiny/497--0--Serperior.png similarity index 100% rename from src/canonical/dex/front-shiny/Serperior.png rename to src/canonical/dex/front-shiny/497--0--Serperior.png diff --git a/src/canonical/dex/front-shiny/Tepig.png b/src/canonical/dex/front-shiny/498--0--Tepig.png similarity index 100% rename from src/canonical/dex/front-shiny/Tepig.png rename to src/canonical/dex/front-shiny/498--0--Tepig.png diff --git a/src/canonical/dex/front-shiny/Pignite.png b/src/canonical/dex/front-shiny/499--0--Pignite.png similarity index 100% rename from src/canonical/dex/front-shiny/Pignite.png rename to src/canonical/dex/front-shiny/499--0--Pignite.png diff --git a/src/canonical/dex/front-shiny/Charmeleon.png b/src/canonical/dex/front-shiny/5--0--Charmeleon.png similarity index 100% rename from src/canonical/dex/front-shiny/Charmeleon.png rename to src/canonical/dex/front-shiny/5--0--Charmeleon.png diff --git a/src/canonical/dex/front-shiny/Diglett.png b/src/canonical/dex/front-shiny/50--0--Diglett.png similarity index 100% rename from src/canonical/dex/front-shiny/Diglett.png rename to src/canonical/dex/front-shiny/50--0--Diglett.png diff --git a/src/canonical/dex/front-shiny/Diglett--Alola.png b/src/canonical/dex/front-shiny/50--420--Diglett--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Diglett--Alola.png rename to src/canonical/dex/front-shiny/50--420--Diglett--Alola.png diff --git a/src/canonical/dex/front-shiny/Emboar.png b/src/canonical/dex/front-shiny/500--0--Emboar.png similarity index 100% rename from src/canonical/dex/front-shiny/Emboar.png rename to src/canonical/dex/front-shiny/500--0--Emboar.png diff --git a/src/canonical/dex/front-shiny/Oshawott.png b/src/canonical/dex/front-shiny/501--0--Oshawott.png similarity index 100% rename from src/canonical/dex/front-shiny/Oshawott.png rename to src/canonical/dex/front-shiny/501--0--Oshawott.png diff --git a/src/canonical/dex/front-shiny/Dewott.png b/src/canonical/dex/front-shiny/502--0--Dewott.png similarity index 100% rename from src/canonical/dex/front-shiny/Dewott.png rename to src/canonical/dex/front-shiny/502--0--Dewott.png diff --git a/src/canonical/dex/front-shiny/Samurott.png b/src/canonical/dex/front-shiny/503--0--Samurott.png similarity index 100% rename from src/canonical/dex/front-shiny/Samurott.png rename to src/canonical/dex/front-shiny/503--0--Samurott.png diff --git a/src/canonical/dex/front-shiny/Patrat.png b/src/canonical/dex/front-shiny/504--0--Patrat.png similarity index 100% rename from src/canonical/dex/front-shiny/Patrat.png rename to src/canonical/dex/front-shiny/504--0--Patrat.png diff --git a/src/canonical/dex/front-shiny/Watchog.png b/src/canonical/dex/front-shiny/505--0--Watchog.png similarity index 100% rename from src/canonical/dex/front-shiny/Watchog.png rename to src/canonical/dex/front-shiny/505--0--Watchog.png diff --git a/src/canonical/dex/front-shiny/Lillipup.png b/src/canonical/dex/front-shiny/506--0--Lillipup.png similarity index 100% rename from src/canonical/dex/front-shiny/Lillipup.png rename to src/canonical/dex/front-shiny/506--0--Lillipup.png diff --git a/src/canonical/dex/front-shiny/Herdier.png b/src/canonical/dex/front-shiny/507--0--Herdier.png similarity index 100% rename from src/canonical/dex/front-shiny/Herdier.png rename to src/canonical/dex/front-shiny/507--0--Herdier.png diff --git a/src/canonical/dex/front-shiny/Stoutland.png b/src/canonical/dex/front-shiny/508--0--Stoutland.png similarity index 100% rename from src/canonical/dex/front-shiny/Stoutland.png rename to src/canonical/dex/front-shiny/508--0--Stoutland.png diff --git a/src/canonical/dex/front-shiny/Purrloin.png b/src/canonical/dex/front-shiny/509--0--Purrloin.png similarity index 100% rename from src/canonical/dex/front-shiny/Purrloin.png rename to src/canonical/dex/front-shiny/509--0--Purrloin.png diff --git a/src/canonical/dex/front-shiny/Dugtrio.png b/src/canonical/dex/front-shiny/51--0--Dugtrio.png similarity index 100% rename from src/canonical/dex/front-shiny/Dugtrio.png rename to src/canonical/dex/front-shiny/51--0--Dugtrio.png diff --git a/src/canonical/dex/front-shiny/Dugtrio--Alola.png b/src/canonical/dex/front-shiny/51--420--Dugtrio--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Dugtrio--Alola.png rename to src/canonical/dex/front-shiny/51--420--Dugtrio--Alola.png diff --git a/src/canonical/dex/front-shiny/Liepard.png b/src/canonical/dex/front-shiny/510--0--Liepard.png similarity index 100% rename from src/canonical/dex/front-shiny/Liepard.png rename to src/canonical/dex/front-shiny/510--0--Liepard.png diff --git a/src/canonical/dex/front-shiny/Pansage.png b/src/canonical/dex/front-shiny/511--0--Pansage.png similarity index 100% rename from src/canonical/dex/front-shiny/Pansage.png rename to src/canonical/dex/front-shiny/511--0--Pansage.png diff --git a/src/canonical/dex/front-shiny/Simisage.png b/src/canonical/dex/front-shiny/512--0--Simisage.png similarity index 100% rename from src/canonical/dex/front-shiny/Simisage.png rename to src/canonical/dex/front-shiny/512--0--Simisage.png diff --git a/src/canonical/dex/front-shiny/Pansear.png b/src/canonical/dex/front-shiny/513--0--Pansear.png similarity index 100% rename from src/canonical/dex/front-shiny/Pansear.png rename to src/canonical/dex/front-shiny/513--0--Pansear.png diff --git a/src/canonical/dex/front-shiny/Simisear.png b/src/canonical/dex/front-shiny/514--0--Simisear.png similarity index 100% rename from src/canonical/dex/front-shiny/Simisear.png rename to src/canonical/dex/front-shiny/514--0--Simisear.png diff --git a/src/canonical/dex/front-shiny/Panpour.png b/src/canonical/dex/front-shiny/515--0--Panpour.png similarity index 100% rename from src/canonical/dex/front-shiny/Panpour.png rename to src/canonical/dex/front-shiny/515--0--Panpour.png diff --git a/src/canonical/dex/front-shiny/Simipour.png b/src/canonical/dex/front-shiny/516--0--Simipour.png similarity index 100% rename from src/canonical/dex/front-shiny/Simipour.png rename to src/canonical/dex/front-shiny/516--0--Simipour.png diff --git a/src/canonical/dex/front-shiny/Munna.png b/src/canonical/dex/front-shiny/517--0--Munna.png similarity index 100% rename from src/canonical/dex/front-shiny/Munna.png rename to src/canonical/dex/front-shiny/517--0--Munna.png diff --git a/src/canonical/dex/front-shiny/Musharna.png b/src/canonical/dex/front-shiny/518--0--Musharna.png similarity index 100% rename from src/canonical/dex/front-shiny/Musharna.png rename to src/canonical/dex/front-shiny/518--0--Musharna.png diff --git a/src/canonical/dex/front-shiny/Pidove.png b/src/canonical/dex/front-shiny/519--0--Pidove.png similarity index 100% rename from src/canonical/dex/front-shiny/Pidove.png rename to src/canonical/dex/front-shiny/519--0--Pidove.png diff --git a/src/canonical/dex/front-shiny/Meowth.png b/src/canonical/dex/front-shiny/52--0--Meowth.png similarity index 100% rename from src/canonical/dex/front-shiny/Meowth.png rename to src/canonical/dex/front-shiny/52--0--Meowth.png diff --git a/src/canonical/dex/front-shiny/Meowth--Alola.png b/src/canonical/dex/front-shiny/52--420--Meowth--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Meowth--Alola.png rename to src/canonical/dex/front-shiny/52--420--Meowth--Alola.png diff --git a/src/canonical/dex/front-shiny/Tranquill.png b/src/canonical/dex/front-shiny/520--0--Tranquill.png similarity index 100% rename from src/canonical/dex/front-shiny/Tranquill.png rename to src/canonical/dex/front-shiny/520--0--Tranquill.png diff --git a/src/canonical/dex/front-shiny/Unfezant.png b/src/canonical/dex/front-shiny/521--0--Unfezant.png similarity index 100% rename from src/canonical/dex/front-shiny/Unfezant.png rename to src/canonical/dex/front-shiny/521--0--Unfezant.png diff --git a/src/canonical/dex/front-shiny/Blitzle.png b/src/canonical/dex/front-shiny/522--0--Blitzle.png similarity index 100% rename from src/canonical/dex/front-shiny/Blitzle.png rename to src/canonical/dex/front-shiny/522--0--Blitzle.png diff --git a/src/canonical/dex/front-shiny/Zebstrika.png b/src/canonical/dex/front-shiny/523--0--Zebstrika.png similarity index 100% rename from src/canonical/dex/front-shiny/Zebstrika.png rename to src/canonical/dex/front-shiny/523--0--Zebstrika.png diff --git a/src/canonical/dex/front-shiny/Roggenrola.png b/src/canonical/dex/front-shiny/524--0--Roggenrola.png similarity index 100% rename from src/canonical/dex/front-shiny/Roggenrola.png rename to src/canonical/dex/front-shiny/524--0--Roggenrola.png diff --git a/src/canonical/dex/front-shiny/Boldore.png b/src/canonical/dex/front-shiny/525--0--Boldore.png similarity index 100% rename from src/canonical/dex/front-shiny/Boldore.png rename to src/canonical/dex/front-shiny/525--0--Boldore.png diff --git a/src/canonical/dex/front-shiny/Gigalith.png b/src/canonical/dex/front-shiny/526--0--Gigalith.png similarity index 100% rename from src/canonical/dex/front-shiny/Gigalith.png rename to src/canonical/dex/front-shiny/526--0--Gigalith.png diff --git a/src/canonical/dex/front-shiny/Woobat.png b/src/canonical/dex/front-shiny/527--0--Woobat.png similarity index 100% rename from src/canonical/dex/front-shiny/Woobat.png rename to src/canonical/dex/front-shiny/527--0--Woobat.png diff --git a/src/canonical/dex/front-shiny/Swoobat.png b/src/canonical/dex/front-shiny/528--0--Swoobat.png similarity index 100% rename from src/canonical/dex/front-shiny/Swoobat.png rename to src/canonical/dex/front-shiny/528--0--Swoobat.png diff --git a/src/canonical/dex/front-shiny/Drilbur.png b/src/canonical/dex/front-shiny/529--0--Drilbur.png similarity index 100% rename from src/canonical/dex/front-shiny/Drilbur.png rename to src/canonical/dex/front-shiny/529--0--Drilbur.png diff --git a/src/canonical/dex/front-shiny/Persian.png b/src/canonical/dex/front-shiny/53--0--Persian.png similarity index 100% rename from src/canonical/dex/front-shiny/Persian.png rename to src/canonical/dex/front-shiny/53--0--Persian.png diff --git a/src/canonical/dex/front-shiny/Persian--Alola.png b/src/canonical/dex/front-shiny/53--420--Persian--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Persian--Alola.png rename to src/canonical/dex/front-shiny/53--420--Persian--Alola.png diff --git a/src/canonical/dex/front-shiny/Excadrill.png b/src/canonical/dex/front-shiny/530--0--Excadrill.png similarity index 100% rename from src/canonical/dex/front-shiny/Excadrill.png rename to src/canonical/dex/front-shiny/530--0--Excadrill.png diff --git a/src/canonical/dex/front-shiny/Audino.png b/src/canonical/dex/front-shiny/531--0--Audino.png similarity index 100% rename from src/canonical/dex/front-shiny/Audino.png rename to src/canonical/dex/front-shiny/531--0--Audino.png diff --git a/src/canonical/dex/front-shiny/Audino--Mega.png b/src/canonical/dex/front-shiny/531--420--Audino--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Audino--Mega.png rename to src/canonical/dex/front-shiny/531--420--Audino--Mega.png diff --git a/src/canonical/dex/front-shiny/Timburr.png b/src/canonical/dex/front-shiny/532--0--Timburr.png similarity index 100% rename from src/canonical/dex/front-shiny/Timburr.png rename to src/canonical/dex/front-shiny/532--0--Timburr.png diff --git a/src/canonical/dex/front-shiny/Gurdurr.png b/src/canonical/dex/front-shiny/533--0--Gurdurr.png similarity index 100% rename from src/canonical/dex/front-shiny/Gurdurr.png rename to src/canonical/dex/front-shiny/533--0--Gurdurr.png diff --git a/src/canonical/dex/front-shiny/Conkeldurr.png b/src/canonical/dex/front-shiny/534--0--Conkeldurr.png similarity index 100% rename from src/canonical/dex/front-shiny/Conkeldurr.png rename to src/canonical/dex/front-shiny/534--0--Conkeldurr.png diff --git a/src/canonical/dex/front-shiny/Tympole.png b/src/canonical/dex/front-shiny/535--0--Tympole.png similarity index 100% rename from src/canonical/dex/front-shiny/Tympole.png rename to src/canonical/dex/front-shiny/535--0--Tympole.png diff --git a/src/canonical/dex/front-shiny/Palpitoad.png b/src/canonical/dex/front-shiny/536--0--Palpitoad.png similarity index 100% rename from src/canonical/dex/front-shiny/Palpitoad.png rename to src/canonical/dex/front-shiny/536--0--Palpitoad.png diff --git a/src/canonical/dex/front-shiny/Seismitoad.png b/src/canonical/dex/front-shiny/537--0--Seismitoad.png similarity index 100% rename from src/canonical/dex/front-shiny/Seismitoad.png rename to src/canonical/dex/front-shiny/537--0--Seismitoad.png diff --git a/src/canonical/dex/front-shiny/Throh.png b/src/canonical/dex/front-shiny/538--0--Throh.png similarity index 100% rename from src/canonical/dex/front-shiny/Throh.png rename to src/canonical/dex/front-shiny/538--0--Throh.png diff --git a/src/canonical/dex/front-shiny/Sawk.png b/src/canonical/dex/front-shiny/539--0--Sawk.png similarity index 100% rename from src/canonical/dex/front-shiny/Sawk.png rename to src/canonical/dex/front-shiny/539--0--Sawk.png diff --git a/src/canonical/dex/front-shiny/Psyduck.png b/src/canonical/dex/front-shiny/54--0--Psyduck.png similarity index 100% rename from src/canonical/dex/front-shiny/Psyduck.png rename to src/canonical/dex/front-shiny/54--0--Psyduck.png diff --git a/src/canonical/dex/front-shiny/Sewaddle.png b/src/canonical/dex/front-shiny/540--0--Sewaddle.png similarity index 100% rename from src/canonical/dex/front-shiny/Sewaddle.png rename to src/canonical/dex/front-shiny/540--0--Sewaddle.png diff --git a/src/canonical/dex/front-shiny/Swadloon.png b/src/canonical/dex/front-shiny/541--0--Swadloon.png similarity index 100% rename from src/canonical/dex/front-shiny/Swadloon.png rename to src/canonical/dex/front-shiny/541--0--Swadloon.png diff --git a/src/canonical/dex/front-shiny/Leavanny.png b/src/canonical/dex/front-shiny/542--0--Leavanny.png similarity index 100% rename from src/canonical/dex/front-shiny/Leavanny.png rename to src/canonical/dex/front-shiny/542--0--Leavanny.png diff --git a/src/canonical/dex/front-shiny/Venipede.png b/src/canonical/dex/front-shiny/543--0--Venipede.png similarity index 100% rename from src/canonical/dex/front-shiny/Venipede.png rename to src/canonical/dex/front-shiny/543--0--Venipede.png diff --git a/src/canonical/dex/front-shiny/Whirlipede.png b/src/canonical/dex/front-shiny/544--0--Whirlipede.png similarity index 100% rename from src/canonical/dex/front-shiny/Whirlipede.png rename to src/canonical/dex/front-shiny/544--0--Whirlipede.png diff --git a/src/canonical/dex/front-shiny/Scolipede.png b/src/canonical/dex/front-shiny/545--0--Scolipede.png similarity index 100% rename from src/canonical/dex/front-shiny/Scolipede.png rename to src/canonical/dex/front-shiny/545--0--Scolipede.png diff --git a/src/canonical/dex/front-shiny/Cottonee.png b/src/canonical/dex/front-shiny/546--0--Cottonee.png similarity index 100% rename from src/canonical/dex/front-shiny/Cottonee.png rename to src/canonical/dex/front-shiny/546--0--Cottonee.png diff --git a/src/canonical/dex/front-shiny/Whimsicott.png b/src/canonical/dex/front-shiny/547--0--Whimsicott.png similarity index 100% rename from src/canonical/dex/front-shiny/Whimsicott.png rename to src/canonical/dex/front-shiny/547--0--Whimsicott.png diff --git a/src/canonical/dex/front-shiny/Petilil.png b/src/canonical/dex/front-shiny/548--0--Petilil.png similarity index 100% rename from src/canonical/dex/front-shiny/Petilil.png rename to src/canonical/dex/front-shiny/548--0--Petilil.png diff --git a/src/canonical/dex/front-shiny/Lilligant.png b/src/canonical/dex/front-shiny/549--0--Lilligant.png similarity index 100% rename from src/canonical/dex/front-shiny/Lilligant.png rename to src/canonical/dex/front-shiny/549--0--Lilligant.png diff --git a/src/canonical/dex/front-shiny/Golduck.png b/src/canonical/dex/front-shiny/55--0--Golduck.png similarity index 100% rename from src/canonical/dex/front-shiny/Golduck.png rename to src/canonical/dex/front-shiny/55--0--Golduck.png diff --git a/src/canonical/dex/front-shiny/Basculin.png b/src/canonical/dex/front-shiny/550--0--Basculin.png similarity index 100% rename from src/canonical/dex/front-shiny/Basculin.png rename to src/canonical/dex/front-shiny/550--0--Basculin.png diff --git a/src/canonical/dex/front-shiny/Basculin--Blue-Striped.png b/src/canonical/dex/front-shiny/550--420--Basculin--Blue-Striped.png similarity index 100% rename from src/canonical/dex/front-shiny/Basculin--Blue-Striped.png rename to src/canonical/dex/front-shiny/550--420--Basculin--Blue-Striped.png diff --git a/src/canonical/dex/front-shiny/Sandile.png b/src/canonical/dex/front-shiny/551--0--Sandile.png similarity index 100% rename from src/canonical/dex/front-shiny/Sandile.png rename to src/canonical/dex/front-shiny/551--0--Sandile.png diff --git a/src/canonical/dex/front-shiny/Krokorok.png b/src/canonical/dex/front-shiny/552--0--Krokorok.png similarity index 100% rename from src/canonical/dex/front-shiny/Krokorok.png rename to src/canonical/dex/front-shiny/552--0--Krokorok.png diff --git a/src/canonical/dex/front-shiny/Krookodile.png b/src/canonical/dex/front-shiny/553--0--Krookodile.png similarity index 100% rename from src/canonical/dex/front-shiny/Krookodile.png rename to src/canonical/dex/front-shiny/553--0--Krookodile.png diff --git a/src/canonical/dex/front-shiny/Darumaka.png b/src/canonical/dex/front-shiny/554--0--Darumaka.png similarity index 100% rename from src/canonical/dex/front-shiny/Darumaka.png rename to src/canonical/dex/front-shiny/554--0--Darumaka.png diff --git a/src/canonical/dex/front-shiny/Darmanitan.png b/src/canonical/dex/front-shiny/555--0--Darmanitan.png similarity index 100% rename from src/canonical/dex/front-shiny/Darmanitan.png rename to src/canonical/dex/front-shiny/555--0--Darmanitan.png diff --git a/src/canonical/dex/front-shiny/Darmanitan--Zen.png b/src/canonical/dex/front-shiny/555--420--Darmanitan--Zen.png similarity index 100% rename from src/canonical/dex/front-shiny/Darmanitan--Zen.png rename to src/canonical/dex/front-shiny/555--420--Darmanitan--Zen.png diff --git a/src/canonical/dex/front-shiny/Maractus.png b/src/canonical/dex/front-shiny/556--0--Maractus.png similarity index 100% rename from src/canonical/dex/front-shiny/Maractus.png rename to src/canonical/dex/front-shiny/556--0--Maractus.png diff --git a/src/canonical/dex/front-shiny/Dwebble.png b/src/canonical/dex/front-shiny/557--0--Dwebble.png similarity index 100% rename from src/canonical/dex/front-shiny/Dwebble.png rename to src/canonical/dex/front-shiny/557--0--Dwebble.png diff --git a/src/canonical/dex/front-shiny/Crustle.png b/src/canonical/dex/front-shiny/558--0--Crustle.png similarity index 100% rename from src/canonical/dex/front-shiny/Crustle.png rename to src/canonical/dex/front-shiny/558--0--Crustle.png diff --git a/src/canonical/dex/front-shiny/Scraggy.png b/src/canonical/dex/front-shiny/559--0--Scraggy.png similarity index 100% rename from src/canonical/dex/front-shiny/Scraggy.png rename to src/canonical/dex/front-shiny/559--0--Scraggy.png diff --git a/src/canonical/dex/front-shiny/Mankey.png b/src/canonical/dex/front-shiny/56--0--Mankey.png similarity index 100% rename from src/canonical/dex/front-shiny/Mankey.png rename to src/canonical/dex/front-shiny/56--0--Mankey.png diff --git a/src/canonical/dex/front-shiny/Scrafty.png b/src/canonical/dex/front-shiny/560--0--Scrafty.png similarity index 100% rename from src/canonical/dex/front-shiny/Scrafty.png rename to src/canonical/dex/front-shiny/560--0--Scrafty.png diff --git a/src/canonical/dex/front-shiny/Sigilyph.png b/src/canonical/dex/front-shiny/561--0--Sigilyph.png similarity index 100% rename from src/canonical/dex/front-shiny/Sigilyph.png rename to src/canonical/dex/front-shiny/561--0--Sigilyph.png diff --git a/src/canonical/dex/front-shiny/Yamask.png b/src/canonical/dex/front-shiny/562--0--Yamask.png similarity index 100% rename from src/canonical/dex/front-shiny/Yamask.png rename to src/canonical/dex/front-shiny/562--0--Yamask.png diff --git a/src/canonical/dex/front-shiny/Cofagrigus.png b/src/canonical/dex/front-shiny/563--0--Cofagrigus.png similarity index 100% rename from src/canonical/dex/front-shiny/Cofagrigus.png rename to src/canonical/dex/front-shiny/563--0--Cofagrigus.png diff --git a/src/canonical/dex/front-shiny/Tirtouga.png b/src/canonical/dex/front-shiny/564--0--Tirtouga.png similarity index 100% rename from src/canonical/dex/front-shiny/Tirtouga.png rename to src/canonical/dex/front-shiny/564--0--Tirtouga.png diff --git a/src/canonical/dex/front-shiny/Carracosta.png b/src/canonical/dex/front-shiny/565--0--Carracosta.png similarity index 100% rename from src/canonical/dex/front-shiny/Carracosta.png rename to src/canonical/dex/front-shiny/565--0--Carracosta.png diff --git a/src/canonical/dex/front-shiny/Archen.png b/src/canonical/dex/front-shiny/566--0--Archen.png similarity index 100% rename from src/canonical/dex/front-shiny/Archen.png rename to src/canonical/dex/front-shiny/566--0--Archen.png diff --git a/src/canonical/dex/front-shiny/Archeops.png b/src/canonical/dex/front-shiny/567--0--Archeops.png similarity index 100% rename from src/canonical/dex/front-shiny/Archeops.png rename to src/canonical/dex/front-shiny/567--0--Archeops.png diff --git a/src/canonical/dex/front-shiny/Trubbish.png b/src/canonical/dex/front-shiny/568--0--Trubbish.png similarity index 100% rename from src/canonical/dex/front-shiny/Trubbish.png rename to src/canonical/dex/front-shiny/568--0--Trubbish.png diff --git a/src/canonical/dex/front-shiny/Garbodor.png b/src/canonical/dex/front-shiny/569--0--Garbodor.png similarity index 100% rename from src/canonical/dex/front-shiny/Garbodor.png rename to src/canonical/dex/front-shiny/569--0--Garbodor.png diff --git a/src/canonical/dex/front-shiny/Primeape.png b/src/canonical/dex/front-shiny/57--0--Primeape.png similarity index 100% rename from src/canonical/dex/front-shiny/Primeape.png rename to src/canonical/dex/front-shiny/57--0--Primeape.png diff --git a/src/canonical/dex/front-shiny/Zorua.png b/src/canonical/dex/front-shiny/570--0--Zorua.png similarity index 100% rename from src/canonical/dex/front-shiny/Zorua.png rename to src/canonical/dex/front-shiny/570--0--Zorua.png diff --git a/src/canonical/dex/front-shiny/Zoroark.png b/src/canonical/dex/front-shiny/571--0--Zoroark.png similarity index 100% rename from src/canonical/dex/front-shiny/Zoroark.png rename to src/canonical/dex/front-shiny/571--0--Zoroark.png diff --git a/src/canonical/dex/front-shiny/Minccino.png b/src/canonical/dex/front-shiny/572--0--Minccino.png similarity index 100% rename from src/canonical/dex/front-shiny/Minccino.png rename to src/canonical/dex/front-shiny/572--0--Minccino.png diff --git a/src/canonical/dex/front-shiny/Cinccino.png b/src/canonical/dex/front-shiny/573--0--Cinccino.png similarity index 100% rename from src/canonical/dex/front-shiny/Cinccino.png rename to src/canonical/dex/front-shiny/573--0--Cinccino.png diff --git a/src/canonical/dex/front-shiny/Gothita.png b/src/canonical/dex/front-shiny/574--0--Gothita.png similarity index 100% rename from src/canonical/dex/front-shiny/Gothita.png rename to src/canonical/dex/front-shiny/574--0--Gothita.png diff --git a/src/canonical/dex/front-shiny/Gothorita.png b/src/canonical/dex/front-shiny/575--0--Gothorita.png similarity index 100% rename from src/canonical/dex/front-shiny/Gothorita.png rename to src/canonical/dex/front-shiny/575--0--Gothorita.png diff --git a/src/canonical/dex/front-shiny/Gothitelle.png b/src/canonical/dex/front-shiny/576--0--Gothitelle.png similarity index 100% rename from src/canonical/dex/front-shiny/Gothitelle.png rename to src/canonical/dex/front-shiny/576--0--Gothitelle.png diff --git a/src/canonical/dex/front-shiny/Solosis.png b/src/canonical/dex/front-shiny/577--0--Solosis.png similarity index 100% rename from src/canonical/dex/front-shiny/Solosis.png rename to src/canonical/dex/front-shiny/577--0--Solosis.png diff --git a/src/canonical/dex/front-shiny/Duosion.png b/src/canonical/dex/front-shiny/578--0--Duosion.png similarity index 100% rename from src/canonical/dex/front-shiny/Duosion.png rename to src/canonical/dex/front-shiny/578--0--Duosion.png diff --git a/src/canonical/dex/front-shiny/Reuniclus.png b/src/canonical/dex/front-shiny/579--0--Reuniclus.png similarity index 100% rename from src/canonical/dex/front-shiny/Reuniclus.png rename to src/canonical/dex/front-shiny/579--0--Reuniclus.png diff --git a/src/canonical/dex/front-shiny/Growlithe.png b/src/canonical/dex/front-shiny/58--0--Growlithe.png similarity index 100% rename from src/canonical/dex/front-shiny/Growlithe.png rename to src/canonical/dex/front-shiny/58--0--Growlithe.png diff --git a/src/canonical/dex/front-shiny/Ducklett.png b/src/canonical/dex/front-shiny/580--0--Ducklett.png similarity index 100% rename from src/canonical/dex/front-shiny/Ducklett.png rename to src/canonical/dex/front-shiny/580--0--Ducklett.png diff --git a/src/canonical/dex/front-shiny/Swanna.png b/src/canonical/dex/front-shiny/581--0--Swanna.png similarity index 100% rename from src/canonical/dex/front-shiny/Swanna.png rename to src/canonical/dex/front-shiny/581--0--Swanna.png diff --git a/src/canonical/dex/front-shiny/Vanillite.png b/src/canonical/dex/front-shiny/582--0--Vanillite.png similarity index 100% rename from src/canonical/dex/front-shiny/Vanillite.png rename to src/canonical/dex/front-shiny/582--0--Vanillite.png diff --git a/src/canonical/dex/front-shiny/Vanillish.png b/src/canonical/dex/front-shiny/583--0--Vanillish.png similarity index 100% rename from src/canonical/dex/front-shiny/Vanillish.png rename to src/canonical/dex/front-shiny/583--0--Vanillish.png diff --git a/src/canonical/dex/front-shiny/Vanilluxe.png b/src/canonical/dex/front-shiny/584--0--Vanilluxe.png similarity index 100% rename from src/canonical/dex/front-shiny/Vanilluxe.png rename to src/canonical/dex/front-shiny/584--0--Vanilluxe.png diff --git a/src/canonical/dex/front-shiny/Deerling.png b/src/canonical/dex/front-shiny/585--0--Deerling.png similarity index 100% rename from src/canonical/dex/front-shiny/Deerling.png rename to src/canonical/dex/front-shiny/585--0--Deerling.png diff --git a/src/canonical/dex/front-shiny/Sawsbuck.png b/src/canonical/dex/front-shiny/586--0--Sawsbuck.png similarity index 100% rename from src/canonical/dex/front-shiny/Sawsbuck.png rename to src/canonical/dex/front-shiny/586--0--Sawsbuck.png diff --git a/src/canonical/dex/front-shiny/Emolga.png b/src/canonical/dex/front-shiny/587--0--Emolga.png similarity index 100% rename from src/canonical/dex/front-shiny/Emolga.png rename to src/canonical/dex/front-shiny/587--0--Emolga.png diff --git a/src/canonical/dex/front-shiny/Karrablast.png b/src/canonical/dex/front-shiny/588--0--Karrablast.png similarity index 100% rename from src/canonical/dex/front-shiny/Karrablast.png rename to src/canonical/dex/front-shiny/588--0--Karrablast.png diff --git a/src/canonical/dex/front-shiny/Escavalier.png b/src/canonical/dex/front-shiny/589--0--Escavalier.png similarity index 100% rename from src/canonical/dex/front-shiny/Escavalier.png rename to src/canonical/dex/front-shiny/589--0--Escavalier.png diff --git a/src/canonical/dex/front-shiny/Arcanine.png b/src/canonical/dex/front-shiny/59--0--Arcanine.png similarity index 100% rename from src/canonical/dex/front-shiny/Arcanine.png rename to src/canonical/dex/front-shiny/59--0--Arcanine.png diff --git a/src/canonical/dex/front-shiny/Foongus.png b/src/canonical/dex/front-shiny/590--0--Foongus.png similarity index 100% rename from src/canonical/dex/front-shiny/Foongus.png rename to src/canonical/dex/front-shiny/590--0--Foongus.png diff --git a/src/canonical/dex/front-shiny/Amoonguss.png b/src/canonical/dex/front-shiny/591--0--Amoonguss.png similarity index 100% rename from src/canonical/dex/front-shiny/Amoonguss.png rename to src/canonical/dex/front-shiny/591--0--Amoonguss.png diff --git a/src/canonical/dex/front-shiny/Frillish.png b/src/canonical/dex/front-shiny/592--0--Frillish.png similarity index 100% rename from src/canonical/dex/front-shiny/Frillish.png rename to src/canonical/dex/front-shiny/592--0--Frillish.png diff --git a/src/canonical/dex/front-shiny/Jellicent.png b/src/canonical/dex/front-shiny/593--0--Jellicent.png similarity index 100% rename from src/canonical/dex/front-shiny/Jellicent.png rename to src/canonical/dex/front-shiny/593--0--Jellicent.png diff --git a/src/canonical/dex/front-shiny/Alomomola.png b/src/canonical/dex/front-shiny/594--0--Alomomola.png similarity index 100% rename from src/canonical/dex/front-shiny/Alomomola.png rename to src/canonical/dex/front-shiny/594--0--Alomomola.png diff --git a/src/canonical/dex/front-shiny/Joltik.png b/src/canonical/dex/front-shiny/595--0--Joltik.png similarity index 100% rename from src/canonical/dex/front-shiny/Joltik.png rename to src/canonical/dex/front-shiny/595--0--Joltik.png diff --git a/src/canonical/dex/front-shiny/Galvantula.png b/src/canonical/dex/front-shiny/596--0--Galvantula.png similarity index 100% rename from src/canonical/dex/front-shiny/Galvantula.png rename to src/canonical/dex/front-shiny/596--0--Galvantula.png diff --git a/src/canonical/dex/front-shiny/Ferroseed.png b/src/canonical/dex/front-shiny/597--0--Ferroseed.png similarity index 100% rename from src/canonical/dex/front-shiny/Ferroseed.png rename to src/canonical/dex/front-shiny/597--0--Ferroseed.png diff --git a/src/canonical/dex/front-shiny/Ferrothorn.png b/src/canonical/dex/front-shiny/598--0--Ferrothorn.png similarity index 100% rename from src/canonical/dex/front-shiny/Ferrothorn.png rename to src/canonical/dex/front-shiny/598--0--Ferrothorn.png diff --git a/src/canonical/dex/front-shiny/Klink.png b/src/canonical/dex/front-shiny/599--0--Klink.png similarity index 100% rename from src/canonical/dex/front-shiny/Klink.png rename to src/canonical/dex/front-shiny/599--0--Klink.png diff --git a/src/canonical/dex/front-shiny/Charizard.png b/src/canonical/dex/front-shiny/6--0--Charizard.png similarity index 100% rename from src/canonical/dex/front-shiny/Charizard.png rename to src/canonical/dex/front-shiny/6--0--Charizard.png diff --git a/src/canonical/dex/front-shiny/Charizard--Mega-X.png b/src/canonical/dex/front-shiny/6--420--Charizard--Mega-X.png similarity index 100% rename from src/canonical/dex/front-shiny/Charizard--Mega-X.png rename to src/canonical/dex/front-shiny/6--420--Charizard--Mega-X.png diff --git a/src/canonical/dex/front-shiny/Charizard--Mega-Y.png b/src/canonical/dex/front-shiny/6--420--Charizard--Mega-Y.png similarity index 100% rename from src/canonical/dex/front-shiny/Charizard--Mega-Y.png rename to src/canonical/dex/front-shiny/6--420--Charizard--Mega-Y.png diff --git a/src/canonical/dex/front-shiny/Poliwag.png b/src/canonical/dex/front-shiny/60--0--Poliwag.png similarity index 100% rename from src/canonical/dex/front-shiny/Poliwag.png rename to src/canonical/dex/front-shiny/60--0--Poliwag.png diff --git a/src/canonical/dex/front-shiny/Klang.png b/src/canonical/dex/front-shiny/600--0--Klang.png similarity index 100% rename from src/canonical/dex/front-shiny/Klang.png rename to src/canonical/dex/front-shiny/600--0--Klang.png diff --git a/src/canonical/dex/front-shiny/Klinklang.png b/src/canonical/dex/front-shiny/601--0--Klinklang.png similarity index 100% rename from src/canonical/dex/front-shiny/Klinklang.png rename to src/canonical/dex/front-shiny/601--0--Klinklang.png diff --git a/src/canonical/dex/front-shiny/Tynamo.png b/src/canonical/dex/front-shiny/602--0--Tynamo.png similarity index 100% rename from src/canonical/dex/front-shiny/Tynamo.png rename to src/canonical/dex/front-shiny/602--0--Tynamo.png diff --git a/src/canonical/dex/front-shiny/Eelektrik.png b/src/canonical/dex/front-shiny/603--0--Eelektrik.png similarity index 100% rename from src/canonical/dex/front-shiny/Eelektrik.png rename to src/canonical/dex/front-shiny/603--0--Eelektrik.png diff --git a/src/canonical/dex/front-shiny/Eelektross.png b/src/canonical/dex/front-shiny/604--0--Eelektross.png similarity index 100% rename from src/canonical/dex/front-shiny/Eelektross.png rename to src/canonical/dex/front-shiny/604--0--Eelektross.png diff --git a/src/canonical/dex/front-shiny/Elgyem.png b/src/canonical/dex/front-shiny/605--0--Elgyem.png similarity index 100% rename from src/canonical/dex/front-shiny/Elgyem.png rename to src/canonical/dex/front-shiny/605--0--Elgyem.png diff --git a/src/canonical/dex/front-shiny/Beheeyem.png b/src/canonical/dex/front-shiny/606--0--Beheeyem.png similarity index 100% rename from src/canonical/dex/front-shiny/Beheeyem.png rename to src/canonical/dex/front-shiny/606--0--Beheeyem.png diff --git a/src/canonical/dex/front-shiny/Litwick.png b/src/canonical/dex/front-shiny/607--0--Litwick.png similarity index 100% rename from src/canonical/dex/front-shiny/Litwick.png rename to src/canonical/dex/front-shiny/607--0--Litwick.png diff --git a/src/canonical/dex/front-shiny/Lampent.png b/src/canonical/dex/front-shiny/608--0--Lampent.png similarity index 100% rename from src/canonical/dex/front-shiny/Lampent.png rename to src/canonical/dex/front-shiny/608--0--Lampent.png diff --git a/src/canonical/dex/front-shiny/Chandelure.png b/src/canonical/dex/front-shiny/609--0--Chandelure.png similarity index 100% rename from src/canonical/dex/front-shiny/Chandelure.png rename to src/canonical/dex/front-shiny/609--0--Chandelure.png diff --git a/src/canonical/dex/front-shiny/Poliwhirl.png b/src/canonical/dex/front-shiny/61--0--Poliwhirl.png similarity index 100% rename from src/canonical/dex/front-shiny/Poliwhirl.png rename to src/canonical/dex/front-shiny/61--0--Poliwhirl.png diff --git a/src/canonical/dex/front-shiny/Axew.png b/src/canonical/dex/front-shiny/610--0--Axew.png similarity index 100% rename from src/canonical/dex/front-shiny/Axew.png rename to src/canonical/dex/front-shiny/610--0--Axew.png diff --git a/src/canonical/dex/front-shiny/Fraxure.png b/src/canonical/dex/front-shiny/611--0--Fraxure.png similarity index 100% rename from src/canonical/dex/front-shiny/Fraxure.png rename to src/canonical/dex/front-shiny/611--0--Fraxure.png diff --git a/src/canonical/dex/front-shiny/Haxorus.png b/src/canonical/dex/front-shiny/612--0--Haxorus.png similarity index 100% rename from src/canonical/dex/front-shiny/Haxorus.png rename to src/canonical/dex/front-shiny/612--0--Haxorus.png diff --git a/src/canonical/dex/front-shiny/Cubchoo.png b/src/canonical/dex/front-shiny/613--0--Cubchoo.png similarity index 100% rename from src/canonical/dex/front-shiny/Cubchoo.png rename to src/canonical/dex/front-shiny/613--0--Cubchoo.png diff --git a/src/canonical/dex/front-shiny/Beartic.png b/src/canonical/dex/front-shiny/614--0--Beartic.png similarity index 100% rename from src/canonical/dex/front-shiny/Beartic.png rename to src/canonical/dex/front-shiny/614--0--Beartic.png diff --git a/src/canonical/dex/front-shiny/Cryogonal.png b/src/canonical/dex/front-shiny/615--0--Cryogonal.png similarity index 100% rename from src/canonical/dex/front-shiny/Cryogonal.png rename to src/canonical/dex/front-shiny/615--0--Cryogonal.png diff --git a/src/canonical/dex/front-shiny/Shelmet.png b/src/canonical/dex/front-shiny/616--0--Shelmet.png similarity index 100% rename from src/canonical/dex/front-shiny/Shelmet.png rename to src/canonical/dex/front-shiny/616--0--Shelmet.png diff --git a/src/canonical/dex/front-shiny/Accelgor.png b/src/canonical/dex/front-shiny/617--0--Accelgor.png similarity index 100% rename from src/canonical/dex/front-shiny/Accelgor.png rename to src/canonical/dex/front-shiny/617--0--Accelgor.png diff --git a/src/canonical/dex/front-shiny/Stunfisk.png b/src/canonical/dex/front-shiny/618--0--Stunfisk.png similarity index 100% rename from src/canonical/dex/front-shiny/Stunfisk.png rename to src/canonical/dex/front-shiny/618--0--Stunfisk.png diff --git a/src/canonical/dex/front-shiny/Mienfoo.png b/src/canonical/dex/front-shiny/619--0--Mienfoo.png similarity index 100% rename from src/canonical/dex/front-shiny/Mienfoo.png rename to src/canonical/dex/front-shiny/619--0--Mienfoo.png diff --git a/src/canonical/dex/front-shiny/Poliwrath.png b/src/canonical/dex/front-shiny/62--0--Poliwrath.png similarity index 100% rename from src/canonical/dex/front-shiny/Poliwrath.png rename to src/canonical/dex/front-shiny/62--0--Poliwrath.png diff --git a/src/canonical/dex/front-shiny/Mienshao.png b/src/canonical/dex/front-shiny/620--0--Mienshao.png similarity index 100% rename from src/canonical/dex/front-shiny/Mienshao.png rename to src/canonical/dex/front-shiny/620--0--Mienshao.png diff --git a/src/canonical/dex/front-shiny/Druddigon.png b/src/canonical/dex/front-shiny/621--0--Druddigon.png similarity index 100% rename from src/canonical/dex/front-shiny/Druddigon.png rename to src/canonical/dex/front-shiny/621--0--Druddigon.png diff --git a/src/canonical/dex/front-shiny/Golett.png b/src/canonical/dex/front-shiny/622--0--Golett.png similarity index 100% rename from src/canonical/dex/front-shiny/Golett.png rename to src/canonical/dex/front-shiny/622--0--Golett.png diff --git a/src/canonical/dex/front-shiny/Golurk.png b/src/canonical/dex/front-shiny/623--0--Golurk.png similarity index 100% rename from src/canonical/dex/front-shiny/Golurk.png rename to src/canonical/dex/front-shiny/623--0--Golurk.png diff --git a/src/canonical/dex/front-shiny/Pawniard.png b/src/canonical/dex/front-shiny/624--0--Pawniard.png similarity index 100% rename from src/canonical/dex/front-shiny/Pawniard.png rename to src/canonical/dex/front-shiny/624--0--Pawniard.png diff --git a/src/canonical/dex/front-shiny/Bisharp.png b/src/canonical/dex/front-shiny/625--0--Bisharp.png similarity index 100% rename from src/canonical/dex/front-shiny/Bisharp.png rename to src/canonical/dex/front-shiny/625--0--Bisharp.png diff --git a/src/canonical/dex/front-shiny/Bouffalant.png b/src/canonical/dex/front-shiny/626--0--Bouffalant.png similarity index 100% rename from src/canonical/dex/front-shiny/Bouffalant.png rename to src/canonical/dex/front-shiny/626--0--Bouffalant.png diff --git a/src/canonical/dex/front-shiny/Rufflet.png b/src/canonical/dex/front-shiny/627--0--Rufflet.png similarity index 100% rename from src/canonical/dex/front-shiny/Rufflet.png rename to src/canonical/dex/front-shiny/627--0--Rufflet.png diff --git a/src/canonical/dex/front-shiny/Braviary.png b/src/canonical/dex/front-shiny/628--0--Braviary.png similarity index 100% rename from src/canonical/dex/front-shiny/Braviary.png rename to src/canonical/dex/front-shiny/628--0--Braviary.png diff --git a/src/canonical/dex/front-shiny/Vullaby.png b/src/canonical/dex/front-shiny/629--0--Vullaby.png similarity index 100% rename from src/canonical/dex/front-shiny/Vullaby.png rename to src/canonical/dex/front-shiny/629--0--Vullaby.png diff --git a/src/canonical/dex/front-shiny/Abra.png b/src/canonical/dex/front-shiny/63--0--Abra.png similarity index 100% rename from src/canonical/dex/front-shiny/Abra.png rename to src/canonical/dex/front-shiny/63--0--Abra.png diff --git a/src/canonical/dex/front-shiny/Mandibuzz.png b/src/canonical/dex/front-shiny/630--0--Mandibuzz.png similarity index 100% rename from src/canonical/dex/front-shiny/Mandibuzz.png rename to src/canonical/dex/front-shiny/630--0--Mandibuzz.png diff --git a/src/canonical/dex/front-shiny/Heatmor.png b/src/canonical/dex/front-shiny/631--0--Heatmor.png similarity index 100% rename from src/canonical/dex/front-shiny/Heatmor.png rename to src/canonical/dex/front-shiny/631--0--Heatmor.png diff --git a/src/canonical/dex/front-shiny/Durant.png b/src/canonical/dex/front-shiny/632--0--Durant.png similarity index 100% rename from src/canonical/dex/front-shiny/Durant.png rename to src/canonical/dex/front-shiny/632--0--Durant.png diff --git a/src/canonical/dex/front-shiny/Deino.png b/src/canonical/dex/front-shiny/633--0--Deino.png similarity index 100% rename from src/canonical/dex/front-shiny/Deino.png rename to src/canonical/dex/front-shiny/633--0--Deino.png diff --git a/src/canonical/dex/front-shiny/Zweilous.png b/src/canonical/dex/front-shiny/634--0--Zweilous.png similarity index 100% rename from src/canonical/dex/front-shiny/Zweilous.png rename to src/canonical/dex/front-shiny/634--0--Zweilous.png diff --git a/src/canonical/dex/front-shiny/Hydreigon.png b/src/canonical/dex/front-shiny/635--0--Hydreigon.png similarity index 100% rename from src/canonical/dex/front-shiny/Hydreigon.png rename to src/canonical/dex/front-shiny/635--0--Hydreigon.png diff --git a/src/canonical/dex/front-shiny/Larvesta.png b/src/canonical/dex/front-shiny/636--0--Larvesta.png similarity index 100% rename from src/canonical/dex/front-shiny/Larvesta.png rename to src/canonical/dex/front-shiny/636--0--Larvesta.png diff --git a/src/canonical/dex/front-shiny/Volcarona.png b/src/canonical/dex/front-shiny/637--0--Volcarona.png similarity index 100% rename from src/canonical/dex/front-shiny/Volcarona.png rename to src/canonical/dex/front-shiny/637--0--Volcarona.png diff --git a/src/canonical/dex/front-shiny/Cobalion.png b/src/canonical/dex/front-shiny/638--0--Cobalion.png similarity index 100% rename from src/canonical/dex/front-shiny/Cobalion.png rename to src/canonical/dex/front-shiny/638--0--Cobalion.png diff --git a/src/canonical/dex/front-shiny/Terrakion.png b/src/canonical/dex/front-shiny/639--0--Terrakion.png similarity index 100% rename from src/canonical/dex/front-shiny/Terrakion.png rename to src/canonical/dex/front-shiny/639--0--Terrakion.png diff --git a/src/canonical/dex/front-shiny/Kadabra.png b/src/canonical/dex/front-shiny/64--0--Kadabra.png similarity index 100% rename from src/canonical/dex/front-shiny/Kadabra.png rename to src/canonical/dex/front-shiny/64--0--Kadabra.png diff --git a/src/canonical/dex/front-shiny/Virizion.png b/src/canonical/dex/front-shiny/640--0--Virizion.png similarity index 100% rename from src/canonical/dex/front-shiny/Virizion.png rename to src/canonical/dex/front-shiny/640--0--Virizion.png diff --git a/src/canonical/dex/front-shiny/Tornadus.png b/src/canonical/dex/front-shiny/641--0--Tornadus.png similarity index 100% rename from src/canonical/dex/front-shiny/Tornadus.png rename to src/canonical/dex/front-shiny/641--0--Tornadus.png diff --git a/src/canonical/dex/front-shiny/Tornadus--Therian.png b/src/canonical/dex/front-shiny/641--420--Tornadus--Therian.png similarity index 100% rename from src/canonical/dex/front-shiny/Tornadus--Therian.png rename to src/canonical/dex/front-shiny/641--420--Tornadus--Therian.png diff --git a/src/canonical/dex/front-shiny/Thundurus.png b/src/canonical/dex/front-shiny/642--0--Thundurus.png similarity index 100% rename from src/canonical/dex/front-shiny/Thundurus.png rename to src/canonical/dex/front-shiny/642--0--Thundurus.png diff --git a/src/canonical/dex/front-shiny/Thundurus--Therian.png b/src/canonical/dex/front-shiny/642--420--Thundurus--Therian.png similarity index 100% rename from src/canonical/dex/front-shiny/Thundurus--Therian.png rename to src/canonical/dex/front-shiny/642--420--Thundurus--Therian.png diff --git a/src/canonical/dex/front-shiny/Reshiram.png b/src/canonical/dex/front-shiny/643--0--Reshiram.png similarity index 100% rename from src/canonical/dex/front-shiny/Reshiram.png rename to src/canonical/dex/front-shiny/643--0--Reshiram.png diff --git a/src/canonical/dex/front-shiny/Zekrom.png b/src/canonical/dex/front-shiny/644--0--Zekrom.png similarity index 100% rename from src/canonical/dex/front-shiny/Zekrom.png rename to src/canonical/dex/front-shiny/644--0--Zekrom.png diff --git a/src/canonical/dex/front-shiny/Landorus.png b/src/canonical/dex/front-shiny/645--0--Landorus.png similarity index 100% rename from src/canonical/dex/front-shiny/Landorus.png rename to src/canonical/dex/front-shiny/645--0--Landorus.png diff --git a/src/canonical/dex/front-shiny/Landorus--Therian.png b/src/canonical/dex/front-shiny/645--420--Landorus--Therian.png similarity index 100% rename from src/canonical/dex/front-shiny/Landorus--Therian.png rename to src/canonical/dex/front-shiny/645--420--Landorus--Therian.png diff --git a/src/canonical/dex/front-shiny/Kyurem.png b/src/canonical/dex/front-shiny/646--0--Kyurem.png similarity index 100% rename from src/canonical/dex/front-shiny/Kyurem.png rename to src/canonical/dex/front-shiny/646--0--Kyurem.png diff --git a/src/canonical/dex/front-shiny/Kyurem--Black.png b/src/canonical/dex/front-shiny/646--420--Kyurem--Black.png similarity index 100% rename from src/canonical/dex/front-shiny/Kyurem--Black.png rename to src/canonical/dex/front-shiny/646--420--Kyurem--Black.png diff --git a/src/canonical/dex/front-shiny/Kyurem--White.png b/src/canonical/dex/front-shiny/646--420--Kyurem--White.png similarity index 100% rename from src/canonical/dex/front-shiny/Kyurem--White.png rename to src/canonical/dex/front-shiny/646--420--Kyurem--White.png diff --git a/src/canonical/dex/front-shiny/Keldeo.png b/src/canonical/dex/front-shiny/647--0--Keldeo.png similarity index 100% rename from src/canonical/dex/front-shiny/Keldeo.png rename to src/canonical/dex/front-shiny/647--0--Keldeo.png diff --git a/src/canonical/dex/front-shiny/Keldeo--Resolute.png b/src/canonical/dex/front-shiny/647--420--Keldeo--Resolute.png similarity index 100% rename from src/canonical/dex/front-shiny/Keldeo--Resolute.png rename to src/canonical/dex/front-shiny/647--420--Keldeo--Resolute.png diff --git a/src/canonical/dex/front-shiny/Meloetta.png b/src/canonical/dex/front-shiny/648--0--Meloetta.png similarity index 100% rename from src/canonical/dex/front-shiny/Meloetta.png rename to src/canonical/dex/front-shiny/648--0--Meloetta.png diff --git a/src/canonical/dex/front-shiny/Meloetta--Pirouette.png b/src/canonical/dex/front-shiny/648--420--Meloetta--Pirouette.png similarity index 100% rename from src/canonical/dex/front-shiny/Meloetta--Pirouette.png rename to src/canonical/dex/front-shiny/648--420--Meloetta--Pirouette.png diff --git a/src/canonical/dex/front-shiny/Genesect.png b/src/canonical/dex/front-shiny/649--0--Genesect.png similarity index 100% rename from src/canonical/dex/front-shiny/Genesect.png rename to src/canonical/dex/front-shiny/649--0--Genesect.png diff --git a/src/canonical/dex/front-shiny/Genesect--Burn.png b/src/canonical/dex/front-shiny/649--420--Genesect--Burn.png similarity index 100% rename from src/canonical/dex/front-shiny/Genesect--Burn.png rename to src/canonical/dex/front-shiny/649--420--Genesect--Burn.png diff --git a/src/canonical/dex/front-shiny/Genesect--Chill.png b/src/canonical/dex/front-shiny/649--420--Genesect--Chill.png similarity index 100% rename from src/canonical/dex/front-shiny/Genesect--Chill.png rename to src/canonical/dex/front-shiny/649--420--Genesect--Chill.png diff --git a/src/canonical/dex/front-shiny/Genesect--Douse.png b/src/canonical/dex/front-shiny/649--420--Genesect--Douse.png similarity index 100% rename from src/canonical/dex/front-shiny/Genesect--Douse.png rename to src/canonical/dex/front-shiny/649--420--Genesect--Douse.png diff --git a/src/canonical/dex/front-shiny/Genesect--Shock.png b/src/canonical/dex/front-shiny/649--420--Genesect--Shock.png similarity index 100% rename from src/canonical/dex/front-shiny/Genesect--Shock.png rename to src/canonical/dex/front-shiny/649--420--Genesect--Shock.png diff --git a/src/canonical/dex/front-shiny/Alakazam.png b/src/canonical/dex/front-shiny/65--0--Alakazam.png similarity index 100% rename from src/canonical/dex/front-shiny/Alakazam.png rename to src/canonical/dex/front-shiny/65--0--Alakazam.png diff --git a/src/canonical/dex/front-shiny/Alakazam--Mega.png b/src/canonical/dex/front-shiny/65--420--Alakazam--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Alakazam--Mega.png rename to src/canonical/dex/front-shiny/65--420--Alakazam--Mega.png diff --git a/src/canonical/dex/front-shiny/Chespin.png b/src/canonical/dex/front-shiny/650--0--Chespin.png similarity index 100% rename from src/canonical/dex/front-shiny/Chespin.png rename to src/canonical/dex/front-shiny/650--0--Chespin.png diff --git a/src/canonical/dex/front-shiny/Quilladin.png b/src/canonical/dex/front-shiny/651--0--Quilladin.png similarity index 100% rename from src/canonical/dex/front-shiny/Quilladin.png rename to src/canonical/dex/front-shiny/651--0--Quilladin.png diff --git a/src/canonical/dex/front-shiny/Chesnaught.png b/src/canonical/dex/front-shiny/652--0--Chesnaught.png similarity index 100% rename from src/canonical/dex/front-shiny/Chesnaught.png rename to src/canonical/dex/front-shiny/652--0--Chesnaught.png diff --git a/src/canonical/dex/front-shiny/Fennekin.png b/src/canonical/dex/front-shiny/653--0--Fennekin.png similarity index 100% rename from src/canonical/dex/front-shiny/Fennekin.png rename to src/canonical/dex/front-shiny/653--0--Fennekin.png diff --git a/src/canonical/dex/front-shiny/Braixen.png b/src/canonical/dex/front-shiny/654--0--Braixen.png similarity index 100% rename from src/canonical/dex/front-shiny/Braixen.png rename to src/canonical/dex/front-shiny/654--0--Braixen.png diff --git a/src/canonical/dex/front-shiny/Delphox.png b/src/canonical/dex/front-shiny/655--0--Delphox.png similarity index 100% rename from src/canonical/dex/front-shiny/Delphox.png rename to src/canonical/dex/front-shiny/655--0--Delphox.png diff --git a/src/canonical/dex/front-shiny/Froakie.png b/src/canonical/dex/front-shiny/656--0--Froakie.png similarity index 100% rename from src/canonical/dex/front-shiny/Froakie.png rename to src/canonical/dex/front-shiny/656--0--Froakie.png diff --git a/src/canonical/dex/front-shiny/Frogadier.png b/src/canonical/dex/front-shiny/657--0--Frogadier.png similarity index 100% rename from src/canonical/dex/front-shiny/Frogadier.png rename to src/canonical/dex/front-shiny/657--0--Frogadier.png diff --git a/src/canonical/dex/front-shiny/Greninja.png b/src/canonical/dex/front-shiny/658--0--Greninja.png similarity index 100% rename from src/canonical/dex/front-shiny/Greninja.png rename to src/canonical/dex/front-shiny/658--0--Greninja.png diff --git a/src/canonical/dex/front-shiny/Greninja--Ash.png b/src/canonical/dex/front-shiny/658--420--Greninja--Ash.png similarity index 100% rename from src/canonical/dex/front-shiny/Greninja--Ash.png rename to src/canonical/dex/front-shiny/658--420--Greninja--Ash.png diff --git a/src/canonical/dex/front-shiny/Bunnelby.png b/src/canonical/dex/front-shiny/659--0--Bunnelby.png similarity index 100% rename from src/canonical/dex/front-shiny/Bunnelby.png rename to src/canonical/dex/front-shiny/659--0--Bunnelby.png diff --git a/src/canonical/dex/front-shiny/Machop.png b/src/canonical/dex/front-shiny/66--0--Machop.png similarity index 100% rename from src/canonical/dex/front-shiny/Machop.png rename to src/canonical/dex/front-shiny/66--0--Machop.png diff --git a/src/canonical/dex/front-shiny/Diggersby.png b/src/canonical/dex/front-shiny/660--0--Diggersby.png similarity index 100% rename from src/canonical/dex/front-shiny/Diggersby.png rename to src/canonical/dex/front-shiny/660--0--Diggersby.png diff --git a/src/canonical/dex/front-shiny/Fletchling.png b/src/canonical/dex/front-shiny/661--0--Fletchling.png similarity index 100% rename from src/canonical/dex/front-shiny/Fletchling.png rename to src/canonical/dex/front-shiny/661--0--Fletchling.png diff --git a/src/canonical/dex/front-shiny/Fletchinder.png b/src/canonical/dex/front-shiny/662--0--Fletchinder.png similarity index 100% rename from src/canonical/dex/front-shiny/Fletchinder.png rename to src/canonical/dex/front-shiny/662--0--Fletchinder.png diff --git a/src/canonical/dex/front-shiny/Talonflame.png b/src/canonical/dex/front-shiny/663--0--Talonflame.png similarity index 100% rename from src/canonical/dex/front-shiny/Talonflame.png rename to src/canonical/dex/front-shiny/663--0--Talonflame.png diff --git a/src/canonical/dex/front-shiny/Scatterbug.png b/src/canonical/dex/front-shiny/664--0--Scatterbug.png similarity index 100% rename from src/canonical/dex/front-shiny/Scatterbug.png rename to src/canonical/dex/front-shiny/664--0--Scatterbug.png diff --git a/src/canonical/dex/front-shiny/Spewpa.png b/src/canonical/dex/front-shiny/665--0--Spewpa.png similarity index 100% rename from src/canonical/dex/front-shiny/Spewpa.png rename to src/canonical/dex/front-shiny/665--0--Spewpa.png diff --git a/src/canonical/dex/front-shiny/Vivillon.png b/src/canonical/dex/front-shiny/666--0--Vivillon.png similarity index 100% rename from src/canonical/dex/front-shiny/Vivillon.png rename to src/canonical/dex/front-shiny/666--0--Vivillon.png diff --git a/src/canonical/dex/front-shiny/Vivillon--Fancy.png b/src/canonical/dex/front-shiny/666--420--Vivillon--Fancy.png similarity index 100% rename from src/canonical/dex/front-shiny/Vivillon--Fancy.png rename to src/canonical/dex/front-shiny/666--420--Vivillon--Fancy.png diff --git a/src/canonical/dex/front-shiny/Vivillon--Pokeball.png b/src/canonical/dex/front-shiny/666--420--Vivillon--Pokeball.png similarity index 100% rename from src/canonical/dex/front-shiny/Vivillon--Pokeball.png rename to src/canonical/dex/front-shiny/666--420--Vivillon--Pokeball.png diff --git a/src/canonical/dex/front-shiny/Litleo.png b/src/canonical/dex/front-shiny/667--0--Litleo.png similarity index 100% rename from src/canonical/dex/front-shiny/Litleo.png rename to src/canonical/dex/front-shiny/667--0--Litleo.png diff --git a/src/canonical/dex/front-shiny/Pyroar.png b/src/canonical/dex/front-shiny/668--0--Pyroar.png similarity index 100% rename from src/canonical/dex/front-shiny/Pyroar.png rename to src/canonical/dex/front-shiny/668--0--Pyroar.png diff --git a/src/canonical/dex/front-shiny/Flabe__0301be__0301.png b/src/canonical/dex/front-shiny/669--0--Flabe__0301be__0301.png similarity index 100% rename from src/canonical/dex/front-shiny/Flabe__0301be__0301.png rename to src/canonical/dex/front-shiny/669--0--Flabe__0301be__0301.png diff --git a/src/canonical/dex/front-shiny/Machoke.png b/src/canonical/dex/front-shiny/67--0--Machoke.png similarity index 100% rename from src/canonical/dex/front-shiny/Machoke.png rename to src/canonical/dex/front-shiny/67--0--Machoke.png diff --git a/src/canonical/dex/front-shiny/Floette.png b/src/canonical/dex/front-shiny/670--0--Floette.png similarity index 100% rename from src/canonical/dex/front-shiny/Floette.png rename to src/canonical/dex/front-shiny/670--0--Floette.png diff --git a/src/canonical/dex/front-shiny/Floette--Eternal.png b/src/canonical/dex/front-shiny/670--420--Floette--Eternal.png similarity index 100% rename from src/canonical/dex/front-shiny/Floette--Eternal.png rename to src/canonical/dex/front-shiny/670--420--Floette--Eternal.png diff --git a/src/canonical/dex/front-shiny/Florges.png b/src/canonical/dex/front-shiny/671--0--Florges.png similarity index 100% rename from src/canonical/dex/front-shiny/Florges.png rename to src/canonical/dex/front-shiny/671--0--Florges.png diff --git a/src/canonical/dex/front-shiny/Skiddo.png b/src/canonical/dex/front-shiny/672--0--Skiddo.png similarity index 100% rename from src/canonical/dex/front-shiny/Skiddo.png rename to src/canonical/dex/front-shiny/672--0--Skiddo.png diff --git a/src/canonical/dex/front-shiny/Gogoat.png b/src/canonical/dex/front-shiny/673--0--Gogoat.png similarity index 100% rename from src/canonical/dex/front-shiny/Gogoat.png rename to src/canonical/dex/front-shiny/673--0--Gogoat.png diff --git a/src/canonical/dex/front-shiny/Pancham.png b/src/canonical/dex/front-shiny/674--0--Pancham.png similarity index 100% rename from src/canonical/dex/front-shiny/Pancham.png rename to src/canonical/dex/front-shiny/674--0--Pancham.png diff --git a/src/canonical/dex/front-shiny/Pangoro.png b/src/canonical/dex/front-shiny/675--0--Pangoro.png similarity index 100% rename from src/canonical/dex/front-shiny/Pangoro.png rename to src/canonical/dex/front-shiny/675--0--Pangoro.png diff --git a/src/canonical/dex/front-shiny/Furfrou.png b/src/canonical/dex/front-shiny/676--0--Furfrou.png similarity index 100% rename from src/canonical/dex/front-shiny/Furfrou.png rename to src/canonical/dex/front-shiny/676--0--Furfrou.png diff --git a/src/canonical/dex/front-shiny/Espurr.png b/src/canonical/dex/front-shiny/677--0--Espurr.png similarity index 100% rename from src/canonical/dex/front-shiny/Espurr.png rename to src/canonical/dex/front-shiny/677--0--Espurr.png diff --git a/src/canonical/dex/front-shiny/Meowstic.png b/src/canonical/dex/front-shiny/678--0--Meowstic.png similarity index 100% rename from src/canonical/dex/front-shiny/Meowstic.png rename to src/canonical/dex/front-shiny/678--0--Meowstic.png diff --git a/src/canonical/dex/front-shiny/Meowstic--F.png b/src/canonical/dex/front-shiny/678--420--Meowstic--F.png similarity index 100% rename from src/canonical/dex/front-shiny/Meowstic--F.png rename to src/canonical/dex/front-shiny/678--420--Meowstic--F.png diff --git a/src/canonical/dex/front-shiny/Honedge.png b/src/canonical/dex/front-shiny/679--0--Honedge.png similarity index 100% rename from src/canonical/dex/front-shiny/Honedge.png rename to src/canonical/dex/front-shiny/679--0--Honedge.png diff --git a/src/canonical/dex/front-shiny/Machamp.png b/src/canonical/dex/front-shiny/68--0--Machamp.png similarity index 100% rename from src/canonical/dex/front-shiny/Machamp.png rename to src/canonical/dex/front-shiny/68--0--Machamp.png diff --git a/src/canonical/dex/front-shiny/Doublade.png b/src/canonical/dex/front-shiny/680--0--Doublade.png similarity index 100% rename from src/canonical/dex/front-shiny/Doublade.png rename to src/canonical/dex/front-shiny/680--0--Doublade.png diff --git a/src/canonical/dex/front-shiny/Aegislash.png b/src/canonical/dex/front-shiny/681--0--Aegislash.png similarity index 100% rename from src/canonical/dex/front-shiny/Aegislash.png rename to src/canonical/dex/front-shiny/681--0--Aegislash.png diff --git a/src/canonical/dex/front-shiny/Aegislash--Blade.png b/src/canonical/dex/front-shiny/681--420--Aegislash--Blade.png similarity index 100% rename from src/canonical/dex/front-shiny/Aegislash--Blade.png rename to src/canonical/dex/front-shiny/681--420--Aegislash--Blade.png diff --git a/src/canonical/dex/front-shiny/Spritzee.png b/src/canonical/dex/front-shiny/682--0--Spritzee.png similarity index 100% rename from src/canonical/dex/front-shiny/Spritzee.png rename to src/canonical/dex/front-shiny/682--0--Spritzee.png diff --git a/src/canonical/dex/front-shiny/Aromatisse.png b/src/canonical/dex/front-shiny/683--0--Aromatisse.png similarity index 100% rename from src/canonical/dex/front-shiny/Aromatisse.png rename to src/canonical/dex/front-shiny/683--0--Aromatisse.png diff --git a/src/canonical/dex/front-shiny/Swirlix.png b/src/canonical/dex/front-shiny/684--0--Swirlix.png similarity index 100% rename from src/canonical/dex/front-shiny/Swirlix.png rename to src/canonical/dex/front-shiny/684--0--Swirlix.png diff --git a/src/canonical/dex/front-shiny/Slurpuff.png b/src/canonical/dex/front-shiny/685--0--Slurpuff.png similarity index 100% rename from src/canonical/dex/front-shiny/Slurpuff.png rename to src/canonical/dex/front-shiny/685--0--Slurpuff.png diff --git a/src/canonical/dex/front-shiny/Inkay.png b/src/canonical/dex/front-shiny/686--0--Inkay.png similarity index 100% rename from src/canonical/dex/front-shiny/Inkay.png rename to src/canonical/dex/front-shiny/686--0--Inkay.png diff --git a/src/canonical/dex/front-shiny/Malamar.png b/src/canonical/dex/front-shiny/687--0--Malamar.png similarity index 100% rename from src/canonical/dex/front-shiny/Malamar.png rename to src/canonical/dex/front-shiny/687--0--Malamar.png diff --git a/src/canonical/dex/front-shiny/Binacle.png b/src/canonical/dex/front-shiny/688--0--Binacle.png similarity index 100% rename from src/canonical/dex/front-shiny/Binacle.png rename to src/canonical/dex/front-shiny/688--0--Binacle.png diff --git a/src/canonical/dex/front-shiny/Barbaracle.png b/src/canonical/dex/front-shiny/689--0--Barbaracle.png similarity index 100% rename from src/canonical/dex/front-shiny/Barbaracle.png rename to src/canonical/dex/front-shiny/689--0--Barbaracle.png diff --git a/src/canonical/dex/front-shiny/Bellsprout.png b/src/canonical/dex/front-shiny/69--0--Bellsprout.png similarity index 100% rename from src/canonical/dex/front-shiny/Bellsprout.png rename to src/canonical/dex/front-shiny/69--0--Bellsprout.png diff --git a/src/canonical/dex/front-shiny/Skrelp.png b/src/canonical/dex/front-shiny/690--0--Skrelp.png similarity index 100% rename from src/canonical/dex/front-shiny/Skrelp.png rename to src/canonical/dex/front-shiny/690--0--Skrelp.png diff --git a/src/canonical/dex/front-shiny/Dragalge.png b/src/canonical/dex/front-shiny/691--0--Dragalge.png similarity index 100% rename from src/canonical/dex/front-shiny/Dragalge.png rename to src/canonical/dex/front-shiny/691--0--Dragalge.png diff --git a/src/canonical/dex/front-shiny/Clauncher.png b/src/canonical/dex/front-shiny/692--0--Clauncher.png similarity index 100% rename from src/canonical/dex/front-shiny/Clauncher.png rename to src/canonical/dex/front-shiny/692--0--Clauncher.png diff --git a/src/canonical/dex/front-shiny/Clawitzer.png b/src/canonical/dex/front-shiny/693--0--Clawitzer.png similarity index 100% rename from src/canonical/dex/front-shiny/Clawitzer.png rename to src/canonical/dex/front-shiny/693--0--Clawitzer.png diff --git a/src/canonical/dex/front-shiny/Helioptile.png b/src/canonical/dex/front-shiny/694--0--Helioptile.png similarity index 100% rename from src/canonical/dex/front-shiny/Helioptile.png rename to src/canonical/dex/front-shiny/694--0--Helioptile.png diff --git a/src/canonical/dex/front-shiny/Heliolisk.png b/src/canonical/dex/front-shiny/695--0--Heliolisk.png similarity index 100% rename from src/canonical/dex/front-shiny/Heliolisk.png rename to src/canonical/dex/front-shiny/695--0--Heliolisk.png diff --git a/src/canonical/dex/front-shiny/Tyrunt.png b/src/canonical/dex/front-shiny/696--0--Tyrunt.png similarity index 100% rename from src/canonical/dex/front-shiny/Tyrunt.png rename to src/canonical/dex/front-shiny/696--0--Tyrunt.png diff --git a/src/canonical/dex/front-shiny/Tyrantrum.png b/src/canonical/dex/front-shiny/697--0--Tyrantrum.png similarity index 100% rename from src/canonical/dex/front-shiny/Tyrantrum.png rename to src/canonical/dex/front-shiny/697--0--Tyrantrum.png diff --git a/src/canonical/dex/front-shiny/Amaura.png b/src/canonical/dex/front-shiny/698--0--Amaura.png similarity index 100% rename from src/canonical/dex/front-shiny/Amaura.png rename to src/canonical/dex/front-shiny/698--0--Amaura.png diff --git a/src/canonical/dex/front-shiny/Aurorus.png b/src/canonical/dex/front-shiny/699--0--Aurorus.png similarity index 100% rename from src/canonical/dex/front-shiny/Aurorus.png rename to src/canonical/dex/front-shiny/699--0--Aurorus.png diff --git a/src/canonical/dex/front-shiny/Squirtle.png b/src/canonical/dex/front-shiny/7--0--Squirtle.png similarity index 100% rename from src/canonical/dex/front-shiny/Squirtle.png rename to src/canonical/dex/front-shiny/7--0--Squirtle.png diff --git a/src/canonical/dex/front-shiny/Weepinbell.png b/src/canonical/dex/front-shiny/70--0--Weepinbell.png similarity index 100% rename from src/canonical/dex/front-shiny/Weepinbell.png rename to src/canonical/dex/front-shiny/70--0--Weepinbell.png diff --git a/src/canonical/dex/front-shiny/Sylveon.png b/src/canonical/dex/front-shiny/700--0--Sylveon.png similarity index 100% rename from src/canonical/dex/front-shiny/Sylveon.png rename to src/canonical/dex/front-shiny/700--0--Sylveon.png diff --git a/src/canonical/dex/front-shiny/Hawlucha.png b/src/canonical/dex/front-shiny/701--0--Hawlucha.png similarity index 100% rename from src/canonical/dex/front-shiny/Hawlucha.png rename to src/canonical/dex/front-shiny/701--0--Hawlucha.png diff --git a/src/canonical/dex/front-shiny/Dedenne.png b/src/canonical/dex/front-shiny/702--0--Dedenne.png similarity index 100% rename from src/canonical/dex/front-shiny/Dedenne.png rename to src/canonical/dex/front-shiny/702--0--Dedenne.png diff --git a/src/canonical/dex/front-shiny/Carbink.png b/src/canonical/dex/front-shiny/703--0--Carbink.png similarity index 100% rename from src/canonical/dex/front-shiny/Carbink.png rename to src/canonical/dex/front-shiny/703--0--Carbink.png diff --git a/src/canonical/dex/front-shiny/Goomy.png b/src/canonical/dex/front-shiny/704--0--Goomy.png similarity index 100% rename from src/canonical/dex/front-shiny/Goomy.png rename to src/canonical/dex/front-shiny/704--0--Goomy.png diff --git a/src/canonical/dex/front-shiny/Sliggoo.png b/src/canonical/dex/front-shiny/705--0--Sliggoo.png similarity index 100% rename from src/canonical/dex/front-shiny/Sliggoo.png rename to src/canonical/dex/front-shiny/705--0--Sliggoo.png diff --git a/src/canonical/dex/front-shiny/Goodra.png b/src/canonical/dex/front-shiny/706--0--Goodra.png similarity index 100% rename from src/canonical/dex/front-shiny/Goodra.png rename to src/canonical/dex/front-shiny/706--0--Goodra.png diff --git a/src/canonical/dex/front-shiny/Klefki.png b/src/canonical/dex/front-shiny/707--0--Klefki.png similarity index 100% rename from src/canonical/dex/front-shiny/Klefki.png rename to src/canonical/dex/front-shiny/707--0--Klefki.png diff --git a/src/canonical/dex/front-shiny/Phantump.png b/src/canonical/dex/front-shiny/708--0--Phantump.png similarity index 100% rename from src/canonical/dex/front-shiny/Phantump.png rename to src/canonical/dex/front-shiny/708--0--Phantump.png diff --git a/src/canonical/dex/front-shiny/Trevenant.png b/src/canonical/dex/front-shiny/709--0--Trevenant.png similarity index 100% rename from src/canonical/dex/front-shiny/Trevenant.png rename to src/canonical/dex/front-shiny/709--0--Trevenant.png diff --git a/src/canonical/dex/front-shiny/Victreebel.png b/src/canonical/dex/front-shiny/71--0--Victreebel.png similarity index 100% rename from src/canonical/dex/front-shiny/Victreebel.png rename to src/canonical/dex/front-shiny/71--0--Victreebel.png diff --git a/src/canonical/dex/front-shiny/Pumpkaboo.png b/src/canonical/dex/front-shiny/710--0--Pumpkaboo.png similarity index 100% rename from src/canonical/dex/front-shiny/Pumpkaboo.png rename to src/canonical/dex/front-shiny/710--0--Pumpkaboo.png diff --git a/src/canonical/dex/front-shiny/Pumpkaboo--Large.png b/src/canonical/dex/front-shiny/710--420--Pumpkaboo--Large.png similarity index 100% rename from src/canonical/dex/front-shiny/Pumpkaboo--Large.png rename to src/canonical/dex/front-shiny/710--420--Pumpkaboo--Large.png diff --git a/src/canonical/dex/front-shiny/Pumpkaboo--Small.png b/src/canonical/dex/front-shiny/710--420--Pumpkaboo--Small.png similarity index 100% rename from src/canonical/dex/front-shiny/Pumpkaboo--Small.png rename to src/canonical/dex/front-shiny/710--420--Pumpkaboo--Small.png diff --git a/src/canonical/dex/front-shiny/Pumpkaboo--Super.png b/src/canonical/dex/front-shiny/710--420--Pumpkaboo--Super.png similarity index 100% rename from src/canonical/dex/front-shiny/Pumpkaboo--Super.png rename to src/canonical/dex/front-shiny/710--420--Pumpkaboo--Super.png diff --git a/src/canonical/dex/front-shiny/Gourgeist.png b/src/canonical/dex/front-shiny/711--0--Gourgeist.png similarity index 100% rename from src/canonical/dex/front-shiny/Gourgeist.png rename to src/canonical/dex/front-shiny/711--0--Gourgeist.png diff --git a/src/canonical/dex/front-shiny/Gourgeist--Large.png b/src/canonical/dex/front-shiny/711--420--Gourgeist--Large.png similarity index 100% rename from src/canonical/dex/front-shiny/Gourgeist--Large.png rename to src/canonical/dex/front-shiny/711--420--Gourgeist--Large.png diff --git a/src/canonical/dex/front-shiny/Gourgeist--Small.png b/src/canonical/dex/front-shiny/711--420--Gourgeist--Small.png similarity index 100% rename from src/canonical/dex/front-shiny/Gourgeist--Small.png rename to src/canonical/dex/front-shiny/711--420--Gourgeist--Small.png diff --git a/src/canonical/dex/front-shiny/Gourgeist--Super.png b/src/canonical/dex/front-shiny/711--420--Gourgeist--Super.png similarity index 100% rename from src/canonical/dex/front-shiny/Gourgeist--Super.png rename to src/canonical/dex/front-shiny/711--420--Gourgeist--Super.png diff --git a/src/canonical/dex/front-shiny/Bergmite.png b/src/canonical/dex/front-shiny/712--0--Bergmite.png similarity index 100% rename from src/canonical/dex/front-shiny/Bergmite.png rename to src/canonical/dex/front-shiny/712--0--Bergmite.png diff --git a/src/canonical/dex/front-shiny/Avalugg.png b/src/canonical/dex/front-shiny/713--0--Avalugg.png similarity index 100% rename from src/canonical/dex/front-shiny/Avalugg.png rename to src/canonical/dex/front-shiny/713--0--Avalugg.png diff --git a/src/canonical/dex/front-shiny/Noibat.png b/src/canonical/dex/front-shiny/714--0--Noibat.png similarity index 100% rename from src/canonical/dex/front-shiny/Noibat.png rename to src/canonical/dex/front-shiny/714--0--Noibat.png diff --git a/src/canonical/dex/front-shiny/Noivern.png b/src/canonical/dex/front-shiny/715--0--Noivern.png similarity index 100% rename from src/canonical/dex/front-shiny/Noivern.png rename to src/canonical/dex/front-shiny/715--0--Noivern.png diff --git a/src/canonical/dex/front-shiny/Xerneas.png b/src/canonical/dex/front-shiny/716--0--Xerneas.png similarity index 100% rename from src/canonical/dex/front-shiny/Xerneas.png rename to src/canonical/dex/front-shiny/716--0--Xerneas.png diff --git a/src/canonical/dex/front-shiny/Yveltal.png b/src/canonical/dex/front-shiny/717--0--Yveltal.png similarity index 100% rename from src/canonical/dex/front-shiny/Yveltal.png rename to src/canonical/dex/front-shiny/717--0--Yveltal.png diff --git a/src/canonical/dex/front-shiny/Zygarde.png b/src/canonical/dex/front-shiny/718--0--Zygarde.png similarity index 100% rename from src/canonical/dex/front-shiny/Zygarde.png rename to src/canonical/dex/front-shiny/718--0--Zygarde.png diff --git a/src/canonical/dex/front-shiny/Zygarde--10__0025.png b/src/canonical/dex/front-shiny/718--420--Zygarde--10__0025.png similarity index 100% rename from src/canonical/dex/front-shiny/Zygarde--10__0025.png rename to src/canonical/dex/front-shiny/718--420--Zygarde--10__0025.png diff --git a/src/canonical/dex/front-shiny/Zygarde--Complete.png b/src/canonical/dex/front-shiny/718--420--Zygarde--Complete.png similarity index 100% rename from src/canonical/dex/front-shiny/Zygarde--Complete.png rename to src/canonical/dex/front-shiny/718--420--Zygarde--Complete.png diff --git a/src/canonical/dex/front-shiny/Diancie.png b/src/canonical/dex/front-shiny/719--0--Diancie.png similarity index 100% rename from src/canonical/dex/front-shiny/Diancie.png rename to src/canonical/dex/front-shiny/719--0--Diancie.png diff --git a/src/canonical/dex/front-shiny/Diancie--Mega.png b/src/canonical/dex/front-shiny/719--420--Diancie--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Diancie--Mega.png rename to src/canonical/dex/front-shiny/719--420--Diancie--Mega.png diff --git a/src/canonical/dex/front-shiny/Tentacool.png b/src/canonical/dex/front-shiny/72--0--Tentacool.png similarity index 100% rename from src/canonical/dex/front-shiny/Tentacool.png rename to src/canonical/dex/front-shiny/72--0--Tentacool.png diff --git a/src/canonical/dex/front-shiny/Hoopa.png b/src/canonical/dex/front-shiny/720--0--Hoopa.png similarity index 100% rename from src/canonical/dex/front-shiny/Hoopa.png rename to src/canonical/dex/front-shiny/720--0--Hoopa.png diff --git a/src/canonical/dex/front-shiny/Hoopa--Unbound.png b/src/canonical/dex/front-shiny/720--420--Hoopa--Unbound.png similarity index 100% rename from src/canonical/dex/front-shiny/Hoopa--Unbound.png rename to src/canonical/dex/front-shiny/720--420--Hoopa--Unbound.png diff --git a/src/canonical/dex/front-shiny/Volcanion.png b/src/canonical/dex/front-shiny/721--0--Volcanion.png similarity index 100% rename from src/canonical/dex/front-shiny/Volcanion.png rename to src/canonical/dex/front-shiny/721--0--Volcanion.png diff --git a/src/canonical/dex/front-shiny/Rowlet.png b/src/canonical/dex/front-shiny/722--0--Rowlet.png similarity index 100% rename from src/canonical/dex/front-shiny/Rowlet.png rename to src/canonical/dex/front-shiny/722--0--Rowlet.png diff --git a/src/canonical/dex/front-shiny/Dartrix.png b/src/canonical/dex/front-shiny/723--0--Dartrix.png similarity index 100% rename from src/canonical/dex/front-shiny/Dartrix.png rename to src/canonical/dex/front-shiny/723--0--Dartrix.png diff --git a/src/canonical/dex/front-shiny/Decidueye.png b/src/canonical/dex/front-shiny/724--0--Decidueye.png similarity index 100% rename from src/canonical/dex/front-shiny/Decidueye.png rename to src/canonical/dex/front-shiny/724--0--Decidueye.png diff --git a/src/canonical/dex/front-shiny/Litten.png b/src/canonical/dex/front-shiny/725--0--Litten.png similarity index 100% rename from src/canonical/dex/front-shiny/Litten.png rename to src/canonical/dex/front-shiny/725--0--Litten.png diff --git a/src/canonical/dex/front-shiny/Torracat.png b/src/canonical/dex/front-shiny/726--0--Torracat.png similarity index 100% rename from src/canonical/dex/front-shiny/Torracat.png rename to src/canonical/dex/front-shiny/726--0--Torracat.png diff --git a/src/canonical/dex/front-shiny/Incineroar.png b/src/canonical/dex/front-shiny/727--0--Incineroar.png similarity index 100% rename from src/canonical/dex/front-shiny/Incineroar.png rename to src/canonical/dex/front-shiny/727--0--Incineroar.png diff --git a/src/canonical/dex/front-shiny/Brionne.png b/src/canonical/dex/front-shiny/729--0--Brionne.png similarity index 100% rename from src/canonical/dex/front-shiny/Brionne.png rename to src/canonical/dex/front-shiny/729--0--Brionne.png diff --git a/src/canonical/dex/front-shiny/Tentacruel.png b/src/canonical/dex/front-shiny/73--0--Tentacruel.png similarity index 100% rename from src/canonical/dex/front-shiny/Tentacruel.png rename to src/canonical/dex/front-shiny/73--0--Tentacruel.png diff --git a/src/canonical/dex/front-shiny/Primarina.png b/src/canonical/dex/front-shiny/730--0--Primarina.png similarity index 100% rename from src/canonical/dex/front-shiny/Primarina.png rename to src/canonical/dex/front-shiny/730--0--Primarina.png diff --git a/src/canonical/dex/front-shiny/Pikipek.png b/src/canonical/dex/front-shiny/731--0--Pikipek.png similarity index 100% rename from src/canonical/dex/front-shiny/Pikipek.png rename to src/canonical/dex/front-shiny/731--0--Pikipek.png diff --git a/src/canonical/dex/front-shiny/Trumbeak.png b/src/canonical/dex/front-shiny/732--0--Trumbeak.png similarity index 100% rename from src/canonical/dex/front-shiny/Trumbeak.png rename to src/canonical/dex/front-shiny/732--0--Trumbeak.png diff --git a/src/canonical/dex/front-shiny/Toucannon.png b/src/canonical/dex/front-shiny/733--0--Toucannon.png similarity index 100% rename from src/canonical/dex/front-shiny/Toucannon.png rename to src/canonical/dex/front-shiny/733--0--Toucannon.png diff --git a/src/canonical/dex/front-shiny/Yungoos.png b/src/canonical/dex/front-shiny/734--0--Yungoos.png similarity index 100% rename from src/canonical/dex/front-shiny/Yungoos.png rename to src/canonical/dex/front-shiny/734--0--Yungoos.png diff --git a/src/canonical/dex/front-shiny/Gumshoos.png b/src/canonical/dex/front-shiny/735--0--Gumshoos.png similarity index 100% rename from src/canonical/dex/front-shiny/Gumshoos.png rename to src/canonical/dex/front-shiny/735--0--Gumshoos.png diff --git a/src/canonical/dex/front-shiny/Gumshoos--Totem.png b/src/canonical/dex/front-shiny/735--420--Gumshoos--Totem.png similarity index 100% rename from src/canonical/dex/front-shiny/Gumshoos--Totem.png rename to src/canonical/dex/front-shiny/735--420--Gumshoos--Totem.png diff --git a/src/canonical/dex/front-shiny/Grubbin.png b/src/canonical/dex/front-shiny/736--0--Grubbin.png similarity index 100% rename from src/canonical/dex/front-shiny/Grubbin.png rename to src/canonical/dex/front-shiny/736--0--Grubbin.png diff --git a/src/canonical/dex/front-shiny/Charjabug.png b/src/canonical/dex/front-shiny/737--0--Charjabug.png similarity index 100% rename from src/canonical/dex/front-shiny/Charjabug.png rename to src/canonical/dex/front-shiny/737--0--Charjabug.png diff --git a/src/canonical/dex/front-shiny/Vikavolt.png b/src/canonical/dex/front-shiny/738--0--Vikavolt.png similarity index 100% rename from src/canonical/dex/front-shiny/Vikavolt.png rename to src/canonical/dex/front-shiny/738--0--Vikavolt.png diff --git a/src/canonical/dex/front-shiny/Vikavolt--Totem.png b/src/canonical/dex/front-shiny/738--420--Vikavolt--Totem.png similarity index 100% rename from src/canonical/dex/front-shiny/Vikavolt--Totem.png rename to src/canonical/dex/front-shiny/738--420--Vikavolt--Totem.png diff --git a/src/canonical/dex/front-shiny/Crabrawler.png b/src/canonical/dex/front-shiny/739--0--Crabrawler.png similarity index 100% rename from src/canonical/dex/front-shiny/Crabrawler.png rename to src/canonical/dex/front-shiny/739--0--Crabrawler.png diff --git a/src/canonical/dex/front-shiny/Geodude.png b/src/canonical/dex/front-shiny/74--0--Geodude.png similarity index 100% rename from src/canonical/dex/front-shiny/Geodude.png rename to src/canonical/dex/front-shiny/74--0--Geodude.png diff --git a/src/canonical/dex/front-shiny/Geodude--Alola.png b/src/canonical/dex/front-shiny/74--420--Geodude--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Geodude--Alola.png rename to src/canonical/dex/front-shiny/74--420--Geodude--Alola.png diff --git a/src/canonical/dex/front-shiny/Crabominable.png b/src/canonical/dex/front-shiny/740--0--Crabominable.png similarity index 100% rename from src/canonical/dex/front-shiny/Crabominable.png rename to src/canonical/dex/front-shiny/740--0--Crabominable.png diff --git a/src/canonical/dex/front-shiny/Oricorio.png b/src/canonical/dex/front-shiny/741--0--Oricorio.png similarity index 100% rename from src/canonical/dex/front-shiny/Oricorio.png rename to src/canonical/dex/front-shiny/741--0--Oricorio.png diff --git a/src/canonical/dex/front-shiny/Oricorio--Pa__0027u.png b/src/canonical/dex/front-shiny/741--420--Oricorio--Pa__0027u.png similarity index 100% rename from src/canonical/dex/front-shiny/Oricorio--Pa__0027u.png rename to src/canonical/dex/front-shiny/741--420--Oricorio--Pa__0027u.png diff --git a/src/canonical/dex/front-shiny/Oricorio--Pom-Pom.png b/src/canonical/dex/front-shiny/741--420--Oricorio--Pom-Pom.png similarity index 100% rename from src/canonical/dex/front-shiny/Oricorio--Pom-Pom.png rename to src/canonical/dex/front-shiny/741--420--Oricorio--Pom-Pom.png diff --git a/src/canonical/dex/front-shiny/Oricorio--Sensu.png b/src/canonical/dex/front-shiny/741--420--Oricorio--Sensu.png similarity index 100% rename from src/canonical/dex/front-shiny/Oricorio--Sensu.png rename to src/canonical/dex/front-shiny/741--420--Oricorio--Sensu.png diff --git a/src/canonical/dex/front-shiny/Cutiefly.png b/src/canonical/dex/front-shiny/742--0--Cutiefly.png similarity index 100% rename from src/canonical/dex/front-shiny/Cutiefly.png rename to src/canonical/dex/front-shiny/742--0--Cutiefly.png diff --git a/src/canonical/dex/front-shiny/Ribombee.png b/src/canonical/dex/front-shiny/743--0--Ribombee.png similarity index 100% rename from src/canonical/dex/front-shiny/Ribombee.png rename to src/canonical/dex/front-shiny/743--0--Ribombee.png diff --git a/src/canonical/dex/front-shiny/Rockruff.png b/src/canonical/dex/front-shiny/744--0--Rockruff.png similarity index 100% rename from src/canonical/dex/front-shiny/Rockruff.png rename to src/canonical/dex/front-shiny/744--0--Rockruff.png diff --git a/src/canonical/dex/front-shiny/Lycanroc.png b/src/canonical/dex/front-shiny/745--0--Lycanroc.png similarity index 100% rename from src/canonical/dex/front-shiny/Lycanroc.png rename to src/canonical/dex/front-shiny/745--0--Lycanroc.png diff --git a/src/canonical/dex/front-shiny/Lycanroc--Dusk.png b/src/canonical/dex/front-shiny/745--420--Lycanroc--Dusk.png similarity index 100% rename from src/canonical/dex/front-shiny/Lycanroc--Dusk.png rename to src/canonical/dex/front-shiny/745--420--Lycanroc--Dusk.png diff --git a/src/canonical/dex/front-shiny/Lycanroc--Midnight.png b/src/canonical/dex/front-shiny/745--420--Lycanroc--Midnight.png similarity index 100% rename from src/canonical/dex/front-shiny/Lycanroc--Midnight.png rename to src/canonical/dex/front-shiny/745--420--Lycanroc--Midnight.png diff --git a/src/canonical/dex/front-shiny/Wishiwashi.png b/src/canonical/dex/front-shiny/746--0--Wishiwashi.png similarity index 100% rename from src/canonical/dex/front-shiny/Wishiwashi.png rename to src/canonical/dex/front-shiny/746--0--Wishiwashi.png diff --git a/src/canonical/dex/front-shiny/Wishiwashi--School.png b/src/canonical/dex/front-shiny/746--420--Wishiwashi--School.png similarity index 100% rename from src/canonical/dex/front-shiny/Wishiwashi--School.png rename to src/canonical/dex/front-shiny/746--420--Wishiwashi--School.png diff --git a/src/canonical/dex/front-shiny/Mareanie.png b/src/canonical/dex/front-shiny/747--0--Mareanie.png similarity index 100% rename from src/canonical/dex/front-shiny/Mareanie.png rename to src/canonical/dex/front-shiny/747--0--Mareanie.png diff --git a/src/canonical/dex/front-shiny/Toxapex.png b/src/canonical/dex/front-shiny/748--0--Toxapex.png similarity index 100% rename from src/canonical/dex/front-shiny/Toxapex.png rename to src/canonical/dex/front-shiny/748--0--Toxapex.png diff --git a/src/canonical/dex/front-shiny/Mudbray.png b/src/canonical/dex/front-shiny/749--0--Mudbray.png similarity index 100% rename from src/canonical/dex/front-shiny/Mudbray.png rename to src/canonical/dex/front-shiny/749--0--Mudbray.png diff --git a/src/canonical/dex/front-shiny/Graveler.png b/src/canonical/dex/front-shiny/75--0--Graveler.png similarity index 100% rename from src/canonical/dex/front-shiny/Graveler.png rename to src/canonical/dex/front-shiny/75--0--Graveler.png diff --git a/src/canonical/dex/front-shiny/Graveler--Alola.png b/src/canonical/dex/front-shiny/75--420--Graveler--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Graveler--Alola.png rename to src/canonical/dex/front-shiny/75--420--Graveler--Alola.png diff --git a/src/canonical/dex/front-shiny/Mudsdale.png b/src/canonical/dex/front-shiny/750--0--Mudsdale.png similarity index 100% rename from src/canonical/dex/front-shiny/Mudsdale.png rename to src/canonical/dex/front-shiny/750--0--Mudsdale.png diff --git a/src/canonical/dex/front-shiny/Dewpider.png b/src/canonical/dex/front-shiny/751--0--Dewpider.png similarity index 100% rename from src/canonical/dex/front-shiny/Dewpider.png rename to src/canonical/dex/front-shiny/751--0--Dewpider.png diff --git a/src/canonical/dex/front-shiny/Araquanid.png b/src/canonical/dex/front-shiny/752--0--Araquanid.png similarity index 100% rename from src/canonical/dex/front-shiny/Araquanid.png rename to src/canonical/dex/front-shiny/752--0--Araquanid.png diff --git a/src/canonical/dex/front-shiny/Fomantis.png b/src/canonical/dex/front-shiny/753--0--Fomantis.png similarity index 100% rename from src/canonical/dex/front-shiny/Fomantis.png rename to src/canonical/dex/front-shiny/753--0--Fomantis.png diff --git a/src/canonical/dex/front-shiny/Lurantis.png b/src/canonical/dex/front-shiny/754--0--Lurantis.png similarity index 100% rename from src/canonical/dex/front-shiny/Lurantis.png rename to src/canonical/dex/front-shiny/754--0--Lurantis.png diff --git a/src/canonical/dex/front-shiny/Morelull.png b/src/canonical/dex/front-shiny/755--0--Morelull.png similarity index 100% rename from src/canonical/dex/front-shiny/Morelull.png rename to src/canonical/dex/front-shiny/755--0--Morelull.png diff --git a/src/canonical/dex/front-shiny/Shiinotic.png b/src/canonical/dex/front-shiny/756--0--Shiinotic.png similarity index 100% rename from src/canonical/dex/front-shiny/Shiinotic.png rename to src/canonical/dex/front-shiny/756--0--Shiinotic.png diff --git a/src/canonical/dex/front-shiny/Salandit.png b/src/canonical/dex/front-shiny/757--0--Salandit.png similarity index 100% rename from src/canonical/dex/front-shiny/Salandit.png rename to src/canonical/dex/front-shiny/757--0--Salandit.png diff --git a/src/canonical/dex/front-shiny/Salazzle.png b/src/canonical/dex/front-shiny/758--0--Salazzle.png similarity index 100% rename from src/canonical/dex/front-shiny/Salazzle.png rename to src/canonical/dex/front-shiny/758--0--Salazzle.png diff --git a/src/canonical/dex/front-shiny/Stufful.png b/src/canonical/dex/front-shiny/759--0--Stufful.png similarity index 100% rename from src/canonical/dex/front-shiny/Stufful.png rename to src/canonical/dex/front-shiny/759--0--Stufful.png diff --git a/src/canonical/dex/front-shiny/Golem.png b/src/canonical/dex/front-shiny/76--0--Golem.png similarity index 100% rename from src/canonical/dex/front-shiny/Golem.png rename to src/canonical/dex/front-shiny/76--0--Golem.png diff --git a/src/canonical/dex/front-shiny/Golem--Alola.png b/src/canonical/dex/front-shiny/76--420--Golem--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Golem--Alola.png rename to src/canonical/dex/front-shiny/76--420--Golem--Alola.png diff --git a/src/canonical/dex/front-shiny/Bewear.png b/src/canonical/dex/front-shiny/760--0--Bewear.png similarity index 100% rename from src/canonical/dex/front-shiny/Bewear.png rename to src/canonical/dex/front-shiny/760--0--Bewear.png diff --git a/src/canonical/dex/front-shiny/Bounsweet.png b/src/canonical/dex/front-shiny/761--0--Bounsweet.png similarity index 100% rename from src/canonical/dex/front-shiny/Bounsweet.png rename to src/canonical/dex/front-shiny/761--0--Bounsweet.png diff --git a/src/canonical/dex/front-shiny/Steenee.png b/src/canonical/dex/front-shiny/762--0--Steenee.png similarity index 100% rename from src/canonical/dex/front-shiny/Steenee.png rename to src/canonical/dex/front-shiny/762--0--Steenee.png diff --git a/src/canonical/dex/front-shiny/Tsareena.png b/src/canonical/dex/front-shiny/763--0--Tsareena.png similarity index 100% rename from src/canonical/dex/front-shiny/Tsareena.png rename to src/canonical/dex/front-shiny/763--0--Tsareena.png diff --git a/src/canonical/dex/front-shiny/Comfey.png b/src/canonical/dex/front-shiny/764--0--Comfey.png similarity index 100% rename from src/canonical/dex/front-shiny/Comfey.png rename to src/canonical/dex/front-shiny/764--0--Comfey.png diff --git a/src/canonical/dex/front-shiny/Oranguru.png b/src/canonical/dex/front-shiny/765--0--Oranguru.png similarity index 100% rename from src/canonical/dex/front-shiny/Oranguru.png rename to src/canonical/dex/front-shiny/765--0--Oranguru.png diff --git a/src/canonical/dex/front-shiny/Passimian.png b/src/canonical/dex/front-shiny/766--0--Passimian.png similarity index 100% rename from src/canonical/dex/front-shiny/Passimian.png rename to src/canonical/dex/front-shiny/766--0--Passimian.png diff --git a/src/canonical/dex/front-shiny/Wimpod.png b/src/canonical/dex/front-shiny/767--0--Wimpod.png similarity index 100% rename from src/canonical/dex/front-shiny/Wimpod.png rename to src/canonical/dex/front-shiny/767--0--Wimpod.png diff --git a/src/canonical/dex/front-shiny/Golisopod.png b/src/canonical/dex/front-shiny/768--0--Golisopod.png similarity index 100% rename from src/canonical/dex/front-shiny/Golisopod.png rename to src/canonical/dex/front-shiny/768--0--Golisopod.png diff --git a/src/canonical/dex/front-shiny/Sandygast.png b/src/canonical/dex/front-shiny/769--0--Sandygast.png similarity index 100% rename from src/canonical/dex/front-shiny/Sandygast.png rename to src/canonical/dex/front-shiny/769--0--Sandygast.png diff --git a/src/canonical/dex/front-shiny/Ponyta.png b/src/canonical/dex/front-shiny/77--0--Ponyta.png similarity index 100% rename from src/canonical/dex/front-shiny/Ponyta.png rename to src/canonical/dex/front-shiny/77--0--Ponyta.png diff --git a/src/canonical/dex/front-shiny/Palossand.png b/src/canonical/dex/front-shiny/770--0--Palossand.png similarity index 100% rename from src/canonical/dex/front-shiny/Palossand.png rename to src/canonical/dex/front-shiny/770--0--Palossand.png diff --git a/src/canonical/dex/front-shiny/Pyukumuku.png b/src/canonical/dex/front-shiny/771--0--Pyukumuku.png similarity index 100% rename from src/canonical/dex/front-shiny/Pyukumuku.png rename to src/canonical/dex/front-shiny/771--0--Pyukumuku.png diff --git a/src/canonical/dex/front-shiny/Type__003a_Null.png b/src/canonical/dex/front-shiny/772--0--Type__003a_Null.png similarity index 100% rename from src/canonical/dex/front-shiny/Type__003a_Null.png rename to src/canonical/dex/front-shiny/772--0--Type__003a_Null.png diff --git a/src/canonical/dex/front-shiny/Silvally.png b/src/canonical/dex/front-shiny/773--0--Silvally.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally.png rename to src/canonical/dex/front-shiny/773--0--Silvally.png diff --git a/src/canonical/dex/front-shiny/Silvally--Bug.png b/src/canonical/dex/front-shiny/773--420--Silvally--Bug.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Bug.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Bug.png diff --git a/src/canonical/dex/front-shiny/Silvally--Dark.png b/src/canonical/dex/front-shiny/773--420--Silvally--Dark.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Dark.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Dark.png diff --git a/src/canonical/dex/front-shiny/Silvally--Dragon.png b/src/canonical/dex/front-shiny/773--420--Silvally--Dragon.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Dragon.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Dragon.png diff --git a/src/canonical/dex/front-shiny/Silvally--Electric.png b/src/canonical/dex/front-shiny/773--420--Silvally--Electric.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Electric.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Electric.png diff --git a/src/canonical/dex/front-shiny/Silvally--Fairy.png b/src/canonical/dex/front-shiny/773--420--Silvally--Fairy.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Fairy.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Fairy.png diff --git a/src/canonical/dex/front-shiny/Silvally--Fighting.png b/src/canonical/dex/front-shiny/773--420--Silvally--Fighting.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Fighting.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Fighting.png diff --git a/src/canonical/dex/front-shiny/Silvally--Fire.png b/src/canonical/dex/front-shiny/773--420--Silvally--Fire.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Fire.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Fire.png diff --git a/src/canonical/dex/front-shiny/Silvally--Flying.png b/src/canonical/dex/front-shiny/773--420--Silvally--Flying.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Flying.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Flying.png diff --git a/src/canonical/dex/front-shiny/Silvally--Ghost.png b/src/canonical/dex/front-shiny/773--420--Silvally--Ghost.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Ghost.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Ghost.png diff --git a/src/canonical/dex/front-shiny/Silvally--Grass.png b/src/canonical/dex/front-shiny/773--420--Silvally--Grass.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Grass.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Grass.png diff --git a/src/canonical/dex/front-shiny/Silvally--Ground.png b/src/canonical/dex/front-shiny/773--420--Silvally--Ground.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Ground.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Ground.png diff --git a/src/canonical/dex/front-shiny/Silvally--Ice.png b/src/canonical/dex/front-shiny/773--420--Silvally--Ice.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Ice.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Ice.png diff --git a/src/canonical/dex/front-shiny/Silvally--Poison.png b/src/canonical/dex/front-shiny/773--420--Silvally--Poison.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Poison.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Poison.png diff --git a/src/canonical/dex/front-shiny/Silvally--Psychic.png b/src/canonical/dex/front-shiny/773--420--Silvally--Psychic.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Psychic.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Psychic.png diff --git a/src/canonical/dex/front-shiny/Silvally--Rock.png b/src/canonical/dex/front-shiny/773--420--Silvally--Rock.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Rock.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Rock.png diff --git a/src/canonical/dex/front-shiny/Silvally--Steel.png b/src/canonical/dex/front-shiny/773--420--Silvally--Steel.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Steel.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Steel.png diff --git a/src/canonical/dex/front-shiny/Silvally--Water.png b/src/canonical/dex/front-shiny/773--420--Silvally--Water.png similarity index 100% rename from src/canonical/dex/front-shiny/Silvally--Water.png rename to src/canonical/dex/front-shiny/773--420--Silvally--Water.png diff --git a/src/canonical/dex/front-shiny/Minior.png b/src/canonical/dex/front-shiny/774--0--Minior.png similarity index 100% rename from src/canonical/dex/front-shiny/Minior.png rename to src/canonical/dex/front-shiny/774--0--Minior.png diff --git a/src/canonical/dex/front-shiny/Minior--Meteor.png b/src/canonical/dex/front-shiny/774--420--Minior--Meteor.png similarity index 100% rename from src/canonical/dex/front-shiny/Minior--Meteor.png rename to src/canonical/dex/front-shiny/774--420--Minior--Meteor.png diff --git a/src/canonical/dex/front-shiny/Komala.png b/src/canonical/dex/front-shiny/775--0--Komala.png similarity index 100% rename from src/canonical/dex/front-shiny/Komala.png rename to src/canonical/dex/front-shiny/775--0--Komala.png diff --git a/src/canonical/dex/front-shiny/Turtonator.png b/src/canonical/dex/front-shiny/776--0--Turtonator.png similarity index 100% rename from src/canonical/dex/front-shiny/Turtonator.png rename to src/canonical/dex/front-shiny/776--0--Turtonator.png diff --git a/src/canonical/dex/front-shiny/Togedemaru.png b/src/canonical/dex/front-shiny/777--0--Togedemaru.png similarity index 100% rename from src/canonical/dex/front-shiny/Togedemaru.png rename to src/canonical/dex/front-shiny/777--0--Togedemaru.png diff --git a/src/canonical/dex/front-shiny/Mimikyu.png b/src/canonical/dex/front-shiny/778--0--Mimikyu.png similarity index 100% rename from src/canonical/dex/front-shiny/Mimikyu.png rename to src/canonical/dex/front-shiny/778--0--Mimikyu.png diff --git a/src/canonical/dex/front-shiny/Mimikyu--Busted-Totem.png b/src/canonical/dex/front-shiny/778--420--Mimikyu--Busted-Totem.png similarity index 100% rename from src/canonical/dex/front-shiny/Mimikyu--Busted-Totem.png rename to src/canonical/dex/front-shiny/778--420--Mimikyu--Busted-Totem.png diff --git a/src/canonical/dex/front-shiny/Mimikyu--Busted.png b/src/canonical/dex/front-shiny/778--420--Mimikyu--Busted.png similarity index 100% rename from src/canonical/dex/front-shiny/Mimikyu--Busted.png rename to src/canonical/dex/front-shiny/778--420--Mimikyu--Busted.png diff --git a/src/canonical/dex/front-shiny/Mimikyu--Totem.png b/src/canonical/dex/front-shiny/778--420--Mimikyu--Totem.png similarity index 100% rename from src/canonical/dex/front-shiny/Mimikyu--Totem.png rename to src/canonical/dex/front-shiny/778--420--Mimikyu--Totem.png diff --git a/src/canonical/dex/front-shiny/Bruxish.png b/src/canonical/dex/front-shiny/779--0--Bruxish.png similarity index 100% rename from src/canonical/dex/front-shiny/Bruxish.png rename to src/canonical/dex/front-shiny/779--0--Bruxish.png diff --git a/src/canonical/dex/front-shiny/Rapidash.png b/src/canonical/dex/front-shiny/78--0--Rapidash.png similarity index 100% rename from src/canonical/dex/front-shiny/Rapidash.png rename to src/canonical/dex/front-shiny/78--0--Rapidash.png diff --git a/src/canonical/dex/front-shiny/Drampa.png b/src/canonical/dex/front-shiny/780--0--Drampa.png similarity index 100% rename from src/canonical/dex/front-shiny/Drampa.png rename to src/canonical/dex/front-shiny/780--0--Drampa.png diff --git a/src/canonical/dex/front-shiny/Dhelmise.png b/src/canonical/dex/front-shiny/781--0--Dhelmise.png similarity index 100% rename from src/canonical/dex/front-shiny/Dhelmise.png rename to src/canonical/dex/front-shiny/781--0--Dhelmise.png diff --git a/src/canonical/dex/front-shiny/Jangmo-o.png b/src/canonical/dex/front-shiny/782--0--Jangmo-o.png similarity index 100% rename from src/canonical/dex/front-shiny/Jangmo-o.png rename to src/canonical/dex/front-shiny/782--0--Jangmo-o.png diff --git a/src/canonical/dex/front-shiny/Hakamo-o.png b/src/canonical/dex/front-shiny/783--0--Hakamo-o.png similarity index 100% rename from src/canonical/dex/front-shiny/Hakamo-o.png rename to src/canonical/dex/front-shiny/783--0--Hakamo-o.png diff --git a/src/canonical/dex/front-shiny/Kommo-o.png b/src/canonical/dex/front-shiny/784--0--Kommo-o.png similarity index 100% rename from src/canonical/dex/front-shiny/Kommo-o.png rename to src/canonical/dex/front-shiny/784--0--Kommo-o.png diff --git a/src/canonical/dex/front-shiny/Kommo-o--Totem.png b/src/canonical/dex/front-shiny/784--420--Kommo-o--Totem.png similarity index 100% rename from src/canonical/dex/front-shiny/Kommo-o--Totem.png rename to src/canonical/dex/front-shiny/784--420--Kommo-o--Totem.png diff --git a/src/canonical/dex/front-shiny/Tapu_Koko.png b/src/canonical/dex/front-shiny/785--0--Tapu_Koko.png similarity index 100% rename from src/canonical/dex/front-shiny/Tapu_Koko.png rename to src/canonical/dex/front-shiny/785--0--Tapu_Koko.png diff --git a/src/canonical/dex/front-shiny/Tapu_Lele.png b/src/canonical/dex/front-shiny/786--0--Tapu_Lele.png similarity index 100% rename from src/canonical/dex/front-shiny/Tapu_Lele.png rename to src/canonical/dex/front-shiny/786--0--Tapu_Lele.png diff --git a/src/canonical/dex/front-shiny/Tapu_Bulu.png b/src/canonical/dex/front-shiny/787--0--Tapu_Bulu.png similarity index 100% rename from src/canonical/dex/front-shiny/Tapu_Bulu.png rename to src/canonical/dex/front-shiny/787--0--Tapu_Bulu.png diff --git a/src/canonical/dex/front-shiny/Tapu_Fini.png b/src/canonical/dex/front-shiny/788--0--Tapu_Fini.png similarity index 100% rename from src/canonical/dex/front-shiny/Tapu_Fini.png rename to src/canonical/dex/front-shiny/788--0--Tapu_Fini.png diff --git a/src/canonical/dex/front-shiny/Cosmog.png b/src/canonical/dex/front-shiny/789--0--Cosmog.png similarity index 100% rename from src/canonical/dex/front-shiny/Cosmog.png rename to src/canonical/dex/front-shiny/789--0--Cosmog.png diff --git a/src/canonical/dex/front-shiny/Slowpoke.png b/src/canonical/dex/front-shiny/79--0--Slowpoke.png similarity index 100% rename from src/canonical/dex/front-shiny/Slowpoke.png rename to src/canonical/dex/front-shiny/79--0--Slowpoke.png diff --git a/src/canonical/dex/front-shiny/Cosmoem.png b/src/canonical/dex/front-shiny/790--0--Cosmoem.png similarity index 100% rename from src/canonical/dex/front-shiny/Cosmoem.png rename to src/canonical/dex/front-shiny/790--0--Cosmoem.png diff --git a/src/canonical/dex/front-shiny/Solgaleo.png b/src/canonical/dex/front-shiny/791--0--Solgaleo.png similarity index 100% rename from src/canonical/dex/front-shiny/Solgaleo.png rename to src/canonical/dex/front-shiny/791--0--Solgaleo.png diff --git a/src/canonical/dex/front-shiny/Lunala.png b/src/canonical/dex/front-shiny/792--0--Lunala.png similarity index 100% rename from src/canonical/dex/front-shiny/Lunala.png rename to src/canonical/dex/front-shiny/792--0--Lunala.png diff --git a/src/canonical/dex/front-shiny/Nihilego.png b/src/canonical/dex/front-shiny/793--0--Nihilego.png similarity index 100% rename from src/canonical/dex/front-shiny/Nihilego.png rename to src/canonical/dex/front-shiny/793--0--Nihilego.png diff --git a/src/canonical/dex/front-shiny/Buzzwole.png b/src/canonical/dex/front-shiny/794--0--Buzzwole.png similarity index 100% rename from src/canonical/dex/front-shiny/Buzzwole.png rename to src/canonical/dex/front-shiny/794--0--Buzzwole.png diff --git a/src/canonical/dex/front-shiny/Pheromosa.png b/src/canonical/dex/front-shiny/795--0--Pheromosa.png similarity index 100% rename from src/canonical/dex/front-shiny/Pheromosa.png rename to src/canonical/dex/front-shiny/795--0--Pheromosa.png diff --git a/src/canonical/dex/front-shiny/Xurkitree.png b/src/canonical/dex/front-shiny/796--0--Xurkitree.png similarity index 100% rename from src/canonical/dex/front-shiny/Xurkitree.png rename to src/canonical/dex/front-shiny/796--0--Xurkitree.png diff --git a/src/canonical/dex/front-shiny/Celesteela.png b/src/canonical/dex/front-shiny/797--0--Celesteela.png similarity index 100% rename from src/canonical/dex/front-shiny/Celesteela.png rename to src/canonical/dex/front-shiny/797--0--Celesteela.png diff --git a/src/canonical/dex/front-shiny/Kartana.png b/src/canonical/dex/front-shiny/798--0--Kartana.png similarity index 100% rename from src/canonical/dex/front-shiny/Kartana.png rename to src/canonical/dex/front-shiny/798--0--Kartana.png diff --git a/src/canonical/dex/front-shiny/Guzzlord.png b/src/canonical/dex/front-shiny/799--0--Guzzlord.png similarity index 100% rename from src/canonical/dex/front-shiny/Guzzlord.png rename to src/canonical/dex/front-shiny/799--0--Guzzlord.png diff --git a/src/canonical/dex/front-shiny/Wartortle.png b/src/canonical/dex/front-shiny/8--0--Wartortle.png similarity index 100% rename from src/canonical/dex/front-shiny/Wartortle.png rename to src/canonical/dex/front-shiny/8--0--Wartortle.png diff --git a/src/canonical/dex/front-shiny/Slowbro.png b/src/canonical/dex/front-shiny/80--0--Slowbro.png similarity index 100% rename from src/canonical/dex/front-shiny/Slowbro.png rename to src/canonical/dex/front-shiny/80--0--Slowbro.png diff --git a/src/canonical/dex/front-shiny/Slowbro--Mega.png b/src/canonical/dex/front-shiny/80--420--Slowbro--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Slowbro--Mega.png rename to src/canonical/dex/front-shiny/80--420--Slowbro--Mega.png diff --git a/src/canonical/dex/front-shiny/Necrozma.png b/src/canonical/dex/front-shiny/800--0--Necrozma.png similarity index 100% rename from src/canonical/dex/front-shiny/Necrozma.png rename to src/canonical/dex/front-shiny/800--0--Necrozma.png diff --git a/src/canonical/dex/front-shiny/Necrozma--Dawn-Wings.png b/src/canonical/dex/front-shiny/800--420--Necrozma--Dawn-Wings.png similarity index 100% rename from src/canonical/dex/front-shiny/Necrozma--Dawn-Wings.png rename to src/canonical/dex/front-shiny/800--420--Necrozma--Dawn-Wings.png diff --git a/src/canonical/dex/front-shiny/Necrozma--Dusk-Mane.png b/src/canonical/dex/front-shiny/800--420--Necrozma--Dusk-Mane.png similarity index 100% rename from src/canonical/dex/front-shiny/Necrozma--Dusk-Mane.png rename to src/canonical/dex/front-shiny/800--420--Necrozma--Dusk-Mane.png diff --git a/src/canonical/dex/front-shiny/Necrozma--Ultra.png b/src/canonical/dex/front-shiny/800--420--Necrozma--Ultra.png similarity index 100% rename from src/canonical/dex/front-shiny/Necrozma--Ultra.png rename to src/canonical/dex/front-shiny/800--420--Necrozma--Ultra.png diff --git a/src/canonical/dex/front-shiny/Magearna.png b/src/canonical/dex/front-shiny/801--0--Magearna.png similarity index 100% rename from src/canonical/dex/front-shiny/Magearna.png rename to src/canonical/dex/front-shiny/801--0--Magearna.png diff --git a/src/canonical/dex/front-shiny/Poipole.png b/src/canonical/dex/front-shiny/803--0--Poipole.png similarity index 100% rename from src/canonical/dex/front-shiny/Poipole.png rename to src/canonical/dex/front-shiny/803--0--Poipole.png diff --git a/src/canonical/dex/front-shiny/Naganadel.png b/src/canonical/dex/front-shiny/804--0--Naganadel.png similarity index 100% rename from src/canonical/dex/front-shiny/Naganadel.png rename to src/canonical/dex/front-shiny/804--0--Naganadel.png diff --git a/src/canonical/dex/front-shiny/Stakataka.png b/src/canonical/dex/front-shiny/805--0--Stakataka.png similarity index 100% rename from src/canonical/dex/front-shiny/Stakataka.png rename to src/canonical/dex/front-shiny/805--0--Stakataka.png diff --git a/src/canonical/dex/front-shiny/Blacephalon.png b/src/canonical/dex/front-shiny/806--0--Blacephalon.png similarity index 100% rename from src/canonical/dex/front-shiny/Blacephalon.png rename to src/canonical/dex/front-shiny/806--0--Blacephalon.png diff --git a/src/canonical/dex/front-shiny/Zeraora.png b/src/canonical/dex/front-shiny/807--0--Zeraora.png similarity index 100% rename from src/canonical/dex/front-shiny/Zeraora.png rename to src/canonical/dex/front-shiny/807--0--Zeraora.png diff --git a/src/canonical/dex/front-shiny/Meltan.png b/src/canonical/dex/front-shiny/808--0--Meltan.png similarity index 100% rename from src/canonical/dex/front-shiny/Meltan.png rename to src/canonical/dex/front-shiny/808--0--Meltan.png diff --git a/src/canonical/dex/front-shiny/Melmetal.png b/src/canonical/dex/front-shiny/809--0--Melmetal.png similarity index 100% rename from src/canonical/dex/front-shiny/Melmetal.png rename to src/canonical/dex/front-shiny/809--0--Melmetal.png diff --git a/src/canonical/dex/front-shiny/Magnemite.png b/src/canonical/dex/front-shiny/81--0--Magnemite.png similarity index 100% rename from src/canonical/dex/front-shiny/Magnemite.png rename to src/canonical/dex/front-shiny/81--0--Magnemite.png diff --git a/src/canonical/dex/front-shiny/Magneton.png b/src/canonical/dex/front-shiny/82--0--Magneton.png similarity index 100% rename from src/canonical/dex/front-shiny/Magneton.png rename to src/canonical/dex/front-shiny/82--0--Magneton.png diff --git a/src/canonical/dex/front-shiny/Farfetch__0027d.png b/src/canonical/dex/front-shiny/83--0--Farfetch__0027d.png similarity index 100% rename from src/canonical/dex/front-shiny/Farfetch__0027d.png rename to src/canonical/dex/front-shiny/83--0--Farfetch__0027d.png diff --git a/src/canonical/dex/front-shiny/Doduo.png b/src/canonical/dex/front-shiny/84--0--Doduo.png similarity index 100% rename from src/canonical/dex/front-shiny/Doduo.png rename to src/canonical/dex/front-shiny/84--0--Doduo.png diff --git a/src/canonical/dex/front-shiny/Dodrio.png b/src/canonical/dex/front-shiny/85--0--Dodrio.png similarity index 100% rename from src/canonical/dex/front-shiny/Dodrio.png rename to src/canonical/dex/front-shiny/85--0--Dodrio.png diff --git a/src/canonical/dex/front-shiny/Seel.png b/src/canonical/dex/front-shiny/86--0--Seel.png similarity index 100% rename from src/canonical/dex/front-shiny/Seel.png rename to src/canonical/dex/front-shiny/86--0--Seel.png diff --git a/src/canonical/dex/front-shiny/Dewgong.png b/src/canonical/dex/front-shiny/87--0--Dewgong.png similarity index 100% rename from src/canonical/dex/front-shiny/Dewgong.png rename to src/canonical/dex/front-shiny/87--0--Dewgong.png diff --git a/src/canonical/dex/front-shiny/Grimer.png b/src/canonical/dex/front-shiny/88--0--Grimer.png similarity index 100% rename from src/canonical/dex/front-shiny/Grimer.png rename to src/canonical/dex/front-shiny/88--0--Grimer.png diff --git a/src/canonical/dex/front-shiny/Grimer--Alola.png b/src/canonical/dex/front-shiny/88--420--Grimer--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Grimer--Alola.png rename to src/canonical/dex/front-shiny/88--420--Grimer--Alola.png diff --git a/src/canonical/dex/front-shiny/Muk.png b/src/canonical/dex/front-shiny/89--0--Muk.png similarity index 100% rename from src/canonical/dex/front-shiny/Muk.png rename to src/canonical/dex/front-shiny/89--0--Muk.png diff --git a/src/canonical/dex/front-shiny/Muk--Alola.png b/src/canonical/dex/front-shiny/89--420--Muk--Alola.png similarity index 100% rename from src/canonical/dex/front-shiny/Muk--Alola.png rename to src/canonical/dex/front-shiny/89--420--Muk--Alola.png diff --git a/src/canonical/dex/front-shiny/Blastoise.png b/src/canonical/dex/front-shiny/9--0--Blastoise.png similarity index 100% rename from src/canonical/dex/front-shiny/Blastoise.png rename to src/canonical/dex/front-shiny/9--0--Blastoise.png diff --git a/src/canonical/dex/front-shiny/Blastoise--Mega.png b/src/canonical/dex/front-shiny/9--420--Blastoise--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Blastoise--Mega.png rename to src/canonical/dex/front-shiny/9--420--Blastoise--Mega.png diff --git a/src/canonical/dex/front-shiny/Shellder.png b/src/canonical/dex/front-shiny/90--0--Shellder.png similarity index 100% rename from src/canonical/dex/front-shiny/Shellder.png rename to src/canonical/dex/front-shiny/90--0--Shellder.png diff --git a/src/canonical/dex/front-shiny/Cloyster.png b/src/canonical/dex/front-shiny/91--0--Cloyster.png similarity index 100% rename from src/canonical/dex/front-shiny/Cloyster.png rename to src/canonical/dex/front-shiny/91--0--Cloyster.png diff --git a/src/canonical/dex/front-shiny/Gastly.png b/src/canonical/dex/front-shiny/92--0--Gastly.png similarity index 100% rename from src/canonical/dex/front-shiny/Gastly.png rename to src/canonical/dex/front-shiny/92--0--Gastly.png diff --git a/src/canonical/dex/front-shiny/Haunter.png b/src/canonical/dex/front-shiny/93--0--Haunter.png similarity index 100% rename from src/canonical/dex/front-shiny/Haunter.png rename to src/canonical/dex/front-shiny/93--0--Haunter.png diff --git a/src/canonical/dex/front-shiny/Gengar.png b/src/canonical/dex/front-shiny/94--0--Gengar.png similarity index 100% rename from src/canonical/dex/front-shiny/Gengar.png rename to src/canonical/dex/front-shiny/94--0--Gengar.png diff --git a/src/canonical/dex/front-shiny/Gengar--Mega.png b/src/canonical/dex/front-shiny/94--420--Gengar--Mega.png similarity index 100% rename from src/canonical/dex/front-shiny/Gengar--Mega.png rename to src/canonical/dex/front-shiny/94--420--Gengar--Mega.png diff --git a/src/canonical/dex/front-shiny/Onix.png b/src/canonical/dex/front-shiny/95--0--Onix.png similarity index 100% rename from src/canonical/dex/front-shiny/Onix.png rename to src/canonical/dex/front-shiny/95--0--Onix.png diff --git a/src/canonical/dex/front-shiny/Drowzee.png b/src/canonical/dex/front-shiny/96--0--Drowzee.png similarity index 100% rename from src/canonical/dex/front-shiny/Drowzee.png rename to src/canonical/dex/front-shiny/96--0--Drowzee.png diff --git a/src/canonical/dex/front-shiny/Hypno.png b/src/canonical/dex/front-shiny/97--0--Hypno.png similarity index 100% rename from src/canonical/dex/front-shiny/Hypno.png rename to src/canonical/dex/front-shiny/97--0--Hypno.png diff --git a/src/canonical/dex/front-shiny/Krabby.png b/src/canonical/dex/front-shiny/98--0--Krabby.png similarity index 100% rename from src/canonical/dex/front-shiny/Krabby.png rename to src/canonical/dex/front-shiny/98--0--Krabby.png diff --git a/src/canonical/dex/front-shiny/Kingler.png b/src/canonical/dex/front-shiny/99--0--Kingler.png similarity index 100% rename from src/canonical/dex/front-shiny/Kingler.png rename to src/canonical/dex/front-shiny/99--0--Kingler.png diff --git a/src/canonical/dex/front/Bulbasaur.png b/src/canonical/dex/front/1--0--Bulbasaur.png similarity index 100% rename from src/canonical/dex/front/Bulbasaur.png rename to src/canonical/dex/front/1--0--Bulbasaur.png diff --git a/src/canonical/dex/front/Caterpie.png b/src/canonical/dex/front/10--0--Caterpie.png similarity index 100% rename from src/canonical/dex/front/Caterpie.png rename to src/canonical/dex/front/10--0--Caterpie.png diff --git a/src/canonical/dex/front/Voltorb.png b/src/canonical/dex/front/100--0--Voltorb.png similarity index 100% rename from src/canonical/dex/front/Voltorb.png rename to src/canonical/dex/front/100--0--Voltorb.png diff --git a/src/canonical/dex/front/Electrode.png b/src/canonical/dex/front/101--0--Electrode.png similarity index 100% rename from src/canonical/dex/front/Electrode.png rename to src/canonical/dex/front/101--0--Electrode.png diff --git a/src/canonical/dex/front/Exeggcute.png b/src/canonical/dex/front/102--0--Exeggcute.png similarity index 100% rename from src/canonical/dex/front/Exeggcute.png rename to src/canonical/dex/front/102--0--Exeggcute.png diff --git a/src/canonical/dex/front/Exeggutor.png b/src/canonical/dex/front/103--0--Exeggutor.png similarity index 100% rename from src/canonical/dex/front/Exeggutor.png rename to src/canonical/dex/front/103--0--Exeggutor.png diff --git a/src/canonical/dex/front/Exeggutor--Alola.png b/src/canonical/dex/front/103--420--Exeggutor--Alola.png similarity index 100% rename from src/canonical/dex/front/Exeggutor--Alola.png rename to src/canonical/dex/front/103--420--Exeggutor--Alola.png diff --git a/src/canonical/dex/front/Cubone.png b/src/canonical/dex/front/104--0--Cubone.png similarity index 100% rename from src/canonical/dex/front/Cubone.png rename to src/canonical/dex/front/104--0--Cubone.png diff --git a/src/canonical/dex/front/Marowak.png b/src/canonical/dex/front/105--0--Marowak.png similarity index 100% rename from src/canonical/dex/front/Marowak.png rename to src/canonical/dex/front/105--0--Marowak.png diff --git a/src/canonical/dex/front/Marowak--Alola.png b/src/canonical/dex/front/105--420--Marowak--Alola.png similarity index 100% rename from src/canonical/dex/front/Marowak--Alola.png rename to src/canonical/dex/front/105--420--Marowak--Alola.png diff --git a/src/canonical/dex/front/Hitmonlee.png b/src/canonical/dex/front/106--0--Hitmonlee.png similarity index 100% rename from src/canonical/dex/front/Hitmonlee.png rename to src/canonical/dex/front/106--0--Hitmonlee.png diff --git a/src/canonical/dex/front/Hitmonchan.png b/src/canonical/dex/front/107--0--Hitmonchan.png similarity index 100% rename from src/canonical/dex/front/Hitmonchan.png rename to src/canonical/dex/front/107--0--Hitmonchan.png diff --git a/src/canonical/dex/front/Lickitung.png b/src/canonical/dex/front/108--0--Lickitung.png similarity index 100% rename from src/canonical/dex/front/Lickitung.png rename to src/canonical/dex/front/108--0--Lickitung.png diff --git a/src/canonical/dex/front/Koffing.png b/src/canonical/dex/front/109--0--Koffing.png similarity index 100% rename from src/canonical/dex/front/Koffing.png rename to src/canonical/dex/front/109--0--Koffing.png diff --git a/src/canonical/dex/front/Metapod.png b/src/canonical/dex/front/11--0--Metapod.png similarity index 100% rename from src/canonical/dex/front/Metapod.png rename to src/canonical/dex/front/11--0--Metapod.png diff --git a/src/canonical/dex/front/Weezing.png b/src/canonical/dex/front/110--0--Weezing.png similarity index 100% rename from src/canonical/dex/front/Weezing.png rename to src/canonical/dex/front/110--0--Weezing.png diff --git a/src/canonical/dex/front/Rhyhorn.png b/src/canonical/dex/front/111--0--Rhyhorn.png similarity index 100% rename from src/canonical/dex/front/Rhyhorn.png rename to src/canonical/dex/front/111--0--Rhyhorn.png diff --git a/src/canonical/dex/front/Rhydon.png b/src/canonical/dex/front/112--0--Rhydon.png similarity index 100% rename from src/canonical/dex/front/Rhydon.png rename to src/canonical/dex/front/112--0--Rhydon.png diff --git a/src/canonical/dex/front/Chansey.png b/src/canonical/dex/front/113--0--Chansey.png similarity index 100% rename from src/canonical/dex/front/Chansey.png rename to src/canonical/dex/front/113--0--Chansey.png diff --git a/src/canonical/dex/front/Tangela.png b/src/canonical/dex/front/114--0--Tangela.png similarity index 100% rename from src/canonical/dex/front/Tangela.png rename to src/canonical/dex/front/114--0--Tangela.png diff --git a/src/canonical/dex/front/Kangaskhan.png b/src/canonical/dex/front/115--0--Kangaskhan.png similarity index 100% rename from src/canonical/dex/front/Kangaskhan.png rename to src/canonical/dex/front/115--0--Kangaskhan.png diff --git a/src/canonical/dex/front/Kangaskhan--Mega.png b/src/canonical/dex/front/115--420--Kangaskhan--Mega.png similarity index 100% rename from src/canonical/dex/front/Kangaskhan--Mega.png rename to src/canonical/dex/front/115--420--Kangaskhan--Mega.png diff --git a/src/canonical/dex/front/Horsea.png b/src/canonical/dex/front/116--0--Horsea.png similarity index 100% rename from src/canonical/dex/front/Horsea.png rename to src/canonical/dex/front/116--0--Horsea.png diff --git a/src/canonical/dex/front/Seadra.png b/src/canonical/dex/front/117--0--Seadra.png similarity index 100% rename from src/canonical/dex/front/Seadra.png rename to src/canonical/dex/front/117--0--Seadra.png diff --git a/src/canonical/dex/front/Goldeen.png b/src/canonical/dex/front/118--0--Goldeen.png similarity index 100% rename from src/canonical/dex/front/Goldeen.png rename to src/canonical/dex/front/118--0--Goldeen.png diff --git a/src/canonical/dex/front/Seaking.png b/src/canonical/dex/front/119--0--Seaking.png similarity index 100% rename from src/canonical/dex/front/Seaking.png rename to src/canonical/dex/front/119--0--Seaking.png diff --git a/src/canonical/dex/front/Butterfree.png b/src/canonical/dex/front/12--0--Butterfree.png similarity index 100% rename from src/canonical/dex/front/Butterfree.png rename to src/canonical/dex/front/12--0--Butterfree.png diff --git a/src/canonical/dex/front/Staryu.png b/src/canonical/dex/front/120--0--Staryu.png similarity index 100% rename from src/canonical/dex/front/Staryu.png rename to src/canonical/dex/front/120--0--Staryu.png diff --git a/src/canonical/dex/front/Starmie.png b/src/canonical/dex/front/121--0--Starmie.png similarity index 100% rename from src/canonical/dex/front/Starmie.png rename to src/canonical/dex/front/121--0--Starmie.png diff --git a/src/canonical/dex/front/Mr._Mime.png b/src/canonical/dex/front/122--0--Mr._Mime.png similarity index 100% rename from src/canonical/dex/front/Mr._Mime.png rename to src/canonical/dex/front/122--0--Mr._Mime.png diff --git a/src/canonical/dex/front/Scyther.png b/src/canonical/dex/front/123--0--Scyther.png similarity index 100% rename from src/canonical/dex/front/Scyther.png rename to src/canonical/dex/front/123--0--Scyther.png diff --git a/src/canonical/dex/front/Jynx.png b/src/canonical/dex/front/124--0--Jynx.png similarity index 100% rename from src/canonical/dex/front/Jynx.png rename to src/canonical/dex/front/124--0--Jynx.png diff --git a/src/canonical/dex/front/Electabuzz.png b/src/canonical/dex/front/125--0--Electabuzz.png similarity index 100% rename from src/canonical/dex/front/Electabuzz.png rename to src/canonical/dex/front/125--0--Electabuzz.png diff --git a/src/canonical/dex/front/Magmar.png b/src/canonical/dex/front/126--0--Magmar.png similarity index 100% rename from src/canonical/dex/front/Magmar.png rename to src/canonical/dex/front/126--0--Magmar.png diff --git a/src/canonical/dex/front/Pinsir.png b/src/canonical/dex/front/127--0--Pinsir.png similarity index 100% rename from src/canonical/dex/front/Pinsir.png rename to src/canonical/dex/front/127--0--Pinsir.png diff --git a/src/canonical/dex/front/Pinsir--Mega.png b/src/canonical/dex/front/127--420--Pinsir--Mega.png similarity index 100% rename from src/canonical/dex/front/Pinsir--Mega.png rename to src/canonical/dex/front/127--420--Pinsir--Mega.png diff --git a/src/canonical/dex/front/Tauros.png b/src/canonical/dex/front/128--0--Tauros.png similarity index 100% rename from src/canonical/dex/front/Tauros.png rename to src/canonical/dex/front/128--0--Tauros.png diff --git a/src/canonical/dex/front/Magikarp.png b/src/canonical/dex/front/129--0--Magikarp.png similarity index 100% rename from src/canonical/dex/front/Magikarp.png rename to src/canonical/dex/front/129--0--Magikarp.png diff --git a/src/canonical/dex/front/Weedle.png b/src/canonical/dex/front/13--0--Weedle.png similarity index 100% rename from src/canonical/dex/front/Weedle.png rename to src/canonical/dex/front/13--0--Weedle.png diff --git a/src/canonical/dex/front/Gyarados.png b/src/canonical/dex/front/130--0--Gyarados.png similarity index 100% rename from src/canonical/dex/front/Gyarados.png rename to src/canonical/dex/front/130--0--Gyarados.png diff --git a/src/canonical/dex/front/Gyarados--Mega.png b/src/canonical/dex/front/130--420--Gyarados--Mega.png similarity index 100% rename from src/canonical/dex/front/Gyarados--Mega.png rename to src/canonical/dex/front/130--420--Gyarados--Mega.png diff --git a/src/canonical/dex/front/Lapras.png b/src/canonical/dex/front/131--0--Lapras.png similarity index 100% rename from src/canonical/dex/front/Lapras.png rename to src/canonical/dex/front/131--0--Lapras.png diff --git a/src/canonical/dex/front/Ditto.png b/src/canonical/dex/front/132--0--Ditto.png similarity index 100% rename from src/canonical/dex/front/Ditto.png rename to src/canonical/dex/front/132--0--Ditto.png diff --git a/src/canonical/dex/front/Eevee.png b/src/canonical/dex/front/133--0--Eevee.png similarity index 100% rename from src/canonical/dex/front/Eevee.png rename to src/canonical/dex/front/133--0--Eevee.png diff --git a/src/canonical/dex/front/Eevee--Starter.png b/src/canonical/dex/front/133--420--Eevee--Starter.png similarity index 100% rename from src/canonical/dex/front/Eevee--Starter.png rename to src/canonical/dex/front/133--420--Eevee--Starter.png diff --git a/src/canonical/dex/front/Vaporeon.png b/src/canonical/dex/front/134--0--Vaporeon.png similarity index 100% rename from src/canonical/dex/front/Vaporeon.png rename to src/canonical/dex/front/134--0--Vaporeon.png diff --git a/src/canonical/dex/front/Jolteon.png b/src/canonical/dex/front/135--0--Jolteon.png similarity index 100% rename from src/canonical/dex/front/Jolteon.png rename to src/canonical/dex/front/135--0--Jolteon.png diff --git a/src/canonical/dex/front/Flareon.png b/src/canonical/dex/front/136--0--Flareon.png similarity index 100% rename from src/canonical/dex/front/Flareon.png rename to src/canonical/dex/front/136--0--Flareon.png diff --git a/src/canonical/dex/front/Porygon.png b/src/canonical/dex/front/137--0--Porygon.png similarity index 100% rename from src/canonical/dex/front/Porygon.png rename to src/canonical/dex/front/137--0--Porygon.png diff --git a/src/canonical/dex/front/Omanyte.png b/src/canonical/dex/front/138--0--Omanyte.png similarity index 100% rename from src/canonical/dex/front/Omanyte.png rename to src/canonical/dex/front/138--0--Omanyte.png diff --git a/src/canonical/dex/front/Omastar.png b/src/canonical/dex/front/139--0--Omastar.png similarity index 100% rename from src/canonical/dex/front/Omastar.png rename to src/canonical/dex/front/139--0--Omastar.png diff --git a/src/canonical/dex/front/Kakuna.png b/src/canonical/dex/front/14--0--Kakuna.png similarity index 100% rename from src/canonical/dex/front/Kakuna.png rename to src/canonical/dex/front/14--0--Kakuna.png diff --git a/src/canonical/dex/front/Kabuto.png b/src/canonical/dex/front/140--0--Kabuto.png similarity index 100% rename from src/canonical/dex/front/Kabuto.png rename to src/canonical/dex/front/140--0--Kabuto.png diff --git a/src/canonical/dex/front/Kabutops.png b/src/canonical/dex/front/141--0--Kabutops.png similarity index 100% rename from src/canonical/dex/front/Kabutops.png rename to src/canonical/dex/front/141--0--Kabutops.png diff --git a/src/canonical/dex/front/Aerodactyl.png b/src/canonical/dex/front/142--0--Aerodactyl.png similarity index 100% rename from src/canonical/dex/front/Aerodactyl.png rename to src/canonical/dex/front/142--0--Aerodactyl.png diff --git a/src/canonical/dex/front/Aerodactyl--Mega.png b/src/canonical/dex/front/142--420--Aerodactyl--Mega.png similarity index 100% rename from src/canonical/dex/front/Aerodactyl--Mega.png rename to src/canonical/dex/front/142--420--Aerodactyl--Mega.png diff --git a/src/canonical/dex/front/Snorlax.png b/src/canonical/dex/front/143--0--Snorlax.png similarity index 100% rename from src/canonical/dex/front/Snorlax.png rename to src/canonical/dex/front/143--0--Snorlax.png diff --git a/src/canonical/dex/front/Articuno.png b/src/canonical/dex/front/144--0--Articuno.png similarity index 100% rename from src/canonical/dex/front/Articuno.png rename to src/canonical/dex/front/144--0--Articuno.png diff --git a/src/canonical/dex/front/Zapdos.png b/src/canonical/dex/front/145--0--Zapdos.png similarity index 100% rename from src/canonical/dex/front/Zapdos.png rename to src/canonical/dex/front/145--0--Zapdos.png diff --git a/src/canonical/dex/front/Moltres.png b/src/canonical/dex/front/146--0--Moltres.png similarity index 100% rename from src/canonical/dex/front/Moltres.png rename to src/canonical/dex/front/146--0--Moltres.png diff --git a/src/canonical/dex/front/Dratini.png b/src/canonical/dex/front/147--0--Dratini.png similarity index 100% rename from src/canonical/dex/front/Dratini.png rename to src/canonical/dex/front/147--0--Dratini.png diff --git a/src/canonical/dex/front/Dragonair.png b/src/canonical/dex/front/148--0--Dragonair.png similarity index 100% rename from src/canonical/dex/front/Dragonair.png rename to src/canonical/dex/front/148--0--Dragonair.png diff --git a/src/canonical/dex/front/Dragonite.png b/src/canonical/dex/front/149--0--Dragonite.png similarity index 100% rename from src/canonical/dex/front/Dragonite.png rename to src/canonical/dex/front/149--0--Dragonite.png diff --git a/src/canonical/dex/front/Beedrill.png b/src/canonical/dex/front/15--0--Beedrill.png similarity index 100% rename from src/canonical/dex/front/Beedrill.png rename to src/canonical/dex/front/15--0--Beedrill.png diff --git a/src/canonical/dex/front/Beedrill--Mega.png b/src/canonical/dex/front/15--420--Beedrill--Mega.png similarity index 100% rename from src/canonical/dex/front/Beedrill--Mega.png rename to src/canonical/dex/front/15--420--Beedrill--Mega.png diff --git a/src/canonical/dex/front/Mewtwo.png b/src/canonical/dex/front/150--0--Mewtwo.png similarity index 100% rename from src/canonical/dex/front/Mewtwo.png rename to src/canonical/dex/front/150--0--Mewtwo.png diff --git a/src/canonical/dex/front/Mewtwo--Mega-X.png b/src/canonical/dex/front/150--420--Mewtwo--Mega-X.png similarity index 100% rename from src/canonical/dex/front/Mewtwo--Mega-X.png rename to src/canonical/dex/front/150--420--Mewtwo--Mega-X.png diff --git a/src/canonical/dex/front/Mewtwo--Mega-Y.png b/src/canonical/dex/front/150--420--Mewtwo--Mega-Y.png similarity index 100% rename from src/canonical/dex/front/Mewtwo--Mega-Y.png rename to src/canonical/dex/front/150--420--Mewtwo--Mega-Y.png diff --git a/src/canonical/dex/front/Mew.png b/src/canonical/dex/front/151--0--Mew.png similarity index 100% rename from src/canonical/dex/front/Mew.png rename to src/canonical/dex/front/151--0--Mew.png diff --git a/src/canonical/dex/front/Chikorita.png b/src/canonical/dex/front/152--0--Chikorita.png similarity index 100% rename from src/canonical/dex/front/Chikorita.png rename to src/canonical/dex/front/152--0--Chikorita.png diff --git a/src/canonical/dex/front/Bayleef.png b/src/canonical/dex/front/153--0--Bayleef.png similarity index 100% rename from src/canonical/dex/front/Bayleef.png rename to src/canonical/dex/front/153--0--Bayleef.png diff --git a/src/canonical/dex/front/Meganium.png b/src/canonical/dex/front/154--0--Meganium.png similarity index 100% rename from src/canonical/dex/front/Meganium.png rename to src/canonical/dex/front/154--0--Meganium.png diff --git a/src/canonical/dex/front/Cyndaquil.png b/src/canonical/dex/front/155--0--Cyndaquil.png similarity index 100% rename from src/canonical/dex/front/Cyndaquil.png rename to src/canonical/dex/front/155--0--Cyndaquil.png diff --git a/src/canonical/dex/front/Quilava.png b/src/canonical/dex/front/156--0--Quilava.png similarity index 100% rename from src/canonical/dex/front/Quilava.png rename to src/canonical/dex/front/156--0--Quilava.png diff --git a/src/canonical/dex/front/Typhlosion.png b/src/canonical/dex/front/157--0--Typhlosion.png similarity index 100% rename from src/canonical/dex/front/Typhlosion.png rename to src/canonical/dex/front/157--0--Typhlosion.png diff --git a/src/canonical/dex/front/Totodile.png b/src/canonical/dex/front/158--0--Totodile.png similarity index 100% rename from src/canonical/dex/front/Totodile.png rename to src/canonical/dex/front/158--0--Totodile.png diff --git a/src/canonical/dex/front/Croconaw.png b/src/canonical/dex/front/159--0--Croconaw.png similarity index 100% rename from src/canonical/dex/front/Croconaw.png rename to src/canonical/dex/front/159--0--Croconaw.png diff --git a/src/canonical/dex/front/Pidgey.png b/src/canonical/dex/front/16--0--Pidgey.png similarity index 100% rename from src/canonical/dex/front/Pidgey.png rename to src/canonical/dex/front/16--0--Pidgey.png diff --git a/src/canonical/dex/front/Feraligatr.png b/src/canonical/dex/front/160--0--Feraligatr.png similarity index 100% rename from src/canonical/dex/front/Feraligatr.png rename to src/canonical/dex/front/160--0--Feraligatr.png diff --git a/src/canonical/dex/front/Sentret.png b/src/canonical/dex/front/161--0--Sentret.png similarity index 100% rename from src/canonical/dex/front/Sentret.png rename to src/canonical/dex/front/161--0--Sentret.png diff --git a/src/canonical/dex/front/Furret.png b/src/canonical/dex/front/162--0--Furret.png similarity index 100% rename from src/canonical/dex/front/Furret.png rename to src/canonical/dex/front/162--0--Furret.png diff --git a/src/canonical/dex/front/Hoothoot.png b/src/canonical/dex/front/163--0--Hoothoot.png similarity index 100% rename from src/canonical/dex/front/Hoothoot.png rename to src/canonical/dex/front/163--0--Hoothoot.png diff --git a/src/canonical/dex/front/Noctowl.png b/src/canonical/dex/front/164--0--Noctowl.png similarity index 100% rename from src/canonical/dex/front/Noctowl.png rename to src/canonical/dex/front/164--0--Noctowl.png diff --git a/src/canonical/dex/front/Ledyba.png b/src/canonical/dex/front/165--0--Ledyba.png similarity index 100% rename from src/canonical/dex/front/Ledyba.png rename to src/canonical/dex/front/165--0--Ledyba.png diff --git a/src/canonical/dex/front/Ledian.png b/src/canonical/dex/front/166--0--Ledian.png similarity index 100% rename from src/canonical/dex/front/Ledian.png rename to src/canonical/dex/front/166--0--Ledian.png diff --git a/src/canonical/dex/front/Spinarak.png b/src/canonical/dex/front/167--0--Spinarak.png similarity index 100% rename from src/canonical/dex/front/Spinarak.png rename to src/canonical/dex/front/167--0--Spinarak.png diff --git a/src/canonical/dex/front/Ariados.png b/src/canonical/dex/front/168--0--Ariados.png similarity index 100% rename from src/canonical/dex/front/Ariados.png rename to src/canonical/dex/front/168--0--Ariados.png diff --git a/src/canonical/dex/front/Crobat.png b/src/canonical/dex/front/169--0--Crobat.png similarity index 100% rename from src/canonical/dex/front/Crobat.png rename to src/canonical/dex/front/169--0--Crobat.png diff --git a/src/canonical/dex/front/Pidgeotto.png b/src/canonical/dex/front/17--0--Pidgeotto.png similarity index 100% rename from src/canonical/dex/front/Pidgeotto.png rename to src/canonical/dex/front/17--0--Pidgeotto.png diff --git a/src/canonical/dex/front/Chinchou.png b/src/canonical/dex/front/170--0--Chinchou.png similarity index 100% rename from src/canonical/dex/front/Chinchou.png rename to src/canonical/dex/front/170--0--Chinchou.png diff --git a/src/canonical/dex/front/Lanturn.png b/src/canonical/dex/front/171--0--Lanturn.png similarity index 100% rename from src/canonical/dex/front/Lanturn.png rename to src/canonical/dex/front/171--0--Lanturn.png diff --git a/src/canonical/dex/front/Pichu.png b/src/canonical/dex/front/172--0--Pichu.png similarity index 100% rename from src/canonical/dex/front/Pichu.png rename to src/canonical/dex/front/172--0--Pichu.png diff --git a/src/canonical/dex/front/Cleffa.png b/src/canonical/dex/front/173--0--Cleffa.png similarity index 100% rename from src/canonical/dex/front/Cleffa.png rename to src/canonical/dex/front/173--0--Cleffa.png diff --git a/src/canonical/dex/front/Igglybuff.png b/src/canonical/dex/front/174--0--Igglybuff.png similarity index 100% rename from src/canonical/dex/front/Igglybuff.png rename to src/canonical/dex/front/174--0--Igglybuff.png diff --git a/src/canonical/dex/front/Togepi.png b/src/canonical/dex/front/175--0--Togepi.png similarity index 100% rename from src/canonical/dex/front/Togepi.png rename to src/canonical/dex/front/175--0--Togepi.png diff --git a/src/canonical/dex/front/Togetic.png b/src/canonical/dex/front/176--0--Togetic.png similarity index 100% rename from src/canonical/dex/front/Togetic.png rename to src/canonical/dex/front/176--0--Togetic.png diff --git a/src/canonical/dex/front/Natu.png b/src/canonical/dex/front/177--0--Natu.png similarity index 100% rename from src/canonical/dex/front/Natu.png rename to src/canonical/dex/front/177--0--Natu.png diff --git a/src/canonical/dex/front/Xatu.png b/src/canonical/dex/front/178--0--Xatu.png similarity index 100% rename from src/canonical/dex/front/Xatu.png rename to src/canonical/dex/front/178--0--Xatu.png diff --git a/src/canonical/dex/front/Mareep.png b/src/canonical/dex/front/179--0--Mareep.png similarity index 100% rename from src/canonical/dex/front/Mareep.png rename to src/canonical/dex/front/179--0--Mareep.png diff --git a/src/canonical/dex/front/Pidgeot.png b/src/canonical/dex/front/18--0--Pidgeot.png similarity index 100% rename from src/canonical/dex/front/Pidgeot.png rename to src/canonical/dex/front/18--0--Pidgeot.png diff --git a/src/canonical/dex/front/Pidgeot--Mega.png b/src/canonical/dex/front/18--420--Pidgeot--Mega.png similarity index 100% rename from src/canonical/dex/front/Pidgeot--Mega.png rename to src/canonical/dex/front/18--420--Pidgeot--Mega.png diff --git a/src/canonical/dex/front/Flaaffy.png b/src/canonical/dex/front/180--0--Flaaffy.png similarity index 100% rename from src/canonical/dex/front/Flaaffy.png rename to src/canonical/dex/front/180--0--Flaaffy.png diff --git a/src/canonical/dex/front/Ampharos.png b/src/canonical/dex/front/181--0--Ampharos.png similarity index 100% rename from src/canonical/dex/front/Ampharos.png rename to src/canonical/dex/front/181--0--Ampharos.png diff --git a/src/canonical/dex/front/Ampharos--Mega.png b/src/canonical/dex/front/181--420--Ampharos--Mega.png similarity index 100% rename from src/canonical/dex/front/Ampharos--Mega.png rename to src/canonical/dex/front/181--420--Ampharos--Mega.png diff --git a/src/canonical/dex/front/Bellossom.png b/src/canonical/dex/front/182--0--Bellossom.png similarity index 100% rename from src/canonical/dex/front/Bellossom.png rename to src/canonical/dex/front/182--0--Bellossom.png diff --git a/src/canonical/dex/front/Marill.png b/src/canonical/dex/front/183--0--Marill.png similarity index 100% rename from src/canonical/dex/front/Marill.png rename to src/canonical/dex/front/183--0--Marill.png diff --git a/src/canonical/dex/front/Azumarill.png b/src/canonical/dex/front/184--0--Azumarill.png similarity index 100% rename from src/canonical/dex/front/Azumarill.png rename to src/canonical/dex/front/184--0--Azumarill.png diff --git a/src/canonical/dex/front/Sudowoodo.png b/src/canonical/dex/front/185--0--Sudowoodo.png similarity index 100% rename from src/canonical/dex/front/Sudowoodo.png rename to src/canonical/dex/front/185--0--Sudowoodo.png diff --git a/src/canonical/dex/front/Politoed.png b/src/canonical/dex/front/186--0--Politoed.png similarity index 100% rename from src/canonical/dex/front/Politoed.png rename to src/canonical/dex/front/186--0--Politoed.png diff --git a/src/canonical/dex/front/Hoppip.png b/src/canonical/dex/front/187--0--Hoppip.png similarity index 100% rename from src/canonical/dex/front/Hoppip.png rename to src/canonical/dex/front/187--0--Hoppip.png diff --git a/src/canonical/dex/front/Skiploom.png b/src/canonical/dex/front/188--0--Skiploom.png similarity index 100% rename from src/canonical/dex/front/Skiploom.png rename to src/canonical/dex/front/188--0--Skiploom.png diff --git a/src/canonical/dex/front/Jumpluff.png b/src/canonical/dex/front/189--0--Jumpluff.png similarity index 100% rename from src/canonical/dex/front/Jumpluff.png rename to src/canonical/dex/front/189--0--Jumpluff.png diff --git a/src/canonical/dex/front/Rattata.png b/src/canonical/dex/front/19--0--Rattata.png similarity index 100% rename from src/canonical/dex/front/Rattata.png rename to src/canonical/dex/front/19--0--Rattata.png diff --git a/src/canonical/dex/front/Rattata--Alola.png b/src/canonical/dex/front/19--420--Rattata--Alola.png similarity index 100% rename from src/canonical/dex/front/Rattata--Alola.png rename to src/canonical/dex/front/19--420--Rattata--Alola.png diff --git a/src/canonical/dex/front/Aipom.png b/src/canonical/dex/front/190--0--Aipom.png similarity index 100% rename from src/canonical/dex/front/Aipom.png rename to src/canonical/dex/front/190--0--Aipom.png diff --git a/src/canonical/dex/front/Sunkern.png b/src/canonical/dex/front/191--0--Sunkern.png similarity index 100% rename from src/canonical/dex/front/Sunkern.png rename to src/canonical/dex/front/191--0--Sunkern.png diff --git a/src/canonical/dex/front/Sunflora.png b/src/canonical/dex/front/192--0--Sunflora.png similarity index 100% rename from src/canonical/dex/front/Sunflora.png rename to src/canonical/dex/front/192--0--Sunflora.png diff --git a/src/canonical/dex/front/Yanma.png b/src/canonical/dex/front/193--0--Yanma.png similarity index 100% rename from src/canonical/dex/front/Yanma.png rename to src/canonical/dex/front/193--0--Yanma.png diff --git a/src/canonical/dex/front/Wooper.png b/src/canonical/dex/front/194--0--Wooper.png similarity index 100% rename from src/canonical/dex/front/Wooper.png rename to src/canonical/dex/front/194--0--Wooper.png diff --git a/src/canonical/dex/front/Quagsire.png b/src/canonical/dex/front/195--0--Quagsire.png similarity index 100% rename from src/canonical/dex/front/Quagsire.png rename to src/canonical/dex/front/195--0--Quagsire.png diff --git a/src/canonical/dex/front/Espeon.png b/src/canonical/dex/front/196--0--Espeon.png similarity index 100% rename from src/canonical/dex/front/Espeon.png rename to src/canonical/dex/front/196--0--Espeon.png diff --git a/src/canonical/dex/front/Umbreon.png b/src/canonical/dex/front/197--0--Umbreon.png similarity index 100% rename from src/canonical/dex/front/Umbreon.png rename to src/canonical/dex/front/197--0--Umbreon.png diff --git a/src/canonical/dex/front/Murkrow.png b/src/canonical/dex/front/198--0--Murkrow.png similarity index 100% rename from src/canonical/dex/front/Murkrow.png rename to src/canonical/dex/front/198--0--Murkrow.png diff --git a/src/canonical/dex/front/Slowking.png b/src/canonical/dex/front/199--0--Slowking.png similarity index 100% rename from src/canonical/dex/front/Slowking.png rename to src/canonical/dex/front/199--0--Slowking.png diff --git a/src/canonical/dex/front/Ivysaur.png b/src/canonical/dex/front/2--0--Ivysaur.png similarity index 100% rename from src/canonical/dex/front/Ivysaur.png rename to src/canonical/dex/front/2--0--Ivysaur.png diff --git a/src/canonical/dex/front/Raticate.png b/src/canonical/dex/front/20--0--Raticate.png similarity index 100% rename from src/canonical/dex/front/Raticate.png rename to src/canonical/dex/front/20--0--Raticate.png diff --git a/src/canonical/dex/front/Raticate--Alola-Totem.png b/src/canonical/dex/front/20--420--Raticate--Alola-Totem.png similarity index 100% rename from src/canonical/dex/front/Raticate--Alola-Totem.png rename to src/canonical/dex/front/20--420--Raticate--Alola-Totem.png diff --git a/src/canonical/dex/front/Raticate--Alola.png b/src/canonical/dex/front/20--420--Raticate--Alola.png similarity index 100% rename from src/canonical/dex/front/Raticate--Alola.png rename to src/canonical/dex/front/20--420--Raticate--Alola.png diff --git a/src/canonical/dex/front/Misdreavus.png b/src/canonical/dex/front/200--0--Misdreavus.png similarity index 100% rename from src/canonical/dex/front/Misdreavus.png rename to src/canonical/dex/front/200--0--Misdreavus.png diff --git a/src/canonical/dex/front/Unown.png b/src/canonical/dex/front/201--0--Unown.png similarity index 100% rename from src/canonical/dex/front/Unown.png rename to src/canonical/dex/front/201--0--Unown.png diff --git a/src/canonical/dex/front/Wobbuffet.png b/src/canonical/dex/front/202--0--Wobbuffet.png similarity index 100% rename from src/canonical/dex/front/Wobbuffet.png rename to src/canonical/dex/front/202--0--Wobbuffet.png diff --git a/src/canonical/dex/front/Girafarig.png b/src/canonical/dex/front/203--0--Girafarig.png similarity index 100% rename from src/canonical/dex/front/Girafarig.png rename to src/canonical/dex/front/203--0--Girafarig.png diff --git a/src/canonical/dex/front/Pineco.png b/src/canonical/dex/front/204--0--Pineco.png similarity index 100% rename from src/canonical/dex/front/Pineco.png rename to src/canonical/dex/front/204--0--Pineco.png diff --git a/src/canonical/dex/front/Forretress.png b/src/canonical/dex/front/205--0--Forretress.png similarity index 100% rename from src/canonical/dex/front/Forretress.png rename to src/canonical/dex/front/205--0--Forretress.png diff --git a/src/canonical/dex/front/Dunsparce.png b/src/canonical/dex/front/206--0--Dunsparce.png similarity index 100% rename from src/canonical/dex/front/Dunsparce.png rename to src/canonical/dex/front/206--0--Dunsparce.png diff --git a/src/canonical/dex/front/Gligar.png b/src/canonical/dex/front/207--0--Gligar.png similarity index 100% rename from src/canonical/dex/front/Gligar.png rename to src/canonical/dex/front/207--0--Gligar.png diff --git a/src/canonical/dex/front/Steelix.png b/src/canonical/dex/front/208--0--Steelix.png similarity index 100% rename from src/canonical/dex/front/Steelix.png rename to src/canonical/dex/front/208--0--Steelix.png diff --git a/src/canonical/dex/front/Steelix--Mega.png b/src/canonical/dex/front/208--420--Steelix--Mega.png similarity index 100% rename from src/canonical/dex/front/Steelix--Mega.png rename to src/canonical/dex/front/208--420--Steelix--Mega.png diff --git a/src/canonical/dex/front/Snubbull.png b/src/canonical/dex/front/209--0--Snubbull.png similarity index 100% rename from src/canonical/dex/front/Snubbull.png rename to src/canonical/dex/front/209--0--Snubbull.png diff --git a/src/canonical/dex/front/Spearow.png b/src/canonical/dex/front/21--0--Spearow.png similarity index 100% rename from src/canonical/dex/front/Spearow.png rename to src/canonical/dex/front/21--0--Spearow.png diff --git a/src/canonical/dex/front/Granbull.png b/src/canonical/dex/front/210--0--Granbull.png similarity index 100% rename from src/canonical/dex/front/Granbull.png rename to src/canonical/dex/front/210--0--Granbull.png diff --git a/src/canonical/dex/front/Qwilfish.png b/src/canonical/dex/front/211--0--Qwilfish.png similarity index 100% rename from src/canonical/dex/front/Qwilfish.png rename to src/canonical/dex/front/211--0--Qwilfish.png diff --git a/src/canonical/dex/front/Scizor.png b/src/canonical/dex/front/212--0--Scizor.png similarity index 100% rename from src/canonical/dex/front/Scizor.png rename to src/canonical/dex/front/212--0--Scizor.png diff --git a/src/canonical/dex/front/Scizor--Mega.png b/src/canonical/dex/front/212--420--Scizor--Mega.png similarity index 100% rename from src/canonical/dex/front/Scizor--Mega.png rename to src/canonical/dex/front/212--420--Scizor--Mega.png diff --git a/src/canonical/dex/front/Shuckle.png b/src/canonical/dex/front/213--0--Shuckle.png similarity index 100% rename from src/canonical/dex/front/Shuckle.png rename to src/canonical/dex/front/213--0--Shuckle.png diff --git a/src/canonical/dex/front/Heracross.png b/src/canonical/dex/front/214--0--Heracross.png similarity index 100% rename from src/canonical/dex/front/Heracross.png rename to src/canonical/dex/front/214--0--Heracross.png diff --git a/src/canonical/dex/front/Heracross--Mega.png b/src/canonical/dex/front/214--420--Heracross--Mega.png similarity index 100% rename from src/canonical/dex/front/Heracross--Mega.png rename to src/canonical/dex/front/214--420--Heracross--Mega.png diff --git a/src/canonical/dex/front/Sneasel.png b/src/canonical/dex/front/215--0--Sneasel.png similarity index 100% rename from src/canonical/dex/front/Sneasel.png rename to src/canonical/dex/front/215--0--Sneasel.png diff --git a/src/canonical/dex/front/Teddiursa.png b/src/canonical/dex/front/216--0--Teddiursa.png similarity index 100% rename from src/canonical/dex/front/Teddiursa.png rename to src/canonical/dex/front/216--0--Teddiursa.png diff --git a/src/canonical/dex/front/Ursaring.png b/src/canonical/dex/front/217--0--Ursaring.png similarity index 100% rename from src/canonical/dex/front/Ursaring.png rename to src/canonical/dex/front/217--0--Ursaring.png diff --git a/src/canonical/dex/front/Slugma.png b/src/canonical/dex/front/218--0--Slugma.png similarity index 100% rename from src/canonical/dex/front/Slugma.png rename to src/canonical/dex/front/218--0--Slugma.png diff --git a/src/canonical/dex/front/Magcargo.png b/src/canonical/dex/front/219--0--Magcargo.png similarity index 100% rename from src/canonical/dex/front/Magcargo.png rename to src/canonical/dex/front/219--0--Magcargo.png diff --git a/src/canonical/dex/front/Fearow.png b/src/canonical/dex/front/22--0--Fearow.png similarity index 100% rename from src/canonical/dex/front/Fearow.png rename to src/canonical/dex/front/22--0--Fearow.png diff --git a/src/canonical/dex/front/Swinub.png b/src/canonical/dex/front/220--0--Swinub.png similarity index 100% rename from src/canonical/dex/front/Swinub.png rename to src/canonical/dex/front/220--0--Swinub.png diff --git a/src/canonical/dex/front/Piloswine.png b/src/canonical/dex/front/221--0--Piloswine.png similarity index 100% rename from src/canonical/dex/front/Piloswine.png rename to src/canonical/dex/front/221--0--Piloswine.png diff --git a/src/canonical/dex/front/Corsola.png b/src/canonical/dex/front/222--0--Corsola.png similarity index 100% rename from src/canonical/dex/front/Corsola.png rename to src/canonical/dex/front/222--0--Corsola.png diff --git a/src/canonical/dex/front/Remoraid.png b/src/canonical/dex/front/223--0--Remoraid.png similarity index 100% rename from src/canonical/dex/front/Remoraid.png rename to src/canonical/dex/front/223--0--Remoraid.png diff --git a/src/canonical/dex/front/Octillery.png b/src/canonical/dex/front/224--0--Octillery.png similarity index 100% rename from src/canonical/dex/front/Octillery.png rename to src/canonical/dex/front/224--0--Octillery.png diff --git a/src/canonical/dex/front/Delibird.png b/src/canonical/dex/front/225--0--Delibird.png similarity index 100% rename from src/canonical/dex/front/Delibird.png rename to src/canonical/dex/front/225--0--Delibird.png diff --git a/src/canonical/dex/front/Mantine.png b/src/canonical/dex/front/226--0--Mantine.png similarity index 100% rename from src/canonical/dex/front/Mantine.png rename to src/canonical/dex/front/226--0--Mantine.png diff --git a/src/canonical/dex/front/Skarmory.png b/src/canonical/dex/front/227--0--Skarmory.png similarity index 100% rename from src/canonical/dex/front/Skarmory.png rename to src/canonical/dex/front/227--0--Skarmory.png diff --git a/src/canonical/dex/front/Houndour.png b/src/canonical/dex/front/228--0--Houndour.png similarity index 100% rename from src/canonical/dex/front/Houndour.png rename to src/canonical/dex/front/228--0--Houndour.png diff --git a/src/canonical/dex/front/Houndoom.png b/src/canonical/dex/front/229--0--Houndoom.png similarity index 100% rename from src/canonical/dex/front/Houndoom.png rename to src/canonical/dex/front/229--0--Houndoom.png diff --git a/src/canonical/dex/front/Houndoom--Mega.png b/src/canonical/dex/front/229--420--Houndoom--Mega.png similarity index 100% rename from src/canonical/dex/front/Houndoom--Mega.png rename to src/canonical/dex/front/229--420--Houndoom--Mega.png diff --git a/src/canonical/dex/front/Ekans.png b/src/canonical/dex/front/23--0--Ekans.png similarity index 100% rename from src/canonical/dex/front/Ekans.png rename to src/canonical/dex/front/23--0--Ekans.png diff --git a/src/canonical/dex/front/Kingdra.png b/src/canonical/dex/front/230--0--Kingdra.png similarity index 100% rename from src/canonical/dex/front/Kingdra.png rename to src/canonical/dex/front/230--0--Kingdra.png diff --git a/src/canonical/dex/front/Phanpy.png b/src/canonical/dex/front/231--0--Phanpy.png similarity index 100% rename from src/canonical/dex/front/Phanpy.png rename to src/canonical/dex/front/231--0--Phanpy.png diff --git a/src/canonical/dex/front/Donphan.png b/src/canonical/dex/front/232--0--Donphan.png similarity index 100% rename from src/canonical/dex/front/Donphan.png rename to src/canonical/dex/front/232--0--Donphan.png diff --git a/src/canonical/dex/front/Porygon2.png b/src/canonical/dex/front/233--0--Porygon2.png similarity index 100% rename from src/canonical/dex/front/Porygon2.png rename to src/canonical/dex/front/233--0--Porygon2.png diff --git a/src/canonical/dex/front/Stantler.png b/src/canonical/dex/front/234--0--Stantler.png similarity index 100% rename from src/canonical/dex/front/Stantler.png rename to src/canonical/dex/front/234--0--Stantler.png diff --git a/src/canonical/dex/front/Smeargle.png b/src/canonical/dex/front/235--0--Smeargle.png similarity index 100% rename from src/canonical/dex/front/Smeargle.png rename to src/canonical/dex/front/235--0--Smeargle.png diff --git a/src/canonical/dex/front/Tyrogue.png b/src/canonical/dex/front/236--0--Tyrogue.png similarity index 100% rename from src/canonical/dex/front/Tyrogue.png rename to src/canonical/dex/front/236--0--Tyrogue.png diff --git a/src/canonical/dex/front/Hitmontop.png b/src/canonical/dex/front/237--0--Hitmontop.png similarity index 100% rename from src/canonical/dex/front/Hitmontop.png rename to src/canonical/dex/front/237--0--Hitmontop.png diff --git a/src/canonical/dex/front/Smoochum.png b/src/canonical/dex/front/238--0--Smoochum.png similarity index 100% rename from src/canonical/dex/front/Smoochum.png rename to src/canonical/dex/front/238--0--Smoochum.png diff --git a/src/canonical/dex/front/Elekid.png b/src/canonical/dex/front/239--0--Elekid.png similarity index 100% rename from src/canonical/dex/front/Elekid.png rename to src/canonical/dex/front/239--0--Elekid.png diff --git a/src/canonical/dex/front/Arbok.png b/src/canonical/dex/front/24--0--Arbok.png similarity index 100% rename from src/canonical/dex/front/Arbok.png rename to src/canonical/dex/front/24--0--Arbok.png diff --git a/src/canonical/dex/front/Magby.png b/src/canonical/dex/front/240--0--Magby.png similarity index 100% rename from src/canonical/dex/front/Magby.png rename to src/canonical/dex/front/240--0--Magby.png diff --git a/src/canonical/dex/front/Miltank.png b/src/canonical/dex/front/241--0--Miltank.png similarity index 100% rename from src/canonical/dex/front/Miltank.png rename to src/canonical/dex/front/241--0--Miltank.png diff --git a/src/canonical/dex/front/Blissey.png b/src/canonical/dex/front/242--0--Blissey.png similarity index 100% rename from src/canonical/dex/front/Blissey.png rename to src/canonical/dex/front/242--0--Blissey.png diff --git a/src/canonical/dex/front/Raikou.png b/src/canonical/dex/front/243--0--Raikou.png similarity index 100% rename from src/canonical/dex/front/Raikou.png rename to src/canonical/dex/front/243--0--Raikou.png diff --git a/src/canonical/dex/front/Entei.png b/src/canonical/dex/front/244--0--Entei.png similarity index 100% rename from src/canonical/dex/front/Entei.png rename to src/canonical/dex/front/244--0--Entei.png diff --git a/src/canonical/dex/front/Suicune.png b/src/canonical/dex/front/245--0--Suicune.png similarity index 100% rename from src/canonical/dex/front/Suicune.png rename to src/canonical/dex/front/245--0--Suicune.png diff --git a/src/canonical/dex/front/Larvitar.png b/src/canonical/dex/front/246--0--Larvitar.png similarity index 100% rename from src/canonical/dex/front/Larvitar.png rename to src/canonical/dex/front/246--0--Larvitar.png diff --git a/src/canonical/dex/front/Pupitar.png b/src/canonical/dex/front/247--0--Pupitar.png similarity index 100% rename from src/canonical/dex/front/Pupitar.png rename to src/canonical/dex/front/247--0--Pupitar.png diff --git a/src/canonical/dex/front/Tyranitar.png b/src/canonical/dex/front/248--0--Tyranitar.png similarity index 100% rename from src/canonical/dex/front/Tyranitar.png rename to src/canonical/dex/front/248--0--Tyranitar.png diff --git a/src/canonical/dex/front/Tyranitar--Mega.png b/src/canonical/dex/front/248--420--Tyranitar--Mega.png similarity index 100% rename from src/canonical/dex/front/Tyranitar--Mega.png rename to src/canonical/dex/front/248--420--Tyranitar--Mega.png diff --git a/src/canonical/dex/front/Lugia.png b/src/canonical/dex/front/249--0--Lugia.png similarity index 100% rename from src/canonical/dex/front/Lugia.png rename to src/canonical/dex/front/249--0--Lugia.png diff --git a/src/canonical/dex/front/Pikachu.png b/src/canonical/dex/front/25--0--Pikachu.png similarity index 100% rename from src/canonical/dex/front/Pikachu.png rename to src/canonical/dex/front/25--0--Pikachu.png diff --git a/src/canonical/dex/front/Pikachu--Alola.png b/src/canonical/dex/front/25--420--Pikachu--Alola.png similarity index 100% rename from src/canonical/dex/front/Pikachu--Alola.png rename to src/canonical/dex/front/25--420--Pikachu--Alola.png diff --git a/src/canonical/dex/front/Pikachu--Cosplay.png b/src/canonical/dex/front/25--420--Pikachu--Cosplay.png similarity index 100% rename from src/canonical/dex/front/Pikachu--Cosplay.png rename to src/canonical/dex/front/25--420--Pikachu--Cosplay.png diff --git a/src/canonical/dex/front/Pikachu--Hoenn.png b/src/canonical/dex/front/25--420--Pikachu--Hoenn.png similarity index 100% rename from src/canonical/dex/front/Pikachu--Hoenn.png rename to src/canonical/dex/front/25--420--Pikachu--Hoenn.png diff --git a/src/canonical/dex/front/Pikachu--Kalos.png b/src/canonical/dex/front/25--420--Pikachu--Kalos.png similarity index 100% rename from src/canonical/dex/front/Pikachu--Kalos.png rename to src/canonical/dex/front/25--420--Pikachu--Kalos.png diff --git a/src/canonical/dex/front/Pikachu--Original.png b/src/canonical/dex/front/25--420--Pikachu--Original.png similarity index 100% rename from src/canonical/dex/front/Pikachu--Original.png rename to src/canonical/dex/front/25--420--Pikachu--Original.png diff --git a/src/canonical/dex/front/Pikachu--Partner.png b/src/canonical/dex/front/25--420--Pikachu--Partner.png similarity index 100% rename from src/canonical/dex/front/Pikachu--Partner.png rename to src/canonical/dex/front/25--420--Pikachu--Partner.png diff --git a/src/canonical/dex/front/Pikachu--Sinnoh.png b/src/canonical/dex/front/25--420--Pikachu--Sinnoh.png similarity index 100% rename from src/canonical/dex/front/Pikachu--Sinnoh.png rename to src/canonical/dex/front/25--420--Pikachu--Sinnoh.png diff --git a/src/canonical/dex/front/Pikachu--Starter.png b/src/canonical/dex/front/25--420--Pikachu--Starter.png similarity index 100% rename from src/canonical/dex/front/Pikachu--Starter.png rename to src/canonical/dex/front/25--420--Pikachu--Starter.png diff --git a/src/canonical/dex/front/Pikachu--Unova.png b/src/canonical/dex/front/25--420--Pikachu--Unova.png similarity index 100% rename from src/canonical/dex/front/Pikachu--Unova.png rename to src/canonical/dex/front/25--420--Pikachu--Unova.png diff --git a/src/canonical/dex/front/Ho-Oh.png b/src/canonical/dex/front/250--0--Ho-Oh.png similarity index 100% rename from src/canonical/dex/front/Ho-Oh.png rename to src/canonical/dex/front/250--0--Ho-Oh.png diff --git a/src/canonical/dex/front/Celebi.png b/src/canonical/dex/front/251--0--Celebi.png similarity index 100% rename from src/canonical/dex/front/Celebi.png rename to src/canonical/dex/front/251--0--Celebi.png diff --git a/src/canonical/dex/front/Treecko.png b/src/canonical/dex/front/252--0--Treecko.png similarity index 100% rename from src/canonical/dex/front/Treecko.png rename to src/canonical/dex/front/252--0--Treecko.png diff --git a/src/canonical/dex/front/Grovyle.png b/src/canonical/dex/front/253--0--Grovyle.png similarity index 100% rename from src/canonical/dex/front/Grovyle.png rename to src/canonical/dex/front/253--0--Grovyle.png diff --git a/src/canonical/dex/front/Sceptile.png b/src/canonical/dex/front/254--0--Sceptile.png similarity index 100% rename from src/canonical/dex/front/Sceptile.png rename to src/canonical/dex/front/254--0--Sceptile.png diff --git a/src/canonical/dex/front/Sceptile--Mega.png b/src/canonical/dex/front/254--420--Sceptile--Mega.png similarity index 100% rename from src/canonical/dex/front/Sceptile--Mega.png rename to src/canonical/dex/front/254--420--Sceptile--Mega.png diff --git a/src/canonical/dex/front/Torchic.png b/src/canonical/dex/front/255--0--Torchic.png similarity index 100% rename from src/canonical/dex/front/Torchic.png rename to src/canonical/dex/front/255--0--Torchic.png diff --git a/src/canonical/dex/front/Combusken.png b/src/canonical/dex/front/256--0--Combusken.png similarity index 100% rename from src/canonical/dex/front/Combusken.png rename to src/canonical/dex/front/256--0--Combusken.png diff --git a/src/canonical/dex/front/Blaziken.png b/src/canonical/dex/front/257--0--Blaziken.png similarity index 100% rename from src/canonical/dex/front/Blaziken.png rename to src/canonical/dex/front/257--0--Blaziken.png diff --git a/src/canonical/dex/front/Blaziken--Mega.png b/src/canonical/dex/front/257--420--Blaziken--Mega.png similarity index 100% rename from src/canonical/dex/front/Blaziken--Mega.png rename to src/canonical/dex/front/257--420--Blaziken--Mega.png diff --git a/src/canonical/dex/front/Mudkip.png b/src/canonical/dex/front/258--0--Mudkip.png similarity index 100% rename from src/canonical/dex/front/Mudkip.png rename to src/canonical/dex/front/258--0--Mudkip.png diff --git a/src/canonical/dex/front/Marshtomp.png b/src/canonical/dex/front/259--0--Marshtomp.png similarity index 100% rename from src/canonical/dex/front/Marshtomp.png rename to src/canonical/dex/front/259--0--Marshtomp.png diff --git a/src/canonical/dex/front/Raichu.png b/src/canonical/dex/front/26--0--Raichu.png similarity index 100% rename from src/canonical/dex/front/Raichu.png rename to src/canonical/dex/front/26--0--Raichu.png diff --git a/src/canonical/dex/front/Raichu--Alola.png b/src/canonical/dex/front/26--420--Raichu--Alola.png similarity index 100% rename from src/canonical/dex/front/Raichu--Alola.png rename to src/canonical/dex/front/26--420--Raichu--Alola.png diff --git a/src/canonical/dex/front/Swampert.png b/src/canonical/dex/front/260--0--Swampert.png similarity index 100% rename from src/canonical/dex/front/Swampert.png rename to src/canonical/dex/front/260--0--Swampert.png diff --git a/src/canonical/dex/front/Swampert--Mega.png b/src/canonical/dex/front/260--420--Swampert--Mega.png similarity index 100% rename from src/canonical/dex/front/Swampert--Mega.png rename to src/canonical/dex/front/260--420--Swampert--Mega.png diff --git a/src/canonical/dex/front/Poochyena.png b/src/canonical/dex/front/261--0--Poochyena.png similarity index 100% rename from src/canonical/dex/front/Poochyena.png rename to src/canonical/dex/front/261--0--Poochyena.png diff --git a/src/canonical/dex/front/Mightyena.png b/src/canonical/dex/front/262--0--Mightyena.png similarity index 100% rename from src/canonical/dex/front/Mightyena.png rename to src/canonical/dex/front/262--0--Mightyena.png diff --git a/src/canonical/dex/front/Zigzagoon.png b/src/canonical/dex/front/263--0--Zigzagoon.png similarity index 100% rename from src/canonical/dex/front/Zigzagoon.png rename to src/canonical/dex/front/263--0--Zigzagoon.png diff --git a/src/canonical/dex/front/Linoone.png b/src/canonical/dex/front/264--0--Linoone.png similarity index 100% rename from src/canonical/dex/front/Linoone.png rename to src/canonical/dex/front/264--0--Linoone.png diff --git a/src/canonical/dex/front/Wurmple.png b/src/canonical/dex/front/265--0--Wurmple.png similarity index 100% rename from src/canonical/dex/front/Wurmple.png rename to src/canonical/dex/front/265--0--Wurmple.png diff --git a/src/canonical/dex/front/Silcoon.png b/src/canonical/dex/front/266--0--Silcoon.png similarity index 100% rename from src/canonical/dex/front/Silcoon.png rename to src/canonical/dex/front/266--0--Silcoon.png diff --git a/src/canonical/dex/front/Beautifly.png b/src/canonical/dex/front/267--0--Beautifly.png similarity index 100% rename from src/canonical/dex/front/Beautifly.png rename to src/canonical/dex/front/267--0--Beautifly.png diff --git a/src/canonical/dex/front/Cascoon.png b/src/canonical/dex/front/268--0--Cascoon.png similarity index 100% rename from src/canonical/dex/front/Cascoon.png rename to src/canonical/dex/front/268--0--Cascoon.png diff --git a/src/canonical/dex/front/Dustox.png b/src/canonical/dex/front/269--0--Dustox.png similarity index 100% rename from src/canonical/dex/front/Dustox.png rename to src/canonical/dex/front/269--0--Dustox.png diff --git a/src/canonical/dex/front/Sandshrew.png b/src/canonical/dex/front/27--0--Sandshrew.png similarity index 100% rename from src/canonical/dex/front/Sandshrew.png rename to src/canonical/dex/front/27--0--Sandshrew.png diff --git a/src/canonical/dex/front/Sandshrew--Alola.png b/src/canonical/dex/front/27--420--Sandshrew--Alola.png similarity index 100% rename from src/canonical/dex/front/Sandshrew--Alola.png rename to src/canonical/dex/front/27--420--Sandshrew--Alola.png diff --git a/src/canonical/dex/front/Lotad.png b/src/canonical/dex/front/270--0--Lotad.png similarity index 100% rename from src/canonical/dex/front/Lotad.png rename to src/canonical/dex/front/270--0--Lotad.png diff --git a/src/canonical/dex/front/Lombre.png b/src/canonical/dex/front/271--0--Lombre.png similarity index 100% rename from src/canonical/dex/front/Lombre.png rename to src/canonical/dex/front/271--0--Lombre.png diff --git a/src/canonical/dex/front/Ludicolo.png b/src/canonical/dex/front/272--0--Ludicolo.png similarity index 100% rename from src/canonical/dex/front/Ludicolo.png rename to src/canonical/dex/front/272--0--Ludicolo.png diff --git a/src/canonical/dex/front/Seedot.png b/src/canonical/dex/front/273--0--Seedot.png similarity index 100% rename from src/canonical/dex/front/Seedot.png rename to src/canonical/dex/front/273--0--Seedot.png diff --git a/src/canonical/dex/front/Nuzleaf.png b/src/canonical/dex/front/274--0--Nuzleaf.png similarity index 100% rename from src/canonical/dex/front/Nuzleaf.png rename to src/canonical/dex/front/274--0--Nuzleaf.png diff --git a/src/canonical/dex/front/Shiftry.png b/src/canonical/dex/front/275--0--Shiftry.png similarity index 100% rename from src/canonical/dex/front/Shiftry.png rename to src/canonical/dex/front/275--0--Shiftry.png diff --git a/src/canonical/dex/front/Taillow.png b/src/canonical/dex/front/276--0--Taillow.png similarity index 100% rename from src/canonical/dex/front/Taillow.png rename to src/canonical/dex/front/276--0--Taillow.png diff --git a/src/canonical/dex/front/Swellow.png b/src/canonical/dex/front/277--0--Swellow.png similarity index 100% rename from src/canonical/dex/front/Swellow.png rename to src/canonical/dex/front/277--0--Swellow.png diff --git a/src/canonical/dex/front/Wingull.png b/src/canonical/dex/front/278--0--Wingull.png similarity index 100% rename from src/canonical/dex/front/Wingull.png rename to src/canonical/dex/front/278--0--Wingull.png diff --git a/src/canonical/dex/front/Pelipper.png b/src/canonical/dex/front/279--0--Pelipper.png similarity index 100% rename from src/canonical/dex/front/Pelipper.png rename to src/canonical/dex/front/279--0--Pelipper.png diff --git a/src/canonical/dex/front/Sandslash.png b/src/canonical/dex/front/28--0--Sandslash.png similarity index 100% rename from src/canonical/dex/front/Sandslash.png rename to src/canonical/dex/front/28--0--Sandslash.png diff --git a/src/canonical/dex/front/Sandslash--Alola.png b/src/canonical/dex/front/28--420--Sandslash--Alola.png similarity index 100% rename from src/canonical/dex/front/Sandslash--Alola.png rename to src/canonical/dex/front/28--420--Sandslash--Alola.png diff --git a/src/canonical/dex/front/Ralts.png b/src/canonical/dex/front/280--0--Ralts.png similarity index 100% rename from src/canonical/dex/front/Ralts.png rename to src/canonical/dex/front/280--0--Ralts.png diff --git a/src/canonical/dex/front/Kirlia.png b/src/canonical/dex/front/281--0--Kirlia.png similarity index 100% rename from src/canonical/dex/front/Kirlia.png rename to src/canonical/dex/front/281--0--Kirlia.png diff --git a/src/canonical/dex/front/Gardevoir.png b/src/canonical/dex/front/282--0--Gardevoir.png similarity index 100% rename from src/canonical/dex/front/Gardevoir.png rename to src/canonical/dex/front/282--0--Gardevoir.png diff --git a/src/canonical/dex/front/Gardevoir--Mega.png b/src/canonical/dex/front/282--420--Gardevoir--Mega.png similarity index 100% rename from src/canonical/dex/front/Gardevoir--Mega.png rename to src/canonical/dex/front/282--420--Gardevoir--Mega.png diff --git a/src/canonical/dex/front/Surskit.png b/src/canonical/dex/front/283--0--Surskit.png similarity index 100% rename from src/canonical/dex/front/Surskit.png rename to src/canonical/dex/front/283--0--Surskit.png diff --git a/src/canonical/dex/front/Masquerain.png b/src/canonical/dex/front/284--0--Masquerain.png similarity index 100% rename from src/canonical/dex/front/Masquerain.png rename to src/canonical/dex/front/284--0--Masquerain.png diff --git a/src/canonical/dex/front/Shroomish.png b/src/canonical/dex/front/285--0--Shroomish.png similarity index 100% rename from src/canonical/dex/front/Shroomish.png rename to src/canonical/dex/front/285--0--Shroomish.png diff --git a/src/canonical/dex/front/Breloom.png b/src/canonical/dex/front/286--0--Breloom.png similarity index 100% rename from src/canonical/dex/front/Breloom.png rename to src/canonical/dex/front/286--0--Breloom.png diff --git a/src/canonical/dex/front/Slakoth.png b/src/canonical/dex/front/287--0--Slakoth.png similarity index 100% rename from src/canonical/dex/front/Slakoth.png rename to src/canonical/dex/front/287--0--Slakoth.png diff --git a/src/canonical/dex/front/Vigoroth.png b/src/canonical/dex/front/288--0--Vigoroth.png similarity index 100% rename from src/canonical/dex/front/Vigoroth.png rename to src/canonical/dex/front/288--0--Vigoroth.png diff --git a/src/canonical/dex/front/Slaking.png b/src/canonical/dex/front/289--0--Slaking.png similarity index 100% rename from src/canonical/dex/front/Slaking.png rename to src/canonical/dex/front/289--0--Slaking.png diff --git a/src/canonical/dex/front/Nidoran-F.png b/src/canonical/dex/front/29--0--Nidoran-F.png similarity index 100% rename from src/canonical/dex/front/Nidoran-F.png rename to src/canonical/dex/front/29--0--Nidoran-F.png diff --git a/src/canonical/dex/front/Nincada.png b/src/canonical/dex/front/290--0--Nincada.png similarity index 100% rename from src/canonical/dex/front/Nincada.png rename to src/canonical/dex/front/290--0--Nincada.png diff --git a/src/canonical/dex/front/Ninjask.png b/src/canonical/dex/front/291--0--Ninjask.png similarity index 100% rename from src/canonical/dex/front/Ninjask.png rename to src/canonical/dex/front/291--0--Ninjask.png diff --git a/src/canonical/dex/front/Shedinja.png b/src/canonical/dex/front/292--0--Shedinja.png similarity index 100% rename from src/canonical/dex/front/Shedinja.png rename to src/canonical/dex/front/292--0--Shedinja.png diff --git a/src/canonical/dex/front/Whismur.png b/src/canonical/dex/front/293--0--Whismur.png similarity index 100% rename from src/canonical/dex/front/Whismur.png rename to src/canonical/dex/front/293--0--Whismur.png diff --git a/src/canonical/dex/front/Loudred.png b/src/canonical/dex/front/294--0--Loudred.png similarity index 100% rename from src/canonical/dex/front/Loudred.png rename to src/canonical/dex/front/294--0--Loudred.png diff --git a/src/canonical/dex/front/Exploud.png b/src/canonical/dex/front/295--0--Exploud.png similarity index 100% rename from src/canonical/dex/front/Exploud.png rename to src/canonical/dex/front/295--0--Exploud.png diff --git a/src/canonical/dex/front/Makuhita.png b/src/canonical/dex/front/296--0--Makuhita.png similarity index 100% rename from src/canonical/dex/front/Makuhita.png rename to src/canonical/dex/front/296--0--Makuhita.png diff --git a/src/canonical/dex/front/Hariyama.png b/src/canonical/dex/front/297--0--Hariyama.png similarity index 100% rename from src/canonical/dex/front/Hariyama.png rename to src/canonical/dex/front/297--0--Hariyama.png diff --git a/src/canonical/dex/front/Azurill.png b/src/canonical/dex/front/298--0--Azurill.png similarity index 100% rename from src/canonical/dex/front/Azurill.png rename to src/canonical/dex/front/298--0--Azurill.png diff --git a/src/canonical/dex/front/Nosepass.png b/src/canonical/dex/front/299--0--Nosepass.png similarity index 100% rename from src/canonical/dex/front/Nosepass.png rename to src/canonical/dex/front/299--0--Nosepass.png diff --git a/src/canonical/dex/front/Venusaur.png b/src/canonical/dex/front/3--0--Venusaur.png similarity index 100% rename from src/canonical/dex/front/Venusaur.png rename to src/canonical/dex/front/3--0--Venusaur.png diff --git a/src/canonical/dex/front/Venusaur--Mega.png b/src/canonical/dex/front/3--420--Venusaur--Mega.png similarity index 100% rename from src/canonical/dex/front/Venusaur--Mega.png rename to src/canonical/dex/front/3--420--Venusaur--Mega.png diff --git a/src/canonical/dex/front/Nidorina.png b/src/canonical/dex/front/30--0--Nidorina.png similarity index 100% rename from src/canonical/dex/front/Nidorina.png rename to src/canonical/dex/front/30--0--Nidorina.png diff --git a/src/canonical/dex/front/Skitty.png b/src/canonical/dex/front/300--0--Skitty.png similarity index 100% rename from src/canonical/dex/front/Skitty.png rename to src/canonical/dex/front/300--0--Skitty.png diff --git a/src/canonical/dex/front/Delcatty.png b/src/canonical/dex/front/301--0--Delcatty.png similarity index 100% rename from src/canonical/dex/front/Delcatty.png rename to src/canonical/dex/front/301--0--Delcatty.png diff --git a/src/canonical/dex/front/Sableye.png b/src/canonical/dex/front/302--0--Sableye.png similarity index 100% rename from src/canonical/dex/front/Sableye.png rename to src/canonical/dex/front/302--0--Sableye.png diff --git a/src/canonical/dex/front/Sableye--Mega.png b/src/canonical/dex/front/302--420--Sableye--Mega.png similarity index 100% rename from src/canonical/dex/front/Sableye--Mega.png rename to src/canonical/dex/front/302--420--Sableye--Mega.png diff --git a/src/canonical/dex/front/Mawile.png b/src/canonical/dex/front/303--0--Mawile.png similarity index 100% rename from src/canonical/dex/front/Mawile.png rename to src/canonical/dex/front/303--0--Mawile.png diff --git a/src/canonical/dex/front/Mawile--Mega.png b/src/canonical/dex/front/303--420--Mawile--Mega.png similarity index 100% rename from src/canonical/dex/front/Mawile--Mega.png rename to src/canonical/dex/front/303--420--Mawile--Mega.png diff --git a/src/canonical/dex/front/Aron.png b/src/canonical/dex/front/304--0--Aron.png similarity index 100% rename from src/canonical/dex/front/Aron.png rename to src/canonical/dex/front/304--0--Aron.png diff --git a/src/canonical/dex/front/Lairon.png b/src/canonical/dex/front/305--0--Lairon.png similarity index 100% rename from src/canonical/dex/front/Lairon.png rename to src/canonical/dex/front/305--0--Lairon.png diff --git a/src/canonical/dex/front/Aggron.png b/src/canonical/dex/front/306--0--Aggron.png similarity index 100% rename from src/canonical/dex/front/Aggron.png rename to src/canonical/dex/front/306--0--Aggron.png diff --git a/src/canonical/dex/front/Aggron--Mega.png b/src/canonical/dex/front/306--420--Aggron--Mega.png similarity index 100% rename from src/canonical/dex/front/Aggron--Mega.png rename to src/canonical/dex/front/306--420--Aggron--Mega.png diff --git a/src/canonical/dex/front/Meditite.png b/src/canonical/dex/front/307--0--Meditite.png similarity index 100% rename from src/canonical/dex/front/Meditite.png rename to src/canonical/dex/front/307--0--Meditite.png diff --git a/src/canonical/dex/front/Medicham.png b/src/canonical/dex/front/308--0--Medicham.png similarity index 100% rename from src/canonical/dex/front/Medicham.png rename to src/canonical/dex/front/308--0--Medicham.png diff --git a/src/canonical/dex/front/Medicham--Mega.png b/src/canonical/dex/front/308--420--Medicham--Mega.png similarity index 100% rename from src/canonical/dex/front/Medicham--Mega.png rename to src/canonical/dex/front/308--420--Medicham--Mega.png diff --git a/src/canonical/dex/front/Electrike.png b/src/canonical/dex/front/309--0--Electrike.png similarity index 100% rename from src/canonical/dex/front/Electrike.png rename to src/canonical/dex/front/309--0--Electrike.png diff --git a/src/canonical/dex/front/Nidoqueen.png b/src/canonical/dex/front/31--0--Nidoqueen.png similarity index 100% rename from src/canonical/dex/front/Nidoqueen.png rename to src/canonical/dex/front/31--0--Nidoqueen.png diff --git a/src/canonical/dex/front/Manectric.png b/src/canonical/dex/front/310--0--Manectric.png similarity index 100% rename from src/canonical/dex/front/Manectric.png rename to src/canonical/dex/front/310--0--Manectric.png diff --git a/src/canonical/dex/front/Manectric--Mega.png b/src/canonical/dex/front/310--420--Manectric--Mega.png similarity index 100% rename from src/canonical/dex/front/Manectric--Mega.png rename to src/canonical/dex/front/310--420--Manectric--Mega.png diff --git a/src/canonical/dex/front/Plusle.png b/src/canonical/dex/front/311--0--Plusle.png similarity index 100% rename from src/canonical/dex/front/Plusle.png rename to src/canonical/dex/front/311--0--Plusle.png diff --git a/src/canonical/dex/front/Minun.png b/src/canonical/dex/front/312--0--Minun.png similarity index 100% rename from src/canonical/dex/front/Minun.png rename to src/canonical/dex/front/312--0--Minun.png diff --git a/src/canonical/dex/front/Volbeat.png b/src/canonical/dex/front/313--0--Volbeat.png similarity index 100% rename from src/canonical/dex/front/Volbeat.png rename to src/canonical/dex/front/313--0--Volbeat.png diff --git a/src/canonical/dex/front/Illumise.png b/src/canonical/dex/front/314--0--Illumise.png similarity index 100% rename from src/canonical/dex/front/Illumise.png rename to src/canonical/dex/front/314--0--Illumise.png diff --git a/src/canonical/dex/front/Roselia.png b/src/canonical/dex/front/315--0--Roselia.png similarity index 100% rename from src/canonical/dex/front/Roselia.png rename to src/canonical/dex/front/315--0--Roselia.png diff --git a/src/canonical/dex/front/Gulpin.png b/src/canonical/dex/front/316--0--Gulpin.png similarity index 100% rename from src/canonical/dex/front/Gulpin.png rename to src/canonical/dex/front/316--0--Gulpin.png diff --git a/src/canonical/dex/front/Swalot.png b/src/canonical/dex/front/317--0--Swalot.png similarity index 100% rename from src/canonical/dex/front/Swalot.png rename to src/canonical/dex/front/317--0--Swalot.png diff --git a/src/canonical/dex/front/Carvanha.png b/src/canonical/dex/front/318--0--Carvanha.png similarity index 100% rename from src/canonical/dex/front/Carvanha.png rename to src/canonical/dex/front/318--0--Carvanha.png diff --git a/src/canonical/dex/front/Sharpedo.png b/src/canonical/dex/front/319--0--Sharpedo.png similarity index 100% rename from src/canonical/dex/front/Sharpedo.png rename to src/canonical/dex/front/319--0--Sharpedo.png diff --git a/src/canonical/dex/front/Sharpedo--Mega.png b/src/canonical/dex/front/319--420--Sharpedo--Mega.png similarity index 100% rename from src/canonical/dex/front/Sharpedo--Mega.png rename to src/canonical/dex/front/319--420--Sharpedo--Mega.png diff --git a/src/canonical/dex/front/Nidoran-M.png b/src/canonical/dex/front/32--0--Nidoran-M.png similarity index 100% rename from src/canonical/dex/front/Nidoran-M.png rename to src/canonical/dex/front/32--0--Nidoran-M.png diff --git a/src/canonical/dex/front/Wailmer.png b/src/canonical/dex/front/320--0--Wailmer.png similarity index 100% rename from src/canonical/dex/front/Wailmer.png rename to src/canonical/dex/front/320--0--Wailmer.png diff --git a/src/canonical/dex/front/Wailord.png b/src/canonical/dex/front/321--0--Wailord.png similarity index 100% rename from src/canonical/dex/front/Wailord.png rename to src/canonical/dex/front/321--0--Wailord.png diff --git a/src/canonical/dex/front/Numel.png b/src/canonical/dex/front/322--0--Numel.png similarity index 100% rename from src/canonical/dex/front/Numel.png rename to src/canonical/dex/front/322--0--Numel.png diff --git a/src/canonical/dex/front/Camerupt.png b/src/canonical/dex/front/323--0--Camerupt.png similarity index 100% rename from src/canonical/dex/front/Camerupt.png rename to src/canonical/dex/front/323--0--Camerupt.png diff --git a/src/canonical/dex/front/Camerupt--Mega.png b/src/canonical/dex/front/323--420--Camerupt--Mega.png similarity index 100% rename from src/canonical/dex/front/Camerupt--Mega.png rename to src/canonical/dex/front/323--420--Camerupt--Mega.png diff --git a/src/canonical/dex/front/Torkoal.png b/src/canonical/dex/front/324--0--Torkoal.png similarity index 100% rename from src/canonical/dex/front/Torkoal.png rename to src/canonical/dex/front/324--0--Torkoal.png diff --git a/src/canonical/dex/front/Spoink.png b/src/canonical/dex/front/325--0--Spoink.png similarity index 100% rename from src/canonical/dex/front/Spoink.png rename to src/canonical/dex/front/325--0--Spoink.png diff --git a/src/canonical/dex/front/Grumpig.png b/src/canonical/dex/front/326--0--Grumpig.png similarity index 100% rename from src/canonical/dex/front/Grumpig.png rename to src/canonical/dex/front/326--0--Grumpig.png diff --git a/src/canonical/dex/front/Spinda.png b/src/canonical/dex/front/327--0--Spinda.png similarity index 100% rename from src/canonical/dex/front/Spinda.png rename to src/canonical/dex/front/327--0--Spinda.png diff --git a/src/canonical/dex/front/Trapinch.png b/src/canonical/dex/front/328--0--Trapinch.png similarity index 100% rename from src/canonical/dex/front/Trapinch.png rename to src/canonical/dex/front/328--0--Trapinch.png diff --git a/src/canonical/dex/front/Vibrava.png b/src/canonical/dex/front/329--0--Vibrava.png similarity index 100% rename from src/canonical/dex/front/Vibrava.png rename to src/canonical/dex/front/329--0--Vibrava.png diff --git a/src/canonical/dex/front/Nidorino.png b/src/canonical/dex/front/33--0--Nidorino.png similarity index 100% rename from src/canonical/dex/front/Nidorino.png rename to src/canonical/dex/front/33--0--Nidorino.png diff --git a/src/canonical/dex/front/Flygon.png b/src/canonical/dex/front/330--0--Flygon.png similarity index 100% rename from src/canonical/dex/front/Flygon.png rename to src/canonical/dex/front/330--0--Flygon.png diff --git a/src/canonical/dex/front/Cacnea.png b/src/canonical/dex/front/331--0--Cacnea.png similarity index 100% rename from src/canonical/dex/front/Cacnea.png rename to src/canonical/dex/front/331--0--Cacnea.png diff --git a/src/canonical/dex/front/Cacturne.png b/src/canonical/dex/front/332--0--Cacturne.png similarity index 100% rename from src/canonical/dex/front/Cacturne.png rename to src/canonical/dex/front/332--0--Cacturne.png diff --git a/src/canonical/dex/front/Swablu.png b/src/canonical/dex/front/333--0--Swablu.png similarity index 100% rename from src/canonical/dex/front/Swablu.png rename to src/canonical/dex/front/333--0--Swablu.png diff --git a/src/canonical/dex/front/Altaria.png b/src/canonical/dex/front/334--0--Altaria.png similarity index 100% rename from src/canonical/dex/front/Altaria.png rename to src/canonical/dex/front/334--0--Altaria.png diff --git a/src/canonical/dex/front/Altaria--Mega.png b/src/canonical/dex/front/334--420--Altaria--Mega.png similarity index 100% rename from src/canonical/dex/front/Altaria--Mega.png rename to src/canonical/dex/front/334--420--Altaria--Mega.png diff --git a/src/canonical/dex/front/Zangoose.png b/src/canonical/dex/front/335--0--Zangoose.png similarity index 100% rename from src/canonical/dex/front/Zangoose.png rename to src/canonical/dex/front/335--0--Zangoose.png diff --git a/src/canonical/dex/front/Seviper.png b/src/canonical/dex/front/336--0--Seviper.png similarity index 100% rename from src/canonical/dex/front/Seviper.png rename to src/canonical/dex/front/336--0--Seviper.png diff --git a/src/canonical/dex/front/Lunatone.png b/src/canonical/dex/front/337--0--Lunatone.png similarity index 100% rename from src/canonical/dex/front/Lunatone.png rename to src/canonical/dex/front/337--0--Lunatone.png diff --git a/src/canonical/dex/front/Solrock.png b/src/canonical/dex/front/338--0--Solrock.png similarity index 100% rename from src/canonical/dex/front/Solrock.png rename to src/canonical/dex/front/338--0--Solrock.png diff --git a/src/canonical/dex/front/Barboach.png b/src/canonical/dex/front/339--0--Barboach.png similarity index 100% rename from src/canonical/dex/front/Barboach.png rename to src/canonical/dex/front/339--0--Barboach.png diff --git a/src/canonical/dex/front/Nidoking.png b/src/canonical/dex/front/34--0--Nidoking.png similarity index 100% rename from src/canonical/dex/front/Nidoking.png rename to src/canonical/dex/front/34--0--Nidoking.png diff --git a/src/canonical/dex/front/Whiscash.png b/src/canonical/dex/front/340--0--Whiscash.png similarity index 100% rename from src/canonical/dex/front/Whiscash.png rename to src/canonical/dex/front/340--0--Whiscash.png diff --git a/src/canonical/dex/front/Corphish.png b/src/canonical/dex/front/341--0--Corphish.png similarity index 100% rename from src/canonical/dex/front/Corphish.png rename to src/canonical/dex/front/341--0--Corphish.png diff --git a/src/canonical/dex/front/Crawdaunt.png b/src/canonical/dex/front/342--0--Crawdaunt.png similarity index 100% rename from src/canonical/dex/front/Crawdaunt.png rename to src/canonical/dex/front/342--0--Crawdaunt.png diff --git a/src/canonical/dex/front/Baltoy.png b/src/canonical/dex/front/343--0--Baltoy.png similarity index 100% rename from src/canonical/dex/front/Baltoy.png rename to src/canonical/dex/front/343--0--Baltoy.png diff --git a/src/canonical/dex/front/Claydol.png b/src/canonical/dex/front/344--0--Claydol.png similarity index 100% rename from src/canonical/dex/front/Claydol.png rename to src/canonical/dex/front/344--0--Claydol.png diff --git a/src/canonical/dex/front/Lileep.png b/src/canonical/dex/front/345--0--Lileep.png similarity index 100% rename from src/canonical/dex/front/Lileep.png rename to src/canonical/dex/front/345--0--Lileep.png diff --git a/src/canonical/dex/front/Cradily.png b/src/canonical/dex/front/346--0--Cradily.png similarity index 100% rename from src/canonical/dex/front/Cradily.png rename to src/canonical/dex/front/346--0--Cradily.png diff --git a/src/canonical/dex/front/Anorith.png b/src/canonical/dex/front/347--0--Anorith.png similarity index 100% rename from src/canonical/dex/front/Anorith.png rename to src/canonical/dex/front/347--0--Anorith.png diff --git a/src/canonical/dex/front/Armaldo.png b/src/canonical/dex/front/348--0--Armaldo.png similarity index 100% rename from src/canonical/dex/front/Armaldo.png rename to src/canonical/dex/front/348--0--Armaldo.png diff --git a/src/canonical/dex/front/Feebas.png b/src/canonical/dex/front/349--0--Feebas.png similarity index 100% rename from src/canonical/dex/front/Feebas.png rename to src/canonical/dex/front/349--0--Feebas.png diff --git a/src/canonical/dex/front/Clefairy.png b/src/canonical/dex/front/35--0--Clefairy.png similarity index 100% rename from src/canonical/dex/front/Clefairy.png rename to src/canonical/dex/front/35--0--Clefairy.png diff --git a/src/canonical/dex/front/Milotic.png b/src/canonical/dex/front/350--0--Milotic.png similarity index 100% rename from src/canonical/dex/front/Milotic.png rename to src/canonical/dex/front/350--0--Milotic.png diff --git a/src/canonical/dex/front/Castform.png b/src/canonical/dex/front/351--0--Castform.png similarity index 100% rename from src/canonical/dex/front/Castform.png rename to src/canonical/dex/front/351--0--Castform.png diff --git a/src/canonical/dex/front/Castform--Rainy.png b/src/canonical/dex/front/351--420--Castform--Rainy.png similarity index 100% rename from src/canonical/dex/front/Castform--Rainy.png rename to src/canonical/dex/front/351--420--Castform--Rainy.png diff --git a/src/canonical/dex/front/Castform--Snowy.png b/src/canonical/dex/front/351--420--Castform--Snowy.png similarity index 100% rename from src/canonical/dex/front/Castform--Snowy.png rename to src/canonical/dex/front/351--420--Castform--Snowy.png diff --git a/src/canonical/dex/front/Castform--Sunny.png b/src/canonical/dex/front/351--420--Castform--Sunny.png similarity index 100% rename from src/canonical/dex/front/Castform--Sunny.png rename to src/canonical/dex/front/351--420--Castform--Sunny.png diff --git a/src/canonical/dex/front/Kecleon.png b/src/canonical/dex/front/352--0--Kecleon.png similarity index 100% rename from src/canonical/dex/front/Kecleon.png rename to src/canonical/dex/front/352--0--Kecleon.png diff --git a/src/canonical/dex/front/Shuppet.png b/src/canonical/dex/front/353--0--Shuppet.png similarity index 100% rename from src/canonical/dex/front/Shuppet.png rename to src/canonical/dex/front/353--0--Shuppet.png diff --git a/src/canonical/dex/front/Banette.png b/src/canonical/dex/front/354--0--Banette.png similarity index 100% rename from src/canonical/dex/front/Banette.png rename to src/canonical/dex/front/354--0--Banette.png diff --git a/src/canonical/dex/front/Banette--Mega.png b/src/canonical/dex/front/354--420--Banette--Mega.png similarity index 100% rename from src/canonical/dex/front/Banette--Mega.png rename to src/canonical/dex/front/354--420--Banette--Mega.png diff --git a/src/canonical/dex/front/Duskull.png b/src/canonical/dex/front/355--0--Duskull.png similarity index 100% rename from src/canonical/dex/front/Duskull.png rename to src/canonical/dex/front/355--0--Duskull.png diff --git a/src/canonical/dex/front/Dusclops.png b/src/canonical/dex/front/356--0--Dusclops.png similarity index 100% rename from src/canonical/dex/front/Dusclops.png rename to src/canonical/dex/front/356--0--Dusclops.png diff --git a/src/canonical/dex/front/Tropius.png b/src/canonical/dex/front/357--0--Tropius.png similarity index 100% rename from src/canonical/dex/front/Tropius.png rename to src/canonical/dex/front/357--0--Tropius.png diff --git a/src/canonical/dex/front/Chimecho.png b/src/canonical/dex/front/358--0--Chimecho.png similarity index 100% rename from src/canonical/dex/front/Chimecho.png rename to src/canonical/dex/front/358--0--Chimecho.png diff --git a/src/canonical/dex/front/Absol.png b/src/canonical/dex/front/359--0--Absol.png similarity index 100% rename from src/canonical/dex/front/Absol.png rename to src/canonical/dex/front/359--0--Absol.png diff --git a/src/canonical/dex/front/Absol--Mega.png b/src/canonical/dex/front/359--420--Absol--Mega.png similarity index 100% rename from src/canonical/dex/front/Absol--Mega.png rename to src/canonical/dex/front/359--420--Absol--Mega.png diff --git a/src/canonical/dex/front/Clefable.png b/src/canonical/dex/front/36--0--Clefable.png similarity index 100% rename from src/canonical/dex/front/Clefable.png rename to src/canonical/dex/front/36--0--Clefable.png diff --git a/src/canonical/dex/front/Wynaut.png b/src/canonical/dex/front/360--0--Wynaut.png similarity index 100% rename from src/canonical/dex/front/Wynaut.png rename to src/canonical/dex/front/360--0--Wynaut.png diff --git a/src/canonical/dex/front/Snorunt.png b/src/canonical/dex/front/361--0--Snorunt.png similarity index 100% rename from src/canonical/dex/front/Snorunt.png rename to src/canonical/dex/front/361--0--Snorunt.png diff --git a/src/canonical/dex/front/Glalie.png b/src/canonical/dex/front/362--0--Glalie.png similarity index 100% rename from src/canonical/dex/front/Glalie.png rename to src/canonical/dex/front/362--0--Glalie.png diff --git a/src/canonical/dex/front/Glalie--Mega.png b/src/canonical/dex/front/362--420--Glalie--Mega.png similarity index 100% rename from src/canonical/dex/front/Glalie--Mega.png rename to src/canonical/dex/front/362--420--Glalie--Mega.png diff --git a/src/canonical/dex/front/Spheal.png b/src/canonical/dex/front/363--0--Spheal.png similarity index 100% rename from src/canonical/dex/front/Spheal.png rename to src/canonical/dex/front/363--0--Spheal.png diff --git a/src/canonical/dex/front/Sealeo.png b/src/canonical/dex/front/364--0--Sealeo.png similarity index 100% rename from src/canonical/dex/front/Sealeo.png rename to src/canonical/dex/front/364--0--Sealeo.png diff --git a/src/canonical/dex/front/Walrein.png b/src/canonical/dex/front/365--0--Walrein.png similarity index 100% rename from src/canonical/dex/front/Walrein.png rename to src/canonical/dex/front/365--0--Walrein.png diff --git a/src/canonical/dex/front/Clamperl.png b/src/canonical/dex/front/366--0--Clamperl.png similarity index 100% rename from src/canonical/dex/front/Clamperl.png rename to src/canonical/dex/front/366--0--Clamperl.png diff --git a/src/canonical/dex/front/Huntail.png b/src/canonical/dex/front/367--0--Huntail.png similarity index 100% rename from src/canonical/dex/front/Huntail.png rename to src/canonical/dex/front/367--0--Huntail.png diff --git a/src/canonical/dex/front/Gorebyss.png b/src/canonical/dex/front/368--0--Gorebyss.png similarity index 100% rename from src/canonical/dex/front/Gorebyss.png rename to src/canonical/dex/front/368--0--Gorebyss.png diff --git a/src/canonical/dex/front/Relicanth.png b/src/canonical/dex/front/369--0--Relicanth.png similarity index 100% rename from src/canonical/dex/front/Relicanth.png rename to src/canonical/dex/front/369--0--Relicanth.png diff --git a/src/canonical/dex/front/Vulpix.png b/src/canonical/dex/front/37--0--Vulpix.png similarity index 100% rename from src/canonical/dex/front/Vulpix.png rename to src/canonical/dex/front/37--0--Vulpix.png diff --git a/src/canonical/dex/front/Vulpix--Alola.png b/src/canonical/dex/front/37--420--Vulpix--Alola.png similarity index 100% rename from src/canonical/dex/front/Vulpix--Alola.png rename to src/canonical/dex/front/37--420--Vulpix--Alola.png diff --git a/src/canonical/dex/front/Luvdisc.png b/src/canonical/dex/front/370--0--Luvdisc.png similarity index 100% rename from src/canonical/dex/front/Luvdisc.png rename to src/canonical/dex/front/370--0--Luvdisc.png diff --git a/src/canonical/dex/front/Bagon.png b/src/canonical/dex/front/371--0--Bagon.png similarity index 100% rename from src/canonical/dex/front/Bagon.png rename to src/canonical/dex/front/371--0--Bagon.png diff --git a/src/canonical/dex/front/Shelgon.png b/src/canonical/dex/front/372--0--Shelgon.png similarity index 100% rename from src/canonical/dex/front/Shelgon.png rename to src/canonical/dex/front/372--0--Shelgon.png diff --git a/src/canonical/dex/front/Salamence.png b/src/canonical/dex/front/373--0--Salamence.png similarity index 100% rename from src/canonical/dex/front/Salamence.png rename to src/canonical/dex/front/373--0--Salamence.png diff --git a/src/canonical/dex/front/Salamence--Mega.png b/src/canonical/dex/front/373--420--Salamence--Mega.png similarity index 100% rename from src/canonical/dex/front/Salamence--Mega.png rename to src/canonical/dex/front/373--420--Salamence--Mega.png diff --git a/src/canonical/dex/front/Beldum.png b/src/canonical/dex/front/374--0--Beldum.png similarity index 100% rename from src/canonical/dex/front/Beldum.png rename to src/canonical/dex/front/374--0--Beldum.png diff --git a/src/canonical/dex/front/Metang.png b/src/canonical/dex/front/375--0--Metang.png similarity index 100% rename from src/canonical/dex/front/Metang.png rename to src/canonical/dex/front/375--0--Metang.png diff --git a/src/canonical/dex/front/Metagross.png b/src/canonical/dex/front/376--0--Metagross.png similarity index 100% rename from src/canonical/dex/front/Metagross.png rename to src/canonical/dex/front/376--0--Metagross.png diff --git a/src/canonical/dex/front/Metagross--Mega.png b/src/canonical/dex/front/376--420--Metagross--Mega.png similarity index 100% rename from src/canonical/dex/front/Metagross--Mega.png rename to src/canonical/dex/front/376--420--Metagross--Mega.png diff --git a/src/canonical/dex/front/Regirock.png b/src/canonical/dex/front/377--0--Regirock.png similarity index 100% rename from src/canonical/dex/front/Regirock.png rename to src/canonical/dex/front/377--0--Regirock.png diff --git a/src/canonical/dex/front/Regice.png b/src/canonical/dex/front/378--0--Regice.png similarity index 100% rename from src/canonical/dex/front/Regice.png rename to src/canonical/dex/front/378--0--Regice.png diff --git a/src/canonical/dex/front/Registeel.png b/src/canonical/dex/front/379--0--Registeel.png similarity index 100% rename from src/canonical/dex/front/Registeel.png rename to src/canonical/dex/front/379--0--Registeel.png diff --git a/src/canonical/dex/front/Ninetales.png b/src/canonical/dex/front/38--0--Ninetales.png similarity index 100% rename from src/canonical/dex/front/Ninetales.png rename to src/canonical/dex/front/38--0--Ninetales.png diff --git a/src/canonical/dex/front/Ninetales--Alola.png b/src/canonical/dex/front/38--420--Ninetales--Alola.png similarity index 100% rename from src/canonical/dex/front/Ninetales--Alola.png rename to src/canonical/dex/front/38--420--Ninetales--Alola.png diff --git a/src/canonical/dex/front/Latias.png b/src/canonical/dex/front/380--0--Latias.png similarity index 100% rename from src/canonical/dex/front/Latias.png rename to src/canonical/dex/front/380--0--Latias.png diff --git a/src/canonical/dex/front/Latias--Mega.png b/src/canonical/dex/front/380--420--Latias--Mega.png similarity index 100% rename from src/canonical/dex/front/Latias--Mega.png rename to src/canonical/dex/front/380--420--Latias--Mega.png diff --git a/src/canonical/dex/front/Latios.png b/src/canonical/dex/front/381--0--Latios.png similarity index 100% rename from src/canonical/dex/front/Latios.png rename to src/canonical/dex/front/381--0--Latios.png diff --git a/src/canonical/dex/front/Latios--Mega.png b/src/canonical/dex/front/381--420--Latios--Mega.png similarity index 100% rename from src/canonical/dex/front/Latios--Mega.png rename to src/canonical/dex/front/381--420--Latios--Mega.png diff --git a/src/canonical/dex/front/Kyogre.png b/src/canonical/dex/front/382--0--Kyogre.png similarity index 100% rename from src/canonical/dex/front/Kyogre.png rename to src/canonical/dex/front/382--0--Kyogre.png diff --git a/src/canonical/dex/front/Kyogre--Primal.png b/src/canonical/dex/front/382--420--Kyogre--Primal.png similarity index 100% rename from src/canonical/dex/front/Kyogre--Primal.png rename to src/canonical/dex/front/382--420--Kyogre--Primal.png diff --git a/src/canonical/dex/front/Groudon.png b/src/canonical/dex/front/383--0--Groudon.png similarity index 100% rename from src/canonical/dex/front/Groudon.png rename to src/canonical/dex/front/383--0--Groudon.png diff --git a/src/canonical/dex/front/Groudon--Primal.png b/src/canonical/dex/front/383--420--Groudon--Primal.png similarity index 100% rename from src/canonical/dex/front/Groudon--Primal.png rename to src/canonical/dex/front/383--420--Groudon--Primal.png diff --git a/src/canonical/dex/front/Rayquaza.png b/src/canonical/dex/front/384--0--Rayquaza.png similarity index 100% rename from src/canonical/dex/front/Rayquaza.png rename to src/canonical/dex/front/384--0--Rayquaza.png diff --git a/src/canonical/dex/front/Rayquaza--Mega.png b/src/canonical/dex/front/384--420--Rayquaza--Mega.png similarity index 100% rename from src/canonical/dex/front/Rayquaza--Mega.png rename to src/canonical/dex/front/384--420--Rayquaza--Mega.png diff --git a/src/canonical/dex/front/Jirachi.png b/src/canonical/dex/front/385--0--Jirachi.png similarity index 100% rename from src/canonical/dex/front/Jirachi.png rename to src/canonical/dex/front/385--0--Jirachi.png diff --git a/src/canonical/dex/front/Deoxys.png b/src/canonical/dex/front/386--0--Deoxys.png similarity index 100% rename from src/canonical/dex/front/Deoxys.png rename to src/canonical/dex/front/386--0--Deoxys.png diff --git a/src/canonical/dex/front/Deoxys--Attack.png b/src/canonical/dex/front/386--420--Deoxys--Attack.png similarity index 100% rename from src/canonical/dex/front/Deoxys--Attack.png rename to src/canonical/dex/front/386--420--Deoxys--Attack.png diff --git a/src/canonical/dex/front/Deoxys--Defense.png b/src/canonical/dex/front/386--420--Deoxys--Defense.png similarity index 100% rename from src/canonical/dex/front/Deoxys--Defense.png rename to src/canonical/dex/front/386--420--Deoxys--Defense.png diff --git a/src/canonical/dex/front/Deoxys--Speed.png b/src/canonical/dex/front/386--420--Deoxys--Speed.png similarity index 100% rename from src/canonical/dex/front/Deoxys--Speed.png rename to src/canonical/dex/front/386--420--Deoxys--Speed.png diff --git a/src/canonical/dex/front/Turtwig.png b/src/canonical/dex/front/387--0--Turtwig.png similarity index 100% rename from src/canonical/dex/front/Turtwig.png rename to src/canonical/dex/front/387--0--Turtwig.png diff --git a/src/canonical/dex/front/Grotle.png b/src/canonical/dex/front/388--0--Grotle.png similarity index 100% rename from src/canonical/dex/front/Grotle.png rename to src/canonical/dex/front/388--0--Grotle.png diff --git a/src/canonical/dex/front/Torterra.png b/src/canonical/dex/front/389--0--Torterra.png similarity index 100% rename from src/canonical/dex/front/Torterra.png rename to src/canonical/dex/front/389--0--Torterra.png diff --git a/src/canonical/dex/front/Jigglypuff.png b/src/canonical/dex/front/39--0--Jigglypuff.png similarity index 100% rename from src/canonical/dex/front/Jigglypuff.png rename to src/canonical/dex/front/39--0--Jigglypuff.png diff --git a/src/canonical/dex/front/Chimchar.png b/src/canonical/dex/front/390--0--Chimchar.png similarity index 100% rename from src/canonical/dex/front/Chimchar.png rename to src/canonical/dex/front/390--0--Chimchar.png diff --git a/src/canonical/dex/front/Monferno.png b/src/canonical/dex/front/391--0--Monferno.png similarity index 100% rename from src/canonical/dex/front/Monferno.png rename to src/canonical/dex/front/391--0--Monferno.png diff --git a/src/canonical/dex/front/Infernape.png b/src/canonical/dex/front/392--0--Infernape.png similarity index 100% rename from src/canonical/dex/front/Infernape.png rename to src/canonical/dex/front/392--0--Infernape.png diff --git a/src/canonical/dex/front/Piplup.png b/src/canonical/dex/front/393--0--Piplup.png similarity index 100% rename from src/canonical/dex/front/Piplup.png rename to src/canonical/dex/front/393--0--Piplup.png diff --git a/src/canonical/dex/front/Prinplup.png b/src/canonical/dex/front/394--0--Prinplup.png similarity index 100% rename from src/canonical/dex/front/Prinplup.png rename to src/canonical/dex/front/394--0--Prinplup.png diff --git a/src/canonical/dex/front/Empoleon.png b/src/canonical/dex/front/395--0--Empoleon.png similarity index 100% rename from src/canonical/dex/front/Empoleon.png rename to src/canonical/dex/front/395--0--Empoleon.png diff --git a/src/canonical/dex/front/Starly.png b/src/canonical/dex/front/396--0--Starly.png similarity index 100% rename from src/canonical/dex/front/Starly.png rename to src/canonical/dex/front/396--0--Starly.png diff --git a/src/canonical/dex/front/Staravia.png b/src/canonical/dex/front/397--0--Staravia.png similarity index 100% rename from src/canonical/dex/front/Staravia.png rename to src/canonical/dex/front/397--0--Staravia.png diff --git a/src/canonical/dex/front/Staraptor.png b/src/canonical/dex/front/398--0--Staraptor.png similarity index 100% rename from src/canonical/dex/front/Staraptor.png rename to src/canonical/dex/front/398--0--Staraptor.png diff --git a/src/canonical/dex/front/Bidoof.png b/src/canonical/dex/front/399--0--Bidoof.png similarity index 100% rename from src/canonical/dex/front/Bidoof.png rename to src/canonical/dex/front/399--0--Bidoof.png diff --git a/src/canonical/dex/front/Charmander.png b/src/canonical/dex/front/4--0--Charmander.png similarity index 100% rename from src/canonical/dex/front/Charmander.png rename to src/canonical/dex/front/4--0--Charmander.png diff --git a/src/canonical/dex/front/Wigglytuff.png b/src/canonical/dex/front/40--0--Wigglytuff.png similarity index 100% rename from src/canonical/dex/front/Wigglytuff.png rename to src/canonical/dex/front/40--0--Wigglytuff.png diff --git a/src/canonical/dex/front/Bibarel.png b/src/canonical/dex/front/400--0--Bibarel.png similarity index 100% rename from src/canonical/dex/front/Bibarel.png rename to src/canonical/dex/front/400--0--Bibarel.png diff --git a/src/canonical/dex/front/Kricketot.png b/src/canonical/dex/front/401--0--Kricketot.png similarity index 100% rename from src/canonical/dex/front/Kricketot.png rename to src/canonical/dex/front/401--0--Kricketot.png diff --git a/src/canonical/dex/front/Kricketune.png b/src/canonical/dex/front/402--0--Kricketune.png similarity index 100% rename from src/canonical/dex/front/Kricketune.png rename to src/canonical/dex/front/402--0--Kricketune.png diff --git a/src/canonical/dex/front/Shinx.png b/src/canonical/dex/front/403--0--Shinx.png similarity index 100% rename from src/canonical/dex/front/Shinx.png rename to src/canonical/dex/front/403--0--Shinx.png diff --git a/src/canonical/dex/front/Luxio.png b/src/canonical/dex/front/404--0--Luxio.png similarity index 100% rename from src/canonical/dex/front/Luxio.png rename to src/canonical/dex/front/404--0--Luxio.png diff --git a/src/canonical/dex/front/Luxray.png b/src/canonical/dex/front/405--0--Luxray.png similarity index 100% rename from src/canonical/dex/front/Luxray.png rename to src/canonical/dex/front/405--0--Luxray.png diff --git a/src/canonical/dex/front/Budew.png b/src/canonical/dex/front/406--0--Budew.png similarity index 100% rename from src/canonical/dex/front/Budew.png rename to src/canonical/dex/front/406--0--Budew.png diff --git a/src/canonical/dex/front/Roserade.png b/src/canonical/dex/front/407--0--Roserade.png similarity index 100% rename from src/canonical/dex/front/Roserade.png rename to src/canonical/dex/front/407--0--Roserade.png diff --git a/src/canonical/dex/front/Cranidos.png b/src/canonical/dex/front/408--0--Cranidos.png similarity index 100% rename from src/canonical/dex/front/Cranidos.png rename to src/canonical/dex/front/408--0--Cranidos.png diff --git a/src/canonical/dex/front/Rampardos.png b/src/canonical/dex/front/409--0--Rampardos.png similarity index 100% rename from src/canonical/dex/front/Rampardos.png rename to src/canonical/dex/front/409--0--Rampardos.png diff --git a/src/canonical/dex/front/Zubat.png b/src/canonical/dex/front/41--0--Zubat.png similarity index 100% rename from src/canonical/dex/front/Zubat.png rename to src/canonical/dex/front/41--0--Zubat.png diff --git a/src/canonical/dex/front/Shieldon.png b/src/canonical/dex/front/410--0--Shieldon.png similarity index 100% rename from src/canonical/dex/front/Shieldon.png rename to src/canonical/dex/front/410--0--Shieldon.png diff --git a/src/canonical/dex/front/Bastiodon.png b/src/canonical/dex/front/411--0--Bastiodon.png similarity index 100% rename from src/canonical/dex/front/Bastiodon.png rename to src/canonical/dex/front/411--0--Bastiodon.png diff --git a/src/canonical/dex/front/Burmy.png b/src/canonical/dex/front/412--0--Burmy.png similarity index 100% rename from src/canonical/dex/front/Burmy.png rename to src/canonical/dex/front/412--0--Burmy.png diff --git a/src/canonical/dex/front/Wormadam.png b/src/canonical/dex/front/413--0--Wormadam.png similarity index 100% rename from src/canonical/dex/front/Wormadam.png rename to src/canonical/dex/front/413--0--Wormadam.png diff --git a/src/canonical/dex/front/Wormadam--Sandy.png b/src/canonical/dex/front/413--420--Wormadam--Sandy.png similarity index 100% rename from src/canonical/dex/front/Wormadam--Sandy.png rename to src/canonical/dex/front/413--420--Wormadam--Sandy.png diff --git a/src/canonical/dex/front/Wormadam--Trash.png b/src/canonical/dex/front/413--420--Wormadam--Trash.png similarity index 100% rename from src/canonical/dex/front/Wormadam--Trash.png rename to src/canonical/dex/front/413--420--Wormadam--Trash.png diff --git a/src/canonical/dex/front/Mothim.png b/src/canonical/dex/front/414--0--Mothim.png similarity index 100% rename from src/canonical/dex/front/Mothim.png rename to src/canonical/dex/front/414--0--Mothim.png diff --git a/src/canonical/dex/front/Combee.png b/src/canonical/dex/front/415--0--Combee.png similarity index 100% rename from src/canonical/dex/front/Combee.png rename to src/canonical/dex/front/415--0--Combee.png diff --git a/src/canonical/dex/front/Vespiquen.png b/src/canonical/dex/front/416--0--Vespiquen.png similarity index 100% rename from src/canonical/dex/front/Vespiquen.png rename to src/canonical/dex/front/416--0--Vespiquen.png diff --git a/src/canonical/dex/front/Pachirisu.png b/src/canonical/dex/front/417--0--Pachirisu.png similarity index 100% rename from src/canonical/dex/front/Pachirisu.png rename to src/canonical/dex/front/417--0--Pachirisu.png diff --git a/src/canonical/dex/front/Buizel.png b/src/canonical/dex/front/418--0--Buizel.png similarity index 100% rename from src/canonical/dex/front/Buizel.png rename to src/canonical/dex/front/418--0--Buizel.png diff --git a/src/canonical/dex/front/Floatzel.png b/src/canonical/dex/front/419--0--Floatzel.png similarity index 100% rename from src/canonical/dex/front/Floatzel.png rename to src/canonical/dex/front/419--0--Floatzel.png diff --git a/src/canonical/dex/front/Golbat.png b/src/canonical/dex/front/42--0--Golbat.png similarity index 100% rename from src/canonical/dex/front/Golbat.png rename to src/canonical/dex/front/42--0--Golbat.png diff --git a/src/canonical/dex/front/Cherubi.png b/src/canonical/dex/front/420--0--Cherubi.png similarity index 100% rename from src/canonical/dex/front/Cherubi.png rename to src/canonical/dex/front/420--0--Cherubi.png diff --git a/src/canonical/dex/front/Cherrim.png b/src/canonical/dex/front/421--0--Cherrim.png similarity index 100% rename from src/canonical/dex/front/Cherrim.png rename to src/canonical/dex/front/421--0--Cherrim.png diff --git a/src/canonical/dex/front/Cherrim--Sunshine.png b/src/canonical/dex/front/421--420--Cherrim--Sunshine.png similarity index 100% rename from src/canonical/dex/front/Cherrim--Sunshine.png rename to src/canonical/dex/front/421--420--Cherrim--Sunshine.png diff --git a/src/canonical/dex/front/Shellos.png b/src/canonical/dex/front/422--0--Shellos.png similarity index 100% rename from src/canonical/dex/front/Shellos.png rename to src/canonical/dex/front/422--0--Shellos.png diff --git a/src/canonical/dex/front/Gastrodon.png b/src/canonical/dex/front/423--0--Gastrodon.png similarity index 100% rename from src/canonical/dex/front/Gastrodon.png rename to src/canonical/dex/front/423--0--Gastrodon.png diff --git a/src/canonical/dex/front/Ambipom.png b/src/canonical/dex/front/424--0--Ambipom.png similarity index 100% rename from src/canonical/dex/front/Ambipom.png rename to src/canonical/dex/front/424--0--Ambipom.png diff --git a/src/canonical/dex/front/Drifloon.png b/src/canonical/dex/front/425--0--Drifloon.png similarity index 100% rename from src/canonical/dex/front/Drifloon.png rename to src/canonical/dex/front/425--0--Drifloon.png diff --git a/src/canonical/dex/front/Drifblim.png b/src/canonical/dex/front/426--0--Drifblim.png similarity index 100% rename from src/canonical/dex/front/Drifblim.png rename to src/canonical/dex/front/426--0--Drifblim.png diff --git a/src/canonical/dex/front/Buneary.png b/src/canonical/dex/front/427--0--Buneary.png similarity index 100% rename from src/canonical/dex/front/Buneary.png rename to src/canonical/dex/front/427--0--Buneary.png diff --git a/src/canonical/dex/front/Lopunny.png b/src/canonical/dex/front/428--0--Lopunny.png similarity index 100% rename from src/canonical/dex/front/Lopunny.png rename to src/canonical/dex/front/428--0--Lopunny.png diff --git a/src/canonical/dex/front/Lopunny--Mega.png b/src/canonical/dex/front/428--420--Lopunny--Mega.png similarity index 100% rename from src/canonical/dex/front/Lopunny--Mega.png rename to src/canonical/dex/front/428--420--Lopunny--Mega.png diff --git a/src/canonical/dex/front/Mismagius.png b/src/canonical/dex/front/429--0--Mismagius.png similarity index 100% rename from src/canonical/dex/front/Mismagius.png rename to src/canonical/dex/front/429--0--Mismagius.png diff --git a/src/canonical/dex/front/Oddish.png b/src/canonical/dex/front/43--0--Oddish.png similarity index 100% rename from src/canonical/dex/front/Oddish.png rename to src/canonical/dex/front/43--0--Oddish.png diff --git a/src/canonical/dex/front/Honchkrow.png b/src/canonical/dex/front/430--0--Honchkrow.png similarity index 100% rename from src/canonical/dex/front/Honchkrow.png rename to src/canonical/dex/front/430--0--Honchkrow.png diff --git a/src/canonical/dex/front/Glameow.png b/src/canonical/dex/front/431--0--Glameow.png similarity index 100% rename from src/canonical/dex/front/Glameow.png rename to src/canonical/dex/front/431--0--Glameow.png diff --git a/src/canonical/dex/front/Purugly.png b/src/canonical/dex/front/432--0--Purugly.png similarity index 100% rename from src/canonical/dex/front/Purugly.png rename to src/canonical/dex/front/432--0--Purugly.png diff --git a/src/canonical/dex/front/Chingling.png b/src/canonical/dex/front/433--0--Chingling.png similarity index 100% rename from src/canonical/dex/front/Chingling.png rename to src/canonical/dex/front/433--0--Chingling.png diff --git a/src/canonical/dex/front/Stunky.png b/src/canonical/dex/front/434--0--Stunky.png similarity index 100% rename from src/canonical/dex/front/Stunky.png rename to src/canonical/dex/front/434--0--Stunky.png diff --git a/src/canonical/dex/front/Skuntank.png b/src/canonical/dex/front/435--0--Skuntank.png similarity index 100% rename from src/canonical/dex/front/Skuntank.png rename to src/canonical/dex/front/435--0--Skuntank.png diff --git a/src/canonical/dex/front/Bronzor.png b/src/canonical/dex/front/436--0--Bronzor.png similarity index 100% rename from src/canonical/dex/front/Bronzor.png rename to src/canonical/dex/front/436--0--Bronzor.png diff --git a/src/canonical/dex/front/Bronzong.png b/src/canonical/dex/front/437--0--Bronzong.png similarity index 100% rename from src/canonical/dex/front/Bronzong.png rename to src/canonical/dex/front/437--0--Bronzong.png diff --git a/src/canonical/dex/front/Bonsly.png b/src/canonical/dex/front/438--0--Bonsly.png similarity index 100% rename from src/canonical/dex/front/Bonsly.png rename to src/canonical/dex/front/438--0--Bonsly.png diff --git a/src/canonical/dex/front/Mime_Jr..png b/src/canonical/dex/front/439--0--Mime_Jr..png similarity index 100% rename from src/canonical/dex/front/Mime_Jr..png rename to src/canonical/dex/front/439--0--Mime_Jr..png diff --git a/src/canonical/dex/front/Gloom.png b/src/canonical/dex/front/44--0--Gloom.png similarity index 100% rename from src/canonical/dex/front/Gloom.png rename to src/canonical/dex/front/44--0--Gloom.png diff --git a/src/canonical/dex/front/Happiny.png b/src/canonical/dex/front/440--0--Happiny.png similarity index 100% rename from src/canonical/dex/front/Happiny.png rename to src/canonical/dex/front/440--0--Happiny.png diff --git a/src/canonical/dex/front/Chatot.png b/src/canonical/dex/front/441--0--Chatot.png similarity index 100% rename from src/canonical/dex/front/Chatot.png rename to src/canonical/dex/front/441--0--Chatot.png diff --git a/src/canonical/dex/front/Spiritomb.png b/src/canonical/dex/front/442--0--Spiritomb.png similarity index 100% rename from src/canonical/dex/front/Spiritomb.png rename to src/canonical/dex/front/442--0--Spiritomb.png diff --git a/src/canonical/dex/front/Gible.png b/src/canonical/dex/front/443--0--Gible.png similarity index 100% rename from src/canonical/dex/front/Gible.png rename to src/canonical/dex/front/443--0--Gible.png diff --git a/src/canonical/dex/front/Gabite.png b/src/canonical/dex/front/444--0--Gabite.png similarity index 100% rename from src/canonical/dex/front/Gabite.png rename to src/canonical/dex/front/444--0--Gabite.png diff --git a/src/canonical/dex/front/Garchomp.png b/src/canonical/dex/front/445--0--Garchomp.png similarity index 100% rename from src/canonical/dex/front/Garchomp.png rename to src/canonical/dex/front/445--0--Garchomp.png diff --git a/src/canonical/dex/front/Garchomp--Mega.png b/src/canonical/dex/front/445--420--Garchomp--Mega.png similarity index 100% rename from src/canonical/dex/front/Garchomp--Mega.png rename to src/canonical/dex/front/445--420--Garchomp--Mega.png diff --git a/src/canonical/dex/front/Munchlax.png b/src/canonical/dex/front/446--0--Munchlax.png similarity index 100% rename from src/canonical/dex/front/Munchlax.png rename to src/canonical/dex/front/446--0--Munchlax.png diff --git a/src/canonical/dex/front/Riolu.png b/src/canonical/dex/front/447--0--Riolu.png similarity index 100% rename from src/canonical/dex/front/Riolu.png rename to src/canonical/dex/front/447--0--Riolu.png diff --git a/src/canonical/dex/front/Lucario.png b/src/canonical/dex/front/448--0--Lucario.png similarity index 100% rename from src/canonical/dex/front/Lucario.png rename to src/canonical/dex/front/448--0--Lucario.png diff --git a/src/canonical/dex/front/Lucario--Mega.png b/src/canonical/dex/front/448--420--Lucario--Mega.png similarity index 100% rename from src/canonical/dex/front/Lucario--Mega.png rename to src/canonical/dex/front/448--420--Lucario--Mega.png diff --git a/src/canonical/dex/front/Hippopotas.png b/src/canonical/dex/front/449--0--Hippopotas.png similarity index 100% rename from src/canonical/dex/front/Hippopotas.png rename to src/canonical/dex/front/449--0--Hippopotas.png diff --git a/src/canonical/dex/front/Vileplume.png b/src/canonical/dex/front/45--0--Vileplume.png similarity index 100% rename from src/canonical/dex/front/Vileplume.png rename to src/canonical/dex/front/45--0--Vileplume.png diff --git a/src/canonical/dex/front/Hippowdon.png b/src/canonical/dex/front/450--0--Hippowdon.png similarity index 100% rename from src/canonical/dex/front/Hippowdon.png rename to src/canonical/dex/front/450--0--Hippowdon.png diff --git a/src/canonical/dex/front/Skorupi.png b/src/canonical/dex/front/451--0--Skorupi.png similarity index 100% rename from src/canonical/dex/front/Skorupi.png rename to src/canonical/dex/front/451--0--Skorupi.png diff --git a/src/canonical/dex/front/Drapion.png b/src/canonical/dex/front/452--0--Drapion.png similarity index 100% rename from src/canonical/dex/front/Drapion.png rename to src/canonical/dex/front/452--0--Drapion.png diff --git a/src/canonical/dex/front/Croagunk.png b/src/canonical/dex/front/453--0--Croagunk.png similarity index 100% rename from src/canonical/dex/front/Croagunk.png rename to src/canonical/dex/front/453--0--Croagunk.png diff --git a/src/canonical/dex/front/Toxicroak.png b/src/canonical/dex/front/454--0--Toxicroak.png similarity index 100% rename from src/canonical/dex/front/Toxicroak.png rename to src/canonical/dex/front/454--0--Toxicroak.png diff --git a/src/canonical/dex/front/Carnivine.png b/src/canonical/dex/front/455--0--Carnivine.png similarity index 100% rename from src/canonical/dex/front/Carnivine.png rename to src/canonical/dex/front/455--0--Carnivine.png diff --git a/src/canonical/dex/front/Finneon.png b/src/canonical/dex/front/456--0--Finneon.png similarity index 100% rename from src/canonical/dex/front/Finneon.png rename to src/canonical/dex/front/456--0--Finneon.png diff --git a/src/canonical/dex/front/Lumineon.png b/src/canonical/dex/front/457--0--Lumineon.png similarity index 100% rename from src/canonical/dex/front/Lumineon.png rename to src/canonical/dex/front/457--0--Lumineon.png diff --git a/src/canonical/dex/front/Mantyke.png b/src/canonical/dex/front/458--0--Mantyke.png similarity index 100% rename from src/canonical/dex/front/Mantyke.png rename to src/canonical/dex/front/458--0--Mantyke.png diff --git a/src/canonical/dex/front/Snover.png b/src/canonical/dex/front/459--0--Snover.png similarity index 100% rename from src/canonical/dex/front/Snover.png rename to src/canonical/dex/front/459--0--Snover.png diff --git a/src/canonical/dex/front/Paras.png b/src/canonical/dex/front/46--0--Paras.png similarity index 100% rename from src/canonical/dex/front/Paras.png rename to src/canonical/dex/front/46--0--Paras.png diff --git a/src/canonical/dex/front/Abomasnow.png b/src/canonical/dex/front/460--0--Abomasnow.png similarity index 100% rename from src/canonical/dex/front/Abomasnow.png rename to src/canonical/dex/front/460--0--Abomasnow.png diff --git a/src/canonical/dex/front/Abomasnow--Mega.png b/src/canonical/dex/front/460--420--Abomasnow--Mega.png similarity index 100% rename from src/canonical/dex/front/Abomasnow--Mega.png rename to src/canonical/dex/front/460--420--Abomasnow--Mega.png diff --git a/src/canonical/dex/front/Weavile.png b/src/canonical/dex/front/461--0--Weavile.png similarity index 100% rename from src/canonical/dex/front/Weavile.png rename to src/canonical/dex/front/461--0--Weavile.png diff --git a/src/canonical/dex/front/Magnezone.png b/src/canonical/dex/front/462--0--Magnezone.png similarity index 100% rename from src/canonical/dex/front/Magnezone.png rename to src/canonical/dex/front/462--0--Magnezone.png diff --git a/src/canonical/dex/front/Lickilicky.png b/src/canonical/dex/front/463--0--Lickilicky.png similarity index 100% rename from src/canonical/dex/front/Lickilicky.png rename to src/canonical/dex/front/463--0--Lickilicky.png diff --git a/src/canonical/dex/front/Rhyperior.png b/src/canonical/dex/front/464--0--Rhyperior.png similarity index 100% rename from src/canonical/dex/front/Rhyperior.png rename to src/canonical/dex/front/464--0--Rhyperior.png diff --git a/src/canonical/dex/front/Tangrowth.png b/src/canonical/dex/front/465--0--Tangrowth.png similarity index 100% rename from src/canonical/dex/front/Tangrowth.png rename to src/canonical/dex/front/465--0--Tangrowth.png diff --git a/src/canonical/dex/front/Electivire.png b/src/canonical/dex/front/466--0--Electivire.png similarity index 100% rename from src/canonical/dex/front/Electivire.png rename to src/canonical/dex/front/466--0--Electivire.png diff --git a/src/canonical/dex/front/Magmortar.png b/src/canonical/dex/front/467--0--Magmortar.png similarity index 100% rename from src/canonical/dex/front/Magmortar.png rename to src/canonical/dex/front/467--0--Magmortar.png diff --git a/src/canonical/dex/front/Togekiss.png b/src/canonical/dex/front/468--0--Togekiss.png similarity index 100% rename from src/canonical/dex/front/Togekiss.png rename to src/canonical/dex/front/468--0--Togekiss.png diff --git a/src/canonical/dex/front/Yanmega.png b/src/canonical/dex/front/469--0--Yanmega.png similarity index 100% rename from src/canonical/dex/front/Yanmega.png rename to src/canonical/dex/front/469--0--Yanmega.png diff --git a/src/canonical/dex/front/Parasect.png b/src/canonical/dex/front/47--0--Parasect.png similarity index 100% rename from src/canonical/dex/front/Parasect.png rename to src/canonical/dex/front/47--0--Parasect.png diff --git a/src/canonical/dex/front/Leafeon.png b/src/canonical/dex/front/470--0--Leafeon.png similarity index 100% rename from src/canonical/dex/front/Leafeon.png rename to src/canonical/dex/front/470--0--Leafeon.png diff --git a/src/canonical/dex/front/Glaceon.png b/src/canonical/dex/front/471--0--Glaceon.png similarity index 100% rename from src/canonical/dex/front/Glaceon.png rename to src/canonical/dex/front/471--0--Glaceon.png diff --git a/src/canonical/dex/front/Gliscor.png b/src/canonical/dex/front/472--0--Gliscor.png similarity index 100% rename from src/canonical/dex/front/Gliscor.png rename to src/canonical/dex/front/472--0--Gliscor.png diff --git a/src/canonical/dex/front/Mamoswine.png b/src/canonical/dex/front/473--0--Mamoswine.png similarity index 100% rename from src/canonical/dex/front/Mamoswine.png rename to src/canonical/dex/front/473--0--Mamoswine.png diff --git a/src/canonical/dex/front/Porygon-Z.png b/src/canonical/dex/front/474--0--Porygon-Z.png similarity index 100% rename from src/canonical/dex/front/Porygon-Z.png rename to src/canonical/dex/front/474--0--Porygon-Z.png diff --git a/src/canonical/dex/front/Gallade.png b/src/canonical/dex/front/475--0--Gallade.png similarity index 100% rename from src/canonical/dex/front/Gallade.png rename to src/canonical/dex/front/475--0--Gallade.png diff --git a/src/canonical/dex/front/Gallade--Mega.png b/src/canonical/dex/front/475--420--Gallade--Mega.png similarity index 100% rename from src/canonical/dex/front/Gallade--Mega.png rename to src/canonical/dex/front/475--420--Gallade--Mega.png diff --git a/src/canonical/dex/front/Probopass.png b/src/canonical/dex/front/476--0--Probopass.png similarity index 100% rename from src/canonical/dex/front/Probopass.png rename to src/canonical/dex/front/476--0--Probopass.png diff --git a/src/canonical/dex/front/Dusknoir.png b/src/canonical/dex/front/477--0--Dusknoir.png similarity index 100% rename from src/canonical/dex/front/Dusknoir.png rename to src/canonical/dex/front/477--0--Dusknoir.png diff --git a/src/canonical/dex/front/Froslass.png b/src/canonical/dex/front/478--0--Froslass.png similarity index 100% rename from src/canonical/dex/front/Froslass.png rename to src/canonical/dex/front/478--0--Froslass.png diff --git a/src/canonical/dex/front/Rotom.png b/src/canonical/dex/front/479--0--Rotom.png similarity index 100% rename from src/canonical/dex/front/Rotom.png rename to src/canonical/dex/front/479--0--Rotom.png diff --git a/src/canonical/dex/front/Rotom--Fan.png b/src/canonical/dex/front/479--420--Rotom--Fan.png similarity index 100% rename from src/canonical/dex/front/Rotom--Fan.png rename to src/canonical/dex/front/479--420--Rotom--Fan.png diff --git a/src/canonical/dex/front/Rotom--Frost.png b/src/canonical/dex/front/479--420--Rotom--Frost.png similarity index 100% rename from src/canonical/dex/front/Rotom--Frost.png rename to src/canonical/dex/front/479--420--Rotom--Frost.png diff --git a/src/canonical/dex/front/Rotom--Heat.png b/src/canonical/dex/front/479--420--Rotom--Heat.png similarity index 100% rename from src/canonical/dex/front/Rotom--Heat.png rename to src/canonical/dex/front/479--420--Rotom--Heat.png diff --git a/src/canonical/dex/front/Rotom--Mow.png b/src/canonical/dex/front/479--420--Rotom--Mow.png similarity index 100% rename from src/canonical/dex/front/Rotom--Mow.png rename to src/canonical/dex/front/479--420--Rotom--Mow.png diff --git a/src/canonical/dex/front/Rotom--Wash.png b/src/canonical/dex/front/479--420--Rotom--Wash.png similarity index 100% rename from src/canonical/dex/front/Rotom--Wash.png rename to src/canonical/dex/front/479--420--Rotom--Wash.png diff --git a/src/canonical/dex/front/Venonat.png b/src/canonical/dex/front/48--0--Venonat.png similarity index 100% rename from src/canonical/dex/front/Venonat.png rename to src/canonical/dex/front/48--0--Venonat.png diff --git a/src/canonical/dex/front/Uxie.png b/src/canonical/dex/front/480--0--Uxie.png similarity index 100% rename from src/canonical/dex/front/Uxie.png rename to src/canonical/dex/front/480--0--Uxie.png diff --git a/src/canonical/dex/front/Mesprit.png b/src/canonical/dex/front/481--0--Mesprit.png similarity index 100% rename from src/canonical/dex/front/Mesprit.png rename to src/canonical/dex/front/481--0--Mesprit.png diff --git a/src/canonical/dex/front/Azelf.png b/src/canonical/dex/front/482--0--Azelf.png similarity index 100% rename from src/canonical/dex/front/Azelf.png rename to src/canonical/dex/front/482--0--Azelf.png diff --git a/src/canonical/dex/front/Dialga.png b/src/canonical/dex/front/483--0--Dialga.png similarity index 100% rename from src/canonical/dex/front/Dialga.png rename to src/canonical/dex/front/483--0--Dialga.png diff --git a/src/canonical/dex/front/Palkia.png b/src/canonical/dex/front/484--0--Palkia.png similarity index 100% rename from src/canonical/dex/front/Palkia.png rename to src/canonical/dex/front/484--0--Palkia.png diff --git a/src/canonical/dex/front/Heatran.png b/src/canonical/dex/front/485--0--Heatran.png similarity index 100% rename from src/canonical/dex/front/Heatran.png rename to src/canonical/dex/front/485--0--Heatran.png diff --git a/src/canonical/dex/front/Regigigas.png b/src/canonical/dex/front/486--0--Regigigas.png similarity index 100% rename from src/canonical/dex/front/Regigigas.png rename to src/canonical/dex/front/486--0--Regigigas.png diff --git a/src/canonical/dex/front/Giratina.png b/src/canonical/dex/front/487--0--Giratina.png similarity index 100% rename from src/canonical/dex/front/Giratina.png rename to src/canonical/dex/front/487--0--Giratina.png diff --git a/src/canonical/dex/front/Giratina--Origin.png b/src/canonical/dex/front/487--420--Giratina--Origin.png similarity index 100% rename from src/canonical/dex/front/Giratina--Origin.png rename to src/canonical/dex/front/487--420--Giratina--Origin.png diff --git a/src/canonical/dex/front/Cresselia.png b/src/canonical/dex/front/488--0--Cresselia.png similarity index 100% rename from src/canonical/dex/front/Cresselia.png rename to src/canonical/dex/front/488--0--Cresselia.png diff --git a/src/canonical/dex/front/Phione.png b/src/canonical/dex/front/489--0--Phione.png similarity index 100% rename from src/canonical/dex/front/Phione.png rename to src/canonical/dex/front/489--0--Phione.png diff --git a/src/canonical/dex/front/Venomoth.png b/src/canonical/dex/front/49--0--Venomoth.png similarity index 100% rename from src/canonical/dex/front/Venomoth.png rename to src/canonical/dex/front/49--0--Venomoth.png diff --git a/src/canonical/dex/front/Manaphy.png b/src/canonical/dex/front/490--0--Manaphy.png similarity index 100% rename from src/canonical/dex/front/Manaphy.png rename to src/canonical/dex/front/490--0--Manaphy.png diff --git a/src/canonical/dex/front/Darkrai.png b/src/canonical/dex/front/491--0--Darkrai.png similarity index 100% rename from src/canonical/dex/front/Darkrai.png rename to src/canonical/dex/front/491--0--Darkrai.png diff --git a/src/canonical/dex/front/Shaymin.png b/src/canonical/dex/front/492--0--Shaymin.png similarity index 100% rename from src/canonical/dex/front/Shaymin.png rename to src/canonical/dex/front/492--0--Shaymin.png diff --git a/src/canonical/dex/front/Shaymin--Sky.png b/src/canonical/dex/front/492--420--Shaymin--Sky.png similarity index 100% rename from src/canonical/dex/front/Shaymin--Sky.png rename to src/canonical/dex/front/492--420--Shaymin--Sky.png diff --git a/src/canonical/dex/front/Arceus.png b/src/canonical/dex/front/493--0--Arceus.png similarity index 100% rename from src/canonical/dex/front/Arceus.png rename to src/canonical/dex/front/493--0--Arceus.png diff --git a/src/canonical/dex/front/Arceus--Bug.png b/src/canonical/dex/front/493--420--Arceus--Bug.png similarity index 100% rename from src/canonical/dex/front/Arceus--Bug.png rename to src/canonical/dex/front/493--420--Arceus--Bug.png diff --git a/src/canonical/dex/front/Arceus--Dark.png b/src/canonical/dex/front/493--420--Arceus--Dark.png similarity index 100% rename from src/canonical/dex/front/Arceus--Dark.png rename to src/canonical/dex/front/493--420--Arceus--Dark.png diff --git a/src/canonical/dex/front/Arceus--Dragon.png b/src/canonical/dex/front/493--420--Arceus--Dragon.png similarity index 100% rename from src/canonical/dex/front/Arceus--Dragon.png rename to src/canonical/dex/front/493--420--Arceus--Dragon.png diff --git a/src/canonical/dex/front/Arceus--Electric.png b/src/canonical/dex/front/493--420--Arceus--Electric.png similarity index 100% rename from src/canonical/dex/front/Arceus--Electric.png rename to src/canonical/dex/front/493--420--Arceus--Electric.png diff --git a/src/canonical/dex/front/Arceus--Fairy.png b/src/canonical/dex/front/493--420--Arceus--Fairy.png similarity index 100% rename from src/canonical/dex/front/Arceus--Fairy.png rename to src/canonical/dex/front/493--420--Arceus--Fairy.png diff --git a/src/canonical/dex/front/Arceus--Fighting.png b/src/canonical/dex/front/493--420--Arceus--Fighting.png similarity index 100% rename from src/canonical/dex/front/Arceus--Fighting.png rename to src/canonical/dex/front/493--420--Arceus--Fighting.png diff --git a/src/canonical/dex/front/Arceus--Fire.png b/src/canonical/dex/front/493--420--Arceus--Fire.png similarity index 100% rename from src/canonical/dex/front/Arceus--Fire.png rename to src/canonical/dex/front/493--420--Arceus--Fire.png diff --git a/src/canonical/dex/front/Arceus--Flying.png b/src/canonical/dex/front/493--420--Arceus--Flying.png similarity index 100% rename from src/canonical/dex/front/Arceus--Flying.png rename to src/canonical/dex/front/493--420--Arceus--Flying.png diff --git a/src/canonical/dex/front/Arceus--Ghost.png b/src/canonical/dex/front/493--420--Arceus--Ghost.png similarity index 100% rename from src/canonical/dex/front/Arceus--Ghost.png rename to src/canonical/dex/front/493--420--Arceus--Ghost.png diff --git a/src/canonical/dex/front/Arceus--Grass.png b/src/canonical/dex/front/493--420--Arceus--Grass.png similarity index 100% rename from src/canonical/dex/front/Arceus--Grass.png rename to src/canonical/dex/front/493--420--Arceus--Grass.png diff --git a/src/canonical/dex/front/Arceus--Ground.png b/src/canonical/dex/front/493--420--Arceus--Ground.png similarity index 100% rename from src/canonical/dex/front/Arceus--Ground.png rename to src/canonical/dex/front/493--420--Arceus--Ground.png diff --git a/src/canonical/dex/front/Arceus--Ice.png b/src/canonical/dex/front/493--420--Arceus--Ice.png similarity index 100% rename from src/canonical/dex/front/Arceus--Ice.png rename to src/canonical/dex/front/493--420--Arceus--Ice.png diff --git a/src/canonical/dex/front/Arceus--Poison.png b/src/canonical/dex/front/493--420--Arceus--Poison.png similarity index 100% rename from src/canonical/dex/front/Arceus--Poison.png rename to src/canonical/dex/front/493--420--Arceus--Poison.png diff --git a/src/canonical/dex/front/Arceus--Psychic.png b/src/canonical/dex/front/493--420--Arceus--Psychic.png similarity index 100% rename from src/canonical/dex/front/Arceus--Psychic.png rename to src/canonical/dex/front/493--420--Arceus--Psychic.png diff --git a/src/canonical/dex/front/Arceus--Rock.png b/src/canonical/dex/front/493--420--Arceus--Rock.png similarity index 100% rename from src/canonical/dex/front/Arceus--Rock.png rename to src/canonical/dex/front/493--420--Arceus--Rock.png diff --git a/src/canonical/dex/front/Arceus--Steel.png b/src/canonical/dex/front/493--420--Arceus--Steel.png similarity index 100% rename from src/canonical/dex/front/Arceus--Steel.png rename to src/canonical/dex/front/493--420--Arceus--Steel.png diff --git a/src/canonical/dex/front/Arceus--Water.png b/src/canonical/dex/front/493--420--Arceus--Water.png similarity index 100% rename from src/canonical/dex/front/Arceus--Water.png rename to src/canonical/dex/front/493--420--Arceus--Water.png diff --git a/src/canonical/dex/front/Victini.png b/src/canonical/dex/front/494--0--Victini.png similarity index 100% rename from src/canonical/dex/front/Victini.png rename to src/canonical/dex/front/494--0--Victini.png diff --git a/src/canonical/dex/front/Snivy.png b/src/canonical/dex/front/495--0--Snivy.png similarity index 100% rename from src/canonical/dex/front/Snivy.png rename to src/canonical/dex/front/495--0--Snivy.png diff --git a/src/canonical/dex/front/Servine.png b/src/canonical/dex/front/496--0--Servine.png similarity index 100% rename from src/canonical/dex/front/Servine.png rename to src/canonical/dex/front/496--0--Servine.png diff --git a/src/canonical/dex/front/Serperior.png b/src/canonical/dex/front/497--0--Serperior.png similarity index 100% rename from src/canonical/dex/front/Serperior.png rename to src/canonical/dex/front/497--0--Serperior.png diff --git a/src/canonical/dex/front/Tepig.png b/src/canonical/dex/front/498--0--Tepig.png similarity index 100% rename from src/canonical/dex/front/Tepig.png rename to src/canonical/dex/front/498--0--Tepig.png diff --git a/src/canonical/dex/front/Pignite.png b/src/canonical/dex/front/499--0--Pignite.png similarity index 100% rename from src/canonical/dex/front/Pignite.png rename to src/canonical/dex/front/499--0--Pignite.png diff --git a/src/canonical/dex/front/Charmeleon.png b/src/canonical/dex/front/5--0--Charmeleon.png similarity index 100% rename from src/canonical/dex/front/Charmeleon.png rename to src/canonical/dex/front/5--0--Charmeleon.png diff --git a/src/canonical/dex/front/Diglett.png b/src/canonical/dex/front/50--0--Diglett.png similarity index 100% rename from src/canonical/dex/front/Diglett.png rename to src/canonical/dex/front/50--0--Diglett.png diff --git a/src/canonical/dex/front/Diglett--Alola.png b/src/canonical/dex/front/50--420--Diglett--Alola.png similarity index 100% rename from src/canonical/dex/front/Diglett--Alola.png rename to src/canonical/dex/front/50--420--Diglett--Alola.png diff --git a/src/canonical/dex/front/Emboar.png b/src/canonical/dex/front/500--0--Emboar.png similarity index 100% rename from src/canonical/dex/front/Emboar.png rename to src/canonical/dex/front/500--0--Emboar.png diff --git a/src/canonical/dex/front/Oshawott.png b/src/canonical/dex/front/501--0--Oshawott.png similarity index 100% rename from src/canonical/dex/front/Oshawott.png rename to src/canonical/dex/front/501--0--Oshawott.png diff --git a/src/canonical/dex/front/Dewott.png b/src/canonical/dex/front/502--0--Dewott.png similarity index 100% rename from src/canonical/dex/front/Dewott.png rename to src/canonical/dex/front/502--0--Dewott.png diff --git a/src/canonical/dex/front/Samurott.png b/src/canonical/dex/front/503--0--Samurott.png similarity index 100% rename from src/canonical/dex/front/Samurott.png rename to src/canonical/dex/front/503--0--Samurott.png diff --git a/src/canonical/dex/front/Patrat.png b/src/canonical/dex/front/504--0--Patrat.png similarity index 100% rename from src/canonical/dex/front/Patrat.png rename to src/canonical/dex/front/504--0--Patrat.png diff --git a/src/canonical/dex/front/Watchog.png b/src/canonical/dex/front/505--0--Watchog.png similarity index 100% rename from src/canonical/dex/front/Watchog.png rename to src/canonical/dex/front/505--0--Watchog.png diff --git a/src/canonical/dex/front/Lillipup.png b/src/canonical/dex/front/506--0--Lillipup.png similarity index 100% rename from src/canonical/dex/front/Lillipup.png rename to src/canonical/dex/front/506--0--Lillipup.png diff --git a/src/canonical/dex/front/Herdier.png b/src/canonical/dex/front/507--0--Herdier.png similarity index 100% rename from src/canonical/dex/front/Herdier.png rename to src/canonical/dex/front/507--0--Herdier.png diff --git a/src/canonical/dex/front/Stoutland.png b/src/canonical/dex/front/508--0--Stoutland.png similarity index 100% rename from src/canonical/dex/front/Stoutland.png rename to src/canonical/dex/front/508--0--Stoutland.png diff --git a/src/canonical/dex/front/Purrloin.png b/src/canonical/dex/front/509--0--Purrloin.png similarity index 100% rename from src/canonical/dex/front/Purrloin.png rename to src/canonical/dex/front/509--0--Purrloin.png diff --git a/src/canonical/dex/front/Dugtrio.png b/src/canonical/dex/front/51--0--Dugtrio.png similarity index 100% rename from src/canonical/dex/front/Dugtrio.png rename to src/canonical/dex/front/51--0--Dugtrio.png diff --git a/src/canonical/dex/front/Dugtrio--Alola.png b/src/canonical/dex/front/51--420--Dugtrio--Alola.png similarity index 100% rename from src/canonical/dex/front/Dugtrio--Alola.png rename to src/canonical/dex/front/51--420--Dugtrio--Alola.png diff --git a/src/canonical/dex/front/Liepard.png b/src/canonical/dex/front/510--0--Liepard.png similarity index 100% rename from src/canonical/dex/front/Liepard.png rename to src/canonical/dex/front/510--0--Liepard.png diff --git a/src/canonical/dex/front/Pansage.png b/src/canonical/dex/front/511--0--Pansage.png similarity index 100% rename from src/canonical/dex/front/Pansage.png rename to src/canonical/dex/front/511--0--Pansage.png diff --git a/src/canonical/dex/front/Simisage.png b/src/canonical/dex/front/512--0--Simisage.png similarity index 100% rename from src/canonical/dex/front/Simisage.png rename to src/canonical/dex/front/512--0--Simisage.png diff --git a/src/canonical/dex/front/Pansear.png b/src/canonical/dex/front/513--0--Pansear.png similarity index 100% rename from src/canonical/dex/front/Pansear.png rename to src/canonical/dex/front/513--0--Pansear.png diff --git a/src/canonical/dex/front/Simisear.png b/src/canonical/dex/front/514--0--Simisear.png similarity index 100% rename from src/canonical/dex/front/Simisear.png rename to src/canonical/dex/front/514--0--Simisear.png diff --git a/src/canonical/dex/front/Panpour.png b/src/canonical/dex/front/515--0--Panpour.png similarity index 100% rename from src/canonical/dex/front/Panpour.png rename to src/canonical/dex/front/515--0--Panpour.png diff --git a/src/canonical/dex/front/Simipour.png b/src/canonical/dex/front/516--0--Simipour.png similarity index 100% rename from src/canonical/dex/front/Simipour.png rename to src/canonical/dex/front/516--0--Simipour.png diff --git a/src/canonical/dex/front/Munna.png b/src/canonical/dex/front/517--0--Munna.png similarity index 100% rename from src/canonical/dex/front/Munna.png rename to src/canonical/dex/front/517--0--Munna.png diff --git a/src/canonical/dex/front/Musharna.png b/src/canonical/dex/front/518--0--Musharna.png similarity index 100% rename from src/canonical/dex/front/Musharna.png rename to src/canonical/dex/front/518--0--Musharna.png diff --git a/src/canonical/dex/front/Pidove.png b/src/canonical/dex/front/519--0--Pidove.png similarity index 100% rename from src/canonical/dex/front/Pidove.png rename to src/canonical/dex/front/519--0--Pidove.png diff --git a/src/canonical/dex/front/Meowth.png b/src/canonical/dex/front/52--0--Meowth.png similarity index 100% rename from src/canonical/dex/front/Meowth.png rename to src/canonical/dex/front/52--0--Meowth.png diff --git a/src/canonical/dex/front/Meowth--Alola.png b/src/canonical/dex/front/52--420--Meowth--Alola.png similarity index 100% rename from src/canonical/dex/front/Meowth--Alola.png rename to src/canonical/dex/front/52--420--Meowth--Alola.png diff --git a/src/canonical/dex/front/Tranquill.png b/src/canonical/dex/front/520--0--Tranquill.png similarity index 100% rename from src/canonical/dex/front/Tranquill.png rename to src/canonical/dex/front/520--0--Tranquill.png diff --git a/src/canonical/dex/front/Unfezant.png b/src/canonical/dex/front/521--0--Unfezant.png similarity index 100% rename from src/canonical/dex/front/Unfezant.png rename to src/canonical/dex/front/521--0--Unfezant.png diff --git a/src/canonical/dex/front/Blitzle.png b/src/canonical/dex/front/522--0--Blitzle.png similarity index 100% rename from src/canonical/dex/front/Blitzle.png rename to src/canonical/dex/front/522--0--Blitzle.png diff --git a/src/canonical/dex/front/Zebstrika.png b/src/canonical/dex/front/523--0--Zebstrika.png similarity index 100% rename from src/canonical/dex/front/Zebstrika.png rename to src/canonical/dex/front/523--0--Zebstrika.png diff --git a/src/canonical/dex/front/Roggenrola.png b/src/canonical/dex/front/524--0--Roggenrola.png similarity index 100% rename from src/canonical/dex/front/Roggenrola.png rename to src/canonical/dex/front/524--0--Roggenrola.png diff --git a/src/canonical/dex/front/Boldore.png b/src/canonical/dex/front/525--0--Boldore.png similarity index 100% rename from src/canonical/dex/front/Boldore.png rename to src/canonical/dex/front/525--0--Boldore.png diff --git a/src/canonical/dex/front/Gigalith.png b/src/canonical/dex/front/526--0--Gigalith.png similarity index 100% rename from src/canonical/dex/front/Gigalith.png rename to src/canonical/dex/front/526--0--Gigalith.png diff --git a/src/canonical/dex/front/Woobat.png b/src/canonical/dex/front/527--0--Woobat.png similarity index 100% rename from src/canonical/dex/front/Woobat.png rename to src/canonical/dex/front/527--0--Woobat.png diff --git a/src/canonical/dex/front/Swoobat.png b/src/canonical/dex/front/528--0--Swoobat.png similarity index 100% rename from src/canonical/dex/front/Swoobat.png rename to src/canonical/dex/front/528--0--Swoobat.png diff --git a/src/canonical/dex/front/Drilbur.png b/src/canonical/dex/front/529--0--Drilbur.png similarity index 100% rename from src/canonical/dex/front/Drilbur.png rename to src/canonical/dex/front/529--0--Drilbur.png diff --git a/src/canonical/dex/front/Persian.png b/src/canonical/dex/front/53--0--Persian.png similarity index 100% rename from src/canonical/dex/front/Persian.png rename to src/canonical/dex/front/53--0--Persian.png diff --git a/src/canonical/dex/front/Persian--Alola.png b/src/canonical/dex/front/53--420--Persian--Alola.png similarity index 100% rename from src/canonical/dex/front/Persian--Alola.png rename to src/canonical/dex/front/53--420--Persian--Alola.png diff --git a/src/canonical/dex/front/Excadrill.png b/src/canonical/dex/front/530--0--Excadrill.png similarity index 100% rename from src/canonical/dex/front/Excadrill.png rename to src/canonical/dex/front/530--0--Excadrill.png diff --git a/src/canonical/dex/front/Audino.png b/src/canonical/dex/front/531--0--Audino.png similarity index 100% rename from src/canonical/dex/front/Audino.png rename to src/canonical/dex/front/531--0--Audino.png diff --git a/src/canonical/dex/front/Audino--Mega.png b/src/canonical/dex/front/531--420--Audino--Mega.png similarity index 100% rename from src/canonical/dex/front/Audino--Mega.png rename to src/canonical/dex/front/531--420--Audino--Mega.png diff --git a/src/canonical/dex/front/Timburr.png b/src/canonical/dex/front/532--0--Timburr.png similarity index 100% rename from src/canonical/dex/front/Timburr.png rename to src/canonical/dex/front/532--0--Timburr.png diff --git a/src/canonical/dex/front/Gurdurr.png b/src/canonical/dex/front/533--0--Gurdurr.png similarity index 100% rename from src/canonical/dex/front/Gurdurr.png rename to src/canonical/dex/front/533--0--Gurdurr.png diff --git a/src/canonical/dex/front/Conkeldurr.png b/src/canonical/dex/front/534--0--Conkeldurr.png similarity index 100% rename from src/canonical/dex/front/Conkeldurr.png rename to src/canonical/dex/front/534--0--Conkeldurr.png diff --git a/src/canonical/dex/front/Tympole.png b/src/canonical/dex/front/535--0--Tympole.png similarity index 100% rename from src/canonical/dex/front/Tympole.png rename to src/canonical/dex/front/535--0--Tympole.png diff --git a/src/canonical/dex/front/Palpitoad.png b/src/canonical/dex/front/536--0--Palpitoad.png similarity index 100% rename from src/canonical/dex/front/Palpitoad.png rename to src/canonical/dex/front/536--0--Palpitoad.png diff --git a/src/canonical/dex/front/Seismitoad.png b/src/canonical/dex/front/537--0--Seismitoad.png similarity index 100% rename from src/canonical/dex/front/Seismitoad.png rename to src/canonical/dex/front/537--0--Seismitoad.png diff --git a/src/canonical/dex/front/Throh.png b/src/canonical/dex/front/538--0--Throh.png similarity index 100% rename from src/canonical/dex/front/Throh.png rename to src/canonical/dex/front/538--0--Throh.png diff --git a/src/canonical/dex/front/Sawk.png b/src/canonical/dex/front/539--0--Sawk.png similarity index 100% rename from src/canonical/dex/front/Sawk.png rename to src/canonical/dex/front/539--0--Sawk.png diff --git a/src/canonical/dex/front/Psyduck.png b/src/canonical/dex/front/54--0--Psyduck.png similarity index 100% rename from src/canonical/dex/front/Psyduck.png rename to src/canonical/dex/front/54--0--Psyduck.png diff --git a/src/canonical/dex/front/Sewaddle.png b/src/canonical/dex/front/540--0--Sewaddle.png similarity index 100% rename from src/canonical/dex/front/Sewaddle.png rename to src/canonical/dex/front/540--0--Sewaddle.png diff --git a/src/canonical/dex/front/Swadloon.png b/src/canonical/dex/front/541--0--Swadloon.png similarity index 100% rename from src/canonical/dex/front/Swadloon.png rename to src/canonical/dex/front/541--0--Swadloon.png diff --git a/src/canonical/dex/front/Leavanny.png b/src/canonical/dex/front/542--0--Leavanny.png similarity index 100% rename from src/canonical/dex/front/Leavanny.png rename to src/canonical/dex/front/542--0--Leavanny.png diff --git a/src/canonical/dex/front/Venipede.png b/src/canonical/dex/front/543--0--Venipede.png similarity index 100% rename from src/canonical/dex/front/Venipede.png rename to src/canonical/dex/front/543--0--Venipede.png diff --git a/src/canonical/dex/front/Whirlipede.png b/src/canonical/dex/front/544--0--Whirlipede.png similarity index 100% rename from src/canonical/dex/front/Whirlipede.png rename to src/canonical/dex/front/544--0--Whirlipede.png diff --git a/src/canonical/dex/front/Scolipede.png b/src/canonical/dex/front/545--0--Scolipede.png similarity index 100% rename from src/canonical/dex/front/Scolipede.png rename to src/canonical/dex/front/545--0--Scolipede.png diff --git a/src/canonical/dex/front/Cottonee.png b/src/canonical/dex/front/546--0--Cottonee.png similarity index 100% rename from src/canonical/dex/front/Cottonee.png rename to src/canonical/dex/front/546--0--Cottonee.png diff --git a/src/canonical/dex/front/Whimsicott.png b/src/canonical/dex/front/547--0--Whimsicott.png similarity index 100% rename from src/canonical/dex/front/Whimsicott.png rename to src/canonical/dex/front/547--0--Whimsicott.png diff --git a/src/canonical/dex/front/Petilil.png b/src/canonical/dex/front/548--0--Petilil.png similarity index 100% rename from src/canonical/dex/front/Petilil.png rename to src/canonical/dex/front/548--0--Petilil.png diff --git a/src/canonical/dex/front/Lilligant.png b/src/canonical/dex/front/549--0--Lilligant.png similarity index 100% rename from src/canonical/dex/front/Lilligant.png rename to src/canonical/dex/front/549--0--Lilligant.png diff --git a/src/canonical/dex/front/Golduck.png b/src/canonical/dex/front/55--0--Golduck.png similarity index 100% rename from src/canonical/dex/front/Golduck.png rename to src/canonical/dex/front/55--0--Golduck.png diff --git a/src/canonical/dex/front/Basculin.png b/src/canonical/dex/front/550--0--Basculin.png similarity index 100% rename from src/canonical/dex/front/Basculin.png rename to src/canonical/dex/front/550--0--Basculin.png diff --git a/src/canonical/dex/front/Basculin--Blue-Striped.png b/src/canonical/dex/front/550--420--Basculin--Blue-Striped.png similarity index 100% rename from src/canonical/dex/front/Basculin--Blue-Striped.png rename to src/canonical/dex/front/550--420--Basculin--Blue-Striped.png diff --git a/src/canonical/dex/front/Sandile.png b/src/canonical/dex/front/551--0--Sandile.png similarity index 100% rename from src/canonical/dex/front/Sandile.png rename to src/canonical/dex/front/551--0--Sandile.png diff --git a/src/canonical/dex/front/Krokorok.png b/src/canonical/dex/front/552--0--Krokorok.png similarity index 100% rename from src/canonical/dex/front/Krokorok.png rename to src/canonical/dex/front/552--0--Krokorok.png diff --git a/src/canonical/dex/front/Krookodile.png b/src/canonical/dex/front/553--0--Krookodile.png similarity index 100% rename from src/canonical/dex/front/Krookodile.png rename to src/canonical/dex/front/553--0--Krookodile.png diff --git a/src/canonical/dex/front/Darumaka.png b/src/canonical/dex/front/554--0--Darumaka.png similarity index 100% rename from src/canonical/dex/front/Darumaka.png rename to src/canonical/dex/front/554--0--Darumaka.png diff --git a/src/canonical/dex/front/Darmanitan.png b/src/canonical/dex/front/555--0--Darmanitan.png similarity index 100% rename from src/canonical/dex/front/Darmanitan.png rename to src/canonical/dex/front/555--0--Darmanitan.png diff --git a/src/canonical/dex/front/Darmanitan--Zen.png b/src/canonical/dex/front/555--420--Darmanitan--Zen.png similarity index 100% rename from src/canonical/dex/front/Darmanitan--Zen.png rename to src/canonical/dex/front/555--420--Darmanitan--Zen.png diff --git a/src/canonical/dex/front/Maractus.png b/src/canonical/dex/front/556--0--Maractus.png similarity index 100% rename from src/canonical/dex/front/Maractus.png rename to src/canonical/dex/front/556--0--Maractus.png diff --git a/src/canonical/dex/front/Dwebble.png b/src/canonical/dex/front/557--0--Dwebble.png similarity index 100% rename from src/canonical/dex/front/Dwebble.png rename to src/canonical/dex/front/557--0--Dwebble.png diff --git a/src/canonical/dex/front/Crustle.png b/src/canonical/dex/front/558--0--Crustle.png similarity index 100% rename from src/canonical/dex/front/Crustle.png rename to src/canonical/dex/front/558--0--Crustle.png diff --git a/src/canonical/dex/front/Scraggy.png b/src/canonical/dex/front/559--0--Scraggy.png similarity index 100% rename from src/canonical/dex/front/Scraggy.png rename to src/canonical/dex/front/559--0--Scraggy.png diff --git a/src/canonical/dex/front/Mankey.png b/src/canonical/dex/front/56--0--Mankey.png similarity index 100% rename from src/canonical/dex/front/Mankey.png rename to src/canonical/dex/front/56--0--Mankey.png diff --git a/src/canonical/dex/front/Scrafty.png b/src/canonical/dex/front/560--0--Scrafty.png similarity index 100% rename from src/canonical/dex/front/Scrafty.png rename to src/canonical/dex/front/560--0--Scrafty.png diff --git a/src/canonical/dex/front/Sigilyph.png b/src/canonical/dex/front/561--0--Sigilyph.png similarity index 100% rename from src/canonical/dex/front/Sigilyph.png rename to src/canonical/dex/front/561--0--Sigilyph.png diff --git a/src/canonical/dex/front/Yamask.png b/src/canonical/dex/front/562--0--Yamask.png similarity index 100% rename from src/canonical/dex/front/Yamask.png rename to src/canonical/dex/front/562--0--Yamask.png diff --git a/src/canonical/dex/front/Cofagrigus.png b/src/canonical/dex/front/563--0--Cofagrigus.png similarity index 100% rename from src/canonical/dex/front/Cofagrigus.png rename to src/canonical/dex/front/563--0--Cofagrigus.png diff --git a/src/canonical/dex/front/Tirtouga.png b/src/canonical/dex/front/564--0--Tirtouga.png similarity index 100% rename from src/canonical/dex/front/Tirtouga.png rename to src/canonical/dex/front/564--0--Tirtouga.png diff --git a/src/canonical/dex/front/Carracosta.png b/src/canonical/dex/front/565--0--Carracosta.png similarity index 100% rename from src/canonical/dex/front/Carracosta.png rename to src/canonical/dex/front/565--0--Carracosta.png diff --git a/src/canonical/dex/front/Archen.png b/src/canonical/dex/front/566--0--Archen.png similarity index 100% rename from src/canonical/dex/front/Archen.png rename to src/canonical/dex/front/566--0--Archen.png diff --git a/src/canonical/dex/front/Archeops.png b/src/canonical/dex/front/567--0--Archeops.png similarity index 100% rename from src/canonical/dex/front/Archeops.png rename to src/canonical/dex/front/567--0--Archeops.png diff --git a/src/canonical/dex/front/Trubbish.png b/src/canonical/dex/front/568--0--Trubbish.png similarity index 100% rename from src/canonical/dex/front/Trubbish.png rename to src/canonical/dex/front/568--0--Trubbish.png diff --git a/src/canonical/dex/front/Garbodor.png b/src/canonical/dex/front/569--0--Garbodor.png similarity index 100% rename from src/canonical/dex/front/Garbodor.png rename to src/canonical/dex/front/569--0--Garbodor.png diff --git a/src/canonical/dex/front/Primeape.png b/src/canonical/dex/front/57--0--Primeape.png similarity index 100% rename from src/canonical/dex/front/Primeape.png rename to src/canonical/dex/front/57--0--Primeape.png diff --git a/src/canonical/dex/front/Zorua.png b/src/canonical/dex/front/570--0--Zorua.png similarity index 100% rename from src/canonical/dex/front/Zorua.png rename to src/canonical/dex/front/570--0--Zorua.png diff --git a/src/canonical/dex/front/Zoroark.png b/src/canonical/dex/front/571--0--Zoroark.png similarity index 100% rename from src/canonical/dex/front/Zoroark.png rename to src/canonical/dex/front/571--0--Zoroark.png diff --git a/src/canonical/dex/front/Minccino.png b/src/canonical/dex/front/572--0--Minccino.png similarity index 100% rename from src/canonical/dex/front/Minccino.png rename to src/canonical/dex/front/572--0--Minccino.png diff --git a/src/canonical/dex/front/Cinccino.png b/src/canonical/dex/front/573--0--Cinccino.png similarity index 100% rename from src/canonical/dex/front/Cinccino.png rename to src/canonical/dex/front/573--0--Cinccino.png diff --git a/src/canonical/dex/front/Gothita.png b/src/canonical/dex/front/574--0--Gothita.png similarity index 100% rename from src/canonical/dex/front/Gothita.png rename to src/canonical/dex/front/574--0--Gothita.png diff --git a/src/canonical/dex/front/Gothorita.png b/src/canonical/dex/front/575--0--Gothorita.png similarity index 100% rename from src/canonical/dex/front/Gothorita.png rename to src/canonical/dex/front/575--0--Gothorita.png diff --git a/src/canonical/dex/front/Gothitelle.png b/src/canonical/dex/front/576--0--Gothitelle.png similarity index 100% rename from src/canonical/dex/front/Gothitelle.png rename to src/canonical/dex/front/576--0--Gothitelle.png diff --git a/src/canonical/dex/front/Solosis.png b/src/canonical/dex/front/577--0--Solosis.png similarity index 100% rename from src/canonical/dex/front/Solosis.png rename to src/canonical/dex/front/577--0--Solosis.png diff --git a/src/canonical/dex/front/Duosion.png b/src/canonical/dex/front/578--0--Duosion.png similarity index 100% rename from src/canonical/dex/front/Duosion.png rename to src/canonical/dex/front/578--0--Duosion.png diff --git a/src/canonical/dex/front/Reuniclus.png b/src/canonical/dex/front/579--0--Reuniclus.png similarity index 100% rename from src/canonical/dex/front/Reuniclus.png rename to src/canonical/dex/front/579--0--Reuniclus.png diff --git a/src/canonical/dex/front/Growlithe.png b/src/canonical/dex/front/58--0--Growlithe.png similarity index 100% rename from src/canonical/dex/front/Growlithe.png rename to src/canonical/dex/front/58--0--Growlithe.png diff --git a/src/canonical/dex/front/Ducklett.png b/src/canonical/dex/front/580--0--Ducklett.png similarity index 100% rename from src/canonical/dex/front/Ducklett.png rename to src/canonical/dex/front/580--0--Ducklett.png diff --git a/src/canonical/dex/front/Swanna.png b/src/canonical/dex/front/581--0--Swanna.png similarity index 100% rename from src/canonical/dex/front/Swanna.png rename to src/canonical/dex/front/581--0--Swanna.png diff --git a/src/canonical/dex/front/Vanillite.png b/src/canonical/dex/front/582--0--Vanillite.png similarity index 100% rename from src/canonical/dex/front/Vanillite.png rename to src/canonical/dex/front/582--0--Vanillite.png diff --git a/src/canonical/dex/front/Vanillish.png b/src/canonical/dex/front/583--0--Vanillish.png similarity index 100% rename from src/canonical/dex/front/Vanillish.png rename to src/canonical/dex/front/583--0--Vanillish.png diff --git a/src/canonical/dex/front/Vanilluxe.png b/src/canonical/dex/front/584--0--Vanilluxe.png similarity index 100% rename from src/canonical/dex/front/Vanilluxe.png rename to src/canonical/dex/front/584--0--Vanilluxe.png diff --git a/src/canonical/dex/front/Deerling.png b/src/canonical/dex/front/585--0--Deerling.png similarity index 100% rename from src/canonical/dex/front/Deerling.png rename to src/canonical/dex/front/585--0--Deerling.png diff --git a/src/canonical/dex/front/Sawsbuck.png b/src/canonical/dex/front/586--0--Sawsbuck.png similarity index 100% rename from src/canonical/dex/front/Sawsbuck.png rename to src/canonical/dex/front/586--0--Sawsbuck.png diff --git a/src/canonical/dex/front/Emolga.png b/src/canonical/dex/front/587--0--Emolga.png similarity index 100% rename from src/canonical/dex/front/Emolga.png rename to src/canonical/dex/front/587--0--Emolga.png diff --git a/src/canonical/dex/front/Karrablast.png b/src/canonical/dex/front/588--0--Karrablast.png similarity index 100% rename from src/canonical/dex/front/Karrablast.png rename to src/canonical/dex/front/588--0--Karrablast.png diff --git a/src/canonical/dex/front/Escavalier.png b/src/canonical/dex/front/589--0--Escavalier.png similarity index 100% rename from src/canonical/dex/front/Escavalier.png rename to src/canonical/dex/front/589--0--Escavalier.png diff --git a/src/canonical/dex/front/Arcanine.png b/src/canonical/dex/front/59--0--Arcanine.png similarity index 100% rename from src/canonical/dex/front/Arcanine.png rename to src/canonical/dex/front/59--0--Arcanine.png diff --git a/src/canonical/dex/front/Foongus.png b/src/canonical/dex/front/590--0--Foongus.png similarity index 100% rename from src/canonical/dex/front/Foongus.png rename to src/canonical/dex/front/590--0--Foongus.png diff --git a/src/canonical/dex/front/Amoonguss.png b/src/canonical/dex/front/591--0--Amoonguss.png similarity index 100% rename from src/canonical/dex/front/Amoonguss.png rename to src/canonical/dex/front/591--0--Amoonguss.png diff --git a/src/canonical/dex/front/Frillish.png b/src/canonical/dex/front/592--0--Frillish.png similarity index 100% rename from src/canonical/dex/front/Frillish.png rename to src/canonical/dex/front/592--0--Frillish.png diff --git a/src/canonical/dex/front/Jellicent.png b/src/canonical/dex/front/593--0--Jellicent.png similarity index 100% rename from src/canonical/dex/front/Jellicent.png rename to src/canonical/dex/front/593--0--Jellicent.png diff --git a/src/canonical/dex/front/Alomomola.png b/src/canonical/dex/front/594--0--Alomomola.png similarity index 100% rename from src/canonical/dex/front/Alomomola.png rename to src/canonical/dex/front/594--0--Alomomola.png diff --git a/src/canonical/dex/front/Joltik.png b/src/canonical/dex/front/595--0--Joltik.png similarity index 100% rename from src/canonical/dex/front/Joltik.png rename to src/canonical/dex/front/595--0--Joltik.png diff --git a/src/canonical/dex/front/Galvantula.png b/src/canonical/dex/front/596--0--Galvantula.png similarity index 100% rename from src/canonical/dex/front/Galvantula.png rename to src/canonical/dex/front/596--0--Galvantula.png diff --git a/src/canonical/dex/front/Ferroseed.png b/src/canonical/dex/front/597--0--Ferroseed.png similarity index 100% rename from src/canonical/dex/front/Ferroseed.png rename to src/canonical/dex/front/597--0--Ferroseed.png diff --git a/src/canonical/dex/front/Ferrothorn.png b/src/canonical/dex/front/598--0--Ferrothorn.png similarity index 100% rename from src/canonical/dex/front/Ferrothorn.png rename to src/canonical/dex/front/598--0--Ferrothorn.png diff --git a/src/canonical/dex/front/Klink.png b/src/canonical/dex/front/599--0--Klink.png similarity index 100% rename from src/canonical/dex/front/Klink.png rename to src/canonical/dex/front/599--0--Klink.png diff --git a/src/canonical/dex/front/Charizard.png b/src/canonical/dex/front/6--0--Charizard.png similarity index 100% rename from src/canonical/dex/front/Charizard.png rename to src/canonical/dex/front/6--0--Charizard.png diff --git a/src/canonical/dex/front/Charizard--Mega-X.png b/src/canonical/dex/front/6--420--Charizard--Mega-X.png similarity index 100% rename from src/canonical/dex/front/Charizard--Mega-X.png rename to src/canonical/dex/front/6--420--Charizard--Mega-X.png diff --git a/src/canonical/dex/front/Charizard--Mega-Y.png b/src/canonical/dex/front/6--420--Charizard--Mega-Y.png similarity index 100% rename from src/canonical/dex/front/Charizard--Mega-Y.png rename to src/canonical/dex/front/6--420--Charizard--Mega-Y.png diff --git a/src/canonical/dex/front/Poliwag.png b/src/canonical/dex/front/60--0--Poliwag.png similarity index 100% rename from src/canonical/dex/front/Poliwag.png rename to src/canonical/dex/front/60--0--Poliwag.png diff --git a/src/canonical/dex/front/Klang.png b/src/canonical/dex/front/600--0--Klang.png similarity index 100% rename from src/canonical/dex/front/Klang.png rename to src/canonical/dex/front/600--0--Klang.png diff --git a/src/canonical/dex/front/Klinklang.png b/src/canonical/dex/front/601--0--Klinklang.png similarity index 100% rename from src/canonical/dex/front/Klinklang.png rename to src/canonical/dex/front/601--0--Klinklang.png diff --git a/src/canonical/dex/front/Tynamo.png b/src/canonical/dex/front/602--0--Tynamo.png similarity index 100% rename from src/canonical/dex/front/Tynamo.png rename to src/canonical/dex/front/602--0--Tynamo.png diff --git a/src/canonical/dex/front/Eelektrik.png b/src/canonical/dex/front/603--0--Eelektrik.png similarity index 100% rename from src/canonical/dex/front/Eelektrik.png rename to src/canonical/dex/front/603--0--Eelektrik.png diff --git a/src/canonical/dex/front/Eelektross.png b/src/canonical/dex/front/604--0--Eelektross.png similarity index 100% rename from src/canonical/dex/front/Eelektross.png rename to src/canonical/dex/front/604--0--Eelektross.png diff --git a/src/canonical/dex/front/Elgyem.png b/src/canonical/dex/front/605--0--Elgyem.png similarity index 100% rename from src/canonical/dex/front/Elgyem.png rename to src/canonical/dex/front/605--0--Elgyem.png diff --git a/src/canonical/dex/front/Beheeyem.png b/src/canonical/dex/front/606--0--Beheeyem.png similarity index 100% rename from src/canonical/dex/front/Beheeyem.png rename to src/canonical/dex/front/606--0--Beheeyem.png diff --git a/src/canonical/dex/front/Litwick.png b/src/canonical/dex/front/607--0--Litwick.png similarity index 100% rename from src/canonical/dex/front/Litwick.png rename to src/canonical/dex/front/607--0--Litwick.png diff --git a/src/canonical/dex/front/Lampent.png b/src/canonical/dex/front/608--0--Lampent.png similarity index 100% rename from src/canonical/dex/front/Lampent.png rename to src/canonical/dex/front/608--0--Lampent.png diff --git a/src/canonical/dex/front/Chandelure.png b/src/canonical/dex/front/609--0--Chandelure.png similarity index 100% rename from src/canonical/dex/front/Chandelure.png rename to src/canonical/dex/front/609--0--Chandelure.png diff --git a/src/canonical/dex/front/Poliwhirl.png b/src/canonical/dex/front/61--0--Poliwhirl.png similarity index 100% rename from src/canonical/dex/front/Poliwhirl.png rename to src/canonical/dex/front/61--0--Poliwhirl.png diff --git a/src/canonical/dex/front/Axew.png b/src/canonical/dex/front/610--0--Axew.png similarity index 100% rename from src/canonical/dex/front/Axew.png rename to src/canonical/dex/front/610--0--Axew.png diff --git a/src/canonical/dex/front/Fraxure.png b/src/canonical/dex/front/611--0--Fraxure.png similarity index 100% rename from src/canonical/dex/front/Fraxure.png rename to src/canonical/dex/front/611--0--Fraxure.png diff --git a/src/canonical/dex/front/Haxorus.png b/src/canonical/dex/front/612--0--Haxorus.png similarity index 100% rename from src/canonical/dex/front/Haxorus.png rename to src/canonical/dex/front/612--0--Haxorus.png diff --git a/src/canonical/dex/front/Cubchoo.png b/src/canonical/dex/front/613--0--Cubchoo.png similarity index 100% rename from src/canonical/dex/front/Cubchoo.png rename to src/canonical/dex/front/613--0--Cubchoo.png diff --git a/src/canonical/dex/front/Beartic.png b/src/canonical/dex/front/614--0--Beartic.png similarity index 100% rename from src/canonical/dex/front/Beartic.png rename to src/canonical/dex/front/614--0--Beartic.png diff --git a/src/canonical/dex/front/Cryogonal.png b/src/canonical/dex/front/615--0--Cryogonal.png similarity index 100% rename from src/canonical/dex/front/Cryogonal.png rename to src/canonical/dex/front/615--0--Cryogonal.png diff --git a/src/canonical/dex/front/Shelmet.png b/src/canonical/dex/front/616--0--Shelmet.png similarity index 100% rename from src/canonical/dex/front/Shelmet.png rename to src/canonical/dex/front/616--0--Shelmet.png diff --git a/src/canonical/dex/front/Accelgor.png b/src/canonical/dex/front/617--0--Accelgor.png similarity index 100% rename from src/canonical/dex/front/Accelgor.png rename to src/canonical/dex/front/617--0--Accelgor.png diff --git a/src/canonical/dex/front/Stunfisk.png b/src/canonical/dex/front/618--0--Stunfisk.png similarity index 100% rename from src/canonical/dex/front/Stunfisk.png rename to src/canonical/dex/front/618--0--Stunfisk.png diff --git a/src/canonical/dex/front/Mienfoo.png b/src/canonical/dex/front/619--0--Mienfoo.png similarity index 100% rename from src/canonical/dex/front/Mienfoo.png rename to src/canonical/dex/front/619--0--Mienfoo.png diff --git a/src/canonical/dex/front/Poliwrath.png b/src/canonical/dex/front/62--0--Poliwrath.png similarity index 100% rename from src/canonical/dex/front/Poliwrath.png rename to src/canonical/dex/front/62--0--Poliwrath.png diff --git a/src/canonical/dex/front/Mienshao.png b/src/canonical/dex/front/620--0--Mienshao.png similarity index 100% rename from src/canonical/dex/front/Mienshao.png rename to src/canonical/dex/front/620--0--Mienshao.png diff --git a/src/canonical/dex/front/Druddigon.png b/src/canonical/dex/front/621--0--Druddigon.png similarity index 100% rename from src/canonical/dex/front/Druddigon.png rename to src/canonical/dex/front/621--0--Druddigon.png diff --git a/src/canonical/dex/front/Golett.png b/src/canonical/dex/front/622--0--Golett.png similarity index 100% rename from src/canonical/dex/front/Golett.png rename to src/canonical/dex/front/622--0--Golett.png diff --git a/src/canonical/dex/front/Golurk.png b/src/canonical/dex/front/623--0--Golurk.png similarity index 100% rename from src/canonical/dex/front/Golurk.png rename to src/canonical/dex/front/623--0--Golurk.png diff --git a/src/canonical/dex/front/Pawniard.png b/src/canonical/dex/front/624--0--Pawniard.png similarity index 100% rename from src/canonical/dex/front/Pawniard.png rename to src/canonical/dex/front/624--0--Pawniard.png diff --git a/src/canonical/dex/front/Bisharp.png b/src/canonical/dex/front/625--0--Bisharp.png similarity index 100% rename from src/canonical/dex/front/Bisharp.png rename to src/canonical/dex/front/625--0--Bisharp.png diff --git a/src/canonical/dex/front/Bouffalant.png b/src/canonical/dex/front/626--0--Bouffalant.png similarity index 100% rename from src/canonical/dex/front/Bouffalant.png rename to src/canonical/dex/front/626--0--Bouffalant.png diff --git a/src/canonical/dex/front/Rufflet.png b/src/canonical/dex/front/627--0--Rufflet.png similarity index 100% rename from src/canonical/dex/front/Rufflet.png rename to src/canonical/dex/front/627--0--Rufflet.png diff --git a/src/canonical/dex/front/Braviary.png b/src/canonical/dex/front/628--0--Braviary.png similarity index 100% rename from src/canonical/dex/front/Braviary.png rename to src/canonical/dex/front/628--0--Braviary.png diff --git a/src/canonical/dex/front/Vullaby.png b/src/canonical/dex/front/629--0--Vullaby.png similarity index 100% rename from src/canonical/dex/front/Vullaby.png rename to src/canonical/dex/front/629--0--Vullaby.png diff --git a/src/canonical/dex/front/Abra.png b/src/canonical/dex/front/63--0--Abra.png similarity index 100% rename from src/canonical/dex/front/Abra.png rename to src/canonical/dex/front/63--0--Abra.png diff --git a/src/canonical/dex/front/Mandibuzz.png b/src/canonical/dex/front/630--0--Mandibuzz.png similarity index 100% rename from src/canonical/dex/front/Mandibuzz.png rename to src/canonical/dex/front/630--0--Mandibuzz.png diff --git a/src/canonical/dex/front/Heatmor.png b/src/canonical/dex/front/631--0--Heatmor.png similarity index 100% rename from src/canonical/dex/front/Heatmor.png rename to src/canonical/dex/front/631--0--Heatmor.png diff --git a/src/canonical/dex/front/Durant.png b/src/canonical/dex/front/632--0--Durant.png similarity index 100% rename from src/canonical/dex/front/Durant.png rename to src/canonical/dex/front/632--0--Durant.png diff --git a/src/canonical/dex/front/Deino.png b/src/canonical/dex/front/633--0--Deino.png similarity index 100% rename from src/canonical/dex/front/Deino.png rename to src/canonical/dex/front/633--0--Deino.png diff --git a/src/canonical/dex/front/Zweilous.png b/src/canonical/dex/front/634--0--Zweilous.png similarity index 100% rename from src/canonical/dex/front/Zweilous.png rename to src/canonical/dex/front/634--0--Zweilous.png diff --git a/src/canonical/dex/front/Hydreigon.png b/src/canonical/dex/front/635--0--Hydreigon.png similarity index 100% rename from src/canonical/dex/front/Hydreigon.png rename to src/canonical/dex/front/635--0--Hydreigon.png diff --git a/src/canonical/dex/front/Larvesta.png b/src/canonical/dex/front/636--0--Larvesta.png similarity index 100% rename from src/canonical/dex/front/Larvesta.png rename to src/canonical/dex/front/636--0--Larvesta.png diff --git a/src/canonical/dex/front/Volcarona.png b/src/canonical/dex/front/637--0--Volcarona.png similarity index 100% rename from src/canonical/dex/front/Volcarona.png rename to src/canonical/dex/front/637--0--Volcarona.png diff --git a/src/canonical/dex/front/Cobalion.png b/src/canonical/dex/front/638--0--Cobalion.png similarity index 100% rename from src/canonical/dex/front/Cobalion.png rename to src/canonical/dex/front/638--0--Cobalion.png diff --git a/src/canonical/dex/front/Terrakion.png b/src/canonical/dex/front/639--0--Terrakion.png similarity index 100% rename from src/canonical/dex/front/Terrakion.png rename to src/canonical/dex/front/639--0--Terrakion.png diff --git a/src/canonical/dex/front/Kadabra.png b/src/canonical/dex/front/64--0--Kadabra.png similarity index 100% rename from src/canonical/dex/front/Kadabra.png rename to src/canonical/dex/front/64--0--Kadabra.png diff --git a/src/canonical/dex/front/Virizion.png b/src/canonical/dex/front/640--0--Virizion.png similarity index 100% rename from src/canonical/dex/front/Virizion.png rename to src/canonical/dex/front/640--0--Virizion.png diff --git a/src/canonical/dex/front/Tornadus.png b/src/canonical/dex/front/641--0--Tornadus.png similarity index 100% rename from src/canonical/dex/front/Tornadus.png rename to src/canonical/dex/front/641--0--Tornadus.png diff --git a/src/canonical/dex/front/Tornadus--Therian.png b/src/canonical/dex/front/641--420--Tornadus--Therian.png similarity index 100% rename from src/canonical/dex/front/Tornadus--Therian.png rename to src/canonical/dex/front/641--420--Tornadus--Therian.png diff --git a/src/canonical/dex/front/Thundurus.png b/src/canonical/dex/front/642--0--Thundurus.png similarity index 100% rename from src/canonical/dex/front/Thundurus.png rename to src/canonical/dex/front/642--0--Thundurus.png diff --git a/src/canonical/dex/front/Thundurus--Therian.png b/src/canonical/dex/front/642--420--Thundurus--Therian.png similarity index 100% rename from src/canonical/dex/front/Thundurus--Therian.png rename to src/canonical/dex/front/642--420--Thundurus--Therian.png diff --git a/src/canonical/dex/front/Reshiram.png b/src/canonical/dex/front/643--0--Reshiram.png similarity index 100% rename from src/canonical/dex/front/Reshiram.png rename to src/canonical/dex/front/643--0--Reshiram.png diff --git a/src/canonical/dex/front/Zekrom.png b/src/canonical/dex/front/644--0--Zekrom.png similarity index 100% rename from src/canonical/dex/front/Zekrom.png rename to src/canonical/dex/front/644--0--Zekrom.png diff --git a/src/canonical/dex/front/Landorus.png b/src/canonical/dex/front/645--0--Landorus.png similarity index 100% rename from src/canonical/dex/front/Landorus.png rename to src/canonical/dex/front/645--0--Landorus.png diff --git a/src/canonical/dex/front/Landorus--Therian.png b/src/canonical/dex/front/645--420--Landorus--Therian.png similarity index 100% rename from src/canonical/dex/front/Landorus--Therian.png rename to src/canonical/dex/front/645--420--Landorus--Therian.png diff --git a/src/canonical/dex/front/Kyurem.png b/src/canonical/dex/front/646--0--Kyurem.png similarity index 100% rename from src/canonical/dex/front/Kyurem.png rename to src/canonical/dex/front/646--0--Kyurem.png diff --git a/src/canonical/dex/front/Kyurem--Black.png b/src/canonical/dex/front/646--420--Kyurem--Black.png similarity index 100% rename from src/canonical/dex/front/Kyurem--Black.png rename to src/canonical/dex/front/646--420--Kyurem--Black.png diff --git a/src/canonical/dex/front/Kyurem--White.png b/src/canonical/dex/front/646--420--Kyurem--White.png similarity index 100% rename from src/canonical/dex/front/Kyurem--White.png rename to src/canonical/dex/front/646--420--Kyurem--White.png diff --git a/src/canonical/dex/front/Keldeo.png b/src/canonical/dex/front/647--0--Keldeo.png similarity index 100% rename from src/canonical/dex/front/Keldeo.png rename to src/canonical/dex/front/647--0--Keldeo.png diff --git a/src/canonical/dex/front/Keldeo--Resolute.png b/src/canonical/dex/front/647--420--Keldeo--Resolute.png similarity index 100% rename from src/canonical/dex/front/Keldeo--Resolute.png rename to src/canonical/dex/front/647--420--Keldeo--Resolute.png diff --git a/src/canonical/dex/front/Meloetta.png b/src/canonical/dex/front/648--0--Meloetta.png similarity index 100% rename from src/canonical/dex/front/Meloetta.png rename to src/canonical/dex/front/648--0--Meloetta.png diff --git a/src/canonical/dex/front/Meloetta--Pirouette.png b/src/canonical/dex/front/648--420--Meloetta--Pirouette.png similarity index 100% rename from src/canonical/dex/front/Meloetta--Pirouette.png rename to src/canonical/dex/front/648--420--Meloetta--Pirouette.png diff --git a/src/canonical/dex/front/Genesect.png b/src/canonical/dex/front/649--0--Genesect.png similarity index 100% rename from src/canonical/dex/front/Genesect.png rename to src/canonical/dex/front/649--0--Genesect.png diff --git a/src/canonical/dex/front/Genesect--Burn.png b/src/canonical/dex/front/649--420--Genesect--Burn.png similarity index 100% rename from src/canonical/dex/front/Genesect--Burn.png rename to src/canonical/dex/front/649--420--Genesect--Burn.png diff --git a/src/canonical/dex/front/Genesect--Chill.png b/src/canonical/dex/front/649--420--Genesect--Chill.png similarity index 100% rename from src/canonical/dex/front/Genesect--Chill.png rename to src/canonical/dex/front/649--420--Genesect--Chill.png diff --git a/src/canonical/dex/front/Genesect--Douse.png b/src/canonical/dex/front/649--420--Genesect--Douse.png similarity index 100% rename from src/canonical/dex/front/Genesect--Douse.png rename to src/canonical/dex/front/649--420--Genesect--Douse.png diff --git a/src/canonical/dex/front/Genesect--Shock.png b/src/canonical/dex/front/649--420--Genesect--Shock.png similarity index 100% rename from src/canonical/dex/front/Genesect--Shock.png rename to src/canonical/dex/front/649--420--Genesect--Shock.png diff --git a/src/canonical/dex/front/Alakazam.png b/src/canonical/dex/front/65--0--Alakazam.png similarity index 100% rename from src/canonical/dex/front/Alakazam.png rename to src/canonical/dex/front/65--0--Alakazam.png diff --git a/src/canonical/dex/front/Alakazam--Mega.png b/src/canonical/dex/front/65--420--Alakazam--Mega.png similarity index 100% rename from src/canonical/dex/front/Alakazam--Mega.png rename to src/canonical/dex/front/65--420--Alakazam--Mega.png diff --git a/src/canonical/dex/front/Chespin.png b/src/canonical/dex/front/650--0--Chespin.png similarity index 100% rename from src/canonical/dex/front/Chespin.png rename to src/canonical/dex/front/650--0--Chespin.png diff --git a/src/canonical/dex/front/Quilladin.png b/src/canonical/dex/front/651--0--Quilladin.png similarity index 100% rename from src/canonical/dex/front/Quilladin.png rename to src/canonical/dex/front/651--0--Quilladin.png diff --git a/src/canonical/dex/front/Chesnaught.png b/src/canonical/dex/front/652--0--Chesnaught.png similarity index 100% rename from src/canonical/dex/front/Chesnaught.png rename to src/canonical/dex/front/652--0--Chesnaught.png diff --git a/src/canonical/dex/front/Fennekin.png b/src/canonical/dex/front/653--0--Fennekin.png similarity index 100% rename from src/canonical/dex/front/Fennekin.png rename to src/canonical/dex/front/653--0--Fennekin.png diff --git a/src/canonical/dex/front/Braixen.png b/src/canonical/dex/front/654--0--Braixen.png similarity index 100% rename from src/canonical/dex/front/Braixen.png rename to src/canonical/dex/front/654--0--Braixen.png diff --git a/src/canonical/dex/front/Delphox.png b/src/canonical/dex/front/655--0--Delphox.png similarity index 100% rename from src/canonical/dex/front/Delphox.png rename to src/canonical/dex/front/655--0--Delphox.png diff --git a/src/canonical/dex/front/Froakie.png b/src/canonical/dex/front/656--0--Froakie.png similarity index 100% rename from src/canonical/dex/front/Froakie.png rename to src/canonical/dex/front/656--0--Froakie.png diff --git a/src/canonical/dex/front/Frogadier.png b/src/canonical/dex/front/657--0--Frogadier.png similarity index 100% rename from src/canonical/dex/front/Frogadier.png rename to src/canonical/dex/front/657--0--Frogadier.png diff --git a/src/canonical/dex/front/Greninja.png b/src/canonical/dex/front/658--0--Greninja.png similarity index 100% rename from src/canonical/dex/front/Greninja.png rename to src/canonical/dex/front/658--0--Greninja.png diff --git a/src/canonical/dex/front/Greninja--Ash.png b/src/canonical/dex/front/658--420--Greninja--Ash.png similarity index 100% rename from src/canonical/dex/front/Greninja--Ash.png rename to src/canonical/dex/front/658--420--Greninja--Ash.png diff --git a/src/canonical/dex/front/Bunnelby.png b/src/canonical/dex/front/659--0--Bunnelby.png similarity index 100% rename from src/canonical/dex/front/Bunnelby.png rename to src/canonical/dex/front/659--0--Bunnelby.png diff --git a/src/canonical/dex/front/Machop.png b/src/canonical/dex/front/66--0--Machop.png similarity index 100% rename from src/canonical/dex/front/Machop.png rename to src/canonical/dex/front/66--0--Machop.png diff --git a/src/canonical/dex/front/Diggersby.png b/src/canonical/dex/front/660--0--Diggersby.png similarity index 100% rename from src/canonical/dex/front/Diggersby.png rename to src/canonical/dex/front/660--0--Diggersby.png diff --git a/src/canonical/dex/front/Fletchling.png b/src/canonical/dex/front/661--0--Fletchling.png similarity index 100% rename from src/canonical/dex/front/Fletchling.png rename to src/canonical/dex/front/661--0--Fletchling.png diff --git a/src/canonical/dex/front/Fletchinder.png b/src/canonical/dex/front/662--0--Fletchinder.png similarity index 100% rename from src/canonical/dex/front/Fletchinder.png rename to src/canonical/dex/front/662--0--Fletchinder.png diff --git a/src/canonical/dex/front/Talonflame.png b/src/canonical/dex/front/663--0--Talonflame.png similarity index 100% rename from src/canonical/dex/front/Talonflame.png rename to src/canonical/dex/front/663--0--Talonflame.png diff --git a/src/canonical/dex/front/Scatterbug.png b/src/canonical/dex/front/664--0--Scatterbug.png similarity index 100% rename from src/canonical/dex/front/Scatterbug.png rename to src/canonical/dex/front/664--0--Scatterbug.png diff --git a/src/canonical/dex/front/Spewpa.png b/src/canonical/dex/front/665--0--Spewpa.png similarity index 100% rename from src/canonical/dex/front/Spewpa.png rename to src/canonical/dex/front/665--0--Spewpa.png diff --git a/src/canonical/dex/front/Vivillon.png b/src/canonical/dex/front/666--0--Vivillon.png similarity index 100% rename from src/canonical/dex/front/Vivillon.png rename to src/canonical/dex/front/666--0--Vivillon.png diff --git a/src/canonical/dex/front/Vivillon--Fancy.png b/src/canonical/dex/front/666--420--Vivillon--Fancy.png similarity index 100% rename from src/canonical/dex/front/Vivillon--Fancy.png rename to src/canonical/dex/front/666--420--Vivillon--Fancy.png diff --git a/src/canonical/dex/front/Vivillon--Pokeball.png b/src/canonical/dex/front/666--420--Vivillon--Pokeball.png similarity index 100% rename from src/canonical/dex/front/Vivillon--Pokeball.png rename to src/canonical/dex/front/666--420--Vivillon--Pokeball.png diff --git a/src/canonical/dex/front/Litleo.png b/src/canonical/dex/front/667--0--Litleo.png similarity index 100% rename from src/canonical/dex/front/Litleo.png rename to src/canonical/dex/front/667--0--Litleo.png diff --git a/src/canonical/dex/front/Pyroar.png b/src/canonical/dex/front/668--0--Pyroar.png similarity index 100% rename from src/canonical/dex/front/Pyroar.png rename to src/canonical/dex/front/668--0--Pyroar.png diff --git a/src/canonical/dex/front/Flabe__0301be__0301.png b/src/canonical/dex/front/669--0--Flabe__0301be__0301.png similarity index 100% rename from src/canonical/dex/front/Flabe__0301be__0301.png rename to src/canonical/dex/front/669--0--Flabe__0301be__0301.png diff --git a/src/canonical/dex/front/Machoke.png b/src/canonical/dex/front/67--0--Machoke.png similarity index 100% rename from src/canonical/dex/front/Machoke.png rename to src/canonical/dex/front/67--0--Machoke.png diff --git a/src/canonical/dex/front/Floette.png b/src/canonical/dex/front/670--0--Floette.png similarity index 100% rename from src/canonical/dex/front/Floette.png rename to src/canonical/dex/front/670--0--Floette.png diff --git a/src/canonical/dex/front/Floette--Eternal.png b/src/canonical/dex/front/670--420--Floette--Eternal.png similarity index 100% rename from src/canonical/dex/front/Floette--Eternal.png rename to src/canonical/dex/front/670--420--Floette--Eternal.png diff --git a/src/canonical/dex/front/Florges.png b/src/canonical/dex/front/671--0--Florges.png similarity index 100% rename from src/canonical/dex/front/Florges.png rename to src/canonical/dex/front/671--0--Florges.png diff --git a/src/canonical/dex/front/Skiddo.png b/src/canonical/dex/front/672--0--Skiddo.png similarity index 100% rename from src/canonical/dex/front/Skiddo.png rename to src/canonical/dex/front/672--0--Skiddo.png diff --git a/src/canonical/dex/front/Gogoat.png b/src/canonical/dex/front/673--0--Gogoat.png similarity index 100% rename from src/canonical/dex/front/Gogoat.png rename to src/canonical/dex/front/673--0--Gogoat.png diff --git a/src/canonical/dex/front/Pancham.png b/src/canonical/dex/front/674--0--Pancham.png similarity index 100% rename from src/canonical/dex/front/Pancham.png rename to src/canonical/dex/front/674--0--Pancham.png diff --git a/src/canonical/dex/front/Pangoro.png b/src/canonical/dex/front/675--0--Pangoro.png similarity index 100% rename from src/canonical/dex/front/Pangoro.png rename to src/canonical/dex/front/675--0--Pangoro.png diff --git a/src/canonical/dex/front/Furfrou.png b/src/canonical/dex/front/676--0--Furfrou.png similarity index 100% rename from src/canonical/dex/front/Furfrou.png rename to src/canonical/dex/front/676--0--Furfrou.png diff --git a/src/canonical/dex/front/Espurr.png b/src/canonical/dex/front/677--0--Espurr.png similarity index 100% rename from src/canonical/dex/front/Espurr.png rename to src/canonical/dex/front/677--0--Espurr.png diff --git a/src/canonical/dex/front/Meowstic.png b/src/canonical/dex/front/678--0--Meowstic.png similarity index 100% rename from src/canonical/dex/front/Meowstic.png rename to src/canonical/dex/front/678--0--Meowstic.png diff --git a/src/canonical/dex/front/Meowstic--F.png b/src/canonical/dex/front/678--420--Meowstic--F.png similarity index 100% rename from src/canonical/dex/front/Meowstic--F.png rename to src/canonical/dex/front/678--420--Meowstic--F.png diff --git a/src/canonical/dex/front/Honedge.png b/src/canonical/dex/front/679--0--Honedge.png similarity index 100% rename from src/canonical/dex/front/Honedge.png rename to src/canonical/dex/front/679--0--Honedge.png diff --git a/src/canonical/dex/front/Machamp.png b/src/canonical/dex/front/68--0--Machamp.png similarity index 100% rename from src/canonical/dex/front/Machamp.png rename to src/canonical/dex/front/68--0--Machamp.png diff --git a/src/canonical/dex/front/Doublade.png b/src/canonical/dex/front/680--0--Doublade.png similarity index 100% rename from src/canonical/dex/front/Doublade.png rename to src/canonical/dex/front/680--0--Doublade.png diff --git a/src/canonical/dex/front/Aegislash.png b/src/canonical/dex/front/681--0--Aegislash.png similarity index 100% rename from src/canonical/dex/front/Aegislash.png rename to src/canonical/dex/front/681--0--Aegislash.png diff --git a/src/canonical/dex/front/Aegislash--Blade.png b/src/canonical/dex/front/681--420--Aegislash--Blade.png similarity index 100% rename from src/canonical/dex/front/Aegislash--Blade.png rename to src/canonical/dex/front/681--420--Aegislash--Blade.png diff --git a/src/canonical/dex/front/Spritzee.png b/src/canonical/dex/front/682--0--Spritzee.png similarity index 100% rename from src/canonical/dex/front/Spritzee.png rename to src/canonical/dex/front/682--0--Spritzee.png diff --git a/src/canonical/dex/front/Aromatisse.png b/src/canonical/dex/front/683--0--Aromatisse.png similarity index 100% rename from src/canonical/dex/front/Aromatisse.png rename to src/canonical/dex/front/683--0--Aromatisse.png diff --git a/src/canonical/dex/front/Swirlix.png b/src/canonical/dex/front/684--0--Swirlix.png similarity index 100% rename from src/canonical/dex/front/Swirlix.png rename to src/canonical/dex/front/684--0--Swirlix.png diff --git a/src/canonical/dex/front/Slurpuff.png b/src/canonical/dex/front/685--0--Slurpuff.png similarity index 100% rename from src/canonical/dex/front/Slurpuff.png rename to src/canonical/dex/front/685--0--Slurpuff.png diff --git a/src/canonical/dex/front/Inkay.png b/src/canonical/dex/front/686--0--Inkay.png similarity index 100% rename from src/canonical/dex/front/Inkay.png rename to src/canonical/dex/front/686--0--Inkay.png diff --git a/src/canonical/dex/front/Malamar.png b/src/canonical/dex/front/687--0--Malamar.png similarity index 100% rename from src/canonical/dex/front/Malamar.png rename to src/canonical/dex/front/687--0--Malamar.png diff --git a/src/canonical/dex/front/Binacle.png b/src/canonical/dex/front/688--0--Binacle.png similarity index 100% rename from src/canonical/dex/front/Binacle.png rename to src/canonical/dex/front/688--0--Binacle.png diff --git a/src/canonical/dex/front/Barbaracle.png b/src/canonical/dex/front/689--0--Barbaracle.png similarity index 100% rename from src/canonical/dex/front/Barbaracle.png rename to src/canonical/dex/front/689--0--Barbaracle.png diff --git a/src/canonical/dex/front/Bellsprout.png b/src/canonical/dex/front/69--0--Bellsprout.png similarity index 100% rename from src/canonical/dex/front/Bellsprout.png rename to src/canonical/dex/front/69--0--Bellsprout.png diff --git a/src/canonical/dex/front/Skrelp.png b/src/canonical/dex/front/690--0--Skrelp.png similarity index 100% rename from src/canonical/dex/front/Skrelp.png rename to src/canonical/dex/front/690--0--Skrelp.png diff --git a/src/canonical/dex/front/Dragalge.png b/src/canonical/dex/front/691--0--Dragalge.png similarity index 100% rename from src/canonical/dex/front/Dragalge.png rename to src/canonical/dex/front/691--0--Dragalge.png diff --git a/src/canonical/dex/front/Clauncher.png b/src/canonical/dex/front/692--0--Clauncher.png similarity index 100% rename from src/canonical/dex/front/Clauncher.png rename to src/canonical/dex/front/692--0--Clauncher.png diff --git a/src/canonical/dex/front/Clawitzer.png b/src/canonical/dex/front/693--0--Clawitzer.png similarity index 100% rename from src/canonical/dex/front/Clawitzer.png rename to src/canonical/dex/front/693--0--Clawitzer.png diff --git a/src/canonical/dex/front/Helioptile.png b/src/canonical/dex/front/694--0--Helioptile.png similarity index 100% rename from src/canonical/dex/front/Helioptile.png rename to src/canonical/dex/front/694--0--Helioptile.png diff --git a/src/canonical/dex/front/Heliolisk.png b/src/canonical/dex/front/695--0--Heliolisk.png similarity index 100% rename from src/canonical/dex/front/Heliolisk.png rename to src/canonical/dex/front/695--0--Heliolisk.png diff --git a/src/canonical/dex/front/Tyrunt.png b/src/canonical/dex/front/696--0--Tyrunt.png similarity index 100% rename from src/canonical/dex/front/Tyrunt.png rename to src/canonical/dex/front/696--0--Tyrunt.png diff --git a/src/canonical/dex/front/Tyrantrum.png b/src/canonical/dex/front/697--0--Tyrantrum.png similarity index 100% rename from src/canonical/dex/front/Tyrantrum.png rename to src/canonical/dex/front/697--0--Tyrantrum.png diff --git a/src/canonical/dex/front/Amaura.png b/src/canonical/dex/front/698--0--Amaura.png similarity index 100% rename from src/canonical/dex/front/Amaura.png rename to src/canonical/dex/front/698--0--Amaura.png diff --git a/src/canonical/dex/front/Aurorus.png b/src/canonical/dex/front/699--0--Aurorus.png similarity index 100% rename from src/canonical/dex/front/Aurorus.png rename to src/canonical/dex/front/699--0--Aurorus.png diff --git a/src/canonical/dex/front/Squirtle.png b/src/canonical/dex/front/7--0--Squirtle.png similarity index 100% rename from src/canonical/dex/front/Squirtle.png rename to src/canonical/dex/front/7--0--Squirtle.png diff --git a/src/canonical/dex/front/Weepinbell.png b/src/canonical/dex/front/70--0--Weepinbell.png similarity index 100% rename from src/canonical/dex/front/Weepinbell.png rename to src/canonical/dex/front/70--0--Weepinbell.png diff --git a/src/canonical/dex/front/Sylveon.png b/src/canonical/dex/front/700--0--Sylveon.png similarity index 100% rename from src/canonical/dex/front/Sylveon.png rename to src/canonical/dex/front/700--0--Sylveon.png diff --git a/src/canonical/dex/front/Hawlucha.png b/src/canonical/dex/front/701--0--Hawlucha.png similarity index 100% rename from src/canonical/dex/front/Hawlucha.png rename to src/canonical/dex/front/701--0--Hawlucha.png diff --git a/src/canonical/dex/front/Dedenne.png b/src/canonical/dex/front/702--0--Dedenne.png similarity index 100% rename from src/canonical/dex/front/Dedenne.png rename to src/canonical/dex/front/702--0--Dedenne.png diff --git a/src/canonical/dex/front/Carbink.png b/src/canonical/dex/front/703--0--Carbink.png similarity index 100% rename from src/canonical/dex/front/Carbink.png rename to src/canonical/dex/front/703--0--Carbink.png diff --git a/src/canonical/dex/front/Goomy.png b/src/canonical/dex/front/704--0--Goomy.png similarity index 100% rename from src/canonical/dex/front/Goomy.png rename to src/canonical/dex/front/704--0--Goomy.png diff --git a/src/canonical/dex/front/Sliggoo.png b/src/canonical/dex/front/705--0--Sliggoo.png similarity index 100% rename from src/canonical/dex/front/Sliggoo.png rename to src/canonical/dex/front/705--0--Sliggoo.png diff --git a/src/canonical/dex/front/Goodra.png b/src/canonical/dex/front/706--0--Goodra.png similarity index 100% rename from src/canonical/dex/front/Goodra.png rename to src/canonical/dex/front/706--0--Goodra.png diff --git a/src/canonical/dex/front/Klefki.png b/src/canonical/dex/front/707--0--Klefki.png similarity index 100% rename from src/canonical/dex/front/Klefki.png rename to src/canonical/dex/front/707--0--Klefki.png diff --git a/src/canonical/dex/front/Phantump.png b/src/canonical/dex/front/708--0--Phantump.png similarity index 100% rename from src/canonical/dex/front/Phantump.png rename to src/canonical/dex/front/708--0--Phantump.png diff --git a/src/canonical/dex/front/Trevenant.png b/src/canonical/dex/front/709--0--Trevenant.png similarity index 100% rename from src/canonical/dex/front/Trevenant.png rename to src/canonical/dex/front/709--0--Trevenant.png diff --git a/src/canonical/dex/front/Victreebel.png b/src/canonical/dex/front/71--0--Victreebel.png similarity index 100% rename from src/canonical/dex/front/Victreebel.png rename to src/canonical/dex/front/71--0--Victreebel.png diff --git a/src/canonical/dex/front/Pumpkaboo.png b/src/canonical/dex/front/710--0--Pumpkaboo.png similarity index 100% rename from src/canonical/dex/front/Pumpkaboo.png rename to src/canonical/dex/front/710--0--Pumpkaboo.png diff --git a/src/canonical/dex/front/Pumpkaboo--Large.png b/src/canonical/dex/front/710--420--Pumpkaboo--Large.png similarity index 100% rename from src/canonical/dex/front/Pumpkaboo--Large.png rename to src/canonical/dex/front/710--420--Pumpkaboo--Large.png diff --git a/src/canonical/dex/front/Pumpkaboo--Small.png b/src/canonical/dex/front/710--420--Pumpkaboo--Small.png similarity index 100% rename from src/canonical/dex/front/Pumpkaboo--Small.png rename to src/canonical/dex/front/710--420--Pumpkaboo--Small.png diff --git a/src/canonical/dex/front/Pumpkaboo--Super.png b/src/canonical/dex/front/710--420--Pumpkaboo--Super.png similarity index 100% rename from src/canonical/dex/front/Pumpkaboo--Super.png rename to src/canonical/dex/front/710--420--Pumpkaboo--Super.png diff --git a/src/canonical/dex/front/Gourgeist.png b/src/canonical/dex/front/711--0--Gourgeist.png similarity index 100% rename from src/canonical/dex/front/Gourgeist.png rename to src/canonical/dex/front/711--0--Gourgeist.png diff --git a/src/canonical/dex/front/Gourgeist--Large.png b/src/canonical/dex/front/711--420--Gourgeist--Large.png similarity index 100% rename from src/canonical/dex/front/Gourgeist--Large.png rename to src/canonical/dex/front/711--420--Gourgeist--Large.png diff --git a/src/canonical/dex/front/Gourgeist--Small.png b/src/canonical/dex/front/711--420--Gourgeist--Small.png similarity index 100% rename from src/canonical/dex/front/Gourgeist--Small.png rename to src/canonical/dex/front/711--420--Gourgeist--Small.png diff --git a/src/canonical/dex/front/Gourgeist--Super.png b/src/canonical/dex/front/711--420--Gourgeist--Super.png similarity index 100% rename from src/canonical/dex/front/Gourgeist--Super.png rename to src/canonical/dex/front/711--420--Gourgeist--Super.png diff --git a/src/canonical/dex/front/Bergmite.png b/src/canonical/dex/front/712--0--Bergmite.png similarity index 100% rename from src/canonical/dex/front/Bergmite.png rename to src/canonical/dex/front/712--0--Bergmite.png diff --git a/src/canonical/dex/front/Avalugg.png b/src/canonical/dex/front/713--0--Avalugg.png similarity index 100% rename from src/canonical/dex/front/Avalugg.png rename to src/canonical/dex/front/713--0--Avalugg.png diff --git a/src/canonical/dex/front/Noibat.png b/src/canonical/dex/front/714--0--Noibat.png similarity index 100% rename from src/canonical/dex/front/Noibat.png rename to src/canonical/dex/front/714--0--Noibat.png diff --git a/src/canonical/dex/front/Noivern.png b/src/canonical/dex/front/715--0--Noivern.png similarity index 100% rename from src/canonical/dex/front/Noivern.png rename to src/canonical/dex/front/715--0--Noivern.png diff --git a/src/canonical/dex/front/Xerneas.png b/src/canonical/dex/front/716--0--Xerneas.png similarity index 100% rename from src/canonical/dex/front/Xerneas.png rename to src/canonical/dex/front/716--0--Xerneas.png diff --git a/src/canonical/dex/front/Yveltal.png b/src/canonical/dex/front/717--0--Yveltal.png similarity index 100% rename from src/canonical/dex/front/Yveltal.png rename to src/canonical/dex/front/717--0--Yveltal.png diff --git a/src/canonical/dex/front/Zygarde.png b/src/canonical/dex/front/718--0--Zygarde.png similarity index 100% rename from src/canonical/dex/front/Zygarde.png rename to src/canonical/dex/front/718--0--Zygarde.png diff --git a/src/canonical/dex/front/Zygarde--10__0025.png b/src/canonical/dex/front/718--420--Zygarde--10__0025.png similarity index 100% rename from src/canonical/dex/front/Zygarde--10__0025.png rename to src/canonical/dex/front/718--420--Zygarde--10__0025.png diff --git a/src/canonical/dex/front/Zygarde--Complete.png b/src/canonical/dex/front/718--420--Zygarde--Complete.png similarity index 100% rename from src/canonical/dex/front/Zygarde--Complete.png rename to src/canonical/dex/front/718--420--Zygarde--Complete.png diff --git a/src/canonical/dex/front/Diancie.png b/src/canonical/dex/front/719--0--Diancie.png similarity index 100% rename from src/canonical/dex/front/Diancie.png rename to src/canonical/dex/front/719--0--Diancie.png diff --git a/src/canonical/dex/front/Diancie--Mega.png b/src/canonical/dex/front/719--420--Diancie--Mega.png similarity index 100% rename from src/canonical/dex/front/Diancie--Mega.png rename to src/canonical/dex/front/719--420--Diancie--Mega.png diff --git a/src/canonical/dex/front/Tentacool.png b/src/canonical/dex/front/72--0--Tentacool.png similarity index 100% rename from src/canonical/dex/front/Tentacool.png rename to src/canonical/dex/front/72--0--Tentacool.png diff --git a/src/canonical/dex/front/Hoopa.png b/src/canonical/dex/front/720--0--Hoopa.png similarity index 100% rename from src/canonical/dex/front/Hoopa.png rename to src/canonical/dex/front/720--0--Hoopa.png diff --git a/src/canonical/dex/front/Hoopa--Unbound.png b/src/canonical/dex/front/720--420--Hoopa--Unbound.png similarity index 100% rename from src/canonical/dex/front/Hoopa--Unbound.png rename to src/canonical/dex/front/720--420--Hoopa--Unbound.png diff --git a/src/canonical/dex/front/Volcanion.png b/src/canonical/dex/front/721--0--Volcanion.png similarity index 100% rename from src/canonical/dex/front/Volcanion.png rename to src/canonical/dex/front/721--0--Volcanion.png diff --git a/src/canonical/dex/front/Rowlet.png b/src/canonical/dex/front/722--0--Rowlet.png similarity index 100% rename from src/canonical/dex/front/Rowlet.png rename to src/canonical/dex/front/722--0--Rowlet.png diff --git a/src/canonical/dex/front/Dartrix.png b/src/canonical/dex/front/723--0--Dartrix.png similarity index 100% rename from src/canonical/dex/front/Dartrix.png rename to src/canonical/dex/front/723--0--Dartrix.png diff --git a/src/canonical/dex/front/Decidueye.png b/src/canonical/dex/front/724--0--Decidueye.png similarity index 100% rename from src/canonical/dex/front/Decidueye.png rename to src/canonical/dex/front/724--0--Decidueye.png diff --git a/src/canonical/dex/front/Litten.png b/src/canonical/dex/front/725--0--Litten.png similarity index 100% rename from src/canonical/dex/front/Litten.png rename to src/canonical/dex/front/725--0--Litten.png diff --git a/src/canonical/dex/front/Torracat.png b/src/canonical/dex/front/726--0--Torracat.png similarity index 100% rename from src/canonical/dex/front/Torracat.png rename to src/canonical/dex/front/726--0--Torracat.png diff --git a/src/canonical/dex/front/Incineroar.png b/src/canonical/dex/front/727--0--Incineroar.png similarity index 100% rename from src/canonical/dex/front/Incineroar.png rename to src/canonical/dex/front/727--0--Incineroar.png diff --git a/src/canonical/dex/front/Popplio.png b/src/canonical/dex/front/728--0--Popplio.png similarity index 100% rename from src/canonical/dex/front/Popplio.png rename to src/canonical/dex/front/728--0--Popplio.png diff --git a/src/canonical/dex/front/Brionne.png b/src/canonical/dex/front/729--0--Brionne.png similarity index 100% rename from src/canonical/dex/front/Brionne.png rename to src/canonical/dex/front/729--0--Brionne.png diff --git a/src/canonical/dex/front/Tentacruel.png b/src/canonical/dex/front/73--0--Tentacruel.png similarity index 100% rename from src/canonical/dex/front/Tentacruel.png rename to src/canonical/dex/front/73--0--Tentacruel.png diff --git a/src/canonical/dex/front/Primarina.png b/src/canonical/dex/front/730--0--Primarina.png similarity index 100% rename from src/canonical/dex/front/Primarina.png rename to src/canonical/dex/front/730--0--Primarina.png diff --git a/src/canonical/dex/front/Pikipek.png b/src/canonical/dex/front/731--0--Pikipek.png similarity index 100% rename from src/canonical/dex/front/Pikipek.png rename to src/canonical/dex/front/731--0--Pikipek.png diff --git a/src/canonical/dex/front/Trumbeak.png b/src/canonical/dex/front/732--0--Trumbeak.png similarity index 100% rename from src/canonical/dex/front/Trumbeak.png rename to src/canonical/dex/front/732--0--Trumbeak.png diff --git a/src/canonical/dex/front/Toucannon.png b/src/canonical/dex/front/733--0--Toucannon.png similarity index 100% rename from src/canonical/dex/front/Toucannon.png rename to src/canonical/dex/front/733--0--Toucannon.png diff --git a/src/canonical/dex/front/Yungoos.png b/src/canonical/dex/front/734--0--Yungoos.png similarity index 100% rename from src/canonical/dex/front/Yungoos.png rename to src/canonical/dex/front/734--0--Yungoos.png diff --git a/src/canonical/dex/front/Gumshoos.png b/src/canonical/dex/front/735--0--Gumshoos.png similarity index 100% rename from src/canonical/dex/front/Gumshoos.png rename to src/canonical/dex/front/735--0--Gumshoos.png diff --git a/src/canonical/dex/front/Gumshoos--Totem.png b/src/canonical/dex/front/735--420--Gumshoos--Totem.png similarity index 100% rename from src/canonical/dex/front/Gumshoos--Totem.png rename to src/canonical/dex/front/735--420--Gumshoos--Totem.png diff --git a/src/canonical/dex/front/Grubbin.png b/src/canonical/dex/front/736--0--Grubbin.png similarity index 100% rename from src/canonical/dex/front/Grubbin.png rename to src/canonical/dex/front/736--0--Grubbin.png diff --git a/src/canonical/dex/front/Charjabug.png b/src/canonical/dex/front/737--0--Charjabug.png similarity index 100% rename from src/canonical/dex/front/Charjabug.png rename to src/canonical/dex/front/737--0--Charjabug.png diff --git a/src/canonical/dex/front/Vikavolt.png b/src/canonical/dex/front/738--0--Vikavolt.png similarity index 100% rename from src/canonical/dex/front/Vikavolt.png rename to src/canonical/dex/front/738--0--Vikavolt.png diff --git a/src/canonical/dex/front/Vikavolt--Totem.png b/src/canonical/dex/front/738--420--Vikavolt--Totem.png similarity index 100% rename from src/canonical/dex/front/Vikavolt--Totem.png rename to src/canonical/dex/front/738--420--Vikavolt--Totem.png diff --git a/src/canonical/dex/front/Crabrawler.png b/src/canonical/dex/front/739--0--Crabrawler.png similarity index 100% rename from src/canonical/dex/front/Crabrawler.png rename to src/canonical/dex/front/739--0--Crabrawler.png diff --git a/src/canonical/dex/front/Geodude.png b/src/canonical/dex/front/74--0--Geodude.png similarity index 100% rename from src/canonical/dex/front/Geodude.png rename to src/canonical/dex/front/74--0--Geodude.png diff --git a/src/canonical/dex/front/Geodude--Alola.png b/src/canonical/dex/front/74--420--Geodude--Alola.png similarity index 100% rename from src/canonical/dex/front/Geodude--Alola.png rename to src/canonical/dex/front/74--420--Geodude--Alola.png diff --git a/src/canonical/dex/front/Crabominable.png b/src/canonical/dex/front/740--0--Crabominable.png similarity index 100% rename from src/canonical/dex/front/Crabominable.png rename to src/canonical/dex/front/740--0--Crabominable.png diff --git a/src/canonical/dex/front/Oricorio.png b/src/canonical/dex/front/741--0--Oricorio.png similarity index 100% rename from src/canonical/dex/front/Oricorio.png rename to src/canonical/dex/front/741--0--Oricorio.png diff --git a/src/canonical/dex/front/Oricorio--Pa__0027u.png b/src/canonical/dex/front/741--420--Oricorio--Pa__0027u.png similarity index 100% rename from src/canonical/dex/front/Oricorio--Pa__0027u.png rename to src/canonical/dex/front/741--420--Oricorio--Pa__0027u.png diff --git a/src/canonical/dex/front/Oricorio--Pom-Pom.png b/src/canonical/dex/front/741--420--Oricorio--Pom-Pom.png similarity index 100% rename from src/canonical/dex/front/Oricorio--Pom-Pom.png rename to src/canonical/dex/front/741--420--Oricorio--Pom-Pom.png diff --git a/src/canonical/dex/front/Oricorio--Sensu.png b/src/canonical/dex/front/741--420--Oricorio--Sensu.png similarity index 100% rename from src/canonical/dex/front/Oricorio--Sensu.png rename to src/canonical/dex/front/741--420--Oricorio--Sensu.png diff --git a/src/canonical/dex/front/Cutiefly.png b/src/canonical/dex/front/742--0--Cutiefly.png similarity index 100% rename from src/canonical/dex/front/Cutiefly.png rename to src/canonical/dex/front/742--0--Cutiefly.png diff --git a/src/canonical/dex/front/Ribombee.png b/src/canonical/dex/front/743--0--Ribombee.png similarity index 100% rename from src/canonical/dex/front/Ribombee.png rename to src/canonical/dex/front/743--0--Ribombee.png diff --git a/src/canonical/dex/front/Rockruff.png b/src/canonical/dex/front/744--0--Rockruff.png similarity index 100% rename from src/canonical/dex/front/Rockruff.png rename to src/canonical/dex/front/744--0--Rockruff.png diff --git a/src/canonical/dex/front/Lycanroc.png b/src/canonical/dex/front/745--0--Lycanroc.png similarity index 100% rename from src/canonical/dex/front/Lycanroc.png rename to src/canonical/dex/front/745--0--Lycanroc.png diff --git a/src/canonical/dex/front/Lycanroc--Dusk.png b/src/canonical/dex/front/745--420--Lycanroc--Dusk.png similarity index 100% rename from src/canonical/dex/front/Lycanroc--Dusk.png rename to src/canonical/dex/front/745--420--Lycanroc--Dusk.png diff --git a/src/canonical/dex/front/Lycanroc--Midnight.png b/src/canonical/dex/front/745--420--Lycanroc--Midnight.png similarity index 100% rename from src/canonical/dex/front/Lycanroc--Midnight.png rename to src/canonical/dex/front/745--420--Lycanroc--Midnight.png diff --git a/src/canonical/dex/front/Wishiwashi.png b/src/canonical/dex/front/746--0--Wishiwashi.png similarity index 100% rename from src/canonical/dex/front/Wishiwashi.png rename to src/canonical/dex/front/746--0--Wishiwashi.png diff --git a/src/canonical/dex/front/Wishiwashi--School.png b/src/canonical/dex/front/746--420--Wishiwashi--School.png similarity index 100% rename from src/canonical/dex/front/Wishiwashi--School.png rename to src/canonical/dex/front/746--420--Wishiwashi--School.png diff --git a/src/canonical/dex/front/Mareanie.png b/src/canonical/dex/front/747--0--Mareanie.png similarity index 100% rename from src/canonical/dex/front/Mareanie.png rename to src/canonical/dex/front/747--0--Mareanie.png diff --git a/src/canonical/dex/front/Toxapex.png b/src/canonical/dex/front/748--0--Toxapex.png similarity index 100% rename from src/canonical/dex/front/Toxapex.png rename to src/canonical/dex/front/748--0--Toxapex.png diff --git a/src/canonical/dex/front/Mudbray.png b/src/canonical/dex/front/749--0--Mudbray.png similarity index 100% rename from src/canonical/dex/front/Mudbray.png rename to src/canonical/dex/front/749--0--Mudbray.png diff --git a/src/canonical/dex/front/Graveler.png b/src/canonical/dex/front/75--0--Graveler.png similarity index 100% rename from src/canonical/dex/front/Graveler.png rename to src/canonical/dex/front/75--0--Graveler.png diff --git a/src/canonical/dex/front/Graveler--Alola.png b/src/canonical/dex/front/75--420--Graveler--Alola.png similarity index 100% rename from src/canonical/dex/front/Graveler--Alola.png rename to src/canonical/dex/front/75--420--Graveler--Alola.png diff --git a/src/canonical/dex/front/Mudsdale.png b/src/canonical/dex/front/750--0--Mudsdale.png similarity index 100% rename from src/canonical/dex/front/Mudsdale.png rename to src/canonical/dex/front/750--0--Mudsdale.png diff --git a/src/canonical/dex/front/Dewpider.png b/src/canonical/dex/front/751--0--Dewpider.png similarity index 100% rename from src/canonical/dex/front/Dewpider.png rename to src/canonical/dex/front/751--0--Dewpider.png diff --git a/src/canonical/dex/front/Araquanid.png b/src/canonical/dex/front/752--0--Araquanid.png similarity index 100% rename from src/canonical/dex/front/Araquanid.png rename to src/canonical/dex/front/752--0--Araquanid.png diff --git a/src/canonical/dex/front/Fomantis.png b/src/canonical/dex/front/753--0--Fomantis.png similarity index 100% rename from src/canonical/dex/front/Fomantis.png rename to src/canonical/dex/front/753--0--Fomantis.png diff --git a/src/canonical/dex/front/Lurantis.png b/src/canonical/dex/front/754--0--Lurantis.png similarity index 100% rename from src/canonical/dex/front/Lurantis.png rename to src/canonical/dex/front/754--0--Lurantis.png diff --git a/src/canonical/dex/front/Morelull.png b/src/canonical/dex/front/755--0--Morelull.png similarity index 100% rename from src/canonical/dex/front/Morelull.png rename to src/canonical/dex/front/755--0--Morelull.png diff --git a/src/canonical/dex/front/Shiinotic.png b/src/canonical/dex/front/756--0--Shiinotic.png similarity index 100% rename from src/canonical/dex/front/Shiinotic.png rename to src/canonical/dex/front/756--0--Shiinotic.png diff --git a/src/canonical/dex/front/Salandit.png b/src/canonical/dex/front/757--0--Salandit.png similarity index 100% rename from src/canonical/dex/front/Salandit.png rename to src/canonical/dex/front/757--0--Salandit.png diff --git a/src/canonical/dex/front/Salazzle.png b/src/canonical/dex/front/758--0--Salazzle.png similarity index 100% rename from src/canonical/dex/front/Salazzle.png rename to src/canonical/dex/front/758--0--Salazzle.png diff --git a/src/canonical/dex/front/Stufful.png b/src/canonical/dex/front/759--0--Stufful.png similarity index 100% rename from src/canonical/dex/front/Stufful.png rename to src/canonical/dex/front/759--0--Stufful.png diff --git a/src/canonical/dex/front/Golem.png b/src/canonical/dex/front/76--0--Golem.png similarity index 100% rename from src/canonical/dex/front/Golem.png rename to src/canonical/dex/front/76--0--Golem.png diff --git a/src/canonical/dex/front/Golem--Alola.png b/src/canonical/dex/front/76--420--Golem--Alola.png similarity index 100% rename from src/canonical/dex/front/Golem--Alola.png rename to src/canonical/dex/front/76--420--Golem--Alola.png diff --git a/src/canonical/dex/front/Bewear.png b/src/canonical/dex/front/760--0--Bewear.png similarity index 100% rename from src/canonical/dex/front/Bewear.png rename to src/canonical/dex/front/760--0--Bewear.png diff --git a/src/canonical/dex/front/Bounsweet.png b/src/canonical/dex/front/761--0--Bounsweet.png similarity index 100% rename from src/canonical/dex/front/Bounsweet.png rename to src/canonical/dex/front/761--0--Bounsweet.png diff --git a/src/canonical/dex/front/Steenee.png b/src/canonical/dex/front/762--0--Steenee.png similarity index 100% rename from src/canonical/dex/front/Steenee.png rename to src/canonical/dex/front/762--0--Steenee.png diff --git a/src/canonical/dex/front/Tsareena.png b/src/canonical/dex/front/763--0--Tsareena.png similarity index 100% rename from src/canonical/dex/front/Tsareena.png rename to src/canonical/dex/front/763--0--Tsareena.png diff --git a/src/canonical/dex/front/Comfey.png b/src/canonical/dex/front/764--0--Comfey.png similarity index 100% rename from src/canonical/dex/front/Comfey.png rename to src/canonical/dex/front/764--0--Comfey.png diff --git a/src/canonical/dex/front/Oranguru.png b/src/canonical/dex/front/765--0--Oranguru.png similarity index 100% rename from src/canonical/dex/front/Oranguru.png rename to src/canonical/dex/front/765--0--Oranguru.png diff --git a/src/canonical/dex/front/Passimian.png b/src/canonical/dex/front/766--0--Passimian.png similarity index 100% rename from src/canonical/dex/front/Passimian.png rename to src/canonical/dex/front/766--0--Passimian.png diff --git a/src/canonical/dex/front/Wimpod.png b/src/canonical/dex/front/767--0--Wimpod.png similarity index 100% rename from src/canonical/dex/front/Wimpod.png rename to src/canonical/dex/front/767--0--Wimpod.png diff --git a/src/canonical/dex/front/Golisopod.png b/src/canonical/dex/front/768--0--Golisopod.png similarity index 100% rename from src/canonical/dex/front/Golisopod.png rename to src/canonical/dex/front/768--0--Golisopod.png diff --git a/src/canonical/dex/front/Sandygast.png b/src/canonical/dex/front/769--0--Sandygast.png similarity index 100% rename from src/canonical/dex/front/Sandygast.png rename to src/canonical/dex/front/769--0--Sandygast.png diff --git a/src/canonical/dex/front/Ponyta.png b/src/canonical/dex/front/77--0--Ponyta.png similarity index 100% rename from src/canonical/dex/front/Ponyta.png rename to src/canonical/dex/front/77--0--Ponyta.png diff --git a/src/canonical/dex/front/Palossand.png b/src/canonical/dex/front/770--0--Palossand.png similarity index 100% rename from src/canonical/dex/front/Palossand.png rename to src/canonical/dex/front/770--0--Palossand.png diff --git a/src/canonical/dex/front/Pyukumuku.png b/src/canonical/dex/front/771--0--Pyukumuku.png similarity index 100% rename from src/canonical/dex/front/Pyukumuku.png rename to src/canonical/dex/front/771--0--Pyukumuku.png diff --git a/src/canonical/dex/front/Type__003a_Null.png b/src/canonical/dex/front/772--0--Type__003a_Null.png similarity index 100% rename from src/canonical/dex/front/Type__003a_Null.png rename to src/canonical/dex/front/772--0--Type__003a_Null.png diff --git a/src/canonical/dex/front/Silvally.png b/src/canonical/dex/front/773--0--Silvally.png similarity index 100% rename from src/canonical/dex/front/Silvally.png rename to src/canonical/dex/front/773--0--Silvally.png diff --git a/src/canonical/dex/front/Silvally--Bug.png b/src/canonical/dex/front/773--420--Silvally--Bug.png similarity index 100% rename from src/canonical/dex/front/Silvally--Bug.png rename to src/canonical/dex/front/773--420--Silvally--Bug.png diff --git a/src/canonical/dex/front/Silvally--Dark.png b/src/canonical/dex/front/773--420--Silvally--Dark.png similarity index 100% rename from src/canonical/dex/front/Silvally--Dark.png rename to src/canonical/dex/front/773--420--Silvally--Dark.png diff --git a/src/canonical/dex/front/Silvally--Dragon.png b/src/canonical/dex/front/773--420--Silvally--Dragon.png similarity index 100% rename from src/canonical/dex/front/Silvally--Dragon.png rename to src/canonical/dex/front/773--420--Silvally--Dragon.png diff --git a/src/canonical/dex/front/Silvally--Electric.png b/src/canonical/dex/front/773--420--Silvally--Electric.png similarity index 100% rename from src/canonical/dex/front/Silvally--Electric.png rename to src/canonical/dex/front/773--420--Silvally--Electric.png diff --git a/src/canonical/dex/front/Silvally--Fairy.png b/src/canonical/dex/front/773--420--Silvally--Fairy.png similarity index 100% rename from src/canonical/dex/front/Silvally--Fairy.png rename to src/canonical/dex/front/773--420--Silvally--Fairy.png diff --git a/src/canonical/dex/front/Silvally--Fighting.png b/src/canonical/dex/front/773--420--Silvally--Fighting.png similarity index 100% rename from src/canonical/dex/front/Silvally--Fighting.png rename to src/canonical/dex/front/773--420--Silvally--Fighting.png diff --git a/src/canonical/dex/front/Silvally--Fire.png b/src/canonical/dex/front/773--420--Silvally--Fire.png similarity index 100% rename from src/canonical/dex/front/Silvally--Fire.png rename to src/canonical/dex/front/773--420--Silvally--Fire.png diff --git a/src/canonical/dex/front/Silvally--Flying.png b/src/canonical/dex/front/773--420--Silvally--Flying.png similarity index 100% rename from src/canonical/dex/front/Silvally--Flying.png rename to src/canonical/dex/front/773--420--Silvally--Flying.png diff --git a/src/canonical/dex/front/Silvally--Ghost.png b/src/canonical/dex/front/773--420--Silvally--Ghost.png similarity index 100% rename from src/canonical/dex/front/Silvally--Ghost.png rename to src/canonical/dex/front/773--420--Silvally--Ghost.png diff --git a/src/canonical/dex/front/Silvally--Grass.png b/src/canonical/dex/front/773--420--Silvally--Grass.png similarity index 100% rename from src/canonical/dex/front/Silvally--Grass.png rename to src/canonical/dex/front/773--420--Silvally--Grass.png diff --git a/src/canonical/dex/front/Silvally--Ground.png b/src/canonical/dex/front/773--420--Silvally--Ground.png similarity index 100% rename from src/canonical/dex/front/Silvally--Ground.png rename to src/canonical/dex/front/773--420--Silvally--Ground.png diff --git a/src/canonical/dex/front/Silvally--Ice.png b/src/canonical/dex/front/773--420--Silvally--Ice.png similarity index 100% rename from src/canonical/dex/front/Silvally--Ice.png rename to src/canonical/dex/front/773--420--Silvally--Ice.png diff --git a/src/canonical/dex/front/Silvally--Poison.png b/src/canonical/dex/front/773--420--Silvally--Poison.png similarity index 100% rename from src/canonical/dex/front/Silvally--Poison.png rename to src/canonical/dex/front/773--420--Silvally--Poison.png diff --git a/src/canonical/dex/front/Silvally--Psychic.png b/src/canonical/dex/front/773--420--Silvally--Psychic.png similarity index 100% rename from src/canonical/dex/front/Silvally--Psychic.png rename to src/canonical/dex/front/773--420--Silvally--Psychic.png diff --git a/src/canonical/dex/front/Silvally--Rock.png b/src/canonical/dex/front/773--420--Silvally--Rock.png similarity index 100% rename from src/canonical/dex/front/Silvally--Rock.png rename to src/canonical/dex/front/773--420--Silvally--Rock.png diff --git a/src/canonical/dex/front/Silvally--Steel.png b/src/canonical/dex/front/773--420--Silvally--Steel.png similarity index 100% rename from src/canonical/dex/front/Silvally--Steel.png rename to src/canonical/dex/front/773--420--Silvally--Steel.png diff --git a/src/canonical/dex/front/Silvally--Water.png b/src/canonical/dex/front/773--420--Silvally--Water.png similarity index 100% rename from src/canonical/dex/front/Silvally--Water.png rename to src/canonical/dex/front/773--420--Silvally--Water.png diff --git a/src/canonical/dex/front/Minior.png b/src/canonical/dex/front/774--0--Minior.png similarity index 100% rename from src/canonical/dex/front/Minior.png rename to src/canonical/dex/front/774--0--Minior.png diff --git a/src/canonical/dex/front/Minior--Meteor.png b/src/canonical/dex/front/774--420--Minior--Meteor.png similarity index 100% rename from src/canonical/dex/front/Minior--Meteor.png rename to src/canonical/dex/front/774--420--Minior--Meteor.png diff --git a/src/canonical/dex/front/Komala.png b/src/canonical/dex/front/775--0--Komala.png similarity index 100% rename from src/canonical/dex/front/Komala.png rename to src/canonical/dex/front/775--0--Komala.png diff --git a/src/canonical/dex/front/Turtonator.png b/src/canonical/dex/front/776--0--Turtonator.png similarity index 100% rename from src/canonical/dex/front/Turtonator.png rename to src/canonical/dex/front/776--0--Turtonator.png diff --git a/src/canonical/dex/front/Togedemaru.png b/src/canonical/dex/front/777--0--Togedemaru.png similarity index 100% rename from src/canonical/dex/front/Togedemaru.png rename to src/canonical/dex/front/777--0--Togedemaru.png diff --git a/src/canonical/dex/front/Mimikyu.png b/src/canonical/dex/front/778--0--Mimikyu.png similarity index 100% rename from src/canonical/dex/front/Mimikyu.png rename to src/canonical/dex/front/778--0--Mimikyu.png diff --git a/src/canonical/dex/front/Mimikyu--Busted-Totem.png b/src/canonical/dex/front/778--420--Mimikyu--Busted-Totem.png similarity index 100% rename from src/canonical/dex/front/Mimikyu--Busted-Totem.png rename to src/canonical/dex/front/778--420--Mimikyu--Busted-Totem.png diff --git a/src/canonical/dex/front/Mimikyu--Busted.png b/src/canonical/dex/front/778--420--Mimikyu--Busted.png similarity index 100% rename from src/canonical/dex/front/Mimikyu--Busted.png rename to src/canonical/dex/front/778--420--Mimikyu--Busted.png diff --git a/src/canonical/dex/front/Mimikyu--Totem.png b/src/canonical/dex/front/778--420--Mimikyu--Totem.png similarity index 100% rename from src/canonical/dex/front/Mimikyu--Totem.png rename to src/canonical/dex/front/778--420--Mimikyu--Totem.png diff --git a/src/canonical/dex/front/Bruxish.png b/src/canonical/dex/front/779--0--Bruxish.png similarity index 100% rename from src/canonical/dex/front/Bruxish.png rename to src/canonical/dex/front/779--0--Bruxish.png diff --git a/src/canonical/dex/front/Rapidash.png b/src/canonical/dex/front/78--0--Rapidash.png similarity index 100% rename from src/canonical/dex/front/Rapidash.png rename to src/canonical/dex/front/78--0--Rapidash.png diff --git a/src/canonical/dex/front/Drampa.png b/src/canonical/dex/front/780--0--Drampa.png similarity index 100% rename from src/canonical/dex/front/Drampa.png rename to src/canonical/dex/front/780--0--Drampa.png diff --git a/src/canonical/dex/front/Dhelmise.png b/src/canonical/dex/front/781--0--Dhelmise.png similarity index 100% rename from src/canonical/dex/front/Dhelmise.png rename to src/canonical/dex/front/781--0--Dhelmise.png diff --git a/src/canonical/dex/front/Jangmo-o.png b/src/canonical/dex/front/782--0--Jangmo-o.png similarity index 100% rename from src/canonical/dex/front/Jangmo-o.png rename to src/canonical/dex/front/782--0--Jangmo-o.png diff --git a/src/canonical/dex/front/Hakamo-o.png b/src/canonical/dex/front/783--0--Hakamo-o.png similarity index 100% rename from src/canonical/dex/front/Hakamo-o.png rename to src/canonical/dex/front/783--0--Hakamo-o.png diff --git a/src/canonical/dex/front/Kommo-o.png b/src/canonical/dex/front/784--0--Kommo-o.png similarity index 100% rename from src/canonical/dex/front/Kommo-o.png rename to src/canonical/dex/front/784--0--Kommo-o.png diff --git a/src/canonical/dex/front/Kommo-o--Totem.png b/src/canonical/dex/front/784--420--Kommo-o--Totem.png similarity index 100% rename from src/canonical/dex/front/Kommo-o--Totem.png rename to src/canonical/dex/front/784--420--Kommo-o--Totem.png diff --git a/src/canonical/dex/front/Tapu_Koko.png b/src/canonical/dex/front/785--0--Tapu_Koko.png similarity index 100% rename from src/canonical/dex/front/Tapu_Koko.png rename to src/canonical/dex/front/785--0--Tapu_Koko.png diff --git a/src/canonical/dex/front/Tapu_Lele.png b/src/canonical/dex/front/786--0--Tapu_Lele.png similarity index 100% rename from src/canonical/dex/front/Tapu_Lele.png rename to src/canonical/dex/front/786--0--Tapu_Lele.png diff --git a/src/canonical/dex/front/Tapu_Bulu.png b/src/canonical/dex/front/787--0--Tapu_Bulu.png similarity index 100% rename from src/canonical/dex/front/Tapu_Bulu.png rename to src/canonical/dex/front/787--0--Tapu_Bulu.png diff --git a/src/canonical/dex/front/Tapu_Fini.png b/src/canonical/dex/front/788--0--Tapu_Fini.png similarity index 100% rename from src/canonical/dex/front/Tapu_Fini.png rename to src/canonical/dex/front/788--0--Tapu_Fini.png diff --git a/src/canonical/dex/front/Cosmog.png b/src/canonical/dex/front/789--0--Cosmog.png similarity index 100% rename from src/canonical/dex/front/Cosmog.png rename to src/canonical/dex/front/789--0--Cosmog.png diff --git a/src/canonical/dex/front/Slowpoke.png b/src/canonical/dex/front/79--0--Slowpoke.png similarity index 100% rename from src/canonical/dex/front/Slowpoke.png rename to src/canonical/dex/front/79--0--Slowpoke.png diff --git a/src/canonical/dex/front/Cosmoem.png b/src/canonical/dex/front/790--0--Cosmoem.png similarity index 100% rename from src/canonical/dex/front/Cosmoem.png rename to src/canonical/dex/front/790--0--Cosmoem.png diff --git a/src/canonical/dex/front/Solgaleo.png b/src/canonical/dex/front/791--0--Solgaleo.png similarity index 100% rename from src/canonical/dex/front/Solgaleo.png rename to src/canonical/dex/front/791--0--Solgaleo.png diff --git a/src/canonical/dex/front/Lunala.png b/src/canonical/dex/front/792--0--Lunala.png similarity index 100% rename from src/canonical/dex/front/Lunala.png rename to src/canonical/dex/front/792--0--Lunala.png diff --git a/src/canonical/dex/front/Nihilego.png b/src/canonical/dex/front/793--0--Nihilego.png similarity index 100% rename from src/canonical/dex/front/Nihilego.png rename to src/canonical/dex/front/793--0--Nihilego.png diff --git a/src/canonical/dex/front/Buzzwole.png b/src/canonical/dex/front/794--0--Buzzwole.png similarity index 100% rename from src/canonical/dex/front/Buzzwole.png rename to src/canonical/dex/front/794--0--Buzzwole.png diff --git a/src/canonical/dex/front/Pheromosa.png b/src/canonical/dex/front/795--0--Pheromosa.png similarity index 100% rename from src/canonical/dex/front/Pheromosa.png rename to src/canonical/dex/front/795--0--Pheromosa.png diff --git a/src/canonical/dex/front/Xurkitree.png b/src/canonical/dex/front/796--0--Xurkitree.png similarity index 100% rename from src/canonical/dex/front/Xurkitree.png rename to src/canonical/dex/front/796--0--Xurkitree.png diff --git a/src/canonical/dex/front/Celesteela.png b/src/canonical/dex/front/797--0--Celesteela.png similarity index 100% rename from src/canonical/dex/front/Celesteela.png rename to src/canonical/dex/front/797--0--Celesteela.png diff --git a/src/canonical/dex/front/Kartana.png b/src/canonical/dex/front/798--0--Kartana.png similarity index 100% rename from src/canonical/dex/front/Kartana.png rename to src/canonical/dex/front/798--0--Kartana.png diff --git a/src/canonical/dex/front/Guzzlord.png b/src/canonical/dex/front/799--0--Guzzlord.png similarity index 100% rename from src/canonical/dex/front/Guzzlord.png rename to src/canonical/dex/front/799--0--Guzzlord.png diff --git a/src/canonical/dex/front/Wartortle.png b/src/canonical/dex/front/8--0--Wartortle.png similarity index 100% rename from src/canonical/dex/front/Wartortle.png rename to src/canonical/dex/front/8--0--Wartortle.png diff --git a/src/canonical/dex/front/Slowbro.png b/src/canonical/dex/front/80--0--Slowbro.png similarity index 100% rename from src/canonical/dex/front/Slowbro.png rename to src/canonical/dex/front/80--0--Slowbro.png diff --git a/src/canonical/dex/front/Slowbro--Mega.png b/src/canonical/dex/front/80--420--Slowbro--Mega.png similarity index 100% rename from src/canonical/dex/front/Slowbro--Mega.png rename to src/canonical/dex/front/80--420--Slowbro--Mega.png diff --git a/src/canonical/dex/front/Necrozma.png b/src/canonical/dex/front/800--0--Necrozma.png similarity index 100% rename from src/canonical/dex/front/Necrozma.png rename to src/canonical/dex/front/800--0--Necrozma.png diff --git a/src/canonical/dex/front/Necrozma--Dawn-Wings.png b/src/canonical/dex/front/800--420--Necrozma--Dawn-Wings.png similarity index 100% rename from src/canonical/dex/front/Necrozma--Dawn-Wings.png rename to src/canonical/dex/front/800--420--Necrozma--Dawn-Wings.png diff --git a/src/canonical/dex/front/Necrozma--Dusk-Mane.png b/src/canonical/dex/front/800--420--Necrozma--Dusk-Mane.png similarity index 100% rename from src/canonical/dex/front/Necrozma--Dusk-Mane.png rename to src/canonical/dex/front/800--420--Necrozma--Dusk-Mane.png diff --git a/src/canonical/dex/front/Necrozma--Ultra.png b/src/canonical/dex/front/800--420--Necrozma--Ultra.png similarity index 100% rename from src/canonical/dex/front/Necrozma--Ultra.png rename to src/canonical/dex/front/800--420--Necrozma--Ultra.png diff --git a/src/canonical/dex/front/Magearna.png b/src/canonical/dex/front/801--0--Magearna.png similarity index 100% rename from src/canonical/dex/front/Magearna.png rename to src/canonical/dex/front/801--0--Magearna.png diff --git a/src/canonical/dex/front/Marshadow.png b/src/canonical/dex/front/802--0--Marshadow.png similarity index 100% rename from src/canonical/dex/front/Marshadow.png rename to src/canonical/dex/front/802--0--Marshadow.png diff --git a/src/canonical/dex/front/Poipole.png b/src/canonical/dex/front/803--0--Poipole.png similarity index 100% rename from src/canonical/dex/front/Poipole.png rename to src/canonical/dex/front/803--0--Poipole.png diff --git a/src/canonical/dex/front/Naganadel.png b/src/canonical/dex/front/804--0--Naganadel.png similarity index 100% rename from src/canonical/dex/front/Naganadel.png rename to src/canonical/dex/front/804--0--Naganadel.png diff --git a/src/canonical/dex/front/Stakataka.png b/src/canonical/dex/front/805--0--Stakataka.png similarity index 100% rename from src/canonical/dex/front/Stakataka.png rename to src/canonical/dex/front/805--0--Stakataka.png diff --git a/src/canonical/dex/front/Blacephalon.png b/src/canonical/dex/front/806--0--Blacephalon.png similarity index 100% rename from src/canonical/dex/front/Blacephalon.png rename to src/canonical/dex/front/806--0--Blacephalon.png diff --git a/src/canonical/dex/front/Zeraora.png b/src/canonical/dex/front/807--0--Zeraora.png similarity index 100% rename from src/canonical/dex/front/Zeraora.png rename to src/canonical/dex/front/807--0--Zeraora.png diff --git a/src/canonical/dex/front/Meltan.png b/src/canonical/dex/front/808--0--Meltan.png similarity index 100% rename from src/canonical/dex/front/Meltan.png rename to src/canonical/dex/front/808--0--Meltan.png diff --git a/src/canonical/dex/front/Melmetal.png b/src/canonical/dex/front/809--0--Melmetal.png similarity index 100% rename from src/canonical/dex/front/Melmetal.png rename to src/canonical/dex/front/809--0--Melmetal.png diff --git a/src/canonical/dex/front/Magnemite.png b/src/canonical/dex/front/81--0--Magnemite.png similarity index 100% rename from src/canonical/dex/front/Magnemite.png rename to src/canonical/dex/front/81--0--Magnemite.png diff --git a/src/canonical/dex/front/Magneton.png b/src/canonical/dex/front/82--0--Magneton.png similarity index 100% rename from src/canonical/dex/front/Magneton.png rename to src/canonical/dex/front/82--0--Magneton.png diff --git a/src/canonical/dex/front/Farfetch__0027d.png b/src/canonical/dex/front/83--0--Farfetch__0027d.png similarity index 100% rename from src/canonical/dex/front/Farfetch__0027d.png rename to src/canonical/dex/front/83--0--Farfetch__0027d.png diff --git a/src/canonical/dex/front/Doduo.png b/src/canonical/dex/front/84--0--Doduo.png similarity index 100% rename from src/canonical/dex/front/Doduo.png rename to src/canonical/dex/front/84--0--Doduo.png diff --git a/src/canonical/dex/front/Dodrio.png b/src/canonical/dex/front/85--0--Dodrio.png similarity index 100% rename from src/canonical/dex/front/Dodrio.png rename to src/canonical/dex/front/85--0--Dodrio.png diff --git a/src/canonical/dex/front/Seel.png b/src/canonical/dex/front/86--0--Seel.png similarity index 100% rename from src/canonical/dex/front/Seel.png rename to src/canonical/dex/front/86--0--Seel.png diff --git a/src/canonical/dex/front/Dewgong.png b/src/canonical/dex/front/87--0--Dewgong.png similarity index 100% rename from src/canonical/dex/front/Dewgong.png rename to src/canonical/dex/front/87--0--Dewgong.png diff --git a/src/canonical/dex/front/Grimer.png b/src/canonical/dex/front/88--0--Grimer.png similarity index 100% rename from src/canonical/dex/front/Grimer.png rename to src/canonical/dex/front/88--0--Grimer.png diff --git a/src/canonical/dex/front/Grimer--Alola.png b/src/canonical/dex/front/88--420--Grimer--Alola.png similarity index 100% rename from src/canonical/dex/front/Grimer--Alola.png rename to src/canonical/dex/front/88--420--Grimer--Alola.png diff --git a/src/canonical/dex/front/Muk.png b/src/canonical/dex/front/89--0--Muk.png similarity index 100% rename from src/canonical/dex/front/Muk.png rename to src/canonical/dex/front/89--0--Muk.png diff --git a/src/canonical/dex/front/Muk--Alola.png b/src/canonical/dex/front/89--420--Muk--Alola.png similarity index 100% rename from src/canonical/dex/front/Muk--Alola.png rename to src/canonical/dex/front/89--420--Muk--Alola.png diff --git a/src/canonical/dex/front/Blastoise.png b/src/canonical/dex/front/9--0--Blastoise.png similarity index 100% rename from src/canonical/dex/front/Blastoise.png rename to src/canonical/dex/front/9--0--Blastoise.png diff --git a/src/canonical/dex/front/Blastoise--Mega.png b/src/canonical/dex/front/9--420--Blastoise--Mega.png similarity index 100% rename from src/canonical/dex/front/Blastoise--Mega.png rename to src/canonical/dex/front/9--420--Blastoise--Mega.png diff --git a/src/canonical/dex/front/Shellder.png b/src/canonical/dex/front/90--0--Shellder.png similarity index 100% rename from src/canonical/dex/front/Shellder.png rename to src/canonical/dex/front/90--0--Shellder.png diff --git a/src/canonical/dex/front/Cloyster.png b/src/canonical/dex/front/91--0--Cloyster.png similarity index 100% rename from src/canonical/dex/front/Cloyster.png rename to src/canonical/dex/front/91--0--Cloyster.png diff --git a/src/canonical/dex/front/Gastly.png b/src/canonical/dex/front/92--0--Gastly.png similarity index 100% rename from src/canonical/dex/front/Gastly.png rename to src/canonical/dex/front/92--0--Gastly.png diff --git a/src/canonical/dex/front/Haunter.png b/src/canonical/dex/front/93--0--Haunter.png similarity index 100% rename from src/canonical/dex/front/Haunter.png rename to src/canonical/dex/front/93--0--Haunter.png diff --git a/src/canonical/dex/front/Gengar.png b/src/canonical/dex/front/94--0--Gengar.png similarity index 100% rename from src/canonical/dex/front/Gengar.png rename to src/canonical/dex/front/94--0--Gengar.png diff --git a/src/canonical/dex/front/Gengar--Mega.png b/src/canonical/dex/front/94--420--Gengar--Mega.png similarity index 100% rename from src/canonical/dex/front/Gengar--Mega.png rename to src/canonical/dex/front/94--420--Gengar--Mega.png diff --git a/src/canonical/dex/front/Onix.png b/src/canonical/dex/front/95--0--Onix.png similarity index 100% rename from src/canonical/dex/front/Onix.png rename to src/canonical/dex/front/95--0--Onix.png diff --git a/src/canonical/dex/front/Drowzee.png b/src/canonical/dex/front/96--0--Drowzee.png similarity index 100% rename from src/canonical/dex/front/Drowzee.png rename to src/canonical/dex/front/96--0--Drowzee.png diff --git a/src/canonical/dex/front/Hypno.png b/src/canonical/dex/front/97--0--Hypno.png similarity index 100% rename from src/canonical/dex/front/Hypno.png rename to src/canonical/dex/front/97--0--Hypno.png diff --git a/src/canonical/dex/front/Krabby.png b/src/canonical/dex/front/98--0--Krabby.png similarity index 100% rename from src/canonical/dex/front/Krabby.png rename to src/canonical/dex/front/98--0--Krabby.png diff --git a/src/canonical/dex/front/Kingler.png b/src/canonical/dex/front/99--0--Kingler.png similarity index 100% rename from src/canonical/dex/front/Kingler.png rename to src/canonical/dex/front/99--0--Kingler.png diff --git a/src/canonical/minisprites/gen5/custom/Kangaskhan--Mega.png b/src/canonical/minisprites/gen5/custom/115--420--Kangaskhan--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Kangaskhan--Mega.png rename to src/canonical/minisprites/gen5/custom/115--420--Kangaskhan--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Pinsir--Mega.png b/src/canonical/minisprites/gen5/custom/127--420--Pinsir--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Pinsir--Mega.png rename to src/canonical/minisprites/gen5/custom/127--420--Pinsir--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Gyarados--Mega.png b/src/canonical/minisprites/gen5/custom/130--420--Gyarados--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Gyarados--Mega.png rename to src/canonical/minisprites/gen5/custom/130--420--Gyarados--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Aerodactyl--Mega.png b/src/canonical/minisprites/gen5/custom/142--420--Aerodactyl--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Aerodactyl--Mega.png rename to src/canonical/minisprites/gen5/custom/142--420--Aerodactyl--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Beedrill--Mega.png b/src/canonical/minisprites/gen5/custom/15--420--Beedrill--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Beedrill--Mega.png rename to src/canonical/minisprites/gen5/custom/15--420--Beedrill--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Mewtwo--Mega-X.png b/src/canonical/minisprites/gen5/custom/150--420--Mewtwo--Mega-X.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Mewtwo--Mega-X.png rename to src/canonical/minisprites/gen5/custom/150--420--Mewtwo--Mega-X.png diff --git a/src/canonical/minisprites/gen5/custom/Mewtwo--Mega-Y.png b/src/canonical/minisprites/gen5/custom/150--420--Mewtwo--Mega-Y.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Mewtwo--Mega-Y.png rename to src/canonical/minisprites/gen5/custom/150--420--Mewtwo--Mega-Y.png diff --git a/src/canonical/minisprites/gen5/custom/Pidgeot--Mega.png b/src/canonical/minisprites/gen5/custom/18--420--Pidgeot--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Pidgeot--Mega.png rename to src/canonical/minisprites/gen5/custom/18--420--Pidgeot--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Ampharos--Mega.png b/src/canonical/minisprites/gen5/custom/181--420--Ampharos--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Ampharos--Mega.png rename to src/canonical/minisprites/gen5/custom/181--420--Ampharos--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Steelix--Mega.png b/src/canonical/minisprites/gen5/custom/208--420--Steelix--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Steelix--Mega.png rename to src/canonical/minisprites/gen5/custom/208--420--Steelix--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Scizor--Mega.png b/src/canonical/minisprites/gen5/custom/212--420--Scizor--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Scizor--Mega.png rename to src/canonical/minisprites/gen5/custom/212--420--Scizor--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Heracross--Mega.png b/src/canonical/minisprites/gen5/custom/214--420--Heracross--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Heracross--Mega.png rename to src/canonical/minisprites/gen5/custom/214--420--Heracross--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Houndoom--Mega.png b/src/canonical/minisprites/gen5/custom/229--420--Houndoom--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Houndoom--Mega.png rename to src/canonical/minisprites/gen5/custom/229--420--Houndoom--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Tyranitar--Mega.png b/src/canonical/minisprites/gen5/custom/248--420--Tyranitar--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Tyranitar--Mega.png rename to src/canonical/minisprites/gen5/custom/248--420--Tyranitar--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Sceptile--Mega.png b/src/canonical/minisprites/gen5/custom/254--420--Sceptile--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Sceptile--Mega.png rename to src/canonical/minisprites/gen5/custom/254--420--Sceptile--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Blaziken--Mega.png b/src/canonical/minisprites/gen5/custom/257--420--Blaziken--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Blaziken--Mega.png rename to src/canonical/minisprites/gen5/custom/257--420--Blaziken--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Swampert--Mega.png b/src/canonical/minisprites/gen5/custom/260--420--Swampert--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Swampert--Mega.png rename to src/canonical/minisprites/gen5/custom/260--420--Swampert--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Gardevoir--Mega.png b/src/canonical/minisprites/gen5/custom/282--420--Gardevoir--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Gardevoir--Mega.png rename to src/canonical/minisprites/gen5/custom/282--420--Gardevoir--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Venusaur--Mega.png b/src/canonical/minisprites/gen5/custom/3--420--Venusaur--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Venusaur--Mega.png rename to src/canonical/minisprites/gen5/custom/3--420--Venusaur--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Sableye--Mega.png b/src/canonical/minisprites/gen5/custom/302--420--Sableye--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Sableye--Mega.png rename to src/canonical/minisprites/gen5/custom/302--420--Sableye--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Mawile--Mega.png b/src/canonical/minisprites/gen5/custom/303--420--Mawile--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Mawile--Mega.png rename to src/canonical/minisprites/gen5/custom/303--420--Mawile--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Aggron--Mega.png b/src/canonical/minisprites/gen5/custom/306--420--Aggron--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Aggron--Mega.png rename to src/canonical/minisprites/gen5/custom/306--420--Aggron--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Medicham--Mega.png b/src/canonical/minisprites/gen5/custom/308--420--Medicham--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Medicham--Mega.png rename to src/canonical/minisprites/gen5/custom/308--420--Medicham--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Manectric--Mega.png b/src/canonical/minisprites/gen5/custom/310--420--Manectric--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Manectric--Mega.png rename to src/canonical/minisprites/gen5/custom/310--420--Manectric--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Sharpedo--Mega.png b/src/canonical/minisprites/gen5/custom/319--420--Sharpedo--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Sharpedo--Mega.png rename to src/canonical/minisprites/gen5/custom/319--420--Sharpedo--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Camerupt--Mega.png b/src/canonical/minisprites/gen5/custom/323--420--Camerupt--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Camerupt--Mega.png rename to src/canonical/minisprites/gen5/custom/323--420--Camerupt--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Altaria--Mega.png b/src/canonical/minisprites/gen5/custom/334--420--Altaria--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Altaria--Mega.png rename to src/canonical/minisprites/gen5/custom/334--420--Altaria--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Banette--Mega.png b/src/canonical/minisprites/gen5/custom/354--420--Banette--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Banette--Mega.png rename to src/canonical/minisprites/gen5/custom/354--420--Banette--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Absol--Mega.png b/src/canonical/minisprites/gen5/custom/359--420--Absol--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Absol--Mega.png rename to src/canonical/minisprites/gen5/custom/359--420--Absol--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Glalie--Mega.png b/src/canonical/minisprites/gen5/custom/362--420--Glalie--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Glalie--Mega.png rename to src/canonical/minisprites/gen5/custom/362--420--Glalie--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Salamence--Mega.png b/src/canonical/minisprites/gen5/custom/373--420--Salamence--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Salamence--Mega.png rename to src/canonical/minisprites/gen5/custom/373--420--Salamence--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Metagross--Mega.png b/src/canonical/minisprites/gen5/custom/376--420--Metagross--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Metagross--Mega.png rename to src/canonical/minisprites/gen5/custom/376--420--Metagross--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Latias--Mega.png b/src/canonical/minisprites/gen5/custom/380--420--Latias--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Latias--Mega.png rename to src/canonical/minisprites/gen5/custom/380--420--Latias--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Latios--Mega.png b/src/canonical/minisprites/gen5/custom/381--420--Latios--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Latios--Mega.png rename to src/canonical/minisprites/gen5/custom/381--420--Latios--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Kyogre--Primal.png b/src/canonical/minisprites/gen5/custom/382--420--Kyogre--Primal.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Kyogre--Primal.png rename to src/canonical/minisprites/gen5/custom/382--420--Kyogre--Primal.png diff --git a/src/canonical/minisprites/gen5/custom/Groudon--Primal.png b/src/canonical/minisprites/gen5/custom/383--420--Groudon--Primal.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Groudon--Primal.png rename to src/canonical/minisprites/gen5/custom/383--420--Groudon--Primal.png diff --git a/src/canonical/minisprites/gen5/custom/Rayquaza--Mega.png b/src/canonical/minisprites/gen5/custom/384--420--Rayquaza--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Rayquaza--Mega.png rename to src/canonical/minisprites/gen5/custom/384--420--Rayquaza--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Lopunny--Mega.png b/src/canonical/minisprites/gen5/custom/428--420--Lopunny--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Lopunny--Mega.png rename to src/canonical/minisprites/gen5/custom/428--420--Lopunny--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Garchomp--Mega.png b/src/canonical/minisprites/gen5/custom/445--420--Garchomp--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Garchomp--Mega.png rename to src/canonical/minisprites/gen5/custom/445--420--Garchomp--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Lucario--Mega.png b/src/canonical/minisprites/gen5/custom/448--420--Lucario--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Lucario--Mega.png rename to src/canonical/minisprites/gen5/custom/448--420--Lucario--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Abomasnow--Mega.png b/src/canonical/minisprites/gen5/custom/460--420--Abomasnow--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Abomasnow--Mega.png rename to src/canonical/minisprites/gen5/custom/460--420--Abomasnow--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Gallade--Mega.png b/src/canonical/minisprites/gen5/custom/475--420--Gallade--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Gallade--Mega.png rename to src/canonical/minisprites/gen5/custom/475--420--Gallade--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Audino--Mega.png b/src/canonical/minisprites/gen5/custom/531--420--Audino--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Audino--Mega.png rename to src/canonical/minisprites/gen5/custom/531--420--Audino--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Charizard--Mega-X.png b/src/canonical/minisprites/gen5/custom/6--420--Charizard--Mega-X.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Charizard--Mega-X.png rename to src/canonical/minisprites/gen5/custom/6--420--Charizard--Mega-X.png diff --git a/src/canonical/minisprites/gen5/custom/Charizard--Mega-Y.png b/src/canonical/minisprites/gen5/custom/6--420--Charizard--Mega-Y.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Charizard--Mega-Y.png rename to src/canonical/minisprites/gen5/custom/6--420--Charizard--Mega-Y.png diff --git a/src/canonical/minisprites/gen5/custom/Alakazam--Mega.png b/src/canonical/minisprites/gen5/custom/65--420--Alakazam--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Alakazam--Mega.png rename to src/canonical/minisprites/gen5/custom/65--420--Alakazam--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Chespin.png b/src/canonical/minisprites/gen5/custom/650--0--Chespin.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Chespin.png rename to src/canonical/minisprites/gen5/custom/650--0--Chespin.png diff --git a/src/canonical/minisprites/gen5/custom/Quilladin.png b/src/canonical/minisprites/gen5/custom/651--0--Quilladin.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Quilladin.png rename to src/canonical/minisprites/gen5/custom/651--0--Quilladin.png diff --git a/src/canonical/minisprites/gen5/custom/Chesnaught.png b/src/canonical/minisprites/gen5/custom/652--0--Chesnaught.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Chesnaught.png rename to src/canonical/minisprites/gen5/custom/652--0--Chesnaught.png diff --git a/src/canonical/minisprites/gen5/custom/Fennekin.png b/src/canonical/minisprites/gen5/custom/653--0--Fennekin.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Fennekin.png rename to src/canonical/minisprites/gen5/custom/653--0--Fennekin.png diff --git a/src/canonical/minisprites/gen5/custom/Braixen.png b/src/canonical/minisprites/gen5/custom/654--0--Braixen.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Braixen.png rename to src/canonical/minisprites/gen5/custom/654--0--Braixen.png diff --git a/src/canonical/minisprites/gen5/custom/Delphox.png b/src/canonical/minisprites/gen5/custom/655--0--Delphox.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Delphox.png rename to src/canonical/minisprites/gen5/custom/655--0--Delphox.png diff --git a/src/canonical/minisprites/gen5/custom/Froakie.png b/src/canonical/minisprites/gen5/custom/656--0--Froakie.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Froakie.png rename to src/canonical/minisprites/gen5/custom/656--0--Froakie.png diff --git a/src/canonical/minisprites/gen5/custom/Frogadier.png b/src/canonical/minisprites/gen5/custom/657--0--Frogadier.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Frogadier.png rename to src/canonical/minisprites/gen5/custom/657--0--Frogadier.png diff --git a/src/canonical/minisprites/gen5/custom/Greninja.png b/src/canonical/minisprites/gen5/custom/658--0--Greninja.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Greninja.png rename to src/canonical/minisprites/gen5/custom/658--0--Greninja.png diff --git a/src/canonical/minisprites/gen5/custom/Bunnelby.png b/src/canonical/minisprites/gen5/custom/659--0--Bunnelby.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Bunnelby.png rename to src/canonical/minisprites/gen5/custom/659--0--Bunnelby.png diff --git a/src/canonical/minisprites/gen5/custom/Diggersby.png b/src/canonical/minisprites/gen5/custom/660--0--Diggersby.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Diggersby.png rename to src/canonical/minisprites/gen5/custom/660--0--Diggersby.png diff --git a/src/canonical/minisprites/gen5/custom/Fletchling.png b/src/canonical/minisprites/gen5/custom/661--0--Fletchling.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Fletchling.png rename to src/canonical/minisprites/gen5/custom/661--0--Fletchling.png diff --git a/src/canonical/minisprites/gen5/custom/Fletchinder.png b/src/canonical/minisprites/gen5/custom/662--0--Fletchinder.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Fletchinder.png rename to src/canonical/minisprites/gen5/custom/662--0--Fletchinder.png diff --git a/src/canonical/minisprites/gen5/custom/Talonflame.png b/src/canonical/minisprites/gen5/custom/663--0--Talonflame.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Talonflame.png rename to src/canonical/minisprites/gen5/custom/663--0--Talonflame.png diff --git a/src/canonical/minisprites/gen5/custom/Scatterbug.png b/src/canonical/minisprites/gen5/custom/664--0--Scatterbug.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Scatterbug.png rename to src/canonical/minisprites/gen5/custom/664--0--Scatterbug.png diff --git a/src/canonical/minisprites/gen5/custom/Spewpa.png b/src/canonical/minisprites/gen5/custom/665--0--Spewpa.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Spewpa.png rename to src/canonical/minisprites/gen5/custom/665--0--Spewpa.png diff --git a/src/canonical/minisprites/gen5/custom/Vivillon.png b/src/canonical/minisprites/gen5/custom/666--0--Vivillon.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Vivillon.png rename to src/canonical/minisprites/gen5/custom/666--0--Vivillon.png diff --git a/src/canonical/minisprites/gen5/custom/Litleo.png b/src/canonical/minisprites/gen5/custom/667--0--Litleo.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Litleo.png rename to src/canonical/minisprites/gen5/custom/667--0--Litleo.png diff --git a/src/canonical/minisprites/gen5/custom/Pyroar.png b/src/canonical/minisprites/gen5/custom/668--0--Pyroar.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Pyroar.png rename to src/canonical/minisprites/gen5/custom/668--0--Pyroar.png diff --git a/src/canonical/minisprites/gen5/custom/Flabe__0301be__0301.png b/src/canonical/minisprites/gen5/custom/669--0--Flabe__0301be__0301.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Flabe__0301be__0301.png rename to src/canonical/minisprites/gen5/custom/669--0--Flabe__0301be__0301.png diff --git a/src/canonical/minisprites/gen5/custom/Floette.png b/src/canonical/minisprites/gen5/custom/670--0--Floette.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Floette.png rename to src/canonical/minisprites/gen5/custom/670--0--Floette.png diff --git a/src/canonical/minisprites/gen5/custom/Floette--Eternal.png b/src/canonical/minisprites/gen5/custom/670--420--Floette--Eternal.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Floette--Eternal.png rename to src/canonical/minisprites/gen5/custom/670--420--Floette--Eternal.png diff --git a/src/canonical/minisprites/gen5/custom/Florges.png b/src/canonical/minisprites/gen5/custom/671--0--Florges.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Florges.png rename to src/canonical/minisprites/gen5/custom/671--0--Florges.png diff --git a/src/canonical/minisprites/gen5/custom/Skiddo.png b/src/canonical/minisprites/gen5/custom/672--0--Skiddo.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Skiddo.png rename to src/canonical/minisprites/gen5/custom/672--0--Skiddo.png diff --git a/src/canonical/minisprites/gen5/custom/Gogoat.png b/src/canonical/minisprites/gen5/custom/673--0--Gogoat.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Gogoat.png rename to src/canonical/minisprites/gen5/custom/673--0--Gogoat.png diff --git a/src/canonical/minisprites/gen5/custom/Pancham.png b/src/canonical/minisprites/gen5/custom/674--0--Pancham.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Pancham.png rename to src/canonical/minisprites/gen5/custom/674--0--Pancham.png diff --git a/src/canonical/minisprites/gen5/custom/Pangoro.png b/src/canonical/minisprites/gen5/custom/675--0--Pangoro.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Pangoro.png rename to src/canonical/minisprites/gen5/custom/675--0--Pangoro.png diff --git a/src/canonical/minisprites/gen5/custom/Furfrou.png b/src/canonical/minisprites/gen5/custom/676--0--Furfrou.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Furfrou.png rename to src/canonical/minisprites/gen5/custom/676--0--Furfrou.png diff --git a/src/canonical/minisprites/gen5/custom/Espurr.png b/src/canonical/minisprites/gen5/custom/677--0--Espurr.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Espurr.png rename to src/canonical/minisprites/gen5/custom/677--0--Espurr.png diff --git a/src/canonical/minisprites/gen5/custom/Meowstic.png b/src/canonical/minisprites/gen5/custom/678--0--Meowstic.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Meowstic.png rename to src/canonical/minisprites/gen5/custom/678--0--Meowstic.png diff --git a/src/canonical/minisprites/gen5/custom/Meowstic--F.png b/src/canonical/minisprites/gen5/custom/678--420--Meowstic--F.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Meowstic--F.png rename to src/canonical/minisprites/gen5/custom/678--420--Meowstic--F.png diff --git a/src/canonical/minisprites/gen5/custom/Honedge.png b/src/canonical/minisprites/gen5/custom/679--0--Honedge.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Honedge.png rename to src/canonical/minisprites/gen5/custom/679--0--Honedge.png diff --git a/src/canonical/minisprites/gen5/custom/Doublade.png b/src/canonical/minisprites/gen5/custom/680--0--Doublade.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Doublade.png rename to src/canonical/minisprites/gen5/custom/680--0--Doublade.png diff --git a/src/canonical/minisprites/gen5/custom/Aegislash.png b/src/canonical/minisprites/gen5/custom/681--0--Aegislash.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Aegislash.png rename to src/canonical/minisprites/gen5/custom/681--0--Aegislash.png diff --git a/src/canonical/minisprites/gen5/custom/Spritzee.png b/src/canonical/minisprites/gen5/custom/682--0--Spritzee.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Spritzee.png rename to src/canonical/minisprites/gen5/custom/682--0--Spritzee.png diff --git a/src/canonical/minisprites/gen5/custom/Aromatisse.png b/src/canonical/minisprites/gen5/custom/683--0--Aromatisse.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Aromatisse.png rename to src/canonical/minisprites/gen5/custom/683--0--Aromatisse.png diff --git a/src/canonical/minisprites/gen5/custom/Swirlix.png b/src/canonical/minisprites/gen5/custom/684--0--Swirlix.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Swirlix.png rename to src/canonical/minisprites/gen5/custom/684--0--Swirlix.png diff --git a/src/canonical/minisprites/gen5/custom/Slurpuff.png b/src/canonical/minisprites/gen5/custom/685--0--Slurpuff.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Slurpuff.png rename to src/canonical/minisprites/gen5/custom/685--0--Slurpuff.png diff --git a/src/canonical/minisprites/gen5/custom/Inkay.png b/src/canonical/minisprites/gen5/custom/686--0--Inkay.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Inkay.png rename to src/canonical/minisprites/gen5/custom/686--0--Inkay.png diff --git a/src/canonical/minisprites/gen5/custom/Malamar.png b/src/canonical/minisprites/gen5/custom/687--0--Malamar.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Malamar.png rename to src/canonical/minisprites/gen5/custom/687--0--Malamar.png diff --git a/src/canonical/minisprites/gen5/custom/Binacle.png b/src/canonical/minisprites/gen5/custom/688--0--Binacle.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Binacle.png rename to src/canonical/minisprites/gen5/custom/688--0--Binacle.png diff --git a/src/canonical/minisprites/gen5/custom/Barbaracle.png b/src/canonical/minisprites/gen5/custom/689--0--Barbaracle.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Barbaracle.png rename to src/canonical/minisprites/gen5/custom/689--0--Barbaracle.png diff --git a/src/canonical/minisprites/gen5/custom/Skrelp.png b/src/canonical/minisprites/gen5/custom/690--0--Skrelp.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Skrelp.png rename to src/canonical/minisprites/gen5/custom/690--0--Skrelp.png diff --git a/src/canonical/minisprites/gen5/custom/Dragalge.png b/src/canonical/minisprites/gen5/custom/691--0--Dragalge.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Dragalge.png rename to src/canonical/minisprites/gen5/custom/691--0--Dragalge.png diff --git a/src/canonical/minisprites/gen5/custom/Clauncher.png b/src/canonical/minisprites/gen5/custom/692--0--Clauncher.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Clauncher.png rename to src/canonical/minisprites/gen5/custom/692--0--Clauncher.png diff --git a/src/canonical/minisprites/gen5/custom/Clawitzer.png b/src/canonical/minisprites/gen5/custom/693--0--Clawitzer.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Clawitzer.png rename to src/canonical/minisprites/gen5/custom/693--0--Clawitzer.png diff --git a/src/canonical/minisprites/gen5/custom/Helioptile.png b/src/canonical/minisprites/gen5/custom/694--0--Helioptile.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Helioptile.png rename to src/canonical/minisprites/gen5/custom/694--0--Helioptile.png diff --git a/src/canonical/minisprites/gen5/custom/Heliolisk.png b/src/canonical/minisprites/gen5/custom/695--0--Heliolisk.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Heliolisk.png rename to src/canonical/minisprites/gen5/custom/695--0--Heliolisk.png diff --git a/src/canonical/minisprites/gen5/custom/Tyrunt.png b/src/canonical/minisprites/gen5/custom/696--0--Tyrunt.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Tyrunt.png rename to src/canonical/minisprites/gen5/custom/696--0--Tyrunt.png diff --git a/src/canonical/minisprites/gen5/custom/Tyrantrum.png b/src/canonical/minisprites/gen5/custom/697--0--Tyrantrum.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Tyrantrum.png rename to src/canonical/minisprites/gen5/custom/697--0--Tyrantrum.png diff --git a/src/canonical/minisprites/gen5/custom/Amaura.png b/src/canonical/minisprites/gen5/custom/698--0--Amaura.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Amaura.png rename to src/canonical/minisprites/gen5/custom/698--0--Amaura.png diff --git a/src/canonical/minisprites/gen5/custom/Aurorus.png b/src/canonical/minisprites/gen5/custom/699--0--Aurorus.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Aurorus.png rename to src/canonical/minisprites/gen5/custom/699--0--Aurorus.png diff --git a/src/canonical/minisprites/gen5/custom/Sylveon.png b/src/canonical/minisprites/gen5/custom/700--0--Sylveon.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Sylveon.png rename to src/canonical/minisprites/gen5/custom/700--0--Sylveon.png diff --git a/src/canonical/minisprites/gen5/custom/Hawlucha.png b/src/canonical/minisprites/gen5/custom/701--0--Hawlucha.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Hawlucha.png rename to src/canonical/minisprites/gen5/custom/701--0--Hawlucha.png diff --git a/src/canonical/minisprites/gen5/custom/Dedenne.png b/src/canonical/minisprites/gen5/custom/702--0--Dedenne.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Dedenne.png rename to src/canonical/minisprites/gen5/custom/702--0--Dedenne.png diff --git a/src/canonical/minisprites/gen5/custom/Carbink.png b/src/canonical/minisprites/gen5/custom/703--0--Carbink.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Carbink.png rename to src/canonical/minisprites/gen5/custom/703--0--Carbink.png diff --git a/src/canonical/minisprites/gen5/custom/Goomy.png b/src/canonical/minisprites/gen5/custom/704--0--Goomy.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Goomy.png rename to src/canonical/minisprites/gen5/custom/704--0--Goomy.png diff --git a/src/canonical/minisprites/gen5/custom/Sliggoo.png b/src/canonical/minisprites/gen5/custom/705--0--Sliggoo.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Sliggoo.png rename to src/canonical/minisprites/gen5/custom/705--0--Sliggoo.png diff --git a/src/canonical/minisprites/gen5/custom/Goodra.png b/src/canonical/minisprites/gen5/custom/706--0--Goodra.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Goodra.png rename to src/canonical/minisprites/gen5/custom/706--0--Goodra.png diff --git a/src/canonical/minisprites/gen5/custom/Klefki.png b/src/canonical/minisprites/gen5/custom/707--0--Klefki.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Klefki.png rename to src/canonical/minisprites/gen5/custom/707--0--Klefki.png diff --git a/src/canonical/minisprites/gen5/custom/Phantump.png b/src/canonical/minisprites/gen5/custom/708--0--Phantump.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Phantump.png rename to src/canonical/minisprites/gen5/custom/708--0--Phantump.png diff --git a/src/canonical/minisprites/gen5/custom/Trevenant.png b/src/canonical/minisprites/gen5/custom/709--0--Trevenant.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Trevenant.png rename to src/canonical/minisprites/gen5/custom/709--0--Trevenant.png diff --git a/src/canonical/minisprites/gen5/custom/Pumpkaboo.png b/src/canonical/minisprites/gen5/custom/710--0--Pumpkaboo.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Pumpkaboo.png rename to src/canonical/minisprites/gen5/custom/710--0--Pumpkaboo.png diff --git a/src/canonical/minisprites/gen5/custom/Gourgeist.png b/src/canonical/minisprites/gen5/custom/711--0--Gourgeist.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Gourgeist.png rename to src/canonical/minisprites/gen5/custom/711--0--Gourgeist.png diff --git a/src/canonical/minisprites/gen5/custom/Bergmite.png b/src/canonical/minisprites/gen5/custom/712--0--Bergmite.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Bergmite.png rename to src/canonical/minisprites/gen5/custom/712--0--Bergmite.png diff --git a/src/canonical/minisprites/gen5/custom/Avalugg.png b/src/canonical/minisprites/gen5/custom/713--0--Avalugg.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Avalugg.png rename to src/canonical/minisprites/gen5/custom/713--0--Avalugg.png diff --git a/src/canonical/minisprites/gen5/custom/Noibat.png b/src/canonical/minisprites/gen5/custom/714--0--Noibat.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Noibat.png rename to src/canonical/minisprites/gen5/custom/714--0--Noibat.png diff --git a/src/canonical/minisprites/gen5/custom/Noivern.png b/src/canonical/minisprites/gen5/custom/715--0--Noivern.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Noivern.png rename to src/canonical/minisprites/gen5/custom/715--0--Noivern.png diff --git a/src/canonical/minisprites/gen5/custom/Xerneas.png b/src/canonical/minisprites/gen5/custom/716--0--Xerneas.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Xerneas.png rename to src/canonical/minisprites/gen5/custom/716--0--Xerneas.png diff --git a/src/canonical/minisprites/gen5/custom/Yveltal.png b/src/canonical/minisprites/gen5/custom/717--0--Yveltal.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Yveltal.png rename to src/canonical/minisprites/gen5/custom/717--0--Yveltal.png diff --git a/src/canonical/minisprites/gen5/custom/Zygarde.png b/src/canonical/minisprites/gen5/custom/718--0--Zygarde.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Zygarde.png rename to src/canonical/minisprites/gen5/custom/718--0--Zygarde.png diff --git a/src/canonical/minisprites/gen5/custom/Diancie.png b/src/canonical/minisprites/gen5/custom/719--0--Diancie.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Diancie.png rename to src/canonical/minisprites/gen5/custom/719--0--Diancie.png diff --git a/src/canonical/minisprites/gen5/custom/Diancie--Mega.png b/src/canonical/minisprites/gen5/custom/719--420--Diancie--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Diancie--Mega.png rename to src/canonical/minisprites/gen5/custom/719--420--Diancie--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Hoopa.png b/src/canonical/minisprites/gen5/custom/720--0--Hoopa.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Hoopa.png rename to src/canonical/minisprites/gen5/custom/720--0--Hoopa.png diff --git a/src/canonical/minisprites/gen5/custom/Hoopa--Unbound.png b/src/canonical/minisprites/gen5/custom/720--420--Hoopa--Unbound.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Hoopa--Unbound.png rename to src/canonical/minisprites/gen5/custom/720--420--Hoopa--Unbound.png diff --git a/src/canonical/minisprites/gen5/custom/Volcanion.png b/src/canonical/minisprites/gen5/custom/721--0--Volcanion.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Volcanion.png rename to src/canonical/minisprites/gen5/custom/721--0--Volcanion.png diff --git a/src/canonical/minisprites/gen5/custom/Slowbro--Mega.png b/src/canonical/minisprites/gen5/custom/80--420--Slowbro--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Slowbro--Mega.png rename to src/canonical/minisprites/gen5/custom/80--420--Slowbro--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Blastoise--Mega.png b/src/canonical/minisprites/gen5/custom/9--420--Blastoise--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Blastoise--Mega.png rename to src/canonical/minisprites/gen5/custom/9--420--Blastoise--Mega.png diff --git a/src/canonical/minisprites/gen5/custom/Gengar--Mega.png b/src/canonical/minisprites/gen5/custom/94--420--Gengar--Mega.png similarity index 100% rename from src/canonical/minisprites/gen5/custom/Gengar--Mega.png rename to src/canonical/minisprites/gen5/custom/94--420--Gengar--Mega.png diff --git a/src/canonical/minisprites/gen5/pokemon/Bulbasaur.png b/src/canonical/minisprites/gen5/pokemon/1--0--Bulbasaur.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Bulbasaur.png rename to src/canonical/minisprites/gen5/pokemon/1--0--Bulbasaur.png diff --git a/src/canonical/minisprites/gen5/pokemon/Caterpie.png b/src/canonical/minisprites/gen5/pokemon/10--0--Caterpie.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Caterpie.png rename to src/canonical/minisprites/gen5/pokemon/10--0--Caterpie.png diff --git a/src/canonical/minisprites/gen5/pokemon/Voltorb.png b/src/canonical/minisprites/gen5/pokemon/100--0--Voltorb.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Voltorb.png rename to src/canonical/minisprites/gen5/pokemon/100--0--Voltorb.png diff --git a/src/canonical/minisprites/gen5/pokemon/Electrode.png b/src/canonical/minisprites/gen5/pokemon/101--0--Electrode.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Electrode.png rename to src/canonical/minisprites/gen5/pokemon/101--0--Electrode.png diff --git a/src/canonical/minisprites/gen5/pokemon/Exeggcute.png b/src/canonical/minisprites/gen5/pokemon/102--0--Exeggcute.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Exeggcute.png rename to src/canonical/minisprites/gen5/pokemon/102--0--Exeggcute.png diff --git a/src/canonical/minisprites/gen5/pokemon/Exeggutor.png b/src/canonical/minisprites/gen5/pokemon/103--0--Exeggutor.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Exeggutor.png rename to src/canonical/minisprites/gen5/pokemon/103--0--Exeggutor.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cubone.png b/src/canonical/minisprites/gen5/pokemon/104--0--Cubone.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cubone.png rename to src/canonical/minisprites/gen5/pokemon/104--0--Cubone.png diff --git a/src/canonical/minisprites/gen5/pokemon/Marowak.png b/src/canonical/minisprites/gen5/pokemon/105--0--Marowak.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Marowak.png rename to src/canonical/minisprites/gen5/pokemon/105--0--Marowak.png diff --git a/src/canonical/minisprites/gen5/pokemon/Hitmonlee.png b/src/canonical/minisprites/gen5/pokemon/106--0--Hitmonlee.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Hitmonlee.png rename to src/canonical/minisprites/gen5/pokemon/106--0--Hitmonlee.png diff --git a/src/canonical/minisprites/gen5/pokemon/Hitmonchan.png b/src/canonical/minisprites/gen5/pokemon/107--0--Hitmonchan.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Hitmonchan.png rename to src/canonical/minisprites/gen5/pokemon/107--0--Hitmonchan.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lickitung.png b/src/canonical/minisprites/gen5/pokemon/108--0--Lickitung.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lickitung.png rename to src/canonical/minisprites/gen5/pokemon/108--0--Lickitung.png diff --git a/src/canonical/minisprites/gen5/pokemon/Koffing.png b/src/canonical/minisprites/gen5/pokemon/109--0--Koffing.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Koffing.png rename to src/canonical/minisprites/gen5/pokemon/109--0--Koffing.png diff --git a/src/canonical/minisprites/gen5/pokemon/Metapod.png b/src/canonical/minisprites/gen5/pokemon/11--0--Metapod.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Metapod.png rename to src/canonical/minisprites/gen5/pokemon/11--0--Metapod.png diff --git a/src/canonical/minisprites/gen5/pokemon/Weezing.png b/src/canonical/minisprites/gen5/pokemon/110--0--Weezing.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Weezing.png rename to src/canonical/minisprites/gen5/pokemon/110--0--Weezing.png diff --git a/src/canonical/minisprites/gen5/pokemon/Rhyhorn.png b/src/canonical/minisprites/gen5/pokemon/111--0--Rhyhorn.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Rhyhorn.png rename to src/canonical/minisprites/gen5/pokemon/111--0--Rhyhorn.png diff --git a/src/canonical/minisprites/gen5/pokemon/Rhydon.png b/src/canonical/minisprites/gen5/pokemon/112--0--Rhydon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Rhydon.png rename to src/canonical/minisprites/gen5/pokemon/112--0--Rhydon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Chansey.png b/src/canonical/minisprites/gen5/pokemon/113--0--Chansey.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Chansey.png rename to src/canonical/minisprites/gen5/pokemon/113--0--Chansey.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tangela.png b/src/canonical/minisprites/gen5/pokemon/114--0--Tangela.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tangela.png rename to src/canonical/minisprites/gen5/pokemon/114--0--Tangela.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kangaskhan.png b/src/canonical/minisprites/gen5/pokemon/115--0--Kangaskhan.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kangaskhan.png rename to src/canonical/minisprites/gen5/pokemon/115--0--Kangaskhan.png diff --git a/src/canonical/minisprites/gen5/pokemon/Horsea.png b/src/canonical/minisprites/gen5/pokemon/116--0--Horsea.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Horsea.png rename to src/canonical/minisprites/gen5/pokemon/116--0--Horsea.png diff --git a/src/canonical/minisprites/gen5/pokemon/Seadra.png b/src/canonical/minisprites/gen5/pokemon/117--0--Seadra.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Seadra.png rename to src/canonical/minisprites/gen5/pokemon/117--0--Seadra.png diff --git a/src/canonical/minisprites/gen5/pokemon/Goldeen.png b/src/canonical/minisprites/gen5/pokemon/118--0--Goldeen.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Goldeen.png rename to src/canonical/minisprites/gen5/pokemon/118--0--Goldeen.png diff --git a/src/canonical/minisprites/gen5/pokemon/Seaking.png b/src/canonical/minisprites/gen5/pokemon/119--0--Seaking.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Seaking.png rename to src/canonical/minisprites/gen5/pokemon/119--0--Seaking.png diff --git a/src/canonical/minisprites/gen5/pokemon/Butterfree.png b/src/canonical/minisprites/gen5/pokemon/12--0--Butterfree.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Butterfree.png rename to src/canonical/minisprites/gen5/pokemon/12--0--Butterfree.png diff --git a/src/canonical/minisprites/gen5/pokemon/Staryu.png b/src/canonical/minisprites/gen5/pokemon/120--0--Staryu.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Staryu.png rename to src/canonical/minisprites/gen5/pokemon/120--0--Staryu.png diff --git a/src/canonical/minisprites/gen5/pokemon/Starmie.png b/src/canonical/minisprites/gen5/pokemon/121--0--Starmie.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Starmie.png rename to src/canonical/minisprites/gen5/pokemon/121--0--Starmie.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mr._Mime.png b/src/canonical/minisprites/gen5/pokemon/122--0--Mr._Mime.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mr._Mime.png rename to src/canonical/minisprites/gen5/pokemon/122--0--Mr._Mime.png diff --git a/src/canonical/minisprites/gen5/pokemon/Scyther.png b/src/canonical/minisprites/gen5/pokemon/123--0--Scyther.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Scyther.png rename to src/canonical/minisprites/gen5/pokemon/123--0--Scyther.png diff --git a/src/canonical/minisprites/gen5/pokemon/Jynx.png b/src/canonical/minisprites/gen5/pokemon/124--0--Jynx.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Jynx.png rename to src/canonical/minisprites/gen5/pokemon/124--0--Jynx.png diff --git a/src/canonical/minisprites/gen5/pokemon/Electabuzz.png b/src/canonical/minisprites/gen5/pokemon/125--0--Electabuzz.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Electabuzz.png rename to src/canonical/minisprites/gen5/pokemon/125--0--Electabuzz.png diff --git a/src/canonical/minisprites/gen5/pokemon/Magmar.png b/src/canonical/minisprites/gen5/pokemon/126--0--Magmar.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Magmar.png rename to src/canonical/minisprites/gen5/pokemon/126--0--Magmar.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pinsir.png b/src/canonical/minisprites/gen5/pokemon/127--0--Pinsir.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pinsir.png rename to src/canonical/minisprites/gen5/pokemon/127--0--Pinsir.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tauros.png b/src/canonical/minisprites/gen5/pokemon/128--0--Tauros.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tauros.png rename to src/canonical/minisprites/gen5/pokemon/128--0--Tauros.png diff --git a/src/canonical/minisprites/gen5/pokemon/Magikarp.png b/src/canonical/minisprites/gen5/pokemon/129--0--Magikarp.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Magikarp.png rename to src/canonical/minisprites/gen5/pokemon/129--0--Magikarp.png diff --git a/src/canonical/minisprites/gen5/pokemon/Weedle.png b/src/canonical/minisprites/gen5/pokemon/13--0--Weedle.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Weedle.png rename to src/canonical/minisprites/gen5/pokemon/13--0--Weedle.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gyarados.png b/src/canonical/minisprites/gen5/pokemon/130--0--Gyarados.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gyarados.png rename to src/canonical/minisprites/gen5/pokemon/130--0--Gyarados.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lapras.png b/src/canonical/minisprites/gen5/pokemon/131--0--Lapras.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lapras.png rename to src/canonical/minisprites/gen5/pokemon/131--0--Lapras.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ditto.png b/src/canonical/minisprites/gen5/pokemon/132--0--Ditto.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ditto.png rename to src/canonical/minisprites/gen5/pokemon/132--0--Ditto.png diff --git a/src/canonical/minisprites/gen5/pokemon/Eevee.png b/src/canonical/minisprites/gen5/pokemon/133--0--Eevee.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Eevee.png rename to src/canonical/minisprites/gen5/pokemon/133--0--Eevee.png diff --git a/src/canonical/minisprites/gen5/pokemon/Vaporeon.png b/src/canonical/minisprites/gen5/pokemon/134--0--Vaporeon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Vaporeon.png rename to src/canonical/minisprites/gen5/pokemon/134--0--Vaporeon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Jolteon.png b/src/canonical/minisprites/gen5/pokemon/135--0--Jolteon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Jolteon.png rename to src/canonical/minisprites/gen5/pokemon/135--0--Jolteon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Flareon.png b/src/canonical/minisprites/gen5/pokemon/136--0--Flareon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Flareon.png rename to src/canonical/minisprites/gen5/pokemon/136--0--Flareon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Porygon.png b/src/canonical/minisprites/gen5/pokemon/137--0--Porygon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Porygon.png rename to src/canonical/minisprites/gen5/pokemon/137--0--Porygon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Omanyte.png b/src/canonical/minisprites/gen5/pokemon/138--0--Omanyte.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Omanyte.png rename to src/canonical/minisprites/gen5/pokemon/138--0--Omanyte.png diff --git a/src/canonical/minisprites/gen5/pokemon/Omastar.png b/src/canonical/minisprites/gen5/pokemon/139--0--Omastar.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Omastar.png rename to src/canonical/minisprites/gen5/pokemon/139--0--Omastar.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kakuna.png b/src/canonical/minisprites/gen5/pokemon/14--0--Kakuna.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kakuna.png rename to src/canonical/minisprites/gen5/pokemon/14--0--Kakuna.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kabuto.png b/src/canonical/minisprites/gen5/pokemon/140--0--Kabuto.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kabuto.png rename to src/canonical/minisprites/gen5/pokemon/140--0--Kabuto.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kabutops.png b/src/canonical/minisprites/gen5/pokemon/141--0--Kabutops.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kabutops.png rename to src/canonical/minisprites/gen5/pokemon/141--0--Kabutops.png diff --git a/src/canonical/minisprites/gen5/pokemon/Aerodactyl.png b/src/canonical/minisprites/gen5/pokemon/142--0--Aerodactyl.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Aerodactyl.png rename to src/canonical/minisprites/gen5/pokemon/142--0--Aerodactyl.png diff --git a/src/canonical/minisprites/gen5/pokemon/Snorlax.png b/src/canonical/minisprites/gen5/pokemon/143--0--Snorlax.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Snorlax.png rename to src/canonical/minisprites/gen5/pokemon/143--0--Snorlax.png diff --git a/src/canonical/minisprites/gen5/pokemon/Articuno.png b/src/canonical/minisprites/gen5/pokemon/144--0--Articuno.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Articuno.png rename to src/canonical/minisprites/gen5/pokemon/144--0--Articuno.png diff --git a/src/canonical/minisprites/gen5/pokemon/Zapdos.png b/src/canonical/minisprites/gen5/pokemon/145--0--Zapdos.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Zapdos.png rename to src/canonical/minisprites/gen5/pokemon/145--0--Zapdos.png diff --git a/src/canonical/minisprites/gen5/pokemon/Moltres.png b/src/canonical/minisprites/gen5/pokemon/146--0--Moltres.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Moltres.png rename to src/canonical/minisprites/gen5/pokemon/146--0--Moltres.png diff --git a/src/canonical/minisprites/gen5/pokemon/Dratini.png b/src/canonical/minisprites/gen5/pokemon/147--0--Dratini.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Dratini.png rename to src/canonical/minisprites/gen5/pokemon/147--0--Dratini.png diff --git a/src/canonical/minisprites/gen5/pokemon/Dragonair.png b/src/canonical/minisprites/gen5/pokemon/148--0--Dragonair.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Dragonair.png rename to src/canonical/minisprites/gen5/pokemon/148--0--Dragonair.png diff --git a/src/canonical/minisprites/gen5/pokemon/Dragonite.png b/src/canonical/minisprites/gen5/pokemon/149--0--Dragonite.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Dragonite.png rename to src/canonical/minisprites/gen5/pokemon/149--0--Dragonite.png diff --git a/src/canonical/minisprites/gen5/pokemon/Beedrill.png b/src/canonical/minisprites/gen5/pokemon/15--0--Beedrill.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Beedrill.png rename to src/canonical/minisprites/gen5/pokemon/15--0--Beedrill.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mewtwo.png b/src/canonical/minisprites/gen5/pokemon/150--0--Mewtwo.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mewtwo.png rename to src/canonical/minisprites/gen5/pokemon/150--0--Mewtwo.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mew.png b/src/canonical/minisprites/gen5/pokemon/151--0--Mew.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mew.png rename to src/canonical/minisprites/gen5/pokemon/151--0--Mew.png diff --git a/src/canonical/minisprites/gen5/pokemon/Chikorita.png b/src/canonical/minisprites/gen5/pokemon/152--0--Chikorita.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Chikorita.png rename to src/canonical/minisprites/gen5/pokemon/152--0--Chikorita.png diff --git a/src/canonical/minisprites/gen5/pokemon/Bayleef.png b/src/canonical/minisprites/gen5/pokemon/153--0--Bayleef.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Bayleef.png rename to src/canonical/minisprites/gen5/pokemon/153--0--Bayleef.png diff --git a/src/canonical/minisprites/gen5/pokemon/Meganium.png b/src/canonical/minisprites/gen5/pokemon/154--0--Meganium.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Meganium.png rename to src/canonical/minisprites/gen5/pokemon/154--0--Meganium.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cyndaquil.png b/src/canonical/minisprites/gen5/pokemon/155--0--Cyndaquil.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cyndaquil.png rename to src/canonical/minisprites/gen5/pokemon/155--0--Cyndaquil.png diff --git a/src/canonical/minisprites/gen5/pokemon/Quilava.png b/src/canonical/minisprites/gen5/pokemon/156--0--Quilava.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Quilava.png rename to src/canonical/minisprites/gen5/pokemon/156--0--Quilava.png diff --git a/src/canonical/minisprites/gen5/pokemon/Typhlosion.png b/src/canonical/minisprites/gen5/pokemon/157--0--Typhlosion.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Typhlosion.png rename to src/canonical/minisprites/gen5/pokemon/157--0--Typhlosion.png diff --git a/src/canonical/minisprites/gen5/pokemon/Totodile.png b/src/canonical/minisprites/gen5/pokemon/158--0--Totodile.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Totodile.png rename to src/canonical/minisprites/gen5/pokemon/158--0--Totodile.png diff --git a/src/canonical/minisprites/gen5/pokemon/Croconaw.png b/src/canonical/minisprites/gen5/pokemon/159--0--Croconaw.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Croconaw.png rename to src/canonical/minisprites/gen5/pokemon/159--0--Croconaw.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pidgey.png b/src/canonical/minisprites/gen5/pokemon/16--0--Pidgey.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pidgey.png rename to src/canonical/minisprites/gen5/pokemon/16--0--Pidgey.png diff --git a/src/canonical/minisprites/gen5/pokemon/Feraligatr.png b/src/canonical/minisprites/gen5/pokemon/160--0--Feraligatr.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Feraligatr.png rename to src/canonical/minisprites/gen5/pokemon/160--0--Feraligatr.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sentret.png b/src/canonical/minisprites/gen5/pokemon/161--0--Sentret.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sentret.png rename to src/canonical/minisprites/gen5/pokemon/161--0--Sentret.png diff --git a/src/canonical/minisprites/gen5/pokemon/Furret.png b/src/canonical/minisprites/gen5/pokemon/162--0--Furret.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Furret.png rename to src/canonical/minisprites/gen5/pokemon/162--0--Furret.png diff --git a/src/canonical/minisprites/gen5/pokemon/Hoothoot.png b/src/canonical/minisprites/gen5/pokemon/163--0--Hoothoot.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Hoothoot.png rename to src/canonical/minisprites/gen5/pokemon/163--0--Hoothoot.png diff --git a/src/canonical/minisprites/gen5/pokemon/Noctowl.png b/src/canonical/minisprites/gen5/pokemon/164--0--Noctowl.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Noctowl.png rename to src/canonical/minisprites/gen5/pokemon/164--0--Noctowl.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ledyba.png b/src/canonical/minisprites/gen5/pokemon/165--0--Ledyba.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ledyba.png rename to src/canonical/minisprites/gen5/pokemon/165--0--Ledyba.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ledian.png b/src/canonical/minisprites/gen5/pokemon/166--0--Ledian.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ledian.png rename to src/canonical/minisprites/gen5/pokemon/166--0--Ledian.png diff --git a/src/canonical/minisprites/gen5/pokemon/Spinarak.png b/src/canonical/minisprites/gen5/pokemon/167--0--Spinarak.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Spinarak.png rename to src/canonical/minisprites/gen5/pokemon/167--0--Spinarak.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ariados.png b/src/canonical/minisprites/gen5/pokemon/168--0--Ariados.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ariados.png rename to src/canonical/minisprites/gen5/pokemon/168--0--Ariados.png diff --git a/src/canonical/minisprites/gen5/pokemon/Crobat.png b/src/canonical/minisprites/gen5/pokemon/169--0--Crobat.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Crobat.png rename to src/canonical/minisprites/gen5/pokemon/169--0--Crobat.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pidgeotto.png b/src/canonical/minisprites/gen5/pokemon/17--0--Pidgeotto.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pidgeotto.png rename to src/canonical/minisprites/gen5/pokemon/17--0--Pidgeotto.png diff --git a/src/canonical/minisprites/gen5/pokemon/Chinchou.png b/src/canonical/minisprites/gen5/pokemon/170--0--Chinchou.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Chinchou.png rename to src/canonical/minisprites/gen5/pokemon/170--0--Chinchou.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lanturn.png b/src/canonical/minisprites/gen5/pokemon/171--0--Lanturn.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lanturn.png rename to src/canonical/minisprites/gen5/pokemon/171--0--Lanturn.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pichu.png b/src/canonical/minisprites/gen5/pokemon/172--0--Pichu.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pichu.png rename to src/canonical/minisprites/gen5/pokemon/172--0--Pichu.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cleffa.png b/src/canonical/minisprites/gen5/pokemon/173--0--Cleffa.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cleffa.png rename to src/canonical/minisprites/gen5/pokemon/173--0--Cleffa.png diff --git a/src/canonical/minisprites/gen5/pokemon/Igglybuff.png b/src/canonical/minisprites/gen5/pokemon/174--0--Igglybuff.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Igglybuff.png rename to src/canonical/minisprites/gen5/pokemon/174--0--Igglybuff.png diff --git a/src/canonical/minisprites/gen5/pokemon/Togepi.png b/src/canonical/minisprites/gen5/pokemon/175--0--Togepi.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Togepi.png rename to src/canonical/minisprites/gen5/pokemon/175--0--Togepi.png diff --git a/src/canonical/minisprites/gen5/pokemon/Togetic.png b/src/canonical/minisprites/gen5/pokemon/176--0--Togetic.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Togetic.png rename to src/canonical/minisprites/gen5/pokemon/176--0--Togetic.png diff --git a/src/canonical/minisprites/gen5/pokemon/Natu.png b/src/canonical/minisprites/gen5/pokemon/177--0--Natu.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Natu.png rename to src/canonical/minisprites/gen5/pokemon/177--0--Natu.png diff --git a/src/canonical/minisprites/gen5/pokemon/Xatu.png b/src/canonical/minisprites/gen5/pokemon/178--0--Xatu.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Xatu.png rename to src/canonical/minisprites/gen5/pokemon/178--0--Xatu.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mareep.png b/src/canonical/minisprites/gen5/pokemon/179--0--Mareep.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mareep.png rename to src/canonical/minisprites/gen5/pokemon/179--0--Mareep.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pidgeot.png b/src/canonical/minisprites/gen5/pokemon/18--0--Pidgeot.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pidgeot.png rename to src/canonical/minisprites/gen5/pokemon/18--0--Pidgeot.png diff --git a/src/canonical/minisprites/gen5/pokemon/Flaaffy.png b/src/canonical/minisprites/gen5/pokemon/180--0--Flaaffy.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Flaaffy.png rename to src/canonical/minisprites/gen5/pokemon/180--0--Flaaffy.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ampharos.png b/src/canonical/minisprites/gen5/pokemon/181--0--Ampharos.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ampharos.png rename to src/canonical/minisprites/gen5/pokemon/181--0--Ampharos.png diff --git a/src/canonical/minisprites/gen5/pokemon/Bellossom.png b/src/canonical/minisprites/gen5/pokemon/182--0--Bellossom.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Bellossom.png rename to src/canonical/minisprites/gen5/pokemon/182--0--Bellossom.png diff --git a/src/canonical/minisprites/gen5/pokemon/Marill.png b/src/canonical/minisprites/gen5/pokemon/183--0--Marill.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Marill.png rename to src/canonical/minisprites/gen5/pokemon/183--0--Marill.png diff --git a/src/canonical/minisprites/gen5/pokemon/Azumarill.png b/src/canonical/minisprites/gen5/pokemon/184--0--Azumarill.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Azumarill.png rename to src/canonical/minisprites/gen5/pokemon/184--0--Azumarill.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sudowoodo.png b/src/canonical/minisprites/gen5/pokemon/185--0--Sudowoodo.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sudowoodo.png rename to src/canonical/minisprites/gen5/pokemon/185--0--Sudowoodo.png diff --git a/src/canonical/minisprites/gen5/pokemon/Politoed.png b/src/canonical/minisprites/gen5/pokemon/186--0--Politoed.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Politoed.png rename to src/canonical/minisprites/gen5/pokemon/186--0--Politoed.png diff --git a/src/canonical/minisprites/gen5/pokemon/Hoppip.png b/src/canonical/minisprites/gen5/pokemon/187--0--Hoppip.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Hoppip.png rename to src/canonical/minisprites/gen5/pokemon/187--0--Hoppip.png diff --git a/src/canonical/minisprites/gen5/pokemon/Skiploom.png b/src/canonical/minisprites/gen5/pokemon/188--0--Skiploom.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Skiploom.png rename to src/canonical/minisprites/gen5/pokemon/188--0--Skiploom.png diff --git a/src/canonical/minisprites/gen5/pokemon/Jumpluff.png b/src/canonical/minisprites/gen5/pokemon/189--0--Jumpluff.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Jumpluff.png rename to src/canonical/minisprites/gen5/pokemon/189--0--Jumpluff.png diff --git a/src/canonical/minisprites/gen5/pokemon/Rattata.png b/src/canonical/minisprites/gen5/pokemon/19--0--Rattata.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Rattata.png rename to src/canonical/minisprites/gen5/pokemon/19--0--Rattata.png diff --git a/src/canonical/minisprites/gen5/pokemon/Aipom.png b/src/canonical/minisprites/gen5/pokemon/190--0--Aipom.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Aipom.png rename to src/canonical/minisprites/gen5/pokemon/190--0--Aipom.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sunkern.png b/src/canonical/minisprites/gen5/pokemon/191--0--Sunkern.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sunkern.png rename to src/canonical/minisprites/gen5/pokemon/191--0--Sunkern.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sunflora.png b/src/canonical/minisprites/gen5/pokemon/192--0--Sunflora.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sunflora.png rename to src/canonical/minisprites/gen5/pokemon/192--0--Sunflora.png diff --git a/src/canonical/minisprites/gen5/pokemon/Yanma.png b/src/canonical/minisprites/gen5/pokemon/193--0--Yanma.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Yanma.png rename to src/canonical/minisprites/gen5/pokemon/193--0--Yanma.png diff --git a/src/canonical/minisprites/gen5/pokemon/Wooper.png b/src/canonical/minisprites/gen5/pokemon/194--0--Wooper.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Wooper.png rename to src/canonical/minisprites/gen5/pokemon/194--0--Wooper.png diff --git a/src/canonical/minisprites/gen5/pokemon/Quagsire.png b/src/canonical/minisprites/gen5/pokemon/195--0--Quagsire.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Quagsire.png rename to src/canonical/minisprites/gen5/pokemon/195--0--Quagsire.png diff --git a/src/canonical/minisprites/gen5/pokemon/Espeon.png b/src/canonical/minisprites/gen5/pokemon/196--0--Espeon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Espeon.png rename to src/canonical/minisprites/gen5/pokemon/196--0--Espeon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Umbreon.png b/src/canonical/minisprites/gen5/pokemon/197--0--Umbreon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Umbreon.png rename to src/canonical/minisprites/gen5/pokemon/197--0--Umbreon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Murkrow.png b/src/canonical/minisprites/gen5/pokemon/198--0--Murkrow.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Murkrow.png rename to src/canonical/minisprites/gen5/pokemon/198--0--Murkrow.png diff --git a/src/canonical/minisprites/gen5/pokemon/Slowking.png b/src/canonical/minisprites/gen5/pokemon/199--0--Slowking.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Slowking.png rename to src/canonical/minisprites/gen5/pokemon/199--0--Slowking.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ivysaur.png b/src/canonical/minisprites/gen5/pokemon/2--0--Ivysaur.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ivysaur.png rename to src/canonical/minisprites/gen5/pokemon/2--0--Ivysaur.png diff --git a/src/canonical/minisprites/gen5/pokemon/Raticate.png b/src/canonical/minisprites/gen5/pokemon/20--0--Raticate.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Raticate.png rename to src/canonical/minisprites/gen5/pokemon/20--0--Raticate.png diff --git a/src/canonical/minisprites/gen5/pokemon/Misdreavus.png b/src/canonical/minisprites/gen5/pokemon/200--0--Misdreavus.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Misdreavus.png rename to src/canonical/minisprites/gen5/pokemon/200--0--Misdreavus.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown.png b/src/canonical/minisprites/gen5/pokemon/201--0--Unown.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown.png rename to src/canonical/minisprites/gen5/pokemon/201--0--Unown.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--B.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--B.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--B.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--B.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--C.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--C.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--C.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--C.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--D.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--D.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--D.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--D.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--E.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--E.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--E.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--E.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--Exclamation.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--Exclamation.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--Exclamation.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--Exclamation.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--F.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--F.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--F.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--F.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--G.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--G.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--G.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--G.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--H.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--H.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--H.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--H.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--I.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--I.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--I.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--I.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--J.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--J.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--J.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--J.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--K.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--K.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--K.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--K.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--L.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--L.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--L.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--L.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--M.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--M.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--M.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--M.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--N.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--N.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--N.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--N.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--O.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--O.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--O.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--O.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--P.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--P.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--P.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--P.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--Q.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--Q.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--Q.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--Q.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--Question.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--Question.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--Question.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--Question.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--R.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--R.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--R.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--R.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--S.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--S.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--S.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--S.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--T.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--T.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--T.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--T.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--U.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--U.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--U.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--U.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--V.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--V.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--V.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--V.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--W.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--W.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--W.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--W.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--X.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--X.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--X.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--X.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--Y.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--Y.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--Y.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--Y.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unown--Z.png b/src/canonical/minisprites/gen5/pokemon/201--420--Unown--Z.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unown--Z.png rename to src/canonical/minisprites/gen5/pokemon/201--420--Unown--Z.png diff --git a/src/canonical/minisprites/gen5/pokemon/Wobbuffet.png b/src/canonical/minisprites/gen5/pokemon/202--0--Wobbuffet.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Wobbuffet.png rename to src/canonical/minisprites/gen5/pokemon/202--0--Wobbuffet.png diff --git a/src/canonical/minisprites/gen5/pokemon/Girafarig.png b/src/canonical/minisprites/gen5/pokemon/203--0--Girafarig.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Girafarig.png rename to src/canonical/minisprites/gen5/pokemon/203--0--Girafarig.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pineco.png b/src/canonical/minisprites/gen5/pokemon/204--0--Pineco.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pineco.png rename to src/canonical/minisprites/gen5/pokemon/204--0--Pineco.png diff --git a/src/canonical/minisprites/gen5/pokemon/Forretress.png b/src/canonical/minisprites/gen5/pokemon/205--0--Forretress.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Forretress.png rename to src/canonical/minisprites/gen5/pokemon/205--0--Forretress.png diff --git a/src/canonical/minisprites/gen5/pokemon/Dunsparce.png b/src/canonical/minisprites/gen5/pokemon/206--0--Dunsparce.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Dunsparce.png rename to src/canonical/minisprites/gen5/pokemon/206--0--Dunsparce.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gligar.png b/src/canonical/minisprites/gen5/pokemon/207--0--Gligar.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gligar.png rename to src/canonical/minisprites/gen5/pokemon/207--0--Gligar.png diff --git a/src/canonical/minisprites/gen5/pokemon/Steelix.png b/src/canonical/minisprites/gen5/pokemon/208--0--Steelix.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Steelix.png rename to src/canonical/minisprites/gen5/pokemon/208--0--Steelix.png diff --git a/src/canonical/minisprites/gen5/pokemon/Snubbull.png b/src/canonical/minisprites/gen5/pokemon/209--0--Snubbull.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Snubbull.png rename to src/canonical/minisprites/gen5/pokemon/209--0--Snubbull.png diff --git a/src/canonical/minisprites/gen5/pokemon/Spearow.png b/src/canonical/minisprites/gen5/pokemon/21--0--Spearow.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Spearow.png rename to src/canonical/minisprites/gen5/pokemon/21--0--Spearow.png diff --git a/src/canonical/minisprites/gen5/pokemon/Granbull.png b/src/canonical/minisprites/gen5/pokemon/210--0--Granbull.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Granbull.png rename to src/canonical/minisprites/gen5/pokemon/210--0--Granbull.png diff --git a/src/canonical/minisprites/gen5/pokemon/Qwilfish.png b/src/canonical/minisprites/gen5/pokemon/211--0--Qwilfish.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Qwilfish.png rename to src/canonical/minisprites/gen5/pokemon/211--0--Qwilfish.png diff --git a/src/canonical/minisprites/gen5/pokemon/Scizor.png b/src/canonical/minisprites/gen5/pokemon/212--0--Scizor.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Scizor.png rename to src/canonical/minisprites/gen5/pokemon/212--0--Scizor.png diff --git a/src/canonical/minisprites/gen5/pokemon/Shuckle.png b/src/canonical/minisprites/gen5/pokemon/213--0--Shuckle.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Shuckle.png rename to src/canonical/minisprites/gen5/pokemon/213--0--Shuckle.png diff --git a/src/canonical/minisprites/gen5/pokemon/Heracross.png b/src/canonical/minisprites/gen5/pokemon/214--0--Heracross.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Heracross.png rename to src/canonical/minisprites/gen5/pokemon/214--0--Heracross.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sneasel.png b/src/canonical/minisprites/gen5/pokemon/215--0--Sneasel.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sneasel.png rename to src/canonical/minisprites/gen5/pokemon/215--0--Sneasel.png diff --git a/src/canonical/minisprites/gen5/pokemon/Teddiursa.png b/src/canonical/minisprites/gen5/pokemon/216--0--Teddiursa.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Teddiursa.png rename to src/canonical/minisprites/gen5/pokemon/216--0--Teddiursa.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ursaring.png b/src/canonical/minisprites/gen5/pokemon/217--0--Ursaring.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ursaring.png rename to src/canonical/minisprites/gen5/pokemon/217--0--Ursaring.png diff --git a/src/canonical/minisprites/gen5/pokemon/Slugma.png b/src/canonical/minisprites/gen5/pokemon/218--0--Slugma.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Slugma.png rename to src/canonical/minisprites/gen5/pokemon/218--0--Slugma.png diff --git a/src/canonical/minisprites/gen5/pokemon/Magcargo.png b/src/canonical/minisprites/gen5/pokemon/219--0--Magcargo.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Magcargo.png rename to src/canonical/minisprites/gen5/pokemon/219--0--Magcargo.png diff --git a/src/canonical/minisprites/gen5/pokemon/Fearow.png b/src/canonical/minisprites/gen5/pokemon/22--0--Fearow.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Fearow.png rename to src/canonical/minisprites/gen5/pokemon/22--0--Fearow.png diff --git a/src/canonical/minisprites/gen5/pokemon/Swinub.png b/src/canonical/minisprites/gen5/pokemon/220--0--Swinub.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Swinub.png rename to src/canonical/minisprites/gen5/pokemon/220--0--Swinub.png diff --git a/src/canonical/minisprites/gen5/pokemon/Piloswine.png b/src/canonical/minisprites/gen5/pokemon/221--0--Piloswine.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Piloswine.png rename to src/canonical/minisprites/gen5/pokemon/221--0--Piloswine.png diff --git a/src/canonical/minisprites/gen5/pokemon/Corsola.png b/src/canonical/minisprites/gen5/pokemon/222--0--Corsola.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Corsola.png rename to src/canonical/minisprites/gen5/pokemon/222--0--Corsola.png diff --git a/src/canonical/minisprites/gen5/pokemon/Remoraid.png b/src/canonical/minisprites/gen5/pokemon/223--0--Remoraid.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Remoraid.png rename to src/canonical/minisprites/gen5/pokemon/223--0--Remoraid.png diff --git a/src/canonical/minisprites/gen5/pokemon/Octillery.png b/src/canonical/minisprites/gen5/pokemon/224--0--Octillery.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Octillery.png rename to src/canonical/minisprites/gen5/pokemon/224--0--Octillery.png diff --git a/src/canonical/minisprites/gen5/pokemon/Delibird.png b/src/canonical/minisprites/gen5/pokemon/225--0--Delibird.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Delibird.png rename to src/canonical/minisprites/gen5/pokemon/225--0--Delibird.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mantine.png b/src/canonical/minisprites/gen5/pokemon/226--0--Mantine.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mantine.png rename to src/canonical/minisprites/gen5/pokemon/226--0--Mantine.png diff --git a/src/canonical/minisprites/gen5/pokemon/Skarmory.png b/src/canonical/minisprites/gen5/pokemon/227--0--Skarmory.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Skarmory.png rename to src/canonical/minisprites/gen5/pokemon/227--0--Skarmory.png diff --git a/src/canonical/minisprites/gen5/pokemon/Houndour.png b/src/canonical/minisprites/gen5/pokemon/228--0--Houndour.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Houndour.png rename to src/canonical/minisprites/gen5/pokemon/228--0--Houndour.png diff --git a/src/canonical/minisprites/gen5/pokemon/Houndoom.png b/src/canonical/minisprites/gen5/pokemon/229--0--Houndoom.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Houndoom.png rename to src/canonical/minisprites/gen5/pokemon/229--0--Houndoom.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ekans.png b/src/canonical/minisprites/gen5/pokemon/23--0--Ekans.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ekans.png rename to src/canonical/minisprites/gen5/pokemon/23--0--Ekans.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kingdra.png b/src/canonical/minisprites/gen5/pokemon/230--0--Kingdra.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kingdra.png rename to src/canonical/minisprites/gen5/pokemon/230--0--Kingdra.png diff --git a/src/canonical/minisprites/gen5/pokemon/Phanpy.png b/src/canonical/minisprites/gen5/pokemon/231--0--Phanpy.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Phanpy.png rename to src/canonical/minisprites/gen5/pokemon/231--0--Phanpy.png diff --git a/src/canonical/minisprites/gen5/pokemon/Donphan.png b/src/canonical/minisprites/gen5/pokemon/232--0--Donphan.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Donphan.png rename to src/canonical/minisprites/gen5/pokemon/232--0--Donphan.png diff --git a/src/canonical/minisprites/gen5/pokemon/Porygon2.png b/src/canonical/minisprites/gen5/pokemon/233--0--Porygon2.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Porygon2.png rename to src/canonical/minisprites/gen5/pokemon/233--0--Porygon2.png diff --git a/src/canonical/minisprites/gen5/pokemon/Stantler.png b/src/canonical/minisprites/gen5/pokemon/234--0--Stantler.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Stantler.png rename to src/canonical/minisprites/gen5/pokemon/234--0--Stantler.png diff --git a/src/canonical/minisprites/gen5/pokemon/Smeargle.png b/src/canonical/minisprites/gen5/pokemon/235--0--Smeargle.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Smeargle.png rename to src/canonical/minisprites/gen5/pokemon/235--0--Smeargle.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tyrogue.png b/src/canonical/minisprites/gen5/pokemon/236--0--Tyrogue.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tyrogue.png rename to src/canonical/minisprites/gen5/pokemon/236--0--Tyrogue.png diff --git a/src/canonical/minisprites/gen5/pokemon/Hitmontop.png b/src/canonical/minisprites/gen5/pokemon/237--0--Hitmontop.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Hitmontop.png rename to src/canonical/minisprites/gen5/pokemon/237--0--Hitmontop.png diff --git a/src/canonical/minisprites/gen5/pokemon/Smoochum.png b/src/canonical/minisprites/gen5/pokemon/238--0--Smoochum.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Smoochum.png rename to src/canonical/minisprites/gen5/pokemon/238--0--Smoochum.png diff --git a/src/canonical/minisprites/gen5/pokemon/Elekid.png b/src/canonical/minisprites/gen5/pokemon/239--0--Elekid.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Elekid.png rename to src/canonical/minisprites/gen5/pokemon/239--0--Elekid.png diff --git a/src/canonical/minisprites/gen5/pokemon/Arbok.png b/src/canonical/minisprites/gen5/pokemon/24--0--Arbok.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Arbok.png rename to src/canonical/minisprites/gen5/pokemon/24--0--Arbok.png diff --git a/src/canonical/minisprites/gen5/pokemon/Magby.png b/src/canonical/minisprites/gen5/pokemon/240--0--Magby.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Magby.png rename to src/canonical/minisprites/gen5/pokemon/240--0--Magby.png diff --git a/src/canonical/minisprites/gen5/pokemon/Miltank.png b/src/canonical/minisprites/gen5/pokemon/241--0--Miltank.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Miltank.png rename to src/canonical/minisprites/gen5/pokemon/241--0--Miltank.png diff --git a/src/canonical/minisprites/gen5/pokemon/Blissey.png b/src/canonical/minisprites/gen5/pokemon/242--0--Blissey.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Blissey.png rename to src/canonical/minisprites/gen5/pokemon/242--0--Blissey.png diff --git a/src/canonical/minisprites/gen5/pokemon/Raikou.png b/src/canonical/minisprites/gen5/pokemon/243--0--Raikou.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Raikou.png rename to src/canonical/minisprites/gen5/pokemon/243--0--Raikou.png diff --git a/src/canonical/minisprites/gen5/pokemon/Entei.png b/src/canonical/minisprites/gen5/pokemon/244--0--Entei.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Entei.png rename to src/canonical/minisprites/gen5/pokemon/244--0--Entei.png diff --git a/src/canonical/minisprites/gen5/pokemon/Suicune.png b/src/canonical/minisprites/gen5/pokemon/245--0--Suicune.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Suicune.png rename to src/canonical/minisprites/gen5/pokemon/245--0--Suicune.png diff --git a/src/canonical/minisprites/gen5/pokemon/Larvitar.png b/src/canonical/minisprites/gen5/pokemon/246--0--Larvitar.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Larvitar.png rename to src/canonical/minisprites/gen5/pokemon/246--0--Larvitar.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pupitar.png b/src/canonical/minisprites/gen5/pokemon/247--0--Pupitar.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pupitar.png rename to src/canonical/minisprites/gen5/pokemon/247--0--Pupitar.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tyranitar.png b/src/canonical/minisprites/gen5/pokemon/248--0--Tyranitar.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tyranitar.png rename to src/canonical/minisprites/gen5/pokemon/248--0--Tyranitar.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lugia.png b/src/canonical/minisprites/gen5/pokemon/249--0--Lugia.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lugia.png rename to src/canonical/minisprites/gen5/pokemon/249--0--Lugia.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pikachu.png b/src/canonical/minisprites/gen5/pokemon/25--0--Pikachu.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pikachu.png rename to src/canonical/minisprites/gen5/pokemon/25--0--Pikachu.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ho-Oh.png b/src/canonical/minisprites/gen5/pokemon/250--0--Ho-Oh.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ho-Oh.png rename to src/canonical/minisprites/gen5/pokemon/250--0--Ho-Oh.png diff --git a/src/canonical/minisprites/gen5/pokemon/Celebi.png b/src/canonical/minisprites/gen5/pokemon/251--0--Celebi.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Celebi.png rename to src/canonical/minisprites/gen5/pokemon/251--0--Celebi.png diff --git a/src/canonical/minisprites/gen5/pokemon/Treecko.png b/src/canonical/minisprites/gen5/pokemon/252--0--Treecko.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Treecko.png rename to src/canonical/minisprites/gen5/pokemon/252--0--Treecko.png diff --git a/src/canonical/minisprites/gen5/pokemon/Grovyle.png b/src/canonical/minisprites/gen5/pokemon/253--0--Grovyle.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Grovyle.png rename to src/canonical/minisprites/gen5/pokemon/253--0--Grovyle.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sceptile.png b/src/canonical/minisprites/gen5/pokemon/254--0--Sceptile.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sceptile.png rename to src/canonical/minisprites/gen5/pokemon/254--0--Sceptile.png diff --git a/src/canonical/minisprites/gen5/pokemon/Torchic.png b/src/canonical/minisprites/gen5/pokemon/255--0--Torchic.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Torchic.png rename to src/canonical/minisprites/gen5/pokemon/255--0--Torchic.png diff --git a/src/canonical/minisprites/gen5/pokemon/Combusken.png b/src/canonical/minisprites/gen5/pokemon/256--0--Combusken.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Combusken.png rename to src/canonical/minisprites/gen5/pokemon/256--0--Combusken.png diff --git a/src/canonical/minisprites/gen5/pokemon/Blaziken.png b/src/canonical/minisprites/gen5/pokemon/257--0--Blaziken.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Blaziken.png rename to src/canonical/minisprites/gen5/pokemon/257--0--Blaziken.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mudkip.png b/src/canonical/minisprites/gen5/pokemon/258--0--Mudkip.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mudkip.png rename to src/canonical/minisprites/gen5/pokemon/258--0--Mudkip.png diff --git a/src/canonical/minisprites/gen5/pokemon/Marshtomp.png b/src/canonical/minisprites/gen5/pokemon/259--0--Marshtomp.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Marshtomp.png rename to src/canonical/minisprites/gen5/pokemon/259--0--Marshtomp.png diff --git a/src/canonical/minisprites/gen5/pokemon/Raichu.png b/src/canonical/minisprites/gen5/pokemon/26--0--Raichu.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Raichu.png rename to src/canonical/minisprites/gen5/pokemon/26--0--Raichu.png diff --git a/src/canonical/minisprites/gen5/pokemon/Swampert.png b/src/canonical/minisprites/gen5/pokemon/260--0--Swampert.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Swampert.png rename to src/canonical/minisprites/gen5/pokemon/260--0--Swampert.png diff --git a/src/canonical/minisprites/gen5/pokemon/Poochyena.png b/src/canonical/minisprites/gen5/pokemon/261--0--Poochyena.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Poochyena.png rename to src/canonical/minisprites/gen5/pokemon/261--0--Poochyena.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mightyena.png b/src/canonical/minisprites/gen5/pokemon/262--0--Mightyena.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mightyena.png rename to src/canonical/minisprites/gen5/pokemon/262--0--Mightyena.png diff --git a/src/canonical/minisprites/gen5/pokemon/Zigzagoon.png b/src/canonical/minisprites/gen5/pokemon/263--0--Zigzagoon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Zigzagoon.png rename to src/canonical/minisprites/gen5/pokemon/263--0--Zigzagoon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Linoone.png b/src/canonical/minisprites/gen5/pokemon/264--0--Linoone.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Linoone.png rename to src/canonical/minisprites/gen5/pokemon/264--0--Linoone.png diff --git a/src/canonical/minisprites/gen5/pokemon/Wurmple.png b/src/canonical/minisprites/gen5/pokemon/265--0--Wurmple.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Wurmple.png rename to src/canonical/minisprites/gen5/pokemon/265--0--Wurmple.png diff --git a/src/canonical/minisprites/gen5/pokemon/Silcoon.png b/src/canonical/minisprites/gen5/pokemon/266--0--Silcoon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Silcoon.png rename to src/canonical/minisprites/gen5/pokemon/266--0--Silcoon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Beautifly.png b/src/canonical/minisprites/gen5/pokemon/267--0--Beautifly.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Beautifly.png rename to src/canonical/minisprites/gen5/pokemon/267--0--Beautifly.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cascoon.png b/src/canonical/minisprites/gen5/pokemon/268--0--Cascoon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cascoon.png rename to src/canonical/minisprites/gen5/pokemon/268--0--Cascoon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Dustox.png b/src/canonical/minisprites/gen5/pokemon/269--0--Dustox.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Dustox.png rename to src/canonical/minisprites/gen5/pokemon/269--0--Dustox.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sandshrew.png b/src/canonical/minisprites/gen5/pokemon/27--0--Sandshrew.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sandshrew.png rename to src/canonical/minisprites/gen5/pokemon/27--0--Sandshrew.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lotad.png b/src/canonical/minisprites/gen5/pokemon/270--0--Lotad.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lotad.png rename to src/canonical/minisprites/gen5/pokemon/270--0--Lotad.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lombre.png b/src/canonical/minisprites/gen5/pokemon/271--0--Lombre.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lombre.png rename to src/canonical/minisprites/gen5/pokemon/271--0--Lombre.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ludicolo.png b/src/canonical/minisprites/gen5/pokemon/272--0--Ludicolo.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ludicolo.png rename to src/canonical/minisprites/gen5/pokemon/272--0--Ludicolo.png diff --git a/src/canonical/minisprites/gen5/pokemon/Seedot.png b/src/canonical/minisprites/gen5/pokemon/273--0--Seedot.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Seedot.png rename to src/canonical/minisprites/gen5/pokemon/273--0--Seedot.png diff --git a/src/canonical/minisprites/gen5/pokemon/Nuzleaf.png b/src/canonical/minisprites/gen5/pokemon/274--0--Nuzleaf.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Nuzleaf.png rename to src/canonical/minisprites/gen5/pokemon/274--0--Nuzleaf.png diff --git a/src/canonical/minisprites/gen5/pokemon/Shiftry.png b/src/canonical/minisprites/gen5/pokemon/275--0--Shiftry.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Shiftry.png rename to src/canonical/minisprites/gen5/pokemon/275--0--Shiftry.png diff --git a/src/canonical/minisprites/gen5/pokemon/Taillow.png b/src/canonical/minisprites/gen5/pokemon/276--0--Taillow.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Taillow.png rename to src/canonical/minisprites/gen5/pokemon/276--0--Taillow.png diff --git a/src/canonical/minisprites/gen5/pokemon/Swellow.png b/src/canonical/minisprites/gen5/pokemon/277--0--Swellow.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Swellow.png rename to src/canonical/minisprites/gen5/pokemon/277--0--Swellow.png diff --git a/src/canonical/minisprites/gen5/pokemon/Wingull.png b/src/canonical/minisprites/gen5/pokemon/278--0--Wingull.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Wingull.png rename to src/canonical/minisprites/gen5/pokemon/278--0--Wingull.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pelipper.png b/src/canonical/minisprites/gen5/pokemon/279--0--Pelipper.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pelipper.png rename to src/canonical/minisprites/gen5/pokemon/279--0--Pelipper.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sandslash.png b/src/canonical/minisprites/gen5/pokemon/28--0--Sandslash.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sandslash.png rename to src/canonical/minisprites/gen5/pokemon/28--0--Sandslash.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ralts.png b/src/canonical/minisprites/gen5/pokemon/280--0--Ralts.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ralts.png rename to src/canonical/minisprites/gen5/pokemon/280--0--Ralts.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kirlia.png b/src/canonical/minisprites/gen5/pokemon/281--0--Kirlia.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kirlia.png rename to src/canonical/minisprites/gen5/pokemon/281--0--Kirlia.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gardevoir.png b/src/canonical/minisprites/gen5/pokemon/282--0--Gardevoir.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gardevoir.png rename to src/canonical/minisprites/gen5/pokemon/282--0--Gardevoir.png diff --git a/src/canonical/minisprites/gen5/pokemon/Surskit.png b/src/canonical/minisprites/gen5/pokemon/283--0--Surskit.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Surskit.png rename to src/canonical/minisprites/gen5/pokemon/283--0--Surskit.png diff --git a/src/canonical/minisprites/gen5/pokemon/Masquerain.png b/src/canonical/minisprites/gen5/pokemon/284--0--Masquerain.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Masquerain.png rename to src/canonical/minisprites/gen5/pokemon/284--0--Masquerain.png diff --git a/src/canonical/minisprites/gen5/pokemon/Shroomish.png b/src/canonical/minisprites/gen5/pokemon/285--0--Shroomish.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Shroomish.png rename to src/canonical/minisprites/gen5/pokemon/285--0--Shroomish.png diff --git a/src/canonical/minisprites/gen5/pokemon/Breloom.png b/src/canonical/minisprites/gen5/pokemon/286--0--Breloom.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Breloom.png rename to src/canonical/minisprites/gen5/pokemon/286--0--Breloom.png diff --git a/src/canonical/minisprites/gen5/pokemon/Slakoth.png b/src/canonical/minisprites/gen5/pokemon/287--0--Slakoth.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Slakoth.png rename to src/canonical/minisprites/gen5/pokemon/287--0--Slakoth.png diff --git a/src/canonical/minisprites/gen5/pokemon/Vigoroth.png b/src/canonical/minisprites/gen5/pokemon/288--0--Vigoroth.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Vigoroth.png rename to src/canonical/minisprites/gen5/pokemon/288--0--Vigoroth.png diff --git a/src/canonical/minisprites/gen5/pokemon/Slaking.png b/src/canonical/minisprites/gen5/pokemon/289--0--Slaking.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Slaking.png rename to src/canonical/minisprites/gen5/pokemon/289--0--Slaking.png diff --git a/src/canonical/minisprites/gen5/pokemon/Nidoran-F.png b/src/canonical/minisprites/gen5/pokemon/29--0--Nidoran-F.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Nidoran-F.png rename to src/canonical/minisprites/gen5/pokemon/29--0--Nidoran-F.png diff --git a/src/canonical/minisprites/gen5/pokemon/Nincada.png b/src/canonical/minisprites/gen5/pokemon/290--0--Nincada.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Nincada.png rename to src/canonical/minisprites/gen5/pokemon/290--0--Nincada.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ninjask.png b/src/canonical/minisprites/gen5/pokemon/291--0--Ninjask.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ninjask.png rename to src/canonical/minisprites/gen5/pokemon/291--0--Ninjask.png diff --git a/src/canonical/minisprites/gen5/pokemon/Shedinja.png b/src/canonical/minisprites/gen5/pokemon/292--0--Shedinja.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Shedinja.png rename to src/canonical/minisprites/gen5/pokemon/292--0--Shedinja.png diff --git a/src/canonical/minisprites/gen5/pokemon/Whismur.png b/src/canonical/minisprites/gen5/pokemon/293--0--Whismur.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Whismur.png rename to src/canonical/minisprites/gen5/pokemon/293--0--Whismur.png diff --git a/src/canonical/minisprites/gen5/pokemon/Loudred.png b/src/canonical/minisprites/gen5/pokemon/294--0--Loudred.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Loudred.png rename to src/canonical/minisprites/gen5/pokemon/294--0--Loudred.png diff --git a/src/canonical/minisprites/gen5/pokemon/Exploud.png b/src/canonical/minisprites/gen5/pokemon/295--0--Exploud.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Exploud.png rename to src/canonical/minisprites/gen5/pokemon/295--0--Exploud.png diff --git a/src/canonical/minisprites/gen5/pokemon/Makuhita.png b/src/canonical/minisprites/gen5/pokemon/296--0--Makuhita.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Makuhita.png rename to src/canonical/minisprites/gen5/pokemon/296--0--Makuhita.png diff --git a/src/canonical/minisprites/gen5/pokemon/Hariyama.png b/src/canonical/minisprites/gen5/pokemon/297--0--Hariyama.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Hariyama.png rename to src/canonical/minisprites/gen5/pokemon/297--0--Hariyama.png diff --git a/src/canonical/minisprites/gen5/pokemon/Azurill.png b/src/canonical/minisprites/gen5/pokemon/298--0--Azurill.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Azurill.png rename to src/canonical/minisprites/gen5/pokemon/298--0--Azurill.png diff --git a/src/canonical/minisprites/gen5/pokemon/Nosepass.png b/src/canonical/minisprites/gen5/pokemon/299--0--Nosepass.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Nosepass.png rename to src/canonical/minisprites/gen5/pokemon/299--0--Nosepass.png diff --git a/src/canonical/minisprites/gen5/pokemon/Venusaur.png b/src/canonical/minisprites/gen5/pokemon/3--0--Venusaur.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Venusaur.png rename to src/canonical/minisprites/gen5/pokemon/3--0--Venusaur.png diff --git a/src/canonical/minisprites/gen5/pokemon/Nidorina.png b/src/canonical/minisprites/gen5/pokemon/30--0--Nidorina.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Nidorina.png rename to src/canonical/minisprites/gen5/pokemon/30--0--Nidorina.png diff --git a/src/canonical/minisprites/gen5/pokemon/Skitty.png b/src/canonical/minisprites/gen5/pokemon/300--0--Skitty.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Skitty.png rename to src/canonical/minisprites/gen5/pokemon/300--0--Skitty.png diff --git a/src/canonical/minisprites/gen5/pokemon/Delcatty.png b/src/canonical/minisprites/gen5/pokemon/301--0--Delcatty.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Delcatty.png rename to src/canonical/minisprites/gen5/pokemon/301--0--Delcatty.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sableye.png b/src/canonical/minisprites/gen5/pokemon/302--0--Sableye.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sableye.png rename to src/canonical/minisprites/gen5/pokemon/302--0--Sableye.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mawile.png b/src/canonical/minisprites/gen5/pokemon/303--0--Mawile.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mawile.png rename to src/canonical/minisprites/gen5/pokemon/303--0--Mawile.png diff --git a/src/canonical/minisprites/gen5/pokemon/Aron.png b/src/canonical/minisprites/gen5/pokemon/304--0--Aron.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Aron.png rename to src/canonical/minisprites/gen5/pokemon/304--0--Aron.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lairon.png b/src/canonical/minisprites/gen5/pokemon/305--0--Lairon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lairon.png rename to src/canonical/minisprites/gen5/pokemon/305--0--Lairon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Aggron.png b/src/canonical/minisprites/gen5/pokemon/306--0--Aggron.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Aggron.png rename to src/canonical/minisprites/gen5/pokemon/306--0--Aggron.png diff --git a/src/canonical/minisprites/gen5/pokemon/Meditite.png b/src/canonical/minisprites/gen5/pokemon/307--0--Meditite.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Meditite.png rename to src/canonical/minisprites/gen5/pokemon/307--0--Meditite.png diff --git a/src/canonical/minisprites/gen5/pokemon/Medicham.png b/src/canonical/minisprites/gen5/pokemon/308--0--Medicham.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Medicham.png rename to src/canonical/minisprites/gen5/pokemon/308--0--Medicham.png diff --git a/src/canonical/minisprites/gen5/pokemon/Electrike.png b/src/canonical/minisprites/gen5/pokemon/309--0--Electrike.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Electrike.png rename to src/canonical/minisprites/gen5/pokemon/309--0--Electrike.png diff --git a/src/canonical/minisprites/gen5/pokemon/Nidoqueen.png b/src/canonical/minisprites/gen5/pokemon/31--0--Nidoqueen.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Nidoqueen.png rename to src/canonical/minisprites/gen5/pokemon/31--0--Nidoqueen.png diff --git a/src/canonical/minisprites/gen5/pokemon/Manectric.png b/src/canonical/minisprites/gen5/pokemon/310--0--Manectric.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Manectric.png rename to src/canonical/minisprites/gen5/pokemon/310--0--Manectric.png diff --git a/src/canonical/minisprites/gen5/pokemon/Plusle.png b/src/canonical/minisprites/gen5/pokemon/311--0--Plusle.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Plusle.png rename to src/canonical/minisprites/gen5/pokemon/311--0--Plusle.png diff --git a/src/canonical/minisprites/gen5/pokemon/Minun.png b/src/canonical/minisprites/gen5/pokemon/312--0--Minun.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Minun.png rename to src/canonical/minisprites/gen5/pokemon/312--0--Minun.png diff --git a/src/canonical/minisprites/gen5/pokemon/Volbeat.png b/src/canonical/minisprites/gen5/pokemon/313--0--Volbeat.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Volbeat.png rename to src/canonical/minisprites/gen5/pokemon/313--0--Volbeat.png diff --git a/src/canonical/minisprites/gen5/pokemon/Illumise.png b/src/canonical/minisprites/gen5/pokemon/314--0--Illumise.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Illumise.png rename to src/canonical/minisprites/gen5/pokemon/314--0--Illumise.png diff --git a/src/canonical/minisprites/gen5/pokemon/Roselia.png b/src/canonical/minisprites/gen5/pokemon/315--0--Roselia.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Roselia.png rename to src/canonical/minisprites/gen5/pokemon/315--0--Roselia.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gulpin.png b/src/canonical/minisprites/gen5/pokemon/316--0--Gulpin.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gulpin.png rename to src/canonical/minisprites/gen5/pokemon/316--0--Gulpin.png diff --git a/src/canonical/minisprites/gen5/pokemon/Swalot.png b/src/canonical/minisprites/gen5/pokemon/317--0--Swalot.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Swalot.png rename to src/canonical/minisprites/gen5/pokemon/317--0--Swalot.png diff --git a/src/canonical/minisprites/gen5/pokemon/Carvanha.png b/src/canonical/minisprites/gen5/pokemon/318--0--Carvanha.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Carvanha.png rename to src/canonical/minisprites/gen5/pokemon/318--0--Carvanha.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sharpedo.png b/src/canonical/minisprites/gen5/pokemon/319--0--Sharpedo.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sharpedo.png rename to src/canonical/minisprites/gen5/pokemon/319--0--Sharpedo.png diff --git a/src/canonical/minisprites/gen5/pokemon/Nidoran-M.png b/src/canonical/minisprites/gen5/pokemon/32--0--Nidoran-M.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Nidoran-M.png rename to src/canonical/minisprites/gen5/pokemon/32--0--Nidoran-M.png diff --git a/src/canonical/minisprites/gen5/pokemon/Wailmer.png b/src/canonical/minisprites/gen5/pokemon/320--0--Wailmer.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Wailmer.png rename to src/canonical/minisprites/gen5/pokemon/320--0--Wailmer.png diff --git a/src/canonical/minisprites/gen5/pokemon/Wailord.png b/src/canonical/minisprites/gen5/pokemon/321--0--Wailord.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Wailord.png rename to src/canonical/minisprites/gen5/pokemon/321--0--Wailord.png diff --git a/src/canonical/minisprites/gen5/pokemon/Numel.png b/src/canonical/minisprites/gen5/pokemon/322--0--Numel.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Numel.png rename to src/canonical/minisprites/gen5/pokemon/322--0--Numel.png diff --git a/src/canonical/minisprites/gen5/pokemon/Camerupt.png b/src/canonical/minisprites/gen5/pokemon/323--0--Camerupt.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Camerupt.png rename to src/canonical/minisprites/gen5/pokemon/323--0--Camerupt.png diff --git a/src/canonical/minisprites/gen5/pokemon/Torkoal.png b/src/canonical/minisprites/gen5/pokemon/324--0--Torkoal.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Torkoal.png rename to src/canonical/minisprites/gen5/pokemon/324--0--Torkoal.png diff --git a/src/canonical/minisprites/gen5/pokemon/Spoink.png b/src/canonical/minisprites/gen5/pokemon/325--0--Spoink.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Spoink.png rename to src/canonical/minisprites/gen5/pokemon/325--0--Spoink.png diff --git a/src/canonical/minisprites/gen5/pokemon/Grumpig.png b/src/canonical/minisprites/gen5/pokemon/326--0--Grumpig.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Grumpig.png rename to src/canonical/minisprites/gen5/pokemon/326--0--Grumpig.png diff --git a/src/canonical/minisprites/gen5/pokemon/Spinda.png b/src/canonical/minisprites/gen5/pokemon/327--0--Spinda.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Spinda.png rename to src/canonical/minisprites/gen5/pokemon/327--0--Spinda.png diff --git a/src/canonical/minisprites/gen5/pokemon/Trapinch.png b/src/canonical/minisprites/gen5/pokemon/328--0--Trapinch.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Trapinch.png rename to src/canonical/minisprites/gen5/pokemon/328--0--Trapinch.png diff --git a/src/canonical/minisprites/gen5/pokemon/Vibrava.png b/src/canonical/minisprites/gen5/pokemon/329--0--Vibrava.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Vibrava.png rename to src/canonical/minisprites/gen5/pokemon/329--0--Vibrava.png diff --git a/src/canonical/minisprites/gen5/pokemon/Nidorino.png b/src/canonical/minisprites/gen5/pokemon/33--0--Nidorino.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Nidorino.png rename to src/canonical/minisprites/gen5/pokemon/33--0--Nidorino.png diff --git a/src/canonical/minisprites/gen5/pokemon/Flygon.png b/src/canonical/minisprites/gen5/pokemon/330--0--Flygon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Flygon.png rename to src/canonical/minisprites/gen5/pokemon/330--0--Flygon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cacnea.png b/src/canonical/minisprites/gen5/pokemon/331--0--Cacnea.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cacnea.png rename to src/canonical/minisprites/gen5/pokemon/331--0--Cacnea.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cacturne.png b/src/canonical/minisprites/gen5/pokemon/332--0--Cacturne.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cacturne.png rename to src/canonical/minisprites/gen5/pokemon/332--0--Cacturne.png diff --git a/src/canonical/minisprites/gen5/pokemon/Swablu.png b/src/canonical/minisprites/gen5/pokemon/333--0--Swablu.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Swablu.png rename to src/canonical/minisprites/gen5/pokemon/333--0--Swablu.png diff --git a/src/canonical/minisprites/gen5/pokemon/Altaria.png b/src/canonical/minisprites/gen5/pokemon/334--0--Altaria.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Altaria.png rename to src/canonical/minisprites/gen5/pokemon/334--0--Altaria.png diff --git a/src/canonical/minisprites/gen5/pokemon/Zangoose.png b/src/canonical/minisprites/gen5/pokemon/335--0--Zangoose.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Zangoose.png rename to src/canonical/minisprites/gen5/pokemon/335--0--Zangoose.png diff --git a/src/canonical/minisprites/gen5/pokemon/Seviper.png b/src/canonical/minisprites/gen5/pokemon/336--0--Seviper.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Seviper.png rename to src/canonical/minisprites/gen5/pokemon/336--0--Seviper.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lunatone.png b/src/canonical/minisprites/gen5/pokemon/337--0--Lunatone.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lunatone.png rename to src/canonical/minisprites/gen5/pokemon/337--0--Lunatone.png diff --git a/src/canonical/minisprites/gen5/pokemon/Solrock.png b/src/canonical/minisprites/gen5/pokemon/338--0--Solrock.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Solrock.png rename to src/canonical/minisprites/gen5/pokemon/338--0--Solrock.png diff --git a/src/canonical/minisprites/gen5/pokemon/Barboach.png b/src/canonical/minisprites/gen5/pokemon/339--0--Barboach.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Barboach.png rename to src/canonical/minisprites/gen5/pokemon/339--0--Barboach.png diff --git a/src/canonical/minisprites/gen5/pokemon/Nidoking.png b/src/canonical/minisprites/gen5/pokemon/34--0--Nidoking.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Nidoking.png rename to src/canonical/minisprites/gen5/pokemon/34--0--Nidoking.png diff --git a/src/canonical/minisprites/gen5/pokemon/Whiscash.png b/src/canonical/minisprites/gen5/pokemon/340--0--Whiscash.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Whiscash.png rename to src/canonical/minisprites/gen5/pokemon/340--0--Whiscash.png diff --git a/src/canonical/minisprites/gen5/pokemon/Corphish.png b/src/canonical/minisprites/gen5/pokemon/341--0--Corphish.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Corphish.png rename to src/canonical/minisprites/gen5/pokemon/341--0--Corphish.png diff --git a/src/canonical/minisprites/gen5/pokemon/Crawdaunt.png b/src/canonical/minisprites/gen5/pokemon/342--0--Crawdaunt.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Crawdaunt.png rename to src/canonical/minisprites/gen5/pokemon/342--0--Crawdaunt.png diff --git a/src/canonical/minisprites/gen5/pokemon/Baltoy.png b/src/canonical/minisprites/gen5/pokemon/343--0--Baltoy.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Baltoy.png rename to src/canonical/minisprites/gen5/pokemon/343--0--Baltoy.png diff --git a/src/canonical/minisprites/gen5/pokemon/Claydol.png b/src/canonical/minisprites/gen5/pokemon/344--0--Claydol.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Claydol.png rename to src/canonical/minisprites/gen5/pokemon/344--0--Claydol.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lileep.png b/src/canonical/minisprites/gen5/pokemon/345--0--Lileep.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lileep.png rename to src/canonical/minisprites/gen5/pokemon/345--0--Lileep.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cradily.png b/src/canonical/minisprites/gen5/pokemon/346--0--Cradily.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cradily.png rename to src/canonical/minisprites/gen5/pokemon/346--0--Cradily.png diff --git a/src/canonical/minisprites/gen5/pokemon/Anorith.png b/src/canonical/minisprites/gen5/pokemon/347--0--Anorith.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Anorith.png rename to src/canonical/minisprites/gen5/pokemon/347--0--Anorith.png diff --git a/src/canonical/minisprites/gen5/pokemon/Armaldo.png b/src/canonical/minisprites/gen5/pokemon/348--0--Armaldo.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Armaldo.png rename to src/canonical/minisprites/gen5/pokemon/348--0--Armaldo.png diff --git a/src/canonical/minisprites/gen5/pokemon/Feebas.png b/src/canonical/minisprites/gen5/pokemon/349--0--Feebas.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Feebas.png rename to src/canonical/minisprites/gen5/pokemon/349--0--Feebas.png diff --git a/src/canonical/minisprites/gen5/pokemon/Clefairy.png b/src/canonical/minisprites/gen5/pokemon/35--0--Clefairy.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Clefairy.png rename to src/canonical/minisprites/gen5/pokemon/35--0--Clefairy.png diff --git a/src/canonical/minisprites/gen5/pokemon/Milotic.png b/src/canonical/minisprites/gen5/pokemon/350--0--Milotic.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Milotic.png rename to src/canonical/minisprites/gen5/pokemon/350--0--Milotic.png diff --git a/src/canonical/minisprites/gen5/pokemon/Castform.png b/src/canonical/minisprites/gen5/pokemon/351--0--Castform.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Castform.png rename to src/canonical/minisprites/gen5/pokemon/351--0--Castform.png diff --git a/src/canonical/minisprites/gen5/pokemon/Castform--Rainy.png b/src/canonical/minisprites/gen5/pokemon/351--420--Castform--Rainy.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Castform--Rainy.png rename to src/canonical/minisprites/gen5/pokemon/351--420--Castform--Rainy.png diff --git a/src/canonical/minisprites/gen5/pokemon/Castform--Snowy.png b/src/canonical/minisprites/gen5/pokemon/351--420--Castform--Snowy.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Castform--Snowy.png rename to src/canonical/minisprites/gen5/pokemon/351--420--Castform--Snowy.png diff --git a/src/canonical/minisprites/gen5/pokemon/Castform--Sunny.png b/src/canonical/minisprites/gen5/pokemon/351--420--Castform--Sunny.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Castform--Sunny.png rename to src/canonical/minisprites/gen5/pokemon/351--420--Castform--Sunny.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kecleon.png b/src/canonical/minisprites/gen5/pokemon/352--0--Kecleon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kecleon.png rename to src/canonical/minisprites/gen5/pokemon/352--0--Kecleon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Shuppet.png b/src/canonical/minisprites/gen5/pokemon/353--0--Shuppet.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Shuppet.png rename to src/canonical/minisprites/gen5/pokemon/353--0--Shuppet.png diff --git a/src/canonical/minisprites/gen5/pokemon/Banette.png b/src/canonical/minisprites/gen5/pokemon/354--0--Banette.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Banette.png rename to src/canonical/minisprites/gen5/pokemon/354--0--Banette.png diff --git a/src/canonical/minisprites/gen5/pokemon/Duskull.png b/src/canonical/minisprites/gen5/pokemon/355--0--Duskull.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Duskull.png rename to src/canonical/minisprites/gen5/pokemon/355--0--Duskull.png diff --git a/src/canonical/minisprites/gen5/pokemon/Dusclops.png b/src/canonical/minisprites/gen5/pokemon/356--0--Dusclops.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Dusclops.png rename to src/canonical/minisprites/gen5/pokemon/356--0--Dusclops.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tropius.png b/src/canonical/minisprites/gen5/pokemon/357--0--Tropius.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tropius.png rename to src/canonical/minisprites/gen5/pokemon/357--0--Tropius.png diff --git a/src/canonical/minisprites/gen5/pokemon/Chimecho.png b/src/canonical/minisprites/gen5/pokemon/358--0--Chimecho.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Chimecho.png rename to src/canonical/minisprites/gen5/pokemon/358--0--Chimecho.png diff --git a/src/canonical/minisprites/gen5/pokemon/Absol.png b/src/canonical/minisprites/gen5/pokemon/359--0--Absol.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Absol.png rename to src/canonical/minisprites/gen5/pokemon/359--0--Absol.png diff --git a/src/canonical/minisprites/gen5/pokemon/Clefable.png b/src/canonical/minisprites/gen5/pokemon/36--0--Clefable.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Clefable.png rename to src/canonical/minisprites/gen5/pokemon/36--0--Clefable.png diff --git a/src/canonical/minisprites/gen5/pokemon/Wynaut.png b/src/canonical/minisprites/gen5/pokemon/360--0--Wynaut.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Wynaut.png rename to src/canonical/minisprites/gen5/pokemon/360--0--Wynaut.png diff --git a/src/canonical/minisprites/gen5/pokemon/Snorunt.png b/src/canonical/minisprites/gen5/pokemon/361--0--Snorunt.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Snorunt.png rename to src/canonical/minisprites/gen5/pokemon/361--0--Snorunt.png diff --git a/src/canonical/minisprites/gen5/pokemon/Glalie.png b/src/canonical/minisprites/gen5/pokemon/362--0--Glalie.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Glalie.png rename to src/canonical/minisprites/gen5/pokemon/362--0--Glalie.png diff --git a/src/canonical/minisprites/gen5/pokemon/Spheal.png b/src/canonical/minisprites/gen5/pokemon/363--0--Spheal.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Spheal.png rename to src/canonical/minisprites/gen5/pokemon/363--0--Spheal.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sealeo.png b/src/canonical/minisprites/gen5/pokemon/364--0--Sealeo.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sealeo.png rename to src/canonical/minisprites/gen5/pokemon/364--0--Sealeo.png diff --git a/src/canonical/minisprites/gen5/pokemon/Walrein.png b/src/canonical/minisprites/gen5/pokemon/365--0--Walrein.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Walrein.png rename to src/canonical/minisprites/gen5/pokemon/365--0--Walrein.png diff --git a/src/canonical/minisprites/gen5/pokemon/Clamperl.png b/src/canonical/minisprites/gen5/pokemon/366--0--Clamperl.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Clamperl.png rename to src/canonical/minisprites/gen5/pokemon/366--0--Clamperl.png diff --git a/src/canonical/minisprites/gen5/pokemon/Huntail.png b/src/canonical/minisprites/gen5/pokemon/367--0--Huntail.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Huntail.png rename to src/canonical/minisprites/gen5/pokemon/367--0--Huntail.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gorebyss.png b/src/canonical/minisprites/gen5/pokemon/368--0--Gorebyss.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gorebyss.png rename to src/canonical/minisprites/gen5/pokemon/368--0--Gorebyss.png diff --git a/src/canonical/minisprites/gen5/pokemon/Relicanth.png b/src/canonical/minisprites/gen5/pokemon/369--0--Relicanth.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Relicanth.png rename to src/canonical/minisprites/gen5/pokemon/369--0--Relicanth.png diff --git a/src/canonical/minisprites/gen5/pokemon/Vulpix.png b/src/canonical/minisprites/gen5/pokemon/37--0--Vulpix.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Vulpix.png rename to src/canonical/minisprites/gen5/pokemon/37--0--Vulpix.png diff --git a/src/canonical/minisprites/gen5/pokemon/Luvdisc.png b/src/canonical/minisprites/gen5/pokemon/370--0--Luvdisc.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Luvdisc.png rename to src/canonical/minisprites/gen5/pokemon/370--0--Luvdisc.png diff --git a/src/canonical/minisprites/gen5/pokemon/Bagon.png b/src/canonical/minisprites/gen5/pokemon/371--0--Bagon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Bagon.png rename to src/canonical/minisprites/gen5/pokemon/371--0--Bagon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Shelgon.png b/src/canonical/minisprites/gen5/pokemon/372--0--Shelgon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Shelgon.png rename to src/canonical/minisprites/gen5/pokemon/372--0--Shelgon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Salamence.png b/src/canonical/minisprites/gen5/pokemon/373--0--Salamence.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Salamence.png rename to src/canonical/minisprites/gen5/pokemon/373--0--Salamence.png diff --git a/src/canonical/minisprites/gen5/pokemon/Beldum.png b/src/canonical/minisprites/gen5/pokemon/374--0--Beldum.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Beldum.png rename to src/canonical/minisprites/gen5/pokemon/374--0--Beldum.png diff --git a/src/canonical/minisprites/gen5/pokemon/Metang.png b/src/canonical/minisprites/gen5/pokemon/375--0--Metang.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Metang.png rename to src/canonical/minisprites/gen5/pokemon/375--0--Metang.png diff --git a/src/canonical/minisprites/gen5/pokemon/Metagross.png b/src/canonical/minisprites/gen5/pokemon/376--0--Metagross.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Metagross.png rename to src/canonical/minisprites/gen5/pokemon/376--0--Metagross.png diff --git a/src/canonical/minisprites/gen5/pokemon/Regirock.png b/src/canonical/minisprites/gen5/pokemon/377--0--Regirock.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Regirock.png rename to src/canonical/minisprites/gen5/pokemon/377--0--Regirock.png diff --git a/src/canonical/minisprites/gen5/pokemon/Regice.png b/src/canonical/minisprites/gen5/pokemon/378--0--Regice.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Regice.png rename to src/canonical/minisprites/gen5/pokemon/378--0--Regice.png diff --git a/src/canonical/minisprites/gen5/pokemon/Registeel.png b/src/canonical/minisprites/gen5/pokemon/379--0--Registeel.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Registeel.png rename to src/canonical/minisprites/gen5/pokemon/379--0--Registeel.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ninetales.png b/src/canonical/minisprites/gen5/pokemon/38--0--Ninetales.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ninetales.png rename to src/canonical/minisprites/gen5/pokemon/38--0--Ninetales.png diff --git a/src/canonical/minisprites/gen5/pokemon/Latias.png b/src/canonical/minisprites/gen5/pokemon/380--0--Latias.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Latias.png rename to src/canonical/minisprites/gen5/pokemon/380--0--Latias.png diff --git a/src/canonical/minisprites/gen5/pokemon/Latios.png b/src/canonical/minisprites/gen5/pokemon/381--0--Latios.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Latios.png rename to src/canonical/minisprites/gen5/pokemon/381--0--Latios.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kyogre.png b/src/canonical/minisprites/gen5/pokemon/382--0--Kyogre.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kyogre.png rename to src/canonical/minisprites/gen5/pokemon/382--0--Kyogre.png diff --git a/src/canonical/minisprites/gen5/pokemon/Groudon.png b/src/canonical/minisprites/gen5/pokemon/383--0--Groudon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Groudon.png rename to src/canonical/minisprites/gen5/pokemon/383--0--Groudon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Rayquaza.png b/src/canonical/minisprites/gen5/pokemon/384--0--Rayquaza.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Rayquaza.png rename to src/canonical/minisprites/gen5/pokemon/384--0--Rayquaza.png diff --git a/src/canonical/minisprites/gen5/pokemon/Jirachi.png b/src/canonical/minisprites/gen5/pokemon/385--0--Jirachi.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Jirachi.png rename to src/canonical/minisprites/gen5/pokemon/385--0--Jirachi.png diff --git a/src/canonical/minisprites/gen5/pokemon/Deoxys.png b/src/canonical/minisprites/gen5/pokemon/386--0--Deoxys.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Deoxys.png rename to src/canonical/minisprites/gen5/pokemon/386--0--Deoxys.png diff --git a/src/canonical/minisprites/gen5/pokemon/Deoxys--Attack.png b/src/canonical/minisprites/gen5/pokemon/386--420--Deoxys--Attack.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Deoxys--Attack.png rename to src/canonical/minisprites/gen5/pokemon/386--420--Deoxys--Attack.png diff --git a/src/canonical/minisprites/gen5/pokemon/Deoxys--Defense.png b/src/canonical/minisprites/gen5/pokemon/386--420--Deoxys--Defense.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Deoxys--Defense.png rename to src/canonical/minisprites/gen5/pokemon/386--420--Deoxys--Defense.png diff --git a/src/canonical/minisprites/gen5/pokemon/Deoxys--Speed.png b/src/canonical/minisprites/gen5/pokemon/386--420--Deoxys--Speed.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Deoxys--Speed.png rename to src/canonical/minisprites/gen5/pokemon/386--420--Deoxys--Speed.png diff --git a/src/canonical/minisprites/gen5/pokemon/Turtwig.png b/src/canonical/minisprites/gen5/pokemon/387--0--Turtwig.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Turtwig.png rename to src/canonical/minisprites/gen5/pokemon/387--0--Turtwig.png diff --git a/src/canonical/minisprites/gen5/pokemon/Grotle.png b/src/canonical/minisprites/gen5/pokemon/388--0--Grotle.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Grotle.png rename to src/canonical/minisprites/gen5/pokemon/388--0--Grotle.png diff --git a/src/canonical/minisprites/gen5/pokemon/Torterra.png b/src/canonical/minisprites/gen5/pokemon/389--0--Torterra.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Torterra.png rename to src/canonical/minisprites/gen5/pokemon/389--0--Torterra.png diff --git a/src/canonical/minisprites/gen5/pokemon/Jigglypuff.png b/src/canonical/minisprites/gen5/pokemon/39--0--Jigglypuff.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Jigglypuff.png rename to src/canonical/minisprites/gen5/pokemon/39--0--Jigglypuff.png diff --git a/src/canonical/minisprites/gen5/pokemon/Chimchar.png b/src/canonical/minisprites/gen5/pokemon/390--0--Chimchar.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Chimchar.png rename to src/canonical/minisprites/gen5/pokemon/390--0--Chimchar.png diff --git a/src/canonical/minisprites/gen5/pokemon/Monferno.png b/src/canonical/minisprites/gen5/pokemon/391--0--Monferno.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Monferno.png rename to src/canonical/minisprites/gen5/pokemon/391--0--Monferno.png diff --git a/src/canonical/minisprites/gen5/pokemon/Infernape.png b/src/canonical/minisprites/gen5/pokemon/392--0--Infernape.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Infernape.png rename to src/canonical/minisprites/gen5/pokemon/392--0--Infernape.png diff --git a/src/canonical/minisprites/gen5/pokemon/Piplup.png b/src/canonical/minisprites/gen5/pokemon/393--0--Piplup.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Piplup.png rename to src/canonical/minisprites/gen5/pokemon/393--0--Piplup.png diff --git a/src/canonical/minisprites/gen5/pokemon/Prinplup.png b/src/canonical/minisprites/gen5/pokemon/394--0--Prinplup.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Prinplup.png rename to src/canonical/minisprites/gen5/pokemon/394--0--Prinplup.png diff --git a/src/canonical/minisprites/gen5/pokemon/Empoleon.png b/src/canonical/minisprites/gen5/pokemon/395--0--Empoleon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Empoleon.png rename to src/canonical/minisprites/gen5/pokemon/395--0--Empoleon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Starly.png b/src/canonical/minisprites/gen5/pokemon/396--0--Starly.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Starly.png rename to src/canonical/minisprites/gen5/pokemon/396--0--Starly.png diff --git a/src/canonical/minisprites/gen5/pokemon/Staravia.png b/src/canonical/minisprites/gen5/pokemon/397--0--Staravia.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Staravia.png rename to src/canonical/minisprites/gen5/pokemon/397--0--Staravia.png diff --git a/src/canonical/minisprites/gen5/pokemon/Staraptor.png b/src/canonical/minisprites/gen5/pokemon/398--0--Staraptor.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Staraptor.png rename to src/canonical/minisprites/gen5/pokemon/398--0--Staraptor.png diff --git a/src/canonical/minisprites/gen5/pokemon/Bidoof.png b/src/canonical/minisprites/gen5/pokemon/399--0--Bidoof.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Bidoof.png rename to src/canonical/minisprites/gen5/pokemon/399--0--Bidoof.png diff --git a/src/canonical/minisprites/gen5/pokemon/Charmander.png b/src/canonical/minisprites/gen5/pokemon/4--0--Charmander.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Charmander.png rename to src/canonical/minisprites/gen5/pokemon/4--0--Charmander.png diff --git a/src/canonical/minisprites/gen5/pokemon/Wigglytuff.png b/src/canonical/minisprites/gen5/pokemon/40--0--Wigglytuff.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Wigglytuff.png rename to src/canonical/minisprites/gen5/pokemon/40--0--Wigglytuff.png diff --git a/src/canonical/minisprites/gen5/pokemon/Bibarel.png b/src/canonical/minisprites/gen5/pokemon/400--0--Bibarel.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Bibarel.png rename to src/canonical/minisprites/gen5/pokemon/400--0--Bibarel.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kricketot.png b/src/canonical/minisprites/gen5/pokemon/401--0--Kricketot.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kricketot.png rename to src/canonical/minisprites/gen5/pokemon/401--0--Kricketot.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kricketune.png b/src/canonical/minisprites/gen5/pokemon/402--0--Kricketune.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kricketune.png rename to src/canonical/minisprites/gen5/pokemon/402--0--Kricketune.png diff --git a/src/canonical/minisprites/gen5/pokemon/Shinx.png b/src/canonical/minisprites/gen5/pokemon/403--0--Shinx.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Shinx.png rename to src/canonical/minisprites/gen5/pokemon/403--0--Shinx.png diff --git a/src/canonical/minisprites/gen5/pokemon/Luxio.png b/src/canonical/minisprites/gen5/pokemon/404--0--Luxio.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Luxio.png rename to src/canonical/minisprites/gen5/pokemon/404--0--Luxio.png diff --git a/src/canonical/minisprites/gen5/pokemon/Luxray.png b/src/canonical/minisprites/gen5/pokemon/405--0--Luxray.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Luxray.png rename to src/canonical/minisprites/gen5/pokemon/405--0--Luxray.png diff --git a/src/canonical/minisprites/gen5/pokemon/Budew.png b/src/canonical/minisprites/gen5/pokemon/406--0--Budew.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Budew.png rename to src/canonical/minisprites/gen5/pokemon/406--0--Budew.png diff --git a/src/canonical/minisprites/gen5/pokemon/Roserade.png b/src/canonical/minisprites/gen5/pokemon/407--0--Roserade.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Roserade.png rename to src/canonical/minisprites/gen5/pokemon/407--0--Roserade.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cranidos.png b/src/canonical/minisprites/gen5/pokemon/408--0--Cranidos.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cranidos.png rename to src/canonical/minisprites/gen5/pokemon/408--0--Cranidos.png diff --git a/src/canonical/minisprites/gen5/pokemon/Rampardos.png b/src/canonical/minisprites/gen5/pokemon/409--0--Rampardos.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Rampardos.png rename to src/canonical/minisprites/gen5/pokemon/409--0--Rampardos.png diff --git a/src/canonical/minisprites/gen5/pokemon/Zubat.png b/src/canonical/minisprites/gen5/pokemon/41--0--Zubat.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Zubat.png rename to src/canonical/minisprites/gen5/pokemon/41--0--Zubat.png diff --git a/src/canonical/minisprites/gen5/pokemon/Shieldon.png b/src/canonical/minisprites/gen5/pokemon/410--0--Shieldon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Shieldon.png rename to src/canonical/minisprites/gen5/pokemon/410--0--Shieldon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Bastiodon.png b/src/canonical/minisprites/gen5/pokemon/411--0--Bastiodon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Bastiodon.png rename to src/canonical/minisprites/gen5/pokemon/411--0--Bastiodon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Burmy.png b/src/canonical/minisprites/gen5/pokemon/412--0--Burmy.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Burmy.png rename to src/canonical/minisprites/gen5/pokemon/412--0--Burmy.png diff --git a/src/canonical/minisprites/gen5/pokemon/Burmy--Sandy.png b/src/canonical/minisprites/gen5/pokemon/412--420--Burmy--Sandy.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Burmy--Sandy.png rename to src/canonical/minisprites/gen5/pokemon/412--420--Burmy--Sandy.png diff --git a/src/canonical/minisprites/gen5/pokemon/Burmy--Trash.png b/src/canonical/minisprites/gen5/pokemon/412--420--Burmy--Trash.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Burmy--Trash.png rename to src/canonical/minisprites/gen5/pokemon/412--420--Burmy--Trash.png diff --git a/src/canonical/minisprites/gen5/pokemon/Wormadam.png b/src/canonical/minisprites/gen5/pokemon/413--0--Wormadam.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Wormadam.png rename to src/canonical/minisprites/gen5/pokemon/413--0--Wormadam.png diff --git a/src/canonical/minisprites/gen5/pokemon/Wormadam--Sandy.png b/src/canonical/minisprites/gen5/pokemon/413--420--Wormadam--Sandy.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Wormadam--Sandy.png rename to src/canonical/minisprites/gen5/pokemon/413--420--Wormadam--Sandy.png diff --git a/src/canonical/minisprites/gen5/pokemon/Wormadam--Trash.png b/src/canonical/minisprites/gen5/pokemon/413--420--Wormadam--Trash.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Wormadam--Trash.png rename to src/canonical/minisprites/gen5/pokemon/413--420--Wormadam--Trash.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mothim.png b/src/canonical/minisprites/gen5/pokemon/414--0--Mothim.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mothim.png rename to src/canonical/minisprites/gen5/pokemon/414--0--Mothim.png diff --git a/src/canonical/minisprites/gen5/pokemon/Combee.png b/src/canonical/minisprites/gen5/pokemon/415--0--Combee.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Combee.png rename to src/canonical/minisprites/gen5/pokemon/415--0--Combee.png diff --git a/src/canonical/minisprites/gen5/pokemon/Vespiquen.png b/src/canonical/minisprites/gen5/pokemon/416--0--Vespiquen.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Vespiquen.png rename to src/canonical/minisprites/gen5/pokemon/416--0--Vespiquen.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pachirisu.png b/src/canonical/minisprites/gen5/pokemon/417--0--Pachirisu.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pachirisu.png rename to src/canonical/minisprites/gen5/pokemon/417--0--Pachirisu.png diff --git a/src/canonical/minisprites/gen5/pokemon/Buizel.png b/src/canonical/minisprites/gen5/pokemon/418--0--Buizel.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Buizel.png rename to src/canonical/minisprites/gen5/pokemon/418--0--Buizel.png diff --git a/src/canonical/minisprites/gen5/pokemon/Floatzel.png b/src/canonical/minisprites/gen5/pokemon/419--0--Floatzel.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Floatzel.png rename to src/canonical/minisprites/gen5/pokemon/419--0--Floatzel.png diff --git a/src/canonical/minisprites/gen5/pokemon/Golbat.png b/src/canonical/minisprites/gen5/pokemon/42--0--Golbat.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Golbat.png rename to src/canonical/minisprites/gen5/pokemon/42--0--Golbat.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cherubi.png b/src/canonical/minisprites/gen5/pokemon/420--0--Cherubi.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cherubi.png rename to src/canonical/minisprites/gen5/pokemon/420--0--Cherubi.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cherrim.png b/src/canonical/minisprites/gen5/pokemon/421--0--Cherrim.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cherrim.png rename to src/canonical/minisprites/gen5/pokemon/421--0--Cherrim.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cherrim--Sunshine.png b/src/canonical/minisprites/gen5/pokemon/421--420--Cherrim--Sunshine.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cherrim--Sunshine.png rename to src/canonical/minisprites/gen5/pokemon/421--420--Cherrim--Sunshine.png diff --git a/src/canonical/minisprites/gen5/pokemon/Shellos.png b/src/canonical/minisprites/gen5/pokemon/422--0--Shellos.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Shellos.png rename to src/canonical/minisprites/gen5/pokemon/422--0--Shellos.png diff --git a/src/canonical/minisprites/gen5/pokemon/Shellos--East.png b/src/canonical/minisprites/gen5/pokemon/422--420--Shellos--East.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Shellos--East.png rename to src/canonical/minisprites/gen5/pokemon/422--420--Shellos--East.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gastrodon.png b/src/canonical/minisprites/gen5/pokemon/423--0--Gastrodon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gastrodon.png rename to src/canonical/minisprites/gen5/pokemon/423--0--Gastrodon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gastrodon--East.png b/src/canonical/minisprites/gen5/pokemon/423--420--Gastrodon--East.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gastrodon--East.png rename to src/canonical/minisprites/gen5/pokemon/423--420--Gastrodon--East.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ambipom.png b/src/canonical/minisprites/gen5/pokemon/424--0--Ambipom.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ambipom.png rename to src/canonical/minisprites/gen5/pokemon/424--0--Ambipom.png diff --git a/src/canonical/minisprites/gen5/pokemon/Drifloon.png b/src/canonical/minisprites/gen5/pokemon/425--0--Drifloon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Drifloon.png rename to src/canonical/minisprites/gen5/pokemon/425--0--Drifloon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Drifblim.png b/src/canonical/minisprites/gen5/pokemon/426--0--Drifblim.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Drifblim.png rename to src/canonical/minisprites/gen5/pokemon/426--0--Drifblim.png diff --git a/src/canonical/minisprites/gen5/pokemon/Buneary.png b/src/canonical/minisprites/gen5/pokemon/427--0--Buneary.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Buneary.png rename to src/canonical/minisprites/gen5/pokemon/427--0--Buneary.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lopunny.png b/src/canonical/minisprites/gen5/pokemon/428--0--Lopunny.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lopunny.png rename to src/canonical/minisprites/gen5/pokemon/428--0--Lopunny.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mismagius.png b/src/canonical/minisprites/gen5/pokemon/429--0--Mismagius.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mismagius.png rename to src/canonical/minisprites/gen5/pokemon/429--0--Mismagius.png diff --git a/src/canonical/minisprites/gen5/pokemon/Oddish.png b/src/canonical/minisprites/gen5/pokemon/43--0--Oddish.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Oddish.png rename to src/canonical/minisprites/gen5/pokemon/43--0--Oddish.png diff --git a/src/canonical/minisprites/gen5/pokemon/Honchkrow.png b/src/canonical/minisprites/gen5/pokemon/430--0--Honchkrow.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Honchkrow.png rename to src/canonical/minisprites/gen5/pokemon/430--0--Honchkrow.png diff --git a/src/canonical/minisprites/gen5/pokemon/Glameow.png b/src/canonical/minisprites/gen5/pokemon/431--0--Glameow.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Glameow.png rename to src/canonical/minisprites/gen5/pokemon/431--0--Glameow.png diff --git a/src/canonical/minisprites/gen5/pokemon/Purugly.png b/src/canonical/minisprites/gen5/pokemon/432--0--Purugly.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Purugly.png rename to src/canonical/minisprites/gen5/pokemon/432--0--Purugly.png diff --git a/src/canonical/minisprites/gen5/pokemon/Chingling.png b/src/canonical/minisprites/gen5/pokemon/433--0--Chingling.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Chingling.png rename to src/canonical/minisprites/gen5/pokemon/433--0--Chingling.png diff --git a/src/canonical/minisprites/gen5/pokemon/Stunky.png b/src/canonical/minisprites/gen5/pokemon/434--0--Stunky.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Stunky.png rename to src/canonical/minisprites/gen5/pokemon/434--0--Stunky.png diff --git a/src/canonical/minisprites/gen5/pokemon/Skuntank.png b/src/canonical/minisprites/gen5/pokemon/435--0--Skuntank.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Skuntank.png rename to src/canonical/minisprites/gen5/pokemon/435--0--Skuntank.png diff --git a/src/canonical/minisprites/gen5/pokemon/Bronzor.png b/src/canonical/minisprites/gen5/pokemon/436--0--Bronzor.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Bronzor.png rename to src/canonical/minisprites/gen5/pokemon/436--0--Bronzor.png diff --git a/src/canonical/minisprites/gen5/pokemon/Bronzong.png b/src/canonical/minisprites/gen5/pokemon/437--0--Bronzong.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Bronzong.png rename to src/canonical/minisprites/gen5/pokemon/437--0--Bronzong.png diff --git a/src/canonical/minisprites/gen5/pokemon/Bonsly.png b/src/canonical/minisprites/gen5/pokemon/438--0--Bonsly.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Bonsly.png rename to src/canonical/minisprites/gen5/pokemon/438--0--Bonsly.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mime_Jr..png b/src/canonical/minisprites/gen5/pokemon/439--0--Mime_Jr..png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mime_Jr..png rename to src/canonical/minisprites/gen5/pokemon/439--0--Mime_Jr..png diff --git a/src/canonical/minisprites/gen5/pokemon/Gloom.png b/src/canonical/minisprites/gen5/pokemon/44--0--Gloom.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gloom.png rename to src/canonical/minisprites/gen5/pokemon/44--0--Gloom.png diff --git a/src/canonical/minisprites/gen5/pokemon/Happiny.png b/src/canonical/minisprites/gen5/pokemon/440--0--Happiny.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Happiny.png rename to src/canonical/minisprites/gen5/pokemon/440--0--Happiny.png diff --git a/src/canonical/minisprites/gen5/pokemon/Chatot.png b/src/canonical/minisprites/gen5/pokemon/441--0--Chatot.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Chatot.png rename to src/canonical/minisprites/gen5/pokemon/441--0--Chatot.png diff --git a/src/canonical/minisprites/gen5/pokemon/Spiritomb.png b/src/canonical/minisprites/gen5/pokemon/442--0--Spiritomb.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Spiritomb.png rename to src/canonical/minisprites/gen5/pokemon/442--0--Spiritomb.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gible.png b/src/canonical/minisprites/gen5/pokemon/443--0--Gible.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gible.png rename to src/canonical/minisprites/gen5/pokemon/443--0--Gible.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gabite.png b/src/canonical/minisprites/gen5/pokemon/444--0--Gabite.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gabite.png rename to src/canonical/minisprites/gen5/pokemon/444--0--Gabite.png diff --git a/src/canonical/minisprites/gen5/pokemon/Garchomp.png b/src/canonical/minisprites/gen5/pokemon/445--0--Garchomp.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Garchomp.png rename to src/canonical/minisprites/gen5/pokemon/445--0--Garchomp.png diff --git a/src/canonical/minisprites/gen5/pokemon/Munchlax.png b/src/canonical/minisprites/gen5/pokemon/446--0--Munchlax.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Munchlax.png rename to src/canonical/minisprites/gen5/pokemon/446--0--Munchlax.png diff --git a/src/canonical/minisprites/gen5/pokemon/Riolu.png b/src/canonical/minisprites/gen5/pokemon/447--0--Riolu.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Riolu.png rename to src/canonical/minisprites/gen5/pokemon/447--0--Riolu.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lucario.png b/src/canonical/minisprites/gen5/pokemon/448--0--Lucario.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lucario.png rename to src/canonical/minisprites/gen5/pokemon/448--0--Lucario.png diff --git a/src/canonical/minisprites/gen5/pokemon/Hippopotas.png b/src/canonical/minisprites/gen5/pokemon/449--0--Hippopotas.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Hippopotas.png rename to src/canonical/minisprites/gen5/pokemon/449--0--Hippopotas.png diff --git a/src/canonical/minisprites/gen5/pokemon/Vileplume.png b/src/canonical/minisprites/gen5/pokemon/45--0--Vileplume.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Vileplume.png rename to src/canonical/minisprites/gen5/pokemon/45--0--Vileplume.png diff --git a/src/canonical/minisprites/gen5/pokemon/Hippowdon.png b/src/canonical/minisprites/gen5/pokemon/450--0--Hippowdon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Hippowdon.png rename to src/canonical/minisprites/gen5/pokemon/450--0--Hippowdon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Skorupi.png b/src/canonical/minisprites/gen5/pokemon/451--0--Skorupi.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Skorupi.png rename to src/canonical/minisprites/gen5/pokemon/451--0--Skorupi.png diff --git a/src/canonical/minisprites/gen5/pokemon/Drapion.png b/src/canonical/minisprites/gen5/pokemon/452--0--Drapion.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Drapion.png rename to src/canonical/minisprites/gen5/pokemon/452--0--Drapion.png diff --git a/src/canonical/minisprites/gen5/pokemon/Croagunk.png b/src/canonical/minisprites/gen5/pokemon/453--0--Croagunk.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Croagunk.png rename to src/canonical/minisprites/gen5/pokemon/453--0--Croagunk.png diff --git a/src/canonical/minisprites/gen5/pokemon/Toxicroak.png b/src/canonical/minisprites/gen5/pokemon/454--0--Toxicroak.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Toxicroak.png rename to src/canonical/minisprites/gen5/pokemon/454--0--Toxicroak.png diff --git a/src/canonical/minisprites/gen5/pokemon/Carnivine.png b/src/canonical/minisprites/gen5/pokemon/455--0--Carnivine.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Carnivine.png rename to src/canonical/minisprites/gen5/pokemon/455--0--Carnivine.png diff --git a/src/canonical/minisprites/gen5/pokemon/Finneon.png b/src/canonical/minisprites/gen5/pokemon/456--0--Finneon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Finneon.png rename to src/canonical/minisprites/gen5/pokemon/456--0--Finneon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lumineon.png b/src/canonical/minisprites/gen5/pokemon/457--0--Lumineon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lumineon.png rename to src/canonical/minisprites/gen5/pokemon/457--0--Lumineon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mantyke.png b/src/canonical/minisprites/gen5/pokemon/458--0--Mantyke.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mantyke.png rename to src/canonical/minisprites/gen5/pokemon/458--0--Mantyke.png diff --git a/src/canonical/minisprites/gen5/pokemon/Snover.png b/src/canonical/minisprites/gen5/pokemon/459--0--Snover.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Snover.png rename to src/canonical/minisprites/gen5/pokemon/459--0--Snover.png diff --git a/src/canonical/minisprites/gen5/pokemon/Paras.png b/src/canonical/minisprites/gen5/pokemon/46--0--Paras.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Paras.png rename to src/canonical/minisprites/gen5/pokemon/46--0--Paras.png diff --git a/src/canonical/minisprites/gen5/pokemon/Abomasnow.png b/src/canonical/minisprites/gen5/pokemon/460--0--Abomasnow.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Abomasnow.png rename to src/canonical/minisprites/gen5/pokemon/460--0--Abomasnow.png diff --git a/src/canonical/minisprites/gen5/pokemon/Weavile.png b/src/canonical/minisprites/gen5/pokemon/461--0--Weavile.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Weavile.png rename to src/canonical/minisprites/gen5/pokemon/461--0--Weavile.png diff --git a/src/canonical/minisprites/gen5/pokemon/Magnezone.png b/src/canonical/minisprites/gen5/pokemon/462--0--Magnezone.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Magnezone.png rename to src/canonical/minisprites/gen5/pokemon/462--0--Magnezone.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lickilicky.png b/src/canonical/minisprites/gen5/pokemon/463--0--Lickilicky.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lickilicky.png rename to src/canonical/minisprites/gen5/pokemon/463--0--Lickilicky.png diff --git a/src/canonical/minisprites/gen5/pokemon/Rhyperior.png b/src/canonical/minisprites/gen5/pokemon/464--0--Rhyperior.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Rhyperior.png rename to src/canonical/minisprites/gen5/pokemon/464--0--Rhyperior.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tangrowth.png b/src/canonical/minisprites/gen5/pokemon/465--0--Tangrowth.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tangrowth.png rename to src/canonical/minisprites/gen5/pokemon/465--0--Tangrowth.png diff --git a/src/canonical/minisprites/gen5/pokemon/Electivire.png b/src/canonical/minisprites/gen5/pokemon/466--0--Electivire.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Electivire.png rename to src/canonical/minisprites/gen5/pokemon/466--0--Electivire.png diff --git a/src/canonical/minisprites/gen5/pokemon/Magmortar.png b/src/canonical/minisprites/gen5/pokemon/467--0--Magmortar.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Magmortar.png rename to src/canonical/minisprites/gen5/pokemon/467--0--Magmortar.png diff --git a/src/canonical/minisprites/gen5/pokemon/Togekiss.png b/src/canonical/minisprites/gen5/pokemon/468--0--Togekiss.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Togekiss.png rename to src/canonical/minisprites/gen5/pokemon/468--0--Togekiss.png diff --git a/src/canonical/minisprites/gen5/pokemon/Yanmega.png b/src/canonical/minisprites/gen5/pokemon/469--0--Yanmega.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Yanmega.png rename to src/canonical/minisprites/gen5/pokemon/469--0--Yanmega.png diff --git a/src/canonical/minisprites/gen5/pokemon/Parasect.png b/src/canonical/minisprites/gen5/pokemon/47--0--Parasect.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Parasect.png rename to src/canonical/minisprites/gen5/pokemon/47--0--Parasect.png diff --git a/src/canonical/minisprites/gen5/pokemon/Leafeon.png b/src/canonical/minisprites/gen5/pokemon/470--0--Leafeon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Leafeon.png rename to src/canonical/minisprites/gen5/pokemon/470--0--Leafeon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Glaceon.png b/src/canonical/minisprites/gen5/pokemon/471--0--Glaceon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Glaceon.png rename to src/canonical/minisprites/gen5/pokemon/471--0--Glaceon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gliscor.png b/src/canonical/minisprites/gen5/pokemon/472--0--Gliscor.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gliscor.png rename to src/canonical/minisprites/gen5/pokemon/472--0--Gliscor.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mamoswine.png b/src/canonical/minisprites/gen5/pokemon/473--0--Mamoswine.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mamoswine.png rename to src/canonical/minisprites/gen5/pokemon/473--0--Mamoswine.png diff --git a/src/canonical/minisprites/gen5/pokemon/Porygon-Z.png b/src/canonical/minisprites/gen5/pokemon/474--0--Porygon-Z.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Porygon-Z.png rename to src/canonical/minisprites/gen5/pokemon/474--0--Porygon-Z.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gallade.png b/src/canonical/minisprites/gen5/pokemon/475--0--Gallade.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gallade.png rename to src/canonical/minisprites/gen5/pokemon/475--0--Gallade.png diff --git a/src/canonical/minisprites/gen5/pokemon/Probopass.png b/src/canonical/minisprites/gen5/pokemon/476--0--Probopass.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Probopass.png rename to src/canonical/minisprites/gen5/pokemon/476--0--Probopass.png diff --git a/src/canonical/minisprites/gen5/pokemon/Dusknoir.png b/src/canonical/minisprites/gen5/pokemon/477--0--Dusknoir.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Dusknoir.png rename to src/canonical/minisprites/gen5/pokemon/477--0--Dusknoir.png diff --git a/src/canonical/minisprites/gen5/pokemon/Froslass.png b/src/canonical/minisprites/gen5/pokemon/478--0--Froslass.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Froslass.png rename to src/canonical/minisprites/gen5/pokemon/478--0--Froslass.png diff --git a/src/canonical/minisprites/gen5/pokemon/Rotom.png b/src/canonical/minisprites/gen5/pokemon/479--0--Rotom.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Rotom.png rename to src/canonical/minisprites/gen5/pokemon/479--0--Rotom.png diff --git a/src/canonical/minisprites/gen5/pokemon/Rotom--Fan.png b/src/canonical/minisprites/gen5/pokemon/479--420--Rotom--Fan.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Rotom--Fan.png rename to src/canonical/minisprites/gen5/pokemon/479--420--Rotom--Fan.png diff --git a/src/canonical/minisprites/gen5/pokemon/Rotom--Frost.png b/src/canonical/minisprites/gen5/pokemon/479--420--Rotom--Frost.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Rotom--Frost.png rename to src/canonical/minisprites/gen5/pokemon/479--420--Rotom--Frost.png diff --git a/src/canonical/minisprites/gen5/pokemon/Rotom--Heat.png b/src/canonical/minisprites/gen5/pokemon/479--420--Rotom--Heat.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Rotom--Heat.png rename to src/canonical/minisprites/gen5/pokemon/479--420--Rotom--Heat.png diff --git a/src/canonical/minisprites/gen5/pokemon/Rotom--Mow.png b/src/canonical/minisprites/gen5/pokemon/479--420--Rotom--Mow.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Rotom--Mow.png rename to src/canonical/minisprites/gen5/pokemon/479--420--Rotom--Mow.png diff --git a/src/canonical/minisprites/gen5/pokemon/Rotom--Wash.png b/src/canonical/minisprites/gen5/pokemon/479--420--Rotom--Wash.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Rotom--Wash.png rename to src/canonical/minisprites/gen5/pokemon/479--420--Rotom--Wash.png diff --git a/src/canonical/minisprites/gen5/pokemon/Venonat.png b/src/canonical/minisprites/gen5/pokemon/48--0--Venonat.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Venonat.png rename to src/canonical/minisprites/gen5/pokemon/48--0--Venonat.png diff --git a/src/canonical/minisprites/gen5/pokemon/Uxie.png b/src/canonical/minisprites/gen5/pokemon/480--0--Uxie.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Uxie.png rename to src/canonical/minisprites/gen5/pokemon/480--0--Uxie.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mesprit.png b/src/canonical/minisprites/gen5/pokemon/481--0--Mesprit.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mesprit.png rename to src/canonical/minisprites/gen5/pokemon/481--0--Mesprit.png diff --git a/src/canonical/minisprites/gen5/pokemon/Azelf.png b/src/canonical/minisprites/gen5/pokemon/482--0--Azelf.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Azelf.png rename to src/canonical/minisprites/gen5/pokemon/482--0--Azelf.png diff --git a/src/canonical/minisprites/gen5/pokemon/Dialga.png b/src/canonical/minisprites/gen5/pokemon/483--0--Dialga.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Dialga.png rename to src/canonical/minisprites/gen5/pokemon/483--0--Dialga.png diff --git a/src/canonical/minisprites/gen5/pokemon/Palkia.png b/src/canonical/minisprites/gen5/pokemon/484--0--Palkia.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Palkia.png rename to src/canonical/minisprites/gen5/pokemon/484--0--Palkia.png diff --git a/src/canonical/minisprites/gen5/pokemon/Heatran.png b/src/canonical/minisprites/gen5/pokemon/485--0--Heatran.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Heatran.png rename to src/canonical/minisprites/gen5/pokemon/485--0--Heatran.png diff --git a/src/canonical/minisprites/gen5/pokemon/Regigigas.png b/src/canonical/minisprites/gen5/pokemon/486--0--Regigigas.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Regigigas.png rename to src/canonical/minisprites/gen5/pokemon/486--0--Regigigas.png diff --git a/src/canonical/minisprites/gen5/pokemon/Giratina.png b/src/canonical/minisprites/gen5/pokemon/487--0--Giratina.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Giratina.png rename to src/canonical/minisprites/gen5/pokemon/487--0--Giratina.png diff --git a/src/canonical/minisprites/gen5/pokemon/Giratina--Origin.png b/src/canonical/minisprites/gen5/pokemon/487--420--Giratina--Origin.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Giratina--Origin.png rename to src/canonical/minisprites/gen5/pokemon/487--420--Giratina--Origin.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cresselia.png b/src/canonical/minisprites/gen5/pokemon/488--0--Cresselia.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cresselia.png rename to src/canonical/minisprites/gen5/pokemon/488--0--Cresselia.png diff --git a/src/canonical/minisprites/gen5/pokemon/Phione.png b/src/canonical/minisprites/gen5/pokemon/489--0--Phione.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Phione.png rename to src/canonical/minisprites/gen5/pokemon/489--0--Phione.png diff --git a/src/canonical/minisprites/gen5/pokemon/Venomoth.png b/src/canonical/minisprites/gen5/pokemon/49--0--Venomoth.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Venomoth.png rename to src/canonical/minisprites/gen5/pokemon/49--0--Venomoth.png diff --git a/src/canonical/minisprites/gen5/pokemon/Manaphy.png b/src/canonical/minisprites/gen5/pokemon/490--0--Manaphy.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Manaphy.png rename to src/canonical/minisprites/gen5/pokemon/490--0--Manaphy.png diff --git a/src/canonical/minisprites/gen5/pokemon/Darkrai.png b/src/canonical/minisprites/gen5/pokemon/491--0--Darkrai.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Darkrai.png rename to src/canonical/minisprites/gen5/pokemon/491--0--Darkrai.png diff --git a/src/canonical/minisprites/gen5/pokemon/Shaymin.png b/src/canonical/minisprites/gen5/pokemon/492--0--Shaymin.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Shaymin.png rename to src/canonical/minisprites/gen5/pokemon/492--0--Shaymin.png diff --git a/src/canonical/minisprites/gen5/pokemon/Shaymin--Sky.png b/src/canonical/minisprites/gen5/pokemon/492--420--Shaymin--Sky.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Shaymin--Sky.png rename to src/canonical/minisprites/gen5/pokemon/492--420--Shaymin--Sky.png diff --git a/src/canonical/minisprites/gen5/pokemon/Arceus.png b/src/canonical/minisprites/gen5/pokemon/493--0--Arceus.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Arceus.png rename to src/canonical/minisprites/gen5/pokemon/493--0--Arceus.png diff --git a/src/canonical/minisprites/gen5/pokemon/Victini.png b/src/canonical/minisprites/gen5/pokemon/494--0--Victini.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Victini.png rename to src/canonical/minisprites/gen5/pokemon/494--0--Victini.png diff --git a/src/canonical/minisprites/gen5/pokemon/Snivy.png b/src/canonical/minisprites/gen5/pokemon/495--0--Snivy.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Snivy.png rename to src/canonical/minisprites/gen5/pokemon/495--0--Snivy.png diff --git a/src/canonical/minisprites/gen5/pokemon/Servine.png b/src/canonical/minisprites/gen5/pokemon/496--0--Servine.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Servine.png rename to src/canonical/minisprites/gen5/pokemon/496--0--Servine.png diff --git a/src/canonical/minisprites/gen5/pokemon/Serperior.png b/src/canonical/minisprites/gen5/pokemon/497--0--Serperior.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Serperior.png rename to src/canonical/minisprites/gen5/pokemon/497--0--Serperior.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tepig.png b/src/canonical/minisprites/gen5/pokemon/498--0--Tepig.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tepig.png rename to src/canonical/minisprites/gen5/pokemon/498--0--Tepig.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pignite.png b/src/canonical/minisprites/gen5/pokemon/499--0--Pignite.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pignite.png rename to src/canonical/minisprites/gen5/pokemon/499--0--Pignite.png diff --git a/src/canonical/minisprites/gen5/pokemon/Charmeleon.png b/src/canonical/minisprites/gen5/pokemon/5--0--Charmeleon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Charmeleon.png rename to src/canonical/minisprites/gen5/pokemon/5--0--Charmeleon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Diglett.png b/src/canonical/minisprites/gen5/pokemon/50--0--Diglett.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Diglett.png rename to src/canonical/minisprites/gen5/pokemon/50--0--Diglett.png diff --git a/src/canonical/minisprites/gen5/pokemon/Emboar.png b/src/canonical/minisprites/gen5/pokemon/500--0--Emboar.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Emboar.png rename to src/canonical/minisprites/gen5/pokemon/500--0--Emboar.png diff --git a/src/canonical/minisprites/gen5/pokemon/Oshawott.png b/src/canonical/minisprites/gen5/pokemon/501--0--Oshawott.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Oshawott.png rename to src/canonical/minisprites/gen5/pokemon/501--0--Oshawott.png diff --git a/src/canonical/minisprites/gen5/pokemon/Dewott.png b/src/canonical/minisprites/gen5/pokemon/502--0--Dewott.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Dewott.png rename to src/canonical/minisprites/gen5/pokemon/502--0--Dewott.png diff --git a/src/canonical/minisprites/gen5/pokemon/Samurott.png b/src/canonical/minisprites/gen5/pokemon/503--0--Samurott.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Samurott.png rename to src/canonical/minisprites/gen5/pokemon/503--0--Samurott.png diff --git a/src/canonical/minisprites/gen5/pokemon/Patrat.png b/src/canonical/minisprites/gen5/pokemon/504--0--Patrat.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Patrat.png rename to src/canonical/minisprites/gen5/pokemon/504--0--Patrat.png diff --git a/src/canonical/minisprites/gen5/pokemon/Watchog.png b/src/canonical/minisprites/gen5/pokemon/505--0--Watchog.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Watchog.png rename to src/canonical/minisprites/gen5/pokemon/505--0--Watchog.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lillipup.png b/src/canonical/minisprites/gen5/pokemon/506--0--Lillipup.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lillipup.png rename to src/canonical/minisprites/gen5/pokemon/506--0--Lillipup.png diff --git a/src/canonical/minisprites/gen5/pokemon/Herdier.png b/src/canonical/minisprites/gen5/pokemon/507--0--Herdier.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Herdier.png rename to src/canonical/minisprites/gen5/pokemon/507--0--Herdier.png diff --git a/src/canonical/minisprites/gen5/pokemon/Stoutland.png b/src/canonical/minisprites/gen5/pokemon/508--0--Stoutland.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Stoutland.png rename to src/canonical/minisprites/gen5/pokemon/508--0--Stoutland.png diff --git a/src/canonical/minisprites/gen5/pokemon/Purrloin.png b/src/canonical/minisprites/gen5/pokemon/509--0--Purrloin.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Purrloin.png rename to src/canonical/minisprites/gen5/pokemon/509--0--Purrloin.png diff --git a/src/canonical/minisprites/gen5/pokemon/Dugtrio.png b/src/canonical/minisprites/gen5/pokemon/51--0--Dugtrio.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Dugtrio.png rename to src/canonical/minisprites/gen5/pokemon/51--0--Dugtrio.png diff --git a/src/canonical/minisprites/gen5/pokemon/Liepard.png b/src/canonical/minisprites/gen5/pokemon/510--0--Liepard.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Liepard.png rename to src/canonical/minisprites/gen5/pokemon/510--0--Liepard.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pansage.png b/src/canonical/minisprites/gen5/pokemon/511--0--Pansage.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pansage.png rename to src/canonical/minisprites/gen5/pokemon/511--0--Pansage.png diff --git a/src/canonical/minisprites/gen5/pokemon/Simisage.png b/src/canonical/minisprites/gen5/pokemon/512--0--Simisage.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Simisage.png rename to src/canonical/minisprites/gen5/pokemon/512--0--Simisage.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pansear.png b/src/canonical/minisprites/gen5/pokemon/513--0--Pansear.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pansear.png rename to src/canonical/minisprites/gen5/pokemon/513--0--Pansear.png diff --git a/src/canonical/minisprites/gen5/pokemon/Simisear.png b/src/canonical/minisprites/gen5/pokemon/514--0--Simisear.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Simisear.png rename to src/canonical/minisprites/gen5/pokemon/514--0--Simisear.png diff --git a/src/canonical/minisprites/gen5/pokemon/Panpour.png b/src/canonical/minisprites/gen5/pokemon/515--0--Panpour.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Panpour.png rename to src/canonical/minisprites/gen5/pokemon/515--0--Panpour.png diff --git a/src/canonical/minisprites/gen5/pokemon/Simipour.png b/src/canonical/minisprites/gen5/pokemon/516--0--Simipour.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Simipour.png rename to src/canonical/minisprites/gen5/pokemon/516--0--Simipour.png diff --git a/src/canonical/minisprites/gen5/pokemon/Munna.png b/src/canonical/minisprites/gen5/pokemon/517--0--Munna.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Munna.png rename to src/canonical/minisprites/gen5/pokemon/517--0--Munna.png diff --git a/src/canonical/minisprites/gen5/pokemon/Musharna.png b/src/canonical/minisprites/gen5/pokemon/518--0--Musharna.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Musharna.png rename to src/canonical/minisprites/gen5/pokemon/518--0--Musharna.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pidove.png b/src/canonical/minisprites/gen5/pokemon/519--0--Pidove.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pidove.png rename to src/canonical/minisprites/gen5/pokemon/519--0--Pidove.png diff --git a/src/canonical/minisprites/gen5/pokemon/Meowth.png b/src/canonical/minisprites/gen5/pokemon/52--0--Meowth.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Meowth.png rename to src/canonical/minisprites/gen5/pokemon/52--0--Meowth.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tranquill.png b/src/canonical/minisprites/gen5/pokemon/520--0--Tranquill.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tranquill.png rename to src/canonical/minisprites/gen5/pokemon/520--0--Tranquill.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unfezant--Female.png b/src/canonical/minisprites/gen5/pokemon/521--0--Unfezant--Female.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unfezant--Female.png rename to src/canonical/minisprites/gen5/pokemon/521--0--Unfezant--Female.png diff --git a/src/canonical/minisprites/gen5/pokemon/Unfezant.png b/src/canonical/minisprites/gen5/pokemon/521--0--Unfezant.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Unfezant.png rename to src/canonical/minisprites/gen5/pokemon/521--0--Unfezant.png diff --git a/src/canonical/minisprites/gen5/pokemon/Blitzle.png b/src/canonical/minisprites/gen5/pokemon/522--0--Blitzle.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Blitzle.png rename to src/canonical/minisprites/gen5/pokemon/522--0--Blitzle.png diff --git a/src/canonical/minisprites/gen5/pokemon/Zebstrika.png b/src/canonical/minisprites/gen5/pokemon/523--0--Zebstrika.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Zebstrika.png rename to src/canonical/minisprites/gen5/pokemon/523--0--Zebstrika.png diff --git a/src/canonical/minisprites/gen5/pokemon/Roggenrola.png b/src/canonical/minisprites/gen5/pokemon/524--0--Roggenrola.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Roggenrola.png rename to src/canonical/minisprites/gen5/pokemon/524--0--Roggenrola.png diff --git a/src/canonical/minisprites/gen5/pokemon/Boldore.png b/src/canonical/minisprites/gen5/pokemon/525--0--Boldore.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Boldore.png rename to src/canonical/minisprites/gen5/pokemon/525--0--Boldore.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gigalith.png b/src/canonical/minisprites/gen5/pokemon/526--0--Gigalith.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gigalith.png rename to src/canonical/minisprites/gen5/pokemon/526--0--Gigalith.png diff --git a/src/canonical/minisprites/gen5/pokemon/Woobat.png b/src/canonical/minisprites/gen5/pokemon/527--0--Woobat.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Woobat.png rename to src/canonical/minisprites/gen5/pokemon/527--0--Woobat.png diff --git a/src/canonical/minisprites/gen5/pokemon/Swoobat.png b/src/canonical/minisprites/gen5/pokemon/528--0--Swoobat.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Swoobat.png rename to src/canonical/minisprites/gen5/pokemon/528--0--Swoobat.png diff --git a/src/canonical/minisprites/gen5/pokemon/Drilbur.png b/src/canonical/minisprites/gen5/pokemon/529--0--Drilbur.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Drilbur.png rename to src/canonical/minisprites/gen5/pokemon/529--0--Drilbur.png diff --git a/src/canonical/minisprites/gen5/pokemon/Persian.png b/src/canonical/minisprites/gen5/pokemon/53--0--Persian.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Persian.png rename to src/canonical/minisprites/gen5/pokemon/53--0--Persian.png diff --git a/src/canonical/minisprites/gen5/pokemon/Excadrill.png b/src/canonical/minisprites/gen5/pokemon/530--0--Excadrill.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Excadrill.png rename to src/canonical/minisprites/gen5/pokemon/530--0--Excadrill.png diff --git a/src/canonical/minisprites/gen5/pokemon/Audino.png b/src/canonical/minisprites/gen5/pokemon/531--0--Audino.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Audino.png rename to src/canonical/minisprites/gen5/pokemon/531--0--Audino.png diff --git a/src/canonical/minisprites/gen5/pokemon/Timburr.png b/src/canonical/minisprites/gen5/pokemon/532--0--Timburr.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Timburr.png rename to src/canonical/minisprites/gen5/pokemon/532--0--Timburr.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gurdurr.png b/src/canonical/minisprites/gen5/pokemon/533--0--Gurdurr.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gurdurr.png rename to src/canonical/minisprites/gen5/pokemon/533--0--Gurdurr.png diff --git a/src/canonical/minisprites/gen5/pokemon/Conkeldurr.png b/src/canonical/minisprites/gen5/pokemon/534--0--Conkeldurr.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Conkeldurr.png rename to src/canonical/minisprites/gen5/pokemon/534--0--Conkeldurr.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tympole.png b/src/canonical/minisprites/gen5/pokemon/535--0--Tympole.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tympole.png rename to src/canonical/minisprites/gen5/pokemon/535--0--Tympole.png diff --git a/src/canonical/minisprites/gen5/pokemon/Palpitoad.png b/src/canonical/minisprites/gen5/pokemon/536--0--Palpitoad.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Palpitoad.png rename to src/canonical/minisprites/gen5/pokemon/536--0--Palpitoad.png diff --git a/src/canonical/minisprites/gen5/pokemon/Seismitoad.png b/src/canonical/minisprites/gen5/pokemon/537--0--Seismitoad.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Seismitoad.png rename to src/canonical/minisprites/gen5/pokemon/537--0--Seismitoad.png diff --git a/src/canonical/minisprites/gen5/pokemon/Throh.png b/src/canonical/minisprites/gen5/pokemon/538--0--Throh.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Throh.png rename to src/canonical/minisprites/gen5/pokemon/538--0--Throh.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sawk.png b/src/canonical/minisprites/gen5/pokemon/539--0--Sawk.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sawk.png rename to src/canonical/minisprites/gen5/pokemon/539--0--Sawk.png diff --git a/src/canonical/minisprites/gen5/pokemon/Psyduck.png b/src/canonical/minisprites/gen5/pokemon/54--0--Psyduck.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Psyduck.png rename to src/canonical/minisprites/gen5/pokemon/54--0--Psyduck.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sewaddle.png b/src/canonical/minisprites/gen5/pokemon/540--0--Sewaddle.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sewaddle.png rename to src/canonical/minisprites/gen5/pokemon/540--0--Sewaddle.png diff --git a/src/canonical/minisprites/gen5/pokemon/Swadloon.png b/src/canonical/minisprites/gen5/pokemon/541--0--Swadloon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Swadloon.png rename to src/canonical/minisprites/gen5/pokemon/541--0--Swadloon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Leavanny.png b/src/canonical/minisprites/gen5/pokemon/542--0--Leavanny.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Leavanny.png rename to src/canonical/minisprites/gen5/pokemon/542--0--Leavanny.png diff --git a/src/canonical/minisprites/gen5/pokemon/Venipede.png b/src/canonical/minisprites/gen5/pokemon/543--0--Venipede.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Venipede.png rename to src/canonical/minisprites/gen5/pokemon/543--0--Venipede.png diff --git a/src/canonical/minisprites/gen5/pokemon/Whirlipede.png b/src/canonical/minisprites/gen5/pokemon/544--0--Whirlipede.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Whirlipede.png rename to src/canonical/minisprites/gen5/pokemon/544--0--Whirlipede.png diff --git a/src/canonical/minisprites/gen5/pokemon/Scolipede.png b/src/canonical/minisprites/gen5/pokemon/545--0--Scolipede.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Scolipede.png rename to src/canonical/minisprites/gen5/pokemon/545--0--Scolipede.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cottonee.png b/src/canonical/minisprites/gen5/pokemon/546--0--Cottonee.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cottonee.png rename to src/canonical/minisprites/gen5/pokemon/546--0--Cottonee.png diff --git a/src/canonical/minisprites/gen5/pokemon/Whimsicott.png b/src/canonical/minisprites/gen5/pokemon/547--0--Whimsicott.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Whimsicott.png rename to src/canonical/minisprites/gen5/pokemon/547--0--Whimsicott.png diff --git a/src/canonical/minisprites/gen5/pokemon/Petilil.png b/src/canonical/minisprites/gen5/pokemon/548--0--Petilil.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Petilil.png rename to src/canonical/minisprites/gen5/pokemon/548--0--Petilil.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lilligant.png b/src/canonical/minisprites/gen5/pokemon/549--0--Lilligant.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lilligant.png rename to src/canonical/minisprites/gen5/pokemon/549--0--Lilligant.png diff --git a/src/canonical/minisprites/gen5/pokemon/Golduck.png b/src/canonical/minisprites/gen5/pokemon/55--0--Golduck.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Golduck.png rename to src/canonical/minisprites/gen5/pokemon/55--0--Golduck.png diff --git a/src/canonical/minisprites/gen5/pokemon/Basculin.png b/src/canonical/minisprites/gen5/pokemon/550--0--Basculin.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Basculin.png rename to src/canonical/minisprites/gen5/pokemon/550--0--Basculin.png diff --git a/src/canonical/minisprites/gen5/pokemon/Basculin--Blue-Striped.png b/src/canonical/minisprites/gen5/pokemon/550--420--Basculin--Blue-Striped.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Basculin--Blue-Striped.png rename to src/canonical/minisprites/gen5/pokemon/550--420--Basculin--Blue-Striped.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sandile.png b/src/canonical/minisprites/gen5/pokemon/551--0--Sandile.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sandile.png rename to src/canonical/minisprites/gen5/pokemon/551--0--Sandile.png diff --git a/src/canonical/minisprites/gen5/pokemon/Krokorok.png b/src/canonical/minisprites/gen5/pokemon/552--0--Krokorok.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Krokorok.png rename to src/canonical/minisprites/gen5/pokemon/552--0--Krokorok.png diff --git a/src/canonical/minisprites/gen5/pokemon/Krookodile.png b/src/canonical/minisprites/gen5/pokemon/553--0--Krookodile.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Krookodile.png rename to src/canonical/minisprites/gen5/pokemon/553--0--Krookodile.png diff --git a/src/canonical/minisprites/gen5/pokemon/Darumaka.png b/src/canonical/minisprites/gen5/pokemon/554--0--Darumaka.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Darumaka.png rename to src/canonical/minisprites/gen5/pokemon/554--0--Darumaka.png diff --git a/src/canonical/minisprites/gen5/pokemon/Darmanitan.png b/src/canonical/minisprites/gen5/pokemon/555--0--Darmanitan.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Darmanitan.png rename to src/canonical/minisprites/gen5/pokemon/555--0--Darmanitan.png diff --git a/src/canonical/minisprites/gen5/pokemon/Darmanitan--Zen.png b/src/canonical/minisprites/gen5/pokemon/555--420--Darmanitan--Zen.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Darmanitan--Zen.png rename to src/canonical/minisprites/gen5/pokemon/555--420--Darmanitan--Zen.png diff --git a/src/canonical/minisprites/gen5/pokemon/Maractus.png b/src/canonical/minisprites/gen5/pokemon/556--0--Maractus.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Maractus.png rename to src/canonical/minisprites/gen5/pokemon/556--0--Maractus.png diff --git a/src/canonical/minisprites/gen5/pokemon/Dwebble.png b/src/canonical/minisprites/gen5/pokemon/557--0--Dwebble.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Dwebble.png rename to src/canonical/minisprites/gen5/pokemon/557--0--Dwebble.png diff --git a/src/canonical/minisprites/gen5/pokemon/Crustle.png b/src/canonical/minisprites/gen5/pokemon/558--0--Crustle.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Crustle.png rename to src/canonical/minisprites/gen5/pokemon/558--0--Crustle.png diff --git a/src/canonical/minisprites/gen5/pokemon/Scraggy.png b/src/canonical/minisprites/gen5/pokemon/559--0--Scraggy.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Scraggy.png rename to src/canonical/minisprites/gen5/pokemon/559--0--Scraggy.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mankey.png b/src/canonical/minisprites/gen5/pokemon/56--0--Mankey.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mankey.png rename to src/canonical/minisprites/gen5/pokemon/56--0--Mankey.png diff --git a/src/canonical/minisprites/gen5/pokemon/Scrafty.png b/src/canonical/minisprites/gen5/pokemon/560--0--Scrafty.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Scrafty.png rename to src/canonical/minisprites/gen5/pokemon/560--0--Scrafty.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sigilyph.png b/src/canonical/minisprites/gen5/pokemon/561--0--Sigilyph.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sigilyph.png rename to src/canonical/minisprites/gen5/pokemon/561--0--Sigilyph.png diff --git a/src/canonical/minisprites/gen5/pokemon/Yamask.png b/src/canonical/minisprites/gen5/pokemon/562--0--Yamask.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Yamask.png rename to src/canonical/minisprites/gen5/pokemon/562--0--Yamask.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cofagrigus.png b/src/canonical/minisprites/gen5/pokemon/563--0--Cofagrigus.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cofagrigus.png rename to src/canonical/minisprites/gen5/pokemon/563--0--Cofagrigus.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tirtouga.png b/src/canonical/minisprites/gen5/pokemon/564--0--Tirtouga.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tirtouga.png rename to src/canonical/minisprites/gen5/pokemon/564--0--Tirtouga.png diff --git a/src/canonical/minisprites/gen5/pokemon/Carracosta.png b/src/canonical/minisprites/gen5/pokemon/565--0--Carracosta.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Carracosta.png rename to src/canonical/minisprites/gen5/pokemon/565--0--Carracosta.png diff --git a/src/canonical/minisprites/gen5/pokemon/Archen.png b/src/canonical/minisprites/gen5/pokemon/566--0--Archen.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Archen.png rename to src/canonical/minisprites/gen5/pokemon/566--0--Archen.png diff --git a/src/canonical/minisprites/gen5/pokemon/Archeops.png b/src/canonical/minisprites/gen5/pokemon/567--0--Archeops.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Archeops.png rename to src/canonical/minisprites/gen5/pokemon/567--0--Archeops.png diff --git a/src/canonical/minisprites/gen5/pokemon/Trubbish.png b/src/canonical/minisprites/gen5/pokemon/568--0--Trubbish.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Trubbish.png rename to src/canonical/minisprites/gen5/pokemon/568--0--Trubbish.png diff --git a/src/canonical/minisprites/gen5/pokemon/Garbodor.png b/src/canonical/minisprites/gen5/pokemon/569--0--Garbodor.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Garbodor.png rename to src/canonical/minisprites/gen5/pokemon/569--0--Garbodor.png diff --git a/src/canonical/minisprites/gen5/pokemon/Primeape.png b/src/canonical/minisprites/gen5/pokemon/57--0--Primeape.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Primeape.png rename to src/canonical/minisprites/gen5/pokemon/57--0--Primeape.png diff --git a/src/canonical/minisprites/gen5/pokemon/Zorua.png b/src/canonical/minisprites/gen5/pokemon/570--0--Zorua.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Zorua.png rename to src/canonical/minisprites/gen5/pokemon/570--0--Zorua.png diff --git a/src/canonical/minisprites/gen5/pokemon/Zoroark.png b/src/canonical/minisprites/gen5/pokemon/571--0--Zoroark.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Zoroark.png rename to src/canonical/minisprites/gen5/pokemon/571--0--Zoroark.png diff --git a/src/canonical/minisprites/gen5/pokemon/Minccino.png b/src/canonical/minisprites/gen5/pokemon/572--0--Minccino.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Minccino.png rename to src/canonical/minisprites/gen5/pokemon/572--0--Minccino.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cinccino.png b/src/canonical/minisprites/gen5/pokemon/573--0--Cinccino.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cinccino.png rename to src/canonical/minisprites/gen5/pokemon/573--0--Cinccino.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gothita.png b/src/canonical/minisprites/gen5/pokemon/574--0--Gothita.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gothita.png rename to src/canonical/minisprites/gen5/pokemon/574--0--Gothita.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gothorita.png b/src/canonical/minisprites/gen5/pokemon/575--0--Gothorita.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gothorita.png rename to src/canonical/minisprites/gen5/pokemon/575--0--Gothorita.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gothitelle.png b/src/canonical/minisprites/gen5/pokemon/576--0--Gothitelle.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gothitelle.png rename to src/canonical/minisprites/gen5/pokemon/576--0--Gothitelle.png diff --git a/src/canonical/minisprites/gen5/pokemon/Solosis.png b/src/canonical/minisprites/gen5/pokemon/577--0--Solosis.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Solosis.png rename to src/canonical/minisprites/gen5/pokemon/577--0--Solosis.png diff --git a/src/canonical/minisprites/gen5/pokemon/Duosion.png b/src/canonical/minisprites/gen5/pokemon/578--0--Duosion.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Duosion.png rename to src/canonical/minisprites/gen5/pokemon/578--0--Duosion.png diff --git a/src/canonical/minisprites/gen5/pokemon/Reuniclus.png b/src/canonical/minisprites/gen5/pokemon/579--0--Reuniclus.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Reuniclus.png rename to src/canonical/minisprites/gen5/pokemon/579--0--Reuniclus.png diff --git a/src/canonical/minisprites/gen5/pokemon/Growlithe.png b/src/canonical/minisprites/gen5/pokemon/58--0--Growlithe.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Growlithe.png rename to src/canonical/minisprites/gen5/pokemon/58--0--Growlithe.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ducklett.png b/src/canonical/minisprites/gen5/pokemon/580--0--Ducklett.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ducklett.png rename to src/canonical/minisprites/gen5/pokemon/580--0--Ducklett.png diff --git a/src/canonical/minisprites/gen5/pokemon/Swanna.png b/src/canonical/minisprites/gen5/pokemon/581--0--Swanna.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Swanna.png rename to src/canonical/minisprites/gen5/pokemon/581--0--Swanna.png diff --git a/src/canonical/minisprites/gen5/pokemon/Vanillite.png b/src/canonical/minisprites/gen5/pokemon/582--0--Vanillite.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Vanillite.png rename to src/canonical/minisprites/gen5/pokemon/582--0--Vanillite.png diff --git a/src/canonical/minisprites/gen5/pokemon/Vanillish.png b/src/canonical/minisprites/gen5/pokemon/583--0--Vanillish.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Vanillish.png rename to src/canonical/minisprites/gen5/pokemon/583--0--Vanillish.png diff --git a/src/canonical/minisprites/gen5/pokemon/Vanilluxe.png b/src/canonical/minisprites/gen5/pokemon/584--0--Vanilluxe.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Vanilluxe.png rename to src/canonical/minisprites/gen5/pokemon/584--0--Vanilluxe.png diff --git a/src/canonical/minisprites/gen5/pokemon/Deerling.png b/src/canonical/minisprites/gen5/pokemon/585--0--Deerling.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Deerling.png rename to src/canonical/minisprites/gen5/pokemon/585--0--Deerling.png diff --git a/src/canonical/minisprites/gen5/pokemon/Deerling--Autumn.png b/src/canonical/minisprites/gen5/pokemon/585--420--Deerling--Autumn.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Deerling--Autumn.png rename to src/canonical/minisprites/gen5/pokemon/585--420--Deerling--Autumn.png diff --git a/src/canonical/minisprites/gen5/pokemon/Deerling--Summer.png b/src/canonical/minisprites/gen5/pokemon/585--420--Deerling--Summer.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Deerling--Summer.png rename to src/canonical/minisprites/gen5/pokemon/585--420--Deerling--Summer.png diff --git a/src/canonical/minisprites/gen5/pokemon/Deerling--Winter.png b/src/canonical/minisprites/gen5/pokemon/585--420--Deerling--Winter.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Deerling--Winter.png rename to src/canonical/minisprites/gen5/pokemon/585--420--Deerling--Winter.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sawsbuck.png b/src/canonical/minisprites/gen5/pokemon/586--0--Sawsbuck.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sawsbuck.png rename to src/canonical/minisprites/gen5/pokemon/586--0--Sawsbuck.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sawsbuck--Autumn.png b/src/canonical/minisprites/gen5/pokemon/586--420--Sawsbuck--Autumn.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sawsbuck--Autumn.png rename to src/canonical/minisprites/gen5/pokemon/586--420--Sawsbuck--Autumn.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sawsbuck--Summer.png b/src/canonical/minisprites/gen5/pokemon/586--420--Sawsbuck--Summer.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sawsbuck--Summer.png rename to src/canonical/minisprites/gen5/pokemon/586--420--Sawsbuck--Summer.png diff --git a/src/canonical/minisprites/gen5/pokemon/Sawsbuck--Winter.png b/src/canonical/minisprites/gen5/pokemon/586--420--Sawsbuck--Winter.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Sawsbuck--Winter.png rename to src/canonical/minisprites/gen5/pokemon/586--420--Sawsbuck--Winter.png diff --git a/src/canonical/minisprites/gen5/pokemon/Emolga.png b/src/canonical/minisprites/gen5/pokemon/587--0--Emolga.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Emolga.png rename to src/canonical/minisprites/gen5/pokemon/587--0--Emolga.png diff --git a/src/canonical/minisprites/gen5/pokemon/Karrablast.png b/src/canonical/minisprites/gen5/pokemon/588--0--Karrablast.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Karrablast.png rename to src/canonical/minisprites/gen5/pokemon/588--0--Karrablast.png diff --git a/src/canonical/minisprites/gen5/pokemon/Escavalier.png b/src/canonical/minisprites/gen5/pokemon/589--0--Escavalier.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Escavalier.png rename to src/canonical/minisprites/gen5/pokemon/589--0--Escavalier.png diff --git a/src/canonical/minisprites/gen5/pokemon/Arcanine.png b/src/canonical/minisprites/gen5/pokemon/59--0--Arcanine.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Arcanine.png rename to src/canonical/minisprites/gen5/pokemon/59--0--Arcanine.png diff --git a/src/canonical/minisprites/gen5/pokemon/Foongus.png b/src/canonical/minisprites/gen5/pokemon/590--0--Foongus.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Foongus.png rename to src/canonical/minisprites/gen5/pokemon/590--0--Foongus.png diff --git a/src/canonical/minisprites/gen5/pokemon/Amoonguss.png b/src/canonical/minisprites/gen5/pokemon/591--0--Amoonguss.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Amoonguss.png rename to src/canonical/minisprites/gen5/pokemon/591--0--Amoonguss.png diff --git a/src/canonical/minisprites/gen5/pokemon/Frillish--Female.png b/src/canonical/minisprites/gen5/pokemon/592--0--Frillish--Female.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Frillish--Female.png rename to src/canonical/minisprites/gen5/pokemon/592--0--Frillish--Female.png diff --git a/src/canonical/minisprites/gen5/pokemon/Frillish.png b/src/canonical/minisprites/gen5/pokemon/592--0--Frillish.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Frillish.png rename to src/canonical/minisprites/gen5/pokemon/592--0--Frillish.png diff --git a/src/canonical/minisprites/gen5/pokemon/Jellicent--Female.png b/src/canonical/minisprites/gen5/pokemon/593--0--Jellicent--Female.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Jellicent--Female.png rename to src/canonical/minisprites/gen5/pokemon/593--0--Jellicent--Female.png diff --git a/src/canonical/minisprites/gen5/pokemon/Jellicent.png b/src/canonical/minisprites/gen5/pokemon/593--0--Jellicent.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Jellicent.png rename to src/canonical/minisprites/gen5/pokemon/593--0--Jellicent.png diff --git a/src/canonical/minisprites/gen5/pokemon/Alomomola.png b/src/canonical/minisprites/gen5/pokemon/594--0--Alomomola.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Alomomola.png rename to src/canonical/minisprites/gen5/pokemon/594--0--Alomomola.png diff --git a/src/canonical/minisprites/gen5/pokemon/Joltik.png b/src/canonical/minisprites/gen5/pokemon/595--0--Joltik.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Joltik.png rename to src/canonical/minisprites/gen5/pokemon/595--0--Joltik.png diff --git a/src/canonical/minisprites/gen5/pokemon/Galvantula.png b/src/canonical/minisprites/gen5/pokemon/596--0--Galvantula.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Galvantula.png rename to src/canonical/minisprites/gen5/pokemon/596--0--Galvantula.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ferroseed.png b/src/canonical/minisprites/gen5/pokemon/597--0--Ferroseed.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ferroseed.png rename to src/canonical/minisprites/gen5/pokemon/597--0--Ferroseed.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ferrothorn.png b/src/canonical/minisprites/gen5/pokemon/598--0--Ferrothorn.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ferrothorn.png rename to src/canonical/minisprites/gen5/pokemon/598--0--Ferrothorn.png diff --git a/src/canonical/minisprites/gen5/pokemon/Klink.png b/src/canonical/minisprites/gen5/pokemon/599--0--Klink.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Klink.png rename to src/canonical/minisprites/gen5/pokemon/599--0--Klink.png diff --git a/src/canonical/minisprites/gen5/pokemon/Charizard.png b/src/canonical/minisprites/gen5/pokemon/6--0--Charizard.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Charizard.png rename to src/canonical/minisprites/gen5/pokemon/6--0--Charizard.png diff --git a/src/canonical/minisprites/gen5/pokemon/Poliwag.png b/src/canonical/minisprites/gen5/pokemon/60--0--Poliwag.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Poliwag.png rename to src/canonical/minisprites/gen5/pokemon/60--0--Poliwag.png diff --git a/src/canonical/minisprites/gen5/pokemon/Klang.png b/src/canonical/minisprites/gen5/pokemon/600--0--Klang.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Klang.png rename to src/canonical/minisprites/gen5/pokemon/600--0--Klang.png diff --git a/src/canonical/minisprites/gen5/pokemon/Klinklang.png b/src/canonical/minisprites/gen5/pokemon/601--0--Klinklang.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Klinklang.png rename to src/canonical/minisprites/gen5/pokemon/601--0--Klinklang.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tynamo.png b/src/canonical/minisprites/gen5/pokemon/602--0--Tynamo.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tynamo.png rename to src/canonical/minisprites/gen5/pokemon/602--0--Tynamo.png diff --git a/src/canonical/minisprites/gen5/pokemon/Eelektrik.png b/src/canonical/minisprites/gen5/pokemon/603--0--Eelektrik.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Eelektrik.png rename to src/canonical/minisprites/gen5/pokemon/603--0--Eelektrik.png diff --git a/src/canonical/minisprites/gen5/pokemon/Eelektross.png b/src/canonical/minisprites/gen5/pokemon/604--0--Eelektross.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Eelektross.png rename to src/canonical/minisprites/gen5/pokemon/604--0--Eelektross.png diff --git a/src/canonical/minisprites/gen5/pokemon/Elgyem.png b/src/canonical/minisprites/gen5/pokemon/605--0--Elgyem.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Elgyem.png rename to src/canonical/minisprites/gen5/pokemon/605--0--Elgyem.png diff --git a/src/canonical/minisprites/gen5/pokemon/Beheeyem.png b/src/canonical/minisprites/gen5/pokemon/606--0--Beheeyem.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Beheeyem.png rename to src/canonical/minisprites/gen5/pokemon/606--0--Beheeyem.png diff --git a/src/canonical/minisprites/gen5/pokemon/Litwick.png b/src/canonical/minisprites/gen5/pokemon/607--0--Litwick.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Litwick.png rename to src/canonical/minisprites/gen5/pokemon/607--0--Litwick.png diff --git a/src/canonical/minisprites/gen5/pokemon/Lampent.png b/src/canonical/minisprites/gen5/pokemon/608--0--Lampent.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Lampent.png rename to src/canonical/minisprites/gen5/pokemon/608--0--Lampent.png diff --git a/src/canonical/minisprites/gen5/pokemon/Chandelure.png b/src/canonical/minisprites/gen5/pokemon/609--0--Chandelure.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Chandelure.png rename to src/canonical/minisprites/gen5/pokemon/609--0--Chandelure.png diff --git a/src/canonical/minisprites/gen5/pokemon/Poliwhirl.png b/src/canonical/minisprites/gen5/pokemon/61--0--Poliwhirl.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Poliwhirl.png rename to src/canonical/minisprites/gen5/pokemon/61--0--Poliwhirl.png diff --git a/src/canonical/minisprites/gen5/pokemon/Axew.png b/src/canonical/minisprites/gen5/pokemon/610--0--Axew.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Axew.png rename to src/canonical/minisprites/gen5/pokemon/610--0--Axew.png diff --git a/src/canonical/minisprites/gen5/pokemon/Fraxure.png b/src/canonical/minisprites/gen5/pokemon/611--0--Fraxure.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Fraxure.png rename to src/canonical/minisprites/gen5/pokemon/611--0--Fraxure.png diff --git a/src/canonical/minisprites/gen5/pokemon/Haxorus.png b/src/canonical/minisprites/gen5/pokemon/612--0--Haxorus.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Haxorus.png rename to src/canonical/minisprites/gen5/pokemon/612--0--Haxorus.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cubchoo.png b/src/canonical/minisprites/gen5/pokemon/613--0--Cubchoo.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cubchoo.png rename to src/canonical/minisprites/gen5/pokemon/613--0--Cubchoo.png diff --git a/src/canonical/minisprites/gen5/pokemon/Beartic.png b/src/canonical/minisprites/gen5/pokemon/614--0--Beartic.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Beartic.png rename to src/canonical/minisprites/gen5/pokemon/614--0--Beartic.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cryogonal.png b/src/canonical/minisprites/gen5/pokemon/615--0--Cryogonal.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cryogonal.png rename to src/canonical/minisprites/gen5/pokemon/615--0--Cryogonal.png diff --git a/src/canonical/minisprites/gen5/pokemon/Shelmet.png b/src/canonical/minisprites/gen5/pokemon/616--0--Shelmet.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Shelmet.png rename to src/canonical/minisprites/gen5/pokemon/616--0--Shelmet.png diff --git a/src/canonical/minisprites/gen5/pokemon/Accelgor.png b/src/canonical/minisprites/gen5/pokemon/617--0--Accelgor.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Accelgor.png rename to src/canonical/minisprites/gen5/pokemon/617--0--Accelgor.png diff --git a/src/canonical/minisprites/gen5/pokemon/Stunfisk.png b/src/canonical/minisprites/gen5/pokemon/618--0--Stunfisk.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Stunfisk.png rename to src/canonical/minisprites/gen5/pokemon/618--0--Stunfisk.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mienfoo.png b/src/canonical/minisprites/gen5/pokemon/619--0--Mienfoo.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mienfoo.png rename to src/canonical/minisprites/gen5/pokemon/619--0--Mienfoo.png diff --git a/src/canonical/minisprites/gen5/pokemon/Poliwrath.png b/src/canonical/minisprites/gen5/pokemon/62--0--Poliwrath.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Poliwrath.png rename to src/canonical/minisprites/gen5/pokemon/62--0--Poliwrath.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mienshao.png b/src/canonical/minisprites/gen5/pokemon/620--0--Mienshao.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mienshao.png rename to src/canonical/minisprites/gen5/pokemon/620--0--Mienshao.png diff --git a/src/canonical/minisprites/gen5/pokemon/Druddigon.png b/src/canonical/minisprites/gen5/pokemon/621--0--Druddigon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Druddigon.png rename to src/canonical/minisprites/gen5/pokemon/621--0--Druddigon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Golett.png b/src/canonical/minisprites/gen5/pokemon/622--0--Golett.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Golett.png rename to src/canonical/minisprites/gen5/pokemon/622--0--Golett.png diff --git a/src/canonical/minisprites/gen5/pokemon/Golurk.png b/src/canonical/minisprites/gen5/pokemon/623--0--Golurk.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Golurk.png rename to src/canonical/minisprites/gen5/pokemon/623--0--Golurk.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pawniard.png b/src/canonical/minisprites/gen5/pokemon/624--0--Pawniard.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pawniard.png rename to src/canonical/minisprites/gen5/pokemon/624--0--Pawniard.png diff --git a/src/canonical/minisprites/gen5/pokemon/Bisharp.png b/src/canonical/minisprites/gen5/pokemon/625--0--Bisharp.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Bisharp.png rename to src/canonical/minisprites/gen5/pokemon/625--0--Bisharp.png diff --git a/src/canonical/minisprites/gen5/pokemon/Bouffalant.png b/src/canonical/minisprites/gen5/pokemon/626--0--Bouffalant.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Bouffalant.png rename to src/canonical/minisprites/gen5/pokemon/626--0--Bouffalant.png diff --git a/src/canonical/minisprites/gen5/pokemon/Rufflet.png b/src/canonical/minisprites/gen5/pokemon/627--0--Rufflet.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Rufflet.png rename to src/canonical/minisprites/gen5/pokemon/627--0--Rufflet.png diff --git a/src/canonical/minisprites/gen5/pokemon/Braviary.png b/src/canonical/minisprites/gen5/pokemon/628--0--Braviary.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Braviary.png rename to src/canonical/minisprites/gen5/pokemon/628--0--Braviary.png diff --git a/src/canonical/minisprites/gen5/pokemon/Vullaby.png b/src/canonical/minisprites/gen5/pokemon/629--0--Vullaby.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Vullaby.png rename to src/canonical/minisprites/gen5/pokemon/629--0--Vullaby.png diff --git a/src/canonical/minisprites/gen5/pokemon/Abra.png b/src/canonical/minisprites/gen5/pokemon/63--0--Abra.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Abra.png rename to src/canonical/minisprites/gen5/pokemon/63--0--Abra.png diff --git a/src/canonical/minisprites/gen5/pokemon/Mandibuzz.png b/src/canonical/minisprites/gen5/pokemon/630--0--Mandibuzz.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Mandibuzz.png rename to src/canonical/minisprites/gen5/pokemon/630--0--Mandibuzz.png diff --git a/src/canonical/minisprites/gen5/pokemon/Heatmor.png b/src/canonical/minisprites/gen5/pokemon/631--0--Heatmor.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Heatmor.png rename to src/canonical/minisprites/gen5/pokemon/631--0--Heatmor.png diff --git a/src/canonical/minisprites/gen5/pokemon/Durant.png b/src/canonical/minisprites/gen5/pokemon/632--0--Durant.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Durant.png rename to src/canonical/minisprites/gen5/pokemon/632--0--Durant.png diff --git a/src/canonical/minisprites/gen5/pokemon/Deino.png b/src/canonical/minisprites/gen5/pokemon/633--0--Deino.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Deino.png rename to src/canonical/minisprites/gen5/pokemon/633--0--Deino.png diff --git a/src/canonical/minisprites/gen5/pokemon/Zweilous.png b/src/canonical/minisprites/gen5/pokemon/634--0--Zweilous.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Zweilous.png rename to src/canonical/minisprites/gen5/pokemon/634--0--Zweilous.png diff --git a/src/canonical/minisprites/gen5/pokemon/Hydreigon.png b/src/canonical/minisprites/gen5/pokemon/635--0--Hydreigon.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Hydreigon.png rename to src/canonical/minisprites/gen5/pokemon/635--0--Hydreigon.png diff --git a/src/canonical/minisprites/gen5/pokemon/Larvesta.png b/src/canonical/minisprites/gen5/pokemon/636--0--Larvesta.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Larvesta.png rename to src/canonical/minisprites/gen5/pokemon/636--0--Larvesta.png diff --git a/src/canonical/minisprites/gen5/pokemon/Volcarona.png b/src/canonical/minisprites/gen5/pokemon/637--0--Volcarona.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Volcarona.png rename to src/canonical/minisprites/gen5/pokemon/637--0--Volcarona.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cobalion.png b/src/canonical/minisprites/gen5/pokemon/638--0--Cobalion.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cobalion.png rename to src/canonical/minisprites/gen5/pokemon/638--0--Cobalion.png diff --git a/src/canonical/minisprites/gen5/pokemon/Terrakion.png b/src/canonical/minisprites/gen5/pokemon/639--0--Terrakion.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Terrakion.png rename to src/canonical/minisprites/gen5/pokemon/639--0--Terrakion.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kadabra.png b/src/canonical/minisprites/gen5/pokemon/64--0--Kadabra.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kadabra.png rename to src/canonical/minisprites/gen5/pokemon/64--0--Kadabra.png diff --git a/src/canonical/minisprites/gen5/pokemon/Virizion.png b/src/canonical/minisprites/gen5/pokemon/640--0--Virizion.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Virizion.png rename to src/canonical/minisprites/gen5/pokemon/640--0--Virizion.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tornadus.png b/src/canonical/minisprites/gen5/pokemon/641--0--Tornadus.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tornadus.png rename to src/canonical/minisprites/gen5/pokemon/641--0--Tornadus.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tornadus--Therian.png b/src/canonical/minisprites/gen5/pokemon/641--420--Tornadus--Therian.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tornadus--Therian.png rename to src/canonical/minisprites/gen5/pokemon/641--420--Tornadus--Therian.png diff --git a/src/canonical/minisprites/gen5/pokemon/Thundurus.png b/src/canonical/minisprites/gen5/pokemon/642--0--Thundurus.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Thundurus.png rename to src/canonical/minisprites/gen5/pokemon/642--0--Thundurus.png diff --git a/src/canonical/minisprites/gen5/pokemon/Thundurus--Therian.png b/src/canonical/minisprites/gen5/pokemon/642--420--Thundurus--Therian.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Thundurus--Therian.png rename to src/canonical/minisprites/gen5/pokemon/642--420--Thundurus--Therian.png diff --git a/src/canonical/minisprites/gen5/pokemon/Reshiram.png b/src/canonical/minisprites/gen5/pokemon/643--0--Reshiram.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Reshiram.png rename to src/canonical/minisprites/gen5/pokemon/643--0--Reshiram.png diff --git a/src/canonical/minisprites/gen5/pokemon/Zekrom.png b/src/canonical/minisprites/gen5/pokemon/644--0--Zekrom.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Zekrom.png rename to src/canonical/minisprites/gen5/pokemon/644--0--Zekrom.png diff --git a/src/canonical/minisprites/gen5/pokemon/Landorus.png b/src/canonical/minisprites/gen5/pokemon/645--0--Landorus.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Landorus.png rename to src/canonical/minisprites/gen5/pokemon/645--0--Landorus.png diff --git a/src/canonical/minisprites/gen5/pokemon/Landorus--Therian.png b/src/canonical/minisprites/gen5/pokemon/645--420--Landorus--Therian.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Landorus--Therian.png rename to src/canonical/minisprites/gen5/pokemon/645--420--Landorus--Therian.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kyurem.png b/src/canonical/minisprites/gen5/pokemon/646--0--Kyurem.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kyurem.png rename to src/canonical/minisprites/gen5/pokemon/646--0--Kyurem.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kyurem--Black.png b/src/canonical/minisprites/gen5/pokemon/646--420--Kyurem--Black.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kyurem--Black.png rename to src/canonical/minisprites/gen5/pokemon/646--420--Kyurem--Black.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kyurem--White.png b/src/canonical/minisprites/gen5/pokemon/646--420--Kyurem--White.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kyurem--White.png rename to src/canonical/minisprites/gen5/pokemon/646--420--Kyurem--White.png diff --git a/src/canonical/minisprites/gen5/pokemon/Keldeo.png b/src/canonical/minisprites/gen5/pokemon/647--0--Keldeo.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Keldeo.png rename to src/canonical/minisprites/gen5/pokemon/647--0--Keldeo.png diff --git a/src/canonical/minisprites/gen5/pokemon/Keldeo--Resolute.png b/src/canonical/minisprites/gen5/pokemon/647--420--Keldeo--Resolute.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Keldeo--Resolute.png rename to src/canonical/minisprites/gen5/pokemon/647--420--Keldeo--Resolute.png diff --git a/src/canonical/minisprites/gen5/pokemon/Meloetta.png b/src/canonical/minisprites/gen5/pokemon/648--0--Meloetta.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Meloetta.png rename to src/canonical/minisprites/gen5/pokemon/648--0--Meloetta.png diff --git a/src/canonical/minisprites/gen5/pokemon/Meloetta--Pirouette.png b/src/canonical/minisprites/gen5/pokemon/648--420--Meloetta--Pirouette.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Meloetta--Pirouette.png rename to src/canonical/minisprites/gen5/pokemon/648--420--Meloetta--Pirouette.png diff --git a/src/canonical/minisprites/gen5/pokemon/Genesect.png b/src/canonical/minisprites/gen5/pokemon/649--0--Genesect.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Genesect.png rename to src/canonical/minisprites/gen5/pokemon/649--0--Genesect.png diff --git a/src/canonical/minisprites/gen5/pokemon/Alakazam.png b/src/canonical/minisprites/gen5/pokemon/65--0--Alakazam.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Alakazam.png rename to src/canonical/minisprites/gen5/pokemon/65--0--Alakazam.png diff --git a/src/canonical/minisprites/gen5/pokemon/Machop.png b/src/canonical/minisprites/gen5/pokemon/66--0--Machop.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Machop.png rename to src/canonical/minisprites/gen5/pokemon/66--0--Machop.png diff --git a/src/canonical/minisprites/gen5/pokemon/Machoke.png b/src/canonical/minisprites/gen5/pokemon/67--0--Machoke.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Machoke.png rename to src/canonical/minisprites/gen5/pokemon/67--0--Machoke.png diff --git a/src/canonical/minisprites/gen5/pokemon/Machamp.png b/src/canonical/minisprites/gen5/pokemon/68--0--Machamp.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Machamp.png rename to src/canonical/minisprites/gen5/pokemon/68--0--Machamp.png diff --git a/src/canonical/minisprites/gen5/pokemon/Bellsprout.png b/src/canonical/minisprites/gen5/pokemon/69--0--Bellsprout.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Bellsprout.png rename to src/canonical/minisprites/gen5/pokemon/69--0--Bellsprout.png diff --git a/src/canonical/minisprites/gen5/pokemon/Squirtle.png b/src/canonical/minisprites/gen5/pokemon/7--0--Squirtle.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Squirtle.png rename to src/canonical/minisprites/gen5/pokemon/7--0--Squirtle.png diff --git a/src/canonical/minisprites/gen5/pokemon/Weepinbell.png b/src/canonical/minisprites/gen5/pokemon/70--0--Weepinbell.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Weepinbell.png rename to src/canonical/minisprites/gen5/pokemon/70--0--Weepinbell.png diff --git a/src/canonical/minisprites/gen5/pokemon/Victreebel.png b/src/canonical/minisprites/gen5/pokemon/71--0--Victreebel.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Victreebel.png rename to src/canonical/minisprites/gen5/pokemon/71--0--Victreebel.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tentacool.png b/src/canonical/minisprites/gen5/pokemon/72--0--Tentacool.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tentacool.png rename to src/canonical/minisprites/gen5/pokemon/72--0--Tentacool.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tentacruel.png b/src/canonical/minisprites/gen5/pokemon/73--0--Tentacruel.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tentacruel.png rename to src/canonical/minisprites/gen5/pokemon/73--0--Tentacruel.png diff --git a/src/canonical/minisprites/gen5/pokemon/Geodude.png b/src/canonical/minisprites/gen5/pokemon/74--0--Geodude.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Geodude.png rename to src/canonical/minisprites/gen5/pokemon/74--0--Geodude.png diff --git a/src/canonical/minisprites/gen5/pokemon/Graveler.png b/src/canonical/minisprites/gen5/pokemon/75--0--Graveler.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Graveler.png rename to src/canonical/minisprites/gen5/pokemon/75--0--Graveler.png diff --git a/src/canonical/minisprites/gen5/pokemon/Golem.png b/src/canonical/minisprites/gen5/pokemon/76--0--Golem.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Golem.png rename to src/canonical/minisprites/gen5/pokemon/76--0--Golem.png diff --git a/src/canonical/minisprites/gen5/pokemon/Ponyta.png b/src/canonical/minisprites/gen5/pokemon/77--0--Ponyta.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Ponyta.png rename to src/canonical/minisprites/gen5/pokemon/77--0--Ponyta.png diff --git a/src/canonical/minisprites/gen5/pokemon/Rapidash.png b/src/canonical/minisprites/gen5/pokemon/78--0--Rapidash.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Rapidash.png rename to src/canonical/minisprites/gen5/pokemon/78--0--Rapidash.png diff --git a/src/canonical/minisprites/gen5/pokemon/Slowpoke.png b/src/canonical/minisprites/gen5/pokemon/79--0--Slowpoke.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Slowpoke.png rename to src/canonical/minisprites/gen5/pokemon/79--0--Slowpoke.png diff --git a/src/canonical/minisprites/gen5/pokemon/Wartortle.png b/src/canonical/minisprites/gen5/pokemon/8--0--Wartortle.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Wartortle.png rename to src/canonical/minisprites/gen5/pokemon/8--0--Wartortle.png diff --git a/src/canonical/minisprites/gen5/pokemon/Slowbro.png b/src/canonical/minisprites/gen5/pokemon/80--0--Slowbro.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Slowbro.png rename to src/canonical/minisprites/gen5/pokemon/80--0--Slowbro.png diff --git a/src/canonical/minisprites/gen5/pokemon/Magnemite.png b/src/canonical/minisprites/gen5/pokemon/81--0--Magnemite.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Magnemite.png rename to src/canonical/minisprites/gen5/pokemon/81--0--Magnemite.png diff --git a/src/canonical/minisprites/gen5/pokemon/Magneton.png b/src/canonical/minisprites/gen5/pokemon/82--0--Magneton.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Magneton.png rename to src/canonical/minisprites/gen5/pokemon/82--0--Magneton.png diff --git a/src/canonical/minisprites/gen5/pokemon/Farfetch__0027d.png b/src/canonical/minisprites/gen5/pokemon/83--0--Farfetch__0027d.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Farfetch__0027d.png rename to src/canonical/minisprites/gen5/pokemon/83--0--Farfetch__0027d.png diff --git a/src/canonical/minisprites/gen5/pokemon/Doduo.png b/src/canonical/minisprites/gen5/pokemon/84--0--Doduo.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Doduo.png rename to src/canonical/minisprites/gen5/pokemon/84--0--Doduo.png diff --git a/src/canonical/minisprites/gen5/pokemon/Dodrio.png b/src/canonical/minisprites/gen5/pokemon/85--0--Dodrio.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Dodrio.png rename to src/canonical/minisprites/gen5/pokemon/85--0--Dodrio.png diff --git a/src/canonical/minisprites/gen5/pokemon/Seel.png b/src/canonical/minisprites/gen5/pokemon/86--0--Seel.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Seel.png rename to src/canonical/minisprites/gen5/pokemon/86--0--Seel.png diff --git a/src/canonical/minisprites/gen5/pokemon/Dewgong.png b/src/canonical/minisprites/gen5/pokemon/87--0--Dewgong.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Dewgong.png rename to src/canonical/minisprites/gen5/pokemon/87--0--Dewgong.png diff --git a/src/canonical/minisprites/gen5/pokemon/Grimer.png b/src/canonical/minisprites/gen5/pokemon/88--0--Grimer.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Grimer.png rename to src/canonical/minisprites/gen5/pokemon/88--0--Grimer.png diff --git a/src/canonical/minisprites/gen5/pokemon/Muk.png b/src/canonical/minisprites/gen5/pokemon/89--0--Muk.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Muk.png rename to src/canonical/minisprites/gen5/pokemon/89--0--Muk.png diff --git a/src/canonical/minisprites/gen5/pokemon/Blastoise.png b/src/canonical/minisprites/gen5/pokemon/9--0--Blastoise.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Blastoise.png rename to src/canonical/minisprites/gen5/pokemon/9--0--Blastoise.png diff --git a/src/canonical/minisprites/gen5/pokemon/Shellder.png b/src/canonical/minisprites/gen5/pokemon/90--0--Shellder.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Shellder.png rename to src/canonical/minisprites/gen5/pokemon/90--0--Shellder.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cloyster.png b/src/canonical/minisprites/gen5/pokemon/91--0--Cloyster.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cloyster.png rename to src/canonical/minisprites/gen5/pokemon/91--0--Cloyster.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gastly.png b/src/canonical/minisprites/gen5/pokemon/92--0--Gastly.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gastly.png rename to src/canonical/minisprites/gen5/pokemon/92--0--Gastly.png diff --git a/src/canonical/minisprites/gen5/pokemon/Haunter.png b/src/canonical/minisprites/gen5/pokemon/93--0--Haunter.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Haunter.png rename to src/canonical/minisprites/gen5/pokemon/93--0--Haunter.png diff --git a/src/canonical/minisprites/gen5/pokemon/Gengar.png b/src/canonical/minisprites/gen5/pokemon/94--0--Gengar.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Gengar.png rename to src/canonical/minisprites/gen5/pokemon/94--0--Gengar.png diff --git a/src/canonical/minisprites/gen5/pokemon/Onix.png b/src/canonical/minisprites/gen5/pokemon/95--0--Onix.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Onix.png rename to src/canonical/minisprites/gen5/pokemon/95--0--Onix.png diff --git a/src/canonical/minisprites/gen5/pokemon/Drowzee.png b/src/canonical/minisprites/gen5/pokemon/96--0--Drowzee.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Drowzee.png rename to src/canonical/minisprites/gen5/pokemon/96--0--Drowzee.png diff --git a/src/canonical/minisprites/gen5/pokemon/Hypno.png b/src/canonical/minisprites/gen5/pokemon/97--0--Hypno.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Hypno.png rename to src/canonical/minisprites/gen5/pokemon/97--0--Hypno.png diff --git a/src/canonical/minisprites/gen5/pokemon/Krabby.png b/src/canonical/minisprites/gen5/pokemon/98--0--Krabby.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Krabby.png rename to src/canonical/minisprites/gen5/pokemon/98--0--Krabby.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kingler.png b/src/canonical/minisprites/gen5/pokemon/99--0--Kingler.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kingler.png rename to src/canonical/minisprites/gen5/pokemon/99--0--Kingler.png diff --git a/src/canonical/minisprites/gen6/custom/Weezing--Galar.png b/src/canonical/minisprites/gen6/custom/110--420--Weezing--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Weezing--Galar.png rename to src/canonical/minisprites/gen6/custom/110--420--Weezing--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Butterfree--Gmax.png b/src/canonical/minisprites/gen6/custom/12--420--Butterfree--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Butterfree--Gmax.png rename to src/canonical/minisprites/gen6/custom/12--420--Butterfree--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Mr._Mime--Galar.png b/src/canonical/minisprites/gen6/custom/122--420--Mr._Mime--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Mr._Mime--Galar.png rename to src/canonical/minisprites/gen6/custom/122--420--Mr._Mime--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Lapras--Gmax.png b/src/canonical/minisprites/gen6/custom/131--420--Lapras--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Lapras--Gmax.png rename to src/canonical/minisprites/gen6/custom/131--420--Lapras--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Eevee--Gmax.png b/src/canonical/minisprites/gen6/custom/133--420--Eevee--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Eevee--Gmax.png rename to src/canonical/minisprites/gen6/custom/133--420--Eevee--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Snorlax--Gmax.png b/src/canonical/minisprites/gen6/custom/143--420--Snorlax--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Snorlax--Gmax.png rename to src/canonical/minisprites/gen6/custom/143--420--Snorlax--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Corsola--Galar.png b/src/canonical/minisprites/gen6/custom/222--420--Corsola--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Corsola--Galar.png rename to src/canonical/minisprites/gen6/custom/222--420--Corsola--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Pikachu--Gmax.png b/src/canonical/minisprites/gen6/custom/25--420--Pikachu--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Pikachu--Gmax.png rename to src/canonical/minisprites/gen6/custom/25--420--Pikachu--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Zigzagoon--Galar.png b/src/canonical/minisprites/gen6/custom/263--420--Zigzagoon--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Zigzagoon--Galar.png rename to src/canonical/minisprites/gen6/custom/263--420--Zigzagoon--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Linoone--Galar.png b/src/canonical/minisprites/gen6/custom/264--420--Linoone--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Linoone--Galar.png rename to src/canonical/minisprites/gen6/custom/264--420--Linoone--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Meowth--Galar.png b/src/canonical/minisprites/gen6/custom/52--420--Meowth--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Meowth--Galar.png rename to src/canonical/minisprites/gen6/custom/52--420--Meowth--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Meowth--Gmax.png b/src/canonical/minisprites/gen6/custom/52--420--Meowth--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Meowth--Gmax.png rename to src/canonical/minisprites/gen6/custom/52--420--Meowth--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Darumaka--Galar.png b/src/canonical/minisprites/gen6/custom/554--420--Darumaka--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Darumaka--Galar.png rename to src/canonical/minisprites/gen6/custom/554--420--Darumaka--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Darmanitan--Galar-Zen.png b/src/canonical/minisprites/gen6/custom/555--420--Darmanitan--Galar-Zen.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Darmanitan--Galar-Zen.png rename to src/canonical/minisprites/gen6/custom/555--420--Darmanitan--Galar-Zen.png diff --git a/src/canonical/minisprites/gen6/custom/Darmanitan--Galar.png b/src/canonical/minisprites/gen6/custom/555--420--Darmanitan--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Darmanitan--Galar.png rename to src/canonical/minisprites/gen6/custom/555--420--Darmanitan--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Yamask--Galar.png b/src/canonical/minisprites/gen6/custom/562--420--Yamask--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Yamask--Galar.png rename to src/canonical/minisprites/gen6/custom/562--420--Yamask--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Garbodor--Gmax.png b/src/canonical/minisprites/gen6/custom/569--420--Garbodor--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Garbodor--Gmax.png rename to src/canonical/minisprites/gen6/custom/569--420--Garbodor--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Charizard--Gmax.png b/src/canonical/minisprites/gen6/custom/6--420--Charizard--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Charizard--Gmax.png rename to src/canonical/minisprites/gen6/custom/6--420--Charizard--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Stunfisk--Galar.png b/src/canonical/minisprites/gen6/custom/618--420--Stunfisk--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Stunfisk--Galar.png rename to src/canonical/minisprites/gen6/custom/618--420--Stunfisk--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Machamp--Gmax.png b/src/canonical/minisprites/gen6/custom/68--420--Machamp--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Machamp--Gmax.png rename to src/canonical/minisprites/gen6/custom/68--420--Machamp--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Ponyta--Galar.png b/src/canonical/minisprites/gen6/custom/77--420--Ponyta--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Ponyta--Galar.png rename to src/canonical/minisprites/gen6/custom/77--420--Ponyta--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Rapidash--Galar.png b/src/canonical/minisprites/gen6/custom/78--420--Rapidash--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Rapidash--Galar.png rename to src/canonical/minisprites/gen6/custom/78--420--Rapidash--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Slowpoke--Galar.png b/src/canonical/minisprites/gen6/custom/79--420--Slowpoke--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Slowpoke--Galar.png rename to src/canonical/minisprites/gen6/custom/79--420--Slowpoke--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Melmetal.png b/src/canonical/minisprites/gen6/custom/809--0--Melmetal.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Melmetal.png rename to src/canonical/minisprites/gen6/custom/809--0--Melmetal.png diff --git a/src/canonical/minisprites/gen6/custom/Melmetal--Gmax.png b/src/canonical/minisprites/gen6/custom/809--420--Melmetal--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Melmetal--Gmax.png rename to src/canonical/minisprites/gen6/custom/809--420--Melmetal--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Grookey.png b/src/canonical/minisprites/gen6/custom/810--0--Grookey.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Grookey.png rename to src/canonical/minisprites/gen6/custom/810--0--Grookey.png diff --git a/src/canonical/minisprites/gen6/custom/Thwackey.png b/src/canonical/minisprites/gen6/custom/811--0--Thwackey.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Thwackey.png rename to src/canonical/minisprites/gen6/custom/811--0--Thwackey.png diff --git a/src/canonical/minisprites/gen6/custom/Rillaboom.png b/src/canonical/minisprites/gen6/custom/812--0--Rillaboom.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Rillaboom.png rename to src/canonical/minisprites/gen6/custom/812--0--Rillaboom.png diff --git a/src/canonical/minisprites/gen6/custom/Scorbunny.png b/src/canonical/minisprites/gen6/custom/813--0--Scorbunny.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Scorbunny.png rename to src/canonical/minisprites/gen6/custom/813--0--Scorbunny.png diff --git a/src/canonical/minisprites/gen6/custom/Raboot.png b/src/canonical/minisprites/gen6/custom/814--0--Raboot.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Raboot.png rename to src/canonical/minisprites/gen6/custom/814--0--Raboot.png diff --git a/src/canonical/minisprites/gen6/custom/Cinderace.png b/src/canonical/minisprites/gen6/custom/815--0--Cinderace.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Cinderace.png rename to src/canonical/minisprites/gen6/custom/815--0--Cinderace.png diff --git a/src/canonical/minisprites/gen6/custom/Sobble.png b/src/canonical/minisprites/gen6/custom/816--0--Sobble.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Sobble.png rename to src/canonical/minisprites/gen6/custom/816--0--Sobble.png diff --git a/src/canonical/minisprites/gen6/custom/Drizzile.png b/src/canonical/minisprites/gen6/custom/817--0--Drizzile.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Drizzile.png rename to src/canonical/minisprites/gen6/custom/817--0--Drizzile.png diff --git a/src/canonical/minisprites/gen6/custom/Inteleon.png b/src/canonical/minisprites/gen6/custom/818--0--Inteleon.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Inteleon.png rename to src/canonical/minisprites/gen6/custom/818--0--Inteleon.png diff --git a/src/canonical/minisprites/gen6/custom/Skwovet.png b/src/canonical/minisprites/gen6/custom/819--0--Skwovet.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Skwovet.png rename to src/canonical/minisprites/gen6/custom/819--0--Skwovet.png diff --git a/src/canonical/minisprites/gen6/custom/Greedent.png b/src/canonical/minisprites/gen6/custom/820--0--Greedent.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Greedent.png rename to src/canonical/minisprites/gen6/custom/820--0--Greedent.png diff --git a/src/canonical/minisprites/gen6/custom/Rookidee.png b/src/canonical/minisprites/gen6/custom/821--0--Rookidee.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Rookidee.png rename to src/canonical/minisprites/gen6/custom/821--0--Rookidee.png diff --git a/src/canonical/minisprites/gen6/custom/Corvisquire.png b/src/canonical/minisprites/gen6/custom/822--0--Corvisquire.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Corvisquire.png rename to src/canonical/minisprites/gen6/custom/822--0--Corvisquire.png diff --git a/src/canonical/minisprites/gen6/custom/Corviknight.png b/src/canonical/minisprites/gen6/custom/823--0--Corviknight.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Corviknight.png rename to src/canonical/minisprites/gen6/custom/823--0--Corviknight.png diff --git a/src/canonical/minisprites/gen6/custom/Corviknight--Gmax.png b/src/canonical/minisprites/gen6/custom/823--420--Corviknight--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Corviknight--Gmax.png rename to src/canonical/minisprites/gen6/custom/823--420--Corviknight--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Blipbug.png b/src/canonical/minisprites/gen6/custom/824--0--Blipbug.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Blipbug.png rename to src/canonical/minisprites/gen6/custom/824--0--Blipbug.png diff --git a/src/canonical/minisprites/gen6/custom/Dottler.png b/src/canonical/minisprites/gen6/custom/825--0--Dottler.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Dottler.png rename to src/canonical/minisprites/gen6/custom/825--0--Dottler.png diff --git a/src/canonical/minisprites/gen6/custom/Orbeetle.png b/src/canonical/minisprites/gen6/custom/826--0--Orbeetle.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Orbeetle.png rename to src/canonical/minisprites/gen6/custom/826--0--Orbeetle.png diff --git a/src/canonical/minisprites/gen6/custom/Orbeetle--Gmax.png b/src/canonical/minisprites/gen6/custom/826--420--Orbeetle--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Orbeetle--Gmax.png rename to src/canonical/minisprites/gen6/custom/826--420--Orbeetle--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Nickit.png b/src/canonical/minisprites/gen6/custom/827--0--Nickit.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Nickit.png rename to src/canonical/minisprites/gen6/custom/827--0--Nickit.png diff --git a/src/canonical/minisprites/gen6/custom/Thievul.png b/src/canonical/minisprites/gen6/custom/828--0--Thievul.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Thievul.png rename to src/canonical/minisprites/gen6/custom/828--0--Thievul.png diff --git a/src/canonical/minisprites/gen6/custom/Gossifleur.png b/src/canonical/minisprites/gen6/custom/829--0--Gossifleur.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Gossifleur.png rename to src/canonical/minisprites/gen6/custom/829--0--Gossifleur.png diff --git a/src/canonical/minisprites/gen6/custom/Farfetch__0027d--Galar.png b/src/canonical/minisprites/gen6/custom/83--420--Farfetch__0027d--Galar.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Farfetch__0027d--Galar.png rename to src/canonical/minisprites/gen6/custom/83--420--Farfetch__0027d--Galar.png diff --git a/src/canonical/minisprites/gen6/custom/Eldegoss.png b/src/canonical/minisprites/gen6/custom/830--0--Eldegoss.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Eldegoss.png rename to src/canonical/minisprites/gen6/custom/830--0--Eldegoss.png diff --git a/src/canonical/minisprites/gen6/custom/Wooloo.png b/src/canonical/minisprites/gen6/custom/831--0--Wooloo.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Wooloo.png rename to src/canonical/minisprites/gen6/custom/831--0--Wooloo.png diff --git a/src/canonical/minisprites/gen6/custom/Dubwool.png b/src/canonical/minisprites/gen6/custom/832--0--Dubwool.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Dubwool.png rename to src/canonical/minisprites/gen6/custom/832--0--Dubwool.png diff --git a/src/canonical/minisprites/gen6/custom/Chewtle.png b/src/canonical/minisprites/gen6/custom/833--0--Chewtle.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Chewtle.png rename to src/canonical/minisprites/gen6/custom/833--0--Chewtle.png diff --git a/src/canonical/minisprites/gen6/custom/Drednaw.png b/src/canonical/minisprites/gen6/custom/834--0--Drednaw.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Drednaw.png rename to src/canonical/minisprites/gen6/custom/834--0--Drednaw.png diff --git a/src/canonical/minisprites/gen6/custom/Drednaw--Gmax.png b/src/canonical/minisprites/gen6/custom/834--420--Drednaw--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Drednaw--Gmax.png rename to src/canonical/minisprites/gen6/custom/834--420--Drednaw--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Yamper.png b/src/canonical/minisprites/gen6/custom/835--0--Yamper.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Yamper.png rename to src/canonical/minisprites/gen6/custom/835--0--Yamper.png diff --git a/src/canonical/minisprites/gen6/custom/Boltund.png b/src/canonical/minisprites/gen6/custom/836--0--Boltund.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Boltund.png rename to src/canonical/minisprites/gen6/custom/836--0--Boltund.png diff --git a/src/canonical/minisprites/gen6/custom/Carkol.png b/src/canonical/minisprites/gen6/custom/838--0--Carkol.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Carkol.png rename to src/canonical/minisprites/gen6/custom/838--0--Carkol.png diff --git a/src/canonical/minisprites/gen6/custom/Coalossal.png b/src/canonical/minisprites/gen6/custom/839--0--Coalossal.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Coalossal.png rename to src/canonical/minisprites/gen6/custom/839--0--Coalossal.png diff --git a/src/canonical/minisprites/gen6/custom/Coalossal--Gmax.png b/src/canonical/minisprites/gen6/custom/839--420--Coalossal--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Coalossal--Gmax.png rename to src/canonical/minisprites/gen6/custom/839--420--Coalossal--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Applin.png b/src/canonical/minisprites/gen6/custom/840--0--Applin.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Applin.png rename to src/canonical/minisprites/gen6/custom/840--0--Applin.png diff --git a/src/canonical/minisprites/gen6/custom/Flapple.png b/src/canonical/minisprites/gen6/custom/841--0--Flapple.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Flapple.png rename to src/canonical/minisprites/gen6/custom/841--0--Flapple.png diff --git a/src/canonical/minisprites/gen6/custom/Appletun--Gmax.png b/src/canonical/minisprites/gen6/custom/841--420--Flapple--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Appletun--Gmax.png rename to src/canonical/minisprites/gen6/custom/841--420--Flapple--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Appletun.png b/src/canonical/minisprites/gen6/custom/842--0--Appletun.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Appletun.png rename to src/canonical/minisprites/gen6/custom/842--0--Appletun.png diff --git a/src/canonical/minisprites/gen6/custom/Flapple--Gmax.png b/src/canonical/minisprites/gen6/custom/842--420--Appletun--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Flapple--Gmax.png rename to src/canonical/minisprites/gen6/custom/842--420--Appletun--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Silicobra.png b/src/canonical/minisprites/gen6/custom/843--0--Silicobra.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Silicobra.png rename to src/canonical/minisprites/gen6/custom/843--0--Silicobra.png diff --git a/src/canonical/minisprites/gen6/custom/Sandaconda.png b/src/canonical/minisprites/gen6/custom/844--0--Sandaconda.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Sandaconda.png rename to src/canonical/minisprites/gen6/custom/844--0--Sandaconda.png diff --git a/src/canonical/minisprites/gen6/custom/Sandaconda--Gmax.png b/src/canonical/minisprites/gen6/custom/844--420--Sandaconda--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Sandaconda--Gmax.png rename to src/canonical/minisprites/gen6/custom/844--420--Sandaconda--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Cramorant.png b/src/canonical/minisprites/gen6/custom/845--0--Cramorant.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Cramorant.png rename to src/canonical/minisprites/gen6/custom/845--0--Cramorant.png diff --git a/src/canonical/minisprites/gen6/custom/Cramorant--Gorging.png b/src/canonical/minisprites/gen6/custom/845--420--Cramorant--Gorging.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Cramorant--Gorging.png rename to src/canonical/minisprites/gen6/custom/845--420--Cramorant--Gorging.png diff --git a/src/canonical/minisprites/gen6/custom/Cramorant--Gulping.png b/src/canonical/minisprites/gen6/custom/845--420--Cramorant--Gulping.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Cramorant--Gulping.png rename to src/canonical/minisprites/gen6/custom/845--420--Cramorant--Gulping.png diff --git a/src/canonical/minisprites/gen6/custom/Arrokuda.png b/src/canonical/minisprites/gen6/custom/846--0--Arrokuda.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Arrokuda.png rename to src/canonical/minisprites/gen6/custom/846--0--Arrokuda.png diff --git a/src/canonical/minisprites/gen6/custom/Barraskewda.png b/src/canonical/minisprites/gen6/custom/847--0--Barraskewda.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Barraskewda.png rename to src/canonical/minisprites/gen6/custom/847--0--Barraskewda.png diff --git a/src/canonical/minisprites/gen6/custom/Toxel.png b/src/canonical/minisprites/gen6/custom/848--0--Toxel.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Toxel.png rename to src/canonical/minisprites/gen6/custom/848--0--Toxel.png diff --git a/src/canonical/minisprites/gen6/custom/Toxtricity.png b/src/canonical/minisprites/gen6/custom/849--0--Toxtricity.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Toxtricity.png rename to src/canonical/minisprites/gen6/custom/849--0--Toxtricity.png diff --git a/src/canonical/minisprites/gen6/custom/Toxtricity--Gmax.png b/src/canonical/minisprites/gen6/custom/849--420--Toxtricity--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Toxtricity--Gmax.png rename to src/canonical/minisprites/gen6/custom/849--420--Toxtricity--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Toxtricity--Low-Key.png b/src/canonical/minisprites/gen6/custom/849--420--Toxtricity--Low-Key.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Toxtricity--Low-Key.png rename to src/canonical/minisprites/gen6/custom/849--420--Toxtricity--Low-Key.png diff --git a/src/canonical/minisprites/gen6/custom/Sizzlipede.png b/src/canonical/minisprites/gen6/custom/850--0--Sizzlipede.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Sizzlipede.png rename to src/canonical/minisprites/gen6/custom/850--0--Sizzlipede.png diff --git a/src/canonical/minisprites/gen6/custom/Centiskorch.png b/src/canonical/minisprites/gen6/custom/851--0--Centiskorch.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Centiskorch.png rename to src/canonical/minisprites/gen6/custom/851--0--Centiskorch.png diff --git a/src/canonical/minisprites/gen6/custom/Centiskorch--Gmax.png b/src/canonical/minisprites/gen6/custom/851--420--Centiskorch--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Centiskorch--Gmax.png rename to src/canonical/minisprites/gen6/custom/851--420--Centiskorch--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Clobbopus.png b/src/canonical/minisprites/gen6/custom/852--0--Clobbopus.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Clobbopus.png rename to src/canonical/minisprites/gen6/custom/852--0--Clobbopus.png diff --git a/src/canonical/minisprites/gen6/custom/Grapploct.png b/src/canonical/minisprites/gen6/custom/853--0--Grapploct.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Grapploct.png rename to src/canonical/minisprites/gen6/custom/853--0--Grapploct.png diff --git a/src/canonical/minisprites/gen6/custom/Sinistea.png b/src/canonical/minisprites/gen6/custom/854--0--Sinistea.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Sinistea.png rename to src/canonical/minisprites/gen6/custom/854--0--Sinistea.png diff --git a/src/canonical/minisprites/gen6/custom/Polteageist.png b/src/canonical/minisprites/gen6/custom/855--0--Polteageist.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Polteageist.png rename to src/canonical/minisprites/gen6/custom/855--0--Polteageist.png diff --git a/src/canonical/minisprites/gen6/custom/Hatenna.png b/src/canonical/minisprites/gen6/custom/856--0--Hatenna.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Hatenna.png rename to src/canonical/minisprites/gen6/custom/856--0--Hatenna.png diff --git a/src/canonical/minisprites/gen6/custom/Hattrem.png b/src/canonical/minisprites/gen6/custom/857--0--Hattrem.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Hattrem.png rename to src/canonical/minisprites/gen6/custom/857--0--Hattrem.png diff --git a/src/canonical/minisprites/gen6/custom/Hatterene.png b/src/canonical/minisprites/gen6/custom/858--0--Hatterene.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Hatterene.png rename to src/canonical/minisprites/gen6/custom/858--0--Hatterene.png diff --git a/src/canonical/minisprites/gen6/custom/Hatterene--Gmax.png b/src/canonical/minisprites/gen6/custom/858--420--Hatterene--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Hatterene--Gmax.png rename to src/canonical/minisprites/gen6/custom/858--420--Hatterene--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Impidimp.png b/src/canonical/minisprites/gen6/custom/859--0--Impidimp.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Impidimp.png rename to src/canonical/minisprites/gen6/custom/859--0--Impidimp.png diff --git a/src/canonical/minisprites/gen6/custom/Morgrem.png b/src/canonical/minisprites/gen6/custom/860--0--Morgrem.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Morgrem.png rename to src/canonical/minisprites/gen6/custom/860--0--Morgrem.png diff --git a/src/canonical/minisprites/gen6/custom/Grimmsnarl.png b/src/canonical/minisprites/gen6/custom/861--0--Grimmsnarl.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Grimmsnarl.png rename to src/canonical/minisprites/gen6/custom/861--0--Grimmsnarl.png diff --git a/src/canonical/minisprites/gen6/custom/Grimmsnarl--Gmax.png b/src/canonical/minisprites/gen6/custom/861--420--Grimmsnarl--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Grimmsnarl--Gmax.png rename to src/canonical/minisprites/gen6/custom/861--420--Grimmsnarl--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Obstagoon.png b/src/canonical/minisprites/gen6/custom/862--0--Obstagoon.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Obstagoon.png rename to src/canonical/minisprites/gen6/custom/862--0--Obstagoon.png diff --git a/src/canonical/minisprites/gen6/custom/Perrserker.png b/src/canonical/minisprites/gen6/custom/863--0--Perrserker.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Perrserker.png rename to src/canonical/minisprites/gen6/custom/863--0--Perrserker.png diff --git a/src/canonical/minisprites/gen6/custom/Cursola.png b/src/canonical/minisprites/gen6/custom/864--0--Cursola.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Cursola.png rename to src/canonical/minisprites/gen6/custom/864--0--Cursola.png diff --git a/src/canonical/minisprites/gen6/custom/Sirfetch__0027d.png b/src/canonical/minisprites/gen6/custom/865--0--Sirfetch__0027d.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Sirfetch__0027d.png rename to src/canonical/minisprites/gen6/custom/865--0--Sirfetch__0027d.png diff --git a/src/canonical/minisprites/gen6/custom/Mr._Rime.png b/src/canonical/minisprites/gen6/custom/866--0--Mr._Rime.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Mr._Rime.png rename to src/canonical/minisprites/gen6/custom/866--0--Mr._Rime.png diff --git a/src/canonical/minisprites/gen6/custom/Runerigus.png b/src/canonical/minisprites/gen6/custom/867--0--Runerigus.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Runerigus.png rename to src/canonical/minisprites/gen6/custom/867--0--Runerigus.png diff --git a/src/canonical/minisprites/gen6/custom/Milcery.png b/src/canonical/minisprites/gen6/custom/868--0--Milcery.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Milcery.png rename to src/canonical/minisprites/gen6/custom/868--0--Milcery.png diff --git a/src/canonical/minisprites/gen6/custom/Alcremie.png b/src/canonical/minisprites/gen6/custom/869--0--Alcremie.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Alcremie.png rename to src/canonical/minisprites/gen6/custom/869--0--Alcremie.png diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Caramel_Swirl.png b/src/canonical/minisprites/gen6/custom/869--420--Alcremie--Caramel_Swirl.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Alcremie--Caramel_Swirl.png rename to src/canonical/minisprites/gen6/custom/869--420--Alcremie--Caramel_Swirl.png diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Gmax.png b/src/canonical/minisprites/gen6/custom/869--420--Alcremie--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Alcremie--Gmax.png rename to src/canonical/minisprites/gen6/custom/869--420--Alcremie--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Lemon_Cream.png b/src/canonical/minisprites/gen6/custom/869--420--Alcremie--Lemon_Cream.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Alcremie--Lemon_Cream.png rename to src/canonical/minisprites/gen6/custom/869--420--Alcremie--Lemon_Cream.png diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Matcha_Cream.png b/src/canonical/minisprites/gen6/custom/869--420--Alcremie--Matcha_Cream.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Alcremie--Matcha_Cream.png rename to src/canonical/minisprites/gen6/custom/869--420--Alcremie--Matcha_Cream.png diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Mint_Cream.png b/src/canonical/minisprites/gen6/custom/869--420--Alcremie--Mint_Cream.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Alcremie--Mint_Cream.png rename to src/canonical/minisprites/gen6/custom/869--420--Alcremie--Mint_Cream.png diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Rainbow_Swirl.png b/src/canonical/minisprites/gen6/custom/869--420--Alcremie--Rainbow_Swirl.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Alcremie--Rainbow_Swirl.png rename to src/canonical/minisprites/gen6/custom/869--420--Alcremie--Rainbow_Swirl.png diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Ruby_Cream.png b/src/canonical/minisprites/gen6/custom/869--420--Alcremie--Ruby_Cream.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Alcremie--Ruby_Cream.png rename to src/canonical/minisprites/gen6/custom/869--420--Alcremie--Ruby_Cream.png diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Ruby_Swirl.png b/src/canonical/minisprites/gen6/custom/869--420--Alcremie--Ruby_Swirl.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Alcremie--Ruby_Swirl.png rename to src/canonical/minisprites/gen6/custom/869--420--Alcremie--Ruby_Swirl.png diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Salted_Cream.png b/src/canonical/minisprites/gen6/custom/869--420--Alcremie--Salted_Cream.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Alcremie--Salted_Cream.png rename to src/canonical/minisprites/gen6/custom/869--420--Alcremie--Salted_Cream.png diff --git a/src/canonical/minisprites/gen6/custom/Falinks.png b/src/canonical/minisprites/gen6/custom/870--0--Falinks.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Falinks.png rename to src/canonical/minisprites/gen6/custom/870--0--Falinks.png diff --git a/src/canonical/minisprites/gen6/custom/Pincurchin.png b/src/canonical/minisprites/gen6/custom/871--0--Pincurchin.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Pincurchin.png rename to src/canonical/minisprites/gen6/custom/871--0--Pincurchin.png diff --git a/src/canonical/minisprites/gen6/custom/Snom.png b/src/canonical/minisprites/gen6/custom/872--0--Snom.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Snom.png rename to src/canonical/minisprites/gen6/custom/872--0--Snom.png diff --git a/src/canonical/minisprites/gen6/custom/Frosmoth.png b/src/canonical/minisprites/gen6/custom/873--0--Frosmoth.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Frosmoth.png rename to src/canonical/minisprites/gen6/custom/873--0--Frosmoth.png diff --git a/src/canonical/minisprites/gen6/custom/Stonjourner.png b/src/canonical/minisprites/gen6/custom/874--0--Stonjourner.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Stonjourner.png rename to src/canonical/minisprites/gen6/custom/874--0--Stonjourner.png diff --git a/src/canonical/minisprites/gen6/custom/Eiscue.png b/src/canonical/minisprites/gen6/custom/875--0--Eiscue.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Eiscue.png rename to src/canonical/minisprites/gen6/custom/875--0--Eiscue.png diff --git a/src/canonical/minisprites/gen6/custom/Eiscue--Noice.png b/src/canonical/minisprites/gen6/custom/875--420--Eiscue--Noice.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Eiscue--Noice.png rename to src/canonical/minisprites/gen6/custom/875--420--Eiscue--Noice.png diff --git a/src/canonical/minisprites/gen6/custom/Indeedee.png b/src/canonical/minisprites/gen6/custom/876--0--Indeedee.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Indeedee.png rename to src/canonical/minisprites/gen6/custom/876--0--Indeedee.png diff --git a/src/canonical/minisprites/gen6/custom/Indeedee--F.png b/src/canonical/minisprites/gen6/custom/876--420--Indeedee--F.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Indeedee--F.png rename to src/canonical/minisprites/gen6/custom/876--420--Indeedee--F.png diff --git a/src/canonical/minisprites/gen6/custom/Morpeko.png b/src/canonical/minisprites/gen6/custom/877--0--Morpeko.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Morpeko.png rename to src/canonical/minisprites/gen6/custom/877--0--Morpeko.png diff --git a/src/canonical/minisprites/gen6/custom/Morpeko--Hangry.png b/src/canonical/minisprites/gen6/custom/877--420--Morpeko--Hangry.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Morpeko--Hangry.png rename to src/canonical/minisprites/gen6/custom/877--420--Morpeko--Hangry.png diff --git a/src/canonical/minisprites/gen6/custom/Cufant.png b/src/canonical/minisprites/gen6/custom/878--0--Cufant.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Cufant.png rename to src/canonical/minisprites/gen6/custom/878--0--Cufant.png diff --git a/src/canonical/minisprites/gen6/custom/Copperajah.png b/src/canonical/minisprites/gen6/custom/879--0--Copperajah.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Copperajah.png rename to src/canonical/minisprites/gen6/custom/879--0--Copperajah.png diff --git a/src/canonical/minisprites/gen6/custom/Copperajah--Gmax.png b/src/canonical/minisprites/gen6/custom/879--420--Copperajah--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Copperajah--Gmax.png rename to src/canonical/minisprites/gen6/custom/879--420--Copperajah--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Dracozolt.png b/src/canonical/minisprites/gen6/custom/880--0--Dracozolt.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Dracozolt.png rename to src/canonical/minisprites/gen6/custom/880--0--Dracozolt.png diff --git a/src/canonical/minisprites/gen6/custom/Arctozolt.png b/src/canonical/minisprites/gen6/custom/881--0--Arctozolt.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Arctozolt.png rename to src/canonical/minisprites/gen6/custom/881--0--Arctozolt.png diff --git a/src/canonical/minisprites/gen6/custom/Dracovish.png b/src/canonical/minisprites/gen6/custom/882--0--Dracovish.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Dracovish.png rename to src/canonical/minisprites/gen6/custom/882--0--Dracovish.png diff --git a/src/canonical/minisprites/gen6/custom/Arctovish.png b/src/canonical/minisprites/gen6/custom/883--0--Arctovish.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Arctovish.png rename to src/canonical/minisprites/gen6/custom/883--0--Arctovish.png diff --git a/src/canonical/minisprites/gen6/custom/Duraludon.png b/src/canonical/minisprites/gen6/custom/884--0--Duraludon.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Duraludon.png rename to src/canonical/minisprites/gen6/custom/884--0--Duraludon.png diff --git a/src/canonical/minisprites/gen6/custom/Duraludon--Gmax.png b/src/canonical/minisprites/gen6/custom/884--420--Duraludon--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Duraludon--Gmax.png rename to src/canonical/minisprites/gen6/custom/884--420--Duraludon--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Dreepy.png b/src/canonical/minisprites/gen6/custom/885--0--Dreepy.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Dreepy.png rename to src/canonical/minisprites/gen6/custom/885--0--Dreepy.png diff --git a/src/canonical/minisprites/gen6/custom/Drakloak.png b/src/canonical/minisprites/gen6/custom/886--0--Drakloak.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Drakloak.png rename to src/canonical/minisprites/gen6/custom/886--0--Drakloak.png diff --git a/src/canonical/minisprites/gen6/custom/Dragapult.png b/src/canonical/minisprites/gen6/custom/887--0--Dragapult.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Dragapult.png rename to src/canonical/minisprites/gen6/custom/887--0--Dragapult.png diff --git a/src/canonical/minisprites/gen6/custom/Zacian.png b/src/canonical/minisprites/gen6/custom/888--0--Zacian.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Zacian.png rename to src/canonical/minisprites/gen6/custom/888--0--Zacian.png diff --git a/src/canonical/minisprites/gen6/custom/Zacian--Crowned.png b/src/canonical/minisprites/gen6/custom/888--420--Zacian--Crowned.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Zacian--Crowned.png rename to src/canonical/minisprites/gen6/custom/888--420--Zacian--Crowned.png diff --git a/src/canonical/minisprites/gen6/custom/Zamazenta.png b/src/canonical/minisprites/gen6/custom/889--0--Zamazenta.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Zamazenta.png rename to src/canonical/minisprites/gen6/custom/889--0--Zamazenta.png diff --git a/src/canonical/minisprites/gen6/custom/Zamazenta--Crowned.png b/src/canonical/minisprites/gen6/custom/889--420--Zamazenta--Crowned.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Zamazenta--Crowned.png rename to src/canonical/minisprites/gen6/custom/889--420--Zamazenta--Crowned.png diff --git a/src/canonical/minisprites/gen6/custom/Eternatus.png b/src/canonical/minisprites/gen6/custom/890--0--Eternatus.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Eternatus.png rename to src/canonical/minisprites/gen6/custom/890--0--Eternatus.png diff --git a/src/canonical/minisprites/gen6/custom/Eternatus--Eternamax.png b/src/canonical/minisprites/gen6/custom/890--420--Eternatus--Eternamax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Eternatus--Eternamax.png rename to src/canonical/minisprites/gen6/custom/890--420--Eternatus--Eternamax.png diff --git a/src/canonical/minisprites/gen6/custom/Gengar--Gmax.png b/src/canonical/minisprites/gen6/custom/94--420--Gengar--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Gengar--Gmax.png rename to src/canonical/minisprites/gen6/custom/94--420--Gengar--Gmax.png diff --git a/src/canonical/minisprites/gen6/custom/Kingler--Gmax.png b/src/canonical/minisprites/gen6/custom/99--420--Kingler--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen6/custom/Kingler--Gmax.png rename to src/canonical/minisprites/gen6/custom/99--420--Kingler--Gmax.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bulbasaur.png b/src/canonical/minisprites/gen6/pokemon/1--0--Bulbasaur.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bulbasaur.png rename to src/canonical/minisprites/gen6/pokemon/1--0--Bulbasaur.png diff --git a/src/canonical/minisprites/gen6/pokemon/Caterpie.png b/src/canonical/minisprites/gen6/pokemon/10--0--Caterpie.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Caterpie.png rename to src/canonical/minisprites/gen6/pokemon/10--0--Caterpie.png diff --git a/src/canonical/minisprites/gen6/pokemon/Voltorb.png b/src/canonical/minisprites/gen6/pokemon/100--0--Voltorb.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Voltorb.png rename to src/canonical/minisprites/gen6/pokemon/100--0--Voltorb.png diff --git a/src/canonical/minisprites/gen6/pokemon/Electrode.png b/src/canonical/minisprites/gen6/pokemon/101--0--Electrode.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Electrode.png rename to src/canonical/minisprites/gen6/pokemon/101--0--Electrode.png diff --git a/src/canonical/minisprites/gen6/pokemon/Exeggcute.png b/src/canonical/minisprites/gen6/pokemon/102--0--Exeggcute.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Exeggcute.png rename to src/canonical/minisprites/gen6/pokemon/102--0--Exeggcute.png diff --git a/src/canonical/minisprites/gen6/pokemon/Exeggutor.png b/src/canonical/minisprites/gen6/pokemon/103--0--Exeggutor.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Exeggutor.png rename to src/canonical/minisprites/gen6/pokemon/103--0--Exeggutor.png diff --git a/src/canonical/minisprites/gen6/pokemon/Exeggutor--Alola.png b/src/canonical/minisprites/gen6/pokemon/103--420--Exeggutor--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Exeggutor--Alola.png rename to src/canonical/minisprites/gen6/pokemon/103--420--Exeggutor--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cubone.png b/src/canonical/minisprites/gen6/pokemon/104--0--Cubone.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cubone.png rename to src/canonical/minisprites/gen6/pokemon/104--0--Cubone.png diff --git a/src/canonical/minisprites/gen6/pokemon/Marowak.png b/src/canonical/minisprites/gen6/pokemon/105--0--Marowak.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Marowak.png rename to src/canonical/minisprites/gen6/pokemon/105--0--Marowak.png diff --git a/src/canonical/minisprites/gen6/pokemon/Marowak--Alola.png b/src/canonical/minisprites/gen6/pokemon/105--420--Marowak--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Marowak--Alola.png rename to src/canonical/minisprites/gen6/pokemon/105--420--Marowak--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Hitmonlee.png b/src/canonical/minisprites/gen6/pokemon/106--0--Hitmonlee.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Hitmonlee.png rename to src/canonical/minisprites/gen6/pokemon/106--0--Hitmonlee.png diff --git a/src/canonical/minisprites/gen6/pokemon/Hitmonchan.png b/src/canonical/minisprites/gen6/pokemon/107--0--Hitmonchan.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Hitmonchan.png rename to src/canonical/minisprites/gen6/pokemon/107--0--Hitmonchan.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lickitung.png b/src/canonical/minisprites/gen6/pokemon/108--0--Lickitung.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lickitung.png rename to src/canonical/minisprites/gen6/pokemon/108--0--Lickitung.png diff --git a/src/canonical/minisprites/gen6/pokemon/Koffing.png b/src/canonical/minisprites/gen6/pokemon/109--0--Koffing.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Koffing.png rename to src/canonical/minisprites/gen6/pokemon/109--0--Koffing.png diff --git a/src/canonical/minisprites/gen6/pokemon/Metapod.png b/src/canonical/minisprites/gen6/pokemon/11--0--Metapod.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Metapod.png rename to src/canonical/minisprites/gen6/pokemon/11--0--Metapod.png diff --git a/src/canonical/minisprites/gen6/pokemon/Weezing.png b/src/canonical/minisprites/gen6/pokemon/110--0--Weezing.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Weezing.png rename to src/canonical/minisprites/gen6/pokemon/110--0--Weezing.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rhyhorn.png b/src/canonical/minisprites/gen6/pokemon/111--0--Rhyhorn.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rhyhorn.png rename to src/canonical/minisprites/gen6/pokemon/111--0--Rhyhorn.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rhydon.png b/src/canonical/minisprites/gen6/pokemon/112--0--Rhydon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rhydon.png rename to src/canonical/minisprites/gen6/pokemon/112--0--Rhydon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Chansey.png b/src/canonical/minisprites/gen6/pokemon/113--0--Chansey.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Chansey.png rename to src/canonical/minisprites/gen6/pokemon/113--0--Chansey.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tangela.png b/src/canonical/minisprites/gen6/pokemon/114--0--Tangela.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tangela.png rename to src/canonical/minisprites/gen6/pokemon/114--0--Tangela.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kangaskhan.png b/src/canonical/minisprites/gen6/pokemon/115--0--Kangaskhan.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kangaskhan.png rename to src/canonical/minisprites/gen6/pokemon/115--0--Kangaskhan.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kangaskhan--Mega.png b/src/canonical/minisprites/gen6/pokemon/115--420--Kangaskhan--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kangaskhan--Mega.png rename to src/canonical/minisprites/gen6/pokemon/115--420--Kangaskhan--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Horsea.png b/src/canonical/minisprites/gen6/pokemon/116--0--Horsea.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Horsea.png rename to src/canonical/minisprites/gen6/pokemon/116--0--Horsea.png diff --git a/src/canonical/minisprites/gen6/pokemon/Seadra.png b/src/canonical/minisprites/gen6/pokemon/117--0--Seadra.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Seadra.png rename to src/canonical/minisprites/gen6/pokemon/117--0--Seadra.png diff --git a/src/canonical/minisprites/gen6/pokemon/Goldeen.png b/src/canonical/minisprites/gen6/pokemon/118--0--Goldeen.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Goldeen.png rename to src/canonical/minisprites/gen6/pokemon/118--0--Goldeen.png diff --git a/src/canonical/minisprites/gen6/pokemon/Seaking.png b/src/canonical/minisprites/gen6/pokemon/119--0--Seaking.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Seaking.png rename to src/canonical/minisprites/gen6/pokemon/119--0--Seaking.png diff --git a/src/canonical/minisprites/gen6/pokemon/Butterfree.png b/src/canonical/minisprites/gen6/pokemon/12--0--Butterfree.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Butterfree.png rename to src/canonical/minisprites/gen6/pokemon/12--0--Butterfree.png diff --git a/src/canonical/minisprites/gen6/pokemon/Staryu.png b/src/canonical/minisprites/gen6/pokemon/120--0--Staryu.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Staryu.png rename to src/canonical/minisprites/gen6/pokemon/120--0--Staryu.png diff --git a/src/canonical/minisprites/gen6/pokemon/Starmie.png b/src/canonical/minisprites/gen6/pokemon/121--0--Starmie.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Starmie.png rename to src/canonical/minisprites/gen6/pokemon/121--0--Starmie.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mr._Mime.png b/src/canonical/minisprites/gen6/pokemon/122--0--Mr._Mime.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mr._Mime.png rename to src/canonical/minisprites/gen6/pokemon/122--0--Mr._Mime.png diff --git a/src/canonical/minisprites/gen6/pokemon/Scyther.png b/src/canonical/minisprites/gen6/pokemon/123--0--Scyther.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Scyther.png rename to src/canonical/minisprites/gen6/pokemon/123--0--Scyther.png diff --git a/src/canonical/minisprites/gen6/pokemon/Jynx.png b/src/canonical/minisprites/gen6/pokemon/124--0--Jynx.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Jynx.png rename to src/canonical/minisprites/gen6/pokemon/124--0--Jynx.png diff --git a/src/canonical/minisprites/gen6/pokemon/Electabuzz.png b/src/canonical/minisprites/gen6/pokemon/125--0--Electabuzz.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Electabuzz.png rename to src/canonical/minisprites/gen6/pokemon/125--0--Electabuzz.png diff --git a/src/canonical/minisprites/gen6/pokemon/Magmar.png b/src/canonical/minisprites/gen6/pokemon/126--0--Magmar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Magmar.png rename to src/canonical/minisprites/gen6/pokemon/126--0--Magmar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pinsir.png b/src/canonical/minisprites/gen6/pokemon/127--0--Pinsir.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pinsir.png rename to src/canonical/minisprites/gen6/pokemon/127--0--Pinsir.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pinsir--Mega.png b/src/canonical/minisprites/gen6/pokemon/127--420--Pinsir--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pinsir--Mega.png rename to src/canonical/minisprites/gen6/pokemon/127--420--Pinsir--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tauros.png b/src/canonical/minisprites/gen6/pokemon/128--0--Tauros.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tauros.png rename to src/canonical/minisprites/gen6/pokemon/128--0--Tauros.png diff --git a/src/canonical/minisprites/gen6/pokemon/Magikarp.png b/src/canonical/minisprites/gen6/pokemon/129--0--Magikarp.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Magikarp.png rename to src/canonical/minisprites/gen6/pokemon/129--0--Magikarp.png diff --git a/src/canonical/minisprites/gen6/pokemon/Weedle.png b/src/canonical/minisprites/gen6/pokemon/13--0--Weedle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Weedle.png rename to src/canonical/minisprites/gen6/pokemon/13--0--Weedle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gyarados.png b/src/canonical/minisprites/gen6/pokemon/130--0--Gyarados.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gyarados.png rename to src/canonical/minisprites/gen6/pokemon/130--0--Gyarados.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gyarados--Mega.png b/src/canonical/minisprites/gen6/pokemon/130--420--Gyarados--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gyarados--Mega.png rename to src/canonical/minisprites/gen6/pokemon/130--420--Gyarados--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lapras.png b/src/canonical/minisprites/gen6/pokemon/131--0--Lapras.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lapras.png rename to src/canonical/minisprites/gen6/pokemon/131--0--Lapras.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ditto.png b/src/canonical/minisprites/gen6/pokemon/132--0--Ditto.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ditto.png rename to src/canonical/minisprites/gen6/pokemon/132--0--Ditto.png diff --git a/src/canonical/minisprites/gen6/pokemon/Eevee.png b/src/canonical/minisprites/gen6/pokemon/133--0--Eevee.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Eevee.png rename to src/canonical/minisprites/gen6/pokemon/133--0--Eevee.png diff --git a/src/canonical/minisprites/gen6/pokemon/Eevee--Starter.png b/src/canonical/minisprites/gen6/pokemon/133--420--Eevee--Starter.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Eevee--Starter.png rename to src/canonical/minisprites/gen6/pokemon/133--420--Eevee--Starter.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vaporeon.png b/src/canonical/minisprites/gen6/pokemon/134--0--Vaporeon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vaporeon.png rename to src/canonical/minisprites/gen6/pokemon/134--0--Vaporeon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Jolteon.png b/src/canonical/minisprites/gen6/pokemon/135--0--Jolteon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Jolteon.png rename to src/canonical/minisprites/gen6/pokemon/135--0--Jolteon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Flareon.png b/src/canonical/minisprites/gen6/pokemon/136--0--Flareon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Flareon.png rename to src/canonical/minisprites/gen6/pokemon/136--0--Flareon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Porygon.png b/src/canonical/minisprites/gen6/pokemon/137--0--Porygon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Porygon.png rename to src/canonical/minisprites/gen6/pokemon/137--0--Porygon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Omanyte.png b/src/canonical/minisprites/gen6/pokemon/138--0--Omanyte.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Omanyte.png rename to src/canonical/minisprites/gen6/pokemon/138--0--Omanyte.png diff --git a/src/canonical/minisprites/gen6/pokemon/Omastar.png b/src/canonical/minisprites/gen6/pokemon/139--0--Omastar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Omastar.png rename to src/canonical/minisprites/gen6/pokemon/139--0--Omastar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kakuna.png b/src/canonical/minisprites/gen6/pokemon/14--0--Kakuna.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kakuna.png rename to src/canonical/minisprites/gen6/pokemon/14--0--Kakuna.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kabuto.png b/src/canonical/minisprites/gen6/pokemon/140--0--Kabuto.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kabuto.png rename to src/canonical/minisprites/gen6/pokemon/140--0--Kabuto.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kabutops.png b/src/canonical/minisprites/gen6/pokemon/141--0--Kabutops.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kabutops.png rename to src/canonical/minisprites/gen6/pokemon/141--0--Kabutops.png diff --git a/src/canonical/minisprites/gen6/pokemon/Aerodactyl.png b/src/canonical/minisprites/gen6/pokemon/142--0--Aerodactyl.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Aerodactyl.png rename to src/canonical/minisprites/gen6/pokemon/142--0--Aerodactyl.png diff --git a/src/canonical/minisprites/gen6/pokemon/Aerodactyl--Mega.png b/src/canonical/minisprites/gen6/pokemon/142--420--Aerodactyl--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Aerodactyl--Mega.png rename to src/canonical/minisprites/gen6/pokemon/142--420--Aerodactyl--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Snorlax.png b/src/canonical/minisprites/gen6/pokemon/143--0--Snorlax.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Snorlax.png rename to src/canonical/minisprites/gen6/pokemon/143--0--Snorlax.png diff --git a/src/canonical/minisprites/gen6/pokemon/Articuno.png b/src/canonical/minisprites/gen6/pokemon/144--0--Articuno.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Articuno.png rename to src/canonical/minisprites/gen6/pokemon/144--0--Articuno.png diff --git a/src/canonical/minisprites/gen6/pokemon/Zapdos.png b/src/canonical/minisprites/gen6/pokemon/145--0--Zapdos.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Zapdos.png rename to src/canonical/minisprites/gen6/pokemon/145--0--Zapdos.png diff --git a/src/canonical/minisprites/gen6/pokemon/Moltres.png b/src/canonical/minisprites/gen6/pokemon/146--0--Moltres.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Moltres.png rename to src/canonical/minisprites/gen6/pokemon/146--0--Moltres.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dratini.png b/src/canonical/minisprites/gen6/pokemon/147--0--Dratini.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dratini.png rename to src/canonical/minisprites/gen6/pokemon/147--0--Dratini.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dragonair.png b/src/canonical/minisprites/gen6/pokemon/148--0--Dragonair.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dragonair.png rename to src/canonical/minisprites/gen6/pokemon/148--0--Dragonair.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dragonite.png b/src/canonical/minisprites/gen6/pokemon/149--0--Dragonite.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dragonite.png rename to src/canonical/minisprites/gen6/pokemon/149--0--Dragonite.png diff --git a/src/canonical/minisprites/gen6/pokemon/Beedrill.png b/src/canonical/minisprites/gen6/pokemon/15--0--Beedrill.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Beedrill.png rename to src/canonical/minisprites/gen6/pokemon/15--0--Beedrill.png diff --git a/src/canonical/minisprites/gen6/pokemon/Beedrill--Mega.png b/src/canonical/minisprites/gen6/pokemon/15--420--Beedrill--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Beedrill--Mega.png rename to src/canonical/minisprites/gen6/pokemon/15--420--Beedrill--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mewtwo.png b/src/canonical/minisprites/gen6/pokemon/150--0--Mewtwo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mewtwo.png rename to src/canonical/minisprites/gen6/pokemon/150--0--Mewtwo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mewtwo--Mega-X.png b/src/canonical/minisprites/gen6/pokemon/150--420--Mewtwo--Mega-X.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mewtwo--Mega-X.png rename to src/canonical/minisprites/gen6/pokemon/150--420--Mewtwo--Mega-X.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mewtwo--Mega-Y.png b/src/canonical/minisprites/gen6/pokemon/150--420--Mewtwo--Mega-Y.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mewtwo--Mega-Y.png rename to src/canonical/minisprites/gen6/pokemon/150--420--Mewtwo--Mega-Y.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mew.png b/src/canonical/minisprites/gen6/pokemon/151--0--Mew.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mew.png rename to src/canonical/minisprites/gen6/pokemon/151--0--Mew.png diff --git a/src/canonical/minisprites/gen6/pokemon/Chikorita.png b/src/canonical/minisprites/gen6/pokemon/152--0--Chikorita.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Chikorita.png rename to src/canonical/minisprites/gen6/pokemon/152--0--Chikorita.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bayleef.png b/src/canonical/minisprites/gen6/pokemon/153--0--Bayleef.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bayleef.png rename to src/canonical/minisprites/gen6/pokemon/153--0--Bayleef.png diff --git a/src/canonical/minisprites/gen6/pokemon/Meganium.png b/src/canonical/minisprites/gen6/pokemon/154--0--Meganium.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Meganium.png rename to src/canonical/minisprites/gen6/pokemon/154--0--Meganium.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cyndaquil.png b/src/canonical/minisprites/gen6/pokemon/155--0--Cyndaquil.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cyndaquil.png rename to src/canonical/minisprites/gen6/pokemon/155--0--Cyndaquil.png diff --git a/src/canonical/minisprites/gen6/pokemon/Quilava.png b/src/canonical/minisprites/gen6/pokemon/156--0--Quilava.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Quilava.png rename to src/canonical/minisprites/gen6/pokemon/156--0--Quilava.png diff --git a/src/canonical/minisprites/gen6/pokemon/Typhlosion.png b/src/canonical/minisprites/gen6/pokemon/157--0--Typhlosion.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Typhlosion.png rename to src/canonical/minisprites/gen6/pokemon/157--0--Typhlosion.png diff --git a/src/canonical/minisprites/gen6/pokemon/Totodile.png b/src/canonical/minisprites/gen6/pokemon/158--0--Totodile.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Totodile.png rename to src/canonical/minisprites/gen6/pokemon/158--0--Totodile.png diff --git a/src/canonical/minisprites/gen6/pokemon/Croconaw.png b/src/canonical/minisprites/gen6/pokemon/159--0--Croconaw.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Croconaw.png rename to src/canonical/minisprites/gen6/pokemon/159--0--Croconaw.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pidgey.png b/src/canonical/minisprites/gen6/pokemon/16--0--Pidgey.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pidgey.png rename to src/canonical/minisprites/gen6/pokemon/16--0--Pidgey.png diff --git a/src/canonical/minisprites/gen6/pokemon/Feraligatr.png b/src/canonical/minisprites/gen6/pokemon/160--0--Feraligatr.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Feraligatr.png rename to src/canonical/minisprites/gen6/pokemon/160--0--Feraligatr.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sentret.png b/src/canonical/minisprites/gen6/pokemon/161--0--Sentret.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sentret.png rename to src/canonical/minisprites/gen6/pokemon/161--0--Sentret.png diff --git a/src/canonical/minisprites/gen6/pokemon/Furret.png b/src/canonical/minisprites/gen6/pokemon/162--0--Furret.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Furret.png rename to src/canonical/minisprites/gen6/pokemon/162--0--Furret.png diff --git a/src/canonical/minisprites/gen6/pokemon/Hoothoot.png b/src/canonical/minisprites/gen6/pokemon/163--0--Hoothoot.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Hoothoot.png rename to src/canonical/minisprites/gen6/pokemon/163--0--Hoothoot.png diff --git a/src/canonical/minisprites/gen6/pokemon/Noctowl.png b/src/canonical/minisprites/gen6/pokemon/164--0--Noctowl.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Noctowl.png rename to src/canonical/minisprites/gen6/pokemon/164--0--Noctowl.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ledyba.png b/src/canonical/minisprites/gen6/pokemon/165--0--Ledyba.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ledyba.png rename to src/canonical/minisprites/gen6/pokemon/165--0--Ledyba.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ledian.png b/src/canonical/minisprites/gen6/pokemon/166--0--Ledian.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ledian.png rename to src/canonical/minisprites/gen6/pokemon/166--0--Ledian.png diff --git a/src/canonical/minisprites/gen6/pokemon/Spinarak.png b/src/canonical/minisprites/gen6/pokemon/167--0--Spinarak.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Spinarak.png rename to src/canonical/minisprites/gen6/pokemon/167--0--Spinarak.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ariados.png b/src/canonical/minisprites/gen6/pokemon/168--0--Ariados.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ariados.png rename to src/canonical/minisprites/gen6/pokemon/168--0--Ariados.png diff --git a/src/canonical/minisprites/gen6/pokemon/Crobat.png b/src/canonical/minisprites/gen6/pokemon/169--0--Crobat.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Crobat.png rename to src/canonical/minisprites/gen6/pokemon/169--0--Crobat.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pidgeotto.png b/src/canonical/minisprites/gen6/pokemon/17--0--Pidgeotto.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pidgeotto.png rename to src/canonical/minisprites/gen6/pokemon/17--0--Pidgeotto.png diff --git a/src/canonical/minisprites/gen6/pokemon/Chinchou.png b/src/canonical/minisprites/gen6/pokemon/170--0--Chinchou.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Chinchou.png rename to src/canonical/minisprites/gen6/pokemon/170--0--Chinchou.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lanturn.png b/src/canonical/minisprites/gen6/pokemon/171--0--Lanturn.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lanturn.png rename to src/canonical/minisprites/gen6/pokemon/171--0--Lanturn.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pichu.png b/src/canonical/minisprites/gen6/pokemon/172--0--Pichu.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pichu.png rename to src/canonical/minisprites/gen6/pokemon/172--0--Pichu.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cleffa.png b/src/canonical/minisprites/gen6/pokemon/173--0--Cleffa.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cleffa.png rename to src/canonical/minisprites/gen6/pokemon/173--0--Cleffa.png diff --git a/src/canonical/minisprites/gen6/pokemon/Igglybuff.png b/src/canonical/minisprites/gen6/pokemon/174--0--Igglybuff.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Igglybuff.png rename to src/canonical/minisprites/gen6/pokemon/174--0--Igglybuff.png diff --git a/src/canonical/minisprites/gen6/pokemon/Togepi.png b/src/canonical/minisprites/gen6/pokemon/175--0--Togepi.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Togepi.png rename to src/canonical/minisprites/gen6/pokemon/175--0--Togepi.png diff --git a/src/canonical/minisprites/gen6/pokemon/Togetic.png b/src/canonical/minisprites/gen6/pokemon/176--0--Togetic.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Togetic.png rename to src/canonical/minisprites/gen6/pokemon/176--0--Togetic.png diff --git a/src/canonical/minisprites/gen6/pokemon/Natu.png b/src/canonical/minisprites/gen6/pokemon/177--0--Natu.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Natu.png rename to src/canonical/minisprites/gen6/pokemon/177--0--Natu.png diff --git a/src/canonical/minisprites/gen6/pokemon/Xatu.png b/src/canonical/minisprites/gen6/pokemon/178--0--Xatu.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Xatu.png rename to src/canonical/minisprites/gen6/pokemon/178--0--Xatu.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mareep.png b/src/canonical/minisprites/gen6/pokemon/179--0--Mareep.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mareep.png rename to src/canonical/minisprites/gen6/pokemon/179--0--Mareep.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pidgeot.png b/src/canonical/minisprites/gen6/pokemon/18--0--Pidgeot.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pidgeot.png rename to src/canonical/minisprites/gen6/pokemon/18--0--Pidgeot.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pidgeot--Mega.png b/src/canonical/minisprites/gen6/pokemon/18--420--Pidgeot--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pidgeot--Mega.png rename to src/canonical/minisprites/gen6/pokemon/18--420--Pidgeot--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Flaaffy.png b/src/canonical/minisprites/gen6/pokemon/180--0--Flaaffy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Flaaffy.png rename to src/canonical/minisprites/gen6/pokemon/180--0--Flaaffy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ampharos.png b/src/canonical/minisprites/gen6/pokemon/181--0--Ampharos.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ampharos.png rename to src/canonical/minisprites/gen6/pokemon/181--0--Ampharos.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ampharos--Mega.png b/src/canonical/minisprites/gen6/pokemon/181--420--Ampharos--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ampharos--Mega.png rename to src/canonical/minisprites/gen6/pokemon/181--420--Ampharos--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bellossom.png b/src/canonical/minisprites/gen6/pokemon/182--0--Bellossom.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bellossom.png rename to src/canonical/minisprites/gen6/pokemon/182--0--Bellossom.png diff --git a/src/canonical/minisprites/gen6/pokemon/Marill.png b/src/canonical/minisprites/gen6/pokemon/183--0--Marill.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Marill.png rename to src/canonical/minisprites/gen6/pokemon/183--0--Marill.png diff --git a/src/canonical/minisprites/gen6/pokemon/Azumarill.png b/src/canonical/minisprites/gen6/pokemon/184--0--Azumarill.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Azumarill.png rename to src/canonical/minisprites/gen6/pokemon/184--0--Azumarill.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sudowoodo.png b/src/canonical/minisprites/gen6/pokemon/185--0--Sudowoodo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sudowoodo.png rename to src/canonical/minisprites/gen6/pokemon/185--0--Sudowoodo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Politoed.png b/src/canonical/minisprites/gen6/pokemon/186--0--Politoed.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Politoed.png rename to src/canonical/minisprites/gen6/pokemon/186--0--Politoed.png diff --git a/src/canonical/minisprites/gen6/pokemon/Hoppip.png b/src/canonical/minisprites/gen6/pokemon/187--0--Hoppip.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Hoppip.png rename to src/canonical/minisprites/gen6/pokemon/187--0--Hoppip.png diff --git a/src/canonical/minisprites/gen6/pokemon/Skiploom.png b/src/canonical/minisprites/gen6/pokemon/188--0--Skiploom.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Skiploom.png rename to src/canonical/minisprites/gen6/pokemon/188--0--Skiploom.png diff --git a/src/canonical/minisprites/gen6/pokemon/Jumpluff.png b/src/canonical/minisprites/gen6/pokemon/189--0--Jumpluff.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Jumpluff.png rename to src/canonical/minisprites/gen6/pokemon/189--0--Jumpluff.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rattata.png b/src/canonical/minisprites/gen6/pokemon/19--0--Rattata.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rattata.png rename to src/canonical/minisprites/gen6/pokemon/19--0--Rattata.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rattata--Alola.png b/src/canonical/minisprites/gen6/pokemon/19--420--Rattata--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rattata--Alola.png rename to src/canonical/minisprites/gen6/pokemon/19--420--Rattata--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Aipom.png b/src/canonical/minisprites/gen6/pokemon/190--0--Aipom.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Aipom.png rename to src/canonical/minisprites/gen6/pokemon/190--0--Aipom.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sunkern.png b/src/canonical/minisprites/gen6/pokemon/191--0--Sunkern.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sunkern.png rename to src/canonical/minisprites/gen6/pokemon/191--0--Sunkern.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sunflora.png b/src/canonical/minisprites/gen6/pokemon/192--0--Sunflora.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sunflora.png rename to src/canonical/minisprites/gen6/pokemon/192--0--Sunflora.png diff --git a/src/canonical/minisprites/gen6/pokemon/Yanma.png b/src/canonical/minisprites/gen6/pokemon/193--0--Yanma.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Yanma.png rename to src/canonical/minisprites/gen6/pokemon/193--0--Yanma.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wooper.png b/src/canonical/minisprites/gen6/pokemon/194--0--Wooper.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wooper.png rename to src/canonical/minisprites/gen6/pokemon/194--0--Wooper.png diff --git a/src/canonical/minisprites/gen6/pokemon/Quagsire.png b/src/canonical/minisprites/gen6/pokemon/195--0--Quagsire.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Quagsire.png rename to src/canonical/minisprites/gen6/pokemon/195--0--Quagsire.png diff --git a/src/canonical/minisprites/gen6/pokemon/Espeon.png b/src/canonical/minisprites/gen6/pokemon/196--0--Espeon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Espeon.png rename to src/canonical/minisprites/gen6/pokemon/196--0--Espeon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Umbreon.png b/src/canonical/minisprites/gen6/pokemon/197--0--Umbreon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Umbreon.png rename to src/canonical/minisprites/gen6/pokemon/197--0--Umbreon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Murkrow.png b/src/canonical/minisprites/gen6/pokemon/198--0--Murkrow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Murkrow.png rename to src/canonical/minisprites/gen6/pokemon/198--0--Murkrow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Slowking.png b/src/canonical/minisprites/gen6/pokemon/199--0--Slowking.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Slowking.png rename to src/canonical/minisprites/gen6/pokemon/199--0--Slowking.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ivysaur.png b/src/canonical/minisprites/gen6/pokemon/2--0--Ivysaur.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ivysaur.png rename to src/canonical/minisprites/gen6/pokemon/2--0--Ivysaur.png diff --git a/src/canonical/minisprites/gen6/pokemon/Raticate.png b/src/canonical/minisprites/gen6/pokemon/20--0--Raticate.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Raticate.png rename to src/canonical/minisprites/gen6/pokemon/20--0--Raticate.png diff --git a/src/canonical/minisprites/gen6/pokemon/Raticate--Alola.png b/src/canonical/minisprites/gen6/pokemon/20--420--Raticate--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Raticate--Alola.png rename to src/canonical/minisprites/gen6/pokemon/20--420--Raticate--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Misdreavus.png b/src/canonical/minisprites/gen6/pokemon/200--0--Misdreavus.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Misdreavus.png rename to src/canonical/minisprites/gen6/pokemon/200--0--Misdreavus.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown.png b/src/canonical/minisprites/gen6/pokemon/201--0--Unown.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown.png rename to src/canonical/minisprites/gen6/pokemon/201--0--Unown.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--B.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--B.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--B.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--B.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--C.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--C.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--C.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--C.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--D.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--D.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--D.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--D.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--E.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--E.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--E.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--E.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--Exclamation.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--Exclamation.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--Exclamation.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--Exclamation.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--F.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--F.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--F.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--F.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--G.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--G.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--G.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--G.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--H.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--H.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--H.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--H.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--I.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--I.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--I.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--I.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--J.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--J.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--J.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--J.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--K.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--K.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--K.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--K.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--L.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--L.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--L.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--L.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--M.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--M.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--M.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--M.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--N.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--N.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--N.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--N.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--O.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--O.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--O.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--O.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--P.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--P.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--P.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--P.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--Q.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--Q.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--Q.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--Q.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--Question.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--Question.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--Question.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--Question.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--R.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--R.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--R.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--R.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--S.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--S.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--S.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--S.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--T.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--T.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--T.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--T.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--U.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--U.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--U.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--U.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--V.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--V.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--V.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--V.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--W.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--W.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--W.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--W.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--X.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--X.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--X.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--X.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--Y.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--Y.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--Y.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--Y.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unown--Z.png b/src/canonical/minisprites/gen6/pokemon/201--420--Unown--Z.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unown--Z.png rename to src/canonical/minisprites/gen6/pokemon/201--420--Unown--Z.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wobbuffet.png b/src/canonical/minisprites/gen6/pokemon/202--0--Wobbuffet.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wobbuffet.png rename to src/canonical/minisprites/gen6/pokemon/202--0--Wobbuffet.png diff --git a/src/canonical/minisprites/gen6/pokemon/Girafarig.png b/src/canonical/minisprites/gen6/pokemon/203--0--Girafarig.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Girafarig.png rename to src/canonical/minisprites/gen6/pokemon/203--0--Girafarig.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pineco.png b/src/canonical/minisprites/gen6/pokemon/204--0--Pineco.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pineco.png rename to src/canonical/minisprites/gen6/pokemon/204--0--Pineco.png diff --git a/src/canonical/minisprites/gen6/pokemon/Forretress.png b/src/canonical/minisprites/gen6/pokemon/205--0--Forretress.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Forretress.png rename to src/canonical/minisprites/gen6/pokemon/205--0--Forretress.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dunsparce.png b/src/canonical/minisprites/gen6/pokemon/206--0--Dunsparce.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dunsparce.png rename to src/canonical/minisprites/gen6/pokemon/206--0--Dunsparce.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gligar.png b/src/canonical/minisprites/gen6/pokemon/207--0--Gligar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gligar.png rename to src/canonical/minisprites/gen6/pokemon/207--0--Gligar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Steelix.png b/src/canonical/minisprites/gen6/pokemon/208--0--Steelix.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Steelix.png rename to src/canonical/minisprites/gen6/pokemon/208--0--Steelix.png diff --git a/src/canonical/minisprites/gen6/pokemon/Steelix--Mega.png b/src/canonical/minisprites/gen6/pokemon/208--420--Steelix--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Steelix--Mega.png rename to src/canonical/minisprites/gen6/pokemon/208--420--Steelix--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Snubbull.png b/src/canonical/minisprites/gen6/pokemon/209--0--Snubbull.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Snubbull.png rename to src/canonical/minisprites/gen6/pokemon/209--0--Snubbull.png diff --git a/src/canonical/minisprites/gen6/pokemon/Spearow.png b/src/canonical/minisprites/gen6/pokemon/21--0--Spearow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Spearow.png rename to src/canonical/minisprites/gen6/pokemon/21--0--Spearow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Granbull.png b/src/canonical/minisprites/gen6/pokemon/210--0--Granbull.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Granbull.png rename to src/canonical/minisprites/gen6/pokemon/210--0--Granbull.png diff --git a/src/canonical/minisprites/gen6/pokemon/Qwilfish.png b/src/canonical/minisprites/gen6/pokemon/211--0--Qwilfish.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Qwilfish.png rename to src/canonical/minisprites/gen6/pokemon/211--0--Qwilfish.png diff --git a/src/canonical/minisprites/gen6/pokemon/Scizor.png b/src/canonical/minisprites/gen6/pokemon/212--0--Scizor.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Scizor.png rename to src/canonical/minisprites/gen6/pokemon/212--0--Scizor.png diff --git a/src/canonical/minisprites/gen6/pokemon/Scizor--Mega.png b/src/canonical/minisprites/gen6/pokemon/212--420--Scizor--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Scizor--Mega.png rename to src/canonical/minisprites/gen6/pokemon/212--420--Scizor--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shuckle.png b/src/canonical/minisprites/gen6/pokemon/213--0--Shuckle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shuckle.png rename to src/canonical/minisprites/gen6/pokemon/213--0--Shuckle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Heracross.png b/src/canonical/minisprites/gen6/pokemon/214--0--Heracross.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Heracross.png rename to src/canonical/minisprites/gen6/pokemon/214--0--Heracross.png diff --git a/src/canonical/minisprites/gen6/pokemon/Heracross--Mega.png b/src/canonical/minisprites/gen6/pokemon/214--420--Heracross--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Heracross--Mega.png rename to src/canonical/minisprites/gen6/pokemon/214--420--Heracross--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sneasel.png b/src/canonical/minisprites/gen6/pokemon/215--0--Sneasel.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sneasel.png rename to src/canonical/minisprites/gen6/pokemon/215--0--Sneasel.png diff --git a/src/canonical/minisprites/gen6/pokemon/Teddiursa.png b/src/canonical/minisprites/gen6/pokemon/216--0--Teddiursa.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Teddiursa.png rename to src/canonical/minisprites/gen6/pokemon/216--0--Teddiursa.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ursaring.png b/src/canonical/minisprites/gen6/pokemon/217--0--Ursaring.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ursaring.png rename to src/canonical/minisprites/gen6/pokemon/217--0--Ursaring.png diff --git a/src/canonical/minisprites/gen6/pokemon/Slugma.png b/src/canonical/minisprites/gen6/pokemon/218--0--Slugma.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Slugma.png rename to src/canonical/minisprites/gen6/pokemon/218--0--Slugma.png diff --git a/src/canonical/minisprites/gen6/pokemon/Magcargo.png b/src/canonical/minisprites/gen6/pokemon/219--0--Magcargo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Magcargo.png rename to src/canonical/minisprites/gen6/pokemon/219--0--Magcargo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Fearow.png b/src/canonical/minisprites/gen6/pokemon/22--0--Fearow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Fearow.png rename to src/canonical/minisprites/gen6/pokemon/22--0--Fearow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Swinub.png b/src/canonical/minisprites/gen6/pokemon/220--0--Swinub.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Swinub.png rename to src/canonical/minisprites/gen6/pokemon/220--0--Swinub.png diff --git a/src/canonical/minisprites/gen6/pokemon/Piloswine.png b/src/canonical/minisprites/gen6/pokemon/221--0--Piloswine.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Piloswine.png rename to src/canonical/minisprites/gen6/pokemon/221--0--Piloswine.png diff --git a/src/canonical/minisprites/gen6/pokemon/Corsola.png b/src/canonical/minisprites/gen6/pokemon/222--0--Corsola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Corsola.png rename to src/canonical/minisprites/gen6/pokemon/222--0--Corsola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Remoraid.png b/src/canonical/minisprites/gen6/pokemon/223--0--Remoraid.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Remoraid.png rename to src/canonical/minisprites/gen6/pokemon/223--0--Remoraid.png diff --git a/src/canonical/minisprites/gen6/pokemon/Octillery.png b/src/canonical/minisprites/gen6/pokemon/224--0--Octillery.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Octillery.png rename to src/canonical/minisprites/gen6/pokemon/224--0--Octillery.png diff --git a/src/canonical/minisprites/gen6/pokemon/Delibird.png b/src/canonical/minisprites/gen6/pokemon/225--0--Delibird.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Delibird.png rename to src/canonical/minisprites/gen6/pokemon/225--0--Delibird.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mantine.png b/src/canonical/minisprites/gen6/pokemon/226--0--Mantine.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mantine.png rename to src/canonical/minisprites/gen6/pokemon/226--0--Mantine.png diff --git a/src/canonical/minisprites/gen6/pokemon/Skarmory.png b/src/canonical/minisprites/gen6/pokemon/227--0--Skarmory.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Skarmory.png rename to src/canonical/minisprites/gen6/pokemon/227--0--Skarmory.png diff --git a/src/canonical/minisprites/gen6/pokemon/Houndour.png b/src/canonical/minisprites/gen6/pokemon/228--0--Houndour.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Houndour.png rename to src/canonical/minisprites/gen6/pokemon/228--0--Houndour.png diff --git a/src/canonical/minisprites/gen6/pokemon/Houndoom.png b/src/canonical/minisprites/gen6/pokemon/229--0--Houndoom.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Houndoom.png rename to src/canonical/minisprites/gen6/pokemon/229--0--Houndoom.png diff --git a/src/canonical/minisprites/gen6/pokemon/Houndoom--Mega.png b/src/canonical/minisprites/gen6/pokemon/229--420--Houndoom--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Houndoom--Mega.png rename to src/canonical/minisprites/gen6/pokemon/229--420--Houndoom--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ekans.png b/src/canonical/minisprites/gen6/pokemon/23--0--Ekans.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ekans.png rename to src/canonical/minisprites/gen6/pokemon/23--0--Ekans.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kingdra.png b/src/canonical/minisprites/gen6/pokemon/230--0--Kingdra.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kingdra.png rename to src/canonical/minisprites/gen6/pokemon/230--0--Kingdra.png diff --git a/src/canonical/minisprites/gen6/pokemon/Phanpy.png b/src/canonical/minisprites/gen6/pokemon/231--0--Phanpy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Phanpy.png rename to src/canonical/minisprites/gen6/pokemon/231--0--Phanpy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Donphan.png b/src/canonical/minisprites/gen6/pokemon/232--0--Donphan.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Donphan.png rename to src/canonical/minisprites/gen6/pokemon/232--0--Donphan.png diff --git a/src/canonical/minisprites/gen6/pokemon/Porygon2.png b/src/canonical/minisprites/gen6/pokemon/233--0--Porygon2.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Porygon2.png rename to src/canonical/minisprites/gen6/pokemon/233--0--Porygon2.png diff --git a/src/canonical/minisprites/gen6/pokemon/Stantler.png b/src/canonical/minisprites/gen6/pokemon/234--0--Stantler.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Stantler.png rename to src/canonical/minisprites/gen6/pokemon/234--0--Stantler.png diff --git a/src/canonical/minisprites/gen6/pokemon/Smeargle.png b/src/canonical/minisprites/gen6/pokemon/235--0--Smeargle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Smeargle.png rename to src/canonical/minisprites/gen6/pokemon/235--0--Smeargle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tyrogue.png b/src/canonical/minisprites/gen6/pokemon/236--0--Tyrogue.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tyrogue.png rename to src/canonical/minisprites/gen6/pokemon/236--0--Tyrogue.png diff --git a/src/canonical/minisprites/gen6/pokemon/Hitmontop.png b/src/canonical/minisprites/gen6/pokemon/237--0--Hitmontop.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Hitmontop.png rename to src/canonical/minisprites/gen6/pokemon/237--0--Hitmontop.png diff --git a/src/canonical/minisprites/gen6/pokemon/Smoochum.png b/src/canonical/minisprites/gen6/pokemon/238--0--Smoochum.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Smoochum.png rename to src/canonical/minisprites/gen6/pokemon/238--0--Smoochum.png diff --git a/src/canonical/minisprites/gen6/pokemon/Elekid.png b/src/canonical/minisprites/gen6/pokemon/239--0--Elekid.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Elekid.png rename to src/canonical/minisprites/gen6/pokemon/239--0--Elekid.png diff --git a/src/canonical/minisprites/gen6/pokemon/Arbok.png b/src/canonical/minisprites/gen6/pokemon/24--0--Arbok.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Arbok.png rename to src/canonical/minisprites/gen6/pokemon/24--0--Arbok.png diff --git a/src/canonical/minisprites/gen6/pokemon/Magby.png b/src/canonical/minisprites/gen6/pokemon/240--0--Magby.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Magby.png rename to src/canonical/minisprites/gen6/pokemon/240--0--Magby.png diff --git a/src/canonical/minisprites/gen6/pokemon/Miltank.png b/src/canonical/minisprites/gen6/pokemon/241--0--Miltank.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Miltank.png rename to src/canonical/minisprites/gen6/pokemon/241--0--Miltank.png diff --git a/src/canonical/minisprites/gen6/pokemon/Blissey.png b/src/canonical/minisprites/gen6/pokemon/242--0--Blissey.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Blissey.png rename to src/canonical/minisprites/gen6/pokemon/242--0--Blissey.png diff --git a/src/canonical/minisprites/gen6/pokemon/Raikou.png b/src/canonical/minisprites/gen6/pokemon/243--0--Raikou.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Raikou.png rename to src/canonical/minisprites/gen6/pokemon/243--0--Raikou.png diff --git a/src/canonical/minisprites/gen6/pokemon/Entei.png b/src/canonical/minisprites/gen6/pokemon/244--0--Entei.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Entei.png rename to src/canonical/minisprites/gen6/pokemon/244--0--Entei.png diff --git a/src/canonical/minisprites/gen6/pokemon/Suicune.png b/src/canonical/minisprites/gen6/pokemon/245--0--Suicune.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Suicune.png rename to src/canonical/minisprites/gen6/pokemon/245--0--Suicune.png diff --git a/src/canonical/minisprites/gen6/pokemon/Larvitar.png b/src/canonical/minisprites/gen6/pokemon/246--0--Larvitar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Larvitar.png rename to src/canonical/minisprites/gen6/pokemon/246--0--Larvitar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pupitar.png b/src/canonical/minisprites/gen6/pokemon/247--0--Pupitar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pupitar.png rename to src/canonical/minisprites/gen6/pokemon/247--0--Pupitar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tyranitar.png b/src/canonical/minisprites/gen6/pokemon/248--0--Tyranitar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tyranitar.png rename to src/canonical/minisprites/gen6/pokemon/248--0--Tyranitar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tyranitar--Mega.png b/src/canonical/minisprites/gen6/pokemon/248--420--Tyranitar--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tyranitar--Mega.png rename to src/canonical/minisprites/gen6/pokemon/248--420--Tyranitar--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lugia.png b/src/canonical/minisprites/gen6/pokemon/249--0--Lugia.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lugia.png rename to src/canonical/minisprites/gen6/pokemon/249--0--Lugia.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu.png b/src/canonical/minisprites/gen6/pokemon/25--0--Pikachu.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu.png rename to src/canonical/minisprites/gen6/pokemon/25--0--Pikachu.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu--Alola.png b/src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu--Alola.png rename to src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu--Belle.png b/src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Belle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu--Belle.png rename to src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Belle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu--Cosplay.png b/src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Cosplay.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu--Cosplay.png rename to src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Cosplay.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu--Hoenn.png b/src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Hoenn.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu--Hoenn.png rename to src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Hoenn.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu--Kalos.png b/src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Kalos.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu--Kalos.png rename to src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Kalos.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu--Libre.png b/src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Libre.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu--Libre.png rename to src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Libre.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu--Original.png b/src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Original.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu--Original.png rename to src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Original.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu--Partner.png b/src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Partner.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu--Partner.png rename to src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Partner.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu--PhD.png b/src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--PhD.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu--PhD.png rename to src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--PhD.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu--Pop-Star.png b/src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Pop-Star.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu--Pop-Star.png rename to src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Pop-Star.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu--Rock-Star.png b/src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Rock-Star.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu--Rock-Star.png rename to src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Rock-Star.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu--Sinnoh.png b/src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Sinnoh.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu--Sinnoh.png rename to src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Sinnoh.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu--Starter.png b/src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Starter.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu--Starter.png rename to src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Starter.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikachu--Unova.png b/src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Unova.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikachu--Unova.png rename to src/canonical/minisprites/gen6/pokemon/25--420--Pikachu--Unova.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ho-Oh.png b/src/canonical/minisprites/gen6/pokemon/250--0--Ho-Oh.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ho-Oh.png rename to src/canonical/minisprites/gen6/pokemon/250--0--Ho-Oh.png diff --git a/src/canonical/minisprites/gen6/pokemon/Celebi.png b/src/canonical/minisprites/gen6/pokemon/251--0--Celebi.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Celebi.png rename to src/canonical/minisprites/gen6/pokemon/251--0--Celebi.png diff --git a/src/canonical/minisprites/gen6/pokemon/Treecko.png b/src/canonical/minisprites/gen6/pokemon/252--0--Treecko.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Treecko.png rename to src/canonical/minisprites/gen6/pokemon/252--0--Treecko.png diff --git a/src/canonical/minisprites/gen6/pokemon/Grovyle.png b/src/canonical/minisprites/gen6/pokemon/253--0--Grovyle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Grovyle.png rename to src/canonical/minisprites/gen6/pokemon/253--0--Grovyle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sceptile.png b/src/canonical/minisprites/gen6/pokemon/254--0--Sceptile.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sceptile.png rename to src/canonical/minisprites/gen6/pokemon/254--0--Sceptile.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sceptile--Mega.png b/src/canonical/minisprites/gen6/pokemon/254--420--Sceptile--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sceptile--Mega.png rename to src/canonical/minisprites/gen6/pokemon/254--420--Sceptile--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Torchic.png b/src/canonical/minisprites/gen6/pokemon/255--0--Torchic.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Torchic.png rename to src/canonical/minisprites/gen6/pokemon/255--0--Torchic.png diff --git a/src/canonical/minisprites/gen6/pokemon/Combusken.png b/src/canonical/minisprites/gen6/pokemon/256--0--Combusken.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Combusken.png rename to src/canonical/minisprites/gen6/pokemon/256--0--Combusken.png diff --git a/src/canonical/minisprites/gen6/pokemon/Blaziken.png b/src/canonical/minisprites/gen6/pokemon/257--0--Blaziken.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Blaziken.png rename to src/canonical/minisprites/gen6/pokemon/257--0--Blaziken.png diff --git a/src/canonical/minisprites/gen6/pokemon/Blaziken--Mega.png b/src/canonical/minisprites/gen6/pokemon/257--420--Blaziken--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Blaziken--Mega.png rename to src/canonical/minisprites/gen6/pokemon/257--420--Blaziken--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mudkip.png b/src/canonical/minisprites/gen6/pokemon/258--0--Mudkip.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mudkip.png rename to src/canonical/minisprites/gen6/pokemon/258--0--Mudkip.png diff --git a/src/canonical/minisprites/gen6/pokemon/Marshtomp.png b/src/canonical/minisprites/gen6/pokemon/259--0--Marshtomp.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Marshtomp.png rename to src/canonical/minisprites/gen6/pokemon/259--0--Marshtomp.png diff --git a/src/canonical/minisprites/gen6/pokemon/Raichu.png b/src/canonical/minisprites/gen6/pokemon/26--0--Raichu.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Raichu.png rename to src/canonical/minisprites/gen6/pokemon/26--0--Raichu.png diff --git a/src/canonical/minisprites/gen6/pokemon/Raichu--Alola.png b/src/canonical/minisprites/gen6/pokemon/26--420--Raichu--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Raichu--Alola.png rename to src/canonical/minisprites/gen6/pokemon/26--420--Raichu--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Swampert.png b/src/canonical/minisprites/gen6/pokemon/260--0--Swampert.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Swampert.png rename to src/canonical/minisprites/gen6/pokemon/260--0--Swampert.png diff --git a/src/canonical/minisprites/gen6/pokemon/Swampert--Mega.png b/src/canonical/minisprites/gen6/pokemon/260--420--Swampert--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Swampert--Mega.png rename to src/canonical/minisprites/gen6/pokemon/260--420--Swampert--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Poochyena.png b/src/canonical/minisprites/gen6/pokemon/261--0--Poochyena.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Poochyena.png rename to src/canonical/minisprites/gen6/pokemon/261--0--Poochyena.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mightyena.png b/src/canonical/minisprites/gen6/pokemon/262--0--Mightyena.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mightyena.png rename to src/canonical/minisprites/gen6/pokemon/262--0--Mightyena.png diff --git a/src/canonical/minisprites/gen6/pokemon/Zigzagoon.png b/src/canonical/minisprites/gen6/pokemon/263--0--Zigzagoon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Zigzagoon.png rename to src/canonical/minisprites/gen6/pokemon/263--0--Zigzagoon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Linoone.png b/src/canonical/minisprites/gen6/pokemon/264--0--Linoone.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Linoone.png rename to src/canonical/minisprites/gen6/pokemon/264--0--Linoone.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wurmple.png b/src/canonical/minisprites/gen6/pokemon/265--0--Wurmple.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wurmple.png rename to src/canonical/minisprites/gen6/pokemon/265--0--Wurmple.png diff --git a/src/canonical/minisprites/gen6/pokemon/Silcoon.png b/src/canonical/minisprites/gen6/pokemon/266--0--Silcoon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Silcoon.png rename to src/canonical/minisprites/gen6/pokemon/266--0--Silcoon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Beautifly.png b/src/canonical/minisprites/gen6/pokemon/267--0--Beautifly.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Beautifly.png rename to src/canonical/minisprites/gen6/pokemon/267--0--Beautifly.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cascoon.png b/src/canonical/minisprites/gen6/pokemon/268--0--Cascoon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cascoon.png rename to src/canonical/minisprites/gen6/pokemon/268--0--Cascoon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dustox.png b/src/canonical/minisprites/gen6/pokemon/269--0--Dustox.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dustox.png rename to src/canonical/minisprites/gen6/pokemon/269--0--Dustox.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sandshrew.png b/src/canonical/minisprites/gen6/pokemon/27--0--Sandshrew.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sandshrew.png rename to src/canonical/minisprites/gen6/pokemon/27--0--Sandshrew.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sandshrew--Alola.png b/src/canonical/minisprites/gen6/pokemon/27--420--Sandshrew--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sandshrew--Alola.png rename to src/canonical/minisprites/gen6/pokemon/27--420--Sandshrew--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lotad.png b/src/canonical/minisprites/gen6/pokemon/270--0--Lotad.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lotad.png rename to src/canonical/minisprites/gen6/pokemon/270--0--Lotad.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lombre.png b/src/canonical/minisprites/gen6/pokemon/271--0--Lombre.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lombre.png rename to src/canonical/minisprites/gen6/pokemon/271--0--Lombre.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ludicolo.png b/src/canonical/minisprites/gen6/pokemon/272--0--Ludicolo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ludicolo.png rename to src/canonical/minisprites/gen6/pokemon/272--0--Ludicolo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Seedot.png b/src/canonical/minisprites/gen6/pokemon/273--0--Seedot.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Seedot.png rename to src/canonical/minisprites/gen6/pokemon/273--0--Seedot.png diff --git a/src/canonical/minisprites/gen6/pokemon/Nuzleaf.png b/src/canonical/minisprites/gen6/pokemon/274--0--Nuzleaf.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Nuzleaf.png rename to src/canonical/minisprites/gen6/pokemon/274--0--Nuzleaf.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shiftry.png b/src/canonical/minisprites/gen6/pokemon/275--0--Shiftry.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shiftry.png rename to src/canonical/minisprites/gen6/pokemon/275--0--Shiftry.png diff --git a/src/canonical/minisprites/gen6/pokemon/Taillow.png b/src/canonical/minisprites/gen6/pokemon/276--0--Taillow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Taillow.png rename to src/canonical/minisprites/gen6/pokemon/276--0--Taillow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Swellow.png b/src/canonical/minisprites/gen6/pokemon/277--0--Swellow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Swellow.png rename to src/canonical/minisprites/gen6/pokemon/277--0--Swellow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wingull.png b/src/canonical/minisprites/gen6/pokemon/278--0--Wingull.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wingull.png rename to src/canonical/minisprites/gen6/pokemon/278--0--Wingull.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pelipper.png b/src/canonical/minisprites/gen6/pokemon/279--0--Pelipper.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pelipper.png rename to src/canonical/minisprites/gen6/pokemon/279--0--Pelipper.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sandslash.png b/src/canonical/minisprites/gen6/pokemon/28--0--Sandslash.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sandslash.png rename to src/canonical/minisprites/gen6/pokemon/28--0--Sandslash.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sandslash--Alola.png b/src/canonical/minisprites/gen6/pokemon/28--420--Sandslash--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sandslash--Alola.png rename to src/canonical/minisprites/gen6/pokemon/28--420--Sandslash--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ralts.png b/src/canonical/minisprites/gen6/pokemon/280--0--Ralts.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ralts.png rename to src/canonical/minisprites/gen6/pokemon/280--0--Ralts.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kirlia.png b/src/canonical/minisprites/gen6/pokemon/281--0--Kirlia.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kirlia.png rename to src/canonical/minisprites/gen6/pokemon/281--0--Kirlia.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gardevoir.png b/src/canonical/minisprites/gen6/pokemon/282--0--Gardevoir.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gardevoir.png rename to src/canonical/minisprites/gen6/pokemon/282--0--Gardevoir.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gardevoir--Mega.png b/src/canonical/minisprites/gen6/pokemon/282--420--Gardevoir--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gardevoir--Mega.png rename to src/canonical/minisprites/gen6/pokemon/282--420--Gardevoir--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Surskit.png b/src/canonical/minisprites/gen6/pokemon/283--0--Surskit.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Surskit.png rename to src/canonical/minisprites/gen6/pokemon/283--0--Surskit.png diff --git a/src/canonical/minisprites/gen6/pokemon/Masquerain.png b/src/canonical/minisprites/gen6/pokemon/284--0--Masquerain.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Masquerain.png rename to src/canonical/minisprites/gen6/pokemon/284--0--Masquerain.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shroomish.png b/src/canonical/minisprites/gen6/pokemon/285--0--Shroomish.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shroomish.png rename to src/canonical/minisprites/gen6/pokemon/285--0--Shroomish.png diff --git a/src/canonical/minisprites/gen6/pokemon/Breloom.png b/src/canonical/minisprites/gen6/pokemon/286--0--Breloom.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Breloom.png rename to src/canonical/minisprites/gen6/pokemon/286--0--Breloom.png diff --git a/src/canonical/minisprites/gen6/pokemon/Slakoth.png b/src/canonical/minisprites/gen6/pokemon/287--0--Slakoth.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Slakoth.png rename to src/canonical/minisprites/gen6/pokemon/287--0--Slakoth.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vigoroth.png b/src/canonical/minisprites/gen6/pokemon/288--0--Vigoroth.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vigoroth.png rename to src/canonical/minisprites/gen6/pokemon/288--0--Vigoroth.png diff --git a/src/canonical/minisprites/gen6/pokemon/Slaking.png b/src/canonical/minisprites/gen6/pokemon/289--0--Slaking.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Slaking.png rename to src/canonical/minisprites/gen6/pokemon/289--0--Slaking.png diff --git a/src/canonical/minisprites/gen6/pokemon/Nidoran-F.png b/src/canonical/minisprites/gen6/pokemon/29--0--Nidoran-F.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Nidoran-F.png rename to src/canonical/minisprites/gen6/pokemon/29--0--Nidoran-F.png diff --git a/src/canonical/minisprites/gen6/pokemon/Nincada.png b/src/canonical/minisprites/gen6/pokemon/290--0--Nincada.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Nincada.png rename to src/canonical/minisprites/gen6/pokemon/290--0--Nincada.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ninjask.png b/src/canonical/minisprites/gen6/pokemon/291--0--Ninjask.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ninjask.png rename to src/canonical/minisprites/gen6/pokemon/291--0--Ninjask.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shedinja.png b/src/canonical/minisprites/gen6/pokemon/292--0--Shedinja.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shedinja.png rename to src/canonical/minisprites/gen6/pokemon/292--0--Shedinja.png diff --git a/src/canonical/minisprites/gen6/pokemon/Whismur.png b/src/canonical/minisprites/gen6/pokemon/293--0--Whismur.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Whismur.png rename to src/canonical/minisprites/gen6/pokemon/293--0--Whismur.png diff --git a/src/canonical/minisprites/gen6/pokemon/Loudred.png b/src/canonical/minisprites/gen6/pokemon/294--0--Loudred.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Loudred.png rename to src/canonical/minisprites/gen6/pokemon/294--0--Loudred.png diff --git a/src/canonical/minisprites/gen6/pokemon/Exploud.png b/src/canonical/minisprites/gen6/pokemon/295--0--Exploud.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Exploud.png rename to src/canonical/minisprites/gen6/pokemon/295--0--Exploud.png diff --git a/src/canonical/minisprites/gen6/pokemon/Makuhita.png b/src/canonical/minisprites/gen6/pokemon/296--0--Makuhita.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Makuhita.png rename to src/canonical/minisprites/gen6/pokemon/296--0--Makuhita.png diff --git a/src/canonical/minisprites/gen6/pokemon/Hariyama.png b/src/canonical/minisprites/gen6/pokemon/297--0--Hariyama.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Hariyama.png rename to src/canonical/minisprites/gen6/pokemon/297--0--Hariyama.png diff --git a/src/canonical/minisprites/gen6/pokemon/Azurill.png b/src/canonical/minisprites/gen6/pokemon/298--0--Azurill.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Azurill.png rename to src/canonical/minisprites/gen6/pokemon/298--0--Azurill.png diff --git a/src/canonical/minisprites/gen6/pokemon/Nosepass.png b/src/canonical/minisprites/gen6/pokemon/299--0--Nosepass.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Nosepass.png rename to src/canonical/minisprites/gen6/pokemon/299--0--Nosepass.png diff --git a/src/canonical/minisprites/gen6/pokemon/Venusaur.png b/src/canonical/minisprites/gen6/pokemon/3--0--Venusaur.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Venusaur.png rename to src/canonical/minisprites/gen6/pokemon/3--0--Venusaur.png diff --git a/src/canonical/minisprites/gen6/pokemon/Venusaur--Mega.png b/src/canonical/minisprites/gen6/pokemon/3--420--Venusaur--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Venusaur--Mega.png rename to src/canonical/minisprites/gen6/pokemon/3--420--Venusaur--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Nidorina.png b/src/canonical/minisprites/gen6/pokemon/30--0--Nidorina.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Nidorina.png rename to src/canonical/minisprites/gen6/pokemon/30--0--Nidorina.png diff --git a/src/canonical/minisprites/gen6/pokemon/Skitty.png b/src/canonical/minisprites/gen6/pokemon/300--0--Skitty.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Skitty.png rename to src/canonical/minisprites/gen6/pokemon/300--0--Skitty.png diff --git a/src/canonical/minisprites/gen6/pokemon/Delcatty.png b/src/canonical/minisprites/gen6/pokemon/301--0--Delcatty.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Delcatty.png rename to src/canonical/minisprites/gen6/pokemon/301--0--Delcatty.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sableye.png b/src/canonical/minisprites/gen6/pokemon/302--0--Sableye.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sableye.png rename to src/canonical/minisprites/gen6/pokemon/302--0--Sableye.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sableye--Mega.png b/src/canonical/minisprites/gen6/pokemon/302--420--Sableye--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sableye--Mega.png rename to src/canonical/minisprites/gen6/pokemon/302--420--Sableye--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mawile.png b/src/canonical/minisprites/gen6/pokemon/303--0--Mawile.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mawile.png rename to src/canonical/minisprites/gen6/pokemon/303--0--Mawile.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mawile--Mega.png b/src/canonical/minisprites/gen6/pokemon/303--420--Mawile--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mawile--Mega.png rename to src/canonical/minisprites/gen6/pokemon/303--420--Mawile--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Aron.png b/src/canonical/minisprites/gen6/pokemon/304--0--Aron.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Aron.png rename to src/canonical/minisprites/gen6/pokemon/304--0--Aron.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lairon.png b/src/canonical/minisprites/gen6/pokemon/305--0--Lairon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lairon.png rename to src/canonical/minisprites/gen6/pokemon/305--0--Lairon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Aggron.png b/src/canonical/minisprites/gen6/pokemon/306--0--Aggron.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Aggron.png rename to src/canonical/minisprites/gen6/pokemon/306--0--Aggron.png diff --git a/src/canonical/minisprites/gen6/pokemon/Aggron--Mega.png b/src/canonical/minisprites/gen6/pokemon/306--420--Aggron--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Aggron--Mega.png rename to src/canonical/minisprites/gen6/pokemon/306--420--Aggron--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Meditite.png b/src/canonical/minisprites/gen6/pokemon/307--0--Meditite.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Meditite.png rename to src/canonical/minisprites/gen6/pokemon/307--0--Meditite.png diff --git a/src/canonical/minisprites/gen6/pokemon/Medicham.png b/src/canonical/minisprites/gen6/pokemon/308--0--Medicham.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Medicham.png rename to src/canonical/minisprites/gen6/pokemon/308--0--Medicham.png diff --git a/src/canonical/minisprites/gen6/pokemon/Medicham--Mega.png b/src/canonical/minisprites/gen6/pokemon/308--420--Medicham--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Medicham--Mega.png rename to src/canonical/minisprites/gen6/pokemon/308--420--Medicham--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Electrike.png b/src/canonical/minisprites/gen6/pokemon/309--0--Electrike.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Electrike.png rename to src/canonical/minisprites/gen6/pokemon/309--0--Electrike.png diff --git a/src/canonical/minisprites/gen6/pokemon/Nidoqueen.png b/src/canonical/minisprites/gen6/pokemon/31--0--Nidoqueen.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Nidoqueen.png rename to src/canonical/minisprites/gen6/pokemon/31--0--Nidoqueen.png diff --git a/src/canonical/minisprites/gen6/pokemon/Manectric.png b/src/canonical/minisprites/gen6/pokemon/310--0--Manectric.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Manectric.png rename to src/canonical/minisprites/gen6/pokemon/310--0--Manectric.png diff --git a/src/canonical/minisprites/gen6/pokemon/Manectric--Mega.png b/src/canonical/minisprites/gen6/pokemon/310--420--Manectric--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Manectric--Mega.png rename to src/canonical/minisprites/gen6/pokemon/310--420--Manectric--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Plusle.png b/src/canonical/minisprites/gen6/pokemon/311--0--Plusle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Plusle.png rename to src/canonical/minisprites/gen6/pokemon/311--0--Plusle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Minun.png b/src/canonical/minisprites/gen6/pokemon/312--0--Minun.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Minun.png rename to src/canonical/minisprites/gen6/pokemon/312--0--Minun.png diff --git a/src/canonical/minisprites/gen6/pokemon/Volbeat.png b/src/canonical/minisprites/gen6/pokemon/313--0--Volbeat.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Volbeat.png rename to src/canonical/minisprites/gen6/pokemon/313--0--Volbeat.png diff --git a/src/canonical/minisprites/gen6/pokemon/Illumise.png b/src/canonical/minisprites/gen6/pokemon/314--0--Illumise.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Illumise.png rename to src/canonical/minisprites/gen6/pokemon/314--0--Illumise.png diff --git a/src/canonical/minisprites/gen6/pokemon/Roselia.png b/src/canonical/minisprites/gen6/pokemon/315--0--Roselia.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Roselia.png rename to src/canonical/minisprites/gen6/pokemon/315--0--Roselia.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gulpin.png b/src/canonical/minisprites/gen6/pokemon/316--0--Gulpin.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gulpin.png rename to src/canonical/minisprites/gen6/pokemon/316--0--Gulpin.png diff --git a/src/canonical/minisprites/gen6/pokemon/Swalot.png b/src/canonical/minisprites/gen6/pokemon/317--0--Swalot.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Swalot.png rename to src/canonical/minisprites/gen6/pokemon/317--0--Swalot.png diff --git a/src/canonical/minisprites/gen6/pokemon/Carvanha.png b/src/canonical/minisprites/gen6/pokemon/318--0--Carvanha.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Carvanha.png rename to src/canonical/minisprites/gen6/pokemon/318--0--Carvanha.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sharpedo.png b/src/canonical/minisprites/gen6/pokemon/319--0--Sharpedo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sharpedo.png rename to src/canonical/minisprites/gen6/pokemon/319--0--Sharpedo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sharpedo--Mega.png b/src/canonical/minisprites/gen6/pokemon/319--420--Sharpedo--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sharpedo--Mega.png rename to src/canonical/minisprites/gen6/pokemon/319--420--Sharpedo--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Nidoran-M.png b/src/canonical/minisprites/gen6/pokemon/32--0--Nidoran-M.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Nidoran-M.png rename to src/canonical/minisprites/gen6/pokemon/32--0--Nidoran-M.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wailmer.png b/src/canonical/minisprites/gen6/pokemon/320--0--Wailmer.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wailmer.png rename to src/canonical/minisprites/gen6/pokemon/320--0--Wailmer.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wailord.png b/src/canonical/minisprites/gen6/pokemon/321--0--Wailord.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wailord.png rename to src/canonical/minisprites/gen6/pokemon/321--0--Wailord.png diff --git a/src/canonical/minisprites/gen6/pokemon/Numel.png b/src/canonical/minisprites/gen6/pokemon/322--0--Numel.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Numel.png rename to src/canonical/minisprites/gen6/pokemon/322--0--Numel.png diff --git a/src/canonical/minisprites/gen6/pokemon/Camerupt.png b/src/canonical/minisprites/gen6/pokemon/323--0--Camerupt.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Camerupt.png rename to src/canonical/minisprites/gen6/pokemon/323--0--Camerupt.png diff --git a/src/canonical/minisprites/gen6/pokemon/Camerupt--Mega.png b/src/canonical/minisprites/gen6/pokemon/323--420--Camerupt--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Camerupt--Mega.png rename to src/canonical/minisprites/gen6/pokemon/323--420--Camerupt--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Torkoal.png b/src/canonical/minisprites/gen6/pokemon/324--0--Torkoal.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Torkoal.png rename to src/canonical/minisprites/gen6/pokemon/324--0--Torkoal.png diff --git a/src/canonical/minisprites/gen6/pokemon/Spoink.png b/src/canonical/minisprites/gen6/pokemon/325--0--Spoink.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Spoink.png rename to src/canonical/minisprites/gen6/pokemon/325--0--Spoink.png diff --git a/src/canonical/minisprites/gen6/pokemon/Grumpig.png b/src/canonical/minisprites/gen6/pokemon/326--0--Grumpig.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Grumpig.png rename to src/canonical/minisprites/gen6/pokemon/326--0--Grumpig.png diff --git a/src/canonical/minisprites/gen6/pokemon/Spinda.png b/src/canonical/minisprites/gen6/pokemon/327--0--Spinda.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Spinda.png rename to src/canonical/minisprites/gen6/pokemon/327--0--Spinda.png diff --git a/src/canonical/minisprites/gen6/pokemon/Trapinch.png b/src/canonical/minisprites/gen6/pokemon/328--0--Trapinch.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Trapinch.png rename to src/canonical/minisprites/gen6/pokemon/328--0--Trapinch.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vibrava.png b/src/canonical/minisprites/gen6/pokemon/329--0--Vibrava.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vibrava.png rename to src/canonical/minisprites/gen6/pokemon/329--0--Vibrava.png diff --git a/src/canonical/minisprites/gen6/pokemon/Nidorino.png b/src/canonical/minisprites/gen6/pokemon/33--0--Nidorino.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Nidorino.png rename to src/canonical/minisprites/gen6/pokemon/33--0--Nidorino.png diff --git a/src/canonical/minisprites/gen6/pokemon/Flygon.png b/src/canonical/minisprites/gen6/pokemon/330--0--Flygon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Flygon.png rename to src/canonical/minisprites/gen6/pokemon/330--0--Flygon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cacnea.png b/src/canonical/minisprites/gen6/pokemon/331--0--Cacnea.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cacnea.png rename to src/canonical/minisprites/gen6/pokemon/331--0--Cacnea.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cacturne.png b/src/canonical/minisprites/gen6/pokemon/332--0--Cacturne.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cacturne.png rename to src/canonical/minisprites/gen6/pokemon/332--0--Cacturne.png diff --git a/src/canonical/minisprites/gen6/pokemon/Swablu.png b/src/canonical/minisprites/gen6/pokemon/333--0--Swablu.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Swablu.png rename to src/canonical/minisprites/gen6/pokemon/333--0--Swablu.png diff --git a/src/canonical/minisprites/gen6/pokemon/Altaria.png b/src/canonical/minisprites/gen6/pokemon/334--0--Altaria.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Altaria.png rename to src/canonical/minisprites/gen6/pokemon/334--0--Altaria.png diff --git a/src/canonical/minisprites/gen6/pokemon/Altaria--Mega.png b/src/canonical/minisprites/gen6/pokemon/334--420--Altaria--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Altaria--Mega.png rename to src/canonical/minisprites/gen6/pokemon/334--420--Altaria--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Zangoose.png b/src/canonical/minisprites/gen6/pokemon/335--0--Zangoose.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Zangoose.png rename to src/canonical/minisprites/gen6/pokemon/335--0--Zangoose.png diff --git a/src/canonical/minisprites/gen6/pokemon/Seviper.png b/src/canonical/minisprites/gen6/pokemon/336--0--Seviper.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Seviper.png rename to src/canonical/minisprites/gen6/pokemon/336--0--Seviper.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lunatone.png b/src/canonical/minisprites/gen6/pokemon/337--0--Lunatone.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lunatone.png rename to src/canonical/minisprites/gen6/pokemon/337--0--Lunatone.png diff --git a/src/canonical/minisprites/gen6/pokemon/Solrock.png b/src/canonical/minisprites/gen6/pokemon/338--0--Solrock.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Solrock.png rename to src/canonical/minisprites/gen6/pokemon/338--0--Solrock.png diff --git a/src/canonical/minisprites/gen6/pokemon/Barboach.png b/src/canonical/minisprites/gen6/pokemon/339--0--Barboach.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Barboach.png rename to src/canonical/minisprites/gen6/pokemon/339--0--Barboach.png diff --git a/src/canonical/minisprites/gen6/pokemon/Nidoking.png b/src/canonical/minisprites/gen6/pokemon/34--0--Nidoking.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Nidoking.png rename to src/canonical/minisprites/gen6/pokemon/34--0--Nidoking.png diff --git a/src/canonical/minisprites/gen6/pokemon/Whiscash.png b/src/canonical/minisprites/gen6/pokemon/340--0--Whiscash.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Whiscash.png rename to src/canonical/minisprites/gen6/pokemon/340--0--Whiscash.png diff --git a/src/canonical/minisprites/gen6/pokemon/Corphish.png b/src/canonical/minisprites/gen6/pokemon/341--0--Corphish.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Corphish.png rename to src/canonical/minisprites/gen6/pokemon/341--0--Corphish.png diff --git a/src/canonical/minisprites/gen6/pokemon/Crawdaunt.png b/src/canonical/minisprites/gen6/pokemon/342--0--Crawdaunt.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Crawdaunt.png rename to src/canonical/minisprites/gen6/pokemon/342--0--Crawdaunt.png diff --git a/src/canonical/minisprites/gen6/pokemon/Baltoy.png b/src/canonical/minisprites/gen6/pokemon/343--0--Baltoy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Baltoy.png rename to src/canonical/minisprites/gen6/pokemon/343--0--Baltoy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Claydol.png b/src/canonical/minisprites/gen6/pokemon/344--0--Claydol.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Claydol.png rename to src/canonical/minisprites/gen6/pokemon/344--0--Claydol.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lileep.png b/src/canonical/minisprites/gen6/pokemon/345--0--Lileep.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lileep.png rename to src/canonical/minisprites/gen6/pokemon/345--0--Lileep.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cradily.png b/src/canonical/minisprites/gen6/pokemon/346--0--Cradily.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cradily.png rename to src/canonical/minisprites/gen6/pokemon/346--0--Cradily.png diff --git a/src/canonical/minisprites/gen6/pokemon/Anorith.png b/src/canonical/minisprites/gen6/pokemon/347--0--Anorith.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Anorith.png rename to src/canonical/minisprites/gen6/pokemon/347--0--Anorith.png diff --git a/src/canonical/minisprites/gen6/pokemon/Armaldo.png b/src/canonical/minisprites/gen6/pokemon/348--0--Armaldo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Armaldo.png rename to src/canonical/minisprites/gen6/pokemon/348--0--Armaldo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Feebas.png b/src/canonical/minisprites/gen6/pokemon/349--0--Feebas.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Feebas.png rename to src/canonical/minisprites/gen6/pokemon/349--0--Feebas.png diff --git a/src/canonical/minisprites/gen6/pokemon/Clefairy.png b/src/canonical/minisprites/gen6/pokemon/35--0--Clefairy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Clefairy.png rename to src/canonical/minisprites/gen6/pokemon/35--0--Clefairy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Milotic.png b/src/canonical/minisprites/gen6/pokemon/350--0--Milotic.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Milotic.png rename to src/canonical/minisprites/gen6/pokemon/350--0--Milotic.png diff --git a/src/canonical/minisprites/gen6/pokemon/Castform.png b/src/canonical/minisprites/gen6/pokemon/351--0--Castform.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Castform.png rename to src/canonical/minisprites/gen6/pokemon/351--0--Castform.png diff --git a/src/canonical/minisprites/gen6/pokemon/Castform--Rainy.png b/src/canonical/minisprites/gen6/pokemon/351--420--Castform--Rainy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Castform--Rainy.png rename to src/canonical/minisprites/gen6/pokemon/351--420--Castform--Rainy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Castform--Snowy.png b/src/canonical/minisprites/gen6/pokemon/351--420--Castform--Snowy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Castform--Snowy.png rename to src/canonical/minisprites/gen6/pokemon/351--420--Castform--Snowy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Castform--Sunny.png b/src/canonical/minisprites/gen6/pokemon/351--420--Castform--Sunny.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Castform--Sunny.png rename to src/canonical/minisprites/gen6/pokemon/351--420--Castform--Sunny.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kecleon.png b/src/canonical/minisprites/gen6/pokemon/352--0--Kecleon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kecleon.png rename to src/canonical/minisprites/gen6/pokemon/352--0--Kecleon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shuppet.png b/src/canonical/minisprites/gen6/pokemon/353--0--Shuppet.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shuppet.png rename to src/canonical/minisprites/gen6/pokemon/353--0--Shuppet.png diff --git a/src/canonical/minisprites/gen6/pokemon/Banette.png b/src/canonical/minisprites/gen6/pokemon/354--0--Banette.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Banette.png rename to src/canonical/minisprites/gen6/pokemon/354--0--Banette.png diff --git a/src/canonical/minisprites/gen6/pokemon/Banette--Mega.png b/src/canonical/minisprites/gen6/pokemon/354--420--Banette--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Banette--Mega.png rename to src/canonical/minisprites/gen6/pokemon/354--420--Banette--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Duskull.png b/src/canonical/minisprites/gen6/pokemon/355--0--Duskull.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Duskull.png rename to src/canonical/minisprites/gen6/pokemon/355--0--Duskull.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dusclops.png b/src/canonical/minisprites/gen6/pokemon/356--0--Dusclops.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dusclops.png rename to src/canonical/minisprites/gen6/pokemon/356--0--Dusclops.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tropius.png b/src/canonical/minisprites/gen6/pokemon/357--0--Tropius.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tropius.png rename to src/canonical/minisprites/gen6/pokemon/357--0--Tropius.png diff --git a/src/canonical/minisprites/gen6/pokemon/Chimecho.png b/src/canonical/minisprites/gen6/pokemon/358--0--Chimecho.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Chimecho.png rename to src/canonical/minisprites/gen6/pokemon/358--0--Chimecho.png diff --git a/src/canonical/minisprites/gen6/pokemon/Absol.png b/src/canonical/minisprites/gen6/pokemon/359--0--Absol.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Absol.png rename to src/canonical/minisprites/gen6/pokemon/359--0--Absol.png diff --git a/src/canonical/minisprites/gen6/pokemon/Absol--Mega.png b/src/canonical/minisprites/gen6/pokemon/359--420--Absol--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Absol--Mega.png rename to src/canonical/minisprites/gen6/pokemon/359--420--Absol--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Clefable.png b/src/canonical/minisprites/gen6/pokemon/36--0--Clefable.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Clefable.png rename to src/canonical/minisprites/gen6/pokemon/36--0--Clefable.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wynaut.png b/src/canonical/minisprites/gen6/pokemon/360--0--Wynaut.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wynaut.png rename to src/canonical/minisprites/gen6/pokemon/360--0--Wynaut.png diff --git a/src/canonical/minisprites/gen6/pokemon/Snorunt.png b/src/canonical/minisprites/gen6/pokemon/361--0--Snorunt.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Snorunt.png rename to src/canonical/minisprites/gen6/pokemon/361--0--Snorunt.png diff --git a/src/canonical/minisprites/gen6/pokemon/Glalie.png b/src/canonical/minisprites/gen6/pokemon/362--0--Glalie.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Glalie.png rename to src/canonical/minisprites/gen6/pokemon/362--0--Glalie.png diff --git a/src/canonical/minisprites/gen6/pokemon/Glalie--Mega.png b/src/canonical/minisprites/gen6/pokemon/362--420--Glalie--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Glalie--Mega.png rename to src/canonical/minisprites/gen6/pokemon/362--420--Glalie--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Spheal.png b/src/canonical/minisprites/gen6/pokemon/363--0--Spheal.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Spheal.png rename to src/canonical/minisprites/gen6/pokemon/363--0--Spheal.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sealeo.png b/src/canonical/minisprites/gen6/pokemon/364--0--Sealeo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sealeo.png rename to src/canonical/minisprites/gen6/pokemon/364--0--Sealeo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Walrein.png b/src/canonical/minisprites/gen6/pokemon/365--0--Walrein.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Walrein.png rename to src/canonical/minisprites/gen6/pokemon/365--0--Walrein.png diff --git a/src/canonical/minisprites/gen6/pokemon/Clamperl.png b/src/canonical/minisprites/gen6/pokemon/366--0--Clamperl.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Clamperl.png rename to src/canonical/minisprites/gen6/pokemon/366--0--Clamperl.png diff --git a/src/canonical/minisprites/gen6/pokemon/Huntail.png b/src/canonical/minisprites/gen6/pokemon/367--0--Huntail.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Huntail.png rename to src/canonical/minisprites/gen6/pokemon/367--0--Huntail.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gorebyss.png b/src/canonical/minisprites/gen6/pokemon/368--0--Gorebyss.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gorebyss.png rename to src/canonical/minisprites/gen6/pokemon/368--0--Gorebyss.png diff --git a/src/canonical/minisprites/gen6/pokemon/Relicanth.png b/src/canonical/minisprites/gen6/pokemon/369--0--Relicanth.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Relicanth.png rename to src/canonical/minisprites/gen6/pokemon/369--0--Relicanth.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vulpix.png b/src/canonical/minisprites/gen6/pokemon/37--0--Vulpix.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vulpix.png rename to src/canonical/minisprites/gen6/pokemon/37--0--Vulpix.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vulpix--Alola.png b/src/canonical/minisprites/gen6/pokemon/37--420--Vulpix--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vulpix--Alola.png rename to src/canonical/minisprites/gen6/pokemon/37--420--Vulpix--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Luvdisc.png b/src/canonical/minisprites/gen6/pokemon/370--0--Luvdisc.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Luvdisc.png rename to src/canonical/minisprites/gen6/pokemon/370--0--Luvdisc.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bagon.png b/src/canonical/minisprites/gen6/pokemon/371--0--Bagon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bagon.png rename to src/canonical/minisprites/gen6/pokemon/371--0--Bagon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shelgon.png b/src/canonical/minisprites/gen6/pokemon/372--0--Shelgon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shelgon.png rename to src/canonical/minisprites/gen6/pokemon/372--0--Shelgon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Salamence.png b/src/canonical/minisprites/gen6/pokemon/373--0--Salamence.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Salamence.png rename to src/canonical/minisprites/gen6/pokemon/373--0--Salamence.png diff --git a/src/canonical/minisprites/gen6/pokemon/Salamence--Mega.png b/src/canonical/minisprites/gen6/pokemon/373--420--Salamence--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Salamence--Mega.png rename to src/canonical/minisprites/gen6/pokemon/373--420--Salamence--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Beldum.png b/src/canonical/minisprites/gen6/pokemon/374--0--Beldum.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Beldum.png rename to src/canonical/minisprites/gen6/pokemon/374--0--Beldum.png diff --git a/src/canonical/minisprites/gen6/pokemon/Metang.png b/src/canonical/minisprites/gen6/pokemon/375--0--Metang.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Metang.png rename to src/canonical/minisprites/gen6/pokemon/375--0--Metang.png diff --git a/src/canonical/minisprites/gen6/pokemon/Metagross.png b/src/canonical/minisprites/gen6/pokemon/376--0--Metagross.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Metagross.png rename to src/canonical/minisprites/gen6/pokemon/376--0--Metagross.png diff --git a/src/canonical/minisprites/gen6/pokemon/Metagross--Mega.png b/src/canonical/minisprites/gen6/pokemon/376--420--Metagross--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Metagross--Mega.png rename to src/canonical/minisprites/gen6/pokemon/376--420--Metagross--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Regirock.png b/src/canonical/minisprites/gen6/pokemon/377--0--Regirock.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Regirock.png rename to src/canonical/minisprites/gen6/pokemon/377--0--Regirock.png diff --git a/src/canonical/minisprites/gen6/pokemon/Regice.png b/src/canonical/minisprites/gen6/pokemon/378--0--Regice.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Regice.png rename to src/canonical/minisprites/gen6/pokemon/378--0--Regice.png diff --git a/src/canonical/minisprites/gen6/pokemon/Registeel.png b/src/canonical/minisprites/gen6/pokemon/379--0--Registeel.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Registeel.png rename to src/canonical/minisprites/gen6/pokemon/379--0--Registeel.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ninetales.png b/src/canonical/minisprites/gen6/pokemon/38--0--Ninetales.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ninetales.png rename to src/canonical/minisprites/gen6/pokemon/38--0--Ninetales.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ninetales--Alola.png b/src/canonical/minisprites/gen6/pokemon/38--420--Ninetales--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ninetales--Alola.png rename to src/canonical/minisprites/gen6/pokemon/38--420--Ninetales--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Latias.png b/src/canonical/minisprites/gen6/pokemon/380--0--Latias.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Latias.png rename to src/canonical/minisprites/gen6/pokemon/380--0--Latias.png diff --git a/src/canonical/minisprites/gen6/pokemon/Latias--Mega.png b/src/canonical/minisprites/gen6/pokemon/380--420--Latias--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Latias--Mega.png rename to src/canonical/minisprites/gen6/pokemon/380--420--Latias--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Latios.png b/src/canonical/minisprites/gen6/pokemon/381--0--Latios.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Latios.png rename to src/canonical/minisprites/gen6/pokemon/381--0--Latios.png diff --git a/src/canonical/minisprites/gen6/pokemon/Latios--Mega.png b/src/canonical/minisprites/gen6/pokemon/381--420--Latios--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Latios--Mega.png rename to src/canonical/minisprites/gen6/pokemon/381--420--Latios--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kyogre.png b/src/canonical/minisprites/gen6/pokemon/382--0--Kyogre.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kyogre.png rename to src/canonical/minisprites/gen6/pokemon/382--0--Kyogre.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kyogre--Primal.png b/src/canonical/minisprites/gen6/pokemon/382--420--Kyogre--Primal.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kyogre--Primal.png rename to src/canonical/minisprites/gen6/pokemon/382--420--Kyogre--Primal.png diff --git a/src/canonical/minisprites/gen6/pokemon/Groudon.png b/src/canonical/minisprites/gen6/pokemon/383--0--Groudon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Groudon.png rename to src/canonical/minisprites/gen6/pokemon/383--0--Groudon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Groudon--Primal.png b/src/canonical/minisprites/gen6/pokemon/383--420--Groudon--Primal.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Groudon--Primal.png rename to src/canonical/minisprites/gen6/pokemon/383--420--Groudon--Primal.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rayquaza.png b/src/canonical/minisprites/gen6/pokemon/384--0--Rayquaza.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rayquaza.png rename to src/canonical/minisprites/gen6/pokemon/384--0--Rayquaza.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rayquaza--Mega.png b/src/canonical/minisprites/gen6/pokemon/384--420--Rayquaza--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rayquaza--Mega.png rename to src/canonical/minisprites/gen6/pokemon/384--420--Rayquaza--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Jirachi.png b/src/canonical/minisprites/gen6/pokemon/385--0--Jirachi.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Jirachi.png rename to src/canonical/minisprites/gen6/pokemon/385--0--Jirachi.png diff --git a/src/canonical/minisprites/gen6/pokemon/Deoxys.png b/src/canonical/minisprites/gen6/pokemon/386--0--Deoxys.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Deoxys.png rename to src/canonical/minisprites/gen6/pokemon/386--0--Deoxys.png diff --git a/src/canonical/minisprites/gen6/pokemon/Deoxys--Attack.png b/src/canonical/minisprites/gen6/pokemon/386--420--Deoxys--Attack.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Deoxys--Attack.png rename to src/canonical/minisprites/gen6/pokemon/386--420--Deoxys--Attack.png diff --git a/src/canonical/minisprites/gen6/pokemon/Deoxys--Defense.png b/src/canonical/minisprites/gen6/pokemon/386--420--Deoxys--Defense.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Deoxys--Defense.png rename to src/canonical/minisprites/gen6/pokemon/386--420--Deoxys--Defense.png diff --git a/src/canonical/minisprites/gen6/pokemon/Deoxys--Speed.png b/src/canonical/minisprites/gen6/pokemon/386--420--Deoxys--Speed.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Deoxys--Speed.png rename to src/canonical/minisprites/gen6/pokemon/386--420--Deoxys--Speed.png diff --git a/src/canonical/minisprites/gen6/pokemon/Turtwig.png b/src/canonical/minisprites/gen6/pokemon/387--0--Turtwig.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Turtwig.png rename to src/canonical/minisprites/gen6/pokemon/387--0--Turtwig.png diff --git a/src/canonical/minisprites/gen6/pokemon/Grotle.png b/src/canonical/minisprites/gen6/pokemon/388--0--Grotle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Grotle.png rename to src/canonical/minisprites/gen6/pokemon/388--0--Grotle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Torterra.png b/src/canonical/minisprites/gen6/pokemon/389--0--Torterra.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Torterra.png rename to src/canonical/minisprites/gen6/pokemon/389--0--Torterra.png diff --git a/src/canonical/minisprites/gen6/pokemon/Jigglypuff.png b/src/canonical/minisprites/gen6/pokemon/39--0--Jigglypuff.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Jigglypuff.png rename to src/canonical/minisprites/gen6/pokemon/39--0--Jigglypuff.png diff --git a/src/canonical/minisprites/gen6/pokemon/Chimchar.png b/src/canonical/minisprites/gen6/pokemon/390--0--Chimchar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Chimchar.png rename to src/canonical/minisprites/gen6/pokemon/390--0--Chimchar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Monferno.png b/src/canonical/minisprites/gen6/pokemon/391--0--Monferno.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Monferno.png rename to src/canonical/minisprites/gen6/pokemon/391--0--Monferno.png diff --git a/src/canonical/minisprites/gen6/pokemon/Infernape.png b/src/canonical/minisprites/gen6/pokemon/392--0--Infernape.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Infernape.png rename to src/canonical/minisprites/gen6/pokemon/392--0--Infernape.png diff --git a/src/canonical/minisprites/gen6/pokemon/Piplup.png b/src/canonical/minisprites/gen6/pokemon/393--0--Piplup.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Piplup.png rename to src/canonical/minisprites/gen6/pokemon/393--0--Piplup.png diff --git a/src/canonical/minisprites/gen6/pokemon/Prinplup.png b/src/canonical/minisprites/gen6/pokemon/394--0--Prinplup.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Prinplup.png rename to src/canonical/minisprites/gen6/pokemon/394--0--Prinplup.png diff --git a/src/canonical/minisprites/gen6/pokemon/Empoleon.png b/src/canonical/minisprites/gen6/pokemon/395--0--Empoleon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Empoleon.png rename to src/canonical/minisprites/gen6/pokemon/395--0--Empoleon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Starly.png b/src/canonical/minisprites/gen6/pokemon/396--0--Starly.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Starly.png rename to src/canonical/minisprites/gen6/pokemon/396--0--Starly.png diff --git a/src/canonical/minisprites/gen6/pokemon/Staravia.png b/src/canonical/minisprites/gen6/pokemon/397--0--Staravia.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Staravia.png rename to src/canonical/minisprites/gen6/pokemon/397--0--Staravia.png diff --git a/src/canonical/minisprites/gen6/pokemon/Staraptor.png b/src/canonical/minisprites/gen6/pokemon/398--0--Staraptor.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Staraptor.png rename to src/canonical/minisprites/gen6/pokemon/398--0--Staraptor.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bidoof.png b/src/canonical/minisprites/gen6/pokemon/399--0--Bidoof.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bidoof.png rename to src/canonical/minisprites/gen6/pokemon/399--0--Bidoof.png diff --git a/src/canonical/minisprites/gen6/pokemon/Charmander.png b/src/canonical/minisprites/gen6/pokemon/4--0--Charmander.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Charmander.png rename to src/canonical/minisprites/gen6/pokemon/4--0--Charmander.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wigglytuff.png b/src/canonical/minisprites/gen6/pokemon/40--0--Wigglytuff.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wigglytuff.png rename to src/canonical/minisprites/gen6/pokemon/40--0--Wigglytuff.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bibarel.png b/src/canonical/minisprites/gen6/pokemon/400--0--Bibarel.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bibarel.png rename to src/canonical/minisprites/gen6/pokemon/400--0--Bibarel.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kricketot.png b/src/canonical/minisprites/gen6/pokemon/401--0--Kricketot.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kricketot.png rename to src/canonical/minisprites/gen6/pokemon/401--0--Kricketot.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kricketune.png b/src/canonical/minisprites/gen6/pokemon/402--0--Kricketune.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kricketune.png rename to src/canonical/minisprites/gen6/pokemon/402--0--Kricketune.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shinx.png b/src/canonical/minisprites/gen6/pokemon/403--0--Shinx.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shinx.png rename to src/canonical/minisprites/gen6/pokemon/403--0--Shinx.png diff --git a/src/canonical/minisprites/gen6/pokemon/Luxio.png b/src/canonical/minisprites/gen6/pokemon/404--0--Luxio.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Luxio.png rename to src/canonical/minisprites/gen6/pokemon/404--0--Luxio.png diff --git a/src/canonical/minisprites/gen6/pokemon/Luxray.png b/src/canonical/minisprites/gen6/pokemon/405--0--Luxray.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Luxray.png rename to src/canonical/minisprites/gen6/pokemon/405--0--Luxray.png diff --git a/src/canonical/minisprites/gen6/pokemon/Budew.png b/src/canonical/minisprites/gen6/pokemon/406--0--Budew.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Budew.png rename to src/canonical/minisprites/gen6/pokemon/406--0--Budew.png diff --git a/src/canonical/minisprites/gen6/pokemon/Roserade.png b/src/canonical/minisprites/gen6/pokemon/407--0--Roserade.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Roserade.png rename to src/canonical/minisprites/gen6/pokemon/407--0--Roserade.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cranidos.png b/src/canonical/minisprites/gen6/pokemon/408--0--Cranidos.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cranidos.png rename to src/canonical/minisprites/gen6/pokemon/408--0--Cranidos.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rampardos.png b/src/canonical/minisprites/gen6/pokemon/409--0--Rampardos.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rampardos.png rename to src/canonical/minisprites/gen6/pokemon/409--0--Rampardos.png diff --git a/src/canonical/minisprites/gen6/pokemon/Zubat.png b/src/canonical/minisprites/gen6/pokemon/41--0--Zubat.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Zubat.png rename to src/canonical/minisprites/gen6/pokemon/41--0--Zubat.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shieldon.png b/src/canonical/minisprites/gen6/pokemon/410--0--Shieldon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shieldon.png rename to src/canonical/minisprites/gen6/pokemon/410--0--Shieldon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bastiodon.png b/src/canonical/minisprites/gen6/pokemon/411--0--Bastiodon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bastiodon.png rename to src/canonical/minisprites/gen6/pokemon/411--0--Bastiodon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Burmy.png b/src/canonical/minisprites/gen6/pokemon/412--0--Burmy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Burmy.png rename to src/canonical/minisprites/gen6/pokemon/412--0--Burmy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Burmy--Sandy.png b/src/canonical/minisprites/gen6/pokemon/412--420--Burmy--Sandy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Burmy--Sandy.png rename to src/canonical/minisprites/gen6/pokemon/412--420--Burmy--Sandy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Burmy--Trash.png b/src/canonical/minisprites/gen6/pokemon/412--420--Burmy--Trash.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Burmy--Trash.png rename to src/canonical/minisprites/gen6/pokemon/412--420--Burmy--Trash.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wormadam.png b/src/canonical/minisprites/gen6/pokemon/413--0--Wormadam.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wormadam.png rename to src/canonical/minisprites/gen6/pokemon/413--0--Wormadam.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wormadam--Sandy.png b/src/canonical/minisprites/gen6/pokemon/413--420--Wormadam--Sandy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wormadam--Sandy.png rename to src/canonical/minisprites/gen6/pokemon/413--420--Wormadam--Sandy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wormadam--Trash.png b/src/canonical/minisprites/gen6/pokemon/413--420--Wormadam--Trash.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wormadam--Trash.png rename to src/canonical/minisprites/gen6/pokemon/413--420--Wormadam--Trash.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mothim.png b/src/canonical/minisprites/gen6/pokemon/414--0--Mothim.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mothim.png rename to src/canonical/minisprites/gen6/pokemon/414--0--Mothim.png diff --git a/src/canonical/minisprites/gen6/pokemon/Combee.png b/src/canonical/minisprites/gen6/pokemon/415--0--Combee.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Combee.png rename to src/canonical/minisprites/gen6/pokemon/415--0--Combee.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vespiquen.png b/src/canonical/minisprites/gen6/pokemon/416--0--Vespiquen.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vespiquen.png rename to src/canonical/minisprites/gen6/pokemon/416--0--Vespiquen.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pachirisu.png b/src/canonical/minisprites/gen6/pokemon/417--0--Pachirisu.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pachirisu.png rename to src/canonical/minisprites/gen6/pokemon/417--0--Pachirisu.png diff --git a/src/canonical/minisprites/gen6/pokemon/Buizel.png b/src/canonical/minisprites/gen6/pokemon/418--0--Buizel.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Buizel.png rename to src/canonical/minisprites/gen6/pokemon/418--0--Buizel.png diff --git a/src/canonical/minisprites/gen6/pokemon/Floatzel.png b/src/canonical/minisprites/gen6/pokemon/419--0--Floatzel.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Floatzel.png rename to src/canonical/minisprites/gen6/pokemon/419--0--Floatzel.png diff --git a/src/canonical/minisprites/gen6/pokemon/Golbat.png b/src/canonical/minisprites/gen6/pokemon/42--0--Golbat.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Golbat.png rename to src/canonical/minisprites/gen6/pokemon/42--0--Golbat.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cherubi.png b/src/canonical/minisprites/gen6/pokemon/420--0--Cherubi.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cherubi.png rename to src/canonical/minisprites/gen6/pokemon/420--0--Cherubi.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cherrim.png b/src/canonical/minisprites/gen6/pokemon/421--0--Cherrim.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cherrim.png rename to src/canonical/minisprites/gen6/pokemon/421--0--Cherrim.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cherrim--Sunshine.png b/src/canonical/minisprites/gen6/pokemon/421--420--Cherrim--Sunshine.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cherrim--Sunshine.png rename to src/canonical/minisprites/gen6/pokemon/421--420--Cherrim--Sunshine.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shellos.png b/src/canonical/minisprites/gen6/pokemon/422--0--Shellos.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shellos.png rename to src/canonical/minisprites/gen6/pokemon/422--0--Shellos.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shellos--East.png b/src/canonical/minisprites/gen6/pokemon/422--420--Shellos--East.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shellos--East.png rename to src/canonical/minisprites/gen6/pokemon/422--420--Shellos--East.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gastrodon.png b/src/canonical/minisprites/gen6/pokemon/423--0--Gastrodon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gastrodon.png rename to src/canonical/minisprites/gen6/pokemon/423--0--Gastrodon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gastrodon--East.png b/src/canonical/minisprites/gen6/pokemon/423--420--Gastrodon--East.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gastrodon--East.png rename to src/canonical/minisprites/gen6/pokemon/423--420--Gastrodon--East.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ambipom.png b/src/canonical/minisprites/gen6/pokemon/424--0--Ambipom.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ambipom.png rename to src/canonical/minisprites/gen6/pokemon/424--0--Ambipom.png diff --git a/src/canonical/minisprites/gen6/pokemon/Drifloon.png b/src/canonical/minisprites/gen6/pokemon/425--0--Drifloon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Drifloon.png rename to src/canonical/minisprites/gen6/pokemon/425--0--Drifloon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Drifblim.png b/src/canonical/minisprites/gen6/pokemon/426--0--Drifblim.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Drifblim.png rename to src/canonical/minisprites/gen6/pokemon/426--0--Drifblim.png diff --git a/src/canonical/minisprites/gen6/pokemon/Buneary.png b/src/canonical/minisprites/gen6/pokemon/427--0--Buneary.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Buneary.png rename to src/canonical/minisprites/gen6/pokemon/427--0--Buneary.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lopunny.png b/src/canonical/minisprites/gen6/pokemon/428--0--Lopunny.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lopunny.png rename to src/canonical/minisprites/gen6/pokemon/428--0--Lopunny.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lopunny--Mega.png b/src/canonical/minisprites/gen6/pokemon/428--420--Lopunny--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lopunny--Mega.png rename to src/canonical/minisprites/gen6/pokemon/428--420--Lopunny--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mismagius.png b/src/canonical/minisprites/gen6/pokemon/429--0--Mismagius.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mismagius.png rename to src/canonical/minisprites/gen6/pokemon/429--0--Mismagius.png diff --git a/src/canonical/minisprites/gen6/pokemon/Oddish.png b/src/canonical/minisprites/gen6/pokemon/43--0--Oddish.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Oddish.png rename to src/canonical/minisprites/gen6/pokemon/43--0--Oddish.png diff --git a/src/canonical/minisprites/gen6/pokemon/Honchkrow.png b/src/canonical/minisprites/gen6/pokemon/430--0--Honchkrow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Honchkrow.png rename to src/canonical/minisprites/gen6/pokemon/430--0--Honchkrow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Glameow.png b/src/canonical/minisprites/gen6/pokemon/431--0--Glameow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Glameow.png rename to src/canonical/minisprites/gen6/pokemon/431--0--Glameow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Purugly.png b/src/canonical/minisprites/gen6/pokemon/432--0--Purugly.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Purugly.png rename to src/canonical/minisprites/gen6/pokemon/432--0--Purugly.png diff --git a/src/canonical/minisprites/gen6/pokemon/Chingling.png b/src/canonical/minisprites/gen6/pokemon/433--0--Chingling.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Chingling.png rename to src/canonical/minisprites/gen6/pokemon/433--0--Chingling.png diff --git a/src/canonical/minisprites/gen6/pokemon/Stunky.png b/src/canonical/minisprites/gen6/pokemon/434--0--Stunky.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Stunky.png rename to src/canonical/minisprites/gen6/pokemon/434--0--Stunky.png diff --git a/src/canonical/minisprites/gen6/pokemon/Skuntank.png b/src/canonical/minisprites/gen6/pokemon/435--0--Skuntank.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Skuntank.png rename to src/canonical/minisprites/gen6/pokemon/435--0--Skuntank.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bronzor.png b/src/canonical/minisprites/gen6/pokemon/436--0--Bronzor.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bronzor.png rename to src/canonical/minisprites/gen6/pokemon/436--0--Bronzor.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bronzong.png b/src/canonical/minisprites/gen6/pokemon/437--0--Bronzong.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bronzong.png rename to src/canonical/minisprites/gen6/pokemon/437--0--Bronzong.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bonsly.png b/src/canonical/minisprites/gen6/pokemon/438--0--Bonsly.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bonsly.png rename to src/canonical/minisprites/gen6/pokemon/438--0--Bonsly.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mime_Jr..png b/src/canonical/minisprites/gen6/pokemon/439--0--Mime_Jr..png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mime_Jr..png rename to src/canonical/minisprites/gen6/pokemon/439--0--Mime_Jr..png diff --git a/src/canonical/minisprites/gen6/pokemon/Gloom.png b/src/canonical/minisprites/gen6/pokemon/44--0--Gloom.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gloom.png rename to src/canonical/minisprites/gen6/pokemon/44--0--Gloom.png diff --git a/src/canonical/minisprites/gen6/pokemon/Happiny.png b/src/canonical/minisprites/gen6/pokemon/440--0--Happiny.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Happiny.png rename to src/canonical/minisprites/gen6/pokemon/440--0--Happiny.png diff --git a/src/canonical/minisprites/gen6/pokemon/Chatot.png b/src/canonical/minisprites/gen6/pokemon/441--0--Chatot.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Chatot.png rename to src/canonical/minisprites/gen6/pokemon/441--0--Chatot.png diff --git a/src/canonical/minisprites/gen6/pokemon/Spiritomb.png b/src/canonical/minisprites/gen6/pokemon/442--0--Spiritomb.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Spiritomb.png rename to src/canonical/minisprites/gen6/pokemon/442--0--Spiritomb.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gible.png b/src/canonical/minisprites/gen6/pokemon/443--0--Gible.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gible.png rename to src/canonical/minisprites/gen6/pokemon/443--0--Gible.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gabite.png b/src/canonical/minisprites/gen6/pokemon/444--0--Gabite.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gabite.png rename to src/canonical/minisprites/gen6/pokemon/444--0--Gabite.png diff --git a/src/canonical/minisprites/gen6/pokemon/Garchomp.png b/src/canonical/minisprites/gen6/pokemon/445--0--Garchomp.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Garchomp.png rename to src/canonical/minisprites/gen6/pokemon/445--0--Garchomp.png diff --git a/src/canonical/minisprites/gen6/pokemon/Garchomp--Mega.png b/src/canonical/minisprites/gen6/pokemon/445--420--Garchomp--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Garchomp--Mega.png rename to src/canonical/minisprites/gen6/pokemon/445--420--Garchomp--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Munchlax.png b/src/canonical/minisprites/gen6/pokemon/446--0--Munchlax.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Munchlax.png rename to src/canonical/minisprites/gen6/pokemon/446--0--Munchlax.png diff --git a/src/canonical/minisprites/gen6/pokemon/Riolu.png b/src/canonical/minisprites/gen6/pokemon/447--0--Riolu.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Riolu.png rename to src/canonical/minisprites/gen6/pokemon/447--0--Riolu.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lucario.png b/src/canonical/minisprites/gen6/pokemon/448--0--Lucario.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lucario.png rename to src/canonical/minisprites/gen6/pokemon/448--0--Lucario.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lucario--Mega.png b/src/canonical/minisprites/gen6/pokemon/448--420--Lucario--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lucario--Mega.png rename to src/canonical/minisprites/gen6/pokemon/448--420--Lucario--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Hippopotas.png b/src/canonical/minisprites/gen6/pokemon/449--0--Hippopotas.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Hippopotas.png rename to src/canonical/minisprites/gen6/pokemon/449--0--Hippopotas.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vileplume.png b/src/canonical/minisprites/gen6/pokemon/45--0--Vileplume.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vileplume.png rename to src/canonical/minisprites/gen6/pokemon/45--0--Vileplume.png diff --git a/src/canonical/minisprites/gen6/pokemon/Hippowdon.png b/src/canonical/minisprites/gen6/pokemon/450--0--Hippowdon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Hippowdon.png rename to src/canonical/minisprites/gen6/pokemon/450--0--Hippowdon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Skorupi.png b/src/canonical/minisprites/gen6/pokemon/451--0--Skorupi.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Skorupi.png rename to src/canonical/minisprites/gen6/pokemon/451--0--Skorupi.png diff --git a/src/canonical/minisprites/gen6/pokemon/Drapion.png b/src/canonical/minisprites/gen6/pokemon/452--0--Drapion.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Drapion.png rename to src/canonical/minisprites/gen6/pokemon/452--0--Drapion.png diff --git a/src/canonical/minisprites/gen6/pokemon/Croagunk.png b/src/canonical/minisprites/gen6/pokemon/453--0--Croagunk.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Croagunk.png rename to src/canonical/minisprites/gen6/pokemon/453--0--Croagunk.png diff --git a/src/canonical/minisprites/gen6/pokemon/Toxicroak.png b/src/canonical/minisprites/gen6/pokemon/454--0--Toxicroak.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Toxicroak.png rename to src/canonical/minisprites/gen6/pokemon/454--0--Toxicroak.png diff --git a/src/canonical/minisprites/gen6/pokemon/Carnivine.png b/src/canonical/minisprites/gen6/pokemon/455--0--Carnivine.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Carnivine.png rename to src/canonical/minisprites/gen6/pokemon/455--0--Carnivine.png diff --git a/src/canonical/minisprites/gen6/pokemon/Finneon.png b/src/canonical/minisprites/gen6/pokemon/456--0--Finneon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Finneon.png rename to src/canonical/minisprites/gen6/pokemon/456--0--Finneon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lumineon.png b/src/canonical/minisprites/gen6/pokemon/457--0--Lumineon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lumineon.png rename to src/canonical/minisprites/gen6/pokemon/457--0--Lumineon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mantyke.png b/src/canonical/minisprites/gen6/pokemon/458--0--Mantyke.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mantyke.png rename to src/canonical/minisprites/gen6/pokemon/458--0--Mantyke.png diff --git a/src/canonical/minisprites/gen6/pokemon/Snover.png b/src/canonical/minisprites/gen6/pokemon/459--0--Snover.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Snover.png rename to src/canonical/minisprites/gen6/pokemon/459--0--Snover.png diff --git a/src/canonical/minisprites/gen6/pokemon/Paras.png b/src/canonical/minisprites/gen6/pokemon/46--0--Paras.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Paras.png rename to src/canonical/minisprites/gen6/pokemon/46--0--Paras.png diff --git a/src/canonical/minisprites/gen6/pokemon/Abomasnow.png b/src/canonical/minisprites/gen6/pokemon/460--0--Abomasnow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Abomasnow.png rename to src/canonical/minisprites/gen6/pokemon/460--0--Abomasnow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Abomasnow--Mega.png b/src/canonical/minisprites/gen6/pokemon/460--420--Abomasnow--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Abomasnow--Mega.png rename to src/canonical/minisprites/gen6/pokemon/460--420--Abomasnow--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Weavile.png b/src/canonical/minisprites/gen6/pokemon/461--0--Weavile.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Weavile.png rename to src/canonical/minisprites/gen6/pokemon/461--0--Weavile.png diff --git a/src/canonical/minisprites/gen6/pokemon/Magnezone.png b/src/canonical/minisprites/gen6/pokemon/462--0--Magnezone.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Magnezone.png rename to src/canonical/minisprites/gen6/pokemon/462--0--Magnezone.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lickilicky.png b/src/canonical/minisprites/gen6/pokemon/463--0--Lickilicky.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lickilicky.png rename to src/canonical/minisprites/gen6/pokemon/463--0--Lickilicky.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rhyperior.png b/src/canonical/minisprites/gen6/pokemon/464--0--Rhyperior.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rhyperior.png rename to src/canonical/minisprites/gen6/pokemon/464--0--Rhyperior.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tangrowth.png b/src/canonical/minisprites/gen6/pokemon/465--0--Tangrowth.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tangrowth.png rename to src/canonical/minisprites/gen6/pokemon/465--0--Tangrowth.png diff --git a/src/canonical/minisprites/gen6/pokemon/Electivire.png b/src/canonical/minisprites/gen6/pokemon/466--0--Electivire.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Electivire.png rename to src/canonical/minisprites/gen6/pokemon/466--0--Electivire.png diff --git a/src/canonical/minisprites/gen6/pokemon/Magmortar.png b/src/canonical/minisprites/gen6/pokemon/467--0--Magmortar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Magmortar.png rename to src/canonical/minisprites/gen6/pokemon/467--0--Magmortar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Togekiss.png b/src/canonical/minisprites/gen6/pokemon/468--0--Togekiss.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Togekiss.png rename to src/canonical/minisprites/gen6/pokemon/468--0--Togekiss.png diff --git a/src/canonical/minisprites/gen6/pokemon/Yanmega.png b/src/canonical/minisprites/gen6/pokemon/469--0--Yanmega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Yanmega.png rename to src/canonical/minisprites/gen6/pokemon/469--0--Yanmega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Parasect.png b/src/canonical/minisprites/gen6/pokemon/47--0--Parasect.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Parasect.png rename to src/canonical/minisprites/gen6/pokemon/47--0--Parasect.png diff --git a/src/canonical/minisprites/gen6/pokemon/Leafeon.png b/src/canonical/minisprites/gen6/pokemon/470--0--Leafeon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Leafeon.png rename to src/canonical/minisprites/gen6/pokemon/470--0--Leafeon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Glaceon.png b/src/canonical/minisprites/gen6/pokemon/471--0--Glaceon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Glaceon.png rename to src/canonical/minisprites/gen6/pokemon/471--0--Glaceon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gliscor.png b/src/canonical/minisprites/gen6/pokemon/472--0--Gliscor.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gliscor.png rename to src/canonical/minisprites/gen6/pokemon/472--0--Gliscor.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mamoswine.png b/src/canonical/minisprites/gen6/pokemon/473--0--Mamoswine.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mamoswine.png rename to src/canonical/minisprites/gen6/pokemon/473--0--Mamoswine.png diff --git a/src/canonical/minisprites/gen6/pokemon/Porygon-Z.png b/src/canonical/minisprites/gen6/pokemon/474--0--Porygon-Z.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Porygon-Z.png rename to src/canonical/minisprites/gen6/pokemon/474--0--Porygon-Z.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gallade.png b/src/canonical/minisprites/gen6/pokemon/475--0--Gallade.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gallade.png rename to src/canonical/minisprites/gen6/pokemon/475--0--Gallade.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gallade--Mega.png b/src/canonical/minisprites/gen6/pokemon/475--420--Gallade--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gallade--Mega.png rename to src/canonical/minisprites/gen6/pokemon/475--420--Gallade--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Probopass.png b/src/canonical/minisprites/gen6/pokemon/476--0--Probopass.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Probopass.png rename to src/canonical/minisprites/gen6/pokemon/476--0--Probopass.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dusknoir.png b/src/canonical/minisprites/gen6/pokemon/477--0--Dusknoir.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dusknoir.png rename to src/canonical/minisprites/gen6/pokemon/477--0--Dusknoir.png diff --git a/src/canonical/minisprites/gen6/pokemon/Froslass.png b/src/canonical/minisprites/gen6/pokemon/478--0--Froslass.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Froslass.png rename to src/canonical/minisprites/gen6/pokemon/478--0--Froslass.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rotom.png b/src/canonical/minisprites/gen6/pokemon/479--0--Rotom.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rotom.png rename to src/canonical/minisprites/gen6/pokemon/479--0--Rotom.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rotom--Fan.png b/src/canonical/minisprites/gen6/pokemon/479--420--Rotom--Fan.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rotom--Fan.png rename to src/canonical/minisprites/gen6/pokemon/479--420--Rotom--Fan.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rotom--Frost.png b/src/canonical/minisprites/gen6/pokemon/479--420--Rotom--Frost.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rotom--Frost.png rename to src/canonical/minisprites/gen6/pokemon/479--420--Rotom--Frost.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rotom--Heat.png b/src/canonical/minisprites/gen6/pokemon/479--420--Rotom--Heat.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rotom--Heat.png rename to src/canonical/minisprites/gen6/pokemon/479--420--Rotom--Heat.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rotom--Mow.png b/src/canonical/minisprites/gen6/pokemon/479--420--Rotom--Mow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rotom--Mow.png rename to src/canonical/minisprites/gen6/pokemon/479--420--Rotom--Mow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rotom--Wash.png b/src/canonical/minisprites/gen6/pokemon/479--420--Rotom--Wash.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rotom--Wash.png rename to src/canonical/minisprites/gen6/pokemon/479--420--Rotom--Wash.png diff --git a/src/canonical/minisprites/gen6/pokemon/Venonat.png b/src/canonical/minisprites/gen6/pokemon/48--0--Venonat.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Venonat.png rename to src/canonical/minisprites/gen6/pokemon/48--0--Venonat.png diff --git a/src/canonical/minisprites/gen6/pokemon/Uxie.png b/src/canonical/minisprites/gen6/pokemon/480--0--Uxie.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Uxie.png rename to src/canonical/minisprites/gen6/pokemon/480--0--Uxie.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mesprit.png b/src/canonical/minisprites/gen6/pokemon/481--0--Mesprit.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mesprit.png rename to src/canonical/minisprites/gen6/pokemon/481--0--Mesprit.png diff --git a/src/canonical/minisprites/gen6/pokemon/Azelf.png b/src/canonical/minisprites/gen6/pokemon/482--0--Azelf.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Azelf.png rename to src/canonical/minisprites/gen6/pokemon/482--0--Azelf.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dialga.png b/src/canonical/minisprites/gen6/pokemon/483--0--Dialga.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dialga.png rename to src/canonical/minisprites/gen6/pokemon/483--0--Dialga.png diff --git a/src/canonical/minisprites/gen6/pokemon/Palkia.png b/src/canonical/minisprites/gen6/pokemon/484--0--Palkia.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Palkia.png rename to src/canonical/minisprites/gen6/pokemon/484--0--Palkia.png diff --git a/src/canonical/minisprites/gen6/pokemon/Heatran.png b/src/canonical/minisprites/gen6/pokemon/485--0--Heatran.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Heatran.png rename to src/canonical/minisprites/gen6/pokemon/485--0--Heatran.png diff --git a/src/canonical/minisprites/gen6/pokemon/Regigigas.png b/src/canonical/minisprites/gen6/pokemon/486--0--Regigigas.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Regigigas.png rename to src/canonical/minisprites/gen6/pokemon/486--0--Regigigas.png diff --git a/src/canonical/minisprites/gen6/pokemon/Giratina.png b/src/canonical/minisprites/gen6/pokemon/487--0--Giratina.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Giratina.png rename to src/canonical/minisprites/gen6/pokemon/487--0--Giratina.png diff --git a/src/canonical/minisprites/gen6/pokemon/Giratina--Origin.png b/src/canonical/minisprites/gen6/pokemon/487--420--Giratina--Origin.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Giratina--Origin.png rename to src/canonical/minisprites/gen6/pokemon/487--420--Giratina--Origin.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cresselia.png b/src/canonical/minisprites/gen6/pokemon/488--0--Cresselia.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cresselia.png rename to src/canonical/minisprites/gen6/pokemon/488--0--Cresselia.png diff --git a/src/canonical/minisprites/gen6/pokemon/Phione.png b/src/canonical/minisprites/gen6/pokemon/489--0--Phione.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Phione.png rename to src/canonical/minisprites/gen6/pokemon/489--0--Phione.png diff --git a/src/canonical/minisprites/gen6/pokemon/Venomoth.png b/src/canonical/minisprites/gen6/pokemon/49--0--Venomoth.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Venomoth.png rename to src/canonical/minisprites/gen6/pokemon/49--0--Venomoth.png diff --git a/src/canonical/minisprites/gen6/pokemon/Manaphy.png b/src/canonical/minisprites/gen6/pokemon/490--0--Manaphy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Manaphy.png rename to src/canonical/minisprites/gen6/pokemon/490--0--Manaphy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Darkrai.png b/src/canonical/minisprites/gen6/pokemon/491--0--Darkrai.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Darkrai.png rename to src/canonical/minisprites/gen6/pokemon/491--0--Darkrai.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shaymin.png b/src/canonical/minisprites/gen6/pokemon/492--0--Shaymin.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shaymin.png rename to src/canonical/minisprites/gen6/pokemon/492--0--Shaymin.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shaymin--Sky.png b/src/canonical/minisprites/gen6/pokemon/492--420--Shaymin--Sky.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shaymin--Sky.png rename to src/canonical/minisprites/gen6/pokemon/492--420--Shaymin--Sky.png diff --git a/src/canonical/minisprites/gen6/pokemon/Arceus.png b/src/canonical/minisprites/gen6/pokemon/493--0--Arceus.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Arceus.png rename to src/canonical/minisprites/gen6/pokemon/493--0--Arceus.png diff --git a/src/canonical/minisprites/gen6/pokemon/Victini.png b/src/canonical/minisprites/gen6/pokemon/494--0--Victini.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Victini.png rename to src/canonical/minisprites/gen6/pokemon/494--0--Victini.png diff --git a/src/canonical/minisprites/gen6/pokemon/Snivy.png b/src/canonical/minisprites/gen6/pokemon/495--0--Snivy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Snivy.png rename to src/canonical/minisprites/gen6/pokemon/495--0--Snivy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Servine.png b/src/canonical/minisprites/gen6/pokemon/496--0--Servine.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Servine.png rename to src/canonical/minisprites/gen6/pokemon/496--0--Servine.png diff --git a/src/canonical/minisprites/gen6/pokemon/Serperior.png b/src/canonical/minisprites/gen6/pokemon/497--0--Serperior.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Serperior.png rename to src/canonical/minisprites/gen6/pokemon/497--0--Serperior.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tepig.png b/src/canonical/minisprites/gen6/pokemon/498--0--Tepig.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tepig.png rename to src/canonical/minisprites/gen6/pokemon/498--0--Tepig.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pignite.png b/src/canonical/minisprites/gen6/pokemon/499--0--Pignite.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pignite.png rename to src/canonical/minisprites/gen6/pokemon/499--0--Pignite.png diff --git a/src/canonical/minisprites/gen6/pokemon/Charmeleon.png b/src/canonical/minisprites/gen6/pokemon/5--0--Charmeleon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Charmeleon.png rename to src/canonical/minisprites/gen6/pokemon/5--0--Charmeleon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Diglett.png b/src/canonical/minisprites/gen6/pokemon/50--0--Diglett.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Diglett.png rename to src/canonical/minisprites/gen6/pokemon/50--0--Diglett.png diff --git a/src/canonical/minisprites/gen6/pokemon/Diglett--Alola.png b/src/canonical/minisprites/gen6/pokemon/50--420--Diglett--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Diglett--Alola.png rename to src/canonical/minisprites/gen6/pokemon/50--420--Diglett--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Emboar.png b/src/canonical/minisprites/gen6/pokemon/500--0--Emboar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Emboar.png rename to src/canonical/minisprites/gen6/pokemon/500--0--Emboar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Oshawott.png b/src/canonical/minisprites/gen6/pokemon/501--0--Oshawott.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Oshawott.png rename to src/canonical/minisprites/gen6/pokemon/501--0--Oshawott.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dewott.png b/src/canonical/minisprites/gen6/pokemon/502--0--Dewott.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dewott.png rename to src/canonical/minisprites/gen6/pokemon/502--0--Dewott.png diff --git a/src/canonical/minisprites/gen6/pokemon/Samurott.png b/src/canonical/minisprites/gen6/pokemon/503--0--Samurott.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Samurott.png rename to src/canonical/minisprites/gen6/pokemon/503--0--Samurott.png diff --git a/src/canonical/minisprites/gen6/pokemon/Patrat.png b/src/canonical/minisprites/gen6/pokemon/504--0--Patrat.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Patrat.png rename to src/canonical/minisprites/gen6/pokemon/504--0--Patrat.png diff --git a/src/canonical/minisprites/gen6/pokemon/Watchog.png b/src/canonical/minisprites/gen6/pokemon/505--0--Watchog.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Watchog.png rename to src/canonical/minisprites/gen6/pokemon/505--0--Watchog.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lillipup.png b/src/canonical/minisprites/gen6/pokemon/506--0--Lillipup.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lillipup.png rename to src/canonical/minisprites/gen6/pokemon/506--0--Lillipup.png diff --git a/src/canonical/minisprites/gen6/pokemon/Herdier.png b/src/canonical/minisprites/gen6/pokemon/507--0--Herdier.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Herdier.png rename to src/canonical/minisprites/gen6/pokemon/507--0--Herdier.png diff --git a/src/canonical/minisprites/gen6/pokemon/Stoutland.png b/src/canonical/minisprites/gen6/pokemon/508--0--Stoutland.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Stoutland.png rename to src/canonical/minisprites/gen6/pokemon/508--0--Stoutland.png diff --git a/src/canonical/minisprites/gen6/pokemon/Purrloin.png b/src/canonical/minisprites/gen6/pokemon/509--0--Purrloin.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Purrloin.png rename to src/canonical/minisprites/gen6/pokemon/509--0--Purrloin.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dugtrio.png b/src/canonical/minisprites/gen6/pokemon/51--0--Dugtrio.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dugtrio.png rename to src/canonical/minisprites/gen6/pokemon/51--0--Dugtrio.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dugtrio--Alola.png b/src/canonical/minisprites/gen6/pokemon/51--420--Dugtrio--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dugtrio--Alola.png rename to src/canonical/minisprites/gen6/pokemon/51--420--Dugtrio--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Liepard.png b/src/canonical/minisprites/gen6/pokemon/510--0--Liepard.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Liepard.png rename to src/canonical/minisprites/gen6/pokemon/510--0--Liepard.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pansage.png b/src/canonical/minisprites/gen6/pokemon/511--0--Pansage.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pansage.png rename to src/canonical/minisprites/gen6/pokemon/511--0--Pansage.png diff --git a/src/canonical/minisprites/gen6/pokemon/Simisage.png b/src/canonical/minisprites/gen6/pokemon/512--0--Simisage.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Simisage.png rename to src/canonical/minisprites/gen6/pokemon/512--0--Simisage.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pansear.png b/src/canonical/minisprites/gen6/pokemon/513--0--Pansear.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pansear.png rename to src/canonical/minisprites/gen6/pokemon/513--0--Pansear.png diff --git a/src/canonical/minisprites/gen6/pokemon/Simisear.png b/src/canonical/minisprites/gen6/pokemon/514--0--Simisear.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Simisear.png rename to src/canonical/minisprites/gen6/pokemon/514--0--Simisear.png diff --git a/src/canonical/minisprites/gen6/pokemon/Panpour.png b/src/canonical/minisprites/gen6/pokemon/515--0--Panpour.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Panpour.png rename to src/canonical/minisprites/gen6/pokemon/515--0--Panpour.png diff --git a/src/canonical/minisprites/gen6/pokemon/Simipour.png b/src/canonical/minisprites/gen6/pokemon/516--0--Simipour.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Simipour.png rename to src/canonical/minisprites/gen6/pokemon/516--0--Simipour.png diff --git a/src/canonical/minisprites/gen6/pokemon/Munna.png b/src/canonical/minisprites/gen6/pokemon/517--0--Munna.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Munna.png rename to src/canonical/minisprites/gen6/pokemon/517--0--Munna.png diff --git a/src/canonical/minisprites/gen6/pokemon/Musharna.png b/src/canonical/minisprites/gen6/pokemon/518--0--Musharna.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Musharna.png rename to src/canonical/minisprites/gen6/pokemon/518--0--Musharna.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pidove.png b/src/canonical/minisprites/gen6/pokemon/519--0--Pidove.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pidove.png rename to src/canonical/minisprites/gen6/pokemon/519--0--Pidove.png diff --git a/src/canonical/minisprites/gen6/pokemon/Meowth.png b/src/canonical/minisprites/gen6/pokemon/52--0--Meowth.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Meowth.png rename to src/canonical/minisprites/gen6/pokemon/52--0--Meowth.png diff --git a/src/canonical/minisprites/gen6/pokemon/Meowth--Alola.png b/src/canonical/minisprites/gen6/pokemon/52--420--Meowth--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Meowth--Alola.png rename to src/canonical/minisprites/gen6/pokemon/52--420--Meowth--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tranquill.png b/src/canonical/minisprites/gen6/pokemon/520--0--Tranquill.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tranquill.png rename to src/canonical/minisprites/gen6/pokemon/520--0--Tranquill.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unfezant--Female.png b/src/canonical/minisprites/gen6/pokemon/521--0--Unfezant--Female.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unfezant--Female.png rename to src/canonical/minisprites/gen6/pokemon/521--0--Unfezant--Female.png diff --git a/src/canonical/minisprites/gen6/pokemon/Unfezant.png b/src/canonical/minisprites/gen6/pokemon/521--0--Unfezant.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Unfezant.png rename to src/canonical/minisprites/gen6/pokemon/521--0--Unfezant.png diff --git a/src/canonical/minisprites/gen6/pokemon/Blitzle.png b/src/canonical/minisprites/gen6/pokemon/522--0--Blitzle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Blitzle.png rename to src/canonical/minisprites/gen6/pokemon/522--0--Blitzle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Zebstrika.png b/src/canonical/minisprites/gen6/pokemon/523--0--Zebstrika.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Zebstrika.png rename to src/canonical/minisprites/gen6/pokemon/523--0--Zebstrika.png diff --git a/src/canonical/minisprites/gen6/pokemon/Roggenrola.png b/src/canonical/minisprites/gen6/pokemon/524--0--Roggenrola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Roggenrola.png rename to src/canonical/minisprites/gen6/pokemon/524--0--Roggenrola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Boldore.png b/src/canonical/minisprites/gen6/pokemon/525--0--Boldore.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Boldore.png rename to src/canonical/minisprites/gen6/pokemon/525--0--Boldore.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gigalith.png b/src/canonical/minisprites/gen6/pokemon/526--0--Gigalith.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gigalith.png rename to src/canonical/minisprites/gen6/pokemon/526--0--Gigalith.png diff --git a/src/canonical/minisprites/gen6/pokemon/Woobat.png b/src/canonical/minisprites/gen6/pokemon/527--0--Woobat.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Woobat.png rename to src/canonical/minisprites/gen6/pokemon/527--0--Woobat.png diff --git a/src/canonical/minisprites/gen6/pokemon/Swoobat.png b/src/canonical/minisprites/gen6/pokemon/528--0--Swoobat.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Swoobat.png rename to src/canonical/minisprites/gen6/pokemon/528--0--Swoobat.png diff --git a/src/canonical/minisprites/gen6/pokemon/Drilbur.png b/src/canonical/minisprites/gen6/pokemon/529--0--Drilbur.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Drilbur.png rename to src/canonical/minisprites/gen6/pokemon/529--0--Drilbur.png diff --git a/src/canonical/minisprites/gen6/pokemon/Persian.png b/src/canonical/minisprites/gen6/pokemon/53--0--Persian.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Persian.png rename to src/canonical/minisprites/gen6/pokemon/53--0--Persian.png diff --git a/src/canonical/minisprites/gen6/pokemon/Persian--Alola.png b/src/canonical/minisprites/gen6/pokemon/53--420--Persian--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Persian--Alola.png rename to src/canonical/minisprites/gen6/pokemon/53--420--Persian--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Excadrill.png b/src/canonical/minisprites/gen6/pokemon/530--0--Excadrill.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Excadrill.png rename to src/canonical/minisprites/gen6/pokemon/530--0--Excadrill.png diff --git a/src/canonical/minisprites/gen6/pokemon/Audino.png b/src/canonical/minisprites/gen6/pokemon/531--0--Audino.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Audino.png rename to src/canonical/minisprites/gen6/pokemon/531--0--Audino.png diff --git a/src/canonical/minisprites/gen6/pokemon/Audino--Mega.png b/src/canonical/minisprites/gen6/pokemon/531--420--Audino--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Audino--Mega.png rename to src/canonical/minisprites/gen6/pokemon/531--420--Audino--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Timburr.png b/src/canonical/minisprites/gen6/pokemon/532--0--Timburr.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Timburr.png rename to src/canonical/minisprites/gen6/pokemon/532--0--Timburr.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gurdurr.png b/src/canonical/minisprites/gen6/pokemon/533--0--Gurdurr.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gurdurr.png rename to src/canonical/minisprites/gen6/pokemon/533--0--Gurdurr.png diff --git a/src/canonical/minisprites/gen6/pokemon/Conkeldurr.png b/src/canonical/minisprites/gen6/pokemon/534--0--Conkeldurr.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Conkeldurr.png rename to src/canonical/minisprites/gen6/pokemon/534--0--Conkeldurr.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tympole.png b/src/canonical/minisprites/gen6/pokemon/535--0--Tympole.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tympole.png rename to src/canonical/minisprites/gen6/pokemon/535--0--Tympole.png diff --git a/src/canonical/minisprites/gen6/pokemon/Palpitoad.png b/src/canonical/minisprites/gen6/pokemon/536--0--Palpitoad.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Palpitoad.png rename to src/canonical/minisprites/gen6/pokemon/536--0--Palpitoad.png diff --git a/src/canonical/minisprites/gen6/pokemon/Seismitoad.png b/src/canonical/minisprites/gen6/pokemon/537--0--Seismitoad.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Seismitoad.png rename to src/canonical/minisprites/gen6/pokemon/537--0--Seismitoad.png diff --git a/src/canonical/minisprites/gen6/pokemon/Throh.png b/src/canonical/minisprites/gen6/pokemon/538--0--Throh.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Throh.png rename to src/canonical/minisprites/gen6/pokemon/538--0--Throh.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sawk.png b/src/canonical/minisprites/gen6/pokemon/539--0--Sawk.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sawk.png rename to src/canonical/minisprites/gen6/pokemon/539--0--Sawk.png diff --git a/src/canonical/minisprites/gen6/pokemon/Psyduck.png b/src/canonical/minisprites/gen6/pokemon/54--0--Psyduck.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Psyduck.png rename to src/canonical/minisprites/gen6/pokemon/54--0--Psyduck.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sewaddle.png b/src/canonical/minisprites/gen6/pokemon/540--0--Sewaddle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sewaddle.png rename to src/canonical/minisprites/gen6/pokemon/540--0--Sewaddle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Swadloon.png b/src/canonical/minisprites/gen6/pokemon/541--0--Swadloon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Swadloon.png rename to src/canonical/minisprites/gen6/pokemon/541--0--Swadloon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Leavanny.png b/src/canonical/minisprites/gen6/pokemon/542--0--Leavanny.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Leavanny.png rename to src/canonical/minisprites/gen6/pokemon/542--0--Leavanny.png diff --git a/src/canonical/minisprites/gen6/pokemon/Venipede.png b/src/canonical/minisprites/gen6/pokemon/543--0--Venipede.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Venipede.png rename to src/canonical/minisprites/gen6/pokemon/543--0--Venipede.png diff --git a/src/canonical/minisprites/gen6/pokemon/Whirlipede.png b/src/canonical/minisprites/gen6/pokemon/544--0--Whirlipede.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Whirlipede.png rename to src/canonical/minisprites/gen6/pokemon/544--0--Whirlipede.png diff --git a/src/canonical/minisprites/gen6/pokemon/Scolipede.png b/src/canonical/minisprites/gen6/pokemon/545--0--Scolipede.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Scolipede.png rename to src/canonical/minisprites/gen6/pokemon/545--0--Scolipede.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cottonee.png b/src/canonical/minisprites/gen6/pokemon/546--0--Cottonee.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cottonee.png rename to src/canonical/minisprites/gen6/pokemon/546--0--Cottonee.png diff --git a/src/canonical/minisprites/gen6/pokemon/Whimsicott.png b/src/canonical/minisprites/gen6/pokemon/547--0--Whimsicott.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Whimsicott.png rename to src/canonical/minisprites/gen6/pokemon/547--0--Whimsicott.png diff --git a/src/canonical/minisprites/gen6/pokemon/Petilil.png b/src/canonical/minisprites/gen6/pokemon/548--0--Petilil.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Petilil.png rename to src/canonical/minisprites/gen6/pokemon/548--0--Petilil.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lilligant.png b/src/canonical/minisprites/gen6/pokemon/549--0--Lilligant.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lilligant.png rename to src/canonical/minisprites/gen6/pokemon/549--0--Lilligant.png diff --git a/src/canonical/minisprites/gen6/pokemon/Golduck.png b/src/canonical/minisprites/gen6/pokemon/55--0--Golduck.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Golduck.png rename to src/canonical/minisprites/gen6/pokemon/55--0--Golduck.png diff --git a/src/canonical/minisprites/gen6/pokemon/Basculin.png b/src/canonical/minisprites/gen6/pokemon/550--0--Basculin.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Basculin.png rename to src/canonical/minisprites/gen6/pokemon/550--0--Basculin.png diff --git a/src/canonical/minisprites/gen6/pokemon/Basculin--Blue-Striped.png b/src/canonical/minisprites/gen6/pokemon/550--420--Basculin--Blue-Striped.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Basculin--Blue-Striped.png rename to src/canonical/minisprites/gen6/pokemon/550--420--Basculin--Blue-Striped.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sandile.png b/src/canonical/minisprites/gen6/pokemon/551--0--Sandile.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sandile.png rename to src/canonical/minisprites/gen6/pokemon/551--0--Sandile.png diff --git a/src/canonical/minisprites/gen6/pokemon/Krokorok.png b/src/canonical/minisprites/gen6/pokemon/552--0--Krokorok.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Krokorok.png rename to src/canonical/minisprites/gen6/pokemon/552--0--Krokorok.png diff --git a/src/canonical/minisprites/gen6/pokemon/Krookodile.png b/src/canonical/minisprites/gen6/pokemon/553--0--Krookodile.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Krookodile.png rename to src/canonical/minisprites/gen6/pokemon/553--0--Krookodile.png diff --git a/src/canonical/minisprites/gen6/pokemon/Darumaka.png b/src/canonical/minisprites/gen6/pokemon/554--0--Darumaka.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Darumaka.png rename to src/canonical/minisprites/gen6/pokemon/554--0--Darumaka.png diff --git a/src/canonical/minisprites/gen6/pokemon/Darmanitan.png b/src/canonical/minisprites/gen6/pokemon/555--0--Darmanitan.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Darmanitan.png rename to src/canonical/minisprites/gen6/pokemon/555--0--Darmanitan.png diff --git a/src/canonical/minisprites/gen6/pokemon/Darmanitan--Zen.png b/src/canonical/minisprites/gen6/pokemon/555--420--Darmanitan--Zen.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Darmanitan--Zen.png rename to src/canonical/minisprites/gen6/pokemon/555--420--Darmanitan--Zen.png diff --git a/src/canonical/minisprites/gen6/pokemon/Maractus.png b/src/canonical/minisprites/gen6/pokemon/556--0--Maractus.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Maractus.png rename to src/canonical/minisprites/gen6/pokemon/556--0--Maractus.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dwebble.png b/src/canonical/minisprites/gen6/pokemon/557--0--Dwebble.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dwebble.png rename to src/canonical/minisprites/gen6/pokemon/557--0--Dwebble.png diff --git a/src/canonical/minisprites/gen6/pokemon/Crustle.png b/src/canonical/minisprites/gen6/pokemon/558--0--Crustle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Crustle.png rename to src/canonical/minisprites/gen6/pokemon/558--0--Crustle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Scraggy.png b/src/canonical/minisprites/gen6/pokemon/559--0--Scraggy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Scraggy.png rename to src/canonical/minisprites/gen6/pokemon/559--0--Scraggy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mankey.png b/src/canonical/minisprites/gen6/pokemon/56--0--Mankey.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mankey.png rename to src/canonical/minisprites/gen6/pokemon/56--0--Mankey.png diff --git a/src/canonical/minisprites/gen6/pokemon/Scrafty.png b/src/canonical/minisprites/gen6/pokemon/560--0--Scrafty.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Scrafty.png rename to src/canonical/minisprites/gen6/pokemon/560--0--Scrafty.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sigilyph.png b/src/canonical/minisprites/gen6/pokemon/561--0--Sigilyph.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sigilyph.png rename to src/canonical/minisprites/gen6/pokemon/561--0--Sigilyph.png diff --git a/src/canonical/minisprites/gen6/pokemon/Yamask.png b/src/canonical/minisprites/gen6/pokemon/562--0--Yamask.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Yamask.png rename to src/canonical/minisprites/gen6/pokemon/562--0--Yamask.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cofagrigus.png b/src/canonical/minisprites/gen6/pokemon/563--0--Cofagrigus.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cofagrigus.png rename to src/canonical/minisprites/gen6/pokemon/563--0--Cofagrigus.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tirtouga.png b/src/canonical/minisprites/gen6/pokemon/564--0--Tirtouga.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tirtouga.png rename to src/canonical/minisprites/gen6/pokemon/564--0--Tirtouga.png diff --git a/src/canonical/minisprites/gen6/pokemon/Carracosta.png b/src/canonical/minisprites/gen6/pokemon/565--0--Carracosta.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Carracosta.png rename to src/canonical/minisprites/gen6/pokemon/565--0--Carracosta.png diff --git a/src/canonical/minisprites/gen6/pokemon/Archen.png b/src/canonical/minisprites/gen6/pokemon/566--0--Archen.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Archen.png rename to src/canonical/minisprites/gen6/pokemon/566--0--Archen.png diff --git a/src/canonical/minisprites/gen6/pokemon/Archeops.png b/src/canonical/minisprites/gen6/pokemon/567--0--Archeops.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Archeops.png rename to src/canonical/minisprites/gen6/pokemon/567--0--Archeops.png diff --git a/src/canonical/minisprites/gen6/pokemon/Trubbish.png b/src/canonical/minisprites/gen6/pokemon/568--0--Trubbish.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Trubbish.png rename to src/canonical/minisprites/gen6/pokemon/568--0--Trubbish.png diff --git a/src/canonical/minisprites/gen6/pokemon/Garbodor.png b/src/canonical/minisprites/gen6/pokemon/569--0--Garbodor.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Garbodor.png rename to src/canonical/minisprites/gen6/pokemon/569--0--Garbodor.png diff --git a/src/canonical/minisprites/gen6/pokemon/Primeape.png b/src/canonical/minisprites/gen6/pokemon/57--0--Primeape.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Primeape.png rename to src/canonical/minisprites/gen6/pokemon/57--0--Primeape.png diff --git a/src/canonical/minisprites/gen6/pokemon/Zorua.png b/src/canonical/minisprites/gen6/pokemon/570--0--Zorua.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Zorua.png rename to src/canonical/minisprites/gen6/pokemon/570--0--Zorua.png diff --git a/src/canonical/minisprites/gen6/pokemon/Zoroark.png b/src/canonical/minisprites/gen6/pokemon/571--0--Zoroark.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Zoroark.png rename to src/canonical/minisprites/gen6/pokemon/571--0--Zoroark.png diff --git a/src/canonical/minisprites/gen6/pokemon/Minccino.png b/src/canonical/minisprites/gen6/pokemon/572--0--Minccino.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Minccino.png rename to src/canonical/minisprites/gen6/pokemon/572--0--Minccino.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cinccino.png b/src/canonical/minisprites/gen6/pokemon/573--0--Cinccino.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cinccino.png rename to src/canonical/minisprites/gen6/pokemon/573--0--Cinccino.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gothita.png b/src/canonical/minisprites/gen6/pokemon/574--0--Gothita.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gothita.png rename to src/canonical/minisprites/gen6/pokemon/574--0--Gothita.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gothorita.png b/src/canonical/minisprites/gen6/pokemon/575--0--Gothorita.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gothorita.png rename to src/canonical/minisprites/gen6/pokemon/575--0--Gothorita.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gothitelle.png b/src/canonical/minisprites/gen6/pokemon/576--0--Gothitelle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gothitelle.png rename to src/canonical/minisprites/gen6/pokemon/576--0--Gothitelle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Solosis.png b/src/canonical/minisprites/gen6/pokemon/577--0--Solosis.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Solosis.png rename to src/canonical/minisprites/gen6/pokemon/577--0--Solosis.png diff --git a/src/canonical/minisprites/gen6/pokemon/Duosion.png b/src/canonical/minisprites/gen6/pokemon/578--0--Duosion.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Duosion.png rename to src/canonical/minisprites/gen6/pokemon/578--0--Duosion.png diff --git a/src/canonical/minisprites/gen6/pokemon/Reuniclus.png b/src/canonical/minisprites/gen6/pokemon/579--0--Reuniclus.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Reuniclus.png rename to src/canonical/minisprites/gen6/pokemon/579--0--Reuniclus.png diff --git a/src/canonical/minisprites/gen6/pokemon/Growlithe.png b/src/canonical/minisprites/gen6/pokemon/58--0--Growlithe.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Growlithe.png rename to src/canonical/minisprites/gen6/pokemon/58--0--Growlithe.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ducklett.png b/src/canonical/minisprites/gen6/pokemon/580--0--Ducklett.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ducklett.png rename to src/canonical/minisprites/gen6/pokemon/580--0--Ducklett.png diff --git a/src/canonical/minisprites/gen6/pokemon/Swanna.png b/src/canonical/minisprites/gen6/pokemon/581--0--Swanna.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Swanna.png rename to src/canonical/minisprites/gen6/pokemon/581--0--Swanna.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vanillite.png b/src/canonical/minisprites/gen6/pokemon/582--0--Vanillite.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vanillite.png rename to src/canonical/minisprites/gen6/pokemon/582--0--Vanillite.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vanillish.png b/src/canonical/minisprites/gen6/pokemon/583--0--Vanillish.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vanillish.png rename to src/canonical/minisprites/gen6/pokemon/583--0--Vanillish.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vanilluxe.png b/src/canonical/minisprites/gen6/pokemon/584--0--Vanilluxe.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vanilluxe.png rename to src/canonical/minisprites/gen6/pokemon/584--0--Vanilluxe.png diff --git a/src/canonical/minisprites/gen6/pokemon/Deerling.png b/src/canonical/minisprites/gen6/pokemon/585--0--Deerling.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Deerling.png rename to src/canonical/minisprites/gen6/pokemon/585--0--Deerling.png diff --git a/src/canonical/minisprites/gen6/pokemon/Deerling--Autumn.png b/src/canonical/minisprites/gen6/pokemon/585--420--Deerling--Autumn.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Deerling--Autumn.png rename to src/canonical/minisprites/gen6/pokemon/585--420--Deerling--Autumn.png diff --git a/src/canonical/minisprites/gen6/pokemon/Deerling--Summer.png b/src/canonical/minisprites/gen6/pokemon/585--420--Deerling--Summer.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Deerling--Summer.png rename to src/canonical/minisprites/gen6/pokemon/585--420--Deerling--Summer.png diff --git a/src/canonical/minisprites/gen6/pokemon/Deerling--Winter.png b/src/canonical/minisprites/gen6/pokemon/585--420--Deerling--Winter.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Deerling--Winter.png rename to src/canonical/minisprites/gen6/pokemon/585--420--Deerling--Winter.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sawsbuck.png b/src/canonical/minisprites/gen6/pokemon/586--0--Sawsbuck.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sawsbuck.png rename to src/canonical/minisprites/gen6/pokemon/586--0--Sawsbuck.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sawsbuck--Autumn.png b/src/canonical/minisprites/gen6/pokemon/586--420--Sawsbuck--Autumn.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sawsbuck--Autumn.png rename to src/canonical/minisprites/gen6/pokemon/586--420--Sawsbuck--Autumn.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sawsbuck--Summer.png b/src/canonical/minisprites/gen6/pokemon/586--420--Sawsbuck--Summer.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sawsbuck--Summer.png rename to src/canonical/minisprites/gen6/pokemon/586--420--Sawsbuck--Summer.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sawsbuck--Winter.png b/src/canonical/minisprites/gen6/pokemon/586--420--Sawsbuck--Winter.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sawsbuck--Winter.png rename to src/canonical/minisprites/gen6/pokemon/586--420--Sawsbuck--Winter.png diff --git a/src/canonical/minisprites/gen6/pokemon/Emolga.png b/src/canonical/minisprites/gen6/pokemon/587--0--Emolga.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Emolga.png rename to src/canonical/minisprites/gen6/pokemon/587--0--Emolga.png diff --git a/src/canonical/minisprites/gen6/pokemon/Karrablast.png b/src/canonical/minisprites/gen6/pokemon/588--0--Karrablast.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Karrablast.png rename to src/canonical/minisprites/gen6/pokemon/588--0--Karrablast.png diff --git a/src/canonical/minisprites/gen6/pokemon/Escavalier.png b/src/canonical/minisprites/gen6/pokemon/589--0--Escavalier.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Escavalier.png rename to src/canonical/minisprites/gen6/pokemon/589--0--Escavalier.png diff --git a/src/canonical/minisprites/gen6/pokemon/Arcanine.png b/src/canonical/minisprites/gen6/pokemon/59--0--Arcanine.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Arcanine.png rename to src/canonical/minisprites/gen6/pokemon/59--0--Arcanine.png diff --git a/src/canonical/minisprites/gen6/pokemon/Foongus.png b/src/canonical/minisprites/gen6/pokemon/590--0--Foongus.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Foongus.png rename to src/canonical/minisprites/gen6/pokemon/590--0--Foongus.png diff --git a/src/canonical/minisprites/gen6/pokemon/Amoonguss.png b/src/canonical/minisprites/gen6/pokemon/591--0--Amoonguss.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Amoonguss.png rename to src/canonical/minisprites/gen6/pokemon/591--0--Amoonguss.png diff --git a/src/canonical/minisprites/gen6/pokemon/Frillish--Female.png b/src/canonical/minisprites/gen6/pokemon/592--0--Frillish--Female.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Frillish--Female.png rename to src/canonical/minisprites/gen6/pokemon/592--0--Frillish--Female.png diff --git a/src/canonical/minisprites/gen6/pokemon/Frillish.png b/src/canonical/minisprites/gen6/pokemon/592--0--Frillish.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Frillish.png rename to src/canonical/minisprites/gen6/pokemon/592--0--Frillish.png diff --git a/src/canonical/minisprites/gen6/pokemon/Jellicent--Female.png b/src/canonical/minisprites/gen6/pokemon/593--0--Jellicent--Female.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Jellicent--Female.png rename to src/canonical/minisprites/gen6/pokemon/593--0--Jellicent--Female.png diff --git a/src/canonical/minisprites/gen6/pokemon/Jellicent.png b/src/canonical/minisprites/gen6/pokemon/593--0--Jellicent.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Jellicent.png rename to src/canonical/minisprites/gen6/pokemon/593--0--Jellicent.png diff --git a/src/canonical/minisprites/gen6/pokemon/Alomomola.png b/src/canonical/minisprites/gen6/pokemon/594--0--Alomomola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Alomomola.png rename to src/canonical/minisprites/gen6/pokemon/594--0--Alomomola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Joltik.png b/src/canonical/minisprites/gen6/pokemon/595--0--Joltik.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Joltik.png rename to src/canonical/minisprites/gen6/pokemon/595--0--Joltik.png diff --git a/src/canonical/minisprites/gen6/pokemon/Galvantula.png b/src/canonical/minisprites/gen6/pokemon/596--0--Galvantula.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Galvantula.png rename to src/canonical/minisprites/gen6/pokemon/596--0--Galvantula.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ferroseed.png b/src/canonical/minisprites/gen6/pokemon/597--0--Ferroseed.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ferroseed.png rename to src/canonical/minisprites/gen6/pokemon/597--0--Ferroseed.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ferrothorn.png b/src/canonical/minisprites/gen6/pokemon/598--0--Ferrothorn.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ferrothorn.png rename to src/canonical/minisprites/gen6/pokemon/598--0--Ferrothorn.png diff --git a/src/canonical/minisprites/gen6/pokemon/Klink.png b/src/canonical/minisprites/gen6/pokemon/599--0--Klink.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Klink.png rename to src/canonical/minisprites/gen6/pokemon/599--0--Klink.png diff --git a/src/canonical/minisprites/gen6/pokemon/Charizard.png b/src/canonical/minisprites/gen6/pokemon/6--0--Charizard.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Charizard.png rename to src/canonical/minisprites/gen6/pokemon/6--0--Charizard.png diff --git a/src/canonical/minisprites/gen6/pokemon/Charizard--Mega-X.png b/src/canonical/minisprites/gen6/pokemon/6--420--Charizard--Mega-X.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Charizard--Mega-X.png rename to src/canonical/minisprites/gen6/pokemon/6--420--Charizard--Mega-X.png diff --git a/src/canonical/minisprites/gen6/pokemon/Charizard--Mega-Y.png b/src/canonical/minisprites/gen6/pokemon/6--420--Charizard--Mega-Y.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Charizard--Mega-Y.png rename to src/canonical/minisprites/gen6/pokemon/6--420--Charizard--Mega-Y.png diff --git a/src/canonical/minisprites/gen6/pokemon/Poliwag.png b/src/canonical/minisprites/gen6/pokemon/60--0--Poliwag.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Poliwag.png rename to src/canonical/minisprites/gen6/pokemon/60--0--Poliwag.png diff --git a/src/canonical/minisprites/gen6/pokemon/Klang.png b/src/canonical/minisprites/gen6/pokemon/600--0--Klang.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Klang.png rename to src/canonical/minisprites/gen6/pokemon/600--0--Klang.png diff --git a/src/canonical/minisprites/gen6/pokemon/Klinklang.png b/src/canonical/minisprites/gen6/pokemon/601--0--Klinklang.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Klinklang.png rename to src/canonical/minisprites/gen6/pokemon/601--0--Klinklang.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tynamo.png b/src/canonical/minisprites/gen6/pokemon/602--0--Tynamo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tynamo.png rename to src/canonical/minisprites/gen6/pokemon/602--0--Tynamo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Eelektrik.png b/src/canonical/minisprites/gen6/pokemon/603--0--Eelektrik.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Eelektrik.png rename to src/canonical/minisprites/gen6/pokemon/603--0--Eelektrik.png diff --git a/src/canonical/minisprites/gen6/pokemon/Eelektross.png b/src/canonical/minisprites/gen6/pokemon/604--0--Eelektross.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Eelektross.png rename to src/canonical/minisprites/gen6/pokemon/604--0--Eelektross.png diff --git a/src/canonical/minisprites/gen6/pokemon/Elgyem.png b/src/canonical/minisprites/gen6/pokemon/605--0--Elgyem.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Elgyem.png rename to src/canonical/minisprites/gen6/pokemon/605--0--Elgyem.png diff --git a/src/canonical/minisprites/gen6/pokemon/Beheeyem.png b/src/canonical/minisprites/gen6/pokemon/606--0--Beheeyem.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Beheeyem.png rename to src/canonical/minisprites/gen6/pokemon/606--0--Beheeyem.png diff --git a/src/canonical/minisprites/gen6/pokemon/Litwick.png b/src/canonical/minisprites/gen6/pokemon/607--0--Litwick.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Litwick.png rename to src/canonical/minisprites/gen6/pokemon/607--0--Litwick.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lampent.png b/src/canonical/minisprites/gen6/pokemon/608--0--Lampent.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lampent.png rename to src/canonical/minisprites/gen6/pokemon/608--0--Lampent.png diff --git a/src/canonical/minisprites/gen6/pokemon/Chandelure.png b/src/canonical/minisprites/gen6/pokemon/609--0--Chandelure.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Chandelure.png rename to src/canonical/minisprites/gen6/pokemon/609--0--Chandelure.png diff --git a/src/canonical/minisprites/gen6/pokemon/Poliwhirl.png b/src/canonical/minisprites/gen6/pokemon/61--0--Poliwhirl.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Poliwhirl.png rename to src/canonical/minisprites/gen6/pokemon/61--0--Poliwhirl.png diff --git a/src/canonical/minisprites/gen6/pokemon/Axew.png b/src/canonical/minisprites/gen6/pokemon/610--0--Axew.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Axew.png rename to src/canonical/minisprites/gen6/pokemon/610--0--Axew.png diff --git a/src/canonical/minisprites/gen6/pokemon/Fraxure.png b/src/canonical/minisprites/gen6/pokemon/611--0--Fraxure.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Fraxure.png rename to src/canonical/minisprites/gen6/pokemon/611--0--Fraxure.png diff --git a/src/canonical/minisprites/gen6/pokemon/Haxorus.png b/src/canonical/minisprites/gen6/pokemon/612--0--Haxorus.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Haxorus.png rename to src/canonical/minisprites/gen6/pokemon/612--0--Haxorus.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cubchoo.png b/src/canonical/minisprites/gen6/pokemon/613--0--Cubchoo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cubchoo.png rename to src/canonical/minisprites/gen6/pokemon/613--0--Cubchoo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Beartic.png b/src/canonical/minisprites/gen6/pokemon/614--0--Beartic.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Beartic.png rename to src/canonical/minisprites/gen6/pokemon/614--0--Beartic.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cryogonal.png b/src/canonical/minisprites/gen6/pokemon/615--0--Cryogonal.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cryogonal.png rename to src/canonical/minisprites/gen6/pokemon/615--0--Cryogonal.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shelmet.png b/src/canonical/minisprites/gen6/pokemon/616--0--Shelmet.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shelmet.png rename to src/canonical/minisprites/gen6/pokemon/616--0--Shelmet.png diff --git a/src/canonical/minisprites/gen6/pokemon/Accelgor.png b/src/canonical/minisprites/gen6/pokemon/617--0--Accelgor.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Accelgor.png rename to src/canonical/minisprites/gen6/pokemon/617--0--Accelgor.png diff --git a/src/canonical/minisprites/gen6/pokemon/Stunfisk.png b/src/canonical/minisprites/gen6/pokemon/618--0--Stunfisk.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Stunfisk.png rename to src/canonical/minisprites/gen6/pokemon/618--0--Stunfisk.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mienfoo.png b/src/canonical/minisprites/gen6/pokemon/619--0--Mienfoo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mienfoo.png rename to src/canonical/minisprites/gen6/pokemon/619--0--Mienfoo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Poliwrath.png b/src/canonical/minisprites/gen6/pokemon/62--0--Poliwrath.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Poliwrath.png rename to src/canonical/minisprites/gen6/pokemon/62--0--Poliwrath.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mienshao.png b/src/canonical/minisprites/gen6/pokemon/620--0--Mienshao.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mienshao.png rename to src/canonical/minisprites/gen6/pokemon/620--0--Mienshao.png diff --git a/src/canonical/minisprites/gen6/pokemon/Druddigon.png b/src/canonical/minisprites/gen6/pokemon/621--0--Druddigon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Druddigon.png rename to src/canonical/minisprites/gen6/pokemon/621--0--Druddigon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Golett.png b/src/canonical/minisprites/gen6/pokemon/622--0--Golett.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Golett.png rename to src/canonical/minisprites/gen6/pokemon/622--0--Golett.png diff --git a/src/canonical/minisprites/gen6/pokemon/Golurk.png b/src/canonical/minisprites/gen6/pokemon/623--0--Golurk.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Golurk.png rename to src/canonical/minisprites/gen6/pokemon/623--0--Golurk.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pawniard.png b/src/canonical/minisprites/gen6/pokemon/624--0--Pawniard.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pawniard.png rename to src/canonical/minisprites/gen6/pokemon/624--0--Pawniard.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bisharp.png b/src/canonical/minisprites/gen6/pokemon/625--0--Bisharp.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bisharp.png rename to src/canonical/minisprites/gen6/pokemon/625--0--Bisharp.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bouffalant.png b/src/canonical/minisprites/gen6/pokemon/626--0--Bouffalant.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bouffalant.png rename to src/canonical/minisprites/gen6/pokemon/626--0--Bouffalant.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rufflet.png b/src/canonical/minisprites/gen6/pokemon/627--0--Rufflet.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rufflet.png rename to src/canonical/minisprites/gen6/pokemon/627--0--Rufflet.png diff --git a/src/canonical/minisprites/gen6/pokemon/Braviary.png b/src/canonical/minisprites/gen6/pokemon/628--0--Braviary.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Braviary.png rename to src/canonical/minisprites/gen6/pokemon/628--0--Braviary.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vullaby.png b/src/canonical/minisprites/gen6/pokemon/629--0--Vullaby.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vullaby.png rename to src/canonical/minisprites/gen6/pokemon/629--0--Vullaby.png diff --git a/src/canonical/minisprites/gen6/pokemon/Abra.png b/src/canonical/minisprites/gen6/pokemon/63--0--Abra.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Abra.png rename to src/canonical/minisprites/gen6/pokemon/63--0--Abra.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mandibuzz.png b/src/canonical/minisprites/gen6/pokemon/630--0--Mandibuzz.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mandibuzz.png rename to src/canonical/minisprites/gen6/pokemon/630--0--Mandibuzz.png diff --git a/src/canonical/minisprites/gen6/pokemon/Heatmor.png b/src/canonical/minisprites/gen6/pokemon/631--0--Heatmor.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Heatmor.png rename to src/canonical/minisprites/gen6/pokemon/631--0--Heatmor.png diff --git a/src/canonical/minisprites/gen6/pokemon/Durant.png b/src/canonical/minisprites/gen6/pokemon/632--0--Durant.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Durant.png rename to src/canonical/minisprites/gen6/pokemon/632--0--Durant.png diff --git a/src/canonical/minisprites/gen6/pokemon/Deino.png b/src/canonical/minisprites/gen6/pokemon/633--0--Deino.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Deino.png rename to src/canonical/minisprites/gen6/pokemon/633--0--Deino.png diff --git a/src/canonical/minisprites/gen6/pokemon/Zweilous.png b/src/canonical/minisprites/gen6/pokemon/634--0--Zweilous.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Zweilous.png rename to src/canonical/minisprites/gen6/pokemon/634--0--Zweilous.png diff --git a/src/canonical/minisprites/gen6/pokemon/Hydreigon.png b/src/canonical/minisprites/gen6/pokemon/635--0--Hydreigon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Hydreigon.png rename to src/canonical/minisprites/gen6/pokemon/635--0--Hydreigon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Larvesta.png b/src/canonical/minisprites/gen6/pokemon/636--0--Larvesta.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Larvesta.png rename to src/canonical/minisprites/gen6/pokemon/636--0--Larvesta.png diff --git a/src/canonical/minisprites/gen6/pokemon/Volcarona.png b/src/canonical/minisprites/gen6/pokemon/637--0--Volcarona.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Volcarona.png rename to src/canonical/minisprites/gen6/pokemon/637--0--Volcarona.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cobalion.png b/src/canonical/minisprites/gen6/pokemon/638--0--Cobalion.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cobalion.png rename to src/canonical/minisprites/gen6/pokemon/638--0--Cobalion.png diff --git a/src/canonical/minisprites/gen6/pokemon/Terrakion.png b/src/canonical/minisprites/gen6/pokemon/639--0--Terrakion.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Terrakion.png rename to src/canonical/minisprites/gen6/pokemon/639--0--Terrakion.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kadabra.png b/src/canonical/minisprites/gen6/pokemon/64--0--Kadabra.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kadabra.png rename to src/canonical/minisprites/gen6/pokemon/64--0--Kadabra.png diff --git a/src/canonical/minisprites/gen6/pokemon/Virizion.png b/src/canonical/minisprites/gen6/pokemon/640--0--Virizion.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Virizion.png rename to src/canonical/minisprites/gen6/pokemon/640--0--Virizion.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tornadus.png b/src/canonical/minisprites/gen6/pokemon/641--0--Tornadus.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tornadus.png rename to src/canonical/minisprites/gen6/pokemon/641--0--Tornadus.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tornadus--Therian.png b/src/canonical/minisprites/gen6/pokemon/641--420--Tornadus--Therian.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tornadus--Therian.png rename to src/canonical/minisprites/gen6/pokemon/641--420--Tornadus--Therian.png diff --git a/src/canonical/minisprites/gen6/pokemon/Thundurus.png b/src/canonical/minisprites/gen6/pokemon/642--0--Thundurus.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Thundurus.png rename to src/canonical/minisprites/gen6/pokemon/642--0--Thundurus.png diff --git a/src/canonical/minisprites/gen6/pokemon/Thundurus--Therian.png b/src/canonical/minisprites/gen6/pokemon/642--420--Thundurus--Therian.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Thundurus--Therian.png rename to src/canonical/minisprites/gen6/pokemon/642--420--Thundurus--Therian.png diff --git a/src/canonical/minisprites/gen6/pokemon/Reshiram.png b/src/canonical/minisprites/gen6/pokemon/643--0--Reshiram.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Reshiram.png rename to src/canonical/minisprites/gen6/pokemon/643--0--Reshiram.png diff --git a/src/canonical/minisprites/gen6/pokemon/Zekrom.png b/src/canonical/minisprites/gen6/pokemon/644--0--Zekrom.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Zekrom.png rename to src/canonical/minisprites/gen6/pokemon/644--0--Zekrom.png diff --git a/src/canonical/minisprites/gen6/pokemon/Landorus.png b/src/canonical/minisprites/gen6/pokemon/645--0--Landorus.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Landorus.png rename to src/canonical/minisprites/gen6/pokemon/645--0--Landorus.png diff --git a/src/canonical/minisprites/gen6/pokemon/Landorus--Therian.png b/src/canonical/minisprites/gen6/pokemon/645--420--Landorus--Therian.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Landorus--Therian.png rename to src/canonical/minisprites/gen6/pokemon/645--420--Landorus--Therian.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kyurem.png b/src/canonical/minisprites/gen6/pokemon/646--0--Kyurem.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kyurem.png rename to src/canonical/minisprites/gen6/pokemon/646--0--Kyurem.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kyurem--Black.png b/src/canonical/minisprites/gen6/pokemon/646--420--Kyurem--Black.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kyurem--Black.png rename to src/canonical/minisprites/gen6/pokemon/646--420--Kyurem--Black.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kyurem--White.png b/src/canonical/minisprites/gen6/pokemon/646--420--Kyurem--White.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kyurem--White.png rename to src/canonical/minisprites/gen6/pokemon/646--420--Kyurem--White.png diff --git a/src/canonical/minisprites/gen6/pokemon/Keldeo.png b/src/canonical/minisprites/gen6/pokemon/647--0--Keldeo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Keldeo.png rename to src/canonical/minisprites/gen6/pokemon/647--0--Keldeo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Keldeo--Resolute.png b/src/canonical/minisprites/gen6/pokemon/647--420--Keldeo--Resolute.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Keldeo--Resolute.png rename to src/canonical/minisprites/gen6/pokemon/647--420--Keldeo--Resolute.png diff --git a/src/canonical/minisprites/gen6/pokemon/Meloetta.png b/src/canonical/minisprites/gen6/pokemon/648--0--Meloetta.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Meloetta.png rename to src/canonical/minisprites/gen6/pokemon/648--0--Meloetta.png diff --git a/src/canonical/minisprites/gen6/pokemon/Meloetta--Pirouette.png b/src/canonical/minisprites/gen6/pokemon/648--420--Meloetta--Pirouette.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Meloetta--Pirouette.png rename to src/canonical/minisprites/gen6/pokemon/648--420--Meloetta--Pirouette.png diff --git a/src/canonical/minisprites/gen6/pokemon/Genesect.png b/src/canonical/minisprites/gen6/pokemon/649--0--Genesect.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Genesect.png rename to src/canonical/minisprites/gen6/pokemon/649--0--Genesect.png diff --git a/src/canonical/minisprites/gen6/pokemon/Alakazam.png b/src/canonical/minisprites/gen6/pokemon/65--0--Alakazam.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Alakazam.png rename to src/canonical/minisprites/gen6/pokemon/65--0--Alakazam.png diff --git a/src/canonical/minisprites/gen6/pokemon/Alakazam--Mega.png b/src/canonical/minisprites/gen6/pokemon/65--420--Alakazam--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Alakazam--Mega.png rename to src/canonical/minisprites/gen6/pokemon/65--420--Alakazam--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Chespin.png b/src/canonical/minisprites/gen6/pokemon/650--0--Chespin.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Chespin.png rename to src/canonical/minisprites/gen6/pokemon/650--0--Chespin.png diff --git a/src/canonical/minisprites/gen6/pokemon/Quilladin.png b/src/canonical/minisprites/gen6/pokemon/651--0--Quilladin.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Quilladin.png rename to src/canonical/minisprites/gen6/pokemon/651--0--Quilladin.png diff --git a/src/canonical/minisprites/gen6/pokemon/Chesnaught.png b/src/canonical/minisprites/gen6/pokemon/652--0--Chesnaught.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Chesnaught.png rename to src/canonical/minisprites/gen6/pokemon/652--0--Chesnaught.png diff --git a/src/canonical/minisprites/gen6/pokemon/Fennekin.png b/src/canonical/minisprites/gen6/pokemon/653--0--Fennekin.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Fennekin.png rename to src/canonical/minisprites/gen6/pokemon/653--0--Fennekin.png diff --git a/src/canonical/minisprites/gen6/pokemon/Braixen.png b/src/canonical/minisprites/gen6/pokemon/654--0--Braixen.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Braixen.png rename to src/canonical/minisprites/gen6/pokemon/654--0--Braixen.png diff --git a/src/canonical/minisprites/gen6/pokemon/Delphox.png b/src/canonical/minisprites/gen6/pokemon/655--0--Delphox.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Delphox.png rename to src/canonical/minisprites/gen6/pokemon/655--0--Delphox.png diff --git a/src/canonical/minisprites/gen6/pokemon/Froakie.png b/src/canonical/minisprites/gen6/pokemon/656--0--Froakie.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Froakie.png rename to src/canonical/minisprites/gen6/pokemon/656--0--Froakie.png diff --git a/src/canonical/minisprites/gen6/pokemon/Frogadier.png b/src/canonical/minisprites/gen6/pokemon/657--0--Frogadier.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Frogadier.png rename to src/canonical/minisprites/gen6/pokemon/657--0--Frogadier.png diff --git a/src/canonical/minisprites/gen6/pokemon/Greninja.png b/src/canonical/minisprites/gen6/pokemon/658--0--Greninja.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Greninja.png rename to src/canonical/minisprites/gen6/pokemon/658--0--Greninja.png diff --git a/src/canonical/minisprites/gen6/pokemon/Greninja--Ash.png b/src/canonical/minisprites/gen6/pokemon/658--420--Greninja--Ash.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Greninja--Ash.png rename to src/canonical/minisprites/gen6/pokemon/658--420--Greninja--Ash.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bunnelby.png b/src/canonical/minisprites/gen6/pokemon/659--0--Bunnelby.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bunnelby.png rename to src/canonical/minisprites/gen6/pokemon/659--0--Bunnelby.png diff --git a/src/canonical/minisprites/gen6/pokemon/Machop.png b/src/canonical/minisprites/gen6/pokemon/66--0--Machop.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Machop.png rename to src/canonical/minisprites/gen6/pokemon/66--0--Machop.png diff --git a/src/canonical/minisprites/gen6/pokemon/Diggersby.png b/src/canonical/minisprites/gen6/pokemon/660--0--Diggersby.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Diggersby.png rename to src/canonical/minisprites/gen6/pokemon/660--0--Diggersby.png diff --git a/src/canonical/minisprites/gen6/pokemon/Fletchling.png b/src/canonical/minisprites/gen6/pokemon/661--0--Fletchling.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Fletchling.png rename to src/canonical/minisprites/gen6/pokemon/661--0--Fletchling.png diff --git a/src/canonical/minisprites/gen6/pokemon/Fletchinder.png b/src/canonical/minisprites/gen6/pokemon/662--0--Fletchinder.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Fletchinder.png rename to src/canonical/minisprites/gen6/pokemon/662--0--Fletchinder.png diff --git a/src/canonical/minisprites/gen6/pokemon/Talonflame.png b/src/canonical/minisprites/gen6/pokemon/663--0--Talonflame.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Talonflame.png rename to src/canonical/minisprites/gen6/pokemon/663--0--Talonflame.png diff --git a/src/canonical/minisprites/gen6/pokemon/Scatterbug.png b/src/canonical/minisprites/gen6/pokemon/664--0--Scatterbug.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Scatterbug.png rename to src/canonical/minisprites/gen6/pokemon/664--0--Scatterbug.png diff --git a/src/canonical/minisprites/gen6/pokemon/Spewpa.png b/src/canonical/minisprites/gen6/pokemon/665--0--Spewpa.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Spewpa.png rename to src/canonical/minisprites/gen6/pokemon/665--0--Spewpa.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon.png b/src/canonical/minisprites/gen6/pokemon/666--0--Vivillon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon.png rename to src/canonical/minisprites/gen6/pokemon/666--0--Vivillon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Archipelago.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Archipelago.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Archipelago.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Archipelago.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Continental.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Continental.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Continental.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Continental.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Elegant.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Elegant.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Elegant.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Elegant.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Fancy.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Fancy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Fancy.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Fancy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Garden.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Garden.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Garden.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Garden.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--High_Plains.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--High_Plains.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--High_Plains.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--High_Plains.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Icy_Snow.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Icy_Snow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Icy_Snow.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Icy_Snow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Jungle.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Jungle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Jungle.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Jungle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Marine.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Marine.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Marine.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Marine.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Modern.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Modern.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Modern.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Modern.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Monsoon.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Monsoon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Monsoon.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Monsoon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Ocean.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Ocean.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Ocean.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Ocean.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Pokeball.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Pokeball.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Pokeball.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Pokeball.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Polar.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Polar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Polar.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Polar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--River.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--River.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--River.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--River.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Sandstorm.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Sandstorm.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Sandstorm.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Sandstorm.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Savanna.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Savanna.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Savanna.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Savanna.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Sun.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Sun.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Sun.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Sun.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vivillon--Tundra.png b/src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Tundra.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vivillon--Tundra.png rename to src/canonical/minisprites/gen6/pokemon/666--420--Vivillon--Tundra.png diff --git a/src/canonical/minisprites/gen6/pokemon/Litleo.png b/src/canonical/minisprites/gen6/pokemon/667--0--Litleo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Litleo.png rename to src/canonical/minisprites/gen6/pokemon/667--0--Litleo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pyroar--Female.png b/src/canonical/minisprites/gen6/pokemon/668--0--Pyroar--Female.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pyroar--Female.png rename to src/canonical/minisprites/gen6/pokemon/668--0--Pyroar--Female.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pyroar.png b/src/canonical/minisprites/gen6/pokemon/668--0--Pyroar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pyroar.png rename to src/canonical/minisprites/gen6/pokemon/668--0--Pyroar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301.png b/src/canonical/minisprites/gen6/pokemon/669--0--Flabe__0301be__0301.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301.png rename to src/canonical/minisprites/gen6/pokemon/669--0--Flabe__0301be__0301.png diff --git a/src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--Blue.png b/src/canonical/minisprites/gen6/pokemon/669--420--Flabe__0301be__0301--Blue.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--Blue.png rename to src/canonical/minisprites/gen6/pokemon/669--420--Flabe__0301be__0301--Blue.png diff --git a/src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--Orange.png b/src/canonical/minisprites/gen6/pokemon/669--420--Flabe__0301be__0301--Orange.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--Orange.png rename to src/canonical/minisprites/gen6/pokemon/669--420--Flabe__0301be__0301--Orange.png diff --git a/src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--White.png b/src/canonical/minisprites/gen6/pokemon/669--420--Flabe__0301be__0301--White.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--White.png rename to src/canonical/minisprites/gen6/pokemon/669--420--Flabe__0301be__0301--White.png diff --git a/src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--Yellow.png b/src/canonical/minisprites/gen6/pokemon/669--420--Flabe__0301be__0301--Yellow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Flabe__0301be__0301--Yellow.png rename to src/canonical/minisprites/gen6/pokemon/669--420--Flabe__0301be__0301--Yellow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Machoke.png b/src/canonical/minisprites/gen6/pokemon/67--0--Machoke.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Machoke.png rename to src/canonical/minisprites/gen6/pokemon/67--0--Machoke.png diff --git a/src/canonical/minisprites/gen6/pokemon/Floette.png b/src/canonical/minisprites/gen6/pokemon/670--0--Floette.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Floette.png rename to src/canonical/minisprites/gen6/pokemon/670--0--Floette.png diff --git a/src/canonical/minisprites/gen6/pokemon/Floette--Blue.png b/src/canonical/minisprites/gen6/pokemon/670--420--Floette--Blue.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Floette--Blue.png rename to src/canonical/minisprites/gen6/pokemon/670--420--Floette--Blue.png diff --git a/src/canonical/minisprites/gen6/pokemon/Floette--Eternal.png b/src/canonical/minisprites/gen6/pokemon/670--420--Floette--Eternal.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Floette--Eternal.png rename to src/canonical/minisprites/gen6/pokemon/670--420--Floette--Eternal.png diff --git a/src/canonical/minisprites/gen6/pokemon/Floette--Orange.png b/src/canonical/minisprites/gen6/pokemon/670--420--Floette--Orange.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Floette--Orange.png rename to src/canonical/minisprites/gen6/pokemon/670--420--Floette--Orange.png diff --git a/src/canonical/minisprites/gen6/pokemon/Floette--White.png b/src/canonical/minisprites/gen6/pokemon/670--420--Floette--White.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Floette--White.png rename to src/canonical/minisprites/gen6/pokemon/670--420--Floette--White.png diff --git a/src/canonical/minisprites/gen6/pokemon/Floette--Yellow.png b/src/canonical/minisprites/gen6/pokemon/670--420--Floette--Yellow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Floette--Yellow.png rename to src/canonical/minisprites/gen6/pokemon/670--420--Floette--Yellow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Florges.png b/src/canonical/minisprites/gen6/pokemon/671--0--Florges.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Florges.png rename to src/canonical/minisprites/gen6/pokemon/671--0--Florges.png diff --git a/src/canonical/minisprites/gen6/pokemon/Florges--Blue.png b/src/canonical/minisprites/gen6/pokemon/671--420--Florges--Blue.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Florges--Blue.png rename to src/canonical/minisprites/gen6/pokemon/671--420--Florges--Blue.png diff --git a/src/canonical/minisprites/gen6/pokemon/Florges--Orange.png b/src/canonical/minisprites/gen6/pokemon/671--420--Florges--Orange.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Florges--Orange.png rename to src/canonical/minisprites/gen6/pokemon/671--420--Florges--Orange.png diff --git a/src/canonical/minisprites/gen6/pokemon/Florges--White.png b/src/canonical/minisprites/gen6/pokemon/671--420--Florges--White.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Florges--White.png rename to src/canonical/minisprites/gen6/pokemon/671--420--Florges--White.png diff --git a/src/canonical/minisprites/gen6/pokemon/Florges--Yellow.png b/src/canonical/minisprites/gen6/pokemon/671--420--Florges--Yellow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Florges--Yellow.png rename to src/canonical/minisprites/gen6/pokemon/671--420--Florges--Yellow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Skiddo.png b/src/canonical/minisprites/gen6/pokemon/672--0--Skiddo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Skiddo.png rename to src/canonical/minisprites/gen6/pokemon/672--0--Skiddo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gogoat.png b/src/canonical/minisprites/gen6/pokemon/673--0--Gogoat.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gogoat.png rename to src/canonical/minisprites/gen6/pokemon/673--0--Gogoat.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pancham.png b/src/canonical/minisprites/gen6/pokemon/674--0--Pancham.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pancham.png rename to src/canonical/minisprites/gen6/pokemon/674--0--Pancham.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pangoro.png b/src/canonical/minisprites/gen6/pokemon/675--0--Pangoro.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pangoro.png rename to src/canonical/minisprites/gen6/pokemon/675--0--Pangoro.png diff --git a/src/canonical/minisprites/gen6/pokemon/Furfrou.png b/src/canonical/minisprites/gen6/pokemon/676--0--Furfrou.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Furfrou.png rename to src/canonical/minisprites/gen6/pokemon/676--0--Furfrou.png diff --git a/src/canonical/minisprites/gen6/pokemon/Furfrou--Dandy.png b/src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Dandy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Furfrou--Dandy.png rename to src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Dandy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Furfrou--Debutante.png b/src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Debutante.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Furfrou--Debutante.png rename to src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Debutante.png diff --git a/src/canonical/minisprites/gen6/pokemon/Furfrou--Diamond.png b/src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Diamond.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Furfrou--Diamond.png rename to src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Diamond.png diff --git a/src/canonical/minisprites/gen6/pokemon/Furfrou--Heart.png b/src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Heart.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Furfrou--Heart.png rename to src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Heart.png diff --git a/src/canonical/minisprites/gen6/pokemon/Furfrou--Kabuki.png b/src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Kabuki.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Furfrou--Kabuki.png rename to src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Kabuki.png diff --git a/src/canonical/minisprites/gen6/pokemon/Furfrou--La_Reine.png b/src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--La_Reine.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Furfrou--La_Reine.png rename to src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--La_Reine.png diff --git a/src/canonical/minisprites/gen6/pokemon/Furfrou--Matron.png b/src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Matron.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Furfrou--Matron.png rename to src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Matron.png diff --git a/src/canonical/minisprites/gen6/pokemon/Furfrou--Pharaoh.png b/src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Pharaoh.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Furfrou--Pharaoh.png rename to src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Pharaoh.png diff --git a/src/canonical/minisprites/gen6/pokemon/Furfrou--Star.png b/src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Star.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Furfrou--Star.png rename to src/canonical/minisprites/gen6/pokemon/676--420--Furfrou--Star.png diff --git a/src/canonical/minisprites/gen6/pokemon/Espurr.png b/src/canonical/minisprites/gen6/pokemon/677--0--Espurr.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Espurr.png rename to src/canonical/minisprites/gen6/pokemon/677--0--Espurr.png diff --git a/src/canonical/minisprites/gen6/pokemon/Meowstic.png b/src/canonical/minisprites/gen6/pokemon/678--0--Meowstic.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Meowstic.png rename to src/canonical/minisprites/gen6/pokemon/678--0--Meowstic.png diff --git a/src/canonical/minisprites/gen6/pokemon/Meowstic--F.png b/src/canonical/minisprites/gen6/pokemon/678--420--Meowstic--F.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Meowstic--F.png rename to src/canonical/minisprites/gen6/pokemon/678--420--Meowstic--F.png diff --git a/src/canonical/minisprites/gen6/pokemon/Honedge.png b/src/canonical/minisprites/gen6/pokemon/679--0--Honedge.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Honedge.png rename to src/canonical/minisprites/gen6/pokemon/679--0--Honedge.png diff --git a/src/canonical/minisprites/gen6/pokemon/Machamp.png b/src/canonical/minisprites/gen6/pokemon/68--0--Machamp.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Machamp.png rename to src/canonical/minisprites/gen6/pokemon/68--0--Machamp.png diff --git a/src/canonical/minisprites/gen6/pokemon/Doublade.png b/src/canonical/minisprites/gen6/pokemon/680--0--Doublade.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Doublade.png rename to src/canonical/minisprites/gen6/pokemon/680--0--Doublade.png diff --git a/src/canonical/minisprites/gen6/pokemon/Aegislash.png b/src/canonical/minisprites/gen6/pokemon/681--0--Aegislash.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Aegislash.png rename to src/canonical/minisprites/gen6/pokemon/681--0--Aegislash.png diff --git a/src/canonical/minisprites/gen6/pokemon/Aegislash--Blade.png b/src/canonical/minisprites/gen6/pokemon/681--420--Aegislash--Blade.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Aegislash--Blade.png rename to src/canonical/minisprites/gen6/pokemon/681--420--Aegislash--Blade.png diff --git a/src/canonical/minisprites/gen6/pokemon/Spritzee.png b/src/canonical/minisprites/gen6/pokemon/682--0--Spritzee.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Spritzee.png rename to src/canonical/minisprites/gen6/pokemon/682--0--Spritzee.png diff --git a/src/canonical/minisprites/gen6/pokemon/Aromatisse.png b/src/canonical/minisprites/gen6/pokemon/683--0--Aromatisse.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Aromatisse.png rename to src/canonical/minisprites/gen6/pokemon/683--0--Aromatisse.png diff --git a/src/canonical/minisprites/gen6/pokemon/Swirlix.png b/src/canonical/minisprites/gen6/pokemon/684--0--Swirlix.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Swirlix.png rename to src/canonical/minisprites/gen6/pokemon/684--0--Swirlix.png diff --git a/src/canonical/minisprites/gen6/pokemon/Slurpuff.png b/src/canonical/minisprites/gen6/pokemon/685--0--Slurpuff.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Slurpuff.png rename to src/canonical/minisprites/gen6/pokemon/685--0--Slurpuff.png diff --git a/src/canonical/minisprites/gen6/pokemon/Inkay.png b/src/canonical/minisprites/gen6/pokemon/686--0--Inkay.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Inkay.png rename to src/canonical/minisprites/gen6/pokemon/686--0--Inkay.png diff --git a/src/canonical/minisprites/gen6/pokemon/Malamar.png b/src/canonical/minisprites/gen6/pokemon/687--0--Malamar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Malamar.png rename to src/canonical/minisprites/gen6/pokemon/687--0--Malamar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Binacle.png b/src/canonical/minisprites/gen6/pokemon/688--0--Binacle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Binacle.png rename to src/canonical/minisprites/gen6/pokemon/688--0--Binacle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Barbaracle.png b/src/canonical/minisprites/gen6/pokemon/689--0--Barbaracle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Barbaracle.png rename to src/canonical/minisprites/gen6/pokemon/689--0--Barbaracle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bellsprout.png b/src/canonical/minisprites/gen6/pokemon/69--0--Bellsprout.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bellsprout.png rename to src/canonical/minisprites/gen6/pokemon/69--0--Bellsprout.png diff --git a/src/canonical/minisprites/gen6/pokemon/Skrelp.png b/src/canonical/minisprites/gen6/pokemon/690--0--Skrelp.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Skrelp.png rename to src/canonical/minisprites/gen6/pokemon/690--0--Skrelp.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dragalge.png b/src/canonical/minisprites/gen6/pokemon/691--0--Dragalge.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dragalge.png rename to src/canonical/minisprites/gen6/pokemon/691--0--Dragalge.png diff --git a/src/canonical/minisprites/gen6/pokemon/Clauncher.png b/src/canonical/minisprites/gen6/pokemon/692--0--Clauncher.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Clauncher.png rename to src/canonical/minisprites/gen6/pokemon/692--0--Clauncher.png diff --git a/src/canonical/minisprites/gen6/pokemon/Clawitzer.png b/src/canonical/minisprites/gen6/pokemon/693--0--Clawitzer.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Clawitzer.png rename to src/canonical/minisprites/gen6/pokemon/693--0--Clawitzer.png diff --git a/src/canonical/minisprites/gen6/pokemon/Helioptile.png b/src/canonical/minisprites/gen6/pokemon/694--0--Helioptile.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Helioptile.png rename to src/canonical/minisprites/gen6/pokemon/694--0--Helioptile.png diff --git a/src/canonical/minisprites/gen6/pokemon/Heliolisk.png b/src/canonical/minisprites/gen6/pokemon/695--0--Heliolisk.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Heliolisk.png rename to src/canonical/minisprites/gen6/pokemon/695--0--Heliolisk.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tyrunt.png b/src/canonical/minisprites/gen6/pokemon/696--0--Tyrunt.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tyrunt.png rename to src/canonical/minisprites/gen6/pokemon/696--0--Tyrunt.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tyrantrum.png b/src/canonical/minisprites/gen6/pokemon/697--0--Tyrantrum.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tyrantrum.png rename to src/canonical/minisprites/gen6/pokemon/697--0--Tyrantrum.png diff --git a/src/canonical/minisprites/gen6/pokemon/Amaura.png b/src/canonical/minisprites/gen6/pokemon/698--0--Amaura.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Amaura.png rename to src/canonical/minisprites/gen6/pokemon/698--0--Amaura.png diff --git a/src/canonical/minisprites/gen6/pokemon/Aurorus.png b/src/canonical/minisprites/gen6/pokemon/699--0--Aurorus.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Aurorus.png rename to src/canonical/minisprites/gen6/pokemon/699--0--Aurorus.png diff --git a/src/canonical/minisprites/gen6/pokemon/Squirtle.png b/src/canonical/minisprites/gen6/pokemon/7--0--Squirtle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Squirtle.png rename to src/canonical/minisprites/gen6/pokemon/7--0--Squirtle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Weepinbell.png b/src/canonical/minisprites/gen6/pokemon/70--0--Weepinbell.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Weepinbell.png rename to src/canonical/minisprites/gen6/pokemon/70--0--Weepinbell.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sylveon.png b/src/canonical/minisprites/gen6/pokemon/700--0--Sylveon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sylveon.png rename to src/canonical/minisprites/gen6/pokemon/700--0--Sylveon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Hawlucha.png b/src/canonical/minisprites/gen6/pokemon/701--0--Hawlucha.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Hawlucha.png rename to src/canonical/minisprites/gen6/pokemon/701--0--Hawlucha.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dedenne.png b/src/canonical/minisprites/gen6/pokemon/702--0--Dedenne.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dedenne.png rename to src/canonical/minisprites/gen6/pokemon/702--0--Dedenne.png diff --git a/src/canonical/minisprites/gen6/pokemon/Carbink.png b/src/canonical/minisprites/gen6/pokemon/703--0--Carbink.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Carbink.png rename to src/canonical/minisprites/gen6/pokemon/703--0--Carbink.png diff --git a/src/canonical/minisprites/gen6/pokemon/Goomy.png b/src/canonical/minisprites/gen6/pokemon/704--0--Goomy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Goomy.png rename to src/canonical/minisprites/gen6/pokemon/704--0--Goomy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sliggoo.png b/src/canonical/minisprites/gen6/pokemon/705--0--Sliggoo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sliggoo.png rename to src/canonical/minisprites/gen6/pokemon/705--0--Sliggoo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Goodra.png b/src/canonical/minisprites/gen6/pokemon/706--0--Goodra.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Goodra.png rename to src/canonical/minisprites/gen6/pokemon/706--0--Goodra.png diff --git a/src/canonical/minisprites/gen6/pokemon/Klefki.png b/src/canonical/minisprites/gen6/pokemon/707--0--Klefki.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Klefki.png rename to src/canonical/minisprites/gen6/pokemon/707--0--Klefki.png diff --git a/src/canonical/minisprites/gen6/pokemon/Phantump.png b/src/canonical/minisprites/gen6/pokemon/708--0--Phantump.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Phantump.png rename to src/canonical/minisprites/gen6/pokemon/708--0--Phantump.png diff --git a/src/canonical/minisprites/gen6/pokemon/Trevenant.png b/src/canonical/minisprites/gen6/pokemon/709--0--Trevenant.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Trevenant.png rename to src/canonical/minisprites/gen6/pokemon/709--0--Trevenant.png diff --git a/src/canonical/minisprites/gen6/pokemon/Victreebel.png b/src/canonical/minisprites/gen6/pokemon/71--0--Victreebel.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Victreebel.png rename to src/canonical/minisprites/gen6/pokemon/71--0--Victreebel.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pumpkaboo.png b/src/canonical/minisprites/gen6/pokemon/710--0--Pumpkaboo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pumpkaboo.png rename to src/canonical/minisprites/gen6/pokemon/710--0--Pumpkaboo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gourgeist.png b/src/canonical/minisprites/gen6/pokemon/711--0--Gourgeist.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gourgeist.png rename to src/canonical/minisprites/gen6/pokemon/711--0--Gourgeist.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bergmite.png b/src/canonical/minisprites/gen6/pokemon/712--0--Bergmite.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bergmite.png rename to src/canonical/minisprites/gen6/pokemon/712--0--Bergmite.png diff --git a/src/canonical/minisprites/gen6/pokemon/Avalugg.png b/src/canonical/minisprites/gen6/pokemon/713--0--Avalugg.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Avalugg.png rename to src/canonical/minisprites/gen6/pokemon/713--0--Avalugg.png diff --git a/src/canonical/minisprites/gen6/pokemon/Noibat.png b/src/canonical/minisprites/gen6/pokemon/714--0--Noibat.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Noibat.png rename to src/canonical/minisprites/gen6/pokemon/714--0--Noibat.png diff --git a/src/canonical/minisprites/gen6/pokemon/Noivern.png b/src/canonical/minisprites/gen6/pokemon/715--0--Noivern.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Noivern.png rename to src/canonical/minisprites/gen6/pokemon/715--0--Noivern.png diff --git a/src/canonical/minisprites/gen6/pokemon/Xerneas.png b/src/canonical/minisprites/gen6/pokemon/716--0--Xerneas.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Xerneas.png rename to src/canonical/minisprites/gen6/pokemon/716--0--Xerneas.png diff --git a/src/canonical/minisprites/gen6/pokemon/Yveltal.png b/src/canonical/minisprites/gen6/pokemon/717--0--Yveltal.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Yveltal.png rename to src/canonical/minisprites/gen6/pokemon/717--0--Yveltal.png diff --git a/src/canonical/minisprites/gen6/pokemon/Zygarde.png b/src/canonical/minisprites/gen6/pokemon/718--0--Zygarde.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Zygarde.png rename to src/canonical/minisprites/gen6/pokemon/718--0--Zygarde.png diff --git a/src/canonical/minisprites/gen6/pokemon/Zygarde--10__0025.png b/src/canonical/minisprites/gen6/pokemon/718--420--Zygarde--10__0025.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Zygarde--10__0025.png rename to src/canonical/minisprites/gen6/pokemon/718--420--Zygarde--10__0025.png diff --git a/src/canonical/minisprites/gen6/pokemon/Zygarde--Complete.png b/src/canonical/minisprites/gen6/pokemon/718--420--Zygarde--Complete.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Zygarde--Complete.png rename to src/canonical/minisprites/gen6/pokemon/718--420--Zygarde--Complete.png diff --git a/src/canonical/minisprites/gen6/pokemon/Diancie.png b/src/canonical/minisprites/gen6/pokemon/719--0--Diancie.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Diancie.png rename to src/canonical/minisprites/gen6/pokemon/719--0--Diancie.png diff --git a/src/canonical/minisprites/gen6/pokemon/Diancie--Mega.png b/src/canonical/minisprites/gen6/pokemon/719--420--Diancie--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Diancie--Mega.png rename to src/canonical/minisprites/gen6/pokemon/719--420--Diancie--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tentacool.png b/src/canonical/minisprites/gen6/pokemon/72--0--Tentacool.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tentacool.png rename to src/canonical/minisprites/gen6/pokemon/72--0--Tentacool.png diff --git a/src/canonical/minisprites/gen6/pokemon/Hoopa.png b/src/canonical/minisprites/gen6/pokemon/720--0--Hoopa.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Hoopa.png rename to src/canonical/minisprites/gen6/pokemon/720--0--Hoopa.png diff --git a/src/canonical/minisprites/gen6/pokemon/Hoopa--Unbound.png b/src/canonical/minisprites/gen6/pokemon/720--420--Hoopa--Unbound.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Hoopa--Unbound.png rename to src/canonical/minisprites/gen6/pokemon/720--420--Hoopa--Unbound.png diff --git a/src/canonical/minisprites/gen6/pokemon/Volcanion.png b/src/canonical/minisprites/gen6/pokemon/721--0--Volcanion.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Volcanion.png rename to src/canonical/minisprites/gen6/pokemon/721--0--Volcanion.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rowlet.png b/src/canonical/minisprites/gen6/pokemon/722--0--Rowlet.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rowlet.png rename to src/canonical/minisprites/gen6/pokemon/722--0--Rowlet.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dartrix.png b/src/canonical/minisprites/gen6/pokemon/723--0--Dartrix.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dartrix.png rename to src/canonical/minisprites/gen6/pokemon/723--0--Dartrix.png diff --git a/src/canonical/minisprites/gen6/pokemon/Decidueye.png b/src/canonical/minisprites/gen6/pokemon/724--0--Decidueye.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Decidueye.png rename to src/canonical/minisprites/gen6/pokemon/724--0--Decidueye.png diff --git a/src/canonical/minisprites/gen6/pokemon/Litten.png b/src/canonical/minisprites/gen6/pokemon/725--0--Litten.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Litten.png rename to src/canonical/minisprites/gen6/pokemon/725--0--Litten.png diff --git a/src/canonical/minisprites/gen6/pokemon/Torracat.png b/src/canonical/minisprites/gen6/pokemon/726--0--Torracat.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Torracat.png rename to src/canonical/minisprites/gen6/pokemon/726--0--Torracat.png diff --git a/src/canonical/minisprites/gen6/pokemon/Incineroar.png b/src/canonical/minisprites/gen6/pokemon/727--0--Incineroar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Incineroar.png rename to src/canonical/minisprites/gen6/pokemon/727--0--Incineroar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Popplio.png b/src/canonical/minisprites/gen6/pokemon/728--0--Popplio.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Popplio.png rename to src/canonical/minisprites/gen6/pokemon/728--0--Popplio.png diff --git a/src/canonical/minisprites/gen6/pokemon/Brionne.png b/src/canonical/minisprites/gen6/pokemon/729--0--Brionne.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Brionne.png rename to src/canonical/minisprites/gen6/pokemon/729--0--Brionne.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tentacruel.png b/src/canonical/minisprites/gen6/pokemon/73--0--Tentacruel.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tentacruel.png rename to src/canonical/minisprites/gen6/pokemon/73--0--Tentacruel.png diff --git a/src/canonical/minisprites/gen6/pokemon/Primarina.png b/src/canonical/minisprites/gen6/pokemon/730--0--Primarina.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Primarina.png rename to src/canonical/minisprites/gen6/pokemon/730--0--Primarina.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pikipek.png b/src/canonical/minisprites/gen6/pokemon/731--0--Pikipek.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pikipek.png rename to src/canonical/minisprites/gen6/pokemon/731--0--Pikipek.png diff --git a/src/canonical/minisprites/gen6/pokemon/Trumbeak.png b/src/canonical/minisprites/gen6/pokemon/732--0--Trumbeak.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Trumbeak.png rename to src/canonical/minisprites/gen6/pokemon/732--0--Trumbeak.png diff --git a/src/canonical/minisprites/gen6/pokemon/Toucannon.png b/src/canonical/minisprites/gen6/pokemon/733--0--Toucannon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Toucannon.png rename to src/canonical/minisprites/gen6/pokemon/733--0--Toucannon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Yungoos.png b/src/canonical/minisprites/gen6/pokemon/734--0--Yungoos.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Yungoos.png rename to src/canonical/minisprites/gen6/pokemon/734--0--Yungoos.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gumshoos.png b/src/canonical/minisprites/gen6/pokemon/735--0--Gumshoos.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gumshoos.png rename to src/canonical/minisprites/gen6/pokemon/735--0--Gumshoos.png diff --git a/src/canonical/minisprites/gen6/pokemon/Grubbin.png b/src/canonical/minisprites/gen6/pokemon/736--0--Grubbin.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Grubbin.png rename to src/canonical/minisprites/gen6/pokemon/736--0--Grubbin.png diff --git a/src/canonical/minisprites/gen6/pokemon/Charjabug.png b/src/canonical/minisprites/gen6/pokemon/737--0--Charjabug.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Charjabug.png rename to src/canonical/minisprites/gen6/pokemon/737--0--Charjabug.png diff --git a/src/canonical/minisprites/gen6/pokemon/Vikavolt.png b/src/canonical/minisprites/gen6/pokemon/738--0--Vikavolt.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Vikavolt.png rename to src/canonical/minisprites/gen6/pokemon/738--0--Vikavolt.png diff --git a/src/canonical/minisprites/gen6/pokemon/Crabrawler.png b/src/canonical/minisprites/gen6/pokemon/739--0--Crabrawler.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Crabrawler.png rename to src/canonical/minisprites/gen6/pokemon/739--0--Crabrawler.png diff --git a/src/canonical/minisprites/gen6/pokemon/Geodude.png b/src/canonical/minisprites/gen6/pokemon/74--0--Geodude.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Geodude.png rename to src/canonical/minisprites/gen6/pokemon/74--0--Geodude.png diff --git a/src/canonical/minisprites/gen6/pokemon/Geodude--Alola.png b/src/canonical/minisprites/gen6/pokemon/74--420--Geodude--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Geodude--Alola.png rename to src/canonical/minisprites/gen6/pokemon/74--420--Geodude--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Crabominable.png b/src/canonical/minisprites/gen6/pokemon/740--0--Crabominable.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Crabominable.png rename to src/canonical/minisprites/gen6/pokemon/740--0--Crabominable.png diff --git a/src/canonical/minisprites/gen6/pokemon/Oricorio.png b/src/canonical/minisprites/gen6/pokemon/741--0--Oricorio.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Oricorio.png rename to src/canonical/minisprites/gen6/pokemon/741--0--Oricorio.png diff --git a/src/canonical/minisprites/gen6/pokemon/Oricorio--Pa__0027u.png b/src/canonical/minisprites/gen6/pokemon/741--420--Oricorio--Pa__0027u.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Oricorio--Pa__0027u.png rename to src/canonical/minisprites/gen6/pokemon/741--420--Oricorio--Pa__0027u.png diff --git a/src/canonical/minisprites/gen6/pokemon/Oricorio--Pom-Pom.png b/src/canonical/minisprites/gen6/pokemon/741--420--Oricorio--Pom-Pom.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Oricorio--Pom-Pom.png rename to src/canonical/minisprites/gen6/pokemon/741--420--Oricorio--Pom-Pom.png diff --git a/src/canonical/minisprites/gen6/pokemon/Oricorio--Sensu.png b/src/canonical/minisprites/gen6/pokemon/741--420--Oricorio--Sensu.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Oricorio--Sensu.png rename to src/canonical/minisprites/gen6/pokemon/741--420--Oricorio--Sensu.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cutiefly.png b/src/canonical/minisprites/gen6/pokemon/742--0--Cutiefly.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cutiefly.png rename to src/canonical/minisprites/gen6/pokemon/742--0--Cutiefly.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ribombee.png b/src/canonical/minisprites/gen6/pokemon/743--0--Ribombee.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ribombee.png rename to src/canonical/minisprites/gen6/pokemon/743--0--Ribombee.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rockruff.png b/src/canonical/minisprites/gen6/pokemon/744--0--Rockruff.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rockruff.png rename to src/canonical/minisprites/gen6/pokemon/744--0--Rockruff.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lycanroc.png b/src/canonical/minisprites/gen6/pokemon/745--0--Lycanroc.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lycanroc.png rename to src/canonical/minisprites/gen6/pokemon/745--0--Lycanroc.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lycanroc--Dusk.png b/src/canonical/minisprites/gen6/pokemon/745--420--Lycanroc--Dusk.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lycanroc--Dusk.png rename to src/canonical/minisprites/gen6/pokemon/745--420--Lycanroc--Dusk.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lycanroc--Midnight.png b/src/canonical/minisprites/gen6/pokemon/745--420--Lycanroc--Midnight.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lycanroc--Midnight.png rename to src/canonical/minisprites/gen6/pokemon/745--420--Lycanroc--Midnight.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wishiwashi.png b/src/canonical/minisprites/gen6/pokemon/746--0--Wishiwashi.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wishiwashi.png rename to src/canonical/minisprites/gen6/pokemon/746--0--Wishiwashi.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wishiwashi--School.png b/src/canonical/minisprites/gen6/pokemon/746--420--Wishiwashi--School.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wishiwashi--School.png rename to src/canonical/minisprites/gen6/pokemon/746--420--Wishiwashi--School.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mareanie.png b/src/canonical/minisprites/gen6/pokemon/747--0--Mareanie.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mareanie.png rename to src/canonical/minisprites/gen6/pokemon/747--0--Mareanie.png diff --git a/src/canonical/minisprites/gen6/pokemon/Toxapex.png b/src/canonical/minisprites/gen6/pokemon/748--0--Toxapex.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Toxapex.png rename to src/canonical/minisprites/gen6/pokemon/748--0--Toxapex.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mudbray.png b/src/canonical/minisprites/gen6/pokemon/749--0--Mudbray.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mudbray.png rename to src/canonical/minisprites/gen6/pokemon/749--0--Mudbray.png diff --git a/src/canonical/minisprites/gen6/pokemon/Graveler.png b/src/canonical/minisprites/gen6/pokemon/75--0--Graveler.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Graveler.png rename to src/canonical/minisprites/gen6/pokemon/75--0--Graveler.png diff --git a/src/canonical/minisprites/gen6/pokemon/Graveler--Alola.png b/src/canonical/minisprites/gen6/pokemon/75--420--Graveler--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Graveler--Alola.png rename to src/canonical/minisprites/gen6/pokemon/75--420--Graveler--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mudsdale.png b/src/canonical/minisprites/gen6/pokemon/750--0--Mudsdale.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mudsdale.png rename to src/canonical/minisprites/gen6/pokemon/750--0--Mudsdale.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dewpider.png b/src/canonical/minisprites/gen6/pokemon/751--0--Dewpider.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dewpider.png rename to src/canonical/minisprites/gen6/pokemon/751--0--Dewpider.png diff --git a/src/canonical/minisprites/gen6/pokemon/Araquanid.png b/src/canonical/minisprites/gen6/pokemon/752--0--Araquanid.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Araquanid.png rename to src/canonical/minisprites/gen6/pokemon/752--0--Araquanid.png diff --git a/src/canonical/minisprites/gen6/pokemon/Fomantis.png b/src/canonical/minisprites/gen6/pokemon/753--0--Fomantis.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Fomantis.png rename to src/canonical/minisprites/gen6/pokemon/753--0--Fomantis.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lurantis.png b/src/canonical/minisprites/gen6/pokemon/754--0--Lurantis.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lurantis.png rename to src/canonical/minisprites/gen6/pokemon/754--0--Lurantis.png diff --git a/src/canonical/minisprites/gen6/pokemon/Morelull.png b/src/canonical/minisprites/gen6/pokemon/755--0--Morelull.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Morelull.png rename to src/canonical/minisprites/gen6/pokemon/755--0--Morelull.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shiinotic.png b/src/canonical/minisprites/gen6/pokemon/756--0--Shiinotic.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shiinotic.png rename to src/canonical/minisprites/gen6/pokemon/756--0--Shiinotic.png diff --git a/src/canonical/minisprites/gen6/pokemon/Salandit.png b/src/canonical/minisprites/gen6/pokemon/757--0--Salandit.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Salandit.png rename to src/canonical/minisprites/gen6/pokemon/757--0--Salandit.png diff --git a/src/canonical/minisprites/gen6/pokemon/Salazzle.png b/src/canonical/minisprites/gen6/pokemon/758--0--Salazzle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Salazzle.png rename to src/canonical/minisprites/gen6/pokemon/758--0--Salazzle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Stufful.png b/src/canonical/minisprites/gen6/pokemon/759--0--Stufful.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Stufful.png rename to src/canonical/minisprites/gen6/pokemon/759--0--Stufful.png diff --git a/src/canonical/minisprites/gen6/pokemon/Golem.png b/src/canonical/minisprites/gen6/pokemon/76--0--Golem.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Golem.png rename to src/canonical/minisprites/gen6/pokemon/76--0--Golem.png diff --git a/src/canonical/minisprites/gen6/pokemon/Golem--Alola.png b/src/canonical/minisprites/gen6/pokemon/76--420--Golem--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Golem--Alola.png rename to src/canonical/minisprites/gen6/pokemon/76--420--Golem--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bewear.png b/src/canonical/minisprites/gen6/pokemon/760--0--Bewear.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bewear.png rename to src/canonical/minisprites/gen6/pokemon/760--0--Bewear.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bounsweet.png b/src/canonical/minisprites/gen6/pokemon/761--0--Bounsweet.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bounsweet.png rename to src/canonical/minisprites/gen6/pokemon/761--0--Bounsweet.png diff --git a/src/canonical/minisprites/gen6/pokemon/Steenee.png b/src/canonical/minisprites/gen6/pokemon/762--0--Steenee.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Steenee.png rename to src/canonical/minisprites/gen6/pokemon/762--0--Steenee.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tsareena.png b/src/canonical/minisprites/gen6/pokemon/763--0--Tsareena.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tsareena.png rename to src/canonical/minisprites/gen6/pokemon/763--0--Tsareena.png diff --git a/src/canonical/minisprites/gen6/pokemon/Comfey.png b/src/canonical/minisprites/gen6/pokemon/764--0--Comfey.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Comfey.png rename to src/canonical/minisprites/gen6/pokemon/764--0--Comfey.png diff --git a/src/canonical/minisprites/gen6/pokemon/Oranguru.png b/src/canonical/minisprites/gen6/pokemon/765--0--Oranguru.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Oranguru.png rename to src/canonical/minisprites/gen6/pokemon/765--0--Oranguru.png diff --git a/src/canonical/minisprites/gen6/pokemon/Passimian.png b/src/canonical/minisprites/gen6/pokemon/766--0--Passimian.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Passimian.png rename to src/canonical/minisprites/gen6/pokemon/766--0--Passimian.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wimpod.png b/src/canonical/minisprites/gen6/pokemon/767--0--Wimpod.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wimpod.png rename to src/canonical/minisprites/gen6/pokemon/767--0--Wimpod.png diff --git a/src/canonical/minisprites/gen6/pokemon/Golisopod.png b/src/canonical/minisprites/gen6/pokemon/768--0--Golisopod.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Golisopod.png rename to src/canonical/minisprites/gen6/pokemon/768--0--Golisopod.png diff --git a/src/canonical/minisprites/gen6/pokemon/Sandygast.png b/src/canonical/minisprites/gen6/pokemon/769--0--Sandygast.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Sandygast.png rename to src/canonical/minisprites/gen6/pokemon/769--0--Sandygast.png diff --git a/src/canonical/minisprites/gen6/pokemon/Ponyta.png b/src/canonical/minisprites/gen6/pokemon/77--0--Ponyta.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Ponyta.png rename to src/canonical/minisprites/gen6/pokemon/77--0--Ponyta.png diff --git a/src/canonical/minisprites/gen6/pokemon/Palossand.png b/src/canonical/minisprites/gen6/pokemon/770--0--Palossand.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Palossand.png rename to src/canonical/minisprites/gen6/pokemon/770--0--Palossand.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pyukumuku.png b/src/canonical/minisprites/gen6/pokemon/771--0--Pyukumuku.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pyukumuku.png rename to src/canonical/minisprites/gen6/pokemon/771--0--Pyukumuku.png diff --git a/src/canonical/minisprites/gen6/pokemon/Type__003a_Null.png b/src/canonical/minisprites/gen6/pokemon/772--0--Type__003a_Null.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Type__003a_Null.png rename to src/canonical/minisprites/gen6/pokemon/772--0--Type__003a_Null.png diff --git a/src/canonical/minisprites/gen6/pokemon/Silvally.png b/src/canonical/minisprites/gen6/pokemon/773--0--Silvally.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Silvally.png rename to src/canonical/minisprites/gen6/pokemon/773--0--Silvally.png diff --git a/src/canonical/minisprites/gen6/pokemon/Minior.png b/src/canonical/minisprites/gen6/pokemon/774--0--Minior.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Minior.png rename to src/canonical/minisprites/gen6/pokemon/774--0--Minior.png diff --git a/src/canonical/minisprites/gen6/pokemon/Minior--Blue.png b/src/canonical/minisprites/gen6/pokemon/774--420--Minior--Blue.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Minior--Blue.png rename to src/canonical/minisprites/gen6/pokemon/774--420--Minior--Blue.png diff --git a/src/canonical/minisprites/gen6/pokemon/Minior--Green.png b/src/canonical/minisprites/gen6/pokemon/774--420--Minior--Green.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Minior--Green.png rename to src/canonical/minisprites/gen6/pokemon/774--420--Minior--Green.png diff --git a/src/canonical/minisprites/gen6/pokemon/Minior--Inidgo.png b/src/canonical/minisprites/gen6/pokemon/774--420--Minior--Inidgo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Minior--Inidgo.png rename to src/canonical/minisprites/gen6/pokemon/774--420--Minior--Inidgo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Minior--Meteor.png b/src/canonical/minisprites/gen6/pokemon/774--420--Minior--Meteor.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Minior--Meteor.png rename to src/canonical/minisprites/gen6/pokemon/774--420--Minior--Meteor.png diff --git a/src/canonical/minisprites/gen6/pokemon/Minior--Orange.png b/src/canonical/minisprites/gen6/pokemon/774--420--Minior--Orange.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Minior--Orange.png rename to src/canonical/minisprites/gen6/pokemon/774--420--Minior--Orange.png diff --git a/src/canonical/minisprites/gen6/pokemon/Minior--Violet.png b/src/canonical/minisprites/gen6/pokemon/774--420--Minior--Violet.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Minior--Violet.png rename to src/canonical/minisprites/gen6/pokemon/774--420--Minior--Violet.png diff --git a/src/canonical/minisprites/gen6/pokemon/Minior--Yellow.png b/src/canonical/minisprites/gen6/pokemon/774--420--Minior--Yellow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Minior--Yellow.png rename to src/canonical/minisprites/gen6/pokemon/774--420--Minior--Yellow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Komala.png b/src/canonical/minisprites/gen6/pokemon/775--0--Komala.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Komala.png rename to src/canonical/minisprites/gen6/pokemon/775--0--Komala.png diff --git a/src/canonical/minisprites/gen6/pokemon/Turtonator.png b/src/canonical/minisprites/gen6/pokemon/776--0--Turtonator.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Turtonator.png rename to src/canonical/minisprites/gen6/pokemon/776--0--Turtonator.png diff --git a/src/canonical/minisprites/gen6/pokemon/Togedemaru.png b/src/canonical/minisprites/gen6/pokemon/777--0--Togedemaru.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Togedemaru.png rename to src/canonical/minisprites/gen6/pokemon/777--0--Togedemaru.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mimikyu.png b/src/canonical/minisprites/gen6/pokemon/778--0--Mimikyu.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mimikyu.png rename to src/canonical/minisprites/gen6/pokemon/778--0--Mimikyu.png diff --git a/src/canonical/minisprites/gen6/pokemon/Bruxish.png b/src/canonical/minisprites/gen6/pokemon/779--0--Bruxish.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Bruxish.png rename to src/canonical/minisprites/gen6/pokemon/779--0--Bruxish.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rapidash.png b/src/canonical/minisprites/gen6/pokemon/78--0--Rapidash.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rapidash.png rename to src/canonical/minisprites/gen6/pokemon/78--0--Rapidash.png diff --git a/src/canonical/minisprites/gen6/pokemon/Drampa.png b/src/canonical/minisprites/gen6/pokemon/780--0--Drampa.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Drampa.png rename to src/canonical/minisprites/gen6/pokemon/780--0--Drampa.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dhelmise.png b/src/canonical/minisprites/gen6/pokemon/781--0--Dhelmise.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dhelmise.png rename to src/canonical/minisprites/gen6/pokemon/781--0--Dhelmise.png diff --git a/src/canonical/minisprites/gen6/pokemon/Jangmo-o.png b/src/canonical/minisprites/gen6/pokemon/782--0--Jangmo-o.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Jangmo-o.png rename to src/canonical/minisprites/gen6/pokemon/782--0--Jangmo-o.png diff --git a/src/canonical/minisprites/gen6/pokemon/Hakamo-o.png b/src/canonical/minisprites/gen6/pokemon/783--0--Hakamo-o.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Hakamo-o.png rename to src/canonical/minisprites/gen6/pokemon/783--0--Hakamo-o.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kommo-o.png b/src/canonical/minisprites/gen6/pokemon/784--0--Kommo-o.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kommo-o.png rename to src/canonical/minisprites/gen6/pokemon/784--0--Kommo-o.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tapu_Koko.png b/src/canonical/minisprites/gen6/pokemon/785--0--Tapu_Koko.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tapu_Koko.png rename to src/canonical/minisprites/gen6/pokemon/785--0--Tapu_Koko.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tapu_Lele.png b/src/canonical/minisprites/gen6/pokemon/786--0--Tapu_Lele.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tapu_Lele.png rename to src/canonical/minisprites/gen6/pokemon/786--0--Tapu_Lele.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tapu_Bulu.png b/src/canonical/minisprites/gen6/pokemon/787--0--Tapu_Bulu.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tapu_Bulu.png rename to src/canonical/minisprites/gen6/pokemon/787--0--Tapu_Bulu.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tapu_Fini.png b/src/canonical/minisprites/gen6/pokemon/788--0--Tapu_Fini.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tapu_Fini.png rename to src/canonical/minisprites/gen6/pokemon/788--0--Tapu_Fini.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cosmog.png b/src/canonical/minisprites/gen6/pokemon/789--0--Cosmog.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cosmog.png rename to src/canonical/minisprites/gen6/pokemon/789--0--Cosmog.png diff --git a/src/canonical/minisprites/gen6/pokemon/Slowpoke.png b/src/canonical/minisprites/gen6/pokemon/79--0--Slowpoke.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Slowpoke.png rename to src/canonical/minisprites/gen6/pokemon/79--0--Slowpoke.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cosmoem.png b/src/canonical/minisprites/gen6/pokemon/790--0--Cosmoem.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cosmoem.png rename to src/canonical/minisprites/gen6/pokemon/790--0--Cosmoem.png diff --git a/src/canonical/minisprites/gen6/pokemon/Solgaleo.png b/src/canonical/minisprites/gen6/pokemon/791--0--Solgaleo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Solgaleo.png rename to src/canonical/minisprites/gen6/pokemon/791--0--Solgaleo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Lunala.png b/src/canonical/minisprites/gen6/pokemon/792--0--Lunala.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Lunala.png rename to src/canonical/minisprites/gen6/pokemon/792--0--Lunala.png diff --git a/src/canonical/minisprites/gen6/pokemon/Nihilego.png b/src/canonical/minisprites/gen6/pokemon/793--0--Nihilego.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Nihilego.png rename to src/canonical/minisprites/gen6/pokemon/793--0--Nihilego.png diff --git a/src/canonical/minisprites/gen6/pokemon/Buzzwole.png b/src/canonical/minisprites/gen6/pokemon/794--0--Buzzwole.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Buzzwole.png rename to src/canonical/minisprites/gen6/pokemon/794--0--Buzzwole.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pheromosa.png b/src/canonical/minisprites/gen6/pokemon/795--0--Pheromosa.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pheromosa.png rename to src/canonical/minisprites/gen6/pokemon/795--0--Pheromosa.png diff --git a/src/canonical/minisprites/gen6/pokemon/Xurkitree.png b/src/canonical/minisprites/gen6/pokemon/796--0--Xurkitree.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Xurkitree.png rename to src/canonical/minisprites/gen6/pokemon/796--0--Xurkitree.png diff --git a/src/canonical/minisprites/gen6/pokemon/Celesteela.png b/src/canonical/minisprites/gen6/pokemon/797--0--Celesteela.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Celesteela.png rename to src/canonical/minisprites/gen6/pokemon/797--0--Celesteela.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kartana.png b/src/canonical/minisprites/gen6/pokemon/798--0--Kartana.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kartana.png rename to src/canonical/minisprites/gen6/pokemon/798--0--Kartana.png diff --git a/src/canonical/minisprites/gen6/pokemon/Guzzlord.png b/src/canonical/minisprites/gen6/pokemon/799--0--Guzzlord.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Guzzlord.png rename to src/canonical/minisprites/gen6/pokemon/799--0--Guzzlord.png diff --git a/src/canonical/minisprites/gen6/pokemon/Wartortle.png b/src/canonical/minisprites/gen6/pokemon/8--0--Wartortle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Wartortle.png rename to src/canonical/minisprites/gen6/pokemon/8--0--Wartortle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Slowbro.png b/src/canonical/minisprites/gen6/pokemon/80--0--Slowbro.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Slowbro.png rename to src/canonical/minisprites/gen6/pokemon/80--0--Slowbro.png diff --git a/src/canonical/minisprites/gen6/pokemon/Slowbro--Mega.png b/src/canonical/minisprites/gen6/pokemon/80--420--Slowbro--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Slowbro--Mega.png rename to src/canonical/minisprites/gen6/pokemon/80--420--Slowbro--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Necrozma.png b/src/canonical/minisprites/gen6/pokemon/800--0--Necrozma.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Necrozma.png rename to src/canonical/minisprites/gen6/pokemon/800--0--Necrozma.png diff --git a/src/canonical/minisprites/gen6/pokemon/Necrozma--Dawn_Wings.png b/src/canonical/minisprites/gen6/pokemon/800--420--Necrozma--Dawn_Wings.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Necrozma--Dawn_Wings.png rename to src/canonical/minisprites/gen6/pokemon/800--420--Necrozma--Dawn_Wings.png diff --git a/src/canonical/minisprites/gen6/pokemon/Necrozma--Dusk_Mane.png b/src/canonical/minisprites/gen6/pokemon/800--420--Necrozma--Dusk_Mane.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Necrozma--Dusk_Mane.png rename to src/canonical/minisprites/gen6/pokemon/800--420--Necrozma--Dusk_Mane.png diff --git a/src/canonical/minisprites/gen6/pokemon/Necrozma--Ultra.png b/src/canonical/minisprites/gen6/pokemon/800--420--Necrozma--Ultra.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Necrozma--Ultra.png rename to src/canonical/minisprites/gen6/pokemon/800--420--Necrozma--Ultra.png diff --git a/src/canonical/minisprites/gen6/pokemon/Magearna.png b/src/canonical/minisprites/gen6/pokemon/801--0--Magearna.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Magearna.png rename to src/canonical/minisprites/gen6/pokemon/801--0--Magearna.png diff --git a/src/canonical/minisprites/gen6/pokemon/Magearna--Original.png b/src/canonical/minisprites/gen6/pokemon/801--420--Magearna--Original.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Magearna--Original.png rename to src/canonical/minisprites/gen6/pokemon/801--420--Magearna--Original.png diff --git a/src/canonical/minisprites/gen6/pokemon/Marshadow.png b/src/canonical/minisprites/gen6/pokemon/802--0--Marshadow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Marshadow.png rename to src/canonical/minisprites/gen6/pokemon/802--0--Marshadow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Poipole.png b/src/canonical/minisprites/gen6/pokemon/803--0--Poipole.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Poipole.png rename to src/canonical/minisprites/gen6/pokemon/803--0--Poipole.png diff --git a/src/canonical/minisprites/gen6/pokemon/Naganadel.png b/src/canonical/minisprites/gen6/pokemon/804--0--Naganadel.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Naganadel.png rename to src/canonical/minisprites/gen6/pokemon/804--0--Naganadel.png diff --git a/src/canonical/minisprites/gen6/pokemon/Stakataka.png b/src/canonical/minisprites/gen6/pokemon/805--0--Stakataka.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Stakataka.png rename to src/canonical/minisprites/gen6/pokemon/805--0--Stakataka.png diff --git a/src/canonical/minisprites/gen6/pokemon/Blacephalon.png b/src/canonical/minisprites/gen6/pokemon/806--0--Blacephalon.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Blacephalon.png rename to src/canonical/minisprites/gen6/pokemon/806--0--Blacephalon.png diff --git a/src/canonical/minisprites/gen6/pokemon/Zeraora.png b/src/canonical/minisprites/gen6/pokemon/807--0--Zeraora.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Zeraora.png rename to src/canonical/minisprites/gen6/pokemon/807--0--Zeraora.png diff --git a/src/canonical/minisprites/gen6/pokemon/Meltan.png b/src/canonical/minisprites/gen6/pokemon/808--0--Meltan.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Meltan.png rename to src/canonical/minisprites/gen6/pokemon/808--0--Meltan.png diff --git a/src/canonical/minisprites/gen6/pokemon/Magnemite.png b/src/canonical/minisprites/gen6/pokemon/81--0--Magnemite.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Magnemite.png rename to src/canonical/minisprites/gen6/pokemon/81--0--Magnemite.png diff --git a/src/canonical/minisprites/gen6/pokemon/Magneton.png b/src/canonical/minisprites/gen6/pokemon/82--0--Magneton.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Magneton.png rename to src/canonical/minisprites/gen6/pokemon/82--0--Magneton.png diff --git a/src/canonical/minisprites/gen6/pokemon/Farfetch__0027d.png b/src/canonical/minisprites/gen6/pokemon/83--0--Farfetch__0027d.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Farfetch__0027d.png rename to src/canonical/minisprites/gen6/pokemon/83--0--Farfetch__0027d.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rolycoly.png b/src/canonical/minisprites/gen6/pokemon/837--0--Rolycoly.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rolycoly.png rename to src/canonical/minisprites/gen6/pokemon/837--0--Rolycoly.png diff --git a/src/canonical/minisprites/gen6/pokemon/Doduo.png b/src/canonical/minisprites/gen6/pokemon/84--0--Doduo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Doduo.png rename to src/canonical/minisprites/gen6/pokemon/84--0--Doduo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dodrio.png b/src/canonical/minisprites/gen6/pokemon/85--0--Dodrio.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dodrio.png rename to src/canonical/minisprites/gen6/pokemon/85--0--Dodrio.png diff --git a/src/canonical/minisprites/gen6/pokemon/Seel.png b/src/canonical/minisprites/gen6/pokemon/86--0--Seel.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Seel.png rename to src/canonical/minisprites/gen6/pokemon/86--0--Seel.png diff --git a/src/canonical/minisprites/gen6/pokemon/Dewgong.png b/src/canonical/minisprites/gen6/pokemon/87--0--Dewgong.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Dewgong.png rename to src/canonical/minisprites/gen6/pokemon/87--0--Dewgong.png diff --git a/src/canonical/minisprites/gen6/pokemon/Grimer.png b/src/canonical/minisprites/gen6/pokemon/88--0--Grimer.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Grimer.png rename to src/canonical/minisprites/gen6/pokemon/88--0--Grimer.png diff --git a/src/canonical/minisprites/gen6/pokemon/Grimer--Alola.png b/src/canonical/minisprites/gen6/pokemon/88--420--Grimer--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Grimer--Alola.png rename to src/canonical/minisprites/gen6/pokemon/88--420--Grimer--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Muk.png b/src/canonical/minisprites/gen6/pokemon/89--0--Muk.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Muk.png rename to src/canonical/minisprites/gen6/pokemon/89--0--Muk.png diff --git a/src/canonical/minisprites/gen6/pokemon/Muk--Alola.png b/src/canonical/minisprites/gen6/pokemon/89--420--Muk--Alola.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Muk--Alola.png rename to src/canonical/minisprites/gen6/pokemon/89--420--Muk--Alola.png diff --git a/src/canonical/minisprites/gen6/pokemon/Blastoise.png b/src/canonical/minisprites/gen6/pokemon/9--0--Blastoise.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Blastoise.png rename to src/canonical/minisprites/gen6/pokemon/9--0--Blastoise.png diff --git a/src/canonical/minisprites/gen6/pokemon/Blastoise--Mega.png b/src/canonical/minisprites/gen6/pokemon/9--420--Blastoise--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Blastoise--Mega.png rename to src/canonical/minisprites/gen6/pokemon/9--420--Blastoise--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Shellder.png b/src/canonical/minisprites/gen6/pokemon/90--0--Shellder.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Shellder.png rename to src/canonical/minisprites/gen6/pokemon/90--0--Shellder.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cloyster.png b/src/canonical/minisprites/gen6/pokemon/91--0--Cloyster.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cloyster.png rename to src/canonical/minisprites/gen6/pokemon/91--0--Cloyster.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gastly.png b/src/canonical/minisprites/gen6/pokemon/92--0--Gastly.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gastly.png rename to src/canonical/minisprites/gen6/pokemon/92--0--Gastly.png diff --git a/src/canonical/minisprites/gen6/pokemon/Haunter.png b/src/canonical/minisprites/gen6/pokemon/93--0--Haunter.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Haunter.png rename to src/canonical/minisprites/gen6/pokemon/93--0--Haunter.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gengar.png b/src/canonical/minisprites/gen6/pokemon/94--0--Gengar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gengar.png rename to src/canonical/minisprites/gen6/pokemon/94--0--Gengar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Gengar--Mega.png b/src/canonical/minisprites/gen6/pokemon/94--420--Gengar--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Gengar--Mega.png rename to src/canonical/minisprites/gen6/pokemon/94--420--Gengar--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Onix.png b/src/canonical/minisprites/gen6/pokemon/95--0--Onix.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Onix.png rename to src/canonical/minisprites/gen6/pokemon/95--0--Onix.png diff --git a/src/canonical/minisprites/gen6/pokemon/Drowzee.png b/src/canonical/minisprites/gen6/pokemon/96--0--Drowzee.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Drowzee.png rename to src/canonical/minisprites/gen6/pokemon/96--0--Drowzee.png diff --git a/src/canonical/minisprites/gen6/pokemon/Hypno.png b/src/canonical/minisprites/gen6/pokemon/97--0--Hypno.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Hypno.png rename to src/canonical/minisprites/gen6/pokemon/97--0--Hypno.png diff --git a/src/canonical/minisprites/gen6/pokemon/Krabby.png b/src/canonical/minisprites/gen6/pokemon/98--0--Krabby.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Krabby.png rename to src/canonical/minisprites/gen6/pokemon/98--0--Krabby.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kingler.png b/src/canonical/minisprites/gen6/pokemon/99--0--Kingler.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kingler.png rename to src/canonical/minisprites/gen6/pokemon/99--0--Kingler.png diff --git a/src/canonical/minisprites/gen8/pokemon/Bulbasaur.png b/src/canonical/minisprites/gen8/pokemon/1--0--Bulbasaur.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Bulbasaur.png rename to src/canonical/minisprites/gen8/pokemon/1--0--Bulbasaur.png diff --git a/src/canonical/minisprites/gen8/pokemon/Caterpie.png b/src/canonical/minisprites/gen8/pokemon/10--0--Caterpie.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Caterpie.png rename to src/canonical/minisprites/gen8/pokemon/10--0--Caterpie.png diff --git a/src/canonical/minisprites/gen8/pokemon/Hitmonlee.png b/src/canonical/minisprites/gen8/pokemon/106--0--Hitmonlee.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Hitmonlee.png rename to src/canonical/minisprites/gen8/pokemon/106--0--Hitmonlee.png diff --git a/src/canonical/minisprites/gen8/pokemon/Hitmonchan.png b/src/canonical/minisprites/gen8/pokemon/107--0--Hitmonchan.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Hitmonchan.png rename to src/canonical/minisprites/gen8/pokemon/107--0--Hitmonchan.png diff --git a/src/canonical/minisprites/gen8/pokemon/Koffing.png b/src/canonical/minisprites/gen8/pokemon/109--0--Koffing.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Koffing.png rename to src/canonical/minisprites/gen8/pokemon/109--0--Koffing.png diff --git a/src/canonical/minisprites/gen8/pokemon/Metapod.png b/src/canonical/minisprites/gen8/pokemon/11--0--Metapod.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Metapod.png rename to src/canonical/minisprites/gen8/pokemon/11--0--Metapod.png diff --git a/src/canonical/minisprites/gen8/pokemon/Weezing.png b/src/canonical/minisprites/gen8/pokemon/110--0--Weezing.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Weezing.png rename to src/canonical/minisprites/gen8/pokemon/110--0--Weezing.png diff --git a/src/canonical/minisprites/gen8/pokemon/Weezing--Galar.png b/src/canonical/minisprites/gen8/pokemon/110--420--Weezing--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Weezing--Galar.png rename to src/canonical/minisprites/gen8/pokemon/110--420--Weezing--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rhyhorn.png b/src/canonical/minisprites/gen8/pokemon/111--0--Rhyhorn.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rhyhorn.png rename to src/canonical/minisprites/gen8/pokemon/111--0--Rhyhorn.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rhydon.png b/src/canonical/minisprites/gen8/pokemon/112--0--Rhydon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rhydon.png rename to src/canonical/minisprites/gen8/pokemon/112--0--Rhydon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Goldeen.png b/src/canonical/minisprites/gen8/pokemon/118--0--Goldeen.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Goldeen.png rename to src/canonical/minisprites/gen8/pokemon/118--0--Goldeen.png diff --git a/src/canonical/minisprites/gen8/pokemon/Seaking.png b/src/canonical/minisprites/gen8/pokemon/119--0--Seaking.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Seaking.png rename to src/canonical/minisprites/gen8/pokemon/119--0--Seaking.png diff --git a/src/canonical/minisprites/gen8/pokemon/Butterfree.png b/src/canonical/minisprites/gen8/pokemon/12--0--Butterfree.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Butterfree.png rename to src/canonical/minisprites/gen8/pokemon/12--0--Butterfree.png diff --git a/src/canonical/minisprites/gen8/pokemon/Butterfree--Gmax.png b/src/canonical/minisprites/gen8/pokemon/12--420--Butterfree--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Butterfree--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/12--420--Butterfree--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mr._Mime.png b/src/canonical/minisprites/gen8/pokemon/122--0--Mr._Mime.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mr._Mime.png rename to src/canonical/minisprites/gen8/pokemon/122--0--Mr._Mime.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mr._Mime--Galar.png b/src/canonical/minisprites/gen8/pokemon/122--420--Mr._Mime--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mr._Mime--Galar.png rename to src/canonical/minisprites/gen8/pokemon/122--420--Mr._Mime--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Magikarp.png b/src/canonical/minisprites/gen8/pokemon/129--0--Magikarp.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Magikarp.png rename to src/canonical/minisprites/gen8/pokemon/129--0--Magikarp.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gyarados.png b/src/canonical/minisprites/gen8/pokemon/130--0--Gyarados.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gyarados.png rename to src/canonical/minisprites/gen8/pokemon/130--0--Gyarados.png diff --git a/src/canonical/minisprites/gen8/pokemon/Lapras.png b/src/canonical/minisprites/gen8/pokemon/131--0--Lapras.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Lapras.png rename to src/canonical/minisprites/gen8/pokemon/131--0--Lapras.png diff --git a/src/canonical/minisprites/gen8/pokemon/Lapras--Gmax.png b/src/canonical/minisprites/gen8/pokemon/131--420--Lapras--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Lapras--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/131--420--Lapras--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Ditto.png b/src/canonical/minisprites/gen8/pokemon/132--0--Ditto.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Ditto.png rename to src/canonical/minisprites/gen8/pokemon/132--0--Ditto.png diff --git a/src/canonical/minisprites/gen8/pokemon/Eevee.png b/src/canonical/minisprites/gen8/pokemon/133--0--Eevee.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Eevee.png rename to src/canonical/minisprites/gen8/pokemon/133--0--Eevee.png diff --git a/src/canonical/minisprites/gen8/pokemon/Eevee--Gmax.png b/src/canonical/minisprites/gen8/pokemon/133--420--Eevee--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Eevee--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/133--420--Eevee--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Vaporeon.png b/src/canonical/minisprites/gen8/pokemon/134--0--Vaporeon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Vaporeon.png rename to src/canonical/minisprites/gen8/pokemon/134--0--Vaporeon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Jolteon.png b/src/canonical/minisprites/gen8/pokemon/135--0--Jolteon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Jolteon.png rename to src/canonical/minisprites/gen8/pokemon/135--0--Jolteon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Flareon.png b/src/canonical/minisprites/gen8/pokemon/136--0--Flareon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Flareon.png rename to src/canonical/minisprites/gen8/pokemon/136--0--Flareon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Snorlax.png b/src/canonical/minisprites/gen8/pokemon/143--0--Snorlax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Snorlax.png rename to src/canonical/minisprites/gen8/pokemon/143--0--Snorlax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Snorlax--Gmax.png b/src/canonical/minisprites/gen8/pokemon/143--420--Snorlax--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Snorlax--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/143--420--Snorlax--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mewtwo.png b/src/canonical/minisprites/gen8/pokemon/150--0--Mewtwo.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mewtwo.png rename to src/canonical/minisprites/gen8/pokemon/150--0--Mewtwo.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mew.png b/src/canonical/minisprites/gen8/pokemon/151--0--Mew.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mew.png rename to src/canonical/minisprites/gen8/pokemon/151--0--Mew.png diff --git a/src/canonical/minisprites/gen8/pokemon/Hoothoot.png b/src/canonical/minisprites/gen8/pokemon/163--0--Hoothoot.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Hoothoot.png rename to src/canonical/minisprites/gen8/pokemon/163--0--Hoothoot.png diff --git a/src/canonical/minisprites/gen8/pokemon/Noctowl.png b/src/canonical/minisprites/gen8/pokemon/164--0--Noctowl.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Noctowl.png rename to src/canonical/minisprites/gen8/pokemon/164--0--Noctowl.png diff --git a/src/canonical/minisprites/gen8/pokemon/Chinchou.png b/src/canonical/minisprites/gen8/pokemon/170--0--Chinchou.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Chinchou.png rename to src/canonical/minisprites/gen8/pokemon/170--0--Chinchou.png diff --git a/src/canonical/minisprites/gen8/pokemon/Lanturn.png b/src/canonical/minisprites/gen8/pokemon/171--0--Lanturn.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Lanturn.png rename to src/canonical/minisprites/gen8/pokemon/171--0--Lanturn.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pichu.png b/src/canonical/minisprites/gen8/pokemon/172--0--Pichu.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pichu.png rename to src/canonical/minisprites/gen8/pokemon/172--0--Pichu.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cleffa.png b/src/canonical/minisprites/gen8/pokemon/173--0--Cleffa.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cleffa.png rename to src/canonical/minisprites/gen8/pokemon/173--0--Cleffa.png diff --git a/src/canonical/minisprites/gen8/pokemon/Togepi.png b/src/canonical/minisprites/gen8/pokemon/175--0--Togepi.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Togepi.png rename to src/canonical/minisprites/gen8/pokemon/175--0--Togepi.png diff --git a/src/canonical/minisprites/gen8/pokemon/Togetic.png b/src/canonical/minisprites/gen8/pokemon/176--0--Togetic.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Togetic.png rename to src/canonical/minisprites/gen8/pokemon/176--0--Togetic.png diff --git a/src/canonical/minisprites/gen8/pokemon/Natu.png b/src/canonical/minisprites/gen8/pokemon/177--0--Natu.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Natu.png rename to src/canonical/minisprites/gen8/pokemon/177--0--Natu.png diff --git a/src/canonical/minisprites/gen8/pokemon/Xatu.png b/src/canonical/minisprites/gen8/pokemon/178--0--Xatu.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Xatu.png rename to src/canonical/minisprites/gen8/pokemon/178--0--Xatu.png diff --git a/src/canonical/minisprites/gen8/pokemon/Bellossom.png b/src/canonical/minisprites/gen8/pokemon/182--0--Bellossom.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Bellossom.png rename to src/canonical/minisprites/gen8/pokemon/182--0--Bellossom.png diff --git a/src/canonical/minisprites/gen8/pokemon/Sudowoodo.png b/src/canonical/minisprites/gen8/pokemon/185--0--Sudowoodo.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Sudowoodo.png rename to src/canonical/minisprites/gen8/pokemon/185--0--Sudowoodo.png diff --git a/src/canonical/minisprites/gen8/pokemon/Umbreon.png b/src/canonical/minisprites/gen8/pokemon/197--0--Umbreon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Umbreon.png rename to src/canonical/minisprites/gen8/pokemon/197--0--Umbreon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Ivysaur.png b/src/canonical/minisprites/gen8/pokemon/2--0--Ivysaur.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Ivysaur.png rename to src/canonical/minisprites/gen8/pokemon/2--0--Ivysaur.png diff --git a/src/canonical/minisprites/gen8/pokemon/Steelix.png b/src/canonical/minisprites/gen8/pokemon/208--0--Steelix.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Steelix.png rename to src/canonical/minisprites/gen8/pokemon/208--0--Steelix.png diff --git a/src/canonical/minisprites/gen8/pokemon/Sneasel.png b/src/canonical/minisprites/gen8/pokemon/215--0--Sneasel.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Sneasel.png rename to src/canonical/minisprites/gen8/pokemon/215--0--Sneasel.png diff --git a/src/canonical/minisprites/gen8/pokemon/Piloswine.png b/src/canonical/minisprites/gen8/pokemon/221--0--Piloswine.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Piloswine.png rename to src/canonical/minisprites/gen8/pokemon/221--0--Piloswine.png diff --git a/src/canonical/minisprites/gen8/pokemon/Corsola.png b/src/canonical/minisprites/gen8/pokemon/222--0--Corsola.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Corsola.png rename to src/canonical/minisprites/gen8/pokemon/222--0--Corsola.png diff --git a/src/canonical/minisprites/gen8/pokemon/Remoraid.png b/src/canonical/minisprites/gen8/pokemon/223--0--Remoraid.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Remoraid.png rename to src/canonical/minisprites/gen8/pokemon/223--0--Remoraid.png diff --git a/src/canonical/minisprites/gen8/pokemon/Tyrogue.png b/src/canonical/minisprites/gen8/pokemon/236--0--Tyrogue.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Tyrogue.png rename to src/canonical/minisprites/gen8/pokemon/236--0--Tyrogue.png diff --git a/src/canonical/minisprites/gen8/pokemon/Larvitar.png b/src/canonical/minisprites/gen8/pokemon/246--0--Larvitar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Larvitar.png rename to src/canonical/minisprites/gen8/pokemon/246--0--Larvitar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pupitar.png b/src/canonical/minisprites/gen8/pokemon/247--0--Pupitar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pupitar.png rename to src/canonical/minisprites/gen8/pokemon/247--0--Pupitar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Tyranitar.png b/src/canonical/minisprites/gen8/pokemon/248--0--Tyranitar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Tyranitar.png rename to src/canonical/minisprites/gen8/pokemon/248--0--Tyranitar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pikachu.png b/src/canonical/minisprites/gen8/pokemon/25--0--Pikachu.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pikachu.png rename to src/canonical/minisprites/gen8/pokemon/25--0--Pikachu.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pikachu--Alola.png b/src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Alola.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pikachu--Alola.png rename to src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Alola.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pikachu--Gmax.png b/src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pikachu--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pikachu--Hoenn.png b/src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Hoenn.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pikachu--Hoenn.png rename to src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Hoenn.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pikachu--Kalos.png b/src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Kalos.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pikachu--Kalos.png rename to src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Kalos.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pikachu--Original.png b/src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Original.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pikachu--Original.png rename to src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Original.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pikachu--Partner.png b/src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Partner.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pikachu--Partner.png rename to src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Partner.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pikachu--Sinnoh.png b/src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Sinnoh.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pikachu--Sinnoh.png rename to src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Sinnoh.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pikachu--Unova.png b/src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Unova.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pikachu--Unova.png rename to src/canonical/minisprites/gen8/pokemon/25--420--Pikachu--Unova.png diff --git a/src/canonical/minisprites/gen8/pokemon/Celebi.png b/src/canonical/minisprites/gen8/pokemon/251--0--Celebi.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Celebi.png rename to src/canonical/minisprites/gen8/pokemon/251--0--Celebi.png diff --git a/src/canonical/minisprites/gen8/pokemon/Raichu.png b/src/canonical/minisprites/gen8/pokemon/26--0--Raichu.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Raichu.png rename to src/canonical/minisprites/gen8/pokemon/26--0--Raichu.png diff --git a/src/canonical/minisprites/gen8/pokemon/Zigzagoon.png b/src/canonical/minisprites/gen8/pokemon/263--0--Zigzagoon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Zigzagoon.png rename to src/canonical/minisprites/gen8/pokemon/263--0--Zigzagoon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Zigzagoon--Galar.png b/src/canonical/minisprites/gen8/pokemon/263--420--Zigzagoon--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Zigzagoon--Galar.png rename to src/canonical/minisprites/gen8/pokemon/263--420--Zigzagoon--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Linoone.png b/src/canonical/minisprites/gen8/pokemon/264--0--Linoone.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Linoone.png rename to src/canonical/minisprites/gen8/pokemon/264--0--Linoone.png diff --git a/src/canonical/minisprites/gen8/pokemon/Linoone--Galar.png b/src/canonical/minisprites/gen8/pokemon/264--420--Linoone--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Linoone--Galar.png rename to src/canonical/minisprites/gen8/pokemon/264--420--Linoone--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Lotad.png b/src/canonical/minisprites/gen8/pokemon/270--0--Lotad.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Lotad.png rename to src/canonical/minisprites/gen8/pokemon/270--0--Lotad.png diff --git a/src/canonical/minisprites/gen8/pokemon/Lombre.png b/src/canonical/minisprites/gen8/pokemon/271--0--Lombre.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Lombre.png rename to src/canonical/minisprites/gen8/pokemon/271--0--Lombre.png diff --git a/src/canonical/minisprites/gen8/pokemon/Ludicolo.png b/src/canonical/minisprites/gen8/pokemon/272--0--Ludicolo.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Ludicolo.png rename to src/canonical/minisprites/gen8/pokemon/272--0--Ludicolo.png diff --git a/src/canonical/minisprites/gen8/pokemon/Seedot.png b/src/canonical/minisprites/gen8/pokemon/273--0--Seedot.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Seedot.png rename to src/canonical/minisprites/gen8/pokemon/273--0--Seedot.png diff --git a/src/canonical/minisprites/gen8/pokemon/Nuzleaf.png b/src/canonical/minisprites/gen8/pokemon/274--0--Nuzleaf.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Nuzleaf.png rename to src/canonical/minisprites/gen8/pokemon/274--0--Nuzleaf.png diff --git a/src/canonical/minisprites/gen8/pokemon/Shiftry.png b/src/canonical/minisprites/gen8/pokemon/275--0--Shiftry.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Shiftry.png rename to src/canonical/minisprites/gen8/pokemon/275--0--Shiftry.png diff --git a/src/canonical/minisprites/gen8/pokemon/Wingull.png b/src/canonical/minisprites/gen8/pokemon/278--0--Wingull.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Wingull.png rename to src/canonical/minisprites/gen8/pokemon/278--0--Wingull.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pelipper.png b/src/canonical/minisprites/gen8/pokemon/279--0--Pelipper.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pelipper.png rename to src/canonical/minisprites/gen8/pokemon/279--0--Pelipper.png diff --git a/src/canonical/minisprites/gen8/pokemon/Ralts.png b/src/canonical/minisprites/gen8/pokemon/280--0--Ralts.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Ralts.png rename to src/canonical/minisprites/gen8/pokemon/280--0--Ralts.png diff --git a/src/canonical/minisprites/gen8/pokemon/Kirlia.png b/src/canonical/minisprites/gen8/pokemon/281--0--Kirlia.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Kirlia.png rename to src/canonical/minisprites/gen8/pokemon/281--0--Kirlia.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gardevoir.png b/src/canonical/minisprites/gen8/pokemon/282--0--Gardevoir.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gardevoir.png rename to src/canonical/minisprites/gen8/pokemon/282--0--Gardevoir.png diff --git a/src/canonical/minisprites/gen8/pokemon/Nincada.png b/src/canonical/minisprites/gen8/pokemon/290--0--Nincada.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Nincada.png rename to src/canonical/minisprites/gen8/pokemon/290--0--Nincada.png diff --git a/src/canonical/minisprites/gen8/pokemon/Ninjask.png b/src/canonical/minisprites/gen8/pokemon/291--0--Ninjask.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Ninjask.png rename to src/canonical/minisprites/gen8/pokemon/291--0--Ninjask.png diff --git a/src/canonical/minisprites/gen8/pokemon/Shedinja.png b/src/canonical/minisprites/gen8/pokemon/292--0--Shedinja.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Shedinja.png rename to src/canonical/minisprites/gen8/pokemon/292--0--Shedinja.png diff --git a/src/canonical/minisprites/gen8/pokemon/Venusaur.png b/src/canonical/minisprites/gen8/pokemon/3--0--Venusaur.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Venusaur.png rename to src/canonical/minisprites/gen8/pokemon/3--0--Venusaur.png diff --git a/src/canonical/minisprites/gen8/pokemon/Sableye.png b/src/canonical/minisprites/gen8/pokemon/302--0--Sableye.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Sableye.png rename to src/canonical/minisprites/gen8/pokemon/302--0--Sableye.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mawile.png b/src/canonical/minisprites/gen8/pokemon/303--0--Mawile.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mawile.png rename to src/canonical/minisprites/gen8/pokemon/303--0--Mawile.png diff --git a/src/canonical/minisprites/gen8/pokemon/Electrike.png b/src/canonical/minisprites/gen8/pokemon/309--0--Electrike.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Electrike.png rename to src/canonical/minisprites/gen8/pokemon/309--0--Electrike.png diff --git a/src/canonical/minisprites/gen8/pokemon/Manectric.png b/src/canonical/minisprites/gen8/pokemon/310--0--Manectric.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Manectric.png rename to src/canonical/minisprites/gen8/pokemon/310--0--Manectric.png diff --git a/src/canonical/minisprites/gen8/pokemon/Roselia.png b/src/canonical/minisprites/gen8/pokemon/315--0--Roselia.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Roselia.png rename to src/canonical/minisprites/gen8/pokemon/315--0--Roselia.png diff --git a/src/canonical/minisprites/gen8/pokemon/Wailmer.png b/src/canonical/minisprites/gen8/pokemon/320--0--Wailmer.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Wailmer.png rename to src/canonical/minisprites/gen8/pokemon/320--0--Wailmer.png diff --git a/src/canonical/minisprites/gen8/pokemon/Wailord.png b/src/canonical/minisprites/gen8/pokemon/321--0--Wailord.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Wailord.png rename to src/canonical/minisprites/gen8/pokemon/321--0--Wailord.png diff --git a/src/canonical/minisprites/gen8/pokemon/Torkoal.png b/src/canonical/minisprites/gen8/pokemon/324--0--Torkoal.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Torkoal.png rename to src/canonical/minisprites/gen8/pokemon/324--0--Torkoal.png diff --git a/src/canonical/minisprites/gen8/pokemon/Trapinch.png b/src/canonical/minisprites/gen8/pokemon/328--0--Trapinch.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Trapinch.png rename to src/canonical/minisprites/gen8/pokemon/328--0--Trapinch.png diff --git a/src/canonical/minisprites/gen8/pokemon/Vibrava.png b/src/canonical/minisprites/gen8/pokemon/329--0--Vibrava.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Vibrava.png rename to src/canonical/minisprites/gen8/pokemon/329--0--Vibrava.png diff --git a/src/canonical/minisprites/gen8/pokemon/Flygon.png b/src/canonical/minisprites/gen8/pokemon/330--0--Flygon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Flygon.png rename to src/canonical/minisprites/gen8/pokemon/330--0--Flygon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Lunatone.png b/src/canonical/minisprites/gen8/pokemon/337--0--Lunatone.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Lunatone.png rename to src/canonical/minisprites/gen8/pokemon/337--0--Lunatone.png diff --git a/src/canonical/minisprites/gen8/pokemon/Solrock.png b/src/canonical/minisprites/gen8/pokemon/338--0--Solrock.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Solrock.png rename to src/canonical/minisprites/gen8/pokemon/338--0--Solrock.png diff --git a/src/canonical/minisprites/gen8/pokemon/Barboach.png b/src/canonical/minisprites/gen8/pokemon/339--0--Barboach.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Barboach.png rename to src/canonical/minisprites/gen8/pokemon/339--0--Barboach.png diff --git a/src/canonical/minisprites/gen8/pokemon/Whiscash.png b/src/canonical/minisprites/gen8/pokemon/340--0--Whiscash.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Whiscash.png rename to src/canonical/minisprites/gen8/pokemon/340--0--Whiscash.png diff --git a/src/canonical/minisprites/gen8/pokemon/Corphish.png b/src/canonical/minisprites/gen8/pokemon/341--0--Corphish.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Corphish.png rename to src/canonical/minisprites/gen8/pokemon/341--0--Corphish.png diff --git a/src/canonical/minisprites/gen8/pokemon/Crawdaunt.png b/src/canonical/minisprites/gen8/pokemon/342--0--Crawdaunt.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Crawdaunt.png rename to src/canonical/minisprites/gen8/pokemon/342--0--Crawdaunt.png diff --git a/src/canonical/minisprites/gen8/pokemon/Baltoy.png b/src/canonical/minisprites/gen8/pokemon/343--0--Baltoy.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Baltoy.png rename to src/canonical/minisprites/gen8/pokemon/343--0--Baltoy.png diff --git a/src/canonical/minisprites/gen8/pokemon/Claydol.png b/src/canonical/minisprites/gen8/pokemon/344--0--Claydol.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Claydol.png rename to src/canonical/minisprites/gen8/pokemon/344--0--Claydol.png diff --git a/src/canonical/minisprites/gen8/pokemon/Feebas.png b/src/canonical/minisprites/gen8/pokemon/349--0--Feebas.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Feebas.png rename to src/canonical/minisprites/gen8/pokemon/349--0--Feebas.png diff --git a/src/canonical/minisprites/gen8/pokemon/Clefairy.png b/src/canonical/minisprites/gen8/pokemon/35--0--Clefairy.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Clefairy.png rename to src/canonical/minisprites/gen8/pokemon/35--0--Clefairy.png diff --git a/src/canonical/minisprites/gen8/pokemon/Milotic.png b/src/canonical/minisprites/gen8/pokemon/350--0--Milotic.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Milotic.png rename to src/canonical/minisprites/gen8/pokemon/350--0--Milotic.png diff --git a/src/canonical/minisprites/gen8/pokemon/Duskull.png b/src/canonical/minisprites/gen8/pokemon/355--0--Duskull.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Duskull.png rename to src/canonical/minisprites/gen8/pokemon/355--0--Duskull.png diff --git a/src/canonical/minisprites/gen8/pokemon/Dusclops.png b/src/canonical/minisprites/gen8/pokemon/356--0--Dusclops.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Dusclops.png rename to src/canonical/minisprites/gen8/pokemon/356--0--Dusclops.png diff --git a/src/canonical/minisprites/gen8/pokemon/Clefable.png b/src/canonical/minisprites/gen8/pokemon/36--0--Clefable.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Clefable.png rename to src/canonical/minisprites/gen8/pokemon/36--0--Clefable.png diff --git a/src/canonical/minisprites/gen8/pokemon/Wynaut.png b/src/canonical/minisprites/gen8/pokemon/360--0--Wynaut.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Wynaut.png rename to src/canonical/minisprites/gen8/pokemon/360--0--Wynaut.png diff --git a/src/canonical/minisprites/gen8/pokemon/Snorunt.png b/src/canonical/minisprites/gen8/pokemon/361--0--Snorunt.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Snorunt.png rename to src/canonical/minisprites/gen8/pokemon/361--0--Snorunt.png diff --git a/src/canonical/minisprites/gen8/pokemon/Glalie.png b/src/canonical/minisprites/gen8/pokemon/362--0--Glalie.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Glalie.png rename to src/canonical/minisprites/gen8/pokemon/362--0--Glalie.png diff --git a/src/canonical/minisprites/gen8/pokemon/Vulpix.png b/src/canonical/minisprites/gen8/pokemon/37--0--Vulpix.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Vulpix.png rename to src/canonical/minisprites/gen8/pokemon/37--0--Vulpix.png diff --git a/src/canonical/minisprites/gen8/pokemon/Ninetales.png b/src/canonical/minisprites/gen8/pokemon/38--0--Ninetales.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Ninetales.png rename to src/canonical/minisprites/gen8/pokemon/38--0--Ninetales.png diff --git a/src/canonical/minisprites/gen8/pokemon/Jirachi.png b/src/canonical/minisprites/gen8/pokemon/385--0--Jirachi.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Jirachi.png rename to src/canonical/minisprites/gen8/pokemon/385--0--Jirachi.png diff --git a/src/canonical/minisprites/gen8/pokemon/Charmander.png b/src/canonical/minisprites/gen8/pokemon/4--0--Charmander.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Charmander.png rename to src/canonical/minisprites/gen8/pokemon/4--0--Charmander.png diff --git a/src/canonical/minisprites/gen8/pokemon/Budew.png b/src/canonical/minisprites/gen8/pokemon/406--0--Budew.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Budew.png rename to src/canonical/minisprites/gen8/pokemon/406--0--Budew.png diff --git a/src/canonical/minisprites/gen8/pokemon/Roserade.png b/src/canonical/minisprites/gen8/pokemon/407--0--Roserade.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Roserade.png rename to src/canonical/minisprites/gen8/pokemon/407--0--Roserade.png diff --git a/src/canonical/minisprites/gen8/pokemon/Combee.png b/src/canonical/minisprites/gen8/pokemon/415--0--Combee.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Combee.png rename to src/canonical/minisprites/gen8/pokemon/415--0--Combee.png diff --git a/src/canonical/minisprites/gen8/pokemon/Vespiquen.png b/src/canonical/minisprites/gen8/pokemon/416--0--Vespiquen.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Vespiquen.png rename to src/canonical/minisprites/gen8/pokemon/416--0--Vespiquen.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cherubi.png b/src/canonical/minisprites/gen8/pokemon/420--0--Cherubi.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cherubi.png rename to src/canonical/minisprites/gen8/pokemon/420--0--Cherubi.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cherrim.png b/src/canonical/minisprites/gen8/pokemon/421--0--Cherrim.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cherrim.png rename to src/canonical/minisprites/gen8/pokemon/421--0--Cherrim.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cherrim--Sunshine.png b/src/canonical/minisprites/gen8/pokemon/421--420--Cherrim--Sunshine.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cherrim--Sunshine.png rename to src/canonical/minisprites/gen8/pokemon/421--420--Cherrim--Sunshine.png diff --git a/src/canonical/minisprites/gen8/pokemon/Shellos.png b/src/canonical/minisprites/gen8/pokemon/422--0--Shellos.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Shellos.png rename to src/canonical/minisprites/gen8/pokemon/422--0--Shellos.png diff --git a/src/canonical/minisprites/gen8/pokemon/Shellos--East.png b/src/canonical/minisprites/gen8/pokemon/422--420--Shellos--East.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Shellos--East.png rename to src/canonical/minisprites/gen8/pokemon/422--420--Shellos--East.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gastrodon.png b/src/canonical/minisprites/gen8/pokemon/423--0--Gastrodon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gastrodon.png rename to src/canonical/minisprites/gen8/pokemon/423--0--Gastrodon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gastrodon--East.png b/src/canonical/minisprites/gen8/pokemon/423--420--Gastrodon--East.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gastrodon--East.png rename to src/canonical/minisprites/gen8/pokemon/423--420--Gastrodon--East.png diff --git a/src/canonical/minisprites/gen8/pokemon/Drifloon.png b/src/canonical/minisprites/gen8/pokemon/425--0--Drifloon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Drifloon.png rename to src/canonical/minisprites/gen8/pokemon/425--0--Drifloon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Drifblim.png b/src/canonical/minisprites/gen8/pokemon/426--0--Drifblim.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Drifblim.png rename to src/canonical/minisprites/gen8/pokemon/426--0--Drifblim.png diff --git a/src/canonical/minisprites/gen8/pokemon/Oddish.png b/src/canonical/minisprites/gen8/pokemon/43--0--Oddish.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Oddish.png rename to src/canonical/minisprites/gen8/pokemon/43--0--Oddish.png diff --git a/src/canonical/minisprites/gen8/pokemon/Stunky.png b/src/canonical/minisprites/gen8/pokemon/434--0--Stunky.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Stunky.png rename to src/canonical/minisprites/gen8/pokemon/434--0--Stunky.png diff --git a/src/canonical/minisprites/gen8/pokemon/Skuntank.png b/src/canonical/minisprites/gen8/pokemon/435--0--Skuntank.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Skuntank.png rename to src/canonical/minisprites/gen8/pokemon/435--0--Skuntank.png diff --git a/src/canonical/minisprites/gen8/pokemon/Bronzor.png b/src/canonical/minisprites/gen8/pokemon/436--0--Bronzor.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Bronzor.png rename to src/canonical/minisprites/gen8/pokemon/436--0--Bronzor.png diff --git a/src/canonical/minisprites/gen8/pokemon/Bronzong.png b/src/canonical/minisprites/gen8/pokemon/437--0--Bronzong.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Bronzong.png rename to src/canonical/minisprites/gen8/pokemon/437--0--Bronzong.png diff --git a/src/canonical/minisprites/gen8/pokemon/Bonsly.png b/src/canonical/minisprites/gen8/pokemon/438--0--Bonsly.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Bonsly.png rename to src/canonical/minisprites/gen8/pokemon/438--0--Bonsly.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mime_Jr..png b/src/canonical/minisprites/gen8/pokemon/439--0--Mime_Jr..png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mime_Jr..png rename to src/canonical/minisprites/gen8/pokemon/439--0--Mime_Jr..png diff --git a/src/canonical/minisprites/gen8/pokemon/Gloom.png b/src/canonical/minisprites/gen8/pokemon/44--0--Gloom.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gloom.png rename to src/canonical/minisprites/gen8/pokemon/44--0--Gloom.png diff --git a/src/canonical/minisprites/gen8/pokemon/Munchlax.png b/src/canonical/minisprites/gen8/pokemon/446--0--Munchlax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Munchlax.png rename to src/canonical/minisprites/gen8/pokemon/446--0--Munchlax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Riolu.png b/src/canonical/minisprites/gen8/pokemon/447--0--Riolu.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Riolu.png rename to src/canonical/minisprites/gen8/pokemon/447--0--Riolu.png diff --git a/src/canonical/minisprites/gen8/pokemon/Lucario.png b/src/canonical/minisprites/gen8/pokemon/448--0--Lucario.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Lucario.png rename to src/canonical/minisprites/gen8/pokemon/448--0--Lucario.png diff --git a/src/canonical/minisprites/gen8/pokemon/Hippopotas.png b/src/canonical/minisprites/gen8/pokemon/449--0--Hippopotas.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Hippopotas.png rename to src/canonical/minisprites/gen8/pokemon/449--0--Hippopotas.png diff --git a/src/canonical/minisprites/gen8/pokemon/Vileplume.png b/src/canonical/minisprites/gen8/pokemon/45--0--Vileplume.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Vileplume.png rename to src/canonical/minisprites/gen8/pokemon/45--0--Vileplume.png diff --git a/src/canonical/minisprites/gen8/pokemon/Hippowdon.png b/src/canonical/minisprites/gen8/pokemon/450--0--Hippowdon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Hippowdon.png rename to src/canonical/minisprites/gen8/pokemon/450--0--Hippowdon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Skorupi.png b/src/canonical/minisprites/gen8/pokemon/451--0--Skorupi.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Skorupi.png rename to src/canonical/minisprites/gen8/pokemon/451--0--Skorupi.png diff --git a/src/canonical/minisprites/gen8/pokemon/Drapion.png b/src/canonical/minisprites/gen8/pokemon/452--0--Drapion.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Drapion.png rename to src/canonical/minisprites/gen8/pokemon/452--0--Drapion.png diff --git a/src/canonical/minisprites/gen8/pokemon/Croagunk.png b/src/canonical/minisprites/gen8/pokemon/453--0--Croagunk.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Croagunk.png rename to src/canonical/minisprites/gen8/pokemon/453--0--Croagunk.png diff --git a/src/canonical/minisprites/gen8/pokemon/Toxicroak.png b/src/canonical/minisprites/gen8/pokemon/454--0--Toxicroak.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Toxicroak.png rename to src/canonical/minisprites/gen8/pokemon/454--0--Toxicroak.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mantyke.png b/src/canonical/minisprites/gen8/pokemon/458--0--Mantyke.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mantyke.png rename to src/canonical/minisprites/gen8/pokemon/458--0--Mantyke.png diff --git a/src/canonical/minisprites/gen8/pokemon/Snover.png b/src/canonical/minisprites/gen8/pokemon/459--0--Snover.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Snover.png rename to src/canonical/minisprites/gen8/pokemon/459--0--Snover.png diff --git a/src/canonical/minisprites/gen8/pokemon/Abomasnow.png b/src/canonical/minisprites/gen8/pokemon/460--0--Abomasnow.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Abomasnow.png rename to src/canonical/minisprites/gen8/pokemon/460--0--Abomasnow.png diff --git a/src/canonical/minisprites/gen8/pokemon/Weavile.png b/src/canonical/minisprites/gen8/pokemon/461--0--Weavile.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Weavile.png rename to src/canonical/minisprites/gen8/pokemon/461--0--Weavile.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rhyperior.png b/src/canonical/minisprites/gen8/pokemon/464--0--Rhyperior.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rhyperior.png rename to src/canonical/minisprites/gen8/pokemon/464--0--Rhyperior.png diff --git a/src/canonical/minisprites/gen8/pokemon/Togekiss.png b/src/canonical/minisprites/gen8/pokemon/468--0--Togekiss.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Togekiss.png rename to src/canonical/minisprites/gen8/pokemon/468--0--Togekiss.png diff --git a/src/canonical/minisprites/gen8/pokemon/Leafeon.png b/src/canonical/minisprites/gen8/pokemon/470--0--Leafeon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Leafeon.png rename to src/canonical/minisprites/gen8/pokemon/470--0--Leafeon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Glaceon.png b/src/canonical/minisprites/gen8/pokemon/471--0--Glaceon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Glaceon.png rename to src/canonical/minisprites/gen8/pokemon/471--0--Glaceon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mamoswine.png b/src/canonical/minisprites/gen8/pokemon/473--0--Mamoswine.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mamoswine.png rename to src/canonical/minisprites/gen8/pokemon/473--0--Mamoswine.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gallade.png b/src/canonical/minisprites/gen8/pokemon/475--0--Gallade.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gallade.png rename to src/canonical/minisprites/gen8/pokemon/475--0--Gallade.png diff --git a/src/canonical/minisprites/gen8/pokemon/Dusknoir.png b/src/canonical/minisprites/gen8/pokemon/477--0--Dusknoir.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Dusknoir.png rename to src/canonical/minisprites/gen8/pokemon/477--0--Dusknoir.png diff --git a/src/canonical/minisprites/gen8/pokemon/Froslass.png b/src/canonical/minisprites/gen8/pokemon/478--0--Froslass.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Froslass.png rename to src/canonical/minisprites/gen8/pokemon/478--0--Froslass.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rotom.png b/src/canonical/minisprites/gen8/pokemon/479--0--Rotom.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rotom.png rename to src/canonical/minisprites/gen8/pokemon/479--0--Rotom.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rotom--Fan.png b/src/canonical/minisprites/gen8/pokemon/479--420--Rotom--Fan.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rotom--Fan.png rename to src/canonical/minisprites/gen8/pokemon/479--420--Rotom--Fan.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rotom--Frost.png b/src/canonical/minisprites/gen8/pokemon/479--420--Rotom--Frost.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rotom--Frost.png rename to src/canonical/minisprites/gen8/pokemon/479--420--Rotom--Frost.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rotom--Heat.png b/src/canonical/minisprites/gen8/pokemon/479--420--Rotom--Heat.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rotom--Heat.png rename to src/canonical/minisprites/gen8/pokemon/479--420--Rotom--Heat.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rotom--Mow.png b/src/canonical/minisprites/gen8/pokemon/479--420--Rotom--Mow.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rotom--Mow.png rename to src/canonical/minisprites/gen8/pokemon/479--420--Rotom--Mow.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rotom--Wash.png b/src/canonical/minisprites/gen8/pokemon/479--420--Rotom--Wash.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rotom--Wash.png rename to src/canonical/minisprites/gen8/pokemon/479--420--Rotom--Wash.png diff --git a/src/canonical/minisprites/gen8/pokemon/Charmeleon.png b/src/canonical/minisprites/gen8/pokemon/5--0--Charmeleon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Charmeleon.png rename to src/canonical/minisprites/gen8/pokemon/5--0--Charmeleon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Diglett.png b/src/canonical/minisprites/gen8/pokemon/50--0--Diglett.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Diglett.png rename to src/canonical/minisprites/gen8/pokemon/50--0--Diglett.png diff --git a/src/canonical/minisprites/gen8/pokemon/Purrloin.png b/src/canonical/minisprites/gen8/pokemon/509--0--Purrloin.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Purrloin.png rename to src/canonical/minisprites/gen8/pokemon/509--0--Purrloin.png diff --git a/src/canonical/minisprites/gen8/pokemon/Dugtrio.png b/src/canonical/minisprites/gen8/pokemon/51--0--Dugtrio.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Dugtrio.png rename to src/canonical/minisprites/gen8/pokemon/51--0--Dugtrio.png diff --git a/src/canonical/minisprites/gen8/pokemon/Liepard.png b/src/canonical/minisprites/gen8/pokemon/510--0--Liepard.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Liepard.png rename to src/canonical/minisprites/gen8/pokemon/510--0--Liepard.png diff --git a/src/canonical/minisprites/gen8/pokemon/Munna.png b/src/canonical/minisprites/gen8/pokemon/517--0--Munna.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Munna.png rename to src/canonical/minisprites/gen8/pokemon/517--0--Munna.png diff --git a/src/canonical/minisprites/gen8/pokemon/Musharna.png b/src/canonical/minisprites/gen8/pokemon/518--0--Musharna.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Musharna.png rename to src/canonical/minisprites/gen8/pokemon/518--0--Musharna.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pidove.png b/src/canonical/minisprites/gen8/pokemon/519--0--Pidove.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pidove.png rename to src/canonical/minisprites/gen8/pokemon/519--0--Pidove.png diff --git a/src/canonical/minisprites/gen8/pokemon/Meowth.png b/src/canonical/minisprites/gen8/pokemon/52--0--Meowth.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Meowth.png rename to src/canonical/minisprites/gen8/pokemon/52--0--Meowth.png diff --git a/src/canonical/minisprites/gen8/pokemon/Meowth--Galar.png b/src/canonical/minisprites/gen8/pokemon/52--420--Meowth--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Meowth--Galar.png rename to src/canonical/minisprites/gen8/pokemon/52--420--Meowth--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Meowth--Gmax.png b/src/canonical/minisprites/gen8/pokemon/52--420--Meowth--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Meowth--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/52--420--Meowth--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Tranquill.png b/src/canonical/minisprites/gen8/pokemon/520--0--Tranquill.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Tranquill.png rename to src/canonical/minisprites/gen8/pokemon/520--0--Tranquill.png diff --git a/src/canonical/minisprites/gen8/pokemon/Unfezant--Female.png b/src/canonical/minisprites/gen8/pokemon/521--0--Unfezant--Female.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Unfezant--Female.png rename to src/canonical/minisprites/gen8/pokemon/521--0--Unfezant--Female.png diff --git a/src/canonical/minisprites/gen8/pokemon/Unfezant.png b/src/canonical/minisprites/gen8/pokemon/521--0--Unfezant.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Unfezant.png rename to src/canonical/minisprites/gen8/pokemon/521--0--Unfezant.png diff --git a/src/canonical/minisprites/gen8/pokemon/Roggenrola.png b/src/canonical/minisprites/gen8/pokemon/524--0--Roggenrola.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Roggenrola.png rename to src/canonical/minisprites/gen8/pokemon/524--0--Roggenrola.png diff --git a/src/canonical/minisprites/gen8/pokemon/Boldore.png b/src/canonical/minisprites/gen8/pokemon/525--0--Boldore.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Boldore.png rename to src/canonical/minisprites/gen8/pokemon/525--0--Boldore.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gigalith.png b/src/canonical/minisprites/gen8/pokemon/526--0--Gigalith.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gigalith.png rename to src/canonical/minisprites/gen8/pokemon/526--0--Gigalith.png diff --git a/src/canonical/minisprites/gen8/pokemon/Woobat.png b/src/canonical/minisprites/gen8/pokemon/527--0--Woobat.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Woobat.png rename to src/canonical/minisprites/gen8/pokemon/527--0--Woobat.png diff --git a/src/canonical/minisprites/gen8/pokemon/Swoobat.png b/src/canonical/minisprites/gen8/pokemon/528--0--Swoobat.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Swoobat.png rename to src/canonical/minisprites/gen8/pokemon/528--0--Swoobat.png diff --git a/src/canonical/minisprites/gen8/pokemon/Drilbur.png b/src/canonical/minisprites/gen8/pokemon/529--0--Drilbur.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Drilbur.png rename to src/canonical/minisprites/gen8/pokemon/529--0--Drilbur.png diff --git a/src/canonical/minisprites/gen8/pokemon/Persian.png b/src/canonical/minisprites/gen8/pokemon/53--0--Persian.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Persian.png rename to src/canonical/minisprites/gen8/pokemon/53--0--Persian.png diff --git a/src/canonical/minisprites/gen8/pokemon/Excadrill.png b/src/canonical/minisprites/gen8/pokemon/530--0--Excadrill.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Excadrill.png rename to src/canonical/minisprites/gen8/pokemon/530--0--Excadrill.png diff --git a/src/canonical/minisprites/gen8/pokemon/Timburr.png b/src/canonical/minisprites/gen8/pokemon/532--0--Timburr.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Timburr.png rename to src/canonical/minisprites/gen8/pokemon/532--0--Timburr.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gurdurr.png b/src/canonical/minisprites/gen8/pokemon/533--0--Gurdurr.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gurdurr.png rename to src/canonical/minisprites/gen8/pokemon/533--0--Gurdurr.png diff --git a/src/canonical/minisprites/gen8/pokemon/Conkeldurr.png b/src/canonical/minisprites/gen8/pokemon/534--0--Conkeldurr.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Conkeldurr.png rename to src/canonical/minisprites/gen8/pokemon/534--0--Conkeldurr.png diff --git a/src/canonical/minisprites/gen8/pokemon/Tympole.png b/src/canonical/minisprites/gen8/pokemon/535--0--Tympole.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Tympole.png rename to src/canonical/minisprites/gen8/pokemon/535--0--Tympole.png diff --git a/src/canonical/minisprites/gen8/pokemon/Palpitoad.png b/src/canonical/minisprites/gen8/pokemon/536--0--Palpitoad.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Palpitoad.png rename to src/canonical/minisprites/gen8/pokemon/536--0--Palpitoad.png diff --git a/src/canonical/minisprites/gen8/pokemon/Seismitoad.png b/src/canonical/minisprites/gen8/pokemon/537--0--Seismitoad.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Seismitoad.png rename to src/canonical/minisprites/gen8/pokemon/537--0--Seismitoad.png diff --git a/src/canonical/minisprites/gen8/pokemon/Throh.png b/src/canonical/minisprites/gen8/pokemon/538--0--Throh.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Throh.png rename to src/canonical/minisprites/gen8/pokemon/538--0--Throh.png diff --git a/src/canonical/minisprites/gen8/pokemon/Sawk.png b/src/canonical/minisprites/gen8/pokemon/539--0--Sawk.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Sawk.png rename to src/canonical/minisprites/gen8/pokemon/539--0--Sawk.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cottonee.png b/src/canonical/minisprites/gen8/pokemon/546--0--Cottonee.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cottonee.png rename to src/canonical/minisprites/gen8/pokemon/546--0--Cottonee.png diff --git a/src/canonical/minisprites/gen8/pokemon/Whimsicott.png b/src/canonical/minisprites/gen8/pokemon/547--0--Whimsicott.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Whimsicott.png rename to src/canonical/minisprites/gen8/pokemon/547--0--Whimsicott.png diff --git a/src/canonical/minisprites/gen8/pokemon/Basculin.png b/src/canonical/minisprites/gen8/pokemon/550--0--Basculin.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Basculin.png rename to src/canonical/minisprites/gen8/pokemon/550--0--Basculin.png diff --git a/src/canonical/minisprites/gen8/pokemon/Basculin--Blue-Striped.png b/src/canonical/minisprites/gen8/pokemon/550--420--Basculin--Blue-Striped.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Basculin--Blue-Striped.png rename to src/canonical/minisprites/gen8/pokemon/550--420--Basculin--Blue-Striped.png diff --git a/src/canonical/minisprites/gen8/pokemon/Darumaka.png b/src/canonical/minisprites/gen8/pokemon/554--0--Darumaka.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Darumaka.png rename to src/canonical/minisprites/gen8/pokemon/554--0--Darumaka.png diff --git a/src/canonical/minisprites/gen8/pokemon/Darumaka--Galar.png b/src/canonical/minisprites/gen8/pokemon/554--420--Darumaka--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Darumaka--Galar.png rename to src/canonical/minisprites/gen8/pokemon/554--420--Darumaka--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Darmanitan.png b/src/canonical/minisprites/gen8/pokemon/555--0--Darmanitan.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Darmanitan.png rename to src/canonical/minisprites/gen8/pokemon/555--0--Darmanitan.png diff --git a/src/canonical/minisprites/gen8/pokemon/Darmanitan--Galar-Zen.png b/src/canonical/minisprites/gen8/pokemon/555--420--Darmanitan--Galar-Zen.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Darmanitan--Galar-Zen.png rename to src/canonical/minisprites/gen8/pokemon/555--420--Darmanitan--Galar-Zen.png diff --git a/src/canonical/minisprites/gen8/pokemon/Darmanitan--Galar.png b/src/canonical/minisprites/gen8/pokemon/555--420--Darmanitan--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Darmanitan--Galar.png rename to src/canonical/minisprites/gen8/pokemon/555--420--Darmanitan--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Darmanitan--Zen.png b/src/canonical/minisprites/gen8/pokemon/555--420--Darmanitan--Zen.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Darmanitan--Zen.png rename to src/canonical/minisprites/gen8/pokemon/555--420--Darmanitan--Zen.png diff --git a/src/canonical/minisprites/gen8/pokemon/Maractus.png b/src/canonical/minisprites/gen8/pokemon/556--0--Maractus.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Maractus.png rename to src/canonical/minisprites/gen8/pokemon/556--0--Maractus.png diff --git a/src/canonical/minisprites/gen8/pokemon/Dwebble.png b/src/canonical/minisprites/gen8/pokemon/557--0--Dwebble.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Dwebble.png rename to src/canonical/minisprites/gen8/pokemon/557--0--Dwebble.png diff --git a/src/canonical/minisprites/gen8/pokemon/Crustle.png b/src/canonical/minisprites/gen8/pokemon/558--0--Crustle.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Crustle.png rename to src/canonical/minisprites/gen8/pokemon/558--0--Crustle.png diff --git a/src/canonical/minisprites/gen8/pokemon/Scraggy.png b/src/canonical/minisprites/gen8/pokemon/559--0--Scraggy.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Scraggy.png rename to src/canonical/minisprites/gen8/pokemon/559--0--Scraggy.png diff --git a/src/canonical/minisprites/gen8/pokemon/Scrafty.png b/src/canonical/minisprites/gen8/pokemon/560--0--Scrafty.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Scrafty.png rename to src/canonical/minisprites/gen8/pokemon/560--0--Scrafty.png diff --git a/src/canonical/minisprites/gen8/pokemon/Sigilyph.png b/src/canonical/minisprites/gen8/pokemon/561--0--Sigilyph.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Sigilyph.png rename to src/canonical/minisprites/gen8/pokemon/561--0--Sigilyph.png diff --git a/src/canonical/minisprites/gen8/pokemon/Yamask.png b/src/canonical/minisprites/gen8/pokemon/562--0--Yamask.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Yamask.png rename to src/canonical/minisprites/gen8/pokemon/562--0--Yamask.png diff --git a/src/canonical/minisprites/gen8/pokemon/Yamask--Galar.png b/src/canonical/minisprites/gen8/pokemon/562--420--Yamask--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Yamask--Galar.png rename to src/canonical/minisprites/gen8/pokemon/562--420--Yamask--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cofagrigus.png b/src/canonical/minisprites/gen8/pokemon/563--0--Cofagrigus.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cofagrigus.png rename to src/canonical/minisprites/gen8/pokemon/563--0--Cofagrigus.png diff --git a/src/canonical/minisprites/gen8/pokemon/Trubbish.png b/src/canonical/minisprites/gen8/pokemon/568--0--Trubbish.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Trubbish.png rename to src/canonical/minisprites/gen8/pokemon/568--0--Trubbish.png diff --git a/src/canonical/minisprites/gen8/pokemon/Garbodor.png b/src/canonical/minisprites/gen8/pokemon/569--0--Garbodor.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Garbodor.png rename to src/canonical/minisprites/gen8/pokemon/569--0--Garbodor.png diff --git a/src/canonical/minisprites/gen8/pokemon/Garbodor--Gmax.png b/src/canonical/minisprites/gen8/pokemon/569--420--Garbodor--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Garbodor--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/569--420--Garbodor--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Minccino.png b/src/canonical/minisprites/gen8/pokemon/572--0--Minccino.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Minccino.png rename to src/canonical/minisprites/gen8/pokemon/572--0--Minccino.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cinccino.png b/src/canonical/minisprites/gen8/pokemon/573--0--Cinccino.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cinccino.png rename to src/canonical/minisprites/gen8/pokemon/573--0--Cinccino.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gothita.png b/src/canonical/minisprites/gen8/pokemon/574--0--Gothita.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gothita.png rename to src/canonical/minisprites/gen8/pokemon/574--0--Gothita.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gothorita.png b/src/canonical/minisprites/gen8/pokemon/575--0--Gothorita.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gothorita.png rename to src/canonical/minisprites/gen8/pokemon/575--0--Gothorita.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gothitelle.png b/src/canonical/minisprites/gen8/pokemon/576--0--Gothitelle.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gothitelle.png rename to src/canonical/minisprites/gen8/pokemon/576--0--Gothitelle.png diff --git a/src/canonical/minisprites/gen8/pokemon/Solosis.png b/src/canonical/minisprites/gen8/pokemon/577--0--Solosis.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Solosis.png rename to src/canonical/minisprites/gen8/pokemon/577--0--Solosis.png diff --git a/src/canonical/minisprites/gen8/pokemon/Duosion.png b/src/canonical/minisprites/gen8/pokemon/578--0--Duosion.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Duosion.png rename to src/canonical/minisprites/gen8/pokemon/578--0--Duosion.png diff --git a/src/canonical/minisprites/gen8/pokemon/Reuniclus.png b/src/canonical/minisprites/gen8/pokemon/579--0--Reuniclus.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Reuniclus.png rename to src/canonical/minisprites/gen8/pokemon/579--0--Reuniclus.png diff --git a/src/canonical/minisprites/gen8/pokemon/Growlithe.png b/src/canonical/minisprites/gen8/pokemon/58--0--Growlithe.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Growlithe.png rename to src/canonical/minisprites/gen8/pokemon/58--0--Growlithe.png diff --git a/src/canonical/minisprites/gen8/pokemon/Vanillite.png b/src/canonical/minisprites/gen8/pokemon/582--0--Vanillite.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Vanillite.png rename to src/canonical/minisprites/gen8/pokemon/582--0--Vanillite.png diff --git a/src/canonical/minisprites/gen8/pokemon/Vanillish.png b/src/canonical/minisprites/gen8/pokemon/583--0--Vanillish.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Vanillish.png rename to src/canonical/minisprites/gen8/pokemon/583--0--Vanillish.png diff --git a/src/canonical/minisprites/gen8/pokemon/Vanilluxe.png b/src/canonical/minisprites/gen8/pokemon/584--0--Vanilluxe.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Vanilluxe.png rename to src/canonical/minisprites/gen8/pokemon/584--0--Vanilluxe.png diff --git a/src/canonical/minisprites/gen8/pokemon/Karrablast.png b/src/canonical/minisprites/gen8/pokemon/588--0--Karrablast.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Karrablast.png rename to src/canonical/minisprites/gen8/pokemon/588--0--Karrablast.png diff --git a/src/canonical/minisprites/gen8/pokemon/Escavalier.png b/src/canonical/minisprites/gen8/pokemon/589--0--Escavalier.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Escavalier.png rename to src/canonical/minisprites/gen8/pokemon/589--0--Escavalier.png diff --git a/src/canonical/minisprites/gen8/pokemon/Arcanine.png b/src/canonical/minisprites/gen8/pokemon/59--0--Arcanine.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Arcanine.png rename to src/canonical/minisprites/gen8/pokemon/59--0--Arcanine.png diff --git a/src/canonical/minisprites/gen8/pokemon/Frillish--Female.png b/src/canonical/minisprites/gen8/pokemon/592--0--Frillish--Female.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Frillish--Female.png rename to src/canonical/minisprites/gen8/pokemon/592--0--Frillish--Female.png diff --git a/src/canonical/minisprites/gen8/pokemon/Frillish.png b/src/canonical/minisprites/gen8/pokemon/592--0--Frillish.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Frillish.png rename to src/canonical/minisprites/gen8/pokemon/592--0--Frillish.png diff --git a/src/canonical/minisprites/gen8/pokemon/Jellicent--Female.png b/src/canonical/minisprites/gen8/pokemon/593--0--Jellicent--Female.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Jellicent--Female.png rename to src/canonical/minisprites/gen8/pokemon/593--0--Jellicent--Female.png diff --git a/src/canonical/minisprites/gen8/pokemon/Jellicent.png b/src/canonical/minisprites/gen8/pokemon/593--0--Jellicent.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Jellicent.png rename to src/canonical/minisprites/gen8/pokemon/593--0--Jellicent.png diff --git a/src/canonical/minisprites/gen8/pokemon/Joltik.png b/src/canonical/minisprites/gen8/pokemon/595--0--Joltik.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Joltik.png rename to src/canonical/minisprites/gen8/pokemon/595--0--Joltik.png diff --git a/src/canonical/minisprites/gen8/pokemon/Galvantula.png b/src/canonical/minisprites/gen8/pokemon/596--0--Galvantula.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Galvantula.png rename to src/canonical/minisprites/gen8/pokemon/596--0--Galvantula.png diff --git a/src/canonical/minisprites/gen8/pokemon/Ferroseed.png b/src/canonical/minisprites/gen8/pokemon/597--0--Ferroseed.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Ferroseed.png rename to src/canonical/minisprites/gen8/pokemon/597--0--Ferroseed.png diff --git a/src/canonical/minisprites/gen8/pokemon/Ferrothorn.png b/src/canonical/minisprites/gen8/pokemon/598--0--Ferrothorn.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Ferrothorn.png rename to src/canonical/minisprites/gen8/pokemon/598--0--Ferrothorn.png diff --git a/src/canonical/minisprites/gen8/pokemon/Klink.png b/src/canonical/minisprites/gen8/pokemon/599--0--Klink.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Klink.png rename to src/canonical/minisprites/gen8/pokemon/599--0--Klink.png diff --git a/src/canonical/minisprites/gen8/pokemon/Charizard.png b/src/canonical/minisprites/gen8/pokemon/6--0--Charizard.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Charizard.png rename to src/canonical/minisprites/gen8/pokemon/6--0--Charizard.png diff --git a/src/canonical/minisprites/gen8/pokemon/Charizard--Gmax.png b/src/canonical/minisprites/gen8/pokemon/6--420--Charizard--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Charizard--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/6--420--Charizard--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Klang.png b/src/canonical/minisprites/gen8/pokemon/600--0--Klang.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Klang.png rename to src/canonical/minisprites/gen8/pokemon/600--0--Klang.png diff --git a/src/canonical/minisprites/gen8/pokemon/Klinklang.png b/src/canonical/minisprites/gen8/pokemon/601--0--Klinklang.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Klinklang.png rename to src/canonical/minisprites/gen8/pokemon/601--0--Klinklang.png diff --git a/src/canonical/minisprites/gen8/pokemon/Elgyem.png b/src/canonical/minisprites/gen8/pokemon/605--0--Elgyem.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Elgyem.png rename to src/canonical/minisprites/gen8/pokemon/605--0--Elgyem.png diff --git a/src/canonical/minisprites/gen8/pokemon/Beheeyem.png b/src/canonical/minisprites/gen8/pokemon/606--0--Beheeyem.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Beheeyem.png rename to src/canonical/minisprites/gen8/pokemon/606--0--Beheeyem.png diff --git a/src/canonical/minisprites/gen8/pokemon/Litwick.png b/src/canonical/minisprites/gen8/pokemon/607--0--Litwick.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Litwick.png rename to src/canonical/minisprites/gen8/pokemon/607--0--Litwick.png diff --git a/src/canonical/minisprites/gen8/pokemon/Lampent.png b/src/canonical/minisprites/gen8/pokemon/608--0--Lampent.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Lampent.png rename to src/canonical/minisprites/gen8/pokemon/608--0--Lampent.png diff --git a/src/canonical/minisprites/gen8/pokemon/Chandelure.png b/src/canonical/minisprites/gen8/pokemon/609--0--Chandelure.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Chandelure.png rename to src/canonical/minisprites/gen8/pokemon/609--0--Chandelure.png diff --git a/src/canonical/minisprites/gen8/pokemon/Axew.png b/src/canonical/minisprites/gen8/pokemon/610--0--Axew.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Axew.png rename to src/canonical/minisprites/gen8/pokemon/610--0--Axew.png diff --git a/src/canonical/minisprites/gen8/pokemon/Fraxure.png b/src/canonical/minisprites/gen8/pokemon/611--0--Fraxure.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Fraxure.png rename to src/canonical/minisprites/gen8/pokemon/611--0--Fraxure.png diff --git a/src/canonical/minisprites/gen8/pokemon/Haxorus.png b/src/canonical/minisprites/gen8/pokemon/612--0--Haxorus.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Haxorus.png rename to src/canonical/minisprites/gen8/pokemon/612--0--Haxorus.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cubchoo.png b/src/canonical/minisprites/gen8/pokemon/613--0--Cubchoo.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cubchoo.png rename to src/canonical/minisprites/gen8/pokemon/613--0--Cubchoo.png diff --git a/src/canonical/minisprites/gen8/pokemon/Beartic.png b/src/canonical/minisprites/gen8/pokemon/614--0--Beartic.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Beartic.png rename to src/canonical/minisprites/gen8/pokemon/614--0--Beartic.png diff --git a/src/canonical/minisprites/gen8/pokemon/Shelmet.png b/src/canonical/minisprites/gen8/pokemon/616--0--Shelmet.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Shelmet.png rename to src/canonical/minisprites/gen8/pokemon/616--0--Shelmet.png diff --git a/src/canonical/minisprites/gen8/pokemon/Accelgor.png b/src/canonical/minisprites/gen8/pokemon/617--0--Accelgor.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Accelgor.png rename to src/canonical/minisprites/gen8/pokemon/617--0--Accelgor.png diff --git a/src/canonical/minisprites/gen8/pokemon/Stunfisk.png b/src/canonical/minisprites/gen8/pokemon/618--0--Stunfisk.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Stunfisk.png rename to src/canonical/minisprites/gen8/pokemon/618--0--Stunfisk.png diff --git a/src/canonical/minisprites/gen8/pokemon/Stunfisk--Galar.png b/src/canonical/minisprites/gen8/pokemon/618--420--Stunfisk--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Stunfisk--Galar.png rename to src/canonical/minisprites/gen8/pokemon/618--420--Stunfisk--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Golett.png b/src/canonical/minisprites/gen8/pokemon/622--0--Golett.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Golett.png rename to src/canonical/minisprites/gen8/pokemon/622--0--Golett.png diff --git a/src/canonical/minisprites/gen8/pokemon/Golurk.png b/src/canonical/minisprites/gen8/pokemon/623--0--Golurk.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Golurk.png rename to src/canonical/minisprites/gen8/pokemon/623--0--Golurk.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pawniard.png b/src/canonical/minisprites/gen8/pokemon/624--0--Pawniard.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pawniard.png rename to src/canonical/minisprites/gen8/pokemon/624--0--Pawniard.png diff --git a/src/canonical/minisprites/gen8/pokemon/Bisharp.png b/src/canonical/minisprites/gen8/pokemon/625--0--Bisharp.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Bisharp.png rename to src/canonical/minisprites/gen8/pokemon/625--0--Bisharp.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rufflet.png b/src/canonical/minisprites/gen8/pokemon/627--0--Rufflet.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rufflet.png rename to src/canonical/minisprites/gen8/pokemon/627--0--Rufflet.png diff --git a/src/canonical/minisprites/gen8/pokemon/Braviary.png b/src/canonical/minisprites/gen8/pokemon/628--0--Braviary.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Braviary.png rename to src/canonical/minisprites/gen8/pokemon/628--0--Braviary.png diff --git a/src/canonical/minisprites/gen8/pokemon/Vullaby.png b/src/canonical/minisprites/gen8/pokemon/629--0--Vullaby.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Vullaby.png rename to src/canonical/minisprites/gen8/pokemon/629--0--Vullaby.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mandibuzz.png b/src/canonical/minisprites/gen8/pokemon/630--0--Mandibuzz.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mandibuzz.png rename to src/canonical/minisprites/gen8/pokemon/630--0--Mandibuzz.png diff --git a/src/canonical/minisprites/gen8/pokemon/Heatmor.png b/src/canonical/minisprites/gen8/pokemon/631--0--Heatmor.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Heatmor.png rename to src/canonical/minisprites/gen8/pokemon/631--0--Heatmor.png diff --git a/src/canonical/minisprites/gen8/pokemon/Durant.png b/src/canonical/minisprites/gen8/pokemon/632--0--Durant.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Durant.png rename to src/canonical/minisprites/gen8/pokemon/632--0--Durant.png diff --git a/src/canonical/minisprites/gen8/pokemon/Deino.png b/src/canonical/minisprites/gen8/pokemon/633--0--Deino.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Deino.png rename to src/canonical/minisprites/gen8/pokemon/633--0--Deino.png diff --git a/src/canonical/minisprites/gen8/pokemon/Zweilous.png b/src/canonical/minisprites/gen8/pokemon/634--0--Zweilous.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Zweilous.png rename to src/canonical/minisprites/gen8/pokemon/634--0--Zweilous.png diff --git a/src/canonical/minisprites/gen8/pokemon/Hydreigon.png b/src/canonical/minisprites/gen8/pokemon/635--0--Hydreigon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Hydreigon.png rename to src/canonical/minisprites/gen8/pokemon/635--0--Hydreigon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cobalion.png b/src/canonical/minisprites/gen8/pokemon/638--0--Cobalion.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cobalion.png rename to src/canonical/minisprites/gen8/pokemon/638--0--Cobalion.png diff --git a/src/canonical/minisprites/gen8/pokemon/Terrakion.png b/src/canonical/minisprites/gen8/pokemon/639--0--Terrakion.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Terrakion.png rename to src/canonical/minisprites/gen8/pokemon/639--0--Terrakion.png diff --git a/src/canonical/minisprites/gen8/pokemon/Virizion.png b/src/canonical/minisprites/gen8/pokemon/640--0--Virizion.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Virizion.png rename to src/canonical/minisprites/gen8/pokemon/640--0--Virizion.png diff --git a/src/canonical/minisprites/gen8/pokemon/Reshiram.png b/src/canonical/minisprites/gen8/pokemon/643--0--Reshiram.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Reshiram.png rename to src/canonical/minisprites/gen8/pokemon/643--0--Reshiram.png diff --git a/src/canonical/minisprites/gen8/pokemon/Zekrom.png b/src/canonical/minisprites/gen8/pokemon/644--0--Zekrom.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Zekrom.png rename to src/canonical/minisprites/gen8/pokemon/644--0--Zekrom.png diff --git a/src/canonical/minisprites/gen8/pokemon/Kyurem.png b/src/canonical/minisprites/gen8/pokemon/646--0--Kyurem.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Kyurem.png rename to src/canonical/minisprites/gen8/pokemon/646--0--Kyurem.png diff --git a/src/canonical/minisprites/gen8/pokemon/Kyurem--Black.png b/src/canonical/minisprites/gen8/pokemon/646--420--Kyurem--Black.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Kyurem--Black.png rename to src/canonical/minisprites/gen8/pokemon/646--420--Kyurem--Black.png diff --git a/src/canonical/minisprites/gen8/pokemon/Kyurem--White.png b/src/canonical/minisprites/gen8/pokemon/646--420--Kyurem--White.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Kyurem--White.png rename to src/canonical/minisprites/gen8/pokemon/646--420--Kyurem--White.png diff --git a/src/canonical/minisprites/gen8/pokemon/Keldeo.png b/src/canonical/minisprites/gen8/pokemon/647--0--Keldeo.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Keldeo.png rename to src/canonical/minisprites/gen8/pokemon/647--0--Keldeo.png diff --git a/src/canonical/minisprites/gen8/pokemon/Keldeo--Resolute.png b/src/canonical/minisprites/gen8/pokemon/647--420--Keldeo--Resolute.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Keldeo--Resolute.png rename to src/canonical/minisprites/gen8/pokemon/647--420--Keldeo--Resolute.png diff --git a/src/canonical/minisprites/gen8/pokemon/Bunnelby.png b/src/canonical/minisprites/gen8/pokemon/659--0--Bunnelby.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Bunnelby.png rename to src/canonical/minisprites/gen8/pokemon/659--0--Bunnelby.png diff --git a/src/canonical/minisprites/gen8/pokemon/Machop.png b/src/canonical/minisprites/gen8/pokemon/66--0--Machop.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Machop.png rename to src/canonical/minisprites/gen8/pokemon/66--0--Machop.png diff --git a/src/canonical/minisprites/gen8/pokemon/Diggersby.png b/src/canonical/minisprites/gen8/pokemon/660--0--Diggersby.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Diggersby.png rename to src/canonical/minisprites/gen8/pokemon/660--0--Diggersby.png diff --git a/src/canonical/minisprites/gen8/pokemon/Machoke.png b/src/canonical/minisprites/gen8/pokemon/67--0--Machoke.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Machoke.png rename to src/canonical/minisprites/gen8/pokemon/67--0--Machoke.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pancham.png b/src/canonical/minisprites/gen8/pokemon/674--0--Pancham.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pancham.png rename to src/canonical/minisprites/gen8/pokemon/674--0--Pancham.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pangoro.png b/src/canonical/minisprites/gen8/pokemon/675--0--Pangoro.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pangoro.png rename to src/canonical/minisprites/gen8/pokemon/675--0--Pangoro.png diff --git a/src/canonical/minisprites/gen8/pokemon/Espurr.png b/src/canonical/minisprites/gen8/pokemon/677--0--Espurr.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Espurr.png rename to src/canonical/minisprites/gen8/pokemon/677--0--Espurr.png diff --git a/src/canonical/minisprites/gen8/pokemon/Meowstic.png b/src/canonical/minisprites/gen8/pokemon/678--0--Meowstic.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Meowstic.png rename to src/canonical/minisprites/gen8/pokemon/678--0--Meowstic.png diff --git a/src/canonical/minisprites/gen8/pokemon/Meowstic--F.png b/src/canonical/minisprites/gen8/pokemon/678--420--Meowstic--F.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Meowstic--F.png rename to src/canonical/minisprites/gen8/pokemon/678--420--Meowstic--F.png diff --git a/src/canonical/minisprites/gen8/pokemon/Honedge.png b/src/canonical/minisprites/gen8/pokemon/679--0--Honedge.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Honedge.png rename to src/canonical/minisprites/gen8/pokemon/679--0--Honedge.png diff --git a/src/canonical/minisprites/gen8/pokemon/Machamp.png b/src/canonical/minisprites/gen8/pokemon/68--0--Machamp.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Machamp.png rename to src/canonical/minisprites/gen8/pokemon/68--0--Machamp.png diff --git a/src/canonical/minisprites/gen8/pokemon/Machamp--Gmax.png b/src/canonical/minisprites/gen8/pokemon/68--420--Machamp--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Machamp--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/68--420--Machamp--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Doublade.png b/src/canonical/minisprites/gen8/pokemon/680--0--Doublade.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Doublade.png rename to src/canonical/minisprites/gen8/pokemon/680--0--Doublade.png diff --git a/src/canonical/minisprites/gen8/pokemon/Aegislash.png b/src/canonical/minisprites/gen8/pokemon/681--0--Aegislash.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Aegislash.png rename to src/canonical/minisprites/gen8/pokemon/681--0--Aegislash.png diff --git a/src/canonical/minisprites/gen8/pokemon/Aegislash--Blade.png b/src/canonical/minisprites/gen8/pokemon/681--420--Aegislash--Blade.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Aegislash--Blade.png rename to src/canonical/minisprites/gen8/pokemon/681--420--Aegislash--Blade.png diff --git a/src/canonical/minisprites/gen8/pokemon/Spritzee.png b/src/canonical/minisprites/gen8/pokemon/682--0--Spritzee.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Spritzee.png rename to src/canonical/minisprites/gen8/pokemon/682--0--Spritzee.png diff --git a/src/canonical/minisprites/gen8/pokemon/Aromatisse.png b/src/canonical/minisprites/gen8/pokemon/683--0--Aromatisse.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Aromatisse.png rename to src/canonical/minisprites/gen8/pokemon/683--0--Aromatisse.png diff --git a/src/canonical/minisprites/gen8/pokemon/Swirlix.png b/src/canonical/minisprites/gen8/pokemon/684--0--Swirlix.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Swirlix.png rename to src/canonical/minisprites/gen8/pokemon/684--0--Swirlix.png diff --git a/src/canonical/minisprites/gen8/pokemon/Slurpuff.png b/src/canonical/minisprites/gen8/pokemon/685--0--Slurpuff.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Slurpuff.png rename to src/canonical/minisprites/gen8/pokemon/685--0--Slurpuff.png diff --git a/src/canonical/minisprites/gen8/pokemon/Inkay.png b/src/canonical/minisprites/gen8/pokemon/686--0--Inkay.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Inkay.png rename to src/canonical/minisprites/gen8/pokemon/686--0--Inkay.png diff --git a/src/canonical/minisprites/gen8/pokemon/Malamar.png b/src/canonical/minisprites/gen8/pokemon/687--0--Malamar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Malamar.png rename to src/canonical/minisprites/gen8/pokemon/687--0--Malamar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Binacle.png b/src/canonical/minisprites/gen8/pokemon/688--0--Binacle.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Binacle.png rename to src/canonical/minisprites/gen8/pokemon/688--0--Binacle.png diff --git a/src/canonical/minisprites/gen8/pokemon/Barbaracle.png b/src/canonical/minisprites/gen8/pokemon/689--0--Barbaracle.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Barbaracle.png rename to src/canonical/minisprites/gen8/pokemon/689--0--Barbaracle.png diff --git a/src/canonical/minisprites/gen8/pokemon/Helioptile.png b/src/canonical/minisprites/gen8/pokemon/694--0--Helioptile.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Helioptile.png rename to src/canonical/minisprites/gen8/pokemon/694--0--Helioptile.png diff --git a/src/canonical/minisprites/gen8/pokemon/Heliolisk.png b/src/canonical/minisprites/gen8/pokemon/695--0--Heliolisk.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Heliolisk.png rename to src/canonical/minisprites/gen8/pokemon/695--0--Heliolisk.png diff --git a/src/canonical/minisprites/gen8/pokemon/Squirtle.png b/src/canonical/minisprites/gen8/pokemon/7--0--Squirtle.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Squirtle.png rename to src/canonical/minisprites/gen8/pokemon/7--0--Squirtle.png diff --git a/src/canonical/minisprites/gen8/pokemon/Sylveon.png b/src/canonical/minisprites/gen8/pokemon/700--0--Sylveon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Sylveon.png rename to src/canonical/minisprites/gen8/pokemon/700--0--Sylveon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Hawlucha.png b/src/canonical/minisprites/gen8/pokemon/701--0--Hawlucha.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Hawlucha.png rename to src/canonical/minisprites/gen8/pokemon/701--0--Hawlucha.png diff --git a/src/canonical/minisprites/gen8/pokemon/Goomy.png b/src/canonical/minisprites/gen8/pokemon/704--0--Goomy.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Goomy.png rename to src/canonical/minisprites/gen8/pokemon/704--0--Goomy.png diff --git a/src/canonical/minisprites/gen8/pokemon/Sliggoo.png b/src/canonical/minisprites/gen8/pokemon/705--0--Sliggoo.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Sliggoo.png rename to src/canonical/minisprites/gen8/pokemon/705--0--Sliggoo.png diff --git a/src/canonical/minisprites/gen8/pokemon/Goodra.png b/src/canonical/minisprites/gen8/pokemon/706--0--Goodra.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Goodra.png rename to src/canonical/minisprites/gen8/pokemon/706--0--Goodra.png diff --git a/src/canonical/minisprites/gen8/pokemon/Phantump.png b/src/canonical/minisprites/gen8/pokemon/708--0--Phantump.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Phantump.png rename to src/canonical/minisprites/gen8/pokemon/708--0--Phantump.png diff --git a/src/canonical/minisprites/gen8/pokemon/Trevenant.png b/src/canonical/minisprites/gen8/pokemon/709--0--Trevenant.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Trevenant.png rename to src/canonical/minisprites/gen8/pokemon/709--0--Trevenant.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pumpkaboo.png b/src/canonical/minisprites/gen8/pokemon/710--0--Pumpkaboo.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pumpkaboo.png rename to src/canonical/minisprites/gen8/pokemon/710--0--Pumpkaboo.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gourgeist.png b/src/canonical/minisprites/gen8/pokemon/711--0--Gourgeist.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gourgeist.png rename to src/canonical/minisprites/gen8/pokemon/711--0--Gourgeist.png diff --git a/src/canonical/minisprites/gen8/pokemon/Bergmite.png b/src/canonical/minisprites/gen8/pokemon/712--0--Bergmite.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Bergmite.png rename to src/canonical/minisprites/gen8/pokemon/712--0--Bergmite.png diff --git a/src/canonical/minisprites/gen8/pokemon/Avalugg.png b/src/canonical/minisprites/gen8/pokemon/713--0--Avalugg.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Avalugg.png rename to src/canonical/minisprites/gen8/pokemon/713--0--Avalugg.png diff --git a/src/canonical/minisprites/gen8/pokemon/Noibat.png b/src/canonical/minisprites/gen8/pokemon/714--0--Noibat.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Noibat.png rename to src/canonical/minisprites/gen8/pokemon/714--0--Noibat.png diff --git a/src/canonical/minisprites/gen8/pokemon/Noivern.png b/src/canonical/minisprites/gen8/pokemon/715--0--Noivern.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Noivern.png rename to src/canonical/minisprites/gen8/pokemon/715--0--Noivern.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rowlet.png b/src/canonical/minisprites/gen8/pokemon/722--0--Rowlet.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rowlet.png rename to src/canonical/minisprites/gen8/pokemon/722--0--Rowlet.png diff --git a/src/canonical/minisprites/gen8/pokemon/Dartrix.png b/src/canonical/minisprites/gen8/pokemon/723--0--Dartrix.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Dartrix.png rename to src/canonical/minisprites/gen8/pokemon/723--0--Dartrix.png diff --git a/src/canonical/minisprites/gen8/pokemon/Decidueye.png b/src/canonical/minisprites/gen8/pokemon/724--0--Decidueye.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Decidueye.png rename to src/canonical/minisprites/gen8/pokemon/724--0--Decidueye.png diff --git a/src/canonical/minisprites/gen8/pokemon/Litten.png b/src/canonical/minisprites/gen8/pokemon/725--0--Litten.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Litten.png rename to src/canonical/minisprites/gen8/pokemon/725--0--Litten.png diff --git a/src/canonical/minisprites/gen8/pokemon/Torracat.png b/src/canonical/minisprites/gen8/pokemon/726--0--Torracat.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Torracat.png rename to src/canonical/minisprites/gen8/pokemon/726--0--Torracat.png diff --git a/src/canonical/minisprites/gen8/pokemon/Incineroar.png b/src/canonical/minisprites/gen8/pokemon/727--0--Incineroar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Incineroar.png rename to src/canonical/minisprites/gen8/pokemon/727--0--Incineroar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Popplio.png b/src/canonical/minisprites/gen8/pokemon/728--0--Popplio.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Popplio.png rename to src/canonical/minisprites/gen8/pokemon/728--0--Popplio.png diff --git a/src/canonical/minisprites/gen8/pokemon/Brionne.png b/src/canonical/minisprites/gen8/pokemon/729--0--Brionne.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Brionne.png rename to src/canonical/minisprites/gen8/pokemon/729--0--Brionne.png diff --git a/src/canonical/minisprites/gen8/pokemon/Primarina.png b/src/canonical/minisprites/gen8/pokemon/730--0--Primarina.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Primarina.png rename to src/canonical/minisprites/gen8/pokemon/730--0--Primarina.png diff --git a/src/canonical/minisprites/gen8/pokemon/Grubbin.png b/src/canonical/minisprites/gen8/pokemon/736--0--Grubbin.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Grubbin.png rename to src/canonical/minisprites/gen8/pokemon/736--0--Grubbin.png diff --git a/src/canonical/minisprites/gen8/pokemon/Charjabug.png b/src/canonical/minisprites/gen8/pokemon/737--0--Charjabug.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Charjabug.png rename to src/canonical/minisprites/gen8/pokemon/737--0--Charjabug.png diff --git a/src/canonical/minisprites/gen8/pokemon/Vikavolt.png b/src/canonical/minisprites/gen8/pokemon/738--0--Vikavolt.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Vikavolt.png rename to src/canonical/minisprites/gen8/pokemon/738--0--Vikavolt.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cutiefly.png b/src/canonical/minisprites/gen8/pokemon/742--0--Cutiefly.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cutiefly.png rename to src/canonical/minisprites/gen8/pokemon/742--0--Cutiefly.png diff --git a/src/canonical/minisprites/gen8/pokemon/Ribombee.png b/src/canonical/minisprites/gen8/pokemon/743--0--Ribombee.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Ribombee.png rename to src/canonical/minisprites/gen8/pokemon/743--0--Ribombee.png diff --git a/src/canonical/minisprites/gen8/pokemon/Wishiwashi.png b/src/canonical/minisprites/gen8/pokemon/746--0--Wishiwashi.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Wishiwashi.png rename to src/canonical/minisprites/gen8/pokemon/746--0--Wishiwashi.png diff --git a/src/canonical/minisprites/gen8/pokemon/Wishiwashi--School.png b/src/canonical/minisprites/gen8/pokemon/746--420--Wishiwashi--School.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Wishiwashi--School.png rename to src/canonical/minisprites/gen8/pokemon/746--420--Wishiwashi--School.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mareanie.png b/src/canonical/minisprites/gen8/pokemon/747--0--Mareanie.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mareanie.png rename to src/canonical/minisprites/gen8/pokemon/747--0--Mareanie.png diff --git a/src/canonical/minisprites/gen8/pokemon/Toxapex.png b/src/canonical/minisprites/gen8/pokemon/748--0--Toxapex.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Toxapex.png rename to src/canonical/minisprites/gen8/pokemon/748--0--Toxapex.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mudbray.png b/src/canonical/minisprites/gen8/pokemon/749--0--Mudbray.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mudbray.png rename to src/canonical/minisprites/gen8/pokemon/749--0--Mudbray.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mudsdale.png b/src/canonical/minisprites/gen8/pokemon/750--0--Mudsdale.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mudsdale.png rename to src/canonical/minisprites/gen8/pokemon/750--0--Mudsdale.png diff --git a/src/canonical/minisprites/gen8/pokemon/Dewpider.png b/src/canonical/minisprites/gen8/pokemon/751--0--Dewpider.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Dewpider.png rename to src/canonical/minisprites/gen8/pokemon/751--0--Dewpider.png diff --git a/src/canonical/minisprites/gen8/pokemon/Araquanid.png b/src/canonical/minisprites/gen8/pokemon/752--0--Araquanid.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Araquanid.png rename to src/canonical/minisprites/gen8/pokemon/752--0--Araquanid.png diff --git a/src/canonical/minisprites/gen8/pokemon/Morelull.png b/src/canonical/minisprites/gen8/pokemon/755--0--Morelull.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Morelull.png rename to src/canonical/minisprites/gen8/pokemon/755--0--Morelull.png diff --git a/src/canonical/minisprites/gen8/pokemon/Shiinotic.png b/src/canonical/minisprites/gen8/pokemon/756--0--Shiinotic.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Shiinotic.png rename to src/canonical/minisprites/gen8/pokemon/756--0--Shiinotic.png diff --git a/src/canonical/minisprites/gen8/pokemon/Salandit.png b/src/canonical/minisprites/gen8/pokemon/757--0--Salandit.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Salandit.png rename to src/canonical/minisprites/gen8/pokemon/757--0--Salandit.png diff --git a/src/canonical/minisprites/gen8/pokemon/Salazzle.png b/src/canonical/minisprites/gen8/pokemon/758--0--Salazzle.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Salazzle.png rename to src/canonical/minisprites/gen8/pokemon/758--0--Salazzle.png diff --git a/src/canonical/minisprites/gen8/pokemon/Stufful.png b/src/canonical/minisprites/gen8/pokemon/759--0--Stufful.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Stufful.png rename to src/canonical/minisprites/gen8/pokemon/759--0--Stufful.png diff --git a/src/canonical/minisprites/gen8/pokemon/Bewear.png b/src/canonical/minisprites/gen8/pokemon/760--0--Bewear.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Bewear.png rename to src/canonical/minisprites/gen8/pokemon/760--0--Bewear.png diff --git a/src/canonical/minisprites/gen8/pokemon/Bounsweet.png b/src/canonical/minisprites/gen8/pokemon/761--0--Bounsweet.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Bounsweet.png rename to src/canonical/minisprites/gen8/pokemon/761--0--Bounsweet.png diff --git a/src/canonical/minisprites/gen8/pokemon/Steenee.png b/src/canonical/minisprites/gen8/pokemon/762--0--Steenee.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Steenee.png rename to src/canonical/minisprites/gen8/pokemon/762--0--Steenee.png diff --git a/src/canonical/minisprites/gen8/pokemon/Tsareena.png b/src/canonical/minisprites/gen8/pokemon/763--0--Tsareena.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Tsareena.png rename to src/canonical/minisprites/gen8/pokemon/763--0--Tsareena.png diff --git a/src/canonical/minisprites/gen8/pokemon/Oranguru.png b/src/canonical/minisprites/gen8/pokemon/765--0--Oranguru.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Oranguru.png rename to src/canonical/minisprites/gen8/pokemon/765--0--Oranguru.png diff --git a/src/canonical/minisprites/gen8/pokemon/Passimian.png b/src/canonical/minisprites/gen8/pokemon/766--0--Passimian.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Passimian.png rename to src/canonical/minisprites/gen8/pokemon/766--0--Passimian.png diff --git a/src/canonical/minisprites/gen8/pokemon/Wimpod.png b/src/canonical/minisprites/gen8/pokemon/767--0--Wimpod.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Wimpod.png rename to src/canonical/minisprites/gen8/pokemon/767--0--Wimpod.png diff --git a/src/canonical/minisprites/gen8/pokemon/Golisopod.png b/src/canonical/minisprites/gen8/pokemon/768--0--Golisopod.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Golisopod.png rename to src/canonical/minisprites/gen8/pokemon/768--0--Golisopod.png diff --git a/src/canonical/minisprites/gen8/pokemon/Ponyta.png b/src/canonical/minisprites/gen8/pokemon/77--0--Ponyta.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Ponyta.png rename to src/canonical/minisprites/gen8/pokemon/77--0--Ponyta.png diff --git a/src/canonical/minisprites/gen8/pokemon/Ponyta--Galar.png b/src/canonical/minisprites/gen8/pokemon/77--420--Ponyta--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Ponyta--Galar.png rename to src/canonical/minisprites/gen8/pokemon/77--420--Ponyta--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pyukumuku.png b/src/canonical/minisprites/gen8/pokemon/771--0--Pyukumuku.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pyukumuku.png rename to src/canonical/minisprites/gen8/pokemon/771--0--Pyukumuku.png diff --git a/src/canonical/minisprites/gen8/pokemon/Type__003a_Null.png b/src/canonical/minisprites/gen8/pokemon/772--0--Type__003a_Null.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Type__003a_Null.png rename to src/canonical/minisprites/gen8/pokemon/772--0--Type__003a_Null.png diff --git a/src/canonical/minisprites/gen8/pokemon/Silvally.png b/src/canonical/minisprites/gen8/pokemon/773--0--Silvally.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Silvally.png rename to src/canonical/minisprites/gen8/pokemon/773--0--Silvally.png diff --git a/src/canonical/minisprites/gen8/pokemon/Turtonator.png b/src/canonical/minisprites/gen8/pokemon/776--0--Turtonator.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Turtonator.png rename to src/canonical/minisprites/gen8/pokemon/776--0--Turtonator.png diff --git a/src/canonical/minisprites/gen8/pokemon/Togedemaru.png b/src/canonical/minisprites/gen8/pokemon/777--0--Togedemaru.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Togedemaru.png rename to src/canonical/minisprites/gen8/pokemon/777--0--Togedemaru.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mimikyu.png b/src/canonical/minisprites/gen8/pokemon/778--0--Mimikyu.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mimikyu.png rename to src/canonical/minisprites/gen8/pokemon/778--0--Mimikyu.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rapidash.png b/src/canonical/minisprites/gen8/pokemon/78--0--Rapidash.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rapidash.png rename to src/canonical/minisprites/gen8/pokemon/78--0--Rapidash.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rapidash--Galar.png b/src/canonical/minisprites/gen8/pokemon/78--420--Rapidash--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rapidash--Galar.png rename to src/canonical/minisprites/gen8/pokemon/78--420--Rapidash--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Drampa.png b/src/canonical/minisprites/gen8/pokemon/780--0--Drampa.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Drampa.png rename to src/canonical/minisprites/gen8/pokemon/780--0--Drampa.png diff --git a/src/canonical/minisprites/gen8/pokemon/Dhelmise.png b/src/canonical/minisprites/gen8/pokemon/781--0--Dhelmise.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Dhelmise.png rename to src/canonical/minisprites/gen8/pokemon/781--0--Dhelmise.png diff --git a/src/canonical/minisprites/gen8/pokemon/Jangmo-o.png b/src/canonical/minisprites/gen8/pokemon/782--0--Jangmo-o.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Jangmo-o.png rename to src/canonical/minisprites/gen8/pokemon/782--0--Jangmo-o.png diff --git a/src/canonical/minisprites/gen8/pokemon/Hakamo-o.png b/src/canonical/minisprites/gen8/pokemon/783--0--Hakamo-o.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Hakamo-o.png rename to src/canonical/minisprites/gen8/pokemon/783--0--Hakamo-o.png diff --git a/src/canonical/minisprites/gen8/pokemon/Kommo-o.png b/src/canonical/minisprites/gen8/pokemon/784--0--Kommo-o.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Kommo-o.png rename to src/canonical/minisprites/gen8/pokemon/784--0--Kommo-o.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cosmog.png b/src/canonical/minisprites/gen8/pokemon/789--0--Cosmog.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cosmog.png rename to src/canonical/minisprites/gen8/pokemon/789--0--Cosmog.png diff --git a/src/canonical/minisprites/gen8/pokemon/Slowpoke--Galar.png b/src/canonical/minisprites/gen8/pokemon/79--420--Slowpoke--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Slowpoke--Galar.png rename to src/canonical/minisprites/gen8/pokemon/79--420--Slowpoke--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cosmoem.png b/src/canonical/minisprites/gen8/pokemon/790--0--Cosmoem.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cosmoem.png rename to src/canonical/minisprites/gen8/pokemon/790--0--Cosmoem.png diff --git a/src/canonical/minisprites/gen8/pokemon/Solgaleo.png b/src/canonical/minisprites/gen8/pokemon/791--0--Solgaleo.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Solgaleo.png rename to src/canonical/minisprites/gen8/pokemon/791--0--Solgaleo.png diff --git a/src/canonical/minisprites/gen8/pokemon/Lunala.png b/src/canonical/minisprites/gen8/pokemon/792--0--Lunala.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Lunala.png rename to src/canonical/minisprites/gen8/pokemon/792--0--Lunala.png diff --git a/src/canonical/minisprites/gen8/pokemon/Wartortle.png b/src/canonical/minisprites/gen8/pokemon/8--0--Wartortle.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Wartortle.png rename to src/canonical/minisprites/gen8/pokemon/8--0--Wartortle.png diff --git a/src/canonical/minisprites/gen8/pokemon/Necrozma.png b/src/canonical/minisprites/gen8/pokemon/800--0--Necrozma.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Necrozma.png rename to src/canonical/minisprites/gen8/pokemon/800--0--Necrozma.png diff --git a/src/canonical/minisprites/gen8/pokemon/Necrozma--Dawn_Wings.png b/src/canonical/minisprites/gen8/pokemon/800--420--Necrozma--Dawn_Wings.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Necrozma--Dawn_Wings.png rename to src/canonical/minisprites/gen8/pokemon/800--420--Necrozma--Dawn_Wings.png diff --git a/src/canonical/minisprites/gen8/pokemon/Necrozma--Dusk_Mane.png b/src/canonical/minisprites/gen8/pokemon/800--420--Necrozma--Dusk_Mane.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Necrozma--Dusk_Mane.png rename to src/canonical/minisprites/gen8/pokemon/800--420--Necrozma--Dusk_Mane.png diff --git a/src/canonical/minisprites/gen8/pokemon/Marshadow.png b/src/canonical/minisprites/gen8/pokemon/802--0--Marshadow.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Marshadow.png rename to src/canonical/minisprites/gen8/pokemon/802--0--Marshadow.png diff --git a/src/canonical/minisprites/gen8/pokemon/Zeraora.png b/src/canonical/minisprites/gen8/pokemon/807--0--Zeraora.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Zeraora.png rename to src/canonical/minisprites/gen8/pokemon/807--0--Zeraora.png diff --git a/src/canonical/minisprites/gen8/pokemon/Meltan.png b/src/canonical/minisprites/gen8/pokemon/808--0--Meltan.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Meltan.png rename to src/canonical/minisprites/gen8/pokemon/808--0--Meltan.png diff --git a/src/canonical/minisprites/gen8/pokemon/Melmetal.png b/src/canonical/minisprites/gen8/pokemon/809--0--Melmetal.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Melmetal.png rename to src/canonical/minisprites/gen8/pokemon/809--0--Melmetal.png diff --git a/src/canonical/minisprites/gen8/pokemon/Melmetal--Gmax.png b/src/canonical/minisprites/gen8/pokemon/809--420--Melmetal--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Melmetal--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/809--420--Melmetal--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Grookey.png b/src/canonical/minisprites/gen8/pokemon/810--0--Grookey.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Grookey.png rename to src/canonical/minisprites/gen8/pokemon/810--0--Grookey.png diff --git a/src/canonical/minisprites/gen8/pokemon/Thwackey.png b/src/canonical/minisprites/gen8/pokemon/811--0--Thwackey.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Thwackey.png rename to src/canonical/minisprites/gen8/pokemon/811--0--Thwackey.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rillaboom.png b/src/canonical/minisprites/gen8/pokemon/812--0--Rillaboom.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rillaboom.png rename to src/canonical/minisprites/gen8/pokemon/812--0--Rillaboom.png diff --git a/src/canonical/minisprites/gen8/pokemon/Scorbunny.png b/src/canonical/minisprites/gen8/pokemon/813--0--Scorbunny.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Scorbunny.png rename to src/canonical/minisprites/gen8/pokemon/813--0--Scorbunny.png diff --git a/src/canonical/minisprites/gen8/pokemon/Raboot.png b/src/canonical/minisprites/gen8/pokemon/814--0--Raboot.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Raboot.png rename to src/canonical/minisprites/gen8/pokemon/814--0--Raboot.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cinderace.png b/src/canonical/minisprites/gen8/pokemon/815--0--Cinderace.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cinderace.png rename to src/canonical/minisprites/gen8/pokemon/815--0--Cinderace.png diff --git a/src/canonical/minisprites/gen8/pokemon/Sobble.png b/src/canonical/minisprites/gen8/pokemon/816--0--Sobble.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Sobble.png rename to src/canonical/minisprites/gen8/pokemon/816--0--Sobble.png diff --git a/src/canonical/minisprites/gen8/pokemon/Drizzile.png b/src/canonical/minisprites/gen8/pokemon/817--0--Drizzile.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Drizzile.png rename to src/canonical/minisprites/gen8/pokemon/817--0--Drizzile.png diff --git a/src/canonical/minisprites/gen8/pokemon/Inteleon.png b/src/canonical/minisprites/gen8/pokemon/818--0--Inteleon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Inteleon.png rename to src/canonical/minisprites/gen8/pokemon/818--0--Inteleon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Skwovet.png b/src/canonical/minisprites/gen8/pokemon/819--0--Skwovet.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Skwovet.png rename to src/canonical/minisprites/gen8/pokemon/819--0--Skwovet.png diff --git a/src/canonical/minisprites/gen8/pokemon/Greedent.png b/src/canonical/minisprites/gen8/pokemon/820--0--Greedent.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Greedent.png rename to src/canonical/minisprites/gen8/pokemon/820--0--Greedent.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rookidee.png b/src/canonical/minisprites/gen8/pokemon/821--0--Rookidee.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rookidee.png rename to src/canonical/minisprites/gen8/pokemon/821--0--Rookidee.png diff --git a/src/canonical/minisprites/gen8/pokemon/Corvisquire.png b/src/canonical/minisprites/gen8/pokemon/822--0--Corvisquire.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Corvisquire.png rename to src/canonical/minisprites/gen8/pokemon/822--0--Corvisquire.png diff --git a/src/canonical/minisprites/gen8/pokemon/Corviknight.png b/src/canonical/minisprites/gen8/pokemon/823--0--Corviknight.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Corviknight.png rename to src/canonical/minisprites/gen8/pokemon/823--0--Corviknight.png diff --git a/src/canonical/minisprites/gen8/pokemon/Corviknight--Gmax.png b/src/canonical/minisprites/gen8/pokemon/823--420--Corviknight--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Corviknight--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/823--420--Corviknight--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Blipbug.png b/src/canonical/minisprites/gen8/pokemon/824--0--Blipbug.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Blipbug.png rename to src/canonical/minisprites/gen8/pokemon/824--0--Blipbug.png diff --git a/src/canonical/minisprites/gen8/pokemon/Dottler.png b/src/canonical/minisprites/gen8/pokemon/825--0--Dottler.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Dottler.png rename to src/canonical/minisprites/gen8/pokemon/825--0--Dottler.png diff --git a/src/canonical/minisprites/gen8/pokemon/Orbeetle.png b/src/canonical/minisprites/gen8/pokemon/826--0--Orbeetle.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Orbeetle.png rename to src/canonical/minisprites/gen8/pokemon/826--0--Orbeetle.png diff --git a/src/canonical/minisprites/gen8/pokemon/Orbeetle--Gmax.png b/src/canonical/minisprites/gen8/pokemon/826--420--Orbeetle--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Orbeetle--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/826--420--Orbeetle--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Nickit.png b/src/canonical/minisprites/gen8/pokemon/827--0--Nickit.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Nickit.png rename to src/canonical/minisprites/gen8/pokemon/827--0--Nickit.png diff --git a/src/canonical/minisprites/gen8/pokemon/Thievul.png b/src/canonical/minisprites/gen8/pokemon/828--0--Thievul.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Thievul.png rename to src/canonical/minisprites/gen8/pokemon/828--0--Thievul.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gossifleur.png b/src/canonical/minisprites/gen8/pokemon/829--0--Gossifleur.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gossifleur.png rename to src/canonical/minisprites/gen8/pokemon/829--0--Gossifleur.png diff --git a/src/canonical/minisprites/gen8/pokemon/Farfetch__0027d.png b/src/canonical/minisprites/gen8/pokemon/83--0--Farfetch__0027d.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Farfetch__0027d.png rename to src/canonical/minisprites/gen8/pokemon/83--0--Farfetch__0027d.png diff --git a/src/canonical/minisprites/gen8/pokemon/Farfetch__0027d--Galar.png b/src/canonical/minisprites/gen8/pokemon/83--420--Farfetch__0027d--Galar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Farfetch__0027d--Galar.png rename to src/canonical/minisprites/gen8/pokemon/83--420--Farfetch__0027d--Galar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Eldegoss.png b/src/canonical/minisprites/gen8/pokemon/830--0--Eldegoss.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Eldegoss.png rename to src/canonical/minisprites/gen8/pokemon/830--0--Eldegoss.png diff --git a/src/canonical/minisprites/gen8/pokemon/Wooloo.png b/src/canonical/minisprites/gen8/pokemon/831--0--Wooloo.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Wooloo.png rename to src/canonical/minisprites/gen8/pokemon/831--0--Wooloo.png diff --git a/src/canonical/minisprites/gen8/pokemon/Dubwool.png b/src/canonical/minisprites/gen8/pokemon/832--0--Dubwool.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Dubwool.png rename to src/canonical/minisprites/gen8/pokemon/832--0--Dubwool.png diff --git a/src/canonical/minisprites/gen8/pokemon/Chewtle.png b/src/canonical/minisprites/gen8/pokemon/833--0--Chewtle.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Chewtle.png rename to src/canonical/minisprites/gen8/pokemon/833--0--Chewtle.png diff --git a/src/canonical/minisprites/gen8/pokemon/Drednaw.png b/src/canonical/minisprites/gen8/pokemon/834--0--Drednaw.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Drednaw.png rename to src/canonical/minisprites/gen8/pokemon/834--0--Drednaw.png diff --git a/src/canonical/minisprites/gen8/pokemon/Drednaw--Gmax.png b/src/canonical/minisprites/gen8/pokemon/834--420--Drednaw--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Drednaw--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/834--420--Drednaw--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Yamper.png b/src/canonical/minisprites/gen8/pokemon/835--0--Yamper.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Yamper.png rename to src/canonical/minisprites/gen8/pokemon/835--0--Yamper.png diff --git a/src/canonical/minisprites/gen8/pokemon/Boltund.png b/src/canonical/minisprites/gen8/pokemon/836--0--Boltund.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Boltund.png rename to src/canonical/minisprites/gen8/pokemon/836--0--Boltund.png diff --git a/src/canonical/minisprites/gen8/pokemon/Rolycoly.png b/src/canonical/minisprites/gen8/pokemon/837--0--Rolycoly.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Rolycoly.png rename to src/canonical/minisprites/gen8/pokemon/837--0--Rolycoly.png diff --git a/src/canonical/minisprites/gen8/pokemon/Carkol.png b/src/canonical/minisprites/gen8/pokemon/838--0--Carkol.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Carkol.png rename to src/canonical/minisprites/gen8/pokemon/838--0--Carkol.png diff --git a/src/canonical/minisprites/gen8/pokemon/Coalossal.png b/src/canonical/minisprites/gen8/pokemon/839--0--Coalossal.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Coalossal.png rename to src/canonical/minisprites/gen8/pokemon/839--0--Coalossal.png diff --git a/src/canonical/minisprites/gen8/pokemon/Coalossal--Gmax.png b/src/canonical/minisprites/gen8/pokemon/839--420--Coalossal--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Coalossal--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/839--420--Coalossal--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Applin.png b/src/canonical/minisprites/gen8/pokemon/840--0--Applin.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Applin.png rename to src/canonical/minisprites/gen8/pokemon/840--0--Applin.png diff --git a/src/canonical/minisprites/gen8/pokemon/Flapple.png b/src/canonical/minisprites/gen8/pokemon/841--0--Flapple.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Flapple.png rename to src/canonical/minisprites/gen8/pokemon/841--0--Flapple.png diff --git a/src/canonical/minisprites/gen8/pokemon/Flapple--Gmax.png b/src/canonical/minisprites/gen8/pokemon/841--420--Flapple--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Flapple--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/841--420--Flapple--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Appletun.png b/src/canonical/minisprites/gen8/pokemon/842--0--Appletun.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Appletun.png rename to src/canonical/minisprites/gen8/pokemon/842--0--Appletun.png diff --git a/src/canonical/minisprites/gen8/pokemon/Appletun--Gmax.png b/src/canonical/minisprites/gen8/pokemon/842--420--Appletun--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Appletun--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/842--420--Appletun--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Silicobra.png b/src/canonical/minisprites/gen8/pokemon/843--0--Silicobra.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Silicobra.png rename to src/canonical/minisprites/gen8/pokemon/843--0--Silicobra.png diff --git a/src/canonical/minisprites/gen8/pokemon/Sandaconda.png b/src/canonical/minisprites/gen8/pokemon/844--0--Sandaconda.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Sandaconda.png rename to src/canonical/minisprites/gen8/pokemon/844--0--Sandaconda.png diff --git a/src/canonical/minisprites/gen8/pokemon/Sandaconda--Gmax.png b/src/canonical/minisprites/gen8/pokemon/844--420--Sandaconda--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Sandaconda--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/844--420--Sandaconda--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cramorant.png b/src/canonical/minisprites/gen8/pokemon/845--0--Cramorant.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cramorant.png rename to src/canonical/minisprites/gen8/pokemon/845--0--Cramorant.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cramorant--Gorging.png b/src/canonical/minisprites/gen8/pokemon/845--420--Cramorant--Gorging.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cramorant--Gorging.png rename to src/canonical/minisprites/gen8/pokemon/845--420--Cramorant--Gorging.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cramorant--Gulping.png b/src/canonical/minisprites/gen8/pokemon/845--420--Cramorant--Gulping.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cramorant--Gulping.png rename to src/canonical/minisprites/gen8/pokemon/845--420--Cramorant--Gulping.png diff --git a/src/canonical/minisprites/gen8/pokemon/Arrokuda.png b/src/canonical/minisprites/gen8/pokemon/846--0--Arrokuda.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Arrokuda.png rename to src/canonical/minisprites/gen8/pokemon/846--0--Arrokuda.png diff --git a/src/canonical/minisprites/gen8/pokemon/Barraskewda.png b/src/canonical/minisprites/gen8/pokemon/847--0--Barraskewda.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Barraskewda.png rename to src/canonical/minisprites/gen8/pokemon/847--0--Barraskewda.png diff --git a/src/canonical/minisprites/gen8/pokemon/Toxel.png b/src/canonical/minisprites/gen8/pokemon/848--0--Toxel.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Toxel.png rename to src/canonical/minisprites/gen8/pokemon/848--0--Toxel.png diff --git a/src/canonical/minisprites/gen8/pokemon/Toxtricity.png b/src/canonical/minisprites/gen8/pokemon/849--0--Toxtricity.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Toxtricity.png rename to src/canonical/minisprites/gen8/pokemon/849--0--Toxtricity.png diff --git a/src/canonical/minisprites/gen8/pokemon/Toxtricity--Gmax.png b/src/canonical/minisprites/gen8/pokemon/849--420--Toxtricity--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Toxtricity--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/849--420--Toxtricity--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Toxtricity--Low-Key.png b/src/canonical/minisprites/gen8/pokemon/849--420--Toxtricity--Low-Key.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Toxtricity--Low-Key.png rename to src/canonical/minisprites/gen8/pokemon/849--420--Toxtricity--Low-Key.png diff --git a/src/canonical/minisprites/gen8/pokemon/Sizzlipede.png b/src/canonical/minisprites/gen8/pokemon/850--0--Sizzlipede.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Sizzlipede.png rename to src/canonical/minisprites/gen8/pokemon/850--0--Sizzlipede.png diff --git a/src/canonical/minisprites/gen8/pokemon/Centiskorch.png b/src/canonical/minisprites/gen8/pokemon/851--0--Centiskorch.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Centiskorch.png rename to src/canonical/minisprites/gen8/pokemon/851--0--Centiskorch.png diff --git a/src/canonical/minisprites/gen8/pokemon/Centiskorch--Gmax.png b/src/canonical/minisprites/gen8/pokemon/851--420--Centiskorch--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Centiskorch--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/851--420--Centiskorch--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Clobbopus.png b/src/canonical/minisprites/gen8/pokemon/852--0--Clobbopus.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Clobbopus.png rename to src/canonical/minisprites/gen8/pokemon/852--0--Clobbopus.png diff --git a/src/canonical/minisprites/gen8/pokemon/Grapploct.png b/src/canonical/minisprites/gen8/pokemon/853--0--Grapploct.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Grapploct.png rename to src/canonical/minisprites/gen8/pokemon/853--0--Grapploct.png diff --git a/src/canonical/minisprites/gen8/pokemon/Sinistea.png b/src/canonical/minisprites/gen8/pokemon/854--0--Sinistea.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Sinistea.png rename to src/canonical/minisprites/gen8/pokemon/854--0--Sinistea.png diff --git a/src/canonical/minisprites/gen8/pokemon/Polteageist.png b/src/canonical/minisprites/gen8/pokemon/855--0--Polteageist.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Polteageist.png rename to src/canonical/minisprites/gen8/pokemon/855--0--Polteageist.png diff --git a/src/canonical/minisprites/gen8/pokemon/Hatenna.png b/src/canonical/minisprites/gen8/pokemon/856--0--Hatenna.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Hatenna.png rename to src/canonical/minisprites/gen8/pokemon/856--0--Hatenna.png diff --git a/src/canonical/minisprites/gen8/pokemon/Hattrem.png b/src/canonical/minisprites/gen8/pokemon/857--0--Hattrem.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Hattrem.png rename to src/canonical/minisprites/gen8/pokemon/857--0--Hattrem.png diff --git a/src/canonical/minisprites/gen8/pokemon/Hatterene.png b/src/canonical/minisprites/gen8/pokemon/858--0--Hatterene.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Hatterene.png rename to src/canonical/minisprites/gen8/pokemon/858--0--Hatterene.png diff --git a/src/canonical/minisprites/gen8/pokemon/Hatterene--Gmax.png b/src/canonical/minisprites/gen8/pokemon/858--420--Hatterene--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Hatterene--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/858--420--Hatterene--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Impidimp.png b/src/canonical/minisprites/gen8/pokemon/859--0--Impidimp.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Impidimp.png rename to src/canonical/minisprites/gen8/pokemon/859--0--Impidimp.png diff --git a/src/canonical/minisprites/gen8/pokemon/Morgrem.png b/src/canonical/minisprites/gen8/pokemon/860--0--Morgrem.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Morgrem.png rename to src/canonical/minisprites/gen8/pokemon/860--0--Morgrem.png diff --git a/src/canonical/minisprites/gen8/pokemon/Grimmsnarl.png b/src/canonical/minisprites/gen8/pokemon/861--0--Grimmsnarl.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Grimmsnarl.png rename to src/canonical/minisprites/gen8/pokemon/861--0--Grimmsnarl.png diff --git a/src/canonical/minisprites/gen8/pokemon/Grimmsnarl--Gmax.png b/src/canonical/minisprites/gen8/pokemon/861--420--Grimmsnarl--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Grimmsnarl--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/861--420--Grimmsnarl--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Obstagoon.png b/src/canonical/minisprites/gen8/pokemon/862--0--Obstagoon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Obstagoon.png rename to src/canonical/minisprites/gen8/pokemon/862--0--Obstagoon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Perrserker.png b/src/canonical/minisprites/gen8/pokemon/863--0--Perrserker.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Perrserker.png rename to src/canonical/minisprites/gen8/pokemon/863--0--Perrserker.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cursola.png b/src/canonical/minisprites/gen8/pokemon/864--0--Cursola.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cursola.png rename to src/canonical/minisprites/gen8/pokemon/864--0--Cursola.png diff --git a/src/canonical/minisprites/gen8/pokemon/Sirfetch__0027d.png b/src/canonical/minisprites/gen8/pokemon/865--0--Sirfetch__0027d.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Sirfetch__0027d.png rename to src/canonical/minisprites/gen8/pokemon/865--0--Sirfetch__0027d.png diff --git a/src/canonical/minisprites/gen8/pokemon/Mr._Rime.png b/src/canonical/minisprites/gen8/pokemon/866--0--Mr._Rime.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Mr._Rime.png rename to src/canonical/minisprites/gen8/pokemon/866--0--Mr._Rime.png diff --git a/src/canonical/minisprites/gen8/pokemon/Runerigus.png b/src/canonical/minisprites/gen8/pokemon/867--0--Runerigus.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Runerigus.png rename to src/canonical/minisprites/gen8/pokemon/867--0--Runerigus.png diff --git a/src/canonical/minisprites/gen8/pokemon/Milcery.png b/src/canonical/minisprites/gen8/pokemon/868--0--Milcery.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Milcery.png rename to src/canonical/minisprites/gen8/pokemon/868--0--Milcery.png diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie.png b/src/canonical/minisprites/gen8/pokemon/869--0--Alcremie.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Alcremie.png rename to src/canonical/minisprites/gen8/pokemon/869--0--Alcremie.png diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Caramel_Swirl.png b/src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Caramel_Swirl.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Caramel_Swirl.png rename to src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Caramel_Swirl.png diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Gmax.png b/src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Lemon_Cream.png b/src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Lemon_Cream.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Lemon_Cream.png rename to src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Lemon_Cream.png diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Matcha_Cream.png b/src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Matcha_Cream.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Matcha_Cream.png rename to src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Matcha_Cream.png diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Mint_Cream.png b/src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Mint_Cream.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Mint_Cream.png rename to src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Mint_Cream.png diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Rainbow_Swirl.png b/src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Rainbow_Swirl.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Rainbow_Swirl.png rename to src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Rainbow_Swirl.png diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Ruby_Cream.png b/src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Ruby_Cream.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Ruby_Cream.png rename to src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Ruby_Cream.png diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Ruby_Swirl.png b/src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Ruby_Swirl.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Ruby_Swirl.png rename to src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Ruby_Swirl.png diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Salted_Cream.png b/src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Salted_Cream.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Salted_Cream.png rename to src/canonical/minisprites/gen8/pokemon/869--420--Alcremie--Salted_Cream.png diff --git a/src/canonical/minisprites/gen8/pokemon/Falinks.png b/src/canonical/minisprites/gen8/pokemon/870--0--Falinks.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Falinks.png rename to src/canonical/minisprites/gen8/pokemon/870--0--Falinks.png diff --git a/src/canonical/minisprites/gen8/pokemon/Pincurchin.png b/src/canonical/minisprites/gen8/pokemon/871--0--Pincurchin.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Pincurchin.png rename to src/canonical/minisprites/gen8/pokemon/871--0--Pincurchin.png diff --git a/src/canonical/minisprites/gen8/pokemon/Snom.png b/src/canonical/minisprites/gen8/pokemon/872--0--Snom.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Snom.png rename to src/canonical/minisprites/gen8/pokemon/872--0--Snom.png diff --git a/src/canonical/minisprites/gen8/pokemon/Frosmoth.png b/src/canonical/minisprites/gen8/pokemon/873--0--Frosmoth.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Frosmoth.png rename to src/canonical/minisprites/gen8/pokemon/873--0--Frosmoth.png diff --git a/src/canonical/minisprites/gen8/pokemon/Stonjourner.png b/src/canonical/minisprites/gen8/pokemon/874--0--Stonjourner.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Stonjourner.png rename to src/canonical/minisprites/gen8/pokemon/874--0--Stonjourner.png diff --git a/src/canonical/minisprites/gen8/pokemon/Eiscue.png b/src/canonical/minisprites/gen8/pokemon/875--0--Eiscue.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Eiscue.png rename to src/canonical/minisprites/gen8/pokemon/875--0--Eiscue.png diff --git a/src/canonical/minisprites/gen8/pokemon/Eiscue--Noice.png b/src/canonical/minisprites/gen8/pokemon/875--420--Eiscue--Noice.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Eiscue--Noice.png rename to src/canonical/minisprites/gen8/pokemon/875--420--Eiscue--Noice.png diff --git a/src/canonical/minisprites/gen8/pokemon/Indeedee.png b/src/canonical/minisprites/gen8/pokemon/876--0--Indeedee.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Indeedee.png rename to src/canonical/minisprites/gen8/pokemon/876--0--Indeedee.png diff --git a/src/canonical/minisprites/gen8/pokemon/Indeedee--F.png b/src/canonical/minisprites/gen8/pokemon/876--420--Indeedee--F.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Indeedee--F.png rename to src/canonical/minisprites/gen8/pokemon/876--420--Indeedee--F.png diff --git a/src/canonical/minisprites/gen8/pokemon/Morpeko.png b/src/canonical/minisprites/gen8/pokemon/877--0--Morpeko.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Morpeko.png rename to src/canonical/minisprites/gen8/pokemon/877--0--Morpeko.png diff --git a/src/canonical/minisprites/gen8/pokemon/Morpeko--Hangry.png b/src/canonical/minisprites/gen8/pokemon/877--420--Morpeko--Hangry.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Morpeko--Hangry.png rename to src/canonical/minisprites/gen8/pokemon/877--420--Morpeko--Hangry.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cufant.png b/src/canonical/minisprites/gen8/pokemon/878--0--Cufant.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cufant.png rename to src/canonical/minisprites/gen8/pokemon/878--0--Cufant.png diff --git a/src/canonical/minisprites/gen8/pokemon/Copperajah.png b/src/canonical/minisprites/gen8/pokemon/879--0--Copperajah.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Copperajah.png rename to src/canonical/minisprites/gen8/pokemon/879--0--Copperajah.png diff --git a/src/canonical/minisprites/gen8/pokemon/Copperajah--Gmax.png b/src/canonical/minisprites/gen8/pokemon/879--420--Copperajah--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Copperajah--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/879--420--Copperajah--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Dracozolt.png b/src/canonical/minisprites/gen8/pokemon/880--0--Dracozolt.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Dracozolt.png rename to src/canonical/minisprites/gen8/pokemon/880--0--Dracozolt.png diff --git a/src/canonical/minisprites/gen8/pokemon/Arctozolt.png b/src/canonical/minisprites/gen8/pokemon/881--0--Arctozolt.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Arctozolt.png rename to src/canonical/minisprites/gen8/pokemon/881--0--Arctozolt.png diff --git a/src/canonical/minisprites/gen8/pokemon/Dracovish.png b/src/canonical/minisprites/gen8/pokemon/882--0--Dracovish.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Dracovish.png rename to src/canonical/minisprites/gen8/pokemon/882--0--Dracovish.png diff --git a/src/canonical/minisprites/gen8/pokemon/Arctovish.png b/src/canonical/minisprites/gen8/pokemon/883--0--Arctovish.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Arctovish.png rename to src/canonical/minisprites/gen8/pokemon/883--0--Arctovish.png diff --git a/src/canonical/minisprites/gen8/pokemon/Duraludon.png b/src/canonical/minisprites/gen8/pokemon/884--0--Duraludon.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Duraludon.png rename to src/canonical/minisprites/gen8/pokemon/884--0--Duraludon.png diff --git a/src/canonical/minisprites/gen8/pokemon/Duraludon--Gmax.png b/src/canonical/minisprites/gen8/pokemon/884--420--Duraludon--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Duraludon--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/884--420--Duraludon--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Dreepy.png b/src/canonical/minisprites/gen8/pokemon/885--0--Dreepy.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Dreepy.png rename to src/canonical/minisprites/gen8/pokemon/885--0--Dreepy.png diff --git a/src/canonical/minisprites/gen8/pokemon/Drakloak.png b/src/canonical/minisprites/gen8/pokemon/886--0--Drakloak.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Drakloak.png rename to src/canonical/minisprites/gen8/pokemon/886--0--Drakloak.png diff --git a/src/canonical/minisprites/gen8/pokemon/Dragapult.png b/src/canonical/minisprites/gen8/pokemon/887--0--Dragapult.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Dragapult.png rename to src/canonical/minisprites/gen8/pokemon/887--0--Dragapult.png diff --git a/src/canonical/minisprites/gen8/pokemon/Zacian.png b/src/canonical/minisprites/gen8/pokemon/888--0--Zacian.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Zacian.png rename to src/canonical/minisprites/gen8/pokemon/888--0--Zacian.png diff --git a/src/canonical/minisprites/gen8/pokemon/Zacian--Crowned.png b/src/canonical/minisprites/gen8/pokemon/888--420--Zacian--Crowned.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Zacian--Crowned.png rename to src/canonical/minisprites/gen8/pokemon/888--420--Zacian--Crowned.png diff --git a/src/canonical/minisprites/gen8/pokemon/Zamazenta.png b/src/canonical/minisprites/gen8/pokemon/889--0--Zamazenta.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Zamazenta.png rename to src/canonical/minisprites/gen8/pokemon/889--0--Zamazenta.png diff --git a/src/canonical/minisprites/gen8/pokemon/Zamazenta--Crowned.png b/src/canonical/minisprites/gen8/pokemon/889--420--Zamazenta--Crowned.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Zamazenta--Crowned.png rename to src/canonical/minisprites/gen8/pokemon/889--420--Zamazenta--Crowned.png diff --git a/src/canonical/minisprites/gen8/pokemon/Eternatus.png b/src/canonical/minisprites/gen8/pokemon/890--0--Eternatus.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Eternatus.png rename to src/canonical/minisprites/gen8/pokemon/890--0--Eternatus.png diff --git a/src/canonical/minisprites/gen8/pokemon/Eternatus--Eternamax.png b/src/canonical/minisprites/gen8/pokemon/890--420--Eternatus--Eternamax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Eternatus--Eternamax.png rename to src/canonical/minisprites/gen8/pokemon/890--420--Eternatus--Eternamax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Blastoise.png b/src/canonical/minisprites/gen8/pokemon/9--0--Blastoise.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Blastoise.png rename to src/canonical/minisprites/gen8/pokemon/9--0--Blastoise.png diff --git a/src/canonical/minisprites/gen8/pokemon/Shellder.png b/src/canonical/minisprites/gen8/pokemon/90--0--Shellder.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Shellder.png rename to src/canonical/minisprites/gen8/pokemon/90--0--Shellder.png diff --git a/src/canonical/minisprites/gen8/pokemon/Cloyster.png b/src/canonical/minisprites/gen8/pokemon/91--0--Cloyster.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Cloyster.png rename to src/canonical/minisprites/gen8/pokemon/91--0--Cloyster.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gastly.png b/src/canonical/minisprites/gen8/pokemon/92--0--Gastly.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gastly.png rename to src/canonical/minisprites/gen8/pokemon/92--0--Gastly.png diff --git a/src/canonical/minisprites/gen8/pokemon/Haunter.png b/src/canonical/minisprites/gen8/pokemon/93--0--Haunter.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Haunter.png rename to src/canonical/minisprites/gen8/pokemon/93--0--Haunter.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gengar.png b/src/canonical/minisprites/gen8/pokemon/94--0--Gengar.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gengar.png rename to src/canonical/minisprites/gen8/pokemon/94--0--Gengar.png diff --git a/src/canonical/minisprites/gen8/pokemon/Gengar--Gmax.png b/src/canonical/minisprites/gen8/pokemon/94--420--Gengar--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Gengar--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/94--420--Gengar--Gmax.png diff --git a/src/canonical/minisprites/gen8/pokemon/Onix.png b/src/canonical/minisprites/gen8/pokemon/95--0--Onix.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Onix.png rename to src/canonical/minisprites/gen8/pokemon/95--0--Onix.png diff --git a/src/canonical/minisprites/gen8/pokemon/Krabby.png b/src/canonical/minisprites/gen8/pokemon/98--0--Krabby.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Krabby.png rename to src/canonical/minisprites/gen8/pokemon/98--0--Krabby.png diff --git a/src/canonical/minisprites/gen8/pokemon/Kingler.png b/src/canonical/minisprites/gen8/pokemon/99--0--Kingler.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Kingler.png rename to src/canonical/minisprites/gen8/pokemon/99--0--Kingler.png diff --git a/src/canonical/minisprites/gen8/pokemon/Kingler--Gmax.png b/src/canonical/minisprites/gen8/pokemon/99--420--Kingler--Gmax.png similarity index 100% rename from src/canonical/minisprites/gen8/pokemon/Kingler--Gmax.png rename to src/canonical/minisprites/gen8/pokemon/99--420--Kingler--Gmax.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Bulbasaur.png b/src/canonical/minisprites/lgpe/pokemon/1--0--Bulbasaur.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Bulbasaur.png rename to src/canonical/minisprites/lgpe/pokemon/1--0--Bulbasaur.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Caterpie.png b/src/canonical/minisprites/lgpe/pokemon/10--0--Caterpie.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Caterpie.png rename to src/canonical/minisprites/lgpe/pokemon/10--0--Caterpie.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Voltorb.png b/src/canonical/minisprites/lgpe/pokemon/100--0--Voltorb.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Voltorb.png rename to src/canonical/minisprites/lgpe/pokemon/100--0--Voltorb.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Electrode.png b/src/canonical/minisprites/lgpe/pokemon/101--0--Electrode.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Electrode.png rename to src/canonical/minisprites/lgpe/pokemon/101--0--Electrode.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Exeggcute.png b/src/canonical/minisprites/lgpe/pokemon/102--0--Exeggcute.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Exeggcute.png rename to src/canonical/minisprites/lgpe/pokemon/102--0--Exeggcute.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Exeggutor.png b/src/canonical/minisprites/lgpe/pokemon/103--0--Exeggutor.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Exeggutor.png rename to src/canonical/minisprites/lgpe/pokemon/103--0--Exeggutor.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Exeggutor--Alola.png b/src/canonical/minisprites/lgpe/pokemon/103--420--Exeggutor--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Exeggutor--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/103--420--Exeggutor--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Cubone.png b/src/canonical/minisprites/lgpe/pokemon/104--0--Cubone.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Cubone.png rename to src/canonical/minisprites/lgpe/pokemon/104--0--Cubone.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Marowak.png b/src/canonical/minisprites/lgpe/pokemon/105--0--Marowak.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Marowak.png rename to src/canonical/minisprites/lgpe/pokemon/105--0--Marowak.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Marowak--Alola.png b/src/canonical/minisprites/lgpe/pokemon/105--420--Marowak--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Marowak--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/105--420--Marowak--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Hitmonlee.png b/src/canonical/minisprites/lgpe/pokemon/106--0--Hitmonlee.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Hitmonlee.png rename to src/canonical/minisprites/lgpe/pokemon/106--0--Hitmonlee.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Hitmonchan.png b/src/canonical/minisprites/lgpe/pokemon/107--0--Hitmonchan.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Hitmonchan.png rename to src/canonical/minisprites/lgpe/pokemon/107--0--Hitmonchan.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Lickitung.png b/src/canonical/minisprites/lgpe/pokemon/108--0--Lickitung.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Lickitung.png rename to src/canonical/minisprites/lgpe/pokemon/108--0--Lickitung.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Koffing.png b/src/canonical/minisprites/lgpe/pokemon/109--0--Koffing.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Koffing.png rename to src/canonical/minisprites/lgpe/pokemon/109--0--Koffing.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Metapod.png b/src/canonical/minisprites/lgpe/pokemon/11--0--Metapod.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Metapod.png rename to src/canonical/minisprites/lgpe/pokemon/11--0--Metapod.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Weezing.png b/src/canonical/minisprites/lgpe/pokemon/110--0--Weezing.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Weezing.png rename to src/canonical/minisprites/lgpe/pokemon/110--0--Weezing.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Rhyhorn.png b/src/canonical/minisprites/lgpe/pokemon/111--0--Rhyhorn.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Rhyhorn.png rename to src/canonical/minisprites/lgpe/pokemon/111--0--Rhyhorn.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Rhydon.png b/src/canonical/minisprites/lgpe/pokemon/112--0--Rhydon.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Rhydon.png rename to src/canonical/minisprites/lgpe/pokemon/112--0--Rhydon.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Chansey.png b/src/canonical/minisprites/lgpe/pokemon/113--0--Chansey.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Chansey.png rename to src/canonical/minisprites/lgpe/pokemon/113--0--Chansey.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Tangela.png b/src/canonical/minisprites/lgpe/pokemon/114--0--Tangela.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Tangela.png rename to src/canonical/minisprites/lgpe/pokemon/114--0--Tangela.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Kangaskhan.png b/src/canonical/minisprites/lgpe/pokemon/115--0--Kangaskhan.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Kangaskhan.png rename to src/canonical/minisprites/lgpe/pokemon/115--0--Kangaskhan.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Kangaskhan--Mega.png b/src/canonical/minisprites/lgpe/pokemon/115--420--Kangaskhan--Mega.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Kangaskhan--Mega.png rename to src/canonical/minisprites/lgpe/pokemon/115--420--Kangaskhan--Mega.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Horsea.png b/src/canonical/minisprites/lgpe/pokemon/116--0--Horsea.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Horsea.png rename to src/canonical/minisprites/lgpe/pokemon/116--0--Horsea.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Seadra.png b/src/canonical/minisprites/lgpe/pokemon/117--0--Seadra.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Seadra.png rename to src/canonical/minisprites/lgpe/pokemon/117--0--Seadra.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Goldeen.png b/src/canonical/minisprites/lgpe/pokemon/118--0--Goldeen.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Goldeen.png rename to src/canonical/minisprites/lgpe/pokemon/118--0--Goldeen.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Seaking.png b/src/canonical/minisprites/lgpe/pokemon/119--0--Seaking.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Seaking.png rename to src/canonical/minisprites/lgpe/pokemon/119--0--Seaking.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Butterfree.png b/src/canonical/minisprites/lgpe/pokemon/12--0--Butterfree.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Butterfree.png rename to src/canonical/minisprites/lgpe/pokemon/12--0--Butterfree.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Staryu.png b/src/canonical/minisprites/lgpe/pokemon/120--0--Staryu.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Staryu.png rename to src/canonical/minisprites/lgpe/pokemon/120--0--Staryu.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Starmie.png b/src/canonical/minisprites/lgpe/pokemon/121--0--Starmie.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Starmie.png rename to src/canonical/minisprites/lgpe/pokemon/121--0--Starmie.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Mr._Mime.png b/src/canonical/minisprites/lgpe/pokemon/122--0--Mr._Mime.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Mr._Mime.png rename to src/canonical/minisprites/lgpe/pokemon/122--0--Mr._Mime.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Scyther.png b/src/canonical/minisprites/lgpe/pokemon/123--0--Scyther.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Scyther.png rename to src/canonical/minisprites/lgpe/pokemon/123--0--Scyther.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Jynx.png b/src/canonical/minisprites/lgpe/pokemon/124--0--Jynx.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Jynx.png rename to src/canonical/minisprites/lgpe/pokemon/124--0--Jynx.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Electabuzz.png b/src/canonical/minisprites/lgpe/pokemon/125--0--Electabuzz.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Electabuzz.png rename to src/canonical/minisprites/lgpe/pokemon/125--0--Electabuzz.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Magmar.png b/src/canonical/minisprites/lgpe/pokemon/126--0--Magmar.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Magmar.png rename to src/canonical/minisprites/lgpe/pokemon/126--0--Magmar.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Pinsir.png b/src/canonical/minisprites/lgpe/pokemon/127--0--Pinsir.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Pinsir.png rename to src/canonical/minisprites/lgpe/pokemon/127--0--Pinsir.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Pinsir--Mega.png b/src/canonical/minisprites/lgpe/pokemon/127--420--Pinsir--Mega.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Pinsir--Mega.png rename to src/canonical/minisprites/lgpe/pokemon/127--420--Pinsir--Mega.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Tauros.png b/src/canonical/minisprites/lgpe/pokemon/128--0--Tauros.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Tauros.png rename to src/canonical/minisprites/lgpe/pokemon/128--0--Tauros.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Magikarp.png b/src/canonical/minisprites/lgpe/pokemon/129--0--Magikarp.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Magikarp.png rename to src/canonical/minisprites/lgpe/pokemon/129--0--Magikarp.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Weedle.png b/src/canonical/minisprites/lgpe/pokemon/13--0--Weedle.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Weedle.png rename to src/canonical/minisprites/lgpe/pokemon/13--0--Weedle.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Gyarados.png b/src/canonical/minisprites/lgpe/pokemon/130--0--Gyarados.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Gyarados.png rename to src/canonical/minisprites/lgpe/pokemon/130--0--Gyarados.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Gyarados--Mega.png b/src/canonical/minisprites/lgpe/pokemon/130--420--Gyarados--Mega.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Gyarados--Mega.png rename to src/canonical/minisprites/lgpe/pokemon/130--420--Gyarados--Mega.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Lapras.png b/src/canonical/minisprites/lgpe/pokemon/131--0--Lapras.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Lapras.png rename to src/canonical/minisprites/lgpe/pokemon/131--0--Lapras.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Ditto.png b/src/canonical/minisprites/lgpe/pokemon/132--0--Ditto.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Ditto.png rename to src/canonical/minisprites/lgpe/pokemon/132--0--Ditto.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Eevee.png b/src/canonical/minisprites/lgpe/pokemon/133--0--Eevee.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Eevee.png rename to src/canonical/minisprites/lgpe/pokemon/133--0--Eevee.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Eevee--Starter.png b/src/canonical/minisprites/lgpe/pokemon/133--420--Eevee--Starter.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Eevee--Starter.png rename to src/canonical/minisprites/lgpe/pokemon/133--420--Eevee--Starter.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Vaporeon.png b/src/canonical/minisprites/lgpe/pokemon/134--0--Vaporeon.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Vaporeon.png rename to src/canonical/minisprites/lgpe/pokemon/134--0--Vaporeon.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Jolteon.png b/src/canonical/minisprites/lgpe/pokemon/135--0--Jolteon.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Jolteon.png rename to src/canonical/minisprites/lgpe/pokemon/135--0--Jolteon.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Flareon.png b/src/canonical/minisprites/lgpe/pokemon/136--0--Flareon.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Flareon.png rename to src/canonical/minisprites/lgpe/pokemon/136--0--Flareon.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Porygon.png b/src/canonical/minisprites/lgpe/pokemon/137--0--Porygon.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Porygon.png rename to src/canonical/minisprites/lgpe/pokemon/137--0--Porygon.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Omanyte.png b/src/canonical/minisprites/lgpe/pokemon/138--0--Omanyte.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Omanyte.png rename to src/canonical/minisprites/lgpe/pokemon/138--0--Omanyte.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Omastar.png b/src/canonical/minisprites/lgpe/pokemon/139--0--Omastar.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Omastar.png rename to src/canonical/minisprites/lgpe/pokemon/139--0--Omastar.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Kakuna.png b/src/canonical/minisprites/lgpe/pokemon/14--0--Kakuna.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Kakuna.png rename to src/canonical/minisprites/lgpe/pokemon/14--0--Kakuna.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Kabuto.png b/src/canonical/minisprites/lgpe/pokemon/140--0--Kabuto.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Kabuto.png rename to src/canonical/minisprites/lgpe/pokemon/140--0--Kabuto.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Kabutops.png b/src/canonical/minisprites/lgpe/pokemon/141--0--Kabutops.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Kabutops.png rename to src/canonical/minisprites/lgpe/pokemon/141--0--Kabutops.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Aerodactyl.png b/src/canonical/minisprites/lgpe/pokemon/142--0--Aerodactyl.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Aerodactyl.png rename to src/canonical/minisprites/lgpe/pokemon/142--0--Aerodactyl.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Aerodactyl--Mega.png b/src/canonical/minisprites/lgpe/pokemon/142--420--Aerodactyl--Mega.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Aerodactyl--Mega.png rename to src/canonical/minisprites/lgpe/pokemon/142--420--Aerodactyl--Mega.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Snorlax.png b/src/canonical/minisprites/lgpe/pokemon/143--0--Snorlax.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Snorlax.png rename to src/canonical/minisprites/lgpe/pokemon/143--0--Snorlax.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Articuno.png b/src/canonical/minisprites/lgpe/pokemon/144--0--Articuno.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Articuno.png rename to src/canonical/minisprites/lgpe/pokemon/144--0--Articuno.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Zapdos.png b/src/canonical/minisprites/lgpe/pokemon/145--0--Zapdos.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Zapdos.png rename to src/canonical/minisprites/lgpe/pokemon/145--0--Zapdos.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Moltres.png b/src/canonical/minisprites/lgpe/pokemon/146--0--Moltres.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Moltres.png rename to src/canonical/minisprites/lgpe/pokemon/146--0--Moltres.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Dratini.png b/src/canonical/minisprites/lgpe/pokemon/147--0--Dratini.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Dratini.png rename to src/canonical/minisprites/lgpe/pokemon/147--0--Dratini.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Dragonair.png b/src/canonical/minisprites/lgpe/pokemon/148--0--Dragonair.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Dragonair.png rename to src/canonical/minisprites/lgpe/pokemon/148--0--Dragonair.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Dragonite.png b/src/canonical/minisprites/lgpe/pokemon/149--0--Dragonite.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Dragonite.png rename to src/canonical/minisprites/lgpe/pokemon/149--0--Dragonite.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Beedrill.png b/src/canonical/minisprites/lgpe/pokemon/15--0--Beedrill.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Beedrill.png rename to src/canonical/minisprites/lgpe/pokemon/15--0--Beedrill.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Beedrill--Mega.png b/src/canonical/minisprites/lgpe/pokemon/15--420--Beedrill--Mega.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Beedrill--Mega.png rename to src/canonical/minisprites/lgpe/pokemon/15--420--Beedrill--Mega.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Mewtwo.png b/src/canonical/minisprites/lgpe/pokemon/150--0--Mewtwo.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Mewtwo.png rename to src/canonical/minisprites/lgpe/pokemon/150--0--Mewtwo.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Mewtwo--Mega-X.png b/src/canonical/minisprites/lgpe/pokemon/150--420--Mewtwo--Mega-X.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Mewtwo--Mega-X.png rename to src/canonical/minisprites/lgpe/pokemon/150--420--Mewtwo--Mega-X.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Mew.png b/src/canonical/minisprites/lgpe/pokemon/151--0--Mew.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Mew.png rename to src/canonical/minisprites/lgpe/pokemon/151--0--Mew.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Pidgey.png b/src/canonical/minisprites/lgpe/pokemon/16--0--Pidgey.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Pidgey.png rename to src/canonical/minisprites/lgpe/pokemon/16--0--Pidgey.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Pidgeotto.png b/src/canonical/minisprites/lgpe/pokemon/17--0--Pidgeotto.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Pidgeotto.png rename to src/canonical/minisprites/lgpe/pokemon/17--0--Pidgeotto.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Pidgeot.png b/src/canonical/minisprites/lgpe/pokemon/18--0--Pidgeot.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Pidgeot.png rename to src/canonical/minisprites/lgpe/pokemon/18--0--Pidgeot.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Pidgeot--Mega.png b/src/canonical/minisprites/lgpe/pokemon/18--420--Pidgeot--Mega.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Pidgeot--Mega.png rename to src/canonical/minisprites/lgpe/pokemon/18--420--Pidgeot--Mega.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Rattata.png b/src/canonical/minisprites/lgpe/pokemon/19--0--Rattata.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Rattata.png rename to src/canonical/minisprites/lgpe/pokemon/19--0--Rattata.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Rattata--Alola.png b/src/canonical/minisprites/lgpe/pokemon/19--420--Rattata--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Rattata--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/19--420--Rattata--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Ivysaur.png b/src/canonical/minisprites/lgpe/pokemon/2--0--Ivysaur.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Ivysaur.png rename to src/canonical/minisprites/lgpe/pokemon/2--0--Ivysaur.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Raticate.png b/src/canonical/minisprites/lgpe/pokemon/20--0--Raticate.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Raticate.png rename to src/canonical/minisprites/lgpe/pokemon/20--0--Raticate.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Raticate--Alola.png b/src/canonical/minisprites/lgpe/pokemon/20--420--Raticate--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Raticate--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/20--420--Raticate--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Spearow.png b/src/canonical/minisprites/lgpe/pokemon/21--0--Spearow.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Spearow.png rename to src/canonical/minisprites/lgpe/pokemon/21--0--Spearow.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Fearow.png b/src/canonical/minisprites/lgpe/pokemon/22--0--Fearow.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Fearow.png rename to src/canonical/minisprites/lgpe/pokemon/22--0--Fearow.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Ekans.png b/src/canonical/minisprites/lgpe/pokemon/23--0--Ekans.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Ekans.png rename to src/canonical/minisprites/lgpe/pokemon/23--0--Ekans.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Arbok.png b/src/canonical/minisprites/lgpe/pokemon/24--0--Arbok.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Arbok.png rename to src/canonical/minisprites/lgpe/pokemon/24--0--Arbok.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Pikachu.png b/src/canonical/minisprites/lgpe/pokemon/25--0--Pikachu.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Pikachu.png rename to src/canonical/minisprites/lgpe/pokemon/25--0--Pikachu.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Pikachu--Starter.png b/src/canonical/minisprites/lgpe/pokemon/25--420--Pikachu--Starter.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Pikachu--Starter.png rename to src/canonical/minisprites/lgpe/pokemon/25--420--Pikachu--Starter.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Raichu.png b/src/canonical/minisprites/lgpe/pokemon/26--0--Raichu.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Raichu.png rename to src/canonical/minisprites/lgpe/pokemon/26--0--Raichu.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Raichu--Alola.png b/src/canonical/minisprites/lgpe/pokemon/26--420--Raichu--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Raichu--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/26--420--Raichu--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Sandshrew.png b/src/canonical/minisprites/lgpe/pokemon/27--0--Sandshrew.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Sandshrew.png rename to src/canonical/minisprites/lgpe/pokemon/27--0--Sandshrew.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Sandshrew--Alola.png b/src/canonical/minisprites/lgpe/pokemon/27--420--Sandshrew--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Sandshrew--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/27--420--Sandshrew--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Sandslash.png b/src/canonical/minisprites/lgpe/pokemon/28--0--Sandslash.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Sandslash.png rename to src/canonical/minisprites/lgpe/pokemon/28--0--Sandslash.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Sandslash--Alola.png b/src/canonical/minisprites/lgpe/pokemon/28--420--Sandslash--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Sandslash--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/28--420--Sandslash--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Nidoran-F.png b/src/canonical/minisprites/lgpe/pokemon/29--0--Nidoran-F.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Nidoran-F.png rename to src/canonical/minisprites/lgpe/pokemon/29--0--Nidoran-F.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Venusaur.png b/src/canonical/minisprites/lgpe/pokemon/3--0--Venusaur.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Venusaur.png rename to src/canonical/minisprites/lgpe/pokemon/3--0--Venusaur.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Venusaur--Mega.png b/src/canonical/minisprites/lgpe/pokemon/3--420--Venusaur--Mega.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Venusaur--Mega.png rename to src/canonical/minisprites/lgpe/pokemon/3--420--Venusaur--Mega.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Nidorina.png b/src/canonical/minisprites/lgpe/pokemon/30--0--Nidorina.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Nidorina.png rename to src/canonical/minisprites/lgpe/pokemon/30--0--Nidorina.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Nidoqueen.png b/src/canonical/minisprites/lgpe/pokemon/31--0--Nidoqueen.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Nidoqueen.png rename to src/canonical/minisprites/lgpe/pokemon/31--0--Nidoqueen.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Nidoran-M.png b/src/canonical/minisprites/lgpe/pokemon/32--0--Nidoran-M.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Nidoran-M.png rename to src/canonical/minisprites/lgpe/pokemon/32--0--Nidoran-M.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Nidorino.png b/src/canonical/minisprites/lgpe/pokemon/33--0--Nidorino.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Nidorino.png rename to src/canonical/minisprites/lgpe/pokemon/33--0--Nidorino.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Nidoking.png b/src/canonical/minisprites/lgpe/pokemon/34--0--Nidoking.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Nidoking.png rename to src/canonical/minisprites/lgpe/pokemon/34--0--Nidoking.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Clefairy.png b/src/canonical/minisprites/lgpe/pokemon/35--0--Clefairy.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Clefairy.png rename to src/canonical/minisprites/lgpe/pokemon/35--0--Clefairy.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Clefable.png b/src/canonical/minisprites/lgpe/pokemon/36--0--Clefable.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Clefable.png rename to src/canonical/minisprites/lgpe/pokemon/36--0--Clefable.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Vulpix.png b/src/canonical/minisprites/lgpe/pokemon/37--0--Vulpix.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Vulpix.png rename to src/canonical/minisprites/lgpe/pokemon/37--0--Vulpix.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Vulpix--Alola.png b/src/canonical/minisprites/lgpe/pokemon/37--420--Vulpix--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Vulpix--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/37--420--Vulpix--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Ninetales.png b/src/canonical/minisprites/lgpe/pokemon/38--0--Ninetales.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Ninetales.png rename to src/canonical/minisprites/lgpe/pokemon/38--0--Ninetales.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Ninetales--Alola.png b/src/canonical/minisprites/lgpe/pokemon/38--420--Ninetales--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Ninetales--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/38--420--Ninetales--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Jigglypuff.png b/src/canonical/minisprites/lgpe/pokemon/39--0--Jigglypuff.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Jigglypuff.png rename to src/canonical/minisprites/lgpe/pokemon/39--0--Jigglypuff.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Charmander.png b/src/canonical/minisprites/lgpe/pokemon/4--0--Charmander.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Charmander.png rename to src/canonical/minisprites/lgpe/pokemon/4--0--Charmander.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Wigglytuff.png b/src/canonical/minisprites/lgpe/pokemon/40--0--Wigglytuff.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Wigglytuff.png rename to src/canonical/minisprites/lgpe/pokemon/40--0--Wigglytuff.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Zubat.png b/src/canonical/minisprites/lgpe/pokemon/41--0--Zubat.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Zubat.png rename to src/canonical/minisprites/lgpe/pokemon/41--0--Zubat.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Golbat.png b/src/canonical/minisprites/lgpe/pokemon/42--0--Golbat.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Golbat.png rename to src/canonical/minisprites/lgpe/pokemon/42--0--Golbat.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Oddish.png b/src/canonical/minisprites/lgpe/pokemon/43--0--Oddish.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Oddish.png rename to src/canonical/minisprites/lgpe/pokemon/43--0--Oddish.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Gloom.png b/src/canonical/minisprites/lgpe/pokemon/44--0--Gloom.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Gloom.png rename to src/canonical/minisprites/lgpe/pokemon/44--0--Gloom.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Vileplume.png b/src/canonical/minisprites/lgpe/pokemon/45--0--Vileplume.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Vileplume.png rename to src/canonical/minisprites/lgpe/pokemon/45--0--Vileplume.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Paras.png b/src/canonical/minisprites/lgpe/pokemon/46--0--Paras.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Paras.png rename to src/canonical/minisprites/lgpe/pokemon/46--0--Paras.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Parasect.png b/src/canonical/minisprites/lgpe/pokemon/47--0--Parasect.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Parasect.png rename to src/canonical/minisprites/lgpe/pokemon/47--0--Parasect.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Venonat.png b/src/canonical/minisprites/lgpe/pokemon/48--0--Venonat.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Venonat.png rename to src/canonical/minisprites/lgpe/pokemon/48--0--Venonat.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Venomoth.png b/src/canonical/minisprites/lgpe/pokemon/49--0--Venomoth.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Venomoth.png rename to src/canonical/minisprites/lgpe/pokemon/49--0--Venomoth.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Charmeleon.png b/src/canonical/minisprites/lgpe/pokemon/5--0--Charmeleon.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Charmeleon.png rename to src/canonical/minisprites/lgpe/pokemon/5--0--Charmeleon.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Diglett.png b/src/canonical/minisprites/lgpe/pokemon/50--0--Diglett.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Diglett.png rename to src/canonical/minisprites/lgpe/pokemon/50--0--Diglett.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Diglett--Alola.png b/src/canonical/minisprites/lgpe/pokemon/50--420--Diglett--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Diglett--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/50--420--Diglett--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Dugtrio.png b/src/canonical/minisprites/lgpe/pokemon/51--0--Dugtrio.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Dugtrio.png rename to src/canonical/minisprites/lgpe/pokemon/51--0--Dugtrio.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Dugtrio--Alola.png b/src/canonical/minisprites/lgpe/pokemon/51--420--Dugtrio--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Dugtrio--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/51--420--Dugtrio--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Meowth.png b/src/canonical/minisprites/lgpe/pokemon/52--0--Meowth.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Meowth.png rename to src/canonical/minisprites/lgpe/pokemon/52--0--Meowth.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Meowth--Alola.png b/src/canonical/minisprites/lgpe/pokemon/52--420--Meowth--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Meowth--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/52--420--Meowth--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Persian.png b/src/canonical/minisprites/lgpe/pokemon/53--0--Persian.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Persian.png rename to src/canonical/minisprites/lgpe/pokemon/53--0--Persian.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Persian--Alola.png b/src/canonical/minisprites/lgpe/pokemon/53--420--Persian--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Persian--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/53--420--Persian--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Psyduck.png b/src/canonical/minisprites/lgpe/pokemon/54--0--Psyduck.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Psyduck.png rename to src/canonical/minisprites/lgpe/pokemon/54--0--Psyduck.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Golduck.png b/src/canonical/minisprites/lgpe/pokemon/55--0--Golduck.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Golduck.png rename to src/canonical/minisprites/lgpe/pokemon/55--0--Golduck.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Mankey.png b/src/canonical/minisprites/lgpe/pokemon/56--0--Mankey.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Mankey.png rename to src/canonical/minisprites/lgpe/pokemon/56--0--Mankey.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Primeape.png b/src/canonical/minisprites/lgpe/pokemon/57--0--Primeape.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Primeape.png rename to src/canonical/minisprites/lgpe/pokemon/57--0--Primeape.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Growlithe.png b/src/canonical/minisprites/lgpe/pokemon/58--0--Growlithe.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Growlithe.png rename to src/canonical/minisprites/lgpe/pokemon/58--0--Growlithe.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Arcanine.png b/src/canonical/minisprites/lgpe/pokemon/59--0--Arcanine.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Arcanine.png rename to src/canonical/minisprites/lgpe/pokemon/59--0--Arcanine.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Charizard.png b/src/canonical/minisprites/lgpe/pokemon/6--0--Charizard.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Charizard.png rename to src/canonical/minisprites/lgpe/pokemon/6--0--Charizard.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Charizard--Mega-X.png b/src/canonical/minisprites/lgpe/pokemon/6--420--Charizard--Mega-X.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Charizard--Mega-X.png rename to src/canonical/minisprites/lgpe/pokemon/6--420--Charizard--Mega-X.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Poliwag.png b/src/canonical/minisprites/lgpe/pokemon/60--0--Poliwag.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Poliwag.png rename to src/canonical/minisprites/lgpe/pokemon/60--0--Poliwag.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Poliwhirl.png b/src/canonical/minisprites/lgpe/pokemon/61--0--Poliwhirl.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Poliwhirl.png rename to src/canonical/minisprites/lgpe/pokemon/61--0--Poliwhirl.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Poliwrath.png b/src/canonical/minisprites/lgpe/pokemon/62--0--Poliwrath.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Poliwrath.png rename to src/canonical/minisprites/lgpe/pokemon/62--0--Poliwrath.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Abra.png b/src/canonical/minisprites/lgpe/pokemon/63--0--Abra.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Abra.png rename to src/canonical/minisprites/lgpe/pokemon/63--0--Abra.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Kadabra.png b/src/canonical/minisprites/lgpe/pokemon/64--0--Kadabra.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Kadabra.png rename to src/canonical/minisprites/lgpe/pokemon/64--0--Kadabra.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Alakazam.png b/src/canonical/minisprites/lgpe/pokemon/65--0--Alakazam.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Alakazam.png rename to src/canonical/minisprites/lgpe/pokemon/65--0--Alakazam.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Alakazam--Mega.png b/src/canonical/minisprites/lgpe/pokemon/65--420--Alakazam--Mega.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Alakazam--Mega.png rename to src/canonical/minisprites/lgpe/pokemon/65--420--Alakazam--Mega.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Machop.png b/src/canonical/minisprites/lgpe/pokemon/66--0--Machop.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Machop.png rename to src/canonical/minisprites/lgpe/pokemon/66--0--Machop.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Machoke.png b/src/canonical/minisprites/lgpe/pokemon/67--0--Machoke.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Machoke.png rename to src/canonical/minisprites/lgpe/pokemon/67--0--Machoke.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Machamp.png b/src/canonical/minisprites/lgpe/pokemon/68--0--Machamp.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Machamp.png rename to src/canonical/minisprites/lgpe/pokemon/68--0--Machamp.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Bellsprout.png b/src/canonical/minisprites/lgpe/pokemon/69--0--Bellsprout.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Bellsprout.png rename to src/canonical/minisprites/lgpe/pokemon/69--0--Bellsprout.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Squirtle.png b/src/canonical/minisprites/lgpe/pokemon/7--0--Squirtle.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Squirtle.png rename to src/canonical/minisprites/lgpe/pokemon/7--0--Squirtle.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Weepinbell.png b/src/canonical/minisprites/lgpe/pokemon/70--0--Weepinbell.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Weepinbell.png rename to src/canonical/minisprites/lgpe/pokemon/70--0--Weepinbell.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Victreebel.png b/src/canonical/minisprites/lgpe/pokemon/71--0--Victreebel.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Victreebel.png rename to src/canonical/minisprites/lgpe/pokemon/71--0--Victreebel.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Tentacool.png b/src/canonical/minisprites/lgpe/pokemon/72--0--Tentacool.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Tentacool.png rename to src/canonical/minisprites/lgpe/pokemon/72--0--Tentacool.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Tentacruel.png b/src/canonical/minisprites/lgpe/pokemon/73--0--Tentacruel.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Tentacruel.png rename to src/canonical/minisprites/lgpe/pokemon/73--0--Tentacruel.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Geodude.png b/src/canonical/minisprites/lgpe/pokemon/74--0--Geodude.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Geodude.png rename to src/canonical/minisprites/lgpe/pokemon/74--0--Geodude.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Geodude--Alola.png b/src/canonical/minisprites/lgpe/pokemon/74--420--Geodude--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Geodude--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/74--420--Geodude--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Graveler.png b/src/canonical/minisprites/lgpe/pokemon/75--0--Graveler.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Graveler.png rename to src/canonical/minisprites/lgpe/pokemon/75--0--Graveler.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Graveler--Alola.png b/src/canonical/minisprites/lgpe/pokemon/75--420--Graveler--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Graveler--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/75--420--Graveler--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Golem.png b/src/canonical/minisprites/lgpe/pokemon/76--0--Golem.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Golem.png rename to src/canonical/minisprites/lgpe/pokemon/76--0--Golem.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Golem--Alola.png b/src/canonical/minisprites/lgpe/pokemon/76--420--Golem--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Golem--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/76--420--Golem--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Ponyta.png b/src/canonical/minisprites/lgpe/pokemon/77--0--Ponyta.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Ponyta.png rename to src/canonical/minisprites/lgpe/pokemon/77--0--Ponyta.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Rapidash.png b/src/canonical/minisprites/lgpe/pokemon/78--0--Rapidash.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Rapidash.png rename to src/canonical/minisprites/lgpe/pokemon/78--0--Rapidash.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Slowpoke.png b/src/canonical/minisprites/lgpe/pokemon/79--0--Slowpoke.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Slowpoke.png rename to src/canonical/minisprites/lgpe/pokemon/79--0--Slowpoke.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Wartortle.png b/src/canonical/minisprites/lgpe/pokemon/8--0--Wartortle.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Wartortle.png rename to src/canonical/minisprites/lgpe/pokemon/8--0--Wartortle.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Slowbro.png b/src/canonical/minisprites/lgpe/pokemon/80--0--Slowbro.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Slowbro.png rename to src/canonical/minisprites/lgpe/pokemon/80--0--Slowbro.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Slowbro--Mega.png b/src/canonical/minisprites/lgpe/pokemon/80--420--Slowbro--Mega.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Slowbro--Mega.png rename to src/canonical/minisprites/lgpe/pokemon/80--420--Slowbro--Mega.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Meltan.png b/src/canonical/minisprites/lgpe/pokemon/808--0--Meltan.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Meltan.png rename to src/canonical/minisprites/lgpe/pokemon/808--0--Meltan.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Melmetal.png b/src/canonical/minisprites/lgpe/pokemon/809--0--Melmetal.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Melmetal.png rename to src/canonical/minisprites/lgpe/pokemon/809--0--Melmetal.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Magnemite.png b/src/canonical/minisprites/lgpe/pokemon/81--0--Magnemite.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Magnemite.png rename to src/canonical/minisprites/lgpe/pokemon/81--0--Magnemite.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Magneton.png b/src/canonical/minisprites/lgpe/pokemon/82--0--Magneton.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Magneton.png rename to src/canonical/minisprites/lgpe/pokemon/82--0--Magneton.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Farfetch__0027d.png b/src/canonical/minisprites/lgpe/pokemon/83--0--Farfetch__0027d.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Farfetch__0027d.png rename to src/canonical/minisprites/lgpe/pokemon/83--0--Farfetch__0027d.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Doduo.png b/src/canonical/minisprites/lgpe/pokemon/84--0--Doduo.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Doduo.png rename to src/canonical/minisprites/lgpe/pokemon/84--0--Doduo.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Dodrio.png b/src/canonical/minisprites/lgpe/pokemon/85--0--Dodrio.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Dodrio.png rename to src/canonical/minisprites/lgpe/pokemon/85--0--Dodrio.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Seel.png b/src/canonical/minisprites/lgpe/pokemon/86--0--Seel.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Seel.png rename to src/canonical/minisprites/lgpe/pokemon/86--0--Seel.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Dewgong.png b/src/canonical/minisprites/lgpe/pokemon/87--0--Dewgong.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Dewgong.png rename to src/canonical/minisprites/lgpe/pokemon/87--0--Dewgong.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Grimer.png b/src/canonical/minisprites/lgpe/pokemon/88--0--Grimer.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Grimer.png rename to src/canonical/minisprites/lgpe/pokemon/88--0--Grimer.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Grimer--Alola.png b/src/canonical/minisprites/lgpe/pokemon/88--420--Grimer--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Grimer--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/88--420--Grimer--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Muk.png b/src/canonical/minisprites/lgpe/pokemon/89--0--Muk.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Muk.png rename to src/canonical/minisprites/lgpe/pokemon/89--0--Muk.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Muk--Alola.png b/src/canonical/minisprites/lgpe/pokemon/89--420--Muk--Alola.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Muk--Alola.png rename to src/canonical/minisprites/lgpe/pokemon/89--420--Muk--Alola.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Blastoise.png b/src/canonical/minisprites/lgpe/pokemon/9--0--Blastoise.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Blastoise.png rename to src/canonical/minisprites/lgpe/pokemon/9--0--Blastoise.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Blastoise--Mega.png b/src/canonical/minisprites/lgpe/pokemon/9--420--Blastoise--Mega.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Blastoise--Mega.png rename to src/canonical/minisprites/lgpe/pokemon/9--420--Blastoise--Mega.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Shellder.png b/src/canonical/minisprites/lgpe/pokemon/90--0--Shellder.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Shellder.png rename to src/canonical/minisprites/lgpe/pokemon/90--0--Shellder.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Cloyster.png b/src/canonical/minisprites/lgpe/pokemon/91--0--Cloyster.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Cloyster.png rename to src/canonical/minisprites/lgpe/pokemon/91--0--Cloyster.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Gastly.png b/src/canonical/minisprites/lgpe/pokemon/92--0--Gastly.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Gastly.png rename to src/canonical/minisprites/lgpe/pokemon/92--0--Gastly.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Haunter.png b/src/canonical/minisprites/lgpe/pokemon/93--0--Haunter.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Haunter.png rename to src/canonical/minisprites/lgpe/pokemon/93--0--Haunter.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Gengar.png b/src/canonical/minisprites/lgpe/pokemon/94--0--Gengar.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Gengar.png rename to src/canonical/minisprites/lgpe/pokemon/94--0--Gengar.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Gengar--Mega.png b/src/canonical/minisprites/lgpe/pokemon/94--420--Gengar--Mega.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Gengar--Mega.png rename to src/canonical/minisprites/lgpe/pokemon/94--420--Gengar--Mega.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Onix.png b/src/canonical/minisprites/lgpe/pokemon/95--0--Onix.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Onix.png rename to src/canonical/minisprites/lgpe/pokemon/95--0--Onix.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Drowzee.png b/src/canonical/minisprites/lgpe/pokemon/96--0--Drowzee.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Drowzee.png rename to src/canonical/minisprites/lgpe/pokemon/96--0--Drowzee.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Hypno.png b/src/canonical/minisprites/lgpe/pokemon/97--0--Hypno.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Hypno.png rename to src/canonical/minisprites/lgpe/pokemon/97--0--Hypno.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Krabby.png b/src/canonical/minisprites/lgpe/pokemon/98--0--Krabby.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Krabby.png rename to src/canonical/minisprites/lgpe/pokemon/98--0--Krabby.png diff --git a/src/canonical/minisprites/lgpe/pokemon/Kingler.png b/src/canonical/minisprites/lgpe/pokemon/99--0--Kingler.png similarity index 100% rename from src/canonical/minisprites/lgpe/pokemon/Kingler.png rename to src/canonical/minisprites/lgpe/pokemon/99--0--Kingler.png diff --git a/src/canonical/models/back-cosmetic/Rhyhorn--Female.gif b/src/canonical/models/back-cosmetic/111--0--Rhyhorn--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Rhyhorn--Female.gif rename to src/canonical/models/back-cosmetic/111--0--Rhyhorn--Female.gif diff --git a/src/canonical/models/back-cosmetic/Goldeen--Female.gif b/src/canonical/models/back-cosmetic/118--0--Goldeen--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Goldeen--Female.gif rename to src/canonical/models/back-cosmetic/118--0--Goldeen--Female.gif diff --git a/src/canonical/models/back-cosmetic/Seaking--Female.gif b/src/canonical/models/back-cosmetic/119--0--Seaking--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Seaking--Female.gif rename to src/canonical/models/back-cosmetic/119--0--Seaking--Female.gif diff --git a/src/canonical/models/back-cosmetic/Butterfree--Female.gif b/src/canonical/models/back-cosmetic/12--0--Butterfree--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Butterfree--Female.gif rename to src/canonical/models/back-cosmetic/12--0--Butterfree--Female.gif diff --git a/src/canonical/models/back-cosmetic/Gyarados--Female.gif b/src/canonical/models/back-cosmetic/130--0--Gyarados--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Gyarados--Female.gif rename to src/canonical/models/back-cosmetic/130--0--Gyarados--Female.gif diff --git a/src/canonical/models/back-cosmetic/Meganium--Female.gif b/src/canonical/models/back-cosmetic/154--0--Meganium--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Meganium--Female.gif rename to src/canonical/models/back-cosmetic/154--0--Meganium--Female.gif diff --git a/src/canonical/models/back-cosmetic/Ledyba--Female.gif b/src/canonical/models/back-cosmetic/165--0--Ledyba--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Ledyba--Female.gif rename to src/canonical/models/back-cosmetic/165--0--Ledyba--Female.gif diff --git a/src/canonical/models/back-cosmetic/Ledian--Female.gif b/src/canonical/models/back-cosmetic/166--0--Ledian--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Ledian--Female.gif rename to src/canonical/models/back-cosmetic/166--0--Ledian--Female.gif diff --git a/src/canonical/models/back-cosmetic/Xatu--Female.gif b/src/canonical/models/back-cosmetic/178--0--Xatu--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Xatu--Female.gif rename to src/canonical/models/back-cosmetic/178--0--Xatu--Female.gif diff --git a/src/canonical/models/back-cosmetic/Sudowoodo--Female.gif b/src/canonical/models/back-cosmetic/185--0--Sudowoodo--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Sudowoodo--Female.gif rename to src/canonical/models/back-cosmetic/185--0--Sudowoodo--Female.gif diff --git a/src/canonical/models/back-cosmetic/Rattata--Female.gif b/src/canonical/models/back-cosmetic/19--0--Rattata--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Rattata--Female.gif rename to src/canonical/models/back-cosmetic/19--0--Rattata--Female.gif diff --git a/src/canonical/models/back-cosmetic/Aipom--Female.gif b/src/canonical/models/back-cosmetic/190--0--Aipom--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Aipom--Female.gif rename to src/canonical/models/back-cosmetic/190--0--Aipom--Female.gif diff --git a/src/canonical/models/back-cosmetic/Wooper--Female.gif b/src/canonical/models/back-cosmetic/194--0--Wooper--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Wooper--Female.gif rename to src/canonical/models/back-cosmetic/194--0--Wooper--Female.gif diff --git a/src/canonical/models/back-cosmetic/Quagsire--Female.gif b/src/canonical/models/back-cosmetic/195--0--Quagsire--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Quagsire--Female.gif rename to src/canonical/models/back-cosmetic/195--0--Quagsire--Female.gif diff --git a/src/canonical/models/back-cosmetic/Unown--A.gif b/src/canonical/models/back-cosmetic/201--420--Unown--A.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--A.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--A.gif diff --git a/src/canonical/models/back-cosmetic/Unown--B.gif b/src/canonical/models/back-cosmetic/201--420--Unown--B.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--B.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--B.gif diff --git a/src/canonical/models/back-cosmetic/Unown--C.gif b/src/canonical/models/back-cosmetic/201--420--Unown--C.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--C.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--C.gif diff --git a/src/canonical/models/back-cosmetic/Unown--D.gif b/src/canonical/models/back-cosmetic/201--420--Unown--D.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--D.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--D.gif diff --git a/src/canonical/models/back-cosmetic/Unown--E.gif b/src/canonical/models/back-cosmetic/201--420--Unown--E.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--E.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--E.gif diff --git a/src/canonical/models/back-cosmetic/Unown--Exclamation.gif b/src/canonical/models/back-cosmetic/201--420--Unown--Exclamation.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--Exclamation.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--Exclamation.gif diff --git a/src/canonical/models/back-cosmetic/Unown--F.gif b/src/canonical/models/back-cosmetic/201--420--Unown--F.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--F.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--F.gif diff --git a/src/canonical/models/back-cosmetic/Unown--G.gif b/src/canonical/models/back-cosmetic/201--420--Unown--G.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--G.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--G.gif diff --git a/src/canonical/models/back-cosmetic/Unown--H.gif b/src/canonical/models/back-cosmetic/201--420--Unown--H.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--H.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--H.gif diff --git a/src/canonical/models/back-cosmetic/Unown--I.gif b/src/canonical/models/back-cosmetic/201--420--Unown--I.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--I.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--I.gif diff --git a/src/canonical/models/back-cosmetic/Unown--J.gif b/src/canonical/models/back-cosmetic/201--420--Unown--J.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--J.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--J.gif diff --git a/src/canonical/models/back-cosmetic/Unown--K.gif b/src/canonical/models/back-cosmetic/201--420--Unown--K.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--K.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--K.gif diff --git a/src/canonical/models/back-cosmetic/Unown--L.gif b/src/canonical/models/back-cosmetic/201--420--Unown--L.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--L.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--L.gif diff --git a/src/canonical/models/back-cosmetic/Unown--M.gif b/src/canonical/models/back-cosmetic/201--420--Unown--M.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--M.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--M.gif diff --git a/src/canonical/models/back-cosmetic/Unown--N.gif b/src/canonical/models/back-cosmetic/201--420--Unown--N.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--N.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--N.gif diff --git a/src/canonical/models/back-cosmetic/Unown--O.gif b/src/canonical/models/back-cosmetic/201--420--Unown--O.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--O.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--O.gif diff --git a/src/canonical/models/back-cosmetic/Unown--P.gif b/src/canonical/models/back-cosmetic/201--420--Unown--P.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--P.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--P.gif diff --git a/src/canonical/models/back-cosmetic/Unown--Q.gif b/src/canonical/models/back-cosmetic/201--420--Unown--Q.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--Q.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--Q.gif diff --git a/src/canonical/models/back-cosmetic/Unown--Question.gif b/src/canonical/models/back-cosmetic/201--420--Unown--Question.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--Question.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--Question.gif diff --git a/src/canonical/models/back-cosmetic/Unown--R.gif b/src/canonical/models/back-cosmetic/201--420--Unown--R.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--R.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--R.gif diff --git a/src/canonical/models/back-cosmetic/Unown--S.gif b/src/canonical/models/back-cosmetic/201--420--Unown--S.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--S.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--S.gif diff --git a/src/canonical/models/back-cosmetic/Unown--T.gif b/src/canonical/models/back-cosmetic/201--420--Unown--T.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--T.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--T.gif diff --git a/src/canonical/models/back-cosmetic/Unown--U.gif b/src/canonical/models/back-cosmetic/201--420--Unown--U.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--U.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--U.gif diff --git a/src/canonical/models/back-cosmetic/Unown--V.gif b/src/canonical/models/back-cosmetic/201--420--Unown--V.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--V.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--V.gif diff --git a/src/canonical/models/back-cosmetic/Unown--W.gif b/src/canonical/models/back-cosmetic/201--420--Unown--W.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--W.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--W.gif diff --git a/src/canonical/models/back-cosmetic/Unown--X.gif b/src/canonical/models/back-cosmetic/201--420--Unown--X.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--X.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--X.gif diff --git a/src/canonical/models/back-cosmetic/Unown--Y.gif b/src/canonical/models/back-cosmetic/201--420--Unown--Y.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--Y.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--Y.gif diff --git a/src/canonical/models/back-cosmetic/Unown--Z.gif b/src/canonical/models/back-cosmetic/201--420--Unown--Z.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unown--Z.gif rename to src/canonical/models/back-cosmetic/201--420--Unown--Z.gif diff --git a/src/canonical/models/back-cosmetic/Gligar--Female.gif b/src/canonical/models/back-cosmetic/207--0--Gligar--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Gligar--Female.gif rename to src/canonical/models/back-cosmetic/207--0--Gligar--Female.gif diff --git a/src/canonical/models/back-cosmetic/Heracross--Female.gif b/src/canonical/models/back-cosmetic/214--0--Heracross--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Heracross--Female.gif rename to src/canonical/models/back-cosmetic/214--0--Heracross--Female.gif diff --git a/src/canonical/models/back-cosmetic/Sneasel--Female.gif b/src/canonical/models/back-cosmetic/215--0--Sneasel--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Sneasel--Female.gif rename to src/canonical/models/back-cosmetic/215--0--Sneasel--Female.gif diff --git a/src/canonical/models/back-cosmetic/Ursaring--Female.gif b/src/canonical/models/back-cosmetic/217--0--Ursaring--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Ursaring--Female.gif rename to src/canonical/models/back-cosmetic/217--0--Ursaring--Female.gif diff --git a/src/canonical/models/back-cosmetic/Piloswine--Female.gif b/src/canonical/models/back-cosmetic/221--0--Piloswine--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Piloswine--Female.gif rename to src/canonical/models/back-cosmetic/221--0--Piloswine--Female.gif diff --git a/src/canonical/models/back-cosmetic/Octillery--Female.gif b/src/canonical/models/back-cosmetic/224--0--Octillery--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Octillery--Female.gif rename to src/canonical/models/back-cosmetic/224--0--Octillery--Female.gif diff --git a/src/canonical/models/back-cosmetic/Houndoom--Female.gif b/src/canonical/models/back-cosmetic/229--0--Houndoom--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Houndoom--Female.gif rename to src/canonical/models/back-cosmetic/229--0--Houndoom--Female.gif diff --git a/src/canonical/models/back-cosmetic/Donphan--Female.gif b/src/canonical/models/back-cosmetic/232--0--Donphan--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Donphan--Female.gif rename to src/canonical/models/back-cosmetic/232--0--Donphan--Female.gif diff --git a/src/canonical/models/back-cosmetic/Pikachu--Female.gif b/src/canonical/models/back-cosmetic/25--0--Pikachu--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Pikachu--Female.gif rename to src/canonical/models/back-cosmetic/25--0--Pikachu--Female.gif diff --git a/src/canonical/models/back-cosmetic/Combusken--Female.gif b/src/canonical/models/back-cosmetic/256--0--Combusken--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Combusken--Female.gif rename to src/canonical/models/back-cosmetic/256--0--Combusken--Female.gif diff --git a/src/canonical/models/back-cosmetic/Blaziken--Female.gif b/src/canonical/models/back-cosmetic/257--0--Blaziken--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Blaziken--Female.gif rename to src/canonical/models/back-cosmetic/257--0--Blaziken--Female.gif diff --git a/src/canonical/models/back-cosmetic/Raichu--Female.gif b/src/canonical/models/back-cosmetic/26--0--Raichu--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Raichu--Female.gif rename to src/canonical/models/back-cosmetic/26--0--Raichu--Female.gif diff --git a/src/canonical/models/back-cosmetic/Beautifly--Female.gif b/src/canonical/models/back-cosmetic/267--0--Beautifly--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Beautifly--Female.gif rename to src/canonical/models/back-cosmetic/267--0--Beautifly--Female.gif diff --git a/src/canonical/models/back-cosmetic/Dustox--Female.gif b/src/canonical/models/back-cosmetic/269--0--Dustox--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Dustox--Female.gif rename to src/canonical/models/back-cosmetic/269--0--Dustox--Female.gif diff --git a/src/canonical/models/back-cosmetic/Ludicolo--Female.gif b/src/canonical/models/back-cosmetic/272--0--Ludicolo--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Ludicolo--Female.gif rename to src/canonical/models/back-cosmetic/272--0--Ludicolo--Female.gif diff --git a/src/canonical/models/back-cosmetic/Nuzleaf--Female.gif b/src/canonical/models/back-cosmetic/274--0--Nuzleaf--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Nuzleaf--Female.gif rename to src/canonical/models/back-cosmetic/274--0--Nuzleaf--Female.gif diff --git a/src/canonical/models/back-cosmetic/Shiftry--Female.gif b/src/canonical/models/back-cosmetic/275--0--Shiftry--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Shiftry--Female.gif rename to src/canonical/models/back-cosmetic/275--0--Shiftry--Female.gif diff --git a/src/canonical/models/back-cosmetic/Venusaur--Female.gif b/src/canonical/models/back-cosmetic/3--0--Venusaur--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Venusaur--Female.gif rename to src/canonical/models/back-cosmetic/3--0--Venusaur--Female.gif diff --git a/src/canonical/models/back-cosmetic/Meditite--Female.gif b/src/canonical/models/back-cosmetic/307--0--Meditite--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Meditite--Female.gif rename to src/canonical/models/back-cosmetic/307--0--Meditite--Female.gif diff --git a/src/canonical/models/back-cosmetic/Medicham--Female.gif b/src/canonical/models/back-cosmetic/308--0--Medicham--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Medicham--Female.gif rename to src/canonical/models/back-cosmetic/308--0--Medicham--Female.gif diff --git a/src/canonical/models/back-cosmetic/Roselia--Female.gif b/src/canonical/models/back-cosmetic/315--0--Roselia--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Roselia--Female.gif rename to src/canonical/models/back-cosmetic/315--0--Roselia--Female.gif diff --git a/src/canonical/models/back-cosmetic/Gulpin--Female.gif b/src/canonical/models/back-cosmetic/316--0--Gulpin--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Gulpin--Female.gif rename to src/canonical/models/back-cosmetic/316--0--Gulpin--Female.gif diff --git a/src/canonical/models/back-cosmetic/Swalot--Female.gif b/src/canonical/models/back-cosmetic/317--0--Swalot--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Swalot--Female.gif rename to src/canonical/models/back-cosmetic/317--0--Swalot--Female.gif diff --git a/src/canonical/models/back-cosmetic/Numel--Female.gif b/src/canonical/models/back-cosmetic/322--0--Numel--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Numel--Female.gif rename to src/canonical/models/back-cosmetic/322--0--Numel--Female.gif diff --git a/src/canonical/models/back-cosmetic/Camerupt--Female.gif b/src/canonical/models/back-cosmetic/323--0--Camerupt--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Camerupt--Female.gif rename to src/canonical/models/back-cosmetic/323--0--Camerupt--Female.gif diff --git a/src/canonical/models/back-cosmetic/Milotic--Female.gif b/src/canonical/models/back-cosmetic/350--0--Milotic--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Milotic--Female.gif rename to src/canonical/models/back-cosmetic/350--0--Milotic--Female.gif diff --git a/src/canonical/models/back-cosmetic/Relicanth--Female.gif b/src/canonical/models/back-cosmetic/369--0--Relicanth--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Relicanth--Female.gif rename to src/canonical/models/back-cosmetic/369--0--Relicanth--Female.gif diff --git a/src/canonical/models/back-cosmetic/Bidoof--Female.gif b/src/canonical/models/back-cosmetic/399--0--Bidoof--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Bidoof--Female.gif rename to src/canonical/models/back-cosmetic/399--0--Bidoof--Female.gif diff --git a/src/canonical/models/back-cosmetic/Shinx--Female.gif b/src/canonical/models/back-cosmetic/403--0--Shinx--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Shinx--Female.gif rename to src/canonical/models/back-cosmetic/403--0--Shinx--Female.gif diff --git a/src/canonical/models/back-cosmetic/Luxio--Female.gif b/src/canonical/models/back-cosmetic/404--0--Luxio--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Luxio--Female.gif rename to src/canonical/models/back-cosmetic/404--0--Luxio--Female.gif diff --git a/src/canonical/models/back-cosmetic/Luxray--Female.gif b/src/canonical/models/back-cosmetic/405--0--Luxray--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Luxray--Female.gif rename to src/canonical/models/back-cosmetic/405--0--Luxray--Female.gif diff --git a/src/canonical/models/back-cosmetic/Roserade--Female.gif b/src/canonical/models/back-cosmetic/407--0--Roserade--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Roserade--Female.gif rename to src/canonical/models/back-cosmetic/407--0--Roserade--Female.gif diff --git a/src/canonical/models/back-cosmetic/Kerfluffle--Female.gif b/src/canonical/models/back-cosmetic/41--0--Kerfluffle--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Kerfluffle--Female.gif rename to src/canonical/models/back-cosmetic/41--0--Kerfluffle--Female.gif diff --git a/src/canonical/models/back-cosmetic/Burmy--Sandy.gif b/src/canonical/models/back-cosmetic/412--420--Burmy--Sandy.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Burmy--Sandy.gif rename to src/canonical/models/back-cosmetic/412--420--Burmy--Sandy.gif diff --git a/src/canonical/models/back-cosmetic/Burmy--Trash.gif b/src/canonical/models/back-cosmetic/412--420--Burmy--Trash.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Burmy--Trash.gif rename to src/canonical/models/back-cosmetic/412--420--Burmy--Trash.gif diff --git a/src/canonical/models/back-cosmetic/Buizel--Female.gif b/src/canonical/models/back-cosmetic/418--0--Buizel--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Buizel--Female.gif rename to src/canonical/models/back-cosmetic/418--0--Buizel--Female.gif diff --git a/src/canonical/models/back-cosmetic/Floatzel--Female.gif b/src/canonical/models/back-cosmetic/419--0--Floatzel--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Floatzel--Female.gif rename to src/canonical/models/back-cosmetic/419--0--Floatzel--Female.gif diff --git a/src/canonical/models/back-cosmetic/Shellos--East.gif b/src/canonical/models/back-cosmetic/422--420--Shellos--East.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Shellos--East.gif rename to src/canonical/models/back-cosmetic/422--420--Shellos--East.gif diff --git a/src/canonical/models/back-cosmetic/Gastrodon--East.gif b/src/canonical/models/back-cosmetic/423--420--Gastrodon--East.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Gastrodon--East.gif rename to src/canonical/models/back-cosmetic/423--420--Gastrodon--East.gif diff --git a/src/canonical/models/back-cosmetic/Ambipom--Female.gif b/src/canonical/models/back-cosmetic/424--0--Ambipom--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Ambipom--Female.gif rename to src/canonical/models/back-cosmetic/424--0--Ambipom--Female.gif diff --git a/src/canonical/models/back-cosmetic/Gloom--Female.gif b/src/canonical/models/back-cosmetic/44--0--Gloom--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Gloom--Female.gif rename to src/canonical/models/back-cosmetic/44--0--Gloom--Female.gif diff --git a/src/canonical/models/back-cosmetic/Gible--Female.gif b/src/canonical/models/back-cosmetic/443--0--Gible--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Gible--Female.gif rename to src/canonical/models/back-cosmetic/443--0--Gible--Female.gif diff --git a/src/canonical/models/back-cosmetic/Gabite--Female.gif b/src/canonical/models/back-cosmetic/444--0--Gabite--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Gabite--Female.gif rename to src/canonical/models/back-cosmetic/444--0--Gabite--Female.gif diff --git a/src/canonical/models/back-cosmetic/Garchomp--Female.gif b/src/canonical/models/back-cosmetic/445--0--Garchomp--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Garchomp--Female.gif rename to src/canonical/models/back-cosmetic/445--0--Garchomp--Female.gif diff --git a/src/canonical/models/back-cosmetic/Hippopotas--Female.gif b/src/canonical/models/back-cosmetic/449--0--Hippopotas--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Hippopotas--Female.gif rename to src/canonical/models/back-cosmetic/449--0--Hippopotas--Female.gif diff --git a/src/canonical/models/back-cosmetic/Vileplume--Female.gif b/src/canonical/models/back-cosmetic/45--0--Vileplume--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vileplume--Female.gif rename to src/canonical/models/back-cosmetic/45--0--Vileplume--Female.gif diff --git a/src/canonical/models/back-cosmetic/Hippowdon--Female.gif b/src/canonical/models/back-cosmetic/450--0--Hippowdon--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Hippowdon--Female.gif rename to src/canonical/models/back-cosmetic/450--0--Hippowdon--Female.gif diff --git a/src/canonical/models/back-cosmetic/Toxicroak--Female.gif b/src/canonical/models/back-cosmetic/454--0--Toxicroak--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Toxicroak--Female.gif rename to src/canonical/models/back-cosmetic/454--0--Toxicroak--Female.gif diff --git a/src/canonical/models/back-cosmetic/Finneon--Female.gif b/src/canonical/models/back-cosmetic/456--0--Finneon--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Finneon--Female.gif rename to src/canonical/models/back-cosmetic/456--0--Finneon--Female.gif diff --git a/src/canonical/models/back-cosmetic/Lumineon--Female.gif b/src/canonical/models/back-cosmetic/457--0--Lumineon--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Lumineon--Female.gif rename to src/canonical/models/back-cosmetic/457--0--Lumineon--Female.gif diff --git a/src/canonical/models/back-cosmetic/Snover--Female.gif b/src/canonical/models/back-cosmetic/459--0--Snover--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Snover--Female.gif rename to src/canonical/models/back-cosmetic/459--0--Snover--Female.gif diff --git a/src/canonical/models/back-cosmetic/Weavile--Female.gif b/src/canonical/models/back-cosmetic/461--0--Weavile--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Weavile--Female.gif rename to src/canonical/models/back-cosmetic/461--0--Weavile--Female.gif diff --git a/src/canonical/models/back-cosmetic/Rhyperior--Female.gif b/src/canonical/models/back-cosmetic/464--0--Rhyperior--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Rhyperior--Female.gif rename to src/canonical/models/back-cosmetic/464--0--Rhyperior--Female.gif diff --git a/src/canonical/models/back-cosmetic/Mamoswine--Female.gif b/src/canonical/models/back-cosmetic/473--0--Mamoswine--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Mamoswine--Female.gif rename to src/canonical/models/back-cosmetic/473--0--Mamoswine--Female.gif diff --git a/src/canonical/models/back-cosmetic/Rotom--Female.gif b/src/canonical/models/back-cosmetic/479--0--Rotom--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Rotom--Female.gif rename to src/canonical/models/back-cosmetic/479--0--Rotom--Female.gif diff --git a/src/canonical/models/back-cosmetic/Unfezant--Female.gif b/src/canonical/models/back-cosmetic/521--0--Unfezant--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Unfezant--Female.gif rename to src/canonical/models/back-cosmetic/521--0--Unfezant--Female.gif diff --git a/src/canonical/models/back-cosmetic/Deerling--Autumn.gif b/src/canonical/models/back-cosmetic/585--420--Deerling--Autumn.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Deerling--Autumn.gif rename to src/canonical/models/back-cosmetic/585--420--Deerling--Autumn.gif diff --git a/src/canonical/models/back-cosmetic/Deerling--Summer.gif b/src/canonical/models/back-cosmetic/585--420--Deerling--Summer.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Deerling--Summer.gif rename to src/canonical/models/back-cosmetic/585--420--Deerling--Summer.gif diff --git a/src/canonical/models/back-cosmetic/Deerling--Winter.gif b/src/canonical/models/back-cosmetic/585--420--Deerling--Winter.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Deerling--Winter.gif rename to src/canonical/models/back-cosmetic/585--420--Deerling--Winter.gif diff --git a/src/canonical/models/back-cosmetic/Sawsbuck--Autumn.gif b/src/canonical/models/back-cosmetic/586--420--Sawsbuck--Autumn.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Sawsbuck--Autumn.gif rename to src/canonical/models/back-cosmetic/586--420--Sawsbuck--Autumn.gif diff --git a/src/canonical/models/back-cosmetic/Sawsbuck--Summer.gif b/src/canonical/models/back-cosmetic/586--420--Sawsbuck--Summer.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Sawsbuck--Summer.gif rename to src/canonical/models/back-cosmetic/586--420--Sawsbuck--Summer.gif diff --git a/src/canonical/models/back-cosmetic/Sawsbuck--Winter.gif b/src/canonical/models/back-cosmetic/586--420--Sawsbuck--Winter.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Sawsbuck--Winter.gif rename to src/canonical/models/back-cosmetic/586--420--Sawsbuck--Winter.gif diff --git a/src/canonical/models/back-cosmetic/Frillish--Female.gif b/src/canonical/models/back-cosmetic/592--0--Frillish--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Frillish--Female.gif rename to src/canonical/models/back-cosmetic/592--0--Frillish--Female.gif diff --git a/src/canonical/models/back-cosmetic/Jellicent--Female.gif b/src/canonical/models/back-cosmetic/593--0--Jellicent--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Jellicent--Female.gif rename to src/canonical/models/back-cosmetic/593--0--Jellicent--Female.gif diff --git a/src/canonical/models/back-cosmetic/Kadabra--Female.gif b/src/canonical/models/back-cosmetic/64--0--Kadabra--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Kadabra--Female.gif rename to src/canonical/models/back-cosmetic/64--0--Kadabra--Female.gif diff --git a/src/canonical/models/back-cosmetic/Alakazam--Female.gif b/src/canonical/models/back-cosmetic/65--0--Alakazam--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Alakazam--Female.gif rename to src/canonical/models/back-cosmetic/65--0--Alakazam--Female.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Archipelago.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Archipelago.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Archipelago.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Archipelago.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Continental.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Continental.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Continental.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Continental.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Elegant.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Elegant.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Elegant.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Elegant.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Garden.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Garden.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Garden.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Garden.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--High_Plains.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--High_Plains.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--High_Plains.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--High_Plains.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Icy_Snow.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Icy_Snow.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Icy_Snow.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Icy_Snow.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Jungle.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Jungle.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Jungle.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Jungle.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Marine.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Marine.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Marine.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Marine.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Modern.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Modern.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Modern.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Modern.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Monsoon.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Monsoon.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Monsoon.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Monsoon.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Ocean.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Ocean.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Ocean.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Ocean.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Polar.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Polar.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Polar.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Polar.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--River.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--River.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--River.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--River.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Sandstorm.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Sandstorm.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Sandstorm.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Sandstorm.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Savanna.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Savanna.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Savanna.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Savanna.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Sun.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Sun.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Sun.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Sun.gif diff --git a/src/canonical/models/back-cosmetic/Vivillon--Tundra.gif b/src/canonical/models/back-cosmetic/666--420--Vivillon--Tundra.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Vivillon--Tundra.gif rename to src/canonical/models/back-cosmetic/666--420--Vivillon--Tundra.gif diff --git a/src/canonical/models/back-cosmetic/Pyroar--Female.gif b/src/canonical/models/back-cosmetic/668--0--Pyroar--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Pyroar--Female.gif rename to src/canonical/models/back-cosmetic/668--0--Pyroar--Female.gif diff --git a/src/canonical/models/back-cosmetic/Flabe__0301be__0301--Blue.gif b/src/canonical/models/back-cosmetic/669--420--Flabe__0301be__0301--Blue.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Flabe__0301be__0301--Blue.gif rename to src/canonical/models/back-cosmetic/669--420--Flabe__0301be__0301--Blue.gif diff --git a/src/canonical/models/back-cosmetic/Flabe__0301be__0301--Orange.gif b/src/canonical/models/back-cosmetic/669--420--Flabe__0301be__0301--Orange.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Flabe__0301be__0301--Orange.gif rename to src/canonical/models/back-cosmetic/669--420--Flabe__0301be__0301--Orange.gif diff --git a/src/canonical/models/back-cosmetic/Flabe__0301be__0301--White.gif b/src/canonical/models/back-cosmetic/669--420--Flabe__0301be__0301--White.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Flabe__0301be__0301--White.gif rename to src/canonical/models/back-cosmetic/669--420--Flabe__0301be__0301--White.gif diff --git a/src/canonical/models/back-cosmetic/Flabe__0301be__0301--Yellow.gif b/src/canonical/models/back-cosmetic/669--420--Flabe__0301be__0301--Yellow.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Flabe__0301be__0301--Yellow.gif rename to src/canonical/models/back-cosmetic/669--420--Flabe__0301be__0301--Yellow.gif diff --git a/src/canonical/models/back-cosmetic/Floette--Blue.gif b/src/canonical/models/back-cosmetic/670--420--Floette--Blue.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Floette--Blue.gif rename to src/canonical/models/back-cosmetic/670--420--Floette--Blue.gif diff --git a/src/canonical/models/back-cosmetic/Floette--Orange.gif b/src/canonical/models/back-cosmetic/670--420--Floette--Orange.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Floette--Orange.gif rename to src/canonical/models/back-cosmetic/670--420--Floette--Orange.gif diff --git a/src/canonical/models/back-cosmetic/Floette--White.gif b/src/canonical/models/back-cosmetic/670--420--Floette--White.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Floette--White.gif rename to src/canonical/models/back-cosmetic/670--420--Floette--White.gif diff --git a/src/canonical/models/back-cosmetic/Floette--Yellow.gif b/src/canonical/models/back-cosmetic/670--420--Floette--Yellow.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Floette--Yellow.gif rename to src/canonical/models/back-cosmetic/670--420--Floette--Yellow.gif diff --git a/src/canonical/models/back-cosmetic/Florges--Blue.gif b/src/canonical/models/back-cosmetic/671--420--Florges--Blue.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Florges--Blue.gif rename to src/canonical/models/back-cosmetic/671--420--Florges--Blue.gif diff --git a/src/canonical/models/back-cosmetic/Florges--Orange.gif b/src/canonical/models/back-cosmetic/671--420--Florges--Orange.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Florges--Orange.gif rename to src/canonical/models/back-cosmetic/671--420--Florges--Orange.gif diff --git a/src/canonical/models/back-cosmetic/Florges--White.gif b/src/canonical/models/back-cosmetic/671--420--Florges--White.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Florges--White.gif rename to src/canonical/models/back-cosmetic/671--420--Florges--White.gif diff --git a/src/canonical/models/back-cosmetic/Florges--Yellow.gif b/src/canonical/models/back-cosmetic/671--420--Florges--Yellow.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Florges--Yellow.gif rename to src/canonical/models/back-cosmetic/671--420--Florges--Yellow.gif diff --git a/src/canonical/models/back-cosmetic/Furfrou--Dandy.gif b/src/canonical/models/back-cosmetic/676--420--Furfrou--Dandy.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Furfrou--Dandy.gif rename to src/canonical/models/back-cosmetic/676--420--Furfrou--Dandy.gif diff --git a/src/canonical/models/back-cosmetic/Furfrou--Debutante.gif b/src/canonical/models/back-cosmetic/676--420--Furfrou--Debutante.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Furfrou--Debutante.gif rename to src/canonical/models/back-cosmetic/676--420--Furfrou--Debutante.gif diff --git a/src/canonical/models/back-cosmetic/Furfrou--Diamond.gif b/src/canonical/models/back-cosmetic/676--420--Furfrou--Diamond.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Furfrou--Diamond.gif rename to src/canonical/models/back-cosmetic/676--420--Furfrou--Diamond.gif diff --git a/src/canonical/models/back-cosmetic/Furfrou--Heart.gif b/src/canonical/models/back-cosmetic/676--420--Furfrou--Heart.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Furfrou--Heart.gif rename to src/canonical/models/back-cosmetic/676--420--Furfrou--Heart.gif diff --git a/src/canonical/models/back-cosmetic/Furfrou--Kabuki.gif b/src/canonical/models/back-cosmetic/676--420--Furfrou--Kabuki.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Furfrou--Kabuki.gif rename to src/canonical/models/back-cosmetic/676--420--Furfrou--Kabuki.gif diff --git a/src/canonical/models/back-cosmetic/Furfrou--La_Reine.gif b/src/canonical/models/back-cosmetic/676--420--Furfrou--La_Reine.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Furfrou--La_Reine.gif rename to src/canonical/models/back-cosmetic/676--420--Furfrou--La_Reine.gif diff --git a/src/canonical/models/back-cosmetic/Furfrou--Matron.gif b/src/canonical/models/back-cosmetic/676--420--Furfrou--Matron.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Furfrou--Matron.gif rename to src/canonical/models/back-cosmetic/676--420--Furfrou--Matron.gif diff --git a/src/canonical/models/back-cosmetic/Furfrou--Pharaoh.gif b/src/canonical/models/back-cosmetic/676--420--Furfrou--Pharaoh.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Furfrou--Pharaoh.gif rename to src/canonical/models/back-cosmetic/676--420--Furfrou--Pharaoh.gif diff --git a/src/canonical/models/back-cosmetic/Furfrou--Star.gif b/src/canonical/models/back-cosmetic/676--420--Furfrou--Star.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Furfrou--Star.gif rename to src/canonical/models/back-cosmetic/676--420--Furfrou--Star.gif diff --git a/src/canonical/models/back-cosmetic/Minior--Blue.gif b/src/canonical/models/back-cosmetic/774--420--Minior--Blue.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Minior--Blue.gif rename to src/canonical/models/back-cosmetic/774--420--Minior--Blue.gif diff --git a/src/canonical/models/back-cosmetic/Minior--Green.gif b/src/canonical/models/back-cosmetic/774--420--Minior--Green.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Minior--Green.gif rename to src/canonical/models/back-cosmetic/774--420--Minior--Green.gif diff --git a/src/canonical/models/back-cosmetic/Minior--Indigo.gif b/src/canonical/models/back-cosmetic/774--420--Minior--Indigo.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Minior--Indigo.gif rename to src/canonical/models/back-cosmetic/774--420--Minior--Indigo.gif diff --git a/src/canonical/models/back-cosmetic/Minior--Meteor.gif b/src/canonical/models/back-cosmetic/774--420--Minior--Meteor.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Minior--Meteor.gif rename to src/canonical/models/back-cosmetic/774--420--Minior--Meteor.gif diff --git a/src/canonical/models/back-cosmetic/Minior--Orange.gif b/src/canonical/models/back-cosmetic/774--420--Minior--Orange.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Minior--Orange.gif rename to src/canonical/models/back-cosmetic/774--420--Minior--Orange.gif diff --git a/src/canonical/models/back-cosmetic/Minior--Violet.gif b/src/canonical/models/back-cosmetic/774--420--Minior--Violet.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Minior--Violet.gif rename to src/canonical/models/back-cosmetic/774--420--Minior--Violet.gif diff --git a/src/canonical/models/back-cosmetic/Minior--Yellow.gif b/src/canonical/models/back-cosmetic/774--420--Minior--Yellow.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Minior--Yellow.gif rename to src/canonical/models/back-cosmetic/774--420--Minior--Yellow.gif diff --git a/src/canonical/models/back-cosmetic/Magearna--Original.gif b/src/canonical/models/back-cosmetic/801--420--Magearna--Original.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Magearna--Original.gif rename to src/canonical/models/back-cosmetic/801--420--Magearna--Original.gif diff --git a/src/canonical/models/back-cosmetic/Doduo--Female.gif b/src/canonical/models/back-cosmetic/84--0--Doduo--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Doduo--Female.gif rename to src/canonical/models/back-cosmetic/84--0--Doduo--Female.gif diff --git a/src/canonical/models/back-cosmetic/Dodrio--Female.gif b/src/canonical/models/back-cosmetic/85--0--Dodrio--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Dodrio--Female.gif rename to src/canonical/models/back-cosmetic/85--0--Dodrio--Female.gif diff --git a/src/canonical/models/back-cosmetic/Alcremie--Caramel_Swirl.gif b/src/canonical/models/back-cosmetic/869--420--Alcremie--Caramel_Swirl.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Alcremie--Caramel_Swirl.gif rename to src/canonical/models/back-cosmetic/869--420--Alcremie--Caramel_Swirl.gif diff --git a/src/canonical/models/back-cosmetic/Alcremie--Lemon_Cream.gif b/src/canonical/models/back-cosmetic/869--420--Alcremie--Lemon_Cream.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Alcremie--Lemon_Cream.gif rename to src/canonical/models/back-cosmetic/869--420--Alcremie--Lemon_Cream.gif diff --git a/src/canonical/models/back-cosmetic/Alcremie--Matcha_Cream.gif b/src/canonical/models/back-cosmetic/869--420--Alcremie--Matcha_Cream.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Alcremie--Matcha_Cream.gif rename to src/canonical/models/back-cosmetic/869--420--Alcremie--Matcha_Cream.gif diff --git a/src/canonical/models/back-cosmetic/Alcremie--Mint_Cream.gif b/src/canonical/models/back-cosmetic/869--420--Alcremie--Mint_Cream.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Alcremie--Mint_Cream.gif rename to src/canonical/models/back-cosmetic/869--420--Alcremie--Mint_Cream.gif diff --git a/src/canonical/models/back-cosmetic/Alcremie--Rainbow_Swirl.gif b/src/canonical/models/back-cosmetic/869--420--Alcremie--Rainbow_Swirl.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Alcremie--Rainbow_Swirl.gif rename to src/canonical/models/back-cosmetic/869--420--Alcremie--Rainbow_Swirl.gif diff --git a/src/canonical/models/back-cosmetic/Alcremie--Ruby_Cream.gif b/src/canonical/models/back-cosmetic/869--420--Alcremie--Ruby_Cream.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Alcremie--Ruby_Cream.gif rename to src/canonical/models/back-cosmetic/869--420--Alcremie--Ruby_Cream.gif diff --git a/src/canonical/models/back-cosmetic/Alcremie--Ruby_Swirl.gif b/src/canonical/models/back-cosmetic/869--420--Alcremie--Ruby_Swirl.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Alcremie--Ruby_Swirl.gif rename to src/canonical/models/back-cosmetic/869--420--Alcremie--Ruby_Swirl.gif diff --git a/src/canonical/models/back-cosmetic/Alcremie--Salted_Cream.gif b/src/canonical/models/back-cosmetic/869--420--Alcremie--Salted_Cream.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Alcremie--Salted_Cream.gif rename to src/canonical/models/back-cosmetic/869--420--Alcremie--Salted_Cream.gif diff --git a/src/canonical/models/back-cosmetic/Hypno--Female.gif b/src/canonical/models/back-cosmetic/97--0--Hypno--Female.gif similarity index 100% rename from src/canonical/models/back-cosmetic/Hypno--Female.gif rename to src/canonical/models/back-cosmetic/97--0--Hypno--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Rhyhorn--Female.gif b/src/canonical/models/back-shiny-cosmetic/111--0--Rhyhorn--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Rhyhorn--Female.gif rename to src/canonical/models/back-shiny-cosmetic/111--0--Rhyhorn--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Goldeen--Female.gif b/src/canonical/models/back-shiny-cosmetic/118--0--Goldeen--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Goldeen--Female.gif rename to src/canonical/models/back-shiny-cosmetic/118--0--Goldeen--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Seaking--Female.gif b/src/canonical/models/back-shiny-cosmetic/119--0--Seaking--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Seaking--Female.gif rename to src/canonical/models/back-shiny-cosmetic/119--0--Seaking--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Butterfree--Female.gif b/src/canonical/models/back-shiny-cosmetic/12--0--Butterfree--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Butterfree--Female.gif rename to src/canonical/models/back-shiny-cosmetic/12--0--Butterfree--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Scyther--Female.gif b/src/canonical/models/back-shiny-cosmetic/123--0--Scyther--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Scyther--Female.gif rename to src/canonical/models/back-shiny-cosmetic/123--0--Scyther--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Gyarados--Female.gif b/src/canonical/models/back-shiny-cosmetic/130--0--Gyarados--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Gyarados--Female.gif rename to src/canonical/models/back-shiny-cosmetic/130--0--Gyarados--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Meganium--Female.gif b/src/canonical/models/back-shiny-cosmetic/154--0--Meganium--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Meganium--Female.gif rename to src/canonical/models/back-shiny-cosmetic/154--0--Meganium--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Ledyba--Female.gif b/src/canonical/models/back-shiny-cosmetic/165--0--Ledyba--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Ledyba--Female.gif rename to src/canonical/models/back-shiny-cosmetic/165--0--Ledyba--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Ledian--Female.gif b/src/canonical/models/back-shiny-cosmetic/166--0--Ledian--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Ledian--Female.gif rename to src/canonical/models/back-shiny-cosmetic/166--0--Ledian--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Xatu--Female.gif b/src/canonical/models/back-shiny-cosmetic/178--0--Xatu--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Xatu--Female.gif rename to src/canonical/models/back-shiny-cosmetic/178--0--Xatu--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Sudowoodo--Female.gif b/src/canonical/models/back-shiny-cosmetic/185--0--Sudowoodo--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Sudowoodo--Female.gif rename to src/canonical/models/back-shiny-cosmetic/185--0--Sudowoodo--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Politoed--Female.gif b/src/canonical/models/back-shiny-cosmetic/186--0--Politoed--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Politoed--Female.gif rename to src/canonical/models/back-shiny-cosmetic/186--0--Politoed--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Rattata--Female.gif b/src/canonical/models/back-shiny-cosmetic/19--0--Rattata--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Rattata--Female.gif rename to src/canonical/models/back-shiny-cosmetic/19--0--Rattata--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Aipom--Female.gif b/src/canonical/models/back-shiny-cosmetic/190--0--Aipom--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Aipom--Female.gif rename to src/canonical/models/back-shiny-cosmetic/190--0--Aipom--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Wooper--Female.gif b/src/canonical/models/back-shiny-cosmetic/194--0--Wooper--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Wooper--Female.gif rename to src/canonical/models/back-shiny-cosmetic/194--0--Wooper--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Quagsire--Female.gif b/src/canonical/models/back-shiny-cosmetic/195--0--Quagsire--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Quagsire--Female.gif rename to src/canonical/models/back-shiny-cosmetic/195--0--Quagsire--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Raticate--Female.gif b/src/canonical/models/back-shiny-cosmetic/20--0--Raticate--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Raticate--Female.gif rename to src/canonical/models/back-shiny-cosmetic/20--0--Raticate--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--A.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--A.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--A.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--A.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--B.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--B.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--B.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--B.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--C.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--C.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--C.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--C.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--D.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--D.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--D.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--D.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--E.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--E.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--E.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--E.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--Exclamation.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--Exclamation.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--Exclamation.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--Exclamation.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--F.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--F.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--F.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--F.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--G.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--G.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--G.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--G.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--H.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--H.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--H.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--H.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--I.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--I.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--I.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--I.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--J.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--J.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--J.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--J.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--K.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--K.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--K.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--K.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--L.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--L.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--L.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--L.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--M.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--M.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--M.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--M.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--N.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--N.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--N.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--N.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--O.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--O.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--O.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--O.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--Q.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--Q.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--Q.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--Q.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--Question.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--Question.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--Question.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--Question.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--R.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--R.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--R.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--R.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--S.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--S.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--S.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--S.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--T.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--T.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--T.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--T.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--U.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--U.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--U.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--U.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--V.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--V.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--V.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--V.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--W.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--W.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--W.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--W.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--X.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--X.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--X.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--X.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--Y.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--Y.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--Y.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--Y.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unown--Z.gif b/src/canonical/models/back-shiny-cosmetic/201--420--Unown--Z.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unown--Z.gif rename to src/canonical/models/back-shiny-cosmetic/201--420--Unown--Z.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Gligar--Female.gif b/src/canonical/models/back-shiny-cosmetic/207--0--Gligar--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Gligar--Female.gif rename to src/canonical/models/back-shiny-cosmetic/207--0--Gligar--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Heracross--Female.gif b/src/canonical/models/back-shiny-cosmetic/214--0--Heracross--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Heracross--Female.gif rename to src/canonical/models/back-shiny-cosmetic/214--0--Heracross--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Sneasel--Female.gif b/src/canonical/models/back-shiny-cosmetic/215--0--Sneasel--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Sneasel--Female.gif rename to src/canonical/models/back-shiny-cosmetic/215--0--Sneasel--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Ursaring--Female.gif b/src/canonical/models/back-shiny-cosmetic/217--0--Ursaring--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Ursaring--Female.gif rename to src/canonical/models/back-shiny-cosmetic/217--0--Ursaring--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Piloswine--Female.gif b/src/canonical/models/back-shiny-cosmetic/221--0--Piloswine--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Piloswine--Female.gif rename to src/canonical/models/back-shiny-cosmetic/221--0--Piloswine--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Octillery--Female.gif b/src/canonical/models/back-shiny-cosmetic/224--0--Octillery--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Octillery--Female.gif rename to src/canonical/models/back-shiny-cosmetic/224--0--Octillery--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Houndoom--Female.gif b/src/canonical/models/back-shiny-cosmetic/229--0--Houndoom--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Houndoom--Female.gif rename to src/canonical/models/back-shiny-cosmetic/229--0--Houndoom--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Donphan--Female.gif b/src/canonical/models/back-shiny-cosmetic/232--0--Donphan--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Donphan--Female.gif rename to src/canonical/models/back-shiny-cosmetic/232--0--Donphan--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Pikachu--Female.gif b/src/canonical/models/back-shiny-cosmetic/25--0--Pikachu--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Pikachu--Female.gif rename to src/canonical/models/back-shiny-cosmetic/25--0--Pikachu--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Combusken--Female.gif b/src/canonical/models/back-shiny-cosmetic/256--0--Combusken--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Combusken--Female.gif rename to src/canonical/models/back-shiny-cosmetic/256--0--Combusken--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Blaziken--Female.gif b/src/canonical/models/back-shiny-cosmetic/257--0--Blaziken--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Blaziken--Female.gif rename to src/canonical/models/back-shiny-cosmetic/257--0--Blaziken--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Raichu--Female.gif b/src/canonical/models/back-shiny-cosmetic/26--0--Raichu--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Raichu--Female.gif rename to src/canonical/models/back-shiny-cosmetic/26--0--Raichu--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Beautifly--Female.gif b/src/canonical/models/back-shiny-cosmetic/267--0--Beautifly--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Beautifly--Female.gif rename to src/canonical/models/back-shiny-cosmetic/267--0--Beautifly--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Dustox--Female.gif b/src/canonical/models/back-shiny-cosmetic/269--0--Dustox--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Dustox--Female.gif rename to src/canonical/models/back-shiny-cosmetic/269--0--Dustox--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Ludicolo--Female.gif b/src/canonical/models/back-shiny-cosmetic/272--0--Ludicolo--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Ludicolo--Female.gif rename to src/canonical/models/back-shiny-cosmetic/272--0--Ludicolo--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Nuzleaf--Female.gif b/src/canonical/models/back-shiny-cosmetic/274--0--Nuzleaf--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Nuzleaf--Female.gif rename to src/canonical/models/back-shiny-cosmetic/274--0--Nuzleaf--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Shiftry--Female.gif b/src/canonical/models/back-shiny-cosmetic/275--0--Shiftry--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Shiftry--Female.gif rename to src/canonical/models/back-shiny-cosmetic/275--0--Shiftry--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Venusaur--Female.gif b/src/canonical/models/back-shiny-cosmetic/3--0--Venusaur--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Venusaur--Female.gif rename to src/canonical/models/back-shiny-cosmetic/3--0--Venusaur--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Meditite--Female.gif b/src/canonical/models/back-shiny-cosmetic/307--0--Meditite--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Meditite--Female.gif rename to src/canonical/models/back-shiny-cosmetic/307--0--Meditite--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Medicham--Female.gif b/src/canonical/models/back-shiny-cosmetic/308--0--Medicham--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Medicham--Female.gif rename to src/canonical/models/back-shiny-cosmetic/308--0--Medicham--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Roselia--Female.gif b/src/canonical/models/back-shiny-cosmetic/315--0--Roselia--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Roselia--Female.gif rename to src/canonical/models/back-shiny-cosmetic/315--0--Roselia--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Gulpin--Female.gif b/src/canonical/models/back-shiny-cosmetic/316--0--Gulpin--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Gulpin--Female.gif rename to src/canonical/models/back-shiny-cosmetic/316--0--Gulpin--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Swalot--Female.gif b/src/canonical/models/back-shiny-cosmetic/317--0--Swalot--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Swalot--Female.gif rename to src/canonical/models/back-shiny-cosmetic/317--0--Swalot--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Numel--Female.gif b/src/canonical/models/back-shiny-cosmetic/322--0--Numel--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Numel--Female.gif rename to src/canonical/models/back-shiny-cosmetic/322--0--Numel--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Camerupt--Female.gif b/src/canonical/models/back-shiny-cosmetic/323--0--Camerupt--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Camerupt--Female.gif rename to src/canonical/models/back-shiny-cosmetic/323--0--Camerupt--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Milotic--Female.gif b/src/canonical/models/back-shiny-cosmetic/350--0--Milotic--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Milotic--Female.gif rename to src/canonical/models/back-shiny-cosmetic/350--0--Milotic--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Relicanth--Female.gif b/src/canonical/models/back-shiny-cosmetic/369--0--Relicanth--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Relicanth--Female.gif rename to src/canonical/models/back-shiny-cosmetic/369--0--Relicanth--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Bidoof--Female.gif b/src/canonical/models/back-shiny-cosmetic/399--0--Bidoof--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Bidoof--Female.gif rename to src/canonical/models/back-shiny-cosmetic/399--0--Bidoof--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Shinx--Female.gif b/src/canonical/models/back-shiny-cosmetic/403--0--Shinx--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Shinx--Female.gif rename to src/canonical/models/back-shiny-cosmetic/403--0--Shinx--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Luxio--Female.gif b/src/canonical/models/back-shiny-cosmetic/404--0--Luxio--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Luxio--Female.gif rename to src/canonical/models/back-shiny-cosmetic/404--0--Luxio--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Luxray--Female.gif b/src/canonical/models/back-shiny-cosmetic/405--0--Luxray--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Luxray--Female.gif rename to src/canonical/models/back-shiny-cosmetic/405--0--Luxray--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Roserade--Female.gif b/src/canonical/models/back-shiny-cosmetic/407--0--Roserade--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Roserade--Female.gif rename to src/canonical/models/back-shiny-cosmetic/407--0--Roserade--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Kerfluffle--Female.gif b/src/canonical/models/back-shiny-cosmetic/41--0--Kerfluffle--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Kerfluffle--Female.gif rename to src/canonical/models/back-shiny-cosmetic/41--0--Kerfluffle--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Burmy--Sandy.gif b/src/canonical/models/back-shiny-cosmetic/412--420--Burmy--Sandy.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Burmy--Sandy.gif rename to src/canonical/models/back-shiny-cosmetic/412--420--Burmy--Sandy.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Burmy--Trash.gif b/src/canonical/models/back-shiny-cosmetic/412--420--Burmy--Trash.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Burmy--Trash.gif rename to src/canonical/models/back-shiny-cosmetic/412--420--Burmy--Trash.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Floatzel--Female.gif b/src/canonical/models/back-shiny-cosmetic/419--0--Floatzel--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Floatzel--Female.gif rename to src/canonical/models/back-shiny-cosmetic/419--0--Floatzel--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Shellos--East.gif b/src/canonical/models/back-shiny-cosmetic/422--420--Shellos--East.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Shellos--East.gif rename to src/canonical/models/back-shiny-cosmetic/422--420--Shellos--East.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Gastrodon--East.gif b/src/canonical/models/back-shiny-cosmetic/423--420--Gastrodon--East.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Gastrodon--East.gif rename to src/canonical/models/back-shiny-cosmetic/423--420--Gastrodon--East.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Ambipom--Female.gif b/src/canonical/models/back-shiny-cosmetic/424--0--Ambipom--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Ambipom--Female.gif rename to src/canonical/models/back-shiny-cosmetic/424--0--Ambipom--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Gloom--Female.gif b/src/canonical/models/back-shiny-cosmetic/44--0--Gloom--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Gloom--Female.gif rename to src/canonical/models/back-shiny-cosmetic/44--0--Gloom--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Gible--Female.gif b/src/canonical/models/back-shiny-cosmetic/443--0--Gible--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Gible--Female.gif rename to src/canonical/models/back-shiny-cosmetic/443--0--Gible--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Gabite--Female.gif b/src/canonical/models/back-shiny-cosmetic/444--0--Gabite--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Gabite--Female.gif rename to src/canonical/models/back-shiny-cosmetic/444--0--Gabite--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Garchomp--Female.gif b/src/canonical/models/back-shiny-cosmetic/445--0--Garchomp--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Garchomp--Female.gif rename to src/canonical/models/back-shiny-cosmetic/445--0--Garchomp--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Hippopotas--Female.gif b/src/canonical/models/back-shiny-cosmetic/449--0--Hippopotas--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Hippopotas--Female.gif rename to src/canonical/models/back-shiny-cosmetic/449--0--Hippopotas--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vileplume--Female.gif b/src/canonical/models/back-shiny-cosmetic/45--0--Vileplume--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vileplume--Female.gif rename to src/canonical/models/back-shiny-cosmetic/45--0--Vileplume--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Hippowdon--Female.gif b/src/canonical/models/back-shiny-cosmetic/450--0--Hippowdon--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Hippowdon--Female.gif rename to src/canonical/models/back-shiny-cosmetic/450--0--Hippowdon--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Toxicroak--Female.gif b/src/canonical/models/back-shiny-cosmetic/454--0--Toxicroak--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Toxicroak--Female.gif rename to src/canonical/models/back-shiny-cosmetic/454--0--Toxicroak--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Finneon--Female.gif b/src/canonical/models/back-shiny-cosmetic/456--0--Finneon--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Finneon--Female.gif rename to src/canonical/models/back-shiny-cosmetic/456--0--Finneon--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Lumineon--Female.gif b/src/canonical/models/back-shiny-cosmetic/457--0--Lumineon--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Lumineon--Female.gif rename to src/canonical/models/back-shiny-cosmetic/457--0--Lumineon--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Weavile--Female.gif b/src/canonical/models/back-shiny-cosmetic/461--0--Weavile--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Weavile--Female.gif rename to src/canonical/models/back-shiny-cosmetic/461--0--Weavile--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Rhyperior--Female.gif b/src/canonical/models/back-shiny-cosmetic/464--0--Rhyperior--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Rhyperior--Female.gif rename to src/canonical/models/back-shiny-cosmetic/464--0--Rhyperior--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Tangrowth--Female.gif b/src/canonical/models/back-shiny-cosmetic/465--0--Tangrowth--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Tangrowth--Female.gif rename to src/canonical/models/back-shiny-cosmetic/465--0--Tangrowth--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Mamoswine--Female.gif b/src/canonical/models/back-shiny-cosmetic/473--0--Mamoswine--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Mamoswine--Female.gif rename to src/canonical/models/back-shiny-cosmetic/473--0--Mamoswine--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Unfezant--Female.gif b/src/canonical/models/back-shiny-cosmetic/521--0--Unfezant--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Unfezant--Female.gif rename to src/canonical/models/back-shiny-cosmetic/521--0--Unfezant--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Basculin--Blue.gif b/src/canonical/models/back-shiny-cosmetic/550--420--Basculin--Blue.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Basculin--Blue.gif rename to src/canonical/models/back-shiny-cosmetic/550--420--Basculin--Blue.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Deerling--Autumn.gif b/src/canonical/models/back-shiny-cosmetic/585--420--Deerling--Autumn.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Deerling--Autumn.gif rename to src/canonical/models/back-shiny-cosmetic/585--420--Deerling--Autumn.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Deerling--Summer.gif b/src/canonical/models/back-shiny-cosmetic/585--420--Deerling--Summer.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Deerling--Summer.gif rename to src/canonical/models/back-shiny-cosmetic/585--420--Deerling--Summer.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Deerling--Winter.gif b/src/canonical/models/back-shiny-cosmetic/585--420--Deerling--Winter.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Deerling--Winter.gif rename to src/canonical/models/back-shiny-cosmetic/585--420--Deerling--Winter.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Sawsbuck--Autumn.gif b/src/canonical/models/back-shiny-cosmetic/586--420--Sawsbuck--Autumn.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Sawsbuck--Autumn.gif rename to src/canonical/models/back-shiny-cosmetic/586--420--Sawsbuck--Autumn.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Sawsbuck--Summer.gif b/src/canonical/models/back-shiny-cosmetic/586--420--Sawsbuck--Summer.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Sawsbuck--Summer.gif rename to src/canonical/models/back-shiny-cosmetic/586--420--Sawsbuck--Summer.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Sawsbuck--Winter.gif b/src/canonical/models/back-shiny-cosmetic/586--420--Sawsbuck--Winter.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Sawsbuck--Winter.gif rename to src/canonical/models/back-shiny-cosmetic/586--420--Sawsbuck--Winter.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Frillish--Female.gif b/src/canonical/models/back-shiny-cosmetic/592--0--Frillish--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Frillish--Female.gif rename to src/canonical/models/back-shiny-cosmetic/592--0--Frillish--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Jellicent--Female.gif b/src/canonical/models/back-shiny-cosmetic/593--0--Jellicent--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Jellicent--Female.gif rename to src/canonical/models/back-shiny-cosmetic/593--0--Jellicent--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Kadabra--Female.gif b/src/canonical/models/back-shiny-cosmetic/64--0--Kadabra--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Kadabra--Female.gif rename to src/canonical/models/back-shiny-cosmetic/64--0--Kadabra--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Alakazam--Female.gif b/src/canonical/models/back-shiny-cosmetic/65--0--Alakazam--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Alakazam--Female.gif rename to src/canonical/models/back-shiny-cosmetic/65--0--Alakazam--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Archipelago.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Archipelago.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Archipelago.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Archipelago.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Continental.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Continental.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Continental.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Continental.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Elegant.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Elegant.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Elegant.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Elegant.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Garden.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Garden.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Garden.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Garden.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--High_Plains.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--High_Plains.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--High_Plains.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--High_Plains.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Icy_Snow.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Icy_Snow.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Icy_Snow.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Icy_Snow.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Jungle.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Jungle.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Jungle.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Jungle.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Marine.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Marine.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Marine.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Marine.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Modern.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Modern.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Modern.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Modern.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Monsoon.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Monsoon.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Monsoon.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Monsoon.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Ocean.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Ocean.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Ocean.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Ocean.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Polar.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Polar.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Polar.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Polar.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--River.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--River.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--River.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--River.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Sandstorm.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Sandstorm.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Sandstorm.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Sandstorm.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Savanna.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Savanna.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Savanna.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Savanna.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Sun.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Sun.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Sun.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Sun.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Vivillon--Tundra.gif b/src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Tundra.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Vivillon--Tundra.gif rename to src/canonical/models/back-shiny-cosmetic/666--420--Vivillon--Tundra.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Pyroar--Female.gif b/src/canonical/models/back-shiny-cosmetic/668--0--Pyroar--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Pyroar--Female.gif rename to src/canonical/models/back-shiny-cosmetic/668--0--Pyroar--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--Blue.gif b/src/canonical/models/back-shiny-cosmetic/669--420--Flabe__0301be__0301--Blue.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--Blue.gif rename to src/canonical/models/back-shiny-cosmetic/669--420--Flabe__0301be__0301--Blue.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--Orange.gif b/src/canonical/models/back-shiny-cosmetic/669--420--Flabe__0301be__0301--Orange.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--Orange.gif rename to src/canonical/models/back-shiny-cosmetic/669--420--Flabe__0301be__0301--Orange.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--White.gif b/src/canonical/models/back-shiny-cosmetic/669--420--Flabe__0301be__0301--White.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--White.gif rename to src/canonical/models/back-shiny-cosmetic/669--420--Flabe__0301be__0301--White.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--Yellow.gif b/src/canonical/models/back-shiny-cosmetic/669--420--Flabe__0301be__0301--Yellow.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Flabe__0301be__0301--Yellow.gif rename to src/canonical/models/back-shiny-cosmetic/669--420--Flabe__0301be__0301--Yellow.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Floette--Blue.gif b/src/canonical/models/back-shiny-cosmetic/670--420--Floette--Blue.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Floette--Blue.gif rename to src/canonical/models/back-shiny-cosmetic/670--420--Floette--Blue.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Floette--Orange.gif b/src/canonical/models/back-shiny-cosmetic/670--420--Floette--Orange.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Floette--Orange.gif rename to src/canonical/models/back-shiny-cosmetic/670--420--Floette--Orange.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Floette--White.gif b/src/canonical/models/back-shiny-cosmetic/670--420--Floette--White.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Floette--White.gif rename to src/canonical/models/back-shiny-cosmetic/670--420--Floette--White.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Floette--Yellow.gif b/src/canonical/models/back-shiny-cosmetic/670--420--Floette--Yellow.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Floette--Yellow.gif rename to src/canonical/models/back-shiny-cosmetic/670--420--Floette--Yellow.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Florges--Blue.gif b/src/canonical/models/back-shiny-cosmetic/671--420--Florges--Blue.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Florges--Blue.gif rename to src/canonical/models/back-shiny-cosmetic/671--420--Florges--Blue.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Florges--Orange.gif b/src/canonical/models/back-shiny-cosmetic/671--420--Florges--Orange.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Florges--Orange.gif rename to src/canonical/models/back-shiny-cosmetic/671--420--Florges--Orange.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Florges--White.gif b/src/canonical/models/back-shiny-cosmetic/671--420--Florges--White.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Florges--White.gif rename to src/canonical/models/back-shiny-cosmetic/671--420--Florges--White.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Florges--Yellow.gif b/src/canonical/models/back-shiny-cosmetic/671--420--Florges--Yellow.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Florges--Yellow.gif rename to src/canonical/models/back-shiny-cosmetic/671--420--Florges--Yellow.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Furfrou--Dandy.gif b/src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Dandy.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Furfrou--Dandy.gif rename to src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Dandy.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Furfrou--Debutante.gif b/src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Debutante.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Furfrou--Debutante.gif rename to src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Debutante.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Furfrou--Diamond.gif b/src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Diamond.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Furfrou--Diamond.gif rename to src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Diamond.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Furfrou--Heart.gif b/src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Heart.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Furfrou--Heart.gif rename to src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Heart.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Furfrou--Kabuki.gif b/src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Kabuki.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Furfrou--Kabuki.gif rename to src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Kabuki.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Furfrou--La_Reine.gif b/src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--La_Reine.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Furfrou--La_Reine.gif rename to src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--La_Reine.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Furfrou--Matron.gif b/src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Matron.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Furfrou--Matron.gif rename to src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Matron.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Furfrou--Pharaoh.gif b/src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Pharaoh.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Furfrou--Pharaoh.gif rename to src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Pharaoh.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Furfrou--Star.gif b/src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Star.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Furfrou--Star.gif rename to src/canonical/models/back-shiny-cosmetic/676--420--Furfrou--Star.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Minior--Blue.gif b/src/canonical/models/back-shiny-cosmetic/774--420--Minior--Blue.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Minior--Blue.gif rename to src/canonical/models/back-shiny-cosmetic/774--420--Minior--Blue.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Minior--Green.gif b/src/canonical/models/back-shiny-cosmetic/774--420--Minior--Green.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Minior--Green.gif rename to src/canonical/models/back-shiny-cosmetic/774--420--Minior--Green.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Minior--Indigo.gif b/src/canonical/models/back-shiny-cosmetic/774--420--Minior--Indigo.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Minior--Indigo.gif rename to src/canonical/models/back-shiny-cosmetic/774--420--Minior--Indigo.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Minior--Meteor.gif b/src/canonical/models/back-shiny-cosmetic/774--420--Minior--Meteor.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Minior--Meteor.gif rename to src/canonical/models/back-shiny-cosmetic/774--420--Minior--Meteor.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Minior--Orange.gif b/src/canonical/models/back-shiny-cosmetic/774--420--Minior--Orange.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Minior--Orange.gif rename to src/canonical/models/back-shiny-cosmetic/774--420--Minior--Orange.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Minior--Violet.gif b/src/canonical/models/back-shiny-cosmetic/774--420--Minior--Violet.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Minior--Violet.gif rename to src/canonical/models/back-shiny-cosmetic/774--420--Minior--Violet.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Minior--Yellow.gif b/src/canonical/models/back-shiny-cosmetic/774--420--Minior--Yellow.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Minior--Yellow.gif rename to src/canonical/models/back-shiny-cosmetic/774--420--Minior--Yellow.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Magearna--Original.gif b/src/canonical/models/back-shiny-cosmetic/801--420--Magearna--Original.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Magearna--Original.gif rename to src/canonical/models/back-shiny-cosmetic/801--420--Magearna--Original.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Doduo--Female.gif b/src/canonical/models/back-shiny-cosmetic/84--0--Doduo--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Doduo--Female.gif rename to src/canonical/models/back-shiny-cosmetic/84--0--Doduo--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Dodrio--Female.gif b/src/canonical/models/back-shiny-cosmetic/85--0--Dodrio--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Dodrio--Female.gif rename to src/canonical/models/back-shiny-cosmetic/85--0--Dodrio--Female.gif diff --git a/src/canonical/models/back-shiny-cosmetic/Hypno--Female.gif b/src/canonical/models/back-shiny-cosmetic/97--0--Hypno--Female.gif similarity index 100% rename from src/canonical/models/back-shiny-cosmetic/Hypno--Female.gif rename to src/canonical/models/back-shiny-cosmetic/97--0--Hypno--Female.gif diff --git a/src/canonical/models/back-shiny/Bulbasaur.gif b/src/canonical/models/back-shiny/1--0--Bulbasaur.gif similarity index 100% rename from src/canonical/models/back-shiny/Bulbasaur.gif rename to src/canonical/models/back-shiny/1--0--Bulbasaur.gif diff --git a/src/canonical/models/back-shiny/Caterpie.gif b/src/canonical/models/back-shiny/10--0--Caterpie.gif similarity index 100% rename from src/canonical/models/back-shiny/Caterpie.gif rename to src/canonical/models/back-shiny/10--0--Caterpie.gif diff --git a/src/canonical/models/back-shiny/Voltorb.gif b/src/canonical/models/back-shiny/100--0--Voltorb.gif similarity index 100% rename from src/canonical/models/back-shiny/Voltorb.gif rename to src/canonical/models/back-shiny/100--0--Voltorb.gif diff --git a/src/canonical/models/back-shiny/Electrode.gif b/src/canonical/models/back-shiny/101--0--Electrode.gif similarity index 100% rename from src/canonical/models/back-shiny/Electrode.gif rename to src/canonical/models/back-shiny/101--0--Electrode.gif diff --git a/src/canonical/models/back-shiny/Exeggcute.gif b/src/canonical/models/back-shiny/102--0--Exeggcute.gif similarity index 100% rename from src/canonical/models/back-shiny/Exeggcute.gif rename to src/canonical/models/back-shiny/102--0--Exeggcute.gif diff --git a/src/canonical/models/back-shiny/Exeggutor.gif b/src/canonical/models/back-shiny/103--0--Exeggutor.gif similarity index 100% rename from src/canonical/models/back-shiny/Exeggutor.gif rename to src/canonical/models/back-shiny/103--0--Exeggutor.gif diff --git a/src/canonical/models/back-shiny/Exeggutor--Alola.gif b/src/canonical/models/back-shiny/103--420--Exeggutor--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Exeggutor--Alola.gif rename to src/canonical/models/back-shiny/103--420--Exeggutor--Alola.gif diff --git a/src/canonical/models/back-shiny/Cubone.gif b/src/canonical/models/back-shiny/104--0--Cubone.gif similarity index 100% rename from src/canonical/models/back-shiny/Cubone.gif rename to src/canonical/models/back-shiny/104--0--Cubone.gif diff --git a/src/canonical/models/back-shiny/Marowak.gif b/src/canonical/models/back-shiny/105--0--Marowak.gif similarity index 100% rename from src/canonical/models/back-shiny/Marowak.gif rename to src/canonical/models/back-shiny/105--0--Marowak.gif diff --git a/src/canonical/models/back-shiny/Marowak--Alola-Totem.gif b/src/canonical/models/back-shiny/105--420--Marowak--Alola-Totem.gif similarity index 100% rename from src/canonical/models/back-shiny/Marowak--Alola-Totem.gif rename to src/canonical/models/back-shiny/105--420--Marowak--Alola-Totem.gif diff --git a/src/canonical/models/back-shiny/Marowak--Alola.gif b/src/canonical/models/back-shiny/105--420--Marowak--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Marowak--Alola.gif rename to src/canonical/models/back-shiny/105--420--Marowak--Alola.gif diff --git a/src/canonical/models/back-shiny/Hitmonlee.gif b/src/canonical/models/back-shiny/106--0--Hitmonlee.gif similarity index 100% rename from src/canonical/models/back-shiny/Hitmonlee.gif rename to src/canonical/models/back-shiny/106--0--Hitmonlee.gif diff --git a/src/canonical/models/back-shiny/Hitmonchan.gif b/src/canonical/models/back-shiny/107--0--Hitmonchan.gif similarity index 100% rename from src/canonical/models/back-shiny/Hitmonchan.gif rename to src/canonical/models/back-shiny/107--0--Hitmonchan.gif diff --git a/src/canonical/models/back-shiny/Lickitung.gif b/src/canonical/models/back-shiny/108--0--Lickitung.gif similarity index 100% rename from src/canonical/models/back-shiny/Lickitung.gif rename to src/canonical/models/back-shiny/108--0--Lickitung.gif diff --git a/src/canonical/models/back-shiny/Koffing.gif b/src/canonical/models/back-shiny/109--0--Koffing.gif similarity index 100% rename from src/canonical/models/back-shiny/Koffing.gif rename to src/canonical/models/back-shiny/109--0--Koffing.gif diff --git a/src/canonical/models/back-shiny/Metapod.gif b/src/canonical/models/back-shiny/11--0--Metapod.gif similarity index 100% rename from src/canonical/models/back-shiny/Metapod.gif rename to src/canonical/models/back-shiny/11--0--Metapod.gif diff --git a/src/canonical/models/back-shiny/Weezing.gif b/src/canonical/models/back-shiny/110--0--Weezing.gif similarity index 100% rename from src/canonical/models/back-shiny/Weezing.gif rename to src/canonical/models/back-shiny/110--0--Weezing.gif diff --git a/src/canonical/models/back-shiny/Weezing--Galar.gif b/src/canonical/models/back-shiny/110--420--Weezing--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Weezing--Galar.gif rename to src/canonical/models/back-shiny/110--420--Weezing--Galar.gif diff --git a/src/canonical/models/back-shiny/Rhyhorn.gif b/src/canonical/models/back-shiny/111--0--Rhyhorn.gif similarity index 100% rename from src/canonical/models/back-shiny/Rhyhorn.gif rename to src/canonical/models/back-shiny/111--0--Rhyhorn.gif diff --git a/src/canonical/models/back-shiny/Rhydon.gif b/src/canonical/models/back-shiny/112--0--Rhydon.gif similarity index 100% rename from src/canonical/models/back-shiny/Rhydon.gif rename to src/canonical/models/back-shiny/112--0--Rhydon.gif diff --git a/src/canonical/models/back-shiny/Chansey.gif b/src/canonical/models/back-shiny/113--0--Chansey.gif similarity index 100% rename from src/canonical/models/back-shiny/Chansey.gif rename to src/canonical/models/back-shiny/113--0--Chansey.gif diff --git a/src/canonical/models/back-shiny/Tangela.gif b/src/canonical/models/back-shiny/114--0--Tangela.gif similarity index 100% rename from src/canonical/models/back-shiny/Tangela.gif rename to src/canonical/models/back-shiny/114--0--Tangela.gif diff --git a/src/canonical/models/back-shiny/Kangaskhan.gif b/src/canonical/models/back-shiny/115--0--Kangaskhan.gif similarity index 100% rename from src/canonical/models/back-shiny/Kangaskhan.gif rename to src/canonical/models/back-shiny/115--0--Kangaskhan.gif diff --git a/src/canonical/models/back-shiny/Kangaskhan--Mega.gif b/src/canonical/models/back-shiny/115--420--Kangaskhan--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Kangaskhan--Mega.gif rename to src/canonical/models/back-shiny/115--420--Kangaskhan--Mega.gif diff --git a/src/canonical/models/back-shiny/Horsea.gif b/src/canonical/models/back-shiny/116--0--Horsea.gif similarity index 100% rename from src/canonical/models/back-shiny/Horsea.gif rename to src/canonical/models/back-shiny/116--0--Horsea.gif diff --git a/src/canonical/models/back-shiny/Seadra.gif b/src/canonical/models/back-shiny/117--0--Seadra.gif similarity index 100% rename from src/canonical/models/back-shiny/Seadra.gif rename to src/canonical/models/back-shiny/117--0--Seadra.gif diff --git a/src/canonical/models/back-shiny/Goldeen.gif b/src/canonical/models/back-shiny/118--0--Goldeen.gif similarity index 100% rename from src/canonical/models/back-shiny/Goldeen.gif rename to src/canonical/models/back-shiny/118--0--Goldeen.gif diff --git a/src/canonical/models/back-shiny/Seaking.gif b/src/canonical/models/back-shiny/119--0--Seaking.gif similarity index 100% rename from src/canonical/models/back-shiny/Seaking.gif rename to src/canonical/models/back-shiny/119--0--Seaking.gif diff --git a/src/canonical/models/back-shiny/Butterfree.gif b/src/canonical/models/back-shiny/12--0--Butterfree.gif similarity index 100% rename from src/canonical/models/back-shiny/Butterfree.gif rename to src/canonical/models/back-shiny/12--0--Butterfree.gif diff --git a/src/canonical/models/back-shiny/Butterfree--Gmax.gif b/src/canonical/models/back-shiny/12--420--Butterfree--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Butterfree--Gmax.gif rename to src/canonical/models/back-shiny/12--420--Butterfree--Gmax.gif diff --git a/src/canonical/models/back-shiny/Staryu.gif b/src/canonical/models/back-shiny/120--0--Staryu.gif similarity index 100% rename from src/canonical/models/back-shiny/Staryu.gif rename to src/canonical/models/back-shiny/120--0--Staryu.gif diff --git a/src/canonical/models/back-shiny/Starmie.gif b/src/canonical/models/back-shiny/121--0--Starmie.gif similarity index 100% rename from src/canonical/models/back-shiny/Starmie.gif rename to src/canonical/models/back-shiny/121--0--Starmie.gif diff --git a/src/canonical/models/back-shiny/Mr._Mime.gif b/src/canonical/models/back-shiny/122--0--Mr._Mime.gif similarity index 100% rename from src/canonical/models/back-shiny/Mr._Mime.gif rename to src/canonical/models/back-shiny/122--0--Mr._Mime.gif diff --git a/src/canonical/models/back-shiny/Mr._Mime--Galar.gif b/src/canonical/models/back-shiny/122--420--Mr._Mime--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Mr._Mime--Galar.gif rename to src/canonical/models/back-shiny/122--420--Mr._Mime--Galar.gif diff --git a/src/canonical/models/back-shiny/Scyther.gif b/src/canonical/models/back-shiny/123--0--Scyther.gif similarity index 100% rename from src/canonical/models/back-shiny/Scyther.gif rename to src/canonical/models/back-shiny/123--0--Scyther.gif diff --git a/src/canonical/models/back-shiny/Jynx.gif b/src/canonical/models/back-shiny/124--0--Jynx.gif similarity index 100% rename from src/canonical/models/back-shiny/Jynx.gif rename to src/canonical/models/back-shiny/124--0--Jynx.gif diff --git a/src/canonical/models/back-shiny/Electabuzz.gif b/src/canonical/models/back-shiny/125--0--Electabuzz.gif similarity index 100% rename from src/canonical/models/back-shiny/Electabuzz.gif rename to src/canonical/models/back-shiny/125--0--Electabuzz.gif diff --git a/src/canonical/models/back-shiny/Magmar.gif b/src/canonical/models/back-shiny/126--0--Magmar.gif similarity index 100% rename from src/canonical/models/back-shiny/Magmar.gif rename to src/canonical/models/back-shiny/126--0--Magmar.gif diff --git a/src/canonical/models/back-shiny/Pinsir.gif b/src/canonical/models/back-shiny/127--0--Pinsir.gif similarity index 100% rename from src/canonical/models/back-shiny/Pinsir.gif rename to src/canonical/models/back-shiny/127--0--Pinsir.gif diff --git a/src/canonical/models/back-shiny/Pinsir--Mega.gif b/src/canonical/models/back-shiny/127--420--Pinsir--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Pinsir--Mega.gif rename to src/canonical/models/back-shiny/127--420--Pinsir--Mega.gif diff --git a/src/canonical/models/back-shiny/Tauros.gif b/src/canonical/models/back-shiny/128--0--Tauros.gif similarity index 100% rename from src/canonical/models/back-shiny/Tauros.gif rename to src/canonical/models/back-shiny/128--0--Tauros.gif diff --git a/src/canonical/models/back-shiny/Magikarp.gif b/src/canonical/models/back-shiny/129--0--Magikarp.gif similarity index 100% rename from src/canonical/models/back-shiny/Magikarp.gif rename to src/canonical/models/back-shiny/129--0--Magikarp.gif diff --git a/src/canonical/models/back-shiny/Weedle.gif b/src/canonical/models/back-shiny/13--0--Weedle.gif similarity index 100% rename from src/canonical/models/back-shiny/Weedle.gif rename to src/canonical/models/back-shiny/13--0--Weedle.gif diff --git a/src/canonical/models/back-shiny/Gyarados.gif b/src/canonical/models/back-shiny/130--0--Gyarados.gif similarity index 100% rename from src/canonical/models/back-shiny/Gyarados.gif rename to src/canonical/models/back-shiny/130--0--Gyarados.gif diff --git a/src/canonical/models/back-shiny/Gyarados--Mega.gif b/src/canonical/models/back-shiny/130--420--Gyarados--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Gyarados--Mega.gif rename to src/canonical/models/back-shiny/130--420--Gyarados--Mega.gif diff --git a/src/canonical/models/back-shiny/Lapras.gif b/src/canonical/models/back-shiny/131--0--Lapras.gif similarity index 100% rename from src/canonical/models/back-shiny/Lapras.gif rename to src/canonical/models/back-shiny/131--0--Lapras.gif diff --git a/src/canonical/models/back-shiny/Lapras--Gmax.gif b/src/canonical/models/back-shiny/131--420--Lapras--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Lapras--Gmax.gif rename to src/canonical/models/back-shiny/131--420--Lapras--Gmax.gif diff --git a/src/canonical/models/back-shiny/Ditto.gif b/src/canonical/models/back-shiny/132--0--Ditto.gif similarity index 100% rename from src/canonical/models/back-shiny/Ditto.gif rename to src/canonical/models/back-shiny/132--0--Ditto.gif diff --git a/src/canonical/models/back-shiny/Eevee.gif b/src/canonical/models/back-shiny/133--0--Eevee.gif similarity index 100% rename from src/canonical/models/back-shiny/Eevee.gif rename to src/canonical/models/back-shiny/133--0--Eevee.gif diff --git a/src/canonical/models/back-shiny/Eevee--Gmax.gif b/src/canonical/models/back-shiny/133--420--Eevee--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Eevee--Gmax.gif rename to src/canonical/models/back-shiny/133--420--Eevee--Gmax.gif diff --git a/src/canonical/models/back-shiny/Vaporeon.gif b/src/canonical/models/back-shiny/134--0--Vaporeon.gif similarity index 100% rename from src/canonical/models/back-shiny/Vaporeon.gif rename to src/canonical/models/back-shiny/134--0--Vaporeon.gif diff --git a/src/canonical/models/back-shiny/Jolteon.gif b/src/canonical/models/back-shiny/135--0--Jolteon.gif similarity index 100% rename from src/canonical/models/back-shiny/Jolteon.gif rename to src/canonical/models/back-shiny/135--0--Jolteon.gif diff --git a/src/canonical/models/back-shiny/Flareon.gif b/src/canonical/models/back-shiny/136--0--Flareon.gif similarity index 100% rename from src/canonical/models/back-shiny/Flareon.gif rename to src/canonical/models/back-shiny/136--0--Flareon.gif diff --git a/src/canonical/models/back-shiny/Porygon.gif b/src/canonical/models/back-shiny/137--0--Porygon.gif similarity index 100% rename from src/canonical/models/back-shiny/Porygon.gif rename to src/canonical/models/back-shiny/137--0--Porygon.gif diff --git a/src/canonical/models/back-shiny/Omanyte.gif b/src/canonical/models/back-shiny/138--0--Omanyte.gif similarity index 100% rename from src/canonical/models/back-shiny/Omanyte.gif rename to src/canonical/models/back-shiny/138--0--Omanyte.gif diff --git a/src/canonical/models/back-shiny/Omastar.gif b/src/canonical/models/back-shiny/139--0--Omastar.gif similarity index 100% rename from src/canonical/models/back-shiny/Omastar.gif rename to src/canonical/models/back-shiny/139--0--Omastar.gif diff --git a/src/canonical/models/back-shiny/Kakuna.gif b/src/canonical/models/back-shiny/14--0--Kakuna.gif similarity index 100% rename from src/canonical/models/back-shiny/Kakuna.gif rename to src/canonical/models/back-shiny/14--0--Kakuna.gif diff --git a/src/canonical/models/back-shiny/Kabuto.gif b/src/canonical/models/back-shiny/140--0--Kabuto.gif similarity index 100% rename from src/canonical/models/back-shiny/Kabuto.gif rename to src/canonical/models/back-shiny/140--0--Kabuto.gif diff --git a/src/canonical/models/back-shiny/Kabutops.gif b/src/canonical/models/back-shiny/141--0--Kabutops.gif similarity index 100% rename from src/canonical/models/back-shiny/Kabutops.gif rename to src/canonical/models/back-shiny/141--0--Kabutops.gif diff --git a/src/canonical/models/back-shiny/Aerodactyl.gif b/src/canonical/models/back-shiny/142--0--Aerodactyl.gif similarity index 100% rename from src/canonical/models/back-shiny/Aerodactyl.gif rename to src/canonical/models/back-shiny/142--0--Aerodactyl.gif diff --git a/src/canonical/models/back-shiny/Aerodactyl--Mega.gif b/src/canonical/models/back-shiny/142--420--Aerodactyl--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Aerodactyl--Mega.gif rename to src/canonical/models/back-shiny/142--420--Aerodactyl--Mega.gif diff --git a/src/canonical/models/back-shiny/Snorlax.gif b/src/canonical/models/back-shiny/143--0--Snorlax.gif similarity index 100% rename from src/canonical/models/back-shiny/Snorlax.gif rename to src/canonical/models/back-shiny/143--0--Snorlax.gif diff --git a/src/canonical/models/back-shiny/Snorlax--Gmax.gif b/src/canonical/models/back-shiny/143--420--Snorlax--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Snorlax--Gmax.gif rename to src/canonical/models/back-shiny/143--420--Snorlax--Gmax.gif diff --git a/src/canonical/models/back-shiny/Articuno.gif b/src/canonical/models/back-shiny/144--0--Articuno.gif similarity index 100% rename from src/canonical/models/back-shiny/Articuno.gif rename to src/canonical/models/back-shiny/144--0--Articuno.gif diff --git a/src/canonical/models/back-shiny/Zapdos.gif b/src/canonical/models/back-shiny/145--0--Zapdos.gif similarity index 100% rename from src/canonical/models/back-shiny/Zapdos.gif rename to src/canonical/models/back-shiny/145--0--Zapdos.gif diff --git a/src/canonical/models/back-shiny/Moltres.gif b/src/canonical/models/back-shiny/146--0--Moltres.gif similarity index 100% rename from src/canonical/models/back-shiny/Moltres.gif rename to src/canonical/models/back-shiny/146--0--Moltres.gif diff --git a/src/canonical/models/back-shiny/Dratini.gif b/src/canonical/models/back-shiny/147--0--Dratini.gif similarity index 100% rename from src/canonical/models/back-shiny/Dratini.gif rename to src/canonical/models/back-shiny/147--0--Dratini.gif diff --git a/src/canonical/models/back-shiny/Dragonair.gif b/src/canonical/models/back-shiny/148--0--Dragonair.gif similarity index 100% rename from src/canonical/models/back-shiny/Dragonair.gif rename to src/canonical/models/back-shiny/148--0--Dragonair.gif diff --git a/src/canonical/models/back-shiny/Dragonite.gif b/src/canonical/models/back-shiny/149--0--Dragonite.gif similarity index 100% rename from src/canonical/models/back-shiny/Dragonite.gif rename to src/canonical/models/back-shiny/149--0--Dragonite.gif diff --git a/src/canonical/models/back-shiny/Beedrill.gif b/src/canonical/models/back-shiny/15--0--Beedrill.gif similarity index 100% rename from src/canonical/models/back-shiny/Beedrill.gif rename to src/canonical/models/back-shiny/15--0--Beedrill.gif diff --git a/src/canonical/models/back-shiny/Beedrill--Mega.gif b/src/canonical/models/back-shiny/15--420--Beedrill--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Beedrill--Mega.gif rename to src/canonical/models/back-shiny/15--420--Beedrill--Mega.gif diff --git a/src/canonical/models/back-shiny/Mewtwo.gif b/src/canonical/models/back-shiny/150--0--Mewtwo.gif similarity index 100% rename from src/canonical/models/back-shiny/Mewtwo.gif rename to src/canonical/models/back-shiny/150--0--Mewtwo.gif diff --git a/src/canonical/models/back-shiny/Mewtwo--Mega-X.gif b/src/canonical/models/back-shiny/150--420--Mewtwo--Mega-X.gif similarity index 100% rename from src/canonical/models/back-shiny/Mewtwo--Mega-X.gif rename to src/canonical/models/back-shiny/150--420--Mewtwo--Mega-X.gif diff --git a/src/canonical/models/back-shiny/Mewtwo--Mega-Y.gif b/src/canonical/models/back-shiny/150--420--Mewtwo--Mega-Y.gif similarity index 100% rename from src/canonical/models/back-shiny/Mewtwo--Mega-Y.gif rename to src/canonical/models/back-shiny/150--420--Mewtwo--Mega-Y.gif diff --git a/src/canonical/models/back-shiny/Mew.gif b/src/canonical/models/back-shiny/151--0--Mew.gif similarity index 100% rename from src/canonical/models/back-shiny/Mew.gif rename to src/canonical/models/back-shiny/151--0--Mew.gif diff --git a/src/canonical/models/back-shiny/Chikorita.gif b/src/canonical/models/back-shiny/152--0--Chikorita.gif similarity index 100% rename from src/canonical/models/back-shiny/Chikorita.gif rename to src/canonical/models/back-shiny/152--0--Chikorita.gif diff --git a/src/canonical/models/back-shiny/Bayleef.gif b/src/canonical/models/back-shiny/153--0--Bayleef.gif similarity index 100% rename from src/canonical/models/back-shiny/Bayleef.gif rename to src/canonical/models/back-shiny/153--0--Bayleef.gif diff --git a/src/canonical/models/back-shiny/Meganium.gif b/src/canonical/models/back-shiny/154--0--Meganium.gif similarity index 100% rename from src/canonical/models/back-shiny/Meganium.gif rename to src/canonical/models/back-shiny/154--0--Meganium.gif diff --git a/src/canonical/models/back-shiny/Cyndaquil.gif b/src/canonical/models/back-shiny/155--0--Cyndaquil.gif similarity index 100% rename from src/canonical/models/back-shiny/Cyndaquil.gif rename to src/canonical/models/back-shiny/155--0--Cyndaquil.gif diff --git a/src/canonical/models/back-shiny/Quilava.gif b/src/canonical/models/back-shiny/156--0--Quilava.gif similarity index 100% rename from src/canonical/models/back-shiny/Quilava.gif rename to src/canonical/models/back-shiny/156--0--Quilava.gif diff --git a/src/canonical/models/back-shiny/Typhlosion.gif b/src/canonical/models/back-shiny/157--0--Typhlosion.gif similarity index 100% rename from src/canonical/models/back-shiny/Typhlosion.gif rename to src/canonical/models/back-shiny/157--0--Typhlosion.gif diff --git a/src/canonical/models/back-shiny/Totodile.gif b/src/canonical/models/back-shiny/158--0--Totodile.gif similarity index 100% rename from src/canonical/models/back-shiny/Totodile.gif rename to src/canonical/models/back-shiny/158--0--Totodile.gif diff --git a/src/canonical/models/back-shiny/Croconaw.gif b/src/canonical/models/back-shiny/159--0--Croconaw.gif similarity index 100% rename from src/canonical/models/back-shiny/Croconaw.gif rename to src/canonical/models/back-shiny/159--0--Croconaw.gif diff --git a/src/canonical/models/back-shiny/Pidgey.gif b/src/canonical/models/back-shiny/16--0--Pidgey.gif similarity index 100% rename from src/canonical/models/back-shiny/Pidgey.gif rename to src/canonical/models/back-shiny/16--0--Pidgey.gif diff --git a/src/canonical/models/back-shiny/Feraligatr.gif b/src/canonical/models/back-shiny/160--0--Feraligatr.gif similarity index 100% rename from src/canonical/models/back-shiny/Feraligatr.gif rename to src/canonical/models/back-shiny/160--0--Feraligatr.gif diff --git a/src/canonical/models/back-shiny/Sentret.gif b/src/canonical/models/back-shiny/161--0--Sentret.gif similarity index 100% rename from src/canonical/models/back-shiny/Sentret.gif rename to src/canonical/models/back-shiny/161--0--Sentret.gif diff --git a/src/canonical/models/back-shiny/Furret.gif b/src/canonical/models/back-shiny/162--0--Furret.gif similarity index 100% rename from src/canonical/models/back-shiny/Furret.gif rename to src/canonical/models/back-shiny/162--0--Furret.gif diff --git a/src/canonical/models/back-shiny/Hoothoot.gif b/src/canonical/models/back-shiny/163--0--Hoothoot.gif similarity index 100% rename from src/canonical/models/back-shiny/Hoothoot.gif rename to src/canonical/models/back-shiny/163--0--Hoothoot.gif diff --git a/src/canonical/models/back-shiny/Noctowl.gif b/src/canonical/models/back-shiny/164--0--Noctowl.gif similarity index 100% rename from src/canonical/models/back-shiny/Noctowl.gif rename to src/canonical/models/back-shiny/164--0--Noctowl.gif diff --git a/src/canonical/models/back-shiny/Ledyba.gif b/src/canonical/models/back-shiny/165--0--Ledyba.gif similarity index 100% rename from src/canonical/models/back-shiny/Ledyba.gif rename to src/canonical/models/back-shiny/165--0--Ledyba.gif diff --git a/src/canonical/models/back-shiny/Ledian.gif b/src/canonical/models/back-shiny/166--0--Ledian.gif similarity index 100% rename from src/canonical/models/back-shiny/Ledian.gif rename to src/canonical/models/back-shiny/166--0--Ledian.gif diff --git a/src/canonical/models/back-shiny/Spinarak.gif b/src/canonical/models/back-shiny/167--0--Spinarak.gif similarity index 100% rename from src/canonical/models/back-shiny/Spinarak.gif rename to src/canonical/models/back-shiny/167--0--Spinarak.gif diff --git a/src/canonical/models/back-shiny/Ariados.gif b/src/canonical/models/back-shiny/168--0--Ariados.gif similarity index 100% rename from src/canonical/models/back-shiny/Ariados.gif rename to src/canonical/models/back-shiny/168--0--Ariados.gif diff --git a/src/canonical/models/back-shiny/Crobat.gif b/src/canonical/models/back-shiny/169--0--Crobat.gif similarity index 100% rename from src/canonical/models/back-shiny/Crobat.gif rename to src/canonical/models/back-shiny/169--0--Crobat.gif diff --git a/src/canonical/models/back-shiny/Pidgeotto.gif b/src/canonical/models/back-shiny/17--0--Pidgeotto.gif similarity index 100% rename from src/canonical/models/back-shiny/Pidgeotto.gif rename to src/canonical/models/back-shiny/17--0--Pidgeotto.gif diff --git a/src/canonical/models/back-shiny/Chinchou.gif b/src/canonical/models/back-shiny/170--0--Chinchou.gif similarity index 100% rename from src/canonical/models/back-shiny/Chinchou.gif rename to src/canonical/models/back-shiny/170--0--Chinchou.gif diff --git a/src/canonical/models/back-shiny/Lanturn.gif b/src/canonical/models/back-shiny/171--0--Lanturn.gif similarity index 100% rename from src/canonical/models/back-shiny/Lanturn.gif rename to src/canonical/models/back-shiny/171--0--Lanturn.gif diff --git a/src/canonical/models/back-shiny/Pichu.gif b/src/canonical/models/back-shiny/172--0--Pichu.gif similarity index 100% rename from src/canonical/models/back-shiny/Pichu.gif rename to src/canonical/models/back-shiny/172--0--Pichu.gif diff --git a/src/canonical/models/back-shiny/Cleffa.gif b/src/canonical/models/back-shiny/173--0--Cleffa.gif similarity index 100% rename from src/canonical/models/back-shiny/Cleffa.gif rename to src/canonical/models/back-shiny/173--0--Cleffa.gif diff --git a/src/canonical/models/back-shiny/Igglybuff.gif b/src/canonical/models/back-shiny/174--0--Igglybuff.gif similarity index 100% rename from src/canonical/models/back-shiny/Igglybuff.gif rename to src/canonical/models/back-shiny/174--0--Igglybuff.gif diff --git a/src/canonical/models/back-shiny/Togepi.gif b/src/canonical/models/back-shiny/175--0--Togepi.gif similarity index 100% rename from src/canonical/models/back-shiny/Togepi.gif rename to src/canonical/models/back-shiny/175--0--Togepi.gif diff --git a/src/canonical/models/back-shiny/Togetic.gif b/src/canonical/models/back-shiny/176--0--Togetic.gif similarity index 100% rename from src/canonical/models/back-shiny/Togetic.gif rename to src/canonical/models/back-shiny/176--0--Togetic.gif diff --git a/src/canonical/models/back-shiny/Natu.gif b/src/canonical/models/back-shiny/177--0--Natu.gif similarity index 100% rename from src/canonical/models/back-shiny/Natu.gif rename to src/canonical/models/back-shiny/177--0--Natu.gif diff --git a/src/canonical/models/back-shiny/Xatu.gif b/src/canonical/models/back-shiny/178--0--Xatu.gif similarity index 100% rename from src/canonical/models/back-shiny/Xatu.gif rename to src/canonical/models/back-shiny/178--0--Xatu.gif diff --git a/src/canonical/models/back-shiny/Mareep.gif b/src/canonical/models/back-shiny/179--0--Mareep.gif similarity index 100% rename from src/canonical/models/back-shiny/Mareep.gif rename to src/canonical/models/back-shiny/179--0--Mareep.gif diff --git a/src/canonical/models/back-shiny/Pidgeot.gif b/src/canonical/models/back-shiny/18--0--Pidgeot.gif similarity index 100% rename from src/canonical/models/back-shiny/Pidgeot.gif rename to src/canonical/models/back-shiny/18--0--Pidgeot.gif diff --git a/src/canonical/models/back-shiny/Pidgeot--Mega.gif b/src/canonical/models/back-shiny/18--420--Pidgeot--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Pidgeot--Mega.gif rename to src/canonical/models/back-shiny/18--420--Pidgeot--Mega.gif diff --git a/src/canonical/models/back-shiny/Flaaffy.gif b/src/canonical/models/back-shiny/180--0--Flaaffy.gif similarity index 100% rename from src/canonical/models/back-shiny/Flaaffy.gif rename to src/canonical/models/back-shiny/180--0--Flaaffy.gif diff --git a/src/canonical/models/back-shiny/Ampharos.gif b/src/canonical/models/back-shiny/181--0--Ampharos.gif similarity index 100% rename from src/canonical/models/back-shiny/Ampharos.gif rename to src/canonical/models/back-shiny/181--0--Ampharos.gif diff --git a/src/canonical/models/back-shiny/Ampharos--Mega.gif b/src/canonical/models/back-shiny/181--420--Ampharos--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Ampharos--Mega.gif rename to src/canonical/models/back-shiny/181--420--Ampharos--Mega.gif diff --git a/src/canonical/models/back-shiny/Bellossom.gif b/src/canonical/models/back-shiny/182--0--Bellossom.gif similarity index 100% rename from src/canonical/models/back-shiny/Bellossom.gif rename to src/canonical/models/back-shiny/182--0--Bellossom.gif diff --git a/src/canonical/models/back-shiny/Marill.gif b/src/canonical/models/back-shiny/183--0--Marill.gif similarity index 100% rename from src/canonical/models/back-shiny/Marill.gif rename to src/canonical/models/back-shiny/183--0--Marill.gif diff --git a/src/canonical/models/back-shiny/Azumarill.gif b/src/canonical/models/back-shiny/184--0--Azumarill.gif similarity index 100% rename from src/canonical/models/back-shiny/Azumarill.gif rename to src/canonical/models/back-shiny/184--0--Azumarill.gif diff --git a/src/canonical/models/back-shiny/Sudowoodo.gif b/src/canonical/models/back-shiny/185--0--Sudowoodo.gif similarity index 100% rename from src/canonical/models/back-shiny/Sudowoodo.gif rename to src/canonical/models/back-shiny/185--0--Sudowoodo.gif diff --git a/src/canonical/models/back-shiny/Politoed.gif b/src/canonical/models/back-shiny/186--0--Politoed.gif similarity index 100% rename from src/canonical/models/back-shiny/Politoed.gif rename to src/canonical/models/back-shiny/186--0--Politoed.gif diff --git a/src/canonical/models/back-shiny/Hoppip.gif b/src/canonical/models/back-shiny/187--0--Hoppip.gif similarity index 100% rename from src/canonical/models/back-shiny/Hoppip.gif rename to src/canonical/models/back-shiny/187--0--Hoppip.gif diff --git a/src/canonical/models/back-shiny/Skiploom.gif b/src/canonical/models/back-shiny/188--0--Skiploom.gif similarity index 100% rename from src/canonical/models/back-shiny/Skiploom.gif rename to src/canonical/models/back-shiny/188--0--Skiploom.gif diff --git a/src/canonical/models/back-shiny/Jumpluff.gif b/src/canonical/models/back-shiny/189--0--Jumpluff.gif similarity index 100% rename from src/canonical/models/back-shiny/Jumpluff.gif rename to src/canonical/models/back-shiny/189--0--Jumpluff.gif diff --git a/src/canonical/models/back-shiny/Rattata.gif b/src/canonical/models/back-shiny/19--0--Rattata.gif similarity index 100% rename from src/canonical/models/back-shiny/Rattata.gif rename to src/canonical/models/back-shiny/19--0--Rattata.gif diff --git a/src/canonical/models/back-shiny/Rattata--Alola.gif b/src/canonical/models/back-shiny/19--420--Rattata--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Rattata--Alola.gif rename to src/canonical/models/back-shiny/19--420--Rattata--Alola.gif diff --git a/src/canonical/models/back-shiny/Aipom.gif b/src/canonical/models/back-shiny/190--0--Aipom.gif similarity index 100% rename from src/canonical/models/back-shiny/Aipom.gif rename to src/canonical/models/back-shiny/190--0--Aipom.gif diff --git a/src/canonical/models/back-shiny/Sunkern.gif b/src/canonical/models/back-shiny/191--0--Sunkern.gif similarity index 100% rename from src/canonical/models/back-shiny/Sunkern.gif rename to src/canonical/models/back-shiny/191--0--Sunkern.gif diff --git a/src/canonical/models/back-shiny/Sunflora.gif b/src/canonical/models/back-shiny/192--0--Sunflora.gif similarity index 100% rename from src/canonical/models/back-shiny/Sunflora.gif rename to src/canonical/models/back-shiny/192--0--Sunflora.gif diff --git a/src/canonical/models/back-shiny/Yanma.gif b/src/canonical/models/back-shiny/193--0--Yanma.gif similarity index 100% rename from src/canonical/models/back-shiny/Yanma.gif rename to src/canonical/models/back-shiny/193--0--Yanma.gif diff --git a/src/canonical/models/back-shiny/Wooper.gif b/src/canonical/models/back-shiny/194--0--Wooper.gif similarity index 100% rename from src/canonical/models/back-shiny/Wooper.gif rename to src/canonical/models/back-shiny/194--0--Wooper.gif diff --git a/src/canonical/models/back-shiny/Quagsire.gif b/src/canonical/models/back-shiny/195--0--Quagsire.gif similarity index 100% rename from src/canonical/models/back-shiny/Quagsire.gif rename to src/canonical/models/back-shiny/195--0--Quagsire.gif diff --git a/src/canonical/models/back-shiny/Espeon.gif b/src/canonical/models/back-shiny/196--0--Espeon.gif similarity index 100% rename from src/canonical/models/back-shiny/Espeon.gif rename to src/canonical/models/back-shiny/196--0--Espeon.gif diff --git a/src/canonical/models/back-shiny/Umbreon.gif b/src/canonical/models/back-shiny/197--0--Umbreon.gif similarity index 100% rename from src/canonical/models/back-shiny/Umbreon.gif rename to src/canonical/models/back-shiny/197--0--Umbreon.gif diff --git a/src/canonical/models/back-shiny/Murkrow.gif b/src/canonical/models/back-shiny/198--0--Murkrow.gif similarity index 100% rename from src/canonical/models/back-shiny/Murkrow.gif rename to src/canonical/models/back-shiny/198--0--Murkrow.gif diff --git a/src/canonical/models/back-shiny/Slowking.gif b/src/canonical/models/back-shiny/199--0--Slowking.gif similarity index 100% rename from src/canonical/models/back-shiny/Slowking.gif rename to src/canonical/models/back-shiny/199--0--Slowking.gif diff --git a/src/canonical/models/back-shiny/Ivysaur.gif b/src/canonical/models/back-shiny/2--0--Ivysaur.gif similarity index 100% rename from src/canonical/models/back-shiny/Ivysaur.gif rename to src/canonical/models/back-shiny/2--0--Ivysaur.gif diff --git a/src/canonical/models/back-shiny/Raticate.gif b/src/canonical/models/back-shiny/20--0--Raticate.gif similarity index 100% rename from src/canonical/models/back-shiny/Raticate.gif rename to src/canonical/models/back-shiny/20--0--Raticate.gif diff --git a/src/canonical/models/back-shiny/Raticate--Alola-Totem.gif b/src/canonical/models/back-shiny/20--420--Raticate--Alola-Totem.gif similarity index 100% rename from src/canonical/models/back-shiny/Raticate--Alola-Totem.gif rename to src/canonical/models/back-shiny/20--420--Raticate--Alola-Totem.gif diff --git a/src/canonical/models/back-shiny/Raticate--Alola.gif b/src/canonical/models/back-shiny/20--420--Raticate--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Raticate--Alola.gif rename to src/canonical/models/back-shiny/20--420--Raticate--Alola.gif diff --git a/src/canonical/models/back-shiny/Misdreavus.gif b/src/canonical/models/back-shiny/200--0--Misdreavus.gif similarity index 100% rename from src/canonical/models/back-shiny/Misdreavus.gif rename to src/canonical/models/back-shiny/200--0--Misdreavus.gif diff --git a/src/canonical/models/back-shiny/201--0--Unown.gif b/src/canonical/models/back-shiny/201--0--Unown.gif new file mode 120000 index 00000000..8ab9aabc --- /dev/null +++ b/src/canonical/models/back-shiny/201--0--Unown.gif @@ -0,0 +1 @@ +../back-shiny-cosmetic/201--420--Unown--A.gif \ No newline at end of file diff --git a/src/canonical/models/back-shiny/Wobbuffet.gif b/src/canonical/models/back-shiny/202--0--Wobbuffet.gif similarity index 100% rename from src/canonical/models/back-shiny/Wobbuffet.gif rename to src/canonical/models/back-shiny/202--0--Wobbuffet.gif diff --git a/src/canonical/models/back-shiny/Girafarig.gif b/src/canonical/models/back-shiny/203--0--Girafarig.gif similarity index 100% rename from src/canonical/models/back-shiny/Girafarig.gif rename to src/canonical/models/back-shiny/203--0--Girafarig.gif diff --git a/src/canonical/models/back-shiny/Pineco.gif b/src/canonical/models/back-shiny/204--0--Pineco.gif similarity index 100% rename from src/canonical/models/back-shiny/Pineco.gif rename to src/canonical/models/back-shiny/204--0--Pineco.gif diff --git a/src/canonical/models/back-shiny/Forretress.gif b/src/canonical/models/back-shiny/205--0--Forretress.gif similarity index 100% rename from src/canonical/models/back-shiny/Forretress.gif rename to src/canonical/models/back-shiny/205--0--Forretress.gif diff --git a/src/canonical/models/back-shiny/Dunsparce.gif b/src/canonical/models/back-shiny/206--0--Dunsparce.gif similarity index 100% rename from src/canonical/models/back-shiny/Dunsparce.gif rename to src/canonical/models/back-shiny/206--0--Dunsparce.gif diff --git a/src/canonical/models/back-shiny/Gligar.gif b/src/canonical/models/back-shiny/207--0--Gligar.gif similarity index 100% rename from src/canonical/models/back-shiny/Gligar.gif rename to src/canonical/models/back-shiny/207--0--Gligar.gif diff --git a/src/canonical/models/back-shiny/Steelix.gif b/src/canonical/models/back-shiny/208--0--Steelix.gif similarity index 100% rename from src/canonical/models/back-shiny/Steelix.gif rename to src/canonical/models/back-shiny/208--0--Steelix.gif diff --git a/src/canonical/models/back-shiny/Steelix--Mega.gif b/src/canonical/models/back-shiny/208--420--Steelix--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Steelix--Mega.gif rename to src/canonical/models/back-shiny/208--420--Steelix--Mega.gif diff --git a/src/canonical/models/back-shiny/Snubbull.gif b/src/canonical/models/back-shiny/209--0--Snubbull.gif similarity index 100% rename from src/canonical/models/back-shiny/Snubbull.gif rename to src/canonical/models/back-shiny/209--0--Snubbull.gif diff --git a/src/canonical/models/back-shiny/Spearow.gif b/src/canonical/models/back-shiny/21--0--Spearow.gif similarity index 100% rename from src/canonical/models/back-shiny/Spearow.gif rename to src/canonical/models/back-shiny/21--0--Spearow.gif diff --git a/src/canonical/models/back-shiny/Granbull.gif b/src/canonical/models/back-shiny/210--0--Granbull.gif similarity index 100% rename from src/canonical/models/back-shiny/Granbull.gif rename to src/canonical/models/back-shiny/210--0--Granbull.gif diff --git a/src/canonical/models/back-shiny/Qwilfish.gif b/src/canonical/models/back-shiny/211--0--Qwilfish.gif similarity index 100% rename from src/canonical/models/back-shiny/Qwilfish.gif rename to src/canonical/models/back-shiny/211--0--Qwilfish.gif diff --git a/src/canonical/models/back-shiny/Scizor.gif b/src/canonical/models/back-shiny/212--0--Scizor.gif similarity index 100% rename from src/canonical/models/back-shiny/Scizor.gif rename to src/canonical/models/back-shiny/212--0--Scizor.gif diff --git a/src/canonical/models/back-shiny/Scizor--Mega.gif b/src/canonical/models/back-shiny/212--420--Scizor--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Scizor--Mega.gif rename to src/canonical/models/back-shiny/212--420--Scizor--Mega.gif diff --git a/src/canonical/models/back-shiny/Shuckle.gif b/src/canonical/models/back-shiny/213--0--Shuckle.gif similarity index 100% rename from src/canonical/models/back-shiny/Shuckle.gif rename to src/canonical/models/back-shiny/213--0--Shuckle.gif diff --git a/src/canonical/models/back-shiny/Heracross.gif b/src/canonical/models/back-shiny/214--0--Heracross.gif similarity index 100% rename from src/canonical/models/back-shiny/Heracross.gif rename to src/canonical/models/back-shiny/214--0--Heracross.gif diff --git a/src/canonical/models/back-shiny/Heracross--Mega.gif b/src/canonical/models/back-shiny/214--420--Heracross--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Heracross--Mega.gif rename to src/canonical/models/back-shiny/214--420--Heracross--Mega.gif diff --git a/src/canonical/models/back-shiny/Sneasel.gif b/src/canonical/models/back-shiny/215--0--Sneasel.gif similarity index 100% rename from src/canonical/models/back-shiny/Sneasel.gif rename to src/canonical/models/back-shiny/215--0--Sneasel.gif diff --git a/src/canonical/models/back-shiny/Teddiursa.gif b/src/canonical/models/back-shiny/216--0--Teddiursa.gif similarity index 100% rename from src/canonical/models/back-shiny/Teddiursa.gif rename to src/canonical/models/back-shiny/216--0--Teddiursa.gif diff --git a/src/canonical/models/back-shiny/Ursaring.gif b/src/canonical/models/back-shiny/217--0--Ursaring.gif similarity index 100% rename from src/canonical/models/back-shiny/Ursaring.gif rename to src/canonical/models/back-shiny/217--0--Ursaring.gif diff --git a/src/canonical/models/back-shiny/Slugma.gif b/src/canonical/models/back-shiny/218--0--Slugma.gif similarity index 100% rename from src/canonical/models/back-shiny/Slugma.gif rename to src/canonical/models/back-shiny/218--0--Slugma.gif diff --git a/src/canonical/models/back-shiny/Magcargo.gif b/src/canonical/models/back-shiny/219--0--Magcargo.gif similarity index 100% rename from src/canonical/models/back-shiny/Magcargo.gif rename to src/canonical/models/back-shiny/219--0--Magcargo.gif diff --git a/src/canonical/models/back-shiny/Fearow.gif b/src/canonical/models/back-shiny/22--0--Fearow.gif similarity index 100% rename from src/canonical/models/back-shiny/Fearow.gif rename to src/canonical/models/back-shiny/22--0--Fearow.gif diff --git a/src/canonical/models/back-shiny/Swinub.gif b/src/canonical/models/back-shiny/220--0--Swinub.gif similarity index 100% rename from src/canonical/models/back-shiny/Swinub.gif rename to src/canonical/models/back-shiny/220--0--Swinub.gif diff --git a/src/canonical/models/back-shiny/Piloswine.gif b/src/canonical/models/back-shiny/221--0--Piloswine.gif similarity index 100% rename from src/canonical/models/back-shiny/Piloswine.gif rename to src/canonical/models/back-shiny/221--0--Piloswine.gif diff --git a/src/canonical/models/back-shiny/Corsola.gif b/src/canonical/models/back-shiny/222--0--Corsola.gif similarity index 100% rename from src/canonical/models/back-shiny/Corsola.gif rename to src/canonical/models/back-shiny/222--0--Corsola.gif diff --git a/src/canonical/models/back-shiny/Corsola--Galar.gif b/src/canonical/models/back-shiny/222--420--Corsola--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Corsola--Galar.gif rename to src/canonical/models/back-shiny/222--420--Corsola--Galar.gif diff --git a/src/canonical/models/back-shiny/Remoraid.gif b/src/canonical/models/back-shiny/223--0--Remoraid.gif similarity index 100% rename from src/canonical/models/back-shiny/Remoraid.gif rename to src/canonical/models/back-shiny/223--0--Remoraid.gif diff --git a/src/canonical/models/back-shiny/Octillery.gif b/src/canonical/models/back-shiny/224--0--Octillery.gif similarity index 100% rename from src/canonical/models/back-shiny/Octillery.gif rename to src/canonical/models/back-shiny/224--0--Octillery.gif diff --git a/src/canonical/models/back-shiny/Delibird.gif b/src/canonical/models/back-shiny/225--0--Delibird.gif similarity index 100% rename from src/canonical/models/back-shiny/Delibird.gif rename to src/canonical/models/back-shiny/225--0--Delibird.gif diff --git a/src/canonical/models/back-shiny/Mantine.gif b/src/canonical/models/back-shiny/226--0--Mantine.gif similarity index 100% rename from src/canonical/models/back-shiny/Mantine.gif rename to src/canonical/models/back-shiny/226--0--Mantine.gif diff --git a/src/canonical/models/back-shiny/Skarmory.gif b/src/canonical/models/back-shiny/227--0--Skarmory.gif similarity index 100% rename from src/canonical/models/back-shiny/Skarmory.gif rename to src/canonical/models/back-shiny/227--0--Skarmory.gif diff --git a/src/canonical/models/back-shiny/Houndour.gif b/src/canonical/models/back-shiny/228--0--Houndour.gif similarity index 100% rename from src/canonical/models/back-shiny/Houndour.gif rename to src/canonical/models/back-shiny/228--0--Houndour.gif diff --git a/src/canonical/models/back-shiny/Houndoom.gif b/src/canonical/models/back-shiny/229--0--Houndoom.gif similarity index 100% rename from src/canonical/models/back-shiny/Houndoom.gif rename to src/canonical/models/back-shiny/229--0--Houndoom.gif diff --git a/src/canonical/models/back-shiny/Houndoom--Mega.gif b/src/canonical/models/back-shiny/229--420--Houndoom--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Houndoom--Mega.gif rename to src/canonical/models/back-shiny/229--420--Houndoom--Mega.gif diff --git a/src/canonical/models/back-shiny/Ekans.gif b/src/canonical/models/back-shiny/23--0--Ekans.gif similarity index 100% rename from src/canonical/models/back-shiny/Ekans.gif rename to src/canonical/models/back-shiny/23--0--Ekans.gif diff --git a/src/canonical/models/back-shiny/Kingdra.gif b/src/canonical/models/back-shiny/230--0--Kingdra.gif similarity index 100% rename from src/canonical/models/back-shiny/Kingdra.gif rename to src/canonical/models/back-shiny/230--0--Kingdra.gif diff --git a/src/canonical/models/back-shiny/Phanpy.gif b/src/canonical/models/back-shiny/231--0--Phanpy.gif similarity index 100% rename from src/canonical/models/back-shiny/Phanpy.gif rename to src/canonical/models/back-shiny/231--0--Phanpy.gif diff --git a/src/canonical/models/back-shiny/Donphan.gif b/src/canonical/models/back-shiny/232--0--Donphan.gif similarity index 100% rename from src/canonical/models/back-shiny/Donphan.gif rename to src/canonical/models/back-shiny/232--0--Donphan.gif diff --git a/src/canonical/models/back-shiny/Porygon2.gif b/src/canonical/models/back-shiny/233--0--Porygon2.gif similarity index 100% rename from src/canonical/models/back-shiny/Porygon2.gif rename to src/canonical/models/back-shiny/233--0--Porygon2.gif diff --git a/src/canonical/models/back-shiny/Stantler.gif b/src/canonical/models/back-shiny/234--0--Stantler.gif similarity index 100% rename from src/canonical/models/back-shiny/Stantler.gif rename to src/canonical/models/back-shiny/234--0--Stantler.gif diff --git a/src/canonical/models/back-shiny/Smeargle.gif b/src/canonical/models/back-shiny/235--0--Smeargle.gif similarity index 100% rename from src/canonical/models/back-shiny/Smeargle.gif rename to src/canonical/models/back-shiny/235--0--Smeargle.gif diff --git a/src/canonical/models/back-shiny/Tyrogue.gif b/src/canonical/models/back-shiny/236--0--Tyrogue.gif similarity index 100% rename from src/canonical/models/back-shiny/Tyrogue.gif rename to src/canonical/models/back-shiny/236--0--Tyrogue.gif diff --git a/src/canonical/models/back-shiny/Hitmontop.gif b/src/canonical/models/back-shiny/237--0--Hitmontop.gif similarity index 100% rename from src/canonical/models/back-shiny/Hitmontop.gif rename to src/canonical/models/back-shiny/237--0--Hitmontop.gif diff --git a/src/canonical/models/back-shiny/Smoochum.gif b/src/canonical/models/back-shiny/238--0--Smoochum.gif similarity index 100% rename from src/canonical/models/back-shiny/Smoochum.gif rename to src/canonical/models/back-shiny/238--0--Smoochum.gif diff --git a/src/canonical/models/back-shiny/Elekid.gif b/src/canonical/models/back-shiny/239--0--Elekid.gif similarity index 100% rename from src/canonical/models/back-shiny/Elekid.gif rename to src/canonical/models/back-shiny/239--0--Elekid.gif diff --git a/src/canonical/models/back-shiny/Arbok.gif b/src/canonical/models/back-shiny/24--0--Arbok.gif similarity index 100% rename from src/canonical/models/back-shiny/Arbok.gif rename to src/canonical/models/back-shiny/24--0--Arbok.gif diff --git a/src/canonical/models/back-shiny/Magby.gif b/src/canonical/models/back-shiny/240--0--Magby.gif similarity index 100% rename from src/canonical/models/back-shiny/Magby.gif rename to src/canonical/models/back-shiny/240--0--Magby.gif diff --git a/src/canonical/models/back-shiny/Miltank.gif b/src/canonical/models/back-shiny/241--0--Miltank.gif similarity index 100% rename from src/canonical/models/back-shiny/Miltank.gif rename to src/canonical/models/back-shiny/241--0--Miltank.gif diff --git a/src/canonical/models/back-shiny/Blissey.gif b/src/canonical/models/back-shiny/242--0--Blissey.gif similarity index 100% rename from src/canonical/models/back-shiny/Blissey.gif rename to src/canonical/models/back-shiny/242--0--Blissey.gif diff --git a/src/canonical/models/back-shiny/Raikou.gif b/src/canonical/models/back-shiny/243--0--Raikou.gif similarity index 100% rename from src/canonical/models/back-shiny/Raikou.gif rename to src/canonical/models/back-shiny/243--0--Raikou.gif diff --git a/src/canonical/models/back-shiny/Entei.gif b/src/canonical/models/back-shiny/244--0--Entei.gif similarity index 100% rename from src/canonical/models/back-shiny/Entei.gif rename to src/canonical/models/back-shiny/244--0--Entei.gif diff --git a/src/canonical/models/back-shiny/Suicune.gif b/src/canonical/models/back-shiny/245--0--Suicune.gif similarity index 100% rename from src/canonical/models/back-shiny/Suicune.gif rename to src/canonical/models/back-shiny/245--0--Suicune.gif diff --git a/src/canonical/models/back-shiny/Larvitar.gif b/src/canonical/models/back-shiny/246--0--Larvitar.gif similarity index 100% rename from src/canonical/models/back-shiny/Larvitar.gif rename to src/canonical/models/back-shiny/246--0--Larvitar.gif diff --git a/src/canonical/models/back-shiny/Pupitar.gif b/src/canonical/models/back-shiny/247--0--Pupitar.gif similarity index 100% rename from src/canonical/models/back-shiny/Pupitar.gif rename to src/canonical/models/back-shiny/247--0--Pupitar.gif diff --git a/src/canonical/models/back-shiny/Tyranitar.gif b/src/canonical/models/back-shiny/248--0--Tyranitar.gif similarity index 100% rename from src/canonical/models/back-shiny/Tyranitar.gif rename to src/canonical/models/back-shiny/248--0--Tyranitar.gif diff --git a/src/canonical/models/back-shiny/Tyranitar--Mega.gif b/src/canonical/models/back-shiny/248--420--Tyranitar--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Tyranitar--Mega.gif rename to src/canonical/models/back-shiny/248--420--Tyranitar--Mega.gif diff --git a/src/canonical/models/back-shiny/Lugia.gif b/src/canonical/models/back-shiny/249--0--Lugia.gif similarity index 100% rename from src/canonical/models/back-shiny/Lugia.gif rename to src/canonical/models/back-shiny/249--0--Lugia.gif diff --git a/src/canonical/models/back-shiny/Pikachu.gif b/src/canonical/models/back-shiny/25--0--Pikachu.gif similarity index 100% rename from src/canonical/models/back-shiny/Pikachu.gif rename to src/canonical/models/back-shiny/25--0--Pikachu.gif diff --git a/src/canonical/models/back-shiny/25--420--Pikachu--Alola.gif b/src/canonical/models/back-shiny/25--420--Pikachu--Alola.gif new file mode 120000 index 00000000..7a09b6cf --- /dev/null +++ b/src/canonical/models/back-shiny/25--420--Pikachu--Alola.gif @@ -0,0 +1 @@ +../back/25--420--Pikachu--Alola.gif \ No newline at end of file diff --git a/src/canonical/models/back-shiny/Pikachu--Belle.gif b/src/canonical/models/back-shiny/25--420--Pikachu--Belle.gif similarity index 100% rename from src/canonical/models/back-shiny/Pikachu--Belle.gif rename to src/canonical/models/back-shiny/25--420--Pikachu--Belle.gif diff --git a/src/canonical/models/back-shiny/Pikachu--Cosplay.gif b/src/canonical/models/back-shiny/25--420--Pikachu--Cosplay.gif similarity index 100% rename from src/canonical/models/back-shiny/Pikachu--Cosplay.gif rename to src/canonical/models/back-shiny/25--420--Pikachu--Cosplay.gif diff --git a/src/canonical/models/back-shiny/Pikachu--Gmax.gif b/src/canonical/models/back-shiny/25--420--Pikachu--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Pikachu--Gmax.gif rename to src/canonical/models/back-shiny/25--420--Pikachu--Gmax.gif diff --git a/src/canonical/models/back-shiny/25--420--Pikachu--Hoenn.gif b/src/canonical/models/back-shiny/25--420--Pikachu--Hoenn.gif new file mode 120000 index 00000000..a72d1b15 --- /dev/null +++ b/src/canonical/models/back-shiny/25--420--Pikachu--Hoenn.gif @@ -0,0 +1 @@ +../back/25--420--Pikachu--Hoenn.gif \ No newline at end of file diff --git a/src/canonical/models/back-shiny/25--420--Pikachu--Kalos.gif b/src/canonical/models/back-shiny/25--420--Pikachu--Kalos.gif new file mode 120000 index 00000000..c5a7f683 --- /dev/null +++ b/src/canonical/models/back-shiny/25--420--Pikachu--Kalos.gif @@ -0,0 +1 @@ +../back/25--420--Pikachu--Kalos.gif \ No newline at end of file diff --git a/src/canonical/models/back-shiny/Pikachu--Partner.gif b/src/canonical/models/back-shiny/25--420--Pikachu--Partner.gif similarity index 100% rename from src/canonical/models/back-shiny/Pikachu--Partner.gif rename to src/canonical/models/back-shiny/25--420--Pikachu--Partner.gif diff --git a/src/canonical/models/back-shiny/Pikachu--PhD.gif b/src/canonical/models/back-shiny/25--420--Pikachu--PhD.gif similarity index 100% rename from src/canonical/models/back-shiny/Pikachu--PhD.gif rename to src/canonical/models/back-shiny/25--420--Pikachu--PhD.gif diff --git a/src/canonical/models/back-shiny/Pikachu--Pop-Star.gif b/src/canonical/models/back-shiny/25--420--Pikachu--Pop-Star.gif similarity index 100% rename from src/canonical/models/back-shiny/Pikachu--Pop-Star.gif rename to src/canonical/models/back-shiny/25--420--Pikachu--Pop-Star.gif diff --git a/src/canonical/models/back-shiny/Pikachu--Rock-Star.gif b/src/canonical/models/back-shiny/25--420--Pikachu--Rock-Star.gif similarity index 100% rename from src/canonical/models/back-shiny/Pikachu--Rock-Star.gif rename to src/canonical/models/back-shiny/25--420--Pikachu--Rock-Star.gif diff --git a/src/canonical/models/back-shiny/25--420--Pikachu--Sinnoh.gif b/src/canonical/models/back-shiny/25--420--Pikachu--Sinnoh.gif new file mode 120000 index 00000000..a9c1424b --- /dev/null +++ b/src/canonical/models/back-shiny/25--420--Pikachu--Sinnoh.gif @@ -0,0 +1 @@ +../back/25--420--Pikachu--Sinnoh.gif \ No newline at end of file diff --git a/src/canonical/models/back-shiny/25--420--Pikachu--Unova.gif b/src/canonical/models/back-shiny/25--420--Pikachu--Unova.gif new file mode 120000 index 00000000..d492bc58 --- /dev/null +++ b/src/canonical/models/back-shiny/25--420--Pikachu--Unova.gif @@ -0,0 +1 @@ +../back/25--420--Pikachu--Unova.gif \ No newline at end of file diff --git a/src/canonical/models/back-shiny/Ho-Oh.gif b/src/canonical/models/back-shiny/250--0--Ho-Oh.gif similarity index 100% rename from src/canonical/models/back-shiny/Ho-Oh.gif rename to src/canonical/models/back-shiny/250--0--Ho-Oh.gif diff --git a/src/canonical/models/back-shiny/Celebi.gif b/src/canonical/models/back-shiny/251--0--Celebi.gif similarity index 100% rename from src/canonical/models/back-shiny/Celebi.gif rename to src/canonical/models/back-shiny/251--0--Celebi.gif diff --git a/src/canonical/models/back-shiny/Treecko.gif b/src/canonical/models/back-shiny/252--0--Treecko.gif similarity index 100% rename from src/canonical/models/back-shiny/Treecko.gif rename to src/canonical/models/back-shiny/252--0--Treecko.gif diff --git a/src/canonical/models/back-shiny/Grovyle.gif b/src/canonical/models/back-shiny/253--0--Grovyle.gif similarity index 100% rename from src/canonical/models/back-shiny/Grovyle.gif rename to src/canonical/models/back-shiny/253--0--Grovyle.gif diff --git a/src/canonical/models/back-shiny/Sceptile.gif b/src/canonical/models/back-shiny/254--0--Sceptile.gif similarity index 100% rename from src/canonical/models/back-shiny/Sceptile.gif rename to src/canonical/models/back-shiny/254--0--Sceptile.gif diff --git a/src/canonical/models/back-shiny/Sceptile--Mega.gif b/src/canonical/models/back-shiny/254--420--Sceptile--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Sceptile--Mega.gif rename to src/canonical/models/back-shiny/254--420--Sceptile--Mega.gif diff --git a/src/canonical/models/back-shiny/Torchic.gif b/src/canonical/models/back-shiny/255--0--Torchic.gif similarity index 100% rename from src/canonical/models/back-shiny/Torchic.gif rename to src/canonical/models/back-shiny/255--0--Torchic.gif diff --git a/src/canonical/models/back-shiny/Combusken.gif b/src/canonical/models/back-shiny/256--0--Combusken.gif similarity index 100% rename from src/canonical/models/back-shiny/Combusken.gif rename to src/canonical/models/back-shiny/256--0--Combusken.gif diff --git a/src/canonical/models/back-shiny/Blaziken.gif b/src/canonical/models/back-shiny/257--0--Blaziken.gif similarity index 100% rename from src/canonical/models/back-shiny/Blaziken.gif rename to src/canonical/models/back-shiny/257--0--Blaziken.gif diff --git a/src/canonical/models/back-shiny/Blaziken--Mega.gif b/src/canonical/models/back-shiny/257--420--Blaziken--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Blaziken--Mega.gif rename to src/canonical/models/back-shiny/257--420--Blaziken--Mega.gif diff --git a/src/canonical/models/back-shiny/Mudkip.gif b/src/canonical/models/back-shiny/258--0--Mudkip.gif similarity index 100% rename from src/canonical/models/back-shiny/Mudkip.gif rename to src/canonical/models/back-shiny/258--0--Mudkip.gif diff --git a/src/canonical/models/back-shiny/Marshtomp.gif b/src/canonical/models/back-shiny/259--0--Marshtomp.gif similarity index 100% rename from src/canonical/models/back-shiny/Marshtomp.gif rename to src/canonical/models/back-shiny/259--0--Marshtomp.gif diff --git a/src/canonical/models/back-shiny/Raichu.gif b/src/canonical/models/back-shiny/26--0--Raichu.gif similarity index 100% rename from src/canonical/models/back-shiny/Raichu.gif rename to src/canonical/models/back-shiny/26--0--Raichu.gif diff --git a/src/canonical/models/back-shiny/Raichu--Alola.gif b/src/canonical/models/back-shiny/26--420--Raichu--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Raichu--Alola.gif rename to src/canonical/models/back-shiny/26--420--Raichu--Alola.gif diff --git a/src/canonical/models/back-shiny/Swampert.gif b/src/canonical/models/back-shiny/260--0--Swampert.gif similarity index 100% rename from src/canonical/models/back-shiny/Swampert.gif rename to src/canonical/models/back-shiny/260--0--Swampert.gif diff --git a/src/canonical/models/back-shiny/Swampert--Mega.gif b/src/canonical/models/back-shiny/260--420--Swampert--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Swampert--Mega.gif rename to src/canonical/models/back-shiny/260--420--Swampert--Mega.gif diff --git a/src/canonical/models/back-shiny/Poochyena.gif b/src/canonical/models/back-shiny/261--0--Poochyena.gif similarity index 100% rename from src/canonical/models/back-shiny/Poochyena.gif rename to src/canonical/models/back-shiny/261--0--Poochyena.gif diff --git a/src/canonical/models/back-shiny/Mightyena.gif b/src/canonical/models/back-shiny/262--0--Mightyena.gif similarity index 100% rename from src/canonical/models/back-shiny/Mightyena.gif rename to src/canonical/models/back-shiny/262--0--Mightyena.gif diff --git a/src/canonical/models/back-shiny/Zigzagoon.gif b/src/canonical/models/back-shiny/263--0--Zigzagoon.gif similarity index 100% rename from src/canonical/models/back-shiny/Zigzagoon.gif rename to src/canonical/models/back-shiny/263--0--Zigzagoon.gif diff --git a/src/canonical/models/back-shiny/Zigzagoon--Galar.gif b/src/canonical/models/back-shiny/263--420--Zigzagoon--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Zigzagoon--Galar.gif rename to src/canonical/models/back-shiny/263--420--Zigzagoon--Galar.gif diff --git a/src/canonical/models/back-shiny/Linoone.gif b/src/canonical/models/back-shiny/264--0--Linoone.gif similarity index 100% rename from src/canonical/models/back-shiny/Linoone.gif rename to src/canonical/models/back-shiny/264--0--Linoone.gif diff --git a/src/canonical/models/back-shiny/Linoone--Galar.gif b/src/canonical/models/back-shiny/264--420--Linoone--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Linoone--Galar.gif rename to src/canonical/models/back-shiny/264--420--Linoone--Galar.gif diff --git a/src/canonical/models/back-shiny/Wurmple.gif b/src/canonical/models/back-shiny/265--0--Wurmple.gif similarity index 100% rename from src/canonical/models/back-shiny/Wurmple.gif rename to src/canonical/models/back-shiny/265--0--Wurmple.gif diff --git a/src/canonical/models/back-shiny/Silcoon.gif b/src/canonical/models/back-shiny/266--0--Silcoon.gif similarity index 100% rename from src/canonical/models/back-shiny/Silcoon.gif rename to src/canonical/models/back-shiny/266--0--Silcoon.gif diff --git a/src/canonical/models/back-shiny/Beautifly.gif b/src/canonical/models/back-shiny/267--0--Beautifly.gif similarity index 100% rename from src/canonical/models/back-shiny/Beautifly.gif rename to src/canonical/models/back-shiny/267--0--Beautifly.gif diff --git a/src/canonical/models/back-shiny/Cascoon.gif b/src/canonical/models/back-shiny/268--0--Cascoon.gif similarity index 100% rename from src/canonical/models/back-shiny/Cascoon.gif rename to src/canonical/models/back-shiny/268--0--Cascoon.gif diff --git a/src/canonical/models/back-shiny/Dustox.gif b/src/canonical/models/back-shiny/269--0--Dustox.gif similarity index 100% rename from src/canonical/models/back-shiny/Dustox.gif rename to src/canonical/models/back-shiny/269--0--Dustox.gif diff --git a/src/canonical/models/back-shiny/Sandshrew.gif b/src/canonical/models/back-shiny/27--0--Sandshrew.gif similarity index 100% rename from src/canonical/models/back-shiny/Sandshrew.gif rename to src/canonical/models/back-shiny/27--0--Sandshrew.gif diff --git a/src/canonical/models/back-shiny/Sandshrew--Alola.gif b/src/canonical/models/back-shiny/27--420--Sandshrew--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Sandshrew--Alola.gif rename to src/canonical/models/back-shiny/27--420--Sandshrew--Alola.gif diff --git a/src/canonical/models/back-shiny/Lotad.gif b/src/canonical/models/back-shiny/270--0--Lotad.gif similarity index 100% rename from src/canonical/models/back-shiny/Lotad.gif rename to src/canonical/models/back-shiny/270--0--Lotad.gif diff --git a/src/canonical/models/back-shiny/Lombre.gif b/src/canonical/models/back-shiny/271--0--Lombre.gif similarity index 100% rename from src/canonical/models/back-shiny/Lombre.gif rename to src/canonical/models/back-shiny/271--0--Lombre.gif diff --git a/src/canonical/models/back-shiny/Ludicolo.gif b/src/canonical/models/back-shiny/272--0--Ludicolo.gif similarity index 100% rename from src/canonical/models/back-shiny/Ludicolo.gif rename to src/canonical/models/back-shiny/272--0--Ludicolo.gif diff --git a/src/canonical/models/back-shiny/Seedot.gif b/src/canonical/models/back-shiny/273--0--Seedot.gif similarity index 100% rename from src/canonical/models/back-shiny/Seedot.gif rename to src/canonical/models/back-shiny/273--0--Seedot.gif diff --git a/src/canonical/models/back-shiny/Nuzleaf.gif b/src/canonical/models/back-shiny/274--0--Nuzleaf.gif similarity index 100% rename from src/canonical/models/back-shiny/Nuzleaf.gif rename to src/canonical/models/back-shiny/274--0--Nuzleaf.gif diff --git a/src/canonical/models/back-shiny/Shiftry.gif b/src/canonical/models/back-shiny/275--0--Shiftry.gif similarity index 100% rename from src/canonical/models/back-shiny/Shiftry.gif rename to src/canonical/models/back-shiny/275--0--Shiftry.gif diff --git a/src/canonical/models/back-shiny/Taillow.gif b/src/canonical/models/back-shiny/276--0--Taillow.gif similarity index 100% rename from src/canonical/models/back-shiny/Taillow.gif rename to src/canonical/models/back-shiny/276--0--Taillow.gif diff --git a/src/canonical/models/back-shiny/Swellow.gif b/src/canonical/models/back-shiny/277--0--Swellow.gif similarity index 100% rename from src/canonical/models/back-shiny/Swellow.gif rename to src/canonical/models/back-shiny/277--0--Swellow.gif diff --git a/src/canonical/models/back-shiny/Wingull.gif b/src/canonical/models/back-shiny/278--0--Wingull.gif similarity index 100% rename from src/canonical/models/back-shiny/Wingull.gif rename to src/canonical/models/back-shiny/278--0--Wingull.gif diff --git a/src/canonical/models/back-shiny/Pelipper.gif b/src/canonical/models/back-shiny/279--0--Pelipper.gif similarity index 100% rename from src/canonical/models/back-shiny/Pelipper.gif rename to src/canonical/models/back-shiny/279--0--Pelipper.gif diff --git a/src/canonical/models/back-shiny/Sandslash.gif b/src/canonical/models/back-shiny/28--0--Sandslash.gif similarity index 100% rename from src/canonical/models/back-shiny/Sandslash.gif rename to src/canonical/models/back-shiny/28--0--Sandslash.gif diff --git a/src/canonical/models/back-shiny/Sandslash--Alola.gif b/src/canonical/models/back-shiny/28--420--Sandslash--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Sandslash--Alola.gif rename to src/canonical/models/back-shiny/28--420--Sandslash--Alola.gif diff --git a/src/canonical/models/back-shiny/Ralts.gif b/src/canonical/models/back-shiny/280--0--Ralts.gif similarity index 100% rename from src/canonical/models/back-shiny/Ralts.gif rename to src/canonical/models/back-shiny/280--0--Ralts.gif diff --git a/src/canonical/models/back-shiny/Kirlia.gif b/src/canonical/models/back-shiny/281--0--Kirlia.gif similarity index 100% rename from src/canonical/models/back-shiny/Kirlia.gif rename to src/canonical/models/back-shiny/281--0--Kirlia.gif diff --git a/src/canonical/models/back-shiny/Gardevoir.gif b/src/canonical/models/back-shiny/282--0--Gardevoir.gif similarity index 100% rename from src/canonical/models/back-shiny/Gardevoir.gif rename to src/canonical/models/back-shiny/282--0--Gardevoir.gif diff --git a/src/canonical/models/back-shiny/Gardevoir--Mega.gif b/src/canonical/models/back-shiny/282--420--Gardevoir--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Gardevoir--Mega.gif rename to src/canonical/models/back-shiny/282--420--Gardevoir--Mega.gif diff --git a/src/canonical/models/back-shiny/Surskit.gif b/src/canonical/models/back-shiny/283--0--Surskit.gif similarity index 100% rename from src/canonical/models/back-shiny/Surskit.gif rename to src/canonical/models/back-shiny/283--0--Surskit.gif diff --git a/src/canonical/models/back-shiny/Masquerain.gif b/src/canonical/models/back-shiny/284--0--Masquerain.gif similarity index 100% rename from src/canonical/models/back-shiny/Masquerain.gif rename to src/canonical/models/back-shiny/284--0--Masquerain.gif diff --git a/src/canonical/models/back-shiny/Shroomish.gif b/src/canonical/models/back-shiny/285--0--Shroomish.gif similarity index 100% rename from src/canonical/models/back-shiny/Shroomish.gif rename to src/canonical/models/back-shiny/285--0--Shroomish.gif diff --git a/src/canonical/models/back-shiny/Breloom.gif b/src/canonical/models/back-shiny/286--0--Breloom.gif similarity index 100% rename from src/canonical/models/back-shiny/Breloom.gif rename to src/canonical/models/back-shiny/286--0--Breloom.gif diff --git a/src/canonical/models/back-shiny/Slakoth.gif b/src/canonical/models/back-shiny/287--0--Slakoth.gif similarity index 100% rename from src/canonical/models/back-shiny/Slakoth.gif rename to src/canonical/models/back-shiny/287--0--Slakoth.gif diff --git a/src/canonical/models/back-shiny/Vigoroth.gif b/src/canonical/models/back-shiny/288--0--Vigoroth.gif similarity index 100% rename from src/canonical/models/back-shiny/Vigoroth.gif rename to src/canonical/models/back-shiny/288--0--Vigoroth.gif diff --git a/src/canonical/models/back-shiny/Slaking.gif b/src/canonical/models/back-shiny/289--0--Slaking.gif similarity index 100% rename from src/canonical/models/back-shiny/Slaking.gif rename to src/canonical/models/back-shiny/289--0--Slaking.gif diff --git a/src/canonical/models/back-shiny/Nidoran-F.gif b/src/canonical/models/back-shiny/29--0--Nidoran-F.gif similarity index 100% rename from src/canonical/models/back-shiny/Nidoran-F.gif rename to src/canonical/models/back-shiny/29--0--Nidoran-F.gif diff --git a/src/canonical/models/back-shiny/Nincada.gif b/src/canonical/models/back-shiny/290--0--Nincada.gif similarity index 100% rename from src/canonical/models/back-shiny/Nincada.gif rename to src/canonical/models/back-shiny/290--0--Nincada.gif diff --git a/src/canonical/models/back-shiny/Ninjask.gif b/src/canonical/models/back-shiny/291--0--Ninjask.gif similarity index 100% rename from src/canonical/models/back-shiny/Ninjask.gif rename to src/canonical/models/back-shiny/291--0--Ninjask.gif diff --git a/src/canonical/models/back-shiny/Shedinja.gif b/src/canonical/models/back-shiny/292--0--Shedinja.gif similarity index 100% rename from src/canonical/models/back-shiny/Shedinja.gif rename to src/canonical/models/back-shiny/292--0--Shedinja.gif diff --git a/src/canonical/models/back-shiny/Whismur.gif b/src/canonical/models/back-shiny/293--0--Whismur.gif similarity index 100% rename from src/canonical/models/back-shiny/Whismur.gif rename to src/canonical/models/back-shiny/293--0--Whismur.gif diff --git a/src/canonical/models/back-shiny/Loudred.gif b/src/canonical/models/back-shiny/294--0--Loudred.gif similarity index 100% rename from src/canonical/models/back-shiny/Loudred.gif rename to src/canonical/models/back-shiny/294--0--Loudred.gif diff --git a/src/canonical/models/back-shiny/Exploud.gif b/src/canonical/models/back-shiny/295--0--Exploud.gif similarity index 100% rename from src/canonical/models/back-shiny/Exploud.gif rename to src/canonical/models/back-shiny/295--0--Exploud.gif diff --git a/src/canonical/models/back-shiny/Makuhita.gif b/src/canonical/models/back-shiny/296--0--Makuhita.gif similarity index 100% rename from src/canonical/models/back-shiny/Makuhita.gif rename to src/canonical/models/back-shiny/296--0--Makuhita.gif diff --git a/src/canonical/models/back-shiny/Hariyama.gif b/src/canonical/models/back-shiny/297--0--Hariyama.gif similarity index 100% rename from src/canonical/models/back-shiny/Hariyama.gif rename to src/canonical/models/back-shiny/297--0--Hariyama.gif diff --git a/src/canonical/models/back-shiny/Azurill.gif b/src/canonical/models/back-shiny/298--0--Azurill.gif similarity index 100% rename from src/canonical/models/back-shiny/Azurill.gif rename to src/canonical/models/back-shiny/298--0--Azurill.gif diff --git a/src/canonical/models/back-shiny/Nosepass.gif b/src/canonical/models/back-shiny/299--0--Nosepass.gif similarity index 100% rename from src/canonical/models/back-shiny/Nosepass.gif rename to src/canonical/models/back-shiny/299--0--Nosepass.gif diff --git a/src/canonical/models/back-shiny/Venusaur.gif b/src/canonical/models/back-shiny/3--0--Venusaur.gif similarity index 100% rename from src/canonical/models/back-shiny/Venusaur.gif rename to src/canonical/models/back-shiny/3--0--Venusaur.gif diff --git a/src/canonical/models/back-shiny/Venusaur--Mega.gif b/src/canonical/models/back-shiny/3--420--Venusaur--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Venusaur--Mega.gif rename to src/canonical/models/back-shiny/3--420--Venusaur--Mega.gif diff --git a/src/canonical/models/back-shiny/Nidorina.gif b/src/canonical/models/back-shiny/30--0--Nidorina.gif similarity index 100% rename from src/canonical/models/back-shiny/Nidorina.gif rename to src/canonical/models/back-shiny/30--0--Nidorina.gif diff --git a/src/canonical/models/back-shiny/Skitty.gif b/src/canonical/models/back-shiny/300--0--Skitty.gif similarity index 100% rename from src/canonical/models/back-shiny/Skitty.gif rename to src/canonical/models/back-shiny/300--0--Skitty.gif diff --git a/src/canonical/models/back-shiny/Delcatty.gif b/src/canonical/models/back-shiny/301--0--Delcatty.gif similarity index 100% rename from src/canonical/models/back-shiny/Delcatty.gif rename to src/canonical/models/back-shiny/301--0--Delcatty.gif diff --git a/src/canonical/models/back-shiny/Sableye.gif b/src/canonical/models/back-shiny/302--0--Sableye.gif similarity index 100% rename from src/canonical/models/back-shiny/Sableye.gif rename to src/canonical/models/back-shiny/302--0--Sableye.gif diff --git a/src/canonical/models/back-shiny/Sableye--Mega.gif b/src/canonical/models/back-shiny/302--420--Sableye--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Sableye--Mega.gif rename to src/canonical/models/back-shiny/302--420--Sableye--Mega.gif diff --git a/src/canonical/models/back-shiny/Mawile.gif b/src/canonical/models/back-shiny/303--0--Mawile.gif similarity index 100% rename from src/canonical/models/back-shiny/Mawile.gif rename to src/canonical/models/back-shiny/303--0--Mawile.gif diff --git a/src/canonical/models/back-shiny/Mawile--Mega.gif b/src/canonical/models/back-shiny/303--420--Mawile--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Mawile--Mega.gif rename to src/canonical/models/back-shiny/303--420--Mawile--Mega.gif diff --git a/src/canonical/models/back-shiny/Aron.gif b/src/canonical/models/back-shiny/304--0--Aron.gif similarity index 100% rename from src/canonical/models/back-shiny/Aron.gif rename to src/canonical/models/back-shiny/304--0--Aron.gif diff --git a/src/canonical/models/back-shiny/Lairon.gif b/src/canonical/models/back-shiny/305--0--Lairon.gif similarity index 100% rename from src/canonical/models/back-shiny/Lairon.gif rename to src/canonical/models/back-shiny/305--0--Lairon.gif diff --git a/src/canonical/models/back-shiny/Aggron.gif b/src/canonical/models/back-shiny/306--0--Aggron.gif similarity index 100% rename from src/canonical/models/back-shiny/Aggron.gif rename to src/canonical/models/back-shiny/306--0--Aggron.gif diff --git a/src/canonical/models/back-shiny/Aggron--Mega.gif b/src/canonical/models/back-shiny/306--420--Aggron--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Aggron--Mega.gif rename to src/canonical/models/back-shiny/306--420--Aggron--Mega.gif diff --git a/src/canonical/models/back-shiny/Meditite.gif b/src/canonical/models/back-shiny/307--0--Meditite.gif similarity index 100% rename from src/canonical/models/back-shiny/Meditite.gif rename to src/canonical/models/back-shiny/307--0--Meditite.gif diff --git a/src/canonical/models/back-shiny/Medicham.gif b/src/canonical/models/back-shiny/308--0--Medicham.gif similarity index 100% rename from src/canonical/models/back-shiny/Medicham.gif rename to src/canonical/models/back-shiny/308--0--Medicham.gif diff --git a/src/canonical/models/back-shiny/Medicham--Mega.gif b/src/canonical/models/back-shiny/308--420--Medicham--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Medicham--Mega.gif rename to src/canonical/models/back-shiny/308--420--Medicham--Mega.gif diff --git a/src/canonical/models/back-shiny/Electrike.gif b/src/canonical/models/back-shiny/309--0--Electrike.gif similarity index 100% rename from src/canonical/models/back-shiny/Electrike.gif rename to src/canonical/models/back-shiny/309--0--Electrike.gif diff --git a/src/canonical/models/back-shiny/Nidoqueen.gif b/src/canonical/models/back-shiny/31--0--Nidoqueen.gif similarity index 100% rename from src/canonical/models/back-shiny/Nidoqueen.gif rename to src/canonical/models/back-shiny/31--0--Nidoqueen.gif diff --git a/src/canonical/models/back-shiny/Manectric.gif b/src/canonical/models/back-shiny/310--0--Manectric.gif similarity index 100% rename from src/canonical/models/back-shiny/Manectric.gif rename to src/canonical/models/back-shiny/310--0--Manectric.gif diff --git a/src/canonical/models/back-shiny/Manectric--Mega.gif b/src/canonical/models/back-shiny/310--420--Manectric--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Manectric--Mega.gif rename to src/canonical/models/back-shiny/310--420--Manectric--Mega.gif diff --git a/src/canonical/models/back-shiny/Plusle.gif b/src/canonical/models/back-shiny/311--0--Plusle.gif similarity index 100% rename from src/canonical/models/back-shiny/Plusle.gif rename to src/canonical/models/back-shiny/311--0--Plusle.gif diff --git a/src/canonical/models/back-shiny/Minun.gif b/src/canonical/models/back-shiny/312--0--Minun.gif similarity index 100% rename from src/canonical/models/back-shiny/Minun.gif rename to src/canonical/models/back-shiny/312--0--Minun.gif diff --git a/src/canonical/models/back-shiny/Volbeat.gif b/src/canonical/models/back-shiny/313--0--Volbeat.gif similarity index 100% rename from src/canonical/models/back-shiny/Volbeat.gif rename to src/canonical/models/back-shiny/313--0--Volbeat.gif diff --git a/src/canonical/models/back-shiny/Illumise.gif b/src/canonical/models/back-shiny/314--0--Illumise.gif similarity index 100% rename from src/canonical/models/back-shiny/Illumise.gif rename to src/canonical/models/back-shiny/314--0--Illumise.gif diff --git a/src/canonical/models/back-shiny/Roselia.gif b/src/canonical/models/back-shiny/315--0--Roselia.gif similarity index 100% rename from src/canonical/models/back-shiny/Roselia.gif rename to src/canonical/models/back-shiny/315--0--Roselia.gif diff --git a/src/canonical/models/back-shiny/Gulpin.gif b/src/canonical/models/back-shiny/316--0--Gulpin.gif similarity index 100% rename from src/canonical/models/back-shiny/Gulpin.gif rename to src/canonical/models/back-shiny/316--0--Gulpin.gif diff --git a/src/canonical/models/back-shiny/Swalot.gif b/src/canonical/models/back-shiny/317--0--Swalot.gif similarity index 100% rename from src/canonical/models/back-shiny/Swalot.gif rename to src/canonical/models/back-shiny/317--0--Swalot.gif diff --git a/src/canonical/models/back-shiny/Carvanha.gif b/src/canonical/models/back-shiny/318--0--Carvanha.gif similarity index 100% rename from src/canonical/models/back-shiny/Carvanha.gif rename to src/canonical/models/back-shiny/318--0--Carvanha.gif diff --git a/src/canonical/models/back-shiny/Sharpedo.gif b/src/canonical/models/back-shiny/319--0--Sharpedo.gif similarity index 100% rename from src/canonical/models/back-shiny/Sharpedo.gif rename to src/canonical/models/back-shiny/319--0--Sharpedo.gif diff --git a/src/canonical/models/back-shiny/Sharpedo--Mega.gif b/src/canonical/models/back-shiny/319--420--Sharpedo--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Sharpedo--Mega.gif rename to src/canonical/models/back-shiny/319--420--Sharpedo--Mega.gif diff --git a/src/canonical/models/back-shiny/Nidoran-M.gif b/src/canonical/models/back-shiny/32--0--Nidoran-M.gif similarity index 100% rename from src/canonical/models/back-shiny/Nidoran-M.gif rename to src/canonical/models/back-shiny/32--0--Nidoran-M.gif diff --git a/src/canonical/models/back-shiny/Wailmer.gif b/src/canonical/models/back-shiny/320--0--Wailmer.gif similarity index 100% rename from src/canonical/models/back-shiny/Wailmer.gif rename to src/canonical/models/back-shiny/320--0--Wailmer.gif diff --git a/src/canonical/models/back-shiny/Wailord.gif b/src/canonical/models/back-shiny/321--0--Wailord.gif similarity index 100% rename from src/canonical/models/back-shiny/Wailord.gif rename to src/canonical/models/back-shiny/321--0--Wailord.gif diff --git a/src/canonical/models/back-shiny/Numel.gif b/src/canonical/models/back-shiny/322--0--Numel.gif similarity index 100% rename from src/canonical/models/back-shiny/Numel.gif rename to src/canonical/models/back-shiny/322--0--Numel.gif diff --git a/src/canonical/models/back-shiny/Camerupt.gif b/src/canonical/models/back-shiny/323--0--Camerupt.gif similarity index 100% rename from src/canonical/models/back-shiny/Camerupt.gif rename to src/canonical/models/back-shiny/323--0--Camerupt.gif diff --git a/src/canonical/models/back-shiny/Camerupt--Mega.gif b/src/canonical/models/back-shiny/323--420--Camerupt--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Camerupt--Mega.gif rename to src/canonical/models/back-shiny/323--420--Camerupt--Mega.gif diff --git a/src/canonical/models/back-shiny/Torkoal.gif b/src/canonical/models/back-shiny/324--0--Torkoal.gif similarity index 100% rename from src/canonical/models/back-shiny/Torkoal.gif rename to src/canonical/models/back-shiny/324--0--Torkoal.gif diff --git a/src/canonical/models/back-shiny/Spoink.gif b/src/canonical/models/back-shiny/325--0--Spoink.gif similarity index 100% rename from src/canonical/models/back-shiny/Spoink.gif rename to src/canonical/models/back-shiny/325--0--Spoink.gif diff --git a/src/canonical/models/back-shiny/Grumpig.gif b/src/canonical/models/back-shiny/326--0--Grumpig.gif similarity index 100% rename from src/canonical/models/back-shiny/Grumpig.gif rename to src/canonical/models/back-shiny/326--0--Grumpig.gif diff --git a/src/canonical/models/back-shiny/Spinda.gif b/src/canonical/models/back-shiny/327--0--Spinda.gif similarity index 100% rename from src/canonical/models/back-shiny/Spinda.gif rename to src/canonical/models/back-shiny/327--0--Spinda.gif diff --git a/src/canonical/models/back-shiny/Trapinch.gif b/src/canonical/models/back-shiny/328--0--Trapinch.gif similarity index 100% rename from src/canonical/models/back-shiny/Trapinch.gif rename to src/canonical/models/back-shiny/328--0--Trapinch.gif diff --git a/src/canonical/models/back-shiny/Vibrava.gif b/src/canonical/models/back-shiny/329--0--Vibrava.gif similarity index 100% rename from src/canonical/models/back-shiny/Vibrava.gif rename to src/canonical/models/back-shiny/329--0--Vibrava.gif diff --git a/src/canonical/models/back-shiny/Nidorino.gif b/src/canonical/models/back-shiny/33--0--Nidorino.gif similarity index 100% rename from src/canonical/models/back-shiny/Nidorino.gif rename to src/canonical/models/back-shiny/33--0--Nidorino.gif diff --git a/src/canonical/models/back-shiny/Flygon.gif b/src/canonical/models/back-shiny/330--0--Flygon.gif similarity index 100% rename from src/canonical/models/back-shiny/Flygon.gif rename to src/canonical/models/back-shiny/330--0--Flygon.gif diff --git a/src/canonical/models/back-shiny/Cacnea.gif b/src/canonical/models/back-shiny/331--0--Cacnea.gif similarity index 100% rename from src/canonical/models/back-shiny/Cacnea.gif rename to src/canonical/models/back-shiny/331--0--Cacnea.gif diff --git a/src/canonical/models/back-shiny/Cacturne.gif b/src/canonical/models/back-shiny/332--0--Cacturne.gif similarity index 100% rename from src/canonical/models/back-shiny/Cacturne.gif rename to src/canonical/models/back-shiny/332--0--Cacturne.gif diff --git a/src/canonical/models/back-shiny/Swablu.gif b/src/canonical/models/back-shiny/333--0--Swablu.gif similarity index 100% rename from src/canonical/models/back-shiny/Swablu.gif rename to src/canonical/models/back-shiny/333--0--Swablu.gif diff --git a/src/canonical/models/back-shiny/Altaria.gif b/src/canonical/models/back-shiny/334--0--Altaria.gif similarity index 100% rename from src/canonical/models/back-shiny/Altaria.gif rename to src/canonical/models/back-shiny/334--0--Altaria.gif diff --git a/src/canonical/models/back-shiny/Altaria--Mega.gif b/src/canonical/models/back-shiny/334--420--Altaria--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Altaria--Mega.gif rename to src/canonical/models/back-shiny/334--420--Altaria--Mega.gif diff --git a/src/canonical/models/back-shiny/Zangoose.gif b/src/canonical/models/back-shiny/335--0--Zangoose.gif similarity index 100% rename from src/canonical/models/back-shiny/Zangoose.gif rename to src/canonical/models/back-shiny/335--0--Zangoose.gif diff --git a/src/canonical/models/back-shiny/Seviper.gif b/src/canonical/models/back-shiny/336--0--Seviper.gif similarity index 100% rename from src/canonical/models/back-shiny/Seviper.gif rename to src/canonical/models/back-shiny/336--0--Seviper.gif diff --git a/src/canonical/models/back-shiny/Lunatone.gif b/src/canonical/models/back-shiny/337--0--Lunatone.gif similarity index 100% rename from src/canonical/models/back-shiny/Lunatone.gif rename to src/canonical/models/back-shiny/337--0--Lunatone.gif diff --git a/src/canonical/models/back-shiny/Solrock.gif b/src/canonical/models/back-shiny/338--0--Solrock.gif similarity index 100% rename from src/canonical/models/back-shiny/Solrock.gif rename to src/canonical/models/back-shiny/338--0--Solrock.gif diff --git a/src/canonical/models/back-shiny/Barboach.gif b/src/canonical/models/back-shiny/339--0--Barboach.gif similarity index 100% rename from src/canonical/models/back-shiny/Barboach.gif rename to src/canonical/models/back-shiny/339--0--Barboach.gif diff --git a/src/canonical/models/back-shiny/Nidoking.gif b/src/canonical/models/back-shiny/34--0--Nidoking.gif similarity index 100% rename from src/canonical/models/back-shiny/Nidoking.gif rename to src/canonical/models/back-shiny/34--0--Nidoking.gif diff --git a/src/canonical/models/back-shiny/Whiscash.gif b/src/canonical/models/back-shiny/340--0--Whiscash.gif similarity index 100% rename from src/canonical/models/back-shiny/Whiscash.gif rename to src/canonical/models/back-shiny/340--0--Whiscash.gif diff --git a/src/canonical/models/back-shiny/Corphish.gif b/src/canonical/models/back-shiny/341--0--Corphish.gif similarity index 100% rename from src/canonical/models/back-shiny/Corphish.gif rename to src/canonical/models/back-shiny/341--0--Corphish.gif diff --git a/src/canonical/models/back-shiny/Crawdaunt.gif b/src/canonical/models/back-shiny/342--0--Crawdaunt.gif similarity index 100% rename from src/canonical/models/back-shiny/Crawdaunt.gif rename to src/canonical/models/back-shiny/342--0--Crawdaunt.gif diff --git a/src/canonical/models/back-shiny/Baltoy.gif b/src/canonical/models/back-shiny/343--0--Baltoy.gif similarity index 100% rename from src/canonical/models/back-shiny/Baltoy.gif rename to src/canonical/models/back-shiny/343--0--Baltoy.gif diff --git a/src/canonical/models/back-shiny/Claydol.gif b/src/canonical/models/back-shiny/344--0--Claydol.gif similarity index 100% rename from src/canonical/models/back-shiny/Claydol.gif rename to src/canonical/models/back-shiny/344--0--Claydol.gif diff --git a/src/canonical/models/back-shiny/Lileep.gif b/src/canonical/models/back-shiny/345--0--Lileep.gif similarity index 100% rename from src/canonical/models/back-shiny/Lileep.gif rename to src/canonical/models/back-shiny/345--0--Lileep.gif diff --git a/src/canonical/models/back-shiny/Cradily.gif b/src/canonical/models/back-shiny/346--0--Cradily.gif similarity index 100% rename from src/canonical/models/back-shiny/Cradily.gif rename to src/canonical/models/back-shiny/346--0--Cradily.gif diff --git a/src/canonical/models/back-shiny/Anorith.gif b/src/canonical/models/back-shiny/347--0--Anorith.gif similarity index 100% rename from src/canonical/models/back-shiny/Anorith.gif rename to src/canonical/models/back-shiny/347--0--Anorith.gif diff --git a/src/canonical/models/back-shiny/Armaldo.gif b/src/canonical/models/back-shiny/348--0--Armaldo.gif similarity index 100% rename from src/canonical/models/back-shiny/Armaldo.gif rename to src/canonical/models/back-shiny/348--0--Armaldo.gif diff --git a/src/canonical/models/back-shiny/Feebas.gif b/src/canonical/models/back-shiny/349--0--Feebas.gif similarity index 100% rename from src/canonical/models/back-shiny/Feebas.gif rename to src/canonical/models/back-shiny/349--0--Feebas.gif diff --git a/src/canonical/models/back-shiny/Clefairy.gif b/src/canonical/models/back-shiny/35--0--Clefairy.gif similarity index 100% rename from src/canonical/models/back-shiny/Clefairy.gif rename to src/canonical/models/back-shiny/35--0--Clefairy.gif diff --git a/src/canonical/models/back-shiny/Milotic.gif b/src/canonical/models/back-shiny/350--0--Milotic.gif similarity index 100% rename from src/canonical/models/back-shiny/Milotic.gif rename to src/canonical/models/back-shiny/350--0--Milotic.gif diff --git a/src/canonical/models/back-shiny/Castform.gif b/src/canonical/models/back-shiny/351--0--Castform.gif similarity index 100% rename from src/canonical/models/back-shiny/Castform.gif rename to src/canonical/models/back-shiny/351--0--Castform.gif diff --git a/src/canonical/models/back-shiny/Castform--Rainy.gif b/src/canonical/models/back-shiny/351--420--Castform--Rainy.gif similarity index 100% rename from src/canonical/models/back-shiny/Castform--Rainy.gif rename to src/canonical/models/back-shiny/351--420--Castform--Rainy.gif diff --git a/src/canonical/models/back-shiny/Castform--Snowy.gif b/src/canonical/models/back-shiny/351--420--Castform--Snowy.gif similarity index 100% rename from src/canonical/models/back-shiny/Castform--Snowy.gif rename to src/canonical/models/back-shiny/351--420--Castform--Snowy.gif diff --git a/src/canonical/models/back-shiny/Castform--Sunny.gif b/src/canonical/models/back-shiny/351--420--Castform--Sunny.gif similarity index 100% rename from src/canonical/models/back-shiny/Castform--Sunny.gif rename to src/canonical/models/back-shiny/351--420--Castform--Sunny.gif diff --git a/src/canonical/models/back-shiny/Kecleon.gif b/src/canonical/models/back-shiny/352--0--Kecleon.gif similarity index 100% rename from src/canonical/models/back-shiny/Kecleon.gif rename to src/canonical/models/back-shiny/352--0--Kecleon.gif diff --git a/src/canonical/models/back-shiny/Shuppet.gif b/src/canonical/models/back-shiny/353--0--Shuppet.gif similarity index 100% rename from src/canonical/models/back-shiny/Shuppet.gif rename to src/canonical/models/back-shiny/353--0--Shuppet.gif diff --git a/src/canonical/models/back-shiny/Banette.gif b/src/canonical/models/back-shiny/354--0--Banette.gif similarity index 100% rename from src/canonical/models/back-shiny/Banette.gif rename to src/canonical/models/back-shiny/354--0--Banette.gif diff --git a/src/canonical/models/back-shiny/Banette--Mega.gif b/src/canonical/models/back-shiny/354--420--Banette--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Banette--Mega.gif rename to src/canonical/models/back-shiny/354--420--Banette--Mega.gif diff --git a/src/canonical/models/back-shiny/Duskull.gif b/src/canonical/models/back-shiny/355--0--Duskull.gif similarity index 100% rename from src/canonical/models/back-shiny/Duskull.gif rename to src/canonical/models/back-shiny/355--0--Duskull.gif diff --git a/src/canonical/models/back-shiny/Dusclops.gif b/src/canonical/models/back-shiny/356--0--Dusclops.gif similarity index 100% rename from src/canonical/models/back-shiny/Dusclops.gif rename to src/canonical/models/back-shiny/356--0--Dusclops.gif diff --git a/src/canonical/models/back-shiny/Tropius.gif b/src/canonical/models/back-shiny/357--0--Tropius.gif similarity index 100% rename from src/canonical/models/back-shiny/Tropius.gif rename to src/canonical/models/back-shiny/357--0--Tropius.gif diff --git a/src/canonical/models/back-shiny/Chimecho.gif b/src/canonical/models/back-shiny/358--0--Chimecho.gif similarity index 100% rename from src/canonical/models/back-shiny/Chimecho.gif rename to src/canonical/models/back-shiny/358--0--Chimecho.gif diff --git a/src/canonical/models/back-shiny/Absol.gif b/src/canonical/models/back-shiny/359--0--Absol.gif similarity index 100% rename from src/canonical/models/back-shiny/Absol.gif rename to src/canonical/models/back-shiny/359--0--Absol.gif diff --git a/src/canonical/models/back-shiny/Absol--Mega.gif b/src/canonical/models/back-shiny/359--420--Absol--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Absol--Mega.gif rename to src/canonical/models/back-shiny/359--420--Absol--Mega.gif diff --git a/src/canonical/models/back-shiny/Clefable.gif b/src/canonical/models/back-shiny/36--0--Clefable.gif similarity index 100% rename from src/canonical/models/back-shiny/Clefable.gif rename to src/canonical/models/back-shiny/36--0--Clefable.gif diff --git a/src/canonical/models/back-shiny/Wynaut.gif b/src/canonical/models/back-shiny/360--0--Wynaut.gif similarity index 100% rename from src/canonical/models/back-shiny/Wynaut.gif rename to src/canonical/models/back-shiny/360--0--Wynaut.gif diff --git a/src/canonical/models/back-shiny/Snorunt.gif b/src/canonical/models/back-shiny/361--0--Snorunt.gif similarity index 100% rename from src/canonical/models/back-shiny/Snorunt.gif rename to src/canonical/models/back-shiny/361--0--Snorunt.gif diff --git a/src/canonical/models/back-shiny/Glalie.gif b/src/canonical/models/back-shiny/362--0--Glalie.gif similarity index 100% rename from src/canonical/models/back-shiny/Glalie.gif rename to src/canonical/models/back-shiny/362--0--Glalie.gif diff --git a/src/canonical/models/back-shiny/Glalie--Mega.gif b/src/canonical/models/back-shiny/362--420--Glalie--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Glalie--Mega.gif rename to src/canonical/models/back-shiny/362--420--Glalie--Mega.gif diff --git a/src/canonical/models/back-shiny/Spheal.gif b/src/canonical/models/back-shiny/363--0--Spheal.gif similarity index 100% rename from src/canonical/models/back-shiny/Spheal.gif rename to src/canonical/models/back-shiny/363--0--Spheal.gif diff --git a/src/canonical/models/back-shiny/Sealeo.gif b/src/canonical/models/back-shiny/364--0--Sealeo.gif similarity index 100% rename from src/canonical/models/back-shiny/Sealeo.gif rename to src/canonical/models/back-shiny/364--0--Sealeo.gif diff --git a/src/canonical/models/back-shiny/Walrein.gif b/src/canonical/models/back-shiny/365--0--Walrein.gif similarity index 100% rename from src/canonical/models/back-shiny/Walrein.gif rename to src/canonical/models/back-shiny/365--0--Walrein.gif diff --git a/src/canonical/models/back-shiny/Clamperl.gif b/src/canonical/models/back-shiny/366--0--Clamperl.gif similarity index 100% rename from src/canonical/models/back-shiny/Clamperl.gif rename to src/canonical/models/back-shiny/366--0--Clamperl.gif diff --git a/src/canonical/models/back-shiny/Huntail.gif b/src/canonical/models/back-shiny/367--0--Huntail.gif similarity index 100% rename from src/canonical/models/back-shiny/Huntail.gif rename to src/canonical/models/back-shiny/367--0--Huntail.gif diff --git a/src/canonical/models/back-shiny/Gorebyss.gif b/src/canonical/models/back-shiny/368--0--Gorebyss.gif similarity index 100% rename from src/canonical/models/back-shiny/Gorebyss.gif rename to src/canonical/models/back-shiny/368--0--Gorebyss.gif diff --git a/src/canonical/models/back-shiny/Relicanth.gif b/src/canonical/models/back-shiny/369--0--Relicanth.gif similarity index 100% rename from src/canonical/models/back-shiny/Relicanth.gif rename to src/canonical/models/back-shiny/369--0--Relicanth.gif diff --git a/src/canonical/models/back-shiny/Vulpix.gif b/src/canonical/models/back-shiny/37--0--Vulpix.gif similarity index 100% rename from src/canonical/models/back-shiny/Vulpix.gif rename to src/canonical/models/back-shiny/37--0--Vulpix.gif diff --git a/src/canonical/models/back-shiny/Vulpix--Alola.gif b/src/canonical/models/back-shiny/37--420--Vulpix--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Vulpix--Alola.gif rename to src/canonical/models/back-shiny/37--420--Vulpix--Alola.gif diff --git a/src/canonical/models/back-shiny/Luvdisc.gif b/src/canonical/models/back-shiny/370--0--Luvdisc.gif similarity index 100% rename from src/canonical/models/back-shiny/Luvdisc.gif rename to src/canonical/models/back-shiny/370--0--Luvdisc.gif diff --git a/src/canonical/models/back-shiny/Bagon.gif b/src/canonical/models/back-shiny/371--0--Bagon.gif similarity index 100% rename from src/canonical/models/back-shiny/Bagon.gif rename to src/canonical/models/back-shiny/371--0--Bagon.gif diff --git a/src/canonical/models/back-shiny/Shelgon.gif b/src/canonical/models/back-shiny/372--0--Shelgon.gif similarity index 100% rename from src/canonical/models/back-shiny/Shelgon.gif rename to src/canonical/models/back-shiny/372--0--Shelgon.gif diff --git a/src/canonical/models/back-shiny/Salamence.gif b/src/canonical/models/back-shiny/373--0--Salamence.gif similarity index 100% rename from src/canonical/models/back-shiny/Salamence.gif rename to src/canonical/models/back-shiny/373--0--Salamence.gif diff --git a/src/canonical/models/back-shiny/Salamence--Mega.gif b/src/canonical/models/back-shiny/373--420--Salamence--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Salamence--Mega.gif rename to src/canonical/models/back-shiny/373--420--Salamence--Mega.gif diff --git a/src/canonical/models/back-shiny/Beldum.gif b/src/canonical/models/back-shiny/374--0--Beldum.gif similarity index 100% rename from src/canonical/models/back-shiny/Beldum.gif rename to src/canonical/models/back-shiny/374--0--Beldum.gif diff --git a/src/canonical/models/back-shiny/Metang.gif b/src/canonical/models/back-shiny/375--0--Metang.gif similarity index 100% rename from src/canonical/models/back-shiny/Metang.gif rename to src/canonical/models/back-shiny/375--0--Metang.gif diff --git a/src/canonical/models/back-shiny/Metagross.gif b/src/canonical/models/back-shiny/376--0--Metagross.gif similarity index 100% rename from src/canonical/models/back-shiny/Metagross.gif rename to src/canonical/models/back-shiny/376--0--Metagross.gif diff --git a/src/canonical/models/back-shiny/Metagross--Mega.gif b/src/canonical/models/back-shiny/376--420--Metagross--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Metagross--Mega.gif rename to src/canonical/models/back-shiny/376--420--Metagross--Mega.gif diff --git a/src/canonical/models/back-shiny/Regirock.gif b/src/canonical/models/back-shiny/377--0--Regirock.gif similarity index 100% rename from src/canonical/models/back-shiny/Regirock.gif rename to src/canonical/models/back-shiny/377--0--Regirock.gif diff --git a/src/canonical/models/back-shiny/Regice.gif b/src/canonical/models/back-shiny/378--0--Regice.gif similarity index 100% rename from src/canonical/models/back-shiny/Regice.gif rename to src/canonical/models/back-shiny/378--0--Regice.gif diff --git a/src/canonical/models/back-shiny/Registeel.gif b/src/canonical/models/back-shiny/379--0--Registeel.gif similarity index 100% rename from src/canonical/models/back-shiny/Registeel.gif rename to src/canonical/models/back-shiny/379--0--Registeel.gif diff --git a/src/canonical/models/back-shiny/Ninetales.gif b/src/canonical/models/back-shiny/38--0--Ninetales.gif similarity index 100% rename from src/canonical/models/back-shiny/Ninetales.gif rename to src/canonical/models/back-shiny/38--0--Ninetales.gif diff --git a/src/canonical/models/back-shiny/Ninetales--Alola.gif b/src/canonical/models/back-shiny/38--420--Ninetales--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Ninetales--Alola.gif rename to src/canonical/models/back-shiny/38--420--Ninetales--Alola.gif diff --git a/src/canonical/models/back-shiny/Latias.gif b/src/canonical/models/back-shiny/380--0--Latias.gif similarity index 100% rename from src/canonical/models/back-shiny/Latias.gif rename to src/canonical/models/back-shiny/380--0--Latias.gif diff --git a/src/canonical/models/back-shiny/Latias--Mega.gif b/src/canonical/models/back-shiny/380--420--Latias--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Latias--Mega.gif rename to src/canonical/models/back-shiny/380--420--Latias--Mega.gif diff --git a/src/canonical/models/back-shiny/Latios.gif b/src/canonical/models/back-shiny/381--0--Latios.gif similarity index 100% rename from src/canonical/models/back-shiny/Latios.gif rename to src/canonical/models/back-shiny/381--0--Latios.gif diff --git a/src/canonical/models/back-shiny/Latios--Mega.gif b/src/canonical/models/back-shiny/381--420--Latios--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Latios--Mega.gif rename to src/canonical/models/back-shiny/381--420--Latios--Mega.gif diff --git a/src/canonical/models/back-shiny/Kyogre.gif b/src/canonical/models/back-shiny/382--0--Kyogre.gif similarity index 100% rename from src/canonical/models/back-shiny/Kyogre.gif rename to src/canonical/models/back-shiny/382--0--Kyogre.gif diff --git a/src/canonical/models/back-shiny/Kyogre--Primal.gif b/src/canonical/models/back-shiny/382--420--Kyogre--Primal.gif similarity index 100% rename from src/canonical/models/back-shiny/Kyogre--Primal.gif rename to src/canonical/models/back-shiny/382--420--Kyogre--Primal.gif diff --git a/src/canonical/models/back-shiny/Groudon.gif b/src/canonical/models/back-shiny/383--0--Groudon.gif similarity index 100% rename from src/canonical/models/back-shiny/Groudon.gif rename to src/canonical/models/back-shiny/383--0--Groudon.gif diff --git a/src/canonical/models/back-shiny/Groudon--Primal.gif b/src/canonical/models/back-shiny/383--420--Groudon--Primal.gif similarity index 100% rename from src/canonical/models/back-shiny/Groudon--Primal.gif rename to src/canonical/models/back-shiny/383--420--Groudon--Primal.gif diff --git a/src/canonical/models/back-shiny/Rayquaza.gif b/src/canonical/models/back-shiny/384--0--Rayquaza.gif similarity index 100% rename from src/canonical/models/back-shiny/Rayquaza.gif rename to src/canonical/models/back-shiny/384--0--Rayquaza.gif diff --git a/src/canonical/models/back-shiny/Rayquaza--Mega.gif b/src/canonical/models/back-shiny/384--420--Rayquaza--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Rayquaza--Mega.gif rename to src/canonical/models/back-shiny/384--420--Rayquaza--Mega.gif diff --git a/src/canonical/models/back-shiny/Jirachi.gif b/src/canonical/models/back-shiny/385--0--Jirachi.gif similarity index 100% rename from src/canonical/models/back-shiny/Jirachi.gif rename to src/canonical/models/back-shiny/385--0--Jirachi.gif diff --git a/src/canonical/models/back-shiny/Deoxys.gif b/src/canonical/models/back-shiny/386--0--Deoxys.gif similarity index 100% rename from src/canonical/models/back-shiny/Deoxys.gif rename to src/canonical/models/back-shiny/386--0--Deoxys.gif diff --git a/src/canonical/models/back-shiny/Deoxys--Attack.gif b/src/canonical/models/back-shiny/386--420--Deoxys--Attack.gif similarity index 100% rename from src/canonical/models/back-shiny/Deoxys--Attack.gif rename to src/canonical/models/back-shiny/386--420--Deoxys--Attack.gif diff --git a/src/canonical/models/back-shiny/Deoxys--Defense.gif b/src/canonical/models/back-shiny/386--420--Deoxys--Defense.gif similarity index 100% rename from src/canonical/models/back-shiny/Deoxys--Defense.gif rename to src/canonical/models/back-shiny/386--420--Deoxys--Defense.gif diff --git a/src/canonical/models/back-shiny/Deoxys--Speed.gif b/src/canonical/models/back-shiny/386--420--Deoxys--Speed.gif similarity index 100% rename from src/canonical/models/back-shiny/Deoxys--Speed.gif rename to src/canonical/models/back-shiny/386--420--Deoxys--Speed.gif diff --git a/src/canonical/models/back-shiny/Turtwig.gif b/src/canonical/models/back-shiny/387--0--Turtwig.gif similarity index 100% rename from src/canonical/models/back-shiny/Turtwig.gif rename to src/canonical/models/back-shiny/387--0--Turtwig.gif diff --git a/src/canonical/models/back-shiny/Grotle.gif b/src/canonical/models/back-shiny/388--0--Grotle.gif similarity index 100% rename from src/canonical/models/back-shiny/Grotle.gif rename to src/canonical/models/back-shiny/388--0--Grotle.gif diff --git a/src/canonical/models/back-shiny/Torterra.gif b/src/canonical/models/back-shiny/389--0--Torterra.gif similarity index 100% rename from src/canonical/models/back-shiny/Torterra.gif rename to src/canonical/models/back-shiny/389--0--Torterra.gif diff --git a/src/canonical/models/back-shiny/Jigglypuff.gif b/src/canonical/models/back-shiny/39--0--Jigglypuff.gif similarity index 100% rename from src/canonical/models/back-shiny/Jigglypuff.gif rename to src/canonical/models/back-shiny/39--0--Jigglypuff.gif diff --git a/src/canonical/models/back-shiny/Chimchar.gif b/src/canonical/models/back-shiny/390--0--Chimchar.gif similarity index 100% rename from src/canonical/models/back-shiny/Chimchar.gif rename to src/canonical/models/back-shiny/390--0--Chimchar.gif diff --git a/src/canonical/models/back-shiny/Monferno.gif b/src/canonical/models/back-shiny/391--0--Monferno.gif similarity index 100% rename from src/canonical/models/back-shiny/Monferno.gif rename to src/canonical/models/back-shiny/391--0--Monferno.gif diff --git a/src/canonical/models/back-shiny/Infernape.gif b/src/canonical/models/back-shiny/392--0--Infernape.gif similarity index 100% rename from src/canonical/models/back-shiny/Infernape.gif rename to src/canonical/models/back-shiny/392--0--Infernape.gif diff --git a/src/canonical/models/back-shiny/Piplup.gif b/src/canonical/models/back-shiny/393--0--Piplup.gif similarity index 100% rename from src/canonical/models/back-shiny/Piplup.gif rename to src/canonical/models/back-shiny/393--0--Piplup.gif diff --git a/src/canonical/models/back-shiny/Prinplup.gif b/src/canonical/models/back-shiny/394--0--Prinplup.gif similarity index 100% rename from src/canonical/models/back-shiny/Prinplup.gif rename to src/canonical/models/back-shiny/394--0--Prinplup.gif diff --git a/src/canonical/models/back-shiny/Empoleon.gif b/src/canonical/models/back-shiny/395--0--Empoleon.gif similarity index 100% rename from src/canonical/models/back-shiny/Empoleon.gif rename to src/canonical/models/back-shiny/395--0--Empoleon.gif diff --git a/src/canonical/models/back-shiny/Starly.gif b/src/canonical/models/back-shiny/396--0--Starly.gif similarity index 100% rename from src/canonical/models/back-shiny/Starly.gif rename to src/canonical/models/back-shiny/396--0--Starly.gif diff --git a/src/canonical/models/back-shiny/Staravia.gif b/src/canonical/models/back-shiny/397--0--Staravia.gif similarity index 100% rename from src/canonical/models/back-shiny/Staravia.gif rename to src/canonical/models/back-shiny/397--0--Staravia.gif diff --git a/src/canonical/models/back-shiny/Staraptor.gif b/src/canonical/models/back-shiny/398--0--Staraptor.gif similarity index 100% rename from src/canonical/models/back-shiny/Staraptor.gif rename to src/canonical/models/back-shiny/398--0--Staraptor.gif diff --git a/src/canonical/models/back-shiny/Bidoof.gif b/src/canonical/models/back-shiny/399--0--Bidoof.gif similarity index 100% rename from src/canonical/models/back-shiny/Bidoof.gif rename to src/canonical/models/back-shiny/399--0--Bidoof.gif diff --git a/src/canonical/models/back-shiny/Charmander.gif b/src/canonical/models/back-shiny/4--0--Charmander.gif similarity index 100% rename from src/canonical/models/back-shiny/Charmander.gif rename to src/canonical/models/back-shiny/4--0--Charmander.gif diff --git a/src/canonical/models/back-shiny/Wigglytuff.gif b/src/canonical/models/back-shiny/40--0--Wigglytuff.gif similarity index 100% rename from src/canonical/models/back-shiny/Wigglytuff.gif rename to src/canonical/models/back-shiny/40--0--Wigglytuff.gif diff --git a/src/canonical/models/back-shiny/Bibarel.gif b/src/canonical/models/back-shiny/400--0--Bibarel.gif similarity index 100% rename from src/canonical/models/back-shiny/Bibarel.gif rename to src/canonical/models/back-shiny/400--0--Bibarel.gif diff --git a/src/canonical/models/back-shiny/Kricketot.gif b/src/canonical/models/back-shiny/401--0--Kricketot.gif similarity index 100% rename from src/canonical/models/back-shiny/Kricketot.gif rename to src/canonical/models/back-shiny/401--0--Kricketot.gif diff --git a/src/canonical/models/back-shiny/Kricketune.gif b/src/canonical/models/back-shiny/402--0--Kricketune.gif similarity index 100% rename from src/canonical/models/back-shiny/Kricketune.gif rename to src/canonical/models/back-shiny/402--0--Kricketune.gif diff --git a/src/canonical/models/back-shiny/Shinx.gif b/src/canonical/models/back-shiny/403--0--Shinx.gif similarity index 100% rename from src/canonical/models/back-shiny/Shinx.gif rename to src/canonical/models/back-shiny/403--0--Shinx.gif diff --git a/src/canonical/models/back-shiny/Luxio.gif b/src/canonical/models/back-shiny/404--0--Luxio.gif similarity index 100% rename from src/canonical/models/back-shiny/Luxio.gif rename to src/canonical/models/back-shiny/404--0--Luxio.gif diff --git a/src/canonical/models/back-shiny/Luxray.gif b/src/canonical/models/back-shiny/405--0--Luxray.gif similarity index 100% rename from src/canonical/models/back-shiny/Luxray.gif rename to src/canonical/models/back-shiny/405--0--Luxray.gif diff --git a/src/canonical/models/back-shiny/Budew.gif b/src/canonical/models/back-shiny/406--0--Budew.gif similarity index 100% rename from src/canonical/models/back-shiny/Budew.gif rename to src/canonical/models/back-shiny/406--0--Budew.gif diff --git a/src/canonical/models/back-shiny/Roserade.gif b/src/canonical/models/back-shiny/407--0--Roserade.gif similarity index 100% rename from src/canonical/models/back-shiny/Roserade.gif rename to src/canonical/models/back-shiny/407--0--Roserade.gif diff --git a/src/canonical/models/back-shiny/Cranidos.gif b/src/canonical/models/back-shiny/408--0--Cranidos.gif similarity index 100% rename from src/canonical/models/back-shiny/Cranidos.gif rename to src/canonical/models/back-shiny/408--0--Cranidos.gif diff --git a/src/canonical/models/back-shiny/Rampardos.gif b/src/canonical/models/back-shiny/409--0--Rampardos.gif similarity index 100% rename from src/canonical/models/back-shiny/Rampardos.gif rename to src/canonical/models/back-shiny/409--0--Rampardos.gif diff --git a/src/canonical/models/back-shiny/Zubat.gif b/src/canonical/models/back-shiny/41--0--Zubat.gif similarity index 100% rename from src/canonical/models/back-shiny/Zubat.gif rename to src/canonical/models/back-shiny/41--0--Zubat.gif diff --git a/src/canonical/models/back-shiny/Shieldon.gif b/src/canonical/models/back-shiny/410--0--Shieldon.gif similarity index 100% rename from src/canonical/models/back-shiny/Shieldon.gif rename to src/canonical/models/back-shiny/410--0--Shieldon.gif diff --git a/src/canonical/models/back-shiny/Bastiodon.gif b/src/canonical/models/back-shiny/411--0--Bastiodon.gif similarity index 100% rename from src/canonical/models/back-shiny/Bastiodon.gif rename to src/canonical/models/back-shiny/411--0--Bastiodon.gif diff --git a/src/canonical/models/back-shiny/Burmy.gif b/src/canonical/models/back-shiny/412--0--Burmy.gif similarity index 100% rename from src/canonical/models/back-shiny/Burmy.gif rename to src/canonical/models/back-shiny/412--0--Burmy.gif diff --git a/src/canonical/models/back-shiny/Wormadam.gif b/src/canonical/models/back-shiny/413--0--Wormadam.gif similarity index 100% rename from src/canonical/models/back-shiny/Wormadam.gif rename to src/canonical/models/back-shiny/413--0--Wormadam.gif diff --git a/src/canonical/models/back-shiny/Wormadam--Sandy.gif b/src/canonical/models/back-shiny/413--420--Wormadam--Sandy.gif similarity index 100% rename from src/canonical/models/back-shiny/Wormadam--Sandy.gif rename to src/canonical/models/back-shiny/413--420--Wormadam--Sandy.gif diff --git a/src/canonical/models/back-shiny/Wormadam--Trash.gif b/src/canonical/models/back-shiny/413--420--Wormadam--Trash.gif similarity index 100% rename from src/canonical/models/back-shiny/Wormadam--Trash.gif rename to src/canonical/models/back-shiny/413--420--Wormadam--Trash.gif diff --git a/src/canonical/models/back-shiny/Mothim.gif b/src/canonical/models/back-shiny/414--0--Mothim.gif similarity index 100% rename from src/canonical/models/back-shiny/Mothim.gif rename to src/canonical/models/back-shiny/414--0--Mothim.gif diff --git a/src/canonical/models/back-shiny/Combee.gif b/src/canonical/models/back-shiny/415--0--Combee.gif similarity index 100% rename from src/canonical/models/back-shiny/Combee.gif rename to src/canonical/models/back-shiny/415--0--Combee.gif diff --git a/src/canonical/models/back-shiny/Vespiquen.gif b/src/canonical/models/back-shiny/416--0--Vespiquen.gif similarity index 100% rename from src/canonical/models/back-shiny/Vespiquen.gif rename to src/canonical/models/back-shiny/416--0--Vespiquen.gif diff --git a/src/canonical/models/back-shiny/Pachirisu.gif b/src/canonical/models/back-shiny/417--0--Pachirisu.gif similarity index 100% rename from src/canonical/models/back-shiny/Pachirisu.gif rename to src/canonical/models/back-shiny/417--0--Pachirisu.gif diff --git a/src/canonical/models/back-shiny/Buizel.gif b/src/canonical/models/back-shiny/418--0--Buizel.gif similarity index 100% rename from src/canonical/models/back-shiny/Buizel.gif rename to src/canonical/models/back-shiny/418--0--Buizel.gif diff --git a/src/canonical/models/back-shiny/Floatzel.gif b/src/canonical/models/back-shiny/419--0--Floatzel.gif similarity index 100% rename from src/canonical/models/back-shiny/Floatzel.gif rename to src/canonical/models/back-shiny/419--0--Floatzel.gif diff --git a/src/canonical/models/back-shiny/Golbat.gif b/src/canonical/models/back-shiny/42--0--Golbat.gif similarity index 100% rename from src/canonical/models/back-shiny/Golbat.gif rename to src/canonical/models/back-shiny/42--0--Golbat.gif diff --git a/src/canonical/models/back-shiny/Cherubi.gif b/src/canonical/models/back-shiny/420--0--Cherubi.gif similarity index 100% rename from src/canonical/models/back-shiny/Cherubi.gif rename to src/canonical/models/back-shiny/420--0--Cherubi.gif diff --git a/src/canonical/models/back-shiny/Cherrim.gif b/src/canonical/models/back-shiny/421--0--Cherrim.gif similarity index 100% rename from src/canonical/models/back-shiny/Cherrim.gif rename to src/canonical/models/back-shiny/421--0--Cherrim.gif diff --git a/src/canonical/models/back-shiny/Cherrim--Sunshine.gif b/src/canonical/models/back-shiny/421--420--Cherrim--Sunshine.gif similarity index 100% rename from src/canonical/models/back-shiny/Cherrim--Sunshine.gif rename to src/canonical/models/back-shiny/421--420--Cherrim--Sunshine.gif diff --git a/src/canonical/models/back-shiny/Shellos.gif b/src/canonical/models/back-shiny/422--0--Shellos.gif similarity index 100% rename from src/canonical/models/back-shiny/Shellos.gif rename to src/canonical/models/back-shiny/422--0--Shellos.gif diff --git a/src/canonical/models/back-shiny/Gastrodon.gif b/src/canonical/models/back-shiny/423--0--Gastrodon.gif similarity index 100% rename from src/canonical/models/back-shiny/Gastrodon.gif rename to src/canonical/models/back-shiny/423--0--Gastrodon.gif diff --git a/src/canonical/models/back-shiny/Ambipom.gif b/src/canonical/models/back-shiny/424--0--Ambipom.gif similarity index 100% rename from src/canonical/models/back-shiny/Ambipom.gif rename to src/canonical/models/back-shiny/424--0--Ambipom.gif diff --git a/src/canonical/models/back-shiny/Drifloon.gif b/src/canonical/models/back-shiny/425--0--Drifloon.gif similarity index 100% rename from src/canonical/models/back-shiny/Drifloon.gif rename to src/canonical/models/back-shiny/425--0--Drifloon.gif diff --git a/src/canonical/models/back-shiny/Drifblim.gif b/src/canonical/models/back-shiny/426--0--Drifblim.gif similarity index 100% rename from src/canonical/models/back-shiny/Drifblim.gif rename to src/canonical/models/back-shiny/426--0--Drifblim.gif diff --git a/src/canonical/models/back-shiny/Buneary.gif b/src/canonical/models/back-shiny/427--0--Buneary.gif similarity index 100% rename from src/canonical/models/back-shiny/Buneary.gif rename to src/canonical/models/back-shiny/427--0--Buneary.gif diff --git a/src/canonical/models/back-shiny/Lopunny.gif b/src/canonical/models/back-shiny/428--0--Lopunny.gif similarity index 100% rename from src/canonical/models/back-shiny/Lopunny.gif rename to src/canonical/models/back-shiny/428--0--Lopunny.gif diff --git a/src/canonical/models/back-shiny/Lopunny--Mega.gif b/src/canonical/models/back-shiny/428--420--Lopunny--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Lopunny--Mega.gif rename to src/canonical/models/back-shiny/428--420--Lopunny--Mega.gif diff --git a/src/canonical/models/back-shiny/Mismagius.gif b/src/canonical/models/back-shiny/429--0--Mismagius.gif similarity index 100% rename from src/canonical/models/back-shiny/Mismagius.gif rename to src/canonical/models/back-shiny/429--0--Mismagius.gif diff --git a/src/canonical/models/back-shiny/Oddish.gif b/src/canonical/models/back-shiny/43--0--Oddish.gif similarity index 100% rename from src/canonical/models/back-shiny/Oddish.gif rename to src/canonical/models/back-shiny/43--0--Oddish.gif diff --git a/src/canonical/models/back-shiny/Honchkrow.gif b/src/canonical/models/back-shiny/430--0--Honchkrow.gif similarity index 100% rename from src/canonical/models/back-shiny/Honchkrow.gif rename to src/canonical/models/back-shiny/430--0--Honchkrow.gif diff --git a/src/canonical/models/back-shiny/Glameow.gif b/src/canonical/models/back-shiny/431--0--Glameow.gif similarity index 100% rename from src/canonical/models/back-shiny/Glameow.gif rename to src/canonical/models/back-shiny/431--0--Glameow.gif diff --git a/src/canonical/models/back-shiny/Purugly.gif b/src/canonical/models/back-shiny/432--0--Purugly.gif similarity index 100% rename from src/canonical/models/back-shiny/Purugly.gif rename to src/canonical/models/back-shiny/432--0--Purugly.gif diff --git a/src/canonical/models/back-shiny/Chingling.gif b/src/canonical/models/back-shiny/433--0--Chingling.gif similarity index 100% rename from src/canonical/models/back-shiny/Chingling.gif rename to src/canonical/models/back-shiny/433--0--Chingling.gif diff --git a/src/canonical/models/back-shiny/Stunky.gif b/src/canonical/models/back-shiny/434--0--Stunky.gif similarity index 100% rename from src/canonical/models/back-shiny/Stunky.gif rename to src/canonical/models/back-shiny/434--0--Stunky.gif diff --git a/src/canonical/models/back-shiny/Skuntank.gif b/src/canonical/models/back-shiny/435--0--Skuntank.gif similarity index 100% rename from src/canonical/models/back-shiny/Skuntank.gif rename to src/canonical/models/back-shiny/435--0--Skuntank.gif diff --git a/src/canonical/models/back-shiny/Bronzor.gif b/src/canonical/models/back-shiny/436--0--Bronzor.gif similarity index 100% rename from src/canonical/models/back-shiny/Bronzor.gif rename to src/canonical/models/back-shiny/436--0--Bronzor.gif diff --git a/src/canonical/models/back-shiny/Bronzong.gif b/src/canonical/models/back-shiny/437--0--Bronzong.gif similarity index 100% rename from src/canonical/models/back-shiny/Bronzong.gif rename to src/canonical/models/back-shiny/437--0--Bronzong.gif diff --git a/src/canonical/models/back-shiny/Bonsly.gif b/src/canonical/models/back-shiny/438--0--Bonsly.gif similarity index 100% rename from src/canonical/models/back-shiny/Bonsly.gif rename to src/canonical/models/back-shiny/438--0--Bonsly.gif diff --git a/src/canonical/models/back-shiny/Mime_Jr..gif b/src/canonical/models/back-shiny/439--0--Mime_Jr..gif similarity index 100% rename from src/canonical/models/back-shiny/Mime_Jr..gif rename to src/canonical/models/back-shiny/439--0--Mime_Jr..gif diff --git a/src/canonical/models/back-shiny/Gloom.gif b/src/canonical/models/back-shiny/44--0--Gloom.gif similarity index 100% rename from src/canonical/models/back-shiny/Gloom.gif rename to src/canonical/models/back-shiny/44--0--Gloom.gif diff --git a/src/canonical/models/back-shiny/Happiny.gif b/src/canonical/models/back-shiny/440--0--Happiny.gif similarity index 100% rename from src/canonical/models/back-shiny/Happiny.gif rename to src/canonical/models/back-shiny/440--0--Happiny.gif diff --git a/src/canonical/models/back-shiny/Chatot.gif b/src/canonical/models/back-shiny/441--0--Chatot.gif similarity index 100% rename from src/canonical/models/back-shiny/Chatot.gif rename to src/canonical/models/back-shiny/441--0--Chatot.gif diff --git a/src/canonical/models/back-shiny/Spiritomb.gif b/src/canonical/models/back-shiny/442--0--Spiritomb.gif similarity index 100% rename from src/canonical/models/back-shiny/Spiritomb.gif rename to src/canonical/models/back-shiny/442--0--Spiritomb.gif diff --git a/src/canonical/models/back-shiny/Gible.gif b/src/canonical/models/back-shiny/443--0--Gible.gif similarity index 100% rename from src/canonical/models/back-shiny/Gible.gif rename to src/canonical/models/back-shiny/443--0--Gible.gif diff --git a/src/canonical/models/back-shiny/Gabite.gif b/src/canonical/models/back-shiny/444--0--Gabite.gif similarity index 100% rename from src/canonical/models/back-shiny/Gabite.gif rename to src/canonical/models/back-shiny/444--0--Gabite.gif diff --git a/src/canonical/models/back-shiny/Garchomp.gif b/src/canonical/models/back-shiny/445--0--Garchomp.gif similarity index 100% rename from src/canonical/models/back-shiny/Garchomp.gif rename to src/canonical/models/back-shiny/445--0--Garchomp.gif diff --git a/src/canonical/models/back-shiny/Garchomp--Mega.gif b/src/canonical/models/back-shiny/445--420--Garchomp--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Garchomp--Mega.gif rename to src/canonical/models/back-shiny/445--420--Garchomp--Mega.gif diff --git a/src/canonical/models/back-shiny/Munchlax.gif b/src/canonical/models/back-shiny/446--0--Munchlax.gif similarity index 100% rename from src/canonical/models/back-shiny/Munchlax.gif rename to src/canonical/models/back-shiny/446--0--Munchlax.gif diff --git a/src/canonical/models/back-shiny/Riolu.gif b/src/canonical/models/back-shiny/447--0--Riolu.gif similarity index 100% rename from src/canonical/models/back-shiny/Riolu.gif rename to src/canonical/models/back-shiny/447--0--Riolu.gif diff --git a/src/canonical/models/back-shiny/Lucario.gif b/src/canonical/models/back-shiny/448--0--Lucario.gif similarity index 100% rename from src/canonical/models/back-shiny/Lucario.gif rename to src/canonical/models/back-shiny/448--0--Lucario.gif diff --git a/src/canonical/models/back-shiny/Lucario--Mega.gif b/src/canonical/models/back-shiny/448--420--Lucario--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Lucario--Mega.gif rename to src/canonical/models/back-shiny/448--420--Lucario--Mega.gif diff --git a/src/canonical/models/back-shiny/Hippopotas.gif b/src/canonical/models/back-shiny/449--0--Hippopotas.gif similarity index 100% rename from src/canonical/models/back-shiny/Hippopotas.gif rename to src/canonical/models/back-shiny/449--0--Hippopotas.gif diff --git a/src/canonical/models/back-shiny/Vileplume.gif b/src/canonical/models/back-shiny/45--0--Vileplume.gif similarity index 100% rename from src/canonical/models/back-shiny/Vileplume.gif rename to src/canonical/models/back-shiny/45--0--Vileplume.gif diff --git a/src/canonical/models/back-shiny/Hippowdon.gif b/src/canonical/models/back-shiny/450--0--Hippowdon.gif similarity index 100% rename from src/canonical/models/back-shiny/Hippowdon.gif rename to src/canonical/models/back-shiny/450--0--Hippowdon.gif diff --git a/src/canonical/models/back-shiny/Skorupi.gif b/src/canonical/models/back-shiny/451--0--Skorupi.gif similarity index 100% rename from src/canonical/models/back-shiny/Skorupi.gif rename to src/canonical/models/back-shiny/451--0--Skorupi.gif diff --git a/src/canonical/models/back-shiny/Drapion.gif b/src/canonical/models/back-shiny/452--0--Drapion.gif similarity index 100% rename from src/canonical/models/back-shiny/Drapion.gif rename to src/canonical/models/back-shiny/452--0--Drapion.gif diff --git a/src/canonical/models/back-shiny/Croagunk.gif b/src/canonical/models/back-shiny/453--0--Croagunk.gif similarity index 100% rename from src/canonical/models/back-shiny/Croagunk.gif rename to src/canonical/models/back-shiny/453--0--Croagunk.gif diff --git a/src/canonical/models/back-shiny/Toxicroak.gif b/src/canonical/models/back-shiny/454--0--Toxicroak.gif similarity index 100% rename from src/canonical/models/back-shiny/Toxicroak.gif rename to src/canonical/models/back-shiny/454--0--Toxicroak.gif diff --git a/src/canonical/models/back-shiny/Carnivine.gif b/src/canonical/models/back-shiny/455--0--Carnivine.gif similarity index 100% rename from src/canonical/models/back-shiny/Carnivine.gif rename to src/canonical/models/back-shiny/455--0--Carnivine.gif diff --git a/src/canonical/models/back-shiny/Finneon.gif b/src/canonical/models/back-shiny/456--0--Finneon.gif similarity index 100% rename from src/canonical/models/back-shiny/Finneon.gif rename to src/canonical/models/back-shiny/456--0--Finneon.gif diff --git a/src/canonical/models/back-shiny/Lumineon.gif b/src/canonical/models/back-shiny/457--0--Lumineon.gif similarity index 100% rename from src/canonical/models/back-shiny/Lumineon.gif rename to src/canonical/models/back-shiny/457--0--Lumineon.gif diff --git a/src/canonical/models/back-shiny/Mantyke.gif b/src/canonical/models/back-shiny/458--0--Mantyke.gif similarity index 100% rename from src/canonical/models/back-shiny/Mantyke.gif rename to src/canonical/models/back-shiny/458--0--Mantyke.gif diff --git a/src/canonical/models/back-shiny/Snover.gif b/src/canonical/models/back-shiny/459--0--Snover.gif similarity index 100% rename from src/canonical/models/back-shiny/Snover.gif rename to src/canonical/models/back-shiny/459--0--Snover.gif diff --git a/src/canonical/models/back-shiny/Paras.gif b/src/canonical/models/back-shiny/46--0--Paras.gif similarity index 100% rename from src/canonical/models/back-shiny/Paras.gif rename to src/canonical/models/back-shiny/46--0--Paras.gif diff --git a/src/canonical/models/back-shiny/Abomasnow.gif b/src/canonical/models/back-shiny/460--0--Abomasnow.gif similarity index 100% rename from src/canonical/models/back-shiny/Abomasnow.gif rename to src/canonical/models/back-shiny/460--0--Abomasnow.gif diff --git a/src/canonical/models/back-shiny/Abomasnow--Mega.gif b/src/canonical/models/back-shiny/460--420--Abomasnow--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Abomasnow--Mega.gif rename to src/canonical/models/back-shiny/460--420--Abomasnow--Mega.gif diff --git a/src/canonical/models/back-shiny/Weavile.gif b/src/canonical/models/back-shiny/461--0--Weavile.gif similarity index 100% rename from src/canonical/models/back-shiny/Weavile.gif rename to src/canonical/models/back-shiny/461--0--Weavile.gif diff --git a/src/canonical/models/back-shiny/Magnezone.gif b/src/canonical/models/back-shiny/462--0--Magnezone.gif similarity index 100% rename from src/canonical/models/back-shiny/Magnezone.gif rename to src/canonical/models/back-shiny/462--0--Magnezone.gif diff --git a/src/canonical/models/back-shiny/Lickilicky.gif b/src/canonical/models/back-shiny/463--0--Lickilicky.gif similarity index 100% rename from src/canonical/models/back-shiny/Lickilicky.gif rename to src/canonical/models/back-shiny/463--0--Lickilicky.gif diff --git a/src/canonical/models/back-shiny/Rhyperior.gif b/src/canonical/models/back-shiny/464--0--Rhyperior.gif similarity index 100% rename from src/canonical/models/back-shiny/Rhyperior.gif rename to src/canonical/models/back-shiny/464--0--Rhyperior.gif diff --git a/src/canonical/models/back-shiny/Tangrowth.gif b/src/canonical/models/back-shiny/465--0--Tangrowth.gif similarity index 100% rename from src/canonical/models/back-shiny/Tangrowth.gif rename to src/canonical/models/back-shiny/465--0--Tangrowth.gif diff --git a/src/canonical/models/back-shiny/Electivire.gif b/src/canonical/models/back-shiny/466--0--Electivire.gif similarity index 100% rename from src/canonical/models/back-shiny/Electivire.gif rename to src/canonical/models/back-shiny/466--0--Electivire.gif diff --git a/src/canonical/models/back-shiny/Magmortar.gif b/src/canonical/models/back-shiny/467--0--Magmortar.gif similarity index 100% rename from src/canonical/models/back-shiny/Magmortar.gif rename to src/canonical/models/back-shiny/467--0--Magmortar.gif diff --git a/src/canonical/models/back-shiny/Togekiss.gif b/src/canonical/models/back-shiny/468--0--Togekiss.gif similarity index 100% rename from src/canonical/models/back-shiny/Togekiss.gif rename to src/canonical/models/back-shiny/468--0--Togekiss.gif diff --git a/src/canonical/models/back-shiny/Yanmega.gif b/src/canonical/models/back-shiny/469--0--Yanmega.gif similarity index 100% rename from src/canonical/models/back-shiny/Yanmega.gif rename to src/canonical/models/back-shiny/469--0--Yanmega.gif diff --git a/src/canonical/models/back-shiny/Parasect.gif b/src/canonical/models/back-shiny/47--0--Parasect.gif similarity index 100% rename from src/canonical/models/back-shiny/Parasect.gif rename to src/canonical/models/back-shiny/47--0--Parasect.gif diff --git a/src/canonical/models/back-shiny/Leafeon.gif b/src/canonical/models/back-shiny/470--0--Leafeon.gif similarity index 100% rename from src/canonical/models/back-shiny/Leafeon.gif rename to src/canonical/models/back-shiny/470--0--Leafeon.gif diff --git a/src/canonical/models/back-shiny/Glaceon.gif b/src/canonical/models/back-shiny/471--0--Glaceon.gif similarity index 100% rename from src/canonical/models/back-shiny/Glaceon.gif rename to src/canonical/models/back-shiny/471--0--Glaceon.gif diff --git a/src/canonical/models/back-shiny/Gliscor.gif b/src/canonical/models/back-shiny/472--0--Gliscor.gif similarity index 100% rename from src/canonical/models/back-shiny/Gliscor.gif rename to src/canonical/models/back-shiny/472--0--Gliscor.gif diff --git a/src/canonical/models/back-shiny/Mamoswine.gif b/src/canonical/models/back-shiny/473--0--Mamoswine.gif similarity index 100% rename from src/canonical/models/back-shiny/Mamoswine.gif rename to src/canonical/models/back-shiny/473--0--Mamoswine.gif diff --git a/src/canonical/models/back-shiny/Porygon-Z.gif b/src/canonical/models/back-shiny/474--0--Porygon-Z.gif similarity index 100% rename from src/canonical/models/back-shiny/Porygon-Z.gif rename to src/canonical/models/back-shiny/474--0--Porygon-Z.gif diff --git a/src/canonical/models/back-shiny/Gallade.gif b/src/canonical/models/back-shiny/475--0--Gallade.gif similarity index 100% rename from src/canonical/models/back-shiny/Gallade.gif rename to src/canonical/models/back-shiny/475--0--Gallade.gif diff --git a/src/canonical/models/back-shiny/Gallade--Mega.gif b/src/canonical/models/back-shiny/475--420--Gallade--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Gallade--Mega.gif rename to src/canonical/models/back-shiny/475--420--Gallade--Mega.gif diff --git a/src/canonical/models/back-shiny/Probopass.gif b/src/canonical/models/back-shiny/476--0--Probopass.gif similarity index 100% rename from src/canonical/models/back-shiny/Probopass.gif rename to src/canonical/models/back-shiny/476--0--Probopass.gif diff --git a/src/canonical/models/back-shiny/Dusknoir.gif b/src/canonical/models/back-shiny/477--0--Dusknoir.gif similarity index 100% rename from src/canonical/models/back-shiny/Dusknoir.gif rename to src/canonical/models/back-shiny/477--0--Dusknoir.gif diff --git a/src/canonical/models/back-shiny/Froslass.gif b/src/canonical/models/back-shiny/478--0--Froslass.gif similarity index 100% rename from src/canonical/models/back-shiny/Froslass.gif rename to src/canonical/models/back-shiny/478--0--Froslass.gif diff --git a/src/canonical/models/back-shiny/Rotom.gif b/src/canonical/models/back-shiny/479--0--Rotom.gif similarity index 100% rename from src/canonical/models/back-shiny/Rotom.gif rename to src/canonical/models/back-shiny/479--0--Rotom.gif diff --git a/src/canonical/models/back-shiny/Rotom--Fan.gif b/src/canonical/models/back-shiny/479--420--Rotom--Fan.gif similarity index 100% rename from src/canonical/models/back-shiny/Rotom--Fan.gif rename to src/canonical/models/back-shiny/479--420--Rotom--Fan.gif diff --git a/src/canonical/models/back-shiny/Rotom--Frost.gif b/src/canonical/models/back-shiny/479--420--Rotom--Frost.gif similarity index 100% rename from src/canonical/models/back-shiny/Rotom--Frost.gif rename to src/canonical/models/back-shiny/479--420--Rotom--Frost.gif diff --git a/src/canonical/models/back-shiny/Rotom--Heat.gif b/src/canonical/models/back-shiny/479--420--Rotom--Heat.gif similarity index 100% rename from src/canonical/models/back-shiny/Rotom--Heat.gif rename to src/canonical/models/back-shiny/479--420--Rotom--Heat.gif diff --git a/src/canonical/models/back-shiny/Rotom--Mow.gif b/src/canonical/models/back-shiny/479--420--Rotom--Mow.gif similarity index 100% rename from src/canonical/models/back-shiny/Rotom--Mow.gif rename to src/canonical/models/back-shiny/479--420--Rotom--Mow.gif diff --git a/src/canonical/models/back-shiny/Rotom--Wash.gif b/src/canonical/models/back-shiny/479--420--Rotom--Wash.gif similarity index 100% rename from src/canonical/models/back-shiny/Rotom--Wash.gif rename to src/canonical/models/back-shiny/479--420--Rotom--Wash.gif diff --git a/src/canonical/models/back-shiny/Venonat.gif b/src/canonical/models/back-shiny/48--0--Venonat.gif similarity index 100% rename from src/canonical/models/back-shiny/Venonat.gif rename to src/canonical/models/back-shiny/48--0--Venonat.gif diff --git a/src/canonical/models/back-shiny/Uxie.gif b/src/canonical/models/back-shiny/480--0--Uxie.gif similarity index 100% rename from src/canonical/models/back-shiny/Uxie.gif rename to src/canonical/models/back-shiny/480--0--Uxie.gif diff --git a/src/canonical/models/back-shiny/Mesprit.gif b/src/canonical/models/back-shiny/481--0--Mesprit.gif similarity index 100% rename from src/canonical/models/back-shiny/Mesprit.gif rename to src/canonical/models/back-shiny/481--0--Mesprit.gif diff --git a/src/canonical/models/back-shiny/Azelf.gif b/src/canonical/models/back-shiny/482--0--Azelf.gif similarity index 100% rename from src/canonical/models/back-shiny/Azelf.gif rename to src/canonical/models/back-shiny/482--0--Azelf.gif diff --git a/src/canonical/models/back-shiny/Dialga.gif b/src/canonical/models/back-shiny/483--0--Dialga.gif similarity index 100% rename from src/canonical/models/back-shiny/Dialga.gif rename to src/canonical/models/back-shiny/483--0--Dialga.gif diff --git a/src/canonical/models/back-shiny/Palkia.gif b/src/canonical/models/back-shiny/484--0--Palkia.gif similarity index 100% rename from src/canonical/models/back-shiny/Palkia.gif rename to src/canonical/models/back-shiny/484--0--Palkia.gif diff --git a/src/canonical/models/back-shiny/Heatran.gif b/src/canonical/models/back-shiny/485--0--Heatran.gif similarity index 100% rename from src/canonical/models/back-shiny/Heatran.gif rename to src/canonical/models/back-shiny/485--0--Heatran.gif diff --git a/src/canonical/models/back-shiny/Regigigas.gif b/src/canonical/models/back-shiny/486--0--Regigigas.gif similarity index 100% rename from src/canonical/models/back-shiny/Regigigas.gif rename to src/canonical/models/back-shiny/486--0--Regigigas.gif diff --git a/src/canonical/models/back-shiny/Giratina.gif b/src/canonical/models/back-shiny/487--0--Giratina.gif similarity index 100% rename from src/canonical/models/back-shiny/Giratina.gif rename to src/canonical/models/back-shiny/487--0--Giratina.gif diff --git a/src/canonical/models/back-shiny/Giratina--Origin.gif b/src/canonical/models/back-shiny/487--420--Giratina--Origin.gif similarity index 100% rename from src/canonical/models/back-shiny/Giratina--Origin.gif rename to src/canonical/models/back-shiny/487--420--Giratina--Origin.gif diff --git a/src/canonical/models/back-shiny/Cresselia.gif b/src/canonical/models/back-shiny/488--0--Cresselia.gif similarity index 100% rename from src/canonical/models/back-shiny/Cresselia.gif rename to src/canonical/models/back-shiny/488--0--Cresselia.gif diff --git a/src/canonical/models/back-shiny/Phione.gif b/src/canonical/models/back-shiny/489--0--Phione.gif similarity index 100% rename from src/canonical/models/back-shiny/Phione.gif rename to src/canonical/models/back-shiny/489--0--Phione.gif diff --git a/src/canonical/models/back-shiny/Venomoth.gif b/src/canonical/models/back-shiny/49--0--Venomoth.gif similarity index 100% rename from src/canonical/models/back-shiny/Venomoth.gif rename to src/canonical/models/back-shiny/49--0--Venomoth.gif diff --git a/src/canonical/models/back-shiny/Manaphy.gif b/src/canonical/models/back-shiny/490--0--Manaphy.gif similarity index 100% rename from src/canonical/models/back-shiny/Manaphy.gif rename to src/canonical/models/back-shiny/490--0--Manaphy.gif diff --git a/src/canonical/models/back-shiny/Darkrai.gif b/src/canonical/models/back-shiny/491--0--Darkrai.gif similarity index 100% rename from src/canonical/models/back-shiny/Darkrai.gif rename to src/canonical/models/back-shiny/491--0--Darkrai.gif diff --git a/src/canonical/models/back-shiny/Shaymin.gif b/src/canonical/models/back-shiny/492--0--Shaymin.gif similarity index 100% rename from src/canonical/models/back-shiny/Shaymin.gif rename to src/canonical/models/back-shiny/492--0--Shaymin.gif diff --git a/src/canonical/models/back-shiny/Shaymin--Sky.gif b/src/canonical/models/back-shiny/492--420--Shaymin--Sky.gif similarity index 100% rename from src/canonical/models/back-shiny/Shaymin--Sky.gif rename to src/canonical/models/back-shiny/492--420--Shaymin--Sky.gif diff --git a/src/canonical/models/back-shiny/Arceus.gif b/src/canonical/models/back-shiny/493--0--Arceus.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus.gif rename to src/canonical/models/back-shiny/493--0--Arceus.gif diff --git a/src/canonical/models/back-shiny/Arceus--Bug.gif b/src/canonical/models/back-shiny/493--420--Arceus--Bug.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Bug.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Bug.gif diff --git a/src/canonical/models/back-shiny/Arceus--Dark.gif b/src/canonical/models/back-shiny/493--420--Arceus--Dark.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Dark.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Dark.gif diff --git a/src/canonical/models/back-shiny/Arceus--Dragon.gif b/src/canonical/models/back-shiny/493--420--Arceus--Dragon.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Dragon.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Dragon.gif diff --git a/src/canonical/models/back-shiny/Arceus--Electric.gif b/src/canonical/models/back-shiny/493--420--Arceus--Electric.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Electric.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Electric.gif diff --git a/src/canonical/models/back-shiny/Arceus--Fairy.gif b/src/canonical/models/back-shiny/493--420--Arceus--Fairy.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Fairy.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Fairy.gif diff --git a/src/canonical/models/back-shiny/Arceus--Fighting.gif b/src/canonical/models/back-shiny/493--420--Arceus--Fighting.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Fighting.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Fighting.gif diff --git a/src/canonical/models/back-shiny/Arceus--Fire.gif b/src/canonical/models/back-shiny/493--420--Arceus--Fire.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Fire.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Fire.gif diff --git a/src/canonical/models/back-shiny/Arceus--Flying.gif b/src/canonical/models/back-shiny/493--420--Arceus--Flying.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Flying.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Flying.gif diff --git a/src/canonical/models/back-shiny/Arceus--Ghost.gif b/src/canonical/models/back-shiny/493--420--Arceus--Ghost.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Ghost.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Ghost.gif diff --git a/src/canonical/models/back-shiny/Arceus--Grass.gif b/src/canonical/models/back-shiny/493--420--Arceus--Grass.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Grass.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Grass.gif diff --git a/src/canonical/models/back-shiny/Arceus--Ground.gif b/src/canonical/models/back-shiny/493--420--Arceus--Ground.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Ground.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Ground.gif diff --git a/src/canonical/models/back-shiny/Arceus--Ice.gif b/src/canonical/models/back-shiny/493--420--Arceus--Ice.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Ice.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Ice.gif diff --git a/src/canonical/models/back-shiny/Arceus--Poison.gif b/src/canonical/models/back-shiny/493--420--Arceus--Poison.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Poison.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Poison.gif diff --git a/src/canonical/models/back-shiny/Arceus--Psychic.gif b/src/canonical/models/back-shiny/493--420--Arceus--Psychic.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Psychic.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Psychic.gif diff --git a/src/canonical/models/back-shiny/Arceus--Rock.gif b/src/canonical/models/back-shiny/493--420--Arceus--Rock.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Rock.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Rock.gif diff --git a/src/canonical/models/back-shiny/Arceus--Steel.gif b/src/canonical/models/back-shiny/493--420--Arceus--Steel.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Steel.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Steel.gif diff --git a/src/canonical/models/back-shiny/Arceus--Water.gif b/src/canonical/models/back-shiny/493--420--Arceus--Water.gif similarity index 100% rename from src/canonical/models/back-shiny/Arceus--Water.gif rename to src/canonical/models/back-shiny/493--420--Arceus--Water.gif diff --git a/src/canonical/models/back-shiny/Victini.gif b/src/canonical/models/back-shiny/494--0--Victini.gif similarity index 100% rename from src/canonical/models/back-shiny/Victini.gif rename to src/canonical/models/back-shiny/494--0--Victini.gif diff --git a/src/canonical/models/back-shiny/Snivy.gif b/src/canonical/models/back-shiny/495--0--Snivy.gif similarity index 100% rename from src/canonical/models/back-shiny/Snivy.gif rename to src/canonical/models/back-shiny/495--0--Snivy.gif diff --git a/src/canonical/models/back-shiny/Servine.gif b/src/canonical/models/back-shiny/496--0--Servine.gif similarity index 100% rename from src/canonical/models/back-shiny/Servine.gif rename to src/canonical/models/back-shiny/496--0--Servine.gif diff --git a/src/canonical/models/back-shiny/Serperior.gif b/src/canonical/models/back-shiny/497--0--Serperior.gif similarity index 100% rename from src/canonical/models/back-shiny/Serperior.gif rename to src/canonical/models/back-shiny/497--0--Serperior.gif diff --git a/src/canonical/models/back-shiny/Tepig.gif b/src/canonical/models/back-shiny/498--0--Tepig.gif similarity index 100% rename from src/canonical/models/back-shiny/Tepig.gif rename to src/canonical/models/back-shiny/498--0--Tepig.gif diff --git a/src/canonical/models/back-shiny/Pignite.gif b/src/canonical/models/back-shiny/499--0--Pignite.gif similarity index 100% rename from src/canonical/models/back-shiny/Pignite.gif rename to src/canonical/models/back-shiny/499--0--Pignite.gif diff --git a/src/canonical/models/back-shiny/Charmeleon.gif b/src/canonical/models/back-shiny/5--0--Charmeleon.gif similarity index 100% rename from src/canonical/models/back-shiny/Charmeleon.gif rename to src/canonical/models/back-shiny/5--0--Charmeleon.gif diff --git a/src/canonical/models/back-shiny/Diglett.gif b/src/canonical/models/back-shiny/50--0--Diglett.gif similarity index 100% rename from src/canonical/models/back-shiny/Diglett.gif rename to src/canonical/models/back-shiny/50--0--Diglett.gif diff --git a/src/canonical/models/back-shiny/Diglett--Alola.gif b/src/canonical/models/back-shiny/50--420--Diglett--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Diglett--Alola.gif rename to src/canonical/models/back-shiny/50--420--Diglett--Alola.gif diff --git a/src/canonical/models/back-shiny/Emboar.gif b/src/canonical/models/back-shiny/500--0--Emboar.gif similarity index 100% rename from src/canonical/models/back-shiny/Emboar.gif rename to src/canonical/models/back-shiny/500--0--Emboar.gif diff --git a/src/canonical/models/back-shiny/Oshawott.gif b/src/canonical/models/back-shiny/501--0--Oshawott.gif similarity index 100% rename from src/canonical/models/back-shiny/Oshawott.gif rename to src/canonical/models/back-shiny/501--0--Oshawott.gif diff --git a/src/canonical/models/back-shiny/Dewott.gif b/src/canonical/models/back-shiny/502--0--Dewott.gif similarity index 100% rename from src/canonical/models/back-shiny/Dewott.gif rename to src/canonical/models/back-shiny/502--0--Dewott.gif diff --git a/src/canonical/models/back-shiny/Samurott.gif b/src/canonical/models/back-shiny/503--0--Samurott.gif similarity index 100% rename from src/canonical/models/back-shiny/Samurott.gif rename to src/canonical/models/back-shiny/503--0--Samurott.gif diff --git a/src/canonical/models/back-shiny/Patrat.gif b/src/canonical/models/back-shiny/504--0--Patrat.gif similarity index 100% rename from src/canonical/models/back-shiny/Patrat.gif rename to src/canonical/models/back-shiny/504--0--Patrat.gif diff --git a/src/canonical/models/back-shiny/Watchog.gif b/src/canonical/models/back-shiny/505--0--Watchog.gif similarity index 100% rename from src/canonical/models/back-shiny/Watchog.gif rename to src/canonical/models/back-shiny/505--0--Watchog.gif diff --git a/src/canonical/models/back-shiny/Lillipup.gif b/src/canonical/models/back-shiny/506--0--Lillipup.gif similarity index 100% rename from src/canonical/models/back-shiny/Lillipup.gif rename to src/canonical/models/back-shiny/506--0--Lillipup.gif diff --git a/src/canonical/models/back-shiny/Herdier.gif b/src/canonical/models/back-shiny/507--0--Herdier.gif similarity index 100% rename from src/canonical/models/back-shiny/Herdier.gif rename to src/canonical/models/back-shiny/507--0--Herdier.gif diff --git a/src/canonical/models/back-shiny/Stoutland.gif b/src/canonical/models/back-shiny/508--0--Stoutland.gif similarity index 100% rename from src/canonical/models/back-shiny/Stoutland.gif rename to src/canonical/models/back-shiny/508--0--Stoutland.gif diff --git a/src/canonical/models/back-shiny/Purrloin.gif b/src/canonical/models/back-shiny/509--0--Purrloin.gif similarity index 100% rename from src/canonical/models/back-shiny/Purrloin.gif rename to src/canonical/models/back-shiny/509--0--Purrloin.gif diff --git a/src/canonical/models/back-shiny/Dugtrio.gif b/src/canonical/models/back-shiny/51--0--Dugtrio.gif similarity index 100% rename from src/canonical/models/back-shiny/Dugtrio.gif rename to src/canonical/models/back-shiny/51--0--Dugtrio.gif diff --git a/src/canonical/models/back-shiny/Dugtrio--Alola.gif b/src/canonical/models/back-shiny/51--420--Dugtrio--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Dugtrio--Alola.gif rename to src/canonical/models/back-shiny/51--420--Dugtrio--Alola.gif diff --git a/src/canonical/models/back-shiny/Liepard.gif b/src/canonical/models/back-shiny/510--0--Liepard.gif similarity index 100% rename from src/canonical/models/back-shiny/Liepard.gif rename to src/canonical/models/back-shiny/510--0--Liepard.gif diff --git a/src/canonical/models/back-shiny/Pansage.gif b/src/canonical/models/back-shiny/511--0--Pansage.gif similarity index 100% rename from src/canonical/models/back-shiny/Pansage.gif rename to src/canonical/models/back-shiny/511--0--Pansage.gif diff --git a/src/canonical/models/back-shiny/Simisage.gif b/src/canonical/models/back-shiny/512--0--Simisage.gif similarity index 100% rename from src/canonical/models/back-shiny/Simisage.gif rename to src/canonical/models/back-shiny/512--0--Simisage.gif diff --git a/src/canonical/models/back-shiny/Pansear.gif b/src/canonical/models/back-shiny/513--0--Pansear.gif similarity index 100% rename from src/canonical/models/back-shiny/Pansear.gif rename to src/canonical/models/back-shiny/513--0--Pansear.gif diff --git a/src/canonical/models/back-shiny/Simisear.gif b/src/canonical/models/back-shiny/514--0--Simisear.gif similarity index 100% rename from src/canonical/models/back-shiny/Simisear.gif rename to src/canonical/models/back-shiny/514--0--Simisear.gif diff --git a/src/canonical/models/back-shiny/Panpour.gif b/src/canonical/models/back-shiny/515--0--Panpour.gif similarity index 100% rename from src/canonical/models/back-shiny/Panpour.gif rename to src/canonical/models/back-shiny/515--0--Panpour.gif diff --git a/src/canonical/models/back-shiny/Simipour.gif b/src/canonical/models/back-shiny/516--0--Simipour.gif similarity index 100% rename from src/canonical/models/back-shiny/Simipour.gif rename to src/canonical/models/back-shiny/516--0--Simipour.gif diff --git a/src/canonical/models/back-shiny/Munna.gif b/src/canonical/models/back-shiny/517--0--Munna.gif similarity index 100% rename from src/canonical/models/back-shiny/Munna.gif rename to src/canonical/models/back-shiny/517--0--Munna.gif diff --git a/src/canonical/models/back-shiny/Musharna.gif b/src/canonical/models/back-shiny/518--0--Musharna.gif similarity index 100% rename from src/canonical/models/back-shiny/Musharna.gif rename to src/canonical/models/back-shiny/518--0--Musharna.gif diff --git a/src/canonical/models/back-shiny/Pidove.gif b/src/canonical/models/back-shiny/519--0--Pidove.gif similarity index 100% rename from src/canonical/models/back-shiny/Pidove.gif rename to src/canonical/models/back-shiny/519--0--Pidove.gif diff --git a/src/canonical/models/back-shiny/Meowth.gif b/src/canonical/models/back-shiny/52--0--Meowth.gif similarity index 100% rename from src/canonical/models/back-shiny/Meowth.gif rename to src/canonical/models/back-shiny/52--0--Meowth.gif diff --git a/src/canonical/models/back-shiny/Meowth--Alola.gif b/src/canonical/models/back-shiny/52--420--Meowth--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Meowth--Alola.gif rename to src/canonical/models/back-shiny/52--420--Meowth--Alola.gif diff --git a/src/canonical/models/back-shiny/Meowth--Galar.gif b/src/canonical/models/back-shiny/52--420--Meowth--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Meowth--Galar.gif rename to src/canonical/models/back-shiny/52--420--Meowth--Galar.gif diff --git a/src/canonical/models/back-shiny/Meowth--Gmax.gif b/src/canonical/models/back-shiny/52--420--Meowth--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Meowth--Gmax.gif rename to src/canonical/models/back-shiny/52--420--Meowth--Gmax.gif diff --git a/src/canonical/models/back-shiny/Tranquill.gif b/src/canonical/models/back-shiny/520--0--Tranquill.gif similarity index 100% rename from src/canonical/models/back-shiny/Tranquill.gif rename to src/canonical/models/back-shiny/520--0--Tranquill.gif diff --git a/src/canonical/models/back-shiny/Unfezant.gif b/src/canonical/models/back-shiny/521--0--Unfezant.gif similarity index 100% rename from src/canonical/models/back-shiny/Unfezant.gif rename to src/canonical/models/back-shiny/521--0--Unfezant.gif diff --git a/src/canonical/models/back-shiny/Blitzle.gif b/src/canonical/models/back-shiny/522--0--Blitzle.gif similarity index 100% rename from src/canonical/models/back-shiny/Blitzle.gif rename to src/canonical/models/back-shiny/522--0--Blitzle.gif diff --git a/src/canonical/models/back-shiny/Zebstrika.gif b/src/canonical/models/back-shiny/523--0--Zebstrika.gif similarity index 100% rename from src/canonical/models/back-shiny/Zebstrika.gif rename to src/canonical/models/back-shiny/523--0--Zebstrika.gif diff --git a/src/canonical/models/back-shiny/Roggenrola.gif b/src/canonical/models/back-shiny/524--0--Roggenrola.gif similarity index 100% rename from src/canonical/models/back-shiny/Roggenrola.gif rename to src/canonical/models/back-shiny/524--0--Roggenrola.gif diff --git a/src/canonical/models/back-shiny/Boldore.gif b/src/canonical/models/back-shiny/525--0--Boldore.gif similarity index 100% rename from src/canonical/models/back-shiny/Boldore.gif rename to src/canonical/models/back-shiny/525--0--Boldore.gif diff --git a/src/canonical/models/back-shiny/Gigalith.gif b/src/canonical/models/back-shiny/526--0--Gigalith.gif similarity index 100% rename from src/canonical/models/back-shiny/Gigalith.gif rename to src/canonical/models/back-shiny/526--0--Gigalith.gif diff --git a/src/canonical/models/back-shiny/Woobat.gif b/src/canonical/models/back-shiny/527--0--Woobat.gif similarity index 100% rename from src/canonical/models/back-shiny/Woobat.gif rename to src/canonical/models/back-shiny/527--0--Woobat.gif diff --git a/src/canonical/models/back-shiny/Swoobat.gif b/src/canonical/models/back-shiny/528--0--Swoobat.gif similarity index 100% rename from src/canonical/models/back-shiny/Swoobat.gif rename to src/canonical/models/back-shiny/528--0--Swoobat.gif diff --git a/src/canonical/models/back-shiny/Drilbur.gif b/src/canonical/models/back-shiny/529--0--Drilbur.gif similarity index 100% rename from src/canonical/models/back-shiny/Drilbur.gif rename to src/canonical/models/back-shiny/529--0--Drilbur.gif diff --git a/src/canonical/models/back-shiny/Persian.gif b/src/canonical/models/back-shiny/53--0--Persian.gif similarity index 100% rename from src/canonical/models/back-shiny/Persian.gif rename to src/canonical/models/back-shiny/53--0--Persian.gif diff --git a/src/canonical/models/back-shiny/Persian--Alola.gif b/src/canonical/models/back-shiny/53--420--Persian--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Persian--Alola.gif rename to src/canonical/models/back-shiny/53--420--Persian--Alola.gif diff --git a/src/canonical/models/back-shiny/Excadrill.gif b/src/canonical/models/back-shiny/530--0--Excadrill.gif similarity index 100% rename from src/canonical/models/back-shiny/Excadrill.gif rename to src/canonical/models/back-shiny/530--0--Excadrill.gif diff --git a/src/canonical/models/back-shiny/Audino.gif b/src/canonical/models/back-shiny/531--0--Audino.gif similarity index 100% rename from src/canonical/models/back-shiny/Audino.gif rename to src/canonical/models/back-shiny/531--0--Audino.gif diff --git a/src/canonical/models/back-shiny/Audino--Mega.gif b/src/canonical/models/back-shiny/531--420--Audino--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Audino--Mega.gif rename to src/canonical/models/back-shiny/531--420--Audino--Mega.gif diff --git a/src/canonical/models/back-shiny/Timburr.gif b/src/canonical/models/back-shiny/532--0--Timburr.gif similarity index 100% rename from src/canonical/models/back-shiny/Timburr.gif rename to src/canonical/models/back-shiny/532--0--Timburr.gif diff --git a/src/canonical/models/back-shiny/Gurdurr.gif b/src/canonical/models/back-shiny/533--0--Gurdurr.gif similarity index 100% rename from src/canonical/models/back-shiny/Gurdurr.gif rename to src/canonical/models/back-shiny/533--0--Gurdurr.gif diff --git a/src/canonical/models/back-shiny/Conkeldurr.gif b/src/canonical/models/back-shiny/534--0--Conkeldurr.gif similarity index 100% rename from src/canonical/models/back-shiny/Conkeldurr.gif rename to src/canonical/models/back-shiny/534--0--Conkeldurr.gif diff --git a/src/canonical/models/back-shiny/Tympole.gif b/src/canonical/models/back-shiny/535--0--Tympole.gif similarity index 100% rename from src/canonical/models/back-shiny/Tympole.gif rename to src/canonical/models/back-shiny/535--0--Tympole.gif diff --git a/src/canonical/models/back-shiny/Palpitoad.gif b/src/canonical/models/back-shiny/536--0--Palpitoad.gif similarity index 100% rename from src/canonical/models/back-shiny/Palpitoad.gif rename to src/canonical/models/back-shiny/536--0--Palpitoad.gif diff --git a/src/canonical/models/back-shiny/Seismitoad.gif b/src/canonical/models/back-shiny/537--0--Seismitoad.gif similarity index 100% rename from src/canonical/models/back-shiny/Seismitoad.gif rename to src/canonical/models/back-shiny/537--0--Seismitoad.gif diff --git a/src/canonical/models/back-shiny/Throh.gif b/src/canonical/models/back-shiny/538--0--Throh.gif similarity index 100% rename from src/canonical/models/back-shiny/Throh.gif rename to src/canonical/models/back-shiny/538--0--Throh.gif diff --git a/src/canonical/models/back-shiny/Sawk.gif b/src/canonical/models/back-shiny/539--0--Sawk.gif similarity index 100% rename from src/canonical/models/back-shiny/Sawk.gif rename to src/canonical/models/back-shiny/539--0--Sawk.gif diff --git a/src/canonical/models/back-shiny/Psyduck.gif b/src/canonical/models/back-shiny/54--0--Psyduck.gif similarity index 100% rename from src/canonical/models/back-shiny/Psyduck.gif rename to src/canonical/models/back-shiny/54--0--Psyduck.gif diff --git a/src/canonical/models/back-shiny/Sewaddle.gif b/src/canonical/models/back-shiny/540--0--Sewaddle.gif similarity index 100% rename from src/canonical/models/back-shiny/Sewaddle.gif rename to src/canonical/models/back-shiny/540--0--Sewaddle.gif diff --git a/src/canonical/models/back-shiny/Swadloon.gif b/src/canonical/models/back-shiny/541--0--Swadloon.gif similarity index 100% rename from src/canonical/models/back-shiny/Swadloon.gif rename to src/canonical/models/back-shiny/541--0--Swadloon.gif diff --git a/src/canonical/models/back-shiny/Leavanny.gif b/src/canonical/models/back-shiny/542--0--Leavanny.gif similarity index 100% rename from src/canonical/models/back-shiny/Leavanny.gif rename to src/canonical/models/back-shiny/542--0--Leavanny.gif diff --git a/src/canonical/models/back-shiny/Venipede.gif b/src/canonical/models/back-shiny/543--0--Venipede.gif similarity index 100% rename from src/canonical/models/back-shiny/Venipede.gif rename to src/canonical/models/back-shiny/543--0--Venipede.gif diff --git a/src/canonical/models/back-shiny/Whirlipede.gif b/src/canonical/models/back-shiny/544--0--Whirlipede.gif similarity index 100% rename from src/canonical/models/back-shiny/Whirlipede.gif rename to src/canonical/models/back-shiny/544--0--Whirlipede.gif diff --git a/src/canonical/models/back-shiny/Scolipede.gif b/src/canonical/models/back-shiny/545--0--Scolipede.gif similarity index 100% rename from src/canonical/models/back-shiny/Scolipede.gif rename to src/canonical/models/back-shiny/545--0--Scolipede.gif diff --git a/src/canonical/models/back-shiny/Cottonee.gif b/src/canonical/models/back-shiny/546--0--Cottonee.gif similarity index 100% rename from src/canonical/models/back-shiny/Cottonee.gif rename to src/canonical/models/back-shiny/546--0--Cottonee.gif diff --git a/src/canonical/models/back-shiny/Whimsicott.gif b/src/canonical/models/back-shiny/547--0--Whimsicott.gif similarity index 100% rename from src/canonical/models/back-shiny/Whimsicott.gif rename to src/canonical/models/back-shiny/547--0--Whimsicott.gif diff --git a/src/canonical/models/back-shiny/Petilil.gif b/src/canonical/models/back-shiny/548--0--Petilil.gif similarity index 100% rename from src/canonical/models/back-shiny/Petilil.gif rename to src/canonical/models/back-shiny/548--0--Petilil.gif diff --git a/src/canonical/models/back-shiny/Lilligant.gif b/src/canonical/models/back-shiny/549--0--Lilligant.gif similarity index 100% rename from src/canonical/models/back-shiny/Lilligant.gif rename to src/canonical/models/back-shiny/549--0--Lilligant.gif diff --git a/src/canonical/models/back-shiny/Golduck.gif b/src/canonical/models/back-shiny/55--0--Golduck.gif similarity index 100% rename from src/canonical/models/back-shiny/Golduck.gif rename to src/canonical/models/back-shiny/55--0--Golduck.gif diff --git a/src/canonical/models/back-shiny/Basculin.gif b/src/canonical/models/back-shiny/550--0--Basculin.gif similarity index 100% rename from src/canonical/models/back-shiny/Basculin.gif rename to src/canonical/models/back-shiny/550--0--Basculin.gif diff --git a/src/canonical/models/back-shiny/Basculin--Blue-Striped.gif b/src/canonical/models/back-shiny/550--420--Basculin--Blue-Striped.gif similarity index 100% rename from src/canonical/models/back-shiny/Basculin--Blue-Striped.gif rename to src/canonical/models/back-shiny/550--420--Basculin--Blue-Striped.gif diff --git a/src/canonical/models/back-shiny/Sandile.gif b/src/canonical/models/back-shiny/551--0--Sandile.gif similarity index 100% rename from src/canonical/models/back-shiny/Sandile.gif rename to src/canonical/models/back-shiny/551--0--Sandile.gif diff --git a/src/canonical/models/back-shiny/Krokorok.gif b/src/canonical/models/back-shiny/552--0--Krokorok.gif similarity index 100% rename from src/canonical/models/back-shiny/Krokorok.gif rename to src/canonical/models/back-shiny/552--0--Krokorok.gif diff --git a/src/canonical/models/back-shiny/Krookodile.gif b/src/canonical/models/back-shiny/553--0--Krookodile.gif similarity index 100% rename from src/canonical/models/back-shiny/Krookodile.gif rename to src/canonical/models/back-shiny/553--0--Krookodile.gif diff --git a/src/canonical/models/back-shiny/Darumaka.gif b/src/canonical/models/back-shiny/554--0--Darumaka.gif similarity index 100% rename from src/canonical/models/back-shiny/Darumaka.gif rename to src/canonical/models/back-shiny/554--0--Darumaka.gif diff --git a/src/canonical/models/back-shiny/Darumaka--Galar.gif b/src/canonical/models/back-shiny/554--420--Darumaka--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Darumaka--Galar.gif rename to src/canonical/models/back-shiny/554--420--Darumaka--Galar.gif diff --git a/src/canonical/models/back-shiny/Darmanitan.gif b/src/canonical/models/back-shiny/555--0--Darmanitan.gif similarity index 100% rename from src/canonical/models/back-shiny/Darmanitan.gif rename to src/canonical/models/back-shiny/555--0--Darmanitan.gif diff --git a/src/canonical/models/back-shiny/Darmanitan--Galar-Zen.gif b/src/canonical/models/back-shiny/555--420--Darmanitan--Galar-Zen.gif similarity index 100% rename from src/canonical/models/back-shiny/Darmanitan--Galar-Zen.gif rename to src/canonical/models/back-shiny/555--420--Darmanitan--Galar-Zen.gif diff --git a/src/canonical/models/back-shiny/Darmanitan--Galar.gif b/src/canonical/models/back-shiny/555--420--Darmanitan--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Darmanitan--Galar.gif rename to src/canonical/models/back-shiny/555--420--Darmanitan--Galar.gif diff --git a/src/canonical/models/back-shiny/Darmanitan--Zen.gif b/src/canonical/models/back-shiny/555--420--Darmanitan--Zen.gif similarity index 100% rename from src/canonical/models/back-shiny/Darmanitan--Zen.gif rename to src/canonical/models/back-shiny/555--420--Darmanitan--Zen.gif diff --git a/src/canonical/models/back-shiny/Maractus.gif b/src/canonical/models/back-shiny/556--0--Maractus.gif similarity index 100% rename from src/canonical/models/back-shiny/Maractus.gif rename to src/canonical/models/back-shiny/556--0--Maractus.gif diff --git a/src/canonical/models/back-shiny/Dwebble.gif b/src/canonical/models/back-shiny/557--0--Dwebble.gif similarity index 100% rename from src/canonical/models/back-shiny/Dwebble.gif rename to src/canonical/models/back-shiny/557--0--Dwebble.gif diff --git a/src/canonical/models/back-shiny/Crustle.gif b/src/canonical/models/back-shiny/558--0--Crustle.gif similarity index 100% rename from src/canonical/models/back-shiny/Crustle.gif rename to src/canonical/models/back-shiny/558--0--Crustle.gif diff --git a/src/canonical/models/back-shiny/Scraggy.gif b/src/canonical/models/back-shiny/559--0--Scraggy.gif similarity index 100% rename from src/canonical/models/back-shiny/Scraggy.gif rename to src/canonical/models/back-shiny/559--0--Scraggy.gif diff --git a/src/canonical/models/back-shiny/Mankey.gif b/src/canonical/models/back-shiny/56--0--Mankey.gif similarity index 100% rename from src/canonical/models/back-shiny/Mankey.gif rename to src/canonical/models/back-shiny/56--0--Mankey.gif diff --git a/src/canonical/models/back-shiny/Scrafty.gif b/src/canonical/models/back-shiny/560--0--Scrafty.gif similarity index 100% rename from src/canonical/models/back-shiny/Scrafty.gif rename to src/canonical/models/back-shiny/560--0--Scrafty.gif diff --git a/src/canonical/models/back-shiny/Sigilyph.gif b/src/canonical/models/back-shiny/561--0--Sigilyph.gif similarity index 100% rename from src/canonical/models/back-shiny/Sigilyph.gif rename to src/canonical/models/back-shiny/561--0--Sigilyph.gif diff --git a/src/canonical/models/back-shiny/Yamask.gif b/src/canonical/models/back-shiny/562--0--Yamask.gif similarity index 100% rename from src/canonical/models/back-shiny/Yamask.gif rename to src/canonical/models/back-shiny/562--0--Yamask.gif diff --git a/src/canonical/models/back-shiny/Yamask--Galar.gif b/src/canonical/models/back-shiny/562--420--Yamask--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Yamask--Galar.gif rename to src/canonical/models/back-shiny/562--420--Yamask--Galar.gif diff --git a/src/canonical/models/back-shiny/Cofagrigus.gif b/src/canonical/models/back-shiny/563--0--Cofagrigus.gif similarity index 100% rename from src/canonical/models/back-shiny/Cofagrigus.gif rename to src/canonical/models/back-shiny/563--0--Cofagrigus.gif diff --git a/src/canonical/models/back-shiny/Tirtouga.gif b/src/canonical/models/back-shiny/564--0--Tirtouga.gif similarity index 100% rename from src/canonical/models/back-shiny/Tirtouga.gif rename to src/canonical/models/back-shiny/564--0--Tirtouga.gif diff --git a/src/canonical/models/back-shiny/Carracosta.gif b/src/canonical/models/back-shiny/565--0--Carracosta.gif similarity index 100% rename from src/canonical/models/back-shiny/Carracosta.gif rename to src/canonical/models/back-shiny/565--0--Carracosta.gif diff --git a/src/canonical/models/back-shiny/Archen.gif b/src/canonical/models/back-shiny/566--0--Archen.gif similarity index 100% rename from src/canonical/models/back-shiny/Archen.gif rename to src/canonical/models/back-shiny/566--0--Archen.gif diff --git a/src/canonical/models/back-shiny/Archeops.gif b/src/canonical/models/back-shiny/567--0--Archeops.gif similarity index 100% rename from src/canonical/models/back-shiny/Archeops.gif rename to src/canonical/models/back-shiny/567--0--Archeops.gif diff --git a/src/canonical/models/back-shiny/Trubbish.gif b/src/canonical/models/back-shiny/568--0--Trubbish.gif similarity index 100% rename from src/canonical/models/back-shiny/Trubbish.gif rename to src/canonical/models/back-shiny/568--0--Trubbish.gif diff --git a/src/canonical/models/back-shiny/Garbodor.gif b/src/canonical/models/back-shiny/569--0--Garbodor.gif similarity index 100% rename from src/canonical/models/back-shiny/Garbodor.gif rename to src/canonical/models/back-shiny/569--0--Garbodor.gif diff --git a/src/canonical/models/back-shiny/Garbodor--Gmax.gif b/src/canonical/models/back-shiny/569--420--Garbodor--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Garbodor--Gmax.gif rename to src/canonical/models/back-shiny/569--420--Garbodor--Gmax.gif diff --git a/src/canonical/models/back-shiny/Primeape.gif b/src/canonical/models/back-shiny/57--0--Primeape.gif similarity index 100% rename from src/canonical/models/back-shiny/Primeape.gif rename to src/canonical/models/back-shiny/57--0--Primeape.gif diff --git a/src/canonical/models/back-shiny/Zorua.gif b/src/canonical/models/back-shiny/570--0--Zorua.gif similarity index 100% rename from src/canonical/models/back-shiny/Zorua.gif rename to src/canonical/models/back-shiny/570--0--Zorua.gif diff --git a/src/canonical/models/back-shiny/Zoroark.gif b/src/canonical/models/back-shiny/571--0--Zoroark.gif similarity index 100% rename from src/canonical/models/back-shiny/Zoroark.gif rename to src/canonical/models/back-shiny/571--0--Zoroark.gif diff --git a/src/canonical/models/back-shiny/Minccino.gif b/src/canonical/models/back-shiny/572--0--Minccino.gif similarity index 100% rename from src/canonical/models/back-shiny/Minccino.gif rename to src/canonical/models/back-shiny/572--0--Minccino.gif diff --git a/src/canonical/models/back-shiny/Cinccino.gif b/src/canonical/models/back-shiny/573--0--Cinccino.gif similarity index 100% rename from src/canonical/models/back-shiny/Cinccino.gif rename to src/canonical/models/back-shiny/573--0--Cinccino.gif diff --git a/src/canonical/models/back-shiny/Gothita.gif b/src/canonical/models/back-shiny/574--0--Gothita.gif similarity index 100% rename from src/canonical/models/back-shiny/Gothita.gif rename to src/canonical/models/back-shiny/574--0--Gothita.gif diff --git a/src/canonical/models/back-shiny/Gothorita.gif b/src/canonical/models/back-shiny/575--0--Gothorita.gif similarity index 100% rename from src/canonical/models/back-shiny/Gothorita.gif rename to src/canonical/models/back-shiny/575--0--Gothorita.gif diff --git a/src/canonical/models/back-shiny/Gothitelle.gif b/src/canonical/models/back-shiny/576--0--Gothitelle.gif similarity index 100% rename from src/canonical/models/back-shiny/Gothitelle.gif rename to src/canonical/models/back-shiny/576--0--Gothitelle.gif diff --git a/src/canonical/models/back-shiny/Solosis.gif b/src/canonical/models/back-shiny/577--0--Solosis.gif similarity index 100% rename from src/canonical/models/back-shiny/Solosis.gif rename to src/canonical/models/back-shiny/577--0--Solosis.gif diff --git a/src/canonical/models/back-shiny/Duosion.gif b/src/canonical/models/back-shiny/578--0--Duosion.gif similarity index 100% rename from src/canonical/models/back-shiny/Duosion.gif rename to src/canonical/models/back-shiny/578--0--Duosion.gif diff --git a/src/canonical/models/back-shiny/Reuniclus.gif b/src/canonical/models/back-shiny/579--0--Reuniclus.gif similarity index 100% rename from src/canonical/models/back-shiny/Reuniclus.gif rename to src/canonical/models/back-shiny/579--0--Reuniclus.gif diff --git a/src/canonical/models/back-shiny/Growlithe.gif b/src/canonical/models/back-shiny/58--0--Growlithe.gif similarity index 100% rename from src/canonical/models/back-shiny/Growlithe.gif rename to src/canonical/models/back-shiny/58--0--Growlithe.gif diff --git a/src/canonical/models/back-shiny/Ducklett.gif b/src/canonical/models/back-shiny/580--0--Ducklett.gif similarity index 100% rename from src/canonical/models/back-shiny/Ducklett.gif rename to src/canonical/models/back-shiny/580--0--Ducklett.gif diff --git a/src/canonical/models/back-shiny/Swanna.gif b/src/canonical/models/back-shiny/581--0--Swanna.gif similarity index 100% rename from src/canonical/models/back-shiny/Swanna.gif rename to src/canonical/models/back-shiny/581--0--Swanna.gif diff --git a/src/canonical/models/back-shiny/Vanillite.gif b/src/canonical/models/back-shiny/582--0--Vanillite.gif similarity index 100% rename from src/canonical/models/back-shiny/Vanillite.gif rename to src/canonical/models/back-shiny/582--0--Vanillite.gif diff --git a/src/canonical/models/back-shiny/Vanillish.gif b/src/canonical/models/back-shiny/583--0--Vanillish.gif similarity index 100% rename from src/canonical/models/back-shiny/Vanillish.gif rename to src/canonical/models/back-shiny/583--0--Vanillish.gif diff --git a/src/canonical/models/back-shiny/Vanilluxe.gif b/src/canonical/models/back-shiny/584--0--Vanilluxe.gif similarity index 100% rename from src/canonical/models/back-shiny/Vanilluxe.gif rename to src/canonical/models/back-shiny/584--0--Vanilluxe.gif diff --git a/src/canonical/models/back-shiny/Deerling.gif b/src/canonical/models/back-shiny/585--0--Deerling.gif similarity index 100% rename from src/canonical/models/back-shiny/Deerling.gif rename to src/canonical/models/back-shiny/585--0--Deerling.gif diff --git a/src/canonical/models/back-shiny/Sawsbuck.gif b/src/canonical/models/back-shiny/586--0--Sawsbuck.gif similarity index 100% rename from src/canonical/models/back-shiny/Sawsbuck.gif rename to src/canonical/models/back-shiny/586--0--Sawsbuck.gif diff --git a/src/canonical/models/back-shiny/Emolga.gif b/src/canonical/models/back-shiny/587--0--Emolga.gif similarity index 100% rename from src/canonical/models/back-shiny/Emolga.gif rename to src/canonical/models/back-shiny/587--0--Emolga.gif diff --git a/src/canonical/models/back-shiny/Karrablast.gif b/src/canonical/models/back-shiny/588--0--Karrablast.gif similarity index 100% rename from src/canonical/models/back-shiny/Karrablast.gif rename to src/canonical/models/back-shiny/588--0--Karrablast.gif diff --git a/src/canonical/models/back-shiny/Escavalier.gif b/src/canonical/models/back-shiny/589--0--Escavalier.gif similarity index 100% rename from src/canonical/models/back-shiny/Escavalier.gif rename to src/canonical/models/back-shiny/589--0--Escavalier.gif diff --git a/src/canonical/models/back-shiny/Arcanine.gif b/src/canonical/models/back-shiny/59--0--Arcanine.gif similarity index 100% rename from src/canonical/models/back-shiny/Arcanine.gif rename to src/canonical/models/back-shiny/59--0--Arcanine.gif diff --git a/src/canonical/models/back-shiny/Foongus.gif b/src/canonical/models/back-shiny/590--0--Foongus.gif similarity index 100% rename from src/canonical/models/back-shiny/Foongus.gif rename to src/canonical/models/back-shiny/590--0--Foongus.gif diff --git a/src/canonical/models/back-shiny/Amoonguss.gif b/src/canonical/models/back-shiny/591--0--Amoonguss.gif similarity index 100% rename from src/canonical/models/back-shiny/Amoonguss.gif rename to src/canonical/models/back-shiny/591--0--Amoonguss.gif diff --git a/src/canonical/models/back-shiny/Frillish.gif b/src/canonical/models/back-shiny/592--0--Frillish.gif similarity index 100% rename from src/canonical/models/back-shiny/Frillish.gif rename to src/canonical/models/back-shiny/592--0--Frillish.gif diff --git a/src/canonical/models/back-shiny/Jellicent.gif b/src/canonical/models/back-shiny/593--0--Jellicent.gif similarity index 100% rename from src/canonical/models/back-shiny/Jellicent.gif rename to src/canonical/models/back-shiny/593--0--Jellicent.gif diff --git a/src/canonical/models/back-shiny/Alomomola.gif b/src/canonical/models/back-shiny/594--0--Alomomola.gif similarity index 100% rename from src/canonical/models/back-shiny/Alomomola.gif rename to src/canonical/models/back-shiny/594--0--Alomomola.gif diff --git a/src/canonical/models/back-shiny/Joltik.gif b/src/canonical/models/back-shiny/595--0--Joltik.gif similarity index 100% rename from src/canonical/models/back-shiny/Joltik.gif rename to src/canonical/models/back-shiny/595--0--Joltik.gif diff --git a/src/canonical/models/back-shiny/Galvantula.gif b/src/canonical/models/back-shiny/596--0--Galvantula.gif similarity index 100% rename from src/canonical/models/back-shiny/Galvantula.gif rename to src/canonical/models/back-shiny/596--0--Galvantula.gif diff --git a/src/canonical/models/back-shiny/Ferroseed.gif b/src/canonical/models/back-shiny/597--0--Ferroseed.gif similarity index 100% rename from src/canonical/models/back-shiny/Ferroseed.gif rename to src/canonical/models/back-shiny/597--0--Ferroseed.gif diff --git a/src/canonical/models/back-shiny/Ferrothorn.gif b/src/canonical/models/back-shiny/598--0--Ferrothorn.gif similarity index 100% rename from src/canonical/models/back-shiny/Ferrothorn.gif rename to src/canonical/models/back-shiny/598--0--Ferrothorn.gif diff --git a/src/canonical/models/back-shiny/Klink.gif b/src/canonical/models/back-shiny/599--0--Klink.gif similarity index 100% rename from src/canonical/models/back-shiny/Klink.gif rename to src/canonical/models/back-shiny/599--0--Klink.gif diff --git a/src/canonical/models/back-shiny/Charizard.gif b/src/canonical/models/back-shiny/6--0--Charizard.gif similarity index 100% rename from src/canonical/models/back-shiny/Charizard.gif rename to src/canonical/models/back-shiny/6--0--Charizard.gif diff --git a/src/canonical/models/back-shiny/Charizard--Gmax.gif b/src/canonical/models/back-shiny/6--420--Charizard--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Charizard--Gmax.gif rename to src/canonical/models/back-shiny/6--420--Charizard--Gmax.gif diff --git a/src/canonical/models/back-shiny/Charizard--Mega-X.gif b/src/canonical/models/back-shiny/6--420--Charizard--Mega-X.gif similarity index 100% rename from src/canonical/models/back-shiny/Charizard--Mega-X.gif rename to src/canonical/models/back-shiny/6--420--Charizard--Mega-X.gif diff --git a/src/canonical/models/back-shiny/Charizard--Mega-Y.gif b/src/canonical/models/back-shiny/6--420--Charizard--Mega-Y.gif similarity index 100% rename from src/canonical/models/back-shiny/Charizard--Mega-Y.gif rename to src/canonical/models/back-shiny/6--420--Charizard--Mega-Y.gif diff --git a/src/canonical/models/back-shiny/Poliwag.gif b/src/canonical/models/back-shiny/60--0--Poliwag.gif similarity index 100% rename from src/canonical/models/back-shiny/Poliwag.gif rename to src/canonical/models/back-shiny/60--0--Poliwag.gif diff --git a/src/canonical/models/back-shiny/Klang.gif b/src/canonical/models/back-shiny/600--0--Klang.gif similarity index 100% rename from src/canonical/models/back-shiny/Klang.gif rename to src/canonical/models/back-shiny/600--0--Klang.gif diff --git a/src/canonical/models/back-shiny/Klinklang.gif b/src/canonical/models/back-shiny/601--0--Klinklang.gif similarity index 100% rename from src/canonical/models/back-shiny/Klinklang.gif rename to src/canonical/models/back-shiny/601--0--Klinklang.gif diff --git a/src/canonical/models/back-shiny/Tynamo.gif b/src/canonical/models/back-shiny/602--0--Tynamo.gif similarity index 100% rename from src/canonical/models/back-shiny/Tynamo.gif rename to src/canonical/models/back-shiny/602--0--Tynamo.gif diff --git a/src/canonical/models/back-shiny/Eelektrik.gif b/src/canonical/models/back-shiny/603--0--Eelektrik.gif similarity index 100% rename from src/canonical/models/back-shiny/Eelektrik.gif rename to src/canonical/models/back-shiny/603--0--Eelektrik.gif diff --git a/src/canonical/models/back-shiny/Eelektross.gif b/src/canonical/models/back-shiny/604--0--Eelektross.gif similarity index 100% rename from src/canonical/models/back-shiny/Eelektross.gif rename to src/canonical/models/back-shiny/604--0--Eelektross.gif diff --git a/src/canonical/models/back-shiny/Elgyem.gif b/src/canonical/models/back-shiny/605--0--Elgyem.gif similarity index 100% rename from src/canonical/models/back-shiny/Elgyem.gif rename to src/canonical/models/back-shiny/605--0--Elgyem.gif diff --git a/src/canonical/models/back-shiny/Beheeyem.gif b/src/canonical/models/back-shiny/606--0--Beheeyem.gif similarity index 100% rename from src/canonical/models/back-shiny/Beheeyem.gif rename to src/canonical/models/back-shiny/606--0--Beheeyem.gif diff --git a/src/canonical/models/back-shiny/Litwick.gif b/src/canonical/models/back-shiny/607--0--Litwick.gif similarity index 100% rename from src/canonical/models/back-shiny/Litwick.gif rename to src/canonical/models/back-shiny/607--0--Litwick.gif diff --git a/src/canonical/models/back-shiny/Lampent.gif b/src/canonical/models/back-shiny/608--0--Lampent.gif similarity index 100% rename from src/canonical/models/back-shiny/Lampent.gif rename to src/canonical/models/back-shiny/608--0--Lampent.gif diff --git a/src/canonical/models/back-shiny/Chandelure.gif b/src/canonical/models/back-shiny/609--0--Chandelure.gif similarity index 100% rename from src/canonical/models/back-shiny/Chandelure.gif rename to src/canonical/models/back-shiny/609--0--Chandelure.gif diff --git a/src/canonical/models/back-shiny/Poliwhirl.gif b/src/canonical/models/back-shiny/61--0--Poliwhirl.gif similarity index 100% rename from src/canonical/models/back-shiny/Poliwhirl.gif rename to src/canonical/models/back-shiny/61--0--Poliwhirl.gif diff --git a/src/canonical/models/back-shiny/Axew.gif b/src/canonical/models/back-shiny/610--0--Axew.gif similarity index 100% rename from src/canonical/models/back-shiny/Axew.gif rename to src/canonical/models/back-shiny/610--0--Axew.gif diff --git a/src/canonical/models/back-shiny/Fraxure.gif b/src/canonical/models/back-shiny/611--0--Fraxure.gif similarity index 100% rename from src/canonical/models/back-shiny/Fraxure.gif rename to src/canonical/models/back-shiny/611--0--Fraxure.gif diff --git a/src/canonical/models/back-shiny/Haxorus.gif b/src/canonical/models/back-shiny/612--0--Haxorus.gif similarity index 100% rename from src/canonical/models/back-shiny/Haxorus.gif rename to src/canonical/models/back-shiny/612--0--Haxorus.gif diff --git a/src/canonical/models/back-shiny/Cubchoo.gif b/src/canonical/models/back-shiny/613--0--Cubchoo.gif similarity index 100% rename from src/canonical/models/back-shiny/Cubchoo.gif rename to src/canonical/models/back-shiny/613--0--Cubchoo.gif diff --git a/src/canonical/models/back-shiny/Beartic.gif b/src/canonical/models/back-shiny/614--0--Beartic.gif similarity index 100% rename from src/canonical/models/back-shiny/Beartic.gif rename to src/canonical/models/back-shiny/614--0--Beartic.gif diff --git a/src/canonical/models/back-shiny/Cryogonal.gif b/src/canonical/models/back-shiny/615--0--Cryogonal.gif similarity index 100% rename from src/canonical/models/back-shiny/Cryogonal.gif rename to src/canonical/models/back-shiny/615--0--Cryogonal.gif diff --git a/src/canonical/models/back-shiny/Shelmet.gif b/src/canonical/models/back-shiny/616--0--Shelmet.gif similarity index 100% rename from src/canonical/models/back-shiny/Shelmet.gif rename to src/canonical/models/back-shiny/616--0--Shelmet.gif diff --git a/src/canonical/models/back-shiny/Accelgor.gif b/src/canonical/models/back-shiny/617--0--Accelgor.gif similarity index 100% rename from src/canonical/models/back-shiny/Accelgor.gif rename to src/canonical/models/back-shiny/617--0--Accelgor.gif diff --git a/src/canonical/models/back-shiny/Stunfisk.gif b/src/canonical/models/back-shiny/618--0--Stunfisk.gif similarity index 100% rename from src/canonical/models/back-shiny/Stunfisk.gif rename to src/canonical/models/back-shiny/618--0--Stunfisk.gif diff --git a/src/canonical/models/back-shiny/Stunfisk--Galar.gif b/src/canonical/models/back-shiny/618--420--Stunfisk--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Stunfisk--Galar.gif rename to src/canonical/models/back-shiny/618--420--Stunfisk--Galar.gif diff --git a/src/canonical/models/back-shiny/Mienfoo.gif b/src/canonical/models/back-shiny/619--0--Mienfoo.gif similarity index 100% rename from src/canonical/models/back-shiny/Mienfoo.gif rename to src/canonical/models/back-shiny/619--0--Mienfoo.gif diff --git a/src/canonical/models/back-shiny/Poliwrath.gif b/src/canonical/models/back-shiny/62--0--Poliwrath.gif similarity index 100% rename from src/canonical/models/back-shiny/Poliwrath.gif rename to src/canonical/models/back-shiny/62--0--Poliwrath.gif diff --git a/src/canonical/models/back-shiny/Mienshao.gif b/src/canonical/models/back-shiny/620--0--Mienshao.gif similarity index 100% rename from src/canonical/models/back-shiny/Mienshao.gif rename to src/canonical/models/back-shiny/620--0--Mienshao.gif diff --git a/src/canonical/models/back-shiny/Druddigon.gif b/src/canonical/models/back-shiny/621--0--Druddigon.gif similarity index 100% rename from src/canonical/models/back-shiny/Druddigon.gif rename to src/canonical/models/back-shiny/621--0--Druddigon.gif diff --git a/src/canonical/models/back-shiny/Golett.gif b/src/canonical/models/back-shiny/622--0--Golett.gif similarity index 100% rename from src/canonical/models/back-shiny/Golett.gif rename to src/canonical/models/back-shiny/622--0--Golett.gif diff --git a/src/canonical/models/back-shiny/Golurk.gif b/src/canonical/models/back-shiny/623--0--Golurk.gif similarity index 100% rename from src/canonical/models/back-shiny/Golurk.gif rename to src/canonical/models/back-shiny/623--0--Golurk.gif diff --git a/src/canonical/models/back-shiny/Pawniard.gif b/src/canonical/models/back-shiny/624--0--Pawniard.gif similarity index 100% rename from src/canonical/models/back-shiny/Pawniard.gif rename to src/canonical/models/back-shiny/624--0--Pawniard.gif diff --git a/src/canonical/models/back-shiny/Bisharp.gif b/src/canonical/models/back-shiny/625--0--Bisharp.gif similarity index 100% rename from src/canonical/models/back-shiny/Bisharp.gif rename to src/canonical/models/back-shiny/625--0--Bisharp.gif diff --git a/src/canonical/models/back-shiny/Bouffalant.gif b/src/canonical/models/back-shiny/626--0--Bouffalant.gif similarity index 100% rename from src/canonical/models/back-shiny/Bouffalant.gif rename to src/canonical/models/back-shiny/626--0--Bouffalant.gif diff --git a/src/canonical/models/back-shiny/Rufflet.gif b/src/canonical/models/back-shiny/627--0--Rufflet.gif similarity index 100% rename from src/canonical/models/back-shiny/Rufflet.gif rename to src/canonical/models/back-shiny/627--0--Rufflet.gif diff --git a/src/canonical/models/back-shiny/Braviary.gif b/src/canonical/models/back-shiny/628--0--Braviary.gif similarity index 100% rename from src/canonical/models/back-shiny/Braviary.gif rename to src/canonical/models/back-shiny/628--0--Braviary.gif diff --git a/src/canonical/models/back-shiny/Vullaby.gif b/src/canonical/models/back-shiny/629--0--Vullaby.gif similarity index 100% rename from src/canonical/models/back-shiny/Vullaby.gif rename to src/canonical/models/back-shiny/629--0--Vullaby.gif diff --git a/src/canonical/models/back-shiny/Abra.gif b/src/canonical/models/back-shiny/63--0--Abra.gif similarity index 100% rename from src/canonical/models/back-shiny/Abra.gif rename to src/canonical/models/back-shiny/63--0--Abra.gif diff --git a/src/canonical/models/back-shiny/Mandibuzz.gif b/src/canonical/models/back-shiny/630--0--Mandibuzz.gif similarity index 100% rename from src/canonical/models/back-shiny/Mandibuzz.gif rename to src/canonical/models/back-shiny/630--0--Mandibuzz.gif diff --git a/src/canonical/models/back-shiny/Heatmor.gif b/src/canonical/models/back-shiny/631--0--Heatmor.gif similarity index 100% rename from src/canonical/models/back-shiny/Heatmor.gif rename to src/canonical/models/back-shiny/631--0--Heatmor.gif diff --git a/src/canonical/models/back-shiny/Durant.gif b/src/canonical/models/back-shiny/632--0--Durant.gif similarity index 100% rename from src/canonical/models/back-shiny/Durant.gif rename to src/canonical/models/back-shiny/632--0--Durant.gif diff --git a/src/canonical/models/back-shiny/Deino.gif b/src/canonical/models/back-shiny/633--0--Deino.gif similarity index 100% rename from src/canonical/models/back-shiny/Deino.gif rename to src/canonical/models/back-shiny/633--0--Deino.gif diff --git a/src/canonical/models/back-shiny/Zweilous.gif b/src/canonical/models/back-shiny/634--0--Zweilous.gif similarity index 100% rename from src/canonical/models/back-shiny/Zweilous.gif rename to src/canonical/models/back-shiny/634--0--Zweilous.gif diff --git a/src/canonical/models/back-shiny/Hydreigon.gif b/src/canonical/models/back-shiny/635--0--Hydreigon.gif similarity index 100% rename from src/canonical/models/back-shiny/Hydreigon.gif rename to src/canonical/models/back-shiny/635--0--Hydreigon.gif diff --git a/src/canonical/models/back-shiny/Larvesta.gif b/src/canonical/models/back-shiny/636--0--Larvesta.gif similarity index 100% rename from src/canonical/models/back-shiny/Larvesta.gif rename to src/canonical/models/back-shiny/636--0--Larvesta.gif diff --git a/src/canonical/models/back-shiny/Volcarona.gif b/src/canonical/models/back-shiny/637--0--Volcarona.gif similarity index 100% rename from src/canonical/models/back-shiny/Volcarona.gif rename to src/canonical/models/back-shiny/637--0--Volcarona.gif diff --git a/src/canonical/models/back-shiny/Cobalion.gif b/src/canonical/models/back-shiny/638--0--Cobalion.gif similarity index 100% rename from src/canonical/models/back-shiny/Cobalion.gif rename to src/canonical/models/back-shiny/638--0--Cobalion.gif diff --git a/src/canonical/models/back-shiny/Terrakion.gif b/src/canonical/models/back-shiny/639--0--Terrakion.gif similarity index 100% rename from src/canonical/models/back-shiny/Terrakion.gif rename to src/canonical/models/back-shiny/639--0--Terrakion.gif diff --git a/src/canonical/models/back-shiny/Kadabra.gif b/src/canonical/models/back-shiny/64--0--Kadabra.gif similarity index 100% rename from src/canonical/models/back-shiny/Kadabra.gif rename to src/canonical/models/back-shiny/64--0--Kadabra.gif diff --git a/src/canonical/models/back-shiny/Virizion.gif b/src/canonical/models/back-shiny/640--0--Virizion.gif similarity index 100% rename from src/canonical/models/back-shiny/Virizion.gif rename to src/canonical/models/back-shiny/640--0--Virizion.gif diff --git a/src/canonical/models/back-shiny/Tornadus.gif b/src/canonical/models/back-shiny/641--0--Tornadus.gif similarity index 100% rename from src/canonical/models/back-shiny/Tornadus.gif rename to src/canonical/models/back-shiny/641--0--Tornadus.gif diff --git a/src/canonical/models/back-shiny/Tornadus--Therian.gif b/src/canonical/models/back-shiny/641--420--Tornadus--Therian.gif similarity index 100% rename from src/canonical/models/back-shiny/Tornadus--Therian.gif rename to src/canonical/models/back-shiny/641--420--Tornadus--Therian.gif diff --git a/src/canonical/models/back-shiny/Thundurus.gif b/src/canonical/models/back-shiny/642--0--Thundurus.gif similarity index 100% rename from src/canonical/models/back-shiny/Thundurus.gif rename to src/canonical/models/back-shiny/642--0--Thundurus.gif diff --git a/src/canonical/models/back-shiny/Thundurus--Therian.gif b/src/canonical/models/back-shiny/642--420--Thundurus--Therian.gif similarity index 100% rename from src/canonical/models/back-shiny/Thundurus--Therian.gif rename to src/canonical/models/back-shiny/642--420--Thundurus--Therian.gif diff --git a/src/canonical/models/back-shiny/Reshiram.gif b/src/canonical/models/back-shiny/643--0--Reshiram.gif similarity index 100% rename from src/canonical/models/back-shiny/Reshiram.gif rename to src/canonical/models/back-shiny/643--0--Reshiram.gif diff --git a/src/canonical/models/back-shiny/Zekrom.gif b/src/canonical/models/back-shiny/644--0--Zekrom.gif similarity index 100% rename from src/canonical/models/back-shiny/Zekrom.gif rename to src/canonical/models/back-shiny/644--0--Zekrom.gif diff --git a/src/canonical/models/back-shiny/Landorus.gif b/src/canonical/models/back-shiny/645--0--Landorus.gif similarity index 100% rename from src/canonical/models/back-shiny/Landorus.gif rename to src/canonical/models/back-shiny/645--0--Landorus.gif diff --git a/src/canonical/models/back-shiny/Landorus--Therian.gif b/src/canonical/models/back-shiny/645--420--Landorus--Therian.gif similarity index 100% rename from src/canonical/models/back-shiny/Landorus--Therian.gif rename to src/canonical/models/back-shiny/645--420--Landorus--Therian.gif diff --git a/src/canonical/models/back-shiny/Kyurem.gif b/src/canonical/models/back-shiny/646--0--Kyurem.gif similarity index 100% rename from src/canonical/models/back-shiny/Kyurem.gif rename to src/canonical/models/back-shiny/646--0--Kyurem.gif diff --git a/src/canonical/models/back-shiny/Kyurem--Black.gif b/src/canonical/models/back-shiny/646--420--Kyurem--Black.gif similarity index 100% rename from src/canonical/models/back-shiny/Kyurem--Black.gif rename to src/canonical/models/back-shiny/646--420--Kyurem--Black.gif diff --git a/src/canonical/models/back-shiny/Kyurem--White.gif b/src/canonical/models/back-shiny/646--420--Kyurem--White.gif similarity index 100% rename from src/canonical/models/back-shiny/Kyurem--White.gif rename to src/canonical/models/back-shiny/646--420--Kyurem--White.gif diff --git a/src/canonical/models/back-shiny/Keldeo.gif b/src/canonical/models/back-shiny/647--0--Keldeo.gif similarity index 100% rename from src/canonical/models/back-shiny/Keldeo.gif rename to src/canonical/models/back-shiny/647--0--Keldeo.gif diff --git a/src/canonical/models/back-shiny/Keldeo--Resolute.gif b/src/canonical/models/back-shiny/647--420--Keldeo--Resolute.gif similarity index 100% rename from src/canonical/models/back-shiny/Keldeo--Resolute.gif rename to src/canonical/models/back-shiny/647--420--Keldeo--Resolute.gif diff --git a/src/canonical/models/back-shiny/Meloetta.gif b/src/canonical/models/back-shiny/648--0--Meloetta.gif similarity index 100% rename from src/canonical/models/back-shiny/Meloetta.gif rename to src/canonical/models/back-shiny/648--0--Meloetta.gif diff --git a/src/canonical/models/back-shiny/Meloetta--Pirouette.gif b/src/canonical/models/back-shiny/648--420--Meloetta--Pirouette.gif similarity index 100% rename from src/canonical/models/back-shiny/Meloetta--Pirouette.gif rename to src/canonical/models/back-shiny/648--420--Meloetta--Pirouette.gif diff --git a/src/canonical/models/back-shiny/Genesect.gif b/src/canonical/models/back-shiny/649--0--Genesect.gif similarity index 100% rename from src/canonical/models/back-shiny/Genesect.gif rename to src/canonical/models/back-shiny/649--0--Genesect.gif diff --git a/src/canonical/models/back-shiny/Genesect--Burn.gif b/src/canonical/models/back-shiny/649--420--Genesect--Burn.gif similarity index 100% rename from src/canonical/models/back-shiny/Genesect--Burn.gif rename to src/canonical/models/back-shiny/649--420--Genesect--Burn.gif diff --git a/src/canonical/models/back-shiny/Genesect--Chill.gif b/src/canonical/models/back-shiny/649--420--Genesect--Chill.gif similarity index 100% rename from src/canonical/models/back-shiny/Genesect--Chill.gif rename to src/canonical/models/back-shiny/649--420--Genesect--Chill.gif diff --git a/src/canonical/models/back-shiny/Genesect--Douse.gif b/src/canonical/models/back-shiny/649--420--Genesect--Douse.gif similarity index 100% rename from src/canonical/models/back-shiny/Genesect--Douse.gif rename to src/canonical/models/back-shiny/649--420--Genesect--Douse.gif diff --git a/src/canonical/models/back-shiny/Genesect--Shock.gif b/src/canonical/models/back-shiny/649--420--Genesect--Shock.gif similarity index 100% rename from src/canonical/models/back-shiny/Genesect--Shock.gif rename to src/canonical/models/back-shiny/649--420--Genesect--Shock.gif diff --git a/src/canonical/models/back-shiny/Alakazam.gif b/src/canonical/models/back-shiny/65--0--Alakazam.gif similarity index 100% rename from src/canonical/models/back-shiny/Alakazam.gif rename to src/canonical/models/back-shiny/65--0--Alakazam.gif diff --git a/src/canonical/models/back-shiny/Alakazam--Mega.gif b/src/canonical/models/back-shiny/65--420--Alakazam--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Alakazam--Mega.gif rename to src/canonical/models/back-shiny/65--420--Alakazam--Mega.gif diff --git a/src/canonical/models/back-shiny/Chespin.gif b/src/canonical/models/back-shiny/650--0--Chespin.gif similarity index 100% rename from src/canonical/models/back-shiny/Chespin.gif rename to src/canonical/models/back-shiny/650--0--Chespin.gif diff --git a/src/canonical/models/back-shiny/Quilladin.gif b/src/canonical/models/back-shiny/651--0--Quilladin.gif similarity index 100% rename from src/canonical/models/back-shiny/Quilladin.gif rename to src/canonical/models/back-shiny/651--0--Quilladin.gif diff --git a/src/canonical/models/back-shiny/Chesnaught.gif b/src/canonical/models/back-shiny/652--0--Chesnaught.gif similarity index 100% rename from src/canonical/models/back-shiny/Chesnaught.gif rename to src/canonical/models/back-shiny/652--0--Chesnaught.gif diff --git a/src/canonical/models/back-shiny/Fennekin.gif b/src/canonical/models/back-shiny/653--0--Fennekin.gif similarity index 100% rename from src/canonical/models/back-shiny/Fennekin.gif rename to src/canonical/models/back-shiny/653--0--Fennekin.gif diff --git a/src/canonical/models/back-shiny/Braixen.gif b/src/canonical/models/back-shiny/654--0--Braixen.gif similarity index 100% rename from src/canonical/models/back-shiny/Braixen.gif rename to src/canonical/models/back-shiny/654--0--Braixen.gif diff --git a/src/canonical/models/back-shiny/Delphox.gif b/src/canonical/models/back-shiny/655--0--Delphox.gif similarity index 100% rename from src/canonical/models/back-shiny/Delphox.gif rename to src/canonical/models/back-shiny/655--0--Delphox.gif diff --git a/src/canonical/models/back-shiny/Froakie.gif b/src/canonical/models/back-shiny/656--0--Froakie.gif similarity index 100% rename from src/canonical/models/back-shiny/Froakie.gif rename to src/canonical/models/back-shiny/656--0--Froakie.gif diff --git a/src/canonical/models/back-shiny/Frogadier.gif b/src/canonical/models/back-shiny/657--0--Frogadier.gif similarity index 100% rename from src/canonical/models/back-shiny/Frogadier.gif rename to src/canonical/models/back-shiny/657--0--Frogadier.gif diff --git a/src/canonical/models/back-shiny/Greninja.gif b/src/canonical/models/back-shiny/658--0--Greninja.gif similarity index 100% rename from src/canonical/models/back-shiny/Greninja.gif rename to src/canonical/models/back-shiny/658--0--Greninja.gif diff --git a/src/canonical/models/back-shiny/Greninja--Ash.gif b/src/canonical/models/back-shiny/658--420--Greninja--Ash.gif similarity index 100% rename from src/canonical/models/back-shiny/Greninja--Ash.gif rename to src/canonical/models/back-shiny/658--420--Greninja--Ash.gif diff --git a/src/canonical/models/back-shiny/Bunnelby.gif b/src/canonical/models/back-shiny/659--0--Bunnelby.gif similarity index 100% rename from src/canonical/models/back-shiny/Bunnelby.gif rename to src/canonical/models/back-shiny/659--0--Bunnelby.gif diff --git a/src/canonical/models/back-shiny/Machop.gif b/src/canonical/models/back-shiny/66--0--Machop.gif similarity index 100% rename from src/canonical/models/back-shiny/Machop.gif rename to src/canonical/models/back-shiny/66--0--Machop.gif diff --git a/src/canonical/models/back-shiny/Diggersby.gif b/src/canonical/models/back-shiny/660--0--Diggersby.gif similarity index 100% rename from src/canonical/models/back-shiny/Diggersby.gif rename to src/canonical/models/back-shiny/660--0--Diggersby.gif diff --git a/src/canonical/models/back-shiny/Fletchling.gif b/src/canonical/models/back-shiny/661--0--Fletchling.gif similarity index 100% rename from src/canonical/models/back-shiny/Fletchling.gif rename to src/canonical/models/back-shiny/661--0--Fletchling.gif diff --git a/src/canonical/models/back-shiny/Fletchinder.gif b/src/canonical/models/back-shiny/662--0--Fletchinder.gif similarity index 100% rename from src/canonical/models/back-shiny/Fletchinder.gif rename to src/canonical/models/back-shiny/662--0--Fletchinder.gif diff --git a/src/canonical/models/back-shiny/Talonflame.gif b/src/canonical/models/back-shiny/663--0--Talonflame.gif similarity index 100% rename from src/canonical/models/back-shiny/Talonflame.gif rename to src/canonical/models/back-shiny/663--0--Talonflame.gif diff --git a/src/canonical/models/back-shiny/Scatterbug.gif b/src/canonical/models/back-shiny/664--0--Scatterbug.gif similarity index 100% rename from src/canonical/models/back-shiny/Scatterbug.gif rename to src/canonical/models/back-shiny/664--0--Scatterbug.gif diff --git a/src/canonical/models/back-shiny/Spewpa.gif b/src/canonical/models/back-shiny/665--0--Spewpa.gif similarity index 100% rename from src/canonical/models/back-shiny/Spewpa.gif rename to src/canonical/models/back-shiny/665--0--Spewpa.gif diff --git a/src/canonical/models/back-shiny/Vivillon.gif b/src/canonical/models/back-shiny/666--0--Vivillon.gif similarity index 100% rename from src/canonical/models/back-shiny/Vivillon.gif rename to src/canonical/models/back-shiny/666--0--Vivillon.gif diff --git a/src/canonical/models/back-shiny/Vivillon--Fancy.gif b/src/canonical/models/back-shiny/666--420--Vivillon--Fancy.gif similarity index 100% rename from src/canonical/models/back-shiny/Vivillon--Fancy.gif rename to src/canonical/models/back-shiny/666--420--Vivillon--Fancy.gif diff --git a/src/canonical/models/back-shiny/Vivillon--Pokeball.gif b/src/canonical/models/back-shiny/666--420--Vivillon--Pokeball.gif similarity index 100% rename from src/canonical/models/back-shiny/Vivillon--Pokeball.gif rename to src/canonical/models/back-shiny/666--420--Vivillon--Pokeball.gif diff --git a/src/canonical/models/back-shiny/Litleo.gif b/src/canonical/models/back-shiny/667--0--Litleo.gif similarity index 100% rename from src/canonical/models/back-shiny/Litleo.gif rename to src/canonical/models/back-shiny/667--0--Litleo.gif diff --git a/src/canonical/models/back-shiny/Pyroar.gif b/src/canonical/models/back-shiny/668--0--Pyroar.gif similarity index 100% rename from src/canonical/models/back-shiny/Pyroar.gif rename to src/canonical/models/back-shiny/668--0--Pyroar.gif diff --git a/src/canonical/models/back-shiny/Flabe__0301be__0301.gif b/src/canonical/models/back-shiny/669--0--Flabe__0301be__0301.gif similarity index 100% rename from src/canonical/models/back-shiny/Flabe__0301be__0301.gif rename to src/canonical/models/back-shiny/669--0--Flabe__0301be__0301.gif diff --git a/src/canonical/models/back-shiny/Machoke.gif b/src/canonical/models/back-shiny/67--0--Machoke.gif similarity index 100% rename from src/canonical/models/back-shiny/Machoke.gif rename to src/canonical/models/back-shiny/67--0--Machoke.gif diff --git a/src/canonical/models/back-shiny/Floette.gif b/src/canonical/models/back-shiny/670--0--Floette.gif similarity index 100% rename from src/canonical/models/back-shiny/Floette.gif rename to src/canonical/models/back-shiny/670--0--Floette.gif diff --git a/src/canonical/models/back-shiny/Floette--Eternal.gif b/src/canonical/models/back-shiny/670--420--Floette--Eternal.gif similarity index 100% rename from src/canonical/models/back-shiny/Floette--Eternal.gif rename to src/canonical/models/back-shiny/670--420--Floette--Eternal.gif diff --git a/src/canonical/models/back-shiny/Florges.gif b/src/canonical/models/back-shiny/671--0--Florges.gif similarity index 100% rename from src/canonical/models/back-shiny/Florges.gif rename to src/canonical/models/back-shiny/671--0--Florges.gif diff --git a/src/canonical/models/back-shiny/Skiddo.gif b/src/canonical/models/back-shiny/672--0--Skiddo.gif similarity index 100% rename from src/canonical/models/back-shiny/Skiddo.gif rename to src/canonical/models/back-shiny/672--0--Skiddo.gif diff --git a/src/canonical/models/back-shiny/Gogoat.gif b/src/canonical/models/back-shiny/673--0--Gogoat.gif similarity index 100% rename from src/canonical/models/back-shiny/Gogoat.gif rename to src/canonical/models/back-shiny/673--0--Gogoat.gif diff --git a/src/canonical/models/back-shiny/Pancham.gif b/src/canonical/models/back-shiny/674--0--Pancham.gif similarity index 100% rename from src/canonical/models/back-shiny/Pancham.gif rename to src/canonical/models/back-shiny/674--0--Pancham.gif diff --git a/src/canonical/models/back-shiny/Pangoro.gif b/src/canonical/models/back-shiny/675--0--Pangoro.gif similarity index 100% rename from src/canonical/models/back-shiny/Pangoro.gif rename to src/canonical/models/back-shiny/675--0--Pangoro.gif diff --git a/src/canonical/models/back-shiny/Furfrou.gif b/src/canonical/models/back-shiny/676--0--Furfrou.gif similarity index 100% rename from src/canonical/models/back-shiny/Furfrou.gif rename to src/canonical/models/back-shiny/676--0--Furfrou.gif diff --git a/src/canonical/models/back-shiny/Espurr.gif b/src/canonical/models/back-shiny/677--0--Espurr.gif similarity index 100% rename from src/canonical/models/back-shiny/Espurr.gif rename to src/canonical/models/back-shiny/677--0--Espurr.gif diff --git a/src/canonical/models/back-shiny/Meowstic.gif b/src/canonical/models/back-shiny/678--0--Meowstic.gif similarity index 100% rename from src/canonical/models/back-shiny/Meowstic.gif rename to src/canonical/models/back-shiny/678--0--Meowstic.gif diff --git a/src/canonical/models/back-shiny/Meowstic--F.gif b/src/canonical/models/back-shiny/678--420--Meowstic--F.gif similarity index 100% rename from src/canonical/models/back-shiny/Meowstic--F.gif rename to src/canonical/models/back-shiny/678--420--Meowstic--F.gif diff --git a/src/canonical/models/back-shiny/Honedge.gif b/src/canonical/models/back-shiny/679--0--Honedge.gif similarity index 100% rename from src/canonical/models/back-shiny/Honedge.gif rename to src/canonical/models/back-shiny/679--0--Honedge.gif diff --git a/src/canonical/models/back-shiny/Machamp.gif b/src/canonical/models/back-shiny/68--0--Machamp.gif similarity index 100% rename from src/canonical/models/back-shiny/Machamp.gif rename to src/canonical/models/back-shiny/68--0--Machamp.gif diff --git a/src/canonical/models/back-shiny/Machamp--Gmax.gif b/src/canonical/models/back-shiny/68--420--Machamp--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Machamp--Gmax.gif rename to src/canonical/models/back-shiny/68--420--Machamp--Gmax.gif diff --git a/src/canonical/models/back-shiny/Doublade.gif b/src/canonical/models/back-shiny/680--0--Doublade.gif similarity index 100% rename from src/canonical/models/back-shiny/Doublade.gif rename to src/canonical/models/back-shiny/680--0--Doublade.gif diff --git a/src/canonical/models/back-shiny/Aegislash.gif b/src/canonical/models/back-shiny/681--0--Aegislash.gif similarity index 100% rename from src/canonical/models/back-shiny/Aegislash.gif rename to src/canonical/models/back-shiny/681--0--Aegislash.gif diff --git a/src/canonical/models/back-shiny/Aegislash--Blade.gif b/src/canonical/models/back-shiny/681--420--Aegislash--Blade.gif similarity index 100% rename from src/canonical/models/back-shiny/Aegislash--Blade.gif rename to src/canonical/models/back-shiny/681--420--Aegislash--Blade.gif diff --git a/src/canonical/models/back-shiny/Spritzee.gif b/src/canonical/models/back-shiny/682--0--Spritzee.gif similarity index 100% rename from src/canonical/models/back-shiny/Spritzee.gif rename to src/canonical/models/back-shiny/682--0--Spritzee.gif diff --git a/src/canonical/models/back-shiny/Aromatisse.gif b/src/canonical/models/back-shiny/683--0--Aromatisse.gif similarity index 100% rename from src/canonical/models/back-shiny/Aromatisse.gif rename to src/canonical/models/back-shiny/683--0--Aromatisse.gif diff --git a/src/canonical/models/back-shiny/Swirlix.gif b/src/canonical/models/back-shiny/684--0--Swirlix.gif similarity index 100% rename from src/canonical/models/back-shiny/Swirlix.gif rename to src/canonical/models/back-shiny/684--0--Swirlix.gif diff --git a/src/canonical/models/back-shiny/Slurpuff.gif b/src/canonical/models/back-shiny/685--0--Slurpuff.gif similarity index 100% rename from src/canonical/models/back-shiny/Slurpuff.gif rename to src/canonical/models/back-shiny/685--0--Slurpuff.gif diff --git a/src/canonical/models/back-shiny/Inkay.gif b/src/canonical/models/back-shiny/686--0--Inkay.gif similarity index 100% rename from src/canonical/models/back-shiny/Inkay.gif rename to src/canonical/models/back-shiny/686--0--Inkay.gif diff --git a/src/canonical/models/back-shiny/Malamar.gif b/src/canonical/models/back-shiny/687--0--Malamar.gif similarity index 100% rename from src/canonical/models/back-shiny/Malamar.gif rename to src/canonical/models/back-shiny/687--0--Malamar.gif diff --git a/src/canonical/models/back-shiny/Binacle.gif b/src/canonical/models/back-shiny/688--0--Binacle.gif similarity index 100% rename from src/canonical/models/back-shiny/Binacle.gif rename to src/canonical/models/back-shiny/688--0--Binacle.gif diff --git a/src/canonical/models/back-shiny/Barbaracle.gif b/src/canonical/models/back-shiny/689--0--Barbaracle.gif similarity index 100% rename from src/canonical/models/back-shiny/Barbaracle.gif rename to src/canonical/models/back-shiny/689--0--Barbaracle.gif diff --git a/src/canonical/models/back-shiny/Bellsprout.gif b/src/canonical/models/back-shiny/69--0--Bellsprout.gif similarity index 100% rename from src/canonical/models/back-shiny/Bellsprout.gif rename to src/canonical/models/back-shiny/69--0--Bellsprout.gif diff --git a/src/canonical/models/back-shiny/Skrelp.gif b/src/canonical/models/back-shiny/690--0--Skrelp.gif similarity index 100% rename from src/canonical/models/back-shiny/Skrelp.gif rename to src/canonical/models/back-shiny/690--0--Skrelp.gif diff --git a/src/canonical/models/back-shiny/Dragalge.gif b/src/canonical/models/back-shiny/691--0--Dragalge.gif similarity index 100% rename from src/canonical/models/back-shiny/Dragalge.gif rename to src/canonical/models/back-shiny/691--0--Dragalge.gif diff --git a/src/canonical/models/back-shiny/Clauncher.gif b/src/canonical/models/back-shiny/692--0--Clauncher.gif similarity index 100% rename from src/canonical/models/back-shiny/Clauncher.gif rename to src/canonical/models/back-shiny/692--0--Clauncher.gif diff --git a/src/canonical/models/back-shiny/Clawitzer.gif b/src/canonical/models/back-shiny/693--0--Clawitzer.gif similarity index 100% rename from src/canonical/models/back-shiny/Clawitzer.gif rename to src/canonical/models/back-shiny/693--0--Clawitzer.gif diff --git a/src/canonical/models/back-shiny/Helioptile.gif b/src/canonical/models/back-shiny/694--0--Helioptile.gif similarity index 100% rename from src/canonical/models/back-shiny/Helioptile.gif rename to src/canonical/models/back-shiny/694--0--Helioptile.gif diff --git a/src/canonical/models/back-shiny/Heliolisk.gif b/src/canonical/models/back-shiny/695--0--Heliolisk.gif similarity index 100% rename from src/canonical/models/back-shiny/Heliolisk.gif rename to src/canonical/models/back-shiny/695--0--Heliolisk.gif diff --git a/src/canonical/models/back-shiny/Tyrunt.gif b/src/canonical/models/back-shiny/696--0--Tyrunt.gif similarity index 100% rename from src/canonical/models/back-shiny/Tyrunt.gif rename to src/canonical/models/back-shiny/696--0--Tyrunt.gif diff --git a/src/canonical/models/back-shiny/Tyrantrum.gif b/src/canonical/models/back-shiny/697--0--Tyrantrum.gif similarity index 100% rename from src/canonical/models/back-shiny/Tyrantrum.gif rename to src/canonical/models/back-shiny/697--0--Tyrantrum.gif diff --git a/src/canonical/models/back-shiny/Amaura.gif b/src/canonical/models/back-shiny/698--0--Amaura.gif similarity index 100% rename from src/canonical/models/back-shiny/Amaura.gif rename to src/canonical/models/back-shiny/698--0--Amaura.gif diff --git a/src/canonical/models/back-shiny/Aurorus.gif b/src/canonical/models/back-shiny/699--0--Aurorus.gif similarity index 100% rename from src/canonical/models/back-shiny/Aurorus.gif rename to src/canonical/models/back-shiny/699--0--Aurorus.gif diff --git a/src/canonical/models/back-shiny/Squirtle.gif b/src/canonical/models/back-shiny/7--0--Squirtle.gif similarity index 100% rename from src/canonical/models/back-shiny/Squirtle.gif rename to src/canonical/models/back-shiny/7--0--Squirtle.gif diff --git a/src/canonical/models/back-shiny/Weepinbell.gif b/src/canonical/models/back-shiny/70--0--Weepinbell.gif similarity index 100% rename from src/canonical/models/back-shiny/Weepinbell.gif rename to src/canonical/models/back-shiny/70--0--Weepinbell.gif diff --git a/src/canonical/models/back-shiny/Sylveon.gif b/src/canonical/models/back-shiny/700--0--Sylveon.gif similarity index 100% rename from src/canonical/models/back-shiny/Sylveon.gif rename to src/canonical/models/back-shiny/700--0--Sylveon.gif diff --git a/src/canonical/models/back-shiny/Hawlucha.gif b/src/canonical/models/back-shiny/701--0--Hawlucha.gif similarity index 100% rename from src/canonical/models/back-shiny/Hawlucha.gif rename to src/canonical/models/back-shiny/701--0--Hawlucha.gif diff --git a/src/canonical/models/back-shiny/Dedenne.gif b/src/canonical/models/back-shiny/702--0--Dedenne.gif similarity index 100% rename from src/canonical/models/back-shiny/Dedenne.gif rename to src/canonical/models/back-shiny/702--0--Dedenne.gif diff --git a/src/canonical/models/back-shiny/Carbink.gif b/src/canonical/models/back-shiny/703--0--Carbink.gif similarity index 100% rename from src/canonical/models/back-shiny/Carbink.gif rename to src/canonical/models/back-shiny/703--0--Carbink.gif diff --git a/src/canonical/models/back-shiny/Goomy.gif b/src/canonical/models/back-shiny/704--0--Goomy.gif similarity index 100% rename from src/canonical/models/back-shiny/Goomy.gif rename to src/canonical/models/back-shiny/704--0--Goomy.gif diff --git a/src/canonical/models/back-shiny/Sliggoo.gif b/src/canonical/models/back-shiny/705--0--Sliggoo.gif similarity index 100% rename from src/canonical/models/back-shiny/Sliggoo.gif rename to src/canonical/models/back-shiny/705--0--Sliggoo.gif diff --git a/src/canonical/models/back-shiny/Goodra.gif b/src/canonical/models/back-shiny/706--0--Goodra.gif similarity index 100% rename from src/canonical/models/back-shiny/Goodra.gif rename to src/canonical/models/back-shiny/706--0--Goodra.gif diff --git a/src/canonical/models/back-shiny/Klefki.gif b/src/canonical/models/back-shiny/707--0--Klefki.gif similarity index 100% rename from src/canonical/models/back-shiny/Klefki.gif rename to src/canonical/models/back-shiny/707--0--Klefki.gif diff --git a/src/canonical/models/back-shiny/Phantump.gif b/src/canonical/models/back-shiny/708--0--Phantump.gif similarity index 100% rename from src/canonical/models/back-shiny/Phantump.gif rename to src/canonical/models/back-shiny/708--0--Phantump.gif diff --git a/src/canonical/models/back-shiny/Trevenant.gif b/src/canonical/models/back-shiny/709--0--Trevenant.gif similarity index 100% rename from src/canonical/models/back-shiny/Trevenant.gif rename to src/canonical/models/back-shiny/709--0--Trevenant.gif diff --git a/src/canonical/models/back-shiny/Victreebel.gif b/src/canonical/models/back-shiny/71--0--Victreebel.gif similarity index 100% rename from src/canonical/models/back-shiny/Victreebel.gif rename to src/canonical/models/back-shiny/71--0--Victreebel.gif diff --git a/src/canonical/models/back-shiny/Pumpkaboo.gif b/src/canonical/models/back-shiny/710--0--Pumpkaboo.gif similarity index 100% rename from src/canonical/models/back-shiny/Pumpkaboo.gif rename to src/canonical/models/back-shiny/710--0--Pumpkaboo.gif diff --git a/src/canonical/models/back-shiny/Pumpkaboo--Large.gif b/src/canonical/models/back-shiny/710--420--Pumpkaboo--Large.gif similarity index 100% rename from src/canonical/models/back-shiny/Pumpkaboo--Large.gif rename to src/canonical/models/back-shiny/710--420--Pumpkaboo--Large.gif diff --git a/src/canonical/models/back-shiny/Pumpkaboo--Small.gif b/src/canonical/models/back-shiny/710--420--Pumpkaboo--Small.gif similarity index 100% rename from src/canonical/models/back-shiny/Pumpkaboo--Small.gif rename to src/canonical/models/back-shiny/710--420--Pumpkaboo--Small.gif diff --git a/src/canonical/models/back-shiny/Pumpkaboo--Super.gif b/src/canonical/models/back-shiny/710--420--Pumpkaboo--Super.gif similarity index 100% rename from src/canonical/models/back-shiny/Pumpkaboo--Super.gif rename to src/canonical/models/back-shiny/710--420--Pumpkaboo--Super.gif diff --git a/src/canonical/models/back-shiny/Gourgeist.gif b/src/canonical/models/back-shiny/711--0--Gourgeist.gif similarity index 100% rename from src/canonical/models/back-shiny/Gourgeist.gif rename to src/canonical/models/back-shiny/711--0--Gourgeist.gif diff --git a/src/canonical/models/back-shiny/Gourgeist--Large.gif b/src/canonical/models/back-shiny/711--420--Gourgeist--Large.gif similarity index 100% rename from src/canonical/models/back-shiny/Gourgeist--Large.gif rename to src/canonical/models/back-shiny/711--420--Gourgeist--Large.gif diff --git a/src/canonical/models/back-shiny/Gourgeist--Small.gif b/src/canonical/models/back-shiny/711--420--Gourgeist--Small.gif similarity index 100% rename from src/canonical/models/back-shiny/Gourgeist--Small.gif rename to src/canonical/models/back-shiny/711--420--Gourgeist--Small.gif diff --git a/src/canonical/models/back-shiny/Gourgeist--Super.gif b/src/canonical/models/back-shiny/711--420--Gourgeist--Super.gif similarity index 100% rename from src/canonical/models/back-shiny/Gourgeist--Super.gif rename to src/canonical/models/back-shiny/711--420--Gourgeist--Super.gif diff --git a/src/canonical/models/back-shiny/Bergmite.gif b/src/canonical/models/back-shiny/712--0--Bergmite.gif similarity index 100% rename from src/canonical/models/back-shiny/Bergmite.gif rename to src/canonical/models/back-shiny/712--0--Bergmite.gif diff --git a/src/canonical/models/back-shiny/Avalugg.gif b/src/canonical/models/back-shiny/713--0--Avalugg.gif similarity index 100% rename from src/canonical/models/back-shiny/Avalugg.gif rename to src/canonical/models/back-shiny/713--0--Avalugg.gif diff --git a/src/canonical/models/back-shiny/Noibat.gif b/src/canonical/models/back-shiny/714--0--Noibat.gif similarity index 100% rename from src/canonical/models/back-shiny/Noibat.gif rename to src/canonical/models/back-shiny/714--0--Noibat.gif diff --git a/src/canonical/models/back-shiny/Noivern.gif b/src/canonical/models/back-shiny/715--0--Noivern.gif similarity index 100% rename from src/canonical/models/back-shiny/Noivern.gif rename to src/canonical/models/back-shiny/715--0--Noivern.gif diff --git a/src/canonical/models/back-shiny/Xerneas.gif b/src/canonical/models/back-shiny/716--0--Xerneas.gif similarity index 100% rename from src/canonical/models/back-shiny/Xerneas.gif rename to src/canonical/models/back-shiny/716--0--Xerneas.gif diff --git a/src/canonical/models/back-shiny/Yveltal.gif b/src/canonical/models/back-shiny/717--0--Yveltal.gif similarity index 100% rename from src/canonical/models/back-shiny/Yveltal.gif rename to src/canonical/models/back-shiny/717--0--Yveltal.gif diff --git a/src/canonical/models/back-shiny/Zygarde.gif b/src/canonical/models/back-shiny/718--0--Zygarde.gif similarity index 100% rename from src/canonical/models/back-shiny/Zygarde.gif rename to src/canonical/models/back-shiny/718--0--Zygarde.gif diff --git a/src/canonical/models/back-shiny/Zygarde--10__0025.gif b/src/canonical/models/back-shiny/718--420--Zygarde--10__0025.gif similarity index 100% rename from src/canonical/models/back-shiny/Zygarde--10__0025.gif rename to src/canonical/models/back-shiny/718--420--Zygarde--10__0025.gif diff --git a/src/canonical/models/back-shiny/Zygarde--Complete.gif b/src/canonical/models/back-shiny/718--420--Zygarde--Complete.gif similarity index 100% rename from src/canonical/models/back-shiny/Zygarde--Complete.gif rename to src/canonical/models/back-shiny/718--420--Zygarde--Complete.gif diff --git a/src/canonical/models/back-shiny/Diancie.gif b/src/canonical/models/back-shiny/719--0--Diancie.gif similarity index 100% rename from src/canonical/models/back-shiny/Diancie.gif rename to src/canonical/models/back-shiny/719--0--Diancie.gif diff --git a/src/canonical/models/back-shiny/Diancie--Mega.gif b/src/canonical/models/back-shiny/719--420--Diancie--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Diancie--Mega.gif rename to src/canonical/models/back-shiny/719--420--Diancie--Mega.gif diff --git a/src/canonical/models/back-shiny/Tentacool.gif b/src/canonical/models/back-shiny/72--0--Tentacool.gif similarity index 100% rename from src/canonical/models/back-shiny/Tentacool.gif rename to src/canonical/models/back-shiny/72--0--Tentacool.gif diff --git a/src/canonical/models/back-shiny/Hoopa.gif b/src/canonical/models/back-shiny/720--0--Hoopa.gif similarity index 100% rename from src/canonical/models/back-shiny/Hoopa.gif rename to src/canonical/models/back-shiny/720--0--Hoopa.gif diff --git a/src/canonical/models/back-shiny/Hoopa--Unbound.gif b/src/canonical/models/back-shiny/720--420--Hoopa--Unbound.gif similarity index 100% rename from src/canonical/models/back-shiny/Hoopa--Unbound.gif rename to src/canonical/models/back-shiny/720--420--Hoopa--Unbound.gif diff --git a/src/canonical/models/back-shiny/Volcanion.gif b/src/canonical/models/back-shiny/721--0--Volcanion.gif similarity index 100% rename from src/canonical/models/back-shiny/Volcanion.gif rename to src/canonical/models/back-shiny/721--0--Volcanion.gif diff --git a/src/canonical/models/back-shiny/Rowlet.gif b/src/canonical/models/back-shiny/722--0--Rowlet.gif similarity index 100% rename from src/canonical/models/back-shiny/Rowlet.gif rename to src/canonical/models/back-shiny/722--0--Rowlet.gif diff --git a/src/canonical/models/back-shiny/Dartrix.gif b/src/canonical/models/back-shiny/723--0--Dartrix.gif similarity index 100% rename from src/canonical/models/back-shiny/Dartrix.gif rename to src/canonical/models/back-shiny/723--0--Dartrix.gif diff --git a/src/canonical/models/back-shiny/Decidueye.gif b/src/canonical/models/back-shiny/724--0--Decidueye.gif similarity index 100% rename from src/canonical/models/back-shiny/Decidueye.gif rename to src/canonical/models/back-shiny/724--0--Decidueye.gif diff --git a/src/canonical/models/back-shiny/Litten.gif b/src/canonical/models/back-shiny/725--0--Litten.gif similarity index 100% rename from src/canonical/models/back-shiny/Litten.gif rename to src/canonical/models/back-shiny/725--0--Litten.gif diff --git a/src/canonical/models/back-shiny/Torracat.gif b/src/canonical/models/back-shiny/726--0--Torracat.gif similarity index 100% rename from src/canonical/models/back-shiny/Torracat.gif rename to src/canonical/models/back-shiny/726--0--Torracat.gif diff --git a/src/canonical/models/back-shiny/Incineroar.gif b/src/canonical/models/back-shiny/727--0--Incineroar.gif similarity index 100% rename from src/canonical/models/back-shiny/Incineroar.gif rename to src/canonical/models/back-shiny/727--0--Incineroar.gif diff --git a/src/canonical/models/back-shiny/Popplio.gif b/src/canonical/models/back-shiny/728--0--Popplio.gif similarity index 100% rename from src/canonical/models/back-shiny/Popplio.gif rename to src/canonical/models/back-shiny/728--0--Popplio.gif diff --git a/src/canonical/models/back-shiny/Brionne.gif b/src/canonical/models/back-shiny/729--0--Brionne.gif similarity index 100% rename from src/canonical/models/back-shiny/Brionne.gif rename to src/canonical/models/back-shiny/729--0--Brionne.gif diff --git a/src/canonical/models/back-shiny/Tentacruel.gif b/src/canonical/models/back-shiny/73--0--Tentacruel.gif similarity index 100% rename from src/canonical/models/back-shiny/Tentacruel.gif rename to src/canonical/models/back-shiny/73--0--Tentacruel.gif diff --git a/src/canonical/models/back-shiny/Primarina.gif b/src/canonical/models/back-shiny/730--0--Primarina.gif similarity index 100% rename from src/canonical/models/back-shiny/Primarina.gif rename to src/canonical/models/back-shiny/730--0--Primarina.gif diff --git a/src/canonical/models/back-shiny/Pikipek.gif b/src/canonical/models/back-shiny/731--0--Pikipek.gif similarity index 100% rename from src/canonical/models/back-shiny/Pikipek.gif rename to src/canonical/models/back-shiny/731--0--Pikipek.gif diff --git a/src/canonical/models/back-shiny/Trumbeak.gif b/src/canonical/models/back-shiny/732--0--Trumbeak.gif similarity index 100% rename from src/canonical/models/back-shiny/Trumbeak.gif rename to src/canonical/models/back-shiny/732--0--Trumbeak.gif diff --git a/src/canonical/models/back-shiny/Toucannon.gif b/src/canonical/models/back-shiny/733--0--Toucannon.gif similarity index 100% rename from src/canonical/models/back-shiny/Toucannon.gif rename to src/canonical/models/back-shiny/733--0--Toucannon.gif diff --git a/src/canonical/models/back-shiny/Yungoos.gif b/src/canonical/models/back-shiny/734--0--Yungoos.gif similarity index 100% rename from src/canonical/models/back-shiny/Yungoos.gif rename to src/canonical/models/back-shiny/734--0--Yungoos.gif diff --git a/src/canonical/models/back-shiny/Gumshoos.gif b/src/canonical/models/back-shiny/735--0--Gumshoos.gif similarity index 100% rename from src/canonical/models/back-shiny/Gumshoos.gif rename to src/canonical/models/back-shiny/735--0--Gumshoos.gif diff --git a/src/canonical/models/back-shiny/Gumshoos--Totem.gif b/src/canonical/models/back-shiny/735--420--Gumshoos--Totem.gif similarity index 100% rename from src/canonical/models/back-shiny/Gumshoos--Totem.gif rename to src/canonical/models/back-shiny/735--420--Gumshoos--Totem.gif diff --git a/src/canonical/models/back-shiny/Grubbin.gif b/src/canonical/models/back-shiny/736--0--Grubbin.gif similarity index 100% rename from src/canonical/models/back-shiny/Grubbin.gif rename to src/canonical/models/back-shiny/736--0--Grubbin.gif diff --git a/src/canonical/models/back-shiny/Charjabug.gif b/src/canonical/models/back-shiny/737--0--Charjabug.gif similarity index 100% rename from src/canonical/models/back-shiny/Charjabug.gif rename to src/canonical/models/back-shiny/737--0--Charjabug.gif diff --git a/src/canonical/models/back-shiny/Vikavolt.gif b/src/canonical/models/back-shiny/738--0--Vikavolt.gif similarity index 100% rename from src/canonical/models/back-shiny/Vikavolt.gif rename to src/canonical/models/back-shiny/738--0--Vikavolt.gif diff --git a/src/canonical/models/back-shiny/Vikavolt--Totem.gif b/src/canonical/models/back-shiny/738--420--Vikavolt--Totem.gif similarity index 100% rename from src/canonical/models/back-shiny/Vikavolt--Totem.gif rename to src/canonical/models/back-shiny/738--420--Vikavolt--Totem.gif diff --git a/src/canonical/models/back-shiny/Crabrawler.gif b/src/canonical/models/back-shiny/739--0--Crabrawler.gif similarity index 100% rename from src/canonical/models/back-shiny/Crabrawler.gif rename to src/canonical/models/back-shiny/739--0--Crabrawler.gif diff --git a/src/canonical/models/back-shiny/Geodude.gif b/src/canonical/models/back-shiny/74--0--Geodude.gif similarity index 100% rename from src/canonical/models/back-shiny/Geodude.gif rename to src/canonical/models/back-shiny/74--0--Geodude.gif diff --git a/src/canonical/models/back-shiny/Geodude--Alola.gif b/src/canonical/models/back-shiny/74--420--Geodude--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Geodude--Alola.gif rename to src/canonical/models/back-shiny/74--420--Geodude--Alola.gif diff --git a/src/canonical/models/back-shiny/Crabominable.gif b/src/canonical/models/back-shiny/740--0--Crabominable.gif similarity index 100% rename from src/canonical/models/back-shiny/Crabominable.gif rename to src/canonical/models/back-shiny/740--0--Crabominable.gif diff --git a/src/canonical/models/back-shiny/Oricorio.gif b/src/canonical/models/back-shiny/741--0--Oricorio.gif similarity index 100% rename from src/canonical/models/back-shiny/Oricorio.gif rename to src/canonical/models/back-shiny/741--0--Oricorio.gif diff --git a/src/canonical/models/back-shiny/Oricorio--Pa__0027u.gif b/src/canonical/models/back-shiny/741--420--Oricorio--Pa__0027u.gif similarity index 100% rename from src/canonical/models/back-shiny/Oricorio--Pa__0027u.gif rename to src/canonical/models/back-shiny/741--420--Oricorio--Pa__0027u.gif diff --git a/src/canonical/models/back-shiny/Oricorio--Pom-Pom.gif b/src/canonical/models/back-shiny/741--420--Oricorio--Pom-Pom.gif similarity index 100% rename from src/canonical/models/back-shiny/Oricorio--Pom-Pom.gif rename to src/canonical/models/back-shiny/741--420--Oricorio--Pom-Pom.gif diff --git a/src/canonical/models/back-shiny/Oricorio--Sensu.gif b/src/canonical/models/back-shiny/741--420--Oricorio--Sensu.gif similarity index 100% rename from src/canonical/models/back-shiny/Oricorio--Sensu.gif rename to src/canonical/models/back-shiny/741--420--Oricorio--Sensu.gif diff --git a/src/canonical/models/back-shiny/Cutiefly.gif b/src/canonical/models/back-shiny/742--0--Cutiefly.gif similarity index 100% rename from src/canonical/models/back-shiny/Cutiefly.gif rename to src/canonical/models/back-shiny/742--0--Cutiefly.gif diff --git a/src/canonical/models/back-shiny/Ribombee.gif b/src/canonical/models/back-shiny/743--0--Ribombee.gif similarity index 100% rename from src/canonical/models/back-shiny/Ribombee.gif rename to src/canonical/models/back-shiny/743--0--Ribombee.gif diff --git a/src/canonical/models/back-shiny/Ribombee--Totem.gif b/src/canonical/models/back-shiny/743--420--Ribombee--Totem.gif similarity index 100% rename from src/canonical/models/back-shiny/Ribombee--Totem.gif rename to src/canonical/models/back-shiny/743--420--Ribombee--Totem.gif diff --git a/src/canonical/models/back-shiny/Rockruff.gif b/src/canonical/models/back-shiny/744--0--Rockruff.gif similarity index 100% rename from src/canonical/models/back-shiny/Rockruff.gif rename to src/canonical/models/back-shiny/744--0--Rockruff.gif diff --git a/src/canonical/models/back-shiny/Lycanroc.gif b/src/canonical/models/back-shiny/745--0--Lycanroc.gif similarity index 100% rename from src/canonical/models/back-shiny/Lycanroc.gif rename to src/canonical/models/back-shiny/745--0--Lycanroc.gif diff --git a/src/canonical/models/back-shiny/Lycanroc--Dusk.gif b/src/canonical/models/back-shiny/745--420--Lycanroc--Dusk.gif similarity index 100% rename from src/canonical/models/back-shiny/Lycanroc--Dusk.gif rename to src/canonical/models/back-shiny/745--420--Lycanroc--Dusk.gif diff --git a/src/canonical/models/back-shiny/Lycanroc--Midnight.gif b/src/canonical/models/back-shiny/745--420--Lycanroc--Midnight.gif similarity index 100% rename from src/canonical/models/back-shiny/Lycanroc--Midnight.gif rename to src/canonical/models/back-shiny/745--420--Lycanroc--Midnight.gif diff --git a/src/canonical/models/back-shiny/Wishiwashi.gif b/src/canonical/models/back-shiny/746--0--Wishiwashi.gif similarity index 100% rename from src/canonical/models/back-shiny/Wishiwashi.gif rename to src/canonical/models/back-shiny/746--0--Wishiwashi.gif diff --git a/src/canonical/models/back-shiny/Wishiwashi--School.gif b/src/canonical/models/back-shiny/746--420--Wishiwashi--School.gif similarity index 100% rename from src/canonical/models/back-shiny/Wishiwashi--School.gif rename to src/canonical/models/back-shiny/746--420--Wishiwashi--School.gif diff --git a/src/canonical/models/back-shiny/Mareanie.gif b/src/canonical/models/back-shiny/747--0--Mareanie.gif similarity index 100% rename from src/canonical/models/back-shiny/Mareanie.gif rename to src/canonical/models/back-shiny/747--0--Mareanie.gif diff --git a/src/canonical/models/back-shiny/Toxapex.gif b/src/canonical/models/back-shiny/748--0--Toxapex.gif similarity index 100% rename from src/canonical/models/back-shiny/Toxapex.gif rename to src/canonical/models/back-shiny/748--0--Toxapex.gif diff --git a/src/canonical/models/back-shiny/Mudbray.gif b/src/canonical/models/back-shiny/749--0--Mudbray.gif similarity index 100% rename from src/canonical/models/back-shiny/Mudbray.gif rename to src/canonical/models/back-shiny/749--0--Mudbray.gif diff --git a/src/canonical/models/back-shiny/Graveler.gif b/src/canonical/models/back-shiny/75--0--Graveler.gif similarity index 100% rename from src/canonical/models/back-shiny/Graveler.gif rename to src/canonical/models/back-shiny/75--0--Graveler.gif diff --git a/src/canonical/models/back-shiny/Graveler--Alola.gif b/src/canonical/models/back-shiny/75--420--Graveler--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Graveler--Alola.gif rename to src/canonical/models/back-shiny/75--420--Graveler--Alola.gif diff --git a/src/canonical/models/back-shiny/Mudsdale.gif b/src/canonical/models/back-shiny/750--0--Mudsdale.gif similarity index 100% rename from src/canonical/models/back-shiny/Mudsdale.gif rename to src/canonical/models/back-shiny/750--0--Mudsdale.gif diff --git a/src/canonical/models/back-shiny/Dewpider.gif b/src/canonical/models/back-shiny/751--0--Dewpider.gif similarity index 100% rename from src/canonical/models/back-shiny/Dewpider.gif rename to src/canonical/models/back-shiny/751--0--Dewpider.gif diff --git a/src/canonical/models/back-shiny/Araquanid.gif b/src/canonical/models/back-shiny/752--0--Araquanid.gif similarity index 100% rename from src/canonical/models/back-shiny/Araquanid.gif rename to src/canonical/models/back-shiny/752--0--Araquanid.gif diff --git a/src/canonical/models/back-shiny/Araquanid--Totem.gif b/src/canonical/models/back-shiny/752--420--Araquanid--Totem.gif similarity index 100% rename from src/canonical/models/back-shiny/Araquanid--Totem.gif rename to src/canonical/models/back-shiny/752--420--Araquanid--Totem.gif diff --git a/src/canonical/models/back-shiny/Fomantis.gif b/src/canonical/models/back-shiny/753--0--Fomantis.gif similarity index 100% rename from src/canonical/models/back-shiny/Fomantis.gif rename to src/canonical/models/back-shiny/753--0--Fomantis.gif diff --git a/src/canonical/models/back-shiny/Lurantis.gif b/src/canonical/models/back-shiny/754--0--Lurantis.gif similarity index 100% rename from src/canonical/models/back-shiny/Lurantis.gif rename to src/canonical/models/back-shiny/754--0--Lurantis.gif diff --git a/src/canonical/models/back-shiny/Lurantis--Totem.gif b/src/canonical/models/back-shiny/754--420--Lurantis--Totem.gif similarity index 100% rename from src/canonical/models/back-shiny/Lurantis--Totem.gif rename to src/canonical/models/back-shiny/754--420--Lurantis--Totem.gif diff --git a/src/canonical/models/back-shiny/Morelull.gif b/src/canonical/models/back-shiny/755--0--Morelull.gif similarity index 100% rename from src/canonical/models/back-shiny/Morelull.gif rename to src/canonical/models/back-shiny/755--0--Morelull.gif diff --git a/src/canonical/models/back-shiny/Shiinotic.gif b/src/canonical/models/back-shiny/756--0--Shiinotic.gif similarity index 100% rename from src/canonical/models/back-shiny/Shiinotic.gif rename to src/canonical/models/back-shiny/756--0--Shiinotic.gif diff --git a/src/canonical/models/back-shiny/Salandit.gif b/src/canonical/models/back-shiny/757--0--Salandit.gif similarity index 100% rename from src/canonical/models/back-shiny/Salandit.gif rename to src/canonical/models/back-shiny/757--0--Salandit.gif diff --git a/src/canonical/models/back-shiny/Salazzle.gif b/src/canonical/models/back-shiny/758--0--Salazzle.gif similarity index 100% rename from src/canonical/models/back-shiny/Salazzle.gif rename to src/canonical/models/back-shiny/758--0--Salazzle.gif diff --git a/src/canonical/models/back-shiny/Salazzle--Totem.gif b/src/canonical/models/back-shiny/758--420--Salazzle--Totem.gif similarity index 100% rename from src/canonical/models/back-shiny/Salazzle--Totem.gif rename to src/canonical/models/back-shiny/758--420--Salazzle--Totem.gif diff --git a/src/canonical/models/back-shiny/Stufful.gif b/src/canonical/models/back-shiny/759--0--Stufful.gif similarity index 100% rename from src/canonical/models/back-shiny/Stufful.gif rename to src/canonical/models/back-shiny/759--0--Stufful.gif diff --git a/src/canonical/models/back-shiny/Golem.gif b/src/canonical/models/back-shiny/76--0--Golem.gif similarity index 100% rename from src/canonical/models/back-shiny/Golem.gif rename to src/canonical/models/back-shiny/76--0--Golem.gif diff --git a/src/canonical/models/back-shiny/Golem--Alola.gif b/src/canonical/models/back-shiny/76--420--Golem--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Golem--Alola.gif rename to src/canonical/models/back-shiny/76--420--Golem--Alola.gif diff --git a/src/canonical/models/back-shiny/Bewear.gif b/src/canonical/models/back-shiny/760--0--Bewear.gif similarity index 100% rename from src/canonical/models/back-shiny/Bewear.gif rename to src/canonical/models/back-shiny/760--0--Bewear.gif diff --git a/src/canonical/models/back-shiny/Bounsweet.gif b/src/canonical/models/back-shiny/761--0--Bounsweet.gif similarity index 100% rename from src/canonical/models/back-shiny/Bounsweet.gif rename to src/canonical/models/back-shiny/761--0--Bounsweet.gif diff --git a/src/canonical/models/back-shiny/Steenee.gif b/src/canonical/models/back-shiny/762--0--Steenee.gif similarity index 100% rename from src/canonical/models/back-shiny/Steenee.gif rename to src/canonical/models/back-shiny/762--0--Steenee.gif diff --git a/src/canonical/models/back-shiny/Tsareena.gif b/src/canonical/models/back-shiny/763--0--Tsareena.gif similarity index 100% rename from src/canonical/models/back-shiny/Tsareena.gif rename to src/canonical/models/back-shiny/763--0--Tsareena.gif diff --git a/src/canonical/models/back-shiny/Comfey.gif b/src/canonical/models/back-shiny/764--0--Comfey.gif similarity index 100% rename from src/canonical/models/back-shiny/Comfey.gif rename to src/canonical/models/back-shiny/764--0--Comfey.gif diff --git a/src/canonical/models/back-shiny/Oranguru.gif b/src/canonical/models/back-shiny/765--0--Oranguru.gif similarity index 100% rename from src/canonical/models/back-shiny/Oranguru.gif rename to src/canonical/models/back-shiny/765--0--Oranguru.gif diff --git a/src/canonical/models/back-shiny/Passimian.gif b/src/canonical/models/back-shiny/766--0--Passimian.gif similarity index 100% rename from src/canonical/models/back-shiny/Passimian.gif rename to src/canonical/models/back-shiny/766--0--Passimian.gif diff --git a/src/canonical/models/back-shiny/Wimpod.gif b/src/canonical/models/back-shiny/767--0--Wimpod.gif similarity index 100% rename from src/canonical/models/back-shiny/Wimpod.gif rename to src/canonical/models/back-shiny/767--0--Wimpod.gif diff --git a/src/canonical/models/back-shiny/Golisopod.gif b/src/canonical/models/back-shiny/768--0--Golisopod.gif similarity index 100% rename from src/canonical/models/back-shiny/Golisopod.gif rename to src/canonical/models/back-shiny/768--0--Golisopod.gif diff --git a/src/canonical/models/back-shiny/Sandygast.gif b/src/canonical/models/back-shiny/769--0--Sandygast.gif similarity index 100% rename from src/canonical/models/back-shiny/Sandygast.gif rename to src/canonical/models/back-shiny/769--0--Sandygast.gif diff --git a/src/canonical/models/back-shiny/Ponyta.gif b/src/canonical/models/back-shiny/77--0--Ponyta.gif similarity index 100% rename from src/canonical/models/back-shiny/Ponyta.gif rename to src/canonical/models/back-shiny/77--0--Ponyta.gif diff --git a/src/canonical/models/back-shiny/Ponyta--Galar.gif b/src/canonical/models/back-shiny/77--420--Ponyta--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Ponyta--Galar.gif rename to src/canonical/models/back-shiny/77--420--Ponyta--Galar.gif diff --git a/src/canonical/models/back-shiny/Palossand.gif b/src/canonical/models/back-shiny/770--0--Palossand.gif similarity index 100% rename from src/canonical/models/back-shiny/Palossand.gif rename to src/canonical/models/back-shiny/770--0--Palossand.gif diff --git a/src/canonical/models/back-shiny/Pyukumuku.gif b/src/canonical/models/back-shiny/771--0--Pyukumuku.gif similarity index 100% rename from src/canonical/models/back-shiny/Pyukumuku.gif rename to src/canonical/models/back-shiny/771--0--Pyukumuku.gif diff --git a/src/canonical/models/back-shiny/Type__003a_Null.gif b/src/canonical/models/back-shiny/772--0--Type__003a_Null.gif similarity index 100% rename from src/canonical/models/back-shiny/Type__003a_Null.gif rename to src/canonical/models/back-shiny/772--0--Type__003a_Null.gif diff --git a/src/canonical/models/back-shiny/Silvally.gif b/src/canonical/models/back-shiny/773--0--Silvally.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally.gif rename to src/canonical/models/back-shiny/773--0--Silvally.gif diff --git a/src/canonical/models/back-shiny/Silvally--Bug.gif b/src/canonical/models/back-shiny/773--420--Silvally--Bug.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Bug.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Bug.gif diff --git a/src/canonical/models/back-shiny/Silvally--Dark.gif b/src/canonical/models/back-shiny/773--420--Silvally--Dark.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Dark.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Dark.gif diff --git a/src/canonical/models/back-shiny/Silvally--Dragon.gif b/src/canonical/models/back-shiny/773--420--Silvally--Dragon.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Dragon.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Dragon.gif diff --git a/src/canonical/models/back-shiny/Silvally--Electric.gif b/src/canonical/models/back-shiny/773--420--Silvally--Electric.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Electric.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Electric.gif diff --git a/src/canonical/models/back-shiny/Silvally--Fairy.gif b/src/canonical/models/back-shiny/773--420--Silvally--Fairy.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Fairy.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Fairy.gif diff --git a/src/canonical/models/back-shiny/Silvally--Fighting.gif b/src/canonical/models/back-shiny/773--420--Silvally--Fighting.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Fighting.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Fighting.gif diff --git a/src/canonical/models/back-shiny/Silvally--Fire.gif b/src/canonical/models/back-shiny/773--420--Silvally--Fire.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Fire.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Fire.gif diff --git a/src/canonical/models/back-shiny/Silvally--Flying.gif b/src/canonical/models/back-shiny/773--420--Silvally--Flying.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Flying.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Flying.gif diff --git a/src/canonical/models/back-shiny/Silvally--Ghost.gif b/src/canonical/models/back-shiny/773--420--Silvally--Ghost.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Ghost.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Ghost.gif diff --git a/src/canonical/models/back-shiny/Silvally--Grass.gif b/src/canonical/models/back-shiny/773--420--Silvally--Grass.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Grass.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Grass.gif diff --git a/src/canonical/models/back-shiny/Silvally--Ground.gif b/src/canonical/models/back-shiny/773--420--Silvally--Ground.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Ground.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Ground.gif diff --git a/src/canonical/models/back-shiny/Silvally--Ice.gif b/src/canonical/models/back-shiny/773--420--Silvally--Ice.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Ice.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Ice.gif diff --git a/src/canonical/models/back-shiny/Silvally--Poison.gif b/src/canonical/models/back-shiny/773--420--Silvally--Poison.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Poison.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Poison.gif diff --git a/src/canonical/models/back-shiny/Silvally--Psychic.gif b/src/canonical/models/back-shiny/773--420--Silvally--Psychic.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Psychic.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Psychic.gif diff --git a/src/canonical/models/back-shiny/Silvally--Rock.gif b/src/canonical/models/back-shiny/773--420--Silvally--Rock.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Rock.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Rock.gif diff --git a/src/canonical/models/back-shiny/Silvally--Steel.gif b/src/canonical/models/back-shiny/773--420--Silvally--Steel.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Steel.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Steel.gif diff --git a/src/canonical/models/back-shiny/Silvally--Water.gif b/src/canonical/models/back-shiny/773--420--Silvally--Water.gif similarity index 100% rename from src/canonical/models/back-shiny/Silvally--Water.gif rename to src/canonical/models/back-shiny/773--420--Silvally--Water.gif diff --git a/src/canonical/models/back-shiny/Minior.gif b/src/canonical/models/back-shiny/774--0--Minior.gif similarity index 100% rename from src/canonical/models/back-shiny/Minior.gif rename to src/canonical/models/back-shiny/774--0--Minior.gif diff --git a/src/canonical/models/back-shiny/Komala.gif b/src/canonical/models/back-shiny/775--0--Komala.gif similarity index 100% rename from src/canonical/models/back-shiny/Komala.gif rename to src/canonical/models/back-shiny/775--0--Komala.gif diff --git a/src/canonical/models/back-shiny/Turtonator.gif b/src/canonical/models/back-shiny/776--0--Turtonator.gif similarity index 100% rename from src/canonical/models/back-shiny/Turtonator.gif rename to src/canonical/models/back-shiny/776--0--Turtonator.gif diff --git a/src/canonical/models/back-shiny/Togedemaru.gif b/src/canonical/models/back-shiny/777--0--Togedemaru.gif similarity index 100% rename from src/canonical/models/back-shiny/Togedemaru.gif rename to src/canonical/models/back-shiny/777--0--Togedemaru.gif diff --git a/src/canonical/models/back-shiny/Togedemaru--Totem.gif b/src/canonical/models/back-shiny/777--420--Togedemaru--Totem.gif similarity index 100% rename from src/canonical/models/back-shiny/Togedemaru--Totem.gif rename to src/canonical/models/back-shiny/777--420--Togedemaru--Totem.gif diff --git a/src/canonical/models/back-shiny/Mimikyu.gif b/src/canonical/models/back-shiny/778--0--Mimikyu.gif similarity index 100% rename from src/canonical/models/back-shiny/Mimikyu.gif rename to src/canonical/models/back-shiny/778--0--Mimikyu.gif diff --git a/src/canonical/models/back-shiny/Mimikyu--Busted-Totem.gif b/src/canonical/models/back-shiny/778--420--Mimikyu--Busted-Totem.gif similarity index 100% rename from src/canonical/models/back-shiny/Mimikyu--Busted-Totem.gif rename to src/canonical/models/back-shiny/778--420--Mimikyu--Busted-Totem.gif diff --git a/src/canonical/models/back-shiny/Mimikyu--Busted.gif b/src/canonical/models/back-shiny/778--420--Mimikyu--Busted.gif similarity index 100% rename from src/canonical/models/back-shiny/Mimikyu--Busted.gif rename to src/canonical/models/back-shiny/778--420--Mimikyu--Busted.gif diff --git a/src/canonical/models/back-shiny/Mimikyu--Totem.gif b/src/canonical/models/back-shiny/778--420--Mimikyu--Totem.gif similarity index 100% rename from src/canonical/models/back-shiny/Mimikyu--Totem.gif rename to src/canonical/models/back-shiny/778--420--Mimikyu--Totem.gif diff --git a/src/canonical/models/back-shiny/Bruxish.gif b/src/canonical/models/back-shiny/779--0--Bruxish.gif similarity index 100% rename from src/canonical/models/back-shiny/Bruxish.gif rename to src/canonical/models/back-shiny/779--0--Bruxish.gif diff --git a/src/canonical/models/back-shiny/Rapidash.gif b/src/canonical/models/back-shiny/78--0--Rapidash.gif similarity index 100% rename from src/canonical/models/back-shiny/Rapidash.gif rename to src/canonical/models/back-shiny/78--0--Rapidash.gif diff --git a/src/canonical/models/back-shiny/Rapidash--Galar.gif b/src/canonical/models/back-shiny/78--420--Rapidash--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Rapidash--Galar.gif rename to src/canonical/models/back-shiny/78--420--Rapidash--Galar.gif diff --git a/src/canonical/models/back-shiny/Drampa.gif b/src/canonical/models/back-shiny/780--0--Drampa.gif similarity index 100% rename from src/canonical/models/back-shiny/Drampa.gif rename to src/canonical/models/back-shiny/780--0--Drampa.gif diff --git a/src/canonical/models/back-shiny/Dhelmise.gif b/src/canonical/models/back-shiny/781--0--Dhelmise.gif similarity index 100% rename from src/canonical/models/back-shiny/Dhelmise.gif rename to src/canonical/models/back-shiny/781--0--Dhelmise.gif diff --git a/src/canonical/models/back-shiny/Jangmo-o.gif b/src/canonical/models/back-shiny/782--0--Jangmo-o.gif similarity index 100% rename from src/canonical/models/back-shiny/Jangmo-o.gif rename to src/canonical/models/back-shiny/782--0--Jangmo-o.gif diff --git a/src/canonical/models/back-shiny/Hakamo-o.gif b/src/canonical/models/back-shiny/783--0--Hakamo-o.gif similarity index 100% rename from src/canonical/models/back-shiny/Hakamo-o.gif rename to src/canonical/models/back-shiny/783--0--Hakamo-o.gif diff --git a/src/canonical/models/back-shiny/Kommo-o.gif b/src/canonical/models/back-shiny/784--0--Kommo-o.gif similarity index 100% rename from src/canonical/models/back-shiny/Kommo-o.gif rename to src/canonical/models/back-shiny/784--0--Kommo-o.gif diff --git a/src/canonical/models/back-shiny/Kommo-o--Totem.gif b/src/canonical/models/back-shiny/784--420--Kommo-o--Totem.gif similarity index 100% rename from src/canonical/models/back-shiny/Kommo-o--Totem.gif rename to src/canonical/models/back-shiny/784--420--Kommo-o--Totem.gif diff --git a/src/canonical/models/back-shiny/Tapu_Koko.gif b/src/canonical/models/back-shiny/785--0--Tapu_Koko.gif similarity index 100% rename from src/canonical/models/back-shiny/Tapu_Koko.gif rename to src/canonical/models/back-shiny/785--0--Tapu_Koko.gif diff --git a/src/canonical/models/back-shiny/Tapu_Lele.gif b/src/canonical/models/back-shiny/786--0--Tapu_Lele.gif similarity index 100% rename from src/canonical/models/back-shiny/Tapu_Lele.gif rename to src/canonical/models/back-shiny/786--0--Tapu_Lele.gif diff --git a/src/canonical/models/back-shiny/Tapu_Bulu.gif b/src/canonical/models/back-shiny/787--0--Tapu_Bulu.gif similarity index 100% rename from src/canonical/models/back-shiny/Tapu_Bulu.gif rename to src/canonical/models/back-shiny/787--0--Tapu_Bulu.gif diff --git a/src/canonical/models/back-shiny/Tapu_Fini.gif b/src/canonical/models/back-shiny/788--0--Tapu_Fini.gif similarity index 100% rename from src/canonical/models/back-shiny/Tapu_Fini.gif rename to src/canonical/models/back-shiny/788--0--Tapu_Fini.gif diff --git a/src/canonical/models/back-shiny/Cosmog.gif b/src/canonical/models/back-shiny/789--0--Cosmog.gif similarity index 100% rename from src/canonical/models/back-shiny/Cosmog.gif rename to src/canonical/models/back-shiny/789--0--Cosmog.gif diff --git a/src/canonical/models/back-shiny/Slowpoke.gif b/src/canonical/models/back-shiny/79--0--Slowpoke.gif similarity index 100% rename from src/canonical/models/back-shiny/Slowpoke.gif rename to src/canonical/models/back-shiny/79--0--Slowpoke.gif diff --git a/src/canonical/models/back-shiny/Slowpoke--Galar.gif b/src/canonical/models/back-shiny/79--420--Slowpoke--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Slowpoke--Galar.gif rename to src/canonical/models/back-shiny/79--420--Slowpoke--Galar.gif diff --git a/src/canonical/models/back-shiny/Cosmoem.gif b/src/canonical/models/back-shiny/790--0--Cosmoem.gif similarity index 100% rename from src/canonical/models/back-shiny/Cosmoem.gif rename to src/canonical/models/back-shiny/790--0--Cosmoem.gif diff --git a/src/canonical/models/back-shiny/Solgaleo.gif b/src/canonical/models/back-shiny/791--0--Solgaleo.gif similarity index 100% rename from src/canonical/models/back-shiny/Solgaleo.gif rename to src/canonical/models/back-shiny/791--0--Solgaleo.gif diff --git a/src/canonical/models/back-shiny/Lunala.gif b/src/canonical/models/back-shiny/792--0--Lunala.gif similarity index 100% rename from src/canonical/models/back-shiny/Lunala.gif rename to src/canonical/models/back-shiny/792--0--Lunala.gif diff --git a/src/canonical/models/back-shiny/Nihilego.gif b/src/canonical/models/back-shiny/793--0--Nihilego.gif similarity index 100% rename from src/canonical/models/back-shiny/Nihilego.gif rename to src/canonical/models/back-shiny/793--0--Nihilego.gif diff --git a/src/canonical/models/back-shiny/Buzzwole.gif b/src/canonical/models/back-shiny/794--0--Buzzwole.gif similarity index 100% rename from src/canonical/models/back-shiny/Buzzwole.gif rename to src/canonical/models/back-shiny/794--0--Buzzwole.gif diff --git a/src/canonical/models/back-shiny/Pheromosa.gif b/src/canonical/models/back-shiny/795--0--Pheromosa.gif similarity index 100% rename from src/canonical/models/back-shiny/Pheromosa.gif rename to src/canonical/models/back-shiny/795--0--Pheromosa.gif diff --git a/src/canonical/models/back-shiny/Xurkitree.gif b/src/canonical/models/back-shiny/796--0--Xurkitree.gif similarity index 100% rename from src/canonical/models/back-shiny/Xurkitree.gif rename to src/canonical/models/back-shiny/796--0--Xurkitree.gif diff --git a/src/canonical/models/back-shiny/Celesteela.gif b/src/canonical/models/back-shiny/797--0--Celesteela.gif similarity index 100% rename from src/canonical/models/back-shiny/Celesteela.gif rename to src/canonical/models/back-shiny/797--0--Celesteela.gif diff --git a/src/canonical/models/back-shiny/Kartana.gif b/src/canonical/models/back-shiny/798--0--Kartana.gif similarity index 100% rename from src/canonical/models/back-shiny/Kartana.gif rename to src/canonical/models/back-shiny/798--0--Kartana.gif diff --git a/src/canonical/models/back-shiny/Guzzlord.gif b/src/canonical/models/back-shiny/799--0--Guzzlord.gif similarity index 100% rename from src/canonical/models/back-shiny/Guzzlord.gif rename to src/canonical/models/back-shiny/799--0--Guzzlord.gif diff --git a/src/canonical/models/back-shiny/Wartortle.gif b/src/canonical/models/back-shiny/8--0--Wartortle.gif similarity index 100% rename from src/canonical/models/back-shiny/Wartortle.gif rename to src/canonical/models/back-shiny/8--0--Wartortle.gif diff --git a/src/canonical/models/back-shiny/Slowbro.gif b/src/canonical/models/back-shiny/80--0--Slowbro.gif similarity index 100% rename from src/canonical/models/back-shiny/Slowbro.gif rename to src/canonical/models/back-shiny/80--0--Slowbro.gif diff --git a/src/canonical/models/back-shiny/Slowbro--Mega.gif b/src/canonical/models/back-shiny/80--420--Slowbro--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Slowbro--Mega.gif rename to src/canonical/models/back-shiny/80--420--Slowbro--Mega.gif diff --git a/src/canonical/models/back-shiny/Necrozma.gif b/src/canonical/models/back-shiny/800--0--Necrozma.gif similarity index 100% rename from src/canonical/models/back-shiny/Necrozma.gif rename to src/canonical/models/back-shiny/800--0--Necrozma.gif diff --git a/src/canonical/models/back-shiny/Necrozma--Dawn_Wings.gif b/src/canonical/models/back-shiny/800--420--Necrozma--Dawn_Wings.gif similarity index 100% rename from src/canonical/models/back-shiny/Necrozma--Dawn_Wings.gif rename to src/canonical/models/back-shiny/800--420--Necrozma--Dawn_Wings.gif diff --git a/src/canonical/models/back-shiny/Necrozma--Dusk_Mane.gif b/src/canonical/models/back-shiny/800--420--Necrozma--Dusk_Mane.gif similarity index 100% rename from src/canonical/models/back-shiny/Necrozma--Dusk_Mane.gif rename to src/canonical/models/back-shiny/800--420--Necrozma--Dusk_Mane.gif diff --git a/src/canonical/models/back-shiny/Necrozma--Ultra.gif b/src/canonical/models/back-shiny/800--420--Necrozma--Ultra.gif similarity index 100% rename from src/canonical/models/back-shiny/Necrozma--Ultra.gif rename to src/canonical/models/back-shiny/800--420--Necrozma--Ultra.gif diff --git a/src/canonical/models/back-shiny/Magearna.gif b/src/canonical/models/back-shiny/801--0--Magearna.gif similarity index 100% rename from src/canonical/models/back-shiny/Magearna.gif rename to src/canonical/models/back-shiny/801--0--Magearna.gif diff --git a/src/canonical/models/back-shiny/Marshadow.gif b/src/canonical/models/back-shiny/802--0--Marshadow.gif similarity index 100% rename from src/canonical/models/back-shiny/Marshadow.gif rename to src/canonical/models/back-shiny/802--0--Marshadow.gif diff --git a/src/canonical/models/back-shiny/Poipole.gif b/src/canonical/models/back-shiny/803--0--Poipole.gif similarity index 100% rename from src/canonical/models/back-shiny/Poipole.gif rename to src/canonical/models/back-shiny/803--0--Poipole.gif diff --git a/src/canonical/models/back-shiny/Naganadel.gif b/src/canonical/models/back-shiny/804--0--Naganadel.gif similarity index 100% rename from src/canonical/models/back-shiny/Naganadel.gif rename to src/canonical/models/back-shiny/804--0--Naganadel.gif diff --git a/src/canonical/models/back-shiny/Stakataka.gif b/src/canonical/models/back-shiny/805--0--Stakataka.gif similarity index 100% rename from src/canonical/models/back-shiny/Stakataka.gif rename to src/canonical/models/back-shiny/805--0--Stakataka.gif diff --git a/src/canonical/models/back-shiny/Blacephalon.gif b/src/canonical/models/back-shiny/806--0--Blacephalon.gif similarity index 100% rename from src/canonical/models/back-shiny/Blacephalon.gif rename to src/canonical/models/back-shiny/806--0--Blacephalon.gif diff --git a/src/canonical/models/back-shiny/Zeraora.gif b/src/canonical/models/back-shiny/807--0--Zeraora.gif similarity index 100% rename from src/canonical/models/back-shiny/Zeraora.gif rename to src/canonical/models/back-shiny/807--0--Zeraora.gif diff --git a/src/canonical/models/back-shiny/Meltan.gif b/src/canonical/models/back-shiny/808--0--Meltan.gif similarity index 100% rename from src/canonical/models/back-shiny/Meltan.gif rename to src/canonical/models/back-shiny/808--0--Meltan.gif diff --git a/src/canonical/models/back-shiny/Melmetal.gif b/src/canonical/models/back-shiny/809--0--Melmetal.gif similarity index 100% rename from src/canonical/models/back-shiny/Melmetal.gif rename to src/canonical/models/back-shiny/809--0--Melmetal.gif diff --git a/src/canonical/models/back-shiny/Melmetal--Gmax.gif b/src/canonical/models/back-shiny/809--420--Melmetal--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Melmetal--Gmax.gif rename to src/canonical/models/back-shiny/809--420--Melmetal--Gmax.gif diff --git a/src/canonical/models/back-shiny/Magnemite.gif b/src/canonical/models/back-shiny/81--0--Magnemite.gif similarity index 100% rename from src/canonical/models/back-shiny/Magnemite.gif rename to src/canonical/models/back-shiny/81--0--Magnemite.gif diff --git a/src/canonical/models/back-shiny/Grookey.gif b/src/canonical/models/back-shiny/810--0--Grookey.gif similarity index 100% rename from src/canonical/models/back-shiny/Grookey.gif rename to src/canonical/models/back-shiny/810--0--Grookey.gif diff --git a/src/canonical/models/back-shiny/Thwackey.gif b/src/canonical/models/back-shiny/811--0--Thwackey.gif similarity index 100% rename from src/canonical/models/back-shiny/Thwackey.gif rename to src/canonical/models/back-shiny/811--0--Thwackey.gif diff --git a/src/canonical/models/back-shiny/Rillaboom.gif b/src/canonical/models/back-shiny/812--0--Rillaboom.gif similarity index 100% rename from src/canonical/models/back-shiny/Rillaboom.gif rename to src/canonical/models/back-shiny/812--0--Rillaboom.gif diff --git a/src/canonical/models/back-shiny/Scorbunny.gif b/src/canonical/models/back-shiny/813--0--Scorbunny.gif similarity index 100% rename from src/canonical/models/back-shiny/Scorbunny.gif rename to src/canonical/models/back-shiny/813--0--Scorbunny.gif diff --git a/src/canonical/models/back-shiny/Raboot.gif b/src/canonical/models/back-shiny/814--0--Raboot.gif similarity index 100% rename from src/canonical/models/back-shiny/Raboot.gif rename to src/canonical/models/back-shiny/814--0--Raboot.gif diff --git a/src/canonical/models/back-shiny/Cinderace.gif b/src/canonical/models/back-shiny/815--0--Cinderace.gif similarity index 100% rename from src/canonical/models/back-shiny/Cinderace.gif rename to src/canonical/models/back-shiny/815--0--Cinderace.gif diff --git a/src/canonical/models/back-shiny/Sobble.gif b/src/canonical/models/back-shiny/816--0--Sobble.gif similarity index 100% rename from src/canonical/models/back-shiny/Sobble.gif rename to src/canonical/models/back-shiny/816--0--Sobble.gif diff --git a/src/canonical/models/back-shiny/Drizzile.gif b/src/canonical/models/back-shiny/817--0--Drizzile.gif similarity index 100% rename from src/canonical/models/back-shiny/Drizzile.gif rename to src/canonical/models/back-shiny/817--0--Drizzile.gif diff --git a/src/canonical/models/back-shiny/Inteleon.gif b/src/canonical/models/back-shiny/818--0--Inteleon.gif similarity index 100% rename from src/canonical/models/back-shiny/Inteleon.gif rename to src/canonical/models/back-shiny/818--0--Inteleon.gif diff --git a/src/canonical/models/back-shiny/Skwovet.gif b/src/canonical/models/back-shiny/819--0--Skwovet.gif similarity index 100% rename from src/canonical/models/back-shiny/Skwovet.gif rename to src/canonical/models/back-shiny/819--0--Skwovet.gif diff --git a/src/canonical/models/back-shiny/Magneton.gif b/src/canonical/models/back-shiny/82--0--Magneton.gif similarity index 100% rename from src/canonical/models/back-shiny/Magneton.gif rename to src/canonical/models/back-shiny/82--0--Magneton.gif diff --git a/src/canonical/models/back-shiny/Greedent.gif b/src/canonical/models/back-shiny/820--0--Greedent.gif similarity index 100% rename from src/canonical/models/back-shiny/Greedent.gif rename to src/canonical/models/back-shiny/820--0--Greedent.gif diff --git a/src/canonical/models/back-shiny/Rookidee.gif b/src/canonical/models/back-shiny/821--0--Rookidee.gif similarity index 100% rename from src/canonical/models/back-shiny/Rookidee.gif rename to src/canonical/models/back-shiny/821--0--Rookidee.gif diff --git a/src/canonical/models/back-shiny/Corvisquire.gif b/src/canonical/models/back-shiny/822--0--Corvisquire.gif similarity index 100% rename from src/canonical/models/back-shiny/Corvisquire.gif rename to src/canonical/models/back-shiny/822--0--Corvisquire.gif diff --git a/src/canonical/models/back-shiny/Corviknight.gif b/src/canonical/models/back-shiny/823--0--Corviknight.gif similarity index 100% rename from src/canonical/models/back-shiny/Corviknight.gif rename to src/canonical/models/back-shiny/823--0--Corviknight.gif diff --git a/src/canonical/models/back-shiny/Corviknight--Gmax.gif b/src/canonical/models/back-shiny/823--420--Corviknight--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Corviknight--Gmax.gif rename to src/canonical/models/back-shiny/823--420--Corviknight--Gmax.gif diff --git a/src/canonical/models/back-shiny/Blipbug.gif b/src/canonical/models/back-shiny/824--0--Blipbug.gif similarity index 100% rename from src/canonical/models/back-shiny/Blipbug.gif rename to src/canonical/models/back-shiny/824--0--Blipbug.gif diff --git a/src/canonical/models/back-shiny/Dottler.gif b/src/canonical/models/back-shiny/825--0--Dottler.gif similarity index 100% rename from src/canonical/models/back-shiny/Dottler.gif rename to src/canonical/models/back-shiny/825--0--Dottler.gif diff --git a/src/canonical/models/back-shiny/Orbeetle.gif b/src/canonical/models/back-shiny/826--0--Orbeetle.gif similarity index 100% rename from src/canonical/models/back-shiny/Orbeetle.gif rename to src/canonical/models/back-shiny/826--0--Orbeetle.gif diff --git a/src/canonical/models/back-shiny/Orbeetle--Gmax.gif b/src/canonical/models/back-shiny/826--420--Orbeetle--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Orbeetle--Gmax.gif rename to src/canonical/models/back-shiny/826--420--Orbeetle--Gmax.gif diff --git a/src/canonical/models/back-shiny/Nickit.gif b/src/canonical/models/back-shiny/827--0--Nickit.gif similarity index 100% rename from src/canonical/models/back-shiny/Nickit.gif rename to src/canonical/models/back-shiny/827--0--Nickit.gif diff --git a/src/canonical/models/back-shiny/Thievul.gif b/src/canonical/models/back-shiny/828--0--Thievul.gif similarity index 100% rename from src/canonical/models/back-shiny/Thievul.gif rename to src/canonical/models/back-shiny/828--0--Thievul.gif diff --git a/src/canonical/models/back-shiny/Gossifleur.gif b/src/canonical/models/back-shiny/829--0--Gossifleur.gif similarity index 100% rename from src/canonical/models/back-shiny/Gossifleur.gif rename to src/canonical/models/back-shiny/829--0--Gossifleur.gif diff --git a/src/canonical/models/back-shiny/Farfetch__0027d.gif b/src/canonical/models/back-shiny/83--0--Farfetch__0027d.gif similarity index 100% rename from src/canonical/models/back-shiny/Farfetch__0027d.gif rename to src/canonical/models/back-shiny/83--0--Farfetch__0027d.gif diff --git a/src/canonical/models/back-shiny/Farfetch__0027d--Galar.gif b/src/canonical/models/back-shiny/83--420--Farfetch__0027d--Galar.gif similarity index 100% rename from src/canonical/models/back-shiny/Farfetch__0027d--Galar.gif rename to src/canonical/models/back-shiny/83--420--Farfetch__0027d--Galar.gif diff --git a/src/canonical/models/back-shiny/Eldegoss.gif b/src/canonical/models/back-shiny/830--0--Eldegoss.gif similarity index 100% rename from src/canonical/models/back-shiny/Eldegoss.gif rename to src/canonical/models/back-shiny/830--0--Eldegoss.gif diff --git a/src/canonical/models/back-shiny/Wooloo.gif b/src/canonical/models/back-shiny/831--0--Wooloo.gif similarity index 100% rename from src/canonical/models/back-shiny/Wooloo.gif rename to src/canonical/models/back-shiny/831--0--Wooloo.gif diff --git a/src/canonical/models/back-shiny/Dubwool.gif b/src/canonical/models/back-shiny/832--0--Dubwool.gif similarity index 100% rename from src/canonical/models/back-shiny/Dubwool.gif rename to src/canonical/models/back-shiny/832--0--Dubwool.gif diff --git a/src/canonical/models/back-shiny/Chewtle.gif b/src/canonical/models/back-shiny/833--0--Chewtle.gif similarity index 100% rename from src/canonical/models/back-shiny/Chewtle.gif rename to src/canonical/models/back-shiny/833--0--Chewtle.gif diff --git a/src/canonical/models/back-shiny/Drednaw.gif b/src/canonical/models/back-shiny/834--0--Drednaw.gif similarity index 100% rename from src/canonical/models/back-shiny/Drednaw.gif rename to src/canonical/models/back-shiny/834--0--Drednaw.gif diff --git a/src/canonical/models/back-shiny/Drednaw--Gmax.gif b/src/canonical/models/back-shiny/834--420--Drednaw--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Drednaw--Gmax.gif rename to src/canonical/models/back-shiny/834--420--Drednaw--Gmax.gif diff --git a/src/canonical/models/back-shiny/Yamper.gif b/src/canonical/models/back-shiny/835--0--Yamper.gif similarity index 100% rename from src/canonical/models/back-shiny/Yamper.gif rename to src/canonical/models/back-shiny/835--0--Yamper.gif diff --git a/src/canonical/models/back-shiny/Boltund.gif b/src/canonical/models/back-shiny/836--0--Boltund.gif similarity index 100% rename from src/canonical/models/back-shiny/Boltund.gif rename to src/canonical/models/back-shiny/836--0--Boltund.gif diff --git a/src/canonical/models/back-shiny/Rolycoly.gif b/src/canonical/models/back-shiny/837--0--Rolycoly.gif similarity index 100% rename from src/canonical/models/back-shiny/Rolycoly.gif rename to src/canonical/models/back-shiny/837--0--Rolycoly.gif diff --git a/src/canonical/models/back-shiny/Carkol.gif b/src/canonical/models/back-shiny/838--0--Carkol.gif similarity index 100% rename from src/canonical/models/back-shiny/Carkol.gif rename to src/canonical/models/back-shiny/838--0--Carkol.gif diff --git a/src/canonical/models/back-shiny/Coalossal.gif b/src/canonical/models/back-shiny/839--0--Coalossal.gif similarity index 100% rename from src/canonical/models/back-shiny/Coalossal.gif rename to src/canonical/models/back-shiny/839--0--Coalossal.gif diff --git a/src/canonical/models/back-shiny/Coalossal--Gmax.gif b/src/canonical/models/back-shiny/839--420--Coalossal--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Coalossal--Gmax.gif rename to src/canonical/models/back-shiny/839--420--Coalossal--Gmax.gif diff --git a/src/canonical/models/back-shiny/Doduo.gif b/src/canonical/models/back-shiny/84--0--Doduo.gif similarity index 100% rename from src/canonical/models/back-shiny/Doduo.gif rename to src/canonical/models/back-shiny/84--0--Doduo.gif diff --git a/src/canonical/models/back-shiny/Applin.gif b/src/canonical/models/back-shiny/840--0--Applin.gif similarity index 100% rename from src/canonical/models/back-shiny/Applin.gif rename to src/canonical/models/back-shiny/840--0--Applin.gif diff --git a/src/canonical/models/back-shiny/Flapple.gif b/src/canonical/models/back-shiny/841--0--Flapple.gif similarity index 100% rename from src/canonical/models/back-shiny/Flapple.gif rename to src/canonical/models/back-shiny/841--0--Flapple.gif diff --git a/src/canonical/models/back-shiny/Flapple--Gmax.gif b/src/canonical/models/back-shiny/841--420--Flapple--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Flapple--Gmax.gif rename to src/canonical/models/back-shiny/841--420--Flapple--Gmax.gif diff --git a/src/canonical/models/back-shiny/Appletun.gif b/src/canonical/models/back-shiny/842--0--Appletun.gif similarity index 100% rename from src/canonical/models/back-shiny/Appletun.gif rename to src/canonical/models/back-shiny/842--0--Appletun.gif diff --git a/src/canonical/models/back-shiny/Appletun--Gmax.gif b/src/canonical/models/back-shiny/842--420--Appletun--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Appletun--Gmax.gif rename to src/canonical/models/back-shiny/842--420--Appletun--Gmax.gif diff --git a/src/canonical/models/back-shiny/Silicobra.gif b/src/canonical/models/back-shiny/843--0--Silicobra.gif similarity index 100% rename from src/canonical/models/back-shiny/Silicobra.gif rename to src/canonical/models/back-shiny/843--0--Silicobra.gif diff --git a/src/canonical/models/back-shiny/Sandaconda.gif b/src/canonical/models/back-shiny/844--0--Sandaconda.gif similarity index 100% rename from src/canonical/models/back-shiny/Sandaconda.gif rename to src/canonical/models/back-shiny/844--0--Sandaconda.gif diff --git a/src/canonical/models/back-shiny/Sandaconda--Gmax.gif b/src/canonical/models/back-shiny/844--420--Sandaconda--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Sandaconda--Gmax.gif rename to src/canonical/models/back-shiny/844--420--Sandaconda--Gmax.gif diff --git a/src/canonical/models/back-shiny/Cramorant.gif b/src/canonical/models/back-shiny/845--0--Cramorant.gif similarity index 100% rename from src/canonical/models/back-shiny/Cramorant.gif rename to src/canonical/models/back-shiny/845--0--Cramorant.gif diff --git a/src/canonical/models/back-shiny/Cramorant--Gorging.gif b/src/canonical/models/back-shiny/845--420--Cramorant--Gorging.gif similarity index 100% rename from src/canonical/models/back-shiny/Cramorant--Gorging.gif rename to src/canonical/models/back-shiny/845--420--Cramorant--Gorging.gif diff --git a/src/canonical/models/back-shiny/Cramorant--Gulping.gif b/src/canonical/models/back-shiny/845--420--Cramorant--Gulping.gif similarity index 100% rename from src/canonical/models/back-shiny/Cramorant--Gulping.gif rename to src/canonical/models/back-shiny/845--420--Cramorant--Gulping.gif diff --git a/src/canonical/models/back-shiny/Arrokuda.gif b/src/canonical/models/back-shiny/846--0--Arrokuda.gif similarity index 100% rename from src/canonical/models/back-shiny/Arrokuda.gif rename to src/canonical/models/back-shiny/846--0--Arrokuda.gif diff --git a/src/canonical/models/back-shiny/Barraskewda.gif b/src/canonical/models/back-shiny/847--0--Barraskewda.gif similarity index 100% rename from src/canonical/models/back-shiny/Barraskewda.gif rename to src/canonical/models/back-shiny/847--0--Barraskewda.gif diff --git a/src/canonical/models/back-shiny/Toxel.gif b/src/canonical/models/back-shiny/848--0--Toxel.gif similarity index 100% rename from src/canonical/models/back-shiny/Toxel.gif rename to src/canonical/models/back-shiny/848--0--Toxel.gif diff --git a/src/canonical/models/back-shiny/Toxtricity.gif b/src/canonical/models/back-shiny/849--0--Toxtricity.gif similarity index 100% rename from src/canonical/models/back-shiny/Toxtricity.gif rename to src/canonical/models/back-shiny/849--0--Toxtricity.gif diff --git a/src/canonical/models/back-shiny/Toxtricity--Gmax.gif b/src/canonical/models/back-shiny/849--420--Toxtricity--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Toxtricity--Gmax.gif rename to src/canonical/models/back-shiny/849--420--Toxtricity--Gmax.gif diff --git a/src/canonical/models/back-shiny/Toxtricity--Low-Key.gif b/src/canonical/models/back-shiny/849--420--Toxtricity--Low-Key.gif similarity index 100% rename from src/canonical/models/back-shiny/Toxtricity--Low-Key.gif rename to src/canonical/models/back-shiny/849--420--Toxtricity--Low-Key.gif diff --git a/src/canonical/models/back-shiny/Dodrio.gif b/src/canonical/models/back-shiny/85--0--Dodrio.gif similarity index 100% rename from src/canonical/models/back-shiny/Dodrio.gif rename to src/canonical/models/back-shiny/85--0--Dodrio.gif diff --git a/src/canonical/models/back-shiny/Sizzlipede.gif b/src/canonical/models/back-shiny/850--0--Sizzlipede.gif similarity index 100% rename from src/canonical/models/back-shiny/Sizzlipede.gif rename to src/canonical/models/back-shiny/850--0--Sizzlipede.gif diff --git a/src/canonical/models/back-shiny/Centiskorch.gif b/src/canonical/models/back-shiny/851--0--Centiskorch.gif similarity index 100% rename from src/canonical/models/back-shiny/Centiskorch.gif rename to src/canonical/models/back-shiny/851--0--Centiskorch.gif diff --git a/src/canonical/models/back-shiny/Centiskorch--Gmax.gif b/src/canonical/models/back-shiny/851--420--Centiskorch--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Centiskorch--Gmax.gif rename to src/canonical/models/back-shiny/851--420--Centiskorch--Gmax.gif diff --git a/src/canonical/models/back-shiny/Clobbopus.gif b/src/canonical/models/back-shiny/852--0--Clobbopus.gif similarity index 100% rename from src/canonical/models/back-shiny/Clobbopus.gif rename to src/canonical/models/back-shiny/852--0--Clobbopus.gif diff --git a/src/canonical/models/back-shiny/Grapploct.gif b/src/canonical/models/back-shiny/853--0--Grapploct.gif similarity index 100% rename from src/canonical/models/back-shiny/Grapploct.gif rename to src/canonical/models/back-shiny/853--0--Grapploct.gif diff --git a/src/canonical/models/back-shiny/Sinistea--Antique.gif b/src/canonical/models/back-shiny/854--0--Sinistea.gif similarity index 100% rename from src/canonical/models/back-shiny/Sinistea--Antique.gif rename to src/canonical/models/back-shiny/854--0--Sinistea.gif diff --git a/src/canonical/models/back-shiny/Sinistea.gif b/src/canonical/models/back-shiny/854--420--Sinistea--Antique.gif similarity index 100% rename from src/canonical/models/back-shiny/Sinistea.gif rename to src/canonical/models/back-shiny/854--420--Sinistea--Antique.gif diff --git a/src/canonical/models/back-shiny/Polteageist--Antique.gif b/src/canonical/models/back-shiny/855--0--Polteageist.gif similarity index 100% rename from src/canonical/models/back-shiny/Polteageist--Antique.gif rename to src/canonical/models/back-shiny/855--0--Polteageist.gif diff --git a/src/canonical/models/back-shiny/Polteageist.gif b/src/canonical/models/back-shiny/855--420--Polteageist--Antique.gif similarity index 100% rename from src/canonical/models/back-shiny/Polteageist.gif rename to src/canonical/models/back-shiny/855--420--Polteageist--Antique.gif diff --git a/src/canonical/models/back-shiny/Hatenna.gif b/src/canonical/models/back-shiny/856--0--Hatenna.gif similarity index 100% rename from src/canonical/models/back-shiny/Hatenna.gif rename to src/canonical/models/back-shiny/856--0--Hatenna.gif diff --git a/src/canonical/models/back-shiny/Hattrem.gif b/src/canonical/models/back-shiny/857--0--Hattrem.gif similarity index 100% rename from src/canonical/models/back-shiny/Hattrem.gif rename to src/canonical/models/back-shiny/857--0--Hattrem.gif diff --git a/src/canonical/models/back-shiny/Hatterene.gif b/src/canonical/models/back-shiny/858--0--Hatterene.gif similarity index 100% rename from src/canonical/models/back-shiny/Hatterene.gif rename to src/canonical/models/back-shiny/858--0--Hatterene.gif diff --git a/src/canonical/models/back-shiny/Hatterene--Gmax.gif b/src/canonical/models/back-shiny/858--420--Hatterene--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Hatterene--Gmax.gif rename to src/canonical/models/back-shiny/858--420--Hatterene--Gmax.gif diff --git a/src/canonical/models/back-shiny/Impidimp.gif b/src/canonical/models/back-shiny/859--0--Impidimp.gif similarity index 100% rename from src/canonical/models/back-shiny/Impidimp.gif rename to src/canonical/models/back-shiny/859--0--Impidimp.gif diff --git a/src/canonical/models/back-shiny/Seel.gif b/src/canonical/models/back-shiny/86--0--Seel.gif similarity index 100% rename from src/canonical/models/back-shiny/Seel.gif rename to src/canonical/models/back-shiny/86--0--Seel.gif diff --git a/src/canonical/models/back-shiny/Morgrem.gif b/src/canonical/models/back-shiny/860--0--Morgrem.gif similarity index 100% rename from src/canonical/models/back-shiny/Morgrem.gif rename to src/canonical/models/back-shiny/860--0--Morgrem.gif diff --git a/src/canonical/models/back-shiny/Grimmsnarl.gif b/src/canonical/models/back-shiny/861--0--Grimmsnarl.gif similarity index 100% rename from src/canonical/models/back-shiny/Grimmsnarl.gif rename to src/canonical/models/back-shiny/861--0--Grimmsnarl.gif diff --git a/src/canonical/models/back-shiny/Grimmsnarl--Gmax.gif b/src/canonical/models/back-shiny/861--420--Grimmsnarl--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Grimmsnarl--Gmax.gif rename to src/canonical/models/back-shiny/861--420--Grimmsnarl--Gmax.gif diff --git a/src/canonical/models/back-shiny/Obstagoon.gif b/src/canonical/models/back-shiny/862--0--Obstagoon.gif similarity index 100% rename from src/canonical/models/back-shiny/Obstagoon.gif rename to src/canonical/models/back-shiny/862--0--Obstagoon.gif diff --git a/src/canonical/models/back-shiny/Perrserker.gif b/src/canonical/models/back-shiny/863--0--Perrserker.gif similarity index 100% rename from src/canonical/models/back-shiny/Perrserker.gif rename to src/canonical/models/back-shiny/863--0--Perrserker.gif diff --git a/src/canonical/models/back-shiny/Cursola.gif b/src/canonical/models/back-shiny/864--0--Cursola.gif similarity index 100% rename from src/canonical/models/back-shiny/Cursola.gif rename to src/canonical/models/back-shiny/864--0--Cursola.gif diff --git a/src/canonical/models/back-shiny/Sirfetch__0027d.gif b/src/canonical/models/back-shiny/865--0--Sirfetch__0027d.gif similarity index 100% rename from src/canonical/models/back-shiny/Sirfetch__0027d.gif rename to src/canonical/models/back-shiny/865--0--Sirfetch__0027d.gif diff --git a/src/canonical/models/back-shiny/Mr._Rime.gif b/src/canonical/models/back-shiny/866--0--Mr._Rime.gif similarity index 100% rename from src/canonical/models/back-shiny/Mr._Rime.gif rename to src/canonical/models/back-shiny/866--0--Mr._Rime.gif diff --git a/src/canonical/models/back-shiny/Runerigus.gif b/src/canonical/models/back-shiny/867--0--Runerigus.gif similarity index 100% rename from src/canonical/models/back-shiny/Runerigus.gif rename to src/canonical/models/back-shiny/867--0--Runerigus.gif diff --git a/src/canonical/models/back-shiny/Milcery.gif b/src/canonical/models/back-shiny/868--0--Milcery.gif similarity index 100% rename from src/canonical/models/back-shiny/Milcery.gif rename to src/canonical/models/back-shiny/868--0--Milcery.gif diff --git a/src/canonical/models/back-shiny/Alcremie.gif b/src/canonical/models/back-shiny/869--0--Alcremie.gif similarity index 100% rename from src/canonical/models/back-shiny/Alcremie.gif rename to src/canonical/models/back-shiny/869--0--Alcremie.gif diff --git a/src/canonical/models/back-shiny/Alcremie--Gmax.gif b/src/canonical/models/back-shiny/869--420--Alcremie--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Alcremie--Gmax.gif rename to src/canonical/models/back-shiny/869--420--Alcremie--Gmax.gif diff --git a/src/canonical/models/back-shiny/Dewgong.gif b/src/canonical/models/back-shiny/87--0--Dewgong.gif similarity index 100% rename from src/canonical/models/back-shiny/Dewgong.gif rename to src/canonical/models/back-shiny/87--0--Dewgong.gif diff --git a/src/canonical/models/back-shiny/Falinks.gif b/src/canonical/models/back-shiny/870--0--Falinks.gif similarity index 100% rename from src/canonical/models/back-shiny/Falinks.gif rename to src/canonical/models/back-shiny/870--0--Falinks.gif diff --git a/src/canonical/models/back-shiny/Pincurchin.gif b/src/canonical/models/back-shiny/871--0--Pincurchin.gif similarity index 100% rename from src/canonical/models/back-shiny/Pincurchin.gif rename to src/canonical/models/back-shiny/871--0--Pincurchin.gif diff --git a/src/canonical/models/back-shiny/Snom.gif b/src/canonical/models/back-shiny/872--0--Snom.gif similarity index 100% rename from src/canonical/models/back-shiny/Snom.gif rename to src/canonical/models/back-shiny/872--0--Snom.gif diff --git a/src/canonical/models/back-shiny/Frosmoth.gif b/src/canonical/models/back-shiny/873--0--Frosmoth.gif similarity index 100% rename from src/canonical/models/back-shiny/Frosmoth.gif rename to src/canonical/models/back-shiny/873--0--Frosmoth.gif diff --git a/src/canonical/models/back-shiny/Stonjourner.gif b/src/canonical/models/back-shiny/874--0--Stonjourner.gif similarity index 100% rename from src/canonical/models/back-shiny/Stonjourner.gif rename to src/canonical/models/back-shiny/874--0--Stonjourner.gif diff --git a/src/canonical/models/back-shiny/Eiscue.gif b/src/canonical/models/back-shiny/875--0--Eiscue.gif similarity index 100% rename from src/canonical/models/back-shiny/Eiscue.gif rename to src/canonical/models/back-shiny/875--0--Eiscue.gif diff --git a/src/canonical/models/back-shiny/Eiscue--Noice.gif b/src/canonical/models/back-shiny/875--420--Eiscue--Noice.gif similarity index 100% rename from src/canonical/models/back-shiny/Eiscue--Noice.gif rename to src/canonical/models/back-shiny/875--420--Eiscue--Noice.gif diff --git a/src/canonical/models/back-shiny/Indeedee.gif b/src/canonical/models/back-shiny/876--0--Indeedee.gif similarity index 100% rename from src/canonical/models/back-shiny/Indeedee.gif rename to src/canonical/models/back-shiny/876--0--Indeedee.gif diff --git a/src/canonical/models/back-shiny/Indeedee--F.gif b/src/canonical/models/back-shiny/876--420--Indeedee--F.gif similarity index 100% rename from src/canonical/models/back-shiny/Indeedee--F.gif rename to src/canonical/models/back-shiny/876--420--Indeedee--F.gif diff --git a/src/canonical/models/back-shiny/Morpeko.gif b/src/canonical/models/back-shiny/877--0--Morpeko.gif similarity index 100% rename from src/canonical/models/back-shiny/Morpeko.gif rename to src/canonical/models/back-shiny/877--0--Morpeko.gif diff --git a/src/canonical/models/back-shiny/Morpeko--Hangry.gif b/src/canonical/models/back-shiny/877--420--Morpeko--Hangry.gif similarity index 100% rename from src/canonical/models/back-shiny/Morpeko--Hangry.gif rename to src/canonical/models/back-shiny/877--420--Morpeko--Hangry.gif diff --git a/src/canonical/models/back-shiny/Cufant.gif b/src/canonical/models/back-shiny/878--0--Cufant.gif similarity index 100% rename from src/canonical/models/back-shiny/Cufant.gif rename to src/canonical/models/back-shiny/878--0--Cufant.gif diff --git a/src/canonical/models/back-shiny/Copperajah.gif b/src/canonical/models/back-shiny/879--0--Copperajah.gif similarity index 100% rename from src/canonical/models/back-shiny/Copperajah.gif rename to src/canonical/models/back-shiny/879--0--Copperajah.gif diff --git a/src/canonical/models/back-shiny/Copperajah--Gmax.gif b/src/canonical/models/back-shiny/879--420--Copperajah--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Copperajah--Gmax.gif rename to src/canonical/models/back-shiny/879--420--Copperajah--Gmax.gif diff --git a/src/canonical/models/back-shiny/Grimer.gif b/src/canonical/models/back-shiny/88--0--Grimer.gif similarity index 100% rename from src/canonical/models/back-shiny/Grimer.gif rename to src/canonical/models/back-shiny/88--0--Grimer.gif diff --git a/src/canonical/models/back-shiny/Grimer--Alola.gif b/src/canonical/models/back-shiny/88--420--Grimer--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Grimer--Alola.gif rename to src/canonical/models/back-shiny/88--420--Grimer--Alola.gif diff --git a/src/canonical/models/back-shiny/Dracozolt.gif b/src/canonical/models/back-shiny/880--0--Dracozolt.gif similarity index 100% rename from src/canonical/models/back-shiny/Dracozolt.gif rename to src/canonical/models/back-shiny/880--0--Dracozolt.gif diff --git a/src/canonical/models/back-shiny/Arctozolt.gif b/src/canonical/models/back-shiny/881--0--Arctozolt.gif similarity index 100% rename from src/canonical/models/back-shiny/Arctozolt.gif rename to src/canonical/models/back-shiny/881--0--Arctozolt.gif diff --git a/src/canonical/models/back-shiny/Dracovish.gif b/src/canonical/models/back-shiny/882--0--Dracovish.gif similarity index 100% rename from src/canonical/models/back-shiny/Dracovish.gif rename to src/canonical/models/back-shiny/882--0--Dracovish.gif diff --git a/src/canonical/models/back-shiny/Arctovish.gif b/src/canonical/models/back-shiny/883--0--Arctovish.gif similarity index 100% rename from src/canonical/models/back-shiny/Arctovish.gif rename to src/canonical/models/back-shiny/883--0--Arctovish.gif diff --git a/src/canonical/models/back-shiny/Duraludon.gif b/src/canonical/models/back-shiny/884--0--Duraludon.gif similarity index 100% rename from src/canonical/models/back-shiny/Duraludon.gif rename to src/canonical/models/back-shiny/884--0--Duraludon.gif diff --git a/src/canonical/models/back-shiny/Duraludon--Gmax.gif b/src/canonical/models/back-shiny/884--420--Duraludon--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Duraludon--Gmax.gif rename to src/canonical/models/back-shiny/884--420--Duraludon--Gmax.gif diff --git a/src/canonical/models/back-shiny/Dreepy.gif b/src/canonical/models/back-shiny/885--0--Dreepy.gif similarity index 100% rename from src/canonical/models/back-shiny/Dreepy.gif rename to src/canonical/models/back-shiny/885--0--Dreepy.gif diff --git a/src/canonical/models/back-shiny/Drakloak.gif b/src/canonical/models/back-shiny/886--0--Drakloak.gif similarity index 100% rename from src/canonical/models/back-shiny/Drakloak.gif rename to src/canonical/models/back-shiny/886--0--Drakloak.gif diff --git a/src/canonical/models/back-shiny/Dragapult.gif b/src/canonical/models/back-shiny/887--0--Dragapult.gif similarity index 100% rename from src/canonical/models/back-shiny/Dragapult.gif rename to src/canonical/models/back-shiny/887--0--Dragapult.gif diff --git a/src/canonical/models/back-shiny/Zacian.gif b/src/canonical/models/back-shiny/888--0--Zacian.gif similarity index 100% rename from src/canonical/models/back-shiny/Zacian.gif rename to src/canonical/models/back-shiny/888--0--Zacian.gif diff --git a/src/canonical/models/back-shiny/Zacian--Crowned.gif b/src/canonical/models/back-shiny/888--420--Zacian--Crowned.gif similarity index 100% rename from src/canonical/models/back-shiny/Zacian--Crowned.gif rename to src/canonical/models/back-shiny/888--420--Zacian--Crowned.gif diff --git a/src/canonical/models/back-shiny/Zamazenta.gif b/src/canonical/models/back-shiny/889--0--Zamazenta.gif similarity index 100% rename from src/canonical/models/back-shiny/Zamazenta.gif rename to src/canonical/models/back-shiny/889--0--Zamazenta.gif diff --git a/src/canonical/models/back-shiny/Zamazenta--Crowned.gif b/src/canonical/models/back-shiny/889--420--Zamazenta--Crowned.gif similarity index 100% rename from src/canonical/models/back-shiny/Zamazenta--Crowned.gif rename to src/canonical/models/back-shiny/889--420--Zamazenta--Crowned.gif diff --git a/src/canonical/models/back-shiny/Muk.gif b/src/canonical/models/back-shiny/89--0--Muk.gif similarity index 100% rename from src/canonical/models/back-shiny/Muk.gif rename to src/canonical/models/back-shiny/89--0--Muk.gif diff --git a/src/canonical/models/back-shiny/Muk--Alola.gif b/src/canonical/models/back-shiny/89--420--Muk--Alola.gif similarity index 100% rename from src/canonical/models/back-shiny/Muk--Alola.gif rename to src/canonical/models/back-shiny/89--420--Muk--Alola.gif diff --git a/src/canonical/models/back-shiny/Eternatus.gif b/src/canonical/models/back-shiny/890--0--Eternatus.gif similarity index 100% rename from src/canonical/models/back-shiny/Eternatus.gif rename to src/canonical/models/back-shiny/890--0--Eternatus.gif diff --git a/src/canonical/models/back-shiny/Eternatus--Eternamax.gif b/src/canonical/models/back-shiny/890--420--Eternatus--Eternamax.gif similarity index 100% rename from src/canonical/models/back-shiny/Eternatus--Eternamax.gif rename to src/canonical/models/back-shiny/890--420--Eternatus--Eternamax.gif diff --git a/src/canonical/models/back-shiny/Blastoise.gif b/src/canonical/models/back-shiny/9--0--Blastoise.gif similarity index 100% rename from src/canonical/models/back-shiny/Blastoise.gif rename to src/canonical/models/back-shiny/9--0--Blastoise.gif diff --git a/src/canonical/models/back-shiny/Blastoise--Mega.gif b/src/canonical/models/back-shiny/9--420--Blastoise--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Blastoise--Mega.gif rename to src/canonical/models/back-shiny/9--420--Blastoise--Mega.gif diff --git a/src/canonical/models/back-shiny/Shellder.gif b/src/canonical/models/back-shiny/90--0--Shellder.gif similarity index 100% rename from src/canonical/models/back-shiny/Shellder.gif rename to src/canonical/models/back-shiny/90--0--Shellder.gif diff --git a/src/canonical/models/back-shiny/Cloyster.gif b/src/canonical/models/back-shiny/91--0--Cloyster.gif similarity index 100% rename from src/canonical/models/back-shiny/Cloyster.gif rename to src/canonical/models/back-shiny/91--0--Cloyster.gif diff --git a/src/canonical/models/back-shiny/Gastly.gif b/src/canonical/models/back-shiny/92--0--Gastly.gif similarity index 100% rename from src/canonical/models/back-shiny/Gastly.gif rename to src/canonical/models/back-shiny/92--0--Gastly.gif diff --git a/src/canonical/models/back-shiny/Haunter.gif b/src/canonical/models/back-shiny/93--0--Haunter.gif similarity index 100% rename from src/canonical/models/back-shiny/Haunter.gif rename to src/canonical/models/back-shiny/93--0--Haunter.gif diff --git a/src/canonical/models/back-shiny/Gengar.gif b/src/canonical/models/back-shiny/94--0--Gengar.gif similarity index 100% rename from src/canonical/models/back-shiny/Gengar.gif rename to src/canonical/models/back-shiny/94--0--Gengar.gif diff --git a/src/canonical/models/back-shiny/Gengar--Gmax.gif b/src/canonical/models/back-shiny/94--420--Gengar--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Gengar--Gmax.gif rename to src/canonical/models/back-shiny/94--420--Gengar--Gmax.gif diff --git a/src/canonical/models/back-shiny/Gengar--Mega.gif b/src/canonical/models/back-shiny/94--420--Gengar--Mega.gif similarity index 100% rename from src/canonical/models/back-shiny/Gengar--Mega.gif rename to src/canonical/models/back-shiny/94--420--Gengar--Mega.gif diff --git a/src/canonical/models/back-shiny/Onix.gif b/src/canonical/models/back-shiny/95--0--Onix.gif similarity index 100% rename from src/canonical/models/back-shiny/Onix.gif rename to src/canonical/models/back-shiny/95--0--Onix.gif diff --git a/src/canonical/models/back-shiny/Drowzee.gif b/src/canonical/models/back-shiny/96--0--Drowzee.gif similarity index 100% rename from src/canonical/models/back-shiny/Drowzee.gif rename to src/canonical/models/back-shiny/96--0--Drowzee.gif diff --git a/src/canonical/models/back-shiny/Hypno.gif b/src/canonical/models/back-shiny/97--0--Hypno.gif similarity index 100% rename from src/canonical/models/back-shiny/Hypno.gif rename to src/canonical/models/back-shiny/97--0--Hypno.gif diff --git a/src/canonical/models/back-shiny/Krabby.gif b/src/canonical/models/back-shiny/98--0--Krabby.gif similarity index 100% rename from src/canonical/models/back-shiny/Krabby.gif rename to src/canonical/models/back-shiny/98--0--Krabby.gif diff --git a/src/canonical/models/back-shiny/Kingler.gif b/src/canonical/models/back-shiny/99--0--Kingler.gif similarity index 100% rename from src/canonical/models/back-shiny/Kingler.gif rename to src/canonical/models/back-shiny/99--0--Kingler.gif diff --git a/src/canonical/models/back-shiny/Kingler--Gmax.gif b/src/canonical/models/back-shiny/99--420--Kingler--Gmax.gif similarity index 100% rename from src/canonical/models/back-shiny/Kingler--Gmax.gif rename to src/canonical/models/back-shiny/99--420--Kingler--Gmax.gif diff --git a/src/canonical/models/back-shiny/Pikachu--Alola.gif b/src/canonical/models/back-shiny/Pikachu--Alola.gif deleted file mode 120000 index e29b3f20..00000000 --- a/src/canonical/models/back-shiny/Pikachu--Alola.gif +++ /dev/null @@ -1 +0,0 @@ -../back/Pikachu--Alola.gif \ No newline at end of file diff --git a/src/canonical/models/back-shiny/Pikachu--Hoenn.gif b/src/canonical/models/back-shiny/Pikachu--Hoenn.gif deleted file mode 120000 index 57e3b576..00000000 --- a/src/canonical/models/back-shiny/Pikachu--Hoenn.gif +++ /dev/null @@ -1 +0,0 @@ -../back/Pikachu--Hoenn.gif \ No newline at end of file diff --git a/src/canonical/models/back-shiny/Pikachu--Kalos.gif b/src/canonical/models/back-shiny/Pikachu--Kalos.gif deleted file mode 120000 index 128f3c98..00000000 --- a/src/canonical/models/back-shiny/Pikachu--Kalos.gif +++ /dev/null @@ -1 +0,0 @@ -../back/Pikachu--Kalos.gif \ No newline at end of file diff --git a/src/canonical/models/back-shiny/Pikachu--Sinnoh.gif b/src/canonical/models/back-shiny/Pikachu--Sinnoh.gif deleted file mode 120000 index 69f862e0..00000000 --- a/src/canonical/models/back-shiny/Pikachu--Sinnoh.gif +++ /dev/null @@ -1 +0,0 @@ -../back/Pikachu--Sinnoh.gif \ No newline at end of file diff --git a/src/canonical/models/back-shiny/Pikachu--Unova.gif b/src/canonical/models/back-shiny/Pikachu--Unova.gif deleted file mode 120000 index 8cc1f340..00000000 --- a/src/canonical/models/back-shiny/Pikachu--Unova.gif +++ /dev/null @@ -1 +0,0 @@ -../back/Pikachu--Unova.gif \ No newline at end of file diff --git a/src/canonical/models/back-shiny/Unown.gif b/src/canonical/models/back-shiny/Unown.gif deleted file mode 120000 index 99d05510..00000000 --- a/src/canonical/models/back-shiny/Unown.gif +++ /dev/null @@ -1 +0,0 @@ -../back-shiny-cosmetic/Unown--A.gif \ No newline at end of file diff --git a/src/canonical/models/back/Bulbasaur.gif b/src/canonical/models/back/1--0--Bulbasaur.gif similarity index 100% rename from src/canonical/models/back/Bulbasaur.gif rename to src/canonical/models/back/1--0--Bulbasaur.gif diff --git a/src/canonical/models/back/Caterpie.gif b/src/canonical/models/back/10--0--Caterpie.gif similarity index 100% rename from src/canonical/models/back/Caterpie.gif rename to src/canonical/models/back/10--0--Caterpie.gif diff --git a/src/canonical/models/back/Voltorb.gif b/src/canonical/models/back/100--0--Voltorb.gif similarity index 100% rename from src/canonical/models/back/Voltorb.gif rename to src/canonical/models/back/100--0--Voltorb.gif diff --git a/src/canonical/models/back/Electrode.gif b/src/canonical/models/back/101--0--Electrode.gif similarity index 100% rename from src/canonical/models/back/Electrode.gif rename to src/canonical/models/back/101--0--Electrode.gif diff --git a/src/canonical/models/back/Exeggcute.gif b/src/canonical/models/back/102--0--Exeggcute.gif similarity index 100% rename from src/canonical/models/back/Exeggcute.gif rename to src/canonical/models/back/102--0--Exeggcute.gif diff --git a/src/canonical/models/back/Exeggutor.gif b/src/canonical/models/back/103--0--Exeggutor.gif similarity index 100% rename from src/canonical/models/back/Exeggutor.gif rename to src/canonical/models/back/103--0--Exeggutor.gif diff --git a/src/canonical/models/back/Exeggutor--Alola.gif b/src/canonical/models/back/103--420--Exeggutor--Alola.gif similarity index 100% rename from src/canonical/models/back/Exeggutor--Alola.gif rename to src/canonical/models/back/103--420--Exeggutor--Alola.gif diff --git a/src/canonical/models/back/Cubone.gif b/src/canonical/models/back/104--0--Cubone.gif similarity index 100% rename from src/canonical/models/back/Cubone.gif rename to src/canonical/models/back/104--0--Cubone.gif diff --git a/src/canonical/models/back/Marowak.gif b/src/canonical/models/back/105--0--Marowak.gif similarity index 100% rename from src/canonical/models/back/Marowak.gif rename to src/canonical/models/back/105--0--Marowak.gif diff --git a/src/canonical/models/back/Marowak--Alola-Totem.gif b/src/canonical/models/back/105--420--Marowak--Alola-Totem.gif similarity index 100% rename from src/canonical/models/back/Marowak--Alola-Totem.gif rename to src/canonical/models/back/105--420--Marowak--Alola-Totem.gif diff --git a/src/canonical/models/back/Marowak--Alola.gif b/src/canonical/models/back/105--420--Marowak--Alola.gif similarity index 100% rename from src/canonical/models/back/Marowak--Alola.gif rename to src/canonical/models/back/105--420--Marowak--Alola.gif diff --git a/src/canonical/models/back/Hitmonlee.gif b/src/canonical/models/back/106--0--Hitmonlee.gif similarity index 100% rename from src/canonical/models/back/Hitmonlee.gif rename to src/canonical/models/back/106--0--Hitmonlee.gif diff --git a/src/canonical/models/back/Hitmonchan.gif b/src/canonical/models/back/107--0--Hitmonchan.gif similarity index 100% rename from src/canonical/models/back/Hitmonchan.gif rename to src/canonical/models/back/107--0--Hitmonchan.gif diff --git a/src/canonical/models/back/Lickitung.gif b/src/canonical/models/back/108--0--Lickitung.gif similarity index 100% rename from src/canonical/models/back/Lickitung.gif rename to src/canonical/models/back/108--0--Lickitung.gif diff --git a/src/canonical/models/back/Koffing.gif b/src/canonical/models/back/109--0--Koffing.gif similarity index 100% rename from src/canonical/models/back/Koffing.gif rename to src/canonical/models/back/109--0--Koffing.gif diff --git a/src/canonical/models/back/Metapod.gif b/src/canonical/models/back/11--0--Metapod.gif similarity index 100% rename from src/canonical/models/back/Metapod.gif rename to src/canonical/models/back/11--0--Metapod.gif diff --git a/src/canonical/models/back/Weezing.gif b/src/canonical/models/back/110--0--Weezing.gif similarity index 100% rename from src/canonical/models/back/Weezing.gif rename to src/canonical/models/back/110--0--Weezing.gif diff --git a/src/canonical/models/back/Weezing--Galar.gif b/src/canonical/models/back/110--420--Weezing--Galar.gif similarity index 100% rename from src/canonical/models/back/Weezing--Galar.gif rename to src/canonical/models/back/110--420--Weezing--Galar.gif diff --git a/src/canonical/models/back/Rhyhorn.gif b/src/canonical/models/back/111--0--Rhyhorn.gif similarity index 100% rename from src/canonical/models/back/Rhyhorn.gif rename to src/canonical/models/back/111--0--Rhyhorn.gif diff --git a/src/canonical/models/back/Rhydon.gif b/src/canonical/models/back/112--0--Rhydon.gif similarity index 100% rename from src/canonical/models/back/Rhydon.gif rename to src/canonical/models/back/112--0--Rhydon.gif diff --git a/src/canonical/models/back/Chansey.gif b/src/canonical/models/back/113--0--Chansey.gif similarity index 100% rename from src/canonical/models/back/Chansey.gif rename to src/canonical/models/back/113--0--Chansey.gif diff --git a/src/canonical/models/back/Tangela.gif b/src/canonical/models/back/114--0--Tangela.gif similarity index 100% rename from src/canonical/models/back/Tangela.gif rename to src/canonical/models/back/114--0--Tangela.gif diff --git a/src/canonical/models/back/Kangaskhan.gif b/src/canonical/models/back/115--0--Kangaskhan.gif similarity index 100% rename from src/canonical/models/back/Kangaskhan.gif rename to src/canonical/models/back/115--0--Kangaskhan.gif diff --git a/src/canonical/models/back/Kangaskhan--Mega.gif b/src/canonical/models/back/115--420--Kangaskhan--Mega.gif similarity index 100% rename from src/canonical/models/back/Kangaskhan--Mega.gif rename to src/canonical/models/back/115--420--Kangaskhan--Mega.gif diff --git a/src/canonical/models/back/Horsea.gif b/src/canonical/models/back/116--0--Horsea.gif similarity index 100% rename from src/canonical/models/back/Horsea.gif rename to src/canonical/models/back/116--0--Horsea.gif diff --git a/src/canonical/models/back/Seadra.gif b/src/canonical/models/back/117--0--Seadra.gif similarity index 100% rename from src/canonical/models/back/Seadra.gif rename to src/canonical/models/back/117--0--Seadra.gif diff --git a/src/canonical/models/back/Goldeen.gif b/src/canonical/models/back/118--0--Goldeen.gif similarity index 100% rename from src/canonical/models/back/Goldeen.gif rename to src/canonical/models/back/118--0--Goldeen.gif diff --git a/src/canonical/models/back/Seaking.gif b/src/canonical/models/back/119--0--Seaking.gif similarity index 100% rename from src/canonical/models/back/Seaking.gif rename to src/canonical/models/back/119--0--Seaking.gif diff --git a/src/canonical/models/back/Butterfree.gif b/src/canonical/models/back/12--0--Butterfree.gif similarity index 100% rename from src/canonical/models/back/Butterfree.gif rename to src/canonical/models/back/12--0--Butterfree.gif diff --git a/src/canonical/models/back/Butterfree--Gmax.gif b/src/canonical/models/back/12--420--Butterfree--Gmax.gif similarity index 100% rename from src/canonical/models/back/Butterfree--Gmax.gif rename to src/canonical/models/back/12--420--Butterfree--Gmax.gif diff --git a/src/canonical/models/back/Staryu.gif b/src/canonical/models/back/120--0--Staryu.gif similarity index 100% rename from src/canonical/models/back/Staryu.gif rename to src/canonical/models/back/120--0--Staryu.gif diff --git a/src/canonical/models/back/Starmie.gif b/src/canonical/models/back/121--0--Starmie.gif similarity index 100% rename from src/canonical/models/back/Starmie.gif rename to src/canonical/models/back/121--0--Starmie.gif diff --git a/src/canonical/models/back/Mr._Mime.gif b/src/canonical/models/back/122--0--Mr._Mime.gif similarity index 100% rename from src/canonical/models/back/Mr._Mime.gif rename to src/canonical/models/back/122--0--Mr._Mime.gif diff --git a/src/canonical/models/back/Mr._Mime--Galar.gif b/src/canonical/models/back/122--420--Mr._Mime--Galar.gif similarity index 100% rename from src/canonical/models/back/Mr._Mime--Galar.gif rename to src/canonical/models/back/122--420--Mr._Mime--Galar.gif diff --git a/src/canonical/models/back/Scyther.gif b/src/canonical/models/back/123--0--Scyther.gif similarity index 100% rename from src/canonical/models/back/Scyther.gif rename to src/canonical/models/back/123--0--Scyther.gif diff --git a/src/canonical/models/back/Jynx.gif b/src/canonical/models/back/124--0--Jynx.gif similarity index 100% rename from src/canonical/models/back/Jynx.gif rename to src/canonical/models/back/124--0--Jynx.gif diff --git a/src/canonical/models/back/Electabuzz.gif b/src/canonical/models/back/125--0--Electabuzz.gif similarity index 100% rename from src/canonical/models/back/Electabuzz.gif rename to src/canonical/models/back/125--0--Electabuzz.gif diff --git a/src/canonical/models/back/Magmar.gif b/src/canonical/models/back/126--0--Magmar.gif similarity index 100% rename from src/canonical/models/back/Magmar.gif rename to src/canonical/models/back/126--0--Magmar.gif diff --git a/src/canonical/models/back/Pinsir.gif b/src/canonical/models/back/127--0--Pinsir.gif similarity index 100% rename from src/canonical/models/back/Pinsir.gif rename to src/canonical/models/back/127--0--Pinsir.gif diff --git a/src/canonical/models/back/Pinsir--Mega.gif b/src/canonical/models/back/127--420--Pinsir--Mega.gif similarity index 100% rename from src/canonical/models/back/Pinsir--Mega.gif rename to src/canonical/models/back/127--420--Pinsir--Mega.gif diff --git a/src/canonical/models/back/Tauros.gif b/src/canonical/models/back/128--0--Tauros.gif similarity index 100% rename from src/canonical/models/back/Tauros.gif rename to src/canonical/models/back/128--0--Tauros.gif diff --git a/src/canonical/models/back/Magikarp.gif b/src/canonical/models/back/129--0--Magikarp.gif similarity index 100% rename from src/canonical/models/back/Magikarp.gif rename to src/canonical/models/back/129--0--Magikarp.gif diff --git a/src/canonical/models/back/Weedle.gif b/src/canonical/models/back/13--0--Weedle.gif similarity index 100% rename from src/canonical/models/back/Weedle.gif rename to src/canonical/models/back/13--0--Weedle.gif diff --git a/src/canonical/models/back/Gyarados.gif b/src/canonical/models/back/130--0--Gyarados.gif similarity index 100% rename from src/canonical/models/back/Gyarados.gif rename to src/canonical/models/back/130--0--Gyarados.gif diff --git a/src/canonical/models/back/Gyarados--Mega.gif b/src/canonical/models/back/130--420--Gyarados--Mega.gif similarity index 100% rename from src/canonical/models/back/Gyarados--Mega.gif rename to src/canonical/models/back/130--420--Gyarados--Mega.gif diff --git a/src/canonical/models/back/Lapras.gif b/src/canonical/models/back/131--0--Lapras.gif similarity index 100% rename from src/canonical/models/back/Lapras.gif rename to src/canonical/models/back/131--0--Lapras.gif diff --git a/src/canonical/models/back/Lapras--Gmax.gif b/src/canonical/models/back/131--420--Lapras--Gmax.gif similarity index 100% rename from src/canonical/models/back/Lapras--Gmax.gif rename to src/canonical/models/back/131--420--Lapras--Gmax.gif diff --git a/src/canonical/models/back/Ditto.gif b/src/canonical/models/back/132--0--Ditto.gif similarity index 100% rename from src/canonical/models/back/Ditto.gif rename to src/canonical/models/back/132--0--Ditto.gif diff --git a/src/canonical/models/back/Eevee.gif b/src/canonical/models/back/133--0--Eevee.gif similarity index 100% rename from src/canonical/models/back/Eevee.gif rename to src/canonical/models/back/133--0--Eevee.gif diff --git a/src/canonical/models/back/Eevee--Gmax.gif b/src/canonical/models/back/133--420--Eevee--Gmax.gif similarity index 100% rename from src/canonical/models/back/Eevee--Gmax.gif rename to src/canonical/models/back/133--420--Eevee--Gmax.gif diff --git a/src/canonical/models/back/Eevee--Starter.gif b/src/canonical/models/back/133--420--Eevee--Starter.gif similarity index 100% rename from src/canonical/models/back/Eevee--Starter.gif rename to src/canonical/models/back/133--420--Eevee--Starter.gif diff --git a/src/canonical/models/back/Vaporeon.gif b/src/canonical/models/back/134--0--Vaporeon.gif similarity index 100% rename from src/canonical/models/back/Vaporeon.gif rename to src/canonical/models/back/134--0--Vaporeon.gif diff --git a/src/canonical/models/back/Jolteon.gif b/src/canonical/models/back/135--0--Jolteon.gif similarity index 100% rename from src/canonical/models/back/Jolteon.gif rename to src/canonical/models/back/135--0--Jolteon.gif diff --git a/src/canonical/models/back/Flareon.gif b/src/canonical/models/back/136--0--Flareon.gif similarity index 100% rename from src/canonical/models/back/Flareon.gif rename to src/canonical/models/back/136--0--Flareon.gif diff --git a/src/canonical/models/back/Porygon.gif b/src/canonical/models/back/137--0--Porygon.gif similarity index 100% rename from src/canonical/models/back/Porygon.gif rename to src/canonical/models/back/137--0--Porygon.gif diff --git a/src/canonical/models/back/Omanyte.gif b/src/canonical/models/back/138--0--Omanyte.gif similarity index 100% rename from src/canonical/models/back/Omanyte.gif rename to src/canonical/models/back/138--0--Omanyte.gif diff --git a/src/canonical/models/back/Omastar.gif b/src/canonical/models/back/139--0--Omastar.gif similarity index 100% rename from src/canonical/models/back/Omastar.gif rename to src/canonical/models/back/139--0--Omastar.gif diff --git a/src/canonical/models/back/Kakuna.gif b/src/canonical/models/back/14--0--Kakuna.gif similarity index 100% rename from src/canonical/models/back/Kakuna.gif rename to src/canonical/models/back/14--0--Kakuna.gif diff --git a/src/canonical/models/back/Kabuto.gif b/src/canonical/models/back/140--0--Kabuto.gif similarity index 100% rename from src/canonical/models/back/Kabuto.gif rename to src/canonical/models/back/140--0--Kabuto.gif diff --git a/src/canonical/models/back/Kabutops.gif b/src/canonical/models/back/141--0--Kabutops.gif similarity index 100% rename from src/canonical/models/back/Kabutops.gif rename to src/canonical/models/back/141--0--Kabutops.gif diff --git a/src/canonical/models/back/Aerodactyl.gif b/src/canonical/models/back/142--0--Aerodactyl.gif similarity index 100% rename from src/canonical/models/back/Aerodactyl.gif rename to src/canonical/models/back/142--0--Aerodactyl.gif diff --git a/src/canonical/models/back/Aerodactyl--Mega.gif b/src/canonical/models/back/142--420--Aerodactyl--Mega.gif similarity index 100% rename from src/canonical/models/back/Aerodactyl--Mega.gif rename to src/canonical/models/back/142--420--Aerodactyl--Mega.gif diff --git a/src/canonical/models/back/Snorlax.gif b/src/canonical/models/back/143--0--Snorlax.gif similarity index 100% rename from src/canonical/models/back/Snorlax.gif rename to src/canonical/models/back/143--0--Snorlax.gif diff --git a/src/canonical/models/back/Snorlax--Gmax.gif b/src/canonical/models/back/143--420--Snorlax--Gmax.gif similarity index 100% rename from src/canonical/models/back/Snorlax--Gmax.gif rename to src/canonical/models/back/143--420--Snorlax--Gmax.gif diff --git a/src/canonical/models/back/Articuno.gif b/src/canonical/models/back/144--0--Articuno.gif similarity index 100% rename from src/canonical/models/back/Articuno.gif rename to src/canonical/models/back/144--0--Articuno.gif diff --git a/src/canonical/models/back/Zapdos.gif b/src/canonical/models/back/145--0--Zapdos.gif similarity index 100% rename from src/canonical/models/back/Zapdos.gif rename to src/canonical/models/back/145--0--Zapdos.gif diff --git a/src/canonical/models/back/Moltres.gif b/src/canonical/models/back/146--0--Moltres.gif similarity index 100% rename from src/canonical/models/back/Moltres.gif rename to src/canonical/models/back/146--0--Moltres.gif diff --git a/src/canonical/models/back/Dratini.gif b/src/canonical/models/back/147--0--Dratini.gif similarity index 100% rename from src/canonical/models/back/Dratini.gif rename to src/canonical/models/back/147--0--Dratini.gif diff --git a/src/canonical/models/back/Dragonair.gif b/src/canonical/models/back/148--0--Dragonair.gif similarity index 100% rename from src/canonical/models/back/Dragonair.gif rename to src/canonical/models/back/148--0--Dragonair.gif diff --git a/src/canonical/models/back/Dragonite.gif b/src/canonical/models/back/149--0--Dragonite.gif similarity index 100% rename from src/canonical/models/back/Dragonite.gif rename to src/canonical/models/back/149--0--Dragonite.gif diff --git a/src/canonical/models/back/Beedrill.gif b/src/canonical/models/back/15--0--Beedrill.gif similarity index 100% rename from src/canonical/models/back/Beedrill.gif rename to src/canonical/models/back/15--0--Beedrill.gif diff --git a/src/canonical/models/back/Beedrill--Mega.gif b/src/canonical/models/back/15--420--Beedrill--Mega.gif similarity index 100% rename from src/canonical/models/back/Beedrill--Mega.gif rename to src/canonical/models/back/15--420--Beedrill--Mega.gif diff --git a/src/canonical/models/back/Mewtwo.gif b/src/canonical/models/back/150--0--Mewtwo.gif similarity index 100% rename from src/canonical/models/back/Mewtwo.gif rename to src/canonical/models/back/150--0--Mewtwo.gif diff --git a/src/canonical/models/back/Mewtwo--Mega-X.gif b/src/canonical/models/back/150--420--Mewtwo--Mega-X.gif similarity index 100% rename from src/canonical/models/back/Mewtwo--Mega-X.gif rename to src/canonical/models/back/150--420--Mewtwo--Mega-X.gif diff --git a/src/canonical/models/back/Mewtwo--Mega-Y.gif b/src/canonical/models/back/150--420--Mewtwo--Mega-Y.gif similarity index 100% rename from src/canonical/models/back/Mewtwo--Mega-Y.gif rename to src/canonical/models/back/150--420--Mewtwo--Mega-Y.gif diff --git a/src/canonical/models/back/Mew.gif b/src/canonical/models/back/151--0--Mew.gif similarity index 100% rename from src/canonical/models/back/Mew.gif rename to src/canonical/models/back/151--0--Mew.gif diff --git a/src/canonical/models/back/Chikorita.gif b/src/canonical/models/back/152--0--Chikorita.gif similarity index 100% rename from src/canonical/models/back/Chikorita.gif rename to src/canonical/models/back/152--0--Chikorita.gif diff --git a/src/canonical/models/back/Bayleef.gif b/src/canonical/models/back/153--0--Bayleef.gif similarity index 100% rename from src/canonical/models/back/Bayleef.gif rename to src/canonical/models/back/153--0--Bayleef.gif diff --git a/src/canonical/models/back/Meganium.gif b/src/canonical/models/back/154--0--Meganium.gif similarity index 100% rename from src/canonical/models/back/Meganium.gif rename to src/canonical/models/back/154--0--Meganium.gif diff --git a/src/canonical/models/back/Cyndaquil.gif b/src/canonical/models/back/155--0--Cyndaquil.gif similarity index 100% rename from src/canonical/models/back/Cyndaquil.gif rename to src/canonical/models/back/155--0--Cyndaquil.gif diff --git a/src/canonical/models/back/Quilava.gif b/src/canonical/models/back/156--0--Quilava.gif similarity index 100% rename from src/canonical/models/back/Quilava.gif rename to src/canonical/models/back/156--0--Quilava.gif diff --git a/src/canonical/models/back/Typhlosion.gif b/src/canonical/models/back/157--0--Typhlosion.gif similarity index 100% rename from src/canonical/models/back/Typhlosion.gif rename to src/canonical/models/back/157--0--Typhlosion.gif diff --git a/src/canonical/models/back/Totodile.gif b/src/canonical/models/back/158--0--Totodile.gif similarity index 100% rename from src/canonical/models/back/Totodile.gif rename to src/canonical/models/back/158--0--Totodile.gif diff --git a/src/canonical/models/back/Croconaw.gif b/src/canonical/models/back/159--0--Croconaw.gif similarity index 100% rename from src/canonical/models/back/Croconaw.gif rename to src/canonical/models/back/159--0--Croconaw.gif diff --git a/src/canonical/models/back/Pidgey.gif b/src/canonical/models/back/16--0--Pidgey.gif similarity index 100% rename from src/canonical/models/back/Pidgey.gif rename to src/canonical/models/back/16--0--Pidgey.gif diff --git a/src/canonical/models/back/Feraligatr.gif b/src/canonical/models/back/160--0--Feraligatr.gif similarity index 100% rename from src/canonical/models/back/Feraligatr.gif rename to src/canonical/models/back/160--0--Feraligatr.gif diff --git a/src/canonical/models/back/Sentret.gif b/src/canonical/models/back/161--0--Sentret.gif similarity index 100% rename from src/canonical/models/back/Sentret.gif rename to src/canonical/models/back/161--0--Sentret.gif diff --git a/src/canonical/models/back/Furret.gif b/src/canonical/models/back/162--0--Furret.gif similarity index 100% rename from src/canonical/models/back/Furret.gif rename to src/canonical/models/back/162--0--Furret.gif diff --git a/src/canonical/models/back/Hoothoot.gif b/src/canonical/models/back/163--0--Hoothoot.gif similarity index 100% rename from src/canonical/models/back/Hoothoot.gif rename to src/canonical/models/back/163--0--Hoothoot.gif diff --git a/src/canonical/models/back/Noctowl.gif b/src/canonical/models/back/164--0--Noctowl.gif similarity index 100% rename from src/canonical/models/back/Noctowl.gif rename to src/canonical/models/back/164--0--Noctowl.gif diff --git a/src/canonical/models/back/Ledyba.gif b/src/canonical/models/back/165--0--Ledyba.gif similarity index 100% rename from src/canonical/models/back/Ledyba.gif rename to src/canonical/models/back/165--0--Ledyba.gif diff --git a/src/canonical/models/back/Ledian.gif b/src/canonical/models/back/166--0--Ledian.gif similarity index 100% rename from src/canonical/models/back/Ledian.gif rename to src/canonical/models/back/166--0--Ledian.gif diff --git a/src/canonical/models/back/Spinarak.gif b/src/canonical/models/back/167--0--Spinarak.gif similarity index 100% rename from src/canonical/models/back/Spinarak.gif rename to src/canonical/models/back/167--0--Spinarak.gif diff --git a/src/canonical/models/back/Ariados.gif b/src/canonical/models/back/168--0--Ariados.gif similarity index 100% rename from src/canonical/models/back/Ariados.gif rename to src/canonical/models/back/168--0--Ariados.gif diff --git a/src/canonical/models/back/Crobat.gif b/src/canonical/models/back/169--0--Crobat.gif similarity index 100% rename from src/canonical/models/back/Crobat.gif rename to src/canonical/models/back/169--0--Crobat.gif diff --git a/src/canonical/models/back/Pidgeotto.gif b/src/canonical/models/back/17--0--Pidgeotto.gif similarity index 100% rename from src/canonical/models/back/Pidgeotto.gif rename to src/canonical/models/back/17--0--Pidgeotto.gif diff --git a/src/canonical/models/back/Chinchou.gif b/src/canonical/models/back/170--0--Chinchou.gif similarity index 100% rename from src/canonical/models/back/Chinchou.gif rename to src/canonical/models/back/170--0--Chinchou.gif diff --git a/src/canonical/models/back/Lanturn.gif b/src/canonical/models/back/171--0--Lanturn.gif similarity index 100% rename from src/canonical/models/back/Lanturn.gif rename to src/canonical/models/back/171--0--Lanturn.gif diff --git a/src/canonical/models/back/Pichu.gif b/src/canonical/models/back/172--0--Pichu.gif similarity index 100% rename from src/canonical/models/back/Pichu.gif rename to src/canonical/models/back/172--0--Pichu.gif diff --git a/src/canonical/models/back/Cleffa.gif b/src/canonical/models/back/173--0--Cleffa.gif similarity index 100% rename from src/canonical/models/back/Cleffa.gif rename to src/canonical/models/back/173--0--Cleffa.gif diff --git a/src/canonical/models/back/Igglybuff.gif b/src/canonical/models/back/174--0--Igglybuff.gif similarity index 100% rename from src/canonical/models/back/Igglybuff.gif rename to src/canonical/models/back/174--0--Igglybuff.gif diff --git a/src/canonical/models/back/Togepi.gif b/src/canonical/models/back/175--0--Togepi.gif similarity index 100% rename from src/canonical/models/back/Togepi.gif rename to src/canonical/models/back/175--0--Togepi.gif diff --git a/src/canonical/models/back/Togetic.gif b/src/canonical/models/back/176--0--Togetic.gif similarity index 100% rename from src/canonical/models/back/Togetic.gif rename to src/canonical/models/back/176--0--Togetic.gif diff --git a/src/canonical/models/back/Natu.gif b/src/canonical/models/back/177--0--Natu.gif similarity index 100% rename from src/canonical/models/back/Natu.gif rename to src/canonical/models/back/177--0--Natu.gif diff --git a/src/canonical/models/back/Xatu.gif b/src/canonical/models/back/178--0--Xatu.gif similarity index 100% rename from src/canonical/models/back/Xatu.gif rename to src/canonical/models/back/178--0--Xatu.gif diff --git a/src/canonical/models/back/Mareep.gif b/src/canonical/models/back/179--0--Mareep.gif similarity index 100% rename from src/canonical/models/back/Mareep.gif rename to src/canonical/models/back/179--0--Mareep.gif diff --git a/src/canonical/models/back/Pidgeot.gif b/src/canonical/models/back/18--0--Pidgeot.gif similarity index 100% rename from src/canonical/models/back/Pidgeot.gif rename to src/canonical/models/back/18--0--Pidgeot.gif diff --git a/src/canonical/models/back/Pidgeot--Mega.gif b/src/canonical/models/back/18--420--Pidgeot--Mega.gif similarity index 100% rename from src/canonical/models/back/Pidgeot--Mega.gif rename to src/canonical/models/back/18--420--Pidgeot--Mega.gif diff --git a/src/canonical/models/back/Flaaffy.gif b/src/canonical/models/back/180--0--Flaaffy.gif similarity index 100% rename from src/canonical/models/back/Flaaffy.gif rename to src/canonical/models/back/180--0--Flaaffy.gif diff --git a/src/canonical/models/back/Ampharos.gif b/src/canonical/models/back/181--0--Ampharos.gif similarity index 100% rename from src/canonical/models/back/Ampharos.gif rename to src/canonical/models/back/181--0--Ampharos.gif diff --git a/src/canonical/models/back/Ampharos--Mega.gif b/src/canonical/models/back/181--420--Ampharos--Mega.gif similarity index 100% rename from src/canonical/models/back/Ampharos--Mega.gif rename to src/canonical/models/back/181--420--Ampharos--Mega.gif diff --git a/src/canonical/models/back/Bellossom.gif b/src/canonical/models/back/182--0--Bellossom.gif similarity index 100% rename from src/canonical/models/back/Bellossom.gif rename to src/canonical/models/back/182--0--Bellossom.gif diff --git a/src/canonical/models/back/Marill.gif b/src/canonical/models/back/183--0--Marill.gif similarity index 100% rename from src/canonical/models/back/Marill.gif rename to src/canonical/models/back/183--0--Marill.gif diff --git a/src/canonical/models/back/Azumarill.gif b/src/canonical/models/back/184--0--Azumarill.gif similarity index 100% rename from src/canonical/models/back/Azumarill.gif rename to src/canonical/models/back/184--0--Azumarill.gif diff --git a/src/canonical/models/back/Sudowoodo.gif b/src/canonical/models/back/185--0--Sudowoodo.gif similarity index 100% rename from src/canonical/models/back/Sudowoodo.gif rename to src/canonical/models/back/185--0--Sudowoodo.gif diff --git a/src/canonical/models/back/Politoed.gif b/src/canonical/models/back/186--0--Politoed.gif similarity index 100% rename from src/canonical/models/back/Politoed.gif rename to src/canonical/models/back/186--0--Politoed.gif diff --git a/src/canonical/models/back/Hoppip.gif b/src/canonical/models/back/187--0--Hoppip.gif similarity index 100% rename from src/canonical/models/back/Hoppip.gif rename to src/canonical/models/back/187--0--Hoppip.gif diff --git a/src/canonical/models/back/Skiploom.gif b/src/canonical/models/back/188--0--Skiploom.gif similarity index 100% rename from src/canonical/models/back/Skiploom.gif rename to src/canonical/models/back/188--0--Skiploom.gif diff --git a/src/canonical/models/back/Jumpluff.gif b/src/canonical/models/back/189--0--Jumpluff.gif similarity index 100% rename from src/canonical/models/back/Jumpluff.gif rename to src/canonical/models/back/189--0--Jumpluff.gif diff --git a/src/canonical/models/back/Rattata.gif b/src/canonical/models/back/19--0--Rattata.gif similarity index 100% rename from src/canonical/models/back/Rattata.gif rename to src/canonical/models/back/19--0--Rattata.gif diff --git a/src/canonical/models/back/Rattata--Alola.gif b/src/canonical/models/back/19--420--Rattata--Alola.gif similarity index 100% rename from src/canonical/models/back/Rattata--Alola.gif rename to src/canonical/models/back/19--420--Rattata--Alola.gif diff --git a/src/canonical/models/back/Aipom.gif b/src/canonical/models/back/190--0--Aipom.gif similarity index 100% rename from src/canonical/models/back/Aipom.gif rename to src/canonical/models/back/190--0--Aipom.gif diff --git a/src/canonical/models/back/Sunkern.gif b/src/canonical/models/back/191--0--Sunkern.gif similarity index 100% rename from src/canonical/models/back/Sunkern.gif rename to src/canonical/models/back/191--0--Sunkern.gif diff --git a/src/canonical/models/back/Sunflora.gif b/src/canonical/models/back/192--0--Sunflora.gif similarity index 100% rename from src/canonical/models/back/Sunflora.gif rename to src/canonical/models/back/192--0--Sunflora.gif diff --git a/src/canonical/models/back/Yanma.gif b/src/canonical/models/back/193--0--Yanma.gif similarity index 100% rename from src/canonical/models/back/Yanma.gif rename to src/canonical/models/back/193--0--Yanma.gif diff --git a/src/canonical/models/back/Wooper.gif b/src/canonical/models/back/194--0--Wooper.gif similarity index 100% rename from src/canonical/models/back/Wooper.gif rename to src/canonical/models/back/194--0--Wooper.gif diff --git a/src/canonical/models/back/Quagsire.gif b/src/canonical/models/back/195--0--Quagsire.gif similarity index 100% rename from src/canonical/models/back/Quagsire.gif rename to src/canonical/models/back/195--0--Quagsire.gif diff --git a/src/canonical/models/back/Espeon.gif b/src/canonical/models/back/196--0--Espeon.gif similarity index 100% rename from src/canonical/models/back/Espeon.gif rename to src/canonical/models/back/196--0--Espeon.gif diff --git a/src/canonical/models/back/Umbreon.gif b/src/canonical/models/back/197--0--Umbreon.gif similarity index 100% rename from src/canonical/models/back/Umbreon.gif rename to src/canonical/models/back/197--0--Umbreon.gif diff --git a/src/canonical/models/back/Murkrow.gif b/src/canonical/models/back/198--0--Murkrow.gif similarity index 100% rename from src/canonical/models/back/Murkrow.gif rename to src/canonical/models/back/198--0--Murkrow.gif diff --git a/src/canonical/models/back/Slowking.gif b/src/canonical/models/back/199--0--Slowking.gif similarity index 100% rename from src/canonical/models/back/Slowking.gif rename to src/canonical/models/back/199--0--Slowking.gif diff --git a/src/canonical/models/back/Ivysaur.gif b/src/canonical/models/back/2--0--Ivysaur.gif similarity index 100% rename from src/canonical/models/back/Ivysaur.gif rename to src/canonical/models/back/2--0--Ivysaur.gif diff --git a/src/canonical/models/back/Raticate.gif b/src/canonical/models/back/20--0--Raticate.gif similarity index 100% rename from src/canonical/models/back/Raticate.gif rename to src/canonical/models/back/20--0--Raticate.gif diff --git a/src/canonical/models/back/Raticate--Alola-Totem.gif b/src/canonical/models/back/20--420--Raticate--Alola-Totem.gif similarity index 100% rename from src/canonical/models/back/Raticate--Alola-Totem.gif rename to src/canonical/models/back/20--420--Raticate--Alola-Totem.gif diff --git a/src/canonical/models/back/Raticate--Alola.gif b/src/canonical/models/back/20--420--Raticate--Alola.gif similarity index 100% rename from src/canonical/models/back/Raticate--Alola.gif rename to src/canonical/models/back/20--420--Raticate--Alola.gif diff --git a/src/canonical/models/back/Misdreavus.gif b/src/canonical/models/back/200--0--Misdreavus.gif similarity index 100% rename from src/canonical/models/back/Misdreavus.gif rename to src/canonical/models/back/200--0--Misdreavus.gif diff --git a/src/canonical/models/back/201--0--Unown.gif b/src/canonical/models/back/201--0--Unown.gif new file mode 120000 index 00000000..ba29f2d4 --- /dev/null +++ b/src/canonical/models/back/201--0--Unown.gif @@ -0,0 +1 @@ +../back-cosmetic/201--420--Unown--A.gif \ No newline at end of file diff --git a/src/canonical/models/back/Wobbuffet.gif b/src/canonical/models/back/202--0--Wobbuffet.gif similarity index 100% rename from src/canonical/models/back/Wobbuffet.gif rename to src/canonical/models/back/202--0--Wobbuffet.gif diff --git a/src/canonical/models/back/Girafarig.gif b/src/canonical/models/back/203--0--Girafarig.gif similarity index 100% rename from src/canonical/models/back/Girafarig.gif rename to src/canonical/models/back/203--0--Girafarig.gif diff --git a/src/canonical/models/back/Pineco.gif b/src/canonical/models/back/204--0--Pineco.gif similarity index 100% rename from src/canonical/models/back/Pineco.gif rename to src/canonical/models/back/204--0--Pineco.gif diff --git a/src/canonical/models/back/Forretress.gif b/src/canonical/models/back/205--0--Forretress.gif similarity index 100% rename from src/canonical/models/back/Forretress.gif rename to src/canonical/models/back/205--0--Forretress.gif diff --git a/src/canonical/models/back/Dunsparce.gif b/src/canonical/models/back/206--0--Dunsparce.gif similarity index 100% rename from src/canonical/models/back/Dunsparce.gif rename to src/canonical/models/back/206--0--Dunsparce.gif diff --git a/src/canonical/models/back/Gligar.gif b/src/canonical/models/back/207--0--Gligar.gif similarity index 100% rename from src/canonical/models/back/Gligar.gif rename to src/canonical/models/back/207--0--Gligar.gif diff --git a/src/canonical/models/back/Steelix.gif b/src/canonical/models/back/208--0--Steelix.gif similarity index 100% rename from src/canonical/models/back/Steelix.gif rename to src/canonical/models/back/208--0--Steelix.gif diff --git a/src/canonical/models/back/Steelix--Mega.gif b/src/canonical/models/back/208--420--Steelix--Mega.gif similarity index 100% rename from src/canonical/models/back/Steelix--Mega.gif rename to src/canonical/models/back/208--420--Steelix--Mega.gif diff --git a/src/canonical/models/back/Snubbull.gif b/src/canonical/models/back/209--0--Snubbull.gif similarity index 100% rename from src/canonical/models/back/Snubbull.gif rename to src/canonical/models/back/209--0--Snubbull.gif diff --git a/src/canonical/models/back/Spearow.gif b/src/canonical/models/back/21--0--Spearow.gif similarity index 100% rename from src/canonical/models/back/Spearow.gif rename to src/canonical/models/back/21--0--Spearow.gif diff --git a/src/canonical/models/back/Granbull.gif b/src/canonical/models/back/210--0--Granbull.gif similarity index 100% rename from src/canonical/models/back/Granbull.gif rename to src/canonical/models/back/210--0--Granbull.gif diff --git a/src/canonical/models/back/Qwilfish.gif b/src/canonical/models/back/211--0--Qwilfish.gif similarity index 100% rename from src/canonical/models/back/Qwilfish.gif rename to src/canonical/models/back/211--0--Qwilfish.gif diff --git a/src/canonical/models/back/Scizor.gif b/src/canonical/models/back/212--0--Scizor.gif similarity index 100% rename from src/canonical/models/back/Scizor.gif rename to src/canonical/models/back/212--0--Scizor.gif diff --git a/src/canonical/models/back/Scizor--Mega.gif b/src/canonical/models/back/212--420--Scizor--Mega.gif similarity index 100% rename from src/canonical/models/back/Scizor--Mega.gif rename to src/canonical/models/back/212--420--Scizor--Mega.gif diff --git a/src/canonical/models/back/Shuckle.gif b/src/canonical/models/back/213--0--Shuckle.gif similarity index 100% rename from src/canonical/models/back/Shuckle.gif rename to src/canonical/models/back/213--0--Shuckle.gif diff --git a/src/canonical/models/back/Heracross.gif b/src/canonical/models/back/214--0--Heracross.gif similarity index 100% rename from src/canonical/models/back/Heracross.gif rename to src/canonical/models/back/214--0--Heracross.gif diff --git a/src/canonical/models/back/Heracross--Mega.gif b/src/canonical/models/back/214--420--Heracross--Mega.gif similarity index 100% rename from src/canonical/models/back/Heracross--Mega.gif rename to src/canonical/models/back/214--420--Heracross--Mega.gif diff --git a/src/canonical/models/back/Sneasel.gif b/src/canonical/models/back/215--0--Sneasel.gif similarity index 100% rename from src/canonical/models/back/Sneasel.gif rename to src/canonical/models/back/215--0--Sneasel.gif diff --git a/src/canonical/models/back/Teddiursa.gif b/src/canonical/models/back/216--0--Teddiursa.gif similarity index 100% rename from src/canonical/models/back/Teddiursa.gif rename to src/canonical/models/back/216--0--Teddiursa.gif diff --git a/src/canonical/models/back/Ursaring.gif b/src/canonical/models/back/217--0--Ursaring.gif similarity index 100% rename from src/canonical/models/back/Ursaring.gif rename to src/canonical/models/back/217--0--Ursaring.gif diff --git a/src/canonical/models/back/Slugma.gif b/src/canonical/models/back/218--0--Slugma.gif similarity index 100% rename from src/canonical/models/back/Slugma.gif rename to src/canonical/models/back/218--0--Slugma.gif diff --git a/src/canonical/models/back/Magcargo.gif b/src/canonical/models/back/219--0--Magcargo.gif similarity index 100% rename from src/canonical/models/back/Magcargo.gif rename to src/canonical/models/back/219--0--Magcargo.gif diff --git a/src/canonical/models/back/Fearow.gif b/src/canonical/models/back/22--0--Fearow.gif similarity index 100% rename from src/canonical/models/back/Fearow.gif rename to src/canonical/models/back/22--0--Fearow.gif diff --git a/src/canonical/models/back/Swinub.gif b/src/canonical/models/back/220--0--Swinub.gif similarity index 100% rename from src/canonical/models/back/Swinub.gif rename to src/canonical/models/back/220--0--Swinub.gif diff --git a/src/canonical/models/back/Piloswine.gif b/src/canonical/models/back/221--0--Piloswine.gif similarity index 100% rename from src/canonical/models/back/Piloswine.gif rename to src/canonical/models/back/221--0--Piloswine.gif diff --git a/src/canonical/models/back/Corsola.gif b/src/canonical/models/back/222--0--Corsola.gif similarity index 100% rename from src/canonical/models/back/Corsola.gif rename to src/canonical/models/back/222--0--Corsola.gif diff --git a/src/canonical/models/back/Corsola--Galar.gif b/src/canonical/models/back/222--420--Corsola--Galar.gif similarity index 100% rename from src/canonical/models/back/Corsola--Galar.gif rename to src/canonical/models/back/222--420--Corsola--Galar.gif diff --git a/src/canonical/models/back/Remoraid.gif b/src/canonical/models/back/223--0--Remoraid.gif similarity index 100% rename from src/canonical/models/back/Remoraid.gif rename to src/canonical/models/back/223--0--Remoraid.gif diff --git a/src/canonical/models/back/Octillery.gif b/src/canonical/models/back/224--0--Octillery.gif similarity index 100% rename from src/canonical/models/back/Octillery.gif rename to src/canonical/models/back/224--0--Octillery.gif diff --git a/src/canonical/models/back/Delibird.gif b/src/canonical/models/back/225--0--Delibird.gif similarity index 100% rename from src/canonical/models/back/Delibird.gif rename to src/canonical/models/back/225--0--Delibird.gif diff --git a/src/canonical/models/back/Mantine.gif b/src/canonical/models/back/226--0--Mantine.gif similarity index 100% rename from src/canonical/models/back/Mantine.gif rename to src/canonical/models/back/226--0--Mantine.gif diff --git a/src/canonical/models/back/Skarmory.gif b/src/canonical/models/back/227--0--Skarmory.gif similarity index 100% rename from src/canonical/models/back/Skarmory.gif rename to src/canonical/models/back/227--0--Skarmory.gif diff --git a/src/canonical/models/back/Houndour.gif b/src/canonical/models/back/228--0--Houndour.gif similarity index 100% rename from src/canonical/models/back/Houndour.gif rename to src/canonical/models/back/228--0--Houndour.gif diff --git a/src/canonical/models/back/Houndoom.gif b/src/canonical/models/back/229--0--Houndoom.gif similarity index 100% rename from src/canonical/models/back/Houndoom.gif rename to src/canonical/models/back/229--0--Houndoom.gif diff --git a/src/canonical/models/back/Houndoom--Mega.gif b/src/canonical/models/back/229--420--Houndoom--Mega.gif similarity index 100% rename from src/canonical/models/back/Houndoom--Mega.gif rename to src/canonical/models/back/229--420--Houndoom--Mega.gif diff --git a/src/canonical/models/back/Ekans.gif b/src/canonical/models/back/23--0--Ekans.gif similarity index 100% rename from src/canonical/models/back/Ekans.gif rename to src/canonical/models/back/23--0--Ekans.gif diff --git a/src/canonical/models/back/Kingdra.gif b/src/canonical/models/back/230--0--Kingdra.gif similarity index 100% rename from src/canonical/models/back/Kingdra.gif rename to src/canonical/models/back/230--0--Kingdra.gif diff --git a/src/canonical/models/back/Phanpy.gif b/src/canonical/models/back/231--0--Phanpy.gif similarity index 100% rename from src/canonical/models/back/Phanpy.gif rename to src/canonical/models/back/231--0--Phanpy.gif diff --git a/src/canonical/models/back/Donphan.gif b/src/canonical/models/back/232--0--Donphan.gif similarity index 100% rename from src/canonical/models/back/Donphan.gif rename to src/canonical/models/back/232--0--Donphan.gif diff --git a/src/canonical/models/back/Porygon2.gif b/src/canonical/models/back/233--0--Porygon2.gif similarity index 100% rename from src/canonical/models/back/Porygon2.gif rename to src/canonical/models/back/233--0--Porygon2.gif diff --git a/src/canonical/models/back/Stantler.gif b/src/canonical/models/back/234--0--Stantler.gif similarity index 100% rename from src/canonical/models/back/Stantler.gif rename to src/canonical/models/back/234--0--Stantler.gif diff --git a/src/canonical/models/back/Smeargle.gif b/src/canonical/models/back/235--0--Smeargle.gif similarity index 100% rename from src/canonical/models/back/Smeargle.gif rename to src/canonical/models/back/235--0--Smeargle.gif diff --git a/src/canonical/models/back/Tyrogue.gif b/src/canonical/models/back/236--0--Tyrogue.gif similarity index 100% rename from src/canonical/models/back/Tyrogue.gif rename to src/canonical/models/back/236--0--Tyrogue.gif diff --git a/src/canonical/models/back/Hitmontop.gif b/src/canonical/models/back/237--0--Hitmontop.gif similarity index 100% rename from src/canonical/models/back/Hitmontop.gif rename to src/canonical/models/back/237--0--Hitmontop.gif diff --git a/src/canonical/models/back/Smoochum.gif b/src/canonical/models/back/238--0--Smoochum.gif similarity index 100% rename from src/canonical/models/back/Smoochum.gif rename to src/canonical/models/back/238--0--Smoochum.gif diff --git a/src/canonical/models/back/Elekid.gif b/src/canonical/models/back/239--0--Elekid.gif similarity index 100% rename from src/canonical/models/back/Elekid.gif rename to src/canonical/models/back/239--0--Elekid.gif diff --git a/src/canonical/models/back/Arbok.gif b/src/canonical/models/back/24--0--Arbok.gif similarity index 100% rename from src/canonical/models/back/Arbok.gif rename to src/canonical/models/back/24--0--Arbok.gif diff --git a/src/canonical/models/back/Magby.gif b/src/canonical/models/back/240--0--Magby.gif similarity index 100% rename from src/canonical/models/back/Magby.gif rename to src/canonical/models/back/240--0--Magby.gif diff --git a/src/canonical/models/back/Miltank.gif b/src/canonical/models/back/241--0--Miltank.gif similarity index 100% rename from src/canonical/models/back/Miltank.gif rename to src/canonical/models/back/241--0--Miltank.gif diff --git a/src/canonical/models/back/Blissey.gif b/src/canonical/models/back/242--0--Blissey.gif similarity index 100% rename from src/canonical/models/back/Blissey.gif rename to src/canonical/models/back/242--0--Blissey.gif diff --git a/src/canonical/models/back/Raikou.gif b/src/canonical/models/back/243--0--Raikou.gif similarity index 100% rename from src/canonical/models/back/Raikou.gif rename to src/canonical/models/back/243--0--Raikou.gif diff --git a/src/canonical/models/back/Entei.gif b/src/canonical/models/back/244--0--Entei.gif similarity index 100% rename from src/canonical/models/back/Entei.gif rename to src/canonical/models/back/244--0--Entei.gif diff --git a/src/canonical/models/back/Suicune.gif b/src/canonical/models/back/245--0--Suicune.gif similarity index 100% rename from src/canonical/models/back/Suicune.gif rename to src/canonical/models/back/245--0--Suicune.gif diff --git a/src/canonical/models/back/Larvitar.gif b/src/canonical/models/back/246--0--Larvitar.gif similarity index 100% rename from src/canonical/models/back/Larvitar.gif rename to src/canonical/models/back/246--0--Larvitar.gif diff --git a/src/canonical/models/back/Pupitar.gif b/src/canonical/models/back/247--0--Pupitar.gif similarity index 100% rename from src/canonical/models/back/Pupitar.gif rename to src/canonical/models/back/247--0--Pupitar.gif diff --git a/src/canonical/models/back/Tyranitar.gif b/src/canonical/models/back/248--0--Tyranitar.gif similarity index 100% rename from src/canonical/models/back/Tyranitar.gif rename to src/canonical/models/back/248--0--Tyranitar.gif diff --git a/src/canonical/models/back/Tyranitar--Mega.gif b/src/canonical/models/back/248--420--Tyranitar--Mega.gif similarity index 100% rename from src/canonical/models/back/Tyranitar--Mega.gif rename to src/canonical/models/back/248--420--Tyranitar--Mega.gif diff --git a/src/canonical/models/back/Lugia.gif b/src/canonical/models/back/249--0--Lugia.gif similarity index 100% rename from src/canonical/models/back/Lugia.gif rename to src/canonical/models/back/249--0--Lugia.gif diff --git a/src/canonical/models/back/Pikachu.gif b/src/canonical/models/back/25--0--Pikachu.gif similarity index 100% rename from src/canonical/models/back/Pikachu.gif rename to src/canonical/models/back/25--0--Pikachu.gif diff --git a/src/canonical/models/back/Pikachu--Alola.gif b/src/canonical/models/back/25--420--Pikachu--Alola.gif similarity index 100% rename from src/canonical/models/back/Pikachu--Alola.gif rename to src/canonical/models/back/25--420--Pikachu--Alola.gif diff --git a/src/canonical/models/back/Pikachu--Belle.gif b/src/canonical/models/back/25--420--Pikachu--Belle.gif similarity index 100% rename from src/canonical/models/back/Pikachu--Belle.gif rename to src/canonical/models/back/25--420--Pikachu--Belle.gif diff --git a/src/canonical/models/back/Pikachu--Cosplay.gif b/src/canonical/models/back/25--420--Pikachu--Cosplay.gif similarity index 100% rename from src/canonical/models/back/Pikachu--Cosplay.gif rename to src/canonical/models/back/25--420--Pikachu--Cosplay.gif diff --git a/src/canonical/models/back/Pikachu--Gmax.gif b/src/canonical/models/back/25--420--Pikachu--Gmax.gif similarity index 100% rename from src/canonical/models/back/Pikachu--Gmax.gif rename to src/canonical/models/back/25--420--Pikachu--Gmax.gif diff --git a/src/canonical/models/back/Pikachu--Hoenn.gif b/src/canonical/models/back/25--420--Pikachu--Hoenn.gif similarity index 100% rename from src/canonical/models/back/Pikachu--Hoenn.gif rename to src/canonical/models/back/25--420--Pikachu--Hoenn.gif diff --git a/src/canonical/models/back/Pikachu--Kalos.gif b/src/canonical/models/back/25--420--Pikachu--Kalos.gif similarity index 100% rename from src/canonical/models/back/Pikachu--Kalos.gif rename to src/canonical/models/back/25--420--Pikachu--Kalos.gif diff --git a/src/canonical/models/back/Pikachu--Partner.gif b/src/canonical/models/back/25--420--Pikachu--Partner.gif similarity index 100% rename from src/canonical/models/back/Pikachu--Partner.gif rename to src/canonical/models/back/25--420--Pikachu--Partner.gif diff --git a/src/canonical/models/back/Pikachu--PhD.gif b/src/canonical/models/back/25--420--Pikachu--PhD.gif similarity index 100% rename from src/canonical/models/back/Pikachu--PhD.gif rename to src/canonical/models/back/25--420--Pikachu--PhD.gif diff --git a/src/canonical/models/back/Pikachu--Pop-Star.gif b/src/canonical/models/back/25--420--Pikachu--Pop-Star.gif similarity index 100% rename from src/canonical/models/back/Pikachu--Pop-Star.gif rename to src/canonical/models/back/25--420--Pikachu--Pop-Star.gif diff --git a/src/canonical/models/back/Pikachu--Rock-Star.gif b/src/canonical/models/back/25--420--Pikachu--Rock-Star.gif similarity index 100% rename from src/canonical/models/back/Pikachu--Rock-Star.gif rename to src/canonical/models/back/25--420--Pikachu--Rock-Star.gif diff --git a/src/canonical/models/back/Pikachu--Sinnoh.gif b/src/canonical/models/back/25--420--Pikachu--Sinnoh.gif similarity index 100% rename from src/canonical/models/back/Pikachu--Sinnoh.gif rename to src/canonical/models/back/25--420--Pikachu--Sinnoh.gif diff --git a/src/canonical/models/back/Pikachu--Starter.gif b/src/canonical/models/back/25--420--Pikachu--Starter.gif similarity index 100% rename from src/canonical/models/back/Pikachu--Starter.gif rename to src/canonical/models/back/25--420--Pikachu--Starter.gif diff --git a/src/canonical/models/back/Pikachu--Unova.gif b/src/canonical/models/back/25--420--Pikachu--Unova.gif similarity index 100% rename from src/canonical/models/back/Pikachu--Unova.gif rename to src/canonical/models/back/25--420--Pikachu--Unova.gif diff --git a/src/canonical/models/back/Ho-Oh.gif b/src/canonical/models/back/250--0--Ho-Oh.gif similarity index 100% rename from src/canonical/models/back/Ho-Oh.gif rename to src/canonical/models/back/250--0--Ho-Oh.gif diff --git a/src/canonical/models/back/Celebi.gif b/src/canonical/models/back/251--0--Celebi.gif similarity index 100% rename from src/canonical/models/back/Celebi.gif rename to src/canonical/models/back/251--0--Celebi.gif diff --git a/src/canonical/models/back/Treecko.gif b/src/canonical/models/back/252--0--Treecko.gif similarity index 100% rename from src/canonical/models/back/Treecko.gif rename to src/canonical/models/back/252--0--Treecko.gif diff --git a/src/canonical/models/back/Grovyle.gif b/src/canonical/models/back/253--0--Grovyle.gif similarity index 100% rename from src/canonical/models/back/Grovyle.gif rename to src/canonical/models/back/253--0--Grovyle.gif diff --git a/src/canonical/models/back/Sceptile.gif b/src/canonical/models/back/254--0--Sceptile.gif similarity index 100% rename from src/canonical/models/back/Sceptile.gif rename to src/canonical/models/back/254--0--Sceptile.gif diff --git a/src/canonical/models/back/Sceptile--Mega.gif b/src/canonical/models/back/254--420--Sceptile--Mega.gif similarity index 100% rename from src/canonical/models/back/Sceptile--Mega.gif rename to src/canonical/models/back/254--420--Sceptile--Mega.gif diff --git a/src/canonical/models/back/Torchic.gif b/src/canonical/models/back/255--0--Torchic.gif similarity index 100% rename from src/canonical/models/back/Torchic.gif rename to src/canonical/models/back/255--0--Torchic.gif diff --git a/src/canonical/models/back/Combusken.gif b/src/canonical/models/back/256--0--Combusken.gif similarity index 100% rename from src/canonical/models/back/Combusken.gif rename to src/canonical/models/back/256--0--Combusken.gif diff --git a/src/canonical/models/back/Blaziken.gif b/src/canonical/models/back/257--0--Blaziken.gif similarity index 100% rename from src/canonical/models/back/Blaziken.gif rename to src/canonical/models/back/257--0--Blaziken.gif diff --git a/src/canonical/models/back/Blaziken--Mega.gif b/src/canonical/models/back/257--420--Blaziken--Mega.gif similarity index 100% rename from src/canonical/models/back/Blaziken--Mega.gif rename to src/canonical/models/back/257--420--Blaziken--Mega.gif diff --git a/src/canonical/models/back/Mudkip.gif b/src/canonical/models/back/258--0--Mudkip.gif similarity index 100% rename from src/canonical/models/back/Mudkip.gif rename to src/canonical/models/back/258--0--Mudkip.gif diff --git a/src/canonical/models/back/Marshtomp.gif b/src/canonical/models/back/259--0--Marshtomp.gif similarity index 100% rename from src/canonical/models/back/Marshtomp.gif rename to src/canonical/models/back/259--0--Marshtomp.gif diff --git a/src/canonical/models/back/Raichu.gif b/src/canonical/models/back/26--0--Raichu.gif similarity index 100% rename from src/canonical/models/back/Raichu.gif rename to src/canonical/models/back/26--0--Raichu.gif diff --git a/src/canonical/models/back/Raichu--Alola.gif b/src/canonical/models/back/26--420--Raichu--Alola.gif similarity index 100% rename from src/canonical/models/back/Raichu--Alola.gif rename to src/canonical/models/back/26--420--Raichu--Alola.gif diff --git a/src/canonical/models/back/Swampert.gif b/src/canonical/models/back/260--0--Swampert.gif similarity index 100% rename from src/canonical/models/back/Swampert.gif rename to src/canonical/models/back/260--0--Swampert.gif diff --git a/src/canonical/models/back/Swampert--Mega.gif b/src/canonical/models/back/260--420--Swampert--Mega.gif similarity index 100% rename from src/canonical/models/back/Swampert--Mega.gif rename to src/canonical/models/back/260--420--Swampert--Mega.gif diff --git a/src/canonical/models/back/Poochyena.gif b/src/canonical/models/back/261--0--Poochyena.gif similarity index 100% rename from src/canonical/models/back/Poochyena.gif rename to src/canonical/models/back/261--0--Poochyena.gif diff --git a/src/canonical/models/back/Mightyena.gif b/src/canonical/models/back/262--0--Mightyena.gif similarity index 100% rename from src/canonical/models/back/Mightyena.gif rename to src/canonical/models/back/262--0--Mightyena.gif diff --git a/src/canonical/models/back/Zigzagoon.gif b/src/canonical/models/back/263--0--Zigzagoon.gif similarity index 100% rename from src/canonical/models/back/Zigzagoon.gif rename to src/canonical/models/back/263--0--Zigzagoon.gif diff --git a/src/canonical/models/back/Zigzagoon--Galar.gif b/src/canonical/models/back/263--420--Zigzagoon--Galar.gif similarity index 100% rename from src/canonical/models/back/Zigzagoon--Galar.gif rename to src/canonical/models/back/263--420--Zigzagoon--Galar.gif diff --git a/src/canonical/models/back/Linoone.gif b/src/canonical/models/back/264--0--Linoone.gif similarity index 100% rename from src/canonical/models/back/Linoone.gif rename to src/canonical/models/back/264--0--Linoone.gif diff --git a/src/canonical/models/back/Linoone--Galar.gif b/src/canonical/models/back/264--420--Linoone--Galar.gif similarity index 100% rename from src/canonical/models/back/Linoone--Galar.gif rename to src/canonical/models/back/264--420--Linoone--Galar.gif diff --git a/src/canonical/models/back/Wurmple.gif b/src/canonical/models/back/265--0--Wurmple.gif similarity index 100% rename from src/canonical/models/back/Wurmple.gif rename to src/canonical/models/back/265--0--Wurmple.gif diff --git a/src/canonical/models/back/Silcoon.gif b/src/canonical/models/back/266--0--Silcoon.gif similarity index 100% rename from src/canonical/models/back/Silcoon.gif rename to src/canonical/models/back/266--0--Silcoon.gif diff --git a/src/canonical/models/back/Beautifly.gif b/src/canonical/models/back/267--0--Beautifly.gif similarity index 100% rename from src/canonical/models/back/Beautifly.gif rename to src/canonical/models/back/267--0--Beautifly.gif diff --git a/src/canonical/models/back/Cascoon.gif b/src/canonical/models/back/268--0--Cascoon.gif similarity index 100% rename from src/canonical/models/back/Cascoon.gif rename to src/canonical/models/back/268--0--Cascoon.gif diff --git a/src/canonical/models/back/Dustox.gif b/src/canonical/models/back/269--0--Dustox.gif similarity index 100% rename from src/canonical/models/back/Dustox.gif rename to src/canonical/models/back/269--0--Dustox.gif diff --git a/src/canonical/models/back/Sandshrew.gif b/src/canonical/models/back/27--0--Sandshrew.gif similarity index 100% rename from src/canonical/models/back/Sandshrew.gif rename to src/canonical/models/back/27--0--Sandshrew.gif diff --git a/src/canonical/models/back/Sandshrew--Alola.gif b/src/canonical/models/back/27--420--Sandshrew--Alola.gif similarity index 100% rename from src/canonical/models/back/Sandshrew--Alola.gif rename to src/canonical/models/back/27--420--Sandshrew--Alola.gif diff --git a/src/canonical/models/back/Lotad.gif b/src/canonical/models/back/270--0--Lotad.gif similarity index 100% rename from src/canonical/models/back/Lotad.gif rename to src/canonical/models/back/270--0--Lotad.gif diff --git a/src/canonical/models/back/Lombre.gif b/src/canonical/models/back/271--0--Lombre.gif similarity index 100% rename from src/canonical/models/back/Lombre.gif rename to src/canonical/models/back/271--0--Lombre.gif diff --git a/src/canonical/models/back/Ludicolo.gif b/src/canonical/models/back/272--0--Ludicolo.gif similarity index 100% rename from src/canonical/models/back/Ludicolo.gif rename to src/canonical/models/back/272--0--Ludicolo.gif diff --git a/src/canonical/models/back/Seedot.gif b/src/canonical/models/back/273--0--Seedot.gif similarity index 100% rename from src/canonical/models/back/Seedot.gif rename to src/canonical/models/back/273--0--Seedot.gif diff --git a/src/canonical/models/back/Nuzleaf.gif b/src/canonical/models/back/274--0--Nuzleaf.gif similarity index 100% rename from src/canonical/models/back/Nuzleaf.gif rename to src/canonical/models/back/274--0--Nuzleaf.gif diff --git a/src/canonical/models/back/Shiftry.gif b/src/canonical/models/back/275--0--Shiftry.gif similarity index 100% rename from src/canonical/models/back/Shiftry.gif rename to src/canonical/models/back/275--0--Shiftry.gif diff --git a/src/canonical/models/back/Taillow.gif b/src/canonical/models/back/276--0--Taillow.gif similarity index 100% rename from src/canonical/models/back/Taillow.gif rename to src/canonical/models/back/276--0--Taillow.gif diff --git a/src/canonical/models/back/Swellow.gif b/src/canonical/models/back/277--0--Swellow.gif similarity index 100% rename from src/canonical/models/back/Swellow.gif rename to src/canonical/models/back/277--0--Swellow.gif diff --git a/src/canonical/models/back/Wingull.gif b/src/canonical/models/back/278--0--Wingull.gif similarity index 100% rename from src/canonical/models/back/Wingull.gif rename to src/canonical/models/back/278--0--Wingull.gif diff --git a/src/canonical/models/back/Pelipper.gif b/src/canonical/models/back/279--0--Pelipper.gif similarity index 100% rename from src/canonical/models/back/Pelipper.gif rename to src/canonical/models/back/279--0--Pelipper.gif diff --git a/src/canonical/models/back/Sandslash.gif b/src/canonical/models/back/28--0--Sandslash.gif similarity index 100% rename from src/canonical/models/back/Sandslash.gif rename to src/canonical/models/back/28--0--Sandslash.gif diff --git a/src/canonical/models/back/Sandslash--Alola.gif b/src/canonical/models/back/28--420--Sandslash--Alola.gif similarity index 100% rename from src/canonical/models/back/Sandslash--Alola.gif rename to src/canonical/models/back/28--420--Sandslash--Alola.gif diff --git a/src/canonical/models/back/Ralts.gif b/src/canonical/models/back/280--0--Ralts.gif similarity index 100% rename from src/canonical/models/back/Ralts.gif rename to src/canonical/models/back/280--0--Ralts.gif diff --git a/src/canonical/models/back/Kirlia.gif b/src/canonical/models/back/281--0--Kirlia.gif similarity index 100% rename from src/canonical/models/back/Kirlia.gif rename to src/canonical/models/back/281--0--Kirlia.gif diff --git a/src/canonical/models/back/Gardevoir.gif b/src/canonical/models/back/282--0--Gardevoir.gif similarity index 100% rename from src/canonical/models/back/Gardevoir.gif rename to src/canonical/models/back/282--0--Gardevoir.gif diff --git a/src/canonical/models/back/Gardevoir--Mega.gif b/src/canonical/models/back/282--420--Gardevoir--Mega.gif similarity index 100% rename from src/canonical/models/back/Gardevoir--Mega.gif rename to src/canonical/models/back/282--420--Gardevoir--Mega.gif diff --git a/src/canonical/models/back/Surskit.gif b/src/canonical/models/back/283--0--Surskit.gif similarity index 100% rename from src/canonical/models/back/Surskit.gif rename to src/canonical/models/back/283--0--Surskit.gif diff --git a/src/canonical/models/back/Masquerain.gif b/src/canonical/models/back/284--0--Masquerain.gif similarity index 100% rename from src/canonical/models/back/Masquerain.gif rename to src/canonical/models/back/284--0--Masquerain.gif diff --git a/src/canonical/models/back/Shroomish.gif b/src/canonical/models/back/285--0--Shroomish.gif similarity index 100% rename from src/canonical/models/back/Shroomish.gif rename to src/canonical/models/back/285--0--Shroomish.gif diff --git a/src/canonical/models/back/Breloom.gif b/src/canonical/models/back/286--0--Breloom.gif similarity index 100% rename from src/canonical/models/back/Breloom.gif rename to src/canonical/models/back/286--0--Breloom.gif diff --git a/src/canonical/models/back/Slakoth.gif b/src/canonical/models/back/287--0--Slakoth.gif similarity index 100% rename from src/canonical/models/back/Slakoth.gif rename to src/canonical/models/back/287--0--Slakoth.gif diff --git a/src/canonical/models/back/Vigoroth.gif b/src/canonical/models/back/288--0--Vigoroth.gif similarity index 100% rename from src/canonical/models/back/Vigoroth.gif rename to src/canonical/models/back/288--0--Vigoroth.gif diff --git a/src/canonical/models/back/Slaking.gif b/src/canonical/models/back/289--0--Slaking.gif similarity index 100% rename from src/canonical/models/back/Slaking.gif rename to src/canonical/models/back/289--0--Slaking.gif diff --git a/src/canonical/models/back/Nidoran-F.gif b/src/canonical/models/back/29--0--Nidoran-F.gif similarity index 100% rename from src/canonical/models/back/Nidoran-F.gif rename to src/canonical/models/back/29--0--Nidoran-F.gif diff --git a/src/canonical/models/back/Nincada.gif b/src/canonical/models/back/290--0--Nincada.gif similarity index 100% rename from src/canonical/models/back/Nincada.gif rename to src/canonical/models/back/290--0--Nincada.gif diff --git a/src/canonical/models/back/Ninjask.gif b/src/canonical/models/back/291--0--Ninjask.gif similarity index 100% rename from src/canonical/models/back/Ninjask.gif rename to src/canonical/models/back/291--0--Ninjask.gif diff --git a/src/canonical/models/back/Shedinja.gif b/src/canonical/models/back/292--0--Shedinja.gif similarity index 100% rename from src/canonical/models/back/Shedinja.gif rename to src/canonical/models/back/292--0--Shedinja.gif diff --git a/src/canonical/models/back/Whismur.gif b/src/canonical/models/back/293--0--Whismur.gif similarity index 100% rename from src/canonical/models/back/Whismur.gif rename to src/canonical/models/back/293--0--Whismur.gif diff --git a/src/canonical/models/back/Loudred.gif b/src/canonical/models/back/294--0--Loudred.gif similarity index 100% rename from src/canonical/models/back/Loudred.gif rename to src/canonical/models/back/294--0--Loudred.gif diff --git a/src/canonical/models/back/Exploud.gif b/src/canonical/models/back/295--0--Exploud.gif similarity index 100% rename from src/canonical/models/back/Exploud.gif rename to src/canonical/models/back/295--0--Exploud.gif diff --git a/src/canonical/models/back/Makuhita.gif b/src/canonical/models/back/296--0--Makuhita.gif similarity index 100% rename from src/canonical/models/back/Makuhita.gif rename to src/canonical/models/back/296--0--Makuhita.gif diff --git a/src/canonical/models/back/Hariyama.gif b/src/canonical/models/back/297--0--Hariyama.gif similarity index 100% rename from src/canonical/models/back/Hariyama.gif rename to src/canonical/models/back/297--0--Hariyama.gif diff --git a/src/canonical/models/back/Azurill.gif b/src/canonical/models/back/298--0--Azurill.gif similarity index 100% rename from src/canonical/models/back/Azurill.gif rename to src/canonical/models/back/298--0--Azurill.gif diff --git a/src/canonical/models/back/Nosepass.gif b/src/canonical/models/back/299--0--Nosepass.gif similarity index 100% rename from src/canonical/models/back/Nosepass.gif rename to src/canonical/models/back/299--0--Nosepass.gif diff --git a/src/canonical/models/back/Venusaur.gif b/src/canonical/models/back/3--0--Venusaur.gif similarity index 100% rename from src/canonical/models/back/Venusaur.gif rename to src/canonical/models/back/3--0--Venusaur.gif diff --git a/src/canonical/models/back/Venusaur--Mega.gif b/src/canonical/models/back/3--420--Venusaur--Mega.gif similarity index 100% rename from src/canonical/models/back/Venusaur--Mega.gif rename to src/canonical/models/back/3--420--Venusaur--Mega.gif diff --git a/src/canonical/models/back/Nidorina.gif b/src/canonical/models/back/30--0--Nidorina.gif similarity index 100% rename from src/canonical/models/back/Nidorina.gif rename to src/canonical/models/back/30--0--Nidorina.gif diff --git a/src/canonical/models/back/Skitty.gif b/src/canonical/models/back/300--0--Skitty.gif similarity index 100% rename from src/canonical/models/back/Skitty.gif rename to src/canonical/models/back/300--0--Skitty.gif diff --git a/src/canonical/models/back/Delcatty.gif b/src/canonical/models/back/301--0--Delcatty.gif similarity index 100% rename from src/canonical/models/back/Delcatty.gif rename to src/canonical/models/back/301--0--Delcatty.gif diff --git a/src/canonical/models/back/Sableye.gif b/src/canonical/models/back/302--0--Sableye.gif similarity index 100% rename from src/canonical/models/back/Sableye.gif rename to src/canonical/models/back/302--0--Sableye.gif diff --git a/src/canonical/models/back/Sableye--Mega.gif b/src/canonical/models/back/302--420--Sableye--Mega.gif similarity index 100% rename from src/canonical/models/back/Sableye--Mega.gif rename to src/canonical/models/back/302--420--Sableye--Mega.gif diff --git a/src/canonical/models/back/Mawile.gif b/src/canonical/models/back/303--0--Mawile.gif similarity index 100% rename from src/canonical/models/back/Mawile.gif rename to src/canonical/models/back/303--0--Mawile.gif diff --git a/src/canonical/models/back/Mawile--Mega.gif b/src/canonical/models/back/303--420--Mawile--Mega.gif similarity index 100% rename from src/canonical/models/back/Mawile--Mega.gif rename to src/canonical/models/back/303--420--Mawile--Mega.gif diff --git a/src/canonical/models/back/Aron.gif b/src/canonical/models/back/304--0--Aron.gif similarity index 100% rename from src/canonical/models/back/Aron.gif rename to src/canonical/models/back/304--0--Aron.gif diff --git a/src/canonical/models/back/Lairon.gif b/src/canonical/models/back/305--0--Lairon.gif similarity index 100% rename from src/canonical/models/back/Lairon.gif rename to src/canonical/models/back/305--0--Lairon.gif diff --git a/src/canonical/models/back/Aggron.gif b/src/canonical/models/back/306--0--Aggron.gif similarity index 100% rename from src/canonical/models/back/Aggron.gif rename to src/canonical/models/back/306--0--Aggron.gif diff --git a/src/canonical/models/back/Aggron--Mega.gif b/src/canonical/models/back/306--420--Aggron--Mega.gif similarity index 100% rename from src/canonical/models/back/Aggron--Mega.gif rename to src/canonical/models/back/306--420--Aggron--Mega.gif diff --git a/src/canonical/models/back/Meditite.gif b/src/canonical/models/back/307--0--Meditite.gif similarity index 100% rename from src/canonical/models/back/Meditite.gif rename to src/canonical/models/back/307--0--Meditite.gif diff --git a/src/canonical/models/back/Medicham.gif b/src/canonical/models/back/308--0--Medicham.gif similarity index 100% rename from src/canonical/models/back/Medicham.gif rename to src/canonical/models/back/308--0--Medicham.gif diff --git a/src/canonical/models/back/Medicham--Mega.gif b/src/canonical/models/back/308--420--Medicham--Mega.gif similarity index 100% rename from src/canonical/models/back/Medicham--Mega.gif rename to src/canonical/models/back/308--420--Medicham--Mega.gif diff --git a/src/canonical/models/back/Electrike.gif b/src/canonical/models/back/309--0--Electrike.gif similarity index 100% rename from src/canonical/models/back/Electrike.gif rename to src/canonical/models/back/309--0--Electrike.gif diff --git a/src/canonical/models/back/Nidoqueen.gif b/src/canonical/models/back/31--0--Nidoqueen.gif similarity index 100% rename from src/canonical/models/back/Nidoqueen.gif rename to src/canonical/models/back/31--0--Nidoqueen.gif diff --git a/src/canonical/models/back/Manectric.gif b/src/canonical/models/back/310--0--Manectric.gif similarity index 100% rename from src/canonical/models/back/Manectric.gif rename to src/canonical/models/back/310--0--Manectric.gif diff --git a/src/canonical/models/back/Manectric--Mega.gif b/src/canonical/models/back/310--420--Manectric--Mega.gif similarity index 100% rename from src/canonical/models/back/Manectric--Mega.gif rename to src/canonical/models/back/310--420--Manectric--Mega.gif diff --git a/src/canonical/models/back/Plusle.gif b/src/canonical/models/back/311--0--Plusle.gif similarity index 100% rename from src/canonical/models/back/Plusle.gif rename to src/canonical/models/back/311--0--Plusle.gif diff --git a/src/canonical/models/back/Minun.gif b/src/canonical/models/back/312--0--Minun.gif similarity index 100% rename from src/canonical/models/back/Minun.gif rename to src/canonical/models/back/312--0--Minun.gif diff --git a/src/canonical/models/back/Volbeat.gif b/src/canonical/models/back/313--0--Volbeat.gif similarity index 100% rename from src/canonical/models/back/Volbeat.gif rename to src/canonical/models/back/313--0--Volbeat.gif diff --git a/src/canonical/models/back/Illumise.gif b/src/canonical/models/back/314--0--Illumise.gif similarity index 100% rename from src/canonical/models/back/Illumise.gif rename to src/canonical/models/back/314--0--Illumise.gif diff --git a/src/canonical/models/back/Roselia.gif b/src/canonical/models/back/315--0--Roselia.gif similarity index 100% rename from src/canonical/models/back/Roselia.gif rename to src/canonical/models/back/315--0--Roselia.gif diff --git a/src/canonical/models/back/Gulpin.gif b/src/canonical/models/back/316--0--Gulpin.gif similarity index 100% rename from src/canonical/models/back/Gulpin.gif rename to src/canonical/models/back/316--0--Gulpin.gif diff --git a/src/canonical/models/back/Swalot.gif b/src/canonical/models/back/317--0--Swalot.gif similarity index 100% rename from src/canonical/models/back/Swalot.gif rename to src/canonical/models/back/317--0--Swalot.gif diff --git a/src/canonical/models/back/Carvanha.gif b/src/canonical/models/back/318--0--Carvanha.gif similarity index 100% rename from src/canonical/models/back/Carvanha.gif rename to src/canonical/models/back/318--0--Carvanha.gif diff --git a/src/canonical/models/back/Sharpedo.gif b/src/canonical/models/back/319--0--Sharpedo.gif similarity index 100% rename from src/canonical/models/back/Sharpedo.gif rename to src/canonical/models/back/319--0--Sharpedo.gif diff --git a/src/canonical/models/back/Sharpedo--Mega.gif b/src/canonical/models/back/319--420--Sharpedo--Mega.gif similarity index 100% rename from src/canonical/models/back/Sharpedo--Mega.gif rename to src/canonical/models/back/319--420--Sharpedo--Mega.gif diff --git a/src/canonical/models/back/Nidoran-M.gif b/src/canonical/models/back/32--0--Nidoran-M.gif similarity index 100% rename from src/canonical/models/back/Nidoran-M.gif rename to src/canonical/models/back/32--0--Nidoran-M.gif diff --git a/src/canonical/models/back/Wailmer.gif b/src/canonical/models/back/320--0--Wailmer.gif similarity index 100% rename from src/canonical/models/back/Wailmer.gif rename to src/canonical/models/back/320--0--Wailmer.gif diff --git a/src/canonical/models/back/Wailord.gif b/src/canonical/models/back/321--0--Wailord.gif similarity index 100% rename from src/canonical/models/back/Wailord.gif rename to src/canonical/models/back/321--0--Wailord.gif diff --git a/src/canonical/models/back/Numel.gif b/src/canonical/models/back/322--0--Numel.gif similarity index 100% rename from src/canonical/models/back/Numel.gif rename to src/canonical/models/back/322--0--Numel.gif diff --git a/src/canonical/models/back/Camerupt.gif b/src/canonical/models/back/323--0--Camerupt.gif similarity index 100% rename from src/canonical/models/back/Camerupt.gif rename to src/canonical/models/back/323--0--Camerupt.gif diff --git a/src/canonical/models/back/Camerupt--Mega.gif b/src/canonical/models/back/323--420--Camerupt--Mega.gif similarity index 100% rename from src/canonical/models/back/Camerupt--Mega.gif rename to src/canonical/models/back/323--420--Camerupt--Mega.gif diff --git a/src/canonical/models/back/Torkoal.gif b/src/canonical/models/back/324--0--Torkoal.gif similarity index 100% rename from src/canonical/models/back/Torkoal.gif rename to src/canonical/models/back/324--0--Torkoal.gif diff --git a/src/canonical/models/back/Spoink.gif b/src/canonical/models/back/325--0--Spoink.gif similarity index 100% rename from src/canonical/models/back/Spoink.gif rename to src/canonical/models/back/325--0--Spoink.gif diff --git a/src/canonical/models/back/Grumpig.gif b/src/canonical/models/back/326--0--Grumpig.gif similarity index 100% rename from src/canonical/models/back/Grumpig.gif rename to src/canonical/models/back/326--0--Grumpig.gif diff --git a/src/canonical/models/back/Spinda.gif b/src/canonical/models/back/327--0--Spinda.gif similarity index 100% rename from src/canonical/models/back/Spinda.gif rename to src/canonical/models/back/327--0--Spinda.gif diff --git a/src/canonical/models/back/Trapinch.gif b/src/canonical/models/back/328--0--Trapinch.gif similarity index 100% rename from src/canonical/models/back/Trapinch.gif rename to src/canonical/models/back/328--0--Trapinch.gif diff --git a/src/canonical/models/back/Vibrava.gif b/src/canonical/models/back/329--0--Vibrava.gif similarity index 100% rename from src/canonical/models/back/Vibrava.gif rename to src/canonical/models/back/329--0--Vibrava.gif diff --git a/src/canonical/models/back/Nidorino.gif b/src/canonical/models/back/33--0--Nidorino.gif similarity index 100% rename from src/canonical/models/back/Nidorino.gif rename to src/canonical/models/back/33--0--Nidorino.gif diff --git a/src/canonical/models/back/Flygon.gif b/src/canonical/models/back/330--0--Flygon.gif similarity index 100% rename from src/canonical/models/back/Flygon.gif rename to src/canonical/models/back/330--0--Flygon.gif diff --git a/src/canonical/models/back/Cacnea.gif b/src/canonical/models/back/331--0--Cacnea.gif similarity index 100% rename from src/canonical/models/back/Cacnea.gif rename to src/canonical/models/back/331--0--Cacnea.gif diff --git a/src/canonical/models/back/Cacturne.gif b/src/canonical/models/back/332--0--Cacturne.gif similarity index 100% rename from src/canonical/models/back/Cacturne.gif rename to src/canonical/models/back/332--0--Cacturne.gif diff --git a/src/canonical/models/back/Swablu.gif b/src/canonical/models/back/333--0--Swablu.gif similarity index 100% rename from src/canonical/models/back/Swablu.gif rename to src/canonical/models/back/333--0--Swablu.gif diff --git a/src/canonical/models/back/Altaria.gif b/src/canonical/models/back/334--0--Altaria.gif similarity index 100% rename from src/canonical/models/back/Altaria.gif rename to src/canonical/models/back/334--0--Altaria.gif diff --git a/src/canonical/models/back/Altaria--Mega.gif b/src/canonical/models/back/334--420--Altaria--Mega.gif similarity index 100% rename from src/canonical/models/back/Altaria--Mega.gif rename to src/canonical/models/back/334--420--Altaria--Mega.gif diff --git a/src/canonical/models/back/Zangoose.gif b/src/canonical/models/back/335--0--Zangoose.gif similarity index 100% rename from src/canonical/models/back/Zangoose.gif rename to src/canonical/models/back/335--0--Zangoose.gif diff --git a/src/canonical/models/back/Seviper.gif b/src/canonical/models/back/336--0--Seviper.gif similarity index 100% rename from src/canonical/models/back/Seviper.gif rename to src/canonical/models/back/336--0--Seviper.gif diff --git a/src/canonical/models/back/Lunatone.gif b/src/canonical/models/back/337--0--Lunatone.gif similarity index 100% rename from src/canonical/models/back/Lunatone.gif rename to src/canonical/models/back/337--0--Lunatone.gif diff --git a/src/canonical/models/back/Solrock.gif b/src/canonical/models/back/338--0--Solrock.gif similarity index 100% rename from src/canonical/models/back/Solrock.gif rename to src/canonical/models/back/338--0--Solrock.gif diff --git a/src/canonical/models/back/Barboach.gif b/src/canonical/models/back/339--0--Barboach.gif similarity index 100% rename from src/canonical/models/back/Barboach.gif rename to src/canonical/models/back/339--0--Barboach.gif diff --git a/src/canonical/models/back/Nidoking.gif b/src/canonical/models/back/34--0--Nidoking.gif similarity index 100% rename from src/canonical/models/back/Nidoking.gif rename to src/canonical/models/back/34--0--Nidoking.gif diff --git a/src/canonical/models/back/Whiscash.gif b/src/canonical/models/back/340--0--Whiscash.gif similarity index 100% rename from src/canonical/models/back/Whiscash.gif rename to src/canonical/models/back/340--0--Whiscash.gif diff --git a/src/canonical/models/back/Corphish.gif b/src/canonical/models/back/341--0--Corphish.gif similarity index 100% rename from src/canonical/models/back/Corphish.gif rename to src/canonical/models/back/341--0--Corphish.gif diff --git a/src/canonical/models/back/Crawdaunt.gif b/src/canonical/models/back/342--0--Crawdaunt.gif similarity index 100% rename from src/canonical/models/back/Crawdaunt.gif rename to src/canonical/models/back/342--0--Crawdaunt.gif diff --git a/src/canonical/models/back/Baltoy.gif b/src/canonical/models/back/343--0--Baltoy.gif similarity index 100% rename from src/canonical/models/back/Baltoy.gif rename to src/canonical/models/back/343--0--Baltoy.gif diff --git a/src/canonical/models/back/Claydol.gif b/src/canonical/models/back/344--0--Claydol.gif similarity index 100% rename from src/canonical/models/back/Claydol.gif rename to src/canonical/models/back/344--0--Claydol.gif diff --git a/src/canonical/models/back/Lileep.gif b/src/canonical/models/back/345--0--Lileep.gif similarity index 100% rename from src/canonical/models/back/Lileep.gif rename to src/canonical/models/back/345--0--Lileep.gif diff --git a/src/canonical/models/back/Cradily.gif b/src/canonical/models/back/346--0--Cradily.gif similarity index 100% rename from src/canonical/models/back/Cradily.gif rename to src/canonical/models/back/346--0--Cradily.gif diff --git a/src/canonical/models/back/Anorith.gif b/src/canonical/models/back/347--0--Anorith.gif similarity index 100% rename from src/canonical/models/back/Anorith.gif rename to src/canonical/models/back/347--0--Anorith.gif diff --git a/src/canonical/models/back/Armaldo.gif b/src/canonical/models/back/348--0--Armaldo.gif similarity index 100% rename from src/canonical/models/back/Armaldo.gif rename to src/canonical/models/back/348--0--Armaldo.gif diff --git a/src/canonical/models/back/Feebas.gif b/src/canonical/models/back/349--0--Feebas.gif similarity index 100% rename from src/canonical/models/back/Feebas.gif rename to src/canonical/models/back/349--0--Feebas.gif diff --git a/src/canonical/models/back/Clefairy.gif b/src/canonical/models/back/35--0--Clefairy.gif similarity index 100% rename from src/canonical/models/back/Clefairy.gif rename to src/canonical/models/back/35--0--Clefairy.gif diff --git a/src/canonical/models/back/Milotic.gif b/src/canonical/models/back/350--0--Milotic.gif similarity index 100% rename from src/canonical/models/back/Milotic.gif rename to src/canonical/models/back/350--0--Milotic.gif diff --git a/src/canonical/models/back/Castform.gif b/src/canonical/models/back/351--0--Castform.gif similarity index 100% rename from src/canonical/models/back/Castform.gif rename to src/canonical/models/back/351--0--Castform.gif diff --git a/src/canonical/models/back/Castform--Rainy.gif b/src/canonical/models/back/351--420--Castform--Rainy.gif similarity index 100% rename from src/canonical/models/back/Castform--Rainy.gif rename to src/canonical/models/back/351--420--Castform--Rainy.gif diff --git a/src/canonical/models/back/Castform--Snowy.gif b/src/canonical/models/back/351--420--Castform--Snowy.gif similarity index 100% rename from src/canonical/models/back/Castform--Snowy.gif rename to src/canonical/models/back/351--420--Castform--Snowy.gif diff --git a/src/canonical/models/back/Castform--Sunny.gif b/src/canonical/models/back/351--420--Castform--Sunny.gif similarity index 100% rename from src/canonical/models/back/Castform--Sunny.gif rename to src/canonical/models/back/351--420--Castform--Sunny.gif diff --git a/src/canonical/models/back/Kecleon.gif b/src/canonical/models/back/352--0--Kecleon.gif similarity index 100% rename from src/canonical/models/back/Kecleon.gif rename to src/canonical/models/back/352--0--Kecleon.gif diff --git a/src/canonical/models/back/Shuppet.gif b/src/canonical/models/back/353--0--Shuppet.gif similarity index 100% rename from src/canonical/models/back/Shuppet.gif rename to src/canonical/models/back/353--0--Shuppet.gif diff --git a/src/canonical/models/back/Banette.gif b/src/canonical/models/back/354--0--Banette.gif similarity index 100% rename from src/canonical/models/back/Banette.gif rename to src/canonical/models/back/354--0--Banette.gif diff --git a/src/canonical/models/back/Banette--Mega.gif b/src/canonical/models/back/354--420--Banette--Mega.gif similarity index 100% rename from src/canonical/models/back/Banette--Mega.gif rename to src/canonical/models/back/354--420--Banette--Mega.gif diff --git a/src/canonical/models/back/Duskull.gif b/src/canonical/models/back/355--0--Duskull.gif similarity index 100% rename from src/canonical/models/back/Duskull.gif rename to src/canonical/models/back/355--0--Duskull.gif diff --git a/src/canonical/models/back/Dusclops.gif b/src/canonical/models/back/356--0--Dusclops.gif similarity index 100% rename from src/canonical/models/back/Dusclops.gif rename to src/canonical/models/back/356--0--Dusclops.gif diff --git a/src/canonical/models/back/Tropius.gif b/src/canonical/models/back/357--0--Tropius.gif similarity index 100% rename from src/canonical/models/back/Tropius.gif rename to src/canonical/models/back/357--0--Tropius.gif diff --git a/src/canonical/models/back/Chimecho.gif b/src/canonical/models/back/358--0--Chimecho.gif similarity index 100% rename from src/canonical/models/back/Chimecho.gif rename to src/canonical/models/back/358--0--Chimecho.gif diff --git a/src/canonical/models/back/Absol.gif b/src/canonical/models/back/359--0--Absol.gif similarity index 100% rename from src/canonical/models/back/Absol.gif rename to src/canonical/models/back/359--0--Absol.gif diff --git a/src/canonical/models/back/Absol--Mega.gif b/src/canonical/models/back/359--420--Absol--Mega.gif similarity index 100% rename from src/canonical/models/back/Absol--Mega.gif rename to src/canonical/models/back/359--420--Absol--Mega.gif diff --git a/src/canonical/models/back/Clefable.gif b/src/canonical/models/back/36--0--Clefable.gif similarity index 100% rename from src/canonical/models/back/Clefable.gif rename to src/canonical/models/back/36--0--Clefable.gif diff --git a/src/canonical/models/back/Wynaut.gif b/src/canonical/models/back/360--0--Wynaut.gif similarity index 100% rename from src/canonical/models/back/Wynaut.gif rename to src/canonical/models/back/360--0--Wynaut.gif diff --git a/src/canonical/models/back/Snorunt.gif b/src/canonical/models/back/361--0--Snorunt.gif similarity index 100% rename from src/canonical/models/back/Snorunt.gif rename to src/canonical/models/back/361--0--Snorunt.gif diff --git a/src/canonical/models/back/Glalie.gif b/src/canonical/models/back/362--0--Glalie.gif similarity index 100% rename from src/canonical/models/back/Glalie.gif rename to src/canonical/models/back/362--0--Glalie.gif diff --git a/src/canonical/models/back/Glalie--Mega.gif b/src/canonical/models/back/362--420--Glalie--Mega.gif similarity index 100% rename from src/canonical/models/back/Glalie--Mega.gif rename to src/canonical/models/back/362--420--Glalie--Mega.gif diff --git a/src/canonical/models/back/Spheal.gif b/src/canonical/models/back/363--0--Spheal.gif similarity index 100% rename from src/canonical/models/back/Spheal.gif rename to src/canonical/models/back/363--0--Spheal.gif diff --git a/src/canonical/models/back/Sealeo.gif b/src/canonical/models/back/364--0--Sealeo.gif similarity index 100% rename from src/canonical/models/back/Sealeo.gif rename to src/canonical/models/back/364--0--Sealeo.gif diff --git a/src/canonical/models/back/Walrein.gif b/src/canonical/models/back/365--0--Walrein.gif similarity index 100% rename from src/canonical/models/back/Walrein.gif rename to src/canonical/models/back/365--0--Walrein.gif diff --git a/src/canonical/models/back/Clamperl.gif b/src/canonical/models/back/366--0--Clamperl.gif similarity index 100% rename from src/canonical/models/back/Clamperl.gif rename to src/canonical/models/back/366--0--Clamperl.gif diff --git a/src/canonical/models/back/Huntail.gif b/src/canonical/models/back/367--0--Huntail.gif similarity index 100% rename from src/canonical/models/back/Huntail.gif rename to src/canonical/models/back/367--0--Huntail.gif diff --git a/src/canonical/models/back/Gorebyss.gif b/src/canonical/models/back/368--0--Gorebyss.gif similarity index 100% rename from src/canonical/models/back/Gorebyss.gif rename to src/canonical/models/back/368--0--Gorebyss.gif diff --git a/src/canonical/models/back/Relicanth.gif b/src/canonical/models/back/369--0--Relicanth.gif similarity index 100% rename from src/canonical/models/back/Relicanth.gif rename to src/canonical/models/back/369--0--Relicanth.gif diff --git a/src/canonical/models/back/Vulpix.gif b/src/canonical/models/back/37--0--Vulpix.gif similarity index 100% rename from src/canonical/models/back/Vulpix.gif rename to src/canonical/models/back/37--0--Vulpix.gif diff --git a/src/canonical/models/back/Vulpix--Alola.gif b/src/canonical/models/back/37--420--Vulpix--Alola.gif similarity index 100% rename from src/canonical/models/back/Vulpix--Alola.gif rename to src/canonical/models/back/37--420--Vulpix--Alola.gif diff --git a/src/canonical/models/back/Luvdisc.gif b/src/canonical/models/back/370--0--Luvdisc.gif similarity index 100% rename from src/canonical/models/back/Luvdisc.gif rename to src/canonical/models/back/370--0--Luvdisc.gif diff --git a/src/canonical/models/back/Bagon.gif b/src/canonical/models/back/371--0--Bagon.gif similarity index 100% rename from src/canonical/models/back/Bagon.gif rename to src/canonical/models/back/371--0--Bagon.gif diff --git a/src/canonical/models/back/Shelgon.gif b/src/canonical/models/back/372--0--Shelgon.gif similarity index 100% rename from src/canonical/models/back/Shelgon.gif rename to src/canonical/models/back/372--0--Shelgon.gif diff --git a/src/canonical/models/back/Salamence.gif b/src/canonical/models/back/373--0--Salamence.gif similarity index 100% rename from src/canonical/models/back/Salamence.gif rename to src/canonical/models/back/373--0--Salamence.gif diff --git a/src/canonical/models/back/Salamence--Mega.gif b/src/canonical/models/back/373--420--Salamence--Mega.gif similarity index 100% rename from src/canonical/models/back/Salamence--Mega.gif rename to src/canonical/models/back/373--420--Salamence--Mega.gif diff --git a/src/canonical/models/back/Beldum.gif b/src/canonical/models/back/374--0--Beldum.gif similarity index 100% rename from src/canonical/models/back/Beldum.gif rename to src/canonical/models/back/374--0--Beldum.gif diff --git a/src/canonical/models/back/Metang.gif b/src/canonical/models/back/375--0--Metang.gif similarity index 100% rename from src/canonical/models/back/Metang.gif rename to src/canonical/models/back/375--0--Metang.gif diff --git a/src/canonical/models/back/Metagross.gif b/src/canonical/models/back/376--0--Metagross.gif similarity index 100% rename from src/canonical/models/back/Metagross.gif rename to src/canonical/models/back/376--0--Metagross.gif diff --git a/src/canonical/models/back/Metagross--Mega.gif b/src/canonical/models/back/376--420--Metagross--Mega.gif similarity index 100% rename from src/canonical/models/back/Metagross--Mega.gif rename to src/canonical/models/back/376--420--Metagross--Mega.gif diff --git a/src/canonical/models/back/Regirock.gif b/src/canonical/models/back/377--0--Regirock.gif similarity index 100% rename from src/canonical/models/back/Regirock.gif rename to src/canonical/models/back/377--0--Regirock.gif diff --git a/src/canonical/models/back/Regice.gif b/src/canonical/models/back/378--0--Regice.gif similarity index 100% rename from src/canonical/models/back/Regice.gif rename to src/canonical/models/back/378--0--Regice.gif diff --git a/src/canonical/models/back/Registeel.gif b/src/canonical/models/back/379--0--Registeel.gif similarity index 100% rename from src/canonical/models/back/Registeel.gif rename to src/canonical/models/back/379--0--Registeel.gif diff --git a/src/canonical/models/back/Ninetales.gif b/src/canonical/models/back/38--0--Ninetales.gif similarity index 100% rename from src/canonical/models/back/Ninetales.gif rename to src/canonical/models/back/38--0--Ninetales.gif diff --git a/src/canonical/models/back/Ninetales--Alola.gif b/src/canonical/models/back/38--420--Ninetales--Alola.gif similarity index 100% rename from src/canonical/models/back/Ninetales--Alola.gif rename to src/canonical/models/back/38--420--Ninetales--Alola.gif diff --git a/src/canonical/models/back/Latias.gif b/src/canonical/models/back/380--0--Latias.gif similarity index 100% rename from src/canonical/models/back/Latias.gif rename to src/canonical/models/back/380--0--Latias.gif diff --git a/src/canonical/models/back/Latias--Mega.gif b/src/canonical/models/back/380--420--Latias--Mega.gif similarity index 100% rename from src/canonical/models/back/Latias--Mega.gif rename to src/canonical/models/back/380--420--Latias--Mega.gif diff --git a/src/canonical/models/back/Latios.gif b/src/canonical/models/back/381--0--Latios.gif similarity index 100% rename from src/canonical/models/back/Latios.gif rename to src/canonical/models/back/381--0--Latios.gif diff --git a/src/canonical/models/back/Latios--Mega.gif b/src/canonical/models/back/381--420--Latios--Mega.gif similarity index 100% rename from src/canonical/models/back/Latios--Mega.gif rename to src/canonical/models/back/381--420--Latios--Mega.gif diff --git a/src/canonical/models/back/Kyogre.gif b/src/canonical/models/back/382--0--Kyogre.gif similarity index 100% rename from src/canonical/models/back/Kyogre.gif rename to src/canonical/models/back/382--0--Kyogre.gif diff --git a/src/canonical/models/back/Kyogre--Primal.gif b/src/canonical/models/back/382--420--Kyogre--Primal.gif similarity index 100% rename from src/canonical/models/back/Kyogre--Primal.gif rename to src/canonical/models/back/382--420--Kyogre--Primal.gif diff --git a/src/canonical/models/back/Groudon.gif b/src/canonical/models/back/383--0--Groudon.gif similarity index 100% rename from src/canonical/models/back/Groudon.gif rename to src/canonical/models/back/383--0--Groudon.gif diff --git a/src/canonical/models/back/Groudon--Primal.gif b/src/canonical/models/back/383--420--Groudon--Primal.gif similarity index 100% rename from src/canonical/models/back/Groudon--Primal.gif rename to src/canonical/models/back/383--420--Groudon--Primal.gif diff --git a/src/canonical/models/back/Rayquaza.gif b/src/canonical/models/back/384--0--Rayquaza.gif similarity index 100% rename from src/canonical/models/back/Rayquaza.gif rename to src/canonical/models/back/384--0--Rayquaza.gif diff --git a/src/canonical/models/back/Rayquaza--Mega.gif b/src/canonical/models/back/384--420--Rayquaza--Mega.gif similarity index 100% rename from src/canonical/models/back/Rayquaza--Mega.gif rename to src/canonical/models/back/384--420--Rayquaza--Mega.gif diff --git a/src/canonical/models/back/Jirachi.gif b/src/canonical/models/back/385--0--Jirachi.gif similarity index 100% rename from src/canonical/models/back/Jirachi.gif rename to src/canonical/models/back/385--0--Jirachi.gif diff --git a/src/canonical/models/back/Deoxys.gif b/src/canonical/models/back/386--0--Deoxys.gif similarity index 100% rename from src/canonical/models/back/Deoxys.gif rename to src/canonical/models/back/386--0--Deoxys.gif diff --git a/src/canonical/models/back/Deoxys--Attack.gif b/src/canonical/models/back/386--420--Deoxys--Attack.gif similarity index 100% rename from src/canonical/models/back/Deoxys--Attack.gif rename to src/canonical/models/back/386--420--Deoxys--Attack.gif diff --git a/src/canonical/models/back/Deoxys--Defense.gif b/src/canonical/models/back/386--420--Deoxys--Defense.gif similarity index 100% rename from src/canonical/models/back/Deoxys--Defense.gif rename to src/canonical/models/back/386--420--Deoxys--Defense.gif diff --git a/src/canonical/models/back/Deoxys--Speed.gif b/src/canonical/models/back/386--420--Deoxys--Speed.gif similarity index 100% rename from src/canonical/models/back/Deoxys--Speed.gif rename to src/canonical/models/back/386--420--Deoxys--Speed.gif diff --git a/src/canonical/models/back/Turtwig.gif b/src/canonical/models/back/387--0--Turtwig.gif similarity index 100% rename from src/canonical/models/back/Turtwig.gif rename to src/canonical/models/back/387--0--Turtwig.gif diff --git a/src/canonical/models/back/Grotle.gif b/src/canonical/models/back/388--0--Grotle.gif similarity index 100% rename from src/canonical/models/back/Grotle.gif rename to src/canonical/models/back/388--0--Grotle.gif diff --git a/src/canonical/models/back/Torterra.gif b/src/canonical/models/back/389--0--Torterra.gif similarity index 100% rename from src/canonical/models/back/Torterra.gif rename to src/canonical/models/back/389--0--Torterra.gif diff --git a/src/canonical/models/back/Jigglypuff.gif b/src/canonical/models/back/39--0--Jigglypuff.gif similarity index 100% rename from src/canonical/models/back/Jigglypuff.gif rename to src/canonical/models/back/39--0--Jigglypuff.gif diff --git a/src/canonical/models/back/Chimchar.gif b/src/canonical/models/back/390--0--Chimchar.gif similarity index 100% rename from src/canonical/models/back/Chimchar.gif rename to src/canonical/models/back/390--0--Chimchar.gif diff --git a/src/canonical/models/back/Monferno.gif b/src/canonical/models/back/391--0--Monferno.gif similarity index 100% rename from src/canonical/models/back/Monferno.gif rename to src/canonical/models/back/391--0--Monferno.gif diff --git a/src/canonical/models/back/Infernape.gif b/src/canonical/models/back/392--0--Infernape.gif similarity index 100% rename from src/canonical/models/back/Infernape.gif rename to src/canonical/models/back/392--0--Infernape.gif diff --git a/src/canonical/models/back/Piplup.gif b/src/canonical/models/back/393--0--Piplup.gif similarity index 100% rename from src/canonical/models/back/Piplup.gif rename to src/canonical/models/back/393--0--Piplup.gif diff --git a/src/canonical/models/back/Prinplup.gif b/src/canonical/models/back/394--0--Prinplup.gif similarity index 100% rename from src/canonical/models/back/Prinplup.gif rename to src/canonical/models/back/394--0--Prinplup.gif diff --git a/src/canonical/models/back/Empoleon.gif b/src/canonical/models/back/395--0--Empoleon.gif similarity index 100% rename from src/canonical/models/back/Empoleon.gif rename to src/canonical/models/back/395--0--Empoleon.gif diff --git a/src/canonical/models/back/Starly.gif b/src/canonical/models/back/396--0--Starly.gif similarity index 100% rename from src/canonical/models/back/Starly.gif rename to src/canonical/models/back/396--0--Starly.gif diff --git a/src/canonical/models/back/Staravia.gif b/src/canonical/models/back/397--0--Staravia.gif similarity index 100% rename from src/canonical/models/back/Staravia.gif rename to src/canonical/models/back/397--0--Staravia.gif diff --git a/src/canonical/models/back/Staraptor.gif b/src/canonical/models/back/398--0--Staraptor.gif similarity index 100% rename from src/canonical/models/back/Staraptor.gif rename to src/canonical/models/back/398--0--Staraptor.gif diff --git a/src/canonical/models/back/Bidoof.gif b/src/canonical/models/back/399--0--Bidoof.gif similarity index 100% rename from src/canonical/models/back/Bidoof.gif rename to src/canonical/models/back/399--0--Bidoof.gif diff --git a/src/canonical/models/back/Charmander.gif b/src/canonical/models/back/4--0--Charmander.gif similarity index 100% rename from src/canonical/models/back/Charmander.gif rename to src/canonical/models/back/4--0--Charmander.gif diff --git a/src/canonical/models/back/Wigglytuff.gif b/src/canonical/models/back/40--0--Wigglytuff.gif similarity index 100% rename from src/canonical/models/back/Wigglytuff.gif rename to src/canonical/models/back/40--0--Wigglytuff.gif diff --git a/src/canonical/models/back/Bibarel.gif b/src/canonical/models/back/400--0--Bibarel.gif similarity index 100% rename from src/canonical/models/back/Bibarel.gif rename to src/canonical/models/back/400--0--Bibarel.gif diff --git a/src/canonical/models/back/Kricketot.gif b/src/canonical/models/back/401--0--Kricketot.gif similarity index 100% rename from src/canonical/models/back/Kricketot.gif rename to src/canonical/models/back/401--0--Kricketot.gif diff --git a/src/canonical/models/back/Kricketune.gif b/src/canonical/models/back/402--0--Kricketune.gif similarity index 100% rename from src/canonical/models/back/Kricketune.gif rename to src/canonical/models/back/402--0--Kricketune.gif diff --git a/src/canonical/models/back/Shinx.gif b/src/canonical/models/back/403--0--Shinx.gif similarity index 100% rename from src/canonical/models/back/Shinx.gif rename to src/canonical/models/back/403--0--Shinx.gif diff --git a/src/canonical/models/back/Luxio.gif b/src/canonical/models/back/404--0--Luxio.gif similarity index 100% rename from src/canonical/models/back/Luxio.gif rename to src/canonical/models/back/404--0--Luxio.gif diff --git a/src/canonical/models/back/Luxray.gif b/src/canonical/models/back/405--0--Luxray.gif similarity index 100% rename from src/canonical/models/back/Luxray.gif rename to src/canonical/models/back/405--0--Luxray.gif diff --git a/src/canonical/models/back/Budew.gif b/src/canonical/models/back/406--0--Budew.gif similarity index 100% rename from src/canonical/models/back/Budew.gif rename to src/canonical/models/back/406--0--Budew.gif diff --git a/src/canonical/models/back/Roserade.gif b/src/canonical/models/back/407--0--Roserade.gif similarity index 100% rename from src/canonical/models/back/Roserade.gif rename to src/canonical/models/back/407--0--Roserade.gif diff --git a/src/canonical/models/back/Cranidos.gif b/src/canonical/models/back/408--0--Cranidos.gif similarity index 100% rename from src/canonical/models/back/Cranidos.gif rename to src/canonical/models/back/408--0--Cranidos.gif diff --git a/src/canonical/models/back/Rampardos.gif b/src/canonical/models/back/409--0--Rampardos.gif similarity index 100% rename from src/canonical/models/back/Rampardos.gif rename to src/canonical/models/back/409--0--Rampardos.gif diff --git a/src/canonical/models/back/Zubat.gif b/src/canonical/models/back/41--0--Zubat.gif similarity index 100% rename from src/canonical/models/back/Zubat.gif rename to src/canonical/models/back/41--0--Zubat.gif diff --git a/src/canonical/models/back/Shieldon.gif b/src/canonical/models/back/410--0--Shieldon.gif similarity index 100% rename from src/canonical/models/back/Shieldon.gif rename to src/canonical/models/back/410--0--Shieldon.gif diff --git a/src/canonical/models/back/Bastiodon.gif b/src/canonical/models/back/411--0--Bastiodon.gif similarity index 100% rename from src/canonical/models/back/Bastiodon.gif rename to src/canonical/models/back/411--0--Bastiodon.gif diff --git a/src/canonical/models/back/Burmy.gif b/src/canonical/models/back/412--0--Burmy.gif similarity index 100% rename from src/canonical/models/back/Burmy.gif rename to src/canonical/models/back/412--0--Burmy.gif diff --git a/src/canonical/models/back/Wormadam.gif b/src/canonical/models/back/413--0--Wormadam.gif similarity index 100% rename from src/canonical/models/back/Wormadam.gif rename to src/canonical/models/back/413--0--Wormadam.gif diff --git a/src/canonical/models/back/Wormadam--Sandy.gif b/src/canonical/models/back/413--420--Wormadam--Sandy.gif similarity index 100% rename from src/canonical/models/back/Wormadam--Sandy.gif rename to src/canonical/models/back/413--420--Wormadam--Sandy.gif diff --git a/src/canonical/models/back/Wormadam--Trash.gif b/src/canonical/models/back/413--420--Wormadam--Trash.gif similarity index 100% rename from src/canonical/models/back/Wormadam--Trash.gif rename to src/canonical/models/back/413--420--Wormadam--Trash.gif diff --git a/src/canonical/models/back/Mothim.gif b/src/canonical/models/back/414--0--Mothim.gif similarity index 100% rename from src/canonical/models/back/Mothim.gif rename to src/canonical/models/back/414--0--Mothim.gif diff --git a/src/canonical/models/back/Combee.gif b/src/canonical/models/back/415--0--Combee.gif similarity index 100% rename from src/canonical/models/back/Combee.gif rename to src/canonical/models/back/415--0--Combee.gif diff --git a/src/canonical/models/back/Vespiquen.gif b/src/canonical/models/back/416--0--Vespiquen.gif similarity index 100% rename from src/canonical/models/back/Vespiquen.gif rename to src/canonical/models/back/416--0--Vespiquen.gif diff --git a/src/canonical/models/back/Pachirisu.gif b/src/canonical/models/back/417--0--Pachirisu.gif similarity index 100% rename from src/canonical/models/back/Pachirisu.gif rename to src/canonical/models/back/417--0--Pachirisu.gif diff --git a/src/canonical/models/back/Buizel.gif b/src/canonical/models/back/418--0--Buizel.gif similarity index 100% rename from src/canonical/models/back/Buizel.gif rename to src/canonical/models/back/418--0--Buizel.gif diff --git a/src/canonical/models/back/Floatzel.gif b/src/canonical/models/back/419--0--Floatzel.gif similarity index 100% rename from src/canonical/models/back/Floatzel.gif rename to src/canonical/models/back/419--0--Floatzel.gif diff --git a/src/canonical/models/back/Golbat.gif b/src/canonical/models/back/42--0--Golbat.gif similarity index 100% rename from src/canonical/models/back/Golbat.gif rename to src/canonical/models/back/42--0--Golbat.gif diff --git a/src/canonical/models/back/Cherubi.gif b/src/canonical/models/back/420--0--Cherubi.gif similarity index 100% rename from src/canonical/models/back/Cherubi.gif rename to src/canonical/models/back/420--0--Cherubi.gif diff --git a/src/canonical/models/back/Cherrim.gif b/src/canonical/models/back/421--0--Cherrim.gif similarity index 100% rename from src/canonical/models/back/Cherrim.gif rename to src/canonical/models/back/421--0--Cherrim.gif diff --git a/src/canonical/models/back/Cherrim--Sunshine.gif b/src/canonical/models/back/421--420--Cherrim--Sunshine.gif similarity index 100% rename from src/canonical/models/back/Cherrim--Sunshine.gif rename to src/canonical/models/back/421--420--Cherrim--Sunshine.gif diff --git a/src/canonical/models/back/Shellos.gif b/src/canonical/models/back/422--0--Shellos.gif similarity index 100% rename from src/canonical/models/back/Shellos.gif rename to src/canonical/models/back/422--0--Shellos.gif diff --git a/src/canonical/models/back/Gastrodon.gif b/src/canonical/models/back/423--0--Gastrodon.gif similarity index 100% rename from src/canonical/models/back/Gastrodon.gif rename to src/canonical/models/back/423--0--Gastrodon.gif diff --git a/src/canonical/models/back/Ambipom.gif b/src/canonical/models/back/424--0--Ambipom.gif similarity index 100% rename from src/canonical/models/back/Ambipom.gif rename to src/canonical/models/back/424--0--Ambipom.gif diff --git a/src/canonical/models/back/Drifloon.gif b/src/canonical/models/back/425--0--Drifloon.gif similarity index 100% rename from src/canonical/models/back/Drifloon.gif rename to src/canonical/models/back/425--0--Drifloon.gif diff --git a/src/canonical/models/back/Drifblim.gif b/src/canonical/models/back/426--0--Drifblim.gif similarity index 100% rename from src/canonical/models/back/Drifblim.gif rename to src/canonical/models/back/426--0--Drifblim.gif diff --git a/src/canonical/models/back/Buneary.gif b/src/canonical/models/back/427--0--Buneary.gif similarity index 100% rename from src/canonical/models/back/Buneary.gif rename to src/canonical/models/back/427--0--Buneary.gif diff --git a/src/canonical/models/back/Lopunny.gif b/src/canonical/models/back/428--0--Lopunny.gif similarity index 100% rename from src/canonical/models/back/Lopunny.gif rename to src/canonical/models/back/428--0--Lopunny.gif diff --git a/src/canonical/models/back/Lopunny--Mega.gif b/src/canonical/models/back/428--420--Lopunny--Mega.gif similarity index 100% rename from src/canonical/models/back/Lopunny--Mega.gif rename to src/canonical/models/back/428--420--Lopunny--Mega.gif diff --git a/src/canonical/models/back/Mismagius.gif b/src/canonical/models/back/429--0--Mismagius.gif similarity index 100% rename from src/canonical/models/back/Mismagius.gif rename to src/canonical/models/back/429--0--Mismagius.gif diff --git a/src/canonical/models/back/Oddish.gif b/src/canonical/models/back/43--0--Oddish.gif similarity index 100% rename from src/canonical/models/back/Oddish.gif rename to src/canonical/models/back/43--0--Oddish.gif diff --git a/src/canonical/models/back/Honchkrow.gif b/src/canonical/models/back/430--0--Honchkrow.gif similarity index 100% rename from src/canonical/models/back/Honchkrow.gif rename to src/canonical/models/back/430--0--Honchkrow.gif diff --git a/src/canonical/models/back/Glameow.gif b/src/canonical/models/back/431--0--Glameow.gif similarity index 100% rename from src/canonical/models/back/Glameow.gif rename to src/canonical/models/back/431--0--Glameow.gif diff --git a/src/canonical/models/back/Purugly.gif b/src/canonical/models/back/432--0--Purugly.gif similarity index 100% rename from src/canonical/models/back/Purugly.gif rename to src/canonical/models/back/432--0--Purugly.gif diff --git a/src/canonical/models/back/Chingling.gif b/src/canonical/models/back/433--0--Chingling.gif similarity index 100% rename from src/canonical/models/back/Chingling.gif rename to src/canonical/models/back/433--0--Chingling.gif diff --git a/src/canonical/models/back/Stunky.gif b/src/canonical/models/back/434--0--Stunky.gif similarity index 100% rename from src/canonical/models/back/Stunky.gif rename to src/canonical/models/back/434--0--Stunky.gif diff --git a/src/canonical/models/back/Skuntank.gif b/src/canonical/models/back/435--0--Skuntank.gif similarity index 100% rename from src/canonical/models/back/Skuntank.gif rename to src/canonical/models/back/435--0--Skuntank.gif diff --git a/src/canonical/models/back/Bronzor.gif b/src/canonical/models/back/436--0--Bronzor.gif similarity index 100% rename from src/canonical/models/back/Bronzor.gif rename to src/canonical/models/back/436--0--Bronzor.gif diff --git a/src/canonical/models/back/Bronzong.gif b/src/canonical/models/back/437--0--Bronzong.gif similarity index 100% rename from src/canonical/models/back/Bronzong.gif rename to src/canonical/models/back/437--0--Bronzong.gif diff --git a/src/canonical/models/back/Bonsly.gif b/src/canonical/models/back/438--0--Bonsly.gif similarity index 100% rename from src/canonical/models/back/Bonsly.gif rename to src/canonical/models/back/438--0--Bonsly.gif diff --git a/src/canonical/models/back/Mime_Jr..gif b/src/canonical/models/back/439--0--Mime_Jr..gif similarity index 100% rename from src/canonical/models/back/Mime_Jr..gif rename to src/canonical/models/back/439--0--Mime_Jr..gif diff --git a/src/canonical/models/back/Gloom.gif b/src/canonical/models/back/44--0--Gloom.gif similarity index 100% rename from src/canonical/models/back/Gloom.gif rename to src/canonical/models/back/44--0--Gloom.gif diff --git a/src/canonical/models/back/Happiny.gif b/src/canonical/models/back/440--0--Happiny.gif similarity index 100% rename from src/canonical/models/back/Happiny.gif rename to src/canonical/models/back/440--0--Happiny.gif diff --git a/src/canonical/models/back/Chatot.gif b/src/canonical/models/back/441--0--Chatot.gif similarity index 100% rename from src/canonical/models/back/Chatot.gif rename to src/canonical/models/back/441--0--Chatot.gif diff --git a/src/canonical/models/back/Spiritomb.gif b/src/canonical/models/back/442--0--Spiritomb.gif similarity index 100% rename from src/canonical/models/back/Spiritomb.gif rename to src/canonical/models/back/442--0--Spiritomb.gif diff --git a/src/canonical/models/back/Gible.gif b/src/canonical/models/back/443--0--Gible.gif similarity index 100% rename from src/canonical/models/back/Gible.gif rename to src/canonical/models/back/443--0--Gible.gif diff --git a/src/canonical/models/back/Gabite.gif b/src/canonical/models/back/444--0--Gabite.gif similarity index 100% rename from src/canonical/models/back/Gabite.gif rename to src/canonical/models/back/444--0--Gabite.gif diff --git a/src/canonical/models/back/Garchomp.gif b/src/canonical/models/back/445--0--Garchomp.gif similarity index 100% rename from src/canonical/models/back/Garchomp.gif rename to src/canonical/models/back/445--0--Garchomp.gif diff --git a/src/canonical/models/back/Garchomp--Mega.gif b/src/canonical/models/back/445--420--Garchomp--Mega.gif similarity index 100% rename from src/canonical/models/back/Garchomp--Mega.gif rename to src/canonical/models/back/445--420--Garchomp--Mega.gif diff --git a/src/canonical/models/back/Munchlax.gif b/src/canonical/models/back/446--0--Munchlax.gif similarity index 100% rename from src/canonical/models/back/Munchlax.gif rename to src/canonical/models/back/446--0--Munchlax.gif diff --git a/src/canonical/models/back/Riolu.gif b/src/canonical/models/back/447--0--Riolu.gif similarity index 100% rename from src/canonical/models/back/Riolu.gif rename to src/canonical/models/back/447--0--Riolu.gif diff --git a/src/canonical/models/back/Lucario.gif b/src/canonical/models/back/448--0--Lucario.gif similarity index 100% rename from src/canonical/models/back/Lucario.gif rename to src/canonical/models/back/448--0--Lucario.gif diff --git a/src/canonical/models/back/Lucario--Mega.gif b/src/canonical/models/back/448--420--Lucario--Mega.gif similarity index 100% rename from src/canonical/models/back/Lucario--Mega.gif rename to src/canonical/models/back/448--420--Lucario--Mega.gif diff --git a/src/canonical/models/back/Hippopotas.gif b/src/canonical/models/back/449--0--Hippopotas.gif similarity index 100% rename from src/canonical/models/back/Hippopotas.gif rename to src/canonical/models/back/449--0--Hippopotas.gif diff --git a/src/canonical/models/back/Vileplume.gif b/src/canonical/models/back/45--0--Vileplume.gif similarity index 100% rename from src/canonical/models/back/Vileplume.gif rename to src/canonical/models/back/45--0--Vileplume.gif diff --git a/src/canonical/models/back/Hippowdon.gif b/src/canonical/models/back/450--0--Hippowdon.gif similarity index 100% rename from src/canonical/models/back/Hippowdon.gif rename to src/canonical/models/back/450--0--Hippowdon.gif diff --git a/src/canonical/models/back/Skorupi.gif b/src/canonical/models/back/451--0--Skorupi.gif similarity index 100% rename from src/canonical/models/back/Skorupi.gif rename to src/canonical/models/back/451--0--Skorupi.gif diff --git a/src/canonical/models/back/Drapion.gif b/src/canonical/models/back/452--0--Drapion.gif similarity index 100% rename from src/canonical/models/back/Drapion.gif rename to src/canonical/models/back/452--0--Drapion.gif diff --git a/src/canonical/models/back/Croagunk.gif b/src/canonical/models/back/453--0--Croagunk.gif similarity index 100% rename from src/canonical/models/back/Croagunk.gif rename to src/canonical/models/back/453--0--Croagunk.gif diff --git a/src/canonical/models/back/Toxicroak.gif b/src/canonical/models/back/454--0--Toxicroak.gif similarity index 100% rename from src/canonical/models/back/Toxicroak.gif rename to src/canonical/models/back/454--0--Toxicroak.gif diff --git a/src/canonical/models/back/Carnivine.gif b/src/canonical/models/back/455--0--Carnivine.gif similarity index 100% rename from src/canonical/models/back/Carnivine.gif rename to src/canonical/models/back/455--0--Carnivine.gif diff --git a/src/canonical/models/back/Finneon.gif b/src/canonical/models/back/456--0--Finneon.gif similarity index 100% rename from src/canonical/models/back/Finneon.gif rename to src/canonical/models/back/456--0--Finneon.gif diff --git a/src/canonical/models/back/Lumineon.gif b/src/canonical/models/back/457--0--Lumineon.gif similarity index 100% rename from src/canonical/models/back/Lumineon.gif rename to src/canonical/models/back/457--0--Lumineon.gif diff --git a/src/canonical/models/back/Mantyke.gif b/src/canonical/models/back/458--0--Mantyke.gif similarity index 100% rename from src/canonical/models/back/Mantyke.gif rename to src/canonical/models/back/458--0--Mantyke.gif diff --git a/src/canonical/models/back/Snover.gif b/src/canonical/models/back/459--0--Snover.gif similarity index 100% rename from src/canonical/models/back/Snover.gif rename to src/canonical/models/back/459--0--Snover.gif diff --git a/src/canonical/models/back/Paras.gif b/src/canonical/models/back/46--0--Paras.gif similarity index 100% rename from src/canonical/models/back/Paras.gif rename to src/canonical/models/back/46--0--Paras.gif diff --git a/src/canonical/models/back/Abomasnow.gif b/src/canonical/models/back/460--0--Abomasnow.gif similarity index 100% rename from src/canonical/models/back/Abomasnow.gif rename to src/canonical/models/back/460--0--Abomasnow.gif diff --git a/src/canonical/models/back/Abomasnow--Mega.gif b/src/canonical/models/back/460--420--Abomasnow--Mega.gif similarity index 100% rename from src/canonical/models/back/Abomasnow--Mega.gif rename to src/canonical/models/back/460--420--Abomasnow--Mega.gif diff --git a/src/canonical/models/back/Weavile.gif b/src/canonical/models/back/461--0--Weavile.gif similarity index 100% rename from src/canonical/models/back/Weavile.gif rename to src/canonical/models/back/461--0--Weavile.gif diff --git a/src/canonical/models/back/Magnezone.gif b/src/canonical/models/back/462--0--Magnezone.gif similarity index 100% rename from src/canonical/models/back/Magnezone.gif rename to src/canonical/models/back/462--0--Magnezone.gif diff --git a/src/canonical/models/back/Lickilicky.gif b/src/canonical/models/back/463--0--Lickilicky.gif similarity index 100% rename from src/canonical/models/back/Lickilicky.gif rename to src/canonical/models/back/463--0--Lickilicky.gif diff --git a/src/canonical/models/back/Rhyperior.gif b/src/canonical/models/back/464--0--Rhyperior.gif similarity index 100% rename from src/canonical/models/back/Rhyperior.gif rename to src/canonical/models/back/464--0--Rhyperior.gif diff --git a/src/canonical/models/back/Tangrowth.gif b/src/canonical/models/back/465--0--Tangrowth.gif similarity index 100% rename from src/canonical/models/back/Tangrowth.gif rename to src/canonical/models/back/465--0--Tangrowth.gif diff --git a/src/canonical/models/back/Electivire.gif b/src/canonical/models/back/466--0--Electivire.gif similarity index 100% rename from src/canonical/models/back/Electivire.gif rename to src/canonical/models/back/466--0--Electivire.gif diff --git a/src/canonical/models/back/Magmortar.gif b/src/canonical/models/back/467--0--Magmortar.gif similarity index 100% rename from src/canonical/models/back/Magmortar.gif rename to src/canonical/models/back/467--0--Magmortar.gif diff --git a/src/canonical/models/back/Togekiss.gif b/src/canonical/models/back/468--0--Togekiss.gif similarity index 100% rename from src/canonical/models/back/Togekiss.gif rename to src/canonical/models/back/468--0--Togekiss.gif diff --git a/src/canonical/models/back/Yanmega.gif b/src/canonical/models/back/469--0--Yanmega.gif similarity index 100% rename from src/canonical/models/back/Yanmega.gif rename to src/canonical/models/back/469--0--Yanmega.gif diff --git a/src/canonical/models/back/Parasect.gif b/src/canonical/models/back/47--0--Parasect.gif similarity index 100% rename from src/canonical/models/back/Parasect.gif rename to src/canonical/models/back/47--0--Parasect.gif diff --git a/src/canonical/models/back/Leafeon.gif b/src/canonical/models/back/470--0--Leafeon.gif similarity index 100% rename from src/canonical/models/back/Leafeon.gif rename to src/canonical/models/back/470--0--Leafeon.gif diff --git a/src/canonical/models/back/Glaceon.gif b/src/canonical/models/back/471--0--Glaceon.gif similarity index 100% rename from src/canonical/models/back/Glaceon.gif rename to src/canonical/models/back/471--0--Glaceon.gif diff --git a/src/canonical/models/back/Gliscor.gif b/src/canonical/models/back/472--0--Gliscor.gif similarity index 100% rename from src/canonical/models/back/Gliscor.gif rename to src/canonical/models/back/472--0--Gliscor.gif diff --git a/src/canonical/models/back/Mamoswine.gif b/src/canonical/models/back/473--0--Mamoswine.gif similarity index 100% rename from src/canonical/models/back/Mamoswine.gif rename to src/canonical/models/back/473--0--Mamoswine.gif diff --git a/src/canonical/models/back/Porygon-Z.gif b/src/canonical/models/back/474--0--Porygon-Z.gif similarity index 100% rename from src/canonical/models/back/Porygon-Z.gif rename to src/canonical/models/back/474--0--Porygon-Z.gif diff --git a/src/canonical/models/back/Gallade.gif b/src/canonical/models/back/475--0--Gallade.gif similarity index 100% rename from src/canonical/models/back/Gallade.gif rename to src/canonical/models/back/475--0--Gallade.gif diff --git a/src/canonical/models/back/Gallade--Mega.gif b/src/canonical/models/back/475--420--Gallade--Mega.gif similarity index 100% rename from src/canonical/models/back/Gallade--Mega.gif rename to src/canonical/models/back/475--420--Gallade--Mega.gif diff --git a/src/canonical/models/back/Probopass.gif b/src/canonical/models/back/476--0--Probopass.gif similarity index 100% rename from src/canonical/models/back/Probopass.gif rename to src/canonical/models/back/476--0--Probopass.gif diff --git a/src/canonical/models/back/Dusknoir.gif b/src/canonical/models/back/477--0--Dusknoir.gif similarity index 100% rename from src/canonical/models/back/Dusknoir.gif rename to src/canonical/models/back/477--0--Dusknoir.gif diff --git a/src/canonical/models/back/Froslass.gif b/src/canonical/models/back/478--0--Froslass.gif similarity index 100% rename from src/canonical/models/back/Froslass.gif rename to src/canonical/models/back/478--0--Froslass.gif diff --git a/src/canonical/models/back/Rotom.gif b/src/canonical/models/back/479--0--Rotom.gif similarity index 100% rename from src/canonical/models/back/Rotom.gif rename to src/canonical/models/back/479--0--Rotom.gif diff --git a/src/canonical/models/back/Rotom--Fan.gif b/src/canonical/models/back/479--420--Rotom--Fan.gif similarity index 100% rename from src/canonical/models/back/Rotom--Fan.gif rename to src/canonical/models/back/479--420--Rotom--Fan.gif diff --git a/src/canonical/models/back/Rotom--Frost.gif b/src/canonical/models/back/479--420--Rotom--Frost.gif similarity index 100% rename from src/canonical/models/back/Rotom--Frost.gif rename to src/canonical/models/back/479--420--Rotom--Frost.gif diff --git a/src/canonical/models/back/Rotom--Heat.gif b/src/canonical/models/back/479--420--Rotom--Heat.gif similarity index 100% rename from src/canonical/models/back/Rotom--Heat.gif rename to src/canonical/models/back/479--420--Rotom--Heat.gif diff --git a/src/canonical/models/back/Rotom--Mow.gif b/src/canonical/models/back/479--420--Rotom--Mow.gif similarity index 100% rename from src/canonical/models/back/Rotom--Mow.gif rename to src/canonical/models/back/479--420--Rotom--Mow.gif diff --git a/src/canonical/models/back/Rotom--Wash.gif b/src/canonical/models/back/479--420--Rotom--Wash.gif similarity index 100% rename from src/canonical/models/back/Rotom--Wash.gif rename to src/canonical/models/back/479--420--Rotom--Wash.gif diff --git a/src/canonical/models/back/Venonat.gif b/src/canonical/models/back/48--0--Venonat.gif similarity index 100% rename from src/canonical/models/back/Venonat.gif rename to src/canonical/models/back/48--0--Venonat.gif diff --git a/src/canonical/models/back/Uxie.gif b/src/canonical/models/back/480--0--Uxie.gif similarity index 100% rename from src/canonical/models/back/Uxie.gif rename to src/canonical/models/back/480--0--Uxie.gif diff --git a/src/canonical/models/back/Mesprit.gif b/src/canonical/models/back/481--0--Mesprit.gif similarity index 100% rename from src/canonical/models/back/Mesprit.gif rename to src/canonical/models/back/481--0--Mesprit.gif diff --git a/src/canonical/models/back/Azelf.gif b/src/canonical/models/back/482--0--Azelf.gif similarity index 100% rename from src/canonical/models/back/Azelf.gif rename to src/canonical/models/back/482--0--Azelf.gif diff --git a/src/canonical/models/back/Dialga.gif b/src/canonical/models/back/483--0--Dialga.gif similarity index 100% rename from src/canonical/models/back/Dialga.gif rename to src/canonical/models/back/483--0--Dialga.gif diff --git a/src/canonical/models/back/Palkia.gif b/src/canonical/models/back/484--0--Palkia.gif similarity index 100% rename from src/canonical/models/back/Palkia.gif rename to src/canonical/models/back/484--0--Palkia.gif diff --git a/src/canonical/models/back/Heatran.gif b/src/canonical/models/back/485--0--Heatran.gif similarity index 100% rename from src/canonical/models/back/Heatran.gif rename to src/canonical/models/back/485--0--Heatran.gif diff --git a/src/canonical/models/back/Regigigas.gif b/src/canonical/models/back/486--0--Regigigas.gif similarity index 100% rename from src/canonical/models/back/Regigigas.gif rename to src/canonical/models/back/486--0--Regigigas.gif diff --git a/src/canonical/models/back/Giratina.gif b/src/canonical/models/back/487--0--Giratina.gif similarity index 100% rename from src/canonical/models/back/Giratina.gif rename to src/canonical/models/back/487--0--Giratina.gif diff --git a/src/canonical/models/back/Giratina--Origin.gif b/src/canonical/models/back/487--420--Giratina--Origin.gif similarity index 100% rename from src/canonical/models/back/Giratina--Origin.gif rename to src/canonical/models/back/487--420--Giratina--Origin.gif diff --git a/src/canonical/models/back/Cresselia.gif b/src/canonical/models/back/488--0--Cresselia.gif similarity index 100% rename from src/canonical/models/back/Cresselia.gif rename to src/canonical/models/back/488--0--Cresselia.gif diff --git a/src/canonical/models/back/Phione.gif b/src/canonical/models/back/489--0--Phione.gif similarity index 100% rename from src/canonical/models/back/Phione.gif rename to src/canonical/models/back/489--0--Phione.gif diff --git a/src/canonical/models/back/Venomoth.gif b/src/canonical/models/back/49--0--Venomoth.gif similarity index 100% rename from src/canonical/models/back/Venomoth.gif rename to src/canonical/models/back/49--0--Venomoth.gif diff --git a/src/canonical/models/back/Manaphy.gif b/src/canonical/models/back/490--0--Manaphy.gif similarity index 100% rename from src/canonical/models/back/Manaphy.gif rename to src/canonical/models/back/490--0--Manaphy.gif diff --git a/src/canonical/models/back/Darkrai.gif b/src/canonical/models/back/491--0--Darkrai.gif similarity index 100% rename from src/canonical/models/back/Darkrai.gif rename to src/canonical/models/back/491--0--Darkrai.gif diff --git a/src/canonical/models/back/Shaymin.gif b/src/canonical/models/back/492--0--Shaymin.gif similarity index 100% rename from src/canonical/models/back/Shaymin.gif rename to src/canonical/models/back/492--0--Shaymin.gif diff --git a/src/canonical/models/back/Shaymin--Sky.gif b/src/canonical/models/back/492--420--Shaymin--Sky.gif similarity index 100% rename from src/canonical/models/back/Shaymin--Sky.gif rename to src/canonical/models/back/492--420--Shaymin--Sky.gif diff --git a/src/canonical/models/back/Arceus.gif b/src/canonical/models/back/493--0--Arceus.gif similarity index 100% rename from src/canonical/models/back/Arceus.gif rename to src/canonical/models/back/493--0--Arceus.gif diff --git a/src/canonical/models/back/Arceus--Bug.gif b/src/canonical/models/back/493--420--Arceus--Bug.gif similarity index 100% rename from src/canonical/models/back/Arceus--Bug.gif rename to src/canonical/models/back/493--420--Arceus--Bug.gif diff --git a/src/canonical/models/back/Arceus--Dark.gif b/src/canonical/models/back/493--420--Arceus--Dark.gif similarity index 100% rename from src/canonical/models/back/Arceus--Dark.gif rename to src/canonical/models/back/493--420--Arceus--Dark.gif diff --git a/src/canonical/models/back/Arceus--Dragon.gif b/src/canonical/models/back/493--420--Arceus--Dragon.gif similarity index 100% rename from src/canonical/models/back/Arceus--Dragon.gif rename to src/canonical/models/back/493--420--Arceus--Dragon.gif diff --git a/src/canonical/models/back/Arceus--Electric.gif b/src/canonical/models/back/493--420--Arceus--Electric.gif similarity index 100% rename from src/canonical/models/back/Arceus--Electric.gif rename to src/canonical/models/back/493--420--Arceus--Electric.gif diff --git a/src/canonical/models/back/Arceus--Fairy.gif b/src/canonical/models/back/493--420--Arceus--Fairy.gif similarity index 100% rename from src/canonical/models/back/Arceus--Fairy.gif rename to src/canonical/models/back/493--420--Arceus--Fairy.gif diff --git a/src/canonical/models/back/Arceus--Fighting.gif b/src/canonical/models/back/493--420--Arceus--Fighting.gif similarity index 100% rename from src/canonical/models/back/Arceus--Fighting.gif rename to src/canonical/models/back/493--420--Arceus--Fighting.gif diff --git a/src/canonical/models/back/Arceus--Fire.gif b/src/canonical/models/back/493--420--Arceus--Fire.gif similarity index 100% rename from src/canonical/models/back/Arceus--Fire.gif rename to src/canonical/models/back/493--420--Arceus--Fire.gif diff --git a/src/canonical/models/back/Arceus--Flying.gif b/src/canonical/models/back/493--420--Arceus--Flying.gif similarity index 100% rename from src/canonical/models/back/Arceus--Flying.gif rename to src/canonical/models/back/493--420--Arceus--Flying.gif diff --git a/src/canonical/models/back/Arceus--Ghost.gif b/src/canonical/models/back/493--420--Arceus--Ghost.gif similarity index 100% rename from src/canonical/models/back/Arceus--Ghost.gif rename to src/canonical/models/back/493--420--Arceus--Ghost.gif diff --git a/src/canonical/models/back/Arceus--Grass.gif b/src/canonical/models/back/493--420--Arceus--Grass.gif similarity index 100% rename from src/canonical/models/back/Arceus--Grass.gif rename to src/canonical/models/back/493--420--Arceus--Grass.gif diff --git a/src/canonical/models/back/Arceus--Ground.gif b/src/canonical/models/back/493--420--Arceus--Ground.gif similarity index 100% rename from src/canonical/models/back/Arceus--Ground.gif rename to src/canonical/models/back/493--420--Arceus--Ground.gif diff --git a/src/canonical/models/back/Arceus--Ice.gif b/src/canonical/models/back/493--420--Arceus--Ice.gif similarity index 100% rename from src/canonical/models/back/Arceus--Ice.gif rename to src/canonical/models/back/493--420--Arceus--Ice.gif diff --git a/src/canonical/models/back/Arceus--Poison.gif b/src/canonical/models/back/493--420--Arceus--Poison.gif similarity index 100% rename from src/canonical/models/back/Arceus--Poison.gif rename to src/canonical/models/back/493--420--Arceus--Poison.gif diff --git a/src/canonical/models/back/Arceus--Psychic.gif b/src/canonical/models/back/493--420--Arceus--Psychic.gif similarity index 100% rename from src/canonical/models/back/Arceus--Psychic.gif rename to src/canonical/models/back/493--420--Arceus--Psychic.gif diff --git a/src/canonical/models/back/Arceus--Rock.gif b/src/canonical/models/back/493--420--Arceus--Rock.gif similarity index 100% rename from src/canonical/models/back/Arceus--Rock.gif rename to src/canonical/models/back/493--420--Arceus--Rock.gif diff --git a/src/canonical/models/back/Arceus--Steel.gif b/src/canonical/models/back/493--420--Arceus--Steel.gif similarity index 100% rename from src/canonical/models/back/Arceus--Steel.gif rename to src/canonical/models/back/493--420--Arceus--Steel.gif diff --git a/src/canonical/models/back/Arceus--Water.gif b/src/canonical/models/back/493--420--Arceus--Water.gif similarity index 100% rename from src/canonical/models/back/Arceus--Water.gif rename to src/canonical/models/back/493--420--Arceus--Water.gif diff --git a/src/canonical/models/back/Victini.gif b/src/canonical/models/back/494--0--Victini.gif similarity index 100% rename from src/canonical/models/back/Victini.gif rename to src/canonical/models/back/494--0--Victini.gif diff --git a/src/canonical/models/back/Snivy.gif b/src/canonical/models/back/495--0--Snivy.gif similarity index 100% rename from src/canonical/models/back/Snivy.gif rename to src/canonical/models/back/495--0--Snivy.gif diff --git a/src/canonical/models/back/Servine.gif b/src/canonical/models/back/496--0--Servine.gif similarity index 100% rename from src/canonical/models/back/Servine.gif rename to src/canonical/models/back/496--0--Servine.gif diff --git a/src/canonical/models/back/Serperior.gif b/src/canonical/models/back/497--0--Serperior.gif similarity index 100% rename from src/canonical/models/back/Serperior.gif rename to src/canonical/models/back/497--0--Serperior.gif diff --git a/src/canonical/models/back/Tepig.gif b/src/canonical/models/back/498--0--Tepig.gif similarity index 100% rename from src/canonical/models/back/Tepig.gif rename to src/canonical/models/back/498--0--Tepig.gif diff --git a/src/canonical/models/back/Pignite.gif b/src/canonical/models/back/499--0--Pignite.gif similarity index 100% rename from src/canonical/models/back/Pignite.gif rename to src/canonical/models/back/499--0--Pignite.gif diff --git a/src/canonical/models/back/Charmeleon.gif b/src/canonical/models/back/5--0--Charmeleon.gif similarity index 100% rename from src/canonical/models/back/Charmeleon.gif rename to src/canonical/models/back/5--0--Charmeleon.gif diff --git a/src/canonical/models/back/Diglett.gif b/src/canonical/models/back/50--0--Diglett.gif similarity index 100% rename from src/canonical/models/back/Diglett.gif rename to src/canonical/models/back/50--0--Diglett.gif diff --git a/src/canonical/models/back/Diglett--Alola.gif b/src/canonical/models/back/50--420--Diglett--Alola.gif similarity index 100% rename from src/canonical/models/back/Diglett--Alola.gif rename to src/canonical/models/back/50--420--Diglett--Alola.gif diff --git a/src/canonical/models/back/Emboar.gif b/src/canonical/models/back/500--0--Emboar.gif similarity index 100% rename from src/canonical/models/back/Emboar.gif rename to src/canonical/models/back/500--0--Emboar.gif diff --git a/src/canonical/models/back/Oshawott.gif b/src/canonical/models/back/501--0--Oshawott.gif similarity index 100% rename from src/canonical/models/back/Oshawott.gif rename to src/canonical/models/back/501--0--Oshawott.gif diff --git a/src/canonical/models/back/Dewott.gif b/src/canonical/models/back/502--0--Dewott.gif similarity index 100% rename from src/canonical/models/back/Dewott.gif rename to src/canonical/models/back/502--0--Dewott.gif diff --git a/src/canonical/models/back/Samurott.gif b/src/canonical/models/back/503--0--Samurott.gif similarity index 100% rename from src/canonical/models/back/Samurott.gif rename to src/canonical/models/back/503--0--Samurott.gif diff --git a/src/canonical/models/back/Patrat.gif b/src/canonical/models/back/504--0--Patrat.gif similarity index 100% rename from src/canonical/models/back/Patrat.gif rename to src/canonical/models/back/504--0--Patrat.gif diff --git a/src/canonical/models/back/Watchog.gif b/src/canonical/models/back/505--0--Watchog.gif similarity index 100% rename from src/canonical/models/back/Watchog.gif rename to src/canonical/models/back/505--0--Watchog.gif diff --git a/src/canonical/models/back/Lillipup.gif b/src/canonical/models/back/506--0--Lillipup.gif similarity index 100% rename from src/canonical/models/back/Lillipup.gif rename to src/canonical/models/back/506--0--Lillipup.gif diff --git a/src/canonical/models/back/Herdier.gif b/src/canonical/models/back/507--0--Herdier.gif similarity index 100% rename from src/canonical/models/back/Herdier.gif rename to src/canonical/models/back/507--0--Herdier.gif diff --git a/src/canonical/models/back/Stoutland.gif b/src/canonical/models/back/508--0--Stoutland.gif similarity index 100% rename from src/canonical/models/back/Stoutland.gif rename to src/canonical/models/back/508--0--Stoutland.gif diff --git a/src/canonical/models/back/Purrloin.gif b/src/canonical/models/back/509--0--Purrloin.gif similarity index 100% rename from src/canonical/models/back/Purrloin.gif rename to src/canonical/models/back/509--0--Purrloin.gif diff --git a/src/canonical/models/back/Dugtrio.gif b/src/canonical/models/back/51--0--Dugtrio.gif similarity index 100% rename from src/canonical/models/back/Dugtrio.gif rename to src/canonical/models/back/51--0--Dugtrio.gif diff --git a/src/canonical/models/back/Dugtrio--Alola.gif b/src/canonical/models/back/51--420--Dugtrio--Alola.gif similarity index 100% rename from src/canonical/models/back/Dugtrio--Alola.gif rename to src/canonical/models/back/51--420--Dugtrio--Alola.gif diff --git a/src/canonical/models/back/Liepard.gif b/src/canonical/models/back/510--0--Liepard.gif similarity index 100% rename from src/canonical/models/back/Liepard.gif rename to src/canonical/models/back/510--0--Liepard.gif diff --git a/src/canonical/models/back/Pansage.gif b/src/canonical/models/back/511--0--Pansage.gif similarity index 100% rename from src/canonical/models/back/Pansage.gif rename to src/canonical/models/back/511--0--Pansage.gif diff --git a/src/canonical/models/back/Simisage.gif b/src/canonical/models/back/512--0--Simisage.gif similarity index 100% rename from src/canonical/models/back/Simisage.gif rename to src/canonical/models/back/512--0--Simisage.gif diff --git a/src/canonical/models/back/Pansear.gif b/src/canonical/models/back/513--0--Pansear.gif similarity index 100% rename from src/canonical/models/back/Pansear.gif rename to src/canonical/models/back/513--0--Pansear.gif diff --git a/src/canonical/models/back/Simisear.gif b/src/canonical/models/back/514--0--Simisear.gif similarity index 100% rename from src/canonical/models/back/Simisear.gif rename to src/canonical/models/back/514--0--Simisear.gif diff --git a/src/canonical/models/back/Panpour.gif b/src/canonical/models/back/515--0--Panpour.gif similarity index 100% rename from src/canonical/models/back/Panpour.gif rename to src/canonical/models/back/515--0--Panpour.gif diff --git a/src/canonical/models/back/Simipour.gif b/src/canonical/models/back/516--0--Simipour.gif similarity index 100% rename from src/canonical/models/back/Simipour.gif rename to src/canonical/models/back/516--0--Simipour.gif diff --git a/src/canonical/models/back/Munna.gif b/src/canonical/models/back/517--0--Munna.gif similarity index 100% rename from src/canonical/models/back/Munna.gif rename to src/canonical/models/back/517--0--Munna.gif diff --git a/src/canonical/models/back/Musharna.gif b/src/canonical/models/back/518--0--Musharna.gif similarity index 100% rename from src/canonical/models/back/Musharna.gif rename to src/canonical/models/back/518--0--Musharna.gif diff --git a/src/canonical/models/back/Pidove.gif b/src/canonical/models/back/519--0--Pidove.gif similarity index 100% rename from src/canonical/models/back/Pidove.gif rename to src/canonical/models/back/519--0--Pidove.gif diff --git a/src/canonical/models/back/Meowth.gif b/src/canonical/models/back/52--0--Meowth.gif similarity index 100% rename from src/canonical/models/back/Meowth.gif rename to src/canonical/models/back/52--0--Meowth.gif diff --git a/src/canonical/models/back/Meowth--Alola.gif b/src/canonical/models/back/52--420--Meowth--Alola.gif similarity index 100% rename from src/canonical/models/back/Meowth--Alola.gif rename to src/canonical/models/back/52--420--Meowth--Alola.gif diff --git a/src/canonical/models/back/Meowth--Galar.gif b/src/canonical/models/back/52--420--Meowth--Galar.gif similarity index 100% rename from src/canonical/models/back/Meowth--Galar.gif rename to src/canonical/models/back/52--420--Meowth--Galar.gif diff --git a/src/canonical/models/back/Meowth--Gmax.gif b/src/canonical/models/back/52--420--Meowth--Gmax.gif similarity index 100% rename from src/canonical/models/back/Meowth--Gmax.gif rename to src/canonical/models/back/52--420--Meowth--Gmax.gif diff --git a/src/canonical/models/back/Tranquill.gif b/src/canonical/models/back/520--0--Tranquill.gif similarity index 100% rename from src/canonical/models/back/Tranquill.gif rename to src/canonical/models/back/520--0--Tranquill.gif diff --git a/src/canonical/models/back/Unfezant.gif b/src/canonical/models/back/521--0--Unfezant.gif similarity index 100% rename from src/canonical/models/back/Unfezant.gif rename to src/canonical/models/back/521--0--Unfezant.gif diff --git a/src/canonical/models/back/Blitzle.gif b/src/canonical/models/back/522--0--Blitzle.gif similarity index 100% rename from src/canonical/models/back/Blitzle.gif rename to src/canonical/models/back/522--0--Blitzle.gif diff --git a/src/canonical/models/back/Zebstrika.gif b/src/canonical/models/back/523--0--Zebstrika.gif similarity index 100% rename from src/canonical/models/back/Zebstrika.gif rename to src/canonical/models/back/523--0--Zebstrika.gif diff --git a/src/canonical/models/back/Roggenrola.gif b/src/canonical/models/back/524--0--Roggenrola.gif similarity index 100% rename from src/canonical/models/back/Roggenrola.gif rename to src/canonical/models/back/524--0--Roggenrola.gif diff --git a/src/canonical/models/back/Boldore.gif b/src/canonical/models/back/525--0--Boldore.gif similarity index 100% rename from src/canonical/models/back/Boldore.gif rename to src/canonical/models/back/525--0--Boldore.gif diff --git a/src/canonical/models/back/Gigalith.gif b/src/canonical/models/back/526--0--Gigalith.gif similarity index 100% rename from src/canonical/models/back/Gigalith.gif rename to src/canonical/models/back/526--0--Gigalith.gif diff --git a/src/canonical/models/back/Woobat.gif b/src/canonical/models/back/527--0--Woobat.gif similarity index 100% rename from src/canonical/models/back/Woobat.gif rename to src/canonical/models/back/527--0--Woobat.gif diff --git a/src/canonical/models/back/Swoobat.gif b/src/canonical/models/back/528--0--Swoobat.gif similarity index 100% rename from src/canonical/models/back/Swoobat.gif rename to src/canonical/models/back/528--0--Swoobat.gif diff --git a/src/canonical/models/back/Drilbur.gif b/src/canonical/models/back/529--0--Drilbur.gif similarity index 100% rename from src/canonical/models/back/Drilbur.gif rename to src/canonical/models/back/529--0--Drilbur.gif diff --git a/src/canonical/models/back/Persian.gif b/src/canonical/models/back/53--0--Persian.gif similarity index 100% rename from src/canonical/models/back/Persian.gif rename to src/canonical/models/back/53--0--Persian.gif diff --git a/src/canonical/models/back/Persian--Alola.gif b/src/canonical/models/back/53--420--Persian--Alola.gif similarity index 100% rename from src/canonical/models/back/Persian--Alola.gif rename to src/canonical/models/back/53--420--Persian--Alola.gif diff --git a/src/canonical/models/back/Excadrill.gif b/src/canonical/models/back/530--0--Excadrill.gif similarity index 100% rename from src/canonical/models/back/Excadrill.gif rename to src/canonical/models/back/530--0--Excadrill.gif diff --git a/src/canonical/models/back/Audino.gif b/src/canonical/models/back/531--0--Audino.gif similarity index 100% rename from src/canonical/models/back/Audino.gif rename to src/canonical/models/back/531--0--Audino.gif diff --git a/src/canonical/models/back/Audino--Mega.gif b/src/canonical/models/back/531--420--Audino--Mega.gif similarity index 100% rename from src/canonical/models/back/Audino--Mega.gif rename to src/canonical/models/back/531--420--Audino--Mega.gif diff --git a/src/canonical/models/back/Timburr.gif b/src/canonical/models/back/532--0--Timburr.gif similarity index 100% rename from src/canonical/models/back/Timburr.gif rename to src/canonical/models/back/532--0--Timburr.gif diff --git a/src/canonical/models/back/Gurdurr.gif b/src/canonical/models/back/533--0--Gurdurr.gif similarity index 100% rename from src/canonical/models/back/Gurdurr.gif rename to src/canonical/models/back/533--0--Gurdurr.gif diff --git a/src/canonical/models/back/Conkeldurr.gif b/src/canonical/models/back/534--0--Conkeldurr.gif similarity index 100% rename from src/canonical/models/back/Conkeldurr.gif rename to src/canonical/models/back/534--0--Conkeldurr.gif diff --git a/src/canonical/models/back/Tympole.gif b/src/canonical/models/back/535--0--Tympole.gif similarity index 100% rename from src/canonical/models/back/Tympole.gif rename to src/canonical/models/back/535--0--Tympole.gif diff --git a/src/canonical/models/back/Palpitoad.gif b/src/canonical/models/back/536--0--Palpitoad.gif similarity index 100% rename from src/canonical/models/back/Palpitoad.gif rename to src/canonical/models/back/536--0--Palpitoad.gif diff --git a/src/canonical/models/back/Seismitoad.gif b/src/canonical/models/back/537--0--Seismitoad.gif similarity index 100% rename from src/canonical/models/back/Seismitoad.gif rename to src/canonical/models/back/537--0--Seismitoad.gif diff --git a/src/canonical/models/back/Throh.gif b/src/canonical/models/back/538--0--Throh.gif similarity index 100% rename from src/canonical/models/back/Throh.gif rename to src/canonical/models/back/538--0--Throh.gif diff --git a/src/canonical/models/back/Sawk.gif b/src/canonical/models/back/539--0--Sawk.gif similarity index 100% rename from src/canonical/models/back/Sawk.gif rename to src/canonical/models/back/539--0--Sawk.gif diff --git a/src/canonical/models/back/Psyduck.gif b/src/canonical/models/back/54--0--Psyduck.gif similarity index 100% rename from src/canonical/models/back/Psyduck.gif rename to src/canonical/models/back/54--0--Psyduck.gif diff --git a/src/canonical/models/back/Sewaddle.gif b/src/canonical/models/back/540--0--Sewaddle.gif similarity index 100% rename from src/canonical/models/back/Sewaddle.gif rename to src/canonical/models/back/540--0--Sewaddle.gif diff --git a/src/canonical/models/back/Swadloon.gif b/src/canonical/models/back/541--0--Swadloon.gif similarity index 100% rename from src/canonical/models/back/Swadloon.gif rename to src/canonical/models/back/541--0--Swadloon.gif diff --git a/src/canonical/models/back/Leavanny.gif b/src/canonical/models/back/542--0--Leavanny.gif similarity index 100% rename from src/canonical/models/back/Leavanny.gif rename to src/canonical/models/back/542--0--Leavanny.gif diff --git a/src/canonical/models/back/Venipede.gif b/src/canonical/models/back/543--0--Venipede.gif similarity index 100% rename from src/canonical/models/back/Venipede.gif rename to src/canonical/models/back/543--0--Venipede.gif diff --git a/src/canonical/models/back/Whirlipede.gif b/src/canonical/models/back/544--0--Whirlipede.gif similarity index 100% rename from src/canonical/models/back/Whirlipede.gif rename to src/canonical/models/back/544--0--Whirlipede.gif diff --git a/src/canonical/models/back/Scolipede.gif b/src/canonical/models/back/545--0--Scolipede.gif similarity index 100% rename from src/canonical/models/back/Scolipede.gif rename to src/canonical/models/back/545--0--Scolipede.gif diff --git a/src/canonical/models/back/Cottonee.gif b/src/canonical/models/back/546--0--Cottonee.gif similarity index 100% rename from src/canonical/models/back/Cottonee.gif rename to src/canonical/models/back/546--0--Cottonee.gif diff --git a/src/canonical/models/back/Whimsicott.gif b/src/canonical/models/back/547--0--Whimsicott.gif similarity index 100% rename from src/canonical/models/back/Whimsicott.gif rename to src/canonical/models/back/547--0--Whimsicott.gif diff --git a/src/canonical/models/back/Petilil.gif b/src/canonical/models/back/548--0--Petilil.gif similarity index 100% rename from src/canonical/models/back/Petilil.gif rename to src/canonical/models/back/548--0--Petilil.gif diff --git a/src/canonical/models/back/Lilligant.gif b/src/canonical/models/back/549--0--Lilligant.gif similarity index 100% rename from src/canonical/models/back/Lilligant.gif rename to src/canonical/models/back/549--0--Lilligant.gif diff --git a/src/canonical/models/back/Golduck.gif b/src/canonical/models/back/55--0--Golduck.gif similarity index 100% rename from src/canonical/models/back/Golduck.gif rename to src/canonical/models/back/55--0--Golduck.gif diff --git a/src/canonical/models/back/Basculin.gif b/src/canonical/models/back/550--0--Basculin.gif similarity index 100% rename from src/canonical/models/back/Basculin.gif rename to src/canonical/models/back/550--0--Basculin.gif diff --git a/src/canonical/models/back/Basculin--Blue-Striped.gif b/src/canonical/models/back/550--420--Basculin--Blue-Striped.gif similarity index 100% rename from src/canonical/models/back/Basculin--Blue-Striped.gif rename to src/canonical/models/back/550--420--Basculin--Blue-Striped.gif diff --git a/src/canonical/models/back/Sandile.gif b/src/canonical/models/back/551--0--Sandile.gif similarity index 100% rename from src/canonical/models/back/Sandile.gif rename to src/canonical/models/back/551--0--Sandile.gif diff --git a/src/canonical/models/back/Krokorok.gif b/src/canonical/models/back/552--0--Krokorok.gif similarity index 100% rename from src/canonical/models/back/Krokorok.gif rename to src/canonical/models/back/552--0--Krokorok.gif diff --git a/src/canonical/models/back/Krookodile.gif b/src/canonical/models/back/553--0--Krookodile.gif similarity index 100% rename from src/canonical/models/back/Krookodile.gif rename to src/canonical/models/back/553--0--Krookodile.gif diff --git a/src/canonical/models/back/Darumaka.gif b/src/canonical/models/back/554--0--Darumaka.gif similarity index 100% rename from src/canonical/models/back/Darumaka.gif rename to src/canonical/models/back/554--0--Darumaka.gif diff --git a/src/canonical/models/back/Darumaka--Galar.gif b/src/canonical/models/back/554--420--Darumaka--Galar.gif similarity index 100% rename from src/canonical/models/back/Darumaka--Galar.gif rename to src/canonical/models/back/554--420--Darumaka--Galar.gif diff --git a/src/canonical/models/back/Darmanitan.gif b/src/canonical/models/back/555--0--Darmanitan.gif similarity index 100% rename from src/canonical/models/back/Darmanitan.gif rename to src/canonical/models/back/555--0--Darmanitan.gif diff --git a/src/canonical/models/back/Darmanitan--Galar-Zen.gif b/src/canonical/models/back/555--420--Darmanitan--Galar-Zen.gif similarity index 100% rename from src/canonical/models/back/Darmanitan--Galar-Zen.gif rename to src/canonical/models/back/555--420--Darmanitan--Galar-Zen.gif diff --git a/src/canonical/models/back/Darmanitan--Galar.gif b/src/canonical/models/back/555--420--Darmanitan--Galar.gif similarity index 100% rename from src/canonical/models/back/Darmanitan--Galar.gif rename to src/canonical/models/back/555--420--Darmanitan--Galar.gif diff --git a/src/canonical/models/back/Darmanitan--Zen.gif b/src/canonical/models/back/555--420--Darmanitan--Zen.gif similarity index 100% rename from src/canonical/models/back/Darmanitan--Zen.gif rename to src/canonical/models/back/555--420--Darmanitan--Zen.gif diff --git a/src/canonical/models/back/Maractus.gif b/src/canonical/models/back/556--0--Maractus.gif similarity index 100% rename from src/canonical/models/back/Maractus.gif rename to src/canonical/models/back/556--0--Maractus.gif diff --git a/src/canonical/models/back/Dwebble.gif b/src/canonical/models/back/557--0--Dwebble.gif similarity index 100% rename from src/canonical/models/back/Dwebble.gif rename to src/canonical/models/back/557--0--Dwebble.gif diff --git a/src/canonical/models/back/Crustle.gif b/src/canonical/models/back/558--0--Crustle.gif similarity index 100% rename from src/canonical/models/back/Crustle.gif rename to src/canonical/models/back/558--0--Crustle.gif diff --git a/src/canonical/models/back/Scraggy.gif b/src/canonical/models/back/559--0--Scraggy.gif similarity index 100% rename from src/canonical/models/back/Scraggy.gif rename to src/canonical/models/back/559--0--Scraggy.gif diff --git a/src/canonical/models/back/Mankey.gif b/src/canonical/models/back/56--0--Mankey.gif similarity index 100% rename from src/canonical/models/back/Mankey.gif rename to src/canonical/models/back/56--0--Mankey.gif diff --git a/src/canonical/models/back/Scrafty.gif b/src/canonical/models/back/560--0--Scrafty.gif similarity index 100% rename from src/canonical/models/back/Scrafty.gif rename to src/canonical/models/back/560--0--Scrafty.gif diff --git a/src/canonical/models/back/Sigilyph.gif b/src/canonical/models/back/561--0--Sigilyph.gif similarity index 100% rename from src/canonical/models/back/Sigilyph.gif rename to src/canonical/models/back/561--0--Sigilyph.gif diff --git a/src/canonical/models/back/Yamask.gif b/src/canonical/models/back/562--0--Yamask.gif similarity index 100% rename from src/canonical/models/back/Yamask.gif rename to src/canonical/models/back/562--0--Yamask.gif diff --git a/src/canonical/models/back/Yamask--Galar.gif b/src/canonical/models/back/562--420--Yamask--Galar.gif similarity index 100% rename from src/canonical/models/back/Yamask--Galar.gif rename to src/canonical/models/back/562--420--Yamask--Galar.gif diff --git a/src/canonical/models/back/Cofagrigus.gif b/src/canonical/models/back/563--0--Cofagrigus.gif similarity index 100% rename from src/canonical/models/back/Cofagrigus.gif rename to src/canonical/models/back/563--0--Cofagrigus.gif diff --git a/src/canonical/models/back/Tirtouga.gif b/src/canonical/models/back/564--0--Tirtouga.gif similarity index 100% rename from src/canonical/models/back/Tirtouga.gif rename to src/canonical/models/back/564--0--Tirtouga.gif diff --git a/src/canonical/models/back/Carracosta.gif b/src/canonical/models/back/565--0--Carracosta.gif similarity index 100% rename from src/canonical/models/back/Carracosta.gif rename to src/canonical/models/back/565--0--Carracosta.gif diff --git a/src/canonical/models/back/Archen.gif b/src/canonical/models/back/566--0--Archen.gif similarity index 100% rename from src/canonical/models/back/Archen.gif rename to src/canonical/models/back/566--0--Archen.gif diff --git a/src/canonical/models/back/Archeops.gif b/src/canonical/models/back/567--0--Archeops.gif similarity index 100% rename from src/canonical/models/back/Archeops.gif rename to src/canonical/models/back/567--0--Archeops.gif diff --git a/src/canonical/models/back/Trubbish.gif b/src/canonical/models/back/568--0--Trubbish.gif similarity index 100% rename from src/canonical/models/back/Trubbish.gif rename to src/canonical/models/back/568--0--Trubbish.gif diff --git a/src/canonical/models/back/Garbodor.gif b/src/canonical/models/back/569--0--Garbodor.gif similarity index 100% rename from src/canonical/models/back/Garbodor.gif rename to src/canonical/models/back/569--0--Garbodor.gif diff --git a/src/canonical/models/back/Garbodor--Gmax.gif b/src/canonical/models/back/569--420--Garbodor--Gmax.gif similarity index 100% rename from src/canonical/models/back/Garbodor--Gmax.gif rename to src/canonical/models/back/569--420--Garbodor--Gmax.gif diff --git a/src/canonical/models/back/Primeape.gif b/src/canonical/models/back/57--0--Primeape.gif similarity index 100% rename from src/canonical/models/back/Primeape.gif rename to src/canonical/models/back/57--0--Primeape.gif diff --git a/src/canonical/models/back/Zorua.gif b/src/canonical/models/back/570--0--Zorua.gif similarity index 100% rename from src/canonical/models/back/Zorua.gif rename to src/canonical/models/back/570--0--Zorua.gif diff --git a/src/canonical/models/back/Zoroark.gif b/src/canonical/models/back/571--0--Zoroark.gif similarity index 100% rename from src/canonical/models/back/Zoroark.gif rename to src/canonical/models/back/571--0--Zoroark.gif diff --git a/src/canonical/models/back/Minccino.gif b/src/canonical/models/back/572--0--Minccino.gif similarity index 100% rename from src/canonical/models/back/Minccino.gif rename to src/canonical/models/back/572--0--Minccino.gif diff --git a/src/canonical/models/back/Cinccino.gif b/src/canonical/models/back/573--0--Cinccino.gif similarity index 100% rename from src/canonical/models/back/Cinccino.gif rename to src/canonical/models/back/573--0--Cinccino.gif diff --git a/src/canonical/models/back/Gothita.gif b/src/canonical/models/back/574--0--Gothita.gif similarity index 100% rename from src/canonical/models/back/Gothita.gif rename to src/canonical/models/back/574--0--Gothita.gif diff --git a/src/canonical/models/back/Gothorita.gif b/src/canonical/models/back/575--0--Gothorita.gif similarity index 100% rename from src/canonical/models/back/Gothorita.gif rename to src/canonical/models/back/575--0--Gothorita.gif diff --git a/src/canonical/models/back/Gothitelle.gif b/src/canonical/models/back/576--0--Gothitelle.gif similarity index 100% rename from src/canonical/models/back/Gothitelle.gif rename to src/canonical/models/back/576--0--Gothitelle.gif diff --git a/src/canonical/models/back/Solosis.gif b/src/canonical/models/back/577--0--Solosis.gif similarity index 100% rename from src/canonical/models/back/Solosis.gif rename to src/canonical/models/back/577--0--Solosis.gif diff --git a/src/canonical/models/back/Duosion.gif b/src/canonical/models/back/578--0--Duosion.gif similarity index 100% rename from src/canonical/models/back/Duosion.gif rename to src/canonical/models/back/578--0--Duosion.gif diff --git a/src/canonical/models/back/Reuniclus.gif b/src/canonical/models/back/579--0--Reuniclus.gif similarity index 100% rename from src/canonical/models/back/Reuniclus.gif rename to src/canonical/models/back/579--0--Reuniclus.gif diff --git a/src/canonical/models/back/Growlithe.gif b/src/canonical/models/back/58--0--Growlithe.gif similarity index 100% rename from src/canonical/models/back/Growlithe.gif rename to src/canonical/models/back/58--0--Growlithe.gif diff --git a/src/canonical/models/back/Ducklett.gif b/src/canonical/models/back/580--0--Ducklett.gif similarity index 100% rename from src/canonical/models/back/Ducklett.gif rename to src/canonical/models/back/580--0--Ducklett.gif diff --git a/src/canonical/models/back/Swanna.gif b/src/canonical/models/back/581--0--Swanna.gif similarity index 100% rename from src/canonical/models/back/Swanna.gif rename to src/canonical/models/back/581--0--Swanna.gif diff --git a/src/canonical/models/back/Vanillite.gif b/src/canonical/models/back/582--0--Vanillite.gif similarity index 100% rename from src/canonical/models/back/Vanillite.gif rename to src/canonical/models/back/582--0--Vanillite.gif diff --git a/src/canonical/models/back/Vanillish.gif b/src/canonical/models/back/583--0--Vanillish.gif similarity index 100% rename from src/canonical/models/back/Vanillish.gif rename to src/canonical/models/back/583--0--Vanillish.gif diff --git a/src/canonical/models/back/Vanilluxe.gif b/src/canonical/models/back/584--0--Vanilluxe.gif similarity index 100% rename from src/canonical/models/back/Vanilluxe.gif rename to src/canonical/models/back/584--0--Vanilluxe.gif diff --git a/src/canonical/models/back/Deerling.gif b/src/canonical/models/back/585--0--Deerling.gif similarity index 100% rename from src/canonical/models/back/Deerling.gif rename to src/canonical/models/back/585--0--Deerling.gif diff --git a/src/canonical/models/back/Sawsbuck.gif b/src/canonical/models/back/586--0--Sawsbuck.gif similarity index 100% rename from src/canonical/models/back/Sawsbuck.gif rename to src/canonical/models/back/586--0--Sawsbuck.gif diff --git a/src/canonical/models/back/Emolga.gif b/src/canonical/models/back/587--0--Emolga.gif similarity index 100% rename from src/canonical/models/back/Emolga.gif rename to src/canonical/models/back/587--0--Emolga.gif diff --git a/src/canonical/models/back/Karrablast.gif b/src/canonical/models/back/588--0--Karrablast.gif similarity index 100% rename from src/canonical/models/back/Karrablast.gif rename to src/canonical/models/back/588--0--Karrablast.gif diff --git a/src/canonical/models/back/Escavalier.gif b/src/canonical/models/back/589--0--Escavalier.gif similarity index 100% rename from src/canonical/models/back/Escavalier.gif rename to src/canonical/models/back/589--0--Escavalier.gif diff --git a/src/canonical/models/back/Arcanine.gif b/src/canonical/models/back/59--0--Arcanine.gif similarity index 100% rename from src/canonical/models/back/Arcanine.gif rename to src/canonical/models/back/59--0--Arcanine.gif diff --git a/src/canonical/models/back/Foongus.gif b/src/canonical/models/back/590--0--Foongus.gif similarity index 100% rename from src/canonical/models/back/Foongus.gif rename to src/canonical/models/back/590--0--Foongus.gif diff --git a/src/canonical/models/back/Amoonguss.gif b/src/canonical/models/back/591--0--Amoonguss.gif similarity index 100% rename from src/canonical/models/back/Amoonguss.gif rename to src/canonical/models/back/591--0--Amoonguss.gif diff --git a/src/canonical/models/back/Frillish.gif b/src/canonical/models/back/592--0--Frillish.gif similarity index 100% rename from src/canonical/models/back/Frillish.gif rename to src/canonical/models/back/592--0--Frillish.gif diff --git a/src/canonical/models/back/Jellicent.gif b/src/canonical/models/back/593--0--Jellicent.gif similarity index 100% rename from src/canonical/models/back/Jellicent.gif rename to src/canonical/models/back/593--0--Jellicent.gif diff --git a/src/canonical/models/back/Alomomola.gif b/src/canonical/models/back/594--0--Alomomola.gif similarity index 100% rename from src/canonical/models/back/Alomomola.gif rename to src/canonical/models/back/594--0--Alomomola.gif diff --git a/src/canonical/models/back/Joltik.gif b/src/canonical/models/back/595--0--Joltik.gif similarity index 100% rename from src/canonical/models/back/Joltik.gif rename to src/canonical/models/back/595--0--Joltik.gif diff --git a/src/canonical/models/back/Galvantula.gif b/src/canonical/models/back/596--0--Galvantula.gif similarity index 100% rename from src/canonical/models/back/Galvantula.gif rename to src/canonical/models/back/596--0--Galvantula.gif diff --git a/src/canonical/models/back/Ferroseed.gif b/src/canonical/models/back/597--0--Ferroseed.gif similarity index 100% rename from src/canonical/models/back/Ferroseed.gif rename to src/canonical/models/back/597--0--Ferroseed.gif diff --git a/src/canonical/models/back/Ferrothorn.gif b/src/canonical/models/back/598--0--Ferrothorn.gif similarity index 100% rename from src/canonical/models/back/Ferrothorn.gif rename to src/canonical/models/back/598--0--Ferrothorn.gif diff --git a/src/canonical/models/back/Klink.gif b/src/canonical/models/back/599--0--Klink.gif similarity index 100% rename from src/canonical/models/back/Klink.gif rename to src/canonical/models/back/599--0--Klink.gif diff --git a/src/canonical/models/back/Charizard.gif b/src/canonical/models/back/6--0--Charizard.gif similarity index 100% rename from src/canonical/models/back/Charizard.gif rename to src/canonical/models/back/6--0--Charizard.gif diff --git a/src/canonical/models/back/Charizard--Gmax.gif b/src/canonical/models/back/6--420--Charizard--Gmax.gif similarity index 100% rename from src/canonical/models/back/Charizard--Gmax.gif rename to src/canonical/models/back/6--420--Charizard--Gmax.gif diff --git a/src/canonical/models/back/Charizard--Mega-X.gif b/src/canonical/models/back/6--420--Charizard--Mega-X.gif similarity index 100% rename from src/canonical/models/back/Charizard--Mega-X.gif rename to src/canonical/models/back/6--420--Charizard--Mega-X.gif diff --git a/src/canonical/models/back/Charizard--Mega-Y.gif b/src/canonical/models/back/6--420--Charizard--Mega-Y.gif similarity index 100% rename from src/canonical/models/back/Charizard--Mega-Y.gif rename to src/canonical/models/back/6--420--Charizard--Mega-Y.gif diff --git a/src/canonical/models/back/Poliwag.gif b/src/canonical/models/back/60--0--Poliwag.gif similarity index 100% rename from src/canonical/models/back/Poliwag.gif rename to src/canonical/models/back/60--0--Poliwag.gif diff --git a/src/canonical/models/back/Klang.gif b/src/canonical/models/back/600--0--Klang.gif similarity index 100% rename from src/canonical/models/back/Klang.gif rename to src/canonical/models/back/600--0--Klang.gif diff --git a/src/canonical/models/back/Klinklang.gif b/src/canonical/models/back/601--0--Klinklang.gif similarity index 100% rename from src/canonical/models/back/Klinklang.gif rename to src/canonical/models/back/601--0--Klinklang.gif diff --git a/src/canonical/models/back/Tynamo.gif b/src/canonical/models/back/602--0--Tynamo.gif similarity index 100% rename from src/canonical/models/back/Tynamo.gif rename to src/canonical/models/back/602--0--Tynamo.gif diff --git a/src/canonical/models/back/Eelektrik.gif b/src/canonical/models/back/603--0--Eelektrik.gif similarity index 100% rename from src/canonical/models/back/Eelektrik.gif rename to src/canonical/models/back/603--0--Eelektrik.gif diff --git a/src/canonical/models/back/Eelektross.gif b/src/canonical/models/back/604--0--Eelektross.gif similarity index 100% rename from src/canonical/models/back/Eelektross.gif rename to src/canonical/models/back/604--0--Eelektross.gif diff --git a/src/canonical/models/back/Elgyem.gif b/src/canonical/models/back/605--0--Elgyem.gif similarity index 100% rename from src/canonical/models/back/Elgyem.gif rename to src/canonical/models/back/605--0--Elgyem.gif diff --git a/src/canonical/models/back/Beheeyem.gif b/src/canonical/models/back/606--0--Beheeyem.gif similarity index 100% rename from src/canonical/models/back/Beheeyem.gif rename to src/canonical/models/back/606--0--Beheeyem.gif diff --git a/src/canonical/models/back/Litwick.gif b/src/canonical/models/back/607--0--Litwick.gif similarity index 100% rename from src/canonical/models/back/Litwick.gif rename to src/canonical/models/back/607--0--Litwick.gif diff --git a/src/canonical/models/back/Lampent.gif b/src/canonical/models/back/608--0--Lampent.gif similarity index 100% rename from src/canonical/models/back/Lampent.gif rename to src/canonical/models/back/608--0--Lampent.gif diff --git a/src/canonical/models/back/Chandelure.gif b/src/canonical/models/back/609--0--Chandelure.gif similarity index 100% rename from src/canonical/models/back/Chandelure.gif rename to src/canonical/models/back/609--0--Chandelure.gif diff --git a/src/canonical/models/back/Poliwhirl.gif b/src/canonical/models/back/61--0--Poliwhirl.gif similarity index 100% rename from src/canonical/models/back/Poliwhirl.gif rename to src/canonical/models/back/61--0--Poliwhirl.gif diff --git a/src/canonical/models/back/Axew.gif b/src/canonical/models/back/610--0--Axew.gif similarity index 100% rename from src/canonical/models/back/Axew.gif rename to src/canonical/models/back/610--0--Axew.gif diff --git a/src/canonical/models/back/Fraxure.gif b/src/canonical/models/back/611--0--Fraxure.gif similarity index 100% rename from src/canonical/models/back/Fraxure.gif rename to src/canonical/models/back/611--0--Fraxure.gif diff --git a/src/canonical/models/back/Haxorus.gif b/src/canonical/models/back/612--0--Haxorus.gif similarity index 100% rename from src/canonical/models/back/Haxorus.gif rename to src/canonical/models/back/612--0--Haxorus.gif diff --git a/src/canonical/models/back/Cubchoo.gif b/src/canonical/models/back/613--0--Cubchoo.gif similarity index 100% rename from src/canonical/models/back/Cubchoo.gif rename to src/canonical/models/back/613--0--Cubchoo.gif diff --git a/src/canonical/models/back/Beartic.gif b/src/canonical/models/back/614--0--Beartic.gif similarity index 100% rename from src/canonical/models/back/Beartic.gif rename to src/canonical/models/back/614--0--Beartic.gif diff --git a/src/canonical/models/back/Cryogonal.gif b/src/canonical/models/back/615--0--Cryogonal.gif similarity index 100% rename from src/canonical/models/back/Cryogonal.gif rename to src/canonical/models/back/615--0--Cryogonal.gif diff --git a/src/canonical/models/back/Shelmet.gif b/src/canonical/models/back/616--0--Shelmet.gif similarity index 100% rename from src/canonical/models/back/Shelmet.gif rename to src/canonical/models/back/616--0--Shelmet.gif diff --git a/src/canonical/models/back/Accelgor.gif b/src/canonical/models/back/617--0--Accelgor.gif similarity index 100% rename from src/canonical/models/back/Accelgor.gif rename to src/canonical/models/back/617--0--Accelgor.gif diff --git a/src/canonical/models/back/Stunfisk.gif b/src/canonical/models/back/618--0--Stunfisk.gif similarity index 100% rename from src/canonical/models/back/Stunfisk.gif rename to src/canonical/models/back/618--0--Stunfisk.gif diff --git a/src/canonical/models/back/Stunfisk--Galar.gif b/src/canonical/models/back/618--420--Stunfisk--Galar.gif similarity index 100% rename from src/canonical/models/back/Stunfisk--Galar.gif rename to src/canonical/models/back/618--420--Stunfisk--Galar.gif diff --git a/src/canonical/models/back/Mienfoo.gif b/src/canonical/models/back/619--0--Mienfoo.gif similarity index 100% rename from src/canonical/models/back/Mienfoo.gif rename to src/canonical/models/back/619--0--Mienfoo.gif diff --git a/src/canonical/models/back/Poliwrath.gif b/src/canonical/models/back/62--0--Poliwrath.gif similarity index 100% rename from src/canonical/models/back/Poliwrath.gif rename to src/canonical/models/back/62--0--Poliwrath.gif diff --git a/src/canonical/models/back/Mienshao.gif b/src/canonical/models/back/620--0--Mienshao.gif similarity index 100% rename from src/canonical/models/back/Mienshao.gif rename to src/canonical/models/back/620--0--Mienshao.gif diff --git a/src/canonical/models/back/Druddigon.gif b/src/canonical/models/back/621--0--Druddigon.gif similarity index 100% rename from src/canonical/models/back/Druddigon.gif rename to src/canonical/models/back/621--0--Druddigon.gif diff --git a/src/canonical/models/back/Golett.gif b/src/canonical/models/back/622--0--Golett.gif similarity index 100% rename from src/canonical/models/back/Golett.gif rename to src/canonical/models/back/622--0--Golett.gif diff --git a/src/canonical/models/back/Golurk.gif b/src/canonical/models/back/623--0--Golurk.gif similarity index 100% rename from src/canonical/models/back/Golurk.gif rename to src/canonical/models/back/623--0--Golurk.gif diff --git a/src/canonical/models/back/Pawniard.gif b/src/canonical/models/back/624--0--Pawniard.gif similarity index 100% rename from src/canonical/models/back/Pawniard.gif rename to src/canonical/models/back/624--0--Pawniard.gif diff --git a/src/canonical/models/back/Bisharp.gif b/src/canonical/models/back/625--0--Bisharp.gif similarity index 100% rename from src/canonical/models/back/Bisharp.gif rename to src/canonical/models/back/625--0--Bisharp.gif diff --git a/src/canonical/models/back/Bouffalant.gif b/src/canonical/models/back/626--0--Bouffalant.gif similarity index 100% rename from src/canonical/models/back/Bouffalant.gif rename to src/canonical/models/back/626--0--Bouffalant.gif diff --git a/src/canonical/models/back/Rufflet.gif b/src/canonical/models/back/627--0--Rufflet.gif similarity index 100% rename from src/canonical/models/back/Rufflet.gif rename to src/canonical/models/back/627--0--Rufflet.gif diff --git a/src/canonical/models/back/Braviary.gif b/src/canonical/models/back/628--0--Braviary.gif similarity index 100% rename from src/canonical/models/back/Braviary.gif rename to src/canonical/models/back/628--0--Braviary.gif diff --git a/src/canonical/models/back/Vullaby.gif b/src/canonical/models/back/629--0--Vullaby.gif similarity index 100% rename from src/canonical/models/back/Vullaby.gif rename to src/canonical/models/back/629--0--Vullaby.gif diff --git a/src/canonical/models/back/Abra.gif b/src/canonical/models/back/63--0--Abra.gif similarity index 100% rename from src/canonical/models/back/Abra.gif rename to src/canonical/models/back/63--0--Abra.gif diff --git a/src/canonical/models/back/Mandibuzz.gif b/src/canonical/models/back/630--0--Mandibuzz.gif similarity index 100% rename from src/canonical/models/back/Mandibuzz.gif rename to src/canonical/models/back/630--0--Mandibuzz.gif diff --git a/src/canonical/models/back/Heatmor.gif b/src/canonical/models/back/631--0--Heatmor.gif similarity index 100% rename from src/canonical/models/back/Heatmor.gif rename to src/canonical/models/back/631--0--Heatmor.gif diff --git a/src/canonical/models/back/Durant.gif b/src/canonical/models/back/632--0--Durant.gif similarity index 100% rename from src/canonical/models/back/Durant.gif rename to src/canonical/models/back/632--0--Durant.gif diff --git a/src/canonical/models/back/Deino.gif b/src/canonical/models/back/633--0--Deino.gif similarity index 100% rename from src/canonical/models/back/Deino.gif rename to src/canonical/models/back/633--0--Deino.gif diff --git a/src/canonical/models/back/Zweilous.gif b/src/canonical/models/back/634--0--Zweilous.gif similarity index 100% rename from src/canonical/models/back/Zweilous.gif rename to src/canonical/models/back/634--0--Zweilous.gif diff --git a/src/canonical/models/back/Hydreigon.gif b/src/canonical/models/back/635--0--Hydreigon.gif similarity index 100% rename from src/canonical/models/back/Hydreigon.gif rename to src/canonical/models/back/635--0--Hydreigon.gif diff --git a/src/canonical/models/back/Larvesta.gif b/src/canonical/models/back/636--0--Larvesta.gif similarity index 100% rename from src/canonical/models/back/Larvesta.gif rename to src/canonical/models/back/636--0--Larvesta.gif diff --git a/src/canonical/models/back/Volcarona.gif b/src/canonical/models/back/637--0--Volcarona.gif similarity index 100% rename from src/canonical/models/back/Volcarona.gif rename to src/canonical/models/back/637--0--Volcarona.gif diff --git a/src/canonical/models/back/Cobalion.gif b/src/canonical/models/back/638--0--Cobalion.gif similarity index 100% rename from src/canonical/models/back/Cobalion.gif rename to src/canonical/models/back/638--0--Cobalion.gif diff --git a/src/canonical/models/back/Terrakion.gif b/src/canonical/models/back/639--0--Terrakion.gif similarity index 100% rename from src/canonical/models/back/Terrakion.gif rename to src/canonical/models/back/639--0--Terrakion.gif diff --git a/src/canonical/models/back/Kadabra.gif b/src/canonical/models/back/64--0--Kadabra.gif similarity index 100% rename from src/canonical/models/back/Kadabra.gif rename to src/canonical/models/back/64--0--Kadabra.gif diff --git a/src/canonical/models/back/Virizion.gif b/src/canonical/models/back/640--0--Virizion.gif similarity index 100% rename from src/canonical/models/back/Virizion.gif rename to src/canonical/models/back/640--0--Virizion.gif diff --git a/src/canonical/models/back/Tornadus.gif b/src/canonical/models/back/641--0--Tornadus.gif similarity index 100% rename from src/canonical/models/back/Tornadus.gif rename to src/canonical/models/back/641--0--Tornadus.gif diff --git a/src/canonical/models/back/Tornadus--Therian.gif b/src/canonical/models/back/641--420--Tornadus--Therian.gif similarity index 100% rename from src/canonical/models/back/Tornadus--Therian.gif rename to src/canonical/models/back/641--420--Tornadus--Therian.gif diff --git a/src/canonical/models/back/Thundurus.gif b/src/canonical/models/back/642--0--Thundurus.gif similarity index 100% rename from src/canonical/models/back/Thundurus.gif rename to src/canonical/models/back/642--0--Thundurus.gif diff --git a/src/canonical/models/back/Thundurus--Therian.gif b/src/canonical/models/back/642--420--Thundurus--Therian.gif similarity index 100% rename from src/canonical/models/back/Thundurus--Therian.gif rename to src/canonical/models/back/642--420--Thundurus--Therian.gif diff --git a/src/canonical/models/back/Reshiram.gif b/src/canonical/models/back/643--0--Reshiram.gif similarity index 100% rename from src/canonical/models/back/Reshiram.gif rename to src/canonical/models/back/643--0--Reshiram.gif diff --git a/src/canonical/models/back/Zekrom.gif b/src/canonical/models/back/644--0--Zekrom.gif similarity index 100% rename from src/canonical/models/back/Zekrom.gif rename to src/canonical/models/back/644--0--Zekrom.gif diff --git a/src/canonical/models/back/Landorus.gif b/src/canonical/models/back/645--0--Landorus.gif similarity index 100% rename from src/canonical/models/back/Landorus.gif rename to src/canonical/models/back/645--0--Landorus.gif diff --git a/src/canonical/models/back/Landorus--Therian.gif b/src/canonical/models/back/645--420--Landorus--Therian.gif similarity index 100% rename from src/canonical/models/back/Landorus--Therian.gif rename to src/canonical/models/back/645--420--Landorus--Therian.gif diff --git a/src/canonical/models/back/Kyurem.gif b/src/canonical/models/back/646--0--Kyurem.gif similarity index 100% rename from src/canonical/models/back/Kyurem.gif rename to src/canonical/models/back/646--0--Kyurem.gif diff --git a/src/canonical/models/back/Kyurem--Black.gif b/src/canonical/models/back/646--420--Kyurem--Black.gif similarity index 100% rename from src/canonical/models/back/Kyurem--Black.gif rename to src/canonical/models/back/646--420--Kyurem--Black.gif diff --git a/src/canonical/models/back/Kyurem--White.gif b/src/canonical/models/back/646--420--Kyurem--White.gif similarity index 100% rename from src/canonical/models/back/Kyurem--White.gif rename to src/canonical/models/back/646--420--Kyurem--White.gif diff --git a/src/canonical/models/back/Keldeo.gif b/src/canonical/models/back/647--0--Keldeo.gif similarity index 100% rename from src/canonical/models/back/Keldeo.gif rename to src/canonical/models/back/647--0--Keldeo.gif diff --git a/src/canonical/models/back/Keldeo--Resolute.gif b/src/canonical/models/back/647--420--Keldeo--Resolute.gif similarity index 100% rename from src/canonical/models/back/Keldeo--Resolute.gif rename to src/canonical/models/back/647--420--Keldeo--Resolute.gif diff --git a/src/canonical/models/back/Meloetta.gif b/src/canonical/models/back/648--0--Meloetta.gif similarity index 100% rename from src/canonical/models/back/Meloetta.gif rename to src/canonical/models/back/648--0--Meloetta.gif diff --git a/src/canonical/models/back/Meloetta--Pirouette.gif b/src/canonical/models/back/648--420--Meloetta--Pirouette.gif similarity index 100% rename from src/canonical/models/back/Meloetta--Pirouette.gif rename to src/canonical/models/back/648--420--Meloetta--Pirouette.gif diff --git a/src/canonical/models/back/Genesect.gif b/src/canonical/models/back/649--0--Genesect.gif similarity index 100% rename from src/canonical/models/back/Genesect.gif rename to src/canonical/models/back/649--0--Genesect.gif diff --git a/src/canonical/models/back/Genesect--Burn.gif b/src/canonical/models/back/649--420--Genesect--Burn.gif similarity index 100% rename from src/canonical/models/back/Genesect--Burn.gif rename to src/canonical/models/back/649--420--Genesect--Burn.gif diff --git a/src/canonical/models/back/Genesect--Chill.gif b/src/canonical/models/back/649--420--Genesect--Chill.gif similarity index 100% rename from src/canonical/models/back/Genesect--Chill.gif rename to src/canonical/models/back/649--420--Genesect--Chill.gif diff --git a/src/canonical/models/back/Genesect--Douse.gif b/src/canonical/models/back/649--420--Genesect--Douse.gif similarity index 100% rename from src/canonical/models/back/Genesect--Douse.gif rename to src/canonical/models/back/649--420--Genesect--Douse.gif diff --git a/src/canonical/models/back/Genesect--Shock.gif b/src/canonical/models/back/649--420--Genesect--Shock.gif similarity index 100% rename from src/canonical/models/back/Genesect--Shock.gif rename to src/canonical/models/back/649--420--Genesect--Shock.gif diff --git a/src/canonical/models/back/Alakazam.gif b/src/canonical/models/back/65--0--Alakazam.gif similarity index 100% rename from src/canonical/models/back/Alakazam.gif rename to src/canonical/models/back/65--0--Alakazam.gif diff --git a/src/canonical/models/back/Alakazam--Mega.gif b/src/canonical/models/back/65--420--Alakazam--Mega.gif similarity index 100% rename from src/canonical/models/back/Alakazam--Mega.gif rename to src/canonical/models/back/65--420--Alakazam--Mega.gif diff --git a/src/canonical/models/back/Chespin.gif b/src/canonical/models/back/650--0--Chespin.gif similarity index 100% rename from src/canonical/models/back/Chespin.gif rename to src/canonical/models/back/650--0--Chespin.gif diff --git a/src/canonical/models/back/Quilladin.gif b/src/canonical/models/back/651--0--Quilladin.gif similarity index 100% rename from src/canonical/models/back/Quilladin.gif rename to src/canonical/models/back/651--0--Quilladin.gif diff --git a/src/canonical/models/back/Chesnaught.gif b/src/canonical/models/back/652--0--Chesnaught.gif similarity index 100% rename from src/canonical/models/back/Chesnaught.gif rename to src/canonical/models/back/652--0--Chesnaught.gif diff --git a/src/canonical/models/back/Fennekin.gif b/src/canonical/models/back/653--0--Fennekin.gif similarity index 100% rename from src/canonical/models/back/Fennekin.gif rename to src/canonical/models/back/653--0--Fennekin.gif diff --git a/src/canonical/models/back/Braixen.gif b/src/canonical/models/back/654--0--Braixen.gif similarity index 100% rename from src/canonical/models/back/Braixen.gif rename to src/canonical/models/back/654--0--Braixen.gif diff --git a/src/canonical/models/back/Delphox.gif b/src/canonical/models/back/655--0--Delphox.gif similarity index 100% rename from src/canonical/models/back/Delphox.gif rename to src/canonical/models/back/655--0--Delphox.gif diff --git a/src/canonical/models/back/Froakie.gif b/src/canonical/models/back/656--0--Froakie.gif similarity index 100% rename from src/canonical/models/back/Froakie.gif rename to src/canonical/models/back/656--0--Froakie.gif diff --git a/src/canonical/models/back/Frogadier.gif b/src/canonical/models/back/657--0--Frogadier.gif similarity index 100% rename from src/canonical/models/back/Frogadier.gif rename to src/canonical/models/back/657--0--Frogadier.gif diff --git a/src/canonical/models/back/Greninja.gif b/src/canonical/models/back/658--0--Greninja.gif similarity index 100% rename from src/canonical/models/back/Greninja.gif rename to src/canonical/models/back/658--0--Greninja.gif diff --git a/src/canonical/models/back/Greninja--Ash.gif b/src/canonical/models/back/658--420--Greninja--Ash.gif similarity index 100% rename from src/canonical/models/back/Greninja--Ash.gif rename to src/canonical/models/back/658--420--Greninja--Ash.gif diff --git a/src/canonical/models/back/Bunnelby.gif b/src/canonical/models/back/659--0--Bunnelby.gif similarity index 100% rename from src/canonical/models/back/Bunnelby.gif rename to src/canonical/models/back/659--0--Bunnelby.gif diff --git a/src/canonical/models/back/Machop.gif b/src/canonical/models/back/66--0--Machop.gif similarity index 100% rename from src/canonical/models/back/Machop.gif rename to src/canonical/models/back/66--0--Machop.gif diff --git a/src/canonical/models/back/Diggersby.gif b/src/canonical/models/back/660--0--Diggersby.gif similarity index 100% rename from src/canonical/models/back/Diggersby.gif rename to src/canonical/models/back/660--0--Diggersby.gif diff --git a/src/canonical/models/back/Fletchling.gif b/src/canonical/models/back/661--0--Fletchling.gif similarity index 100% rename from src/canonical/models/back/Fletchling.gif rename to src/canonical/models/back/661--0--Fletchling.gif diff --git a/src/canonical/models/back/Fletchinder.gif b/src/canonical/models/back/662--0--Fletchinder.gif similarity index 100% rename from src/canonical/models/back/Fletchinder.gif rename to src/canonical/models/back/662--0--Fletchinder.gif diff --git a/src/canonical/models/back/Talonflame.gif b/src/canonical/models/back/663--0--Talonflame.gif similarity index 100% rename from src/canonical/models/back/Talonflame.gif rename to src/canonical/models/back/663--0--Talonflame.gif diff --git a/src/canonical/models/back/Scatterbug.gif b/src/canonical/models/back/664--0--Scatterbug.gif similarity index 100% rename from src/canonical/models/back/Scatterbug.gif rename to src/canonical/models/back/664--0--Scatterbug.gif diff --git a/src/canonical/models/back/Spewpa.gif b/src/canonical/models/back/665--0--Spewpa.gif similarity index 100% rename from src/canonical/models/back/Spewpa.gif rename to src/canonical/models/back/665--0--Spewpa.gif diff --git a/src/canonical/models/back/Vivillon.gif b/src/canonical/models/back/666--0--Vivillon.gif similarity index 100% rename from src/canonical/models/back/Vivillon.gif rename to src/canonical/models/back/666--0--Vivillon.gif diff --git a/src/canonical/models/back/Vivillon--Fancy.gif b/src/canonical/models/back/666--420--Vivillon--Fancy.gif similarity index 100% rename from src/canonical/models/back/Vivillon--Fancy.gif rename to src/canonical/models/back/666--420--Vivillon--Fancy.gif diff --git a/src/canonical/models/back/Vivillon--Pokeball.gif b/src/canonical/models/back/666--420--Vivillon--Pokeball.gif similarity index 100% rename from src/canonical/models/back/Vivillon--Pokeball.gif rename to src/canonical/models/back/666--420--Vivillon--Pokeball.gif diff --git a/src/canonical/models/back/Litleo.gif b/src/canonical/models/back/667--0--Litleo.gif similarity index 100% rename from src/canonical/models/back/Litleo.gif rename to src/canonical/models/back/667--0--Litleo.gif diff --git a/src/canonical/models/back/Pyroar.gif b/src/canonical/models/back/668--0--Pyroar.gif similarity index 100% rename from src/canonical/models/back/Pyroar.gif rename to src/canonical/models/back/668--0--Pyroar.gif diff --git a/src/canonical/models/back/Flabe__0301be__0301.gif b/src/canonical/models/back/669--0--Flabe__0301be__0301.gif similarity index 100% rename from src/canonical/models/back/Flabe__0301be__0301.gif rename to src/canonical/models/back/669--0--Flabe__0301be__0301.gif diff --git a/src/canonical/models/back/Machoke.gif b/src/canonical/models/back/67--0--Machoke.gif similarity index 100% rename from src/canonical/models/back/Machoke.gif rename to src/canonical/models/back/67--0--Machoke.gif diff --git a/src/canonical/models/back/Floette.gif b/src/canonical/models/back/670--0--Floette.gif similarity index 100% rename from src/canonical/models/back/Floette.gif rename to src/canonical/models/back/670--0--Floette.gif diff --git a/src/canonical/models/back/Floette--Eternal.gif b/src/canonical/models/back/670--420--Floette--Eternal.gif similarity index 100% rename from src/canonical/models/back/Floette--Eternal.gif rename to src/canonical/models/back/670--420--Floette--Eternal.gif diff --git a/src/canonical/models/back/Florges.gif b/src/canonical/models/back/671--0--Florges.gif similarity index 100% rename from src/canonical/models/back/Florges.gif rename to src/canonical/models/back/671--0--Florges.gif diff --git a/src/canonical/models/back/Skiddo.gif b/src/canonical/models/back/672--0--Skiddo.gif similarity index 100% rename from src/canonical/models/back/Skiddo.gif rename to src/canonical/models/back/672--0--Skiddo.gif diff --git a/src/canonical/models/back/Gogoat.gif b/src/canonical/models/back/673--0--Gogoat.gif similarity index 100% rename from src/canonical/models/back/Gogoat.gif rename to src/canonical/models/back/673--0--Gogoat.gif diff --git a/src/canonical/models/back/Pancham.gif b/src/canonical/models/back/674--0--Pancham.gif similarity index 100% rename from src/canonical/models/back/Pancham.gif rename to src/canonical/models/back/674--0--Pancham.gif diff --git a/src/canonical/models/back/Pangoro.gif b/src/canonical/models/back/675--0--Pangoro.gif similarity index 100% rename from src/canonical/models/back/Pangoro.gif rename to src/canonical/models/back/675--0--Pangoro.gif diff --git a/src/canonical/models/back/Furfrou.gif b/src/canonical/models/back/676--0--Furfrou.gif similarity index 100% rename from src/canonical/models/back/Furfrou.gif rename to src/canonical/models/back/676--0--Furfrou.gif diff --git a/src/canonical/models/back/Espurr.gif b/src/canonical/models/back/677--0--Espurr.gif similarity index 100% rename from src/canonical/models/back/Espurr.gif rename to src/canonical/models/back/677--0--Espurr.gif diff --git a/src/canonical/models/back/Meowstic.gif b/src/canonical/models/back/678--0--Meowstic.gif similarity index 100% rename from src/canonical/models/back/Meowstic.gif rename to src/canonical/models/back/678--0--Meowstic.gif diff --git a/src/canonical/models/back/Meowstic--F.gif b/src/canonical/models/back/678--420--Meowstic--F.gif similarity index 100% rename from src/canonical/models/back/Meowstic--F.gif rename to src/canonical/models/back/678--420--Meowstic--F.gif diff --git a/src/canonical/models/back/Honedge.gif b/src/canonical/models/back/679--0--Honedge.gif similarity index 100% rename from src/canonical/models/back/Honedge.gif rename to src/canonical/models/back/679--0--Honedge.gif diff --git a/src/canonical/models/back/Machamp.gif b/src/canonical/models/back/68--0--Machamp.gif similarity index 100% rename from src/canonical/models/back/Machamp.gif rename to src/canonical/models/back/68--0--Machamp.gif diff --git a/src/canonical/models/back/Machamp--Gmax.gif b/src/canonical/models/back/68--420--Machamp--Gmax.gif similarity index 100% rename from src/canonical/models/back/Machamp--Gmax.gif rename to src/canonical/models/back/68--420--Machamp--Gmax.gif diff --git a/src/canonical/models/back/Doublade.gif b/src/canonical/models/back/680--0--Doublade.gif similarity index 100% rename from src/canonical/models/back/Doublade.gif rename to src/canonical/models/back/680--0--Doublade.gif diff --git a/src/canonical/models/back/Aegislash.gif b/src/canonical/models/back/681--0--Aegislash.gif similarity index 100% rename from src/canonical/models/back/Aegislash.gif rename to src/canonical/models/back/681--0--Aegislash.gif diff --git a/src/canonical/models/back/Aegislash--Blade.gif b/src/canonical/models/back/681--420--Aegislash--Blade.gif similarity index 100% rename from src/canonical/models/back/Aegislash--Blade.gif rename to src/canonical/models/back/681--420--Aegislash--Blade.gif diff --git a/src/canonical/models/back/Spritzee.gif b/src/canonical/models/back/682--0--Spritzee.gif similarity index 100% rename from src/canonical/models/back/Spritzee.gif rename to src/canonical/models/back/682--0--Spritzee.gif diff --git a/src/canonical/models/back/Aromatisse.gif b/src/canonical/models/back/683--0--Aromatisse.gif similarity index 100% rename from src/canonical/models/back/Aromatisse.gif rename to src/canonical/models/back/683--0--Aromatisse.gif diff --git a/src/canonical/models/back/Swirlix.gif b/src/canonical/models/back/684--0--Swirlix.gif similarity index 100% rename from src/canonical/models/back/Swirlix.gif rename to src/canonical/models/back/684--0--Swirlix.gif diff --git a/src/canonical/models/back/Slurpuff.gif b/src/canonical/models/back/685--0--Slurpuff.gif similarity index 100% rename from src/canonical/models/back/Slurpuff.gif rename to src/canonical/models/back/685--0--Slurpuff.gif diff --git a/src/canonical/models/back/Inkay.gif b/src/canonical/models/back/686--0--Inkay.gif similarity index 100% rename from src/canonical/models/back/Inkay.gif rename to src/canonical/models/back/686--0--Inkay.gif diff --git a/src/canonical/models/back/Malamar.gif b/src/canonical/models/back/687--0--Malamar.gif similarity index 100% rename from src/canonical/models/back/Malamar.gif rename to src/canonical/models/back/687--0--Malamar.gif diff --git a/src/canonical/models/back/Binacle.gif b/src/canonical/models/back/688--0--Binacle.gif similarity index 100% rename from src/canonical/models/back/Binacle.gif rename to src/canonical/models/back/688--0--Binacle.gif diff --git a/src/canonical/models/back/Barbaracle.gif b/src/canonical/models/back/689--0--Barbaracle.gif similarity index 100% rename from src/canonical/models/back/Barbaracle.gif rename to src/canonical/models/back/689--0--Barbaracle.gif diff --git a/src/canonical/models/back/Bellsprout.gif b/src/canonical/models/back/69--0--Bellsprout.gif similarity index 100% rename from src/canonical/models/back/Bellsprout.gif rename to src/canonical/models/back/69--0--Bellsprout.gif diff --git a/src/canonical/models/back/Skrelp.gif b/src/canonical/models/back/690--0--Skrelp.gif similarity index 100% rename from src/canonical/models/back/Skrelp.gif rename to src/canonical/models/back/690--0--Skrelp.gif diff --git a/src/canonical/models/back/Dragalge.gif b/src/canonical/models/back/691--0--Dragalge.gif similarity index 100% rename from src/canonical/models/back/Dragalge.gif rename to src/canonical/models/back/691--0--Dragalge.gif diff --git a/src/canonical/models/back/Clauncher.gif b/src/canonical/models/back/692--0--Clauncher.gif similarity index 100% rename from src/canonical/models/back/Clauncher.gif rename to src/canonical/models/back/692--0--Clauncher.gif diff --git a/src/canonical/models/back/Clawitzer.gif b/src/canonical/models/back/693--0--Clawitzer.gif similarity index 100% rename from src/canonical/models/back/Clawitzer.gif rename to src/canonical/models/back/693--0--Clawitzer.gif diff --git a/src/canonical/models/back/Helioptile.gif b/src/canonical/models/back/694--0--Helioptile.gif similarity index 100% rename from src/canonical/models/back/Helioptile.gif rename to src/canonical/models/back/694--0--Helioptile.gif diff --git a/src/canonical/models/back/Heliolisk.gif b/src/canonical/models/back/695--0--Heliolisk.gif similarity index 100% rename from src/canonical/models/back/Heliolisk.gif rename to src/canonical/models/back/695--0--Heliolisk.gif diff --git a/src/canonical/models/back/Tyrunt.gif b/src/canonical/models/back/696--0--Tyrunt.gif similarity index 100% rename from src/canonical/models/back/Tyrunt.gif rename to src/canonical/models/back/696--0--Tyrunt.gif diff --git a/src/canonical/models/back/Tyrantrum.gif b/src/canonical/models/back/697--0--Tyrantrum.gif similarity index 100% rename from src/canonical/models/back/Tyrantrum.gif rename to src/canonical/models/back/697--0--Tyrantrum.gif diff --git a/src/canonical/models/back/Amaura.gif b/src/canonical/models/back/698--0--Amaura.gif similarity index 100% rename from src/canonical/models/back/Amaura.gif rename to src/canonical/models/back/698--0--Amaura.gif diff --git a/src/canonical/models/back/Aurorus.gif b/src/canonical/models/back/699--0--Aurorus.gif similarity index 100% rename from src/canonical/models/back/Aurorus.gif rename to src/canonical/models/back/699--0--Aurorus.gif diff --git a/src/canonical/models/back/Squirtle.gif b/src/canonical/models/back/7--0--Squirtle.gif similarity index 100% rename from src/canonical/models/back/Squirtle.gif rename to src/canonical/models/back/7--0--Squirtle.gif diff --git a/src/canonical/models/back/Weepinbell.gif b/src/canonical/models/back/70--0--Weepinbell.gif similarity index 100% rename from src/canonical/models/back/Weepinbell.gif rename to src/canonical/models/back/70--0--Weepinbell.gif diff --git a/src/canonical/models/back/Sylveon.gif b/src/canonical/models/back/700--0--Sylveon.gif similarity index 100% rename from src/canonical/models/back/Sylveon.gif rename to src/canonical/models/back/700--0--Sylveon.gif diff --git a/src/canonical/models/back/Hawlucha.gif b/src/canonical/models/back/701--0--Hawlucha.gif similarity index 100% rename from src/canonical/models/back/Hawlucha.gif rename to src/canonical/models/back/701--0--Hawlucha.gif diff --git a/src/canonical/models/back/Dedenne.gif b/src/canonical/models/back/702--0--Dedenne.gif similarity index 100% rename from src/canonical/models/back/Dedenne.gif rename to src/canonical/models/back/702--0--Dedenne.gif diff --git a/src/canonical/models/back/Carbink.gif b/src/canonical/models/back/703--0--Carbink.gif similarity index 100% rename from src/canonical/models/back/Carbink.gif rename to src/canonical/models/back/703--0--Carbink.gif diff --git a/src/canonical/models/back/Goomy.gif b/src/canonical/models/back/704--0--Goomy.gif similarity index 100% rename from src/canonical/models/back/Goomy.gif rename to src/canonical/models/back/704--0--Goomy.gif diff --git a/src/canonical/models/back/Sliggoo.gif b/src/canonical/models/back/705--0--Sliggoo.gif similarity index 100% rename from src/canonical/models/back/Sliggoo.gif rename to src/canonical/models/back/705--0--Sliggoo.gif diff --git a/src/canonical/models/back/Goodra.gif b/src/canonical/models/back/706--0--Goodra.gif similarity index 100% rename from src/canonical/models/back/Goodra.gif rename to src/canonical/models/back/706--0--Goodra.gif diff --git a/src/canonical/models/back/Klefki.gif b/src/canonical/models/back/707--0--Klefki.gif similarity index 100% rename from src/canonical/models/back/Klefki.gif rename to src/canonical/models/back/707--0--Klefki.gif diff --git a/src/canonical/models/back/Phantump.gif b/src/canonical/models/back/708--0--Phantump.gif similarity index 100% rename from src/canonical/models/back/Phantump.gif rename to src/canonical/models/back/708--0--Phantump.gif diff --git a/src/canonical/models/back/Trevenant.gif b/src/canonical/models/back/709--0--Trevenant.gif similarity index 100% rename from src/canonical/models/back/Trevenant.gif rename to src/canonical/models/back/709--0--Trevenant.gif diff --git a/src/canonical/models/back/Victreebel.gif b/src/canonical/models/back/71--0--Victreebel.gif similarity index 100% rename from src/canonical/models/back/Victreebel.gif rename to src/canonical/models/back/71--0--Victreebel.gif diff --git a/src/canonical/models/back/Pumpkaboo.gif b/src/canonical/models/back/710--0--Pumpkaboo.gif similarity index 100% rename from src/canonical/models/back/Pumpkaboo.gif rename to src/canonical/models/back/710--0--Pumpkaboo.gif diff --git a/src/canonical/models/back/Pumpkaboo--Large.gif b/src/canonical/models/back/710--420--Pumpkaboo--Large.gif similarity index 100% rename from src/canonical/models/back/Pumpkaboo--Large.gif rename to src/canonical/models/back/710--420--Pumpkaboo--Large.gif diff --git a/src/canonical/models/back/Pumpkaboo--Small.gif b/src/canonical/models/back/710--420--Pumpkaboo--Small.gif similarity index 100% rename from src/canonical/models/back/Pumpkaboo--Small.gif rename to src/canonical/models/back/710--420--Pumpkaboo--Small.gif diff --git a/src/canonical/models/back/Pumpkaboo--Super.gif b/src/canonical/models/back/710--420--Pumpkaboo--Super.gif similarity index 100% rename from src/canonical/models/back/Pumpkaboo--Super.gif rename to src/canonical/models/back/710--420--Pumpkaboo--Super.gif diff --git a/src/canonical/models/back/Gourgeist.gif b/src/canonical/models/back/711--0--Gourgeist.gif similarity index 100% rename from src/canonical/models/back/Gourgeist.gif rename to src/canonical/models/back/711--0--Gourgeist.gif diff --git a/src/canonical/models/back/Gourgeist--Large.gif b/src/canonical/models/back/711--420--Gourgeist--Large.gif similarity index 100% rename from src/canonical/models/back/Gourgeist--Large.gif rename to src/canonical/models/back/711--420--Gourgeist--Large.gif diff --git a/src/canonical/models/back/Gourgeist--Small.gif b/src/canonical/models/back/711--420--Gourgeist--Small.gif similarity index 100% rename from src/canonical/models/back/Gourgeist--Small.gif rename to src/canonical/models/back/711--420--Gourgeist--Small.gif diff --git a/src/canonical/models/back/Gourgeist--Super.gif b/src/canonical/models/back/711--420--Gourgeist--Super.gif similarity index 100% rename from src/canonical/models/back/Gourgeist--Super.gif rename to src/canonical/models/back/711--420--Gourgeist--Super.gif diff --git a/src/canonical/models/back/Bergmite.gif b/src/canonical/models/back/712--0--Bergmite.gif similarity index 100% rename from src/canonical/models/back/Bergmite.gif rename to src/canonical/models/back/712--0--Bergmite.gif diff --git a/src/canonical/models/back/Avalugg.gif b/src/canonical/models/back/713--0--Avalugg.gif similarity index 100% rename from src/canonical/models/back/Avalugg.gif rename to src/canonical/models/back/713--0--Avalugg.gif diff --git a/src/canonical/models/back/Noibat.gif b/src/canonical/models/back/714--0--Noibat.gif similarity index 100% rename from src/canonical/models/back/Noibat.gif rename to src/canonical/models/back/714--0--Noibat.gif diff --git a/src/canonical/models/back/Noivern.gif b/src/canonical/models/back/715--0--Noivern.gif similarity index 100% rename from src/canonical/models/back/Noivern.gif rename to src/canonical/models/back/715--0--Noivern.gif diff --git a/src/canonical/models/back/Xerneas.gif b/src/canonical/models/back/716--0--Xerneas.gif similarity index 100% rename from src/canonical/models/back/Xerneas.gif rename to src/canonical/models/back/716--0--Xerneas.gif diff --git a/src/canonical/models/back/Yveltal.gif b/src/canonical/models/back/717--0--Yveltal.gif similarity index 100% rename from src/canonical/models/back/Yveltal.gif rename to src/canonical/models/back/717--0--Yveltal.gif diff --git a/src/canonical/models/back/Zygarde.gif b/src/canonical/models/back/718--0--Zygarde.gif similarity index 100% rename from src/canonical/models/back/Zygarde.gif rename to src/canonical/models/back/718--0--Zygarde.gif diff --git a/src/canonical/models/back/Zygarde--10__0025.gif b/src/canonical/models/back/718--420--Zygarde--10__0025.gif similarity index 100% rename from src/canonical/models/back/Zygarde--10__0025.gif rename to src/canonical/models/back/718--420--Zygarde--10__0025.gif diff --git a/src/canonical/models/back/Zygarde--Complete.gif b/src/canonical/models/back/718--420--Zygarde--Complete.gif similarity index 100% rename from src/canonical/models/back/Zygarde--Complete.gif rename to src/canonical/models/back/718--420--Zygarde--Complete.gif diff --git a/src/canonical/models/back/Diancie.gif b/src/canonical/models/back/719--0--Diancie.gif similarity index 100% rename from src/canonical/models/back/Diancie.gif rename to src/canonical/models/back/719--0--Diancie.gif diff --git a/src/canonical/models/back/Diancie--Mega.gif b/src/canonical/models/back/719--420--Diancie--Mega.gif similarity index 100% rename from src/canonical/models/back/Diancie--Mega.gif rename to src/canonical/models/back/719--420--Diancie--Mega.gif diff --git a/src/canonical/models/back/Tentacool.gif b/src/canonical/models/back/72--0--Tentacool.gif similarity index 100% rename from src/canonical/models/back/Tentacool.gif rename to src/canonical/models/back/72--0--Tentacool.gif diff --git a/src/canonical/models/back/Hoopa.gif b/src/canonical/models/back/720--0--Hoopa.gif similarity index 100% rename from src/canonical/models/back/Hoopa.gif rename to src/canonical/models/back/720--0--Hoopa.gif diff --git a/src/canonical/models/back/Hoopa--Unbound.gif b/src/canonical/models/back/720--420--Hoopa--Unbound.gif similarity index 100% rename from src/canonical/models/back/Hoopa--Unbound.gif rename to src/canonical/models/back/720--420--Hoopa--Unbound.gif diff --git a/src/canonical/models/back/Volcanion.gif b/src/canonical/models/back/721--0--Volcanion.gif similarity index 100% rename from src/canonical/models/back/Volcanion.gif rename to src/canonical/models/back/721--0--Volcanion.gif diff --git a/src/canonical/models/back/Rowlet.gif b/src/canonical/models/back/722--0--Rowlet.gif similarity index 100% rename from src/canonical/models/back/Rowlet.gif rename to src/canonical/models/back/722--0--Rowlet.gif diff --git a/src/canonical/models/back/Dartrix.gif b/src/canonical/models/back/723--0--Dartrix.gif similarity index 100% rename from src/canonical/models/back/Dartrix.gif rename to src/canonical/models/back/723--0--Dartrix.gif diff --git a/src/canonical/models/back/Decidueye.gif b/src/canonical/models/back/724--0--Decidueye.gif similarity index 100% rename from src/canonical/models/back/Decidueye.gif rename to src/canonical/models/back/724--0--Decidueye.gif diff --git a/src/canonical/models/back/Litten.gif b/src/canonical/models/back/725--0--Litten.gif similarity index 100% rename from src/canonical/models/back/Litten.gif rename to src/canonical/models/back/725--0--Litten.gif diff --git a/src/canonical/models/back/Torracat.gif b/src/canonical/models/back/726--0--Torracat.gif similarity index 100% rename from src/canonical/models/back/Torracat.gif rename to src/canonical/models/back/726--0--Torracat.gif diff --git a/src/canonical/models/back/Incineroar.gif b/src/canonical/models/back/727--0--Incineroar.gif similarity index 100% rename from src/canonical/models/back/Incineroar.gif rename to src/canonical/models/back/727--0--Incineroar.gif diff --git a/src/canonical/models/back/Popplio.gif b/src/canonical/models/back/728--0--Popplio.gif similarity index 100% rename from src/canonical/models/back/Popplio.gif rename to src/canonical/models/back/728--0--Popplio.gif diff --git a/src/canonical/models/back/Brionne.gif b/src/canonical/models/back/729--0--Brionne.gif similarity index 100% rename from src/canonical/models/back/Brionne.gif rename to src/canonical/models/back/729--0--Brionne.gif diff --git a/src/canonical/models/back/Tentacruel.gif b/src/canonical/models/back/73--0--Tentacruel.gif similarity index 100% rename from src/canonical/models/back/Tentacruel.gif rename to src/canonical/models/back/73--0--Tentacruel.gif diff --git a/src/canonical/models/back/Primarina.gif b/src/canonical/models/back/730--0--Primarina.gif similarity index 100% rename from src/canonical/models/back/Primarina.gif rename to src/canonical/models/back/730--0--Primarina.gif diff --git a/src/canonical/models/back/Pikipek.gif b/src/canonical/models/back/731--0--Pikipek.gif similarity index 100% rename from src/canonical/models/back/Pikipek.gif rename to src/canonical/models/back/731--0--Pikipek.gif diff --git a/src/canonical/models/back/Trumbeak.gif b/src/canonical/models/back/732--0--Trumbeak.gif similarity index 100% rename from src/canonical/models/back/Trumbeak.gif rename to src/canonical/models/back/732--0--Trumbeak.gif diff --git a/src/canonical/models/back/Toucannon.gif b/src/canonical/models/back/733--0--Toucannon.gif similarity index 100% rename from src/canonical/models/back/Toucannon.gif rename to src/canonical/models/back/733--0--Toucannon.gif diff --git a/src/canonical/models/back/Yungoos.gif b/src/canonical/models/back/734--0--Yungoos.gif similarity index 100% rename from src/canonical/models/back/Yungoos.gif rename to src/canonical/models/back/734--0--Yungoos.gif diff --git a/src/canonical/models/back/Gumshoos.gif b/src/canonical/models/back/735--0--Gumshoos.gif similarity index 100% rename from src/canonical/models/back/Gumshoos.gif rename to src/canonical/models/back/735--0--Gumshoos.gif diff --git a/src/canonical/models/back/Gumshoos--Totem.gif b/src/canonical/models/back/735--420--Gumshoos--Totem.gif similarity index 100% rename from src/canonical/models/back/Gumshoos--Totem.gif rename to src/canonical/models/back/735--420--Gumshoos--Totem.gif diff --git a/src/canonical/models/back/Grubbin.gif b/src/canonical/models/back/736--0--Grubbin.gif similarity index 100% rename from src/canonical/models/back/Grubbin.gif rename to src/canonical/models/back/736--0--Grubbin.gif diff --git a/src/canonical/models/back/Charjabug.gif b/src/canonical/models/back/737--0--Charjabug.gif similarity index 100% rename from src/canonical/models/back/Charjabug.gif rename to src/canonical/models/back/737--0--Charjabug.gif diff --git a/src/canonical/models/back/Vikavolt.gif b/src/canonical/models/back/738--0--Vikavolt.gif similarity index 100% rename from src/canonical/models/back/Vikavolt.gif rename to src/canonical/models/back/738--0--Vikavolt.gif diff --git a/src/canonical/models/back/Vikavolt--Totem.gif b/src/canonical/models/back/738--420--Vikavolt--Totem.gif similarity index 100% rename from src/canonical/models/back/Vikavolt--Totem.gif rename to src/canonical/models/back/738--420--Vikavolt--Totem.gif diff --git a/src/canonical/models/back/Crabrawler.gif b/src/canonical/models/back/739--0--Crabrawler.gif similarity index 100% rename from src/canonical/models/back/Crabrawler.gif rename to src/canonical/models/back/739--0--Crabrawler.gif diff --git a/src/canonical/models/back/Geodude.gif b/src/canonical/models/back/74--0--Geodude.gif similarity index 100% rename from src/canonical/models/back/Geodude.gif rename to src/canonical/models/back/74--0--Geodude.gif diff --git a/src/canonical/models/back/Geodude--Alola.gif b/src/canonical/models/back/74--420--Geodude--Alola.gif similarity index 100% rename from src/canonical/models/back/Geodude--Alola.gif rename to src/canonical/models/back/74--420--Geodude--Alola.gif diff --git a/src/canonical/models/back/Crabominable.gif b/src/canonical/models/back/740--0--Crabominable.gif similarity index 100% rename from src/canonical/models/back/Crabominable.gif rename to src/canonical/models/back/740--0--Crabominable.gif diff --git a/src/canonical/models/back/Oricorio.gif b/src/canonical/models/back/741--0--Oricorio.gif similarity index 100% rename from src/canonical/models/back/Oricorio.gif rename to src/canonical/models/back/741--0--Oricorio.gif diff --git a/src/canonical/models/back/Oricorio--Pa__0027u.gif b/src/canonical/models/back/741--420--Oricorio--Pa__0027u.gif similarity index 100% rename from src/canonical/models/back/Oricorio--Pa__0027u.gif rename to src/canonical/models/back/741--420--Oricorio--Pa__0027u.gif diff --git a/src/canonical/models/back/Oricorio--Pom-Pom.gif b/src/canonical/models/back/741--420--Oricorio--Pom-Pom.gif similarity index 100% rename from src/canonical/models/back/Oricorio--Pom-Pom.gif rename to src/canonical/models/back/741--420--Oricorio--Pom-Pom.gif diff --git a/src/canonical/models/back/Oricorio--Sensu.gif b/src/canonical/models/back/741--420--Oricorio--Sensu.gif similarity index 100% rename from src/canonical/models/back/Oricorio--Sensu.gif rename to src/canonical/models/back/741--420--Oricorio--Sensu.gif diff --git a/src/canonical/models/back/Cutiefly.gif b/src/canonical/models/back/742--0--Cutiefly.gif similarity index 100% rename from src/canonical/models/back/Cutiefly.gif rename to src/canonical/models/back/742--0--Cutiefly.gif diff --git a/src/canonical/models/back/Ribombee.gif b/src/canonical/models/back/743--0--Ribombee.gif similarity index 100% rename from src/canonical/models/back/Ribombee.gif rename to src/canonical/models/back/743--0--Ribombee.gif diff --git a/src/canonical/models/back/Ribombee--Totem.gif b/src/canonical/models/back/743--420--Ribombee--Totem.gif similarity index 100% rename from src/canonical/models/back/Ribombee--Totem.gif rename to src/canonical/models/back/743--420--Ribombee--Totem.gif diff --git a/src/canonical/models/back/Rockruff.gif b/src/canonical/models/back/744--0--Rockruff.gif similarity index 100% rename from src/canonical/models/back/Rockruff.gif rename to src/canonical/models/back/744--0--Rockruff.gif diff --git a/src/canonical/models/back/Lycanroc.gif b/src/canonical/models/back/745--0--Lycanroc.gif similarity index 100% rename from src/canonical/models/back/Lycanroc.gif rename to src/canonical/models/back/745--0--Lycanroc.gif diff --git a/src/canonical/models/back/Lycanroc--Dusk.gif b/src/canonical/models/back/745--420--Lycanroc--Dusk.gif similarity index 100% rename from src/canonical/models/back/Lycanroc--Dusk.gif rename to src/canonical/models/back/745--420--Lycanroc--Dusk.gif diff --git a/src/canonical/models/back/Lycanroc--Midnight.gif b/src/canonical/models/back/745--420--Lycanroc--Midnight.gif similarity index 100% rename from src/canonical/models/back/Lycanroc--Midnight.gif rename to src/canonical/models/back/745--420--Lycanroc--Midnight.gif diff --git a/src/canonical/models/back/Wishiwashi.gif b/src/canonical/models/back/746--0--Wishiwashi.gif similarity index 100% rename from src/canonical/models/back/Wishiwashi.gif rename to src/canonical/models/back/746--0--Wishiwashi.gif diff --git a/src/canonical/models/back/Wishiwashi--School.gif b/src/canonical/models/back/746--420--Wishiwashi--School.gif similarity index 100% rename from src/canonical/models/back/Wishiwashi--School.gif rename to src/canonical/models/back/746--420--Wishiwashi--School.gif diff --git a/src/canonical/models/back/Mareanie.gif b/src/canonical/models/back/747--0--Mareanie.gif similarity index 100% rename from src/canonical/models/back/Mareanie.gif rename to src/canonical/models/back/747--0--Mareanie.gif diff --git a/src/canonical/models/back/Toxapex.gif b/src/canonical/models/back/748--0--Toxapex.gif similarity index 100% rename from src/canonical/models/back/Toxapex.gif rename to src/canonical/models/back/748--0--Toxapex.gif diff --git a/src/canonical/models/back/Mudbray.gif b/src/canonical/models/back/749--0--Mudbray.gif similarity index 100% rename from src/canonical/models/back/Mudbray.gif rename to src/canonical/models/back/749--0--Mudbray.gif diff --git a/src/canonical/models/back/Graveler.gif b/src/canonical/models/back/75--0--Graveler.gif similarity index 100% rename from src/canonical/models/back/Graveler.gif rename to src/canonical/models/back/75--0--Graveler.gif diff --git a/src/canonical/models/back/Graveler--Alola.gif b/src/canonical/models/back/75--420--Graveler--Alola.gif similarity index 100% rename from src/canonical/models/back/Graveler--Alola.gif rename to src/canonical/models/back/75--420--Graveler--Alola.gif diff --git a/src/canonical/models/back/Mudsdale.gif b/src/canonical/models/back/750--0--Mudsdale.gif similarity index 100% rename from src/canonical/models/back/Mudsdale.gif rename to src/canonical/models/back/750--0--Mudsdale.gif diff --git a/src/canonical/models/back/Dewpider.gif b/src/canonical/models/back/751--0--Dewpider.gif similarity index 100% rename from src/canonical/models/back/Dewpider.gif rename to src/canonical/models/back/751--0--Dewpider.gif diff --git a/src/canonical/models/back/Araquanid.gif b/src/canonical/models/back/752--0--Araquanid.gif similarity index 100% rename from src/canonical/models/back/Araquanid.gif rename to src/canonical/models/back/752--0--Araquanid.gif diff --git a/src/canonical/models/back/Araquanid--Totem.gif b/src/canonical/models/back/752--420--Araquanid--Totem.gif similarity index 100% rename from src/canonical/models/back/Araquanid--Totem.gif rename to src/canonical/models/back/752--420--Araquanid--Totem.gif diff --git a/src/canonical/models/back/Fomantis.gif b/src/canonical/models/back/753--0--Fomantis.gif similarity index 100% rename from src/canonical/models/back/Fomantis.gif rename to src/canonical/models/back/753--0--Fomantis.gif diff --git a/src/canonical/models/back/Lurantis.gif b/src/canonical/models/back/754--0--Lurantis.gif similarity index 100% rename from src/canonical/models/back/Lurantis.gif rename to src/canonical/models/back/754--0--Lurantis.gif diff --git a/src/canonical/models/back/Lurantis--Totem.gif b/src/canonical/models/back/754--420--Lurantis--Totem.gif similarity index 100% rename from src/canonical/models/back/Lurantis--Totem.gif rename to src/canonical/models/back/754--420--Lurantis--Totem.gif diff --git a/src/canonical/models/back/Morelull.gif b/src/canonical/models/back/755--0--Morelull.gif similarity index 100% rename from src/canonical/models/back/Morelull.gif rename to src/canonical/models/back/755--0--Morelull.gif diff --git a/src/canonical/models/back/Shiinotic.gif b/src/canonical/models/back/756--0--Shiinotic.gif similarity index 100% rename from src/canonical/models/back/Shiinotic.gif rename to src/canonical/models/back/756--0--Shiinotic.gif diff --git a/src/canonical/models/back/Salandit.gif b/src/canonical/models/back/757--0--Salandit.gif similarity index 100% rename from src/canonical/models/back/Salandit.gif rename to src/canonical/models/back/757--0--Salandit.gif diff --git a/src/canonical/models/back/Salazzle.gif b/src/canonical/models/back/758--0--Salazzle.gif similarity index 100% rename from src/canonical/models/back/Salazzle.gif rename to src/canonical/models/back/758--0--Salazzle.gif diff --git a/src/canonical/models/back/Salazzle--Totem.gif b/src/canonical/models/back/758--420--Salazzle--Totem.gif similarity index 100% rename from src/canonical/models/back/Salazzle--Totem.gif rename to src/canonical/models/back/758--420--Salazzle--Totem.gif diff --git a/src/canonical/models/back/Stufful.gif b/src/canonical/models/back/759--0--Stufful.gif similarity index 100% rename from src/canonical/models/back/Stufful.gif rename to src/canonical/models/back/759--0--Stufful.gif diff --git a/src/canonical/models/back/Golem.gif b/src/canonical/models/back/76--0--Golem.gif similarity index 100% rename from src/canonical/models/back/Golem.gif rename to src/canonical/models/back/76--0--Golem.gif diff --git a/src/canonical/models/back/Golem--Alola.gif b/src/canonical/models/back/76--420--Golem--Alola.gif similarity index 100% rename from src/canonical/models/back/Golem--Alola.gif rename to src/canonical/models/back/76--420--Golem--Alola.gif diff --git a/src/canonical/models/back/Bewear.gif b/src/canonical/models/back/760--0--Bewear.gif similarity index 100% rename from src/canonical/models/back/Bewear.gif rename to src/canonical/models/back/760--0--Bewear.gif diff --git a/src/canonical/models/back/Bounsweet.gif b/src/canonical/models/back/761--0--Bounsweet.gif similarity index 100% rename from src/canonical/models/back/Bounsweet.gif rename to src/canonical/models/back/761--0--Bounsweet.gif diff --git a/src/canonical/models/back/Steenee.gif b/src/canonical/models/back/762--0--Steenee.gif similarity index 100% rename from src/canonical/models/back/Steenee.gif rename to src/canonical/models/back/762--0--Steenee.gif diff --git a/src/canonical/models/back/Tsareena.gif b/src/canonical/models/back/763--0--Tsareena.gif similarity index 100% rename from src/canonical/models/back/Tsareena.gif rename to src/canonical/models/back/763--0--Tsareena.gif diff --git a/src/canonical/models/back/Comfey.gif b/src/canonical/models/back/764--0--Comfey.gif similarity index 100% rename from src/canonical/models/back/Comfey.gif rename to src/canonical/models/back/764--0--Comfey.gif diff --git a/src/canonical/models/back/Oranguru.gif b/src/canonical/models/back/765--0--Oranguru.gif similarity index 100% rename from src/canonical/models/back/Oranguru.gif rename to src/canonical/models/back/765--0--Oranguru.gif diff --git a/src/canonical/models/back/Passimian.gif b/src/canonical/models/back/766--0--Passimian.gif similarity index 100% rename from src/canonical/models/back/Passimian.gif rename to src/canonical/models/back/766--0--Passimian.gif diff --git a/src/canonical/models/back/Wimpod.gif b/src/canonical/models/back/767--0--Wimpod.gif similarity index 100% rename from src/canonical/models/back/Wimpod.gif rename to src/canonical/models/back/767--0--Wimpod.gif diff --git a/src/canonical/models/back/Golisopod.gif b/src/canonical/models/back/768--0--Golisopod.gif similarity index 100% rename from src/canonical/models/back/Golisopod.gif rename to src/canonical/models/back/768--0--Golisopod.gif diff --git a/src/canonical/models/back/Sandygast.gif b/src/canonical/models/back/769--0--Sandygast.gif similarity index 100% rename from src/canonical/models/back/Sandygast.gif rename to src/canonical/models/back/769--0--Sandygast.gif diff --git a/src/canonical/models/back/Ponyta.gif b/src/canonical/models/back/77--0--Ponyta.gif similarity index 100% rename from src/canonical/models/back/Ponyta.gif rename to src/canonical/models/back/77--0--Ponyta.gif diff --git a/src/canonical/models/back/Ponyta--Galar.gif b/src/canonical/models/back/77--420--Ponyta--Galar.gif similarity index 100% rename from src/canonical/models/back/Ponyta--Galar.gif rename to src/canonical/models/back/77--420--Ponyta--Galar.gif diff --git a/src/canonical/models/back/Palossand.gif b/src/canonical/models/back/770--0--Palossand.gif similarity index 100% rename from src/canonical/models/back/Palossand.gif rename to src/canonical/models/back/770--0--Palossand.gif diff --git a/src/canonical/models/back/Pyukumuku.gif b/src/canonical/models/back/771--0--Pyukumuku.gif similarity index 100% rename from src/canonical/models/back/Pyukumuku.gif rename to src/canonical/models/back/771--0--Pyukumuku.gif diff --git a/src/canonical/models/back/Type__003a_Null.gif b/src/canonical/models/back/772--0--Type__003a_Null.gif similarity index 100% rename from src/canonical/models/back/Type__003a_Null.gif rename to src/canonical/models/back/772--0--Type__003a_Null.gif diff --git a/src/canonical/models/back/Silvally.gif b/src/canonical/models/back/773--0--Silvally.gif similarity index 100% rename from src/canonical/models/back/Silvally.gif rename to src/canonical/models/back/773--0--Silvally.gif diff --git a/src/canonical/models/back/Silvally--Bug.gif b/src/canonical/models/back/773--420--Silvally--Bug.gif similarity index 100% rename from src/canonical/models/back/Silvally--Bug.gif rename to src/canonical/models/back/773--420--Silvally--Bug.gif diff --git a/src/canonical/models/back/Silvally--Dark.gif b/src/canonical/models/back/773--420--Silvally--Dark.gif similarity index 100% rename from src/canonical/models/back/Silvally--Dark.gif rename to src/canonical/models/back/773--420--Silvally--Dark.gif diff --git a/src/canonical/models/back/Silvally--Dragon.gif b/src/canonical/models/back/773--420--Silvally--Dragon.gif similarity index 100% rename from src/canonical/models/back/Silvally--Dragon.gif rename to src/canonical/models/back/773--420--Silvally--Dragon.gif diff --git a/src/canonical/models/back/Silvally--Electric.gif b/src/canonical/models/back/773--420--Silvally--Electric.gif similarity index 100% rename from src/canonical/models/back/Silvally--Electric.gif rename to src/canonical/models/back/773--420--Silvally--Electric.gif diff --git a/src/canonical/models/back/Silvally--Fairy.gif b/src/canonical/models/back/773--420--Silvally--Fairy.gif similarity index 100% rename from src/canonical/models/back/Silvally--Fairy.gif rename to src/canonical/models/back/773--420--Silvally--Fairy.gif diff --git a/src/canonical/models/back/Silvally--Fighting.gif b/src/canonical/models/back/773--420--Silvally--Fighting.gif similarity index 100% rename from src/canonical/models/back/Silvally--Fighting.gif rename to src/canonical/models/back/773--420--Silvally--Fighting.gif diff --git a/src/canonical/models/back/Silvally--Fire.gif b/src/canonical/models/back/773--420--Silvally--Fire.gif similarity index 100% rename from src/canonical/models/back/Silvally--Fire.gif rename to src/canonical/models/back/773--420--Silvally--Fire.gif diff --git a/src/canonical/models/back/Silvally--Flying.gif b/src/canonical/models/back/773--420--Silvally--Flying.gif similarity index 100% rename from src/canonical/models/back/Silvally--Flying.gif rename to src/canonical/models/back/773--420--Silvally--Flying.gif diff --git a/src/canonical/models/back/Silvally--Ghost.gif b/src/canonical/models/back/773--420--Silvally--Ghost.gif similarity index 100% rename from src/canonical/models/back/Silvally--Ghost.gif rename to src/canonical/models/back/773--420--Silvally--Ghost.gif diff --git a/src/canonical/models/back/Silvally--Grass.gif b/src/canonical/models/back/773--420--Silvally--Grass.gif similarity index 100% rename from src/canonical/models/back/Silvally--Grass.gif rename to src/canonical/models/back/773--420--Silvally--Grass.gif diff --git a/src/canonical/models/back/Silvally--Ground.gif b/src/canonical/models/back/773--420--Silvally--Ground.gif similarity index 100% rename from src/canonical/models/back/Silvally--Ground.gif rename to src/canonical/models/back/773--420--Silvally--Ground.gif diff --git a/src/canonical/models/back/Silvally--Ice.gif b/src/canonical/models/back/773--420--Silvally--Ice.gif similarity index 100% rename from src/canonical/models/back/Silvally--Ice.gif rename to src/canonical/models/back/773--420--Silvally--Ice.gif diff --git a/src/canonical/models/back/Silvally--Poison.gif b/src/canonical/models/back/773--420--Silvally--Poison.gif similarity index 100% rename from src/canonical/models/back/Silvally--Poison.gif rename to src/canonical/models/back/773--420--Silvally--Poison.gif diff --git a/src/canonical/models/back/Silvally--Psychic.gif b/src/canonical/models/back/773--420--Silvally--Psychic.gif similarity index 100% rename from src/canonical/models/back/Silvally--Psychic.gif rename to src/canonical/models/back/773--420--Silvally--Psychic.gif diff --git a/src/canonical/models/back/Silvally--Rock.gif b/src/canonical/models/back/773--420--Silvally--Rock.gif similarity index 100% rename from src/canonical/models/back/Silvally--Rock.gif rename to src/canonical/models/back/773--420--Silvally--Rock.gif diff --git a/src/canonical/models/back/Silvally--Steel.gif b/src/canonical/models/back/773--420--Silvally--Steel.gif similarity index 100% rename from src/canonical/models/back/Silvally--Steel.gif rename to src/canonical/models/back/773--420--Silvally--Steel.gif diff --git a/src/canonical/models/back/Silvally--Water.gif b/src/canonical/models/back/773--420--Silvally--Water.gif similarity index 100% rename from src/canonical/models/back/Silvally--Water.gif rename to src/canonical/models/back/773--420--Silvally--Water.gif diff --git a/src/canonical/models/back/Minior.gif b/src/canonical/models/back/774--0--Minior.gif similarity index 100% rename from src/canonical/models/back/Minior.gif rename to src/canonical/models/back/774--0--Minior.gif diff --git a/src/canonical/models/back/Komala.gif b/src/canonical/models/back/775--0--Komala.gif similarity index 100% rename from src/canonical/models/back/Komala.gif rename to src/canonical/models/back/775--0--Komala.gif diff --git a/src/canonical/models/back/Turtonator.gif b/src/canonical/models/back/776--0--Turtonator.gif similarity index 100% rename from src/canonical/models/back/Turtonator.gif rename to src/canonical/models/back/776--0--Turtonator.gif diff --git a/src/canonical/models/back/Togedemaru.gif b/src/canonical/models/back/777--0--Togedemaru.gif similarity index 100% rename from src/canonical/models/back/Togedemaru.gif rename to src/canonical/models/back/777--0--Togedemaru.gif diff --git a/src/canonical/models/back/Togedemaru--Totem.gif b/src/canonical/models/back/777--420--Togedemaru--Totem.gif similarity index 100% rename from src/canonical/models/back/Togedemaru--Totem.gif rename to src/canonical/models/back/777--420--Togedemaru--Totem.gif diff --git a/src/canonical/models/back/Mimikyu.gif b/src/canonical/models/back/778--0--Mimikyu.gif similarity index 100% rename from src/canonical/models/back/Mimikyu.gif rename to src/canonical/models/back/778--0--Mimikyu.gif diff --git a/src/canonical/models/back/Mimikyu--Busted-Totem.gif b/src/canonical/models/back/778--420--Mimikyu--Busted-Totem.gif similarity index 100% rename from src/canonical/models/back/Mimikyu--Busted-Totem.gif rename to src/canonical/models/back/778--420--Mimikyu--Busted-Totem.gif diff --git a/src/canonical/models/back/Mimikyu--Busted.gif b/src/canonical/models/back/778--420--Mimikyu--Busted.gif similarity index 100% rename from src/canonical/models/back/Mimikyu--Busted.gif rename to src/canonical/models/back/778--420--Mimikyu--Busted.gif diff --git a/src/canonical/models/back/Mimikyu--Totem.gif b/src/canonical/models/back/778--420--Mimikyu--Totem.gif similarity index 100% rename from src/canonical/models/back/Mimikyu--Totem.gif rename to src/canonical/models/back/778--420--Mimikyu--Totem.gif diff --git a/src/canonical/models/back/Bruxish.gif b/src/canonical/models/back/779--0--Bruxish.gif similarity index 100% rename from src/canonical/models/back/Bruxish.gif rename to src/canonical/models/back/779--0--Bruxish.gif diff --git a/src/canonical/models/back/Rapidash.gif b/src/canonical/models/back/78--0--Rapidash.gif similarity index 100% rename from src/canonical/models/back/Rapidash.gif rename to src/canonical/models/back/78--0--Rapidash.gif diff --git a/src/canonical/models/back/Rapidash--Galar.gif b/src/canonical/models/back/78--420--Rapidash--Galar.gif similarity index 100% rename from src/canonical/models/back/Rapidash--Galar.gif rename to src/canonical/models/back/78--420--Rapidash--Galar.gif diff --git a/src/canonical/models/back/Drampa.gif b/src/canonical/models/back/780--0--Drampa.gif similarity index 100% rename from src/canonical/models/back/Drampa.gif rename to src/canonical/models/back/780--0--Drampa.gif diff --git a/src/canonical/models/back/Dhelmise.gif b/src/canonical/models/back/781--0--Dhelmise.gif similarity index 100% rename from src/canonical/models/back/Dhelmise.gif rename to src/canonical/models/back/781--0--Dhelmise.gif diff --git a/src/canonical/models/back/Jangmo-o.gif b/src/canonical/models/back/782--0--Jangmo-o.gif similarity index 100% rename from src/canonical/models/back/Jangmo-o.gif rename to src/canonical/models/back/782--0--Jangmo-o.gif diff --git a/src/canonical/models/back/Hakamo-o.gif b/src/canonical/models/back/783--0--Hakamo-o.gif similarity index 100% rename from src/canonical/models/back/Hakamo-o.gif rename to src/canonical/models/back/783--0--Hakamo-o.gif diff --git a/src/canonical/models/back/Kommo-o.gif b/src/canonical/models/back/784--0--Kommo-o.gif similarity index 100% rename from src/canonical/models/back/Kommo-o.gif rename to src/canonical/models/back/784--0--Kommo-o.gif diff --git a/src/canonical/models/back/Kommo-o--Totem.gif b/src/canonical/models/back/784--420--Kommo-o--Totem.gif similarity index 100% rename from src/canonical/models/back/Kommo-o--Totem.gif rename to src/canonical/models/back/784--420--Kommo-o--Totem.gif diff --git a/src/canonical/models/back/Tapu_Koko.gif b/src/canonical/models/back/785--0--Tapu_Koko.gif similarity index 100% rename from src/canonical/models/back/Tapu_Koko.gif rename to src/canonical/models/back/785--0--Tapu_Koko.gif diff --git a/src/canonical/models/back/Tapu_Lele.gif b/src/canonical/models/back/786--0--Tapu_Lele.gif similarity index 100% rename from src/canonical/models/back/Tapu_Lele.gif rename to src/canonical/models/back/786--0--Tapu_Lele.gif diff --git a/src/canonical/models/back/Tapu_Bulu.gif b/src/canonical/models/back/787--0--Tapu_Bulu.gif similarity index 100% rename from src/canonical/models/back/Tapu_Bulu.gif rename to src/canonical/models/back/787--0--Tapu_Bulu.gif diff --git a/src/canonical/models/back/Tapu_Fini.gif b/src/canonical/models/back/788--0--Tapu_Fini.gif similarity index 100% rename from src/canonical/models/back/Tapu_Fini.gif rename to src/canonical/models/back/788--0--Tapu_Fini.gif diff --git a/src/canonical/models/back/Cosmog.gif b/src/canonical/models/back/789--0--Cosmog.gif similarity index 100% rename from src/canonical/models/back/Cosmog.gif rename to src/canonical/models/back/789--0--Cosmog.gif diff --git a/src/canonical/models/back/Slowpoke.gif b/src/canonical/models/back/79--0--Slowpoke.gif similarity index 100% rename from src/canonical/models/back/Slowpoke.gif rename to src/canonical/models/back/79--0--Slowpoke.gif diff --git a/src/canonical/models/back/Slowpoke--Galar.gif b/src/canonical/models/back/79--420--Slowpoke--Galar.gif similarity index 100% rename from src/canonical/models/back/Slowpoke--Galar.gif rename to src/canonical/models/back/79--420--Slowpoke--Galar.gif diff --git a/src/canonical/models/back/Cosmoem.gif b/src/canonical/models/back/790--0--Cosmoem.gif similarity index 100% rename from src/canonical/models/back/Cosmoem.gif rename to src/canonical/models/back/790--0--Cosmoem.gif diff --git a/src/canonical/models/back/Solgaleo.gif b/src/canonical/models/back/791--0--Solgaleo.gif similarity index 100% rename from src/canonical/models/back/Solgaleo.gif rename to src/canonical/models/back/791--0--Solgaleo.gif diff --git a/src/canonical/models/back/Lunala.gif b/src/canonical/models/back/792--0--Lunala.gif similarity index 100% rename from src/canonical/models/back/Lunala.gif rename to src/canonical/models/back/792--0--Lunala.gif diff --git a/src/canonical/models/back/Nihilego.gif b/src/canonical/models/back/793--0--Nihilego.gif similarity index 100% rename from src/canonical/models/back/Nihilego.gif rename to src/canonical/models/back/793--0--Nihilego.gif diff --git a/src/canonical/models/back/Buzzwole.gif b/src/canonical/models/back/794--0--Buzzwole.gif similarity index 100% rename from src/canonical/models/back/Buzzwole.gif rename to src/canonical/models/back/794--0--Buzzwole.gif diff --git a/src/canonical/models/back/Pheromosa.gif b/src/canonical/models/back/795--0--Pheromosa.gif similarity index 100% rename from src/canonical/models/back/Pheromosa.gif rename to src/canonical/models/back/795--0--Pheromosa.gif diff --git a/src/canonical/models/back/Xurkitree.gif b/src/canonical/models/back/796--0--Xurkitree.gif similarity index 100% rename from src/canonical/models/back/Xurkitree.gif rename to src/canonical/models/back/796--0--Xurkitree.gif diff --git a/src/canonical/models/back/Celesteela.gif b/src/canonical/models/back/797--0--Celesteela.gif similarity index 100% rename from src/canonical/models/back/Celesteela.gif rename to src/canonical/models/back/797--0--Celesteela.gif diff --git a/src/canonical/models/back/Kartana.gif b/src/canonical/models/back/798--0--Kartana.gif similarity index 100% rename from src/canonical/models/back/Kartana.gif rename to src/canonical/models/back/798--0--Kartana.gif diff --git a/src/canonical/models/back/Guzzlord.gif b/src/canonical/models/back/799--0--Guzzlord.gif similarity index 100% rename from src/canonical/models/back/Guzzlord.gif rename to src/canonical/models/back/799--0--Guzzlord.gif diff --git a/src/canonical/models/back/Wartortle.gif b/src/canonical/models/back/8--0--Wartortle.gif similarity index 100% rename from src/canonical/models/back/Wartortle.gif rename to src/canonical/models/back/8--0--Wartortle.gif diff --git a/src/canonical/models/back/Slowbro.gif b/src/canonical/models/back/80--0--Slowbro.gif similarity index 100% rename from src/canonical/models/back/Slowbro.gif rename to src/canonical/models/back/80--0--Slowbro.gif diff --git a/src/canonical/models/back/Slowbro--Mega.gif b/src/canonical/models/back/80--420--Slowbro--Mega.gif similarity index 100% rename from src/canonical/models/back/Slowbro--Mega.gif rename to src/canonical/models/back/80--420--Slowbro--Mega.gif diff --git a/src/canonical/models/back/Necrozma.gif b/src/canonical/models/back/800--0--Necrozma.gif similarity index 100% rename from src/canonical/models/back/Necrozma.gif rename to src/canonical/models/back/800--0--Necrozma.gif diff --git a/src/canonical/models/back/Necrozma--Dawn_Wings.gif b/src/canonical/models/back/800--420--Necrozma--Dawn_Wings.gif similarity index 100% rename from src/canonical/models/back/Necrozma--Dawn_Wings.gif rename to src/canonical/models/back/800--420--Necrozma--Dawn_Wings.gif diff --git a/src/canonical/models/back/Necrozma--Dusk_Mane.gif b/src/canonical/models/back/800--420--Necrozma--Dusk_Mane.gif similarity index 100% rename from src/canonical/models/back/Necrozma--Dusk_Mane.gif rename to src/canonical/models/back/800--420--Necrozma--Dusk_Mane.gif diff --git a/src/canonical/models/back/Necrozma--Ultra.gif b/src/canonical/models/back/800--420--Necrozma--Ultra.gif similarity index 100% rename from src/canonical/models/back/Necrozma--Ultra.gif rename to src/canonical/models/back/800--420--Necrozma--Ultra.gif diff --git a/src/canonical/models/back/Magearna.gif b/src/canonical/models/back/801--0--Magearna.gif similarity index 100% rename from src/canonical/models/back/Magearna.gif rename to src/canonical/models/back/801--0--Magearna.gif diff --git a/src/canonical/models/back/Marshadow.gif b/src/canonical/models/back/802--0--Marshadow.gif similarity index 100% rename from src/canonical/models/back/Marshadow.gif rename to src/canonical/models/back/802--0--Marshadow.gif diff --git a/src/canonical/models/back/Poipole.gif b/src/canonical/models/back/803--0--Poipole.gif similarity index 100% rename from src/canonical/models/back/Poipole.gif rename to src/canonical/models/back/803--0--Poipole.gif diff --git a/src/canonical/models/back/Naganadel.gif b/src/canonical/models/back/804--0--Naganadel.gif similarity index 100% rename from src/canonical/models/back/Naganadel.gif rename to src/canonical/models/back/804--0--Naganadel.gif diff --git a/src/canonical/models/back/Stakataka.gif b/src/canonical/models/back/805--0--Stakataka.gif similarity index 100% rename from src/canonical/models/back/Stakataka.gif rename to src/canonical/models/back/805--0--Stakataka.gif diff --git a/src/canonical/models/back/Blacephalon.gif b/src/canonical/models/back/806--0--Blacephalon.gif similarity index 100% rename from src/canonical/models/back/Blacephalon.gif rename to src/canonical/models/back/806--0--Blacephalon.gif diff --git a/src/canonical/models/back/Zeraora.gif b/src/canonical/models/back/807--0--Zeraora.gif similarity index 100% rename from src/canonical/models/back/Zeraora.gif rename to src/canonical/models/back/807--0--Zeraora.gif diff --git a/src/canonical/models/back/Meltan.gif b/src/canonical/models/back/808--0--Meltan.gif similarity index 100% rename from src/canonical/models/back/Meltan.gif rename to src/canonical/models/back/808--0--Meltan.gif diff --git a/src/canonical/models/back/Melmetal.gif b/src/canonical/models/back/809--0--Melmetal.gif similarity index 100% rename from src/canonical/models/back/Melmetal.gif rename to src/canonical/models/back/809--0--Melmetal.gif diff --git a/src/canonical/models/back/Melmetal--Gmax.gif b/src/canonical/models/back/809--420--Melmetal--Gmax.gif similarity index 100% rename from src/canonical/models/back/Melmetal--Gmax.gif rename to src/canonical/models/back/809--420--Melmetal--Gmax.gif diff --git a/src/canonical/models/back/Magnemite.gif b/src/canonical/models/back/81--0--Magnemite.gif similarity index 100% rename from src/canonical/models/back/Magnemite.gif rename to src/canonical/models/back/81--0--Magnemite.gif diff --git a/src/canonical/models/back/Grookey.gif b/src/canonical/models/back/810--0--Grookey.gif similarity index 100% rename from src/canonical/models/back/Grookey.gif rename to src/canonical/models/back/810--0--Grookey.gif diff --git a/src/canonical/models/back/Thwackey.gif b/src/canonical/models/back/811--0--Thwackey.gif similarity index 100% rename from src/canonical/models/back/Thwackey.gif rename to src/canonical/models/back/811--0--Thwackey.gif diff --git a/src/canonical/models/back/Rillaboom.gif b/src/canonical/models/back/812--0--Rillaboom.gif similarity index 100% rename from src/canonical/models/back/Rillaboom.gif rename to src/canonical/models/back/812--0--Rillaboom.gif diff --git a/src/canonical/models/back/Scorbunny.gif b/src/canonical/models/back/813--0--Scorbunny.gif similarity index 100% rename from src/canonical/models/back/Scorbunny.gif rename to src/canonical/models/back/813--0--Scorbunny.gif diff --git a/src/canonical/models/back/Raboot.gif b/src/canonical/models/back/814--0--Raboot.gif similarity index 100% rename from src/canonical/models/back/Raboot.gif rename to src/canonical/models/back/814--0--Raboot.gif diff --git a/src/canonical/models/back/Cinderace.gif b/src/canonical/models/back/815--0--Cinderace.gif similarity index 100% rename from src/canonical/models/back/Cinderace.gif rename to src/canonical/models/back/815--0--Cinderace.gif diff --git a/src/canonical/models/back/Sobble.gif b/src/canonical/models/back/816--0--Sobble.gif similarity index 100% rename from src/canonical/models/back/Sobble.gif rename to src/canonical/models/back/816--0--Sobble.gif diff --git a/src/canonical/models/back/Drizzile.gif b/src/canonical/models/back/817--0--Drizzile.gif similarity index 100% rename from src/canonical/models/back/Drizzile.gif rename to src/canonical/models/back/817--0--Drizzile.gif diff --git a/src/canonical/models/back/Inteleon.gif b/src/canonical/models/back/818--0--Inteleon.gif similarity index 100% rename from src/canonical/models/back/Inteleon.gif rename to src/canonical/models/back/818--0--Inteleon.gif diff --git a/src/canonical/models/back/Skwovet.gif b/src/canonical/models/back/819--0--Skwovet.gif similarity index 100% rename from src/canonical/models/back/Skwovet.gif rename to src/canonical/models/back/819--0--Skwovet.gif diff --git a/src/canonical/models/back/Magneton.gif b/src/canonical/models/back/82--0--Magneton.gif similarity index 100% rename from src/canonical/models/back/Magneton.gif rename to src/canonical/models/back/82--0--Magneton.gif diff --git a/src/canonical/models/back/Greedent.gif b/src/canonical/models/back/820--0--Greedent.gif similarity index 100% rename from src/canonical/models/back/Greedent.gif rename to src/canonical/models/back/820--0--Greedent.gif diff --git a/src/canonical/models/back/Rookidee.gif b/src/canonical/models/back/821--0--Rookidee.gif similarity index 100% rename from src/canonical/models/back/Rookidee.gif rename to src/canonical/models/back/821--0--Rookidee.gif diff --git a/src/canonical/models/back/Corvisquire.gif b/src/canonical/models/back/822--0--Corvisquire.gif similarity index 100% rename from src/canonical/models/back/Corvisquire.gif rename to src/canonical/models/back/822--0--Corvisquire.gif diff --git a/src/canonical/models/back/Corviknight.gif b/src/canonical/models/back/823--0--Corviknight.gif similarity index 100% rename from src/canonical/models/back/Corviknight.gif rename to src/canonical/models/back/823--0--Corviknight.gif diff --git a/src/canonical/models/back/Corviknight--Gmax.gif b/src/canonical/models/back/823--420--Corviknight--Gmax.gif similarity index 100% rename from src/canonical/models/back/Corviknight--Gmax.gif rename to src/canonical/models/back/823--420--Corviknight--Gmax.gif diff --git a/src/canonical/models/back/Blipbug.gif b/src/canonical/models/back/824--0--Blipbug.gif similarity index 100% rename from src/canonical/models/back/Blipbug.gif rename to src/canonical/models/back/824--0--Blipbug.gif diff --git a/src/canonical/models/back/Dottler.gif b/src/canonical/models/back/825--0--Dottler.gif similarity index 100% rename from src/canonical/models/back/Dottler.gif rename to src/canonical/models/back/825--0--Dottler.gif diff --git a/src/canonical/models/back/Orbeetle.gif b/src/canonical/models/back/826--0--Orbeetle.gif similarity index 100% rename from src/canonical/models/back/Orbeetle.gif rename to src/canonical/models/back/826--0--Orbeetle.gif diff --git a/src/canonical/models/back/Orbeetle--Gmax.gif b/src/canonical/models/back/826--420--Orbeetle--Gmax.gif similarity index 100% rename from src/canonical/models/back/Orbeetle--Gmax.gif rename to src/canonical/models/back/826--420--Orbeetle--Gmax.gif diff --git a/src/canonical/models/back/Nickit.gif b/src/canonical/models/back/827--0--Nickit.gif similarity index 100% rename from src/canonical/models/back/Nickit.gif rename to src/canonical/models/back/827--0--Nickit.gif diff --git a/src/canonical/models/back/Thievul.gif b/src/canonical/models/back/828--0--Thievul.gif similarity index 100% rename from src/canonical/models/back/Thievul.gif rename to src/canonical/models/back/828--0--Thievul.gif diff --git a/src/canonical/models/back/Gossifleur.gif b/src/canonical/models/back/829--0--Gossifleur.gif similarity index 100% rename from src/canonical/models/back/Gossifleur.gif rename to src/canonical/models/back/829--0--Gossifleur.gif diff --git a/src/canonical/models/back/Farfetch__0027d.gif b/src/canonical/models/back/83--0--Farfetch__0027d.gif similarity index 100% rename from src/canonical/models/back/Farfetch__0027d.gif rename to src/canonical/models/back/83--0--Farfetch__0027d.gif diff --git a/src/canonical/models/back/Farfetch__0027d--Galar.gif b/src/canonical/models/back/83--420--Farfetch__0027d--Galar.gif similarity index 100% rename from src/canonical/models/back/Farfetch__0027d--Galar.gif rename to src/canonical/models/back/83--420--Farfetch__0027d--Galar.gif diff --git a/src/canonical/models/back/Eldegoss.gif b/src/canonical/models/back/830--0--Eldegoss.gif similarity index 100% rename from src/canonical/models/back/Eldegoss.gif rename to src/canonical/models/back/830--0--Eldegoss.gif diff --git a/src/canonical/models/back/Wooloo.gif b/src/canonical/models/back/831--0--Wooloo.gif similarity index 100% rename from src/canonical/models/back/Wooloo.gif rename to src/canonical/models/back/831--0--Wooloo.gif diff --git a/src/canonical/models/back/Dubwool.gif b/src/canonical/models/back/832--0--Dubwool.gif similarity index 100% rename from src/canonical/models/back/Dubwool.gif rename to src/canonical/models/back/832--0--Dubwool.gif diff --git a/src/canonical/models/back/Chewtle.gif b/src/canonical/models/back/833--0--Chewtle.gif similarity index 100% rename from src/canonical/models/back/Chewtle.gif rename to src/canonical/models/back/833--0--Chewtle.gif diff --git a/src/canonical/models/back/Drednaw.gif b/src/canonical/models/back/834--0--Drednaw.gif similarity index 100% rename from src/canonical/models/back/Drednaw.gif rename to src/canonical/models/back/834--0--Drednaw.gif diff --git a/src/canonical/models/back/Drednaw--Gmax.gif b/src/canonical/models/back/834--420--Drednaw--Gmax.gif similarity index 100% rename from src/canonical/models/back/Drednaw--Gmax.gif rename to src/canonical/models/back/834--420--Drednaw--Gmax.gif diff --git a/src/canonical/models/back/Yamper.gif b/src/canonical/models/back/835--0--Yamper.gif similarity index 100% rename from src/canonical/models/back/Yamper.gif rename to src/canonical/models/back/835--0--Yamper.gif diff --git a/src/canonical/models/back/Boltund.gif b/src/canonical/models/back/836--0--Boltund.gif similarity index 100% rename from src/canonical/models/back/Boltund.gif rename to src/canonical/models/back/836--0--Boltund.gif diff --git a/src/canonical/models/back/Rolycoly.gif b/src/canonical/models/back/837--0--Rolycoly.gif similarity index 100% rename from src/canonical/models/back/Rolycoly.gif rename to src/canonical/models/back/837--0--Rolycoly.gif diff --git a/src/canonical/models/back/Carkol.gif b/src/canonical/models/back/838--0--Carkol.gif similarity index 100% rename from src/canonical/models/back/Carkol.gif rename to src/canonical/models/back/838--0--Carkol.gif diff --git a/src/canonical/models/back/Coalossal.gif b/src/canonical/models/back/839--0--Coalossal.gif similarity index 100% rename from src/canonical/models/back/Coalossal.gif rename to src/canonical/models/back/839--0--Coalossal.gif diff --git a/src/canonical/models/back/Coalossal--Gmax.gif b/src/canonical/models/back/839--420--Coalossal--Gmax.gif similarity index 100% rename from src/canonical/models/back/Coalossal--Gmax.gif rename to src/canonical/models/back/839--420--Coalossal--Gmax.gif diff --git a/src/canonical/models/back/Doduo.gif b/src/canonical/models/back/84--0--Doduo.gif similarity index 100% rename from src/canonical/models/back/Doduo.gif rename to src/canonical/models/back/84--0--Doduo.gif diff --git a/src/canonical/models/back/Applin.gif b/src/canonical/models/back/840--0--Applin.gif similarity index 100% rename from src/canonical/models/back/Applin.gif rename to src/canonical/models/back/840--0--Applin.gif diff --git a/src/canonical/models/back/Flapple.gif b/src/canonical/models/back/841--0--Flapple.gif similarity index 100% rename from src/canonical/models/back/Flapple.gif rename to src/canonical/models/back/841--0--Flapple.gif diff --git a/src/canonical/models/back/Flapple--Gmax.gif b/src/canonical/models/back/841--420--Flapple--Gmax.gif similarity index 100% rename from src/canonical/models/back/Flapple--Gmax.gif rename to src/canonical/models/back/841--420--Flapple--Gmax.gif diff --git a/src/canonical/models/back/Appletun.gif b/src/canonical/models/back/842--0--Appletun.gif similarity index 100% rename from src/canonical/models/back/Appletun.gif rename to src/canonical/models/back/842--0--Appletun.gif diff --git a/src/canonical/models/back/Appletun--Gmax.gif b/src/canonical/models/back/842--420--Appletun--Gmax.gif similarity index 100% rename from src/canonical/models/back/Appletun--Gmax.gif rename to src/canonical/models/back/842--420--Appletun--Gmax.gif diff --git a/src/canonical/models/back/Silicobra.gif b/src/canonical/models/back/843--0--Silicobra.gif similarity index 100% rename from src/canonical/models/back/Silicobra.gif rename to src/canonical/models/back/843--0--Silicobra.gif diff --git a/src/canonical/models/back/Sandaconda.gif b/src/canonical/models/back/844--0--Sandaconda.gif similarity index 100% rename from src/canonical/models/back/Sandaconda.gif rename to src/canonical/models/back/844--0--Sandaconda.gif diff --git a/src/canonical/models/back/Sandaconda--Gmax.gif b/src/canonical/models/back/844--420--Sandaconda--Gmax.gif similarity index 100% rename from src/canonical/models/back/Sandaconda--Gmax.gif rename to src/canonical/models/back/844--420--Sandaconda--Gmax.gif diff --git a/src/canonical/models/back/Cramorant.gif b/src/canonical/models/back/845--0--Cramorant.gif similarity index 100% rename from src/canonical/models/back/Cramorant.gif rename to src/canonical/models/back/845--0--Cramorant.gif diff --git a/src/canonical/models/back/Cramorant--Gorging.gif b/src/canonical/models/back/845--420--Cramorant--Gorging.gif similarity index 100% rename from src/canonical/models/back/Cramorant--Gorging.gif rename to src/canonical/models/back/845--420--Cramorant--Gorging.gif diff --git a/src/canonical/models/back/Cramorant--Gulping.gif b/src/canonical/models/back/845--420--Cramorant--Gulping.gif similarity index 100% rename from src/canonical/models/back/Cramorant--Gulping.gif rename to src/canonical/models/back/845--420--Cramorant--Gulping.gif diff --git a/src/canonical/models/back/Arrokuda.gif b/src/canonical/models/back/846--0--Arrokuda.gif similarity index 100% rename from src/canonical/models/back/Arrokuda.gif rename to src/canonical/models/back/846--0--Arrokuda.gif diff --git a/src/canonical/models/back/Barraskewda.gif b/src/canonical/models/back/847--0--Barraskewda.gif similarity index 100% rename from src/canonical/models/back/Barraskewda.gif rename to src/canonical/models/back/847--0--Barraskewda.gif diff --git a/src/canonical/models/back/Toxel.gif b/src/canonical/models/back/848--0--Toxel.gif similarity index 100% rename from src/canonical/models/back/Toxel.gif rename to src/canonical/models/back/848--0--Toxel.gif diff --git a/src/canonical/models/back/Toxtricity.gif b/src/canonical/models/back/849--0--Toxtricity.gif similarity index 100% rename from src/canonical/models/back/Toxtricity.gif rename to src/canonical/models/back/849--0--Toxtricity.gif diff --git a/src/canonical/models/back/Toxtricity--Gmax.gif b/src/canonical/models/back/849--420--Toxtricity--Gmax.gif similarity index 100% rename from src/canonical/models/back/Toxtricity--Gmax.gif rename to src/canonical/models/back/849--420--Toxtricity--Gmax.gif diff --git a/src/canonical/models/back/Toxtricity--Low-Key.gif b/src/canonical/models/back/849--420--Toxtricity--Low-Key.gif similarity index 100% rename from src/canonical/models/back/Toxtricity--Low-Key.gif rename to src/canonical/models/back/849--420--Toxtricity--Low-Key.gif diff --git a/src/canonical/models/back/Dodrio.gif b/src/canonical/models/back/85--0--Dodrio.gif similarity index 100% rename from src/canonical/models/back/Dodrio.gif rename to src/canonical/models/back/85--0--Dodrio.gif diff --git a/src/canonical/models/back/Sizzlipede.gif b/src/canonical/models/back/850--0--Sizzlipede.gif similarity index 100% rename from src/canonical/models/back/Sizzlipede.gif rename to src/canonical/models/back/850--0--Sizzlipede.gif diff --git a/src/canonical/models/back/Centiskorch.gif b/src/canonical/models/back/851--0--Centiskorch.gif similarity index 100% rename from src/canonical/models/back/Centiskorch.gif rename to src/canonical/models/back/851--0--Centiskorch.gif diff --git a/src/canonical/models/back/Centiskorch--Gmax.gif b/src/canonical/models/back/851--420--Centiskorch--Gmax.gif similarity index 100% rename from src/canonical/models/back/Centiskorch--Gmax.gif rename to src/canonical/models/back/851--420--Centiskorch--Gmax.gif diff --git a/src/canonical/models/back/Clobbopus.gif b/src/canonical/models/back/852--0--Clobbopus.gif similarity index 100% rename from src/canonical/models/back/Clobbopus.gif rename to src/canonical/models/back/852--0--Clobbopus.gif diff --git a/src/canonical/models/back/Grapploct.gif b/src/canonical/models/back/853--0--Grapploct.gif similarity index 100% rename from src/canonical/models/back/Grapploct.gif rename to src/canonical/models/back/853--0--Grapploct.gif diff --git a/src/canonical/models/back/Sinistea--Antique.gif b/src/canonical/models/back/854--0--Sinistea.gif similarity index 100% rename from src/canonical/models/back/Sinistea--Antique.gif rename to src/canonical/models/back/854--0--Sinistea.gif diff --git a/src/canonical/models/back/Sinistea.gif b/src/canonical/models/back/854--420--Sinistea--Antique.gif similarity index 100% rename from src/canonical/models/back/Sinistea.gif rename to src/canonical/models/back/854--420--Sinistea--Antique.gif diff --git a/src/canonical/models/back/Polteageist--Antique.gif b/src/canonical/models/back/855--0--Polteageist.gif similarity index 100% rename from src/canonical/models/back/Polteageist--Antique.gif rename to src/canonical/models/back/855--0--Polteageist.gif diff --git a/src/canonical/models/back/Polteageist.gif b/src/canonical/models/back/855--420--Polteageist--Antique.gif similarity index 100% rename from src/canonical/models/back/Polteageist.gif rename to src/canonical/models/back/855--420--Polteageist--Antique.gif diff --git a/src/canonical/models/back/Hatenna.gif b/src/canonical/models/back/856--0--Hatenna.gif similarity index 100% rename from src/canonical/models/back/Hatenna.gif rename to src/canonical/models/back/856--0--Hatenna.gif diff --git a/src/canonical/models/back/Hattrem.gif b/src/canonical/models/back/857--0--Hattrem.gif similarity index 100% rename from src/canonical/models/back/Hattrem.gif rename to src/canonical/models/back/857--0--Hattrem.gif diff --git a/src/canonical/models/back/Hatterene.gif b/src/canonical/models/back/858--0--Hatterene.gif similarity index 100% rename from src/canonical/models/back/Hatterene.gif rename to src/canonical/models/back/858--0--Hatterene.gif diff --git a/src/canonical/models/back/Hatterene--Gmax.gif b/src/canonical/models/back/858--420--Hatterene--Gmax.gif similarity index 100% rename from src/canonical/models/back/Hatterene--Gmax.gif rename to src/canonical/models/back/858--420--Hatterene--Gmax.gif diff --git a/src/canonical/models/back/Impidimp.gif b/src/canonical/models/back/859--0--Impidimp.gif similarity index 100% rename from src/canonical/models/back/Impidimp.gif rename to src/canonical/models/back/859--0--Impidimp.gif diff --git a/src/canonical/models/back/Seel.gif b/src/canonical/models/back/86--0--Seel.gif similarity index 100% rename from src/canonical/models/back/Seel.gif rename to src/canonical/models/back/86--0--Seel.gif diff --git a/src/canonical/models/back/Morgrem.gif b/src/canonical/models/back/860--0--Morgrem.gif similarity index 100% rename from src/canonical/models/back/Morgrem.gif rename to src/canonical/models/back/860--0--Morgrem.gif diff --git a/src/canonical/models/back/Grimmsnarl.gif b/src/canonical/models/back/861--0--Grimmsnarl.gif similarity index 100% rename from src/canonical/models/back/Grimmsnarl.gif rename to src/canonical/models/back/861--0--Grimmsnarl.gif diff --git a/src/canonical/models/back/Grimmsnarl--Gmax.gif b/src/canonical/models/back/861--420--Grimmsnarl--Gmax.gif similarity index 100% rename from src/canonical/models/back/Grimmsnarl--Gmax.gif rename to src/canonical/models/back/861--420--Grimmsnarl--Gmax.gif diff --git a/src/canonical/models/back/Obstagoon.gif b/src/canonical/models/back/862--0--Obstagoon.gif similarity index 100% rename from src/canonical/models/back/Obstagoon.gif rename to src/canonical/models/back/862--0--Obstagoon.gif diff --git a/src/canonical/models/back/Perrserker.gif b/src/canonical/models/back/863--0--Perrserker.gif similarity index 100% rename from src/canonical/models/back/Perrserker.gif rename to src/canonical/models/back/863--0--Perrserker.gif diff --git a/src/canonical/models/back/Cursola.gif b/src/canonical/models/back/864--0--Cursola.gif similarity index 100% rename from src/canonical/models/back/Cursola.gif rename to src/canonical/models/back/864--0--Cursola.gif diff --git a/src/canonical/models/back/Sirfetch__0027d.gif b/src/canonical/models/back/865--0--Sirfetch__0027d.gif similarity index 100% rename from src/canonical/models/back/Sirfetch__0027d.gif rename to src/canonical/models/back/865--0--Sirfetch__0027d.gif diff --git a/src/canonical/models/back/Mr._Rime.gif b/src/canonical/models/back/866--0--Mr._Rime.gif similarity index 100% rename from src/canonical/models/back/Mr._Rime.gif rename to src/canonical/models/back/866--0--Mr._Rime.gif diff --git a/src/canonical/models/back/Runerigus.gif b/src/canonical/models/back/867--0--Runerigus.gif similarity index 100% rename from src/canonical/models/back/Runerigus.gif rename to src/canonical/models/back/867--0--Runerigus.gif diff --git a/src/canonical/models/back/Milcery.gif b/src/canonical/models/back/868--0--Milcery.gif similarity index 100% rename from src/canonical/models/back/Milcery.gif rename to src/canonical/models/back/868--0--Milcery.gif diff --git a/src/canonical/models/back/Alcremie.gif b/src/canonical/models/back/869--0--Alcremie.gif similarity index 100% rename from src/canonical/models/back/Alcremie.gif rename to src/canonical/models/back/869--0--Alcremie.gif diff --git a/src/canonical/models/back/Alcremie--Gmax.gif b/src/canonical/models/back/869--420--Alcremie--Gmax.gif similarity index 100% rename from src/canonical/models/back/Alcremie--Gmax.gif rename to src/canonical/models/back/869--420--Alcremie--Gmax.gif diff --git a/src/canonical/models/back/Dewgong.gif b/src/canonical/models/back/87--0--Dewgong.gif similarity index 100% rename from src/canonical/models/back/Dewgong.gif rename to src/canonical/models/back/87--0--Dewgong.gif diff --git a/src/canonical/models/back/Falinks.gif b/src/canonical/models/back/870--0--Falinks.gif similarity index 100% rename from src/canonical/models/back/Falinks.gif rename to src/canonical/models/back/870--0--Falinks.gif diff --git a/src/canonical/models/back/Pincurchin.gif b/src/canonical/models/back/871--0--Pincurchin.gif similarity index 100% rename from src/canonical/models/back/Pincurchin.gif rename to src/canonical/models/back/871--0--Pincurchin.gif diff --git a/src/canonical/models/back/Snom.gif b/src/canonical/models/back/872--0--Snom.gif similarity index 100% rename from src/canonical/models/back/Snom.gif rename to src/canonical/models/back/872--0--Snom.gif diff --git a/src/canonical/models/back/Frosmoth.gif b/src/canonical/models/back/873--0--Frosmoth.gif similarity index 100% rename from src/canonical/models/back/Frosmoth.gif rename to src/canonical/models/back/873--0--Frosmoth.gif diff --git a/src/canonical/models/back/Stonjourner.gif b/src/canonical/models/back/874--0--Stonjourner.gif similarity index 100% rename from src/canonical/models/back/Stonjourner.gif rename to src/canonical/models/back/874--0--Stonjourner.gif diff --git a/src/canonical/models/back/Eiscue.gif b/src/canonical/models/back/875--0--Eiscue.gif similarity index 100% rename from src/canonical/models/back/Eiscue.gif rename to src/canonical/models/back/875--0--Eiscue.gif diff --git a/src/canonical/models/back/Eiscue--Noice.gif b/src/canonical/models/back/875--420--Eiscue--Noice.gif similarity index 100% rename from src/canonical/models/back/Eiscue--Noice.gif rename to src/canonical/models/back/875--420--Eiscue--Noice.gif diff --git a/src/canonical/models/back/Indeedee.gif b/src/canonical/models/back/876--0--Indeedee.gif similarity index 100% rename from src/canonical/models/back/Indeedee.gif rename to src/canonical/models/back/876--0--Indeedee.gif diff --git a/src/canonical/models/back/Indeedee--F.gif b/src/canonical/models/back/876--420--Indeedee--F.gif similarity index 100% rename from src/canonical/models/back/Indeedee--F.gif rename to src/canonical/models/back/876--420--Indeedee--F.gif diff --git a/src/canonical/models/back/Morpeko.gif b/src/canonical/models/back/877--0--Morpeko.gif similarity index 100% rename from src/canonical/models/back/Morpeko.gif rename to src/canonical/models/back/877--0--Morpeko.gif diff --git a/src/canonical/models/back/Morpeko--Hangry.gif b/src/canonical/models/back/877--420--Morpeko--Hangry.gif similarity index 100% rename from src/canonical/models/back/Morpeko--Hangry.gif rename to src/canonical/models/back/877--420--Morpeko--Hangry.gif diff --git a/src/canonical/models/back/Cufant.gif b/src/canonical/models/back/878--0--Cufant.gif similarity index 100% rename from src/canonical/models/back/Cufant.gif rename to src/canonical/models/back/878--0--Cufant.gif diff --git a/src/canonical/models/back/Copperajah.gif b/src/canonical/models/back/879--0--Copperajah.gif similarity index 100% rename from src/canonical/models/back/Copperajah.gif rename to src/canonical/models/back/879--0--Copperajah.gif diff --git a/src/canonical/models/back/Copperajah--Gmax.gif b/src/canonical/models/back/879--420--Copperajah--Gmax.gif similarity index 100% rename from src/canonical/models/back/Copperajah--Gmax.gif rename to src/canonical/models/back/879--420--Copperajah--Gmax.gif diff --git a/src/canonical/models/back/Grimer.gif b/src/canonical/models/back/88--0--Grimer.gif similarity index 100% rename from src/canonical/models/back/Grimer.gif rename to src/canonical/models/back/88--0--Grimer.gif diff --git a/src/canonical/models/back/Grimer--Alola.gif b/src/canonical/models/back/88--420--Grimer--Alola.gif similarity index 100% rename from src/canonical/models/back/Grimer--Alola.gif rename to src/canonical/models/back/88--420--Grimer--Alola.gif diff --git a/src/canonical/models/back/Dracozolt.gif b/src/canonical/models/back/880--0--Dracozolt.gif similarity index 100% rename from src/canonical/models/back/Dracozolt.gif rename to src/canonical/models/back/880--0--Dracozolt.gif diff --git a/src/canonical/models/back/Arctozolt.gif b/src/canonical/models/back/881--0--Arctozolt.gif similarity index 100% rename from src/canonical/models/back/Arctozolt.gif rename to src/canonical/models/back/881--0--Arctozolt.gif diff --git a/src/canonical/models/back/Dracovish.gif b/src/canonical/models/back/882--0--Dracovish.gif similarity index 100% rename from src/canonical/models/back/Dracovish.gif rename to src/canonical/models/back/882--0--Dracovish.gif diff --git a/src/canonical/models/back/Arctovish.gif b/src/canonical/models/back/883--0--Arctovish.gif similarity index 100% rename from src/canonical/models/back/Arctovish.gif rename to src/canonical/models/back/883--0--Arctovish.gif diff --git a/src/canonical/models/back/Duraludon.gif b/src/canonical/models/back/884--0--Duraludon.gif similarity index 100% rename from src/canonical/models/back/Duraludon.gif rename to src/canonical/models/back/884--0--Duraludon.gif diff --git a/src/canonical/models/back/Duraludon--Gmax.gif b/src/canonical/models/back/884--420--Duraludon--Gmax.gif similarity index 100% rename from src/canonical/models/back/Duraludon--Gmax.gif rename to src/canonical/models/back/884--420--Duraludon--Gmax.gif diff --git a/src/canonical/models/back/Dreepy.gif b/src/canonical/models/back/885--0--Dreepy.gif similarity index 100% rename from src/canonical/models/back/Dreepy.gif rename to src/canonical/models/back/885--0--Dreepy.gif diff --git a/src/canonical/models/back/Drakloak.gif b/src/canonical/models/back/886--0--Drakloak.gif similarity index 100% rename from src/canonical/models/back/Drakloak.gif rename to src/canonical/models/back/886--0--Drakloak.gif diff --git a/src/canonical/models/back/Dragapult.gif b/src/canonical/models/back/887--0--Dragapult.gif similarity index 100% rename from src/canonical/models/back/Dragapult.gif rename to src/canonical/models/back/887--0--Dragapult.gif diff --git a/src/canonical/models/back/Zacian.gif b/src/canonical/models/back/888--0--Zacian.gif similarity index 100% rename from src/canonical/models/back/Zacian.gif rename to src/canonical/models/back/888--0--Zacian.gif diff --git a/src/canonical/models/back/Zacian--Crowned.gif b/src/canonical/models/back/888--420--Zacian--Crowned.gif similarity index 100% rename from src/canonical/models/back/Zacian--Crowned.gif rename to src/canonical/models/back/888--420--Zacian--Crowned.gif diff --git a/src/canonical/models/back/Zamazenta.gif b/src/canonical/models/back/889--0--Zamazenta.gif similarity index 100% rename from src/canonical/models/back/Zamazenta.gif rename to src/canonical/models/back/889--0--Zamazenta.gif diff --git a/src/canonical/models/back/Zamazenta--Crowned.gif b/src/canonical/models/back/889--420--Zamazenta--Crowned.gif similarity index 100% rename from src/canonical/models/back/Zamazenta--Crowned.gif rename to src/canonical/models/back/889--420--Zamazenta--Crowned.gif diff --git a/src/canonical/models/back/Muk.gif b/src/canonical/models/back/89--0--Muk.gif similarity index 100% rename from src/canonical/models/back/Muk.gif rename to src/canonical/models/back/89--0--Muk.gif diff --git a/src/canonical/models/back/Muk--Alola.gif b/src/canonical/models/back/89--420--Muk--Alola.gif similarity index 100% rename from src/canonical/models/back/Muk--Alola.gif rename to src/canonical/models/back/89--420--Muk--Alola.gif diff --git a/src/canonical/models/back/Eternatus.gif b/src/canonical/models/back/890--0--Eternatus.gif similarity index 100% rename from src/canonical/models/back/Eternatus.gif rename to src/canonical/models/back/890--0--Eternatus.gif diff --git a/src/canonical/models/back/Eternatus--Eternamax.gif b/src/canonical/models/back/890--420--Eternatus--Eternamax.gif similarity index 100% rename from src/canonical/models/back/Eternatus--Eternamax.gif rename to src/canonical/models/back/890--420--Eternatus--Eternamax.gif diff --git a/src/canonical/models/back/Blastoise.gif b/src/canonical/models/back/9--0--Blastoise.gif similarity index 100% rename from src/canonical/models/back/Blastoise.gif rename to src/canonical/models/back/9--0--Blastoise.gif diff --git a/src/canonical/models/back/Blastoise--Mega.gif b/src/canonical/models/back/9--420--Blastoise--Mega.gif similarity index 100% rename from src/canonical/models/back/Blastoise--Mega.gif rename to src/canonical/models/back/9--420--Blastoise--Mega.gif diff --git a/src/canonical/models/back/Shellder.gif b/src/canonical/models/back/90--0--Shellder.gif similarity index 100% rename from src/canonical/models/back/Shellder.gif rename to src/canonical/models/back/90--0--Shellder.gif diff --git a/src/canonical/models/back/Cloyster.gif b/src/canonical/models/back/91--0--Cloyster.gif similarity index 100% rename from src/canonical/models/back/Cloyster.gif rename to src/canonical/models/back/91--0--Cloyster.gif diff --git a/src/canonical/models/back/Gastly.gif b/src/canonical/models/back/92--0--Gastly.gif similarity index 100% rename from src/canonical/models/back/Gastly.gif rename to src/canonical/models/back/92--0--Gastly.gif diff --git a/src/canonical/models/back/Haunter.gif b/src/canonical/models/back/93--0--Haunter.gif similarity index 100% rename from src/canonical/models/back/Haunter.gif rename to src/canonical/models/back/93--0--Haunter.gif diff --git a/src/canonical/models/back/Gengar.gif b/src/canonical/models/back/94--0--Gengar.gif similarity index 100% rename from src/canonical/models/back/Gengar.gif rename to src/canonical/models/back/94--0--Gengar.gif diff --git a/src/canonical/models/back/Gengar--Gmax.gif b/src/canonical/models/back/94--420--Gengar--Gmax.gif similarity index 100% rename from src/canonical/models/back/Gengar--Gmax.gif rename to src/canonical/models/back/94--420--Gengar--Gmax.gif diff --git a/src/canonical/models/back/Gengar--Mega.gif b/src/canonical/models/back/94--420--Gengar--Mega.gif similarity index 100% rename from src/canonical/models/back/Gengar--Mega.gif rename to src/canonical/models/back/94--420--Gengar--Mega.gif diff --git a/src/canonical/models/back/Onix.gif b/src/canonical/models/back/95--0--Onix.gif similarity index 100% rename from src/canonical/models/back/Onix.gif rename to src/canonical/models/back/95--0--Onix.gif diff --git a/src/canonical/models/back/Drowzee.gif b/src/canonical/models/back/96--0--Drowzee.gif similarity index 100% rename from src/canonical/models/back/Drowzee.gif rename to src/canonical/models/back/96--0--Drowzee.gif diff --git a/src/canonical/models/back/Hypno.gif b/src/canonical/models/back/97--0--Hypno.gif similarity index 100% rename from src/canonical/models/back/Hypno.gif rename to src/canonical/models/back/97--0--Hypno.gif diff --git a/src/canonical/models/back/Krabby.gif b/src/canonical/models/back/98--0--Krabby.gif similarity index 100% rename from src/canonical/models/back/Krabby.gif rename to src/canonical/models/back/98--0--Krabby.gif diff --git a/src/canonical/models/back/Kingler.gif b/src/canonical/models/back/99--0--Kingler.gif similarity index 100% rename from src/canonical/models/back/Kingler.gif rename to src/canonical/models/back/99--0--Kingler.gif diff --git a/src/canonical/models/back/Kingler--Gmax.gif b/src/canonical/models/back/99--420--Kingler--Gmax.gif similarity index 100% rename from src/canonical/models/back/Kingler--Gmax.gif rename to src/canonical/models/back/99--420--Kingler--Gmax.gif diff --git a/src/canonical/models/back/Unown.gif b/src/canonical/models/back/Unown.gif deleted file mode 120000 index 784d9191..00000000 --- a/src/canonical/models/back/Unown.gif +++ /dev/null @@ -1 +0,0 @@ -../back-cosmetic/Unown--A.gif \ No newline at end of file diff --git a/src/canonical/models/front-cosmetic/Rhydon--Female.gif b/src/canonical/models/front-cosmetic/112--0--Rhydon--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Rhydon--Female.gif rename to src/canonical/models/front-cosmetic/112--0--Rhydon--Female.gif diff --git a/src/canonical/models/front-cosmetic/Scyther--Female.gif b/src/canonical/models/front-cosmetic/123--0--Scyther--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Scyther--Female.gif rename to src/canonical/models/front-cosmetic/123--0--Scyther--Female.gif diff --git a/src/canonical/models/front-cosmetic/Magikarp--Female.gif b/src/canonical/models/front-cosmetic/129--0--Magikarp--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Magikarp--Female.gif rename to src/canonical/models/front-cosmetic/129--0--Magikarp--Female.gif diff --git a/src/canonical/models/front-cosmetic/Meganium--Female.gif b/src/canonical/models/front-cosmetic/154--0--Meganium--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Meganium--Female.gif rename to src/canonical/models/front-cosmetic/154--0--Meganium--Female.gif diff --git a/src/canonical/models/front-cosmetic/Ledyba--Female.gif b/src/canonical/models/front-cosmetic/165--0--Ledyba--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Ledyba--Female.gif rename to src/canonical/models/front-cosmetic/165--0--Ledyba--Female.gif diff --git a/src/canonical/models/front-cosmetic/Ledian--Female.gif b/src/canonical/models/front-cosmetic/166--0--Ledian--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Ledian--Female.gif rename to src/canonical/models/front-cosmetic/166--0--Ledian--Female.gif diff --git a/src/canonical/models/front-cosmetic/Xatu--Female.gif b/src/canonical/models/front-cosmetic/178--0--Xatu--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Xatu--Female.gif rename to src/canonical/models/front-cosmetic/178--0--Xatu--Female.gif diff --git a/src/canonical/models/front-cosmetic/Sudowoodo--Female.gif b/src/canonical/models/front-cosmetic/185--0--Sudowoodo--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Sudowoodo--Female.gif rename to src/canonical/models/front-cosmetic/185--0--Sudowoodo--Female.gif diff --git a/src/canonical/models/front-cosmetic/Politoed--Female.gif b/src/canonical/models/front-cosmetic/186--0--Politoed--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Politoed--Female.gif rename to src/canonical/models/front-cosmetic/186--0--Politoed--Female.gif diff --git a/src/canonical/models/front-cosmetic/Rattata--Female.gif b/src/canonical/models/front-cosmetic/19--0--Rattata--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Rattata--Female.gif rename to src/canonical/models/front-cosmetic/19--0--Rattata--Female.gif diff --git a/src/canonical/models/front-cosmetic/Aipom--Female.gif b/src/canonical/models/front-cosmetic/190--0--Aipom--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Aipom--Female.gif rename to src/canonical/models/front-cosmetic/190--0--Aipom--Female.gif diff --git a/src/canonical/models/front-cosmetic/Wooper--Female.gif b/src/canonical/models/front-cosmetic/194--0--Wooper--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Wooper--Female.gif rename to src/canonical/models/front-cosmetic/194--0--Wooper--Female.gif diff --git a/src/canonical/models/front-cosmetic/Quagsire--Female.gif b/src/canonical/models/front-cosmetic/195--0--Quagsire--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Quagsire--Female.gif rename to src/canonical/models/front-cosmetic/195--0--Quagsire--Female.gif diff --git a/src/canonical/models/front-cosmetic/Murkrow--Female.gif b/src/canonical/models/front-cosmetic/198--0--Murkrow--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Murkrow--Female.gif rename to src/canonical/models/front-cosmetic/198--0--Murkrow--Female.gif diff --git a/src/canonical/models/front-cosmetic/Raticate--Female.gif b/src/canonical/models/front-cosmetic/20--0--Raticate--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Raticate--Female.gif rename to src/canonical/models/front-cosmetic/20--0--Raticate--Female.gif diff --git a/src/canonical/models/front-cosmetic/Unown--A.gif b/src/canonical/models/front-cosmetic/201--420--Unown--A.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--A.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--A.gif diff --git a/src/canonical/models/front-cosmetic/Unown--B.gif b/src/canonical/models/front-cosmetic/201--420--Unown--B.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--B.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--B.gif diff --git a/src/canonical/models/front-cosmetic/Unown--C.gif b/src/canonical/models/front-cosmetic/201--420--Unown--C.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--C.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--C.gif diff --git a/src/canonical/models/front-cosmetic/Unown--D.gif b/src/canonical/models/front-cosmetic/201--420--Unown--D.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--D.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--D.gif diff --git a/src/canonical/models/front-cosmetic/Unown--E.gif b/src/canonical/models/front-cosmetic/201--420--Unown--E.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--E.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--E.gif diff --git a/src/canonical/models/front-cosmetic/Unown--Exclamation.gif b/src/canonical/models/front-cosmetic/201--420--Unown--Exclamation.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--Exclamation.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--Exclamation.gif diff --git a/src/canonical/models/front-cosmetic/Unown--F.gif b/src/canonical/models/front-cosmetic/201--420--Unown--F.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--F.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--F.gif diff --git a/src/canonical/models/front-cosmetic/Unown--G.gif b/src/canonical/models/front-cosmetic/201--420--Unown--G.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--G.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--G.gif diff --git a/src/canonical/models/front-cosmetic/Unown--H.gif b/src/canonical/models/front-cosmetic/201--420--Unown--H.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--H.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--H.gif diff --git a/src/canonical/models/front-cosmetic/Unown--I.gif b/src/canonical/models/front-cosmetic/201--420--Unown--I.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--I.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--I.gif diff --git a/src/canonical/models/front-cosmetic/Unown--J.gif b/src/canonical/models/front-cosmetic/201--420--Unown--J.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--J.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--J.gif diff --git a/src/canonical/models/front-cosmetic/Unown--K.gif b/src/canonical/models/front-cosmetic/201--420--Unown--K.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--K.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--K.gif diff --git a/src/canonical/models/front-cosmetic/Unown--L.gif b/src/canonical/models/front-cosmetic/201--420--Unown--L.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--L.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--L.gif diff --git a/src/canonical/models/front-cosmetic/Unown--M.gif b/src/canonical/models/front-cosmetic/201--420--Unown--M.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--M.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--M.gif diff --git a/src/canonical/models/front-cosmetic/Unown--N.gif b/src/canonical/models/front-cosmetic/201--420--Unown--N.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--N.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--N.gif diff --git a/src/canonical/models/front-cosmetic/Unown--O.gif b/src/canonical/models/front-cosmetic/201--420--Unown--O.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--O.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--O.gif diff --git a/src/canonical/models/front-cosmetic/Unown--P.gif b/src/canonical/models/front-cosmetic/201--420--Unown--P.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--P.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--P.gif diff --git a/src/canonical/models/front-cosmetic/Unown--Q.gif b/src/canonical/models/front-cosmetic/201--420--Unown--Q.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--Q.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--Q.gif diff --git a/src/canonical/models/front-cosmetic/Unown--Question.gif b/src/canonical/models/front-cosmetic/201--420--Unown--Question.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--Question.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--Question.gif diff --git a/src/canonical/models/front-cosmetic/Unown--R.gif b/src/canonical/models/front-cosmetic/201--420--Unown--R.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--R.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--R.gif diff --git a/src/canonical/models/front-cosmetic/Unown--S.gif b/src/canonical/models/front-cosmetic/201--420--Unown--S.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--S.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--S.gif diff --git a/src/canonical/models/front-cosmetic/Unown--T.gif b/src/canonical/models/front-cosmetic/201--420--Unown--T.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--T.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--T.gif diff --git a/src/canonical/models/front-cosmetic/Unown--U.gif b/src/canonical/models/front-cosmetic/201--420--Unown--U.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--U.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--U.gif diff --git a/src/canonical/models/front-cosmetic/Unown--V.gif b/src/canonical/models/front-cosmetic/201--420--Unown--V.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--V.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--V.gif diff --git a/src/canonical/models/front-cosmetic/Unown--W.gif b/src/canonical/models/front-cosmetic/201--420--Unown--W.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--W.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--W.gif diff --git a/src/canonical/models/front-cosmetic/Unown--X.gif b/src/canonical/models/front-cosmetic/201--420--Unown--X.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--X.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--X.gif diff --git a/src/canonical/models/front-cosmetic/Unown--Y.gif b/src/canonical/models/front-cosmetic/201--420--Unown--Y.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--Y.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--Y.gif diff --git a/src/canonical/models/front-cosmetic/Unown--Z.gif b/src/canonical/models/front-cosmetic/201--420--Unown--Z.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unown--Z.gif rename to src/canonical/models/front-cosmetic/201--420--Unown--Z.gif diff --git a/src/canonical/models/front-cosmetic/Wobbuffet--Female.gif b/src/canonical/models/front-cosmetic/202--0--Wobbuffet--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Wobbuffet--Female.gif rename to src/canonical/models/front-cosmetic/202--0--Wobbuffet--Female.gif diff --git a/src/canonical/models/front-cosmetic/Girafarig--Female.gif b/src/canonical/models/front-cosmetic/203--0--Girafarig--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Girafarig--Female.gif rename to src/canonical/models/front-cosmetic/203--0--Girafarig--Female.gif diff --git a/src/canonical/models/front-cosmetic/Gligar--Female.gif b/src/canonical/models/front-cosmetic/207--0--Gligar--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Gligar--Female.gif rename to src/canonical/models/front-cosmetic/207--0--Gligar--Female.gif diff --git a/src/canonical/models/front-cosmetic/Steelix--Female.gif b/src/canonical/models/front-cosmetic/208--0--Steelix--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Steelix--Female.gif rename to src/canonical/models/front-cosmetic/208--0--Steelix--Female.gif diff --git a/src/canonical/models/front-cosmetic/Scizor--Female.gif b/src/canonical/models/front-cosmetic/212--0--Scizor--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Scizor--Female.gif rename to src/canonical/models/front-cosmetic/212--0--Scizor--Female.gif diff --git a/src/canonical/models/front-cosmetic/Heracross--Female.gif b/src/canonical/models/front-cosmetic/214--0--Heracross--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Heracross--Female.gif rename to src/canonical/models/front-cosmetic/214--0--Heracross--Female.gif diff --git a/src/canonical/models/front-cosmetic/Sneasel--Female.gif b/src/canonical/models/front-cosmetic/215--0--Sneasel--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Sneasel--Female.gif rename to src/canonical/models/front-cosmetic/215--0--Sneasel--Female.gif diff --git a/src/canonical/models/front-cosmetic/Ursaring--Female.gif b/src/canonical/models/front-cosmetic/217--0--Ursaring--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Ursaring--Female.gif rename to src/canonical/models/front-cosmetic/217--0--Ursaring--Female.gif diff --git a/src/canonical/models/front-cosmetic/Piloswine--Female.gif b/src/canonical/models/front-cosmetic/221--0--Piloswine--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Piloswine--Female.gif rename to src/canonical/models/front-cosmetic/221--0--Piloswine--Female.gif diff --git a/src/canonical/models/front-cosmetic/Octillery--Female.gif b/src/canonical/models/front-cosmetic/224--0--Octillery--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Octillery--Female.gif rename to src/canonical/models/front-cosmetic/224--0--Octillery--Female.gif diff --git a/src/canonical/models/front-cosmetic/Houndoom--Female.gif b/src/canonical/models/front-cosmetic/229--0--Houndoom--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Houndoom--Female.gif rename to src/canonical/models/front-cosmetic/229--0--Houndoom--Female.gif diff --git a/src/canonical/models/front-cosmetic/Donphan--Female.gif b/src/canonical/models/front-cosmetic/232--0--Donphan--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Donphan--Female.gif rename to src/canonical/models/front-cosmetic/232--0--Donphan--Female.gif diff --git a/src/canonical/models/front-cosmetic/Pikachu--Female.gif b/src/canonical/models/front-cosmetic/25--0--Pikachu--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Pikachu--Female.gif rename to src/canonical/models/front-cosmetic/25--0--Pikachu--Female.gif diff --git a/src/canonical/models/front-cosmetic/Torchic--Female.gif b/src/canonical/models/front-cosmetic/255--0--Torchic--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Torchic--Female.gif rename to src/canonical/models/front-cosmetic/255--0--Torchic--Female.gif diff --git a/src/canonical/models/front-cosmetic/Combusken--Female.gif b/src/canonical/models/front-cosmetic/256--0--Combusken--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Combusken--Female.gif rename to src/canonical/models/front-cosmetic/256--0--Combusken--Female.gif diff --git a/src/canonical/models/front-cosmetic/Blaziken--Female.gif b/src/canonical/models/front-cosmetic/257--0--Blaziken--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Blaziken--Female.gif rename to src/canonical/models/front-cosmetic/257--0--Blaziken--Female.gif diff --git a/src/canonical/models/front-cosmetic/Beautifly--Female.gif b/src/canonical/models/front-cosmetic/267--0--Beautifly--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Beautifly--Female.gif rename to src/canonical/models/front-cosmetic/267--0--Beautifly--Female.gif diff --git a/src/canonical/models/front-cosmetic/Dustox--Female.gif b/src/canonical/models/front-cosmetic/269--0--Dustox--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Dustox--Female.gif rename to src/canonical/models/front-cosmetic/269--0--Dustox--Female.gif diff --git a/src/canonical/models/front-cosmetic/Ludicolo--Female.gif b/src/canonical/models/front-cosmetic/272--0--Ludicolo--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Ludicolo--Female.gif rename to src/canonical/models/front-cosmetic/272--0--Ludicolo--Female.gif diff --git a/src/canonical/models/front-cosmetic/Nuzleaf--Female.gif b/src/canonical/models/front-cosmetic/274--0--Nuzleaf--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Nuzleaf--Female.gif rename to src/canonical/models/front-cosmetic/274--0--Nuzleaf--Female.gif diff --git a/src/canonical/models/front-cosmetic/Shiftry--Female.gif b/src/canonical/models/front-cosmetic/275--0--Shiftry--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Shiftry--Female.gif rename to src/canonical/models/front-cosmetic/275--0--Shiftry--Female.gif diff --git a/src/canonical/models/front-cosmetic/Meditite--Female.gif b/src/canonical/models/front-cosmetic/307--0--Meditite--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Meditite--Female.gif rename to src/canonical/models/front-cosmetic/307--0--Meditite--Female.gif diff --git a/src/canonical/models/front-cosmetic/Medicham--Female.gif b/src/canonical/models/front-cosmetic/308--0--Medicham--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Medicham--Female.gif rename to src/canonical/models/front-cosmetic/308--0--Medicham--Female.gif diff --git a/src/canonical/models/front-cosmetic/Roselia--Female.gif b/src/canonical/models/front-cosmetic/315--0--Roselia--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Roselia--Female.gif rename to src/canonical/models/front-cosmetic/315--0--Roselia--Female.gif diff --git a/src/canonical/models/front-cosmetic/Gulpin--Female.gif b/src/canonical/models/front-cosmetic/316--0--Gulpin--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Gulpin--Female.gif rename to src/canonical/models/front-cosmetic/316--0--Gulpin--Female.gif diff --git a/src/canonical/models/front-cosmetic/Swalot--Female.gif b/src/canonical/models/front-cosmetic/317--0--Swalot--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Swalot--Female.gif rename to src/canonical/models/front-cosmetic/317--0--Swalot--Female.gif diff --git a/src/canonical/models/front-cosmetic/Numel--Female.gif b/src/canonical/models/front-cosmetic/322--0--Numel--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Numel--Female.gif rename to src/canonical/models/front-cosmetic/322--0--Numel--Female.gif diff --git a/src/canonical/models/front-cosmetic/Camerupt--Female.gif b/src/canonical/models/front-cosmetic/323--0--Camerupt--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Camerupt--Female.gif rename to src/canonical/models/front-cosmetic/323--0--Camerupt--Female.gif diff --git a/src/canonical/models/front-cosmetic/Cacturne--Female.gif b/src/canonical/models/front-cosmetic/332--0--Cacturne--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Cacturne--Female.gif rename to src/canonical/models/front-cosmetic/332--0--Cacturne--Female.gif diff --git a/src/canonical/models/front-cosmetic/Milotic--Female.gif b/src/canonical/models/front-cosmetic/350--0--Milotic--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Milotic--Female.gif rename to src/canonical/models/front-cosmetic/350--0--Milotic--Female.gif diff --git a/src/canonical/models/front-cosmetic/Relicanth--Female.gif b/src/canonical/models/front-cosmetic/369--0--Relicanth--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Relicanth--Female.gif rename to src/canonical/models/front-cosmetic/369--0--Relicanth--Female.gif diff --git a/src/canonical/models/front-cosmetic/Starly--Female.gif b/src/canonical/models/front-cosmetic/396--0--Starly--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Starly--Female.gif rename to src/canonical/models/front-cosmetic/396--0--Starly--Female.gif diff --git a/src/canonical/models/front-cosmetic/Staravia--Female.gif b/src/canonical/models/front-cosmetic/397--0--Staravia--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Staravia--Female.gif rename to src/canonical/models/front-cosmetic/397--0--Staravia--Female.gif diff --git a/src/canonical/models/front-cosmetic/Staraptor--Female.gif b/src/canonical/models/front-cosmetic/398--0--Staraptor--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Staraptor--Female.gif rename to src/canonical/models/front-cosmetic/398--0--Staraptor--Female.gif diff --git a/src/canonical/models/front-cosmetic/Bidoof--Female.gif b/src/canonical/models/front-cosmetic/399--0--Bidoof--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Bidoof--Female.gif rename to src/canonical/models/front-cosmetic/399--0--Bidoof--Female.gif diff --git a/src/canonical/models/front-cosmetic/Bibarel--Female.gif b/src/canonical/models/front-cosmetic/400--0--Bibarel--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Bibarel--Female.gif rename to src/canonical/models/front-cosmetic/400--0--Bibarel--Female.gif diff --git a/src/canonical/models/front-cosmetic/Kricketot--Female.gif b/src/canonical/models/front-cosmetic/401--0--Kricketot--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Kricketot--Female.gif rename to src/canonical/models/front-cosmetic/401--0--Kricketot--Female.gif diff --git a/src/canonical/models/front-cosmetic/Kricketune--Female.gif b/src/canonical/models/front-cosmetic/402--0--Kricketune--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Kricketune--Female.gif rename to src/canonical/models/front-cosmetic/402--0--Kricketune--Female.gif diff --git a/src/canonical/models/front-cosmetic/Shinx--Female.gif b/src/canonical/models/front-cosmetic/403--0--Shinx--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Shinx--Female.gif rename to src/canonical/models/front-cosmetic/403--0--Shinx--Female.gif diff --git a/src/canonical/models/front-cosmetic/Luxio--Female.gif b/src/canonical/models/front-cosmetic/404--0--Luxio--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Luxio--Female.gif rename to src/canonical/models/front-cosmetic/404--0--Luxio--Female.gif diff --git a/src/canonical/models/front-cosmetic/Luxray--Female.gif b/src/canonical/models/front-cosmetic/405--0--Luxray--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Luxray--Female.gif rename to src/canonical/models/front-cosmetic/405--0--Luxray--Female.gif diff --git a/src/canonical/models/front-cosmetic/Roserade--Female.gif b/src/canonical/models/front-cosmetic/407--0--Roserade--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Roserade--Female.gif rename to src/canonical/models/front-cosmetic/407--0--Roserade--Female.gif diff --git a/src/canonical/models/front-cosmetic/Kerfluffle--Female.gif b/src/canonical/models/front-cosmetic/41--0--Kerfluffle--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Kerfluffle--Female.gif rename to src/canonical/models/front-cosmetic/41--0--Kerfluffle--Female.gif diff --git a/src/canonical/models/front-cosmetic/Zubat--Female.gif b/src/canonical/models/front-cosmetic/41--0--Zubat--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Zubat--Female.gif rename to src/canonical/models/front-cosmetic/41--0--Zubat--Female.gif diff --git a/src/canonical/models/front-cosmetic/Burmy--Sandy.gif b/src/canonical/models/front-cosmetic/412--420--Burmy--Sandy.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Burmy--Sandy.gif rename to src/canonical/models/front-cosmetic/412--420--Burmy--Sandy.gif diff --git a/src/canonical/models/front-cosmetic/Burmy--Trash.gif b/src/canonical/models/front-cosmetic/412--420--Burmy--Trash.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Burmy--Trash.gif rename to src/canonical/models/front-cosmetic/412--420--Burmy--Trash.gif diff --git a/src/canonical/models/front-cosmetic/Combee--Female.gif b/src/canonical/models/front-cosmetic/415--0--Combee--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Combee--Female.gif rename to src/canonical/models/front-cosmetic/415--0--Combee--Female.gif diff --git a/src/canonical/models/front-cosmetic/Pachirisu--Female.gif b/src/canonical/models/front-cosmetic/417--0--Pachirisu--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Pachirisu--Female.gif rename to src/canonical/models/front-cosmetic/417--0--Pachirisu--Female.gif diff --git a/src/canonical/models/front-cosmetic/Buizel--Female.gif b/src/canonical/models/front-cosmetic/418--0--Buizel--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Buizel--Female.gif rename to src/canonical/models/front-cosmetic/418--0--Buizel--Female.gif diff --git a/src/canonical/models/front-cosmetic/Floatzel--Female.gif b/src/canonical/models/front-cosmetic/419--0--Floatzel--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Floatzel--Female.gif rename to src/canonical/models/front-cosmetic/419--0--Floatzel--Female.gif diff --git a/src/canonical/models/front-cosmetic/Golbat--Female.gif b/src/canonical/models/front-cosmetic/42--0--Golbat--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Golbat--Female.gif rename to src/canonical/models/front-cosmetic/42--0--Golbat--Female.gif diff --git a/src/canonical/models/front-cosmetic/Shellos--East.gif b/src/canonical/models/front-cosmetic/422--420--Shellos--East.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Shellos--East.gif rename to src/canonical/models/front-cosmetic/422--420--Shellos--East.gif diff --git a/src/canonical/models/front-cosmetic/Gastrodon--East.gif b/src/canonical/models/front-cosmetic/423--420--Gastrodon--East.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Gastrodon--East.gif rename to src/canonical/models/front-cosmetic/423--420--Gastrodon--East.gif diff --git a/src/canonical/models/front-cosmetic/Ambipom--Female.gif b/src/canonical/models/front-cosmetic/424--0--Ambipom--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Ambipom--Female.gif rename to src/canonical/models/front-cosmetic/424--0--Ambipom--Female.gif diff --git a/src/canonical/models/front-cosmetic/Gible--Female.gif b/src/canonical/models/front-cosmetic/443--0--Gible--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Gible--Female.gif rename to src/canonical/models/front-cosmetic/443--0--Gible--Female.gif diff --git a/src/canonical/models/front-cosmetic/Gabite--Female.gif b/src/canonical/models/front-cosmetic/444--0--Gabite--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Gabite--Female.gif rename to src/canonical/models/front-cosmetic/444--0--Gabite--Female.gif diff --git a/src/canonical/models/front-cosmetic/Garchomp--Female.gif b/src/canonical/models/front-cosmetic/445--0--Garchomp--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Garchomp--Female.gif rename to src/canonical/models/front-cosmetic/445--0--Garchomp--Female.gif diff --git a/src/canonical/models/front-cosmetic/Hippopotas--Female.gif b/src/canonical/models/front-cosmetic/449--0--Hippopotas--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Hippopotas--Female.gif rename to src/canonical/models/front-cosmetic/449--0--Hippopotas--Female.gif diff --git a/src/canonical/models/front-cosmetic/Hippowdon--Female.gif b/src/canonical/models/front-cosmetic/450--0--Hippowdon--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Hippowdon--Female.gif rename to src/canonical/models/front-cosmetic/450--0--Hippowdon--Female.gif diff --git a/src/canonical/models/front-cosmetic/Croagunk--Female.gif b/src/canonical/models/front-cosmetic/453--0--Croagunk--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Croagunk--Female.gif rename to src/canonical/models/front-cosmetic/453--0--Croagunk--Female.gif diff --git a/src/canonical/models/front-cosmetic/Toxicroak--Female.gif b/src/canonical/models/front-cosmetic/454--0--Toxicroak--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Toxicroak--Female.gif rename to src/canonical/models/front-cosmetic/454--0--Toxicroak--Female.gif diff --git a/src/canonical/models/front-cosmetic/Finneon--Female.gif b/src/canonical/models/front-cosmetic/456--0--Finneon--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Finneon--Female.gif rename to src/canonical/models/front-cosmetic/456--0--Finneon--Female.gif diff --git a/src/canonical/models/front-cosmetic/Lumineon--Female.gif b/src/canonical/models/front-cosmetic/457--0--Lumineon--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Lumineon--Female.gif rename to src/canonical/models/front-cosmetic/457--0--Lumineon--Female.gif diff --git a/src/canonical/models/front-cosmetic/Snover--Female.gif b/src/canonical/models/front-cosmetic/459--0--Snover--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Snover--Female.gif rename to src/canonical/models/front-cosmetic/459--0--Snover--Female.gif diff --git a/src/canonical/models/front-cosmetic/Abomasnow--Female.gif b/src/canonical/models/front-cosmetic/460--0--Abomasnow--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Abomasnow--Female.gif rename to src/canonical/models/front-cosmetic/460--0--Abomasnow--Female.gif diff --git a/src/canonical/models/front-cosmetic/Weavile--Female.gif b/src/canonical/models/front-cosmetic/461--0--Weavile--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Weavile--Female.gif rename to src/canonical/models/front-cosmetic/461--0--Weavile--Female.gif diff --git a/src/canonical/models/front-cosmetic/Rhyperior--Female.gif b/src/canonical/models/front-cosmetic/464--0--Rhyperior--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Rhyperior--Female.gif rename to src/canonical/models/front-cosmetic/464--0--Rhyperior--Female.gif diff --git a/src/canonical/models/front-cosmetic/Tangrowth--Female.gif b/src/canonical/models/front-cosmetic/465--0--Tangrowth--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Tangrowth--Female.gif rename to src/canonical/models/front-cosmetic/465--0--Tangrowth--Female.gif diff --git a/src/canonical/models/front-cosmetic/Mamoswine--Female.gif b/src/canonical/models/front-cosmetic/473--0--Mamoswine--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Mamoswine--Female.gif rename to src/canonical/models/front-cosmetic/473--0--Mamoswine--Female.gif diff --git a/src/canonical/models/front-cosmetic/Rotom--Female.gif b/src/canonical/models/front-cosmetic/479--0--Rotom--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Rotom--Female.gif rename to src/canonical/models/front-cosmetic/479--0--Rotom--Female.gif diff --git a/src/canonical/models/front-cosmetic/Unfezant--Female.gif b/src/canonical/models/front-cosmetic/521--0--Unfezant--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Unfezant--Female.gif rename to src/canonical/models/front-cosmetic/521--0--Unfezant--Female.gif diff --git a/src/canonical/models/front-cosmetic/Deerling--Autumn.gif b/src/canonical/models/front-cosmetic/585--420--Deerling--Autumn.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Deerling--Autumn.gif rename to src/canonical/models/front-cosmetic/585--420--Deerling--Autumn.gif diff --git a/src/canonical/models/front-cosmetic/Deerling--Summer.gif b/src/canonical/models/front-cosmetic/585--420--Deerling--Summer.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Deerling--Summer.gif rename to src/canonical/models/front-cosmetic/585--420--Deerling--Summer.gif diff --git a/src/canonical/models/front-cosmetic/Deerling--Winter.gif b/src/canonical/models/front-cosmetic/585--420--Deerling--Winter.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Deerling--Winter.gif rename to src/canonical/models/front-cosmetic/585--420--Deerling--Winter.gif diff --git a/src/canonical/models/front-cosmetic/Sawsbuck--Autumn.gif b/src/canonical/models/front-cosmetic/586--420--Sawsbuck--Autumn.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Sawsbuck--Autumn.gif rename to src/canonical/models/front-cosmetic/586--420--Sawsbuck--Autumn.gif diff --git a/src/canonical/models/front-cosmetic/Sawsbuck--Summer.gif b/src/canonical/models/front-cosmetic/586--420--Sawsbuck--Summer.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Sawsbuck--Summer.gif rename to src/canonical/models/front-cosmetic/586--420--Sawsbuck--Summer.gif diff --git a/src/canonical/models/front-cosmetic/Sawsbuck--Winter.gif b/src/canonical/models/front-cosmetic/586--420--Sawsbuck--Winter.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Sawsbuck--Winter.gif rename to src/canonical/models/front-cosmetic/586--420--Sawsbuck--Winter.gif diff --git a/src/canonical/models/front-cosmetic/Frillish--Female.gif b/src/canonical/models/front-cosmetic/592--0--Frillish--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Frillish--Female.gif rename to src/canonical/models/front-cosmetic/592--0--Frillish--Female.gif diff --git a/src/canonical/models/front-cosmetic/Jellicent--Female.gif b/src/canonical/models/front-cosmetic/593--0--Jellicent--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Jellicent--Female.gif rename to src/canonical/models/front-cosmetic/593--0--Jellicent--Female.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Archipelago.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Archipelago.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Archipelago.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Archipelago.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Continental.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Continental.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Continental.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Continental.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Elegant.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Elegant.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Elegant.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Elegant.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Garden.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Garden.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Garden.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Garden.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--High_Plains.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--High_Plains.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--High_Plains.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--High_Plains.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Icy_Snow.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Icy_Snow.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Icy_Snow.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Icy_Snow.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Jungle.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Jungle.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Jungle.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Jungle.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Marine.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Marine.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Marine.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Marine.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Modern.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Modern.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Modern.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Modern.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Monsoon.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Monsoon.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Monsoon.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Monsoon.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Ocean.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Ocean.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Ocean.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Ocean.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Polar.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Polar.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Polar.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Polar.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--River.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--River.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--River.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--River.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Sandstorm.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Sandstorm.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Sandstorm.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Sandstorm.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Savanna.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Savanna.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Savanna.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Savanna.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Sun.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Sun.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Sun.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Sun.gif diff --git a/src/canonical/models/front-cosmetic/Vivillon--Tundra.gif b/src/canonical/models/front-cosmetic/666--420--Vivillon--Tundra.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Vivillon--Tundra.gif rename to src/canonical/models/front-cosmetic/666--420--Vivillon--Tundra.gif diff --git a/src/canonical/models/front-cosmetic/Pyroar--Female.gif b/src/canonical/models/front-cosmetic/668--0--Pyroar--Female.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Pyroar--Female.gif rename to src/canonical/models/front-cosmetic/668--0--Pyroar--Female.gif diff --git a/src/canonical/models/front-cosmetic/Flabe__0301be__0301--Blue.gif b/src/canonical/models/front-cosmetic/669--420--Flabe__0301be__0301--Blue.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Flabe__0301be__0301--Blue.gif rename to src/canonical/models/front-cosmetic/669--420--Flabe__0301be__0301--Blue.gif diff --git a/src/canonical/models/front-cosmetic/Flabe__0301be__0301--Orange.gif b/src/canonical/models/front-cosmetic/669--420--Flabe__0301be__0301--Orange.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Flabe__0301be__0301--Orange.gif rename to src/canonical/models/front-cosmetic/669--420--Flabe__0301be__0301--Orange.gif diff --git a/src/canonical/models/front-cosmetic/Flabe__0301be__0301--White.gif b/src/canonical/models/front-cosmetic/669--420--Flabe__0301be__0301--White.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Flabe__0301be__0301--White.gif rename to src/canonical/models/front-cosmetic/669--420--Flabe__0301be__0301--White.gif diff --git a/src/canonical/models/front-cosmetic/Flabe__0301be__0301--Yellow.gif b/src/canonical/models/front-cosmetic/669--420--Flabe__0301be__0301--Yellow.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Flabe__0301be__0301--Yellow.gif rename to src/canonical/models/front-cosmetic/669--420--Flabe__0301be__0301--Yellow.gif diff --git a/src/canonical/models/front-cosmetic/Floette--Blue.gif b/src/canonical/models/front-cosmetic/670--420--Floette--Blue.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Floette--Blue.gif rename to src/canonical/models/front-cosmetic/670--420--Floette--Blue.gif diff --git a/src/canonical/models/front-cosmetic/Floette--Orange.gif b/src/canonical/models/front-cosmetic/670--420--Floette--Orange.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Floette--Orange.gif rename to src/canonical/models/front-cosmetic/670--420--Floette--Orange.gif diff --git a/src/canonical/models/front-cosmetic/Floette--White.gif b/src/canonical/models/front-cosmetic/670--420--Floette--White.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Floette--White.gif rename to src/canonical/models/front-cosmetic/670--420--Floette--White.gif diff --git a/src/canonical/models/front-cosmetic/Floette--Yellow.gif b/src/canonical/models/front-cosmetic/670--420--Floette--Yellow.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Floette--Yellow.gif rename to src/canonical/models/front-cosmetic/670--420--Floette--Yellow.gif diff --git a/src/canonical/models/front-cosmetic/Florges--Blue.gif b/src/canonical/models/front-cosmetic/671--420--Florges--Blue.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Florges--Blue.gif rename to src/canonical/models/front-cosmetic/671--420--Florges--Blue.gif diff --git a/src/canonical/models/front-cosmetic/Florges--Orange.gif b/src/canonical/models/front-cosmetic/671--420--Florges--Orange.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Florges--Orange.gif rename to src/canonical/models/front-cosmetic/671--420--Florges--Orange.gif diff --git a/src/canonical/models/front-cosmetic/Florges--White.gif b/src/canonical/models/front-cosmetic/671--420--Florges--White.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Florges--White.gif rename to src/canonical/models/front-cosmetic/671--420--Florges--White.gif diff --git a/src/canonical/models/front-cosmetic/Florges--Yellow.gif b/src/canonical/models/front-cosmetic/671--420--Florges--Yellow.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Florges--Yellow.gif rename to src/canonical/models/front-cosmetic/671--420--Florges--Yellow.gif diff --git a/src/canonical/models/front-cosmetic/Furfrou--Dandy.gif b/src/canonical/models/front-cosmetic/676--420--Furfrou--Dandy.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Furfrou--Dandy.gif rename to src/canonical/models/front-cosmetic/676--420--Furfrou--Dandy.gif diff --git a/src/canonical/models/front-cosmetic/Furfrou--Debutante.gif b/src/canonical/models/front-cosmetic/676--420--Furfrou--Debutante.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Furfrou--Debutante.gif rename to src/canonical/models/front-cosmetic/676--420--Furfrou--Debutante.gif diff --git a/src/canonical/models/front-cosmetic/Furfrou--Diamond.gif b/src/canonical/models/front-cosmetic/676--420--Furfrou--Diamond.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Furfrou--Diamond.gif rename to src/canonical/models/front-cosmetic/676--420--Furfrou--Diamond.gif diff --git a/src/canonical/models/front-cosmetic/Furfrou--Heart.gif b/src/canonical/models/front-cosmetic/676--420--Furfrou--Heart.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Furfrou--Heart.gif rename to src/canonical/models/front-cosmetic/676--420--Furfrou--Heart.gif diff --git a/src/canonical/models/front-cosmetic/Furfrou--Kabuki.gif b/src/canonical/models/front-cosmetic/676--420--Furfrou--Kabuki.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Furfrou--Kabuki.gif rename to src/canonical/models/front-cosmetic/676--420--Furfrou--Kabuki.gif diff --git a/src/canonical/models/front-cosmetic/Furfrou--La_Reine.gif b/src/canonical/models/front-cosmetic/676--420--Furfrou--La_Reine.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Furfrou--La_Reine.gif rename to src/canonical/models/front-cosmetic/676--420--Furfrou--La_Reine.gif diff --git a/src/canonical/models/front-cosmetic/Furfrou--Matron.gif b/src/canonical/models/front-cosmetic/676--420--Furfrou--Matron.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Furfrou--Matron.gif rename to src/canonical/models/front-cosmetic/676--420--Furfrou--Matron.gif diff --git a/src/canonical/models/front-cosmetic/Furfrou--Pharaoh.gif b/src/canonical/models/front-cosmetic/676--420--Furfrou--Pharaoh.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Furfrou--Pharaoh.gif rename to src/canonical/models/front-cosmetic/676--420--Furfrou--Pharaoh.gif diff --git a/src/canonical/models/front-cosmetic/Furfrou--Star.gif b/src/canonical/models/front-cosmetic/676--420--Furfrou--Star.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Furfrou--Star.gif rename to src/canonical/models/front-cosmetic/676--420--Furfrou--Star.gif diff --git a/src/canonical/models/front-cosmetic/Minior--Blue.gif b/src/canonical/models/front-cosmetic/774--420--Minior--Blue.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Minior--Blue.gif rename to src/canonical/models/front-cosmetic/774--420--Minior--Blue.gif diff --git a/src/canonical/models/front-cosmetic/Minior--Green.gif b/src/canonical/models/front-cosmetic/774--420--Minior--Green.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Minior--Green.gif rename to src/canonical/models/front-cosmetic/774--420--Minior--Green.gif diff --git a/src/canonical/models/front-cosmetic/Minior--Indigo.gif b/src/canonical/models/front-cosmetic/774--420--Minior--Indigo.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Minior--Indigo.gif rename to src/canonical/models/front-cosmetic/774--420--Minior--Indigo.gif diff --git a/src/canonical/models/front-cosmetic/Minior--Meteor.gif b/src/canonical/models/front-cosmetic/774--420--Minior--Meteor.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Minior--Meteor.gif rename to src/canonical/models/front-cosmetic/774--420--Minior--Meteor.gif diff --git a/src/canonical/models/front-cosmetic/Minior--Orange.gif b/src/canonical/models/front-cosmetic/774--420--Minior--Orange.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Minior--Orange.gif rename to src/canonical/models/front-cosmetic/774--420--Minior--Orange.gif diff --git a/src/canonical/models/front-cosmetic/Minior--Violet.gif b/src/canonical/models/front-cosmetic/774--420--Minior--Violet.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Minior--Violet.gif rename to src/canonical/models/front-cosmetic/774--420--Minior--Violet.gif diff --git a/src/canonical/models/front-cosmetic/Minior--Yellow.gif b/src/canonical/models/front-cosmetic/774--420--Minior--Yellow.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Minior--Yellow.gif rename to src/canonical/models/front-cosmetic/774--420--Minior--Yellow.gif diff --git a/src/canonical/models/front-cosmetic/Magearna--Original.gif b/src/canonical/models/front-cosmetic/801--420--Magearna--Original.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Magearna--Original.gif rename to src/canonical/models/front-cosmetic/801--420--Magearna--Original.gif diff --git a/src/canonical/models/front-cosmetic/Alcremie--Caramel_Swirl.gif b/src/canonical/models/front-cosmetic/869--420--Alcremie--Caramel_Swirl.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Alcremie--Caramel_Swirl.gif rename to src/canonical/models/front-cosmetic/869--420--Alcremie--Caramel_Swirl.gif diff --git a/src/canonical/models/front-cosmetic/Alcremie--Lemon_Cream.gif b/src/canonical/models/front-cosmetic/869--420--Alcremie--Lemon_Cream.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Alcremie--Lemon_Cream.gif rename to src/canonical/models/front-cosmetic/869--420--Alcremie--Lemon_Cream.gif diff --git a/src/canonical/models/front-cosmetic/Alcremie--Matcha_Cream.gif b/src/canonical/models/front-cosmetic/869--420--Alcremie--Matcha_Cream.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Alcremie--Matcha_Cream.gif rename to src/canonical/models/front-cosmetic/869--420--Alcremie--Matcha_Cream.gif diff --git a/src/canonical/models/front-cosmetic/Alcremie--Mint_Cream.gif b/src/canonical/models/front-cosmetic/869--420--Alcremie--Mint_Cream.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Alcremie--Mint_Cream.gif rename to src/canonical/models/front-cosmetic/869--420--Alcremie--Mint_Cream.gif diff --git a/src/canonical/models/front-cosmetic/Alcremie--Rainbow_Swirl.gif b/src/canonical/models/front-cosmetic/869--420--Alcremie--Rainbow_Swirl.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Alcremie--Rainbow_Swirl.gif rename to src/canonical/models/front-cosmetic/869--420--Alcremie--Rainbow_Swirl.gif diff --git a/src/canonical/models/front-cosmetic/Alcremie--Ruby_Cream.gif b/src/canonical/models/front-cosmetic/869--420--Alcremie--Ruby_Cream.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Alcremie--Ruby_Cream.gif rename to src/canonical/models/front-cosmetic/869--420--Alcremie--Ruby_Cream.gif diff --git a/src/canonical/models/front-cosmetic/Alcremie--Ruby_Swirl.gif b/src/canonical/models/front-cosmetic/869--420--Alcremie--Ruby_Swirl.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Alcremie--Ruby_Swirl.gif rename to src/canonical/models/front-cosmetic/869--420--Alcremie--Ruby_Swirl.gif diff --git a/src/canonical/models/front-cosmetic/Alcremie--Salted_Cream.gif b/src/canonical/models/front-cosmetic/869--420--Alcremie--Salted_Cream.gif similarity index 100% rename from src/canonical/models/front-cosmetic/Alcremie--Salted_Cream.gif rename to src/canonical/models/front-cosmetic/869--420--Alcremie--Salted_Cream.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Rhydon--Female.gif b/src/canonical/models/front-shiny-cosmetic/112--0--Rhydon--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Rhydon--Female.gif rename to src/canonical/models/front-shiny-cosmetic/112--0--Rhydon--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Scyther--Female.gif b/src/canonical/models/front-shiny-cosmetic/123--0--Scyther--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Scyther--Female.gif rename to src/canonical/models/front-shiny-cosmetic/123--0--Scyther--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Magikarp--Female.gif b/src/canonical/models/front-shiny-cosmetic/129--0--Magikarp--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Magikarp--Female.gif rename to src/canonical/models/front-shiny-cosmetic/129--0--Magikarp--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Meganium--Female.gif b/src/canonical/models/front-shiny-cosmetic/154--0--Meganium--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Meganium--Female.gif rename to src/canonical/models/front-shiny-cosmetic/154--0--Meganium--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Ledyba--Female.gif b/src/canonical/models/front-shiny-cosmetic/165--0--Ledyba--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Ledyba--Female.gif rename to src/canonical/models/front-shiny-cosmetic/165--0--Ledyba--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Ledian--Female.gif b/src/canonical/models/front-shiny-cosmetic/166--0--Ledian--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Ledian--Female.gif rename to src/canonical/models/front-shiny-cosmetic/166--0--Ledian--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Xatu--Female.gif b/src/canonical/models/front-shiny-cosmetic/178--0--Xatu--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Xatu--Female.gif rename to src/canonical/models/front-shiny-cosmetic/178--0--Xatu--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Sudowoodo--Female.gif b/src/canonical/models/front-shiny-cosmetic/185--0--Sudowoodo--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Sudowoodo--Female.gif rename to src/canonical/models/front-shiny-cosmetic/185--0--Sudowoodo--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Politoed--Female.gif b/src/canonical/models/front-shiny-cosmetic/186--0--Politoed--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Politoed--Female.gif rename to src/canonical/models/front-shiny-cosmetic/186--0--Politoed--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Rattata--Female.gif b/src/canonical/models/front-shiny-cosmetic/19--0--Rattata--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Rattata--Female.gif rename to src/canonical/models/front-shiny-cosmetic/19--0--Rattata--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Aipom--Female.gif b/src/canonical/models/front-shiny-cosmetic/190--0--Aipom--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Aipom--Female.gif rename to src/canonical/models/front-shiny-cosmetic/190--0--Aipom--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Wooper--Female.gif b/src/canonical/models/front-shiny-cosmetic/194--0--Wooper--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Wooper--Female.gif rename to src/canonical/models/front-shiny-cosmetic/194--0--Wooper--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Quagsire--Female.gif b/src/canonical/models/front-shiny-cosmetic/195--0--Quagsire--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Quagsire--Female.gif rename to src/canonical/models/front-shiny-cosmetic/195--0--Quagsire--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Murkrow--Female.gif b/src/canonical/models/front-shiny-cosmetic/198--0--Murkrow--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Murkrow--Female.gif rename to src/canonical/models/front-shiny-cosmetic/198--0--Murkrow--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Raticate--Female.gif b/src/canonical/models/front-shiny-cosmetic/20--0--Raticate--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Raticate--Female.gif rename to src/canonical/models/front-shiny-cosmetic/20--0--Raticate--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--A.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--A.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--A.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--A.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--B.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--B.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--B.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--B.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--C.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--C.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--C.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--C.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--D.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--D.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--D.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--D.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--E.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--E.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--E.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--E.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--Exclamation.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--Exclamation.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--Exclamation.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--Exclamation.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--F.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--F.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--F.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--F.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--G.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--G.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--G.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--G.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--H.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--H.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--H.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--H.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--I.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--I.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--I.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--I.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--J.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--J.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--J.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--J.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--K.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--K.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--K.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--K.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--L.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--L.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--L.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--L.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--M.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--M.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--M.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--M.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--N.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--N.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--N.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--N.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--O.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--O.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--O.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--O.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--P.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--P.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--P.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--P.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--Q.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--Q.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--Q.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--Q.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--Question.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--Question.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--Question.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--Question.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--R.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--R.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--R.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--R.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--S.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--S.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--S.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--S.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--T.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--T.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--T.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--T.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--U.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--U.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--U.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--U.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--V.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--V.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--V.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--V.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--W.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--W.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--W.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--W.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--X.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--X.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--X.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--X.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--Y.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--Y.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--Y.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--Y.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unown--Z.gif b/src/canonical/models/front-shiny-cosmetic/201--420--Unown--Z.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unown--Z.gif rename to src/canonical/models/front-shiny-cosmetic/201--420--Unown--Z.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Wobbuffet--Female.gif b/src/canonical/models/front-shiny-cosmetic/202--0--Wobbuffet--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Wobbuffet--Female.gif rename to src/canonical/models/front-shiny-cosmetic/202--0--Wobbuffet--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Girafarig--Female.gif b/src/canonical/models/front-shiny-cosmetic/203--0--Girafarig--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Girafarig--Female.gif rename to src/canonical/models/front-shiny-cosmetic/203--0--Girafarig--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Gligar--Female.gif b/src/canonical/models/front-shiny-cosmetic/207--0--Gligar--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Gligar--Female.gif rename to src/canonical/models/front-shiny-cosmetic/207--0--Gligar--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Steelix--Female.gif b/src/canonical/models/front-shiny-cosmetic/208--0--Steelix--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Steelix--Female.gif rename to src/canonical/models/front-shiny-cosmetic/208--0--Steelix--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Scizor--Female.gif b/src/canonical/models/front-shiny-cosmetic/212--0--Scizor--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Scizor--Female.gif rename to src/canonical/models/front-shiny-cosmetic/212--0--Scizor--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Heracross--Female.gif b/src/canonical/models/front-shiny-cosmetic/214--0--Heracross--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Heracross--Female.gif rename to src/canonical/models/front-shiny-cosmetic/214--0--Heracross--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Sneasel--Female.gif b/src/canonical/models/front-shiny-cosmetic/215--0--Sneasel--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Sneasel--Female.gif rename to src/canonical/models/front-shiny-cosmetic/215--0--Sneasel--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Ursaring--Female.gif b/src/canonical/models/front-shiny-cosmetic/217--0--Ursaring--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Ursaring--Female.gif rename to src/canonical/models/front-shiny-cosmetic/217--0--Ursaring--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Piloswine--Female.gif b/src/canonical/models/front-shiny-cosmetic/221--0--Piloswine--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Piloswine--Female.gif rename to src/canonical/models/front-shiny-cosmetic/221--0--Piloswine--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Octillery--Female.gif b/src/canonical/models/front-shiny-cosmetic/224--0--Octillery--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Octillery--Female.gif rename to src/canonical/models/front-shiny-cosmetic/224--0--Octillery--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Houndoom--Female.gif b/src/canonical/models/front-shiny-cosmetic/229--0--Houndoom--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Houndoom--Female.gif rename to src/canonical/models/front-shiny-cosmetic/229--0--Houndoom--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Donphan--Female.gif b/src/canonical/models/front-shiny-cosmetic/232--0--Donphan--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Donphan--Female.gif rename to src/canonical/models/front-shiny-cosmetic/232--0--Donphan--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Pikachu--Female.gif b/src/canonical/models/front-shiny-cosmetic/25--0--Pikachu--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Pikachu--Female.gif rename to src/canonical/models/front-shiny-cosmetic/25--0--Pikachu--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Torchic--Female.gif b/src/canonical/models/front-shiny-cosmetic/255--0--Torchic--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Torchic--Female.gif rename to src/canonical/models/front-shiny-cosmetic/255--0--Torchic--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Combusken--Female.gif b/src/canonical/models/front-shiny-cosmetic/256--0--Combusken--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Combusken--Female.gif rename to src/canonical/models/front-shiny-cosmetic/256--0--Combusken--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Blaziken--Female.gif b/src/canonical/models/front-shiny-cosmetic/257--0--Blaziken--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Blaziken--Female.gif rename to src/canonical/models/front-shiny-cosmetic/257--0--Blaziken--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Beautifly--Female.gif b/src/canonical/models/front-shiny-cosmetic/267--0--Beautifly--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Beautifly--Female.gif rename to src/canonical/models/front-shiny-cosmetic/267--0--Beautifly--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Dustox--Female.gif b/src/canonical/models/front-shiny-cosmetic/269--0--Dustox--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Dustox--Female.gif rename to src/canonical/models/front-shiny-cosmetic/269--0--Dustox--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Ludicolo--Female.gif b/src/canonical/models/front-shiny-cosmetic/272--0--Ludicolo--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Ludicolo--Female.gif rename to src/canonical/models/front-shiny-cosmetic/272--0--Ludicolo--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Nuzleaf--Female.gif b/src/canonical/models/front-shiny-cosmetic/274--0--Nuzleaf--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Nuzleaf--Female.gif rename to src/canonical/models/front-shiny-cosmetic/274--0--Nuzleaf--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Shiftry--Female.gif b/src/canonical/models/front-shiny-cosmetic/275--0--Shiftry--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Shiftry--Female.gif rename to src/canonical/models/front-shiny-cosmetic/275--0--Shiftry--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Meditite--Female.gif b/src/canonical/models/front-shiny-cosmetic/307--0--Meditite--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Meditite--Female.gif rename to src/canonical/models/front-shiny-cosmetic/307--0--Meditite--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Medicham--Female.gif b/src/canonical/models/front-shiny-cosmetic/308--0--Medicham--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Medicham--Female.gif rename to src/canonical/models/front-shiny-cosmetic/308--0--Medicham--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Roselia--Female.gif b/src/canonical/models/front-shiny-cosmetic/315--0--Roselia--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Roselia--Female.gif rename to src/canonical/models/front-shiny-cosmetic/315--0--Roselia--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Gulpin--Female.gif b/src/canonical/models/front-shiny-cosmetic/316--0--Gulpin--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Gulpin--Female.gif rename to src/canonical/models/front-shiny-cosmetic/316--0--Gulpin--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Swalot--Female.gif b/src/canonical/models/front-shiny-cosmetic/317--0--Swalot--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Swalot--Female.gif rename to src/canonical/models/front-shiny-cosmetic/317--0--Swalot--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Numel--Female.gif b/src/canonical/models/front-shiny-cosmetic/322--0--Numel--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Numel--Female.gif rename to src/canonical/models/front-shiny-cosmetic/322--0--Numel--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Camerupt--Female.gif b/src/canonical/models/front-shiny-cosmetic/323--0--Camerupt--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Camerupt--Female.gif rename to src/canonical/models/front-shiny-cosmetic/323--0--Camerupt--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Cacturne--Female.gif b/src/canonical/models/front-shiny-cosmetic/332--0--Cacturne--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Cacturne--Female.gif rename to src/canonical/models/front-shiny-cosmetic/332--0--Cacturne--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Milotic--Female.gif b/src/canonical/models/front-shiny-cosmetic/350--0--Milotic--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Milotic--Female.gif rename to src/canonical/models/front-shiny-cosmetic/350--0--Milotic--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Relicanth--Female.gif b/src/canonical/models/front-shiny-cosmetic/369--0--Relicanth--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Relicanth--Female.gif rename to src/canonical/models/front-shiny-cosmetic/369--0--Relicanth--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Starly--Female.gif b/src/canonical/models/front-shiny-cosmetic/396--0--Starly--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Starly--Female.gif rename to src/canonical/models/front-shiny-cosmetic/396--0--Starly--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Staravia--Female.gif b/src/canonical/models/front-shiny-cosmetic/397--0--Staravia--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Staravia--Female.gif rename to src/canonical/models/front-shiny-cosmetic/397--0--Staravia--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Staraptor--Female.gif b/src/canonical/models/front-shiny-cosmetic/398--0--Staraptor--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Staraptor--Female.gif rename to src/canonical/models/front-shiny-cosmetic/398--0--Staraptor--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Bidoof--Female.gif b/src/canonical/models/front-shiny-cosmetic/399--0--Bidoof--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Bidoof--Female.gif rename to src/canonical/models/front-shiny-cosmetic/399--0--Bidoof--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Bibarel--Female.gif b/src/canonical/models/front-shiny-cosmetic/400--0--Bibarel--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Bibarel--Female.gif rename to src/canonical/models/front-shiny-cosmetic/400--0--Bibarel--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Kricketot--Female.gif b/src/canonical/models/front-shiny-cosmetic/401--0--Kricketot--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Kricketot--Female.gif rename to src/canonical/models/front-shiny-cosmetic/401--0--Kricketot--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Kricketune--Female.gif b/src/canonical/models/front-shiny-cosmetic/402--0--Kricketune--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Kricketune--Female.gif rename to src/canonical/models/front-shiny-cosmetic/402--0--Kricketune--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Shinx--Female.gif b/src/canonical/models/front-shiny-cosmetic/403--0--Shinx--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Shinx--Female.gif rename to src/canonical/models/front-shiny-cosmetic/403--0--Shinx--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Luxio--Female.gif b/src/canonical/models/front-shiny-cosmetic/404--0--Luxio--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Luxio--Female.gif rename to src/canonical/models/front-shiny-cosmetic/404--0--Luxio--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Luxray--Female.gif b/src/canonical/models/front-shiny-cosmetic/405--0--Luxray--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Luxray--Female.gif rename to src/canonical/models/front-shiny-cosmetic/405--0--Luxray--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Roserade--Female.gif b/src/canonical/models/front-shiny-cosmetic/407--0--Roserade--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Roserade--Female.gif rename to src/canonical/models/front-shiny-cosmetic/407--0--Roserade--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Kerfluffle--Female.gif b/src/canonical/models/front-shiny-cosmetic/41--0--Kerfluffle--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Kerfluffle--Female.gif rename to src/canonical/models/front-shiny-cosmetic/41--0--Kerfluffle--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Zubat--Female.gif b/src/canonical/models/front-shiny-cosmetic/41--0--Zubat--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Zubat--Female.gif rename to src/canonical/models/front-shiny-cosmetic/41--0--Zubat--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Burmy--Sandy.gif b/src/canonical/models/front-shiny-cosmetic/412--420--Burmy--Sandy.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Burmy--Sandy.gif rename to src/canonical/models/front-shiny-cosmetic/412--420--Burmy--Sandy.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Burmy--Trash.gif b/src/canonical/models/front-shiny-cosmetic/412--420--Burmy--Trash.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Burmy--Trash.gif rename to src/canonical/models/front-shiny-cosmetic/412--420--Burmy--Trash.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Combee--Female.gif b/src/canonical/models/front-shiny-cosmetic/415--0--Combee--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Combee--Female.gif rename to src/canonical/models/front-shiny-cosmetic/415--0--Combee--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Pachirisu--Female.gif b/src/canonical/models/front-shiny-cosmetic/417--0--Pachirisu--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Pachirisu--Female.gif rename to src/canonical/models/front-shiny-cosmetic/417--0--Pachirisu--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Buizel--Female.gif b/src/canonical/models/front-shiny-cosmetic/418--0--Buizel--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Buizel--Female.gif rename to src/canonical/models/front-shiny-cosmetic/418--0--Buizel--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Floatzel--Female.gif b/src/canonical/models/front-shiny-cosmetic/419--0--Floatzel--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Floatzel--Female.gif rename to src/canonical/models/front-shiny-cosmetic/419--0--Floatzel--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Golbat--Female.gif b/src/canonical/models/front-shiny-cosmetic/42--0--Golbat--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Golbat--Female.gif rename to src/canonical/models/front-shiny-cosmetic/42--0--Golbat--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Shellos--East.gif b/src/canonical/models/front-shiny-cosmetic/422--420--Shellos--East.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Shellos--East.gif rename to src/canonical/models/front-shiny-cosmetic/422--420--Shellos--East.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Gastrodon--East.gif b/src/canonical/models/front-shiny-cosmetic/423--420--Gastrodon--East.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Gastrodon--East.gif rename to src/canonical/models/front-shiny-cosmetic/423--420--Gastrodon--East.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Ambipom--Female.gif b/src/canonical/models/front-shiny-cosmetic/424--0--Ambipom--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Ambipom--Female.gif rename to src/canonical/models/front-shiny-cosmetic/424--0--Ambipom--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Gible--Female.gif b/src/canonical/models/front-shiny-cosmetic/443--0--Gible--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Gible--Female.gif rename to src/canonical/models/front-shiny-cosmetic/443--0--Gible--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Gabite--Female.gif b/src/canonical/models/front-shiny-cosmetic/444--0--Gabite--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Gabite--Female.gif rename to src/canonical/models/front-shiny-cosmetic/444--0--Gabite--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Garchomp--Female.gif b/src/canonical/models/front-shiny-cosmetic/445--0--Garchomp--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Garchomp--Female.gif rename to src/canonical/models/front-shiny-cosmetic/445--0--Garchomp--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Hippopotas--Female.gif b/src/canonical/models/front-shiny-cosmetic/449--0--Hippopotas--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Hippopotas--Female.gif rename to src/canonical/models/front-shiny-cosmetic/449--0--Hippopotas--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Hippowdon--Female.gif b/src/canonical/models/front-shiny-cosmetic/450--0--Hippowdon--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Hippowdon--Female.gif rename to src/canonical/models/front-shiny-cosmetic/450--0--Hippowdon--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Croagunk--Female.gif b/src/canonical/models/front-shiny-cosmetic/453--0--Croagunk--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Croagunk--Female.gif rename to src/canonical/models/front-shiny-cosmetic/453--0--Croagunk--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Toxicroak--Female.gif b/src/canonical/models/front-shiny-cosmetic/454--0--Toxicroak--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Toxicroak--Female.gif rename to src/canonical/models/front-shiny-cosmetic/454--0--Toxicroak--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Finneon--Female.gif b/src/canonical/models/front-shiny-cosmetic/456--0--Finneon--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Finneon--Female.gif rename to src/canonical/models/front-shiny-cosmetic/456--0--Finneon--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Lumineon--Female.gif b/src/canonical/models/front-shiny-cosmetic/457--0--Lumineon--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Lumineon--Female.gif rename to src/canonical/models/front-shiny-cosmetic/457--0--Lumineon--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Snover--Female.gif b/src/canonical/models/front-shiny-cosmetic/459--0--Snover--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Snover--Female.gif rename to src/canonical/models/front-shiny-cosmetic/459--0--Snover--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Abomasnow--Female.gif b/src/canonical/models/front-shiny-cosmetic/460--0--Abomasnow--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Abomasnow--Female.gif rename to src/canonical/models/front-shiny-cosmetic/460--0--Abomasnow--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Weavile--Female.gif b/src/canonical/models/front-shiny-cosmetic/461--0--Weavile--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Weavile--Female.gif rename to src/canonical/models/front-shiny-cosmetic/461--0--Weavile--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Rhyperior--Female.gif b/src/canonical/models/front-shiny-cosmetic/464--0--Rhyperior--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Rhyperior--Female.gif rename to src/canonical/models/front-shiny-cosmetic/464--0--Rhyperior--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Tangrowth--Female.gif b/src/canonical/models/front-shiny-cosmetic/465--0--Tangrowth--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Tangrowth--Female.gif rename to src/canonical/models/front-shiny-cosmetic/465--0--Tangrowth--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Mamoswine--Female.gif b/src/canonical/models/front-shiny-cosmetic/473--0--Mamoswine--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Mamoswine--Female.gif rename to src/canonical/models/front-shiny-cosmetic/473--0--Mamoswine--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Unfezant--Female.gif b/src/canonical/models/front-shiny-cosmetic/521--0--Unfezant--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Unfezant--Female.gif rename to src/canonical/models/front-shiny-cosmetic/521--0--Unfezant--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Basculin--Blue.gif b/src/canonical/models/front-shiny-cosmetic/550--420--Basculin--Blue.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Basculin--Blue.gif rename to src/canonical/models/front-shiny-cosmetic/550--420--Basculin--Blue.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Deerling--Autumn.gif b/src/canonical/models/front-shiny-cosmetic/585--420--Deerling--Autumn.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Deerling--Autumn.gif rename to src/canonical/models/front-shiny-cosmetic/585--420--Deerling--Autumn.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Deerling--Summer.gif b/src/canonical/models/front-shiny-cosmetic/585--420--Deerling--Summer.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Deerling--Summer.gif rename to src/canonical/models/front-shiny-cosmetic/585--420--Deerling--Summer.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Deerling--Winter.gif b/src/canonical/models/front-shiny-cosmetic/585--420--Deerling--Winter.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Deerling--Winter.gif rename to src/canonical/models/front-shiny-cosmetic/585--420--Deerling--Winter.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Sawsbuck--Autumn.gif b/src/canonical/models/front-shiny-cosmetic/586--420--Sawsbuck--Autumn.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Sawsbuck--Autumn.gif rename to src/canonical/models/front-shiny-cosmetic/586--420--Sawsbuck--Autumn.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Sawsbuck--Summer.gif b/src/canonical/models/front-shiny-cosmetic/586--420--Sawsbuck--Summer.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Sawsbuck--Summer.gif rename to src/canonical/models/front-shiny-cosmetic/586--420--Sawsbuck--Summer.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Sawsbuck--Winter.gif b/src/canonical/models/front-shiny-cosmetic/586--420--Sawsbuck--Winter.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Sawsbuck--Winter.gif rename to src/canonical/models/front-shiny-cosmetic/586--420--Sawsbuck--Winter.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Frillish--Female.gif b/src/canonical/models/front-shiny-cosmetic/592--0--Frillish--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Frillish--Female.gif rename to src/canonical/models/front-shiny-cosmetic/592--0--Frillish--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Jellicent--Female.gif b/src/canonical/models/front-shiny-cosmetic/593--0--Jellicent--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Jellicent--Female.gif rename to src/canonical/models/front-shiny-cosmetic/593--0--Jellicent--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Archipelago.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Archipelago.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Archipelago.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Archipelago.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Continental.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Continental.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Continental.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Continental.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Elegant.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Elegant.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Elegant.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Elegant.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Garden.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Garden.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Garden.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Garden.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--High_Plains.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--High_Plains.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--High_Plains.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--High_Plains.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Icy_Snow.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Icy_Snow.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Icy_Snow.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Icy_Snow.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Jungle.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Jungle.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Jungle.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Jungle.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Marine.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Marine.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Marine.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Marine.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Modern.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Modern.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Modern.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Modern.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Monsoon.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Monsoon.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Monsoon.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Monsoon.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Ocean.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Ocean.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Ocean.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Ocean.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Polar.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Polar.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Polar.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Polar.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--River.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--River.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--River.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--River.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Sandstorm.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Sandstorm.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Sandstorm.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Sandstorm.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Savanna.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Savanna.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Savanna.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Savanna.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Sun.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Sun.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Sun.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Sun.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Vivillon--Tundra.gif b/src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Tundra.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Vivillon--Tundra.gif rename to src/canonical/models/front-shiny-cosmetic/666--420--Vivillon--Tundra.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Pyroar--Female.gif b/src/canonical/models/front-shiny-cosmetic/668--0--Pyroar--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Pyroar--Female.gif rename to src/canonical/models/front-shiny-cosmetic/668--0--Pyroar--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Flabe__0301be__0301--Blue.gif b/src/canonical/models/front-shiny-cosmetic/669--420--Flabe__0301be__0301--Blue.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Flabe__0301be__0301--Blue.gif rename to src/canonical/models/front-shiny-cosmetic/669--420--Flabe__0301be__0301--Blue.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Flabe__0301be__0301--Orange.gif b/src/canonical/models/front-shiny-cosmetic/669--420--Flabe__0301be__0301--Orange.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Flabe__0301be__0301--Orange.gif rename to src/canonical/models/front-shiny-cosmetic/669--420--Flabe__0301be__0301--Orange.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Flabe__0301be__0301--White.gif b/src/canonical/models/front-shiny-cosmetic/669--420--Flabe__0301be__0301--White.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Flabe__0301be__0301--White.gif rename to src/canonical/models/front-shiny-cosmetic/669--420--Flabe__0301be__0301--White.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Flabe__0301be__0301--Yellow.gif b/src/canonical/models/front-shiny-cosmetic/669--420--Flabe__0301be__0301--Yellow.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Flabe__0301be__0301--Yellow.gif rename to src/canonical/models/front-shiny-cosmetic/669--420--Flabe__0301be__0301--Yellow.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Floette--Blue.gif b/src/canonical/models/front-shiny-cosmetic/670--420--Floette--Blue.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Floette--Blue.gif rename to src/canonical/models/front-shiny-cosmetic/670--420--Floette--Blue.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Floette--Orange.gif b/src/canonical/models/front-shiny-cosmetic/670--420--Floette--Orange.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Floette--Orange.gif rename to src/canonical/models/front-shiny-cosmetic/670--420--Floette--Orange.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Floette--White.gif b/src/canonical/models/front-shiny-cosmetic/670--420--Floette--White.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Floette--White.gif rename to src/canonical/models/front-shiny-cosmetic/670--420--Floette--White.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Floette--Yellow.gif b/src/canonical/models/front-shiny-cosmetic/670--420--Floette--Yellow.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Floette--Yellow.gif rename to src/canonical/models/front-shiny-cosmetic/670--420--Floette--Yellow.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Florges--Blue.gif b/src/canonical/models/front-shiny-cosmetic/671--420--Florges--Blue.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Florges--Blue.gif rename to src/canonical/models/front-shiny-cosmetic/671--420--Florges--Blue.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Florges--Orange.gif b/src/canonical/models/front-shiny-cosmetic/671--420--Florges--Orange.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Florges--Orange.gif rename to src/canonical/models/front-shiny-cosmetic/671--420--Florges--Orange.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Florges--White.gif b/src/canonical/models/front-shiny-cosmetic/671--420--Florges--White.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Florges--White.gif rename to src/canonical/models/front-shiny-cosmetic/671--420--Florges--White.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Florges--Yellow.gif b/src/canonical/models/front-shiny-cosmetic/671--420--Florges--Yellow.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Florges--Yellow.gif rename to src/canonical/models/front-shiny-cosmetic/671--420--Florges--Yellow.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Furfrou--Dandy.gif b/src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Dandy.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Furfrou--Dandy.gif rename to src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Dandy.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Furfrou--Debutante.gif b/src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Debutante.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Furfrou--Debutante.gif rename to src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Debutante.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Furfrou--Diamond.gif b/src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Diamond.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Furfrou--Diamond.gif rename to src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Diamond.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Furfrou--Heart.gif b/src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Heart.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Furfrou--Heart.gif rename to src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Heart.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Furfrou--Kabuki.gif b/src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Kabuki.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Furfrou--Kabuki.gif rename to src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Kabuki.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Furfrou--La_Reine.gif b/src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--La_Reine.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Furfrou--La_Reine.gif rename to src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--La_Reine.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Furfrou--Matron.gif b/src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Matron.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Furfrou--Matron.gif rename to src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Matron.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Furfrou--Pharaoh.gif b/src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Pharaoh.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Furfrou--Pharaoh.gif rename to src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Pharaoh.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Furfrou--Star.gif b/src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Star.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Furfrou--Star.gif rename to src/canonical/models/front-shiny-cosmetic/676--420--Furfrou--Star.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Salazzle--Female.gif b/src/canonical/models/front-shiny-cosmetic/758--0--Salazzle--Female.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Salazzle--Female.gif rename to src/canonical/models/front-shiny-cosmetic/758--0--Salazzle--Female.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Minior--Blue.gif b/src/canonical/models/front-shiny-cosmetic/774--420--Minior--Blue.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Minior--Blue.gif rename to src/canonical/models/front-shiny-cosmetic/774--420--Minior--Blue.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Minior--Green.gif b/src/canonical/models/front-shiny-cosmetic/774--420--Minior--Green.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Minior--Green.gif rename to src/canonical/models/front-shiny-cosmetic/774--420--Minior--Green.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Minior--Indigo.gif b/src/canonical/models/front-shiny-cosmetic/774--420--Minior--Indigo.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Minior--Indigo.gif rename to src/canonical/models/front-shiny-cosmetic/774--420--Minior--Indigo.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Minior--Meteor.gif b/src/canonical/models/front-shiny-cosmetic/774--420--Minior--Meteor.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Minior--Meteor.gif rename to src/canonical/models/front-shiny-cosmetic/774--420--Minior--Meteor.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Minior--Orange.gif b/src/canonical/models/front-shiny-cosmetic/774--420--Minior--Orange.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Minior--Orange.gif rename to src/canonical/models/front-shiny-cosmetic/774--420--Minior--Orange.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Minior--Violet.gif b/src/canonical/models/front-shiny-cosmetic/774--420--Minior--Violet.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Minior--Violet.gif rename to src/canonical/models/front-shiny-cosmetic/774--420--Minior--Violet.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Minior--Yellow.gif b/src/canonical/models/front-shiny-cosmetic/774--420--Minior--Yellow.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Minior--Yellow.gif rename to src/canonical/models/front-shiny-cosmetic/774--420--Minior--Yellow.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Magearna--Original.gif b/src/canonical/models/front-shiny-cosmetic/801--420--Magearna--Original.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Magearna--Original.gif rename to src/canonical/models/front-shiny-cosmetic/801--420--Magearna--Original.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Caramel_Swirl.gif b/src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Caramel_Swirl.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Alcremie--Caramel_Swirl.gif rename to src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Caramel_Swirl.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Lemon_Cream.gif b/src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Lemon_Cream.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Alcremie--Lemon_Cream.gif rename to src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Lemon_Cream.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Matcha_Cream.gif b/src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Matcha_Cream.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Alcremie--Matcha_Cream.gif rename to src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Matcha_Cream.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Mint_Cream.gif b/src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Mint_Cream.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Alcremie--Mint_Cream.gif rename to src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Mint_Cream.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Rainbow_Swirl.gif b/src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Rainbow_Swirl.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Alcremie--Rainbow_Swirl.gif rename to src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Rainbow_Swirl.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Ruby_Cream.gif b/src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Ruby_Cream.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Alcremie--Ruby_Cream.gif rename to src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Ruby_Cream.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Ruby_Swirl.gif b/src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Ruby_Swirl.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Alcremie--Ruby_Swirl.gif rename to src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Ruby_Swirl.gif diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Salted_Cream.gif b/src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Salted_Cream.gif similarity index 100% rename from src/canonical/models/front-shiny-cosmetic/Alcremie--Salted_Cream.gif rename to src/canonical/models/front-shiny-cosmetic/869--420--Alcremie--Salted_Cream.gif diff --git a/src/canonical/models/front-shiny/Bulbasaur.gif b/src/canonical/models/front-shiny/1--0--Bulbasaur.gif similarity index 100% rename from src/canonical/models/front-shiny/Bulbasaur.gif rename to src/canonical/models/front-shiny/1--0--Bulbasaur.gif diff --git a/src/canonical/models/front-shiny/Caterpie.gif b/src/canonical/models/front-shiny/10--0--Caterpie.gif similarity index 100% rename from src/canonical/models/front-shiny/Caterpie.gif rename to src/canonical/models/front-shiny/10--0--Caterpie.gif diff --git a/src/canonical/models/front-shiny/Voltorb.gif b/src/canonical/models/front-shiny/100--0--Voltorb.gif similarity index 100% rename from src/canonical/models/front-shiny/Voltorb.gif rename to src/canonical/models/front-shiny/100--0--Voltorb.gif diff --git a/src/canonical/models/front-shiny/Electrode.gif b/src/canonical/models/front-shiny/101--0--Electrode.gif similarity index 100% rename from src/canonical/models/front-shiny/Electrode.gif rename to src/canonical/models/front-shiny/101--0--Electrode.gif diff --git a/src/canonical/models/front-shiny/Exeggcute.gif b/src/canonical/models/front-shiny/102--0--Exeggcute.gif similarity index 100% rename from src/canonical/models/front-shiny/Exeggcute.gif rename to src/canonical/models/front-shiny/102--0--Exeggcute.gif diff --git a/src/canonical/models/front-shiny/Exeggutor.gif b/src/canonical/models/front-shiny/103--0--Exeggutor.gif similarity index 100% rename from src/canonical/models/front-shiny/Exeggutor.gif rename to src/canonical/models/front-shiny/103--0--Exeggutor.gif diff --git a/src/canonical/models/front-shiny/Exeggutor--Alola.gif b/src/canonical/models/front-shiny/103--420--Exeggutor--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Exeggutor--Alola.gif rename to src/canonical/models/front-shiny/103--420--Exeggutor--Alola.gif diff --git a/src/canonical/models/front-shiny/Cubone.gif b/src/canonical/models/front-shiny/104--0--Cubone.gif similarity index 100% rename from src/canonical/models/front-shiny/Cubone.gif rename to src/canonical/models/front-shiny/104--0--Cubone.gif diff --git a/src/canonical/models/front-shiny/Marowak.gif b/src/canonical/models/front-shiny/105--0--Marowak.gif similarity index 100% rename from src/canonical/models/front-shiny/Marowak.gif rename to src/canonical/models/front-shiny/105--0--Marowak.gif diff --git a/src/canonical/models/front-shiny/Marowak--Alola-Totem.gif b/src/canonical/models/front-shiny/105--420--Marowak--Alola-Totem.gif similarity index 100% rename from src/canonical/models/front-shiny/Marowak--Alola-Totem.gif rename to src/canonical/models/front-shiny/105--420--Marowak--Alola-Totem.gif diff --git a/src/canonical/models/front-shiny/Marowak--Alola.gif b/src/canonical/models/front-shiny/105--420--Marowak--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Marowak--Alola.gif rename to src/canonical/models/front-shiny/105--420--Marowak--Alola.gif diff --git a/src/canonical/models/front-shiny/Hitmonlee.gif b/src/canonical/models/front-shiny/106--0--Hitmonlee.gif similarity index 100% rename from src/canonical/models/front-shiny/Hitmonlee.gif rename to src/canonical/models/front-shiny/106--0--Hitmonlee.gif diff --git a/src/canonical/models/front-shiny/Hitmonchan.gif b/src/canonical/models/front-shiny/107--0--Hitmonchan.gif similarity index 100% rename from src/canonical/models/front-shiny/Hitmonchan.gif rename to src/canonical/models/front-shiny/107--0--Hitmonchan.gif diff --git a/src/canonical/models/front-shiny/Lickitung.gif b/src/canonical/models/front-shiny/108--0--Lickitung.gif similarity index 100% rename from src/canonical/models/front-shiny/Lickitung.gif rename to src/canonical/models/front-shiny/108--0--Lickitung.gif diff --git a/src/canonical/models/front-shiny/Koffing.gif b/src/canonical/models/front-shiny/109--0--Koffing.gif similarity index 100% rename from src/canonical/models/front-shiny/Koffing.gif rename to src/canonical/models/front-shiny/109--0--Koffing.gif diff --git a/src/canonical/models/front-shiny/Metapod.gif b/src/canonical/models/front-shiny/11--0--Metapod.gif similarity index 100% rename from src/canonical/models/front-shiny/Metapod.gif rename to src/canonical/models/front-shiny/11--0--Metapod.gif diff --git a/src/canonical/models/front-shiny/Weezing.gif b/src/canonical/models/front-shiny/110--0--Weezing.gif similarity index 100% rename from src/canonical/models/front-shiny/Weezing.gif rename to src/canonical/models/front-shiny/110--0--Weezing.gif diff --git a/src/canonical/models/front-shiny/Weezing--Galar.gif b/src/canonical/models/front-shiny/110--420--Weezing--Galar.gif similarity index 100% rename from src/canonical/models/front-shiny/Weezing--Galar.gif rename to src/canonical/models/front-shiny/110--420--Weezing--Galar.gif diff --git a/src/canonical/models/front-shiny/Rhyhorn.gif b/src/canonical/models/front-shiny/111--0--Rhyhorn.gif similarity index 100% rename from src/canonical/models/front-shiny/Rhyhorn.gif rename to src/canonical/models/front-shiny/111--0--Rhyhorn.gif diff --git a/src/canonical/models/front-shiny/Rhydon.gif b/src/canonical/models/front-shiny/112--0--Rhydon.gif similarity index 100% rename from src/canonical/models/front-shiny/Rhydon.gif rename to src/canonical/models/front-shiny/112--0--Rhydon.gif diff --git a/src/canonical/models/front-shiny/Chansey.gif b/src/canonical/models/front-shiny/113--0--Chansey.gif similarity index 100% rename from src/canonical/models/front-shiny/Chansey.gif rename to src/canonical/models/front-shiny/113--0--Chansey.gif diff --git a/src/canonical/models/front-shiny/Tangela.gif b/src/canonical/models/front-shiny/114--0--Tangela.gif similarity index 100% rename from src/canonical/models/front-shiny/Tangela.gif rename to src/canonical/models/front-shiny/114--0--Tangela.gif diff --git a/src/canonical/models/front-shiny/Kangaskhan.gif b/src/canonical/models/front-shiny/115--0--Kangaskhan.gif similarity index 100% rename from src/canonical/models/front-shiny/Kangaskhan.gif rename to src/canonical/models/front-shiny/115--0--Kangaskhan.gif diff --git a/src/canonical/models/front-shiny/Kangaskhan--Mega.gif b/src/canonical/models/front-shiny/115--420--Kangaskhan--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Kangaskhan--Mega.gif rename to src/canonical/models/front-shiny/115--420--Kangaskhan--Mega.gif diff --git a/src/canonical/models/front-shiny/Horsea.gif b/src/canonical/models/front-shiny/116--0--Horsea.gif similarity index 100% rename from src/canonical/models/front-shiny/Horsea.gif rename to src/canonical/models/front-shiny/116--0--Horsea.gif diff --git a/src/canonical/models/front-shiny/Seadra.gif b/src/canonical/models/front-shiny/117--0--Seadra.gif similarity index 100% rename from src/canonical/models/front-shiny/Seadra.gif rename to src/canonical/models/front-shiny/117--0--Seadra.gif diff --git a/src/canonical/models/front-shiny/Goldeen.gif b/src/canonical/models/front-shiny/118--0--Goldeen.gif similarity index 100% rename from src/canonical/models/front-shiny/Goldeen.gif rename to src/canonical/models/front-shiny/118--0--Goldeen.gif diff --git a/src/canonical/models/front-shiny/Seaking.gif b/src/canonical/models/front-shiny/119--0--Seaking.gif similarity index 100% rename from src/canonical/models/front-shiny/Seaking.gif rename to src/canonical/models/front-shiny/119--0--Seaking.gif diff --git a/src/canonical/models/front-shiny/Butterfree.gif b/src/canonical/models/front-shiny/12--0--Butterfree.gif similarity index 100% rename from src/canonical/models/front-shiny/Butterfree.gif rename to src/canonical/models/front-shiny/12--0--Butterfree.gif diff --git a/src/canonical/models/front-shiny/Butterfree--Gmax.gif b/src/canonical/models/front-shiny/12--420--Butterfree--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Butterfree--Gmax.gif rename to src/canonical/models/front-shiny/12--420--Butterfree--Gmax.gif diff --git a/src/canonical/models/front-shiny/Staryu.gif b/src/canonical/models/front-shiny/120--0--Staryu.gif similarity index 100% rename from src/canonical/models/front-shiny/Staryu.gif rename to src/canonical/models/front-shiny/120--0--Staryu.gif diff --git a/src/canonical/models/front-shiny/Starmie.gif b/src/canonical/models/front-shiny/121--0--Starmie.gif similarity index 100% rename from src/canonical/models/front-shiny/Starmie.gif rename to src/canonical/models/front-shiny/121--0--Starmie.gif diff --git a/src/canonical/models/front-shiny/Mr._Mime.gif b/src/canonical/models/front-shiny/122--0--Mr._Mime.gif similarity index 100% rename from src/canonical/models/front-shiny/Mr._Mime.gif rename to src/canonical/models/front-shiny/122--0--Mr._Mime.gif diff --git a/src/canonical/models/front-shiny/Mr._Mime--Galar.gif b/src/canonical/models/front-shiny/122--420--Mr._Mime--Galar.gif similarity index 100% rename from src/canonical/models/front-shiny/Mr._Mime--Galar.gif rename to src/canonical/models/front-shiny/122--420--Mr._Mime--Galar.gif diff --git a/src/canonical/models/front-shiny/Scyther.gif b/src/canonical/models/front-shiny/123--0--Scyther.gif similarity index 100% rename from src/canonical/models/front-shiny/Scyther.gif rename to src/canonical/models/front-shiny/123--0--Scyther.gif diff --git a/src/canonical/models/front-shiny/Jynx.gif b/src/canonical/models/front-shiny/124--0--Jynx.gif similarity index 100% rename from src/canonical/models/front-shiny/Jynx.gif rename to src/canonical/models/front-shiny/124--0--Jynx.gif diff --git a/src/canonical/models/front-shiny/Electabuzz.gif b/src/canonical/models/front-shiny/125--0--Electabuzz.gif similarity index 100% rename from src/canonical/models/front-shiny/Electabuzz.gif rename to src/canonical/models/front-shiny/125--0--Electabuzz.gif diff --git a/src/canonical/models/front-shiny/Magmar.gif b/src/canonical/models/front-shiny/126--0--Magmar.gif similarity index 100% rename from src/canonical/models/front-shiny/Magmar.gif rename to src/canonical/models/front-shiny/126--0--Magmar.gif diff --git a/src/canonical/models/front-shiny/Pinsir.gif b/src/canonical/models/front-shiny/127--0--Pinsir.gif similarity index 100% rename from src/canonical/models/front-shiny/Pinsir.gif rename to src/canonical/models/front-shiny/127--0--Pinsir.gif diff --git a/src/canonical/models/front-shiny/Pinsir--Mega.gif b/src/canonical/models/front-shiny/127--420--Pinsir--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Pinsir--Mega.gif rename to src/canonical/models/front-shiny/127--420--Pinsir--Mega.gif diff --git a/src/canonical/models/front-shiny/Tauros.gif b/src/canonical/models/front-shiny/128--0--Tauros.gif similarity index 100% rename from src/canonical/models/front-shiny/Tauros.gif rename to src/canonical/models/front-shiny/128--0--Tauros.gif diff --git a/src/canonical/models/front-shiny/Magikarp.gif b/src/canonical/models/front-shiny/129--0--Magikarp.gif similarity index 100% rename from src/canonical/models/front-shiny/Magikarp.gif rename to src/canonical/models/front-shiny/129--0--Magikarp.gif diff --git a/src/canonical/models/front-shiny/Weedle.gif b/src/canonical/models/front-shiny/13--0--Weedle.gif similarity index 100% rename from src/canonical/models/front-shiny/Weedle.gif rename to src/canonical/models/front-shiny/13--0--Weedle.gif diff --git a/src/canonical/models/front-shiny/Gyarados.gif b/src/canonical/models/front-shiny/130--0--Gyarados.gif similarity index 100% rename from src/canonical/models/front-shiny/Gyarados.gif rename to src/canonical/models/front-shiny/130--0--Gyarados.gif diff --git a/src/canonical/models/front-shiny/Gyarados--Mega.gif b/src/canonical/models/front-shiny/130--420--Gyarados--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Gyarados--Mega.gif rename to src/canonical/models/front-shiny/130--420--Gyarados--Mega.gif diff --git a/src/canonical/models/front-shiny/Lapras.gif b/src/canonical/models/front-shiny/131--0--Lapras.gif similarity index 100% rename from src/canonical/models/front-shiny/Lapras.gif rename to src/canonical/models/front-shiny/131--0--Lapras.gif diff --git a/src/canonical/models/front-shiny/Lapras--Gmax.gif b/src/canonical/models/front-shiny/131--420--Lapras--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Lapras--Gmax.gif rename to src/canonical/models/front-shiny/131--420--Lapras--Gmax.gif diff --git a/src/canonical/models/front-shiny/Ditto.gif b/src/canonical/models/front-shiny/132--0--Ditto.gif similarity index 100% rename from src/canonical/models/front-shiny/Ditto.gif rename to src/canonical/models/front-shiny/132--0--Ditto.gif diff --git a/src/canonical/models/front-shiny/Eevee.gif b/src/canonical/models/front-shiny/133--0--Eevee.gif similarity index 100% rename from src/canonical/models/front-shiny/Eevee.gif rename to src/canonical/models/front-shiny/133--0--Eevee.gif diff --git a/src/canonical/models/front-shiny/Eevee--Gmax.gif b/src/canonical/models/front-shiny/133--420--Eevee--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Eevee--Gmax.gif rename to src/canonical/models/front-shiny/133--420--Eevee--Gmax.gif diff --git a/src/canonical/models/front-shiny/Vaporeon.gif b/src/canonical/models/front-shiny/134--0--Vaporeon.gif similarity index 100% rename from src/canonical/models/front-shiny/Vaporeon.gif rename to src/canonical/models/front-shiny/134--0--Vaporeon.gif diff --git a/src/canonical/models/front-shiny/Jolteon.gif b/src/canonical/models/front-shiny/135--0--Jolteon.gif similarity index 100% rename from src/canonical/models/front-shiny/Jolteon.gif rename to src/canonical/models/front-shiny/135--0--Jolteon.gif diff --git a/src/canonical/models/front-shiny/Flareon.gif b/src/canonical/models/front-shiny/136--0--Flareon.gif similarity index 100% rename from src/canonical/models/front-shiny/Flareon.gif rename to src/canonical/models/front-shiny/136--0--Flareon.gif diff --git a/src/canonical/models/front-shiny/Porygon.gif b/src/canonical/models/front-shiny/137--0--Porygon.gif similarity index 100% rename from src/canonical/models/front-shiny/Porygon.gif rename to src/canonical/models/front-shiny/137--0--Porygon.gif diff --git a/src/canonical/models/front-shiny/Omanyte.gif b/src/canonical/models/front-shiny/138--0--Omanyte.gif similarity index 100% rename from src/canonical/models/front-shiny/Omanyte.gif rename to src/canonical/models/front-shiny/138--0--Omanyte.gif diff --git a/src/canonical/models/front-shiny/Omastar.gif b/src/canonical/models/front-shiny/139--0--Omastar.gif similarity index 100% rename from src/canonical/models/front-shiny/Omastar.gif rename to src/canonical/models/front-shiny/139--0--Omastar.gif diff --git a/src/canonical/models/front-shiny/Kakuna.gif b/src/canonical/models/front-shiny/14--0--Kakuna.gif similarity index 100% rename from src/canonical/models/front-shiny/Kakuna.gif rename to src/canonical/models/front-shiny/14--0--Kakuna.gif diff --git a/src/canonical/models/front-shiny/Kabuto.gif b/src/canonical/models/front-shiny/140--0--Kabuto.gif similarity index 100% rename from src/canonical/models/front-shiny/Kabuto.gif rename to src/canonical/models/front-shiny/140--0--Kabuto.gif diff --git a/src/canonical/models/front-shiny/Kabutops.gif b/src/canonical/models/front-shiny/141--0--Kabutops.gif similarity index 100% rename from src/canonical/models/front-shiny/Kabutops.gif rename to src/canonical/models/front-shiny/141--0--Kabutops.gif diff --git a/src/canonical/models/front-shiny/Aerodactyl.gif b/src/canonical/models/front-shiny/142--0--Aerodactyl.gif similarity index 100% rename from src/canonical/models/front-shiny/Aerodactyl.gif rename to src/canonical/models/front-shiny/142--0--Aerodactyl.gif diff --git a/src/canonical/models/front-shiny/Aerodactyl--Mega.gif b/src/canonical/models/front-shiny/142--420--Aerodactyl--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Aerodactyl--Mega.gif rename to src/canonical/models/front-shiny/142--420--Aerodactyl--Mega.gif diff --git a/src/canonical/models/front-shiny/Snorlax.gif b/src/canonical/models/front-shiny/143--0--Snorlax.gif similarity index 100% rename from src/canonical/models/front-shiny/Snorlax.gif rename to src/canonical/models/front-shiny/143--0--Snorlax.gif diff --git a/src/canonical/models/front-shiny/Snorlax--Gmax.gif b/src/canonical/models/front-shiny/143--420--Snorlax--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Snorlax--Gmax.gif rename to src/canonical/models/front-shiny/143--420--Snorlax--Gmax.gif diff --git a/src/canonical/models/front-shiny/Articuno.gif b/src/canonical/models/front-shiny/144--0--Articuno.gif similarity index 100% rename from src/canonical/models/front-shiny/Articuno.gif rename to src/canonical/models/front-shiny/144--0--Articuno.gif diff --git a/src/canonical/models/front-shiny/Zapdos.gif b/src/canonical/models/front-shiny/145--0--Zapdos.gif similarity index 100% rename from src/canonical/models/front-shiny/Zapdos.gif rename to src/canonical/models/front-shiny/145--0--Zapdos.gif diff --git a/src/canonical/models/front-shiny/Moltres.gif b/src/canonical/models/front-shiny/146--0--Moltres.gif similarity index 100% rename from src/canonical/models/front-shiny/Moltres.gif rename to src/canonical/models/front-shiny/146--0--Moltres.gif diff --git a/src/canonical/models/front-shiny/Dratini.gif b/src/canonical/models/front-shiny/147--0--Dratini.gif similarity index 100% rename from src/canonical/models/front-shiny/Dratini.gif rename to src/canonical/models/front-shiny/147--0--Dratini.gif diff --git a/src/canonical/models/front-shiny/Dragonair.gif b/src/canonical/models/front-shiny/148--0--Dragonair.gif similarity index 100% rename from src/canonical/models/front-shiny/Dragonair.gif rename to src/canonical/models/front-shiny/148--0--Dragonair.gif diff --git a/src/canonical/models/front-shiny/Dragonite.gif b/src/canonical/models/front-shiny/149--0--Dragonite.gif similarity index 100% rename from src/canonical/models/front-shiny/Dragonite.gif rename to src/canonical/models/front-shiny/149--0--Dragonite.gif diff --git a/src/canonical/models/front-shiny/Beedrill.gif b/src/canonical/models/front-shiny/15--0--Beedrill.gif similarity index 100% rename from src/canonical/models/front-shiny/Beedrill.gif rename to src/canonical/models/front-shiny/15--0--Beedrill.gif diff --git a/src/canonical/models/front-shiny/Beedrill--Mega.gif b/src/canonical/models/front-shiny/15--420--Beedrill--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Beedrill--Mega.gif rename to src/canonical/models/front-shiny/15--420--Beedrill--Mega.gif diff --git a/src/canonical/models/front-shiny/Mewtwo.gif b/src/canonical/models/front-shiny/150--0--Mewtwo.gif similarity index 100% rename from src/canonical/models/front-shiny/Mewtwo.gif rename to src/canonical/models/front-shiny/150--0--Mewtwo.gif diff --git a/src/canonical/models/front-shiny/Mewtwo--Mega-X.gif b/src/canonical/models/front-shiny/150--420--Mewtwo--Mega-X.gif similarity index 100% rename from src/canonical/models/front-shiny/Mewtwo--Mega-X.gif rename to src/canonical/models/front-shiny/150--420--Mewtwo--Mega-X.gif diff --git a/src/canonical/models/front-shiny/Mewtwo--Mega-Y.gif b/src/canonical/models/front-shiny/150--420--Mewtwo--Mega-Y.gif similarity index 100% rename from src/canonical/models/front-shiny/Mewtwo--Mega-Y.gif rename to src/canonical/models/front-shiny/150--420--Mewtwo--Mega-Y.gif diff --git a/src/canonical/models/front-shiny/Mew.gif b/src/canonical/models/front-shiny/151--0--Mew.gif similarity index 100% rename from src/canonical/models/front-shiny/Mew.gif rename to src/canonical/models/front-shiny/151--0--Mew.gif diff --git a/src/canonical/models/front-shiny/Chikorita.gif b/src/canonical/models/front-shiny/152--0--Chikorita.gif similarity index 100% rename from src/canonical/models/front-shiny/Chikorita.gif rename to src/canonical/models/front-shiny/152--0--Chikorita.gif diff --git a/src/canonical/models/front-shiny/Bayleef.gif b/src/canonical/models/front-shiny/153--0--Bayleef.gif similarity index 100% rename from src/canonical/models/front-shiny/Bayleef.gif rename to src/canonical/models/front-shiny/153--0--Bayleef.gif diff --git a/src/canonical/models/front-shiny/Meganium.gif b/src/canonical/models/front-shiny/154--0--Meganium.gif similarity index 100% rename from src/canonical/models/front-shiny/Meganium.gif rename to src/canonical/models/front-shiny/154--0--Meganium.gif diff --git a/src/canonical/models/front-shiny/Cyndaquil.gif b/src/canonical/models/front-shiny/155--0--Cyndaquil.gif similarity index 100% rename from src/canonical/models/front-shiny/Cyndaquil.gif rename to src/canonical/models/front-shiny/155--0--Cyndaquil.gif diff --git a/src/canonical/models/front-shiny/Quilava.gif b/src/canonical/models/front-shiny/156--0--Quilava.gif similarity index 100% rename from src/canonical/models/front-shiny/Quilava.gif rename to src/canonical/models/front-shiny/156--0--Quilava.gif diff --git a/src/canonical/models/front-shiny/Typhlosion.gif b/src/canonical/models/front-shiny/157--0--Typhlosion.gif similarity index 100% rename from src/canonical/models/front-shiny/Typhlosion.gif rename to src/canonical/models/front-shiny/157--0--Typhlosion.gif diff --git a/src/canonical/models/front-shiny/Totodile.gif b/src/canonical/models/front-shiny/158--0--Totodile.gif similarity index 100% rename from src/canonical/models/front-shiny/Totodile.gif rename to src/canonical/models/front-shiny/158--0--Totodile.gif diff --git a/src/canonical/models/front-shiny/Croconaw.gif b/src/canonical/models/front-shiny/159--0--Croconaw.gif similarity index 100% rename from src/canonical/models/front-shiny/Croconaw.gif rename to src/canonical/models/front-shiny/159--0--Croconaw.gif diff --git a/src/canonical/models/front-shiny/Pidgey.gif b/src/canonical/models/front-shiny/16--0--Pidgey.gif similarity index 100% rename from src/canonical/models/front-shiny/Pidgey.gif rename to src/canonical/models/front-shiny/16--0--Pidgey.gif diff --git a/src/canonical/models/front-shiny/Feraligatr.gif b/src/canonical/models/front-shiny/160--0--Feraligatr.gif similarity index 100% rename from src/canonical/models/front-shiny/Feraligatr.gif rename to src/canonical/models/front-shiny/160--0--Feraligatr.gif diff --git a/src/canonical/models/front-shiny/Sentret.gif b/src/canonical/models/front-shiny/161--0--Sentret.gif similarity index 100% rename from src/canonical/models/front-shiny/Sentret.gif rename to src/canonical/models/front-shiny/161--0--Sentret.gif diff --git a/src/canonical/models/front-shiny/Furret.gif b/src/canonical/models/front-shiny/162--0--Furret.gif similarity index 100% rename from src/canonical/models/front-shiny/Furret.gif rename to src/canonical/models/front-shiny/162--0--Furret.gif diff --git a/src/canonical/models/front-shiny/Hoothoot.gif b/src/canonical/models/front-shiny/163--0--Hoothoot.gif similarity index 100% rename from src/canonical/models/front-shiny/Hoothoot.gif rename to src/canonical/models/front-shiny/163--0--Hoothoot.gif diff --git a/src/canonical/models/front-shiny/Noctowl.gif b/src/canonical/models/front-shiny/164--0--Noctowl.gif similarity index 100% rename from src/canonical/models/front-shiny/Noctowl.gif rename to src/canonical/models/front-shiny/164--0--Noctowl.gif diff --git a/src/canonical/models/front-shiny/Ledyba.gif b/src/canonical/models/front-shiny/165--0--Ledyba.gif similarity index 100% rename from src/canonical/models/front-shiny/Ledyba.gif rename to src/canonical/models/front-shiny/165--0--Ledyba.gif diff --git a/src/canonical/models/front-shiny/Ledian.gif b/src/canonical/models/front-shiny/166--0--Ledian.gif similarity index 100% rename from src/canonical/models/front-shiny/Ledian.gif rename to src/canonical/models/front-shiny/166--0--Ledian.gif diff --git a/src/canonical/models/front-shiny/Spinarak.gif b/src/canonical/models/front-shiny/167--0--Spinarak.gif similarity index 100% rename from src/canonical/models/front-shiny/Spinarak.gif rename to src/canonical/models/front-shiny/167--0--Spinarak.gif diff --git a/src/canonical/models/front-shiny/Ariados.gif b/src/canonical/models/front-shiny/168--0--Ariados.gif similarity index 100% rename from src/canonical/models/front-shiny/Ariados.gif rename to src/canonical/models/front-shiny/168--0--Ariados.gif diff --git a/src/canonical/models/front-shiny/Crobat.gif b/src/canonical/models/front-shiny/169--0--Crobat.gif similarity index 100% rename from src/canonical/models/front-shiny/Crobat.gif rename to src/canonical/models/front-shiny/169--0--Crobat.gif diff --git a/src/canonical/models/front-shiny/Pidgeotto.gif b/src/canonical/models/front-shiny/17--0--Pidgeotto.gif similarity index 100% rename from src/canonical/models/front-shiny/Pidgeotto.gif rename to src/canonical/models/front-shiny/17--0--Pidgeotto.gif diff --git a/src/canonical/models/front-shiny/Chinchou.gif b/src/canonical/models/front-shiny/170--0--Chinchou.gif similarity index 100% rename from src/canonical/models/front-shiny/Chinchou.gif rename to src/canonical/models/front-shiny/170--0--Chinchou.gif diff --git a/src/canonical/models/front-shiny/Lanturn.gif b/src/canonical/models/front-shiny/171--0--Lanturn.gif similarity index 100% rename from src/canonical/models/front-shiny/Lanturn.gif rename to src/canonical/models/front-shiny/171--0--Lanturn.gif diff --git a/src/canonical/models/front-shiny/Pichu.gif b/src/canonical/models/front-shiny/172--0--Pichu.gif similarity index 100% rename from src/canonical/models/front-shiny/Pichu.gif rename to src/canonical/models/front-shiny/172--0--Pichu.gif diff --git a/src/canonical/models/front-shiny/Cleffa.gif b/src/canonical/models/front-shiny/173--0--Cleffa.gif similarity index 100% rename from src/canonical/models/front-shiny/Cleffa.gif rename to src/canonical/models/front-shiny/173--0--Cleffa.gif diff --git a/src/canonical/models/front-shiny/Igglybuff.gif b/src/canonical/models/front-shiny/174--0--Igglybuff.gif similarity index 100% rename from src/canonical/models/front-shiny/Igglybuff.gif rename to src/canonical/models/front-shiny/174--0--Igglybuff.gif diff --git a/src/canonical/models/front-shiny/Togepi.gif b/src/canonical/models/front-shiny/175--0--Togepi.gif similarity index 100% rename from src/canonical/models/front-shiny/Togepi.gif rename to src/canonical/models/front-shiny/175--0--Togepi.gif diff --git a/src/canonical/models/front-shiny/Togetic.gif b/src/canonical/models/front-shiny/176--0--Togetic.gif similarity index 100% rename from src/canonical/models/front-shiny/Togetic.gif rename to src/canonical/models/front-shiny/176--0--Togetic.gif diff --git a/src/canonical/models/front-shiny/Natu.gif b/src/canonical/models/front-shiny/177--0--Natu.gif similarity index 100% rename from src/canonical/models/front-shiny/Natu.gif rename to src/canonical/models/front-shiny/177--0--Natu.gif diff --git a/src/canonical/models/front-shiny/Xatu.gif b/src/canonical/models/front-shiny/178--0--Xatu.gif similarity index 100% rename from src/canonical/models/front-shiny/Xatu.gif rename to src/canonical/models/front-shiny/178--0--Xatu.gif diff --git a/src/canonical/models/front-shiny/Mareep.gif b/src/canonical/models/front-shiny/179--0--Mareep.gif similarity index 100% rename from src/canonical/models/front-shiny/Mareep.gif rename to src/canonical/models/front-shiny/179--0--Mareep.gif diff --git a/src/canonical/models/front-shiny/Pidgeot.gif b/src/canonical/models/front-shiny/18--0--Pidgeot.gif similarity index 100% rename from src/canonical/models/front-shiny/Pidgeot.gif rename to src/canonical/models/front-shiny/18--0--Pidgeot.gif diff --git a/src/canonical/models/front-shiny/Pidgeot--Mega.gif b/src/canonical/models/front-shiny/18--420--Pidgeot--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Pidgeot--Mega.gif rename to src/canonical/models/front-shiny/18--420--Pidgeot--Mega.gif diff --git a/src/canonical/models/front-shiny/Flaaffy.gif b/src/canonical/models/front-shiny/180--0--Flaaffy.gif similarity index 100% rename from src/canonical/models/front-shiny/Flaaffy.gif rename to src/canonical/models/front-shiny/180--0--Flaaffy.gif diff --git a/src/canonical/models/front-shiny/Ampharos.gif b/src/canonical/models/front-shiny/181--0--Ampharos.gif similarity index 100% rename from src/canonical/models/front-shiny/Ampharos.gif rename to src/canonical/models/front-shiny/181--0--Ampharos.gif diff --git a/src/canonical/models/front-shiny/Ampharos--Mega.gif b/src/canonical/models/front-shiny/181--420--Ampharos--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Ampharos--Mega.gif rename to src/canonical/models/front-shiny/181--420--Ampharos--Mega.gif diff --git a/src/canonical/models/front-shiny/Bellossom.gif b/src/canonical/models/front-shiny/182--0--Bellossom.gif similarity index 100% rename from src/canonical/models/front-shiny/Bellossom.gif rename to src/canonical/models/front-shiny/182--0--Bellossom.gif diff --git a/src/canonical/models/front-shiny/Marill.gif b/src/canonical/models/front-shiny/183--0--Marill.gif similarity index 100% rename from src/canonical/models/front-shiny/Marill.gif rename to src/canonical/models/front-shiny/183--0--Marill.gif diff --git a/src/canonical/models/front-shiny/Azumarill.gif b/src/canonical/models/front-shiny/184--0--Azumarill.gif similarity index 100% rename from src/canonical/models/front-shiny/Azumarill.gif rename to src/canonical/models/front-shiny/184--0--Azumarill.gif diff --git a/src/canonical/models/front-shiny/Sudowoodo.gif b/src/canonical/models/front-shiny/185--0--Sudowoodo.gif similarity index 100% rename from src/canonical/models/front-shiny/Sudowoodo.gif rename to src/canonical/models/front-shiny/185--0--Sudowoodo.gif diff --git a/src/canonical/models/front-shiny/Politoed.gif b/src/canonical/models/front-shiny/186--0--Politoed.gif similarity index 100% rename from src/canonical/models/front-shiny/Politoed.gif rename to src/canonical/models/front-shiny/186--0--Politoed.gif diff --git a/src/canonical/models/front-shiny/Hoppip.gif b/src/canonical/models/front-shiny/187--0--Hoppip.gif similarity index 100% rename from src/canonical/models/front-shiny/Hoppip.gif rename to src/canonical/models/front-shiny/187--0--Hoppip.gif diff --git a/src/canonical/models/front-shiny/Skiploom.gif b/src/canonical/models/front-shiny/188--0--Skiploom.gif similarity index 100% rename from src/canonical/models/front-shiny/Skiploom.gif rename to src/canonical/models/front-shiny/188--0--Skiploom.gif diff --git a/src/canonical/models/front-shiny/Jumpluff.gif b/src/canonical/models/front-shiny/189--0--Jumpluff.gif similarity index 100% rename from src/canonical/models/front-shiny/Jumpluff.gif rename to src/canonical/models/front-shiny/189--0--Jumpluff.gif diff --git a/src/canonical/models/front-shiny/Rattata.gif b/src/canonical/models/front-shiny/19--0--Rattata.gif similarity index 100% rename from src/canonical/models/front-shiny/Rattata.gif rename to src/canonical/models/front-shiny/19--0--Rattata.gif diff --git a/src/canonical/models/front-shiny/Rattata--Alola.gif b/src/canonical/models/front-shiny/19--420--Rattata--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Rattata--Alola.gif rename to src/canonical/models/front-shiny/19--420--Rattata--Alola.gif diff --git a/src/canonical/models/front-shiny/Aipom.gif b/src/canonical/models/front-shiny/190--0--Aipom.gif similarity index 100% rename from src/canonical/models/front-shiny/Aipom.gif rename to src/canonical/models/front-shiny/190--0--Aipom.gif diff --git a/src/canonical/models/front-shiny/Sunkern.gif b/src/canonical/models/front-shiny/191--0--Sunkern.gif similarity index 100% rename from src/canonical/models/front-shiny/Sunkern.gif rename to src/canonical/models/front-shiny/191--0--Sunkern.gif diff --git a/src/canonical/models/front-shiny/Sunflora.gif b/src/canonical/models/front-shiny/192--0--Sunflora.gif similarity index 100% rename from src/canonical/models/front-shiny/Sunflora.gif rename to src/canonical/models/front-shiny/192--0--Sunflora.gif diff --git a/src/canonical/models/front-shiny/Yanma.gif b/src/canonical/models/front-shiny/193--0--Yanma.gif similarity index 100% rename from src/canonical/models/front-shiny/Yanma.gif rename to src/canonical/models/front-shiny/193--0--Yanma.gif diff --git a/src/canonical/models/front-shiny/Wooper.gif b/src/canonical/models/front-shiny/194--0--Wooper.gif similarity index 100% rename from src/canonical/models/front-shiny/Wooper.gif rename to src/canonical/models/front-shiny/194--0--Wooper.gif diff --git a/src/canonical/models/front-shiny/Quagsire.gif b/src/canonical/models/front-shiny/195--0--Quagsire.gif similarity index 100% rename from src/canonical/models/front-shiny/Quagsire.gif rename to src/canonical/models/front-shiny/195--0--Quagsire.gif diff --git a/src/canonical/models/front-shiny/Espeon.gif b/src/canonical/models/front-shiny/196--0--Espeon.gif similarity index 100% rename from src/canonical/models/front-shiny/Espeon.gif rename to src/canonical/models/front-shiny/196--0--Espeon.gif diff --git a/src/canonical/models/front-shiny/Umbreon.gif b/src/canonical/models/front-shiny/197--0--Umbreon.gif similarity index 100% rename from src/canonical/models/front-shiny/Umbreon.gif rename to src/canonical/models/front-shiny/197--0--Umbreon.gif diff --git a/src/canonical/models/front-shiny/Murkrow.gif b/src/canonical/models/front-shiny/198--0--Murkrow.gif similarity index 100% rename from src/canonical/models/front-shiny/Murkrow.gif rename to src/canonical/models/front-shiny/198--0--Murkrow.gif diff --git a/src/canonical/models/front-shiny/Slowking.gif b/src/canonical/models/front-shiny/199--0--Slowking.gif similarity index 100% rename from src/canonical/models/front-shiny/Slowking.gif rename to src/canonical/models/front-shiny/199--0--Slowking.gif diff --git a/src/canonical/models/front-shiny/Ivysaur.gif b/src/canonical/models/front-shiny/2--0--Ivysaur.gif similarity index 100% rename from src/canonical/models/front-shiny/Ivysaur.gif rename to src/canonical/models/front-shiny/2--0--Ivysaur.gif diff --git a/src/canonical/models/front-shiny/Raticate.gif b/src/canonical/models/front-shiny/20--0--Raticate.gif similarity index 100% rename from src/canonical/models/front-shiny/Raticate.gif rename to src/canonical/models/front-shiny/20--0--Raticate.gif diff --git a/src/canonical/models/front-shiny/Raticate--Alola-Totem.gif b/src/canonical/models/front-shiny/20--420--Raticate--Alola-Totem.gif similarity index 100% rename from src/canonical/models/front-shiny/Raticate--Alola-Totem.gif rename to src/canonical/models/front-shiny/20--420--Raticate--Alola-Totem.gif diff --git a/src/canonical/models/front-shiny/Raticate--Alola.gif b/src/canonical/models/front-shiny/20--420--Raticate--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Raticate--Alola.gif rename to src/canonical/models/front-shiny/20--420--Raticate--Alola.gif diff --git a/src/canonical/models/front-shiny/Misdreavus.gif b/src/canonical/models/front-shiny/200--0--Misdreavus.gif similarity index 100% rename from src/canonical/models/front-shiny/Misdreavus.gif rename to src/canonical/models/front-shiny/200--0--Misdreavus.gif diff --git a/src/canonical/models/front-shiny/201--0--Unown.gif b/src/canonical/models/front-shiny/201--0--Unown.gif new file mode 120000 index 00000000..b9db12cd --- /dev/null +++ b/src/canonical/models/front-shiny/201--0--Unown.gif @@ -0,0 +1 @@ +../front-shiny-cosmetic/201--420--Unown--A.gif \ No newline at end of file diff --git a/src/canonical/models/front-shiny/Wobbuffet.gif b/src/canonical/models/front-shiny/202--0--Wobbuffet.gif similarity index 100% rename from src/canonical/models/front-shiny/Wobbuffet.gif rename to src/canonical/models/front-shiny/202--0--Wobbuffet.gif diff --git a/src/canonical/models/front-shiny/Girafarig.gif b/src/canonical/models/front-shiny/203--0--Girafarig.gif similarity index 100% rename from src/canonical/models/front-shiny/Girafarig.gif rename to src/canonical/models/front-shiny/203--0--Girafarig.gif diff --git a/src/canonical/models/front-shiny/Pineco.gif b/src/canonical/models/front-shiny/204--0--Pineco.gif similarity index 100% rename from src/canonical/models/front-shiny/Pineco.gif rename to src/canonical/models/front-shiny/204--0--Pineco.gif diff --git a/src/canonical/models/front-shiny/Forretress.gif b/src/canonical/models/front-shiny/205--0--Forretress.gif similarity index 100% rename from src/canonical/models/front-shiny/Forretress.gif rename to src/canonical/models/front-shiny/205--0--Forretress.gif diff --git a/src/canonical/models/front-shiny/Dunsparce.gif b/src/canonical/models/front-shiny/206--0--Dunsparce.gif similarity index 100% rename from src/canonical/models/front-shiny/Dunsparce.gif rename to src/canonical/models/front-shiny/206--0--Dunsparce.gif diff --git a/src/canonical/models/front-shiny/Gligar.gif b/src/canonical/models/front-shiny/207--0--Gligar.gif similarity index 100% rename from src/canonical/models/front-shiny/Gligar.gif rename to src/canonical/models/front-shiny/207--0--Gligar.gif diff --git a/src/canonical/models/front-shiny/Steelix.gif b/src/canonical/models/front-shiny/208--0--Steelix.gif similarity index 100% rename from src/canonical/models/front-shiny/Steelix.gif rename to src/canonical/models/front-shiny/208--0--Steelix.gif diff --git a/src/canonical/models/front-shiny/Steelix--Mega.gif b/src/canonical/models/front-shiny/208--420--Steelix--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Steelix--Mega.gif rename to src/canonical/models/front-shiny/208--420--Steelix--Mega.gif diff --git a/src/canonical/models/front-shiny/Snubbull.gif b/src/canonical/models/front-shiny/209--0--Snubbull.gif similarity index 100% rename from src/canonical/models/front-shiny/Snubbull.gif rename to src/canonical/models/front-shiny/209--0--Snubbull.gif diff --git a/src/canonical/models/front-shiny/Spearow.gif b/src/canonical/models/front-shiny/21--0--Spearow.gif similarity index 100% rename from src/canonical/models/front-shiny/Spearow.gif rename to src/canonical/models/front-shiny/21--0--Spearow.gif diff --git a/src/canonical/models/front-shiny/Granbull.gif b/src/canonical/models/front-shiny/210--0--Granbull.gif similarity index 100% rename from src/canonical/models/front-shiny/Granbull.gif rename to src/canonical/models/front-shiny/210--0--Granbull.gif diff --git a/src/canonical/models/front-shiny/Qwilfish.gif b/src/canonical/models/front-shiny/211--0--Qwilfish.gif similarity index 100% rename from src/canonical/models/front-shiny/Qwilfish.gif rename to src/canonical/models/front-shiny/211--0--Qwilfish.gif diff --git a/src/canonical/models/front-shiny/Scizor.gif b/src/canonical/models/front-shiny/212--0--Scizor.gif similarity index 100% rename from src/canonical/models/front-shiny/Scizor.gif rename to src/canonical/models/front-shiny/212--0--Scizor.gif diff --git a/src/canonical/models/front-shiny/Scizor--Mega.gif b/src/canonical/models/front-shiny/212--420--Scizor--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Scizor--Mega.gif rename to src/canonical/models/front-shiny/212--420--Scizor--Mega.gif diff --git a/src/canonical/models/front-shiny/Shuckle.gif b/src/canonical/models/front-shiny/213--0--Shuckle.gif similarity index 100% rename from src/canonical/models/front-shiny/Shuckle.gif rename to src/canonical/models/front-shiny/213--0--Shuckle.gif diff --git a/src/canonical/models/front-shiny/Heracross.gif b/src/canonical/models/front-shiny/214--0--Heracross.gif similarity index 100% rename from src/canonical/models/front-shiny/Heracross.gif rename to src/canonical/models/front-shiny/214--0--Heracross.gif diff --git a/src/canonical/models/front-shiny/Heracross--Mega.gif b/src/canonical/models/front-shiny/214--420--Heracross--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Heracross--Mega.gif rename to src/canonical/models/front-shiny/214--420--Heracross--Mega.gif diff --git a/src/canonical/models/front-shiny/Sneasel.gif b/src/canonical/models/front-shiny/215--0--Sneasel.gif similarity index 100% rename from src/canonical/models/front-shiny/Sneasel.gif rename to src/canonical/models/front-shiny/215--0--Sneasel.gif diff --git a/src/canonical/models/front-shiny/Teddiursa.gif b/src/canonical/models/front-shiny/216--0--Teddiursa.gif similarity index 100% rename from src/canonical/models/front-shiny/Teddiursa.gif rename to src/canonical/models/front-shiny/216--0--Teddiursa.gif diff --git a/src/canonical/models/front-shiny/Ursaring.gif b/src/canonical/models/front-shiny/217--0--Ursaring.gif similarity index 100% rename from src/canonical/models/front-shiny/Ursaring.gif rename to src/canonical/models/front-shiny/217--0--Ursaring.gif diff --git a/src/canonical/models/front-shiny/Slugma.gif b/src/canonical/models/front-shiny/218--0--Slugma.gif similarity index 100% rename from src/canonical/models/front-shiny/Slugma.gif rename to src/canonical/models/front-shiny/218--0--Slugma.gif diff --git a/src/canonical/models/front-shiny/Magcargo.gif b/src/canonical/models/front-shiny/219--0--Magcargo.gif similarity index 100% rename from src/canonical/models/front-shiny/Magcargo.gif rename to src/canonical/models/front-shiny/219--0--Magcargo.gif diff --git a/src/canonical/models/front-shiny/Fearow.gif b/src/canonical/models/front-shiny/22--0--Fearow.gif similarity index 100% rename from src/canonical/models/front-shiny/Fearow.gif rename to src/canonical/models/front-shiny/22--0--Fearow.gif diff --git a/src/canonical/models/front-shiny/Swinub.gif b/src/canonical/models/front-shiny/220--0--Swinub.gif similarity index 100% rename from src/canonical/models/front-shiny/Swinub.gif rename to src/canonical/models/front-shiny/220--0--Swinub.gif diff --git a/src/canonical/models/front-shiny/Piloswine.gif b/src/canonical/models/front-shiny/221--0--Piloswine.gif similarity index 100% rename from src/canonical/models/front-shiny/Piloswine.gif rename to src/canonical/models/front-shiny/221--0--Piloswine.gif diff --git a/src/canonical/models/front-shiny/Corsola.gif b/src/canonical/models/front-shiny/222--0--Corsola.gif similarity index 100% rename from src/canonical/models/front-shiny/Corsola.gif rename to src/canonical/models/front-shiny/222--0--Corsola.gif diff --git a/src/canonical/models/front-shiny/Corsola--Galar.gif b/src/canonical/models/front-shiny/222--420--Corsola--Galar.gif similarity index 100% rename from src/canonical/models/front-shiny/Corsola--Galar.gif rename to src/canonical/models/front-shiny/222--420--Corsola--Galar.gif diff --git a/src/canonical/models/front-shiny/Remoraid.gif b/src/canonical/models/front-shiny/223--0--Remoraid.gif similarity index 100% rename from src/canonical/models/front-shiny/Remoraid.gif rename to src/canonical/models/front-shiny/223--0--Remoraid.gif diff --git a/src/canonical/models/front-shiny/Octillery.gif b/src/canonical/models/front-shiny/224--0--Octillery.gif similarity index 100% rename from src/canonical/models/front-shiny/Octillery.gif rename to src/canonical/models/front-shiny/224--0--Octillery.gif diff --git a/src/canonical/models/front-shiny/Delibird.gif b/src/canonical/models/front-shiny/225--0--Delibird.gif similarity index 100% rename from src/canonical/models/front-shiny/Delibird.gif rename to src/canonical/models/front-shiny/225--0--Delibird.gif diff --git a/src/canonical/models/front-shiny/Mantine.gif b/src/canonical/models/front-shiny/226--0--Mantine.gif similarity index 100% rename from src/canonical/models/front-shiny/Mantine.gif rename to src/canonical/models/front-shiny/226--0--Mantine.gif diff --git a/src/canonical/models/front-shiny/Skarmory.gif b/src/canonical/models/front-shiny/227--0--Skarmory.gif similarity index 100% rename from src/canonical/models/front-shiny/Skarmory.gif rename to src/canonical/models/front-shiny/227--0--Skarmory.gif diff --git a/src/canonical/models/front-shiny/Houndour.gif b/src/canonical/models/front-shiny/228--0--Houndour.gif similarity index 100% rename from src/canonical/models/front-shiny/Houndour.gif rename to src/canonical/models/front-shiny/228--0--Houndour.gif diff --git a/src/canonical/models/front-shiny/Houndoom.gif b/src/canonical/models/front-shiny/229--0--Houndoom.gif similarity index 100% rename from src/canonical/models/front-shiny/Houndoom.gif rename to src/canonical/models/front-shiny/229--0--Houndoom.gif diff --git a/src/canonical/models/front-shiny/Houndoom--Mega.gif b/src/canonical/models/front-shiny/229--420--Houndoom--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Houndoom--Mega.gif rename to src/canonical/models/front-shiny/229--420--Houndoom--Mega.gif diff --git a/src/canonical/models/front-shiny/Ekans.gif b/src/canonical/models/front-shiny/23--0--Ekans.gif similarity index 100% rename from src/canonical/models/front-shiny/Ekans.gif rename to src/canonical/models/front-shiny/23--0--Ekans.gif diff --git a/src/canonical/models/front-shiny/Kingdra.gif b/src/canonical/models/front-shiny/230--0--Kingdra.gif similarity index 100% rename from src/canonical/models/front-shiny/Kingdra.gif rename to src/canonical/models/front-shiny/230--0--Kingdra.gif diff --git a/src/canonical/models/front-shiny/Phanpy.gif b/src/canonical/models/front-shiny/231--0--Phanpy.gif similarity index 100% rename from src/canonical/models/front-shiny/Phanpy.gif rename to src/canonical/models/front-shiny/231--0--Phanpy.gif diff --git a/src/canonical/models/front-shiny/Donphan.gif b/src/canonical/models/front-shiny/232--0--Donphan.gif similarity index 100% rename from src/canonical/models/front-shiny/Donphan.gif rename to src/canonical/models/front-shiny/232--0--Donphan.gif diff --git a/src/canonical/models/front-shiny/Porygon2.gif b/src/canonical/models/front-shiny/233--0--Porygon2.gif similarity index 100% rename from src/canonical/models/front-shiny/Porygon2.gif rename to src/canonical/models/front-shiny/233--0--Porygon2.gif diff --git a/src/canonical/models/front-shiny/Stantler.gif b/src/canonical/models/front-shiny/234--0--Stantler.gif similarity index 100% rename from src/canonical/models/front-shiny/Stantler.gif rename to src/canonical/models/front-shiny/234--0--Stantler.gif diff --git a/src/canonical/models/front-shiny/Smeargle.gif b/src/canonical/models/front-shiny/235--0--Smeargle.gif similarity index 100% rename from src/canonical/models/front-shiny/Smeargle.gif rename to src/canonical/models/front-shiny/235--0--Smeargle.gif diff --git a/src/canonical/models/front-shiny/Tyrogue.gif b/src/canonical/models/front-shiny/236--0--Tyrogue.gif similarity index 100% rename from src/canonical/models/front-shiny/Tyrogue.gif rename to src/canonical/models/front-shiny/236--0--Tyrogue.gif diff --git a/src/canonical/models/front-shiny/Hitmontop.gif b/src/canonical/models/front-shiny/237--0--Hitmontop.gif similarity index 100% rename from src/canonical/models/front-shiny/Hitmontop.gif rename to src/canonical/models/front-shiny/237--0--Hitmontop.gif diff --git a/src/canonical/models/front-shiny/Smoochum.gif b/src/canonical/models/front-shiny/238--0--Smoochum.gif similarity index 100% rename from src/canonical/models/front-shiny/Smoochum.gif rename to src/canonical/models/front-shiny/238--0--Smoochum.gif diff --git a/src/canonical/models/front-shiny/Elekid.gif b/src/canonical/models/front-shiny/239--0--Elekid.gif similarity index 100% rename from src/canonical/models/front-shiny/Elekid.gif rename to src/canonical/models/front-shiny/239--0--Elekid.gif diff --git a/src/canonical/models/front-shiny/Arbok.gif b/src/canonical/models/front-shiny/24--0--Arbok.gif similarity index 100% rename from src/canonical/models/front-shiny/Arbok.gif rename to src/canonical/models/front-shiny/24--0--Arbok.gif diff --git a/src/canonical/models/front-shiny/Magby.gif b/src/canonical/models/front-shiny/240--0--Magby.gif similarity index 100% rename from src/canonical/models/front-shiny/Magby.gif rename to src/canonical/models/front-shiny/240--0--Magby.gif diff --git a/src/canonical/models/front-shiny/Miltank.gif b/src/canonical/models/front-shiny/241--0--Miltank.gif similarity index 100% rename from src/canonical/models/front-shiny/Miltank.gif rename to src/canonical/models/front-shiny/241--0--Miltank.gif diff --git a/src/canonical/models/front-shiny/Blissey.gif b/src/canonical/models/front-shiny/242--0--Blissey.gif similarity index 100% rename from src/canonical/models/front-shiny/Blissey.gif rename to src/canonical/models/front-shiny/242--0--Blissey.gif diff --git a/src/canonical/models/front-shiny/Raikou.gif b/src/canonical/models/front-shiny/243--0--Raikou.gif similarity index 100% rename from src/canonical/models/front-shiny/Raikou.gif rename to src/canonical/models/front-shiny/243--0--Raikou.gif diff --git a/src/canonical/models/front-shiny/Entei.gif b/src/canonical/models/front-shiny/244--0--Entei.gif similarity index 100% rename from src/canonical/models/front-shiny/Entei.gif rename to src/canonical/models/front-shiny/244--0--Entei.gif diff --git a/src/canonical/models/front-shiny/Suicune.gif b/src/canonical/models/front-shiny/245--0--Suicune.gif similarity index 100% rename from src/canonical/models/front-shiny/Suicune.gif rename to src/canonical/models/front-shiny/245--0--Suicune.gif diff --git a/src/canonical/models/front-shiny/Larvitar.gif b/src/canonical/models/front-shiny/246--0--Larvitar.gif similarity index 100% rename from src/canonical/models/front-shiny/Larvitar.gif rename to src/canonical/models/front-shiny/246--0--Larvitar.gif diff --git a/src/canonical/models/front-shiny/Pupitar.gif b/src/canonical/models/front-shiny/247--0--Pupitar.gif similarity index 100% rename from src/canonical/models/front-shiny/Pupitar.gif rename to src/canonical/models/front-shiny/247--0--Pupitar.gif diff --git a/src/canonical/models/front-shiny/Tyranitar.gif b/src/canonical/models/front-shiny/248--0--Tyranitar.gif similarity index 100% rename from src/canonical/models/front-shiny/Tyranitar.gif rename to src/canonical/models/front-shiny/248--0--Tyranitar.gif diff --git a/src/canonical/models/front-shiny/Tyranitar--Mega.gif b/src/canonical/models/front-shiny/248--420--Tyranitar--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Tyranitar--Mega.gif rename to src/canonical/models/front-shiny/248--420--Tyranitar--Mega.gif diff --git a/src/canonical/models/front-shiny/Lugia.gif b/src/canonical/models/front-shiny/249--0--Lugia.gif similarity index 100% rename from src/canonical/models/front-shiny/Lugia.gif rename to src/canonical/models/front-shiny/249--0--Lugia.gif diff --git a/src/canonical/models/front-shiny/Pikachu.gif b/src/canonical/models/front-shiny/25--0--Pikachu.gif similarity index 100% rename from src/canonical/models/front-shiny/Pikachu.gif rename to src/canonical/models/front-shiny/25--0--Pikachu.gif diff --git a/src/canonical/models/front-shiny/25--420--Pikachu--Alola.gif b/src/canonical/models/front-shiny/25--420--Pikachu--Alola.gif new file mode 120000 index 00000000..dca01b2c --- /dev/null +++ b/src/canonical/models/front-shiny/25--420--Pikachu--Alola.gif @@ -0,0 +1 @@ +../front/25--420--Pikachu--Alola.gif \ No newline at end of file diff --git a/src/canonical/models/front-shiny/Pikachu--Belle.gif b/src/canonical/models/front-shiny/25--420--Pikachu--Belle.gif similarity index 100% rename from src/canonical/models/front-shiny/Pikachu--Belle.gif rename to src/canonical/models/front-shiny/25--420--Pikachu--Belle.gif diff --git a/src/canonical/models/front-shiny/Pikachu--Cosplay.gif b/src/canonical/models/front-shiny/25--420--Pikachu--Cosplay.gif similarity index 100% rename from src/canonical/models/front-shiny/Pikachu--Cosplay.gif rename to src/canonical/models/front-shiny/25--420--Pikachu--Cosplay.gif diff --git a/src/canonical/models/front-shiny/Pikachu--Gmax.gif b/src/canonical/models/front-shiny/25--420--Pikachu--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Pikachu--Gmax.gif rename to src/canonical/models/front-shiny/25--420--Pikachu--Gmax.gif diff --git a/src/canonical/models/front-shiny/25--420--Pikachu--Hoenn.gif b/src/canonical/models/front-shiny/25--420--Pikachu--Hoenn.gif new file mode 120000 index 00000000..4a48460a --- /dev/null +++ b/src/canonical/models/front-shiny/25--420--Pikachu--Hoenn.gif @@ -0,0 +1 @@ +../front/25--420--Pikachu--Hoenn.gif \ No newline at end of file diff --git a/src/canonical/models/front-shiny/25--420--Pikachu--Kalos.gif b/src/canonical/models/front-shiny/25--420--Pikachu--Kalos.gif new file mode 120000 index 00000000..47d0fbc1 --- /dev/null +++ b/src/canonical/models/front-shiny/25--420--Pikachu--Kalos.gif @@ -0,0 +1 @@ +../front/25--420--Pikachu--Kalos.gif \ No newline at end of file diff --git a/src/canonical/models/front-shiny/Pikachu--Libre.gif b/src/canonical/models/front-shiny/25--420--Pikachu--Libre.gif similarity index 100% rename from src/canonical/models/front-shiny/Pikachu--Libre.gif rename to src/canonical/models/front-shiny/25--420--Pikachu--Libre.gif diff --git a/src/canonical/models/front-shiny/Pikachu--Partner.gif b/src/canonical/models/front-shiny/25--420--Pikachu--Partner.gif similarity index 100% rename from src/canonical/models/front-shiny/Pikachu--Partner.gif rename to src/canonical/models/front-shiny/25--420--Pikachu--Partner.gif diff --git a/src/canonical/models/front-shiny/Pikachu--PhD.gif b/src/canonical/models/front-shiny/25--420--Pikachu--PhD.gif similarity index 100% rename from src/canonical/models/front-shiny/Pikachu--PhD.gif rename to src/canonical/models/front-shiny/25--420--Pikachu--PhD.gif diff --git a/src/canonical/models/front-shiny/Pikachu--Pop-Star.gif b/src/canonical/models/front-shiny/25--420--Pikachu--Pop-Star.gif similarity index 100% rename from src/canonical/models/front-shiny/Pikachu--Pop-Star.gif rename to src/canonical/models/front-shiny/25--420--Pikachu--Pop-Star.gif diff --git a/src/canonical/models/front-shiny/Pikachu--Rock-Star.gif b/src/canonical/models/front-shiny/25--420--Pikachu--Rock-Star.gif similarity index 100% rename from src/canonical/models/front-shiny/Pikachu--Rock-Star.gif rename to src/canonical/models/front-shiny/25--420--Pikachu--Rock-Star.gif diff --git a/src/canonical/models/front-shiny/25--420--Pikachu--Sinnoh.gif b/src/canonical/models/front-shiny/25--420--Pikachu--Sinnoh.gif new file mode 120000 index 00000000..ada61b66 --- /dev/null +++ b/src/canonical/models/front-shiny/25--420--Pikachu--Sinnoh.gif @@ -0,0 +1 @@ +../front/25--420--Pikachu--Sinnoh.gif \ No newline at end of file diff --git a/src/canonical/models/front-shiny/25--420--Pikachu--Unova.gif b/src/canonical/models/front-shiny/25--420--Pikachu--Unova.gif new file mode 120000 index 00000000..3d470daf --- /dev/null +++ b/src/canonical/models/front-shiny/25--420--Pikachu--Unova.gif @@ -0,0 +1 @@ +../front/25--420--Pikachu--Unova.gif \ No newline at end of file diff --git a/src/canonical/models/front-shiny/Ho-Oh.gif b/src/canonical/models/front-shiny/250--0--Ho-Oh.gif similarity index 100% rename from src/canonical/models/front-shiny/Ho-Oh.gif rename to src/canonical/models/front-shiny/250--0--Ho-Oh.gif diff --git a/src/canonical/models/front-shiny/Celebi.gif b/src/canonical/models/front-shiny/251--0--Celebi.gif similarity index 100% rename from src/canonical/models/front-shiny/Celebi.gif rename to src/canonical/models/front-shiny/251--0--Celebi.gif diff --git a/src/canonical/models/front-shiny/Treecko.gif b/src/canonical/models/front-shiny/252--0--Treecko.gif similarity index 100% rename from src/canonical/models/front-shiny/Treecko.gif rename to src/canonical/models/front-shiny/252--0--Treecko.gif diff --git a/src/canonical/models/front-shiny/Grovyle.gif b/src/canonical/models/front-shiny/253--0--Grovyle.gif similarity index 100% rename from src/canonical/models/front-shiny/Grovyle.gif rename to src/canonical/models/front-shiny/253--0--Grovyle.gif diff --git a/src/canonical/models/front-shiny/Sceptile.gif b/src/canonical/models/front-shiny/254--0--Sceptile.gif similarity index 100% rename from src/canonical/models/front-shiny/Sceptile.gif rename to src/canonical/models/front-shiny/254--0--Sceptile.gif diff --git a/src/canonical/models/front-shiny/Sceptile--Mega.gif b/src/canonical/models/front-shiny/254--420--Sceptile--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Sceptile--Mega.gif rename to src/canonical/models/front-shiny/254--420--Sceptile--Mega.gif diff --git a/src/canonical/models/front-shiny/Torchic.gif b/src/canonical/models/front-shiny/255--0--Torchic.gif similarity index 100% rename from src/canonical/models/front-shiny/Torchic.gif rename to src/canonical/models/front-shiny/255--0--Torchic.gif diff --git a/src/canonical/models/front-shiny/Combusken.gif b/src/canonical/models/front-shiny/256--0--Combusken.gif similarity index 100% rename from src/canonical/models/front-shiny/Combusken.gif rename to src/canonical/models/front-shiny/256--0--Combusken.gif diff --git a/src/canonical/models/front-shiny/Blaziken.gif b/src/canonical/models/front-shiny/257--0--Blaziken.gif similarity index 100% rename from src/canonical/models/front-shiny/Blaziken.gif rename to src/canonical/models/front-shiny/257--0--Blaziken.gif diff --git a/src/canonical/models/front-shiny/Blaziken--Mega.gif b/src/canonical/models/front-shiny/257--420--Blaziken--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Blaziken--Mega.gif rename to src/canonical/models/front-shiny/257--420--Blaziken--Mega.gif diff --git a/src/canonical/models/front-shiny/Mudkip.gif b/src/canonical/models/front-shiny/258--0--Mudkip.gif similarity index 100% rename from src/canonical/models/front-shiny/Mudkip.gif rename to src/canonical/models/front-shiny/258--0--Mudkip.gif diff --git a/src/canonical/models/front-shiny/Marshtomp.gif b/src/canonical/models/front-shiny/259--0--Marshtomp.gif similarity index 100% rename from src/canonical/models/front-shiny/Marshtomp.gif rename to src/canonical/models/front-shiny/259--0--Marshtomp.gif diff --git a/src/canonical/models/front-shiny/Raichu.gif b/src/canonical/models/front-shiny/26--0--Raichu.gif similarity index 100% rename from src/canonical/models/front-shiny/Raichu.gif rename to src/canonical/models/front-shiny/26--0--Raichu.gif diff --git a/src/canonical/models/front-shiny/Raichu--Alola.gif b/src/canonical/models/front-shiny/26--420--Raichu--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Raichu--Alola.gif rename to src/canonical/models/front-shiny/26--420--Raichu--Alola.gif diff --git a/src/canonical/models/front-shiny/Swampert.gif b/src/canonical/models/front-shiny/260--0--Swampert.gif similarity index 100% rename from src/canonical/models/front-shiny/Swampert.gif rename to src/canonical/models/front-shiny/260--0--Swampert.gif diff --git a/src/canonical/models/front-shiny/Swampert--Mega.gif b/src/canonical/models/front-shiny/260--420--Swampert--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Swampert--Mega.gif rename to src/canonical/models/front-shiny/260--420--Swampert--Mega.gif diff --git a/src/canonical/models/front-shiny/Poochyena.gif b/src/canonical/models/front-shiny/261--0--Poochyena.gif similarity index 100% rename from src/canonical/models/front-shiny/Poochyena.gif rename to src/canonical/models/front-shiny/261--0--Poochyena.gif diff --git a/src/canonical/models/front-shiny/Mightyena.gif b/src/canonical/models/front-shiny/262--0--Mightyena.gif similarity index 100% rename from src/canonical/models/front-shiny/Mightyena.gif rename to src/canonical/models/front-shiny/262--0--Mightyena.gif diff --git a/src/canonical/models/front-shiny/Zigzagoon.gif b/src/canonical/models/front-shiny/263--0--Zigzagoon.gif similarity index 100% rename from src/canonical/models/front-shiny/Zigzagoon.gif rename to src/canonical/models/front-shiny/263--0--Zigzagoon.gif diff --git a/src/canonical/models/front-shiny/Zigzagoon--Galar.gif b/src/canonical/models/front-shiny/263--420--Zigzagoon--Galar.gif similarity index 100% rename from src/canonical/models/front-shiny/Zigzagoon--Galar.gif rename to src/canonical/models/front-shiny/263--420--Zigzagoon--Galar.gif diff --git a/src/canonical/models/front-shiny/Linoone.gif b/src/canonical/models/front-shiny/264--0--Linoone.gif similarity index 100% rename from src/canonical/models/front-shiny/Linoone.gif rename to src/canonical/models/front-shiny/264--0--Linoone.gif diff --git a/src/canonical/models/front-shiny/Linoone--Galar.gif b/src/canonical/models/front-shiny/264--420--Linoone--Galar.gif similarity index 100% rename from src/canonical/models/front-shiny/Linoone--Galar.gif rename to src/canonical/models/front-shiny/264--420--Linoone--Galar.gif diff --git a/src/canonical/models/front-shiny/Wurmple.gif b/src/canonical/models/front-shiny/265--0--Wurmple.gif similarity index 100% rename from src/canonical/models/front-shiny/Wurmple.gif rename to src/canonical/models/front-shiny/265--0--Wurmple.gif diff --git a/src/canonical/models/front-shiny/Silcoon.gif b/src/canonical/models/front-shiny/266--0--Silcoon.gif similarity index 100% rename from src/canonical/models/front-shiny/Silcoon.gif rename to src/canonical/models/front-shiny/266--0--Silcoon.gif diff --git a/src/canonical/models/front-shiny/Beautifly.gif b/src/canonical/models/front-shiny/267--0--Beautifly.gif similarity index 100% rename from src/canonical/models/front-shiny/Beautifly.gif rename to src/canonical/models/front-shiny/267--0--Beautifly.gif diff --git a/src/canonical/models/front-shiny/Cascoon.gif b/src/canonical/models/front-shiny/268--0--Cascoon.gif similarity index 100% rename from src/canonical/models/front-shiny/Cascoon.gif rename to src/canonical/models/front-shiny/268--0--Cascoon.gif diff --git a/src/canonical/models/front-shiny/Dustox.gif b/src/canonical/models/front-shiny/269--0--Dustox.gif similarity index 100% rename from src/canonical/models/front-shiny/Dustox.gif rename to src/canonical/models/front-shiny/269--0--Dustox.gif diff --git a/src/canonical/models/front-shiny/Sandshrew.gif b/src/canonical/models/front-shiny/27--0--Sandshrew.gif similarity index 100% rename from src/canonical/models/front-shiny/Sandshrew.gif rename to src/canonical/models/front-shiny/27--0--Sandshrew.gif diff --git a/src/canonical/models/front-shiny/Sandshrew--Alola.gif b/src/canonical/models/front-shiny/27--420--Sandshrew--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Sandshrew--Alola.gif rename to src/canonical/models/front-shiny/27--420--Sandshrew--Alola.gif diff --git a/src/canonical/models/front-shiny/Lotad.gif b/src/canonical/models/front-shiny/270--0--Lotad.gif similarity index 100% rename from src/canonical/models/front-shiny/Lotad.gif rename to src/canonical/models/front-shiny/270--0--Lotad.gif diff --git a/src/canonical/models/front-shiny/Lombre.gif b/src/canonical/models/front-shiny/271--0--Lombre.gif similarity index 100% rename from src/canonical/models/front-shiny/Lombre.gif rename to src/canonical/models/front-shiny/271--0--Lombre.gif diff --git a/src/canonical/models/front-shiny/Ludicolo.gif b/src/canonical/models/front-shiny/272--0--Ludicolo.gif similarity index 100% rename from src/canonical/models/front-shiny/Ludicolo.gif rename to src/canonical/models/front-shiny/272--0--Ludicolo.gif diff --git a/src/canonical/models/front-shiny/Seedot.gif b/src/canonical/models/front-shiny/273--0--Seedot.gif similarity index 100% rename from src/canonical/models/front-shiny/Seedot.gif rename to src/canonical/models/front-shiny/273--0--Seedot.gif diff --git a/src/canonical/models/front-shiny/Nuzleaf.gif b/src/canonical/models/front-shiny/274--0--Nuzleaf.gif similarity index 100% rename from src/canonical/models/front-shiny/Nuzleaf.gif rename to src/canonical/models/front-shiny/274--0--Nuzleaf.gif diff --git a/src/canonical/models/front-shiny/Shiftry.gif b/src/canonical/models/front-shiny/275--0--Shiftry.gif similarity index 100% rename from src/canonical/models/front-shiny/Shiftry.gif rename to src/canonical/models/front-shiny/275--0--Shiftry.gif diff --git a/src/canonical/models/front-shiny/Taillow.gif b/src/canonical/models/front-shiny/276--0--Taillow.gif similarity index 100% rename from src/canonical/models/front-shiny/Taillow.gif rename to src/canonical/models/front-shiny/276--0--Taillow.gif diff --git a/src/canonical/models/front-shiny/Swellow.gif b/src/canonical/models/front-shiny/277--0--Swellow.gif similarity index 100% rename from src/canonical/models/front-shiny/Swellow.gif rename to src/canonical/models/front-shiny/277--0--Swellow.gif diff --git a/src/canonical/models/front-shiny/Wingull.gif b/src/canonical/models/front-shiny/278--0--Wingull.gif similarity index 100% rename from src/canonical/models/front-shiny/Wingull.gif rename to src/canonical/models/front-shiny/278--0--Wingull.gif diff --git a/src/canonical/models/front-shiny/Pelipper.gif b/src/canonical/models/front-shiny/279--0--Pelipper.gif similarity index 100% rename from src/canonical/models/front-shiny/Pelipper.gif rename to src/canonical/models/front-shiny/279--0--Pelipper.gif diff --git a/src/canonical/models/front-shiny/Sandslash.gif b/src/canonical/models/front-shiny/28--0--Sandslash.gif similarity index 100% rename from src/canonical/models/front-shiny/Sandslash.gif rename to src/canonical/models/front-shiny/28--0--Sandslash.gif diff --git a/src/canonical/models/front-shiny/Sandslash--Alola.gif b/src/canonical/models/front-shiny/28--420--Sandslash--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Sandslash--Alola.gif rename to src/canonical/models/front-shiny/28--420--Sandslash--Alola.gif diff --git a/src/canonical/models/front-shiny/Ralts.gif b/src/canonical/models/front-shiny/280--0--Ralts.gif similarity index 100% rename from src/canonical/models/front-shiny/Ralts.gif rename to src/canonical/models/front-shiny/280--0--Ralts.gif diff --git a/src/canonical/models/front-shiny/Kirlia.gif b/src/canonical/models/front-shiny/281--0--Kirlia.gif similarity index 100% rename from src/canonical/models/front-shiny/Kirlia.gif rename to src/canonical/models/front-shiny/281--0--Kirlia.gif diff --git a/src/canonical/models/front-shiny/Gardevoir.gif b/src/canonical/models/front-shiny/282--0--Gardevoir.gif similarity index 100% rename from src/canonical/models/front-shiny/Gardevoir.gif rename to src/canonical/models/front-shiny/282--0--Gardevoir.gif diff --git a/src/canonical/models/front-shiny/Gardevoir--Mega.gif b/src/canonical/models/front-shiny/282--420--Gardevoir--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Gardevoir--Mega.gif rename to src/canonical/models/front-shiny/282--420--Gardevoir--Mega.gif diff --git a/src/canonical/models/front-shiny/Surskit.gif b/src/canonical/models/front-shiny/283--0--Surskit.gif similarity index 100% rename from src/canonical/models/front-shiny/Surskit.gif rename to src/canonical/models/front-shiny/283--0--Surskit.gif diff --git a/src/canonical/models/front-shiny/Masquerain.gif b/src/canonical/models/front-shiny/284--0--Masquerain.gif similarity index 100% rename from src/canonical/models/front-shiny/Masquerain.gif rename to src/canonical/models/front-shiny/284--0--Masquerain.gif diff --git a/src/canonical/models/front-shiny/Shroomish.gif b/src/canonical/models/front-shiny/285--0--Shroomish.gif similarity index 100% rename from src/canonical/models/front-shiny/Shroomish.gif rename to src/canonical/models/front-shiny/285--0--Shroomish.gif diff --git a/src/canonical/models/front-shiny/Breloom.gif b/src/canonical/models/front-shiny/286--0--Breloom.gif similarity index 100% rename from src/canonical/models/front-shiny/Breloom.gif rename to src/canonical/models/front-shiny/286--0--Breloom.gif diff --git a/src/canonical/models/front-shiny/Slakoth.gif b/src/canonical/models/front-shiny/287--0--Slakoth.gif similarity index 100% rename from src/canonical/models/front-shiny/Slakoth.gif rename to src/canonical/models/front-shiny/287--0--Slakoth.gif diff --git a/src/canonical/models/front-shiny/Vigoroth.gif b/src/canonical/models/front-shiny/288--0--Vigoroth.gif similarity index 100% rename from src/canonical/models/front-shiny/Vigoroth.gif rename to src/canonical/models/front-shiny/288--0--Vigoroth.gif diff --git a/src/canonical/models/front-shiny/Slaking.gif b/src/canonical/models/front-shiny/289--0--Slaking.gif similarity index 100% rename from src/canonical/models/front-shiny/Slaking.gif rename to src/canonical/models/front-shiny/289--0--Slaking.gif diff --git a/src/canonical/models/front-shiny/Nidoran-F.gif b/src/canonical/models/front-shiny/29--0--Nidoran-F.gif similarity index 100% rename from src/canonical/models/front-shiny/Nidoran-F.gif rename to src/canonical/models/front-shiny/29--0--Nidoran-F.gif diff --git a/src/canonical/models/front-shiny/Nincada.gif b/src/canonical/models/front-shiny/290--0--Nincada.gif similarity index 100% rename from src/canonical/models/front-shiny/Nincada.gif rename to src/canonical/models/front-shiny/290--0--Nincada.gif diff --git a/src/canonical/models/front-shiny/Ninjask.gif b/src/canonical/models/front-shiny/291--0--Ninjask.gif similarity index 100% rename from src/canonical/models/front-shiny/Ninjask.gif rename to src/canonical/models/front-shiny/291--0--Ninjask.gif diff --git a/src/canonical/models/front-shiny/Shedinja.gif b/src/canonical/models/front-shiny/292--0--Shedinja.gif similarity index 100% rename from src/canonical/models/front-shiny/Shedinja.gif rename to src/canonical/models/front-shiny/292--0--Shedinja.gif diff --git a/src/canonical/models/front-shiny/Whismur.gif b/src/canonical/models/front-shiny/293--0--Whismur.gif similarity index 100% rename from src/canonical/models/front-shiny/Whismur.gif rename to src/canonical/models/front-shiny/293--0--Whismur.gif diff --git a/src/canonical/models/front-shiny/Loudred.gif b/src/canonical/models/front-shiny/294--0--Loudred.gif similarity index 100% rename from src/canonical/models/front-shiny/Loudred.gif rename to src/canonical/models/front-shiny/294--0--Loudred.gif diff --git a/src/canonical/models/front-shiny/Exploud.gif b/src/canonical/models/front-shiny/295--0--Exploud.gif similarity index 100% rename from src/canonical/models/front-shiny/Exploud.gif rename to src/canonical/models/front-shiny/295--0--Exploud.gif diff --git a/src/canonical/models/front-shiny/Makuhita.gif b/src/canonical/models/front-shiny/296--0--Makuhita.gif similarity index 100% rename from src/canonical/models/front-shiny/Makuhita.gif rename to src/canonical/models/front-shiny/296--0--Makuhita.gif diff --git a/src/canonical/models/front-shiny/Hariyama.gif b/src/canonical/models/front-shiny/297--0--Hariyama.gif similarity index 100% rename from src/canonical/models/front-shiny/Hariyama.gif rename to src/canonical/models/front-shiny/297--0--Hariyama.gif diff --git a/src/canonical/models/front-shiny/Azurill.gif b/src/canonical/models/front-shiny/298--0--Azurill.gif similarity index 100% rename from src/canonical/models/front-shiny/Azurill.gif rename to src/canonical/models/front-shiny/298--0--Azurill.gif diff --git a/src/canonical/models/front-shiny/Nosepass.gif b/src/canonical/models/front-shiny/299--0--Nosepass.gif similarity index 100% rename from src/canonical/models/front-shiny/Nosepass.gif rename to src/canonical/models/front-shiny/299--0--Nosepass.gif diff --git a/src/canonical/models/front-shiny/Venusaur.gif b/src/canonical/models/front-shiny/3--0--Venusaur.gif similarity index 100% rename from src/canonical/models/front-shiny/Venusaur.gif rename to src/canonical/models/front-shiny/3--0--Venusaur.gif diff --git a/src/canonical/models/front-shiny/Venusaur--Mega.gif b/src/canonical/models/front-shiny/3--420--Venusaur--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Venusaur--Mega.gif rename to src/canonical/models/front-shiny/3--420--Venusaur--Mega.gif diff --git a/src/canonical/models/front-shiny/Nidorina.gif b/src/canonical/models/front-shiny/30--0--Nidorina.gif similarity index 100% rename from src/canonical/models/front-shiny/Nidorina.gif rename to src/canonical/models/front-shiny/30--0--Nidorina.gif diff --git a/src/canonical/models/front-shiny/Skitty.gif b/src/canonical/models/front-shiny/300--0--Skitty.gif similarity index 100% rename from src/canonical/models/front-shiny/Skitty.gif rename to src/canonical/models/front-shiny/300--0--Skitty.gif diff --git a/src/canonical/models/front-shiny/Delcatty.gif b/src/canonical/models/front-shiny/301--0--Delcatty.gif similarity index 100% rename from src/canonical/models/front-shiny/Delcatty.gif rename to src/canonical/models/front-shiny/301--0--Delcatty.gif diff --git a/src/canonical/models/front-shiny/Sableye.gif b/src/canonical/models/front-shiny/302--0--Sableye.gif similarity index 100% rename from src/canonical/models/front-shiny/Sableye.gif rename to src/canonical/models/front-shiny/302--0--Sableye.gif diff --git a/src/canonical/models/front-shiny/Sableye--Mega.gif b/src/canonical/models/front-shiny/302--420--Sableye--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Sableye--Mega.gif rename to src/canonical/models/front-shiny/302--420--Sableye--Mega.gif diff --git a/src/canonical/models/front-shiny/Mawile.gif b/src/canonical/models/front-shiny/303--0--Mawile.gif similarity index 100% rename from src/canonical/models/front-shiny/Mawile.gif rename to src/canonical/models/front-shiny/303--0--Mawile.gif diff --git a/src/canonical/models/front-shiny/Mawile--Mega.gif b/src/canonical/models/front-shiny/303--420--Mawile--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Mawile--Mega.gif rename to src/canonical/models/front-shiny/303--420--Mawile--Mega.gif diff --git a/src/canonical/models/front-shiny/Aron.gif b/src/canonical/models/front-shiny/304--0--Aron.gif similarity index 100% rename from src/canonical/models/front-shiny/Aron.gif rename to src/canonical/models/front-shiny/304--0--Aron.gif diff --git a/src/canonical/models/front-shiny/Lairon.gif b/src/canonical/models/front-shiny/305--0--Lairon.gif similarity index 100% rename from src/canonical/models/front-shiny/Lairon.gif rename to src/canonical/models/front-shiny/305--0--Lairon.gif diff --git a/src/canonical/models/front-shiny/Aggron.gif b/src/canonical/models/front-shiny/306--0--Aggron.gif similarity index 100% rename from src/canonical/models/front-shiny/Aggron.gif rename to src/canonical/models/front-shiny/306--0--Aggron.gif diff --git a/src/canonical/models/front-shiny/Aggron--Mega.gif b/src/canonical/models/front-shiny/306--420--Aggron--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Aggron--Mega.gif rename to src/canonical/models/front-shiny/306--420--Aggron--Mega.gif diff --git a/src/canonical/models/front-shiny/Meditite.gif b/src/canonical/models/front-shiny/307--0--Meditite.gif similarity index 100% rename from src/canonical/models/front-shiny/Meditite.gif rename to src/canonical/models/front-shiny/307--0--Meditite.gif diff --git a/src/canonical/models/front-shiny/Medicham.gif b/src/canonical/models/front-shiny/308--0--Medicham.gif similarity index 100% rename from src/canonical/models/front-shiny/Medicham.gif rename to src/canonical/models/front-shiny/308--0--Medicham.gif diff --git a/src/canonical/models/front-shiny/Medicham--Mega.gif b/src/canonical/models/front-shiny/308--420--Medicham--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Medicham--Mega.gif rename to src/canonical/models/front-shiny/308--420--Medicham--Mega.gif diff --git a/src/canonical/models/front-shiny/Electrike.gif b/src/canonical/models/front-shiny/309--0--Electrike.gif similarity index 100% rename from src/canonical/models/front-shiny/Electrike.gif rename to src/canonical/models/front-shiny/309--0--Electrike.gif diff --git a/src/canonical/models/front-shiny/Nidoqueen.gif b/src/canonical/models/front-shiny/31--0--Nidoqueen.gif similarity index 100% rename from src/canonical/models/front-shiny/Nidoqueen.gif rename to src/canonical/models/front-shiny/31--0--Nidoqueen.gif diff --git a/src/canonical/models/front-shiny/Manectric.gif b/src/canonical/models/front-shiny/310--0--Manectric.gif similarity index 100% rename from src/canonical/models/front-shiny/Manectric.gif rename to src/canonical/models/front-shiny/310--0--Manectric.gif diff --git a/src/canonical/models/front-shiny/Manectric--Mega.gif b/src/canonical/models/front-shiny/310--420--Manectric--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Manectric--Mega.gif rename to src/canonical/models/front-shiny/310--420--Manectric--Mega.gif diff --git a/src/canonical/models/front-shiny/Plusle.gif b/src/canonical/models/front-shiny/311--0--Plusle.gif similarity index 100% rename from src/canonical/models/front-shiny/Plusle.gif rename to src/canonical/models/front-shiny/311--0--Plusle.gif diff --git a/src/canonical/models/front-shiny/Minun.gif b/src/canonical/models/front-shiny/312--0--Minun.gif similarity index 100% rename from src/canonical/models/front-shiny/Minun.gif rename to src/canonical/models/front-shiny/312--0--Minun.gif diff --git a/src/canonical/models/front-shiny/Volbeat.gif b/src/canonical/models/front-shiny/313--0--Volbeat.gif similarity index 100% rename from src/canonical/models/front-shiny/Volbeat.gif rename to src/canonical/models/front-shiny/313--0--Volbeat.gif diff --git a/src/canonical/models/front-shiny/Illumise.gif b/src/canonical/models/front-shiny/314--0--Illumise.gif similarity index 100% rename from src/canonical/models/front-shiny/Illumise.gif rename to src/canonical/models/front-shiny/314--0--Illumise.gif diff --git a/src/canonical/models/front-shiny/Roselia.gif b/src/canonical/models/front-shiny/315--0--Roselia.gif similarity index 100% rename from src/canonical/models/front-shiny/Roselia.gif rename to src/canonical/models/front-shiny/315--0--Roselia.gif diff --git a/src/canonical/models/front-shiny/Gulpin.gif b/src/canonical/models/front-shiny/316--0--Gulpin.gif similarity index 100% rename from src/canonical/models/front-shiny/Gulpin.gif rename to src/canonical/models/front-shiny/316--0--Gulpin.gif diff --git a/src/canonical/models/front-shiny/Swalot.gif b/src/canonical/models/front-shiny/317--0--Swalot.gif similarity index 100% rename from src/canonical/models/front-shiny/Swalot.gif rename to src/canonical/models/front-shiny/317--0--Swalot.gif diff --git a/src/canonical/models/front-shiny/Carvanha.gif b/src/canonical/models/front-shiny/318--0--Carvanha.gif similarity index 100% rename from src/canonical/models/front-shiny/Carvanha.gif rename to src/canonical/models/front-shiny/318--0--Carvanha.gif diff --git a/src/canonical/models/front-shiny/Sharpedo.gif b/src/canonical/models/front-shiny/319--0--Sharpedo.gif similarity index 100% rename from src/canonical/models/front-shiny/Sharpedo.gif rename to src/canonical/models/front-shiny/319--0--Sharpedo.gif diff --git a/src/canonical/models/front-shiny/Sharpedo--Mega.gif b/src/canonical/models/front-shiny/319--420--Sharpedo--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Sharpedo--Mega.gif rename to src/canonical/models/front-shiny/319--420--Sharpedo--Mega.gif diff --git a/src/canonical/models/front-shiny/Nidoran-M.gif b/src/canonical/models/front-shiny/32--0--Nidoran-M.gif similarity index 100% rename from src/canonical/models/front-shiny/Nidoran-M.gif rename to src/canonical/models/front-shiny/32--0--Nidoran-M.gif diff --git a/src/canonical/models/front-shiny/Wailmer.gif b/src/canonical/models/front-shiny/320--0--Wailmer.gif similarity index 100% rename from src/canonical/models/front-shiny/Wailmer.gif rename to src/canonical/models/front-shiny/320--0--Wailmer.gif diff --git a/src/canonical/models/front-shiny/Wailord.gif b/src/canonical/models/front-shiny/321--0--Wailord.gif similarity index 100% rename from src/canonical/models/front-shiny/Wailord.gif rename to src/canonical/models/front-shiny/321--0--Wailord.gif diff --git a/src/canonical/models/front-shiny/Numel.gif b/src/canonical/models/front-shiny/322--0--Numel.gif similarity index 100% rename from src/canonical/models/front-shiny/Numel.gif rename to src/canonical/models/front-shiny/322--0--Numel.gif diff --git a/src/canonical/models/front-shiny/Camerupt.gif b/src/canonical/models/front-shiny/323--0--Camerupt.gif similarity index 100% rename from src/canonical/models/front-shiny/Camerupt.gif rename to src/canonical/models/front-shiny/323--0--Camerupt.gif diff --git a/src/canonical/models/front-shiny/Camerupt--Mega.gif b/src/canonical/models/front-shiny/323--420--Camerupt--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Camerupt--Mega.gif rename to src/canonical/models/front-shiny/323--420--Camerupt--Mega.gif diff --git a/src/canonical/models/front-shiny/Torkoal.gif b/src/canonical/models/front-shiny/324--0--Torkoal.gif similarity index 100% rename from src/canonical/models/front-shiny/Torkoal.gif rename to src/canonical/models/front-shiny/324--0--Torkoal.gif diff --git a/src/canonical/models/front-shiny/Spoink.gif b/src/canonical/models/front-shiny/325--0--Spoink.gif similarity index 100% rename from src/canonical/models/front-shiny/Spoink.gif rename to src/canonical/models/front-shiny/325--0--Spoink.gif diff --git a/src/canonical/models/front-shiny/Grumpig.gif b/src/canonical/models/front-shiny/326--0--Grumpig.gif similarity index 100% rename from src/canonical/models/front-shiny/Grumpig.gif rename to src/canonical/models/front-shiny/326--0--Grumpig.gif diff --git a/src/canonical/models/front-shiny/Spinda.gif b/src/canonical/models/front-shiny/327--0--Spinda.gif similarity index 100% rename from src/canonical/models/front-shiny/Spinda.gif rename to src/canonical/models/front-shiny/327--0--Spinda.gif diff --git a/src/canonical/models/front-shiny/Trapinch.gif b/src/canonical/models/front-shiny/328--0--Trapinch.gif similarity index 100% rename from src/canonical/models/front-shiny/Trapinch.gif rename to src/canonical/models/front-shiny/328--0--Trapinch.gif diff --git a/src/canonical/models/front-shiny/Vibrava.gif b/src/canonical/models/front-shiny/329--0--Vibrava.gif similarity index 100% rename from src/canonical/models/front-shiny/Vibrava.gif rename to src/canonical/models/front-shiny/329--0--Vibrava.gif diff --git a/src/canonical/models/front-shiny/Nidorino.gif b/src/canonical/models/front-shiny/33--0--Nidorino.gif similarity index 100% rename from src/canonical/models/front-shiny/Nidorino.gif rename to src/canonical/models/front-shiny/33--0--Nidorino.gif diff --git a/src/canonical/models/front-shiny/Flygon.gif b/src/canonical/models/front-shiny/330--0--Flygon.gif similarity index 100% rename from src/canonical/models/front-shiny/Flygon.gif rename to src/canonical/models/front-shiny/330--0--Flygon.gif diff --git a/src/canonical/models/front-shiny/Cacnea.gif b/src/canonical/models/front-shiny/331--0--Cacnea.gif similarity index 100% rename from src/canonical/models/front-shiny/Cacnea.gif rename to src/canonical/models/front-shiny/331--0--Cacnea.gif diff --git a/src/canonical/models/front-shiny/Cacturne.gif b/src/canonical/models/front-shiny/332--0--Cacturne.gif similarity index 100% rename from src/canonical/models/front-shiny/Cacturne.gif rename to src/canonical/models/front-shiny/332--0--Cacturne.gif diff --git a/src/canonical/models/front-shiny/Swablu.gif b/src/canonical/models/front-shiny/333--0--Swablu.gif similarity index 100% rename from src/canonical/models/front-shiny/Swablu.gif rename to src/canonical/models/front-shiny/333--0--Swablu.gif diff --git a/src/canonical/models/front-shiny/Altaria.gif b/src/canonical/models/front-shiny/334--0--Altaria.gif similarity index 100% rename from src/canonical/models/front-shiny/Altaria.gif rename to src/canonical/models/front-shiny/334--0--Altaria.gif diff --git a/src/canonical/models/front-shiny/Altaria--Mega.gif b/src/canonical/models/front-shiny/334--420--Altaria--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Altaria--Mega.gif rename to src/canonical/models/front-shiny/334--420--Altaria--Mega.gif diff --git a/src/canonical/models/front-shiny/Zangoose.gif b/src/canonical/models/front-shiny/335--0--Zangoose.gif similarity index 100% rename from src/canonical/models/front-shiny/Zangoose.gif rename to src/canonical/models/front-shiny/335--0--Zangoose.gif diff --git a/src/canonical/models/front-shiny/Seviper.gif b/src/canonical/models/front-shiny/336--0--Seviper.gif similarity index 100% rename from src/canonical/models/front-shiny/Seviper.gif rename to src/canonical/models/front-shiny/336--0--Seviper.gif diff --git a/src/canonical/models/front-shiny/Lunatone.gif b/src/canonical/models/front-shiny/337--0--Lunatone.gif similarity index 100% rename from src/canonical/models/front-shiny/Lunatone.gif rename to src/canonical/models/front-shiny/337--0--Lunatone.gif diff --git a/src/canonical/models/front-shiny/Solrock.gif b/src/canonical/models/front-shiny/338--0--Solrock.gif similarity index 100% rename from src/canonical/models/front-shiny/Solrock.gif rename to src/canonical/models/front-shiny/338--0--Solrock.gif diff --git a/src/canonical/models/front-shiny/Barboach.gif b/src/canonical/models/front-shiny/339--0--Barboach.gif similarity index 100% rename from src/canonical/models/front-shiny/Barboach.gif rename to src/canonical/models/front-shiny/339--0--Barboach.gif diff --git a/src/canonical/models/front-shiny/Nidoking.gif b/src/canonical/models/front-shiny/34--0--Nidoking.gif similarity index 100% rename from src/canonical/models/front-shiny/Nidoking.gif rename to src/canonical/models/front-shiny/34--0--Nidoking.gif diff --git a/src/canonical/models/front-shiny/Whiscash.gif b/src/canonical/models/front-shiny/340--0--Whiscash.gif similarity index 100% rename from src/canonical/models/front-shiny/Whiscash.gif rename to src/canonical/models/front-shiny/340--0--Whiscash.gif diff --git a/src/canonical/models/front-shiny/Corphish.gif b/src/canonical/models/front-shiny/341--0--Corphish.gif similarity index 100% rename from src/canonical/models/front-shiny/Corphish.gif rename to src/canonical/models/front-shiny/341--0--Corphish.gif diff --git a/src/canonical/models/front-shiny/Crawdaunt.gif b/src/canonical/models/front-shiny/342--0--Crawdaunt.gif similarity index 100% rename from src/canonical/models/front-shiny/Crawdaunt.gif rename to src/canonical/models/front-shiny/342--0--Crawdaunt.gif diff --git a/src/canonical/models/front-shiny/Baltoy.gif b/src/canonical/models/front-shiny/343--0--Baltoy.gif similarity index 100% rename from src/canonical/models/front-shiny/Baltoy.gif rename to src/canonical/models/front-shiny/343--0--Baltoy.gif diff --git a/src/canonical/models/front-shiny/Claydol.gif b/src/canonical/models/front-shiny/344--0--Claydol.gif similarity index 100% rename from src/canonical/models/front-shiny/Claydol.gif rename to src/canonical/models/front-shiny/344--0--Claydol.gif diff --git a/src/canonical/models/front-shiny/Lileep.gif b/src/canonical/models/front-shiny/345--0--Lileep.gif similarity index 100% rename from src/canonical/models/front-shiny/Lileep.gif rename to src/canonical/models/front-shiny/345--0--Lileep.gif diff --git a/src/canonical/models/front-shiny/Cradily.gif b/src/canonical/models/front-shiny/346--0--Cradily.gif similarity index 100% rename from src/canonical/models/front-shiny/Cradily.gif rename to src/canonical/models/front-shiny/346--0--Cradily.gif diff --git a/src/canonical/models/front-shiny/Anorith.gif b/src/canonical/models/front-shiny/347--0--Anorith.gif similarity index 100% rename from src/canonical/models/front-shiny/Anorith.gif rename to src/canonical/models/front-shiny/347--0--Anorith.gif diff --git a/src/canonical/models/front-shiny/Armaldo.gif b/src/canonical/models/front-shiny/348--0--Armaldo.gif similarity index 100% rename from src/canonical/models/front-shiny/Armaldo.gif rename to src/canonical/models/front-shiny/348--0--Armaldo.gif diff --git a/src/canonical/models/front-shiny/Feebas.gif b/src/canonical/models/front-shiny/349--0--Feebas.gif similarity index 100% rename from src/canonical/models/front-shiny/Feebas.gif rename to src/canonical/models/front-shiny/349--0--Feebas.gif diff --git a/src/canonical/models/front-shiny/Clefairy.gif b/src/canonical/models/front-shiny/35--0--Clefairy.gif similarity index 100% rename from src/canonical/models/front-shiny/Clefairy.gif rename to src/canonical/models/front-shiny/35--0--Clefairy.gif diff --git a/src/canonical/models/front-shiny/Milotic.gif b/src/canonical/models/front-shiny/350--0--Milotic.gif similarity index 100% rename from src/canonical/models/front-shiny/Milotic.gif rename to src/canonical/models/front-shiny/350--0--Milotic.gif diff --git a/src/canonical/models/front-shiny/Castform.gif b/src/canonical/models/front-shiny/351--0--Castform.gif similarity index 100% rename from src/canonical/models/front-shiny/Castform.gif rename to src/canonical/models/front-shiny/351--0--Castform.gif diff --git a/src/canonical/models/front-shiny/Castform--Rainy.gif b/src/canonical/models/front-shiny/351--420--Castform--Rainy.gif similarity index 100% rename from src/canonical/models/front-shiny/Castform--Rainy.gif rename to src/canonical/models/front-shiny/351--420--Castform--Rainy.gif diff --git a/src/canonical/models/front-shiny/Castform--Snowy.gif b/src/canonical/models/front-shiny/351--420--Castform--Snowy.gif similarity index 100% rename from src/canonical/models/front-shiny/Castform--Snowy.gif rename to src/canonical/models/front-shiny/351--420--Castform--Snowy.gif diff --git a/src/canonical/models/front-shiny/Castform--Sunny.gif b/src/canonical/models/front-shiny/351--420--Castform--Sunny.gif similarity index 100% rename from src/canonical/models/front-shiny/Castform--Sunny.gif rename to src/canonical/models/front-shiny/351--420--Castform--Sunny.gif diff --git a/src/canonical/models/front-shiny/Kecleon.gif b/src/canonical/models/front-shiny/352--0--Kecleon.gif similarity index 100% rename from src/canonical/models/front-shiny/Kecleon.gif rename to src/canonical/models/front-shiny/352--0--Kecleon.gif diff --git a/src/canonical/models/front-shiny/Shuppet.gif b/src/canonical/models/front-shiny/353--0--Shuppet.gif similarity index 100% rename from src/canonical/models/front-shiny/Shuppet.gif rename to src/canonical/models/front-shiny/353--0--Shuppet.gif diff --git a/src/canonical/models/front-shiny/Banette.gif b/src/canonical/models/front-shiny/354--0--Banette.gif similarity index 100% rename from src/canonical/models/front-shiny/Banette.gif rename to src/canonical/models/front-shiny/354--0--Banette.gif diff --git a/src/canonical/models/front-shiny/Banette--Mega.gif b/src/canonical/models/front-shiny/354--420--Banette--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Banette--Mega.gif rename to src/canonical/models/front-shiny/354--420--Banette--Mega.gif diff --git a/src/canonical/models/front-shiny/Duskull.gif b/src/canonical/models/front-shiny/355--0--Duskull.gif similarity index 100% rename from src/canonical/models/front-shiny/Duskull.gif rename to src/canonical/models/front-shiny/355--0--Duskull.gif diff --git a/src/canonical/models/front-shiny/Dusclops.gif b/src/canonical/models/front-shiny/356--0--Dusclops.gif similarity index 100% rename from src/canonical/models/front-shiny/Dusclops.gif rename to src/canonical/models/front-shiny/356--0--Dusclops.gif diff --git a/src/canonical/models/front-shiny/Tropius.gif b/src/canonical/models/front-shiny/357--0--Tropius.gif similarity index 100% rename from src/canonical/models/front-shiny/Tropius.gif rename to src/canonical/models/front-shiny/357--0--Tropius.gif diff --git a/src/canonical/models/front-shiny/Chimecho.gif b/src/canonical/models/front-shiny/358--0--Chimecho.gif similarity index 100% rename from src/canonical/models/front-shiny/Chimecho.gif rename to src/canonical/models/front-shiny/358--0--Chimecho.gif diff --git a/src/canonical/models/front-shiny/Absol.gif b/src/canonical/models/front-shiny/359--0--Absol.gif similarity index 100% rename from src/canonical/models/front-shiny/Absol.gif rename to src/canonical/models/front-shiny/359--0--Absol.gif diff --git a/src/canonical/models/front-shiny/Absol--Mega.gif b/src/canonical/models/front-shiny/359--420--Absol--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Absol--Mega.gif rename to src/canonical/models/front-shiny/359--420--Absol--Mega.gif diff --git a/src/canonical/models/front-shiny/Clefable.gif b/src/canonical/models/front-shiny/36--0--Clefable.gif similarity index 100% rename from src/canonical/models/front-shiny/Clefable.gif rename to src/canonical/models/front-shiny/36--0--Clefable.gif diff --git a/src/canonical/models/front-shiny/Wynaut.gif b/src/canonical/models/front-shiny/360--0--Wynaut.gif similarity index 100% rename from src/canonical/models/front-shiny/Wynaut.gif rename to src/canonical/models/front-shiny/360--0--Wynaut.gif diff --git a/src/canonical/models/front-shiny/Snorunt.gif b/src/canonical/models/front-shiny/361--0--Snorunt.gif similarity index 100% rename from src/canonical/models/front-shiny/Snorunt.gif rename to src/canonical/models/front-shiny/361--0--Snorunt.gif diff --git a/src/canonical/models/front-shiny/Glalie.gif b/src/canonical/models/front-shiny/362--0--Glalie.gif similarity index 100% rename from src/canonical/models/front-shiny/Glalie.gif rename to src/canonical/models/front-shiny/362--0--Glalie.gif diff --git a/src/canonical/models/front-shiny/Glalie--Mega.gif b/src/canonical/models/front-shiny/362--420--Glalie--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Glalie--Mega.gif rename to src/canonical/models/front-shiny/362--420--Glalie--Mega.gif diff --git a/src/canonical/models/front-shiny/Spheal.gif b/src/canonical/models/front-shiny/363--0--Spheal.gif similarity index 100% rename from src/canonical/models/front-shiny/Spheal.gif rename to src/canonical/models/front-shiny/363--0--Spheal.gif diff --git a/src/canonical/models/front-shiny/Sealeo.gif b/src/canonical/models/front-shiny/364--0--Sealeo.gif similarity index 100% rename from src/canonical/models/front-shiny/Sealeo.gif rename to src/canonical/models/front-shiny/364--0--Sealeo.gif diff --git a/src/canonical/models/front-shiny/Walrein.gif b/src/canonical/models/front-shiny/365--0--Walrein.gif similarity index 100% rename from src/canonical/models/front-shiny/Walrein.gif rename to src/canonical/models/front-shiny/365--0--Walrein.gif diff --git a/src/canonical/models/front-shiny/Clamperl.gif b/src/canonical/models/front-shiny/366--0--Clamperl.gif similarity index 100% rename from src/canonical/models/front-shiny/Clamperl.gif rename to src/canonical/models/front-shiny/366--0--Clamperl.gif diff --git a/src/canonical/models/front-shiny/Huntail.gif b/src/canonical/models/front-shiny/367--0--Huntail.gif similarity index 100% rename from src/canonical/models/front-shiny/Huntail.gif rename to src/canonical/models/front-shiny/367--0--Huntail.gif diff --git a/src/canonical/models/front-shiny/Gorebyss.gif b/src/canonical/models/front-shiny/368--0--Gorebyss.gif similarity index 100% rename from src/canonical/models/front-shiny/Gorebyss.gif rename to src/canonical/models/front-shiny/368--0--Gorebyss.gif diff --git a/src/canonical/models/front-shiny/Relicanth.gif b/src/canonical/models/front-shiny/369--0--Relicanth.gif similarity index 100% rename from src/canonical/models/front-shiny/Relicanth.gif rename to src/canonical/models/front-shiny/369--0--Relicanth.gif diff --git a/src/canonical/models/front-shiny/Vulpix.gif b/src/canonical/models/front-shiny/37--0--Vulpix.gif similarity index 100% rename from src/canonical/models/front-shiny/Vulpix.gif rename to src/canonical/models/front-shiny/37--0--Vulpix.gif diff --git a/src/canonical/models/front-shiny/Vulpix--Alola.gif b/src/canonical/models/front-shiny/37--420--Vulpix--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Vulpix--Alola.gif rename to src/canonical/models/front-shiny/37--420--Vulpix--Alola.gif diff --git a/src/canonical/models/front-shiny/Luvdisc.gif b/src/canonical/models/front-shiny/370--0--Luvdisc.gif similarity index 100% rename from src/canonical/models/front-shiny/Luvdisc.gif rename to src/canonical/models/front-shiny/370--0--Luvdisc.gif diff --git a/src/canonical/models/front-shiny/Bagon.gif b/src/canonical/models/front-shiny/371--0--Bagon.gif similarity index 100% rename from src/canonical/models/front-shiny/Bagon.gif rename to src/canonical/models/front-shiny/371--0--Bagon.gif diff --git a/src/canonical/models/front-shiny/Shelgon.gif b/src/canonical/models/front-shiny/372--0--Shelgon.gif similarity index 100% rename from src/canonical/models/front-shiny/Shelgon.gif rename to src/canonical/models/front-shiny/372--0--Shelgon.gif diff --git a/src/canonical/models/front-shiny/Salamence.gif b/src/canonical/models/front-shiny/373--0--Salamence.gif similarity index 100% rename from src/canonical/models/front-shiny/Salamence.gif rename to src/canonical/models/front-shiny/373--0--Salamence.gif diff --git a/src/canonical/models/front-shiny/Salamence--Mega.gif b/src/canonical/models/front-shiny/373--420--Salamence--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Salamence--Mega.gif rename to src/canonical/models/front-shiny/373--420--Salamence--Mega.gif diff --git a/src/canonical/models/front-shiny/Beldum.gif b/src/canonical/models/front-shiny/374--0--Beldum.gif similarity index 100% rename from src/canonical/models/front-shiny/Beldum.gif rename to src/canonical/models/front-shiny/374--0--Beldum.gif diff --git a/src/canonical/models/front-shiny/Metang.gif b/src/canonical/models/front-shiny/375--0--Metang.gif similarity index 100% rename from src/canonical/models/front-shiny/Metang.gif rename to src/canonical/models/front-shiny/375--0--Metang.gif diff --git a/src/canonical/models/front-shiny/Metagross.gif b/src/canonical/models/front-shiny/376--0--Metagross.gif similarity index 100% rename from src/canonical/models/front-shiny/Metagross.gif rename to src/canonical/models/front-shiny/376--0--Metagross.gif diff --git a/src/canonical/models/front-shiny/Metagross--Mega.gif b/src/canonical/models/front-shiny/376--420--Metagross--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Metagross--Mega.gif rename to src/canonical/models/front-shiny/376--420--Metagross--Mega.gif diff --git a/src/canonical/models/front-shiny/Regirock.gif b/src/canonical/models/front-shiny/377--0--Regirock.gif similarity index 100% rename from src/canonical/models/front-shiny/Regirock.gif rename to src/canonical/models/front-shiny/377--0--Regirock.gif diff --git a/src/canonical/models/front-shiny/Regice.gif b/src/canonical/models/front-shiny/378--0--Regice.gif similarity index 100% rename from src/canonical/models/front-shiny/Regice.gif rename to src/canonical/models/front-shiny/378--0--Regice.gif diff --git a/src/canonical/models/front-shiny/Registeel.gif b/src/canonical/models/front-shiny/379--0--Registeel.gif similarity index 100% rename from src/canonical/models/front-shiny/Registeel.gif rename to src/canonical/models/front-shiny/379--0--Registeel.gif diff --git a/src/canonical/models/front-shiny/Ninetales.gif b/src/canonical/models/front-shiny/38--0--Ninetales.gif similarity index 100% rename from src/canonical/models/front-shiny/Ninetales.gif rename to src/canonical/models/front-shiny/38--0--Ninetales.gif diff --git a/src/canonical/models/front-shiny/Ninetales--Alola.gif b/src/canonical/models/front-shiny/38--420--Ninetales--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Ninetales--Alola.gif rename to src/canonical/models/front-shiny/38--420--Ninetales--Alola.gif diff --git a/src/canonical/models/front-shiny/Latias.gif b/src/canonical/models/front-shiny/380--0--Latias.gif similarity index 100% rename from src/canonical/models/front-shiny/Latias.gif rename to src/canonical/models/front-shiny/380--0--Latias.gif diff --git a/src/canonical/models/front-shiny/Latias--Mega.gif b/src/canonical/models/front-shiny/380--420--Latias--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Latias--Mega.gif rename to src/canonical/models/front-shiny/380--420--Latias--Mega.gif diff --git a/src/canonical/models/front-shiny/Latios.gif b/src/canonical/models/front-shiny/381--0--Latios.gif similarity index 100% rename from src/canonical/models/front-shiny/Latios.gif rename to src/canonical/models/front-shiny/381--0--Latios.gif diff --git a/src/canonical/models/front-shiny/Latios--Mega.gif b/src/canonical/models/front-shiny/381--420--Latios--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Latios--Mega.gif rename to src/canonical/models/front-shiny/381--420--Latios--Mega.gif diff --git a/src/canonical/models/front-shiny/Kyogre.gif b/src/canonical/models/front-shiny/382--0--Kyogre.gif similarity index 100% rename from src/canonical/models/front-shiny/Kyogre.gif rename to src/canonical/models/front-shiny/382--0--Kyogre.gif diff --git a/src/canonical/models/front-shiny/Kyogre--Primal.gif b/src/canonical/models/front-shiny/382--420--Kyogre--Primal.gif similarity index 100% rename from src/canonical/models/front-shiny/Kyogre--Primal.gif rename to src/canonical/models/front-shiny/382--420--Kyogre--Primal.gif diff --git a/src/canonical/models/front-shiny/Groudon.gif b/src/canonical/models/front-shiny/383--0--Groudon.gif similarity index 100% rename from src/canonical/models/front-shiny/Groudon.gif rename to src/canonical/models/front-shiny/383--0--Groudon.gif diff --git a/src/canonical/models/front-shiny/Groudon--Primal.gif b/src/canonical/models/front-shiny/383--420--Groudon--Primal.gif similarity index 100% rename from src/canonical/models/front-shiny/Groudon--Primal.gif rename to src/canonical/models/front-shiny/383--420--Groudon--Primal.gif diff --git a/src/canonical/models/front-shiny/Rayquaza.gif b/src/canonical/models/front-shiny/384--0--Rayquaza.gif similarity index 100% rename from src/canonical/models/front-shiny/Rayquaza.gif rename to src/canonical/models/front-shiny/384--0--Rayquaza.gif diff --git a/src/canonical/models/front-shiny/Rayquaza--Mega.gif b/src/canonical/models/front-shiny/384--420--Rayquaza--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Rayquaza--Mega.gif rename to src/canonical/models/front-shiny/384--420--Rayquaza--Mega.gif diff --git a/src/canonical/models/front-shiny/Jirachi.gif b/src/canonical/models/front-shiny/385--0--Jirachi.gif similarity index 100% rename from src/canonical/models/front-shiny/Jirachi.gif rename to src/canonical/models/front-shiny/385--0--Jirachi.gif diff --git a/src/canonical/models/front-shiny/Deoxys.gif b/src/canonical/models/front-shiny/386--0--Deoxys.gif similarity index 100% rename from src/canonical/models/front-shiny/Deoxys.gif rename to src/canonical/models/front-shiny/386--0--Deoxys.gif diff --git a/src/canonical/models/front-shiny/Deoxys--Attack.gif b/src/canonical/models/front-shiny/386--420--Deoxys--Attack.gif similarity index 100% rename from src/canonical/models/front-shiny/Deoxys--Attack.gif rename to src/canonical/models/front-shiny/386--420--Deoxys--Attack.gif diff --git a/src/canonical/models/front-shiny/Deoxys--Defense.gif b/src/canonical/models/front-shiny/386--420--Deoxys--Defense.gif similarity index 100% rename from src/canonical/models/front-shiny/Deoxys--Defense.gif rename to src/canonical/models/front-shiny/386--420--Deoxys--Defense.gif diff --git a/src/canonical/models/front-shiny/Deoxys--Speed.gif b/src/canonical/models/front-shiny/386--420--Deoxys--Speed.gif similarity index 100% rename from src/canonical/models/front-shiny/Deoxys--Speed.gif rename to src/canonical/models/front-shiny/386--420--Deoxys--Speed.gif diff --git a/src/canonical/models/front-shiny/Turtwig.gif b/src/canonical/models/front-shiny/387--0--Turtwig.gif similarity index 100% rename from src/canonical/models/front-shiny/Turtwig.gif rename to src/canonical/models/front-shiny/387--0--Turtwig.gif diff --git a/src/canonical/models/front-shiny/Grotle.gif b/src/canonical/models/front-shiny/388--0--Grotle.gif similarity index 100% rename from src/canonical/models/front-shiny/Grotle.gif rename to src/canonical/models/front-shiny/388--0--Grotle.gif diff --git a/src/canonical/models/front-shiny/Torterra.gif b/src/canonical/models/front-shiny/389--0--Torterra.gif similarity index 100% rename from src/canonical/models/front-shiny/Torterra.gif rename to src/canonical/models/front-shiny/389--0--Torterra.gif diff --git a/src/canonical/models/front-shiny/Jigglypuff.gif b/src/canonical/models/front-shiny/39--0--Jigglypuff.gif similarity index 100% rename from src/canonical/models/front-shiny/Jigglypuff.gif rename to src/canonical/models/front-shiny/39--0--Jigglypuff.gif diff --git a/src/canonical/models/front-shiny/Chimchar.gif b/src/canonical/models/front-shiny/390--0--Chimchar.gif similarity index 100% rename from src/canonical/models/front-shiny/Chimchar.gif rename to src/canonical/models/front-shiny/390--0--Chimchar.gif diff --git a/src/canonical/models/front-shiny/Monferno.gif b/src/canonical/models/front-shiny/391--0--Monferno.gif similarity index 100% rename from src/canonical/models/front-shiny/Monferno.gif rename to src/canonical/models/front-shiny/391--0--Monferno.gif diff --git a/src/canonical/models/front-shiny/Infernape.gif b/src/canonical/models/front-shiny/392--0--Infernape.gif similarity index 100% rename from src/canonical/models/front-shiny/Infernape.gif rename to src/canonical/models/front-shiny/392--0--Infernape.gif diff --git a/src/canonical/models/front-shiny/Piplup.gif b/src/canonical/models/front-shiny/393--0--Piplup.gif similarity index 100% rename from src/canonical/models/front-shiny/Piplup.gif rename to src/canonical/models/front-shiny/393--0--Piplup.gif diff --git a/src/canonical/models/front-shiny/Prinplup.gif b/src/canonical/models/front-shiny/394--0--Prinplup.gif similarity index 100% rename from src/canonical/models/front-shiny/Prinplup.gif rename to src/canonical/models/front-shiny/394--0--Prinplup.gif diff --git a/src/canonical/models/front-shiny/Empoleon.gif b/src/canonical/models/front-shiny/395--0--Empoleon.gif similarity index 100% rename from src/canonical/models/front-shiny/Empoleon.gif rename to src/canonical/models/front-shiny/395--0--Empoleon.gif diff --git a/src/canonical/models/front-shiny/Starly.gif b/src/canonical/models/front-shiny/396--0--Starly.gif similarity index 100% rename from src/canonical/models/front-shiny/Starly.gif rename to src/canonical/models/front-shiny/396--0--Starly.gif diff --git a/src/canonical/models/front-shiny/Staravia.gif b/src/canonical/models/front-shiny/397--0--Staravia.gif similarity index 100% rename from src/canonical/models/front-shiny/Staravia.gif rename to src/canonical/models/front-shiny/397--0--Staravia.gif diff --git a/src/canonical/models/front-shiny/Staraptor.gif b/src/canonical/models/front-shiny/398--0--Staraptor.gif similarity index 100% rename from src/canonical/models/front-shiny/Staraptor.gif rename to src/canonical/models/front-shiny/398--0--Staraptor.gif diff --git a/src/canonical/models/front-shiny/Bidoof.gif b/src/canonical/models/front-shiny/399--0--Bidoof.gif similarity index 100% rename from src/canonical/models/front-shiny/Bidoof.gif rename to src/canonical/models/front-shiny/399--0--Bidoof.gif diff --git a/src/canonical/models/front-shiny/Charmander.gif b/src/canonical/models/front-shiny/4--0--Charmander.gif similarity index 100% rename from src/canonical/models/front-shiny/Charmander.gif rename to src/canonical/models/front-shiny/4--0--Charmander.gif diff --git a/src/canonical/models/front-shiny/Wigglytuff.gif b/src/canonical/models/front-shiny/40--0--Wigglytuff.gif similarity index 100% rename from src/canonical/models/front-shiny/Wigglytuff.gif rename to src/canonical/models/front-shiny/40--0--Wigglytuff.gif diff --git a/src/canonical/models/front-shiny/Bibarel.gif b/src/canonical/models/front-shiny/400--0--Bibarel.gif similarity index 100% rename from src/canonical/models/front-shiny/Bibarel.gif rename to src/canonical/models/front-shiny/400--0--Bibarel.gif diff --git a/src/canonical/models/front-shiny/Kricketot.gif b/src/canonical/models/front-shiny/401--0--Kricketot.gif similarity index 100% rename from src/canonical/models/front-shiny/Kricketot.gif rename to src/canonical/models/front-shiny/401--0--Kricketot.gif diff --git a/src/canonical/models/front-shiny/Kricketune.gif b/src/canonical/models/front-shiny/402--0--Kricketune.gif similarity index 100% rename from src/canonical/models/front-shiny/Kricketune.gif rename to src/canonical/models/front-shiny/402--0--Kricketune.gif diff --git a/src/canonical/models/front-shiny/Shinx.gif b/src/canonical/models/front-shiny/403--0--Shinx.gif similarity index 100% rename from src/canonical/models/front-shiny/Shinx.gif rename to src/canonical/models/front-shiny/403--0--Shinx.gif diff --git a/src/canonical/models/front-shiny/Luxio.gif b/src/canonical/models/front-shiny/404--0--Luxio.gif similarity index 100% rename from src/canonical/models/front-shiny/Luxio.gif rename to src/canonical/models/front-shiny/404--0--Luxio.gif diff --git a/src/canonical/models/front-shiny/Luxray.gif b/src/canonical/models/front-shiny/405--0--Luxray.gif similarity index 100% rename from src/canonical/models/front-shiny/Luxray.gif rename to src/canonical/models/front-shiny/405--0--Luxray.gif diff --git a/src/canonical/models/front-shiny/Budew.gif b/src/canonical/models/front-shiny/406--0--Budew.gif similarity index 100% rename from src/canonical/models/front-shiny/Budew.gif rename to src/canonical/models/front-shiny/406--0--Budew.gif diff --git a/src/canonical/models/front-shiny/Roserade.gif b/src/canonical/models/front-shiny/407--0--Roserade.gif similarity index 100% rename from src/canonical/models/front-shiny/Roserade.gif rename to src/canonical/models/front-shiny/407--0--Roserade.gif diff --git a/src/canonical/models/front-shiny/Cranidos.gif b/src/canonical/models/front-shiny/408--0--Cranidos.gif similarity index 100% rename from src/canonical/models/front-shiny/Cranidos.gif rename to src/canonical/models/front-shiny/408--0--Cranidos.gif diff --git a/src/canonical/models/front-shiny/Rampardos.gif b/src/canonical/models/front-shiny/409--0--Rampardos.gif similarity index 100% rename from src/canonical/models/front-shiny/Rampardos.gif rename to src/canonical/models/front-shiny/409--0--Rampardos.gif diff --git a/src/canonical/models/front-shiny/Zubat.gif b/src/canonical/models/front-shiny/41--0--Zubat.gif similarity index 100% rename from src/canonical/models/front-shiny/Zubat.gif rename to src/canonical/models/front-shiny/41--0--Zubat.gif diff --git a/src/canonical/models/front-shiny/Shieldon.gif b/src/canonical/models/front-shiny/410--0--Shieldon.gif similarity index 100% rename from src/canonical/models/front-shiny/Shieldon.gif rename to src/canonical/models/front-shiny/410--0--Shieldon.gif diff --git a/src/canonical/models/front-shiny/Bastiodon.gif b/src/canonical/models/front-shiny/411--0--Bastiodon.gif similarity index 100% rename from src/canonical/models/front-shiny/Bastiodon.gif rename to src/canonical/models/front-shiny/411--0--Bastiodon.gif diff --git a/src/canonical/models/front-shiny/Burmy.gif b/src/canonical/models/front-shiny/412--0--Burmy.gif similarity index 100% rename from src/canonical/models/front-shiny/Burmy.gif rename to src/canonical/models/front-shiny/412--0--Burmy.gif diff --git a/src/canonical/models/front-shiny/Wormadam.gif b/src/canonical/models/front-shiny/413--0--Wormadam.gif similarity index 100% rename from src/canonical/models/front-shiny/Wormadam.gif rename to src/canonical/models/front-shiny/413--0--Wormadam.gif diff --git a/src/canonical/models/front-shiny/Wormadam--Sandy.gif b/src/canonical/models/front-shiny/413--420--Wormadam--Sandy.gif similarity index 100% rename from src/canonical/models/front-shiny/Wormadam--Sandy.gif rename to src/canonical/models/front-shiny/413--420--Wormadam--Sandy.gif diff --git a/src/canonical/models/front-shiny/Wormadam--Trash.gif b/src/canonical/models/front-shiny/413--420--Wormadam--Trash.gif similarity index 100% rename from src/canonical/models/front-shiny/Wormadam--Trash.gif rename to src/canonical/models/front-shiny/413--420--Wormadam--Trash.gif diff --git a/src/canonical/models/front-shiny/Mothim.gif b/src/canonical/models/front-shiny/414--0--Mothim.gif similarity index 100% rename from src/canonical/models/front-shiny/Mothim.gif rename to src/canonical/models/front-shiny/414--0--Mothim.gif diff --git a/src/canonical/models/front-shiny/Combee.gif b/src/canonical/models/front-shiny/415--0--Combee.gif similarity index 100% rename from src/canonical/models/front-shiny/Combee.gif rename to src/canonical/models/front-shiny/415--0--Combee.gif diff --git a/src/canonical/models/front-shiny/Vespiquen.gif b/src/canonical/models/front-shiny/416--0--Vespiquen.gif similarity index 100% rename from src/canonical/models/front-shiny/Vespiquen.gif rename to src/canonical/models/front-shiny/416--0--Vespiquen.gif diff --git a/src/canonical/models/front-shiny/Pachirisu.gif b/src/canonical/models/front-shiny/417--0--Pachirisu.gif similarity index 100% rename from src/canonical/models/front-shiny/Pachirisu.gif rename to src/canonical/models/front-shiny/417--0--Pachirisu.gif diff --git a/src/canonical/models/front-shiny/Buizel.gif b/src/canonical/models/front-shiny/418--0--Buizel.gif similarity index 100% rename from src/canonical/models/front-shiny/Buizel.gif rename to src/canonical/models/front-shiny/418--0--Buizel.gif diff --git a/src/canonical/models/front-shiny/Floatzel.gif b/src/canonical/models/front-shiny/419--0--Floatzel.gif similarity index 100% rename from src/canonical/models/front-shiny/Floatzel.gif rename to src/canonical/models/front-shiny/419--0--Floatzel.gif diff --git a/src/canonical/models/front-shiny/Golbat.gif b/src/canonical/models/front-shiny/42--0--Golbat.gif similarity index 100% rename from src/canonical/models/front-shiny/Golbat.gif rename to src/canonical/models/front-shiny/42--0--Golbat.gif diff --git a/src/canonical/models/front-shiny/Cherubi.gif b/src/canonical/models/front-shiny/420--0--Cherubi.gif similarity index 100% rename from src/canonical/models/front-shiny/Cherubi.gif rename to src/canonical/models/front-shiny/420--0--Cherubi.gif diff --git a/src/canonical/models/front-shiny/Cherrim.gif b/src/canonical/models/front-shiny/421--0--Cherrim.gif similarity index 100% rename from src/canonical/models/front-shiny/Cherrim.gif rename to src/canonical/models/front-shiny/421--0--Cherrim.gif diff --git a/src/canonical/models/front-shiny/Cherrim--Sunshine.gif b/src/canonical/models/front-shiny/421--420--Cherrim--Sunshine.gif similarity index 100% rename from src/canonical/models/front-shiny/Cherrim--Sunshine.gif rename to src/canonical/models/front-shiny/421--420--Cherrim--Sunshine.gif diff --git a/src/canonical/models/front-shiny/Shellos.gif b/src/canonical/models/front-shiny/422--0--Shellos.gif similarity index 100% rename from src/canonical/models/front-shiny/Shellos.gif rename to src/canonical/models/front-shiny/422--0--Shellos.gif diff --git a/src/canonical/models/front-shiny/Gastrodon.gif b/src/canonical/models/front-shiny/423--0--Gastrodon.gif similarity index 100% rename from src/canonical/models/front-shiny/Gastrodon.gif rename to src/canonical/models/front-shiny/423--0--Gastrodon.gif diff --git a/src/canonical/models/front-shiny/Ambipom.gif b/src/canonical/models/front-shiny/424--0--Ambipom.gif similarity index 100% rename from src/canonical/models/front-shiny/Ambipom.gif rename to src/canonical/models/front-shiny/424--0--Ambipom.gif diff --git a/src/canonical/models/front-shiny/Drifloon.gif b/src/canonical/models/front-shiny/425--0--Drifloon.gif similarity index 100% rename from src/canonical/models/front-shiny/Drifloon.gif rename to src/canonical/models/front-shiny/425--0--Drifloon.gif diff --git a/src/canonical/models/front-shiny/Drifblim.gif b/src/canonical/models/front-shiny/426--0--Drifblim.gif similarity index 100% rename from src/canonical/models/front-shiny/Drifblim.gif rename to src/canonical/models/front-shiny/426--0--Drifblim.gif diff --git a/src/canonical/models/front-shiny/Buneary.gif b/src/canonical/models/front-shiny/427--0--Buneary.gif similarity index 100% rename from src/canonical/models/front-shiny/Buneary.gif rename to src/canonical/models/front-shiny/427--0--Buneary.gif diff --git a/src/canonical/models/front-shiny/Lopunny.gif b/src/canonical/models/front-shiny/428--0--Lopunny.gif similarity index 100% rename from src/canonical/models/front-shiny/Lopunny.gif rename to src/canonical/models/front-shiny/428--0--Lopunny.gif diff --git a/src/canonical/models/front-shiny/Lopunny--Mega.gif b/src/canonical/models/front-shiny/428--420--Lopunny--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Lopunny--Mega.gif rename to src/canonical/models/front-shiny/428--420--Lopunny--Mega.gif diff --git a/src/canonical/models/front-shiny/Mismagius.gif b/src/canonical/models/front-shiny/429--0--Mismagius.gif similarity index 100% rename from src/canonical/models/front-shiny/Mismagius.gif rename to src/canonical/models/front-shiny/429--0--Mismagius.gif diff --git a/src/canonical/models/front-shiny/Oddish.gif b/src/canonical/models/front-shiny/43--0--Oddish.gif similarity index 100% rename from src/canonical/models/front-shiny/Oddish.gif rename to src/canonical/models/front-shiny/43--0--Oddish.gif diff --git a/src/canonical/models/front-shiny/Honchkrow.gif b/src/canonical/models/front-shiny/430--0--Honchkrow.gif similarity index 100% rename from src/canonical/models/front-shiny/Honchkrow.gif rename to src/canonical/models/front-shiny/430--0--Honchkrow.gif diff --git a/src/canonical/models/front-shiny/Glameow.gif b/src/canonical/models/front-shiny/431--0--Glameow.gif similarity index 100% rename from src/canonical/models/front-shiny/Glameow.gif rename to src/canonical/models/front-shiny/431--0--Glameow.gif diff --git a/src/canonical/models/front-shiny/Purugly.gif b/src/canonical/models/front-shiny/432--0--Purugly.gif similarity index 100% rename from src/canonical/models/front-shiny/Purugly.gif rename to src/canonical/models/front-shiny/432--0--Purugly.gif diff --git a/src/canonical/models/front-shiny/Chingling.gif b/src/canonical/models/front-shiny/433--0--Chingling.gif similarity index 100% rename from src/canonical/models/front-shiny/Chingling.gif rename to src/canonical/models/front-shiny/433--0--Chingling.gif diff --git a/src/canonical/models/front-shiny/Stunky.gif b/src/canonical/models/front-shiny/434--0--Stunky.gif similarity index 100% rename from src/canonical/models/front-shiny/Stunky.gif rename to src/canonical/models/front-shiny/434--0--Stunky.gif diff --git a/src/canonical/models/front-shiny/Skuntank.gif b/src/canonical/models/front-shiny/435--0--Skuntank.gif similarity index 100% rename from src/canonical/models/front-shiny/Skuntank.gif rename to src/canonical/models/front-shiny/435--0--Skuntank.gif diff --git a/src/canonical/models/front-shiny/Bronzor.gif b/src/canonical/models/front-shiny/436--0--Bronzor.gif similarity index 100% rename from src/canonical/models/front-shiny/Bronzor.gif rename to src/canonical/models/front-shiny/436--0--Bronzor.gif diff --git a/src/canonical/models/front-shiny/Bronzong.gif b/src/canonical/models/front-shiny/437--0--Bronzong.gif similarity index 100% rename from src/canonical/models/front-shiny/Bronzong.gif rename to src/canonical/models/front-shiny/437--0--Bronzong.gif diff --git a/src/canonical/models/front-shiny/Bonsly.gif b/src/canonical/models/front-shiny/438--0--Bonsly.gif similarity index 100% rename from src/canonical/models/front-shiny/Bonsly.gif rename to src/canonical/models/front-shiny/438--0--Bonsly.gif diff --git a/src/canonical/models/front-shiny/Mime_Jr..gif b/src/canonical/models/front-shiny/439--0--Mime_Jr..gif similarity index 100% rename from src/canonical/models/front-shiny/Mime_Jr..gif rename to src/canonical/models/front-shiny/439--0--Mime_Jr..gif diff --git a/src/canonical/models/front-shiny/Gloom.gif b/src/canonical/models/front-shiny/44--0--Gloom.gif similarity index 100% rename from src/canonical/models/front-shiny/Gloom.gif rename to src/canonical/models/front-shiny/44--0--Gloom.gif diff --git a/src/canonical/models/front-shiny/Happiny.gif b/src/canonical/models/front-shiny/440--0--Happiny.gif similarity index 100% rename from src/canonical/models/front-shiny/Happiny.gif rename to src/canonical/models/front-shiny/440--0--Happiny.gif diff --git a/src/canonical/models/front-shiny/Chatot.gif b/src/canonical/models/front-shiny/441--0--Chatot.gif similarity index 100% rename from src/canonical/models/front-shiny/Chatot.gif rename to src/canonical/models/front-shiny/441--0--Chatot.gif diff --git a/src/canonical/models/front-shiny/Spiritomb.gif b/src/canonical/models/front-shiny/442--0--Spiritomb.gif similarity index 100% rename from src/canonical/models/front-shiny/Spiritomb.gif rename to src/canonical/models/front-shiny/442--0--Spiritomb.gif diff --git a/src/canonical/models/front-shiny/Gible.gif b/src/canonical/models/front-shiny/443--0--Gible.gif similarity index 100% rename from src/canonical/models/front-shiny/Gible.gif rename to src/canonical/models/front-shiny/443--0--Gible.gif diff --git a/src/canonical/models/front-shiny/Gabite.gif b/src/canonical/models/front-shiny/444--0--Gabite.gif similarity index 100% rename from src/canonical/models/front-shiny/Gabite.gif rename to src/canonical/models/front-shiny/444--0--Gabite.gif diff --git a/src/canonical/models/front-shiny/Garchomp.gif b/src/canonical/models/front-shiny/445--0--Garchomp.gif similarity index 100% rename from src/canonical/models/front-shiny/Garchomp.gif rename to src/canonical/models/front-shiny/445--0--Garchomp.gif diff --git a/src/canonical/models/front-shiny/Garchomp--Mega.gif b/src/canonical/models/front-shiny/445--420--Garchomp--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Garchomp--Mega.gif rename to src/canonical/models/front-shiny/445--420--Garchomp--Mega.gif diff --git a/src/canonical/models/front-shiny/Munchlax.gif b/src/canonical/models/front-shiny/446--0--Munchlax.gif similarity index 100% rename from src/canonical/models/front-shiny/Munchlax.gif rename to src/canonical/models/front-shiny/446--0--Munchlax.gif diff --git a/src/canonical/models/front-shiny/Riolu.gif b/src/canonical/models/front-shiny/447--0--Riolu.gif similarity index 100% rename from src/canonical/models/front-shiny/Riolu.gif rename to src/canonical/models/front-shiny/447--0--Riolu.gif diff --git a/src/canonical/models/front-shiny/Lucario.gif b/src/canonical/models/front-shiny/448--0--Lucario.gif similarity index 100% rename from src/canonical/models/front-shiny/Lucario.gif rename to src/canonical/models/front-shiny/448--0--Lucario.gif diff --git a/src/canonical/models/front-shiny/Lucario--Mega.gif b/src/canonical/models/front-shiny/448--420--Lucario--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Lucario--Mega.gif rename to src/canonical/models/front-shiny/448--420--Lucario--Mega.gif diff --git a/src/canonical/models/front-shiny/Hippopotas.gif b/src/canonical/models/front-shiny/449--0--Hippopotas.gif similarity index 100% rename from src/canonical/models/front-shiny/Hippopotas.gif rename to src/canonical/models/front-shiny/449--0--Hippopotas.gif diff --git a/src/canonical/models/front-shiny/Vileplume.gif b/src/canonical/models/front-shiny/45--0--Vileplume.gif similarity index 100% rename from src/canonical/models/front-shiny/Vileplume.gif rename to src/canonical/models/front-shiny/45--0--Vileplume.gif diff --git a/src/canonical/models/front-shiny/Hippowdon.gif b/src/canonical/models/front-shiny/450--0--Hippowdon.gif similarity index 100% rename from src/canonical/models/front-shiny/Hippowdon.gif rename to src/canonical/models/front-shiny/450--0--Hippowdon.gif diff --git a/src/canonical/models/front-shiny/Skorupi.gif b/src/canonical/models/front-shiny/451--0--Skorupi.gif similarity index 100% rename from src/canonical/models/front-shiny/Skorupi.gif rename to src/canonical/models/front-shiny/451--0--Skorupi.gif diff --git a/src/canonical/models/front-shiny/Drapion.gif b/src/canonical/models/front-shiny/452--0--Drapion.gif similarity index 100% rename from src/canonical/models/front-shiny/Drapion.gif rename to src/canonical/models/front-shiny/452--0--Drapion.gif diff --git a/src/canonical/models/front-shiny/Croagunk.gif b/src/canonical/models/front-shiny/453--0--Croagunk.gif similarity index 100% rename from src/canonical/models/front-shiny/Croagunk.gif rename to src/canonical/models/front-shiny/453--0--Croagunk.gif diff --git a/src/canonical/models/front-shiny/Toxicroak.gif b/src/canonical/models/front-shiny/454--0--Toxicroak.gif similarity index 100% rename from src/canonical/models/front-shiny/Toxicroak.gif rename to src/canonical/models/front-shiny/454--0--Toxicroak.gif diff --git a/src/canonical/models/front-shiny/Carnivine.gif b/src/canonical/models/front-shiny/455--0--Carnivine.gif similarity index 100% rename from src/canonical/models/front-shiny/Carnivine.gif rename to src/canonical/models/front-shiny/455--0--Carnivine.gif diff --git a/src/canonical/models/front-shiny/Finneon.gif b/src/canonical/models/front-shiny/456--0--Finneon.gif similarity index 100% rename from src/canonical/models/front-shiny/Finneon.gif rename to src/canonical/models/front-shiny/456--0--Finneon.gif diff --git a/src/canonical/models/front-shiny/Lumineon.gif b/src/canonical/models/front-shiny/457--0--Lumineon.gif similarity index 100% rename from src/canonical/models/front-shiny/Lumineon.gif rename to src/canonical/models/front-shiny/457--0--Lumineon.gif diff --git a/src/canonical/models/front-shiny/Mantyke.gif b/src/canonical/models/front-shiny/458--0--Mantyke.gif similarity index 100% rename from src/canonical/models/front-shiny/Mantyke.gif rename to src/canonical/models/front-shiny/458--0--Mantyke.gif diff --git a/src/canonical/models/front-shiny/Snover.gif b/src/canonical/models/front-shiny/459--0--Snover.gif similarity index 100% rename from src/canonical/models/front-shiny/Snover.gif rename to src/canonical/models/front-shiny/459--0--Snover.gif diff --git a/src/canonical/models/front-shiny/Paras.gif b/src/canonical/models/front-shiny/46--0--Paras.gif similarity index 100% rename from src/canonical/models/front-shiny/Paras.gif rename to src/canonical/models/front-shiny/46--0--Paras.gif diff --git a/src/canonical/models/front-shiny/Abomasnow.gif b/src/canonical/models/front-shiny/460--0--Abomasnow.gif similarity index 100% rename from src/canonical/models/front-shiny/Abomasnow.gif rename to src/canonical/models/front-shiny/460--0--Abomasnow.gif diff --git a/src/canonical/models/front-shiny/Abomasnow--Mega.gif b/src/canonical/models/front-shiny/460--420--Abomasnow--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Abomasnow--Mega.gif rename to src/canonical/models/front-shiny/460--420--Abomasnow--Mega.gif diff --git a/src/canonical/models/front-shiny/Weavile.gif b/src/canonical/models/front-shiny/461--0--Weavile.gif similarity index 100% rename from src/canonical/models/front-shiny/Weavile.gif rename to src/canonical/models/front-shiny/461--0--Weavile.gif diff --git a/src/canonical/models/front-shiny/Magnezone.gif b/src/canonical/models/front-shiny/462--0--Magnezone.gif similarity index 100% rename from src/canonical/models/front-shiny/Magnezone.gif rename to src/canonical/models/front-shiny/462--0--Magnezone.gif diff --git a/src/canonical/models/front-shiny/Lickilicky.gif b/src/canonical/models/front-shiny/463--0--Lickilicky.gif similarity index 100% rename from src/canonical/models/front-shiny/Lickilicky.gif rename to src/canonical/models/front-shiny/463--0--Lickilicky.gif diff --git a/src/canonical/models/front-shiny/Rhyperior.gif b/src/canonical/models/front-shiny/464--0--Rhyperior.gif similarity index 100% rename from src/canonical/models/front-shiny/Rhyperior.gif rename to src/canonical/models/front-shiny/464--0--Rhyperior.gif diff --git a/src/canonical/models/front-shiny/Tangrowth.gif b/src/canonical/models/front-shiny/465--0--Tangrowth.gif similarity index 100% rename from src/canonical/models/front-shiny/Tangrowth.gif rename to src/canonical/models/front-shiny/465--0--Tangrowth.gif diff --git a/src/canonical/models/front-shiny/Electivire.gif b/src/canonical/models/front-shiny/466--0--Electivire.gif similarity index 100% rename from src/canonical/models/front-shiny/Electivire.gif rename to src/canonical/models/front-shiny/466--0--Electivire.gif diff --git a/src/canonical/models/front-shiny/Magmortar.gif b/src/canonical/models/front-shiny/467--0--Magmortar.gif similarity index 100% rename from src/canonical/models/front-shiny/Magmortar.gif rename to src/canonical/models/front-shiny/467--0--Magmortar.gif diff --git a/src/canonical/models/front-shiny/Togekiss.gif b/src/canonical/models/front-shiny/468--0--Togekiss.gif similarity index 100% rename from src/canonical/models/front-shiny/Togekiss.gif rename to src/canonical/models/front-shiny/468--0--Togekiss.gif diff --git a/src/canonical/models/front-shiny/Yanmega.gif b/src/canonical/models/front-shiny/469--0--Yanmega.gif similarity index 100% rename from src/canonical/models/front-shiny/Yanmega.gif rename to src/canonical/models/front-shiny/469--0--Yanmega.gif diff --git a/src/canonical/models/front-shiny/Parasect.gif b/src/canonical/models/front-shiny/47--0--Parasect.gif similarity index 100% rename from src/canonical/models/front-shiny/Parasect.gif rename to src/canonical/models/front-shiny/47--0--Parasect.gif diff --git a/src/canonical/models/front-shiny/Leafeon.gif b/src/canonical/models/front-shiny/470--0--Leafeon.gif similarity index 100% rename from src/canonical/models/front-shiny/Leafeon.gif rename to src/canonical/models/front-shiny/470--0--Leafeon.gif diff --git a/src/canonical/models/front-shiny/Glaceon.gif b/src/canonical/models/front-shiny/471--0--Glaceon.gif similarity index 100% rename from src/canonical/models/front-shiny/Glaceon.gif rename to src/canonical/models/front-shiny/471--0--Glaceon.gif diff --git a/src/canonical/models/front-shiny/Gliscor.gif b/src/canonical/models/front-shiny/472--0--Gliscor.gif similarity index 100% rename from src/canonical/models/front-shiny/Gliscor.gif rename to src/canonical/models/front-shiny/472--0--Gliscor.gif diff --git a/src/canonical/models/front-shiny/Mamoswine.gif b/src/canonical/models/front-shiny/473--0--Mamoswine.gif similarity index 100% rename from src/canonical/models/front-shiny/Mamoswine.gif rename to src/canonical/models/front-shiny/473--0--Mamoswine.gif diff --git a/src/canonical/models/front-shiny/Porygon-Z.gif b/src/canonical/models/front-shiny/474--0--Porygon-Z.gif similarity index 100% rename from src/canonical/models/front-shiny/Porygon-Z.gif rename to src/canonical/models/front-shiny/474--0--Porygon-Z.gif diff --git a/src/canonical/models/front-shiny/Gallade.gif b/src/canonical/models/front-shiny/475--0--Gallade.gif similarity index 100% rename from src/canonical/models/front-shiny/Gallade.gif rename to src/canonical/models/front-shiny/475--0--Gallade.gif diff --git a/src/canonical/models/front-shiny/Gallade--Mega.gif b/src/canonical/models/front-shiny/475--420--Gallade--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Gallade--Mega.gif rename to src/canonical/models/front-shiny/475--420--Gallade--Mega.gif diff --git a/src/canonical/models/front-shiny/Probopass.gif b/src/canonical/models/front-shiny/476--0--Probopass.gif similarity index 100% rename from src/canonical/models/front-shiny/Probopass.gif rename to src/canonical/models/front-shiny/476--0--Probopass.gif diff --git a/src/canonical/models/front-shiny/Dusknoir.gif b/src/canonical/models/front-shiny/477--0--Dusknoir.gif similarity index 100% rename from src/canonical/models/front-shiny/Dusknoir.gif rename to src/canonical/models/front-shiny/477--0--Dusknoir.gif diff --git a/src/canonical/models/front-shiny/Froslass.gif b/src/canonical/models/front-shiny/478--0--Froslass.gif similarity index 100% rename from src/canonical/models/front-shiny/Froslass.gif rename to src/canonical/models/front-shiny/478--0--Froslass.gif diff --git a/src/canonical/models/front-shiny/Rotom.gif b/src/canonical/models/front-shiny/479--0--Rotom.gif similarity index 100% rename from src/canonical/models/front-shiny/Rotom.gif rename to src/canonical/models/front-shiny/479--0--Rotom.gif diff --git a/src/canonical/models/front-shiny/Rotom--Fan.gif b/src/canonical/models/front-shiny/479--420--Rotom--Fan.gif similarity index 100% rename from src/canonical/models/front-shiny/Rotom--Fan.gif rename to src/canonical/models/front-shiny/479--420--Rotom--Fan.gif diff --git a/src/canonical/models/front-shiny/Rotom--Frost.gif b/src/canonical/models/front-shiny/479--420--Rotom--Frost.gif similarity index 100% rename from src/canonical/models/front-shiny/Rotom--Frost.gif rename to src/canonical/models/front-shiny/479--420--Rotom--Frost.gif diff --git a/src/canonical/models/front-shiny/Rotom--Heat.gif b/src/canonical/models/front-shiny/479--420--Rotom--Heat.gif similarity index 100% rename from src/canonical/models/front-shiny/Rotom--Heat.gif rename to src/canonical/models/front-shiny/479--420--Rotom--Heat.gif diff --git a/src/canonical/models/front-shiny/Rotom--Mow.gif b/src/canonical/models/front-shiny/479--420--Rotom--Mow.gif similarity index 100% rename from src/canonical/models/front-shiny/Rotom--Mow.gif rename to src/canonical/models/front-shiny/479--420--Rotom--Mow.gif diff --git a/src/canonical/models/front-shiny/Rotom--Wash.gif b/src/canonical/models/front-shiny/479--420--Rotom--Wash.gif similarity index 100% rename from src/canonical/models/front-shiny/Rotom--Wash.gif rename to src/canonical/models/front-shiny/479--420--Rotom--Wash.gif diff --git a/src/canonical/models/front-shiny/Venonat.gif b/src/canonical/models/front-shiny/48--0--Venonat.gif similarity index 100% rename from src/canonical/models/front-shiny/Venonat.gif rename to src/canonical/models/front-shiny/48--0--Venonat.gif diff --git a/src/canonical/models/front-shiny/Uxie.gif b/src/canonical/models/front-shiny/480--0--Uxie.gif similarity index 100% rename from src/canonical/models/front-shiny/Uxie.gif rename to src/canonical/models/front-shiny/480--0--Uxie.gif diff --git a/src/canonical/models/front-shiny/Mesprit.gif b/src/canonical/models/front-shiny/481--0--Mesprit.gif similarity index 100% rename from src/canonical/models/front-shiny/Mesprit.gif rename to src/canonical/models/front-shiny/481--0--Mesprit.gif diff --git a/src/canonical/models/front-shiny/Azelf.gif b/src/canonical/models/front-shiny/482--0--Azelf.gif similarity index 100% rename from src/canonical/models/front-shiny/Azelf.gif rename to src/canonical/models/front-shiny/482--0--Azelf.gif diff --git a/src/canonical/models/front-shiny/Dialga.gif b/src/canonical/models/front-shiny/483--0--Dialga.gif similarity index 100% rename from src/canonical/models/front-shiny/Dialga.gif rename to src/canonical/models/front-shiny/483--0--Dialga.gif diff --git a/src/canonical/models/front-shiny/Palkia.gif b/src/canonical/models/front-shiny/484--0--Palkia.gif similarity index 100% rename from src/canonical/models/front-shiny/Palkia.gif rename to src/canonical/models/front-shiny/484--0--Palkia.gif diff --git a/src/canonical/models/front-shiny/Heatran.gif b/src/canonical/models/front-shiny/485--0--Heatran.gif similarity index 100% rename from src/canonical/models/front-shiny/Heatran.gif rename to src/canonical/models/front-shiny/485--0--Heatran.gif diff --git a/src/canonical/models/front-shiny/Regigigas.gif b/src/canonical/models/front-shiny/486--0--Regigigas.gif similarity index 100% rename from src/canonical/models/front-shiny/Regigigas.gif rename to src/canonical/models/front-shiny/486--0--Regigigas.gif diff --git a/src/canonical/models/front-shiny/Giratina.gif b/src/canonical/models/front-shiny/487--0--Giratina.gif similarity index 100% rename from src/canonical/models/front-shiny/Giratina.gif rename to src/canonical/models/front-shiny/487--0--Giratina.gif diff --git a/src/canonical/models/front-shiny/Giratina--Origin.gif b/src/canonical/models/front-shiny/487--420--Giratina--Origin.gif similarity index 100% rename from src/canonical/models/front-shiny/Giratina--Origin.gif rename to src/canonical/models/front-shiny/487--420--Giratina--Origin.gif diff --git a/src/canonical/models/front-shiny/Cresselia.gif b/src/canonical/models/front-shiny/488--0--Cresselia.gif similarity index 100% rename from src/canonical/models/front-shiny/Cresselia.gif rename to src/canonical/models/front-shiny/488--0--Cresselia.gif diff --git a/src/canonical/models/front-shiny/Phione.gif b/src/canonical/models/front-shiny/489--0--Phione.gif similarity index 100% rename from src/canonical/models/front-shiny/Phione.gif rename to src/canonical/models/front-shiny/489--0--Phione.gif diff --git a/src/canonical/models/front-shiny/Venomoth.gif b/src/canonical/models/front-shiny/49--0--Venomoth.gif similarity index 100% rename from src/canonical/models/front-shiny/Venomoth.gif rename to src/canonical/models/front-shiny/49--0--Venomoth.gif diff --git a/src/canonical/models/front-shiny/Manaphy.gif b/src/canonical/models/front-shiny/490--0--Manaphy.gif similarity index 100% rename from src/canonical/models/front-shiny/Manaphy.gif rename to src/canonical/models/front-shiny/490--0--Manaphy.gif diff --git a/src/canonical/models/front-shiny/Darkrai.gif b/src/canonical/models/front-shiny/491--0--Darkrai.gif similarity index 100% rename from src/canonical/models/front-shiny/Darkrai.gif rename to src/canonical/models/front-shiny/491--0--Darkrai.gif diff --git a/src/canonical/models/front-shiny/Shaymin.gif b/src/canonical/models/front-shiny/492--0--Shaymin.gif similarity index 100% rename from src/canonical/models/front-shiny/Shaymin.gif rename to src/canonical/models/front-shiny/492--0--Shaymin.gif diff --git a/src/canonical/models/front-shiny/Shaymin--Sky.gif b/src/canonical/models/front-shiny/492--420--Shaymin--Sky.gif similarity index 100% rename from src/canonical/models/front-shiny/Shaymin--Sky.gif rename to src/canonical/models/front-shiny/492--420--Shaymin--Sky.gif diff --git a/src/canonical/models/front-shiny/Arceus.gif b/src/canonical/models/front-shiny/493--0--Arceus.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus.gif rename to src/canonical/models/front-shiny/493--0--Arceus.gif diff --git a/src/canonical/models/front-shiny/Arceus--Bug.gif b/src/canonical/models/front-shiny/493--420--Arceus--Bug.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Bug.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Bug.gif diff --git a/src/canonical/models/front-shiny/Arceus--Dark.gif b/src/canonical/models/front-shiny/493--420--Arceus--Dark.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Dark.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Dark.gif diff --git a/src/canonical/models/front-shiny/Arceus--Dragon.gif b/src/canonical/models/front-shiny/493--420--Arceus--Dragon.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Dragon.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Dragon.gif diff --git a/src/canonical/models/front-shiny/Arceus--Electric.gif b/src/canonical/models/front-shiny/493--420--Arceus--Electric.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Electric.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Electric.gif diff --git a/src/canonical/models/front-shiny/Arceus--Fairy.gif b/src/canonical/models/front-shiny/493--420--Arceus--Fairy.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Fairy.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Fairy.gif diff --git a/src/canonical/models/front-shiny/Arceus--Fighting.gif b/src/canonical/models/front-shiny/493--420--Arceus--Fighting.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Fighting.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Fighting.gif diff --git a/src/canonical/models/front-shiny/Arceus--Fire.gif b/src/canonical/models/front-shiny/493--420--Arceus--Fire.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Fire.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Fire.gif diff --git a/src/canonical/models/front-shiny/Arceus--Flying.gif b/src/canonical/models/front-shiny/493--420--Arceus--Flying.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Flying.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Flying.gif diff --git a/src/canonical/models/front-shiny/Arceus--Ghost.gif b/src/canonical/models/front-shiny/493--420--Arceus--Ghost.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Ghost.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Ghost.gif diff --git a/src/canonical/models/front-shiny/Arceus--Grass.gif b/src/canonical/models/front-shiny/493--420--Arceus--Grass.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Grass.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Grass.gif diff --git a/src/canonical/models/front-shiny/Arceus--Ground.gif b/src/canonical/models/front-shiny/493--420--Arceus--Ground.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Ground.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Ground.gif diff --git a/src/canonical/models/front-shiny/Arceus--Ice.gif b/src/canonical/models/front-shiny/493--420--Arceus--Ice.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Ice.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Ice.gif diff --git a/src/canonical/models/front-shiny/Arceus--Poison.gif b/src/canonical/models/front-shiny/493--420--Arceus--Poison.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Poison.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Poison.gif diff --git a/src/canonical/models/front-shiny/Arceus--Psychic.gif b/src/canonical/models/front-shiny/493--420--Arceus--Psychic.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Psychic.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Psychic.gif diff --git a/src/canonical/models/front-shiny/Arceus--Rock.gif b/src/canonical/models/front-shiny/493--420--Arceus--Rock.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Rock.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Rock.gif diff --git a/src/canonical/models/front-shiny/Arceus--Steel.gif b/src/canonical/models/front-shiny/493--420--Arceus--Steel.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Steel.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Steel.gif diff --git a/src/canonical/models/front-shiny/Arceus--Water.gif b/src/canonical/models/front-shiny/493--420--Arceus--Water.gif similarity index 100% rename from src/canonical/models/front-shiny/Arceus--Water.gif rename to src/canonical/models/front-shiny/493--420--Arceus--Water.gif diff --git a/src/canonical/models/front-shiny/Victini.gif b/src/canonical/models/front-shiny/494--0--Victini.gif similarity index 100% rename from src/canonical/models/front-shiny/Victini.gif rename to src/canonical/models/front-shiny/494--0--Victini.gif diff --git a/src/canonical/models/front-shiny/Snivy.gif b/src/canonical/models/front-shiny/495--0--Snivy.gif similarity index 100% rename from src/canonical/models/front-shiny/Snivy.gif rename to src/canonical/models/front-shiny/495--0--Snivy.gif diff --git a/src/canonical/models/front-shiny/Servine.gif b/src/canonical/models/front-shiny/496--0--Servine.gif similarity index 100% rename from src/canonical/models/front-shiny/Servine.gif rename to src/canonical/models/front-shiny/496--0--Servine.gif diff --git a/src/canonical/models/front-shiny/Serperior.gif b/src/canonical/models/front-shiny/497--0--Serperior.gif similarity index 100% rename from src/canonical/models/front-shiny/Serperior.gif rename to src/canonical/models/front-shiny/497--0--Serperior.gif diff --git a/src/canonical/models/front-shiny/Tepig.gif b/src/canonical/models/front-shiny/498--0--Tepig.gif similarity index 100% rename from src/canonical/models/front-shiny/Tepig.gif rename to src/canonical/models/front-shiny/498--0--Tepig.gif diff --git a/src/canonical/models/front-shiny/Pignite.gif b/src/canonical/models/front-shiny/499--0--Pignite.gif similarity index 100% rename from src/canonical/models/front-shiny/Pignite.gif rename to src/canonical/models/front-shiny/499--0--Pignite.gif diff --git a/src/canonical/models/front-shiny/Charmeleon.gif b/src/canonical/models/front-shiny/5--0--Charmeleon.gif similarity index 100% rename from src/canonical/models/front-shiny/Charmeleon.gif rename to src/canonical/models/front-shiny/5--0--Charmeleon.gif diff --git a/src/canonical/models/front-shiny/Diglett.gif b/src/canonical/models/front-shiny/50--0--Diglett.gif similarity index 100% rename from src/canonical/models/front-shiny/Diglett.gif rename to src/canonical/models/front-shiny/50--0--Diglett.gif diff --git a/src/canonical/models/front-shiny/Diglett--Alola.gif b/src/canonical/models/front-shiny/50--420--Diglett--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Diglett--Alola.gif rename to src/canonical/models/front-shiny/50--420--Diglett--Alola.gif diff --git a/src/canonical/models/front-shiny/Emboar.gif b/src/canonical/models/front-shiny/500--0--Emboar.gif similarity index 100% rename from src/canonical/models/front-shiny/Emboar.gif rename to src/canonical/models/front-shiny/500--0--Emboar.gif diff --git a/src/canonical/models/front-shiny/Oshawott.gif b/src/canonical/models/front-shiny/501--0--Oshawott.gif similarity index 100% rename from src/canonical/models/front-shiny/Oshawott.gif rename to src/canonical/models/front-shiny/501--0--Oshawott.gif diff --git a/src/canonical/models/front-shiny/Dewott.gif b/src/canonical/models/front-shiny/502--0--Dewott.gif similarity index 100% rename from src/canonical/models/front-shiny/Dewott.gif rename to src/canonical/models/front-shiny/502--0--Dewott.gif diff --git a/src/canonical/models/front-shiny/Samurott.gif b/src/canonical/models/front-shiny/503--0--Samurott.gif similarity index 100% rename from src/canonical/models/front-shiny/Samurott.gif rename to src/canonical/models/front-shiny/503--0--Samurott.gif diff --git a/src/canonical/models/front-shiny/Patrat.gif b/src/canonical/models/front-shiny/504--0--Patrat.gif similarity index 100% rename from src/canonical/models/front-shiny/Patrat.gif rename to src/canonical/models/front-shiny/504--0--Patrat.gif diff --git a/src/canonical/models/front-shiny/Watchog.gif b/src/canonical/models/front-shiny/505--0--Watchog.gif similarity index 100% rename from src/canonical/models/front-shiny/Watchog.gif rename to src/canonical/models/front-shiny/505--0--Watchog.gif diff --git a/src/canonical/models/front-shiny/Lillipup.gif b/src/canonical/models/front-shiny/506--0--Lillipup.gif similarity index 100% rename from src/canonical/models/front-shiny/Lillipup.gif rename to src/canonical/models/front-shiny/506--0--Lillipup.gif diff --git a/src/canonical/models/front-shiny/Herdier.gif b/src/canonical/models/front-shiny/507--0--Herdier.gif similarity index 100% rename from src/canonical/models/front-shiny/Herdier.gif rename to src/canonical/models/front-shiny/507--0--Herdier.gif diff --git a/src/canonical/models/front-shiny/Stoutland.gif b/src/canonical/models/front-shiny/508--0--Stoutland.gif similarity index 100% rename from src/canonical/models/front-shiny/Stoutland.gif rename to src/canonical/models/front-shiny/508--0--Stoutland.gif diff --git a/src/canonical/models/front-shiny/Purrloin.gif b/src/canonical/models/front-shiny/509--0--Purrloin.gif similarity index 100% rename from src/canonical/models/front-shiny/Purrloin.gif rename to src/canonical/models/front-shiny/509--0--Purrloin.gif diff --git a/src/canonical/models/front-shiny/Dugtrio.gif b/src/canonical/models/front-shiny/51--0--Dugtrio.gif similarity index 100% rename from src/canonical/models/front-shiny/Dugtrio.gif rename to src/canonical/models/front-shiny/51--0--Dugtrio.gif diff --git a/src/canonical/models/front-shiny/Dugtrio--Alola.gif b/src/canonical/models/front-shiny/51--420--Dugtrio--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Dugtrio--Alola.gif rename to src/canonical/models/front-shiny/51--420--Dugtrio--Alola.gif diff --git a/src/canonical/models/front-shiny/Liepard.gif b/src/canonical/models/front-shiny/510--0--Liepard.gif similarity index 100% rename from src/canonical/models/front-shiny/Liepard.gif rename to src/canonical/models/front-shiny/510--0--Liepard.gif diff --git a/src/canonical/models/front-shiny/Pansage.gif b/src/canonical/models/front-shiny/511--0--Pansage.gif similarity index 100% rename from src/canonical/models/front-shiny/Pansage.gif rename to src/canonical/models/front-shiny/511--0--Pansage.gif diff --git a/src/canonical/models/front-shiny/Simisage.gif b/src/canonical/models/front-shiny/512--0--Simisage.gif similarity index 100% rename from src/canonical/models/front-shiny/Simisage.gif rename to src/canonical/models/front-shiny/512--0--Simisage.gif diff --git a/src/canonical/models/front-shiny/Pansear.gif b/src/canonical/models/front-shiny/513--0--Pansear.gif similarity index 100% rename from src/canonical/models/front-shiny/Pansear.gif rename to src/canonical/models/front-shiny/513--0--Pansear.gif diff --git a/src/canonical/models/front-shiny/Simisear.gif b/src/canonical/models/front-shiny/514--0--Simisear.gif similarity index 100% rename from src/canonical/models/front-shiny/Simisear.gif rename to src/canonical/models/front-shiny/514--0--Simisear.gif diff --git a/src/canonical/models/front-shiny/Panpour.gif b/src/canonical/models/front-shiny/515--0--Panpour.gif similarity index 100% rename from src/canonical/models/front-shiny/Panpour.gif rename to src/canonical/models/front-shiny/515--0--Panpour.gif diff --git a/src/canonical/models/front-shiny/Simipour.gif b/src/canonical/models/front-shiny/516--0--Simipour.gif similarity index 100% rename from src/canonical/models/front-shiny/Simipour.gif rename to src/canonical/models/front-shiny/516--0--Simipour.gif diff --git a/src/canonical/models/front-shiny/Munna.gif b/src/canonical/models/front-shiny/517--0--Munna.gif similarity index 100% rename from src/canonical/models/front-shiny/Munna.gif rename to src/canonical/models/front-shiny/517--0--Munna.gif diff --git a/src/canonical/models/front-shiny/Musharna.gif b/src/canonical/models/front-shiny/518--0--Musharna.gif similarity index 100% rename from src/canonical/models/front-shiny/Musharna.gif rename to src/canonical/models/front-shiny/518--0--Musharna.gif diff --git a/src/canonical/models/front-shiny/Pidove.gif b/src/canonical/models/front-shiny/519--0--Pidove.gif similarity index 100% rename from src/canonical/models/front-shiny/Pidove.gif rename to src/canonical/models/front-shiny/519--0--Pidove.gif diff --git a/src/canonical/models/front-shiny/Meowth.gif b/src/canonical/models/front-shiny/52--0--Meowth.gif similarity index 100% rename from src/canonical/models/front-shiny/Meowth.gif rename to src/canonical/models/front-shiny/52--0--Meowth.gif diff --git a/src/canonical/models/front-shiny/Meowth--Alola.gif b/src/canonical/models/front-shiny/52--420--Meowth--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Meowth--Alola.gif rename to src/canonical/models/front-shiny/52--420--Meowth--Alola.gif diff --git a/src/canonical/models/front-shiny/Meowth--Galar.gif b/src/canonical/models/front-shiny/52--420--Meowth--Galar.gif similarity index 100% rename from src/canonical/models/front-shiny/Meowth--Galar.gif rename to src/canonical/models/front-shiny/52--420--Meowth--Galar.gif diff --git a/src/canonical/models/front-shiny/Meowth--Gmax.gif b/src/canonical/models/front-shiny/52--420--Meowth--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Meowth--Gmax.gif rename to src/canonical/models/front-shiny/52--420--Meowth--Gmax.gif diff --git a/src/canonical/models/front-shiny/Tranquill.gif b/src/canonical/models/front-shiny/520--0--Tranquill.gif similarity index 100% rename from src/canonical/models/front-shiny/Tranquill.gif rename to src/canonical/models/front-shiny/520--0--Tranquill.gif diff --git a/src/canonical/models/front-shiny/Unfezant.gif b/src/canonical/models/front-shiny/521--0--Unfezant.gif similarity index 100% rename from src/canonical/models/front-shiny/Unfezant.gif rename to src/canonical/models/front-shiny/521--0--Unfezant.gif diff --git a/src/canonical/models/front-shiny/Blitzle.gif b/src/canonical/models/front-shiny/522--0--Blitzle.gif similarity index 100% rename from src/canonical/models/front-shiny/Blitzle.gif rename to src/canonical/models/front-shiny/522--0--Blitzle.gif diff --git a/src/canonical/models/front-shiny/Zebstrika.gif b/src/canonical/models/front-shiny/523--0--Zebstrika.gif similarity index 100% rename from src/canonical/models/front-shiny/Zebstrika.gif rename to src/canonical/models/front-shiny/523--0--Zebstrika.gif diff --git a/src/canonical/models/front-shiny/Roggenrola.gif b/src/canonical/models/front-shiny/524--0--Roggenrola.gif similarity index 100% rename from src/canonical/models/front-shiny/Roggenrola.gif rename to src/canonical/models/front-shiny/524--0--Roggenrola.gif diff --git a/src/canonical/models/front-shiny/Boldore.gif b/src/canonical/models/front-shiny/525--0--Boldore.gif similarity index 100% rename from src/canonical/models/front-shiny/Boldore.gif rename to src/canonical/models/front-shiny/525--0--Boldore.gif diff --git a/src/canonical/models/front-shiny/Gigalith.gif b/src/canonical/models/front-shiny/526--0--Gigalith.gif similarity index 100% rename from src/canonical/models/front-shiny/Gigalith.gif rename to src/canonical/models/front-shiny/526--0--Gigalith.gif diff --git a/src/canonical/models/front-shiny/Woobat.gif b/src/canonical/models/front-shiny/527--0--Woobat.gif similarity index 100% rename from src/canonical/models/front-shiny/Woobat.gif rename to src/canonical/models/front-shiny/527--0--Woobat.gif diff --git a/src/canonical/models/front-shiny/Swoobat.gif b/src/canonical/models/front-shiny/528--0--Swoobat.gif similarity index 100% rename from src/canonical/models/front-shiny/Swoobat.gif rename to src/canonical/models/front-shiny/528--0--Swoobat.gif diff --git a/src/canonical/models/front-shiny/Drilbur.gif b/src/canonical/models/front-shiny/529--0--Drilbur.gif similarity index 100% rename from src/canonical/models/front-shiny/Drilbur.gif rename to src/canonical/models/front-shiny/529--0--Drilbur.gif diff --git a/src/canonical/models/front-shiny/Persian.gif b/src/canonical/models/front-shiny/53--0--Persian.gif similarity index 100% rename from src/canonical/models/front-shiny/Persian.gif rename to src/canonical/models/front-shiny/53--0--Persian.gif diff --git a/src/canonical/models/front-shiny/Persian--Alola.gif b/src/canonical/models/front-shiny/53--420--Persian--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Persian--Alola.gif rename to src/canonical/models/front-shiny/53--420--Persian--Alola.gif diff --git a/src/canonical/models/front-shiny/Excadrill.gif b/src/canonical/models/front-shiny/530--0--Excadrill.gif similarity index 100% rename from src/canonical/models/front-shiny/Excadrill.gif rename to src/canonical/models/front-shiny/530--0--Excadrill.gif diff --git a/src/canonical/models/front-shiny/Audino.gif b/src/canonical/models/front-shiny/531--0--Audino.gif similarity index 100% rename from src/canonical/models/front-shiny/Audino.gif rename to src/canonical/models/front-shiny/531--0--Audino.gif diff --git a/src/canonical/models/front-shiny/Audino--Mega.gif b/src/canonical/models/front-shiny/531--420--Audino--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Audino--Mega.gif rename to src/canonical/models/front-shiny/531--420--Audino--Mega.gif diff --git a/src/canonical/models/front-shiny/Timburr.gif b/src/canonical/models/front-shiny/532--0--Timburr.gif similarity index 100% rename from src/canonical/models/front-shiny/Timburr.gif rename to src/canonical/models/front-shiny/532--0--Timburr.gif diff --git a/src/canonical/models/front-shiny/Gurdurr.gif b/src/canonical/models/front-shiny/533--0--Gurdurr.gif similarity index 100% rename from src/canonical/models/front-shiny/Gurdurr.gif rename to src/canonical/models/front-shiny/533--0--Gurdurr.gif diff --git a/src/canonical/models/front-shiny/Conkeldurr.gif b/src/canonical/models/front-shiny/534--0--Conkeldurr.gif similarity index 100% rename from src/canonical/models/front-shiny/Conkeldurr.gif rename to src/canonical/models/front-shiny/534--0--Conkeldurr.gif diff --git a/src/canonical/models/front-shiny/Tympole.gif b/src/canonical/models/front-shiny/535--0--Tympole.gif similarity index 100% rename from src/canonical/models/front-shiny/Tympole.gif rename to src/canonical/models/front-shiny/535--0--Tympole.gif diff --git a/src/canonical/models/front-shiny/Palpitoad.gif b/src/canonical/models/front-shiny/536--0--Palpitoad.gif similarity index 100% rename from src/canonical/models/front-shiny/Palpitoad.gif rename to src/canonical/models/front-shiny/536--0--Palpitoad.gif diff --git a/src/canonical/models/front-shiny/Seismitoad.gif b/src/canonical/models/front-shiny/537--0--Seismitoad.gif similarity index 100% rename from src/canonical/models/front-shiny/Seismitoad.gif rename to src/canonical/models/front-shiny/537--0--Seismitoad.gif diff --git a/src/canonical/models/front-shiny/Throh.gif b/src/canonical/models/front-shiny/538--0--Throh.gif similarity index 100% rename from src/canonical/models/front-shiny/Throh.gif rename to src/canonical/models/front-shiny/538--0--Throh.gif diff --git a/src/canonical/models/front-shiny/Sawk.gif b/src/canonical/models/front-shiny/539--0--Sawk.gif similarity index 100% rename from src/canonical/models/front-shiny/Sawk.gif rename to src/canonical/models/front-shiny/539--0--Sawk.gif diff --git a/src/canonical/models/front-shiny/Psyduck.gif b/src/canonical/models/front-shiny/54--0--Psyduck.gif similarity index 100% rename from src/canonical/models/front-shiny/Psyduck.gif rename to src/canonical/models/front-shiny/54--0--Psyduck.gif diff --git a/src/canonical/models/front-shiny/Sewaddle.gif b/src/canonical/models/front-shiny/540--0--Sewaddle.gif similarity index 100% rename from src/canonical/models/front-shiny/Sewaddle.gif rename to src/canonical/models/front-shiny/540--0--Sewaddle.gif diff --git a/src/canonical/models/front-shiny/Swadloon.gif b/src/canonical/models/front-shiny/541--0--Swadloon.gif similarity index 100% rename from src/canonical/models/front-shiny/Swadloon.gif rename to src/canonical/models/front-shiny/541--0--Swadloon.gif diff --git a/src/canonical/models/front-shiny/Leavanny.gif b/src/canonical/models/front-shiny/542--0--Leavanny.gif similarity index 100% rename from src/canonical/models/front-shiny/Leavanny.gif rename to src/canonical/models/front-shiny/542--0--Leavanny.gif diff --git a/src/canonical/models/front-shiny/Venipede.gif b/src/canonical/models/front-shiny/543--0--Venipede.gif similarity index 100% rename from src/canonical/models/front-shiny/Venipede.gif rename to src/canonical/models/front-shiny/543--0--Venipede.gif diff --git a/src/canonical/models/front-shiny/Whirlipede.gif b/src/canonical/models/front-shiny/544--0--Whirlipede.gif similarity index 100% rename from src/canonical/models/front-shiny/Whirlipede.gif rename to src/canonical/models/front-shiny/544--0--Whirlipede.gif diff --git a/src/canonical/models/front-shiny/Scolipede.gif b/src/canonical/models/front-shiny/545--0--Scolipede.gif similarity index 100% rename from src/canonical/models/front-shiny/Scolipede.gif rename to src/canonical/models/front-shiny/545--0--Scolipede.gif diff --git a/src/canonical/models/front-shiny/Cottonee.gif b/src/canonical/models/front-shiny/546--0--Cottonee.gif similarity index 100% rename from src/canonical/models/front-shiny/Cottonee.gif rename to src/canonical/models/front-shiny/546--0--Cottonee.gif diff --git a/src/canonical/models/front-shiny/Whimsicott.gif b/src/canonical/models/front-shiny/547--0--Whimsicott.gif similarity index 100% rename from src/canonical/models/front-shiny/Whimsicott.gif rename to src/canonical/models/front-shiny/547--0--Whimsicott.gif diff --git a/src/canonical/models/front-shiny/Petilil.gif b/src/canonical/models/front-shiny/548--0--Petilil.gif similarity index 100% rename from src/canonical/models/front-shiny/Petilil.gif rename to src/canonical/models/front-shiny/548--0--Petilil.gif diff --git a/src/canonical/models/front-shiny/Lilligant.gif b/src/canonical/models/front-shiny/549--0--Lilligant.gif similarity index 100% rename from src/canonical/models/front-shiny/Lilligant.gif rename to src/canonical/models/front-shiny/549--0--Lilligant.gif diff --git a/src/canonical/models/front-shiny/Golduck.gif b/src/canonical/models/front-shiny/55--0--Golduck.gif similarity index 100% rename from src/canonical/models/front-shiny/Golduck.gif rename to src/canonical/models/front-shiny/55--0--Golduck.gif diff --git a/src/canonical/models/front-shiny/Basculin.gif b/src/canonical/models/front-shiny/550--0--Basculin.gif similarity index 100% rename from src/canonical/models/front-shiny/Basculin.gif rename to src/canonical/models/front-shiny/550--0--Basculin.gif diff --git a/src/canonical/models/front-shiny/Basculin--Blue-Striped.gif b/src/canonical/models/front-shiny/550--420--Basculin--Blue-Striped.gif similarity index 100% rename from src/canonical/models/front-shiny/Basculin--Blue-Striped.gif rename to src/canonical/models/front-shiny/550--420--Basculin--Blue-Striped.gif diff --git a/src/canonical/models/front-shiny/Sandile.gif b/src/canonical/models/front-shiny/551--0--Sandile.gif similarity index 100% rename from src/canonical/models/front-shiny/Sandile.gif rename to src/canonical/models/front-shiny/551--0--Sandile.gif diff --git a/src/canonical/models/front-shiny/Krokorok.gif b/src/canonical/models/front-shiny/552--0--Krokorok.gif similarity index 100% rename from src/canonical/models/front-shiny/Krokorok.gif rename to src/canonical/models/front-shiny/552--0--Krokorok.gif diff --git a/src/canonical/models/front-shiny/Krookodile.gif b/src/canonical/models/front-shiny/553--0--Krookodile.gif similarity index 100% rename from src/canonical/models/front-shiny/Krookodile.gif rename to src/canonical/models/front-shiny/553--0--Krookodile.gif diff --git a/src/canonical/models/front-shiny/Darumaka.gif b/src/canonical/models/front-shiny/554--0--Darumaka.gif similarity index 100% rename from src/canonical/models/front-shiny/Darumaka.gif rename to src/canonical/models/front-shiny/554--0--Darumaka.gif diff --git a/src/canonical/models/front-shiny/Darumaka--Galar.gif b/src/canonical/models/front-shiny/554--420--Darumaka--Galar.gif similarity index 100% rename from src/canonical/models/front-shiny/Darumaka--Galar.gif rename to src/canonical/models/front-shiny/554--420--Darumaka--Galar.gif diff --git a/src/canonical/models/front-shiny/Darmanitan.gif b/src/canonical/models/front-shiny/555--0--Darmanitan.gif similarity index 100% rename from src/canonical/models/front-shiny/Darmanitan.gif rename to src/canonical/models/front-shiny/555--0--Darmanitan.gif diff --git a/src/canonical/models/front-shiny/Darmanitan--Galar-Zen.gif b/src/canonical/models/front-shiny/555--420--Darmanitan--Galar-Zen.gif similarity index 100% rename from src/canonical/models/front-shiny/Darmanitan--Galar-Zen.gif rename to src/canonical/models/front-shiny/555--420--Darmanitan--Galar-Zen.gif diff --git a/src/canonical/models/front-shiny/Darmanitan--Galar.gif b/src/canonical/models/front-shiny/555--420--Darmanitan--Galar.gif similarity index 100% rename from src/canonical/models/front-shiny/Darmanitan--Galar.gif rename to src/canonical/models/front-shiny/555--420--Darmanitan--Galar.gif diff --git a/src/canonical/models/front-shiny/Darmanitan--Zen.gif b/src/canonical/models/front-shiny/555--420--Darmanitan--Zen.gif similarity index 100% rename from src/canonical/models/front-shiny/Darmanitan--Zen.gif rename to src/canonical/models/front-shiny/555--420--Darmanitan--Zen.gif diff --git a/src/canonical/models/front-shiny/Maractus.gif b/src/canonical/models/front-shiny/556--0--Maractus.gif similarity index 100% rename from src/canonical/models/front-shiny/Maractus.gif rename to src/canonical/models/front-shiny/556--0--Maractus.gif diff --git a/src/canonical/models/front-shiny/Dwebble.gif b/src/canonical/models/front-shiny/557--0--Dwebble.gif similarity index 100% rename from src/canonical/models/front-shiny/Dwebble.gif rename to src/canonical/models/front-shiny/557--0--Dwebble.gif diff --git a/src/canonical/models/front-shiny/Crustle.gif b/src/canonical/models/front-shiny/558--0--Crustle.gif similarity index 100% rename from src/canonical/models/front-shiny/Crustle.gif rename to src/canonical/models/front-shiny/558--0--Crustle.gif diff --git a/src/canonical/models/front-shiny/Scraggy.gif b/src/canonical/models/front-shiny/559--0--Scraggy.gif similarity index 100% rename from src/canonical/models/front-shiny/Scraggy.gif rename to src/canonical/models/front-shiny/559--0--Scraggy.gif diff --git a/src/canonical/models/front-shiny/Mankey.gif b/src/canonical/models/front-shiny/56--0--Mankey.gif similarity index 100% rename from src/canonical/models/front-shiny/Mankey.gif rename to src/canonical/models/front-shiny/56--0--Mankey.gif diff --git a/src/canonical/models/front-shiny/Scrafty.gif b/src/canonical/models/front-shiny/560--0--Scrafty.gif similarity index 100% rename from src/canonical/models/front-shiny/Scrafty.gif rename to src/canonical/models/front-shiny/560--0--Scrafty.gif diff --git a/src/canonical/models/front-shiny/Sigilyph.gif b/src/canonical/models/front-shiny/561--0--Sigilyph.gif similarity index 100% rename from src/canonical/models/front-shiny/Sigilyph.gif rename to src/canonical/models/front-shiny/561--0--Sigilyph.gif diff --git a/src/canonical/models/front-shiny/Yamask.gif b/src/canonical/models/front-shiny/562--0--Yamask.gif similarity index 100% rename from src/canonical/models/front-shiny/Yamask.gif rename to src/canonical/models/front-shiny/562--0--Yamask.gif diff --git a/src/canonical/models/front-shiny/Yamask--Galar.gif b/src/canonical/models/front-shiny/562--420--Yamask--Galar.gif similarity index 100% rename from src/canonical/models/front-shiny/Yamask--Galar.gif rename to src/canonical/models/front-shiny/562--420--Yamask--Galar.gif diff --git a/src/canonical/models/front-shiny/Cofagrigus.gif b/src/canonical/models/front-shiny/563--0--Cofagrigus.gif similarity index 100% rename from src/canonical/models/front-shiny/Cofagrigus.gif rename to src/canonical/models/front-shiny/563--0--Cofagrigus.gif diff --git a/src/canonical/models/front-shiny/Tirtouga.gif b/src/canonical/models/front-shiny/564--0--Tirtouga.gif similarity index 100% rename from src/canonical/models/front-shiny/Tirtouga.gif rename to src/canonical/models/front-shiny/564--0--Tirtouga.gif diff --git a/src/canonical/models/front-shiny/Carracosta.gif b/src/canonical/models/front-shiny/565--0--Carracosta.gif similarity index 100% rename from src/canonical/models/front-shiny/Carracosta.gif rename to src/canonical/models/front-shiny/565--0--Carracosta.gif diff --git a/src/canonical/models/front-shiny/Archen.gif b/src/canonical/models/front-shiny/566--0--Archen.gif similarity index 100% rename from src/canonical/models/front-shiny/Archen.gif rename to src/canonical/models/front-shiny/566--0--Archen.gif diff --git a/src/canonical/models/front-shiny/Archeops.gif b/src/canonical/models/front-shiny/567--0--Archeops.gif similarity index 100% rename from src/canonical/models/front-shiny/Archeops.gif rename to src/canonical/models/front-shiny/567--0--Archeops.gif diff --git a/src/canonical/models/front-shiny/Trubbish.gif b/src/canonical/models/front-shiny/568--0--Trubbish.gif similarity index 100% rename from src/canonical/models/front-shiny/Trubbish.gif rename to src/canonical/models/front-shiny/568--0--Trubbish.gif diff --git a/src/canonical/models/front-shiny/Garbodor.gif b/src/canonical/models/front-shiny/569--0--Garbodor.gif similarity index 100% rename from src/canonical/models/front-shiny/Garbodor.gif rename to src/canonical/models/front-shiny/569--0--Garbodor.gif diff --git a/src/canonical/models/front-shiny/Garbodor--Gmax.gif b/src/canonical/models/front-shiny/569--420--Garbodor--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Garbodor--Gmax.gif rename to src/canonical/models/front-shiny/569--420--Garbodor--Gmax.gif diff --git a/src/canonical/models/front-shiny/Primeape.gif b/src/canonical/models/front-shiny/57--0--Primeape.gif similarity index 100% rename from src/canonical/models/front-shiny/Primeape.gif rename to src/canonical/models/front-shiny/57--0--Primeape.gif diff --git a/src/canonical/models/front-shiny/Zorua.gif b/src/canonical/models/front-shiny/570--0--Zorua.gif similarity index 100% rename from src/canonical/models/front-shiny/Zorua.gif rename to src/canonical/models/front-shiny/570--0--Zorua.gif diff --git a/src/canonical/models/front-shiny/Zoroark.gif b/src/canonical/models/front-shiny/571--0--Zoroark.gif similarity index 100% rename from src/canonical/models/front-shiny/Zoroark.gif rename to src/canonical/models/front-shiny/571--0--Zoroark.gif diff --git a/src/canonical/models/front-shiny/Minccino.gif b/src/canonical/models/front-shiny/572--0--Minccino.gif similarity index 100% rename from src/canonical/models/front-shiny/Minccino.gif rename to src/canonical/models/front-shiny/572--0--Minccino.gif diff --git a/src/canonical/models/front-shiny/Cinccino.gif b/src/canonical/models/front-shiny/573--0--Cinccino.gif similarity index 100% rename from src/canonical/models/front-shiny/Cinccino.gif rename to src/canonical/models/front-shiny/573--0--Cinccino.gif diff --git a/src/canonical/models/front-shiny/Gothita.gif b/src/canonical/models/front-shiny/574--0--Gothita.gif similarity index 100% rename from src/canonical/models/front-shiny/Gothita.gif rename to src/canonical/models/front-shiny/574--0--Gothita.gif diff --git a/src/canonical/models/front-shiny/Gothorita.gif b/src/canonical/models/front-shiny/575--0--Gothorita.gif similarity index 100% rename from src/canonical/models/front-shiny/Gothorita.gif rename to src/canonical/models/front-shiny/575--0--Gothorita.gif diff --git a/src/canonical/models/front-shiny/Gothitelle.gif b/src/canonical/models/front-shiny/576--0--Gothitelle.gif similarity index 100% rename from src/canonical/models/front-shiny/Gothitelle.gif rename to src/canonical/models/front-shiny/576--0--Gothitelle.gif diff --git a/src/canonical/models/front-shiny/Solosis.gif b/src/canonical/models/front-shiny/577--0--Solosis.gif similarity index 100% rename from src/canonical/models/front-shiny/Solosis.gif rename to src/canonical/models/front-shiny/577--0--Solosis.gif diff --git a/src/canonical/models/front-shiny/Duosion.gif b/src/canonical/models/front-shiny/578--0--Duosion.gif similarity index 100% rename from src/canonical/models/front-shiny/Duosion.gif rename to src/canonical/models/front-shiny/578--0--Duosion.gif diff --git a/src/canonical/models/front-shiny/Reuniclus.gif b/src/canonical/models/front-shiny/579--0--Reuniclus.gif similarity index 100% rename from src/canonical/models/front-shiny/Reuniclus.gif rename to src/canonical/models/front-shiny/579--0--Reuniclus.gif diff --git a/src/canonical/models/front-shiny/Growlithe.gif b/src/canonical/models/front-shiny/58--0--Growlithe.gif similarity index 100% rename from src/canonical/models/front-shiny/Growlithe.gif rename to src/canonical/models/front-shiny/58--0--Growlithe.gif diff --git a/src/canonical/models/front-shiny/Ducklett.gif b/src/canonical/models/front-shiny/580--0--Ducklett.gif similarity index 100% rename from src/canonical/models/front-shiny/Ducklett.gif rename to src/canonical/models/front-shiny/580--0--Ducklett.gif diff --git a/src/canonical/models/front-shiny/Swanna.gif b/src/canonical/models/front-shiny/581--0--Swanna.gif similarity index 100% rename from src/canonical/models/front-shiny/Swanna.gif rename to src/canonical/models/front-shiny/581--0--Swanna.gif diff --git a/src/canonical/models/front-shiny/Vanillite.gif b/src/canonical/models/front-shiny/582--0--Vanillite.gif similarity index 100% rename from src/canonical/models/front-shiny/Vanillite.gif rename to src/canonical/models/front-shiny/582--0--Vanillite.gif diff --git a/src/canonical/models/front-shiny/Vanillish.gif b/src/canonical/models/front-shiny/583--0--Vanillish.gif similarity index 100% rename from src/canonical/models/front-shiny/Vanillish.gif rename to src/canonical/models/front-shiny/583--0--Vanillish.gif diff --git a/src/canonical/models/front-shiny/Vanilluxe.gif b/src/canonical/models/front-shiny/584--0--Vanilluxe.gif similarity index 100% rename from src/canonical/models/front-shiny/Vanilluxe.gif rename to src/canonical/models/front-shiny/584--0--Vanilluxe.gif diff --git a/src/canonical/models/front-shiny/Deerling.gif b/src/canonical/models/front-shiny/585--0--Deerling.gif similarity index 100% rename from src/canonical/models/front-shiny/Deerling.gif rename to src/canonical/models/front-shiny/585--0--Deerling.gif diff --git a/src/canonical/models/front-shiny/Sawsbuck.gif b/src/canonical/models/front-shiny/586--0--Sawsbuck.gif similarity index 100% rename from src/canonical/models/front-shiny/Sawsbuck.gif rename to src/canonical/models/front-shiny/586--0--Sawsbuck.gif diff --git a/src/canonical/models/front-shiny/Emolga.gif b/src/canonical/models/front-shiny/587--0--Emolga.gif similarity index 100% rename from src/canonical/models/front-shiny/Emolga.gif rename to src/canonical/models/front-shiny/587--0--Emolga.gif diff --git a/src/canonical/models/front-shiny/Karrablast.gif b/src/canonical/models/front-shiny/588--0--Karrablast.gif similarity index 100% rename from src/canonical/models/front-shiny/Karrablast.gif rename to src/canonical/models/front-shiny/588--0--Karrablast.gif diff --git a/src/canonical/models/front-shiny/Escavalier.gif b/src/canonical/models/front-shiny/589--0--Escavalier.gif similarity index 100% rename from src/canonical/models/front-shiny/Escavalier.gif rename to src/canonical/models/front-shiny/589--0--Escavalier.gif diff --git a/src/canonical/models/front-shiny/Arcanine.gif b/src/canonical/models/front-shiny/59--0--Arcanine.gif similarity index 100% rename from src/canonical/models/front-shiny/Arcanine.gif rename to src/canonical/models/front-shiny/59--0--Arcanine.gif diff --git a/src/canonical/models/front-shiny/Foongus.gif b/src/canonical/models/front-shiny/590--0--Foongus.gif similarity index 100% rename from src/canonical/models/front-shiny/Foongus.gif rename to src/canonical/models/front-shiny/590--0--Foongus.gif diff --git a/src/canonical/models/front-shiny/Amoonguss.gif b/src/canonical/models/front-shiny/591--0--Amoonguss.gif similarity index 100% rename from src/canonical/models/front-shiny/Amoonguss.gif rename to src/canonical/models/front-shiny/591--0--Amoonguss.gif diff --git a/src/canonical/models/front-shiny/Frillish.gif b/src/canonical/models/front-shiny/592--0--Frillish.gif similarity index 100% rename from src/canonical/models/front-shiny/Frillish.gif rename to src/canonical/models/front-shiny/592--0--Frillish.gif diff --git a/src/canonical/models/front-shiny/Jellicent.gif b/src/canonical/models/front-shiny/593--0--Jellicent.gif similarity index 100% rename from src/canonical/models/front-shiny/Jellicent.gif rename to src/canonical/models/front-shiny/593--0--Jellicent.gif diff --git a/src/canonical/models/front-shiny/Alomomola.gif b/src/canonical/models/front-shiny/594--0--Alomomola.gif similarity index 100% rename from src/canonical/models/front-shiny/Alomomola.gif rename to src/canonical/models/front-shiny/594--0--Alomomola.gif diff --git a/src/canonical/models/front-shiny/Joltik.gif b/src/canonical/models/front-shiny/595--0--Joltik.gif similarity index 100% rename from src/canonical/models/front-shiny/Joltik.gif rename to src/canonical/models/front-shiny/595--0--Joltik.gif diff --git a/src/canonical/models/front-shiny/Galvantula.gif b/src/canonical/models/front-shiny/596--0--Galvantula.gif similarity index 100% rename from src/canonical/models/front-shiny/Galvantula.gif rename to src/canonical/models/front-shiny/596--0--Galvantula.gif diff --git a/src/canonical/models/front-shiny/Ferroseed.gif b/src/canonical/models/front-shiny/597--0--Ferroseed.gif similarity index 100% rename from src/canonical/models/front-shiny/Ferroseed.gif rename to src/canonical/models/front-shiny/597--0--Ferroseed.gif diff --git a/src/canonical/models/front-shiny/Ferrothorn.gif b/src/canonical/models/front-shiny/598--0--Ferrothorn.gif similarity index 100% rename from src/canonical/models/front-shiny/Ferrothorn.gif rename to src/canonical/models/front-shiny/598--0--Ferrothorn.gif diff --git a/src/canonical/models/front-shiny/Klink.gif b/src/canonical/models/front-shiny/599--0--Klink.gif similarity index 100% rename from src/canonical/models/front-shiny/Klink.gif rename to src/canonical/models/front-shiny/599--0--Klink.gif diff --git a/src/canonical/models/front-shiny/Charizard.gif b/src/canonical/models/front-shiny/6--0--Charizard.gif similarity index 100% rename from src/canonical/models/front-shiny/Charizard.gif rename to src/canonical/models/front-shiny/6--0--Charizard.gif diff --git a/src/canonical/models/front-shiny/Charizard--Gmax.gif b/src/canonical/models/front-shiny/6--420--Charizard--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Charizard--Gmax.gif rename to src/canonical/models/front-shiny/6--420--Charizard--Gmax.gif diff --git a/src/canonical/models/front-shiny/Charizard--Mega-X.gif b/src/canonical/models/front-shiny/6--420--Charizard--Mega-X.gif similarity index 100% rename from src/canonical/models/front-shiny/Charizard--Mega-X.gif rename to src/canonical/models/front-shiny/6--420--Charizard--Mega-X.gif diff --git a/src/canonical/models/front-shiny/Charizard--Mega-Y.gif b/src/canonical/models/front-shiny/6--420--Charizard--Mega-Y.gif similarity index 100% rename from src/canonical/models/front-shiny/Charizard--Mega-Y.gif rename to src/canonical/models/front-shiny/6--420--Charizard--Mega-Y.gif diff --git a/src/canonical/models/front-shiny/Poliwag.gif b/src/canonical/models/front-shiny/60--0--Poliwag.gif similarity index 100% rename from src/canonical/models/front-shiny/Poliwag.gif rename to src/canonical/models/front-shiny/60--0--Poliwag.gif diff --git a/src/canonical/models/front-shiny/Klang.gif b/src/canonical/models/front-shiny/600--0--Klang.gif similarity index 100% rename from src/canonical/models/front-shiny/Klang.gif rename to src/canonical/models/front-shiny/600--0--Klang.gif diff --git a/src/canonical/models/front-shiny/Klinklang.gif b/src/canonical/models/front-shiny/601--0--Klinklang.gif similarity index 100% rename from src/canonical/models/front-shiny/Klinklang.gif rename to src/canonical/models/front-shiny/601--0--Klinklang.gif diff --git a/src/canonical/models/front-shiny/Tynamo.gif b/src/canonical/models/front-shiny/602--0--Tynamo.gif similarity index 100% rename from src/canonical/models/front-shiny/Tynamo.gif rename to src/canonical/models/front-shiny/602--0--Tynamo.gif diff --git a/src/canonical/models/front-shiny/Eelektrik.gif b/src/canonical/models/front-shiny/603--0--Eelektrik.gif similarity index 100% rename from src/canonical/models/front-shiny/Eelektrik.gif rename to src/canonical/models/front-shiny/603--0--Eelektrik.gif diff --git a/src/canonical/models/front-shiny/Eelektross.gif b/src/canonical/models/front-shiny/604--0--Eelektross.gif similarity index 100% rename from src/canonical/models/front-shiny/Eelektross.gif rename to src/canonical/models/front-shiny/604--0--Eelektross.gif diff --git a/src/canonical/models/front-shiny/Elgyem.gif b/src/canonical/models/front-shiny/605--0--Elgyem.gif similarity index 100% rename from src/canonical/models/front-shiny/Elgyem.gif rename to src/canonical/models/front-shiny/605--0--Elgyem.gif diff --git a/src/canonical/models/front-shiny/Beheeyem.gif b/src/canonical/models/front-shiny/606--0--Beheeyem.gif similarity index 100% rename from src/canonical/models/front-shiny/Beheeyem.gif rename to src/canonical/models/front-shiny/606--0--Beheeyem.gif diff --git a/src/canonical/models/front-shiny/Litwick.gif b/src/canonical/models/front-shiny/607--0--Litwick.gif similarity index 100% rename from src/canonical/models/front-shiny/Litwick.gif rename to src/canonical/models/front-shiny/607--0--Litwick.gif diff --git a/src/canonical/models/front-shiny/Lampent.gif b/src/canonical/models/front-shiny/608--0--Lampent.gif similarity index 100% rename from src/canonical/models/front-shiny/Lampent.gif rename to src/canonical/models/front-shiny/608--0--Lampent.gif diff --git a/src/canonical/models/front-shiny/Chandelure.gif b/src/canonical/models/front-shiny/609--0--Chandelure.gif similarity index 100% rename from src/canonical/models/front-shiny/Chandelure.gif rename to src/canonical/models/front-shiny/609--0--Chandelure.gif diff --git a/src/canonical/models/front-shiny/Poliwhirl.gif b/src/canonical/models/front-shiny/61--0--Poliwhirl.gif similarity index 100% rename from src/canonical/models/front-shiny/Poliwhirl.gif rename to src/canonical/models/front-shiny/61--0--Poliwhirl.gif diff --git a/src/canonical/models/front-shiny/Axew.gif b/src/canonical/models/front-shiny/610--0--Axew.gif similarity index 100% rename from src/canonical/models/front-shiny/Axew.gif rename to src/canonical/models/front-shiny/610--0--Axew.gif diff --git a/src/canonical/models/front-shiny/Fraxure.gif b/src/canonical/models/front-shiny/611--0--Fraxure.gif similarity index 100% rename from src/canonical/models/front-shiny/Fraxure.gif rename to src/canonical/models/front-shiny/611--0--Fraxure.gif diff --git a/src/canonical/models/front-shiny/Haxorus.gif b/src/canonical/models/front-shiny/612--0--Haxorus.gif similarity index 100% rename from src/canonical/models/front-shiny/Haxorus.gif rename to src/canonical/models/front-shiny/612--0--Haxorus.gif diff --git a/src/canonical/models/front-shiny/Cubchoo.gif b/src/canonical/models/front-shiny/613--0--Cubchoo.gif similarity index 100% rename from src/canonical/models/front-shiny/Cubchoo.gif rename to src/canonical/models/front-shiny/613--0--Cubchoo.gif diff --git a/src/canonical/models/front-shiny/Beartic.gif b/src/canonical/models/front-shiny/614--0--Beartic.gif similarity index 100% rename from src/canonical/models/front-shiny/Beartic.gif rename to src/canonical/models/front-shiny/614--0--Beartic.gif diff --git a/src/canonical/models/front-shiny/Cryogonal.gif b/src/canonical/models/front-shiny/615--0--Cryogonal.gif similarity index 100% rename from src/canonical/models/front-shiny/Cryogonal.gif rename to src/canonical/models/front-shiny/615--0--Cryogonal.gif diff --git a/src/canonical/models/front-shiny/Shelmet.gif b/src/canonical/models/front-shiny/616--0--Shelmet.gif similarity index 100% rename from src/canonical/models/front-shiny/Shelmet.gif rename to src/canonical/models/front-shiny/616--0--Shelmet.gif diff --git a/src/canonical/models/front-shiny/Accelgor.gif b/src/canonical/models/front-shiny/617--0--Accelgor.gif similarity index 100% rename from src/canonical/models/front-shiny/Accelgor.gif rename to src/canonical/models/front-shiny/617--0--Accelgor.gif diff --git a/src/canonical/models/front-shiny/Stunfisk.gif b/src/canonical/models/front-shiny/618--0--Stunfisk.gif similarity index 100% rename from src/canonical/models/front-shiny/Stunfisk.gif rename to src/canonical/models/front-shiny/618--0--Stunfisk.gif diff --git a/src/canonical/models/front-shiny/Stunfisk--Galar.gif b/src/canonical/models/front-shiny/618--420--Stunfisk--Galar.gif similarity index 100% rename from src/canonical/models/front-shiny/Stunfisk--Galar.gif rename to src/canonical/models/front-shiny/618--420--Stunfisk--Galar.gif diff --git a/src/canonical/models/front-shiny/Mienfoo.gif b/src/canonical/models/front-shiny/619--0--Mienfoo.gif similarity index 100% rename from src/canonical/models/front-shiny/Mienfoo.gif rename to src/canonical/models/front-shiny/619--0--Mienfoo.gif diff --git a/src/canonical/models/front-shiny/Poliwrath.gif b/src/canonical/models/front-shiny/62--0--Poliwrath.gif similarity index 100% rename from src/canonical/models/front-shiny/Poliwrath.gif rename to src/canonical/models/front-shiny/62--0--Poliwrath.gif diff --git a/src/canonical/models/front-shiny/Mienshao.gif b/src/canonical/models/front-shiny/620--0--Mienshao.gif similarity index 100% rename from src/canonical/models/front-shiny/Mienshao.gif rename to src/canonical/models/front-shiny/620--0--Mienshao.gif diff --git a/src/canonical/models/front-shiny/Druddigon.gif b/src/canonical/models/front-shiny/621--0--Druddigon.gif similarity index 100% rename from src/canonical/models/front-shiny/Druddigon.gif rename to src/canonical/models/front-shiny/621--0--Druddigon.gif diff --git a/src/canonical/models/front-shiny/Golett.gif b/src/canonical/models/front-shiny/622--0--Golett.gif similarity index 100% rename from src/canonical/models/front-shiny/Golett.gif rename to src/canonical/models/front-shiny/622--0--Golett.gif diff --git a/src/canonical/models/front-shiny/Golurk.gif b/src/canonical/models/front-shiny/623--0--Golurk.gif similarity index 100% rename from src/canonical/models/front-shiny/Golurk.gif rename to src/canonical/models/front-shiny/623--0--Golurk.gif diff --git a/src/canonical/models/front-shiny/Pawniard.gif b/src/canonical/models/front-shiny/624--0--Pawniard.gif similarity index 100% rename from src/canonical/models/front-shiny/Pawniard.gif rename to src/canonical/models/front-shiny/624--0--Pawniard.gif diff --git a/src/canonical/models/front-shiny/Bisharp.gif b/src/canonical/models/front-shiny/625--0--Bisharp.gif similarity index 100% rename from src/canonical/models/front-shiny/Bisharp.gif rename to src/canonical/models/front-shiny/625--0--Bisharp.gif diff --git a/src/canonical/models/front-shiny/Bouffalant.gif b/src/canonical/models/front-shiny/626--0--Bouffalant.gif similarity index 100% rename from src/canonical/models/front-shiny/Bouffalant.gif rename to src/canonical/models/front-shiny/626--0--Bouffalant.gif diff --git a/src/canonical/models/front-shiny/Rufflet.gif b/src/canonical/models/front-shiny/627--0--Rufflet.gif similarity index 100% rename from src/canonical/models/front-shiny/Rufflet.gif rename to src/canonical/models/front-shiny/627--0--Rufflet.gif diff --git a/src/canonical/models/front-shiny/Braviary.gif b/src/canonical/models/front-shiny/628--0--Braviary.gif similarity index 100% rename from src/canonical/models/front-shiny/Braviary.gif rename to src/canonical/models/front-shiny/628--0--Braviary.gif diff --git a/src/canonical/models/front-shiny/Vullaby.gif b/src/canonical/models/front-shiny/629--0--Vullaby.gif similarity index 100% rename from src/canonical/models/front-shiny/Vullaby.gif rename to src/canonical/models/front-shiny/629--0--Vullaby.gif diff --git a/src/canonical/models/front-shiny/Abra.gif b/src/canonical/models/front-shiny/63--0--Abra.gif similarity index 100% rename from src/canonical/models/front-shiny/Abra.gif rename to src/canonical/models/front-shiny/63--0--Abra.gif diff --git a/src/canonical/models/front-shiny/Mandibuzz.gif b/src/canonical/models/front-shiny/630--0--Mandibuzz.gif similarity index 100% rename from src/canonical/models/front-shiny/Mandibuzz.gif rename to src/canonical/models/front-shiny/630--0--Mandibuzz.gif diff --git a/src/canonical/models/front-shiny/Heatmor.gif b/src/canonical/models/front-shiny/631--0--Heatmor.gif similarity index 100% rename from src/canonical/models/front-shiny/Heatmor.gif rename to src/canonical/models/front-shiny/631--0--Heatmor.gif diff --git a/src/canonical/models/front-shiny/Durant.gif b/src/canonical/models/front-shiny/632--0--Durant.gif similarity index 100% rename from src/canonical/models/front-shiny/Durant.gif rename to src/canonical/models/front-shiny/632--0--Durant.gif diff --git a/src/canonical/models/front-shiny/Deino.gif b/src/canonical/models/front-shiny/633--0--Deino.gif similarity index 100% rename from src/canonical/models/front-shiny/Deino.gif rename to src/canonical/models/front-shiny/633--0--Deino.gif diff --git a/src/canonical/models/front-shiny/Zweilous.gif b/src/canonical/models/front-shiny/634--0--Zweilous.gif similarity index 100% rename from src/canonical/models/front-shiny/Zweilous.gif rename to src/canonical/models/front-shiny/634--0--Zweilous.gif diff --git a/src/canonical/models/front-shiny/Hydreigon.gif b/src/canonical/models/front-shiny/635--0--Hydreigon.gif similarity index 100% rename from src/canonical/models/front-shiny/Hydreigon.gif rename to src/canonical/models/front-shiny/635--0--Hydreigon.gif diff --git a/src/canonical/models/front-shiny/Larvesta.gif b/src/canonical/models/front-shiny/636--0--Larvesta.gif similarity index 100% rename from src/canonical/models/front-shiny/Larvesta.gif rename to src/canonical/models/front-shiny/636--0--Larvesta.gif diff --git a/src/canonical/models/front-shiny/Volcarona.gif b/src/canonical/models/front-shiny/637--0--Volcarona.gif similarity index 100% rename from src/canonical/models/front-shiny/Volcarona.gif rename to src/canonical/models/front-shiny/637--0--Volcarona.gif diff --git a/src/canonical/models/front-shiny/Cobalion.gif b/src/canonical/models/front-shiny/638--0--Cobalion.gif similarity index 100% rename from src/canonical/models/front-shiny/Cobalion.gif rename to src/canonical/models/front-shiny/638--0--Cobalion.gif diff --git a/src/canonical/models/front-shiny/Terrakion.gif b/src/canonical/models/front-shiny/639--0--Terrakion.gif similarity index 100% rename from src/canonical/models/front-shiny/Terrakion.gif rename to src/canonical/models/front-shiny/639--0--Terrakion.gif diff --git a/src/canonical/models/front-shiny/Kadabra.gif b/src/canonical/models/front-shiny/64--0--Kadabra.gif similarity index 100% rename from src/canonical/models/front-shiny/Kadabra.gif rename to src/canonical/models/front-shiny/64--0--Kadabra.gif diff --git a/src/canonical/models/front-shiny/Virizion.gif b/src/canonical/models/front-shiny/640--0--Virizion.gif similarity index 100% rename from src/canonical/models/front-shiny/Virizion.gif rename to src/canonical/models/front-shiny/640--0--Virizion.gif diff --git a/src/canonical/models/front-shiny/Tornadus.gif b/src/canonical/models/front-shiny/641--0--Tornadus.gif similarity index 100% rename from src/canonical/models/front-shiny/Tornadus.gif rename to src/canonical/models/front-shiny/641--0--Tornadus.gif diff --git a/src/canonical/models/front-shiny/Tornadus--Therian.gif b/src/canonical/models/front-shiny/641--420--Tornadus--Therian.gif similarity index 100% rename from src/canonical/models/front-shiny/Tornadus--Therian.gif rename to src/canonical/models/front-shiny/641--420--Tornadus--Therian.gif diff --git a/src/canonical/models/front-shiny/Thundurus.gif b/src/canonical/models/front-shiny/642--0--Thundurus.gif similarity index 100% rename from src/canonical/models/front-shiny/Thundurus.gif rename to src/canonical/models/front-shiny/642--0--Thundurus.gif diff --git a/src/canonical/models/front-shiny/Thundurus--Therian.gif b/src/canonical/models/front-shiny/642--420--Thundurus--Therian.gif similarity index 100% rename from src/canonical/models/front-shiny/Thundurus--Therian.gif rename to src/canonical/models/front-shiny/642--420--Thundurus--Therian.gif diff --git a/src/canonical/models/front-shiny/Reshiram.gif b/src/canonical/models/front-shiny/643--0--Reshiram.gif similarity index 100% rename from src/canonical/models/front-shiny/Reshiram.gif rename to src/canonical/models/front-shiny/643--0--Reshiram.gif diff --git a/src/canonical/models/front-shiny/Zekrom.gif b/src/canonical/models/front-shiny/644--0--Zekrom.gif similarity index 100% rename from src/canonical/models/front-shiny/Zekrom.gif rename to src/canonical/models/front-shiny/644--0--Zekrom.gif diff --git a/src/canonical/models/front-shiny/Landorus.gif b/src/canonical/models/front-shiny/645--0--Landorus.gif similarity index 100% rename from src/canonical/models/front-shiny/Landorus.gif rename to src/canonical/models/front-shiny/645--0--Landorus.gif diff --git a/src/canonical/models/front-shiny/Landorus--Therian.gif b/src/canonical/models/front-shiny/645--420--Landorus--Therian.gif similarity index 100% rename from src/canonical/models/front-shiny/Landorus--Therian.gif rename to src/canonical/models/front-shiny/645--420--Landorus--Therian.gif diff --git a/src/canonical/models/front-shiny/Kyurem.gif b/src/canonical/models/front-shiny/646--0--Kyurem.gif similarity index 100% rename from src/canonical/models/front-shiny/Kyurem.gif rename to src/canonical/models/front-shiny/646--0--Kyurem.gif diff --git a/src/canonical/models/front-shiny/Kyurem--Black.gif b/src/canonical/models/front-shiny/646--420--Kyurem--Black.gif similarity index 100% rename from src/canonical/models/front-shiny/Kyurem--Black.gif rename to src/canonical/models/front-shiny/646--420--Kyurem--Black.gif diff --git a/src/canonical/models/front-shiny/Kyurem--White.gif b/src/canonical/models/front-shiny/646--420--Kyurem--White.gif similarity index 100% rename from src/canonical/models/front-shiny/Kyurem--White.gif rename to src/canonical/models/front-shiny/646--420--Kyurem--White.gif diff --git a/src/canonical/models/front-shiny/Keldeo.gif b/src/canonical/models/front-shiny/647--0--Keldeo.gif similarity index 100% rename from src/canonical/models/front-shiny/Keldeo.gif rename to src/canonical/models/front-shiny/647--0--Keldeo.gif diff --git a/src/canonical/models/front-shiny/Keldeo--Resolute.gif b/src/canonical/models/front-shiny/647--420--Keldeo--Resolute.gif similarity index 100% rename from src/canonical/models/front-shiny/Keldeo--Resolute.gif rename to src/canonical/models/front-shiny/647--420--Keldeo--Resolute.gif diff --git a/src/canonical/models/front-shiny/Meloetta.gif b/src/canonical/models/front-shiny/648--0--Meloetta.gif similarity index 100% rename from src/canonical/models/front-shiny/Meloetta.gif rename to src/canonical/models/front-shiny/648--0--Meloetta.gif diff --git a/src/canonical/models/front-shiny/Meloetta--Pirouette.gif b/src/canonical/models/front-shiny/648--420--Meloetta--Pirouette.gif similarity index 100% rename from src/canonical/models/front-shiny/Meloetta--Pirouette.gif rename to src/canonical/models/front-shiny/648--420--Meloetta--Pirouette.gif diff --git a/src/canonical/models/front-shiny/Genesect.gif b/src/canonical/models/front-shiny/649--0--Genesect.gif similarity index 100% rename from src/canonical/models/front-shiny/Genesect.gif rename to src/canonical/models/front-shiny/649--0--Genesect.gif diff --git a/src/canonical/models/front-shiny/Genesect--Burn.gif b/src/canonical/models/front-shiny/649--420--Genesect--Burn.gif similarity index 100% rename from src/canonical/models/front-shiny/Genesect--Burn.gif rename to src/canonical/models/front-shiny/649--420--Genesect--Burn.gif diff --git a/src/canonical/models/front-shiny/Genesect--Chill.gif b/src/canonical/models/front-shiny/649--420--Genesect--Chill.gif similarity index 100% rename from src/canonical/models/front-shiny/Genesect--Chill.gif rename to src/canonical/models/front-shiny/649--420--Genesect--Chill.gif diff --git a/src/canonical/models/front-shiny/Genesect--Douse.gif b/src/canonical/models/front-shiny/649--420--Genesect--Douse.gif similarity index 100% rename from src/canonical/models/front-shiny/Genesect--Douse.gif rename to src/canonical/models/front-shiny/649--420--Genesect--Douse.gif diff --git a/src/canonical/models/front-shiny/Genesect--Shock.gif b/src/canonical/models/front-shiny/649--420--Genesect--Shock.gif similarity index 100% rename from src/canonical/models/front-shiny/Genesect--Shock.gif rename to src/canonical/models/front-shiny/649--420--Genesect--Shock.gif diff --git a/src/canonical/models/front-shiny/Alakazam.gif b/src/canonical/models/front-shiny/65--0--Alakazam.gif similarity index 100% rename from src/canonical/models/front-shiny/Alakazam.gif rename to src/canonical/models/front-shiny/65--0--Alakazam.gif diff --git a/src/canonical/models/front-shiny/Alakazam--Mega.gif b/src/canonical/models/front-shiny/65--420--Alakazam--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Alakazam--Mega.gif rename to src/canonical/models/front-shiny/65--420--Alakazam--Mega.gif diff --git a/src/canonical/models/front-shiny/Chespin.gif b/src/canonical/models/front-shiny/650--0--Chespin.gif similarity index 100% rename from src/canonical/models/front-shiny/Chespin.gif rename to src/canonical/models/front-shiny/650--0--Chespin.gif diff --git a/src/canonical/models/front-shiny/Quilladin.gif b/src/canonical/models/front-shiny/651--0--Quilladin.gif similarity index 100% rename from src/canonical/models/front-shiny/Quilladin.gif rename to src/canonical/models/front-shiny/651--0--Quilladin.gif diff --git a/src/canonical/models/front-shiny/Chesnaught.gif b/src/canonical/models/front-shiny/652--0--Chesnaught.gif similarity index 100% rename from src/canonical/models/front-shiny/Chesnaught.gif rename to src/canonical/models/front-shiny/652--0--Chesnaught.gif diff --git a/src/canonical/models/front-shiny/Fennekin.gif b/src/canonical/models/front-shiny/653--0--Fennekin.gif similarity index 100% rename from src/canonical/models/front-shiny/Fennekin.gif rename to src/canonical/models/front-shiny/653--0--Fennekin.gif diff --git a/src/canonical/models/front-shiny/Braixen.gif b/src/canonical/models/front-shiny/654--0--Braixen.gif similarity index 100% rename from src/canonical/models/front-shiny/Braixen.gif rename to src/canonical/models/front-shiny/654--0--Braixen.gif diff --git a/src/canonical/models/front-shiny/Delphox.gif b/src/canonical/models/front-shiny/655--0--Delphox.gif similarity index 100% rename from src/canonical/models/front-shiny/Delphox.gif rename to src/canonical/models/front-shiny/655--0--Delphox.gif diff --git a/src/canonical/models/front-shiny/Froakie.gif b/src/canonical/models/front-shiny/656--0--Froakie.gif similarity index 100% rename from src/canonical/models/front-shiny/Froakie.gif rename to src/canonical/models/front-shiny/656--0--Froakie.gif diff --git a/src/canonical/models/front-shiny/Frogadier.gif b/src/canonical/models/front-shiny/657--0--Frogadier.gif similarity index 100% rename from src/canonical/models/front-shiny/Frogadier.gif rename to src/canonical/models/front-shiny/657--0--Frogadier.gif diff --git a/src/canonical/models/front-shiny/Greninja.gif b/src/canonical/models/front-shiny/658--0--Greninja.gif similarity index 100% rename from src/canonical/models/front-shiny/Greninja.gif rename to src/canonical/models/front-shiny/658--0--Greninja.gif diff --git a/src/canonical/models/front-shiny/Greninja--Ash.gif b/src/canonical/models/front-shiny/658--420--Greninja--Ash.gif similarity index 100% rename from src/canonical/models/front-shiny/Greninja--Ash.gif rename to src/canonical/models/front-shiny/658--420--Greninja--Ash.gif diff --git a/src/canonical/models/front-shiny/Bunnelby.gif b/src/canonical/models/front-shiny/659--0--Bunnelby.gif similarity index 100% rename from src/canonical/models/front-shiny/Bunnelby.gif rename to src/canonical/models/front-shiny/659--0--Bunnelby.gif diff --git a/src/canonical/models/front-shiny/Machop.gif b/src/canonical/models/front-shiny/66--0--Machop.gif similarity index 100% rename from src/canonical/models/front-shiny/Machop.gif rename to src/canonical/models/front-shiny/66--0--Machop.gif diff --git a/src/canonical/models/front-shiny/Diggersby.gif b/src/canonical/models/front-shiny/660--0--Diggersby.gif similarity index 100% rename from src/canonical/models/front-shiny/Diggersby.gif rename to src/canonical/models/front-shiny/660--0--Diggersby.gif diff --git a/src/canonical/models/front-shiny/Fletchling.gif b/src/canonical/models/front-shiny/661--0--Fletchling.gif similarity index 100% rename from src/canonical/models/front-shiny/Fletchling.gif rename to src/canonical/models/front-shiny/661--0--Fletchling.gif diff --git a/src/canonical/models/front-shiny/Fletchinder.gif b/src/canonical/models/front-shiny/662--0--Fletchinder.gif similarity index 100% rename from src/canonical/models/front-shiny/Fletchinder.gif rename to src/canonical/models/front-shiny/662--0--Fletchinder.gif diff --git a/src/canonical/models/front-shiny/Talonflame.gif b/src/canonical/models/front-shiny/663--0--Talonflame.gif similarity index 100% rename from src/canonical/models/front-shiny/Talonflame.gif rename to src/canonical/models/front-shiny/663--0--Talonflame.gif diff --git a/src/canonical/models/front-shiny/Scatterbug.gif b/src/canonical/models/front-shiny/664--0--Scatterbug.gif similarity index 100% rename from src/canonical/models/front-shiny/Scatterbug.gif rename to src/canonical/models/front-shiny/664--0--Scatterbug.gif diff --git a/src/canonical/models/front-shiny/Spewpa.gif b/src/canonical/models/front-shiny/665--0--Spewpa.gif similarity index 100% rename from src/canonical/models/front-shiny/Spewpa.gif rename to src/canonical/models/front-shiny/665--0--Spewpa.gif diff --git a/src/canonical/models/front-shiny/Vivillon.gif b/src/canonical/models/front-shiny/666--0--Vivillon.gif similarity index 100% rename from src/canonical/models/front-shiny/Vivillon.gif rename to src/canonical/models/front-shiny/666--0--Vivillon.gif diff --git a/src/canonical/models/front-shiny/Vivillon--Fancy.gif b/src/canonical/models/front-shiny/666--420--Vivillon--Fancy.gif similarity index 100% rename from src/canonical/models/front-shiny/Vivillon--Fancy.gif rename to src/canonical/models/front-shiny/666--420--Vivillon--Fancy.gif diff --git a/src/canonical/models/front-shiny/Vivillon--Pokeball.gif b/src/canonical/models/front-shiny/666--420--Vivillon--Pokeball.gif similarity index 100% rename from src/canonical/models/front-shiny/Vivillon--Pokeball.gif rename to src/canonical/models/front-shiny/666--420--Vivillon--Pokeball.gif diff --git a/src/canonical/models/front-shiny/Litleo.gif b/src/canonical/models/front-shiny/667--0--Litleo.gif similarity index 100% rename from src/canonical/models/front-shiny/Litleo.gif rename to src/canonical/models/front-shiny/667--0--Litleo.gif diff --git a/src/canonical/models/front-shiny/Pyroar.gif b/src/canonical/models/front-shiny/668--0--Pyroar.gif similarity index 100% rename from src/canonical/models/front-shiny/Pyroar.gif rename to src/canonical/models/front-shiny/668--0--Pyroar.gif diff --git a/src/canonical/models/front-shiny/Flabe__0301be__0301.gif b/src/canonical/models/front-shiny/669--0--Flabe__0301be__0301.gif similarity index 100% rename from src/canonical/models/front-shiny/Flabe__0301be__0301.gif rename to src/canonical/models/front-shiny/669--0--Flabe__0301be__0301.gif diff --git a/src/canonical/models/front-shiny/Machoke.gif b/src/canonical/models/front-shiny/67--0--Machoke.gif similarity index 100% rename from src/canonical/models/front-shiny/Machoke.gif rename to src/canonical/models/front-shiny/67--0--Machoke.gif diff --git a/src/canonical/models/front-shiny/Floette.gif b/src/canonical/models/front-shiny/670--0--Floette.gif similarity index 100% rename from src/canonical/models/front-shiny/Floette.gif rename to src/canonical/models/front-shiny/670--0--Floette.gif diff --git a/src/canonical/models/front-shiny/Floette--Eternal.gif b/src/canonical/models/front-shiny/670--420--Floette--Eternal.gif similarity index 100% rename from src/canonical/models/front-shiny/Floette--Eternal.gif rename to src/canonical/models/front-shiny/670--420--Floette--Eternal.gif diff --git a/src/canonical/models/front-shiny/Florges.gif b/src/canonical/models/front-shiny/671--0--Florges.gif similarity index 100% rename from src/canonical/models/front-shiny/Florges.gif rename to src/canonical/models/front-shiny/671--0--Florges.gif diff --git a/src/canonical/models/front-shiny/Skiddo.gif b/src/canonical/models/front-shiny/672--0--Skiddo.gif similarity index 100% rename from src/canonical/models/front-shiny/Skiddo.gif rename to src/canonical/models/front-shiny/672--0--Skiddo.gif diff --git a/src/canonical/models/front-shiny/Gogoat.gif b/src/canonical/models/front-shiny/673--0--Gogoat.gif similarity index 100% rename from src/canonical/models/front-shiny/Gogoat.gif rename to src/canonical/models/front-shiny/673--0--Gogoat.gif diff --git a/src/canonical/models/front-shiny/Pancham.gif b/src/canonical/models/front-shiny/674--0--Pancham.gif similarity index 100% rename from src/canonical/models/front-shiny/Pancham.gif rename to src/canonical/models/front-shiny/674--0--Pancham.gif diff --git a/src/canonical/models/front-shiny/Pangoro.gif b/src/canonical/models/front-shiny/675--0--Pangoro.gif similarity index 100% rename from src/canonical/models/front-shiny/Pangoro.gif rename to src/canonical/models/front-shiny/675--0--Pangoro.gif diff --git a/src/canonical/models/front-shiny/Furfrou.gif b/src/canonical/models/front-shiny/676--0--Furfrou.gif similarity index 100% rename from src/canonical/models/front-shiny/Furfrou.gif rename to src/canonical/models/front-shiny/676--0--Furfrou.gif diff --git a/src/canonical/models/front-shiny/Espurr.gif b/src/canonical/models/front-shiny/677--0--Espurr.gif similarity index 100% rename from src/canonical/models/front-shiny/Espurr.gif rename to src/canonical/models/front-shiny/677--0--Espurr.gif diff --git a/src/canonical/models/front-shiny/Meowstic.gif b/src/canonical/models/front-shiny/678--0--Meowstic.gif similarity index 100% rename from src/canonical/models/front-shiny/Meowstic.gif rename to src/canonical/models/front-shiny/678--0--Meowstic.gif diff --git a/src/canonical/models/front-shiny/Meowstic--F.gif b/src/canonical/models/front-shiny/678--420--Meowstic--F.gif similarity index 100% rename from src/canonical/models/front-shiny/Meowstic--F.gif rename to src/canonical/models/front-shiny/678--420--Meowstic--F.gif diff --git a/src/canonical/models/front-shiny/Honedge.gif b/src/canonical/models/front-shiny/679--0--Honedge.gif similarity index 100% rename from src/canonical/models/front-shiny/Honedge.gif rename to src/canonical/models/front-shiny/679--0--Honedge.gif diff --git a/src/canonical/models/front-shiny/Machamp.gif b/src/canonical/models/front-shiny/68--0--Machamp.gif similarity index 100% rename from src/canonical/models/front-shiny/Machamp.gif rename to src/canonical/models/front-shiny/68--0--Machamp.gif diff --git a/src/canonical/models/front-shiny/Machamp--Gmax.gif b/src/canonical/models/front-shiny/68--420--Machamp--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Machamp--Gmax.gif rename to src/canonical/models/front-shiny/68--420--Machamp--Gmax.gif diff --git a/src/canonical/models/front-shiny/Doublade.gif b/src/canonical/models/front-shiny/680--0--Doublade.gif similarity index 100% rename from src/canonical/models/front-shiny/Doublade.gif rename to src/canonical/models/front-shiny/680--0--Doublade.gif diff --git a/src/canonical/models/front-shiny/Aegislash.gif b/src/canonical/models/front-shiny/681--0--Aegislash.gif similarity index 100% rename from src/canonical/models/front-shiny/Aegislash.gif rename to src/canonical/models/front-shiny/681--0--Aegislash.gif diff --git a/src/canonical/models/front-shiny/Aegislash--Blade.gif b/src/canonical/models/front-shiny/681--420--Aegislash--Blade.gif similarity index 100% rename from src/canonical/models/front-shiny/Aegislash--Blade.gif rename to src/canonical/models/front-shiny/681--420--Aegislash--Blade.gif diff --git a/src/canonical/models/front-shiny/Spritzee.gif b/src/canonical/models/front-shiny/682--0--Spritzee.gif similarity index 100% rename from src/canonical/models/front-shiny/Spritzee.gif rename to src/canonical/models/front-shiny/682--0--Spritzee.gif diff --git a/src/canonical/models/front-shiny/Aromatisse.gif b/src/canonical/models/front-shiny/683--0--Aromatisse.gif similarity index 100% rename from src/canonical/models/front-shiny/Aromatisse.gif rename to src/canonical/models/front-shiny/683--0--Aromatisse.gif diff --git a/src/canonical/models/front-shiny/Swirlix.gif b/src/canonical/models/front-shiny/684--0--Swirlix.gif similarity index 100% rename from src/canonical/models/front-shiny/Swirlix.gif rename to src/canonical/models/front-shiny/684--0--Swirlix.gif diff --git a/src/canonical/models/front-shiny/Slurpuff.gif b/src/canonical/models/front-shiny/685--0--Slurpuff.gif similarity index 100% rename from src/canonical/models/front-shiny/Slurpuff.gif rename to src/canonical/models/front-shiny/685--0--Slurpuff.gif diff --git a/src/canonical/models/front-shiny/Inkay.gif b/src/canonical/models/front-shiny/686--0--Inkay.gif similarity index 100% rename from src/canonical/models/front-shiny/Inkay.gif rename to src/canonical/models/front-shiny/686--0--Inkay.gif diff --git a/src/canonical/models/front-shiny/Malamar.gif b/src/canonical/models/front-shiny/687--0--Malamar.gif similarity index 100% rename from src/canonical/models/front-shiny/Malamar.gif rename to src/canonical/models/front-shiny/687--0--Malamar.gif diff --git a/src/canonical/models/front-shiny/Binacle.gif b/src/canonical/models/front-shiny/688--0--Binacle.gif similarity index 100% rename from src/canonical/models/front-shiny/Binacle.gif rename to src/canonical/models/front-shiny/688--0--Binacle.gif diff --git a/src/canonical/models/front-shiny/Barbaracle.gif b/src/canonical/models/front-shiny/689--0--Barbaracle.gif similarity index 100% rename from src/canonical/models/front-shiny/Barbaracle.gif rename to src/canonical/models/front-shiny/689--0--Barbaracle.gif diff --git a/src/canonical/models/front-shiny/Bellsprout.gif b/src/canonical/models/front-shiny/69--0--Bellsprout.gif similarity index 100% rename from src/canonical/models/front-shiny/Bellsprout.gif rename to src/canonical/models/front-shiny/69--0--Bellsprout.gif diff --git a/src/canonical/models/front-shiny/Skrelp.gif b/src/canonical/models/front-shiny/690--0--Skrelp.gif similarity index 100% rename from src/canonical/models/front-shiny/Skrelp.gif rename to src/canonical/models/front-shiny/690--0--Skrelp.gif diff --git a/src/canonical/models/front-shiny/Dragalge.gif b/src/canonical/models/front-shiny/691--0--Dragalge.gif similarity index 100% rename from src/canonical/models/front-shiny/Dragalge.gif rename to src/canonical/models/front-shiny/691--0--Dragalge.gif diff --git a/src/canonical/models/front-shiny/Clauncher.gif b/src/canonical/models/front-shiny/692--0--Clauncher.gif similarity index 100% rename from src/canonical/models/front-shiny/Clauncher.gif rename to src/canonical/models/front-shiny/692--0--Clauncher.gif diff --git a/src/canonical/models/front-shiny/Clawitzer.gif b/src/canonical/models/front-shiny/693--0--Clawitzer.gif similarity index 100% rename from src/canonical/models/front-shiny/Clawitzer.gif rename to src/canonical/models/front-shiny/693--0--Clawitzer.gif diff --git a/src/canonical/models/front-shiny/Helioptile.gif b/src/canonical/models/front-shiny/694--0--Helioptile.gif similarity index 100% rename from src/canonical/models/front-shiny/Helioptile.gif rename to src/canonical/models/front-shiny/694--0--Helioptile.gif diff --git a/src/canonical/models/front-shiny/Heliolisk.gif b/src/canonical/models/front-shiny/695--0--Heliolisk.gif similarity index 100% rename from src/canonical/models/front-shiny/Heliolisk.gif rename to src/canonical/models/front-shiny/695--0--Heliolisk.gif diff --git a/src/canonical/models/front-shiny/Tyrunt.gif b/src/canonical/models/front-shiny/696--0--Tyrunt.gif similarity index 100% rename from src/canonical/models/front-shiny/Tyrunt.gif rename to src/canonical/models/front-shiny/696--0--Tyrunt.gif diff --git a/src/canonical/models/front-shiny/Tyrantrum.gif b/src/canonical/models/front-shiny/697--0--Tyrantrum.gif similarity index 100% rename from src/canonical/models/front-shiny/Tyrantrum.gif rename to src/canonical/models/front-shiny/697--0--Tyrantrum.gif diff --git a/src/canonical/models/front-shiny/Amaura.gif b/src/canonical/models/front-shiny/698--0--Amaura.gif similarity index 100% rename from src/canonical/models/front-shiny/Amaura.gif rename to src/canonical/models/front-shiny/698--0--Amaura.gif diff --git a/src/canonical/models/front-shiny/Aurorus.gif b/src/canonical/models/front-shiny/699--0--Aurorus.gif similarity index 100% rename from src/canonical/models/front-shiny/Aurorus.gif rename to src/canonical/models/front-shiny/699--0--Aurorus.gif diff --git a/src/canonical/models/front-shiny/Squirtle.gif b/src/canonical/models/front-shiny/7--0--Squirtle.gif similarity index 100% rename from src/canonical/models/front-shiny/Squirtle.gif rename to src/canonical/models/front-shiny/7--0--Squirtle.gif diff --git a/src/canonical/models/front-shiny/Weepinbell.gif b/src/canonical/models/front-shiny/70--0--Weepinbell.gif similarity index 100% rename from src/canonical/models/front-shiny/Weepinbell.gif rename to src/canonical/models/front-shiny/70--0--Weepinbell.gif diff --git a/src/canonical/models/front-shiny/Sylveon.gif b/src/canonical/models/front-shiny/700--0--Sylveon.gif similarity index 100% rename from src/canonical/models/front-shiny/Sylveon.gif rename to src/canonical/models/front-shiny/700--0--Sylveon.gif diff --git a/src/canonical/models/front-shiny/Hawlucha.gif b/src/canonical/models/front-shiny/701--0--Hawlucha.gif similarity index 100% rename from src/canonical/models/front-shiny/Hawlucha.gif rename to src/canonical/models/front-shiny/701--0--Hawlucha.gif diff --git a/src/canonical/models/front-shiny/Dedenne.gif b/src/canonical/models/front-shiny/702--0--Dedenne.gif similarity index 100% rename from src/canonical/models/front-shiny/Dedenne.gif rename to src/canonical/models/front-shiny/702--0--Dedenne.gif diff --git a/src/canonical/models/front-shiny/Carbink.gif b/src/canonical/models/front-shiny/703--0--Carbink.gif similarity index 100% rename from src/canonical/models/front-shiny/Carbink.gif rename to src/canonical/models/front-shiny/703--0--Carbink.gif diff --git a/src/canonical/models/front-shiny/Goomy.gif b/src/canonical/models/front-shiny/704--0--Goomy.gif similarity index 100% rename from src/canonical/models/front-shiny/Goomy.gif rename to src/canonical/models/front-shiny/704--0--Goomy.gif diff --git a/src/canonical/models/front-shiny/Sliggoo.gif b/src/canonical/models/front-shiny/705--0--Sliggoo.gif similarity index 100% rename from src/canonical/models/front-shiny/Sliggoo.gif rename to src/canonical/models/front-shiny/705--0--Sliggoo.gif diff --git a/src/canonical/models/front-shiny/Goodra.gif b/src/canonical/models/front-shiny/706--0--Goodra.gif similarity index 100% rename from src/canonical/models/front-shiny/Goodra.gif rename to src/canonical/models/front-shiny/706--0--Goodra.gif diff --git a/src/canonical/models/front-shiny/Klefki.gif b/src/canonical/models/front-shiny/707--0--Klefki.gif similarity index 100% rename from src/canonical/models/front-shiny/Klefki.gif rename to src/canonical/models/front-shiny/707--0--Klefki.gif diff --git a/src/canonical/models/front-shiny/Phantump.gif b/src/canonical/models/front-shiny/708--0--Phantump.gif similarity index 100% rename from src/canonical/models/front-shiny/Phantump.gif rename to src/canonical/models/front-shiny/708--0--Phantump.gif diff --git a/src/canonical/models/front-shiny/Trevenant.gif b/src/canonical/models/front-shiny/709--0--Trevenant.gif similarity index 100% rename from src/canonical/models/front-shiny/Trevenant.gif rename to src/canonical/models/front-shiny/709--0--Trevenant.gif diff --git a/src/canonical/models/front-shiny/Victreebel.gif b/src/canonical/models/front-shiny/71--0--Victreebel.gif similarity index 100% rename from src/canonical/models/front-shiny/Victreebel.gif rename to src/canonical/models/front-shiny/71--0--Victreebel.gif diff --git a/src/canonical/models/front-shiny/Pumpkaboo.gif b/src/canonical/models/front-shiny/710--0--Pumpkaboo.gif similarity index 100% rename from src/canonical/models/front-shiny/Pumpkaboo.gif rename to src/canonical/models/front-shiny/710--0--Pumpkaboo.gif diff --git a/src/canonical/models/front-shiny/Pumpkaboo--Large.gif b/src/canonical/models/front-shiny/710--420--Pumpkaboo--Large.gif similarity index 100% rename from src/canonical/models/front-shiny/Pumpkaboo--Large.gif rename to src/canonical/models/front-shiny/710--420--Pumpkaboo--Large.gif diff --git a/src/canonical/models/front-shiny/Pumpkaboo--Small.gif b/src/canonical/models/front-shiny/710--420--Pumpkaboo--Small.gif similarity index 100% rename from src/canonical/models/front-shiny/Pumpkaboo--Small.gif rename to src/canonical/models/front-shiny/710--420--Pumpkaboo--Small.gif diff --git a/src/canonical/models/front-shiny/Pumpkaboo--Super.gif b/src/canonical/models/front-shiny/710--420--Pumpkaboo--Super.gif similarity index 100% rename from src/canonical/models/front-shiny/Pumpkaboo--Super.gif rename to src/canonical/models/front-shiny/710--420--Pumpkaboo--Super.gif diff --git a/src/canonical/models/front-shiny/Gourgeist--Large.gif b/src/canonical/models/front-shiny/711--0--Gourgeist.gif similarity index 100% rename from src/canonical/models/front-shiny/Gourgeist--Large.gif rename to src/canonical/models/front-shiny/711--0--Gourgeist.gif diff --git a/src/canonical/models/front-shiny/Gourgeist--Super.gif b/src/canonical/models/front-shiny/711--420--Gourgeist--Large.gif similarity index 100% rename from src/canonical/models/front-shiny/Gourgeist--Super.gif rename to src/canonical/models/front-shiny/711--420--Gourgeist--Large.gif diff --git a/src/canonical/models/front-shiny/Gourgeist--Small.gif b/src/canonical/models/front-shiny/711--420--Gourgeist--Small.gif similarity index 100% rename from src/canonical/models/front-shiny/Gourgeist--Small.gif rename to src/canonical/models/front-shiny/711--420--Gourgeist--Small.gif diff --git a/src/canonical/models/front-shiny/Gourgeist.gif b/src/canonical/models/front-shiny/711--420--Gourgeist--Super.gif similarity index 100% rename from src/canonical/models/front-shiny/Gourgeist.gif rename to src/canonical/models/front-shiny/711--420--Gourgeist--Super.gif diff --git a/src/canonical/models/front-shiny/Bergmite.gif b/src/canonical/models/front-shiny/712--0--Bergmite.gif similarity index 100% rename from src/canonical/models/front-shiny/Bergmite.gif rename to src/canonical/models/front-shiny/712--0--Bergmite.gif diff --git a/src/canonical/models/front-shiny/Avalugg.gif b/src/canonical/models/front-shiny/713--0--Avalugg.gif similarity index 100% rename from src/canonical/models/front-shiny/Avalugg.gif rename to src/canonical/models/front-shiny/713--0--Avalugg.gif diff --git a/src/canonical/models/front-shiny/Noibat.gif b/src/canonical/models/front-shiny/714--0--Noibat.gif similarity index 100% rename from src/canonical/models/front-shiny/Noibat.gif rename to src/canonical/models/front-shiny/714--0--Noibat.gif diff --git a/src/canonical/models/front-shiny/Noivern.gif b/src/canonical/models/front-shiny/715--0--Noivern.gif similarity index 100% rename from src/canonical/models/front-shiny/Noivern.gif rename to src/canonical/models/front-shiny/715--0--Noivern.gif diff --git a/src/canonical/models/front-shiny/Xerneas.gif b/src/canonical/models/front-shiny/716--0--Xerneas.gif similarity index 100% rename from src/canonical/models/front-shiny/Xerneas.gif rename to src/canonical/models/front-shiny/716--0--Xerneas.gif diff --git a/src/canonical/models/front-shiny/Yveltal.gif b/src/canonical/models/front-shiny/717--0--Yveltal.gif similarity index 100% rename from src/canonical/models/front-shiny/Yveltal.gif rename to src/canonical/models/front-shiny/717--0--Yveltal.gif diff --git a/src/canonical/models/front-shiny/Zygarde.gif b/src/canonical/models/front-shiny/718--0--Zygarde.gif similarity index 100% rename from src/canonical/models/front-shiny/Zygarde.gif rename to src/canonical/models/front-shiny/718--0--Zygarde.gif diff --git a/src/canonical/models/front-shiny/Zygarde--10__0025.gif b/src/canonical/models/front-shiny/718--420--Zygarde--10__0025.gif similarity index 100% rename from src/canonical/models/front-shiny/Zygarde--10__0025.gif rename to src/canonical/models/front-shiny/718--420--Zygarde--10__0025.gif diff --git a/src/canonical/models/front-shiny/Zygarde--Complete.gif b/src/canonical/models/front-shiny/718--420--Zygarde--Complete.gif similarity index 100% rename from src/canonical/models/front-shiny/Zygarde--Complete.gif rename to src/canonical/models/front-shiny/718--420--Zygarde--Complete.gif diff --git a/src/canonical/models/front-shiny/Diancie.gif b/src/canonical/models/front-shiny/719--0--Diancie.gif similarity index 100% rename from src/canonical/models/front-shiny/Diancie.gif rename to src/canonical/models/front-shiny/719--0--Diancie.gif diff --git a/src/canonical/models/front-shiny/Diancie--Mega.gif b/src/canonical/models/front-shiny/719--420--Diancie--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Diancie--Mega.gif rename to src/canonical/models/front-shiny/719--420--Diancie--Mega.gif diff --git a/src/canonical/models/front-shiny/Tentacool.gif b/src/canonical/models/front-shiny/72--0--Tentacool.gif similarity index 100% rename from src/canonical/models/front-shiny/Tentacool.gif rename to src/canonical/models/front-shiny/72--0--Tentacool.gif diff --git a/src/canonical/models/front-shiny/Hoopa.gif b/src/canonical/models/front-shiny/720--0--Hoopa.gif similarity index 100% rename from src/canonical/models/front-shiny/Hoopa.gif rename to src/canonical/models/front-shiny/720--0--Hoopa.gif diff --git a/src/canonical/models/front-shiny/Hoopa--Unbound.gif b/src/canonical/models/front-shiny/720--420--Hoopa--Unbound.gif similarity index 100% rename from src/canonical/models/front-shiny/Hoopa--Unbound.gif rename to src/canonical/models/front-shiny/720--420--Hoopa--Unbound.gif diff --git a/src/canonical/models/front-shiny/Volcanion.gif b/src/canonical/models/front-shiny/721--0--Volcanion.gif similarity index 100% rename from src/canonical/models/front-shiny/Volcanion.gif rename to src/canonical/models/front-shiny/721--0--Volcanion.gif diff --git a/src/canonical/models/front-shiny/Rowlet.gif b/src/canonical/models/front-shiny/722--0--Rowlet.gif similarity index 100% rename from src/canonical/models/front-shiny/Rowlet.gif rename to src/canonical/models/front-shiny/722--0--Rowlet.gif diff --git a/src/canonical/models/front-shiny/Dartrix.gif b/src/canonical/models/front-shiny/723--0--Dartrix.gif similarity index 100% rename from src/canonical/models/front-shiny/Dartrix.gif rename to src/canonical/models/front-shiny/723--0--Dartrix.gif diff --git a/src/canonical/models/front-shiny/Decidueye.gif b/src/canonical/models/front-shiny/724--0--Decidueye.gif similarity index 100% rename from src/canonical/models/front-shiny/Decidueye.gif rename to src/canonical/models/front-shiny/724--0--Decidueye.gif diff --git a/src/canonical/models/front-shiny/Litten.gif b/src/canonical/models/front-shiny/725--0--Litten.gif similarity index 100% rename from src/canonical/models/front-shiny/Litten.gif rename to src/canonical/models/front-shiny/725--0--Litten.gif diff --git a/src/canonical/models/front-shiny/Torracat.gif b/src/canonical/models/front-shiny/726--0--Torracat.gif similarity index 100% rename from src/canonical/models/front-shiny/Torracat.gif rename to src/canonical/models/front-shiny/726--0--Torracat.gif diff --git a/src/canonical/models/front-shiny/Incineroar.gif b/src/canonical/models/front-shiny/727--0--Incineroar.gif similarity index 100% rename from src/canonical/models/front-shiny/Incineroar.gif rename to src/canonical/models/front-shiny/727--0--Incineroar.gif diff --git a/src/canonical/models/front-shiny/Popplio.gif b/src/canonical/models/front-shiny/728--0--Popplio.gif similarity index 100% rename from src/canonical/models/front-shiny/Popplio.gif rename to src/canonical/models/front-shiny/728--0--Popplio.gif diff --git a/src/canonical/models/front-shiny/Brionne.gif b/src/canonical/models/front-shiny/729--0--Brionne.gif similarity index 100% rename from src/canonical/models/front-shiny/Brionne.gif rename to src/canonical/models/front-shiny/729--0--Brionne.gif diff --git a/src/canonical/models/front-shiny/Tentacruel.gif b/src/canonical/models/front-shiny/73--0--Tentacruel.gif similarity index 100% rename from src/canonical/models/front-shiny/Tentacruel.gif rename to src/canonical/models/front-shiny/73--0--Tentacruel.gif diff --git a/src/canonical/models/front-shiny/Primarina.gif b/src/canonical/models/front-shiny/730--0--Primarina.gif similarity index 100% rename from src/canonical/models/front-shiny/Primarina.gif rename to src/canonical/models/front-shiny/730--0--Primarina.gif diff --git a/src/canonical/models/front-shiny/Pikipek.gif b/src/canonical/models/front-shiny/731--0--Pikipek.gif similarity index 100% rename from src/canonical/models/front-shiny/Pikipek.gif rename to src/canonical/models/front-shiny/731--0--Pikipek.gif diff --git a/src/canonical/models/front-shiny/Trumbeak.gif b/src/canonical/models/front-shiny/732--0--Trumbeak.gif similarity index 100% rename from src/canonical/models/front-shiny/Trumbeak.gif rename to src/canonical/models/front-shiny/732--0--Trumbeak.gif diff --git a/src/canonical/models/front-shiny/Toucannon.gif b/src/canonical/models/front-shiny/733--0--Toucannon.gif similarity index 100% rename from src/canonical/models/front-shiny/Toucannon.gif rename to src/canonical/models/front-shiny/733--0--Toucannon.gif diff --git a/src/canonical/models/front-shiny/Yungoos.gif b/src/canonical/models/front-shiny/734--0--Yungoos.gif similarity index 100% rename from src/canonical/models/front-shiny/Yungoos.gif rename to src/canonical/models/front-shiny/734--0--Yungoos.gif diff --git a/src/canonical/models/front-shiny/Gumshoos.gif b/src/canonical/models/front-shiny/735--0--Gumshoos.gif similarity index 100% rename from src/canonical/models/front-shiny/Gumshoos.gif rename to src/canonical/models/front-shiny/735--0--Gumshoos.gif diff --git a/src/canonical/models/front-shiny/Gumshoos--Totem.gif b/src/canonical/models/front-shiny/735--420--Gumshoos--Totem.gif similarity index 100% rename from src/canonical/models/front-shiny/Gumshoos--Totem.gif rename to src/canonical/models/front-shiny/735--420--Gumshoos--Totem.gif diff --git a/src/canonical/models/front-shiny/Grubbin.gif b/src/canonical/models/front-shiny/736--0--Grubbin.gif similarity index 100% rename from src/canonical/models/front-shiny/Grubbin.gif rename to src/canonical/models/front-shiny/736--0--Grubbin.gif diff --git a/src/canonical/models/front-shiny/Charjabug.gif b/src/canonical/models/front-shiny/737--0--Charjabug.gif similarity index 100% rename from src/canonical/models/front-shiny/Charjabug.gif rename to src/canonical/models/front-shiny/737--0--Charjabug.gif diff --git a/src/canonical/models/front-shiny/Vikavolt.gif b/src/canonical/models/front-shiny/738--0--Vikavolt.gif similarity index 100% rename from src/canonical/models/front-shiny/Vikavolt.gif rename to src/canonical/models/front-shiny/738--0--Vikavolt.gif diff --git a/src/canonical/models/front-shiny/Vikavolt--Totem.gif b/src/canonical/models/front-shiny/738--420--Vikavolt--Totem.gif similarity index 100% rename from src/canonical/models/front-shiny/Vikavolt--Totem.gif rename to src/canonical/models/front-shiny/738--420--Vikavolt--Totem.gif diff --git a/src/canonical/models/front-shiny/Crabrawler.gif b/src/canonical/models/front-shiny/739--0--Crabrawler.gif similarity index 100% rename from src/canonical/models/front-shiny/Crabrawler.gif rename to src/canonical/models/front-shiny/739--0--Crabrawler.gif diff --git a/src/canonical/models/front-shiny/Geodude.gif b/src/canonical/models/front-shiny/74--0--Geodude.gif similarity index 100% rename from src/canonical/models/front-shiny/Geodude.gif rename to src/canonical/models/front-shiny/74--0--Geodude.gif diff --git a/src/canonical/models/front-shiny/Geodude--Alola.gif b/src/canonical/models/front-shiny/74--420--Geodude--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Geodude--Alola.gif rename to src/canonical/models/front-shiny/74--420--Geodude--Alola.gif diff --git a/src/canonical/models/front-shiny/Crabominable.gif b/src/canonical/models/front-shiny/740--0--Crabominable.gif similarity index 100% rename from src/canonical/models/front-shiny/Crabominable.gif rename to src/canonical/models/front-shiny/740--0--Crabominable.gif diff --git a/src/canonical/models/front-shiny/Oricorio.gif b/src/canonical/models/front-shiny/741--0--Oricorio.gif similarity index 100% rename from src/canonical/models/front-shiny/Oricorio.gif rename to src/canonical/models/front-shiny/741--0--Oricorio.gif diff --git a/src/canonical/models/front-shiny/Oricorio--Pa__0027u.gif b/src/canonical/models/front-shiny/741--420--Oricorio--Pa__0027u.gif similarity index 100% rename from src/canonical/models/front-shiny/Oricorio--Pa__0027u.gif rename to src/canonical/models/front-shiny/741--420--Oricorio--Pa__0027u.gif diff --git a/src/canonical/models/front-shiny/Oricorio--Pom-Pom.gif b/src/canonical/models/front-shiny/741--420--Oricorio--Pom-Pom.gif similarity index 100% rename from src/canonical/models/front-shiny/Oricorio--Pom-Pom.gif rename to src/canonical/models/front-shiny/741--420--Oricorio--Pom-Pom.gif diff --git a/src/canonical/models/front-shiny/Oricorio--Sensu.gif b/src/canonical/models/front-shiny/741--420--Oricorio--Sensu.gif similarity index 100% rename from src/canonical/models/front-shiny/Oricorio--Sensu.gif rename to src/canonical/models/front-shiny/741--420--Oricorio--Sensu.gif diff --git a/src/canonical/models/front-shiny/Cutiefly.gif b/src/canonical/models/front-shiny/742--0--Cutiefly.gif similarity index 100% rename from src/canonical/models/front-shiny/Cutiefly.gif rename to src/canonical/models/front-shiny/742--0--Cutiefly.gif diff --git a/src/canonical/models/front-shiny/Ribombee.gif b/src/canonical/models/front-shiny/743--0--Ribombee.gif similarity index 100% rename from src/canonical/models/front-shiny/Ribombee.gif rename to src/canonical/models/front-shiny/743--0--Ribombee.gif diff --git a/src/canonical/models/front-shiny/Ribombee--Totem.gif b/src/canonical/models/front-shiny/743--420--Ribombee--Totem.gif similarity index 100% rename from src/canonical/models/front-shiny/Ribombee--Totem.gif rename to src/canonical/models/front-shiny/743--420--Ribombee--Totem.gif diff --git a/src/canonical/models/front-shiny/Rockruff.gif b/src/canonical/models/front-shiny/744--0--Rockruff.gif similarity index 100% rename from src/canonical/models/front-shiny/Rockruff.gif rename to src/canonical/models/front-shiny/744--0--Rockruff.gif diff --git a/src/canonical/models/front-shiny/Lycanroc.gif b/src/canonical/models/front-shiny/745--0--Lycanroc.gif similarity index 100% rename from src/canonical/models/front-shiny/Lycanroc.gif rename to src/canonical/models/front-shiny/745--0--Lycanroc.gif diff --git a/src/canonical/models/front-shiny/Lycanroc--Dusk.gif b/src/canonical/models/front-shiny/745--420--Lycanroc--Dusk.gif similarity index 100% rename from src/canonical/models/front-shiny/Lycanroc--Dusk.gif rename to src/canonical/models/front-shiny/745--420--Lycanroc--Dusk.gif diff --git a/src/canonical/models/front-shiny/Lycanroc--Midnight.gif b/src/canonical/models/front-shiny/745--420--Lycanroc--Midnight.gif similarity index 100% rename from src/canonical/models/front-shiny/Lycanroc--Midnight.gif rename to src/canonical/models/front-shiny/745--420--Lycanroc--Midnight.gif diff --git a/src/canonical/models/front-shiny/Wishiwashi.gif b/src/canonical/models/front-shiny/746--0--Wishiwashi.gif similarity index 100% rename from src/canonical/models/front-shiny/Wishiwashi.gif rename to src/canonical/models/front-shiny/746--0--Wishiwashi.gif diff --git a/src/canonical/models/front-shiny/Wishiwashi--School.gif b/src/canonical/models/front-shiny/746--420--Wishiwashi--School.gif similarity index 100% rename from src/canonical/models/front-shiny/Wishiwashi--School.gif rename to src/canonical/models/front-shiny/746--420--Wishiwashi--School.gif diff --git a/src/canonical/models/front-shiny/Mareanie.gif b/src/canonical/models/front-shiny/747--0--Mareanie.gif similarity index 100% rename from src/canonical/models/front-shiny/Mareanie.gif rename to src/canonical/models/front-shiny/747--0--Mareanie.gif diff --git a/src/canonical/models/front-shiny/Toxapex.gif b/src/canonical/models/front-shiny/748--0--Toxapex.gif similarity index 100% rename from src/canonical/models/front-shiny/Toxapex.gif rename to src/canonical/models/front-shiny/748--0--Toxapex.gif diff --git a/src/canonical/models/front-shiny/Mudbray.gif b/src/canonical/models/front-shiny/749--0--Mudbray.gif similarity index 100% rename from src/canonical/models/front-shiny/Mudbray.gif rename to src/canonical/models/front-shiny/749--0--Mudbray.gif diff --git a/src/canonical/models/front-shiny/Graveler.gif b/src/canonical/models/front-shiny/75--0--Graveler.gif similarity index 100% rename from src/canonical/models/front-shiny/Graveler.gif rename to src/canonical/models/front-shiny/75--0--Graveler.gif diff --git a/src/canonical/models/front-shiny/Graveler--Alola.gif b/src/canonical/models/front-shiny/75--420--Graveler--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Graveler--Alola.gif rename to src/canonical/models/front-shiny/75--420--Graveler--Alola.gif diff --git a/src/canonical/models/front-shiny/Mudsdale.gif b/src/canonical/models/front-shiny/750--0--Mudsdale.gif similarity index 100% rename from src/canonical/models/front-shiny/Mudsdale.gif rename to src/canonical/models/front-shiny/750--0--Mudsdale.gif diff --git a/src/canonical/models/front-shiny/Dewpider.gif b/src/canonical/models/front-shiny/751--0--Dewpider.gif similarity index 100% rename from src/canonical/models/front-shiny/Dewpider.gif rename to src/canonical/models/front-shiny/751--0--Dewpider.gif diff --git a/src/canonical/models/front-shiny/Araquanid.gif b/src/canonical/models/front-shiny/752--0--Araquanid.gif similarity index 100% rename from src/canonical/models/front-shiny/Araquanid.gif rename to src/canonical/models/front-shiny/752--0--Araquanid.gif diff --git a/src/canonical/models/front-shiny/Araquanid--Totem.gif b/src/canonical/models/front-shiny/752--420--Araquanid--Totem.gif similarity index 100% rename from src/canonical/models/front-shiny/Araquanid--Totem.gif rename to src/canonical/models/front-shiny/752--420--Araquanid--Totem.gif diff --git a/src/canonical/models/front-shiny/Fomantis.gif b/src/canonical/models/front-shiny/753--0--Fomantis.gif similarity index 100% rename from src/canonical/models/front-shiny/Fomantis.gif rename to src/canonical/models/front-shiny/753--0--Fomantis.gif diff --git a/src/canonical/models/front-shiny/Lurantis.gif b/src/canonical/models/front-shiny/754--0--Lurantis.gif similarity index 100% rename from src/canonical/models/front-shiny/Lurantis.gif rename to src/canonical/models/front-shiny/754--0--Lurantis.gif diff --git a/src/canonical/models/front-shiny/Lurantis--Totem.gif b/src/canonical/models/front-shiny/754--420--Lurantis--Totem.gif similarity index 100% rename from src/canonical/models/front-shiny/Lurantis--Totem.gif rename to src/canonical/models/front-shiny/754--420--Lurantis--Totem.gif diff --git a/src/canonical/models/front-shiny/Morelull.gif b/src/canonical/models/front-shiny/755--0--Morelull.gif similarity index 100% rename from src/canonical/models/front-shiny/Morelull.gif rename to src/canonical/models/front-shiny/755--0--Morelull.gif diff --git a/src/canonical/models/front-shiny/Shiinotic.gif b/src/canonical/models/front-shiny/756--0--Shiinotic.gif similarity index 100% rename from src/canonical/models/front-shiny/Shiinotic.gif rename to src/canonical/models/front-shiny/756--0--Shiinotic.gif diff --git a/src/canonical/models/front-shiny/Salandit.gif b/src/canonical/models/front-shiny/757--0--Salandit.gif similarity index 100% rename from src/canonical/models/front-shiny/Salandit.gif rename to src/canonical/models/front-shiny/757--0--Salandit.gif diff --git a/src/canonical/models/front-shiny/Salazzle.gif b/src/canonical/models/front-shiny/758--0--Salazzle.gif similarity index 100% rename from src/canonical/models/front-shiny/Salazzle.gif rename to src/canonical/models/front-shiny/758--0--Salazzle.gif diff --git a/src/canonical/models/front-shiny/Salazzle--Totem.gif b/src/canonical/models/front-shiny/758--420--Salazzle--Totem.gif similarity index 100% rename from src/canonical/models/front-shiny/Salazzle--Totem.gif rename to src/canonical/models/front-shiny/758--420--Salazzle--Totem.gif diff --git a/src/canonical/models/front-shiny/Stufful.gif b/src/canonical/models/front-shiny/759--0--Stufful.gif similarity index 100% rename from src/canonical/models/front-shiny/Stufful.gif rename to src/canonical/models/front-shiny/759--0--Stufful.gif diff --git a/src/canonical/models/front-shiny/Golem.gif b/src/canonical/models/front-shiny/76--0--Golem.gif similarity index 100% rename from src/canonical/models/front-shiny/Golem.gif rename to src/canonical/models/front-shiny/76--0--Golem.gif diff --git a/src/canonical/models/front-shiny/Golem--Alola.gif b/src/canonical/models/front-shiny/76--420--Golem--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Golem--Alola.gif rename to src/canonical/models/front-shiny/76--420--Golem--Alola.gif diff --git a/src/canonical/models/front-shiny/Bewear.gif b/src/canonical/models/front-shiny/760--0--Bewear.gif similarity index 100% rename from src/canonical/models/front-shiny/Bewear.gif rename to src/canonical/models/front-shiny/760--0--Bewear.gif diff --git a/src/canonical/models/front-shiny/Bounsweet.gif b/src/canonical/models/front-shiny/761--0--Bounsweet.gif similarity index 100% rename from src/canonical/models/front-shiny/Bounsweet.gif rename to src/canonical/models/front-shiny/761--0--Bounsweet.gif diff --git a/src/canonical/models/front-shiny/Steenee.gif b/src/canonical/models/front-shiny/762--0--Steenee.gif similarity index 100% rename from src/canonical/models/front-shiny/Steenee.gif rename to src/canonical/models/front-shiny/762--0--Steenee.gif diff --git a/src/canonical/models/front-shiny/Tsareena.gif b/src/canonical/models/front-shiny/763--0--Tsareena.gif similarity index 100% rename from src/canonical/models/front-shiny/Tsareena.gif rename to src/canonical/models/front-shiny/763--0--Tsareena.gif diff --git a/src/canonical/models/front-shiny/Comfey.gif b/src/canonical/models/front-shiny/764--0--Comfey.gif similarity index 100% rename from src/canonical/models/front-shiny/Comfey.gif rename to src/canonical/models/front-shiny/764--0--Comfey.gif diff --git a/src/canonical/models/front-shiny/Oranguru.gif b/src/canonical/models/front-shiny/765--0--Oranguru.gif similarity index 100% rename from src/canonical/models/front-shiny/Oranguru.gif rename to src/canonical/models/front-shiny/765--0--Oranguru.gif diff --git a/src/canonical/models/front-shiny/Passimian.gif b/src/canonical/models/front-shiny/766--0--Passimian.gif similarity index 100% rename from src/canonical/models/front-shiny/Passimian.gif rename to src/canonical/models/front-shiny/766--0--Passimian.gif diff --git a/src/canonical/models/front-shiny/Wimpod.gif b/src/canonical/models/front-shiny/767--0--Wimpod.gif similarity index 100% rename from src/canonical/models/front-shiny/Wimpod.gif rename to src/canonical/models/front-shiny/767--0--Wimpod.gif diff --git a/src/canonical/models/front-shiny/Golisopod.gif b/src/canonical/models/front-shiny/768--0--Golisopod.gif similarity index 100% rename from src/canonical/models/front-shiny/Golisopod.gif rename to src/canonical/models/front-shiny/768--0--Golisopod.gif diff --git a/src/canonical/models/front-shiny/Sandygast.gif b/src/canonical/models/front-shiny/769--0--Sandygast.gif similarity index 100% rename from src/canonical/models/front-shiny/Sandygast.gif rename to src/canonical/models/front-shiny/769--0--Sandygast.gif diff --git a/src/canonical/models/front-shiny/Ponyta.gif b/src/canonical/models/front-shiny/77--0--Ponyta.gif similarity index 100% rename from src/canonical/models/front-shiny/Ponyta.gif rename to src/canonical/models/front-shiny/77--0--Ponyta.gif diff --git a/src/canonical/models/front-shiny/Ponyta--Galar.gif b/src/canonical/models/front-shiny/77--420--Ponyta--Galar.gif similarity index 100% rename from src/canonical/models/front-shiny/Ponyta--Galar.gif rename to src/canonical/models/front-shiny/77--420--Ponyta--Galar.gif diff --git a/src/canonical/models/front-shiny/Palossand.gif b/src/canonical/models/front-shiny/770--0--Palossand.gif similarity index 100% rename from src/canonical/models/front-shiny/Palossand.gif rename to src/canonical/models/front-shiny/770--0--Palossand.gif diff --git a/src/canonical/models/front-shiny/Pyukumuku.gif b/src/canonical/models/front-shiny/771--0--Pyukumuku.gif similarity index 100% rename from src/canonical/models/front-shiny/Pyukumuku.gif rename to src/canonical/models/front-shiny/771--0--Pyukumuku.gif diff --git a/src/canonical/models/front-shiny/Type__003a_Null.gif b/src/canonical/models/front-shiny/772--0--Type__003a_Null.gif similarity index 100% rename from src/canonical/models/front-shiny/Type__003a_Null.gif rename to src/canonical/models/front-shiny/772--0--Type__003a_Null.gif diff --git a/src/canonical/models/front-shiny/Silvally.gif b/src/canonical/models/front-shiny/773--0--Silvally.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally.gif rename to src/canonical/models/front-shiny/773--0--Silvally.gif diff --git a/src/canonical/models/front-shiny/Silvally--Bug.gif b/src/canonical/models/front-shiny/773--420--Silvally--Bug.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Bug.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Bug.gif diff --git a/src/canonical/models/front-shiny/Silvally--Dark.gif b/src/canonical/models/front-shiny/773--420--Silvally--Dark.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Dark.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Dark.gif diff --git a/src/canonical/models/front-shiny/Silvally--Dragon.gif b/src/canonical/models/front-shiny/773--420--Silvally--Dragon.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Dragon.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Dragon.gif diff --git a/src/canonical/models/front-shiny/Silvally--Electric.gif b/src/canonical/models/front-shiny/773--420--Silvally--Electric.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Electric.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Electric.gif diff --git a/src/canonical/models/front-shiny/Silvally--Fairy.gif b/src/canonical/models/front-shiny/773--420--Silvally--Fairy.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Fairy.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Fairy.gif diff --git a/src/canonical/models/front-shiny/Silvally--Fighting.gif b/src/canonical/models/front-shiny/773--420--Silvally--Fighting.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Fighting.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Fighting.gif diff --git a/src/canonical/models/front-shiny/Silvally--Fire.gif b/src/canonical/models/front-shiny/773--420--Silvally--Fire.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Fire.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Fire.gif diff --git a/src/canonical/models/front-shiny/Silvally--Flying.gif b/src/canonical/models/front-shiny/773--420--Silvally--Flying.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Flying.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Flying.gif diff --git a/src/canonical/models/front-shiny/Silvally--Ghost.gif b/src/canonical/models/front-shiny/773--420--Silvally--Ghost.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Ghost.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Ghost.gif diff --git a/src/canonical/models/front-shiny/Silvally--Grass.gif b/src/canonical/models/front-shiny/773--420--Silvally--Grass.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Grass.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Grass.gif diff --git a/src/canonical/models/front-shiny/Silvally--Ground.gif b/src/canonical/models/front-shiny/773--420--Silvally--Ground.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Ground.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Ground.gif diff --git a/src/canonical/models/front-shiny/Silvally--Ice.gif b/src/canonical/models/front-shiny/773--420--Silvally--Ice.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Ice.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Ice.gif diff --git a/src/canonical/models/front-shiny/Silvally--Poison.gif b/src/canonical/models/front-shiny/773--420--Silvally--Poison.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Poison.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Poison.gif diff --git a/src/canonical/models/front-shiny/Silvally--Psychic.gif b/src/canonical/models/front-shiny/773--420--Silvally--Psychic.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Psychic.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Psychic.gif diff --git a/src/canonical/models/front-shiny/Silvally--Rock.gif b/src/canonical/models/front-shiny/773--420--Silvally--Rock.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Rock.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Rock.gif diff --git a/src/canonical/models/front-shiny/Silvally--Steel.gif b/src/canonical/models/front-shiny/773--420--Silvally--Steel.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Steel.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Steel.gif diff --git a/src/canonical/models/front-shiny/Silvally--Water.gif b/src/canonical/models/front-shiny/773--420--Silvally--Water.gif similarity index 100% rename from src/canonical/models/front-shiny/Silvally--Water.gif rename to src/canonical/models/front-shiny/773--420--Silvally--Water.gif diff --git a/src/canonical/models/front-shiny/Minior.gif b/src/canonical/models/front-shiny/774--0--Minior.gif similarity index 100% rename from src/canonical/models/front-shiny/Minior.gif rename to src/canonical/models/front-shiny/774--0--Minior.gif diff --git a/src/canonical/models/front-shiny/Komala.gif b/src/canonical/models/front-shiny/775--0--Komala.gif similarity index 100% rename from src/canonical/models/front-shiny/Komala.gif rename to src/canonical/models/front-shiny/775--0--Komala.gif diff --git a/src/canonical/models/front-shiny/Turtonator.gif b/src/canonical/models/front-shiny/776--0--Turtonator.gif similarity index 100% rename from src/canonical/models/front-shiny/Turtonator.gif rename to src/canonical/models/front-shiny/776--0--Turtonator.gif diff --git a/src/canonical/models/front-shiny/Togedemaru.gif b/src/canonical/models/front-shiny/777--0--Togedemaru.gif similarity index 100% rename from src/canonical/models/front-shiny/Togedemaru.gif rename to src/canonical/models/front-shiny/777--0--Togedemaru.gif diff --git a/src/canonical/models/front-shiny/Togedemaru--Totem.gif b/src/canonical/models/front-shiny/777--420--Togedemaru--Totem.gif similarity index 100% rename from src/canonical/models/front-shiny/Togedemaru--Totem.gif rename to src/canonical/models/front-shiny/777--420--Togedemaru--Totem.gif diff --git a/src/canonical/models/front-shiny/Mimikyu.gif b/src/canonical/models/front-shiny/778--0--Mimikyu.gif similarity index 100% rename from src/canonical/models/front-shiny/Mimikyu.gif rename to src/canonical/models/front-shiny/778--0--Mimikyu.gif diff --git a/src/canonical/models/front-shiny/Mimikyu--Busted-Totem.gif b/src/canonical/models/front-shiny/778--420--Mimikyu--Busted-Totem.gif similarity index 100% rename from src/canonical/models/front-shiny/Mimikyu--Busted-Totem.gif rename to src/canonical/models/front-shiny/778--420--Mimikyu--Busted-Totem.gif diff --git a/src/canonical/models/front-shiny/Mimikyu--Busted.gif b/src/canonical/models/front-shiny/778--420--Mimikyu--Busted.gif similarity index 100% rename from src/canonical/models/front-shiny/Mimikyu--Busted.gif rename to src/canonical/models/front-shiny/778--420--Mimikyu--Busted.gif diff --git a/src/canonical/models/front-shiny/Mimikyu--Totem.gif b/src/canonical/models/front-shiny/778--420--Mimikyu--Totem.gif similarity index 100% rename from src/canonical/models/front-shiny/Mimikyu--Totem.gif rename to src/canonical/models/front-shiny/778--420--Mimikyu--Totem.gif diff --git a/src/canonical/models/front-shiny/Bruxish.gif b/src/canonical/models/front-shiny/779--0--Bruxish.gif similarity index 100% rename from src/canonical/models/front-shiny/Bruxish.gif rename to src/canonical/models/front-shiny/779--0--Bruxish.gif diff --git a/src/canonical/models/front-shiny/Rapidash.gif b/src/canonical/models/front-shiny/78--0--Rapidash.gif similarity index 100% rename from src/canonical/models/front-shiny/Rapidash.gif rename to src/canonical/models/front-shiny/78--0--Rapidash.gif diff --git a/src/canonical/models/front-shiny/Rapidash--Galar.gif b/src/canonical/models/front-shiny/78--420--Rapidash--Galar.gif similarity index 100% rename from src/canonical/models/front-shiny/Rapidash--Galar.gif rename to src/canonical/models/front-shiny/78--420--Rapidash--Galar.gif diff --git a/src/canonical/models/front-shiny/Drampa.gif b/src/canonical/models/front-shiny/780--0--Drampa.gif similarity index 100% rename from src/canonical/models/front-shiny/Drampa.gif rename to src/canonical/models/front-shiny/780--0--Drampa.gif diff --git a/src/canonical/models/front-shiny/Dhelmise.gif b/src/canonical/models/front-shiny/781--0--Dhelmise.gif similarity index 100% rename from src/canonical/models/front-shiny/Dhelmise.gif rename to src/canonical/models/front-shiny/781--0--Dhelmise.gif diff --git a/src/canonical/models/front-shiny/Jangmo-o.gif b/src/canonical/models/front-shiny/782--0--Jangmo-o.gif similarity index 100% rename from src/canonical/models/front-shiny/Jangmo-o.gif rename to src/canonical/models/front-shiny/782--0--Jangmo-o.gif diff --git a/src/canonical/models/front-shiny/Hakamo-o.gif b/src/canonical/models/front-shiny/783--0--Hakamo-o.gif similarity index 100% rename from src/canonical/models/front-shiny/Hakamo-o.gif rename to src/canonical/models/front-shiny/783--0--Hakamo-o.gif diff --git a/src/canonical/models/front-shiny/Kommo-o.gif b/src/canonical/models/front-shiny/784--0--Kommo-o.gif similarity index 100% rename from src/canonical/models/front-shiny/Kommo-o.gif rename to src/canonical/models/front-shiny/784--0--Kommo-o.gif diff --git a/src/canonical/models/front-shiny/Kommo-o--Totem.gif b/src/canonical/models/front-shiny/784--420--Kommo-o--Totem.gif similarity index 100% rename from src/canonical/models/front-shiny/Kommo-o--Totem.gif rename to src/canonical/models/front-shiny/784--420--Kommo-o--Totem.gif diff --git a/src/canonical/models/front-shiny/Tapu_Koko.gif b/src/canonical/models/front-shiny/785--0--Tapu_Koko.gif similarity index 100% rename from src/canonical/models/front-shiny/Tapu_Koko.gif rename to src/canonical/models/front-shiny/785--0--Tapu_Koko.gif diff --git a/src/canonical/models/front-shiny/Tapu_Lele.gif b/src/canonical/models/front-shiny/786--0--Tapu_Lele.gif similarity index 100% rename from src/canonical/models/front-shiny/Tapu_Lele.gif rename to src/canonical/models/front-shiny/786--0--Tapu_Lele.gif diff --git a/src/canonical/models/front-shiny/Tapu_Bulu.gif b/src/canonical/models/front-shiny/787--0--Tapu_Bulu.gif similarity index 100% rename from src/canonical/models/front-shiny/Tapu_Bulu.gif rename to src/canonical/models/front-shiny/787--0--Tapu_Bulu.gif diff --git a/src/canonical/models/front-shiny/Tapu_Fini.gif b/src/canonical/models/front-shiny/788--0--Tapu_Fini.gif similarity index 100% rename from src/canonical/models/front-shiny/Tapu_Fini.gif rename to src/canonical/models/front-shiny/788--0--Tapu_Fini.gif diff --git a/src/canonical/models/front-shiny/Cosmog.gif b/src/canonical/models/front-shiny/789--0--Cosmog.gif similarity index 100% rename from src/canonical/models/front-shiny/Cosmog.gif rename to src/canonical/models/front-shiny/789--0--Cosmog.gif diff --git a/src/canonical/models/front-shiny/Slowpoke.gif b/src/canonical/models/front-shiny/79--0--Slowpoke.gif similarity index 100% rename from src/canonical/models/front-shiny/Slowpoke.gif rename to src/canonical/models/front-shiny/79--0--Slowpoke.gif diff --git a/src/canonical/models/front-shiny/Slowpoke--Galar.gif b/src/canonical/models/front-shiny/79--420--Slowpoke--Galar.gif similarity index 100% rename from src/canonical/models/front-shiny/Slowpoke--Galar.gif rename to src/canonical/models/front-shiny/79--420--Slowpoke--Galar.gif diff --git a/src/canonical/models/front-shiny/Cosmoem.gif b/src/canonical/models/front-shiny/790--0--Cosmoem.gif similarity index 100% rename from src/canonical/models/front-shiny/Cosmoem.gif rename to src/canonical/models/front-shiny/790--0--Cosmoem.gif diff --git a/src/canonical/models/front-shiny/Solgaleo.gif b/src/canonical/models/front-shiny/791--0--Solgaleo.gif similarity index 100% rename from src/canonical/models/front-shiny/Solgaleo.gif rename to src/canonical/models/front-shiny/791--0--Solgaleo.gif diff --git a/src/canonical/models/front-shiny/Lunala.gif b/src/canonical/models/front-shiny/792--0--Lunala.gif similarity index 100% rename from src/canonical/models/front-shiny/Lunala.gif rename to src/canonical/models/front-shiny/792--0--Lunala.gif diff --git a/src/canonical/models/front-shiny/Nihilego.gif b/src/canonical/models/front-shiny/793--0--Nihilego.gif similarity index 100% rename from src/canonical/models/front-shiny/Nihilego.gif rename to src/canonical/models/front-shiny/793--0--Nihilego.gif diff --git a/src/canonical/models/front-shiny/Buzzwole.gif b/src/canonical/models/front-shiny/794--0--Buzzwole.gif similarity index 100% rename from src/canonical/models/front-shiny/Buzzwole.gif rename to src/canonical/models/front-shiny/794--0--Buzzwole.gif diff --git a/src/canonical/models/front-shiny/Pheromosa.gif b/src/canonical/models/front-shiny/795--0--Pheromosa.gif similarity index 100% rename from src/canonical/models/front-shiny/Pheromosa.gif rename to src/canonical/models/front-shiny/795--0--Pheromosa.gif diff --git a/src/canonical/models/front-shiny/Xurkitree.gif b/src/canonical/models/front-shiny/796--0--Xurkitree.gif similarity index 100% rename from src/canonical/models/front-shiny/Xurkitree.gif rename to src/canonical/models/front-shiny/796--0--Xurkitree.gif diff --git a/src/canonical/models/front-shiny/Celesteela.gif b/src/canonical/models/front-shiny/797--0--Celesteela.gif similarity index 100% rename from src/canonical/models/front-shiny/Celesteela.gif rename to src/canonical/models/front-shiny/797--0--Celesteela.gif diff --git a/src/canonical/models/front-shiny/Kartana.gif b/src/canonical/models/front-shiny/798--0--Kartana.gif similarity index 100% rename from src/canonical/models/front-shiny/Kartana.gif rename to src/canonical/models/front-shiny/798--0--Kartana.gif diff --git a/src/canonical/models/front-shiny/Guzzlord.gif b/src/canonical/models/front-shiny/799--0--Guzzlord.gif similarity index 100% rename from src/canonical/models/front-shiny/Guzzlord.gif rename to src/canonical/models/front-shiny/799--0--Guzzlord.gif diff --git a/src/canonical/models/front-shiny/Wartortle.gif b/src/canonical/models/front-shiny/8--0--Wartortle.gif similarity index 100% rename from src/canonical/models/front-shiny/Wartortle.gif rename to src/canonical/models/front-shiny/8--0--Wartortle.gif diff --git a/src/canonical/models/front-shiny/Slowbro.gif b/src/canonical/models/front-shiny/80--0--Slowbro.gif similarity index 100% rename from src/canonical/models/front-shiny/Slowbro.gif rename to src/canonical/models/front-shiny/80--0--Slowbro.gif diff --git a/src/canonical/models/front-shiny/Slowbro--Mega.gif b/src/canonical/models/front-shiny/80--420--Slowbro--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Slowbro--Mega.gif rename to src/canonical/models/front-shiny/80--420--Slowbro--Mega.gif diff --git a/src/canonical/models/front-shiny/Necrozma.gif b/src/canonical/models/front-shiny/800--0--Necrozma.gif similarity index 100% rename from src/canonical/models/front-shiny/Necrozma.gif rename to src/canonical/models/front-shiny/800--0--Necrozma.gif diff --git a/src/canonical/models/front-shiny/Necrozma--Dawn_Wings.gif b/src/canonical/models/front-shiny/800--420--Necrozma--Dawn_Wings.gif similarity index 100% rename from src/canonical/models/front-shiny/Necrozma--Dawn_Wings.gif rename to src/canonical/models/front-shiny/800--420--Necrozma--Dawn_Wings.gif diff --git a/src/canonical/models/front-shiny/Necrozma--Dusk_Mane.gif b/src/canonical/models/front-shiny/800--420--Necrozma--Dusk_Mane.gif similarity index 100% rename from src/canonical/models/front-shiny/Necrozma--Dusk_Mane.gif rename to src/canonical/models/front-shiny/800--420--Necrozma--Dusk_Mane.gif diff --git a/src/canonical/models/front-shiny/Necrozma--Ultra.gif b/src/canonical/models/front-shiny/800--420--Necrozma--Ultra.gif similarity index 100% rename from src/canonical/models/front-shiny/Necrozma--Ultra.gif rename to src/canonical/models/front-shiny/800--420--Necrozma--Ultra.gif diff --git a/src/canonical/models/front-shiny/Magearna.gif b/src/canonical/models/front-shiny/801--0--Magearna.gif similarity index 100% rename from src/canonical/models/front-shiny/Magearna.gif rename to src/canonical/models/front-shiny/801--0--Magearna.gif diff --git a/src/canonical/models/front-shiny/Marshadow.gif b/src/canonical/models/front-shiny/802--0--Marshadow.gif similarity index 100% rename from src/canonical/models/front-shiny/Marshadow.gif rename to src/canonical/models/front-shiny/802--0--Marshadow.gif diff --git a/src/canonical/models/front-shiny/Poipole.gif b/src/canonical/models/front-shiny/803--0--Poipole.gif similarity index 100% rename from src/canonical/models/front-shiny/Poipole.gif rename to src/canonical/models/front-shiny/803--0--Poipole.gif diff --git a/src/canonical/models/front-shiny/Naganadel.gif b/src/canonical/models/front-shiny/804--0--Naganadel.gif similarity index 100% rename from src/canonical/models/front-shiny/Naganadel.gif rename to src/canonical/models/front-shiny/804--0--Naganadel.gif diff --git a/src/canonical/models/front-shiny/Stakataka.gif b/src/canonical/models/front-shiny/805--0--Stakataka.gif similarity index 100% rename from src/canonical/models/front-shiny/Stakataka.gif rename to src/canonical/models/front-shiny/805--0--Stakataka.gif diff --git a/src/canonical/models/front-shiny/Blacephalon.gif b/src/canonical/models/front-shiny/806--0--Blacephalon.gif similarity index 100% rename from src/canonical/models/front-shiny/Blacephalon.gif rename to src/canonical/models/front-shiny/806--0--Blacephalon.gif diff --git a/src/canonical/models/front-shiny/Zeraora.gif b/src/canonical/models/front-shiny/807--0--Zeraora.gif similarity index 100% rename from src/canonical/models/front-shiny/Zeraora.gif rename to src/canonical/models/front-shiny/807--0--Zeraora.gif diff --git a/src/canonical/models/front-shiny/Meltan.gif b/src/canonical/models/front-shiny/808--0--Meltan.gif similarity index 100% rename from src/canonical/models/front-shiny/Meltan.gif rename to src/canonical/models/front-shiny/808--0--Meltan.gif diff --git a/src/canonical/models/front-shiny/Melmetal.gif b/src/canonical/models/front-shiny/809--0--Melmetal.gif similarity index 100% rename from src/canonical/models/front-shiny/Melmetal.gif rename to src/canonical/models/front-shiny/809--0--Melmetal.gif diff --git a/src/canonical/models/front-shiny/Melmetal--Gmax.gif b/src/canonical/models/front-shiny/809--420--Melmetal--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Melmetal--Gmax.gif rename to src/canonical/models/front-shiny/809--420--Melmetal--Gmax.gif diff --git a/src/canonical/models/front-shiny/Magnemite.gif b/src/canonical/models/front-shiny/81--0--Magnemite.gif similarity index 100% rename from src/canonical/models/front-shiny/Magnemite.gif rename to src/canonical/models/front-shiny/81--0--Magnemite.gif diff --git a/src/canonical/models/front-shiny/Grookey.gif b/src/canonical/models/front-shiny/810--0--Grookey.gif similarity index 100% rename from src/canonical/models/front-shiny/Grookey.gif rename to src/canonical/models/front-shiny/810--0--Grookey.gif diff --git a/src/canonical/models/front-shiny/Thwackey.gif b/src/canonical/models/front-shiny/811--0--Thwackey.gif similarity index 100% rename from src/canonical/models/front-shiny/Thwackey.gif rename to src/canonical/models/front-shiny/811--0--Thwackey.gif diff --git a/src/canonical/models/front-shiny/Rillaboom.gif b/src/canonical/models/front-shiny/812--0--Rillaboom.gif similarity index 100% rename from src/canonical/models/front-shiny/Rillaboom.gif rename to src/canonical/models/front-shiny/812--0--Rillaboom.gif diff --git a/src/canonical/models/front-shiny/Scorbunny.gif b/src/canonical/models/front-shiny/813--0--Scorbunny.gif similarity index 100% rename from src/canonical/models/front-shiny/Scorbunny.gif rename to src/canonical/models/front-shiny/813--0--Scorbunny.gif diff --git a/src/canonical/models/front-shiny/Raboot.gif b/src/canonical/models/front-shiny/814--0--Raboot.gif similarity index 100% rename from src/canonical/models/front-shiny/Raboot.gif rename to src/canonical/models/front-shiny/814--0--Raboot.gif diff --git a/src/canonical/models/front-shiny/Cinderace.gif b/src/canonical/models/front-shiny/815--0--Cinderace.gif similarity index 100% rename from src/canonical/models/front-shiny/Cinderace.gif rename to src/canonical/models/front-shiny/815--0--Cinderace.gif diff --git a/src/canonical/models/front-shiny/Sobble.gif b/src/canonical/models/front-shiny/816--0--Sobble.gif similarity index 100% rename from src/canonical/models/front-shiny/Sobble.gif rename to src/canonical/models/front-shiny/816--0--Sobble.gif diff --git a/src/canonical/models/front-shiny/Drizzile.gif b/src/canonical/models/front-shiny/817--0--Drizzile.gif similarity index 100% rename from src/canonical/models/front-shiny/Drizzile.gif rename to src/canonical/models/front-shiny/817--0--Drizzile.gif diff --git a/src/canonical/models/front-shiny/Inteleon.gif b/src/canonical/models/front-shiny/818--0--Inteleon.gif similarity index 100% rename from src/canonical/models/front-shiny/Inteleon.gif rename to src/canonical/models/front-shiny/818--0--Inteleon.gif diff --git a/src/canonical/models/front-shiny/Skwovet.gif b/src/canonical/models/front-shiny/819--0--Skwovet.gif similarity index 100% rename from src/canonical/models/front-shiny/Skwovet.gif rename to src/canonical/models/front-shiny/819--0--Skwovet.gif diff --git a/src/canonical/models/front-shiny/Magneton.gif b/src/canonical/models/front-shiny/82--0--Magneton.gif similarity index 100% rename from src/canonical/models/front-shiny/Magneton.gif rename to src/canonical/models/front-shiny/82--0--Magneton.gif diff --git a/src/canonical/models/front-shiny/Greedent.gif b/src/canonical/models/front-shiny/820--0--Greedent.gif similarity index 100% rename from src/canonical/models/front-shiny/Greedent.gif rename to src/canonical/models/front-shiny/820--0--Greedent.gif diff --git a/src/canonical/models/front-shiny/Rookidee.gif b/src/canonical/models/front-shiny/821--0--Rookidee.gif similarity index 100% rename from src/canonical/models/front-shiny/Rookidee.gif rename to src/canonical/models/front-shiny/821--0--Rookidee.gif diff --git a/src/canonical/models/front-shiny/Corvisquire.gif b/src/canonical/models/front-shiny/822--0--Corvisquire.gif similarity index 100% rename from src/canonical/models/front-shiny/Corvisquire.gif rename to src/canonical/models/front-shiny/822--0--Corvisquire.gif diff --git a/src/canonical/models/front-shiny/Corviknight.gif b/src/canonical/models/front-shiny/823--0--Corviknight.gif similarity index 100% rename from src/canonical/models/front-shiny/Corviknight.gif rename to src/canonical/models/front-shiny/823--0--Corviknight.gif diff --git a/src/canonical/models/front-shiny/Corviknight--Gmax.gif b/src/canonical/models/front-shiny/823--420--Corviknight--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Corviknight--Gmax.gif rename to src/canonical/models/front-shiny/823--420--Corviknight--Gmax.gif diff --git a/src/canonical/models/front-shiny/Blipbug.gif b/src/canonical/models/front-shiny/824--0--Blipbug.gif similarity index 100% rename from src/canonical/models/front-shiny/Blipbug.gif rename to src/canonical/models/front-shiny/824--0--Blipbug.gif diff --git a/src/canonical/models/front-shiny/Dottler.gif b/src/canonical/models/front-shiny/825--0--Dottler.gif similarity index 100% rename from src/canonical/models/front-shiny/Dottler.gif rename to src/canonical/models/front-shiny/825--0--Dottler.gif diff --git a/src/canonical/models/front-shiny/Orbeetle.gif b/src/canonical/models/front-shiny/826--0--Orbeetle.gif similarity index 100% rename from src/canonical/models/front-shiny/Orbeetle.gif rename to src/canonical/models/front-shiny/826--0--Orbeetle.gif diff --git a/src/canonical/models/front-shiny/Orbeetle--Gmax.gif b/src/canonical/models/front-shiny/826--420--Orbeetle--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Orbeetle--Gmax.gif rename to src/canonical/models/front-shiny/826--420--Orbeetle--Gmax.gif diff --git a/src/canonical/models/front-shiny/Nickit.gif b/src/canonical/models/front-shiny/827--0--Nickit.gif similarity index 100% rename from src/canonical/models/front-shiny/Nickit.gif rename to src/canonical/models/front-shiny/827--0--Nickit.gif diff --git a/src/canonical/models/front-shiny/Thievul.gif b/src/canonical/models/front-shiny/828--0--Thievul.gif similarity index 100% rename from src/canonical/models/front-shiny/Thievul.gif rename to src/canonical/models/front-shiny/828--0--Thievul.gif diff --git a/src/canonical/models/front-shiny/Gossifleur.gif b/src/canonical/models/front-shiny/829--0--Gossifleur.gif similarity index 100% rename from src/canonical/models/front-shiny/Gossifleur.gif rename to src/canonical/models/front-shiny/829--0--Gossifleur.gif diff --git a/src/canonical/models/front-shiny/Farfetch__0027d.gif b/src/canonical/models/front-shiny/83--0--Farfetch__0027d.gif similarity index 100% rename from src/canonical/models/front-shiny/Farfetch__0027d.gif rename to src/canonical/models/front-shiny/83--0--Farfetch__0027d.gif diff --git a/src/canonical/models/front-shiny/Farfetch__0027d--Galar.gif b/src/canonical/models/front-shiny/83--420--Farfetch__0027d--Galar.gif similarity index 100% rename from src/canonical/models/front-shiny/Farfetch__0027d--Galar.gif rename to src/canonical/models/front-shiny/83--420--Farfetch__0027d--Galar.gif diff --git a/src/canonical/models/front-shiny/Eldegoss.gif b/src/canonical/models/front-shiny/830--0--Eldegoss.gif similarity index 100% rename from src/canonical/models/front-shiny/Eldegoss.gif rename to src/canonical/models/front-shiny/830--0--Eldegoss.gif diff --git a/src/canonical/models/front-shiny/Wooloo.gif b/src/canonical/models/front-shiny/831--0--Wooloo.gif similarity index 100% rename from src/canonical/models/front-shiny/Wooloo.gif rename to src/canonical/models/front-shiny/831--0--Wooloo.gif diff --git a/src/canonical/models/front-shiny/Dubwool.gif b/src/canonical/models/front-shiny/832--0--Dubwool.gif similarity index 100% rename from src/canonical/models/front-shiny/Dubwool.gif rename to src/canonical/models/front-shiny/832--0--Dubwool.gif diff --git a/src/canonical/models/front-shiny/Chewtle.gif b/src/canonical/models/front-shiny/833--0--Chewtle.gif similarity index 100% rename from src/canonical/models/front-shiny/Chewtle.gif rename to src/canonical/models/front-shiny/833--0--Chewtle.gif diff --git a/src/canonical/models/front-shiny/Drednaw.gif b/src/canonical/models/front-shiny/834--0--Drednaw.gif similarity index 100% rename from src/canonical/models/front-shiny/Drednaw.gif rename to src/canonical/models/front-shiny/834--0--Drednaw.gif diff --git a/src/canonical/models/front-shiny/Drednaw--Gmax.gif b/src/canonical/models/front-shiny/834--420--Drednaw--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Drednaw--Gmax.gif rename to src/canonical/models/front-shiny/834--420--Drednaw--Gmax.gif diff --git a/src/canonical/models/front-shiny/Yamper.gif b/src/canonical/models/front-shiny/835--0--Yamper.gif similarity index 100% rename from src/canonical/models/front-shiny/Yamper.gif rename to src/canonical/models/front-shiny/835--0--Yamper.gif diff --git a/src/canonical/models/front-shiny/Boltund.gif b/src/canonical/models/front-shiny/836--0--Boltund.gif similarity index 100% rename from src/canonical/models/front-shiny/Boltund.gif rename to src/canonical/models/front-shiny/836--0--Boltund.gif diff --git a/src/canonical/models/front-shiny/Rolycoly.gif b/src/canonical/models/front-shiny/837--0--Rolycoly.gif similarity index 100% rename from src/canonical/models/front-shiny/Rolycoly.gif rename to src/canonical/models/front-shiny/837--0--Rolycoly.gif diff --git a/src/canonical/models/front-shiny/Carkol.gif b/src/canonical/models/front-shiny/838--0--Carkol.gif similarity index 100% rename from src/canonical/models/front-shiny/Carkol.gif rename to src/canonical/models/front-shiny/838--0--Carkol.gif diff --git a/src/canonical/models/front-shiny/Coalossal.gif b/src/canonical/models/front-shiny/839--0--Coalossal.gif similarity index 100% rename from src/canonical/models/front-shiny/Coalossal.gif rename to src/canonical/models/front-shiny/839--0--Coalossal.gif diff --git a/src/canonical/models/front-shiny/Coalossal--Gmax.gif b/src/canonical/models/front-shiny/839--420--Coalossal--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Coalossal--Gmax.gif rename to src/canonical/models/front-shiny/839--420--Coalossal--Gmax.gif diff --git a/src/canonical/models/front-shiny/Doduo.gif b/src/canonical/models/front-shiny/84--0--Doduo.gif similarity index 100% rename from src/canonical/models/front-shiny/Doduo.gif rename to src/canonical/models/front-shiny/84--0--Doduo.gif diff --git a/src/canonical/models/front-shiny/Applin.gif b/src/canonical/models/front-shiny/840--0--Applin.gif similarity index 100% rename from src/canonical/models/front-shiny/Applin.gif rename to src/canonical/models/front-shiny/840--0--Applin.gif diff --git a/src/canonical/models/front-shiny/Flapple.gif b/src/canonical/models/front-shiny/841--0--Flapple.gif similarity index 100% rename from src/canonical/models/front-shiny/Flapple.gif rename to src/canonical/models/front-shiny/841--0--Flapple.gif diff --git a/src/canonical/models/front-shiny/Flapple--Gmax.gif b/src/canonical/models/front-shiny/841--420--Flapple--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Flapple--Gmax.gif rename to src/canonical/models/front-shiny/841--420--Flapple--Gmax.gif diff --git a/src/canonical/models/front-shiny/Appletun.gif b/src/canonical/models/front-shiny/842--0--Appletun.gif similarity index 100% rename from src/canonical/models/front-shiny/Appletun.gif rename to src/canonical/models/front-shiny/842--0--Appletun.gif diff --git a/src/canonical/models/front-shiny/Appletun--Gmax.gif b/src/canonical/models/front-shiny/842--420--Appletun--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Appletun--Gmax.gif rename to src/canonical/models/front-shiny/842--420--Appletun--Gmax.gif diff --git a/src/canonical/models/front-shiny/Silicobra.gif b/src/canonical/models/front-shiny/843--0--Silicobra.gif similarity index 100% rename from src/canonical/models/front-shiny/Silicobra.gif rename to src/canonical/models/front-shiny/843--0--Silicobra.gif diff --git a/src/canonical/models/front-shiny/Sandaconda.gif b/src/canonical/models/front-shiny/844--0--Sandaconda.gif similarity index 100% rename from src/canonical/models/front-shiny/Sandaconda.gif rename to src/canonical/models/front-shiny/844--0--Sandaconda.gif diff --git a/src/canonical/models/front-shiny/Sandaconda--Gmax.gif b/src/canonical/models/front-shiny/844--420--Sandaconda--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Sandaconda--Gmax.gif rename to src/canonical/models/front-shiny/844--420--Sandaconda--Gmax.gif diff --git a/src/canonical/models/front-shiny/Cramorant.gif b/src/canonical/models/front-shiny/845--0--Cramorant.gif similarity index 100% rename from src/canonical/models/front-shiny/Cramorant.gif rename to src/canonical/models/front-shiny/845--0--Cramorant.gif diff --git a/src/canonical/models/front-shiny/Cramorant--Gorging.gif b/src/canonical/models/front-shiny/845--420--Cramorant--Gorging.gif similarity index 100% rename from src/canonical/models/front-shiny/Cramorant--Gorging.gif rename to src/canonical/models/front-shiny/845--420--Cramorant--Gorging.gif diff --git a/src/canonical/models/front-shiny/Cramorant--Gulping.gif b/src/canonical/models/front-shiny/845--420--Cramorant--Gulping.gif similarity index 100% rename from src/canonical/models/front-shiny/Cramorant--Gulping.gif rename to src/canonical/models/front-shiny/845--420--Cramorant--Gulping.gif diff --git a/src/canonical/models/front-shiny/Arrokuda.gif b/src/canonical/models/front-shiny/846--0--Arrokuda.gif similarity index 100% rename from src/canonical/models/front-shiny/Arrokuda.gif rename to src/canonical/models/front-shiny/846--0--Arrokuda.gif diff --git a/src/canonical/models/front-shiny/Barraskewda.gif b/src/canonical/models/front-shiny/847--0--Barraskewda.gif similarity index 100% rename from src/canonical/models/front-shiny/Barraskewda.gif rename to src/canonical/models/front-shiny/847--0--Barraskewda.gif diff --git a/src/canonical/models/front-shiny/Toxel.gif b/src/canonical/models/front-shiny/848--0--Toxel.gif similarity index 100% rename from src/canonical/models/front-shiny/Toxel.gif rename to src/canonical/models/front-shiny/848--0--Toxel.gif diff --git a/src/canonical/models/front-shiny/Toxtricity.gif b/src/canonical/models/front-shiny/849--0--Toxtricity.gif similarity index 100% rename from src/canonical/models/front-shiny/Toxtricity.gif rename to src/canonical/models/front-shiny/849--0--Toxtricity.gif diff --git a/src/canonical/models/front-shiny/Toxtricity--Gmax.gif b/src/canonical/models/front-shiny/849--420--Toxtricity--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Toxtricity--Gmax.gif rename to src/canonical/models/front-shiny/849--420--Toxtricity--Gmax.gif diff --git a/src/canonical/models/front-shiny/Toxtricity--Low-Key.gif b/src/canonical/models/front-shiny/849--420--Toxtricity--Low-Key.gif similarity index 100% rename from src/canonical/models/front-shiny/Toxtricity--Low-Key.gif rename to src/canonical/models/front-shiny/849--420--Toxtricity--Low-Key.gif diff --git a/src/canonical/models/front-shiny/Dodrio.gif b/src/canonical/models/front-shiny/85--0--Dodrio.gif similarity index 100% rename from src/canonical/models/front-shiny/Dodrio.gif rename to src/canonical/models/front-shiny/85--0--Dodrio.gif diff --git a/src/canonical/models/front-shiny/Sizzlipede.gif b/src/canonical/models/front-shiny/850--0--Sizzlipede.gif similarity index 100% rename from src/canonical/models/front-shiny/Sizzlipede.gif rename to src/canonical/models/front-shiny/850--0--Sizzlipede.gif diff --git a/src/canonical/models/front-shiny/Centiskorch.gif b/src/canonical/models/front-shiny/851--0--Centiskorch.gif similarity index 100% rename from src/canonical/models/front-shiny/Centiskorch.gif rename to src/canonical/models/front-shiny/851--0--Centiskorch.gif diff --git a/src/canonical/models/front-shiny/Centiskorch--Gmax.gif b/src/canonical/models/front-shiny/851--420--Centiskorch--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Centiskorch--Gmax.gif rename to src/canonical/models/front-shiny/851--420--Centiskorch--Gmax.gif diff --git a/src/canonical/models/front-shiny/Clobbopus.gif b/src/canonical/models/front-shiny/852--0--Clobbopus.gif similarity index 100% rename from src/canonical/models/front-shiny/Clobbopus.gif rename to src/canonical/models/front-shiny/852--0--Clobbopus.gif diff --git a/src/canonical/models/front-shiny/Grapploct.gif b/src/canonical/models/front-shiny/853--0--Grapploct.gif similarity index 100% rename from src/canonical/models/front-shiny/Grapploct.gif rename to src/canonical/models/front-shiny/853--0--Grapploct.gif diff --git a/src/canonical/models/front-shiny/Sinistea--Antique.gif b/src/canonical/models/front-shiny/854--0--Sinistea.gif similarity index 100% rename from src/canonical/models/front-shiny/Sinistea--Antique.gif rename to src/canonical/models/front-shiny/854--0--Sinistea.gif diff --git a/src/canonical/models/front-shiny/Sinistea.gif b/src/canonical/models/front-shiny/854--420--Sinistea--Antique.gif similarity index 100% rename from src/canonical/models/front-shiny/Sinistea.gif rename to src/canonical/models/front-shiny/854--420--Sinistea--Antique.gif diff --git a/src/canonical/models/front-shiny/Polteageist--Antique.gif b/src/canonical/models/front-shiny/855--0--Polteageist.gif similarity index 100% rename from src/canonical/models/front-shiny/Polteageist--Antique.gif rename to src/canonical/models/front-shiny/855--0--Polteageist.gif diff --git a/src/canonical/models/front-shiny/Polteageist.gif b/src/canonical/models/front-shiny/855--420--Polteageist--Antique.gif similarity index 100% rename from src/canonical/models/front-shiny/Polteageist.gif rename to src/canonical/models/front-shiny/855--420--Polteageist--Antique.gif diff --git a/src/canonical/models/front-shiny/Hatenna.gif b/src/canonical/models/front-shiny/856--0--Hatenna.gif similarity index 100% rename from src/canonical/models/front-shiny/Hatenna.gif rename to src/canonical/models/front-shiny/856--0--Hatenna.gif diff --git a/src/canonical/models/front-shiny/Hattrem.gif b/src/canonical/models/front-shiny/857--0--Hattrem.gif similarity index 100% rename from src/canonical/models/front-shiny/Hattrem.gif rename to src/canonical/models/front-shiny/857--0--Hattrem.gif diff --git a/src/canonical/models/front-shiny/Hatterene.gif b/src/canonical/models/front-shiny/858--0--Hatterene.gif similarity index 100% rename from src/canonical/models/front-shiny/Hatterene.gif rename to src/canonical/models/front-shiny/858--0--Hatterene.gif diff --git a/src/canonical/models/front-shiny/Hatterene--Gmax.gif b/src/canonical/models/front-shiny/858--420--Hatterene--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Hatterene--Gmax.gif rename to src/canonical/models/front-shiny/858--420--Hatterene--Gmax.gif diff --git a/src/canonical/models/front-shiny/Impidimp.gif b/src/canonical/models/front-shiny/859--0--Impidimp.gif similarity index 100% rename from src/canonical/models/front-shiny/Impidimp.gif rename to src/canonical/models/front-shiny/859--0--Impidimp.gif diff --git a/src/canonical/models/front-shiny/Seel.gif b/src/canonical/models/front-shiny/86--0--Seel.gif similarity index 100% rename from src/canonical/models/front-shiny/Seel.gif rename to src/canonical/models/front-shiny/86--0--Seel.gif diff --git a/src/canonical/models/front-shiny/Morgrem.gif b/src/canonical/models/front-shiny/860--0--Morgrem.gif similarity index 100% rename from src/canonical/models/front-shiny/Morgrem.gif rename to src/canonical/models/front-shiny/860--0--Morgrem.gif diff --git a/src/canonical/models/front-shiny/Grimmsnarl.gif b/src/canonical/models/front-shiny/861--0--Grimmsnarl.gif similarity index 100% rename from src/canonical/models/front-shiny/Grimmsnarl.gif rename to src/canonical/models/front-shiny/861--0--Grimmsnarl.gif diff --git a/src/canonical/models/front-shiny/Grimmsnarl--Gmax.gif b/src/canonical/models/front-shiny/861--420--Grimmsnarl--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Grimmsnarl--Gmax.gif rename to src/canonical/models/front-shiny/861--420--Grimmsnarl--Gmax.gif diff --git a/src/canonical/models/front-shiny/Obstagoon.gif b/src/canonical/models/front-shiny/862--0--Obstagoon.gif similarity index 100% rename from src/canonical/models/front-shiny/Obstagoon.gif rename to src/canonical/models/front-shiny/862--0--Obstagoon.gif diff --git a/src/canonical/models/front-shiny/Perrserker.gif b/src/canonical/models/front-shiny/863--0--Perrserker.gif similarity index 100% rename from src/canonical/models/front-shiny/Perrserker.gif rename to src/canonical/models/front-shiny/863--0--Perrserker.gif diff --git a/src/canonical/models/front-shiny/Cursola.gif b/src/canonical/models/front-shiny/864--0--Cursola.gif similarity index 100% rename from src/canonical/models/front-shiny/Cursola.gif rename to src/canonical/models/front-shiny/864--0--Cursola.gif diff --git a/src/canonical/models/front-shiny/Sirfetch__0027d.gif b/src/canonical/models/front-shiny/865--0--Sirfetch__0027d.gif similarity index 100% rename from src/canonical/models/front-shiny/Sirfetch__0027d.gif rename to src/canonical/models/front-shiny/865--0--Sirfetch__0027d.gif diff --git a/src/canonical/models/front-shiny/Mr._Rime.gif b/src/canonical/models/front-shiny/866--0--Mr._Rime.gif similarity index 100% rename from src/canonical/models/front-shiny/Mr._Rime.gif rename to src/canonical/models/front-shiny/866--0--Mr._Rime.gif diff --git a/src/canonical/models/front-shiny/Runerigus.gif b/src/canonical/models/front-shiny/867--0--Runerigus.gif similarity index 100% rename from src/canonical/models/front-shiny/Runerigus.gif rename to src/canonical/models/front-shiny/867--0--Runerigus.gif diff --git a/src/canonical/models/front-shiny/Milcery.gif b/src/canonical/models/front-shiny/868--0--Milcery.gif similarity index 100% rename from src/canonical/models/front-shiny/Milcery.gif rename to src/canonical/models/front-shiny/868--0--Milcery.gif diff --git a/src/canonical/models/front-shiny/Alcremie.gif b/src/canonical/models/front-shiny/869--0--Alcremie.gif similarity index 100% rename from src/canonical/models/front-shiny/Alcremie.gif rename to src/canonical/models/front-shiny/869--0--Alcremie.gif diff --git a/src/canonical/models/front-shiny/Alcremie--Gmax.gif b/src/canonical/models/front-shiny/869--420--Alcremie--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Alcremie--Gmax.gif rename to src/canonical/models/front-shiny/869--420--Alcremie--Gmax.gif diff --git a/src/canonical/models/front-shiny/Dewgong.gif b/src/canonical/models/front-shiny/87--0--Dewgong.gif similarity index 100% rename from src/canonical/models/front-shiny/Dewgong.gif rename to src/canonical/models/front-shiny/87--0--Dewgong.gif diff --git a/src/canonical/models/front-shiny/Falinks.gif b/src/canonical/models/front-shiny/870--0--Falinks.gif similarity index 100% rename from src/canonical/models/front-shiny/Falinks.gif rename to src/canonical/models/front-shiny/870--0--Falinks.gif diff --git a/src/canonical/models/front-shiny/Pincurchin.gif b/src/canonical/models/front-shiny/871--0--Pincurchin.gif similarity index 100% rename from src/canonical/models/front-shiny/Pincurchin.gif rename to src/canonical/models/front-shiny/871--0--Pincurchin.gif diff --git a/src/canonical/models/front-shiny/Snom.gif b/src/canonical/models/front-shiny/872--0--Snom.gif similarity index 100% rename from src/canonical/models/front-shiny/Snom.gif rename to src/canonical/models/front-shiny/872--0--Snom.gif diff --git a/src/canonical/models/front-shiny/Frosmoth.gif b/src/canonical/models/front-shiny/873--0--Frosmoth.gif similarity index 100% rename from src/canonical/models/front-shiny/Frosmoth.gif rename to src/canonical/models/front-shiny/873--0--Frosmoth.gif diff --git a/src/canonical/models/front-shiny/Stonjourner.gif b/src/canonical/models/front-shiny/874--0--Stonjourner.gif similarity index 100% rename from src/canonical/models/front-shiny/Stonjourner.gif rename to src/canonical/models/front-shiny/874--0--Stonjourner.gif diff --git a/src/canonical/models/front-shiny/Eiscue.gif b/src/canonical/models/front-shiny/875--0--Eiscue.gif similarity index 100% rename from src/canonical/models/front-shiny/Eiscue.gif rename to src/canonical/models/front-shiny/875--0--Eiscue.gif diff --git a/src/canonical/models/front-shiny/Eiscue--Noice.gif b/src/canonical/models/front-shiny/875--420--Eiscue--Noice.gif similarity index 100% rename from src/canonical/models/front-shiny/Eiscue--Noice.gif rename to src/canonical/models/front-shiny/875--420--Eiscue--Noice.gif diff --git a/src/canonical/models/front-shiny/Indeedee.gif b/src/canonical/models/front-shiny/876--0--Indeedee.gif similarity index 100% rename from src/canonical/models/front-shiny/Indeedee.gif rename to src/canonical/models/front-shiny/876--0--Indeedee.gif diff --git a/src/canonical/models/front-shiny/Indeedee--F.gif b/src/canonical/models/front-shiny/876--420--Indeedee--F.gif similarity index 100% rename from src/canonical/models/front-shiny/Indeedee--F.gif rename to src/canonical/models/front-shiny/876--420--Indeedee--F.gif diff --git a/src/canonical/models/front-shiny/Morpeko.gif b/src/canonical/models/front-shiny/877--0--Morpeko.gif similarity index 100% rename from src/canonical/models/front-shiny/Morpeko.gif rename to src/canonical/models/front-shiny/877--0--Morpeko.gif diff --git a/src/canonical/models/front-shiny/Morpeko--Hangry.gif b/src/canonical/models/front-shiny/877--420--Morpeko--Hangry.gif similarity index 100% rename from src/canonical/models/front-shiny/Morpeko--Hangry.gif rename to src/canonical/models/front-shiny/877--420--Morpeko--Hangry.gif diff --git a/src/canonical/models/front-shiny/Cufant.gif b/src/canonical/models/front-shiny/878--0--Cufant.gif similarity index 100% rename from src/canonical/models/front-shiny/Cufant.gif rename to src/canonical/models/front-shiny/878--0--Cufant.gif diff --git a/src/canonical/models/front-shiny/Copperajah.gif b/src/canonical/models/front-shiny/879--0--Copperajah.gif similarity index 100% rename from src/canonical/models/front-shiny/Copperajah.gif rename to src/canonical/models/front-shiny/879--0--Copperajah.gif diff --git a/src/canonical/models/front-shiny/Copperajah--Gmax.gif b/src/canonical/models/front-shiny/879--420--Copperajah--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Copperajah--Gmax.gif rename to src/canonical/models/front-shiny/879--420--Copperajah--Gmax.gif diff --git a/src/canonical/models/front-shiny/Grimer.gif b/src/canonical/models/front-shiny/88--0--Grimer.gif similarity index 100% rename from src/canonical/models/front-shiny/Grimer.gif rename to src/canonical/models/front-shiny/88--0--Grimer.gif diff --git a/src/canonical/models/front-shiny/Grimer--Alola.gif b/src/canonical/models/front-shiny/88--420--Grimer--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Grimer--Alola.gif rename to src/canonical/models/front-shiny/88--420--Grimer--Alola.gif diff --git a/src/canonical/models/front-shiny/Dracozolt.gif b/src/canonical/models/front-shiny/880--0--Dracozolt.gif similarity index 100% rename from src/canonical/models/front-shiny/Dracozolt.gif rename to src/canonical/models/front-shiny/880--0--Dracozolt.gif diff --git a/src/canonical/models/front-shiny/Arctozolt.gif b/src/canonical/models/front-shiny/881--0--Arctozolt.gif similarity index 100% rename from src/canonical/models/front-shiny/Arctozolt.gif rename to src/canonical/models/front-shiny/881--0--Arctozolt.gif diff --git a/src/canonical/models/front-shiny/Dracovish.gif b/src/canonical/models/front-shiny/882--0--Dracovish.gif similarity index 100% rename from src/canonical/models/front-shiny/Dracovish.gif rename to src/canonical/models/front-shiny/882--0--Dracovish.gif diff --git a/src/canonical/models/front-shiny/Arctovish.gif b/src/canonical/models/front-shiny/883--0--Arctovish.gif similarity index 100% rename from src/canonical/models/front-shiny/Arctovish.gif rename to src/canonical/models/front-shiny/883--0--Arctovish.gif diff --git a/src/canonical/models/front-shiny/Duraludon.gif b/src/canonical/models/front-shiny/884--0--Duraludon.gif similarity index 100% rename from src/canonical/models/front-shiny/Duraludon.gif rename to src/canonical/models/front-shiny/884--0--Duraludon.gif diff --git a/src/canonical/models/front-shiny/Duraludon--Gmax.gif b/src/canonical/models/front-shiny/884--420--Duraludon--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Duraludon--Gmax.gif rename to src/canonical/models/front-shiny/884--420--Duraludon--Gmax.gif diff --git a/src/canonical/models/front-shiny/Dreepy.gif b/src/canonical/models/front-shiny/885--0--Dreepy.gif similarity index 100% rename from src/canonical/models/front-shiny/Dreepy.gif rename to src/canonical/models/front-shiny/885--0--Dreepy.gif diff --git a/src/canonical/models/front-shiny/Drakloak.gif b/src/canonical/models/front-shiny/886--0--Drakloak.gif similarity index 100% rename from src/canonical/models/front-shiny/Drakloak.gif rename to src/canonical/models/front-shiny/886--0--Drakloak.gif diff --git a/src/canonical/models/front-shiny/Dragapult.gif b/src/canonical/models/front-shiny/887--0--Dragapult.gif similarity index 100% rename from src/canonical/models/front-shiny/Dragapult.gif rename to src/canonical/models/front-shiny/887--0--Dragapult.gif diff --git a/src/canonical/models/front-shiny/Zacian.gif b/src/canonical/models/front-shiny/888--0--Zacian.gif similarity index 100% rename from src/canonical/models/front-shiny/Zacian.gif rename to src/canonical/models/front-shiny/888--0--Zacian.gif diff --git a/src/canonical/models/front-shiny/Zacian--Crowned.gif b/src/canonical/models/front-shiny/888--420--Zacian--Crowned.gif similarity index 100% rename from src/canonical/models/front-shiny/Zacian--Crowned.gif rename to src/canonical/models/front-shiny/888--420--Zacian--Crowned.gif diff --git a/src/canonical/models/front-shiny/Zamazenta.gif b/src/canonical/models/front-shiny/889--0--Zamazenta.gif similarity index 100% rename from src/canonical/models/front-shiny/Zamazenta.gif rename to src/canonical/models/front-shiny/889--0--Zamazenta.gif diff --git a/src/canonical/models/front-shiny/Zamazenta--Crowned.gif b/src/canonical/models/front-shiny/889--420--Zamazenta--Crowned.gif similarity index 100% rename from src/canonical/models/front-shiny/Zamazenta--Crowned.gif rename to src/canonical/models/front-shiny/889--420--Zamazenta--Crowned.gif diff --git a/src/canonical/models/front-shiny/Muk.gif b/src/canonical/models/front-shiny/89--0--Muk.gif similarity index 100% rename from src/canonical/models/front-shiny/Muk.gif rename to src/canonical/models/front-shiny/89--0--Muk.gif diff --git a/src/canonical/models/front-shiny/Muk--Alola.gif b/src/canonical/models/front-shiny/89--420--Muk--Alola.gif similarity index 100% rename from src/canonical/models/front-shiny/Muk--Alola.gif rename to src/canonical/models/front-shiny/89--420--Muk--Alola.gif diff --git a/src/canonical/models/front-shiny/Eternatus.gif b/src/canonical/models/front-shiny/890--0--Eternatus.gif similarity index 100% rename from src/canonical/models/front-shiny/Eternatus.gif rename to src/canonical/models/front-shiny/890--0--Eternatus.gif diff --git a/src/canonical/models/front-shiny/Eternatus--Eternamax.gif b/src/canonical/models/front-shiny/890--420--Eternatus--Eternamax.gif similarity index 100% rename from src/canonical/models/front-shiny/Eternatus--Eternamax.gif rename to src/canonical/models/front-shiny/890--420--Eternatus--Eternamax.gif diff --git a/src/canonical/models/front-shiny/Blastoise.gif b/src/canonical/models/front-shiny/9--0--Blastoise.gif similarity index 100% rename from src/canonical/models/front-shiny/Blastoise.gif rename to src/canonical/models/front-shiny/9--0--Blastoise.gif diff --git a/src/canonical/models/front-shiny/Blastoise--Mega.gif b/src/canonical/models/front-shiny/9--420--Blastoise--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Blastoise--Mega.gif rename to src/canonical/models/front-shiny/9--420--Blastoise--Mega.gif diff --git a/src/canonical/models/front-shiny/Shellder.gif b/src/canonical/models/front-shiny/90--0--Shellder.gif similarity index 100% rename from src/canonical/models/front-shiny/Shellder.gif rename to src/canonical/models/front-shiny/90--0--Shellder.gif diff --git a/src/canonical/models/front-shiny/Cloyster.gif b/src/canonical/models/front-shiny/91--0--Cloyster.gif similarity index 100% rename from src/canonical/models/front-shiny/Cloyster.gif rename to src/canonical/models/front-shiny/91--0--Cloyster.gif diff --git a/src/canonical/models/front-shiny/Gastly.gif b/src/canonical/models/front-shiny/92--0--Gastly.gif similarity index 100% rename from src/canonical/models/front-shiny/Gastly.gif rename to src/canonical/models/front-shiny/92--0--Gastly.gif diff --git a/src/canonical/models/front-shiny/Haunter.gif b/src/canonical/models/front-shiny/93--0--Haunter.gif similarity index 100% rename from src/canonical/models/front-shiny/Haunter.gif rename to src/canonical/models/front-shiny/93--0--Haunter.gif diff --git a/src/canonical/models/front-shiny/Gengar.gif b/src/canonical/models/front-shiny/94--0--Gengar.gif similarity index 100% rename from src/canonical/models/front-shiny/Gengar.gif rename to src/canonical/models/front-shiny/94--0--Gengar.gif diff --git a/src/canonical/models/front-shiny/Gengar--Gmax.gif b/src/canonical/models/front-shiny/94--420--Gengar--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Gengar--Gmax.gif rename to src/canonical/models/front-shiny/94--420--Gengar--Gmax.gif diff --git a/src/canonical/models/front-shiny/Gengar--Mega.gif b/src/canonical/models/front-shiny/94--420--Gengar--Mega.gif similarity index 100% rename from src/canonical/models/front-shiny/Gengar--Mega.gif rename to src/canonical/models/front-shiny/94--420--Gengar--Mega.gif diff --git a/src/canonical/models/front-shiny/Onix.gif b/src/canonical/models/front-shiny/95--0--Onix.gif similarity index 100% rename from src/canonical/models/front-shiny/Onix.gif rename to src/canonical/models/front-shiny/95--0--Onix.gif diff --git a/src/canonical/models/front-shiny/Drowzee.gif b/src/canonical/models/front-shiny/96--0--Drowzee.gif similarity index 100% rename from src/canonical/models/front-shiny/Drowzee.gif rename to src/canonical/models/front-shiny/96--0--Drowzee.gif diff --git a/src/canonical/models/front-shiny/Hypno.gif b/src/canonical/models/front-shiny/97--0--Hypno.gif similarity index 100% rename from src/canonical/models/front-shiny/Hypno.gif rename to src/canonical/models/front-shiny/97--0--Hypno.gif diff --git a/src/canonical/models/front-shiny/Krabby.gif b/src/canonical/models/front-shiny/98--0--Krabby.gif similarity index 100% rename from src/canonical/models/front-shiny/Krabby.gif rename to src/canonical/models/front-shiny/98--0--Krabby.gif diff --git a/src/canonical/models/front-shiny/Kingler.gif b/src/canonical/models/front-shiny/99--0--Kingler.gif similarity index 100% rename from src/canonical/models/front-shiny/Kingler.gif rename to src/canonical/models/front-shiny/99--0--Kingler.gif diff --git a/src/canonical/models/front-shiny/Kingler--Gmax.gif b/src/canonical/models/front-shiny/99--420--Kingler--Gmax.gif similarity index 100% rename from src/canonical/models/front-shiny/Kingler--Gmax.gif rename to src/canonical/models/front-shiny/99--420--Kingler--Gmax.gif diff --git a/src/canonical/models/front-shiny/Pikachu--Alola.gif b/src/canonical/models/front-shiny/Pikachu--Alola.gif deleted file mode 120000 index 1240539e..00000000 --- a/src/canonical/models/front-shiny/Pikachu--Alola.gif +++ /dev/null @@ -1 +0,0 @@ -../front/Pikachu--Alola.gif \ No newline at end of file diff --git a/src/canonical/models/front-shiny/Pikachu--Hoenn.gif b/src/canonical/models/front-shiny/Pikachu--Hoenn.gif deleted file mode 120000 index 77753ba2..00000000 --- a/src/canonical/models/front-shiny/Pikachu--Hoenn.gif +++ /dev/null @@ -1 +0,0 @@ -../front/Pikachu--Hoenn.gif \ No newline at end of file diff --git a/src/canonical/models/front-shiny/Pikachu--Kalos.gif b/src/canonical/models/front-shiny/Pikachu--Kalos.gif deleted file mode 120000 index 1a4a5f6b..00000000 --- a/src/canonical/models/front-shiny/Pikachu--Kalos.gif +++ /dev/null @@ -1 +0,0 @@ -../front/Pikachu--Kalos.gif \ No newline at end of file diff --git a/src/canonical/models/front-shiny/Pikachu--Sinnoh.gif b/src/canonical/models/front-shiny/Pikachu--Sinnoh.gif deleted file mode 120000 index 151d65c9..00000000 --- a/src/canonical/models/front-shiny/Pikachu--Sinnoh.gif +++ /dev/null @@ -1 +0,0 @@ -../front/Pikachu--Sinnoh.gif \ No newline at end of file diff --git a/src/canonical/models/front-shiny/Pikachu--Unova.gif b/src/canonical/models/front-shiny/Pikachu--Unova.gif deleted file mode 120000 index 6086ae31..00000000 --- a/src/canonical/models/front-shiny/Pikachu--Unova.gif +++ /dev/null @@ -1 +0,0 @@ -../front/Pikachu--Unova.gif \ No newline at end of file diff --git a/src/canonical/models/front-shiny/Unown.gif b/src/canonical/models/front-shiny/Unown.gif deleted file mode 120000 index 648b4329..00000000 --- a/src/canonical/models/front-shiny/Unown.gif +++ /dev/null @@ -1 +0,0 @@ -../front-shiny-cosmetic/Unown--A.gif \ No newline at end of file diff --git a/src/canonical/models/front/Bulbasaur.gif b/src/canonical/models/front/1--0--Bulbasaur.gif similarity index 100% rename from src/canonical/models/front/Bulbasaur.gif rename to src/canonical/models/front/1--0--Bulbasaur.gif diff --git a/src/canonical/models/front/Caterpie.gif b/src/canonical/models/front/10--0--Caterpie.gif similarity index 100% rename from src/canonical/models/front/Caterpie.gif rename to src/canonical/models/front/10--0--Caterpie.gif diff --git a/src/canonical/models/front/Voltorb.gif b/src/canonical/models/front/100--0--Voltorb.gif similarity index 100% rename from src/canonical/models/front/Voltorb.gif rename to src/canonical/models/front/100--0--Voltorb.gif diff --git a/src/canonical/models/front/Electrode.gif b/src/canonical/models/front/101--0--Electrode.gif similarity index 100% rename from src/canonical/models/front/Electrode.gif rename to src/canonical/models/front/101--0--Electrode.gif diff --git a/src/canonical/models/front/Exeggcute.gif b/src/canonical/models/front/102--0--Exeggcute.gif similarity index 100% rename from src/canonical/models/front/Exeggcute.gif rename to src/canonical/models/front/102--0--Exeggcute.gif diff --git a/src/canonical/models/front/Exeggutor.gif b/src/canonical/models/front/103--0--Exeggutor.gif similarity index 100% rename from src/canonical/models/front/Exeggutor.gif rename to src/canonical/models/front/103--0--Exeggutor.gif diff --git a/src/canonical/models/front/Exeggutor--Alola.gif b/src/canonical/models/front/103--420--Exeggutor--Alola.gif similarity index 100% rename from src/canonical/models/front/Exeggutor--Alola.gif rename to src/canonical/models/front/103--420--Exeggutor--Alola.gif diff --git a/src/canonical/models/front/Cubone.gif b/src/canonical/models/front/104--0--Cubone.gif similarity index 100% rename from src/canonical/models/front/Cubone.gif rename to src/canonical/models/front/104--0--Cubone.gif diff --git a/src/canonical/models/front/Marowak.gif b/src/canonical/models/front/105--0--Marowak.gif similarity index 100% rename from src/canonical/models/front/Marowak.gif rename to src/canonical/models/front/105--0--Marowak.gif diff --git a/src/canonical/models/front/Marowak--Alola-Totem.gif b/src/canonical/models/front/105--420--Marowak--Alola-Totem.gif similarity index 100% rename from src/canonical/models/front/Marowak--Alola-Totem.gif rename to src/canonical/models/front/105--420--Marowak--Alola-Totem.gif diff --git a/src/canonical/models/front/Marowak--Alola.gif b/src/canonical/models/front/105--420--Marowak--Alola.gif similarity index 100% rename from src/canonical/models/front/Marowak--Alola.gif rename to src/canonical/models/front/105--420--Marowak--Alola.gif diff --git a/src/canonical/models/front/Hitmonlee.gif b/src/canonical/models/front/106--0--Hitmonlee.gif similarity index 100% rename from src/canonical/models/front/Hitmonlee.gif rename to src/canonical/models/front/106--0--Hitmonlee.gif diff --git a/src/canonical/models/front/Hitmonchan.gif b/src/canonical/models/front/107--0--Hitmonchan.gif similarity index 100% rename from src/canonical/models/front/Hitmonchan.gif rename to src/canonical/models/front/107--0--Hitmonchan.gif diff --git a/src/canonical/models/front/Lickitung.gif b/src/canonical/models/front/108--0--Lickitung.gif similarity index 100% rename from src/canonical/models/front/Lickitung.gif rename to src/canonical/models/front/108--0--Lickitung.gif diff --git a/src/canonical/models/front/Koffing.gif b/src/canonical/models/front/109--0--Koffing.gif similarity index 100% rename from src/canonical/models/front/Koffing.gif rename to src/canonical/models/front/109--0--Koffing.gif diff --git a/src/canonical/models/front/Metapod.gif b/src/canonical/models/front/11--0--Metapod.gif similarity index 100% rename from src/canonical/models/front/Metapod.gif rename to src/canonical/models/front/11--0--Metapod.gif diff --git a/src/canonical/models/front/Weezing.gif b/src/canonical/models/front/110--0--Weezing.gif similarity index 100% rename from src/canonical/models/front/Weezing.gif rename to src/canonical/models/front/110--0--Weezing.gif diff --git a/src/canonical/models/front/Weezing--Galar.gif b/src/canonical/models/front/110--420--Weezing--Galar.gif similarity index 100% rename from src/canonical/models/front/Weezing--Galar.gif rename to src/canonical/models/front/110--420--Weezing--Galar.gif diff --git a/src/canonical/models/front/Rhyhorn.gif b/src/canonical/models/front/111--0--Rhyhorn.gif similarity index 100% rename from src/canonical/models/front/Rhyhorn.gif rename to src/canonical/models/front/111--0--Rhyhorn.gif diff --git a/src/canonical/models/front/Rhydon.gif b/src/canonical/models/front/112--0--Rhydon.gif similarity index 100% rename from src/canonical/models/front/Rhydon.gif rename to src/canonical/models/front/112--0--Rhydon.gif diff --git a/src/canonical/models/front/Chansey.gif b/src/canonical/models/front/113--0--Chansey.gif similarity index 100% rename from src/canonical/models/front/Chansey.gif rename to src/canonical/models/front/113--0--Chansey.gif diff --git a/src/canonical/models/front/Tangela.gif b/src/canonical/models/front/114--0--Tangela.gif similarity index 100% rename from src/canonical/models/front/Tangela.gif rename to src/canonical/models/front/114--0--Tangela.gif diff --git a/src/canonical/models/front/Kangaskhan.gif b/src/canonical/models/front/115--0--Kangaskhan.gif similarity index 100% rename from src/canonical/models/front/Kangaskhan.gif rename to src/canonical/models/front/115--0--Kangaskhan.gif diff --git a/src/canonical/models/front/Kangaskhan--Mega.gif b/src/canonical/models/front/115--420--Kangaskhan--Mega.gif similarity index 100% rename from src/canonical/models/front/Kangaskhan--Mega.gif rename to src/canonical/models/front/115--420--Kangaskhan--Mega.gif diff --git a/src/canonical/models/front/Horsea.gif b/src/canonical/models/front/116--0--Horsea.gif similarity index 100% rename from src/canonical/models/front/Horsea.gif rename to src/canonical/models/front/116--0--Horsea.gif diff --git a/src/canonical/models/front/Seadra.gif b/src/canonical/models/front/117--0--Seadra.gif similarity index 100% rename from src/canonical/models/front/Seadra.gif rename to src/canonical/models/front/117--0--Seadra.gif diff --git a/src/canonical/models/front/Goldeen.gif b/src/canonical/models/front/118--0--Goldeen.gif similarity index 100% rename from src/canonical/models/front/Goldeen.gif rename to src/canonical/models/front/118--0--Goldeen.gif diff --git a/src/canonical/models/front/Seaking.gif b/src/canonical/models/front/119--0--Seaking.gif similarity index 100% rename from src/canonical/models/front/Seaking.gif rename to src/canonical/models/front/119--0--Seaking.gif diff --git a/src/canonical/models/front/Butterfree.gif b/src/canonical/models/front/12--0--Butterfree.gif similarity index 100% rename from src/canonical/models/front/Butterfree.gif rename to src/canonical/models/front/12--0--Butterfree.gif diff --git a/src/canonical/models/front/Butterfree--Gmax.gif b/src/canonical/models/front/12--420--Butterfree--Gmax.gif similarity index 100% rename from src/canonical/models/front/Butterfree--Gmax.gif rename to src/canonical/models/front/12--420--Butterfree--Gmax.gif diff --git a/src/canonical/models/front/Staryu.gif b/src/canonical/models/front/120--0--Staryu.gif similarity index 100% rename from src/canonical/models/front/Staryu.gif rename to src/canonical/models/front/120--0--Staryu.gif diff --git a/src/canonical/models/front/Starmie.gif b/src/canonical/models/front/121--0--Starmie.gif similarity index 100% rename from src/canonical/models/front/Starmie.gif rename to src/canonical/models/front/121--0--Starmie.gif diff --git a/src/canonical/models/front/Mr._Mime.gif b/src/canonical/models/front/122--0--Mr._Mime.gif similarity index 100% rename from src/canonical/models/front/Mr._Mime.gif rename to src/canonical/models/front/122--0--Mr._Mime.gif diff --git a/src/canonical/models/front/Mr._Mime--Galar.gif b/src/canonical/models/front/122--420--Mr._Mime--Galar.gif similarity index 100% rename from src/canonical/models/front/Mr._Mime--Galar.gif rename to src/canonical/models/front/122--420--Mr._Mime--Galar.gif diff --git a/src/canonical/models/front/Scyther.gif b/src/canonical/models/front/123--0--Scyther.gif similarity index 100% rename from src/canonical/models/front/Scyther.gif rename to src/canonical/models/front/123--0--Scyther.gif diff --git a/src/canonical/models/front/Jynx.gif b/src/canonical/models/front/124--0--Jynx.gif similarity index 100% rename from src/canonical/models/front/Jynx.gif rename to src/canonical/models/front/124--0--Jynx.gif diff --git a/src/canonical/models/front/Electabuzz.gif b/src/canonical/models/front/125--0--Electabuzz.gif similarity index 100% rename from src/canonical/models/front/Electabuzz.gif rename to src/canonical/models/front/125--0--Electabuzz.gif diff --git a/src/canonical/models/front/Magmar.gif b/src/canonical/models/front/126--0--Magmar.gif similarity index 100% rename from src/canonical/models/front/Magmar.gif rename to src/canonical/models/front/126--0--Magmar.gif diff --git a/src/canonical/models/front/Pinsir.gif b/src/canonical/models/front/127--0--Pinsir.gif similarity index 100% rename from src/canonical/models/front/Pinsir.gif rename to src/canonical/models/front/127--0--Pinsir.gif diff --git a/src/canonical/models/front/Pinsir--Mega.gif b/src/canonical/models/front/127--420--Pinsir--Mega.gif similarity index 100% rename from src/canonical/models/front/Pinsir--Mega.gif rename to src/canonical/models/front/127--420--Pinsir--Mega.gif diff --git a/src/canonical/models/front/Tauros.gif b/src/canonical/models/front/128--0--Tauros.gif similarity index 100% rename from src/canonical/models/front/Tauros.gif rename to src/canonical/models/front/128--0--Tauros.gif diff --git a/src/canonical/models/front/Magikarp.gif b/src/canonical/models/front/129--0--Magikarp.gif similarity index 100% rename from src/canonical/models/front/Magikarp.gif rename to src/canonical/models/front/129--0--Magikarp.gif diff --git a/src/canonical/models/front/Weedle.gif b/src/canonical/models/front/13--0--Weedle.gif similarity index 100% rename from src/canonical/models/front/Weedle.gif rename to src/canonical/models/front/13--0--Weedle.gif diff --git a/src/canonical/models/front/Gyarados.gif b/src/canonical/models/front/130--0--Gyarados.gif similarity index 100% rename from src/canonical/models/front/Gyarados.gif rename to src/canonical/models/front/130--0--Gyarados.gif diff --git a/src/canonical/models/front/Gyarados--Mega.gif b/src/canonical/models/front/130--420--Gyarados--Mega.gif similarity index 100% rename from src/canonical/models/front/Gyarados--Mega.gif rename to src/canonical/models/front/130--420--Gyarados--Mega.gif diff --git a/src/canonical/models/front/Lapras.gif b/src/canonical/models/front/131--0--Lapras.gif similarity index 100% rename from src/canonical/models/front/Lapras.gif rename to src/canonical/models/front/131--0--Lapras.gif diff --git a/src/canonical/models/front/Lapras--Gmax.gif b/src/canonical/models/front/131--420--Lapras--Gmax.gif similarity index 100% rename from src/canonical/models/front/Lapras--Gmax.gif rename to src/canonical/models/front/131--420--Lapras--Gmax.gif diff --git a/src/canonical/models/front/Ditto.gif b/src/canonical/models/front/132--0--Ditto.gif similarity index 100% rename from src/canonical/models/front/Ditto.gif rename to src/canonical/models/front/132--0--Ditto.gif diff --git a/src/canonical/models/front/Eevee.gif b/src/canonical/models/front/133--0--Eevee.gif similarity index 100% rename from src/canonical/models/front/Eevee.gif rename to src/canonical/models/front/133--0--Eevee.gif diff --git a/src/canonical/models/front/Eevee--Gmax.gif b/src/canonical/models/front/133--420--Eevee--Gmax.gif similarity index 100% rename from src/canonical/models/front/Eevee--Gmax.gif rename to src/canonical/models/front/133--420--Eevee--Gmax.gif diff --git a/src/canonical/models/front/Eevee--Starter.gif b/src/canonical/models/front/133--420--Eevee--Starter.gif similarity index 100% rename from src/canonical/models/front/Eevee--Starter.gif rename to src/canonical/models/front/133--420--Eevee--Starter.gif diff --git a/src/canonical/models/front/Vaporeon.gif b/src/canonical/models/front/134--0--Vaporeon.gif similarity index 100% rename from src/canonical/models/front/Vaporeon.gif rename to src/canonical/models/front/134--0--Vaporeon.gif diff --git a/src/canonical/models/front/Jolteon.gif b/src/canonical/models/front/135--0--Jolteon.gif similarity index 100% rename from src/canonical/models/front/Jolteon.gif rename to src/canonical/models/front/135--0--Jolteon.gif diff --git a/src/canonical/models/front/Flareon.gif b/src/canonical/models/front/136--0--Flareon.gif similarity index 100% rename from src/canonical/models/front/Flareon.gif rename to src/canonical/models/front/136--0--Flareon.gif diff --git a/src/canonical/models/front/Porygon.gif b/src/canonical/models/front/137--0--Porygon.gif similarity index 100% rename from src/canonical/models/front/Porygon.gif rename to src/canonical/models/front/137--0--Porygon.gif diff --git a/src/canonical/models/front/Omanyte.gif b/src/canonical/models/front/138--0--Omanyte.gif similarity index 100% rename from src/canonical/models/front/Omanyte.gif rename to src/canonical/models/front/138--0--Omanyte.gif diff --git a/src/canonical/models/front/Omastar.gif b/src/canonical/models/front/139--0--Omastar.gif similarity index 100% rename from src/canonical/models/front/Omastar.gif rename to src/canonical/models/front/139--0--Omastar.gif diff --git a/src/canonical/models/front/Kakuna.gif b/src/canonical/models/front/14--0--Kakuna.gif similarity index 100% rename from src/canonical/models/front/Kakuna.gif rename to src/canonical/models/front/14--0--Kakuna.gif diff --git a/src/canonical/models/front/Kabuto.gif b/src/canonical/models/front/140--0--Kabuto.gif similarity index 100% rename from src/canonical/models/front/Kabuto.gif rename to src/canonical/models/front/140--0--Kabuto.gif diff --git a/src/canonical/models/front/Kabutops.gif b/src/canonical/models/front/141--0--Kabutops.gif similarity index 100% rename from src/canonical/models/front/Kabutops.gif rename to src/canonical/models/front/141--0--Kabutops.gif diff --git a/src/canonical/models/front/Aerodactyl.gif b/src/canonical/models/front/142--0--Aerodactyl.gif similarity index 100% rename from src/canonical/models/front/Aerodactyl.gif rename to src/canonical/models/front/142--0--Aerodactyl.gif diff --git a/src/canonical/models/front/Aerodactyl--Mega.gif b/src/canonical/models/front/142--420--Aerodactyl--Mega.gif similarity index 100% rename from src/canonical/models/front/Aerodactyl--Mega.gif rename to src/canonical/models/front/142--420--Aerodactyl--Mega.gif diff --git a/src/canonical/models/front/Snorlax.gif b/src/canonical/models/front/143--0--Snorlax.gif similarity index 100% rename from src/canonical/models/front/Snorlax.gif rename to src/canonical/models/front/143--0--Snorlax.gif diff --git a/src/canonical/models/front/Snorlax--Gmax.gif b/src/canonical/models/front/143--420--Snorlax--Gmax.gif similarity index 100% rename from src/canonical/models/front/Snorlax--Gmax.gif rename to src/canonical/models/front/143--420--Snorlax--Gmax.gif diff --git a/src/canonical/models/front/Articuno.gif b/src/canonical/models/front/144--0--Articuno.gif similarity index 100% rename from src/canonical/models/front/Articuno.gif rename to src/canonical/models/front/144--0--Articuno.gif diff --git a/src/canonical/models/front/Zapdos.gif b/src/canonical/models/front/145--0--Zapdos.gif similarity index 100% rename from src/canonical/models/front/Zapdos.gif rename to src/canonical/models/front/145--0--Zapdos.gif diff --git a/src/canonical/models/front/Moltres.gif b/src/canonical/models/front/146--0--Moltres.gif similarity index 100% rename from src/canonical/models/front/Moltres.gif rename to src/canonical/models/front/146--0--Moltres.gif diff --git a/src/canonical/models/front/Dratini.gif b/src/canonical/models/front/147--0--Dratini.gif similarity index 100% rename from src/canonical/models/front/Dratini.gif rename to src/canonical/models/front/147--0--Dratini.gif diff --git a/src/canonical/models/front/Dragonair.gif b/src/canonical/models/front/148--0--Dragonair.gif similarity index 100% rename from src/canonical/models/front/Dragonair.gif rename to src/canonical/models/front/148--0--Dragonair.gif diff --git a/src/canonical/models/front/Dragonite.gif b/src/canonical/models/front/149--0--Dragonite.gif similarity index 100% rename from src/canonical/models/front/Dragonite.gif rename to src/canonical/models/front/149--0--Dragonite.gif diff --git a/src/canonical/models/front/Beedrill.gif b/src/canonical/models/front/15--0--Beedrill.gif similarity index 100% rename from src/canonical/models/front/Beedrill.gif rename to src/canonical/models/front/15--0--Beedrill.gif diff --git a/src/canonical/models/front/Beedrill--Mega.gif b/src/canonical/models/front/15--420--Beedrill--Mega.gif similarity index 100% rename from src/canonical/models/front/Beedrill--Mega.gif rename to src/canonical/models/front/15--420--Beedrill--Mega.gif diff --git a/src/canonical/models/front/Mewtwo.gif b/src/canonical/models/front/150--0--Mewtwo.gif similarity index 100% rename from src/canonical/models/front/Mewtwo.gif rename to src/canonical/models/front/150--0--Mewtwo.gif diff --git a/src/canonical/models/front/Mewtwo--Mega-X.gif b/src/canonical/models/front/150--420--Mewtwo--Mega-X.gif similarity index 100% rename from src/canonical/models/front/Mewtwo--Mega-X.gif rename to src/canonical/models/front/150--420--Mewtwo--Mega-X.gif diff --git a/src/canonical/models/front/Mewtwo--Mega-Y.gif b/src/canonical/models/front/150--420--Mewtwo--Mega-Y.gif similarity index 100% rename from src/canonical/models/front/Mewtwo--Mega-Y.gif rename to src/canonical/models/front/150--420--Mewtwo--Mega-Y.gif diff --git a/src/canonical/models/front/Mew.gif b/src/canonical/models/front/151--0--Mew.gif similarity index 100% rename from src/canonical/models/front/Mew.gif rename to src/canonical/models/front/151--0--Mew.gif diff --git a/src/canonical/models/front/Chikorita.gif b/src/canonical/models/front/152--0--Chikorita.gif similarity index 100% rename from src/canonical/models/front/Chikorita.gif rename to src/canonical/models/front/152--0--Chikorita.gif diff --git a/src/canonical/models/front/Bayleef.gif b/src/canonical/models/front/153--0--Bayleef.gif similarity index 100% rename from src/canonical/models/front/Bayleef.gif rename to src/canonical/models/front/153--0--Bayleef.gif diff --git a/src/canonical/models/front/Meganium.gif b/src/canonical/models/front/154--0--Meganium.gif similarity index 100% rename from src/canonical/models/front/Meganium.gif rename to src/canonical/models/front/154--0--Meganium.gif diff --git a/src/canonical/models/front/Cyndaquil.gif b/src/canonical/models/front/155--0--Cyndaquil.gif similarity index 100% rename from src/canonical/models/front/Cyndaquil.gif rename to src/canonical/models/front/155--0--Cyndaquil.gif diff --git a/src/canonical/models/front/Quilava.gif b/src/canonical/models/front/156--0--Quilava.gif similarity index 100% rename from src/canonical/models/front/Quilava.gif rename to src/canonical/models/front/156--0--Quilava.gif diff --git a/src/canonical/models/front/Typhlosion.gif b/src/canonical/models/front/157--0--Typhlosion.gif similarity index 100% rename from src/canonical/models/front/Typhlosion.gif rename to src/canonical/models/front/157--0--Typhlosion.gif diff --git a/src/canonical/models/front/Totodile.gif b/src/canonical/models/front/158--0--Totodile.gif similarity index 100% rename from src/canonical/models/front/Totodile.gif rename to src/canonical/models/front/158--0--Totodile.gif diff --git a/src/canonical/models/front/Croconaw.gif b/src/canonical/models/front/159--0--Croconaw.gif similarity index 100% rename from src/canonical/models/front/Croconaw.gif rename to src/canonical/models/front/159--0--Croconaw.gif diff --git a/src/canonical/models/front/Pidgey.gif b/src/canonical/models/front/16--0--Pidgey.gif similarity index 100% rename from src/canonical/models/front/Pidgey.gif rename to src/canonical/models/front/16--0--Pidgey.gif diff --git a/src/canonical/models/front/Feraligatr.gif b/src/canonical/models/front/160--0--Feraligatr.gif similarity index 100% rename from src/canonical/models/front/Feraligatr.gif rename to src/canonical/models/front/160--0--Feraligatr.gif diff --git a/src/canonical/models/front/Sentret.gif b/src/canonical/models/front/161--0--Sentret.gif similarity index 100% rename from src/canonical/models/front/Sentret.gif rename to src/canonical/models/front/161--0--Sentret.gif diff --git a/src/canonical/models/front/Furret.gif b/src/canonical/models/front/162--0--Furret.gif similarity index 100% rename from src/canonical/models/front/Furret.gif rename to src/canonical/models/front/162--0--Furret.gif diff --git a/src/canonical/models/front/Hoothoot.gif b/src/canonical/models/front/163--0--Hoothoot.gif similarity index 100% rename from src/canonical/models/front/Hoothoot.gif rename to src/canonical/models/front/163--0--Hoothoot.gif diff --git a/src/canonical/models/front/Noctowl.gif b/src/canonical/models/front/164--0--Noctowl.gif similarity index 100% rename from src/canonical/models/front/Noctowl.gif rename to src/canonical/models/front/164--0--Noctowl.gif diff --git a/src/canonical/models/front/Ledyba.gif b/src/canonical/models/front/165--0--Ledyba.gif similarity index 100% rename from src/canonical/models/front/Ledyba.gif rename to src/canonical/models/front/165--0--Ledyba.gif diff --git a/src/canonical/models/front/Ledian.gif b/src/canonical/models/front/166--0--Ledian.gif similarity index 100% rename from src/canonical/models/front/Ledian.gif rename to src/canonical/models/front/166--0--Ledian.gif diff --git a/src/canonical/models/front/Spinarak.gif b/src/canonical/models/front/167--0--Spinarak.gif similarity index 100% rename from src/canonical/models/front/Spinarak.gif rename to src/canonical/models/front/167--0--Spinarak.gif diff --git a/src/canonical/models/front/Ariados.gif b/src/canonical/models/front/168--0--Ariados.gif similarity index 100% rename from src/canonical/models/front/Ariados.gif rename to src/canonical/models/front/168--0--Ariados.gif diff --git a/src/canonical/models/front/Crobat.gif b/src/canonical/models/front/169--0--Crobat.gif similarity index 100% rename from src/canonical/models/front/Crobat.gif rename to src/canonical/models/front/169--0--Crobat.gif diff --git a/src/canonical/models/front/Pidgeotto.gif b/src/canonical/models/front/17--0--Pidgeotto.gif similarity index 100% rename from src/canonical/models/front/Pidgeotto.gif rename to src/canonical/models/front/17--0--Pidgeotto.gif diff --git a/src/canonical/models/front/Chinchou.gif b/src/canonical/models/front/170--0--Chinchou.gif similarity index 100% rename from src/canonical/models/front/Chinchou.gif rename to src/canonical/models/front/170--0--Chinchou.gif diff --git a/src/canonical/models/front/Lanturn.gif b/src/canonical/models/front/171--0--Lanturn.gif similarity index 100% rename from src/canonical/models/front/Lanturn.gif rename to src/canonical/models/front/171--0--Lanturn.gif diff --git a/src/canonical/models/front/Pichu.gif b/src/canonical/models/front/172--0--Pichu.gif similarity index 100% rename from src/canonical/models/front/Pichu.gif rename to src/canonical/models/front/172--0--Pichu.gif diff --git a/src/canonical/models/front/Cleffa.gif b/src/canonical/models/front/173--0--Cleffa.gif similarity index 100% rename from src/canonical/models/front/Cleffa.gif rename to src/canonical/models/front/173--0--Cleffa.gif diff --git a/src/canonical/models/front/Igglybuff.gif b/src/canonical/models/front/174--0--Igglybuff.gif similarity index 100% rename from src/canonical/models/front/Igglybuff.gif rename to src/canonical/models/front/174--0--Igglybuff.gif diff --git a/src/canonical/models/front/Togepi.gif b/src/canonical/models/front/175--0--Togepi.gif similarity index 100% rename from src/canonical/models/front/Togepi.gif rename to src/canonical/models/front/175--0--Togepi.gif diff --git a/src/canonical/models/front/Togetic.gif b/src/canonical/models/front/176--0--Togetic.gif similarity index 100% rename from src/canonical/models/front/Togetic.gif rename to src/canonical/models/front/176--0--Togetic.gif diff --git a/src/canonical/models/front/Natu.gif b/src/canonical/models/front/177--0--Natu.gif similarity index 100% rename from src/canonical/models/front/Natu.gif rename to src/canonical/models/front/177--0--Natu.gif diff --git a/src/canonical/models/front/Xatu.gif b/src/canonical/models/front/178--0--Xatu.gif similarity index 100% rename from src/canonical/models/front/Xatu.gif rename to src/canonical/models/front/178--0--Xatu.gif diff --git a/src/canonical/models/front/Mareep.gif b/src/canonical/models/front/179--0--Mareep.gif similarity index 100% rename from src/canonical/models/front/Mareep.gif rename to src/canonical/models/front/179--0--Mareep.gif diff --git a/src/canonical/models/front/Pidgeot.gif b/src/canonical/models/front/18--0--Pidgeot.gif similarity index 100% rename from src/canonical/models/front/Pidgeot.gif rename to src/canonical/models/front/18--0--Pidgeot.gif diff --git a/src/canonical/models/front/Pidgeot--Mega.gif b/src/canonical/models/front/18--420--Pidgeot--Mega.gif similarity index 100% rename from src/canonical/models/front/Pidgeot--Mega.gif rename to src/canonical/models/front/18--420--Pidgeot--Mega.gif diff --git a/src/canonical/models/front/Flaaffy.gif b/src/canonical/models/front/180--0--Flaaffy.gif similarity index 100% rename from src/canonical/models/front/Flaaffy.gif rename to src/canonical/models/front/180--0--Flaaffy.gif diff --git a/src/canonical/models/front/Ampharos.gif b/src/canonical/models/front/181--0--Ampharos.gif similarity index 100% rename from src/canonical/models/front/Ampharos.gif rename to src/canonical/models/front/181--0--Ampharos.gif diff --git a/src/canonical/models/front/Ampharos--Mega.gif b/src/canonical/models/front/181--420--Ampharos--Mega.gif similarity index 100% rename from src/canonical/models/front/Ampharos--Mega.gif rename to src/canonical/models/front/181--420--Ampharos--Mega.gif diff --git a/src/canonical/models/front/Bellossom.gif b/src/canonical/models/front/182--0--Bellossom.gif similarity index 100% rename from src/canonical/models/front/Bellossom.gif rename to src/canonical/models/front/182--0--Bellossom.gif diff --git a/src/canonical/models/front/Marill.gif b/src/canonical/models/front/183--0--Marill.gif similarity index 100% rename from src/canonical/models/front/Marill.gif rename to src/canonical/models/front/183--0--Marill.gif diff --git a/src/canonical/models/front/Azumarill.gif b/src/canonical/models/front/184--0--Azumarill.gif similarity index 100% rename from src/canonical/models/front/Azumarill.gif rename to src/canonical/models/front/184--0--Azumarill.gif diff --git a/src/canonical/models/front/Sudowoodo.gif b/src/canonical/models/front/185--0--Sudowoodo.gif similarity index 100% rename from src/canonical/models/front/Sudowoodo.gif rename to src/canonical/models/front/185--0--Sudowoodo.gif diff --git a/src/canonical/models/front/Politoed.gif b/src/canonical/models/front/186--0--Politoed.gif similarity index 100% rename from src/canonical/models/front/Politoed.gif rename to src/canonical/models/front/186--0--Politoed.gif diff --git a/src/canonical/models/front/Hoppip.gif b/src/canonical/models/front/187--0--Hoppip.gif similarity index 100% rename from src/canonical/models/front/Hoppip.gif rename to src/canonical/models/front/187--0--Hoppip.gif diff --git a/src/canonical/models/front/Skiploom.gif b/src/canonical/models/front/188--0--Skiploom.gif similarity index 100% rename from src/canonical/models/front/Skiploom.gif rename to src/canonical/models/front/188--0--Skiploom.gif diff --git a/src/canonical/models/front/Jumpluff.gif b/src/canonical/models/front/189--0--Jumpluff.gif similarity index 100% rename from src/canonical/models/front/Jumpluff.gif rename to src/canonical/models/front/189--0--Jumpluff.gif diff --git a/src/canonical/models/front/Rattata.gif b/src/canonical/models/front/19--0--Rattata.gif similarity index 100% rename from src/canonical/models/front/Rattata.gif rename to src/canonical/models/front/19--0--Rattata.gif diff --git a/src/canonical/models/front/Rattata--Alola.gif b/src/canonical/models/front/19--420--Rattata--Alola.gif similarity index 100% rename from src/canonical/models/front/Rattata--Alola.gif rename to src/canonical/models/front/19--420--Rattata--Alola.gif diff --git a/src/canonical/models/front/Aipom.gif b/src/canonical/models/front/190--0--Aipom.gif similarity index 100% rename from src/canonical/models/front/Aipom.gif rename to src/canonical/models/front/190--0--Aipom.gif diff --git a/src/canonical/models/front/Sunkern.gif b/src/canonical/models/front/191--0--Sunkern.gif similarity index 100% rename from src/canonical/models/front/Sunkern.gif rename to src/canonical/models/front/191--0--Sunkern.gif diff --git a/src/canonical/models/front/Sunflora.gif b/src/canonical/models/front/192--0--Sunflora.gif similarity index 100% rename from src/canonical/models/front/Sunflora.gif rename to src/canonical/models/front/192--0--Sunflora.gif diff --git a/src/canonical/models/front/Yanma.gif b/src/canonical/models/front/193--0--Yanma.gif similarity index 100% rename from src/canonical/models/front/Yanma.gif rename to src/canonical/models/front/193--0--Yanma.gif diff --git a/src/canonical/models/front/Wooper.gif b/src/canonical/models/front/194--0--Wooper.gif similarity index 100% rename from src/canonical/models/front/Wooper.gif rename to src/canonical/models/front/194--0--Wooper.gif diff --git a/src/canonical/models/front/Quagsire.gif b/src/canonical/models/front/195--0--Quagsire.gif similarity index 100% rename from src/canonical/models/front/Quagsire.gif rename to src/canonical/models/front/195--0--Quagsire.gif diff --git a/src/canonical/models/front/Espeon.gif b/src/canonical/models/front/196--0--Espeon.gif similarity index 100% rename from src/canonical/models/front/Espeon.gif rename to src/canonical/models/front/196--0--Espeon.gif diff --git a/src/canonical/models/front/Umbreon.gif b/src/canonical/models/front/197--0--Umbreon.gif similarity index 100% rename from src/canonical/models/front/Umbreon.gif rename to src/canonical/models/front/197--0--Umbreon.gif diff --git a/src/canonical/models/front/Murkrow.gif b/src/canonical/models/front/198--0--Murkrow.gif similarity index 100% rename from src/canonical/models/front/Murkrow.gif rename to src/canonical/models/front/198--0--Murkrow.gif diff --git a/src/canonical/models/front/Slowking.gif b/src/canonical/models/front/199--0--Slowking.gif similarity index 100% rename from src/canonical/models/front/Slowking.gif rename to src/canonical/models/front/199--0--Slowking.gif diff --git a/src/canonical/models/front/Ivysaur.gif b/src/canonical/models/front/2--0--Ivysaur.gif similarity index 100% rename from src/canonical/models/front/Ivysaur.gif rename to src/canonical/models/front/2--0--Ivysaur.gif diff --git a/src/canonical/models/front/Raticate.gif b/src/canonical/models/front/20--0--Raticate.gif similarity index 100% rename from src/canonical/models/front/Raticate.gif rename to src/canonical/models/front/20--0--Raticate.gif diff --git a/src/canonical/models/front/Raticate--Alola-Totem.gif b/src/canonical/models/front/20--420--Raticate--Alola-Totem.gif similarity index 100% rename from src/canonical/models/front/Raticate--Alola-Totem.gif rename to src/canonical/models/front/20--420--Raticate--Alola-Totem.gif diff --git a/src/canonical/models/front/Raticate--Alola.gif b/src/canonical/models/front/20--420--Raticate--Alola.gif similarity index 100% rename from src/canonical/models/front/Raticate--Alola.gif rename to src/canonical/models/front/20--420--Raticate--Alola.gif diff --git a/src/canonical/models/front/Misdreavus.gif b/src/canonical/models/front/200--0--Misdreavus.gif similarity index 100% rename from src/canonical/models/front/Misdreavus.gif rename to src/canonical/models/front/200--0--Misdreavus.gif diff --git a/src/canonical/models/front/201--0--Unown.gif b/src/canonical/models/front/201--0--Unown.gif new file mode 120000 index 00000000..2ddc0d2a --- /dev/null +++ b/src/canonical/models/front/201--0--Unown.gif @@ -0,0 +1 @@ +../front-cosmetic/201--420--Unown--A.gif \ No newline at end of file diff --git a/src/canonical/models/front/Wobbuffet.gif b/src/canonical/models/front/202--0--Wobbuffet.gif similarity index 100% rename from src/canonical/models/front/Wobbuffet.gif rename to src/canonical/models/front/202--0--Wobbuffet.gif diff --git a/src/canonical/models/front/Girafarig.gif b/src/canonical/models/front/203--0--Girafarig.gif similarity index 100% rename from src/canonical/models/front/Girafarig.gif rename to src/canonical/models/front/203--0--Girafarig.gif diff --git a/src/canonical/models/front/Pineco.gif b/src/canonical/models/front/204--0--Pineco.gif similarity index 100% rename from src/canonical/models/front/Pineco.gif rename to src/canonical/models/front/204--0--Pineco.gif diff --git a/src/canonical/models/front/Forretress.gif b/src/canonical/models/front/205--0--Forretress.gif similarity index 100% rename from src/canonical/models/front/Forretress.gif rename to src/canonical/models/front/205--0--Forretress.gif diff --git a/src/canonical/models/front/Dunsparce.gif b/src/canonical/models/front/206--0--Dunsparce.gif similarity index 100% rename from src/canonical/models/front/Dunsparce.gif rename to src/canonical/models/front/206--0--Dunsparce.gif diff --git a/src/canonical/models/front/Gligar.gif b/src/canonical/models/front/207--0--Gligar.gif similarity index 100% rename from src/canonical/models/front/Gligar.gif rename to src/canonical/models/front/207--0--Gligar.gif diff --git a/src/canonical/models/front/Steelix.gif b/src/canonical/models/front/208--0--Steelix.gif similarity index 100% rename from src/canonical/models/front/Steelix.gif rename to src/canonical/models/front/208--0--Steelix.gif diff --git a/src/canonical/models/front/Steelix--Mega.gif b/src/canonical/models/front/208--420--Steelix--Mega.gif similarity index 100% rename from src/canonical/models/front/Steelix--Mega.gif rename to src/canonical/models/front/208--420--Steelix--Mega.gif diff --git a/src/canonical/models/front/Snubbull.gif b/src/canonical/models/front/209--0--Snubbull.gif similarity index 100% rename from src/canonical/models/front/Snubbull.gif rename to src/canonical/models/front/209--0--Snubbull.gif diff --git a/src/canonical/models/front/Spearow.gif b/src/canonical/models/front/21--0--Spearow.gif similarity index 100% rename from src/canonical/models/front/Spearow.gif rename to src/canonical/models/front/21--0--Spearow.gif diff --git a/src/canonical/models/front/Granbull.gif b/src/canonical/models/front/210--0--Granbull.gif similarity index 100% rename from src/canonical/models/front/Granbull.gif rename to src/canonical/models/front/210--0--Granbull.gif diff --git a/src/canonical/models/front/Qwilfish.gif b/src/canonical/models/front/211--0--Qwilfish.gif similarity index 100% rename from src/canonical/models/front/Qwilfish.gif rename to src/canonical/models/front/211--0--Qwilfish.gif diff --git a/src/canonical/models/front/Scizor.gif b/src/canonical/models/front/212--0--Scizor.gif similarity index 100% rename from src/canonical/models/front/Scizor.gif rename to src/canonical/models/front/212--0--Scizor.gif diff --git a/src/canonical/models/front/Scizor--Mega.gif b/src/canonical/models/front/212--420--Scizor--Mega.gif similarity index 100% rename from src/canonical/models/front/Scizor--Mega.gif rename to src/canonical/models/front/212--420--Scizor--Mega.gif diff --git a/src/canonical/models/front/Shuckle.gif b/src/canonical/models/front/213--0--Shuckle.gif similarity index 100% rename from src/canonical/models/front/Shuckle.gif rename to src/canonical/models/front/213--0--Shuckle.gif diff --git a/src/canonical/models/front/Heracross.gif b/src/canonical/models/front/214--0--Heracross.gif similarity index 100% rename from src/canonical/models/front/Heracross.gif rename to src/canonical/models/front/214--0--Heracross.gif diff --git a/src/canonical/models/front/Heracross--Mega.gif b/src/canonical/models/front/214--420--Heracross--Mega.gif similarity index 100% rename from src/canonical/models/front/Heracross--Mega.gif rename to src/canonical/models/front/214--420--Heracross--Mega.gif diff --git a/src/canonical/models/front/Sneasel.gif b/src/canonical/models/front/215--0--Sneasel.gif similarity index 100% rename from src/canonical/models/front/Sneasel.gif rename to src/canonical/models/front/215--0--Sneasel.gif diff --git a/src/canonical/models/front/Teddiursa.gif b/src/canonical/models/front/216--0--Teddiursa.gif similarity index 100% rename from src/canonical/models/front/Teddiursa.gif rename to src/canonical/models/front/216--0--Teddiursa.gif diff --git a/src/canonical/models/front/Ursaring.gif b/src/canonical/models/front/217--0--Ursaring.gif similarity index 100% rename from src/canonical/models/front/Ursaring.gif rename to src/canonical/models/front/217--0--Ursaring.gif diff --git a/src/canonical/models/front/Slugma.gif b/src/canonical/models/front/218--0--Slugma.gif similarity index 100% rename from src/canonical/models/front/Slugma.gif rename to src/canonical/models/front/218--0--Slugma.gif diff --git a/src/canonical/models/front/Magcargo.gif b/src/canonical/models/front/219--0--Magcargo.gif similarity index 100% rename from src/canonical/models/front/Magcargo.gif rename to src/canonical/models/front/219--0--Magcargo.gif diff --git a/src/canonical/models/front/Fearow.gif b/src/canonical/models/front/22--0--Fearow.gif similarity index 100% rename from src/canonical/models/front/Fearow.gif rename to src/canonical/models/front/22--0--Fearow.gif diff --git a/src/canonical/models/front/Swinub.gif b/src/canonical/models/front/220--0--Swinub.gif similarity index 100% rename from src/canonical/models/front/Swinub.gif rename to src/canonical/models/front/220--0--Swinub.gif diff --git a/src/canonical/models/front/Piloswine.gif b/src/canonical/models/front/221--0--Piloswine.gif similarity index 100% rename from src/canonical/models/front/Piloswine.gif rename to src/canonical/models/front/221--0--Piloswine.gif diff --git a/src/canonical/models/front/Corsola.gif b/src/canonical/models/front/222--0--Corsola.gif similarity index 100% rename from src/canonical/models/front/Corsola.gif rename to src/canonical/models/front/222--0--Corsola.gif diff --git a/src/canonical/models/front/Corsola--Galar.gif b/src/canonical/models/front/222--420--Corsola--Galar.gif similarity index 100% rename from src/canonical/models/front/Corsola--Galar.gif rename to src/canonical/models/front/222--420--Corsola--Galar.gif diff --git a/src/canonical/models/front/Remoraid.gif b/src/canonical/models/front/223--0--Remoraid.gif similarity index 100% rename from src/canonical/models/front/Remoraid.gif rename to src/canonical/models/front/223--0--Remoraid.gif diff --git a/src/canonical/models/front/Octillery.gif b/src/canonical/models/front/224--0--Octillery.gif similarity index 100% rename from src/canonical/models/front/Octillery.gif rename to src/canonical/models/front/224--0--Octillery.gif diff --git a/src/canonical/models/front/Delibird.gif b/src/canonical/models/front/225--0--Delibird.gif similarity index 100% rename from src/canonical/models/front/Delibird.gif rename to src/canonical/models/front/225--0--Delibird.gif diff --git a/src/canonical/models/front/Mantine.gif b/src/canonical/models/front/226--0--Mantine.gif similarity index 100% rename from src/canonical/models/front/Mantine.gif rename to src/canonical/models/front/226--0--Mantine.gif diff --git a/src/canonical/models/front/Skarmory.gif b/src/canonical/models/front/227--0--Skarmory.gif similarity index 100% rename from src/canonical/models/front/Skarmory.gif rename to src/canonical/models/front/227--0--Skarmory.gif diff --git a/src/canonical/models/front/Houndour.gif b/src/canonical/models/front/228--0--Houndour.gif similarity index 100% rename from src/canonical/models/front/Houndour.gif rename to src/canonical/models/front/228--0--Houndour.gif diff --git a/src/canonical/models/front/Houndoom.gif b/src/canonical/models/front/229--0--Houndoom.gif similarity index 100% rename from src/canonical/models/front/Houndoom.gif rename to src/canonical/models/front/229--0--Houndoom.gif diff --git a/src/canonical/models/front/Houndoom--Mega.gif b/src/canonical/models/front/229--420--Houndoom--Mega.gif similarity index 100% rename from src/canonical/models/front/Houndoom--Mega.gif rename to src/canonical/models/front/229--420--Houndoom--Mega.gif diff --git a/src/canonical/models/front/Ekans.gif b/src/canonical/models/front/23--0--Ekans.gif similarity index 100% rename from src/canonical/models/front/Ekans.gif rename to src/canonical/models/front/23--0--Ekans.gif diff --git a/src/canonical/models/front/Kingdra.gif b/src/canonical/models/front/230--0--Kingdra.gif similarity index 100% rename from src/canonical/models/front/Kingdra.gif rename to src/canonical/models/front/230--0--Kingdra.gif diff --git a/src/canonical/models/front/Phanpy.gif b/src/canonical/models/front/231--0--Phanpy.gif similarity index 100% rename from src/canonical/models/front/Phanpy.gif rename to src/canonical/models/front/231--0--Phanpy.gif diff --git a/src/canonical/models/front/Donphan.gif b/src/canonical/models/front/232--0--Donphan.gif similarity index 100% rename from src/canonical/models/front/Donphan.gif rename to src/canonical/models/front/232--0--Donphan.gif diff --git a/src/canonical/models/front/Porygon2.gif b/src/canonical/models/front/233--0--Porygon2.gif similarity index 100% rename from src/canonical/models/front/Porygon2.gif rename to src/canonical/models/front/233--0--Porygon2.gif diff --git a/src/canonical/models/front/Stantler.gif b/src/canonical/models/front/234--0--Stantler.gif similarity index 100% rename from src/canonical/models/front/Stantler.gif rename to src/canonical/models/front/234--0--Stantler.gif diff --git a/src/canonical/models/front/Smeargle.gif b/src/canonical/models/front/235--0--Smeargle.gif similarity index 100% rename from src/canonical/models/front/Smeargle.gif rename to src/canonical/models/front/235--0--Smeargle.gif diff --git a/src/canonical/models/front/Tyrogue.gif b/src/canonical/models/front/236--0--Tyrogue.gif similarity index 100% rename from src/canonical/models/front/Tyrogue.gif rename to src/canonical/models/front/236--0--Tyrogue.gif diff --git a/src/canonical/models/front/Hitmontop.gif b/src/canonical/models/front/237--0--Hitmontop.gif similarity index 100% rename from src/canonical/models/front/Hitmontop.gif rename to src/canonical/models/front/237--0--Hitmontop.gif diff --git a/src/canonical/models/front/Smoochum.gif b/src/canonical/models/front/238--0--Smoochum.gif similarity index 100% rename from src/canonical/models/front/Smoochum.gif rename to src/canonical/models/front/238--0--Smoochum.gif diff --git a/src/canonical/models/front/Elekid.gif b/src/canonical/models/front/239--0--Elekid.gif similarity index 100% rename from src/canonical/models/front/Elekid.gif rename to src/canonical/models/front/239--0--Elekid.gif diff --git a/src/canonical/models/front/Arbok.gif b/src/canonical/models/front/24--0--Arbok.gif similarity index 100% rename from src/canonical/models/front/Arbok.gif rename to src/canonical/models/front/24--0--Arbok.gif diff --git a/src/canonical/models/front/Magby.gif b/src/canonical/models/front/240--0--Magby.gif similarity index 100% rename from src/canonical/models/front/Magby.gif rename to src/canonical/models/front/240--0--Magby.gif diff --git a/src/canonical/models/front/Miltank.gif b/src/canonical/models/front/241--0--Miltank.gif similarity index 100% rename from src/canonical/models/front/Miltank.gif rename to src/canonical/models/front/241--0--Miltank.gif diff --git a/src/canonical/models/front/Blissey.gif b/src/canonical/models/front/242--0--Blissey.gif similarity index 100% rename from src/canonical/models/front/Blissey.gif rename to src/canonical/models/front/242--0--Blissey.gif diff --git a/src/canonical/models/front/Raikou.gif b/src/canonical/models/front/243--0--Raikou.gif similarity index 100% rename from src/canonical/models/front/Raikou.gif rename to src/canonical/models/front/243--0--Raikou.gif diff --git a/src/canonical/models/front/Entei.gif b/src/canonical/models/front/244--0--Entei.gif similarity index 100% rename from src/canonical/models/front/Entei.gif rename to src/canonical/models/front/244--0--Entei.gif diff --git a/src/canonical/models/front/Suicune.gif b/src/canonical/models/front/245--0--Suicune.gif similarity index 100% rename from src/canonical/models/front/Suicune.gif rename to src/canonical/models/front/245--0--Suicune.gif diff --git a/src/canonical/models/front/Larvitar.gif b/src/canonical/models/front/246--0--Larvitar.gif similarity index 100% rename from src/canonical/models/front/Larvitar.gif rename to src/canonical/models/front/246--0--Larvitar.gif diff --git a/src/canonical/models/front/Pupitar.gif b/src/canonical/models/front/247--0--Pupitar.gif similarity index 100% rename from src/canonical/models/front/Pupitar.gif rename to src/canonical/models/front/247--0--Pupitar.gif diff --git a/src/canonical/models/front/Tyranitar.gif b/src/canonical/models/front/248--0--Tyranitar.gif similarity index 100% rename from src/canonical/models/front/Tyranitar.gif rename to src/canonical/models/front/248--0--Tyranitar.gif diff --git a/src/canonical/models/front/Tyranitar--Mega.gif b/src/canonical/models/front/248--420--Tyranitar--Mega.gif similarity index 100% rename from src/canonical/models/front/Tyranitar--Mega.gif rename to src/canonical/models/front/248--420--Tyranitar--Mega.gif diff --git a/src/canonical/models/front/Lugia.gif b/src/canonical/models/front/249--0--Lugia.gif similarity index 100% rename from src/canonical/models/front/Lugia.gif rename to src/canonical/models/front/249--0--Lugia.gif diff --git a/src/canonical/models/front/Pikachu.gif b/src/canonical/models/front/25--0--Pikachu.gif similarity index 100% rename from src/canonical/models/front/Pikachu.gif rename to src/canonical/models/front/25--0--Pikachu.gif diff --git a/src/canonical/models/front/Pikachu--Alola.gif b/src/canonical/models/front/25--420--Pikachu--Alola.gif similarity index 100% rename from src/canonical/models/front/Pikachu--Alola.gif rename to src/canonical/models/front/25--420--Pikachu--Alola.gif diff --git a/src/canonical/models/front/Pikachu--Belle.gif b/src/canonical/models/front/25--420--Pikachu--Belle.gif similarity index 100% rename from src/canonical/models/front/Pikachu--Belle.gif rename to src/canonical/models/front/25--420--Pikachu--Belle.gif diff --git a/src/canonical/models/front/Pikachu--Cosplay.gif b/src/canonical/models/front/25--420--Pikachu--Cosplay.gif similarity index 100% rename from src/canonical/models/front/Pikachu--Cosplay.gif rename to src/canonical/models/front/25--420--Pikachu--Cosplay.gif diff --git a/src/canonical/models/front/Pikachu--Gmax.gif b/src/canonical/models/front/25--420--Pikachu--Gmax.gif similarity index 100% rename from src/canonical/models/front/Pikachu--Gmax.gif rename to src/canonical/models/front/25--420--Pikachu--Gmax.gif diff --git a/src/canonical/models/front/Pikachu--Hoenn.gif b/src/canonical/models/front/25--420--Pikachu--Hoenn.gif similarity index 100% rename from src/canonical/models/front/Pikachu--Hoenn.gif rename to src/canonical/models/front/25--420--Pikachu--Hoenn.gif diff --git a/src/canonical/models/front/Pikachu--Kalos.gif b/src/canonical/models/front/25--420--Pikachu--Kalos.gif similarity index 100% rename from src/canonical/models/front/Pikachu--Kalos.gif rename to src/canonical/models/front/25--420--Pikachu--Kalos.gif diff --git a/src/canonical/models/front/Pikachu--Libre.gif b/src/canonical/models/front/25--420--Pikachu--Libre.gif similarity index 100% rename from src/canonical/models/front/Pikachu--Libre.gif rename to src/canonical/models/front/25--420--Pikachu--Libre.gif diff --git a/src/canonical/models/front/Pikachu--Original.gif b/src/canonical/models/front/25--420--Pikachu--Original.gif similarity index 100% rename from src/canonical/models/front/Pikachu--Original.gif rename to src/canonical/models/front/25--420--Pikachu--Original.gif diff --git a/src/canonical/models/front/Pikachu--Partner.gif b/src/canonical/models/front/25--420--Pikachu--Partner.gif similarity index 100% rename from src/canonical/models/front/Pikachu--Partner.gif rename to src/canonical/models/front/25--420--Pikachu--Partner.gif diff --git a/src/canonical/models/front/Pikachu--PhD.gif b/src/canonical/models/front/25--420--Pikachu--PhD.gif similarity index 100% rename from src/canonical/models/front/Pikachu--PhD.gif rename to src/canonical/models/front/25--420--Pikachu--PhD.gif diff --git a/src/canonical/models/front/Pikachu--Pop-Star.gif b/src/canonical/models/front/25--420--Pikachu--Pop-Star.gif similarity index 100% rename from src/canonical/models/front/Pikachu--Pop-Star.gif rename to src/canonical/models/front/25--420--Pikachu--Pop-Star.gif diff --git a/src/canonical/models/front/Pikachu--Rock-Star.gif b/src/canonical/models/front/25--420--Pikachu--Rock-Star.gif similarity index 100% rename from src/canonical/models/front/Pikachu--Rock-Star.gif rename to src/canonical/models/front/25--420--Pikachu--Rock-Star.gif diff --git a/src/canonical/models/front/Pikachu--Sinnoh.gif b/src/canonical/models/front/25--420--Pikachu--Sinnoh.gif similarity index 100% rename from src/canonical/models/front/Pikachu--Sinnoh.gif rename to src/canonical/models/front/25--420--Pikachu--Sinnoh.gif diff --git a/src/canonical/models/front/Pikachu--Starter.gif b/src/canonical/models/front/25--420--Pikachu--Starter.gif similarity index 100% rename from src/canonical/models/front/Pikachu--Starter.gif rename to src/canonical/models/front/25--420--Pikachu--Starter.gif diff --git a/src/canonical/models/front/Pikachu--Unova.gif b/src/canonical/models/front/25--420--Pikachu--Unova.gif similarity index 100% rename from src/canonical/models/front/Pikachu--Unova.gif rename to src/canonical/models/front/25--420--Pikachu--Unova.gif diff --git a/src/canonical/models/front/Ho-Oh.gif b/src/canonical/models/front/250--0--Ho-Oh.gif similarity index 100% rename from src/canonical/models/front/Ho-Oh.gif rename to src/canonical/models/front/250--0--Ho-Oh.gif diff --git a/src/canonical/models/front/Celebi.gif b/src/canonical/models/front/251--0--Celebi.gif similarity index 100% rename from src/canonical/models/front/Celebi.gif rename to src/canonical/models/front/251--0--Celebi.gif diff --git a/src/canonical/models/front/Treecko.gif b/src/canonical/models/front/252--0--Treecko.gif similarity index 100% rename from src/canonical/models/front/Treecko.gif rename to src/canonical/models/front/252--0--Treecko.gif diff --git a/src/canonical/models/front/Grovyle.gif b/src/canonical/models/front/253--0--Grovyle.gif similarity index 100% rename from src/canonical/models/front/Grovyle.gif rename to src/canonical/models/front/253--0--Grovyle.gif diff --git a/src/canonical/models/front/Sceptile.gif b/src/canonical/models/front/254--0--Sceptile.gif similarity index 100% rename from src/canonical/models/front/Sceptile.gif rename to src/canonical/models/front/254--0--Sceptile.gif diff --git a/src/canonical/models/front/Sceptile--Mega.gif b/src/canonical/models/front/254--420--Sceptile--Mega.gif similarity index 100% rename from src/canonical/models/front/Sceptile--Mega.gif rename to src/canonical/models/front/254--420--Sceptile--Mega.gif diff --git a/src/canonical/models/front/Torchic.gif b/src/canonical/models/front/255--0--Torchic.gif similarity index 100% rename from src/canonical/models/front/Torchic.gif rename to src/canonical/models/front/255--0--Torchic.gif diff --git a/src/canonical/models/front/Combusken.gif b/src/canonical/models/front/256--0--Combusken.gif similarity index 100% rename from src/canonical/models/front/Combusken.gif rename to src/canonical/models/front/256--0--Combusken.gif diff --git a/src/canonical/models/front/Blaziken.gif b/src/canonical/models/front/257--0--Blaziken.gif similarity index 100% rename from src/canonical/models/front/Blaziken.gif rename to src/canonical/models/front/257--0--Blaziken.gif diff --git a/src/canonical/models/front/Blaziken--Mega.gif b/src/canonical/models/front/257--420--Blaziken--Mega.gif similarity index 100% rename from src/canonical/models/front/Blaziken--Mega.gif rename to src/canonical/models/front/257--420--Blaziken--Mega.gif diff --git a/src/canonical/models/front/Mudkip.gif b/src/canonical/models/front/258--0--Mudkip.gif similarity index 100% rename from src/canonical/models/front/Mudkip.gif rename to src/canonical/models/front/258--0--Mudkip.gif diff --git a/src/canonical/models/front/Marshtomp.gif b/src/canonical/models/front/259--0--Marshtomp.gif similarity index 100% rename from src/canonical/models/front/Marshtomp.gif rename to src/canonical/models/front/259--0--Marshtomp.gif diff --git a/src/canonical/models/front/Raichu.gif b/src/canonical/models/front/26--0--Raichu.gif similarity index 100% rename from src/canonical/models/front/Raichu.gif rename to src/canonical/models/front/26--0--Raichu.gif diff --git a/src/canonical/models/front/Raichu--Alola.gif b/src/canonical/models/front/26--420--Raichu--Alola.gif similarity index 100% rename from src/canonical/models/front/Raichu--Alola.gif rename to src/canonical/models/front/26--420--Raichu--Alola.gif diff --git a/src/canonical/models/front/Swampert.gif b/src/canonical/models/front/260--0--Swampert.gif similarity index 100% rename from src/canonical/models/front/Swampert.gif rename to src/canonical/models/front/260--0--Swampert.gif diff --git a/src/canonical/models/front/Swampert--Mega.gif b/src/canonical/models/front/260--420--Swampert--Mega.gif similarity index 100% rename from src/canonical/models/front/Swampert--Mega.gif rename to src/canonical/models/front/260--420--Swampert--Mega.gif diff --git a/src/canonical/models/front/Poochyena.gif b/src/canonical/models/front/261--0--Poochyena.gif similarity index 100% rename from src/canonical/models/front/Poochyena.gif rename to src/canonical/models/front/261--0--Poochyena.gif diff --git a/src/canonical/models/front/Mightyena.gif b/src/canonical/models/front/262--0--Mightyena.gif similarity index 100% rename from src/canonical/models/front/Mightyena.gif rename to src/canonical/models/front/262--0--Mightyena.gif diff --git a/src/canonical/models/front/Zigzagoon.gif b/src/canonical/models/front/263--0--Zigzagoon.gif similarity index 100% rename from src/canonical/models/front/Zigzagoon.gif rename to src/canonical/models/front/263--0--Zigzagoon.gif diff --git a/src/canonical/models/front/Zigzagoon--Galar.gif b/src/canonical/models/front/263--420--Zigzagoon--Galar.gif similarity index 100% rename from src/canonical/models/front/Zigzagoon--Galar.gif rename to src/canonical/models/front/263--420--Zigzagoon--Galar.gif diff --git a/src/canonical/models/front/Linoone.gif b/src/canonical/models/front/264--0--Linoone.gif similarity index 100% rename from src/canonical/models/front/Linoone.gif rename to src/canonical/models/front/264--0--Linoone.gif diff --git a/src/canonical/models/front/Linoone--Galar.gif b/src/canonical/models/front/264--420--Linoone--Galar.gif similarity index 100% rename from src/canonical/models/front/Linoone--Galar.gif rename to src/canonical/models/front/264--420--Linoone--Galar.gif diff --git a/src/canonical/models/front/Wurmple.gif b/src/canonical/models/front/265--0--Wurmple.gif similarity index 100% rename from src/canonical/models/front/Wurmple.gif rename to src/canonical/models/front/265--0--Wurmple.gif diff --git a/src/canonical/models/front/Silcoon.gif b/src/canonical/models/front/266--0--Silcoon.gif similarity index 100% rename from src/canonical/models/front/Silcoon.gif rename to src/canonical/models/front/266--0--Silcoon.gif diff --git a/src/canonical/models/front/Beautifly.gif b/src/canonical/models/front/267--0--Beautifly.gif similarity index 100% rename from src/canonical/models/front/Beautifly.gif rename to src/canonical/models/front/267--0--Beautifly.gif diff --git a/src/canonical/models/front/Cascoon.gif b/src/canonical/models/front/268--0--Cascoon.gif similarity index 100% rename from src/canonical/models/front/Cascoon.gif rename to src/canonical/models/front/268--0--Cascoon.gif diff --git a/src/canonical/models/front/Dustox.gif b/src/canonical/models/front/269--0--Dustox.gif similarity index 100% rename from src/canonical/models/front/Dustox.gif rename to src/canonical/models/front/269--0--Dustox.gif diff --git a/src/canonical/models/front/Sandshrew.gif b/src/canonical/models/front/27--0--Sandshrew.gif similarity index 100% rename from src/canonical/models/front/Sandshrew.gif rename to src/canonical/models/front/27--0--Sandshrew.gif diff --git a/src/canonical/models/front/Sandshrew--Alola.gif b/src/canonical/models/front/27--420--Sandshrew--Alola.gif similarity index 100% rename from src/canonical/models/front/Sandshrew--Alola.gif rename to src/canonical/models/front/27--420--Sandshrew--Alola.gif diff --git a/src/canonical/models/front/Lotad.gif b/src/canonical/models/front/270--0--Lotad.gif similarity index 100% rename from src/canonical/models/front/Lotad.gif rename to src/canonical/models/front/270--0--Lotad.gif diff --git a/src/canonical/models/front/Lombre.gif b/src/canonical/models/front/271--0--Lombre.gif similarity index 100% rename from src/canonical/models/front/Lombre.gif rename to src/canonical/models/front/271--0--Lombre.gif diff --git a/src/canonical/models/front/Ludicolo.gif b/src/canonical/models/front/272--0--Ludicolo.gif similarity index 100% rename from src/canonical/models/front/Ludicolo.gif rename to src/canonical/models/front/272--0--Ludicolo.gif diff --git a/src/canonical/models/front/Seedot.gif b/src/canonical/models/front/273--0--Seedot.gif similarity index 100% rename from src/canonical/models/front/Seedot.gif rename to src/canonical/models/front/273--0--Seedot.gif diff --git a/src/canonical/models/front/Nuzleaf.gif b/src/canonical/models/front/274--0--Nuzleaf.gif similarity index 100% rename from src/canonical/models/front/Nuzleaf.gif rename to src/canonical/models/front/274--0--Nuzleaf.gif diff --git a/src/canonical/models/front/Shiftry.gif b/src/canonical/models/front/275--0--Shiftry.gif similarity index 100% rename from src/canonical/models/front/Shiftry.gif rename to src/canonical/models/front/275--0--Shiftry.gif diff --git a/src/canonical/models/front/Taillow.gif b/src/canonical/models/front/276--0--Taillow.gif similarity index 100% rename from src/canonical/models/front/Taillow.gif rename to src/canonical/models/front/276--0--Taillow.gif diff --git a/src/canonical/models/front/Swellow.gif b/src/canonical/models/front/277--0--Swellow.gif similarity index 100% rename from src/canonical/models/front/Swellow.gif rename to src/canonical/models/front/277--0--Swellow.gif diff --git a/src/canonical/models/front/Wingull.gif b/src/canonical/models/front/278--0--Wingull.gif similarity index 100% rename from src/canonical/models/front/Wingull.gif rename to src/canonical/models/front/278--0--Wingull.gif diff --git a/src/canonical/models/front/Pelipper.gif b/src/canonical/models/front/279--0--Pelipper.gif similarity index 100% rename from src/canonical/models/front/Pelipper.gif rename to src/canonical/models/front/279--0--Pelipper.gif diff --git a/src/canonical/models/front/Sandslash.gif b/src/canonical/models/front/28--0--Sandslash.gif similarity index 100% rename from src/canonical/models/front/Sandslash.gif rename to src/canonical/models/front/28--0--Sandslash.gif diff --git a/src/canonical/models/front/Sandslash--Alola.gif b/src/canonical/models/front/28--420--Sandslash--Alola.gif similarity index 100% rename from src/canonical/models/front/Sandslash--Alola.gif rename to src/canonical/models/front/28--420--Sandslash--Alola.gif diff --git a/src/canonical/models/front/Ralts.gif b/src/canonical/models/front/280--0--Ralts.gif similarity index 100% rename from src/canonical/models/front/Ralts.gif rename to src/canonical/models/front/280--0--Ralts.gif diff --git a/src/canonical/models/front/Kirlia.gif b/src/canonical/models/front/281--0--Kirlia.gif similarity index 100% rename from src/canonical/models/front/Kirlia.gif rename to src/canonical/models/front/281--0--Kirlia.gif diff --git a/src/canonical/models/front/Gardevoir.gif b/src/canonical/models/front/282--0--Gardevoir.gif similarity index 100% rename from src/canonical/models/front/Gardevoir.gif rename to src/canonical/models/front/282--0--Gardevoir.gif diff --git a/src/canonical/models/front/Gardevoir--Mega.gif b/src/canonical/models/front/282--420--Gardevoir--Mega.gif similarity index 100% rename from src/canonical/models/front/Gardevoir--Mega.gif rename to src/canonical/models/front/282--420--Gardevoir--Mega.gif diff --git a/src/canonical/models/front/Surskit.gif b/src/canonical/models/front/283--0--Surskit.gif similarity index 100% rename from src/canonical/models/front/Surskit.gif rename to src/canonical/models/front/283--0--Surskit.gif diff --git a/src/canonical/models/front/Masquerain.gif b/src/canonical/models/front/284--0--Masquerain.gif similarity index 100% rename from src/canonical/models/front/Masquerain.gif rename to src/canonical/models/front/284--0--Masquerain.gif diff --git a/src/canonical/models/front/Shroomish.gif b/src/canonical/models/front/285--0--Shroomish.gif similarity index 100% rename from src/canonical/models/front/Shroomish.gif rename to src/canonical/models/front/285--0--Shroomish.gif diff --git a/src/canonical/models/front/Breloom.gif b/src/canonical/models/front/286--0--Breloom.gif similarity index 100% rename from src/canonical/models/front/Breloom.gif rename to src/canonical/models/front/286--0--Breloom.gif diff --git a/src/canonical/models/front/Slakoth.gif b/src/canonical/models/front/287--0--Slakoth.gif similarity index 100% rename from src/canonical/models/front/Slakoth.gif rename to src/canonical/models/front/287--0--Slakoth.gif diff --git a/src/canonical/models/front/Vigoroth.gif b/src/canonical/models/front/288--0--Vigoroth.gif similarity index 100% rename from src/canonical/models/front/Vigoroth.gif rename to src/canonical/models/front/288--0--Vigoroth.gif diff --git a/src/canonical/models/front/Slaking.gif b/src/canonical/models/front/289--0--Slaking.gif similarity index 100% rename from src/canonical/models/front/Slaking.gif rename to src/canonical/models/front/289--0--Slaking.gif diff --git a/src/canonical/models/front/Nidoran-F.gif b/src/canonical/models/front/29--0--Nidoran-F.gif similarity index 100% rename from src/canonical/models/front/Nidoran-F.gif rename to src/canonical/models/front/29--0--Nidoran-F.gif diff --git a/src/canonical/models/front/Nincada.gif b/src/canonical/models/front/290--0--Nincada.gif similarity index 100% rename from src/canonical/models/front/Nincada.gif rename to src/canonical/models/front/290--0--Nincada.gif diff --git a/src/canonical/models/front/Ninjask.gif b/src/canonical/models/front/291--0--Ninjask.gif similarity index 100% rename from src/canonical/models/front/Ninjask.gif rename to src/canonical/models/front/291--0--Ninjask.gif diff --git a/src/canonical/models/front/Shedinja.gif b/src/canonical/models/front/292--0--Shedinja.gif similarity index 100% rename from src/canonical/models/front/Shedinja.gif rename to src/canonical/models/front/292--0--Shedinja.gif diff --git a/src/canonical/models/front/Whismur.gif b/src/canonical/models/front/293--0--Whismur.gif similarity index 100% rename from src/canonical/models/front/Whismur.gif rename to src/canonical/models/front/293--0--Whismur.gif diff --git a/src/canonical/models/front/Loudred.gif b/src/canonical/models/front/294--0--Loudred.gif similarity index 100% rename from src/canonical/models/front/Loudred.gif rename to src/canonical/models/front/294--0--Loudred.gif diff --git a/src/canonical/models/front/Exploud.gif b/src/canonical/models/front/295--0--Exploud.gif similarity index 100% rename from src/canonical/models/front/Exploud.gif rename to src/canonical/models/front/295--0--Exploud.gif diff --git a/src/canonical/models/front/Makuhita.gif b/src/canonical/models/front/296--0--Makuhita.gif similarity index 100% rename from src/canonical/models/front/Makuhita.gif rename to src/canonical/models/front/296--0--Makuhita.gif diff --git a/src/canonical/models/front/Hariyama.gif b/src/canonical/models/front/297--0--Hariyama.gif similarity index 100% rename from src/canonical/models/front/Hariyama.gif rename to src/canonical/models/front/297--0--Hariyama.gif diff --git a/src/canonical/models/front/Azurill.gif b/src/canonical/models/front/298--0--Azurill.gif similarity index 100% rename from src/canonical/models/front/Azurill.gif rename to src/canonical/models/front/298--0--Azurill.gif diff --git a/src/canonical/models/front/Nosepass.gif b/src/canonical/models/front/299--0--Nosepass.gif similarity index 100% rename from src/canonical/models/front/Nosepass.gif rename to src/canonical/models/front/299--0--Nosepass.gif diff --git a/src/canonical/models/front/Venusaur.gif b/src/canonical/models/front/3--0--Venusaur.gif similarity index 100% rename from src/canonical/models/front/Venusaur.gif rename to src/canonical/models/front/3--0--Venusaur.gif diff --git a/src/canonical/models/front/Venusaur--Mega.gif b/src/canonical/models/front/3--420--Venusaur--Mega.gif similarity index 100% rename from src/canonical/models/front/Venusaur--Mega.gif rename to src/canonical/models/front/3--420--Venusaur--Mega.gif diff --git a/src/canonical/models/front/Nidorina.gif b/src/canonical/models/front/30--0--Nidorina.gif similarity index 100% rename from src/canonical/models/front/Nidorina.gif rename to src/canonical/models/front/30--0--Nidorina.gif diff --git a/src/canonical/models/front/Skitty.gif b/src/canonical/models/front/300--0--Skitty.gif similarity index 100% rename from src/canonical/models/front/Skitty.gif rename to src/canonical/models/front/300--0--Skitty.gif diff --git a/src/canonical/models/front/Delcatty.gif b/src/canonical/models/front/301--0--Delcatty.gif similarity index 100% rename from src/canonical/models/front/Delcatty.gif rename to src/canonical/models/front/301--0--Delcatty.gif diff --git a/src/canonical/models/front/Sableye.gif b/src/canonical/models/front/302--0--Sableye.gif similarity index 100% rename from src/canonical/models/front/Sableye.gif rename to src/canonical/models/front/302--0--Sableye.gif diff --git a/src/canonical/models/front/Sableye--Mega.gif b/src/canonical/models/front/302--420--Sableye--Mega.gif similarity index 100% rename from src/canonical/models/front/Sableye--Mega.gif rename to src/canonical/models/front/302--420--Sableye--Mega.gif diff --git a/src/canonical/models/front/Mawile.gif b/src/canonical/models/front/303--0--Mawile.gif similarity index 100% rename from src/canonical/models/front/Mawile.gif rename to src/canonical/models/front/303--0--Mawile.gif diff --git a/src/canonical/models/front/Mawile--Mega.gif b/src/canonical/models/front/303--420--Mawile--Mega.gif similarity index 100% rename from src/canonical/models/front/Mawile--Mega.gif rename to src/canonical/models/front/303--420--Mawile--Mega.gif diff --git a/src/canonical/models/front/Aron.gif b/src/canonical/models/front/304--0--Aron.gif similarity index 100% rename from src/canonical/models/front/Aron.gif rename to src/canonical/models/front/304--0--Aron.gif diff --git a/src/canonical/models/front/Lairon.gif b/src/canonical/models/front/305--0--Lairon.gif similarity index 100% rename from src/canonical/models/front/Lairon.gif rename to src/canonical/models/front/305--0--Lairon.gif diff --git a/src/canonical/models/front/Aggron.gif b/src/canonical/models/front/306--0--Aggron.gif similarity index 100% rename from src/canonical/models/front/Aggron.gif rename to src/canonical/models/front/306--0--Aggron.gif diff --git a/src/canonical/models/front/Aggron--Mega.gif b/src/canonical/models/front/306--420--Aggron--Mega.gif similarity index 100% rename from src/canonical/models/front/Aggron--Mega.gif rename to src/canonical/models/front/306--420--Aggron--Mega.gif diff --git a/src/canonical/models/front/Meditite.gif b/src/canonical/models/front/307--0--Meditite.gif similarity index 100% rename from src/canonical/models/front/Meditite.gif rename to src/canonical/models/front/307--0--Meditite.gif diff --git a/src/canonical/models/front/Medicham.gif b/src/canonical/models/front/308--0--Medicham.gif similarity index 100% rename from src/canonical/models/front/Medicham.gif rename to src/canonical/models/front/308--0--Medicham.gif diff --git a/src/canonical/models/front/Medicham--Mega.gif b/src/canonical/models/front/308--420--Medicham--Mega.gif similarity index 100% rename from src/canonical/models/front/Medicham--Mega.gif rename to src/canonical/models/front/308--420--Medicham--Mega.gif diff --git a/src/canonical/models/front/Electrike.gif b/src/canonical/models/front/309--0--Electrike.gif similarity index 100% rename from src/canonical/models/front/Electrike.gif rename to src/canonical/models/front/309--0--Electrike.gif diff --git a/src/canonical/models/front/Nidoqueen.gif b/src/canonical/models/front/31--0--Nidoqueen.gif similarity index 100% rename from src/canonical/models/front/Nidoqueen.gif rename to src/canonical/models/front/31--0--Nidoqueen.gif diff --git a/src/canonical/models/front/Manectric.gif b/src/canonical/models/front/310--0--Manectric.gif similarity index 100% rename from src/canonical/models/front/Manectric.gif rename to src/canonical/models/front/310--0--Manectric.gif diff --git a/src/canonical/models/front/Manectric--Mega.gif b/src/canonical/models/front/310--420--Manectric--Mega.gif similarity index 100% rename from src/canonical/models/front/Manectric--Mega.gif rename to src/canonical/models/front/310--420--Manectric--Mega.gif diff --git a/src/canonical/models/front/Plusle.gif b/src/canonical/models/front/311--0--Plusle.gif similarity index 100% rename from src/canonical/models/front/Plusle.gif rename to src/canonical/models/front/311--0--Plusle.gif diff --git a/src/canonical/models/front/Minun.gif b/src/canonical/models/front/312--0--Minun.gif similarity index 100% rename from src/canonical/models/front/Minun.gif rename to src/canonical/models/front/312--0--Minun.gif diff --git a/src/canonical/models/front/Volbeat.gif b/src/canonical/models/front/313--0--Volbeat.gif similarity index 100% rename from src/canonical/models/front/Volbeat.gif rename to src/canonical/models/front/313--0--Volbeat.gif diff --git a/src/canonical/models/front/Illumise.gif b/src/canonical/models/front/314--0--Illumise.gif similarity index 100% rename from src/canonical/models/front/Illumise.gif rename to src/canonical/models/front/314--0--Illumise.gif diff --git a/src/canonical/models/front/Roselia.gif b/src/canonical/models/front/315--0--Roselia.gif similarity index 100% rename from src/canonical/models/front/Roselia.gif rename to src/canonical/models/front/315--0--Roselia.gif diff --git a/src/canonical/models/front/Gulpin.gif b/src/canonical/models/front/316--0--Gulpin.gif similarity index 100% rename from src/canonical/models/front/Gulpin.gif rename to src/canonical/models/front/316--0--Gulpin.gif diff --git a/src/canonical/models/front/Swalot.gif b/src/canonical/models/front/317--0--Swalot.gif similarity index 100% rename from src/canonical/models/front/Swalot.gif rename to src/canonical/models/front/317--0--Swalot.gif diff --git a/src/canonical/models/front/Carvanha.gif b/src/canonical/models/front/318--0--Carvanha.gif similarity index 100% rename from src/canonical/models/front/Carvanha.gif rename to src/canonical/models/front/318--0--Carvanha.gif diff --git a/src/canonical/models/front/Sharpedo.gif b/src/canonical/models/front/319--0--Sharpedo.gif similarity index 100% rename from src/canonical/models/front/Sharpedo.gif rename to src/canonical/models/front/319--0--Sharpedo.gif diff --git a/src/canonical/models/front/Sharpedo--Mega.gif b/src/canonical/models/front/319--420--Sharpedo--Mega.gif similarity index 100% rename from src/canonical/models/front/Sharpedo--Mega.gif rename to src/canonical/models/front/319--420--Sharpedo--Mega.gif diff --git a/src/canonical/models/front/Nidoran-M.gif b/src/canonical/models/front/32--0--Nidoran-M.gif similarity index 100% rename from src/canonical/models/front/Nidoran-M.gif rename to src/canonical/models/front/32--0--Nidoran-M.gif diff --git a/src/canonical/models/front/Wailmer.gif b/src/canonical/models/front/320--0--Wailmer.gif similarity index 100% rename from src/canonical/models/front/Wailmer.gif rename to src/canonical/models/front/320--0--Wailmer.gif diff --git a/src/canonical/models/front/Wailord.gif b/src/canonical/models/front/321--0--Wailord.gif similarity index 100% rename from src/canonical/models/front/Wailord.gif rename to src/canonical/models/front/321--0--Wailord.gif diff --git a/src/canonical/models/front/Numel.gif b/src/canonical/models/front/322--0--Numel.gif similarity index 100% rename from src/canonical/models/front/Numel.gif rename to src/canonical/models/front/322--0--Numel.gif diff --git a/src/canonical/models/front/Camerupt.gif b/src/canonical/models/front/323--0--Camerupt.gif similarity index 100% rename from src/canonical/models/front/Camerupt.gif rename to src/canonical/models/front/323--0--Camerupt.gif diff --git a/src/canonical/models/front/Camerupt--Mega.gif b/src/canonical/models/front/323--420--Camerupt--Mega.gif similarity index 100% rename from src/canonical/models/front/Camerupt--Mega.gif rename to src/canonical/models/front/323--420--Camerupt--Mega.gif diff --git a/src/canonical/models/front/Torkoal.gif b/src/canonical/models/front/324--0--Torkoal.gif similarity index 100% rename from src/canonical/models/front/Torkoal.gif rename to src/canonical/models/front/324--0--Torkoal.gif diff --git a/src/canonical/models/front/Spoink.gif b/src/canonical/models/front/325--0--Spoink.gif similarity index 100% rename from src/canonical/models/front/Spoink.gif rename to src/canonical/models/front/325--0--Spoink.gif diff --git a/src/canonical/models/front/Grumpig.gif b/src/canonical/models/front/326--0--Grumpig.gif similarity index 100% rename from src/canonical/models/front/Grumpig.gif rename to src/canonical/models/front/326--0--Grumpig.gif diff --git a/src/canonical/models/front/Spinda.gif b/src/canonical/models/front/327--0--Spinda.gif similarity index 100% rename from src/canonical/models/front/Spinda.gif rename to src/canonical/models/front/327--0--Spinda.gif diff --git a/src/canonical/models/front/Trapinch.gif b/src/canonical/models/front/328--0--Trapinch.gif similarity index 100% rename from src/canonical/models/front/Trapinch.gif rename to src/canonical/models/front/328--0--Trapinch.gif diff --git a/src/canonical/models/front/Vibrava.gif b/src/canonical/models/front/329--0--Vibrava.gif similarity index 100% rename from src/canonical/models/front/Vibrava.gif rename to src/canonical/models/front/329--0--Vibrava.gif diff --git a/src/canonical/models/front/Nidorino.gif b/src/canonical/models/front/33--0--Nidorino.gif similarity index 100% rename from src/canonical/models/front/Nidorino.gif rename to src/canonical/models/front/33--0--Nidorino.gif diff --git a/src/canonical/models/front/Flygon.gif b/src/canonical/models/front/330--0--Flygon.gif similarity index 100% rename from src/canonical/models/front/Flygon.gif rename to src/canonical/models/front/330--0--Flygon.gif diff --git a/src/canonical/models/front/Cacnea.gif b/src/canonical/models/front/331--0--Cacnea.gif similarity index 100% rename from src/canonical/models/front/Cacnea.gif rename to src/canonical/models/front/331--0--Cacnea.gif diff --git a/src/canonical/models/front/Cacturne.gif b/src/canonical/models/front/332--0--Cacturne.gif similarity index 100% rename from src/canonical/models/front/Cacturne.gif rename to src/canonical/models/front/332--0--Cacturne.gif diff --git a/src/canonical/models/front/Swablu.gif b/src/canonical/models/front/333--0--Swablu.gif similarity index 100% rename from src/canonical/models/front/Swablu.gif rename to src/canonical/models/front/333--0--Swablu.gif diff --git a/src/canonical/models/front/Altaria.gif b/src/canonical/models/front/334--0--Altaria.gif similarity index 100% rename from src/canonical/models/front/Altaria.gif rename to src/canonical/models/front/334--0--Altaria.gif diff --git a/src/canonical/models/front/Altaria--Mega.gif b/src/canonical/models/front/334--420--Altaria--Mega.gif similarity index 100% rename from src/canonical/models/front/Altaria--Mega.gif rename to src/canonical/models/front/334--420--Altaria--Mega.gif diff --git a/src/canonical/models/front/Zangoose.gif b/src/canonical/models/front/335--0--Zangoose.gif similarity index 100% rename from src/canonical/models/front/Zangoose.gif rename to src/canonical/models/front/335--0--Zangoose.gif diff --git a/src/canonical/models/front/Seviper.gif b/src/canonical/models/front/336--0--Seviper.gif similarity index 100% rename from src/canonical/models/front/Seviper.gif rename to src/canonical/models/front/336--0--Seviper.gif diff --git a/src/canonical/models/front/Lunatone.gif b/src/canonical/models/front/337--0--Lunatone.gif similarity index 100% rename from src/canonical/models/front/Lunatone.gif rename to src/canonical/models/front/337--0--Lunatone.gif diff --git a/src/canonical/models/front/Solrock.gif b/src/canonical/models/front/338--0--Solrock.gif similarity index 100% rename from src/canonical/models/front/Solrock.gif rename to src/canonical/models/front/338--0--Solrock.gif diff --git a/src/canonical/models/front/Barboach.gif b/src/canonical/models/front/339--0--Barboach.gif similarity index 100% rename from src/canonical/models/front/Barboach.gif rename to src/canonical/models/front/339--0--Barboach.gif diff --git a/src/canonical/models/front/Nidoking.gif b/src/canonical/models/front/34--0--Nidoking.gif similarity index 100% rename from src/canonical/models/front/Nidoking.gif rename to src/canonical/models/front/34--0--Nidoking.gif diff --git a/src/canonical/models/front/Whiscash.gif b/src/canonical/models/front/340--0--Whiscash.gif similarity index 100% rename from src/canonical/models/front/Whiscash.gif rename to src/canonical/models/front/340--0--Whiscash.gif diff --git a/src/canonical/models/front/Corphish.gif b/src/canonical/models/front/341--0--Corphish.gif similarity index 100% rename from src/canonical/models/front/Corphish.gif rename to src/canonical/models/front/341--0--Corphish.gif diff --git a/src/canonical/models/front/Crawdaunt.gif b/src/canonical/models/front/342--0--Crawdaunt.gif similarity index 100% rename from src/canonical/models/front/Crawdaunt.gif rename to src/canonical/models/front/342--0--Crawdaunt.gif diff --git a/src/canonical/models/front/Baltoy.gif b/src/canonical/models/front/343--0--Baltoy.gif similarity index 100% rename from src/canonical/models/front/Baltoy.gif rename to src/canonical/models/front/343--0--Baltoy.gif diff --git a/src/canonical/models/front/Claydol.gif b/src/canonical/models/front/344--0--Claydol.gif similarity index 100% rename from src/canonical/models/front/Claydol.gif rename to src/canonical/models/front/344--0--Claydol.gif diff --git a/src/canonical/models/front/Lileep.gif b/src/canonical/models/front/345--0--Lileep.gif similarity index 100% rename from src/canonical/models/front/Lileep.gif rename to src/canonical/models/front/345--0--Lileep.gif diff --git a/src/canonical/models/front/Cradily.gif b/src/canonical/models/front/346--0--Cradily.gif similarity index 100% rename from src/canonical/models/front/Cradily.gif rename to src/canonical/models/front/346--0--Cradily.gif diff --git a/src/canonical/models/front/Anorith.gif b/src/canonical/models/front/347--0--Anorith.gif similarity index 100% rename from src/canonical/models/front/Anorith.gif rename to src/canonical/models/front/347--0--Anorith.gif diff --git a/src/canonical/models/front/Armaldo.gif b/src/canonical/models/front/348--0--Armaldo.gif similarity index 100% rename from src/canonical/models/front/Armaldo.gif rename to src/canonical/models/front/348--0--Armaldo.gif diff --git a/src/canonical/models/front/Feebas.gif b/src/canonical/models/front/349--0--Feebas.gif similarity index 100% rename from src/canonical/models/front/Feebas.gif rename to src/canonical/models/front/349--0--Feebas.gif diff --git a/src/canonical/models/front/Clefairy.gif b/src/canonical/models/front/35--0--Clefairy.gif similarity index 100% rename from src/canonical/models/front/Clefairy.gif rename to src/canonical/models/front/35--0--Clefairy.gif diff --git a/src/canonical/models/front/Milotic.gif b/src/canonical/models/front/350--0--Milotic.gif similarity index 100% rename from src/canonical/models/front/Milotic.gif rename to src/canonical/models/front/350--0--Milotic.gif diff --git a/src/canonical/models/front/Castform.gif b/src/canonical/models/front/351--0--Castform.gif similarity index 100% rename from src/canonical/models/front/Castform.gif rename to src/canonical/models/front/351--0--Castform.gif diff --git a/src/canonical/models/front/Castform--Rainy.gif b/src/canonical/models/front/351--420--Castform--Rainy.gif similarity index 100% rename from src/canonical/models/front/Castform--Rainy.gif rename to src/canonical/models/front/351--420--Castform--Rainy.gif diff --git a/src/canonical/models/front/Castform--Snowy.gif b/src/canonical/models/front/351--420--Castform--Snowy.gif similarity index 100% rename from src/canonical/models/front/Castform--Snowy.gif rename to src/canonical/models/front/351--420--Castform--Snowy.gif diff --git a/src/canonical/models/front/Castform--Sunny.gif b/src/canonical/models/front/351--420--Castform--Sunny.gif similarity index 100% rename from src/canonical/models/front/Castform--Sunny.gif rename to src/canonical/models/front/351--420--Castform--Sunny.gif diff --git a/src/canonical/models/front/Kecleon.gif b/src/canonical/models/front/352--0--Kecleon.gif similarity index 100% rename from src/canonical/models/front/Kecleon.gif rename to src/canonical/models/front/352--0--Kecleon.gif diff --git a/src/canonical/models/front/Shuppet.gif b/src/canonical/models/front/353--0--Shuppet.gif similarity index 100% rename from src/canonical/models/front/Shuppet.gif rename to src/canonical/models/front/353--0--Shuppet.gif diff --git a/src/canonical/models/front/Banette.gif b/src/canonical/models/front/354--0--Banette.gif similarity index 100% rename from src/canonical/models/front/Banette.gif rename to src/canonical/models/front/354--0--Banette.gif diff --git a/src/canonical/models/front/Banette--Mega.gif b/src/canonical/models/front/354--420--Banette--Mega.gif similarity index 100% rename from src/canonical/models/front/Banette--Mega.gif rename to src/canonical/models/front/354--420--Banette--Mega.gif diff --git a/src/canonical/models/front/Duskull.gif b/src/canonical/models/front/355--0--Duskull.gif similarity index 100% rename from src/canonical/models/front/Duskull.gif rename to src/canonical/models/front/355--0--Duskull.gif diff --git a/src/canonical/models/front/Dusclops.gif b/src/canonical/models/front/356--0--Dusclops.gif similarity index 100% rename from src/canonical/models/front/Dusclops.gif rename to src/canonical/models/front/356--0--Dusclops.gif diff --git a/src/canonical/models/front/Tropius.gif b/src/canonical/models/front/357--0--Tropius.gif similarity index 100% rename from src/canonical/models/front/Tropius.gif rename to src/canonical/models/front/357--0--Tropius.gif diff --git a/src/canonical/models/front/Chimecho.gif b/src/canonical/models/front/358--0--Chimecho.gif similarity index 100% rename from src/canonical/models/front/Chimecho.gif rename to src/canonical/models/front/358--0--Chimecho.gif diff --git a/src/canonical/models/front/Absol.gif b/src/canonical/models/front/359--0--Absol.gif similarity index 100% rename from src/canonical/models/front/Absol.gif rename to src/canonical/models/front/359--0--Absol.gif diff --git a/src/canonical/models/front/Absol--Mega.gif b/src/canonical/models/front/359--420--Absol--Mega.gif similarity index 100% rename from src/canonical/models/front/Absol--Mega.gif rename to src/canonical/models/front/359--420--Absol--Mega.gif diff --git a/src/canonical/models/front/Clefable.gif b/src/canonical/models/front/36--0--Clefable.gif similarity index 100% rename from src/canonical/models/front/Clefable.gif rename to src/canonical/models/front/36--0--Clefable.gif diff --git a/src/canonical/models/front/Wynaut.gif b/src/canonical/models/front/360--0--Wynaut.gif similarity index 100% rename from src/canonical/models/front/Wynaut.gif rename to src/canonical/models/front/360--0--Wynaut.gif diff --git a/src/canonical/models/front/Snorunt.gif b/src/canonical/models/front/361--0--Snorunt.gif similarity index 100% rename from src/canonical/models/front/Snorunt.gif rename to src/canonical/models/front/361--0--Snorunt.gif diff --git a/src/canonical/models/front/Glalie.gif b/src/canonical/models/front/362--0--Glalie.gif similarity index 100% rename from src/canonical/models/front/Glalie.gif rename to src/canonical/models/front/362--0--Glalie.gif diff --git a/src/canonical/models/front/Glalie--Mega.gif b/src/canonical/models/front/362--420--Glalie--Mega.gif similarity index 100% rename from src/canonical/models/front/Glalie--Mega.gif rename to src/canonical/models/front/362--420--Glalie--Mega.gif diff --git a/src/canonical/models/front/Spheal.gif b/src/canonical/models/front/363--0--Spheal.gif similarity index 100% rename from src/canonical/models/front/Spheal.gif rename to src/canonical/models/front/363--0--Spheal.gif diff --git a/src/canonical/models/front/Sealeo.gif b/src/canonical/models/front/364--0--Sealeo.gif similarity index 100% rename from src/canonical/models/front/Sealeo.gif rename to src/canonical/models/front/364--0--Sealeo.gif diff --git a/src/canonical/models/front/Walrein.gif b/src/canonical/models/front/365--0--Walrein.gif similarity index 100% rename from src/canonical/models/front/Walrein.gif rename to src/canonical/models/front/365--0--Walrein.gif diff --git a/src/canonical/models/front/Clamperl.gif b/src/canonical/models/front/366--0--Clamperl.gif similarity index 100% rename from src/canonical/models/front/Clamperl.gif rename to src/canonical/models/front/366--0--Clamperl.gif diff --git a/src/canonical/models/front/Huntail.gif b/src/canonical/models/front/367--0--Huntail.gif similarity index 100% rename from src/canonical/models/front/Huntail.gif rename to src/canonical/models/front/367--0--Huntail.gif diff --git a/src/canonical/models/front/Gorebyss.gif b/src/canonical/models/front/368--0--Gorebyss.gif similarity index 100% rename from src/canonical/models/front/Gorebyss.gif rename to src/canonical/models/front/368--0--Gorebyss.gif diff --git a/src/canonical/models/front/Relicanth.gif b/src/canonical/models/front/369--0--Relicanth.gif similarity index 100% rename from src/canonical/models/front/Relicanth.gif rename to src/canonical/models/front/369--0--Relicanth.gif diff --git a/src/canonical/models/front/Vulpix.gif b/src/canonical/models/front/37--0--Vulpix.gif similarity index 100% rename from src/canonical/models/front/Vulpix.gif rename to src/canonical/models/front/37--0--Vulpix.gif diff --git a/src/canonical/models/front/Vulpix--Alola.gif b/src/canonical/models/front/37--420--Vulpix--Alola.gif similarity index 100% rename from src/canonical/models/front/Vulpix--Alola.gif rename to src/canonical/models/front/37--420--Vulpix--Alola.gif diff --git a/src/canonical/models/front/Luvdisc.gif b/src/canonical/models/front/370--0--Luvdisc.gif similarity index 100% rename from src/canonical/models/front/Luvdisc.gif rename to src/canonical/models/front/370--0--Luvdisc.gif diff --git a/src/canonical/models/front/Bagon.gif b/src/canonical/models/front/371--0--Bagon.gif similarity index 100% rename from src/canonical/models/front/Bagon.gif rename to src/canonical/models/front/371--0--Bagon.gif diff --git a/src/canonical/models/front/Shelgon.gif b/src/canonical/models/front/372--0--Shelgon.gif similarity index 100% rename from src/canonical/models/front/Shelgon.gif rename to src/canonical/models/front/372--0--Shelgon.gif diff --git a/src/canonical/models/front/Salamence.gif b/src/canonical/models/front/373--0--Salamence.gif similarity index 100% rename from src/canonical/models/front/Salamence.gif rename to src/canonical/models/front/373--0--Salamence.gif diff --git a/src/canonical/models/front/Salamence--Mega.gif b/src/canonical/models/front/373--420--Salamence--Mega.gif similarity index 100% rename from src/canonical/models/front/Salamence--Mega.gif rename to src/canonical/models/front/373--420--Salamence--Mega.gif diff --git a/src/canonical/models/front/Beldum.gif b/src/canonical/models/front/374--0--Beldum.gif similarity index 100% rename from src/canonical/models/front/Beldum.gif rename to src/canonical/models/front/374--0--Beldum.gif diff --git a/src/canonical/models/front/Metang.gif b/src/canonical/models/front/375--0--Metang.gif similarity index 100% rename from src/canonical/models/front/Metang.gif rename to src/canonical/models/front/375--0--Metang.gif diff --git a/src/canonical/models/front/Metagross.gif b/src/canonical/models/front/376--0--Metagross.gif similarity index 100% rename from src/canonical/models/front/Metagross.gif rename to src/canonical/models/front/376--0--Metagross.gif diff --git a/src/canonical/models/front/Metagross--Mega.gif b/src/canonical/models/front/376--420--Metagross--Mega.gif similarity index 100% rename from src/canonical/models/front/Metagross--Mega.gif rename to src/canonical/models/front/376--420--Metagross--Mega.gif diff --git a/src/canonical/models/front/Regirock.gif b/src/canonical/models/front/377--0--Regirock.gif similarity index 100% rename from src/canonical/models/front/Regirock.gif rename to src/canonical/models/front/377--0--Regirock.gif diff --git a/src/canonical/models/front/Regice.gif b/src/canonical/models/front/378--0--Regice.gif similarity index 100% rename from src/canonical/models/front/Regice.gif rename to src/canonical/models/front/378--0--Regice.gif diff --git a/src/canonical/models/front/Registeel.gif b/src/canonical/models/front/379--0--Registeel.gif similarity index 100% rename from src/canonical/models/front/Registeel.gif rename to src/canonical/models/front/379--0--Registeel.gif diff --git a/src/canonical/models/front/Ninetales.gif b/src/canonical/models/front/38--0--Ninetales.gif similarity index 100% rename from src/canonical/models/front/Ninetales.gif rename to src/canonical/models/front/38--0--Ninetales.gif diff --git a/src/canonical/models/front/Ninetales--Alola.gif b/src/canonical/models/front/38--420--Ninetales--Alola.gif similarity index 100% rename from src/canonical/models/front/Ninetales--Alola.gif rename to src/canonical/models/front/38--420--Ninetales--Alola.gif diff --git a/src/canonical/models/front/Latias.gif b/src/canonical/models/front/380--0--Latias.gif similarity index 100% rename from src/canonical/models/front/Latias.gif rename to src/canonical/models/front/380--0--Latias.gif diff --git a/src/canonical/models/front/Latias--Mega.gif b/src/canonical/models/front/380--420--Latias--Mega.gif similarity index 100% rename from src/canonical/models/front/Latias--Mega.gif rename to src/canonical/models/front/380--420--Latias--Mega.gif diff --git a/src/canonical/models/front/Latios.gif b/src/canonical/models/front/381--0--Latios.gif similarity index 100% rename from src/canonical/models/front/Latios.gif rename to src/canonical/models/front/381--0--Latios.gif diff --git a/src/canonical/models/front/Latios--Mega.gif b/src/canonical/models/front/381--420--Latios--Mega.gif similarity index 100% rename from src/canonical/models/front/Latios--Mega.gif rename to src/canonical/models/front/381--420--Latios--Mega.gif diff --git a/src/canonical/models/front/Kyogre.gif b/src/canonical/models/front/382--0--Kyogre.gif similarity index 100% rename from src/canonical/models/front/Kyogre.gif rename to src/canonical/models/front/382--0--Kyogre.gif diff --git a/src/canonical/models/front/Kyogre--Primal.gif b/src/canonical/models/front/382--420--Kyogre--Primal.gif similarity index 100% rename from src/canonical/models/front/Kyogre--Primal.gif rename to src/canonical/models/front/382--420--Kyogre--Primal.gif diff --git a/src/canonical/models/front/Groudon.gif b/src/canonical/models/front/383--0--Groudon.gif similarity index 100% rename from src/canonical/models/front/Groudon.gif rename to src/canonical/models/front/383--0--Groudon.gif diff --git a/src/canonical/models/front/Groudon--Primal.gif b/src/canonical/models/front/383--420--Groudon--Primal.gif similarity index 100% rename from src/canonical/models/front/Groudon--Primal.gif rename to src/canonical/models/front/383--420--Groudon--Primal.gif diff --git a/src/canonical/models/front/Rayquaza.gif b/src/canonical/models/front/384--0--Rayquaza.gif similarity index 100% rename from src/canonical/models/front/Rayquaza.gif rename to src/canonical/models/front/384--0--Rayquaza.gif diff --git a/src/canonical/models/front/Rayquaza--Mega.gif b/src/canonical/models/front/384--420--Rayquaza--Mega.gif similarity index 100% rename from src/canonical/models/front/Rayquaza--Mega.gif rename to src/canonical/models/front/384--420--Rayquaza--Mega.gif diff --git a/src/canonical/models/front/Jirachi.gif b/src/canonical/models/front/385--0--Jirachi.gif similarity index 100% rename from src/canonical/models/front/Jirachi.gif rename to src/canonical/models/front/385--0--Jirachi.gif diff --git a/src/canonical/models/front/Deoxys.gif b/src/canonical/models/front/386--0--Deoxys.gif similarity index 100% rename from src/canonical/models/front/Deoxys.gif rename to src/canonical/models/front/386--0--Deoxys.gif diff --git a/src/canonical/models/front/Deoxys--Attack.gif b/src/canonical/models/front/386--420--Deoxys--Attack.gif similarity index 100% rename from src/canonical/models/front/Deoxys--Attack.gif rename to src/canonical/models/front/386--420--Deoxys--Attack.gif diff --git a/src/canonical/models/front/Deoxys--Defense.gif b/src/canonical/models/front/386--420--Deoxys--Defense.gif similarity index 100% rename from src/canonical/models/front/Deoxys--Defense.gif rename to src/canonical/models/front/386--420--Deoxys--Defense.gif diff --git a/src/canonical/models/front/Deoxys--Speed.gif b/src/canonical/models/front/386--420--Deoxys--Speed.gif similarity index 100% rename from src/canonical/models/front/Deoxys--Speed.gif rename to src/canonical/models/front/386--420--Deoxys--Speed.gif diff --git a/src/canonical/models/front/Turtwig.gif b/src/canonical/models/front/387--0--Turtwig.gif similarity index 100% rename from src/canonical/models/front/Turtwig.gif rename to src/canonical/models/front/387--0--Turtwig.gif diff --git a/src/canonical/models/front/Grotle.gif b/src/canonical/models/front/388--0--Grotle.gif similarity index 100% rename from src/canonical/models/front/Grotle.gif rename to src/canonical/models/front/388--0--Grotle.gif diff --git a/src/canonical/models/front/Torterra.gif b/src/canonical/models/front/389--0--Torterra.gif similarity index 100% rename from src/canonical/models/front/Torterra.gif rename to src/canonical/models/front/389--0--Torterra.gif diff --git a/src/canonical/models/front/Jigglypuff.gif b/src/canonical/models/front/39--0--Jigglypuff.gif similarity index 100% rename from src/canonical/models/front/Jigglypuff.gif rename to src/canonical/models/front/39--0--Jigglypuff.gif diff --git a/src/canonical/models/front/Chimchar.gif b/src/canonical/models/front/390--0--Chimchar.gif similarity index 100% rename from src/canonical/models/front/Chimchar.gif rename to src/canonical/models/front/390--0--Chimchar.gif diff --git a/src/canonical/models/front/Monferno.gif b/src/canonical/models/front/391--0--Monferno.gif similarity index 100% rename from src/canonical/models/front/Monferno.gif rename to src/canonical/models/front/391--0--Monferno.gif diff --git a/src/canonical/models/front/Infernape.gif b/src/canonical/models/front/392--0--Infernape.gif similarity index 100% rename from src/canonical/models/front/Infernape.gif rename to src/canonical/models/front/392--0--Infernape.gif diff --git a/src/canonical/models/front/Piplup.gif b/src/canonical/models/front/393--0--Piplup.gif similarity index 100% rename from src/canonical/models/front/Piplup.gif rename to src/canonical/models/front/393--0--Piplup.gif diff --git a/src/canonical/models/front/Prinplup.gif b/src/canonical/models/front/394--0--Prinplup.gif similarity index 100% rename from src/canonical/models/front/Prinplup.gif rename to src/canonical/models/front/394--0--Prinplup.gif diff --git a/src/canonical/models/front/Empoleon.gif b/src/canonical/models/front/395--0--Empoleon.gif similarity index 100% rename from src/canonical/models/front/Empoleon.gif rename to src/canonical/models/front/395--0--Empoleon.gif diff --git a/src/canonical/models/front/Starly.gif b/src/canonical/models/front/396--0--Starly.gif similarity index 100% rename from src/canonical/models/front/Starly.gif rename to src/canonical/models/front/396--0--Starly.gif diff --git a/src/canonical/models/front/Staravia.gif b/src/canonical/models/front/397--0--Staravia.gif similarity index 100% rename from src/canonical/models/front/Staravia.gif rename to src/canonical/models/front/397--0--Staravia.gif diff --git a/src/canonical/models/front/Staraptor.gif b/src/canonical/models/front/398--0--Staraptor.gif similarity index 100% rename from src/canonical/models/front/Staraptor.gif rename to src/canonical/models/front/398--0--Staraptor.gif diff --git a/src/canonical/models/front/Bidoof.gif b/src/canonical/models/front/399--0--Bidoof.gif similarity index 100% rename from src/canonical/models/front/Bidoof.gif rename to src/canonical/models/front/399--0--Bidoof.gif diff --git a/src/canonical/models/front/Charmander.gif b/src/canonical/models/front/4--0--Charmander.gif similarity index 100% rename from src/canonical/models/front/Charmander.gif rename to src/canonical/models/front/4--0--Charmander.gif diff --git a/src/canonical/models/front/Wigglytuff.gif b/src/canonical/models/front/40--0--Wigglytuff.gif similarity index 100% rename from src/canonical/models/front/Wigglytuff.gif rename to src/canonical/models/front/40--0--Wigglytuff.gif diff --git a/src/canonical/models/front/Bibarel.gif b/src/canonical/models/front/400--0--Bibarel.gif similarity index 100% rename from src/canonical/models/front/Bibarel.gif rename to src/canonical/models/front/400--0--Bibarel.gif diff --git a/src/canonical/models/front/Kricketot.gif b/src/canonical/models/front/401--0--Kricketot.gif similarity index 100% rename from src/canonical/models/front/Kricketot.gif rename to src/canonical/models/front/401--0--Kricketot.gif diff --git a/src/canonical/models/front/Kricketune.gif b/src/canonical/models/front/402--0--Kricketune.gif similarity index 100% rename from src/canonical/models/front/Kricketune.gif rename to src/canonical/models/front/402--0--Kricketune.gif diff --git a/src/canonical/models/front/Shinx.gif b/src/canonical/models/front/403--0--Shinx.gif similarity index 100% rename from src/canonical/models/front/Shinx.gif rename to src/canonical/models/front/403--0--Shinx.gif diff --git a/src/canonical/models/front/Luxio.gif b/src/canonical/models/front/404--0--Luxio.gif similarity index 100% rename from src/canonical/models/front/Luxio.gif rename to src/canonical/models/front/404--0--Luxio.gif diff --git a/src/canonical/models/front/Luxray.gif b/src/canonical/models/front/405--0--Luxray.gif similarity index 100% rename from src/canonical/models/front/Luxray.gif rename to src/canonical/models/front/405--0--Luxray.gif diff --git a/src/canonical/models/front/Budew.gif b/src/canonical/models/front/406--0--Budew.gif similarity index 100% rename from src/canonical/models/front/Budew.gif rename to src/canonical/models/front/406--0--Budew.gif diff --git a/src/canonical/models/front/Roserade.gif b/src/canonical/models/front/407--0--Roserade.gif similarity index 100% rename from src/canonical/models/front/Roserade.gif rename to src/canonical/models/front/407--0--Roserade.gif diff --git a/src/canonical/models/front/Cranidos.gif b/src/canonical/models/front/408--0--Cranidos.gif similarity index 100% rename from src/canonical/models/front/Cranidos.gif rename to src/canonical/models/front/408--0--Cranidos.gif diff --git a/src/canonical/models/front/Rampardos.gif b/src/canonical/models/front/409--0--Rampardos.gif similarity index 100% rename from src/canonical/models/front/Rampardos.gif rename to src/canonical/models/front/409--0--Rampardos.gif diff --git a/src/canonical/models/front/Zubat.gif b/src/canonical/models/front/41--0--Zubat.gif similarity index 100% rename from src/canonical/models/front/Zubat.gif rename to src/canonical/models/front/41--0--Zubat.gif diff --git a/src/canonical/models/front/Shieldon.gif b/src/canonical/models/front/410--0--Shieldon.gif similarity index 100% rename from src/canonical/models/front/Shieldon.gif rename to src/canonical/models/front/410--0--Shieldon.gif diff --git a/src/canonical/models/front/Bastiodon.gif b/src/canonical/models/front/411--0--Bastiodon.gif similarity index 100% rename from src/canonical/models/front/Bastiodon.gif rename to src/canonical/models/front/411--0--Bastiodon.gif diff --git a/src/canonical/models/front/Burmy.gif b/src/canonical/models/front/412--0--Burmy.gif similarity index 100% rename from src/canonical/models/front/Burmy.gif rename to src/canonical/models/front/412--0--Burmy.gif diff --git a/src/canonical/models/front/Wormadam.gif b/src/canonical/models/front/413--0--Wormadam.gif similarity index 100% rename from src/canonical/models/front/Wormadam.gif rename to src/canonical/models/front/413--0--Wormadam.gif diff --git a/src/canonical/models/front/Wormadam--Sandy.gif b/src/canonical/models/front/413--420--Wormadam--Sandy.gif similarity index 100% rename from src/canonical/models/front/Wormadam--Sandy.gif rename to src/canonical/models/front/413--420--Wormadam--Sandy.gif diff --git a/src/canonical/models/front/Wormadam--Trash.gif b/src/canonical/models/front/413--420--Wormadam--Trash.gif similarity index 100% rename from src/canonical/models/front/Wormadam--Trash.gif rename to src/canonical/models/front/413--420--Wormadam--Trash.gif diff --git a/src/canonical/models/front/Mothim.gif b/src/canonical/models/front/414--0--Mothim.gif similarity index 100% rename from src/canonical/models/front/Mothim.gif rename to src/canonical/models/front/414--0--Mothim.gif diff --git a/src/canonical/models/front/Combee.gif b/src/canonical/models/front/415--0--Combee.gif similarity index 100% rename from src/canonical/models/front/Combee.gif rename to src/canonical/models/front/415--0--Combee.gif diff --git a/src/canonical/models/front/Vespiquen.gif b/src/canonical/models/front/416--0--Vespiquen.gif similarity index 100% rename from src/canonical/models/front/Vespiquen.gif rename to src/canonical/models/front/416--0--Vespiquen.gif diff --git a/src/canonical/models/front/Pachirisu.gif b/src/canonical/models/front/417--0--Pachirisu.gif similarity index 100% rename from src/canonical/models/front/Pachirisu.gif rename to src/canonical/models/front/417--0--Pachirisu.gif diff --git a/src/canonical/models/front/Buizel.gif b/src/canonical/models/front/418--0--Buizel.gif similarity index 100% rename from src/canonical/models/front/Buizel.gif rename to src/canonical/models/front/418--0--Buizel.gif diff --git a/src/canonical/models/front/Floatzel.gif b/src/canonical/models/front/419--0--Floatzel.gif similarity index 100% rename from src/canonical/models/front/Floatzel.gif rename to src/canonical/models/front/419--0--Floatzel.gif diff --git a/src/canonical/models/front/Golbat.gif b/src/canonical/models/front/42--0--Golbat.gif similarity index 100% rename from src/canonical/models/front/Golbat.gif rename to src/canonical/models/front/42--0--Golbat.gif diff --git a/src/canonical/models/front/Cherubi.gif b/src/canonical/models/front/420--0--Cherubi.gif similarity index 100% rename from src/canonical/models/front/Cherubi.gif rename to src/canonical/models/front/420--0--Cherubi.gif diff --git a/src/canonical/models/front/Cherrim.gif b/src/canonical/models/front/421--0--Cherrim.gif similarity index 100% rename from src/canonical/models/front/Cherrim.gif rename to src/canonical/models/front/421--0--Cherrim.gif diff --git a/src/canonical/models/front/Cherrim--Sunshine.gif b/src/canonical/models/front/421--420--Cherrim--Sunshine.gif similarity index 100% rename from src/canonical/models/front/Cherrim--Sunshine.gif rename to src/canonical/models/front/421--420--Cherrim--Sunshine.gif diff --git a/src/canonical/models/front/Shellos.gif b/src/canonical/models/front/422--0--Shellos.gif similarity index 100% rename from src/canonical/models/front/Shellos.gif rename to src/canonical/models/front/422--0--Shellos.gif diff --git a/src/canonical/models/front/Gastrodon.gif b/src/canonical/models/front/423--0--Gastrodon.gif similarity index 100% rename from src/canonical/models/front/Gastrodon.gif rename to src/canonical/models/front/423--0--Gastrodon.gif diff --git a/src/canonical/models/front/Ambipom.gif b/src/canonical/models/front/424--0--Ambipom.gif similarity index 100% rename from src/canonical/models/front/Ambipom.gif rename to src/canonical/models/front/424--0--Ambipom.gif diff --git a/src/canonical/models/front/Drifloon.gif b/src/canonical/models/front/425--0--Drifloon.gif similarity index 100% rename from src/canonical/models/front/Drifloon.gif rename to src/canonical/models/front/425--0--Drifloon.gif diff --git a/src/canonical/models/front/Drifblim.gif b/src/canonical/models/front/426--0--Drifblim.gif similarity index 100% rename from src/canonical/models/front/Drifblim.gif rename to src/canonical/models/front/426--0--Drifblim.gif diff --git a/src/canonical/models/front/Buneary.gif b/src/canonical/models/front/427--0--Buneary.gif similarity index 100% rename from src/canonical/models/front/Buneary.gif rename to src/canonical/models/front/427--0--Buneary.gif diff --git a/src/canonical/models/front/Lopunny.gif b/src/canonical/models/front/428--0--Lopunny.gif similarity index 100% rename from src/canonical/models/front/Lopunny.gif rename to src/canonical/models/front/428--0--Lopunny.gif diff --git a/src/canonical/models/front/Lopunny--Mega.gif b/src/canonical/models/front/428--420--Lopunny--Mega.gif similarity index 100% rename from src/canonical/models/front/Lopunny--Mega.gif rename to src/canonical/models/front/428--420--Lopunny--Mega.gif diff --git a/src/canonical/models/front/Mismagius.gif b/src/canonical/models/front/429--0--Mismagius.gif similarity index 100% rename from src/canonical/models/front/Mismagius.gif rename to src/canonical/models/front/429--0--Mismagius.gif diff --git a/src/canonical/models/front/Oddish.gif b/src/canonical/models/front/43--0--Oddish.gif similarity index 100% rename from src/canonical/models/front/Oddish.gif rename to src/canonical/models/front/43--0--Oddish.gif diff --git a/src/canonical/models/front/Honchkrow.gif b/src/canonical/models/front/430--0--Honchkrow.gif similarity index 100% rename from src/canonical/models/front/Honchkrow.gif rename to src/canonical/models/front/430--0--Honchkrow.gif diff --git a/src/canonical/models/front/Glameow.gif b/src/canonical/models/front/431--0--Glameow.gif similarity index 100% rename from src/canonical/models/front/Glameow.gif rename to src/canonical/models/front/431--0--Glameow.gif diff --git a/src/canonical/models/front/Purugly.gif b/src/canonical/models/front/432--0--Purugly.gif similarity index 100% rename from src/canonical/models/front/Purugly.gif rename to src/canonical/models/front/432--0--Purugly.gif diff --git a/src/canonical/models/front/Chingling.gif b/src/canonical/models/front/433--0--Chingling.gif similarity index 100% rename from src/canonical/models/front/Chingling.gif rename to src/canonical/models/front/433--0--Chingling.gif diff --git a/src/canonical/models/front/Stunky.gif b/src/canonical/models/front/434--0--Stunky.gif similarity index 100% rename from src/canonical/models/front/Stunky.gif rename to src/canonical/models/front/434--0--Stunky.gif diff --git a/src/canonical/models/front/Skuntank.gif b/src/canonical/models/front/435--0--Skuntank.gif similarity index 100% rename from src/canonical/models/front/Skuntank.gif rename to src/canonical/models/front/435--0--Skuntank.gif diff --git a/src/canonical/models/front/Bronzor.gif b/src/canonical/models/front/436--0--Bronzor.gif similarity index 100% rename from src/canonical/models/front/Bronzor.gif rename to src/canonical/models/front/436--0--Bronzor.gif diff --git a/src/canonical/models/front/Bronzong.gif b/src/canonical/models/front/437--0--Bronzong.gif similarity index 100% rename from src/canonical/models/front/Bronzong.gif rename to src/canonical/models/front/437--0--Bronzong.gif diff --git a/src/canonical/models/front/Bonsly.gif b/src/canonical/models/front/438--0--Bonsly.gif similarity index 100% rename from src/canonical/models/front/Bonsly.gif rename to src/canonical/models/front/438--0--Bonsly.gif diff --git a/src/canonical/models/front/Mime_Jr..gif b/src/canonical/models/front/439--0--Mime_Jr..gif similarity index 100% rename from src/canonical/models/front/Mime_Jr..gif rename to src/canonical/models/front/439--0--Mime_Jr..gif diff --git a/src/canonical/models/front/Gloom.gif b/src/canonical/models/front/44--0--Gloom.gif similarity index 100% rename from src/canonical/models/front/Gloom.gif rename to src/canonical/models/front/44--0--Gloom.gif diff --git a/src/canonical/models/front/Happiny.gif b/src/canonical/models/front/440--0--Happiny.gif similarity index 100% rename from src/canonical/models/front/Happiny.gif rename to src/canonical/models/front/440--0--Happiny.gif diff --git a/src/canonical/models/front/Chatot.gif b/src/canonical/models/front/441--0--Chatot.gif similarity index 100% rename from src/canonical/models/front/Chatot.gif rename to src/canonical/models/front/441--0--Chatot.gif diff --git a/src/canonical/models/front/Spiritomb.gif b/src/canonical/models/front/442--0--Spiritomb.gif similarity index 100% rename from src/canonical/models/front/Spiritomb.gif rename to src/canonical/models/front/442--0--Spiritomb.gif diff --git a/src/canonical/models/front/Gible.gif b/src/canonical/models/front/443--0--Gible.gif similarity index 100% rename from src/canonical/models/front/Gible.gif rename to src/canonical/models/front/443--0--Gible.gif diff --git a/src/canonical/models/front/Gabite.gif b/src/canonical/models/front/444--0--Gabite.gif similarity index 100% rename from src/canonical/models/front/Gabite.gif rename to src/canonical/models/front/444--0--Gabite.gif diff --git a/src/canonical/models/front/Garchomp.gif b/src/canonical/models/front/445--0--Garchomp.gif similarity index 100% rename from src/canonical/models/front/Garchomp.gif rename to src/canonical/models/front/445--0--Garchomp.gif diff --git a/src/canonical/models/front/Garchomp--Mega.gif b/src/canonical/models/front/445--420--Garchomp--Mega.gif similarity index 100% rename from src/canonical/models/front/Garchomp--Mega.gif rename to src/canonical/models/front/445--420--Garchomp--Mega.gif diff --git a/src/canonical/models/front/Munchlax.gif b/src/canonical/models/front/446--0--Munchlax.gif similarity index 100% rename from src/canonical/models/front/Munchlax.gif rename to src/canonical/models/front/446--0--Munchlax.gif diff --git a/src/canonical/models/front/Riolu.gif b/src/canonical/models/front/447--0--Riolu.gif similarity index 100% rename from src/canonical/models/front/Riolu.gif rename to src/canonical/models/front/447--0--Riolu.gif diff --git a/src/canonical/models/front/Lucario.gif b/src/canonical/models/front/448--0--Lucario.gif similarity index 100% rename from src/canonical/models/front/Lucario.gif rename to src/canonical/models/front/448--0--Lucario.gif diff --git a/src/canonical/models/front/Lucario--Mega.gif b/src/canonical/models/front/448--420--Lucario--Mega.gif similarity index 100% rename from src/canonical/models/front/Lucario--Mega.gif rename to src/canonical/models/front/448--420--Lucario--Mega.gif diff --git a/src/canonical/models/front/Hippopotas.gif b/src/canonical/models/front/449--0--Hippopotas.gif similarity index 100% rename from src/canonical/models/front/Hippopotas.gif rename to src/canonical/models/front/449--0--Hippopotas.gif diff --git a/src/canonical/models/front/Vileplume.gif b/src/canonical/models/front/45--0--Vileplume.gif similarity index 100% rename from src/canonical/models/front/Vileplume.gif rename to src/canonical/models/front/45--0--Vileplume.gif diff --git a/src/canonical/models/front/Hippowdon.gif b/src/canonical/models/front/450--0--Hippowdon.gif similarity index 100% rename from src/canonical/models/front/Hippowdon.gif rename to src/canonical/models/front/450--0--Hippowdon.gif diff --git a/src/canonical/models/front/Skorupi.gif b/src/canonical/models/front/451--0--Skorupi.gif similarity index 100% rename from src/canonical/models/front/Skorupi.gif rename to src/canonical/models/front/451--0--Skorupi.gif diff --git a/src/canonical/models/front/Drapion.gif b/src/canonical/models/front/452--0--Drapion.gif similarity index 100% rename from src/canonical/models/front/Drapion.gif rename to src/canonical/models/front/452--0--Drapion.gif diff --git a/src/canonical/models/front/Croagunk.gif b/src/canonical/models/front/453--0--Croagunk.gif similarity index 100% rename from src/canonical/models/front/Croagunk.gif rename to src/canonical/models/front/453--0--Croagunk.gif diff --git a/src/canonical/models/front/Toxicroak.gif b/src/canonical/models/front/454--0--Toxicroak.gif similarity index 100% rename from src/canonical/models/front/Toxicroak.gif rename to src/canonical/models/front/454--0--Toxicroak.gif diff --git a/src/canonical/models/front/Carnivine.gif b/src/canonical/models/front/455--0--Carnivine.gif similarity index 100% rename from src/canonical/models/front/Carnivine.gif rename to src/canonical/models/front/455--0--Carnivine.gif diff --git a/src/canonical/models/front/Finneon.gif b/src/canonical/models/front/456--0--Finneon.gif similarity index 100% rename from src/canonical/models/front/Finneon.gif rename to src/canonical/models/front/456--0--Finneon.gif diff --git a/src/canonical/models/front/Lumineon.gif b/src/canonical/models/front/457--0--Lumineon.gif similarity index 100% rename from src/canonical/models/front/Lumineon.gif rename to src/canonical/models/front/457--0--Lumineon.gif diff --git a/src/canonical/models/front/Mantyke.gif b/src/canonical/models/front/458--0--Mantyke.gif similarity index 100% rename from src/canonical/models/front/Mantyke.gif rename to src/canonical/models/front/458--0--Mantyke.gif diff --git a/src/canonical/models/front/Snover.gif b/src/canonical/models/front/459--0--Snover.gif similarity index 100% rename from src/canonical/models/front/Snover.gif rename to src/canonical/models/front/459--0--Snover.gif diff --git a/src/canonical/models/front/Paras.gif b/src/canonical/models/front/46--0--Paras.gif similarity index 100% rename from src/canonical/models/front/Paras.gif rename to src/canonical/models/front/46--0--Paras.gif diff --git a/src/canonical/models/front/Abomasnow.gif b/src/canonical/models/front/460--0--Abomasnow.gif similarity index 100% rename from src/canonical/models/front/Abomasnow.gif rename to src/canonical/models/front/460--0--Abomasnow.gif diff --git a/src/canonical/models/front/Abomasnow--Mega.gif b/src/canonical/models/front/460--420--Abomasnow--Mega.gif similarity index 100% rename from src/canonical/models/front/Abomasnow--Mega.gif rename to src/canonical/models/front/460--420--Abomasnow--Mega.gif diff --git a/src/canonical/models/front/Weavile.gif b/src/canonical/models/front/461--0--Weavile.gif similarity index 100% rename from src/canonical/models/front/Weavile.gif rename to src/canonical/models/front/461--0--Weavile.gif diff --git a/src/canonical/models/front/Magnezone.gif b/src/canonical/models/front/462--0--Magnezone.gif similarity index 100% rename from src/canonical/models/front/Magnezone.gif rename to src/canonical/models/front/462--0--Magnezone.gif diff --git a/src/canonical/models/front/Lickilicky.gif b/src/canonical/models/front/463--0--Lickilicky.gif similarity index 100% rename from src/canonical/models/front/Lickilicky.gif rename to src/canonical/models/front/463--0--Lickilicky.gif diff --git a/src/canonical/models/front/Rhyperior.gif b/src/canonical/models/front/464--0--Rhyperior.gif similarity index 100% rename from src/canonical/models/front/Rhyperior.gif rename to src/canonical/models/front/464--0--Rhyperior.gif diff --git a/src/canonical/models/front/Tangrowth.gif b/src/canonical/models/front/465--0--Tangrowth.gif similarity index 100% rename from src/canonical/models/front/Tangrowth.gif rename to src/canonical/models/front/465--0--Tangrowth.gif diff --git a/src/canonical/models/front/Electivire.gif b/src/canonical/models/front/466--0--Electivire.gif similarity index 100% rename from src/canonical/models/front/Electivire.gif rename to src/canonical/models/front/466--0--Electivire.gif diff --git a/src/canonical/models/front/Magmortar.gif b/src/canonical/models/front/467--0--Magmortar.gif similarity index 100% rename from src/canonical/models/front/Magmortar.gif rename to src/canonical/models/front/467--0--Magmortar.gif diff --git a/src/canonical/models/front/Togekiss.gif b/src/canonical/models/front/468--0--Togekiss.gif similarity index 100% rename from src/canonical/models/front/Togekiss.gif rename to src/canonical/models/front/468--0--Togekiss.gif diff --git a/src/canonical/models/front/Yanmega.gif b/src/canonical/models/front/469--0--Yanmega.gif similarity index 100% rename from src/canonical/models/front/Yanmega.gif rename to src/canonical/models/front/469--0--Yanmega.gif diff --git a/src/canonical/models/front/Parasect.gif b/src/canonical/models/front/47--0--Parasect.gif similarity index 100% rename from src/canonical/models/front/Parasect.gif rename to src/canonical/models/front/47--0--Parasect.gif diff --git a/src/canonical/models/front/Leafeon.gif b/src/canonical/models/front/470--0--Leafeon.gif similarity index 100% rename from src/canonical/models/front/Leafeon.gif rename to src/canonical/models/front/470--0--Leafeon.gif diff --git a/src/canonical/models/front/Glaceon.gif b/src/canonical/models/front/471--0--Glaceon.gif similarity index 100% rename from src/canonical/models/front/Glaceon.gif rename to src/canonical/models/front/471--0--Glaceon.gif diff --git a/src/canonical/models/front/Gliscor.gif b/src/canonical/models/front/472--0--Gliscor.gif similarity index 100% rename from src/canonical/models/front/Gliscor.gif rename to src/canonical/models/front/472--0--Gliscor.gif diff --git a/src/canonical/models/front/Mamoswine.gif b/src/canonical/models/front/473--0--Mamoswine.gif similarity index 100% rename from src/canonical/models/front/Mamoswine.gif rename to src/canonical/models/front/473--0--Mamoswine.gif diff --git a/src/canonical/models/front/Porygon-Z.gif b/src/canonical/models/front/474--0--Porygon-Z.gif similarity index 100% rename from src/canonical/models/front/Porygon-Z.gif rename to src/canonical/models/front/474--0--Porygon-Z.gif diff --git a/src/canonical/models/front/Gallade.gif b/src/canonical/models/front/475--0--Gallade.gif similarity index 100% rename from src/canonical/models/front/Gallade.gif rename to src/canonical/models/front/475--0--Gallade.gif diff --git a/src/canonical/models/front/Gallade--Mega.gif b/src/canonical/models/front/475--420--Gallade--Mega.gif similarity index 100% rename from src/canonical/models/front/Gallade--Mega.gif rename to src/canonical/models/front/475--420--Gallade--Mega.gif diff --git a/src/canonical/models/front/Probopass.gif b/src/canonical/models/front/476--0--Probopass.gif similarity index 100% rename from src/canonical/models/front/Probopass.gif rename to src/canonical/models/front/476--0--Probopass.gif diff --git a/src/canonical/models/front/Dusknoir.gif b/src/canonical/models/front/477--0--Dusknoir.gif similarity index 100% rename from src/canonical/models/front/Dusknoir.gif rename to src/canonical/models/front/477--0--Dusknoir.gif diff --git a/src/canonical/models/front/Froslass.gif b/src/canonical/models/front/478--0--Froslass.gif similarity index 100% rename from src/canonical/models/front/Froslass.gif rename to src/canonical/models/front/478--0--Froslass.gif diff --git a/src/canonical/models/front/Rotom.gif b/src/canonical/models/front/479--0--Rotom.gif similarity index 100% rename from src/canonical/models/front/Rotom.gif rename to src/canonical/models/front/479--0--Rotom.gif diff --git a/src/canonical/models/front/Rotom--Fan.gif b/src/canonical/models/front/479--420--Rotom--Fan.gif similarity index 100% rename from src/canonical/models/front/Rotom--Fan.gif rename to src/canonical/models/front/479--420--Rotom--Fan.gif diff --git a/src/canonical/models/front/Rotom--Frost.gif b/src/canonical/models/front/479--420--Rotom--Frost.gif similarity index 100% rename from src/canonical/models/front/Rotom--Frost.gif rename to src/canonical/models/front/479--420--Rotom--Frost.gif diff --git a/src/canonical/models/front/Rotom--Heat.gif b/src/canonical/models/front/479--420--Rotom--Heat.gif similarity index 100% rename from src/canonical/models/front/Rotom--Heat.gif rename to src/canonical/models/front/479--420--Rotom--Heat.gif diff --git a/src/canonical/models/front/Rotom--Mow.gif b/src/canonical/models/front/479--420--Rotom--Mow.gif similarity index 100% rename from src/canonical/models/front/Rotom--Mow.gif rename to src/canonical/models/front/479--420--Rotom--Mow.gif diff --git a/src/canonical/models/front/Rotom--Wash.gif b/src/canonical/models/front/479--420--Rotom--Wash.gif similarity index 100% rename from src/canonical/models/front/Rotom--Wash.gif rename to src/canonical/models/front/479--420--Rotom--Wash.gif diff --git a/src/canonical/models/front/Venonat.gif b/src/canonical/models/front/48--0--Venonat.gif similarity index 100% rename from src/canonical/models/front/Venonat.gif rename to src/canonical/models/front/48--0--Venonat.gif diff --git a/src/canonical/models/front/Uxie.gif b/src/canonical/models/front/480--0--Uxie.gif similarity index 100% rename from src/canonical/models/front/Uxie.gif rename to src/canonical/models/front/480--0--Uxie.gif diff --git a/src/canonical/models/front/Mesprit.gif b/src/canonical/models/front/481--0--Mesprit.gif similarity index 100% rename from src/canonical/models/front/Mesprit.gif rename to src/canonical/models/front/481--0--Mesprit.gif diff --git a/src/canonical/models/front/Azelf.gif b/src/canonical/models/front/482--0--Azelf.gif similarity index 100% rename from src/canonical/models/front/Azelf.gif rename to src/canonical/models/front/482--0--Azelf.gif diff --git a/src/canonical/models/front/Dialga.gif b/src/canonical/models/front/483--0--Dialga.gif similarity index 100% rename from src/canonical/models/front/Dialga.gif rename to src/canonical/models/front/483--0--Dialga.gif diff --git a/src/canonical/models/front/Palkia.gif b/src/canonical/models/front/484--0--Palkia.gif similarity index 100% rename from src/canonical/models/front/Palkia.gif rename to src/canonical/models/front/484--0--Palkia.gif diff --git a/src/canonical/models/front/Heatran.gif b/src/canonical/models/front/485--0--Heatran.gif similarity index 100% rename from src/canonical/models/front/Heatran.gif rename to src/canonical/models/front/485--0--Heatran.gif diff --git a/src/canonical/models/front/Regigigas.gif b/src/canonical/models/front/486--0--Regigigas.gif similarity index 100% rename from src/canonical/models/front/Regigigas.gif rename to src/canonical/models/front/486--0--Regigigas.gif diff --git a/src/canonical/models/front/Giratina.gif b/src/canonical/models/front/487--0--Giratina.gif similarity index 100% rename from src/canonical/models/front/Giratina.gif rename to src/canonical/models/front/487--0--Giratina.gif diff --git a/src/canonical/models/front/Giratina--Origin.gif b/src/canonical/models/front/487--420--Giratina--Origin.gif similarity index 100% rename from src/canonical/models/front/Giratina--Origin.gif rename to src/canonical/models/front/487--420--Giratina--Origin.gif diff --git a/src/canonical/models/front/Cresselia.gif b/src/canonical/models/front/488--0--Cresselia.gif similarity index 100% rename from src/canonical/models/front/Cresselia.gif rename to src/canonical/models/front/488--0--Cresselia.gif diff --git a/src/canonical/models/front/Phione.gif b/src/canonical/models/front/489--0--Phione.gif similarity index 100% rename from src/canonical/models/front/Phione.gif rename to src/canonical/models/front/489--0--Phione.gif diff --git a/src/canonical/models/front/Venomoth.gif b/src/canonical/models/front/49--0--Venomoth.gif similarity index 100% rename from src/canonical/models/front/Venomoth.gif rename to src/canonical/models/front/49--0--Venomoth.gif diff --git a/src/canonical/models/front/Manaphy.gif b/src/canonical/models/front/490--0--Manaphy.gif similarity index 100% rename from src/canonical/models/front/Manaphy.gif rename to src/canonical/models/front/490--0--Manaphy.gif diff --git a/src/canonical/models/front/Darkrai.gif b/src/canonical/models/front/491--0--Darkrai.gif similarity index 100% rename from src/canonical/models/front/Darkrai.gif rename to src/canonical/models/front/491--0--Darkrai.gif diff --git a/src/canonical/models/front/Shaymin.gif b/src/canonical/models/front/492--0--Shaymin.gif similarity index 100% rename from src/canonical/models/front/Shaymin.gif rename to src/canonical/models/front/492--0--Shaymin.gif diff --git a/src/canonical/models/front/Shaymin--Sky.gif b/src/canonical/models/front/492--420--Shaymin--Sky.gif similarity index 100% rename from src/canonical/models/front/Shaymin--Sky.gif rename to src/canonical/models/front/492--420--Shaymin--Sky.gif diff --git a/src/canonical/models/front/Arceus.gif b/src/canonical/models/front/493--0--Arceus.gif similarity index 100% rename from src/canonical/models/front/Arceus.gif rename to src/canonical/models/front/493--0--Arceus.gif diff --git a/src/canonical/models/front/Arceus--Bug.gif b/src/canonical/models/front/493--420--Arceus--Bug.gif similarity index 100% rename from src/canonical/models/front/Arceus--Bug.gif rename to src/canonical/models/front/493--420--Arceus--Bug.gif diff --git a/src/canonical/models/front/Arceus--Dark.gif b/src/canonical/models/front/493--420--Arceus--Dark.gif similarity index 100% rename from src/canonical/models/front/Arceus--Dark.gif rename to src/canonical/models/front/493--420--Arceus--Dark.gif diff --git a/src/canonical/models/front/Arceus--Dragon.gif b/src/canonical/models/front/493--420--Arceus--Dragon.gif similarity index 100% rename from src/canonical/models/front/Arceus--Dragon.gif rename to src/canonical/models/front/493--420--Arceus--Dragon.gif diff --git a/src/canonical/models/front/Arceus--Electric.gif b/src/canonical/models/front/493--420--Arceus--Electric.gif similarity index 100% rename from src/canonical/models/front/Arceus--Electric.gif rename to src/canonical/models/front/493--420--Arceus--Electric.gif diff --git a/src/canonical/models/front/Arceus--Fairy.gif b/src/canonical/models/front/493--420--Arceus--Fairy.gif similarity index 100% rename from src/canonical/models/front/Arceus--Fairy.gif rename to src/canonical/models/front/493--420--Arceus--Fairy.gif diff --git a/src/canonical/models/front/Arceus--Fighting.gif b/src/canonical/models/front/493--420--Arceus--Fighting.gif similarity index 100% rename from src/canonical/models/front/Arceus--Fighting.gif rename to src/canonical/models/front/493--420--Arceus--Fighting.gif diff --git a/src/canonical/models/front/Arceus--Fire.gif b/src/canonical/models/front/493--420--Arceus--Fire.gif similarity index 100% rename from src/canonical/models/front/Arceus--Fire.gif rename to src/canonical/models/front/493--420--Arceus--Fire.gif diff --git a/src/canonical/models/front/Arceus--Flying.gif b/src/canonical/models/front/493--420--Arceus--Flying.gif similarity index 100% rename from src/canonical/models/front/Arceus--Flying.gif rename to src/canonical/models/front/493--420--Arceus--Flying.gif diff --git a/src/canonical/models/front/Arceus--Ghost.gif b/src/canonical/models/front/493--420--Arceus--Ghost.gif similarity index 100% rename from src/canonical/models/front/Arceus--Ghost.gif rename to src/canonical/models/front/493--420--Arceus--Ghost.gif diff --git a/src/canonical/models/front/Arceus--Grass.gif b/src/canonical/models/front/493--420--Arceus--Grass.gif similarity index 100% rename from src/canonical/models/front/Arceus--Grass.gif rename to src/canonical/models/front/493--420--Arceus--Grass.gif diff --git a/src/canonical/models/front/Arceus--Ground.gif b/src/canonical/models/front/493--420--Arceus--Ground.gif similarity index 100% rename from src/canonical/models/front/Arceus--Ground.gif rename to src/canonical/models/front/493--420--Arceus--Ground.gif diff --git a/src/canonical/models/front/Arceus--Ice.gif b/src/canonical/models/front/493--420--Arceus--Ice.gif similarity index 100% rename from src/canonical/models/front/Arceus--Ice.gif rename to src/canonical/models/front/493--420--Arceus--Ice.gif diff --git a/src/canonical/models/front/Arceus--Poison.gif b/src/canonical/models/front/493--420--Arceus--Poison.gif similarity index 100% rename from src/canonical/models/front/Arceus--Poison.gif rename to src/canonical/models/front/493--420--Arceus--Poison.gif diff --git a/src/canonical/models/front/Arceus--Psychic.gif b/src/canonical/models/front/493--420--Arceus--Psychic.gif similarity index 100% rename from src/canonical/models/front/Arceus--Psychic.gif rename to src/canonical/models/front/493--420--Arceus--Psychic.gif diff --git a/src/canonical/models/front/Arceus--Rock.gif b/src/canonical/models/front/493--420--Arceus--Rock.gif similarity index 100% rename from src/canonical/models/front/Arceus--Rock.gif rename to src/canonical/models/front/493--420--Arceus--Rock.gif diff --git a/src/canonical/models/front/Arceus--Steel.gif b/src/canonical/models/front/493--420--Arceus--Steel.gif similarity index 100% rename from src/canonical/models/front/Arceus--Steel.gif rename to src/canonical/models/front/493--420--Arceus--Steel.gif diff --git a/src/canonical/models/front/Arceus--Water.gif b/src/canonical/models/front/493--420--Arceus--Water.gif similarity index 100% rename from src/canonical/models/front/Arceus--Water.gif rename to src/canonical/models/front/493--420--Arceus--Water.gif diff --git a/src/canonical/models/front/Victini.gif b/src/canonical/models/front/494--0--Victini.gif similarity index 100% rename from src/canonical/models/front/Victini.gif rename to src/canonical/models/front/494--0--Victini.gif diff --git a/src/canonical/models/front/Snivy.gif b/src/canonical/models/front/495--0--Snivy.gif similarity index 100% rename from src/canonical/models/front/Snivy.gif rename to src/canonical/models/front/495--0--Snivy.gif diff --git a/src/canonical/models/front/Servine.gif b/src/canonical/models/front/496--0--Servine.gif similarity index 100% rename from src/canonical/models/front/Servine.gif rename to src/canonical/models/front/496--0--Servine.gif diff --git a/src/canonical/models/front/Serperior.gif b/src/canonical/models/front/497--0--Serperior.gif similarity index 100% rename from src/canonical/models/front/Serperior.gif rename to src/canonical/models/front/497--0--Serperior.gif diff --git a/src/canonical/models/front/Tepig.gif b/src/canonical/models/front/498--0--Tepig.gif similarity index 100% rename from src/canonical/models/front/Tepig.gif rename to src/canonical/models/front/498--0--Tepig.gif diff --git a/src/canonical/models/front/Pignite.gif b/src/canonical/models/front/499--0--Pignite.gif similarity index 100% rename from src/canonical/models/front/Pignite.gif rename to src/canonical/models/front/499--0--Pignite.gif diff --git a/src/canonical/models/front/Charmeleon.gif b/src/canonical/models/front/5--0--Charmeleon.gif similarity index 100% rename from src/canonical/models/front/Charmeleon.gif rename to src/canonical/models/front/5--0--Charmeleon.gif diff --git a/src/canonical/models/front/Diglett.gif b/src/canonical/models/front/50--0--Diglett.gif similarity index 100% rename from src/canonical/models/front/Diglett.gif rename to src/canonical/models/front/50--0--Diglett.gif diff --git a/src/canonical/models/front/Diglett--Alola.gif b/src/canonical/models/front/50--420--Diglett--Alola.gif similarity index 100% rename from src/canonical/models/front/Diglett--Alola.gif rename to src/canonical/models/front/50--420--Diglett--Alola.gif diff --git a/src/canonical/models/front/Emboar.gif b/src/canonical/models/front/500--0--Emboar.gif similarity index 100% rename from src/canonical/models/front/Emboar.gif rename to src/canonical/models/front/500--0--Emboar.gif diff --git a/src/canonical/models/front/Oshawott.gif b/src/canonical/models/front/501--0--Oshawott.gif similarity index 100% rename from src/canonical/models/front/Oshawott.gif rename to src/canonical/models/front/501--0--Oshawott.gif diff --git a/src/canonical/models/front/Dewott.gif b/src/canonical/models/front/502--0--Dewott.gif similarity index 100% rename from src/canonical/models/front/Dewott.gif rename to src/canonical/models/front/502--0--Dewott.gif diff --git a/src/canonical/models/front/Samurott.gif b/src/canonical/models/front/503--0--Samurott.gif similarity index 100% rename from src/canonical/models/front/Samurott.gif rename to src/canonical/models/front/503--0--Samurott.gif diff --git a/src/canonical/models/front/Patrat.gif b/src/canonical/models/front/504--0--Patrat.gif similarity index 100% rename from src/canonical/models/front/Patrat.gif rename to src/canonical/models/front/504--0--Patrat.gif diff --git a/src/canonical/models/front/Watchog.gif b/src/canonical/models/front/505--0--Watchog.gif similarity index 100% rename from src/canonical/models/front/Watchog.gif rename to src/canonical/models/front/505--0--Watchog.gif diff --git a/src/canonical/models/front/Lillipup.gif b/src/canonical/models/front/506--0--Lillipup.gif similarity index 100% rename from src/canonical/models/front/Lillipup.gif rename to src/canonical/models/front/506--0--Lillipup.gif diff --git a/src/canonical/models/front/Herdier.gif b/src/canonical/models/front/507--0--Herdier.gif similarity index 100% rename from src/canonical/models/front/Herdier.gif rename to src/canonical/models/front/507--0--Herdier.gif diff --git a/src/canonical/models/front/Stoutland.gif b/src/canonical/models/front/508--0--Stoutland.gif similarity index 100% rename from src/canonical/models/front/Stoutland.gif rename to src/canonical/models/front/508--0--Stoutland.gif diff --git a/src/canonical/models/front/Purrloin.gif b/src/canonical/models/front/509--0--Purrloin.gif similarity index 100% rename from src/canonical/models/front/Purrloin.gif rename to src/canonical/models/front/509--0--Purrloin.gif diff --git a/src/canonical/models/front/Dugtrio.gif b/src/canonical/models/front/51--0--Dugtrio.gif similarity index 100% rename from src/canonical/models/front/Dugtrio.gif rename to src/canonical/models/front/51--0--Dugtrio.gif diff --git a/src/canonical/models/front/Dugtrio--Alola.gif b/src/canonical/models/front/51--420--Dugtrio--Alola.gif similarity index 100% rename from src/canonical/models/front/Dugtrio--Alola.gif rename to src/canonical/models/front/51--420--Dugtrio--Alola.gif diff --git a/src/canonical/models/front/Liepard.gif b/src/canonical/models/front/510--0--Liepard.gif similarity index 100% rename from src/canonical/models/front/Liepard.gif rename to src/canonical/models/front/510--0--Liepard.gif diff --git a/src/canonical/models/front/Pansage.gif b/src/canonical/models/front/511--0--Pansage.gif similarity index 100% rename from src/canonical/models/front/Pansage.gif rename to src/canonical/models/front/511--0--Pansage.gif diff --git a/src/canonical/models/front/Simisage.gif b/src/canonical/models/front/512--0--Simisage.gif similarity index 100% rename from src/canonical/models/front/Simisage.gif rename to src/canonical/models/front/512--0--Simisage.gif diff --git a/src/canonical/models/front/Pansear.gif b/src/canonical/models/front/513--0--Pansear.gif similarity index 100% rename from src/canonical/models/front/Pansear.gif rename to src/canonical/models/front/513--0--Pansear.gif diff --git a/src/canonical/models/front/Simisear.gif b/src/canonical/models/front/514--0--Simisear.gif similarity index 100% rename from src/canonical/models/front/Simisear.gif rename to src/canonical/models/front/514--0--Simisear.gif diff --git a/src/canonical/models/front/Panpour.gif b/src/canonical/models/front/515--0--Panpour.gif similarity index 100% rename from src/canonical/models/front/Panpour.gif rename to src/canonical/models/front/515--0--Panpour.gif diff --git a/src/canonical/models/front/Simipour.gif b/src/canonical/models/front/516--0--Simipour.gif similarity index 100% rename from src/canonical/models/front/Simipour.gif rename to src/canonical/models/front/516--0--Simipour.gif diff --git a/src/canonical/models/front/Munna.gif b/src/canonical/models/front/517--0--Munna.gif similarity index 100% rename from src/canonical/models/front/Munna.gif rename to src/canonical/models/front/517--0--Munna.gif diff --git a/src/canonical/models/front/Musharna.gif b/src/canonical/models/front/518--0--Musharna.gif similarity index 100% rename from src/canonical/models/front/Musharna.gif rename to src/canonical/models/front/518--0--Musharna.gif diff --git a/src/canonical/models/front/Pidove.gif b/src/canonical/models/front/519--0--Pidove.gif similarity index 100% rename from src/canonical/models/front/Pidove.gif rename to src/canonical/models/front/519--0--Pidove.gif diff --git a/src/canonical/models/front/Meowth.gif b/src/canonical/models/front/52--0--Meowth.gif similarity index 100% rename from src/canonical/models/front/Meowth.gif rename to src/canonical/models/front/52--0--Meowth.gif diff --git a/src/canonical/models/front/Meowth--Alola.gif b/src/canonical/models/front/52--420--Meowth--Alola.gif similarity index 100% rename from src/canonical/models/front/Meowth--Alola.gif rename to src/canonical/models/front/52--420--Meowth--Alola.gif diff --git a/src/canonical/models/front/Meowth--Galar.gif b/src/canonical/models/front/52--420--Meowth--Galar.gif similarity index 100% rename from src/canonical/models/front/Meowth--Galar.gif rename to src/canonical/models/front/52--420--Meowth--Galar.gif diff --git a/src/canonical/models/front/Meowth--Gmax.gif b/src/canonical/models/front/52--420--Meowth--Gmax.gif similarity index 100% rename from src/canonical/models/front/Meowth--Gmax.gif rename to src/canonical/models/front/52--420--Meowth--Gmax.gif diff --git a/src/canonical/models/front/Tranquill.gif b/src/canonical/models/front/520--0--Tranquill.gif similarity index 100% rename from src/canonical/models/front/Tranquill.gif rename to src/canonical/models/front/520--0--Tranquill.gif diff --git a/src/canonical/models/front/Unfezant.gif b/src/canonical/models/front/521--0--Unfezant.gif similarity index 100% rename from src/canonical/models/front/Unfezant.gif rename to src/canonical/models/front/521--0--Unfezant.gif diff --git a/src/canonical/models/front/Blitzle.gif b/src/canonical/models/front/522--0--Blitzle.gif similarity index 100% rename from src/canonical/models/front/Blitzle.gif rename to src/canonical/models/front/522--0--Blitzle.gif diff --git a/src/canonical/models/front/Zebstrika.gif b/src/canonical/models/front/523--0--Zebstrika.gif similarity index 100% rename from src/canonical/models/front/Zebstrika.gif rename to src/canonical/models/front/523--0--Zebstrika.gif diff --git a/src/canonical/models/front/Roggenrola.gif b/src/canonical/models/front/524--0--Roggenrola.gif similarity index 100% rename from src/canonical/models/front/Roggenrola.gif rename to src/canonical/models/front/524--0--Roggenrola.gif diff --git a/src/canonical/models/front/Boldore.gif b/src/canonical/models/front/525--0--Boldore.gif similarity index 100% rename from src/canonical/models/front/Boldore.gif rename to src/canonical/models/front/525--0--Boldore.gif diff --git a/src/canonical/models/front/Gigalith.gif b/src/canonical/models/front/526--0--Gigalith.gif similarity index 100% rename from src/canonical/models/front/Gigalith.gif rename to src/canonical/models/front/526--0--Gigalith.gif diff --git a/src/canonical/models/front/Woobat.gif b/src/canonical/models/front/527--0--Woobat.gif similarity index 100% rename from src/canonical/models/front/Woobat.gif rename to src/canonical/models/front/527--0--Woobat.gif diff --git a/src/canonical/models/front/Swoobat.gif b/src/canonical/models/front/528--0--Swoobat.gif similarity index 100% rename from src/canonical/models/front/Swoobat.gif rename to src/canonical/models/front/528--0--Swoobat.gif diff --git a/src/canonical/models/front/Drilbur.gif b/src/canonical/models/front/529--0--Drilbur.gif similarity index 100% rename from src/canonical/models/front/Drilbur.gif rename to src/canonical/models/front/529--0--Drilbur.gif diff --git a/src/canonical/models/front/Persian.gif b/src/canonical/models/front/53--0--Persian.gif similarity index 100% rename from src/canonical/models/front/Persian.gif rename to src/canonical/models/front/53--0--Persian.gif diff --git a/src/canonical/models/front/Persian--Alola.gif b/src/canonical/models/front/53--420--Persian--Alola.gif similarity index 100% rename from src/canonical/models/front/Persian--Alola.gif rename to src/canonical/models/front/53--420--Persian--Alola.gif diff --git a/src/canonical/models/front/Excadrill.gif b/src/canonical/models/front/530--0--Excadrill.gif similarity index 100% rename from src/canonical/models/front/Excadrill.gif rename to src/canonical/models/front/530--0--Excadrill.gif diff --git a/src/canonical/models/front/Audino.gif b/src/canonical/models/front/531--0--Audino.gif similarity index 100% rename from src/canonical/models/front/Audino.gif rename to src/canonical/models/front/531--0--Audino.gif diff --git a/src/canonical/models/front/Audino--Mega.gif b/src/canonical/models/front/531--420--Audino--Mega.gif similarity index 100% rename from src/canonical/models/front/Audino--Mega.gif rename to src/canonical/models/front/531--420--Audino--Mega.gif diff --git a/src/canonical/models/front/Timburr.gif b/src/canonical/models/front/532--0--Timburr.gif similarity index 100% rename from src/canonical/models/front/Timburr.gif rename to src/canonical/models/front/532--0--Timburr.gif diff --git a/src/canonical/models/front/Gurdurr.gif b/src/canonical/models/front/533--0--Gurdurr.gif similarity index 100% rename from src/canonical/models/front/Gurdurr.gif rename to src/canonical/models/front/533--0--Gurdurr.gif diff --git a/src/canonical/models/front/Conkeldurr.gif b/src/canonical/models/front/534--0--Conkeldurr.gif similarity index 100% rename from src/canonical/models/front/Conkeldurr.gif rename to src/canonical/models/front/534--0--Conkeldurr.gif diff --git a/src/canonical/models/front/Tympole.gif b/src/canonical/models/front/535--0--Tympole.gif similarity index 100% rename from src/canonical/models/front/Tympole.gif rename to src/canonical/models/front/535--0--Tympole.gif diff --git a/src/canonical/models/front/Palpitoad.gif b/src/canonical/models/front/536--0--Palpitoad.gif similarity index 100% rename from src/canonical/models/front/Palpitoad.gif rename to src/canonical/models/front/536--0--Palpitoad.gif diff --git a/src/canonical/models/front/Seismitoad.gif b/src/canonical/models/front/537--0--Seismitoad.gif similarity index 100% rename from src/canonical/models/front/Seismitoad.gif rename to src/canonical/models/front/537--0--Seismitoad.gif diff --git a/src/canonical/models/front/Throh.gif b/src/canonical/models/front/538--0--Throh.gif similarity index 100% rename from src/canonical/models/front/Throh.gif rename to src/canonical/models/front/538--0--Throh.gif diff --git a/src/canonical/models/front/Sawk.gif b/src/canonical/models/front/539--0--Sawk.gif similarity index 100% rename from src/canonical/models/front/Sawk.gif rename to src/canonical/models/front/539--0--Sawk.gif diff --git a/src/canonical/models/front/Psyduck.gif b/src/canonical/models/front/54--0--Psyduck.gif similarity index 100% rename from src/canonical/models/front/Psyduck.gif rename to src/canonical/models/front/54--0--Psyduck.gif diff --git a/src/canonical/models/front/Sewaddle.gif b/src/canonical/models/front/540--0--Sewaddle.gif similarity index 100% rename from src/canonical/models/front/Sewaddle.gif rename to src/canonical/models/front/540--0--Sewaddle.gif diff --git a/src/canonical/models/front/Swadloon.gif b/src/canonical/models/front/541--0--Swadloon.gif similarity index 100% rename from src/canonical/models/front/Swadloon.gif rename to src/canonical/models/front/541--0--Swadloon.gif diff --git a/src/canonical/models/front/Leavanny.gif b/src/canonical/models/front/542--0--Leavanny.gif similarity index 100% rename from src/canonical/models/front/Leavanny.gif rename to src/canonical/models/front/542--0--Leavanny.gif diff --git a/src/canonical/models/front/Venipede.gif b/src/canonical/models/front/543--0--Venipede.gif similarity index 100% rename from src/canonical/models/front/Venipede.gif rename to src/canonical/models/front/543--0--Venipede.gif diff --git a/src/canonical/models/front/Whirlipede.gif b/src/canonical/models/front/544--0--Whirlipede.gif similarity index 100% rename from src/canonical/models/front/Whirlipede.gif rename to src/canonical/models/front/544--0--Whirlipede.gif diff --git a/src/canonical/models/front/Scolipede.gif b/src/canonical/models/front/545--0--Scolipede.gif similarity index 100% rename from src/canonical/models/front/Scolipede.gif rename to src/canonical/models/front/545--0--Scolipede.gif diff --git a/src/canonical/models/front/Cottonee.gif b/src/canonical/models/front/546--0--Cottonee.gif similarity index 100% rename from src/canonical/models/front/Cottonee.gif rename to src/canonical/models/front/546--0--Cottonee.gif diff --git a/src/canonical/models/front/Whimsicott.gif b/src/canonical/models/front/547--0--Whimsicott.gif similarity index 100% rename from src/canonical/models/front/Whimsicott.gif rename to src/canonical/models/front/547--0--Whimsicott.gif diff --git a/src/canonical/models/front/Petilil.gif b/src/canonical/models/front/548--0--Petilil.gif similarity index 100% rename from src/canonical/models/front/Petilil.gif rename to src/canonical/models/front/548--0--Petilil.gif diff --git a/src/canonical/models/front/Lilligant.gif b/src/canonical/models/front/549--0--Lilligant.gif similarity index 100% rename from src/canonical/models/front/Lilligant.gif rename to src/canonical/models/front/549--0--Lilligant.gif diff --git a/src/canonical/models/front/Golduck.gif b/src/canonical/models/front/55--0--Golduck.gif similarity index 100% rename from src/canonical/models/front/Golduck.gif rename to src/canonical/models/front/55--0--Golduck.gif diff --git a/src/canonical/models/front/Basculin.gif b/src/canonical/models/front/550--0--Basculin.gif similarity index 100% rename from src/canonical/models/front/Basculin.gif rename to src/canonical/models/front/550--0--Basculin.gif diff --git a/src/canonical/models/front/Basculin--Blue-Striped.gif b/src/canonical/models/front/550--420--Basculin--Blue-Striped.gif similarity index 100% rename from src/canonical/models/front/Basculin--Blue-Striped.gif rename to src/canonical/models/front/550--420--Basculin--Blue-Striped.gif diff --git a/src/canonical/models/front/Sandile.gif b/src/canonical/models/front/551--0--Sandile.gif similarity index 100% rename from src/canonical/models/front/Sandile.gif rename to src/canonical/models/front/551--0--Sandile.gif diff --git a/src/canonical/models/front/Krokorok.gif b/src/canonical/models/front/552--0--Krokorok.gif similarity index 100% rename from src/canonical/models/front/Krokorok.gif rename to src/canonical/models/front/552--0--Krokorok.gif diff --git a/src/canonical/models/front/Krookodile.gif b/src/canonical/models/front/553--0--Krookodile.gif similarity index 100% rename from src/canonical/models/front/Krookodile.gif rename to src/canonical/models/front/553--0--Krookodile.gif diff --git a/src/canonical/models/front/Darumaka.gif b/src/canonical/models/front/554--0--Darumaka.gif similarity index 100% rename from src/canonical/models/front/Darumaka.gif rename to src/canonical/models/front/554--0--Darumaka.gif diff --git a/src/canonical/models/front/Darumaka--Galar.gif b/src/canonical/models/front/554--420--Darumaka--Galar.gif similarity index 100% rename from src/canonical/models/front/Darumaka--Galar.gif rename to src/canonical/models/front/554--420--Darumaka--Galar.gif diff --git a/src/canonical/models/front/Darmanitan.gif b/src/canonical/models/front/555--0--Darmanitan.gif similarity index 100% rename from src/canonical/models/front/Darmanitan.gif rename to src/canonical/models/front/555--0--Darmanitan.gif diff --git a/src/canonical/models/front/Darmanitan--Galar-Zen.gif b/src/canonical/models/front/555--420--Darmanitan--Galar-Zen.gif similarity index 100% rename from src/canonical/models/front/Darmanitan--Galar-Zen.gif rename to src/canonical/models/front/555--420--Darmanitan--Galar-Zen.gif diff --git a/src/canonical/models/front/Darmanitan--Galar.gif b/src/canonical/models/front/555--420--Darmanitan--Galar.gif similarity index 100% rename from src/canonical/models/front/Darmanitan--Galar.gif rename to src/canonical/models/front/555--420--Darmanitan--Galar.gif diff --git a/src/canonical/models/front/Darmanitan--Zen.gif b/src/canonical/models/front/555--420--Darmanitan--Zen.gif similarity index 100% rename from src/canonical/models/front/Darmanitan--Zen.gif rename to src/canonical/models/front/555--420--Darmanitan--Zen.gif diff --git a/src/canonical/models/front/Maractus.gif b/src/canonical/models/front/556--0--Maractus.gif similarity index 100% rename from src/canonical/models/front/Maractus.gif rename to src/canonical/models/front/556--0--Maractus.gif diff --git a/src/canonical/models/front/Dwebble.gif b/src/canonical/models/front/557--0--Dwebble.gif similarity index 100% rename from src/canonical/models/front/Dwebble.gif rename to src/canonical/models/front/557--0--Dwebble.gif diff --git a/src/canonical/models/front/Crustle.gif b/src/canonical/models/front/558--0--Crustle.gif similarity index 100% rename from src/canonical/models/front/Crustle.gif rename to src/canonical/models/front/558--0--Crustle.gif diff --git a/src/canonical/models/front/Scraggy.gif b/src/canonical/models/front/559--0--Scraggy.gif similarity index 100% rename from src/canonical/models/front/Scraggy.gif rename to src/canonical/models/front/559--0--Scraggy.gif diff --git a/src/canonical/models/front/Mankey.gif b/src/canonical/models/front/56--0--Mankey.gif similarity index 100% rename from src/canonical/models/front/Mankey.gif rename to src/canonical/models/front/56--0--Mankey.gif diff --git a/src/canonical/models/front/Scrafty.gif b/src/canonical/models/front/560--0--Scrafty.gif similarity index 100% rename from src/canonical/models/front/Scrafty.gif rename to src/canonical/models/front/560--0--Scrafty.gif diff --git a/src/canonical/models/front/Sigilyph.gif b/src/canonical/models/front/561--0--Sigilyph.gif similarity index 100% rename from src/canonical/models/front/Sigilyph.gif rename to src/canonical/models/front/561--0--Sigilyph.gif diff --git a/src/canonical/models/front/Yamask.gif b/src/canonical/models/front/562--0--Yamask.gif similarity index 100% rename from src/canonical/models/front/Yamask.gif rename to src/canonical/models/front/562--0--Yamask.gif diff --git a/src/canonical/models/front/Yamask--Galar.gif b/src/canonical/models/front/562--420--Yamask--Galar.gif similarity index 100% rename from src/canonical/models/front/Yamask--Galar.gif rename to src/canonical/models/front/562--420--Yamask--Galar.gif diff --git a/src/canonical/models/front/Cofagrigus.gif b/src/canonical/models/front/563--0--Cofagrigus.gif similarity index 100% rename from src/canonical/models/front/Cofagrigus.gif rename to src/canonical/models/front/563--0--Cofagrigus.gif diff --git a/src/canonical/models/front/Tirtouga.gif b/src/canonical/models/front/564--0--Tirtouga.gif similarity index 100% rename from src/canonical/models/front/Tirtouga.gif rename to src/canonical/models/front/564--0--Tirtouga.gif diff --git a/src/canonical/models/front/Carracosta.gif b/src/canonical/models/front/565--0--Carracosta.gif similarity index 100% rename from src/canonical/models/front/Carracosta.gif rename to src/canonical/models/front/565--0--Carracosta.gif diff --git a/src/canonical/models/front/Archen.gif b/src/canonical/models/front/566--0--Archen.gif similarity index 100% rename from src/canonical/models/front/Archen.gif rename to src/canonical/models/front/566--0--Archen.gif diff --git a/src/canonical/models/front/Archeops.gif b/src/canonical/models/front/567--0--Archeops.gif similarity index 100% rename from src/canonical/models/front/Archeops.gif rename to src/canonical/models/front/567--0--Archeops.gif diff --git a/src/canonical/models/front/Trubbish.gif b/src/canonical/models/front/568--0--Trubbish.gif similarity index 100% rename from src/canonical/models/front/Trubbish.gif rename to src/canonical/models/front/568--0--Trubbish.gif diff --git a/src/canonical/models/front/Garbodor.gif b/src/canonical/models/front/569--0--Garbodor.gif similarity index 100% rename from src/canonical/models/front/Garbodor.gif rename to src/canonical/models/front/569--0--Garbodor.gif diff --git a/src/canonical/models/front/Garbodor--Gmax.gif b/src/canonical/models/front/569--420--Garbodor--Gmax.gif similarity index 100% rename from src/canonical/models/front/Garbodor--Gmax.gif rename to src/canonical/models/front/569--420--Garbodor--Gmax.gif diff --git a/src/canonical/models/front/Primeape.gif b/src/canonical/models/front/57--0--Primeape.gif similarity index 100% rename from src/canonical/models/front/Primeape.gif rename to src/canonical/models/front/57--0--Primeape.gif diff --git a/src/canonical/models/front/Zorua.gif b/src/canonical/models/front/570--0--Zorua.gif similarity index 100% rename from src/canonical/models/front/Zorua.gif rename to src/canonical/models/front/570--0--Zorua.gif diff --git a/src/canonical/models/front/Zoroark.gif b/src/canonical/models/front/571--0--Zoroark.gif similarity index 100% rename from src/canonical/models/front/Zoroark.gif rename to src/canonical/models/front/571--0--Zoroark.gif diff --git a/src/canonical/models/front/Minccino.gif b/src/canonical/models/front/572--0--Minccino.gif similarity index 100% rename from src/canonical/models/front/Minccino.gif rename to src/canonical/models/front/572--0--Minccino.gif diff --git a/src/canonical/models/front/Cinccino.gif b/src/canonical/models/front/573--0--Cinccino.gif similarity index 100% rename from src/canonical/models/front/Cinccino.gif rename to src/canonical/models/front/573--0--Cinccino.gif diff --git a/src/canonical/models/front/Gothita.gif b/src/canonical/models/front/574--0--Gothita.gif similarity index 100% rename from src/canonical/models/front/Gothita.gif rename to src/canonical/models/front/574--0--Gothita.gif diff --git a/src/canonical/models/front/Gothorita.gif b/src/canonical/models/front/575--0--Gothorita.gif similarity index 100% rename from src/canonical/models/front/Gothorita.gif rename to src/canonical/models/front/575--0--Gothorita.gif diff --git a/src/canonical/models/front/Gothitelle.gif b/src/canonical/models/front/576--0--Gothitelle.gif similarity index 100% rename from src/canonical/models/front/Gothitelle.gif rename to src/canonical/models/front/576--0--Gothitelle.gif diff --git a/src/canonical/models/front/Solosis.gif b/src/canonical/models/front/577--0--Solosis.gif similarity index 100% rename from src/canonical/models/front/Solosis.gif rename to src/canonical/models/front/577--0--Solosis.gif diff --git a/src/canonical/models/front/Duosion.gif b/src/canonical/models/front/578--0--Duosion.gif similarity index 100% rename from src/canonical/models/front/Duosion.gif rename to src/canonical/models/front/578--0--Duosion.gif diff --git a/src/canonical/models/front/Reuniclus.gif b/src/canonical/models/front/579--0--Reuniclus.gif similarity index 100% rename from src/canonical/models/front/Reuniclus.gif rename to src/canonical/models/front/579--0--Reuniclus.gif diff --git a/src/canonical/models/front/Growlithe.gif b/src/canonical/models/front/58--0--Growlithe.gif similarity index 100% rename from src/canonical/models/front/Growlithe.gif rename to src/canonical/models/front/58--0--Growlithe.gif diff --git a/src/canonical/models/front/Ducklett.gif b/src/canonical/models/front/580--0--Ducklett.gif similarity index 100% rename from src/canonical/models/front/Ducklett.gif rename to src/canonical/models/front/580--0--Ducklett.gif diff --git a/src/canonical/models/front/Swanna.gif b/src/canonical/models/front/581--0--Swanna.gif similarity index 100% rename from src/canonical/models/front/Swanna.gif rename to src/canonical/models/front/581--0--Swanna.gif diff --git a/src/canonical/models/front/Vanillite.gif b/src/canonical/models/front/582--0--Vanillite.gif similarity index 100% rename from src/canonical/models/front/Vanillite.gif rename to src/canonical/models/front/582--0--Vanillite.gif diff --git a/src/canonical/models/front/Vanillish.gif b/src/canonical/models/front/583--0--Vanillish.gif similarity index 100% rename from src/canonical/models/front/Vanillish.gif rename to src/canonical/models/front/583--0--Vanillish.gif diff --git a/src/canonical/models/front/Vanilluxe.gif b/src/canonical/models/front/584--0--Vanilluxe.gif similarity index 100% rename from src/canonical/models/front/Vanilluxe.gif rename to src/canonical/models/front/584--0--Vanilluxe.gif diff --git a/src/canonical/models/front/Deerling.gif b/src/canonical/models/front/585--0--Deerling.gif similarity index 100% rename from src/canonical/models/front/Deerling.gif rename to src/canonical/models/front/585--0--Deerling.gif diff --git a/src/canonical/models/front/Sawsbuck.gif b/src/canonical/models/front/586--0--Sawsbuck.gif similarity index 100% rename from src/canonical/models/front/Sawsbuck.gif rename to src/canonical/models/front/586--0--Sawsbuck.gif diff --git a/src/canonical/models/front/Emolga.gif b/src/canonical/models/front/587--0--Emolga.gif similarity index 100% rename from src/canonical/models/front/Emolga.gif rename to src/canonical/models/front/587--0--Emolga.gif diff --git a/src/canonical/models/front/Karrablast.gif b/src/canonical/models/front/588--0--Karrablast.gif similarity index 100% rename from src/canonical/models/front/Karrablast.gif rename to src/canonical/models/front/588--0--Karrablast.gif diff --git a/src/canonical/models/front/Escavalier.gif b/src/canonical/models/front/589--0--Escavalier.gif similarity index 100% rename from src/canonical/models/front/Escavalier.gif rename to src/canonical/models/front/589--0--Escavalier.gif diff --git a/src/canonical/models/front/Arcanine.gif b/src/canonical/models/front/59--0--Arcanine.gif similarity index 100% rename from src/canonical/models/front/Arcanine.gif rename to src/canonical/models/front/59--0--Arcanine.gif diff --git a/src/canonical/models/front/Foongus.gif b/src/canonical/models/front/590--0--Foongus.gif similarity index 100% rename from src/canonical/models/front/Foongus.gif rename to src/canonical/models/front/590--0--Foongus.gif diff --git a/src/canonical/models/front/Amoonguss.gif b/src/canonical/models/front/591--0--Amoonguss.gif similarity index 100% rename from src/canonical/models/front/Amoonguss.gif rename to src/canonical/models/front/591--0--Amoonguss.gif diff --git a/src/canonical/models/front/Frillish.gif b/src/canonical/models/front/592--0--Frillish.gif similarity index 100% rename from src/canonical/models/front/Frillish.gif rename to src/canonical/models/front/592--0--Frillish.gif diff --git a/src/canonical/models/front/Jellicent.gif b/src/canonical/models/front/593--0--Jellicent.gif similarity index 100% rename from src/canonical/models/front/Jellicent.gif rename to src/canonical/models/front/593--0--Jellicent.gif diff --git a/src/canonical/models/front/Alomomola.gif b/src/canonical/models/front/594--0--Alomomola.gif similarity index 100% rename from src/canonical/models/front/Alomomola.gif rename to src/canonical/models/front/594--0--Alomomola.gif diff --git a/src/canonical/models/front/Joltik.gif b/src/canonical/models/front/595--0--Joltik.gif similarity index 100% rename from src/canonical/models/front/Joltik.gif rename to src/canonical/models/front/595--0--Joltik.gif diff --git a/src/canonical/models/front/Galvantula.gif b/src/canonical/models/front/596--0--Galvantula.gif similarity index 100% rename from src/canonical/models/front/Galvantula.gif rename to src/canonical/models/front/596--0--Galvantula.gif diff --git a/src/canonical/models/front/Ferroseed.gif b/src/canonical/models/front/597--0--Ferroseed.gif similarity index 100% rename from src/canonical/models/front/Ferroseed.gif rename to src/canonical/models/front/597--0--Ferroseed.gif diff --git a/src/canonical/models/front/Ferrothorn.gif b/src/canonical/models/front/598--0--Ferrothorn.gif similarity index 100% rename from src/canonical/models/front/Ferrothorn.gif rename to src/canonical/models/front/598--0--Ferrothorn.gif diff --git a/src/canonical/models/front/Klink.gif b/src/canonical/models/front/599--0--Klink.gif similarity index 100% rename from src/canonical/models/front/Klink.gif rename to src/canonical/models/front/599--0--Klink.gif diff --git a/src/canonical/models/front/Charizard.gif b/src/canonical/models/front/6--0--Charizard.gif similarity index 100% rename from src/canonical/models/front/Charizard.gif rename to src/canonical/models/front/6--0--Charizard.gif diff --git a/src/canonical/models/front/Charizard--Gmax.gif b/src/canonical/models/front/6--420--Charizard--Gmax.gif similarity index 100% rename from src/canonical/models/front/Charizard--Gmax.gif rename to src/canonical/models/front/6--420--Charizard--Gmax.gif diff --git a/src/canonical/models/front/Charizard--Mega-X.gif b/src/canonical/models/front/6--420--Charizard--Mega-X.gif similarity index 100% rename from src/canonical/models/front/Charizard--Mega-X.gif rename to src/canonical/models/front/6--420--Charizard--Mega-X.gif diff --git a/src/canonical/models/front/Charizard--Mega-Y.gif b/src/canonical/models/front/6--420--Charizard--Mega-Y.gif similarity index 100% rename from src/canonical/models/front/Charizard--Mega-Y.gif rename to src/canonical/models/front/6--420--Charizard--Mega-Y.gif diff --git a/src/canonical/models/front/Poliwag.gif b/src/canonical/models/front/60--0--Poliwag.gif similarity index 100% rename from src/canonical/models/front/Poliwag.gif rename to src/canonical/models/front/60--0--Poliwag.gif diff --git a/src/canonical/models/front/Klang.gif b/src/canonical/models/front/600--0--Klang.gif similarity index 100% rename from src/canonical/models/front/Klang.gif rename to src/canonical/models/front/600--0--Klang.gif diff --git a/src/canonical/models/front/Klinklang.gif b/src/canonical/models/front/601--0--Klinklang.gif similarity index 100% rename from src/canonical/models/front/Klinklang.gif rename to src/canonical/models/front/601--0--Klinklang.gif diff --git a/src/canonical/models/front/Tynamo.gif b/src/canonical/models/front/602--0--Tynamo.gif similarity index 100% rename from src/canonical/models/front/Tynamo.gif rename to src/canonical/models/front/602--0--Tynamo.gif diff --git a/src/canonical/models/front/Eelektrik.gif b/src/canonical/models/front/603--0--Eelektrik.gif similarity index 100% rename from src/canonical/models/front/Eelektrik.gif rename to src/canonical/models/front/603--0--Eelektrik.gif diff --git a/src/canonical/models/front/Eelektross.gif b/src/canonical/models/front/604--0--Eelektross.gif similarity index 100% rename from src/canonical/models/front/Eelektross.gif rename to src/canonical/models/front/604--0--Eelektross.gif diff --git a/src/canonical/models/front/Elgyem.gif b/src/canonical/models/front/605--0--Elgyem.gif similarity index 100% rename from src/canonical/models/front/Elgyem.gif rename to src/canonical/models/front/605--0--Elgyem.gif diff --git a/src/canonical/models/front/Beheeyem.gif b/src/canonical/models/front/606--0--Beheeyem.gif similarity index 100% rename from src/canonical/models/front/Beheeyem.gif rename to src/canonical/models/front/606--0--Beheeyem.gif diff --git a/src/canonical/models/front/Litwick.gif b/src/canonical/models/front/607--0--Litwick.gif similarity index 100% rename from src/canonical/models/front/Litwick.gif rename to src/canonical/models/front/607--0--Litwick.gif diff --git a/src/canonical/models/front/Lampent.gif b/src/canonical/models/front/608--0--Lampent.gif similarity index 100% rename from src/canonical/models/front/Lampent.gif rename to src/canonical/models/front/608--0--Lampent.gif diff --git a/src/canonical/models/front/Chandelure.gif b/src/canonical/models/front/609--0--Chandelure.gif similarity index 100% rename from src/canonical/models/front/Chandelure.gif rename to src/canonical/models/front/609--0--Chandelure.gif diff --git a/src/canonical/models/front/Poliwhirl.gif b/src/canonical/models/front/61--0--Poliwhirl.gif similarity index 100% rename from src/canonical/models/front/Poliwhirl.gif rename to src/canonical/models/front/61--0--Poliwhirl.gif diff --git a/src/canonical/models/front/Axew.gif b/src/canonical/models/front/610--0--Axew.gif similarity index 100% rename from src/canonical/models/front/Axew.gif rename to src/canonical/models/front/610--0--Axew.gif diff --git a/src/canonical/models/front/Fraxure.gif b/src/canonical/models/front/611--0--Fraxure.gif similarity index 100% rename from src/canonical/models/front/Fraxure.gif rename to src/canonical/models/front/611--0--Fraxure.gif diff --git a/src/canonical/models/front/Haxorus.gif b/src/canonical/models/front/612--0--Haxorus.gif similarity index 100% rename from src/canonical/models/front/Haxorus.gif rename to src/canonical/models/front/612--0--Haxorus.gif diff --git a/src/canonical/models/front/Cubchoo.gif b/src/canonical/models/front/613--0--Cubchoo.gif similarity index 100% rename from src/canonical/models/front/Cubchoo.gif rename to src/canonical/models/front/613--0--Cubchoo.gif diff --git a/src/canonical/models/front/Beartic.gif b/src/canonical/models/front/614--0--Beartic.gif similarity index 100% rename from src/canonical/models/front/Beartic.gif rename to src/canonical/models/front/614--0--Beartic.gif diff --git a/src/canonical/models/front/Cryogonal.gif b/src/canonical/models/front/615--0--Cryogonal.gif similarity index 100% rename from src/canonical/models/front/Cryogonal.gif rename to src/canonical/models/front/615--0--Cryogonal.gif diff --git a/src/canonical/models/front/Shelmet.gif b/src/canonical/models/front/616--0--Shelmet.gif similarity index 100% rename from src/canonical/models/front/Shelmet.gif rename to src/canonical/models/front/616--0--Shelmet.gif diff --git a/src/canonical/models/front/Accelgor.gif b/src/canonical/models/front/617--0--Accelgor.gif similarity index 100% rename from src/canonical/models/front/Accelgor.gif rename to src/canonical/models/front/617--0--Accelgor.gif diff --git a/src/canonical/models/front/Stunfisk.gif b/src/canonical/models/front/618--0--Stunfisk.gif similarity index 100% rename from src/canonical/models/front/Stunfisk.gif rename to src/canonical/models/front/618--0--Stunfisk.gif diff --git a/src/canonical/models/front/Stunfisk--Galar.gif b/src/canonical/models/front/618--420--Stunfisk--Galar.gif similarity index 100% rename from src/canonical/models/front/Stunfisk--Galar.gif rename to src/canonical/models/front/618--420--Stunfisk--Galar.gif diff --git a/src/canonical/models/front/Mienfoo.gif b/src/canonical/models/front/619--0--Mienfoo.gif similarity index 100% rename from src/canonical/models/front/Mienfoo.gif rename to src/canonical/models/front/619--0--Mienfoo.gif diff --git a/src/canonical/models/front/Poliwrath.gif b/src/canonical/models/front/62--0--Poliwrath.gif similarity index 100% rename from src/canonical/models/front/Poliwrath.gif rename to src/canonical/models/front/62--0--Poliwrath.gif diff --git a/src/canonical/models/front/Mienshao.gif b/src/canonical/models/front/620--0--Mienshao.gif similarity index 100% rename from src/canonical/models/front/Mienshao.gif rename to src/canonical/models/front/620--0--Mienshao.gif diff --git a/src/canonical/models/front/Druddigon.gif b/src/canonical/models/front/621--0--Druddigon.gif similarity index 100% rename from src/canonical/models/front/Druddigon.gif rename to src/canonical/models/front/621--0--Druddigon.gif diff --git a/src/canonical/models/front/Golett.gif b/src/canonical/models/front/622--0--Golett.gif similarity index 100% rename from src/canonical/models/front/Golett.gif rename to src/canonical/models/front/622--0--Golett.gif diff --git a/src/canonical/models/front/Golurk.gif b/src/canonical/models/front/623--0--Golurk.gif similarity index 100% rename from src/canonical/models/front/Golurk.gif rename to src/canonical/models/front/623--0--Golurk.gif diff --git a/src/canonical/models/front/Pawniard.gif b/src/canonical/models/front/624--0--Pawniard.gif similarity index 100% rename from src/canonical/models/front/Pawniard.gif rename to src/canonical/models/front/624--0--Pawniard.gif diff --git a/src/canonical/models/front/Bisharp.gif b/src/canonical/models/front/625--0--Bisharp.gif similarity index 100% rename from src/canonical/models/front/Bisharp.gif rename to src/canonical/models/front/625--0--Bisharp.gif diff --git a/src/canonical/models/front/Bouffalant.gif b/src/canonical/models/front/626--0--Bouffalant.gif similarity index 100% rename from src/canonical/models/front/Bouffalant.gif rename to src/canonical/models/front/626--0--Bouffalant.gif diff --git a/src/canonical/models/front/Rufflet.gif b/src/canonical/models/front/627--0--Rufflet.gif similarity index 100% rename from src/canonical/models/front/Rufflet.gif rename to src/canonical/models/front/627--0--Rufflet.gif diff --git a/src/canonical/models/front/Braviary.gif b/src/canonical/models/front/628--0--Braviary.gif similarity index 100% rename from src/canonical/models/front/Braviary.gif rename to src/canonical/models/front/628--0--Braviary.gif diff --git a/src/canonical/models/front/Vullaby.gif b/src/canonical/models/front/629--0--Vullaby.gif similarity index 100% rename from src/canonical/models/front/Vullaby.gif rename to src/canonical/models/front/629--0--Vullaby.gif diff --git a/src/canonical/models/front/Abra.gif b/src/canonical/models/front/63--0--Abra.gif similarity index 100% rename from src/canonical/models/front/Abra.gif rename to src/canonical/models/front/63--0--Abra.gif diff --git a/src/canonical/models/front/Mandibuzz.gif b/src/canonical/models/front/630--0--Mandibuzz.gif similarity index 100% rename from src/canonical/models/front/Mandibuzz.gif rename to src/canonical/models/front/630--0--Mandibuzz.gif diff --git a/src/canonical/models/front/Heatmor.gif b/src/canonical/models/front/631--0--Heatmor.gif similarity index 100% rename from src/canonical/models/front/Heatmor.gif rename to src/canonical/models/front/631--0--Heatmor.gif diff --git a/src/canonical/models/front/Durant.gif b/src/canonical/models/front/632--0--Durant.gif similarity index 100% rename from src/canonical/models/front/Durant.gif rename to src/canonical/models/front/632--0--Durant.gif diff --git a/src/canonical/models/front/Deino.gif b/src/canonical/models/front/633--0--Deino.gif similarity index 100% rename from src/canonical/models/front/Deino.gif rename to src/canonical/models/front/633--0--Deino.gif diff --git a/src/canonical/models/front/Zweilous.gif b/src/canonical/models/front/634--0--Zweilous.gif similarity index 100% rename from src/canonical/models/front/Zweilous.gif rename to src/canonical/models/front/634--0--Zweilous.gif diff --git a/src/canonical/models/front/Hydreigon.gif b/src/canonical/models/front/635--0--Hydreigon.gif similarity index 100% rename from src/canonical/models/front/Hydreigon.gif rename to src/canonical/models/front/635--0--Hydreigon.gif diff --git a/src/canonical/models/front/Larvesta.gif b/src/canonical/models/front/636--0--Larvesta.gif similarity index 100% rename from src/canonical/models/front/Larvesta.gif rename to src/canonical/models/front/636--0--Larvesta.gif diff --git a/src/canonical/models/front/Volcarona.gif b/src/canonical/models/front/637--0--Volcarona.gif similarity index 100% rename from src/canonical/models/front/Volcarona.gif rename to src/canonical/models/front/637--0--Volcarona.gif diff --git a/src/canonical/models/front/Cobalion.gif b/src/canonical/models/front/638--0--Cobalion.gif similarity index 100% rename from src/canonical/models/front/Cobalion.gif rename to src/canonical/models/front/638--0--Cobalion.gif diff --git a/src/canonical/models/front/Terrakion.gif b/src/canonical/models/front/639--0--Terrakion.gif similarity index 100% rename from src/canonical/models/front/Terrakion.gif rename to src/canonical/models/front/639--0--Terrakion.gif diff --git a/src/canonical/models/front/Kadabra.gif b/src/canonical/models/front/64--0--Kadabra.gif similarity index 100% rename from src/canonical/models/front/Kadabra.gif rename to src/canonical/models/front/64--0--Kadabra.gif diff --git a/src/canonical/models/front/Virizion.gif b/src/canonical/models/front/640--0--Virizion.gif similarity index 100% rename from src/canonical/models/front/Virizion.gif rename to src/canonical/models/front/640--0--Virizion.gif diff --git a/src/canonical/models/front/Tornadus.gif b/src/canonical/models/front/641--0--Tornadus.gif similarity index 100% rename from src/canonical/models/front/Tornadus.gif rename to src/canonical/models/front/641--0--Tornadus.gif diff --git a/src/canonical/models/front/Tornadus--Therian.gif b/src/canonical/models/front/641--420--Tornadus--Therian.gif similarity index 100% rename from src/canonical/models/front/Tornadus--Therian.gif rename to src/canonical/models/front/641--420--Tornadus--Therian.gif diff --git a/src/canonical/models/front/Thundurus.gif b/src/canonical/models/front/642--0--Thundurus.gif similarity index 100% rename from src/canonical/models/front/Thundurus.gif rename to src/canonical/models/front/642--0--Thundurus.gif diff --git a/src/canonical/models/front/Thundurus--Therian.gif b/src/canonical/models/front/642--420--Thundurus--Therian.gif similarity index 100% rename from src/canonical/models/front/Thundurus--Therian.gif rename to src/canonical/models/front/642--420--Thundurus--Therian.gif diff --git a/src/canonical/models/front/Reshiram.gif b/src/canonical/models/front/643--0--Reshiram.gif similarity index 100% rename from src/canonical/models/front/Reshiram.gif rename to src/canonical/models/front/643--0--Reshiram.gif diff --git a/src/canonical/models/front/Zekrom.gif b/src/canonical/models/front/644--0--Zekrom.gif similarity index 100% rename from src/canonical/models/front/Zekrom.gif rename to src/canonical/models/front/644--0--Zekrom.gif diff --git a/src/canonical/models/front/Landorus.gif b/src/canonical/models/front/645--0--Landorus.gif similarity index 100% rename from src/canonical/models/front/Landorus.gif rename to src/canonical/models/front/645--0--Landorus.gif diff --git a/src/canonical/models/front/Landorus--Therian.gif b/src/canonical/models/front/645--420--Landorus--Therian.gif similarity index 100% rename from src/canonical/models/front/Landorus--Therian.gif rename to src/canonical/models/front/645--420--Landorus--Therian.gif diff --git a/src/canonical/models/front/Kyurem.gif b/src/canonical/models/front/646--0--Kyurem.gif similarity index 100% rename from src/canonical/models/front/Kyurem.gif rename to src/canonical/models/front/646--0--Kyurem.gif diff --git a/src/canonical/models/front/Kyurem--Black.gif b/src/canonical/models/front/646--420--Kyurem--Black.gif similarity index 100% rename from src/canonical/models/front/Kyurem--Black.gif rename to src/canonical/models/front/646--420--Kyurem--Black.gif diff --git a/src/canonical/models/front/Kyurem--White.gif b/src/canonical/models/front/646--420--Kyurem--White.gif similarity index 100% rename from src/canonical/models/front/Kyurem--White.gif rename to src/canonical/models/front/646--420--Kyurem--White.gif diff --git a/src/canonical/models/front/Keldeo.gif b/src/canonical/models/front/647--0--Keldeo.gif similarity index 100% rename from src/canonical/models/front/Keldeo.gif rename to src/canonical/models/front/647--0--Keldeo.gif diff --git a/src/canonical/models/front/Keldeo--Resolute.gif b/src/canonical/models/front/647--420--Keldeo--Resolute.gif similarity index 100% rename from src/canonical/models/front/Keldeo--Resolute.gif rename to src/canonical/models/front/647--420--Keldeo--Resolute.gif diff --git a/src/canonical/models/front/Meloetta.gif b/src/canonical/models/front/648--0--Meloetta.gif similarity index 100% rename from src/canonical/models/front/Meloetta.gif rename to src/canonical/models/front/648--0--Meloetta.gif diff --git a/src/canonical/models/front/Meloetta--Pirouette.gif b/src/canonical/models/front/648--420--Meloetta--Pirouette.gif similarity index 100% rename from src/canonical/models/front/Meloetta--Pirouette.gif rename to src/canonical/models/front/648--420--Meloetta--Pirouette.gif diff --git a/src/canonical/models/front/Genesect.gif b/src/canonical/models/front/649--0--Genesect.gif similarity index 100% rename from src/canonical/models/front/Genesect.gif rename to src/canonical/models/front/649--0--Genesect.gif diff --git a/src/canonical/models/front/Genesect--Burn.gif b/src/canonical/models/front/649--420--Genesect--Burn.gif similarity index 100% rename from src/canonical/models/front/Genesect--Burn.gif rename to src/canonical/models/front/649--420--Genesect--Burn.gif diff --git a/src/canonical/models/front/Genesect--Chill.gif b/src/canonical/models/front/649--420--Genesect--Chill.gif similarity index 100% rename from src/canonical/models/front/Genesect--Chill.gif rename to src/canonical/models/front/649--420--Genesect--Chill.gif diff --git a/src/canonical/models/front/Genesect--Douse.gif b/src/canonical/models/front/649--420--Genesect--Douse.gif similarity index 100% rename from src/canonical/models/front/Genesect--Douse.gif rename to src/canonical/models/front/649--420--Genesect--Douse.gif diff --git a/src/canonical/models/front/Genesect--Shock.gif b/src/canonical/models/front/649--420--Genesect--Shock.gif similarity index 100% rename from src/canonical/models/front/Genesect--Shock.gif rename to src/canonical/models/front/649--420--Genesect--Shock.gif diff --git a/src/canonical/models/front/Alakazam.gif b/src/canonical/models/front/65--0--Alakazam.gif similarity index 100% rename from src/canonical/models/front/Alakazam.gif rename to src/canonical/models/front/65--0--Alakazam.gif diff --git a/src/canonical/models/front/Alakazam--Mega.gif b/src/canonical/models/front/65--420--Alakazam--Mega.gif similarity index 100% rename from src/canonical/models/front/Alakazam--Mega.gif rename to src/canonical/models/front/65--420--Alakazam--Mega.gif diff --git a/src/canonical/models/front/Chespin.gif b/src/canonical/models/front/650--0--Chespin.gif similarity index 100% rename from src/canonical/models/front/Chespin.gif rename to src/canonical/models/front/650--0--Chespin.gif diff --git a/src/canonical/models/front/Quilladin.gif b/src/canonical/models/front/651--0--Quilladin.gif similarity index 100% rename from src/canonical/models/front/Quilladin.gif rename to src/canonical/models/front/651--0--Quilladin.gif diff --git a/src/canonical/models/front/Chesnaught.gif b/src/canonical/models/front/652--0--Chesnaught.gif similarity index 100% rename from src/canonical/models/front/Chesnaught.gif rename to src/canonical/models/front/652--0--Chesnaught.gif diff --git a/src/canonical/models/front/Fennekin.gif b/src/canonical/models/front/653--0--Fennekin.gif similarity index 100% rename from src/canonical/models/front/Fennekin.gif rename to src/canonical/models/front/653--0--Fennekin.gif diff --git a/src/canonical/models/front/Braixen.gif b/src/canonical/models/front/654--0--Braixen.gif similarity index 100% rename from src/canonical/models/front/Braixen.gif rename to src/canonical/models/front/654--0--Braixen.gif diff --git a/src/canonical/models/front/Delphox.gif b/src/canonical/models/front/655--0--Delphox.gif similarity index 100% rename from src/canonical/models/front/Delphox.gif rename to src/canonical/models/front/655--0--Delphox.gif diff --git a/src/canonical/models/front/Froakie.gif b/src/canonical/models/front/656--0--Froakie.gif similarity index 100% rename from src/canonical/models/front/Froakie.gif rename to src/canonical/models/front/656--0--Froakie.gif diff --git a/src/canonical/models/front/Frogadier.gif b/src/canonical/models/front/657--0--Frogadier.gif similarity index 100% rename from src/canonical/models/front/Frogadier.gif rename to src/canonical/models/front/657--0--Frogadier.gif diff --git a/src/canonical/models/front/Greninja.gif b/src/canonical/models/front/658--0--Greninja.gif similarity index 100% rename from src/canonical/models/front/Greninja.gif rename to src/canonical/models/front/658--0--Greninja.gif diff --git a/src/canonical/models/front/Greninja--Ash.gif b/src/canonical/models/front/658--420--Greninja--Ash.gif similarity index 100% rename from src/canonical/models/front/Greninja--Ash.gif rename to src/canonical/models/front/658--420--Greninja--Ash.gif diff --git a/src/canonical/models/front/Bunnelby.gif b/src/canonical/models/front/659--0--Bunnelby.gif similarity index 100% rename from src/canonical/models/front/Bunnelby.gif rename to src/canonical/models/front/659--0--Bunnelby.gif diff --git a/src/canonical/models/front/Machop.gif b/src/canonical/models/front/66--0--Machop.gif similarity index 100% rename from src/canonical/models/front/Machop.gif rename to src/canonical/models/front/66--0--Machop.gif diff --git a/src/canonical/models/front/Diggersby.gif b/src/canonical/models/front/660--0--Diggersby.gif similarity index 100% rename from src/canonical/models/front/Diggersby.gif rename to src/canonical/models/front/660--0--Diggersby.gif diff --git a/src/canonical/models/front/Fletchling.gif b/src/canonical/models/front/661--0--Fletchling.gif similarity index 100% rename from src/canonical/models/front/Fletchling.gif rename to src/canonical/models/front/661--0--Fletchling.gif diff --git a/src/canonical/models/front/Fletchinder.gif b/src/canonical/models/front/662--0--Fletchinder.gif similarity index 100% rename from src/canonical/models/front/Fletchinder.gif rename to src/canonical/models/front/662--0--Fletchinder.gif diff --git a/src/canonical/models/front/Talonflame.gif b/src/canonical/models/front/663--0--Talonflame.gif similarity index 100% rename from src/canonical/models/front/Talonflame.gif rename to src/canonical/models/front/663--0--Talonflame.gif diff --git a/src/canonical/models/front/Scatterbug.gif b/src/canonical/models/front/664--0--Scatterbug.gif similarity index 100% rename from src/canonical/models/front/Scatterbug.gif rename to src/canonical/models/front/664--0--Scatterbug.gif diff --git a/src/canonical/models/front/Spewpa.gif b/src/canonical/models/front/665--0--Spewpa.gif similarity index 100% rename from src/canonical/models/front/Spewpa.gif rename to src/canonical/models/front/665--0--Spewpa.gif diff --git a/src/canonical/models/front/Vivillon.gif b/src/canonical/models/front/666--0--Vivillon.gif similarity index 100% rename from src/canonical/models/front/Vivillon.gif rename to src/canonical/models/front/666--0--Vivillon.gif diff --git a/src/canonical/models/front/Vivillon--Fancy.gif b/src/canonical/models/front/666--420--Vivillon--Fancy.gif similarity index 100% rename from src/canonical/models/front/Vivillon--Fancy.gif rename to src/canonical/models/front/666--420--Vivillon--Fancy.gif diff --git a/src/canonical/models/front/Vivillon--Pokeball.gif b/src/canonical/models/front/666--420--Vivillon--Pokeball.gif similarity index 100% rename from src/canonical/models/front/Vivillon--Pokeball.gif rename to src/canonical/models/front/666--420--Vivillon--Pokeball.gif diff --git a/src/canonical/models/front/Litleo.gif b/src/canonical/models/front/667--0--Litleo.gif similarity index 100% rename from src/canonical/models/front/Litleo.gif rename to src/canonical/models/front/667--0--Litleo.gif diff --git a/src/canonical/models/front/Pyroar.gif b/src/canonical/models/front/668--0--Pyroar.gif similarity index 100% rename from src/canonical/models/front/Pyroar.gif rename to src/canonical/models/front/668--0--Pyroar.gif diff --git a/src/canonical/models/front/Flabe__0301be__0301.gif b/src/canonical/models/front/669--0--Flabe__0301be__0301.gif similarity index 100% rename from src/canonical/models/front/Flabe__0301be__0301.gif rename to src/canonical/models/front/669--0--Flabe__0301be__0301.gif diff --git a/src/canonical/models/front/Machoke.gif b/src/canonical/models/front/67--0--Machoke.gif similarity index 100% rename from src/canonical/models/front/Machoke.gif rename to src/canonical/models/front/67--0--Machoke.gif diff --git a/src/canonical/models/front/Floette.gif b/src/canonical/models/front/670--0--Floette.gif similarity index 100% rename from src/canonical/models/front/Floette.gif rename to src/canonical/models/front/670--0--Floette.gif diff --git a/src/canonical/models/front/Floette--Eternal.gif b/src/canonical/models/front/670--420--Floette--Eternal.gif similarity index 100% rename from src/canonical/models/front/Floette--Eternal.gif rename to src/canonical/models/front/670--420--Floette--Eternal.gif diff --git a/src/canonical/models/front/Florges.gif b/src/canonical/models/front/671--0--Florges.gif similarity index 100% rename from src/canonical/models/front/Florges.gif rename to src/canonical/models/front/671--0--Florges.gif diff --git a/src/canonical/models/front/Skiddo.gif b/src/canonical/models/front/672--0--Skiddo.gif similarity index 100% rename from src/canonical/models/front/Skiddo.gif rename to src/canonical/models/front/672--0--Skiddo.gif diff --git a/src/canonical/models/front/Gogoat.gif b/src/canonical/models/front/673--0--Gogoat.gif similarity index 100% rename from src/canonical/models/front/Gogoat.gif rename to src/canonical/models/front/673--0--Gogoat.gif diff --git a/src/canonical/models/front/Pancham.gif b/src/canonical/models/front/674--0--Pancham.gif similarity index 100% rename from src/canonical/models/front/Pancham.gif rename to src/canonical/models/front/674--0--Pancham.gif diff --git a/src/canonical/models/front/Pangoro.gif b/src/canonical/models/front/675--0--Pangoro.gif similarity index 100% rename from src/canonical/models/front/Pangoro.gif rename to src/canonical/models/front/675--0--Pangoro.gif diff --git a/src/canonical/models/front/Furfrou.gif b/src/canonical/models/front/676--0--Furfrou.gif similarity index 100% rename from src/canonical/models/front/Furfrou.gif rename to src/canonical/models/front/676--0--Furfrou.gif diff --git a/src/canonical/models/front/Espurr.gif b/src/canonical/models/front/677--0--Espurr.gif similarity index 100% rename from src/canonical/models/front/Espurr.gif rename to src/canonical/models/front/677--0--Espurr.gif diff --git a/src/canonical/models/front/Meowstic.gif b/src/canonical/models/front/678--0--Meowstic.gif similarity index 100% rename from src/canonical/models/front/Meowstic.gif rename to src/canonical/models/front/678--0--Meowstic.gif diff --git a/src/canonical/models/front/Meowstic--F.gif b/src/canonical/models/front/678--420--Meowstic--F.gif similarity index 100% rename from src/canonical/models/front/Meowstic--F.gif rename to src/canonical/models/front/678--420--Meowstic--F.gif diff --git a/src/canonical/models/front/Honedge.gif b/src/canonical/models/front/679--0--Honedge.gif similarity index 100% rename from src/canonical/models/front/Honedge.gif rename to src/canonical/models/front/679--0--Honedge.gif diff --git a/src/canonical/models/front/Machamp.gif b/src/canonical/models/front/68--0--Machamp.gif similarity index 100% rename from src/canonical/models/front/Machamp.gif rename to src/canonical/models/front/68--0--Machamp.gif diff --git a/src/canonical/models/front/Machamp--Gmax.gif b/src/canonical/models/front/68--420--Machamp--Gmax.gif similarity index 100% rename from src/canonical/models/front/Machamp--Gmax.gif rename to src/canonical/models/front/68--420--Machamp--Gmax.gif diff --git a/src/canonical/models/front/Doublade.gif b/src/canonical/models/front/680--0--Doublade.gif similarity index 100% rename from src/canonical/models/front/Doublade.gif rename to src/canonical/models/front/680--0--Doublade.gif diff --git a/src/canonical/models/front/Aegislash.gif b/src/canonical/models/front/681--0--Aegislash.gif similarity index 100% rename from src/canonical/models/front/Aegislash.gif rename to src/canonical/models/front/681--0--Aegislash.gif diff --git a/src/canonical/models/front/Aegislash--Blade.gif b/src/canonical/models/front/681--420--Aegislash--Blade.gif similarity index 100% rename from src/canonical/models/front/Aegislash--Blade.gif rename to src/canonical/models/front/681--420--Aegislash--Blade.gif diff --git a/src/canonical/models/front/Spritzee.gif b/src/canonical/models/front/682--0--Spritzee.gif similarity index 100% rename from src/canonical/models/front/Spritzee.gif rename to src/canonical/models/front/682--0--Spritzee.gif diff --git a/src/canonical/models/front/Aromatisse.gif b/src/canonical/models/front/683--0--Aromatisse.gif similarity index 100% rename from src/canonical/models/front/Aromatisse.gif rename to src/canonical/models/front/683--0--Aromatisse.gif diff --git a/src/canonical/models/front/Swirlix.gif b/src/canonical/models/front/684--0--Swirlix.gif similarity index 100% rename from src/canonical/models/front/Swirlix.gif rename to src/canonical/models/front/684--0--Swirlix.gif diff --git a/src/canonical/models/front/Slurpuff.gif b/src/canonical/models/front/685--0--Slurpuff.gif similarity index 100% rename from src/canonical/models/front/Slurpuff.gif rename to src/canonical/models/front/685--0--Slurpuff.gif diff --git a/src/canonical/models/front/Inkay.gif b/src/canonical/models/front/686--0--Inkay.gif similarity index 100% rename from src/canonical/models/front/Inkay.gif rename to src/canonical/models/front/686--0--Inkay.gif diff --git a/src/canonical/models/front/Malamar.gif b/src/canonical/models/front/687--0--Malamar.gif similarity index 100% rename from src/canonical/models/front/Malamar.gif rename to src/canonical/models/front/687--0--Malamar.gif diff --git a/src/canonical/models/front/Binacle.gif b/src/canonical/models/front/688--0--Binacle.gif similarity index 100% rename from src/canonical/models/front/Binacle.gif rename to src/canonical/models/front/688--0--Binacle.gif diff --git a/src/canonical/models/front/Barbaracle.gif b/src/canonical/models/front/689--0--Barbaracle.gif similarity index 100% rename from src/canonical/models/front/Barbaracle.gif rename to src/canonical/models/front/689--0--Barbaracle.gif diff --git a/src/canonical/models/front/Bellsprout.gif b/src/canonical/models/front/69--0--Bellsprout.gif similarity index 100% rename from src/canonical/models/front/Bellsprout.gif rename to src/canonical/models/front/69--0--Bellsprout.gif diff --git a/src/canonical/models/front/Skrelp.gif b/src/canonical/models/front/690--0--Skrelp.gif similarity index 100% rename from src/canonical/models/front/Skrelp.gif rename to src/canonical/models/front/690--0--Skrelp.gif diff --git a/src/canonical/models/front/Dragalge.gif b/src/canonical/models/front/691--0--Dragalge.gif similarity index 100% rename from src/canonical/models/front/Dragalge.gif rename to src/canonical/models/front/691--0--Dragalge.gif diff --git a/src/canonical/models/front/Clauncher.gif b/src/canonical/models/front/692--0--Clauncher.gif similarity index 100% rename from src/canonical/models/front/Clauncher.gif rename to src/canonical/models/front/692--0--Clauncher.gif diff --git a/src/canonical/models/front/Clawitzer.gif b/src/canonical/models/front/693--0--Clawitzer.gif similarity index 100% rename from src/canonical/models/front/Clawitzer.gif rename to src/canonical/models/front/693--0--Clawitzer.gif diff --git a/src/canonical/models/front/Helioptile.gif b/src/canonical/models/front/694--0--Helioptile.gif similarity index 100% rename from src/canonical/models/front/Helioptile.gif rename to src/canonical/models/front/694--0--Helioptile.gif diff --git a/src/canonical/models/front/Heliolisk.gif b/src/canonical/models/front/695--0--Heliolisk.gif similarity index 100% rename from src/canonical/models/front/Heliolisk.gif rename to src/canonical/models/front/695--0--Heliolisk.gif diff --git a/src/canonical/models/front/Tyrunt.gif b/src/canonical/models/front/696--0--Tyrunt.gif similarity index 100% rename from src/canonical/models/front/Tyrunt.gif rename to src/canonical/models/front/696--0--Tyrunt.gif diff --git a/src/canonical/models/front/Tyrantrum.gif b/src/canonical/models/front/697--0--Tyrantrum.gif similarity index 100% rename from src/canonical/models/front/Tyrantrum.gif rename to src/canonical/models/front/697--0--Tyrantrum.gif diff --git a/src/canonical/models/front/Amaura.gif b/src/canonical/models/front/698--0--Amaura.gif similarity index 100% rename from src/canonical/models/front/Amaura.gif rename to src/canonical/models/front/698--0--Amaura.gif diff --git a/src/canonical/models/front/Aurorus.gif b/src/canonical/models/front/699--0--Aurorus.gif similarity index 100% rename from src/canonical/models/front/Aurorus.gif rename to src/canonical/models/front/699--0--Aurorus.gif diff --git a/src/canonical/models/front/Squirtle.gif b/src/canonical/models/front/7--0--Squirtle.gif similarity index 100% rename from src/canonical/models/front/Squirtle.gif rename to src/canonical/models/front/7--0--Squirtle.gif diff --git a/src/canonical/models/front/Weepinbell.gif b/src/canonical/models/front/70--0--Weepinbell.gif similarity index 100% rename from src/canonical/models/front/Weepinbell.gif rename to src/canonical/models/front/70--0--Weepinbell.gif diff --git a/src/canonical/models/front/Sylveon.gif b/src/canonical/models/front/700--0--Sylveon.gif similarity index 100% rename from src/canonical/models/front/Sylveon.gif rename to src/canonical/models/front/700--0--Sylveon.gif diff --git a/src/canonical/models/front/Hawlucha.gif b/src/canonical/models/front/701--0--Hawlucha.gif similarity index 100% rename from src/canonical/models/front/Hawlucha.gif rename to src/canonical/models/front/701--0--Hawlucha.gif diff --git a/src/canonical/models/front/Dedenne.gif b/src/canonical/models/front/702--0--Dedenne.gif similarity index 100% rename from src/canonical/models/front/Dedenne.gif rename to src/canonical/models/front/702--0--Dedenne.gif diff --git a/src/canonical/models/front/Carbink.gif b/src/canonical/models/front/703--0--Carbink.gif similarity index 100% rename from src/canonical/models/front/Carbink.gif rename to src/canonical/models/front/703--0--Carbink.gif diff --git a/src/canonical/models/front/Goomy.gif b/src/canonical/models/front/704--0--Goomy.gif similarity index 100% rename from src/canonical/models/front/Goomy.gif rename to src/canonical/models/front/704--0--Goomy.gif diff --git a/src/canonical/models/front/Sliggoo.gif b/src/canonical/models/front/705--0--Sliggoo.gif similarity index 100% rename from src/canonical/models/front/Sliggoo.gif rename to src/canonical/models/front/705--0--Sliggoo.gif diff --git a/src/canonical/models/front/Goodra.gif b/src/canonical/models/front/706--0--Goodra.gif similarity index 100% rename from src/canonical/models/front/Goodra.gif rename to src/canonical/models/front/706--0--Goodra.gif diff --git a/src/canonical/models/front/Klefki.gif b/src/canonical/models/front/707--0--Klefki.gif similarity index 100% rename from src/canonical/models/front/Klefki.gif rename to src/canonical/models/front/707--0--Klefki.gif diff --git a/src/canonical/models/front/Phantump.gif b/src/canonical/models/front/708--0--Phantump.gif similarity index 100% rename from src/canonical/models/front/Phantump.gif rename to src/canonical/models/front/708--0--Phantump.gif diff --git a/src/canonical/models/front/Trevenant.gif b/src/canonical/models/front/709--0--Trevenant.gif similarity index 100% rename from src/canonical/models/front/Trevenant.gif rename to src/canonical/models/front/709--0--Trevenant.gif diff --git a/src/canonical/models/front/Victreebel.gif b/src/canonical/models/front/71--0--Victreebel.gif similarity index 100% rename from src/canonical/models/front/Victreebel.gif rename to src/canonical/models/front/71--0--Victreebel.gif diff --git a/src/canonical/models/front/Pumpkaboo.gif b/src/canonical/models/front/710--0--Pumpkaboo.gif similarity index 100% rename from src/canonical/models/front/Pumpkaboo.gif rename to src/canonical/models/front/710--0--Pumpkaboo.gif diff --git a/src/canonical/models/front/Pumpkaboo--Large.gif b/src/canonical/models/front/710--420--Pumpkaboo--Large.gif similarity index 100% rename from src/canonical/models/front/Pumpkaboo--Large.gif rename to src/canonical/models/front/710--420--Pumpkaboo--Large.gif diff --git a/src/canonical/models/front/Pumpkaboo--Small.gif b/src/canonical/models/front/710--420--Pumpkaboo--Small.gif similarity index 100% rename from src/canonical/models/front/Pumpkaboo--Small.gif rename to src/canonical/models/front/710--420--Pumpkaboo--Small.gif diff --git a/src/canonical/models/front/Pumpkaboo--Super.gif b/src/canonical/models/front/710--420--Pumpkaboo--Super.gif similarity index 100% rename from src/canonical/models/front/Pumpkaboo--Super.gif rename to src/canonical/models/front/710--420--Pumpkaboo--Super.gif diff --git a/src/canonical/models/front/Gourgeist.gif b/src/canonical/models/front/711--0--Gourgeist.gif similarity index 100% rename from src/canonical/models/front/Gourgeist.gif rename to src/canonical/models/front/711--0--Gourgeist.gif diff --git a/src/canonical/models/front/Gourgeist--Large.gif b/src/canonical/models/front/711--420--Gourgeist--Large.gif similarity index 100% rename from src/canonical/models/front/Gourgeist--Large.gif rename to src/canonical/models/front/711--420--Gourgeist--Large.gif diff --git a/src/canonical/models/front/Gourgeist--Small.gif b/src/canonical/models/front/711--420--Gourgeist--Small.gif similarity index 100% rename from src/canonical/models/front/Gourgeist--Small.gif rename to src/canonical/models/front/711--420--Gourgeist--Small.gif diff --git a/src/canonical/models/front/Gourgeist--Super.gif b/src/canonical/models/front/711--420--Gourgeist--Super.gif similarity index 100% rename from src/canonical/models/front/Gourgeist--Super.gif rename to src/canonical/models/front/711--420--Gourgeist--Super.gif diff --git a/src/canonical/models/front/Bergmite.gif b/src/canonical/models/front/712--0--Bergmite.gif similarity index 100% rename from src/canonical/models/front/Bergmite.gif rename to src/canonical/models/front/712--0--Bergmite.gif diff --git a/src/canonical/models/front/Avalugg.gif b/src/canonical/models/front/713--0--Avalugg.gif similarity index 100% rename from src/canonical/models/front/Avalugg.gif rename to src/canonical/models/front/713--0--Avalugg.gif diff --git a/src/canonical/models/front/Noibat.gif b/src/canonical/models/front/714--0--Noibat.gif similarity index 100% rename from src/canonical/models/front/Noibat.gif rename to src/canonical/models/front/714--0--Noibat.gif diff --git a/src/canonical/models/front/Noivern.gif b/src/canonical/models/front/715--0--Noivern.gif similarity index 100% rename from src/canonical/models/front/Noivern.gif rename to src/canonical/models/front/715--0--Noivern.gif diff --git a/src/canonical/models/front/Xerneas.gif b/src/canonical/models/front/716--0--Xerneas.gif similarity index 100% rename from src/canonical/models/front/Xerneas.gif rename to src/canonical/models/front/716--0--Xerneas.gif diff --git a/src/canonical/models/front/Yveltal.gif b/src/canonical/models/front/717--0--Yveltal.gif similarity index 100% rename from src/canonical/models/front/Yveltal.gif rename to src/canonical/models/front/717--0--Yveltal.gif diff --git a/src/canonical/models/front/Zygarde.gif b/src/canonical/models/front/718--0--Zygarde.gif similarity index 100% rename from src/canonical/models/front/Zygarde.gif rename to src/canonical/models/front/718--0--Zygarde.gif diff --git a/src/canonical/models/front/Zygarde--10__0025.gif b/src/canonical/models/front/718--420--Zygarde--10__0025.gif similarity index 100% rename from src/canonical/models/front/Zygarde--10__0025.gif rename to src/canonical/models/front/718--420--Zygarde--10__0025.gif diff --git a/src/canonical/models/front/Zygarde--Complete.gif b/src/canonical/models/front/718--420--Zygarde--Complete.gif similarity index 100% rename from src/canonical/models/front/Zygarde--Complete.gif rename to src/canonical/models/front/718--420--Zygarde--Complete.gif diff --git a/src/canonical/models/front/Diancie.gif b/src/canonical/models/front/719--0--Diancie.gif similarity index 100% rename from src/canonical/models/front/Diancie.gif rename to src/canonical/models/front/719--0--Diancie.gif diff --git a/src/canonical/models/front/Diancie--Mega.gif b/src/canonical/models/front/719--420--Diancie--Mega.gif similarity index 100% rename from src/canonical/models/front/Diancie--Mega.gif rename to src/canonical/models/front/719--420--Diancie--Mega.gif diff --git a/src/canonical/models/front/Tentacool.gif b/src/canonical/models/front/72--0--Tentacool.gif similarity index 100% rename from src/canonical/models/front/Tentacool.gif rename to src/canonical/models/front/72--0--Tentacool.gif diff --git a/src/canonical/models/front/Hoopa.gif b/src/canonical/models/front/720--0--Hoopa.gif similarity index 100% rename from src/canonical/models/front/Hoopa.gif rename to src/canonical/models/front/720--0--Hoopa.gif diff --git a/src/canonical/models/front/Hoopa--Unbound.gif b/src/canonical/models/front/720--420--Hoopa--Unbound.gif similarity index 100% rename from src/canonical/models/front/Hoopa--Unbound.gif rename to src/canonical/models/front/720--420--Hoopa--Unbound.gif diff --git a/src/canonical/models/front/Volcanion.gif b/src/canonical/models/front/721--0--Volcanion.gif similarity index 100% rename from src/canonical/models/front/Volcanion.gif rename to src/canonical/models/front/721--0--Volcanion.gif diff --git a/src/canonical/models/front/Rowlet.gif b/src/canonical/models/front/722--0--Rowlet.gif similarity index 100% rename from src/canonical/models/front/Rowlet.gif rename to src/canonical/models/front/722--0--Rowlet.gif diff --git a/src/canonical/models/front/Dartrix.gif b/src/canonical/models/front/723--0--Dartrix.gif similarity index 100% rename from src/canonical/models/front/Dartrix.gif rename to src/canonical/models/front/723--0--Dartrix.gif diff --git a/src/canonical/models/front/Decidueye.gif b/src/canonical/models/front/724--0--Decidueye.gif similarity index 100% rename from src/canonical/models/front/Decidueye.gif rename to src/canonical/models/front/724--0--Decidueye.gif diff --git a/src/canonical/models/front/Litten.gif b/src/canonical/models/front/725--0--Litten.gif similarity index 100% rename from src/canonical/models/front/Litten.gif rename to src/canonical/models/front/725--0--Litten.gif diff --git a/src/canonical/models/front/Torracat.gif b/src/canonical/models/front/726--0--Torracat.gif similarity index 100% rename from src/canonical/models/front/Torracat.gif rename to src/canonical/models/front/726--0--Torracat.gif diff --git a/src/canonical/models/front/Incineroar.gif b/src/canonical/models/front/727--0--Incineroar.gif similarity index 100% rename from src/canonical/models/front/Incineroar.gif rename to src/canonical/models/front/727--0--Incineroar.gif diff --git a/src/canonical/models/front/Popplio.gif b/src/canonical/models/front/728--0--Popplio.gif similarity index 100% rename from src/canonical/models/front/Popplio.gif rename to src/canonical/models/front/728--0--Popplio.gif diff --git a/src/canonical/models/front/Brionne.gif b/src/canonical/models/front/729--0--Brionne.gif similarity index 100% rename from src/canonical/models/front/Brionne.gif rename to src/canonical/models/front/729--0--Brionne.gif diff --git a/src/canonical/models/front/Tentacruel.gif b/src/canonical/models/front/73--0--Tentacruel.gif similarity index 100% rename from src/canonical/models/front/Tentacruel.gif rename to src/canonical/models/front/73--0--Tentacruel.gif diff --git a/src/canonical/models/front/Primarina.gif b/src/canonical/models/front/730--0--Primarina.gif similarity index 100% rename from src/canonical/models/front/Primarina.gif rename to src/canonical/models/front/730--0--Primarina.gif diff --git a/src/canonical/models/front/Pikipek.gif b/src/canonical/models/front/731--0--Pikipek.gif similarity index 100% rename from src/canonical/models/front/Pikipek.gif rename to src/canonical/models/front/731--0--Pikipek.gif diff --git a/src/canonical/models/front/Trumbeak.gif b/src/canonical/models/front/732--0--Trumbeak.gif similarity index 100% rename from src/canonical/models/front/Trumbeak.gif rename to src/canonical/models/front/732--0--Trumbeak.gif diff --git a/src/canonical/models/front/Toucannon.gif b/src/canonical/models/front/733--0--Toucannon.gif similarity index 100% rename from src/canonical/models/front/Toucannon.gif rename to src/canonical/models/front/733--0--Toucannon.gif diff --git a/src/canonical/models/front/Yungoos.gif b/src/canonical/models/front/734--0--Yungoos.gif similarity index 100% rename from src/canonical/models/front/Yungoos.gif rename to src/canonical/models/front/734--0--Yungoos.gif diff --git a/src/canonical/models/front/Gumshoos.gif b/src/canonical/models/front/735--0--Gumshoos.gif similarity index 100% rename from src/canonical/models/front/Gumshoos.gif rename to src/canonical/models/front/735--0--Gumshoos.gif diff --git a/src/canonical/models/front/Gumshoos--Totem.gif b/src/canonical/models/front/735--420--Gumshoos--Totem.gif similarity index 100% rename from src/canonical/models/front/Gumshoos--Totem.gif rename to src/canonical/models/front/735--420--Gumshoos--Totem.gif diff --git a/src/canonical/models/front/Grubbin.gif b/src/canonical/models/front/736--0--Grubbin.gif similarity index 100% rename from src/canonical/models/front/Grubbin.gif rename to src/canonical/models/front/736--0--Grubbin.gif diff --git a/src/canonical/models/front/Charjabug.gif b/src/canonical/models/front/737--0--Charjabug.gif similarity index 100% rename from src/canonical/models/front/Charjabug.gif rename to src/canonical/models/front/737--0--Charjabug.gif diff --git a/src/canonical/models/front/Vikavolt.gif b/src/canonical/models/front/738--0--Vikavolt.gif similarity index 100% rename from src/canonical/models/front/Vikavolt.gif rename to src/canonical/models/front/738--0--Vikavolt.gif diff --git a/src/canonical/models/front/Vikavolt--Totem.gif b/src/canonical/models/front/738--420--Vikavolt--Totem.gif similarity index 100% rename from src/canonical/models/front/Vikavolt--Totem.gif rename to src/canonical/models/front/738--420--Vikavolt--Totem.gif diff --git a/src/canonical/models/front/Crabrawler.gif b/src/canonical/models/front/739--0--Crabrawler.gif similarity index 100% rename from src/canonical/models/front/Crabrawler.gif rename to src/canonical/models/front/739--0--Crabrawler.gif diff --git a/src/canonical/models/front/Geodude.gif b/src/canonical/models/front/74--0--Geodude.gif similarity index 100% rename from src/canonical/models/front/Geodude.gif rename to src/canonical/models/front/74--0--Geodude.gif diff --git a/src/canonical/models/front/Geodude--Alola.gif b/src/canonical/models/front/74--420--Geodude--Alola.gif similarity index 100% rename from src/canonical/models/front/Geodude--Alola.gif rename to src/canonical/models/front/74--420--Geodude--Alola.gif diff --git a/src/canonical/models/front/Crabominable.gif b/src/canonical/models/front/740--0--Crabominable.gif similarity index 100% rename from src/canonical/models/front/Crabominable.gif rename to src/canonical/models/front/740--0--Crabominable.gif diff --git a/src/canonical/models/front/Oricorio.gif b/src/canonical/models/front/741--0--Oricorio.gif similarity index 100% rename from src/canonical/models/front/Oricorio.gif rename to src/canonical/models/front/741--0--Oricorio.gif diff --git a/src/canonical/models/front/Oricorio--Pa__0027u.gif b/src/canonical/models/front/741--420--Oricorio--Pa__0027u.gif similarity index 100% rename from src/canonical/models/front/Oricorio--Pa__0027u.gif rename to src/canonical/models/front/741--420--Oricorio--Pa__0027u.gif diff --git a/src/canonical/models/front/Oricorio--Pom-Pom.gif b/src/canonical/models/front/741--420--Oricorio--Pom-Pom.gif similarity index 100% rename from src/canonical/models/front/Oricorio--Pom-Pom.gif rename to src/canonical/models/front/741--420--Oricorio--Pom-Pom.gif diff --git a/src/canonical/models/front/Oricorio--Sensu.gif b/src/canonical/models/front/741--420--Oricorio--Sensu.gif similarity index 100% rename from src/canonical/models/front/Oricorio--Sensu.gif rename to src/canonical/models/front/741--420--Oricorio--Sensu.gif diff --git a/src/canonical/models/front/Cutiefly.gif b/src/canonical/models/front/742--0--Cutiefly.gif similarity index 100% rename from src/canonical/models/front/Cutiefly.gif rename to src/canonical/models/front/742--0--Cutiefly.gif diff --git a/src/canonical/models/front/Ribombee.gif b/src/canonical/models/front/743--0--Ribombee.gif similarity index 100% rename from src/canonical/models/front/Ribombee.gif rename to src/canonical/models/front/743--0--Ribombee.gif diff --git a/src/canonical/models/front/Rockruff.gif b/src/canonical/models/front/744--0--Rockruff.gif similarity index 100% rename from src/canonical/models/front/Rockruff.gif rename to src/canonical/models/front/744--0--Rockruff.gif diff --git a/src/canonical/models/front/Lycanroc.gif b/src/canonical/models/front/745--0--Lycanroc.gif similarity index 100% rename from src/canonical/models/front/Lycanroc.gif rename to src/canonical/models/front/745--0--Lycanroc.gif diff --git a/src/canonical/models/front/Lycanroc--Dusk.gif b/src/canonical/models/front/745--420--Lycanroc--Dusk.gif similarity index 100% rename from src/canonical/models/front/Lycanroc--Dusk.gif rename to src/canonical/models/front/745--420--Lycanroc--Dusk.gif diff --git a/src/canonical/models/front/Lycanroc--Midnight.gif b/src/canonical/models/front/745--420--Lycanroc--Midnight.gif similarity index 100% rename from src/canonical/models/front/Lycanroc--Midnight.gif rename to src/canonical/models/front/745--420--Lycanroc--Midnight.gif diff --git a/src/canonical/models/front/Wishiwashi.gif b/src/canonical/models/front/746--0--Wishiwashi.gif similarity index 100% rename from src/canonical/models/front/Wishiwashi.gif rename to src/canonical/models/front/746--0--Wishiwashi.gif diff --git a/src/canonical/models/front/Wishiwashi--School.gif b/src/canonical/models/front/746--420--Wishiwashi--School.gif similarity index 100% rename from src/canonical/models/front/Wishiwashi--School.gif rename to src/canonical/models/front/746--420--Wishiwashi--School.gif diff --git a/src/canonical/models/front/Mareanie.gif b/src/canonical/models/front/747--0--Mareanie.gif similarity index 100% rename from src/canonical/models/front/Mareanie.gif rename to src/canonical/models/front/747--0--Mareanie.gif diff --git a/src/canonical/models/front/Toxapex.gif b/src/canonical/models/front/748--0--Toxapex.gif similarity index 100% rename from src/canonical/models/front/Toxapex.gif rename to src/canonical/models/front/748--0--Toxapex.gif diff --git a/src/canonical/models/front/Mudbray.gif b/src/canonical/models/front/749--0--Mudbray.gif similarity index 100% rename from src/canonical/models/front/Mudbray.gif rename to src/canonical/models/front/749--0--Mudbray.gif diff --git a/src/canonical/models/front/Graveler.gif b/src/canonical/models/front/75--0--Graveler.gif similarity index 100% rename from src/canonical/models/front/Graveler.gif rename to src/canonical/models/front/75--0--Graveler.gif diff --git a/src/canonical/models/front/Graveler--Alola.gif b/src/canonical/models/front/75--420--Graveler--Alola.gif similarity index 100% rename from src/canonical/models/front/Graveler--Alola.gif rename to src/canonical/models/front/75--420--Graveler--Alola.gif diff --git a/src/canonical/models/front/Mudsdale.gif b/src/canonical/models/front/750--0--Mudsdale.gif similarity index 100% rename from src/canonical/models/front/Mudsdale.gif rename to src/canonical/models/front/750--0--Mudsdale.gif diff --git a/src/canonical/models/front/Dewpider.gif b/src/canonical/models/front/751--0--Dewpider.gif similarity index 100% rename from src/canonical/models/front/Dewpider.gif rename to src/canonical/models/front/751--0--Dewpider.gif diff --git a/src/canonical/models/front/Araquanid.gif b/src/canonical/models/front/752--0--Araquanid.gif similarity index 100% rename from src/canonical/models/front/Araquanid.gif rename to src/canonical/models/front/752--0--Araquanid.gif diff --git a/src/canonical/models/front/Araquanid--Totem.gif b/src/canonical/models/front/752--420--Araquanid--Totem.gif similarity index 100% rename from src/canonical/models/front/Araquanid--Totem.gif rename to src/canonical/models/front/752--420--Araquanid--Totem.gif diff --git a/src/canonical/models/front/Fomantis.gif b/src/canonical/models/front/753--0--Fomantis.gif similarity index 100% rename from src/canonical/models/front/Fomantis.gif rename to src/canonical/models/front/753--0--Fomantis.gif diff --git a/src/canonical/models/front/Lurantis.gif b/src/canonical/models/front/754--0--Lurantis.gif similarity index 100% rename from src/canonical/models/front/Lurantis.gif rename to src/canonical/models/front/754--0--Lurantis.gif diff --git a/src/canonical/models/front/Lurantis--Totem.gif b/src/canonical/models/front/754--420--Lurantis--Totem.gif similarity index 100% rename from src/canonical/models/front/Lurantis--Totem.gif rename to src/canonical/models/front/754--420--Lurantis--Totem.gif diff --git a/src/canonical/models/front/Morelull.gif b/src/canonical/models/front/755--0--Morelull.gif similarity index 100% rename from src/canonical/models/front/Morelull.gif rename to src/canonical/models/front/755--0--Morelull.gif diff --git a/src/canonical/models/front/Shiinotic.gif b/src/canonical/models/front/756--0--Shiinotic.gif similarity index 100% rename from src/canonical/models/front/Shiinotic.gif rename to src/canonical/models/front/756--0--Shiinotic.gif diff --git a/src/canonical/models/front/Salandit.gif b/src/canonical/models/front/757--0--Salandit.gif similarity index 100% rename from src/canonical/models/front/Salandit.gif rename to src/canonical/models/front/757--0--Salandit.gif diff --git a/src/canonical/models/front/Salazzle.gif b/src/canonical/models/front/758--0--Salazzle.gif similarity index 100% rename from src/canonical/models/front/Salazzle.gif rename to src/canonical/models/front/758--0--Salazzle.gif diff --git a/src/canonical/models/front/Salazzle--Totem.gif b/src/canonical/models/front/758--420--Salazzle--Totem.gif similarity index 100% rename from src/canonical/models/front/Salazzle--Totem.gif rename to src/canonical/models/front/758--420--Salazzle--Totem.gif diff --git a/src/canonical/models/front/Stufful.gif b/src/canonical/models/front/759--0--Stufful.gif similarity index 100% rename from src/canonical/models/front/Stufful.gif rename to src/canonical/models/front/759--0--Stufful.gif diff --git a/src/canonical/models/front/Golem.gif b/src/canonical/models/front/76--0--Golem.gif similarity index 100% rename from src/canonical/models/front/Golem.gif rename to src/canonical/models/front/76--0--Golem.gif diff --git a/src/canonical/models/front/Golem--Alola.gif b/src/canonical/models/front/76--420--Golem--Alola.gif similarity index 100% rename from src/canonical/models/front/Golem--Alola.gif rename to src/canonical/models/front/76--420--Golem--Alola.gif diff --git a/src/canonical/models/front/Bewear.gif b/src/canonical/models/front/760--0--Bewear.gif similarity index 100% rename from src/canonical/models/front/Bewear.gif rename to src/canonical/models/front/760--0--Bewear.gif diff --git a/src/canonical/models/front/Bounsweet.gif b/src/canonical/models/front/761--0--Bounsweet.gif similarity index 100% rename from src/canonical/models/front/Bounsweet.gif rename to src/canonical/models/front/761--0--Bounsweet.gif diff --git a/src/canonical/models/front/Steenee.gif b/src/canonical/models/front/762--0--Steenee.gif similarity index 100% rename from src/canonical/models/front/Steenee.gif rename to src/canonical/models/front/762--0--Steenee.gif diff --git a/src/canonical/models/front/Tsareena.gif b/src/canonical/models/front/763--0--Tsareena.gif similarity index 100% rename from src/canonical/models/front/Tsareena.gif rename to src/canonical/models/front/763--0--Tsareena.gif diff --git a/src/canonical/models/front/Comfey.gif b/src/canonical/models/front/764--0--Comfey.gif similarity index 100% rename from src/canonical/models/front/Comfey.gif rename to src/canonical/models/front/764--0--Comfey.gif diff --git a/src/canonical/models/front/Oranguru.gif b/src/canonical/models/front/765--0--Oranguru.gif similarity index 100% rename from src/canonical/models/front/Oranguru.gif rename to src/canonical/models/front/765--0--Oranguru.gif diff --git a/src/canonical/models/front/Passimian.gif b/src/canonical/models/front/766--0--Passimian.gif similarity index 100% rename from src/canonical/models/front/Passimian.gif rename to src/canonical/models/front/766--0--Passimian.gif diff --git a/src/canonical/models/front/Wimpod.gif b/src/canonical/models/front/767--0--Wimpod.gif similarity index 100% rename from src/canonical/models/front/Wimpod.gif rename to src/canonical/models/front/767--0--Wimpod.gif diff --git a/src/canonical/models/front/Golisopod.gif b/src/canonical/models/front/768--0--Golisopod.gif similarity index 100% rename from src/canonical/models/front/Golisopod.gif rename to src/canonical/models/front/768--0--Golisopod.gif diff --git a/src/canonical/models/front/Sandygast.gif b/src/canonical/models/front/769--0--Sandygast.gif similarity index 100% rename from src/canonical/models/front/Sandygast.gif rename to src/canonical/models/front/769--0--Sandygast.gif diff --git a/src/canonical/models/front/Ponyta.gif b/src/canonical/models/front/77--0--Ponyta.gif similarity index 100% rename from src/canonical/models/front/Ponyta.gif rename to src/canonical/models/front/77--0--Ponyta.gif diff --git a/src/canonical/models/front/Ponyta--Galar.gif b/src/canonical/models/front/77--420--Ponyta--Galar.gif similarity index 100% rename from src/canonical/models/front/Ponyta--Galar.gif rename to src/canonical/models/front/77--420--Ponyta--Galar.gif diff --git a/src/canonical/models/front/Palossand.gif b/src/canonical/models/front/770--0--Palossand.gif similarity index 100% rename from src/canonical/models/front/Palossand.gif rename to src/canonical/models/front/770--0--Palossand.gif diff --git a/src/canonical/models/front/Pyukumuku.gif b/src/canonical/models/front/771--0--Pyukumuku.gif similarity index 100% rename from src/canonical/models/front/Pyukumuku.gif rename to src/canonical/models/front/771--0--Pyukumuku.gif diff --git a/src/canonical/models/front/Type__003a_Null.gif b/src/canonical/models/front/772--0--Type__003a_Null.gif similarity index 100% rename from src/canonical/models/front/Type__003a_Null.gif rename to src/canonical/models/front/772--0--Type__003a_Null.gif diff --git a/src/canonical/models/front/Silvally.gif b/src/canonical/models/front/773--0--Silvally.gif similarity index 100% rename from src/canonical/models/front/Silvally.gif rename to src/canonical/models/front/773--0--Silvally.gif diff --git a/src/canonical/models/front/Silvally--Bug.gif b/src/canonical/models/front/773--420--Silvally--Bug.gif similarity index 100% rename from src/canonical/models/front/Silvally--Bug.gif rename to src/canonical/models/front/773--420--Silvally--Bug.gif diff --git a/src/canonical/models/front/Silvally--Dark.gif b/src/canonical/models/front/773--420--Silvally--Dark.gif similarity index 100% rename from src/canonical/models/front/Silvally--Dark.gif rename to src/canonical/models/front/773--420--Silvally--Dark.gif diff --git a/src/canonical/models/front/Silvally--Dragon.gif b/src/canonical/models/front/773--420--Silvally--Dragon.gif similarity index 100% rename from src/canonical/models/front/Silvally--Dragon.gif rename to src/canonical/models/front/773--420--Silvally--Dragon.gif diff --git a/src/canonical/models/front/Silvally--Electric.gif b/src/canonical/models/front/773--420--Silvally--Electric.gif similarity index 100% rename from src/canonical/models/front/Silvally--Electric.gif rename to src/canonical/models/front/773--420--Silvally--Electric.gif diff --git a/src/canonical/models/front/Silvally--Fairy.gif b/src/canonical/models/front/773--420--Silvally--Fairy.gif similarity index 100% rename from src/canonical/models/front/Silvally--Fairy.gif rename to src/canonical/models/front/773--420--Silvally--Fairy.gif diff --git a/src/canonical/models/front/Silvally--Fighting.gif b/src/canonical/models/front/773--420--Silvally--Fighting.gif similarity index 100% rename from src/canonical/models/front/Silvally--Fighting.gif rename to src/canonical/models/front/773--420--Silvally--Fighting.gif diff --git a/src/canonical/models/front/Silvally--Fire.gif b/src/canonical/models/front/773--420--Silvally--Fire.gif similarity index 100% rename from src/canonical/models/front/Silvally--Fire.gif rename to src/canonical/models/front/773--420--Silvally--Fire.gif diff --git a/src/canonical/models/front/Silvally--Flying.gif b/src/canonical/models/front/773--420--Silvally--Flying.gif similarity index 100% rename from src/canonical/models/front/Silvally--Flying.gif rename to src/canonical/models/front/773--420--Silvally--Flying.gif diff --git a/src/canonical/models/front/Silvally--Ghost.gif b/src/canonical/models/front/773--420--Silvally--Ghost.gif similarity index 100% rename from src/canonical/models/front/Silvally--Ghost.gif rename to src/canonical/models/front/773--420--Silvally--Ghost.gif diff --git a/src/canonical/models/front/Silvally--Grass.gif b/src/canonical/models/front/773--420--Silvally--Grass.gif similarity index 100% rename from src/canonical/models/front/Silvally--Grass.gif rename to src/canonical/models/front/773--420--Silvally--Grass.gif diff --git a/src/canonical/models/front/Silvally--Ground.gif b/src/canonical/models/front/773--420--Silvally--Ground.gif similarity index 100% rename from src/canonical/models/front/Silvally--Ground.gif rename to src/canonical/models/front/773--420--Silvally--Ground.gif diff --git a/src/canonical/models/front/Silvally--Ice.gif b/src/canonical/models/front/773--420--Silvally--Ice.gif similarity index 100% rename from src/canonical/models/front/Silvally--Ice.gif rename to src/canonical/models/front/773--420--Silvally--Ice.gif diff --git a/src/canonical/models/front/Silvally--Poison.gif b/src/canonical/models/front/773--420--Silvally--Poison.gif similarity index 100% rename from src/canonical/models/front/Silvally--Poison.gif rename to src/canonical/models/front/773--420--Silvally--Poison.gif diff --git a/src/canonical/models/front/Silvally--Psychic.gif b/src/canonical/models/front/773--420--Silvally--Psychic.gif similarity index 100% rename from src/canonical/models/front/Silvally--Psychic.gif rename to src/canonical/models/front/773--420--Silvally--Psychic.gif diff --git a/src/canonical/models/front/Silvally--Rock.gif b/src/canonical/models/front/773--420--Silvally--Rock.gif similarity index 100% rename from src/canonical/models/front/Silvally--Rock.gif rename to src/canonical/models/front/773--420--Silvally--Rock.gif diff --git a/src/canonical/models/front/Silvally--Steel.gif b/src/canonical/models/front/773--420--Silvally--Steel.gif similarity index 100% rename from src/canonical/models/front/Silvally--Steel.gif rename to src/canonical/models/front/773--420--Silvally--Steel.gif diff --git a/src/canonical/models/front/Silvally--Water.gif b/src/canonical/models/front/773--420--Silvally--Water.gif similarity index 100% rename from src/canonical/models/front/Silvally--Water.gif rename to src/canonical/models/front/773--420--Silvally--Water.gif diff --git a/src/canonical/models/front/Minior.gif b/src/canonical/models/front/774--0--Minior.gif similarity index 100% rename from src/canonical/models/front/Minior.gif rename to src/canonical/models/front/774--0--Minior.gif diff --git a/src/canonical/models/front/Komala.gif b/src/canonical/models/front/775--0--Komala.gif similarity index 100% rename from src/canonical/models/front/Komala.gif rename to src/canonical/models/front/775--0--Komala.gif diff --git a/src/canonical/models/front/Turtonator.gif b/src/canonical/models/front/776--0--Turtonator.gif similarity index 100% rename from src/canonical/models/front/Turtonator.gif rename to src/canonical/models/front/776--0--Turtonator.gif diff --git a/src/canonical/models/front/Togedemaru.gif b/src/canonical/models/front/777--0--Togedemaru.gif similarity index 100% rename from src/canonical/models/front/Togedemaru.gif rename to src/canonical/models/front/777--0--Togedemaru.gif diff --git a/src/canonical/models/front/Togedemaru--Totem.gif b/src/canonical/models/front/777--420--Togedemaru--Totem.gif similarity index 100% rename from src/canonical/models/front/Togedemaru--Totem.gif rename to src/canonical/models/front/777--420--Togedemaru--Totem.gif diff --git a/src/canonical/models/front/Mimikyu.gif b/src/canonical/models/front/778--0--Mimikyu.gif similarity index 100% rename from src/canonical/models/front/Mimikyu.gif rename to src/canonical/models/front/778--0--Mimikyu.gif diff --git a/src/canonical/models/front/Mimikyu--Busted-Totem.gif b/src/canonical/models/front/778--420--Mimikyu--Busted-Totem.gif similarity index 100% rename from src/canonical/models/front/Mimikyu--Busted-Totem.gif rename to src/canonical/models/front/778--420--Mimikyu--Busted-Totem.gif diff --git a/src/canonical/models/front/Mimikyu--Busted.gif b/src/canonical/models/front/778--420--Mimikyu--Busted.gif similarity index 100% rename from src/canonical/models/front/Mimikyu--Busted.gif rename to src/canonical/models/front/778--420--Mimikyu--Busted.gif diff --git a/src/canonical/models/front/Mimikyu--Totem.gif b/src/canonical/models/front/778--420--Mimikyu--Totem.gif similarity index 100% rename from src/canonical/models/front/Mimikyu--Totem.gif rename to src/canonical/models/front/778--420--Mimikyu--Totem.gif diff --git a/src/canonical/models/front/Bruxish.gif b/src/canonical/models/front/779--0--Bruxish.gif similarity index 100% rename from src/canonical/models/front/Bruxish.gif rename to src/canonical/models/front/779--0--Bruxish.gif diff --git a/src/canonical/models/front/Rapidash.gif b/src/canonical/models/front/78--0--Rapidash.gif similarity index 100% rename from src/canonical/models/front/Rapidash.gif rename to src/canonical/models/front/78--0--Rapidash.gif diff --git a/src/canonical/models/front/Rapidash--Galar.gif b/src/canonical/models/front/78--420--Rapidash--Galar.gif similarity index 100% rename from src/canonical/models/front/Rapidash--Galar.gif rename to src/canonical/models/front/78--420--Rapidash--Galar.gif diff --git a/src/canonical/models/front/Drampa.gif b/src/canonical/models/front/780--0--Drampa.gif similarity index 100% rename from src/canonical/models/front/Drampa.gif rename to src/canonical/models/front/780--0--Drampa.gif diff --git a/src/canonical/models/front/Dhelmise.gif b/src/canonical/models/front/781--0--Dhelmise.gif similarity index 100% rename from src/canonical/models/front/Dhelmise.gif rename to src/canonical/models/front/781--0--Dhelmise.gif diff --git a/src/canonical/models/front/Jangmo-o.gif b/src/canonical/models/front/782--0--Jangmo-o.gif similarity index 100% rename from src/canonical/models/front/Jangmo-o.gif rename to src/canonical/models/front/782--0--Jangmo-o.gif diff --git a/src/canonical/models/front/Hakamo-o.gif b/src/canonical/models/front/783--0--Hakamo-o.gif similarity index 100% rename from src/canonical/models/front/Hakamo-o.gif rename to src/canonical/models/front/783--0--Hakamo-o.gif diff --git a/src/canonical/models/front/Kommo-o.gif b/src/canonical/models/front/784--0--Kommo-o.gif similarity index 100% rename from src/canonical/models/front/Kommo-o.gif rename to src/canonical/models/front/784--0--Kommo-o.gif diff --git a/src/canonical/models/front/Kommo-o--Totem.gif b/src/canonical/models/front/784--420--Kommo-o--Totem.gif similarity index 100% rename from src/canonical/models/front/Kommo-o--Totem.gif rename to src/canonical/models/front/784--420--Kommo-o--Totem.gif diff --git a/src/canonical/models/front/Tapu_Koko.gif b/src/canonical/models/front/785--0--Tapu_Koko.gif similarity index 100% rename from src/canonical/models/front/Tapu_Koko.gif rename to src/canonical/models/front/785--0--Tapu_Koko.gif diff --git a/src/canonical/models/front/Tapu_Lele.gif b/src/canonical/models/front/786--0--Tapu_Lele.gif similarity index 100% rename from src/canonical/models/front/Tapu_Lele.gif rename to src/canonical/models/front/786--0--Tapu_Lele.gif diff --git a/src/canonical/models/front/Tapu_Bulu.gif b/src/canonical/models/front/787--0--Tapu_Bulu.gif similarity index 100% rename from src/canonical/models/front/Tapu_Bulu.gif rename to src/canonical/models/front/787--0--Tapu_Bulu.gif diff --git a/src/canonical/models/front/Tapu_Fini.gif b/src/canonical/models/front/788--0--Tapu_Fini.gif similarity index 100% rename from src/canonical/models/front/Tapu_Fini.gif rename to src/canonical/models/front/788--0--Tapu_Fini.gif diff --git a/src/canonical/models/front/Cosmog.gif b/src/canonical/models/front/789--0--Cosmog.gif similarity index 100% rename from src/canonical/models/front/Cosmog.gif rename to src/canonical/models/front/789--0--Cosmog.gif diff --git a/src/canonical/models/front/Slowpoke.gif b/src/canonical/models/front/79--0--Slowpoke.gif similarity index 100% rename from src/canonical/models/front/Slowpoke.gif rename to src/canonical/models/front/79--0--Slowpoke.gif diff --git a/src/canonical/models/front/Slowpoke--Galar.gif b/src/canonical/models/front/79--420--Slowpoke--Galar.gif similarity index 100% rename from src/canonical/models/front/Slowpoke--Galar.gif rename to src/canonical/models/front/79--420--Slowpoke--Galar.gif diff --git a/src/canonical/models/front/Cosmoem.gif b/src/canonical/models/front/790--0--Cosmoem.gif similarity index 100% rename from src/canonical/models/front/Cosmoem.gif rename to src/canonical/models/front/790--0--Cosmoem.gif diff --git a/src/canonical/models/front/Solgaleo.gif b/src/canonical/models/front/791--0--Solgaleo.gif similarity index 100% rename from src/canonical/models/front/Solgaleo.gif rename to src/canonical/models/front/791--0--Solgaleo.gif diff --git a/src/canonical/models/front/Lunala.gif b/src/canonical/models/front/792--0--Lunala.gif similarity index 100% rename from src/canonical/models/front/Lunala.gif rename to src/canonical/models/front/792--0--Lunala.gif diff --git a/src/canonical/models/front/Nihilego.gif b/src/canonical/models/front/793--0--Nihilego.gif similarity index 100% rename from src/canonical/models/front/Nihilego.gif rename to src/canonical/models/front/793--0--Nihilego.gif diff --git a/src/canonical/models/front/Buzzwole.gif b/src/canonical/models/front/794--0--Buzzwole.gif similarity index 100% rename from src/canonical/models/front/Buzzwole.gif rename to src/canonical/models/front/794--0--Buzzwole.gif diff --git a/src/canonical/models/front/Pheromosa.gif b/src/canonical/models/front/795--0--Pheromosa.gif similarity index 100% rename from src/canonical/models/front/Pheromosa.gif rename to src/canonical/models/front/795--0--Pheromosa.gif diff --git a/src/canonical/models/front/Xurkitree.gif b/src/canonical/models/front/796--0--Xurkitree.gif similarity index 100% rename from src/canonical/models/front/Xurkitree.gif rename to src/canonical/models/front/796--0--Xurkitree.gif diff --git a/src/canonical/models/front/Celesteela.gif b/src/canonical/models/front/797--0--Celesteela.gif similarity index 100% rename from src/canonical/models/front/Celesteela.gif rename to src/canonical/models/front/797--0--Celesteela.gif diff --git a/src/canonical/models/front/Kartana.gif b/src/canonical/models/front/798--0--Kartana.gif similarity index 100% rename from src/canonical/models/front/Kartana.gif rename to src/canonical/models/front/798--0--Kartana.gif diff --git a/src/canonical/models/front/Guzzlord.gif b/src/canonical/models/front/799--0--Guzzlord.gif similarity index 100% rename from src/canonical/models/front/Guzzlord.gif rename to src/canonical/models/front/799--0--Guzzlord.gif diff --git a/src/canonical/models/front/Wartortle.gif b/src/canonical/models/front/8--0--Wartortle.gif similarity index 100% rename from src/canonical/models/front/Wartortle.gif rename to src/canonical/models/front/8--0--Wartortle.gif diff --git a/src/canonical/models/front/Slowbro.gif b/src/canonical/models/front/80--0--Slowbro.gif similarity index 100% rename from src/canonical/models/front/Slowbro.gif rename to src/canonical/models/front/80--0--Slowbro.gif diff --git a/src/canonical/models/front/Slowbro--Mega.gif b/src/canonical/models/front/80--420--Slowbro--Mega.gif similarity index 100% rename from src/canonical/models/front/Slowbro--Mega.gif rename to src/canonical/models/front/80--420--Slowbro--Mega.gif diff --git a/src/canonical/models/front/Necrozma.gif b/src/canonical/models/front/800--0--Necrozma.gif similarity index 100% rename from src/canonical/models/front/Necrozma.gif rename to src/canonical/models/front/800--0--Necrozma.gif diff --git a/src/canonical/models/front/Necrozma--Dawn_Wings.gif b/src/canonical/models/front/800--420--Necrozma--Dawn_Wings.gif similarity index 100% rename from src/canonical/models/front/Necrozma--Dawn_Wings.gif rename to src/canonical/models/front/800--420--Necrozma--Dawn_Wings.gif diff --git a/src/canonical/models/front/Necrozma--Dusk_Mane.gif b/src/canonical/models/front/800--420--Necrozma--Dusk_Mane.gif similarity index 100% rename from src/canonical/models/front/Necrozma--Dusk_Mane.gif rename to src/canonical/models/front/800--420--Necrozma--Dusk_Mane.gif diff --git a/src/canonical/models/front/Necrozma--Ultra.gif b/src/canonical/models/front/800--420--Necrozma--Ultra.gif similarity index 100% rename from src/canonical/models/front/Necrozma--Ultra.gif rename to src/canonical/models/front/800--420--Necrozma--Ultra.gif diff --git a/src/canonical/models/front/Magearna.gif b/src/canonical/models/front/801--0--Magearna.gif similarity index 100% rename from src/canonical/models/front/Magearna.gif rename to src/canonical/models/front/801--0--Magearna.gif diff --git a/src/canonical/models/front/Marshadow.gif b/src/canonical/models/front/802--0--Marshadow.gif similarity index 100% rename from src/canonical/models/front/Marshadow.gif rename to src/canonical/models/front/802--0--Marshadow.gif diff --git a/src/canonical/models/front/Poipole.gif b/src/canonical/models/front/803--0--Poipole.gif similarity index 100% rename from src/canonical/models/front/Poipole.gif rename to src/canonical/models/front/803--0--Poipole.gif diff --git a/src/canonical/models/front/Naganadel.gif b/src/canonical/models/front/804--0--Naganadel.gif similarity index 100% rename from src/canonical/models/front/Naganadel.gif rename to src/canonical/models/front/804--0--Naganadel.gif diff --git a/src/canonical/models/front/Stakataka.gif b/src/canonical/models/front/805--0--Stakataka.gif similarity index 100% rename from src/canonical/models/front/Stakataka.gif rename to src/canonical/models/front/805--0--Stakataka.gif diff --git a/src/canonical/models/front/Blacephalon.gif b/src/canonical/models/front/806--0--Blacephalon.gif similarity index 100% rename from src/canonical/models/front/Blacephalon.gif rename to src/canonical/models/front/806--0--Blacephalon.gif diff --git a/src/canonical/models/front/Zeraora.gif b/src/canonical/models/front/807--0--Zeraora.gif similarity index 100% rename from src/canonical/models/front/Zeraora.gif rename to src/canonical/models/front/807--0--Zeraora.gif diff --git a/src/canonical/models/front/Meltan.gif b/src/canonical/models/front/808--0--Meltan.gif similarity index 100% rename from src/canonical/models/front/Meltan.gif rename to src/canonical/models/front/808--0--Meltan.gif diff --git a/src/canonical/models/front/Melmetal.gif b/src/canonical/models/front/809--0--Melmetal.gif similarity index 100% rename from src/canonical/models/front/Melmetal.gif rename to src/canonical/models/front/809--0--Melmetal.gif diff --git a/src/canonical/models/front/Melmetal--Gmax.gif b/src/canonical/models/front/809--420--Melmetal--Gmax.gif similarity index 100% rename from src/canonical/models/front/Melmetal--Gmax.gif rename to src/canonical/models/front/809--420--Melmetal--Gmax.gif diff --git a/src/canonical/models/front/Magnemite.gif b/src/canonical/models/front/81--0--Magnemite.gif similarity index 100% rename from src/canonical/models/front/Magnemite.gif rename to src/canonical/models/front/81--0--Magnemite.gif diff --git a/src/canonical/models/front/Grookey.gif b/src/canonical/models/front/810--0--Grookey.gif similarity index 100% rename from src/canonical/models/front/Grookey.gif rename to src/canonical/models/front/810--0--Grookey.gif diff --git a/src/canonical/models/front/Thwackey.gif b/src/canonical/models/front/811--0--Thwackey.gif similarity index 100% rename from src/canonical/models/front/Thwackey.gif rename to src/canonical/models/front/811--0--Thwackey.gif diff --git a/src/canonical/models/front/Rillaboom.gif b/src/canonical/models/front/812--0--Rillaboom.gif similarity index 100% rename from src/canonical/models/front/Rillaboom.gif rename to src/canonical/models/front/812--0--Rillaboom.gif diff --git a/src/canonical/models/front/Scorbunny.gif b/src/canonical/models/front/813--0--Scorbunny.gif similarity index 100% rename from src/canonical/models/front/Scorbunny.gif rename to src/canonical/models/front/813--0--Scorbunny.gif diff --git a/src/canonical/models/front/Raboot.gif b/src/canonical/models/front/814--0--Raboot.gif similarity index 100% rename from src/canonical/models/front/Raboot.gif rename to src/canonical/models/front/814--0--Raboot.gif diff --git a/src/canonical/models/front/Cinderace.gif b/src/canonical/models/front/815--0--Cinderace.gif similarity index 100% rename from src/canonical/models/front/Cinderace.gif rename to src/canonical/models/front/815--0--Cinderace.gif diff --git a/src/canonical/models/front/Sobble.gif b/src/canonical/models/front/816--0--Sobble.gif similarity index 100% rename from src/canonical/models/front/Sobble.gif rename to src/canonical/models/front/816--0--Sobble.gif diff --git a/src/canonical/models/front/Drizzile.gif b/src/canonical/models/front/817--0--Drizzile.gif similarity index 100% rename from src/canonical/models/front/Drizzile.gif rename to src/canonical/models/front/817--0--Drizzile.gif diff --git a/src/canonical/models/front/Inteleon.gif b/src/canonical/models/front/818--0--Inteleon.gif similarity index 100% rename from src/canonical/models/front/Inteleon.gif rename to src/canonical/models/front/818--0--Inteleon.gif diff --git a/src/canonical/models/front/Skwovet.gif b/src/canonical/models/front/819--0--Skwovet.gif similarity index 100% rename from src/canonical/models/front/Skwovet.gif rename to src/canonical/models/front/819--0--Skwovet.gif diff --git a/src/canonical/models/front/Magneton.gif b/src/canonical/models/front/82--0--Magneton.gif similarity index 100% rename from src/canonical/models/front/Magneton.gif rename to src/canonical/models/front/82--0--Magneton.gif diff --git a/src/canonical/models/front/Greedent.gif b/src/canonical/models/front/820--0--Greedent.gif similarity index 100% rename from src/canonical/models/front/Greedent.gif rename to src/canonical/models/front/820--0--Greedent.gif diff --git a/src/canonical/models/front/Rookidee.gif b/src/canonical/models/front/821--0--Rookidee.gif similarity index 100% rename from src/canonical/models/front/Rookidee.gif rename to src/canonical/models/front/821--0--Rookidee.gif diff --git a/src/canonical/models/front/Corvisquire.gif b/src/canonical/models/front/822--0--Corvisquire.gif similarity index 100% rename from src/canonical/models/front/Corvisquire.gif rename to src/canonical/models/front/822--0--Corvisquire.gif diff --git a/src/canonical/models/front/Corviknight.gif b/src/canonical/models/front/823--0--Corviknight.gif similarity index 100% rename from src/canonical/models/front/Corviknight.gif rename to src/canonical/models/front/823--0--Corviknight.gif diff --git a/src/canonical/models/front/Corviknight--Gmax.gif b/src/canonical/models/front/823--420--Corviknight--Gmax.gif similarity index 100% rename from src/canonical/models/front/Corviknight--Gmax.gif rename to src/canonical/models/front/823--420--Corviknight--Gmax.gif diff --git a/src/canonical/models/front/Blipbug.gif b/src/canonical/models/front/824--0--Blipbug.gif similarity index 100% rename from src/canonical/models/front/Blipbug.gif rename to src/canonical/models/front/824--0--Blipbug.gif diff --git a/src/canonical/models/front/Dottler.gif b/src/canonical/models/front/825--0--Dottler.gif similarity index 100% rename from src/canonical/models/front/Dottler.gif rename to src/canonical/models/front/825--0--Dottler.gif diff --git a/src/canonical/models/front/Orbeetle.gif b/src/canonical/models/front/826--0--Orbeetle.gif similarity index 100% rename from src/canonical/models/front/Orbeetle.gif rename to src/canonical/models/front/826--0--Orbeetle.gif diff --git a/src/canonical/models/front/Orbeetle--Gmax.gif b/src/canonical/models/front/826--420--Orbeetle--Gmax.gif similarity index 100% rename from src/canonical/models/front/Orbeetle--Gmax.gif rename to src/canonical/models/front/826--420--Orbeetle--Gmax.gif diff --git a/src/canonical/models/front/Nickit.gif b/src/canonical/models/front/827--0--Nickit.gif similarity index 100% rename from src/canonical/models/front/Nickit.gif rename to src/canonical/models/front/827--0--Nickit.gif diff --git a/src/canonical/models/front/Thievul.gif b/src/canonical/models/front/828--0--Thievul.gif similarity index 100% rename from src/canonical/models/front/Thievul.gif rename to src/canonical/models/front/828--0--Thievul.gif diff --git a/src/canonical/models/front/Gossifleur.gif b/src/canonical/models/front/829--0--Gossifleur.gif similarity index 100% rename from src/canonical/models/front/Gossifleur.gif rename to src/canonical/models/front/829--0--Gossifleur.gif diff --git a/src/canonical/models/front/Farfetch__0027d.gif b/src/canonical/models/front/83--0--Farfetch__0027d.gif similarity index 100% rename from src/canonical/models/front/Farfetch__0027d.gif rename to src/canonical/models/front/83--0--Farfetch__0027d.gif diff --git a/src/canonical/models/front/Farfetch__0027d--Galar.gif b/src/canonical/models/front/83--420--Farfetch__0027d--Galar.gif similarity index 100% rename from src/canonical/models/front/Farfetch__0027d--Galar.gif rename to src/canonical/models/front/83--420--Farfetch__0027d--Galar.gif diff --git a/src/canonical/models/front/Eldegoss.gif b/src/canonical/models/front/830--0--Eldegoss.gif similarity index 100% rename from src/canonical/models/front/Eldegoss.gif rename to src/canonical/models/front/830--0--Eldegoss.gif diff --git a/src/canonical/models/front/Wooloo.gif b/src/canonical/models/front/831--0--Wooloo.gif similarity index 100% rename from src/canonical/models/front/Wooloo.gif rename to src/canonical/models/front/831--0--Wooloo.gif diff --git a/src/canonical/models/front/Dubwool.gif b/src/canonical/models/front/832--0--Dubwool.gif similarity index 100% rename from src/canonical/models/front/Dubwool.gif rename to src/canonical/models/front/832--0--Dubwool.gif diff --git a/src/canonical/models/front/Chewtle.gif b/src/canonical/models/front/833--0--Chewtle.gif similarity index 100% rename from src/canonical/models/front/Chewtle.gif rename to src/canonical/models/front/833--0--Chewtle.gif diff --git a/src/canonical/models/front/Drednaw.gif b/src/canonical/models/front/834--0--Drednaw.gif similarity index 100% rename from src/canonical/models/front/Drednaw.gif rename to src/canonical/models/front/834--0--Drednaw.gif diff --git a/src/canonical/models/front/Drednaw--Gmax.gif b/src/canonical/models/front/834--420--Drednaw--Gmax.gif similarity index 100% rename from src/canonical/models/front/Drednaw--Gmax.gif rename to src/canonical/models/front/834--420--Drednaw--Gmax.gif diff --git a/src/canonical/models/front/Yamper.gif b/src/canonical/models/front/835--0--Yamper.gif similarity index 100% rename from src/canonical/models/front/Yamper.gif rename to src/canonical/models/front/835--0--Yamper.gif diff --git a/src/canonical/models/front/Boltund.gif b/src/canonical/models/front/836--0--Boltund.gif similarity index 100% rename from src/canonical/models/front/Boltund.gif rename to src/canonical/models/front/836--0--Boltund.gif diff --git a/src/canonical/models/front/Rolycoly.gif b/src/canonical/models/front/837--0--Rolycoly.gif similarity index 100% rename from src/canonical/models/front/Rolycoly.gif rename to src/canonical/models/front/837--0--Rolycoly.gif diff --git a/src/canonical/models/front/Carkol.gif b/src/canonical/models/front/838--0--Carkol.gif similarity index 100% rename from src/canonical/models/front/Carkol.gif rename to src/canonical/models/front/838--0--Carkol.gif diff --git a/src/canonical/models/front/Coalossal.gif b/src/canonical/models/front/839--0--Coalossal.gif similarity index 100% rename from src/canonical/models/front/Coalossal.gif rename to src/canonical/models/front/839--0--Coalossal.gif diff --git a/src/canonical/models/front/Coalossal--Gmax.gif b/src/canonical/models/front/839--420--Coalossal--Gmax.gif similarity index 100% rename from src/canonical/models/front/Coalossal--Gmax.gif rename to src/canonical/models/front/839--420--Coalossal--Gmax.gif diff --git a/src/canonical/models/front/Doduo.gif b/src/canonical/models/front/84--0--Doduo.gif similarity index 100% rename from src/canonical/models/front/Doduo.gif rename to src/canonical/models/front/84--0--Doduo.gif diff --git a/src/canonical/models/front/Applin.gif b/src/canonical/models/front/840--0--Applin.gif similarity index 100% rename from src/canonical/models/front/Applin.gif rename to src/canonical/models/front/840--0--Applin.gif diff --git a/src/canonical/models/front/Flapple.gif b/src/canonical/models/front/841--0--Flapple.gif similarity index 100% rename from src/canonical/models/front/Flapple.gif rename to src/canonical/models/front/841--0--Flapple.gif diff --git a/src/canonical/models/front/Flapple--Gmax.gif b/src/canonical/models/front/841--420--Flapple--Gmax.gif similarity index 100% rename from src/canonical/models/front/Flapple--Gmax.gif rename to src/canonical/models/front/841--420--Flapple--Gmax.gif diff --git a/src/canonical/models/front/Appletun.gif b/src/canonical/models/front/842--0--Appletun.gif similarity index 100% rename from src/canonical/models/front/Appletun.gif rename to src/canonical/models/front/842--0--Appletun.gif diff --git a/src/canonical/models/front/Appletun--Gmax.gif b/src/canonical/models/front/842--420--Appletun--Gmax.gif similarity index 100% rename from src/canonical/models/front/Appletun--Gmax.gif rename to src/canonical/models/front/842--420--Appletun--Gmax.gif diff --git a/src/canonical/models/front/Silicobra.gif b/src/canonical/models/front/843--0--Silicobra.gif similarity index 100% rename from src/canonical/models/front/Silicobra.gif rename to src/canonical/models/front/843--0--Silicobra.gif diff --git a/src/canonical/models/front/Sandaconda.gif b/src/canonical/models/front/844--0--Sandaconda.gif similarity index 100% rename from src/canonical/models/front/Sandaconda.gif rename to src/canonical/models/front/844--0--Sandaconda.gif diff --git a/src/canonical/models/front/Sandaconda--Gmax.gif b/src/canonical/models/front/844--420--Sandaconda--Gmax.gif similarity index 100% rename from src/canonical/models/front/Sandaconda--Gmax.gif rename to src/canonical/models/front/844--420--Sandaconda--Gmax.gif diff --git a/src/canonical/models/front/Cramorant.gif b/src/canonical/models/front/845--0--Cramorant.gif similarity index 100% rename from src/canonical/models/front/Cramorant.gif rename to src/canonical/models/front/845--0--Cramorant.gif diff --git a/src/canonical/models/front/Cramorant--Gorging.gif b/src/canonical/models/front/845--420--Cramorant--Gorging.gif similarity index 100% rename from src/canonical/models/front/Cramorant--Gorging.gif rename to src/canonical/models/front/845--420--Cramorant--Gorging.gif diff --git a/src/canonical/models/front/Cramorant--Gulping.gif b/src/canonical/models/front/845--420--Cramorant--Gulping.gif similarity index 100% rename from src/canonical/models/front/Cramorant--Gulping.gif rename to src/canonical/models/front/845--420--Cramorant--Gulping.gif diff --git a/src/canonical/models/front/Arrokuda.gif b/src/canonical/models/front/846--0--Arrokuda.gif similarity index 100% rename from src/canonical/models/front/Arrokuda.gif rename to src/canonical/models/front/846--0--Arrokuda.gif diff --git a/src/canonical/models/front/Barraskewda.gif b/src/canonical/models/front/847--0--Barraskewda.gif similarity index 100% rename from src/canonical/models/front/Barraskewda.gif rename to src/canonical/models/front/847--0--Barraskewda.gif diff --git a/src/canonical/models/front/Toxel.gif b/src/canonical/models/front/848--0--Toxel.gif similarity index 100% rename from src/canonical/models/front/Toxel.gif rename to src/canonical/models/front/848--0--Toxel.gif diff --git a/src/canonical/models/front/Toxtricity.gif b/src/canonical/models/front/849--0--Toxtricity.gif similarity index 100% rename from src/canonical/models/front/Toxtricity.gif rename to src/canonical/models/front/849--0--Toxtricity.gif diff --git a/src/canonical/models/front/Toxtricity--Gmax.gif b/src/canonical/models/front/849--420--Toxtricity--Gmax.gif similarity index 100% rename from src/canonical/models/front/Toxtricity--Gmax.gif rename to src/canonical/models/front/849--420--Toxtricity--Gmax.gif diff --git a/src/canonical/models/front/Toxtricity--Low-Key.gif b/src/canonical/models/front/849--420--Toxtricity--Low-Key.gif similarity index 100% rename from src/canonical/models/front/Toxtricity--Low-Key.gif rename to src/canonical/models/front/849--420--Toxtricity--Low-Key.gif diff --git a/src/canonical/models/front/Dodrio.gif b/src/canonical/models/front/85--0--Dodrio.gif similarity index 100% rename from src/canonical/models/front/Dodrio.gif rename to src/canonical/models/front/85--0--Dodrio.gif diff --git a/src/canonical/models/front/Sizzlipede.gif b/src/canonical/models/front/850--0--Sizzlipede.gif similarity index 100% rename from src/canonical/models/front/Sizzlipede.gif rename to src/canonical/models/front/850--0--Sizzlipede.gif diff --git a/src/canonical/models/front/Centiskorch.gif b/src/canonical/models/front/851--0--Centiskorch.gif similarity index 100% rename from src/canonical/models/front/Centiskorch.gif rename to src/canonical/models/front/851--0--Centiskorch.gif diff --git a/src/canonical/models/front/Centiskorch--Gmax.gif b/src/canonical/models/front/851--420--Centiskorch--Gmax.gif similarity index 100% rename from src/canonical/models/front/Centiskorch--Gmax.gif rename to src/canonical/models/front/851--420--Centiskorch--Gmax.gif diff --git a/src/canonical/models/front/Clobbopus.gif b/src/canonical/models/front/852--0--Clobbopus.gif similarity index 100% rename from src/canonical/models/front/Clobbopus.gif rename to src/canonical/models/front/852--0--Clobbopus.gif diff --git a/src/canonical/models/front/Grapploct.gif b/src/canonical/models/front/853--0--Grapploct.gif similarity index 100% rename from src/canonical/models/front/Grapploct.gif rename to src/canonical/models/front/853--0--Grapploct.gif diff --git a/src/canonical/models/front/Sinistea--Antique.gif b/src/canonical/models/front/854--0--Sinistea.gif similarity index 100% rename from src/canonical/models/front/Sinistea--Antique.gif rename to src/canonical/models/front/854--0--Sinistea.gif diff --git a/src/canonical/models/front/Sinistea.gif b/src/canonical/models/front/854--420--Sinistea--Antique.gif similarity index 100% rename from src/canonical/models/front/Sinistea.gif rename to src/canonical/models/front/854--420--Sinistea--Antique.gif diff --git a/src/canonical/models/front/Polteageist--Antique.gif b/src/canonical/models/front/855--0--Polteageist.gif similarity index 100% rename from src/canonical/models/front/Polteageist--Antique.gif rename to src/canonical/models/front/855--0--Polteageist.gif diff --git a/src/canonical/models/front/Polteageist.gif b/src/canonical/models/front/855--420--Polteageist--Antique.gif similarity index 100% rename from src/canonical/models/front/Polteageist.gif rename to src/canonical/models/front/855--420--Polteageist--Antique.gif diff --git a/src/canonical/models/front/Hatenna.gif b/src/canonical/models/front/856--0--Hatenna.gif similarity index 100% rename from src/canonical/models/front/Hatenna.gif rename to src/canonical/models/front/856--0--Hatenna.gif diff --git a/src/canonical/models/front/Hattrem.gif b/src/canonical/models/front/857--0--Hattrem.gif similarity index 100% rename from src/canonical/models/front/Hattrem.gif rename to src/canonical/models/front/857--0--Hattrem.gif diff --git a/src/canonical/models/front/Hatterene.gif b/src/canonical/models/front/858--0--Hatterene.gif similarity index 100% rename from src/canonical/models/front/Hatterene.gif rename to src/canonical/models/front/858--0--Hatterene.gif diff --git a/src/canonical/models/front/Hatterene--Gmax.gif b/src/canonical/models/front/858--420--Hatterene--Gmax.gif similarity index 100% rename from src/canonical/models/front/Hatterene--Gmax.gif rename to src/canonical/models/front/858--420--Hatterene--Gmax.gif diff --git a/src/canonical/models/front/Impidimp.gif b/src/canonical/models/front/859--0--Impidimp.gif similarity index 100% rename from src/canonical/models/front/Impidimp.gif rename to src/canonical/models/front/859--0--Impidimp.gif diff --git a/src/canonical/models/front/Seel.gif b/src/canonical/models/front/86--0--Seel.gif similarity index 100% rename from src/canonical/models/front/Seel.gif rename to src/canonical/models/front/86--0--Seel.gif diff --git a/src/canonical/models/front/Morgrem.gif b/src/canonical/models/front/860--0--Morgrem.gif similarity index 100% rename from src/canonical/models/front/Morgrem.gif rename to src/canonical/models/front/860--0--Morgrem.gif diff --git a/src/canonical/models/front/Grimmsnarl.gif b/src/canonical/models/front/861--0--Grimmsnarl.gif similarity index 100% rename from src/canonical/models/front/Grimmsnarl.gif rename to src/canonical/models/front/861--0--Grimmsnarl.gif diff --git a/src/canonical/models/front/Grimmsnarl--Gmax.gif b/src/canonical/models/front/861--420--Grimmsnarl--Gmax.gif similarity index 100% rename from src/canonical/models/front/Grimmsnarl--Gmax.gif rename to src/canonical/models/front/861--420--Grimmsnarl--Gmax.gif diff --git a/src/canonical/models/front/Obstagoon.gif b/src/canonical/models/front/862--0--Obstagoon.gif similarity index 100% rename from src/canonical/models/front/Obstagoon.gif rename to src/canonical/models/front/862--0--Obstagoon.gif diff --git a/src/canonical/models/front/Perrserker.gif b/src/canonical/models/front/863--0--Perrserker.gif similarity index 100% rename from src/canonical/models/front/Perrserker.gif rename to src/canonical/models/front/863--0--Perrserker.gif diff --git a/src/canonical/models/front/Cursola.gif b/src/canonical/models/front/864--0--Cursola.gif similarity index 100% rename from src/canonical/models/front/Cursola.gif rename to src/canonical/models/front/864--0--Cursola.gif diff --git a/src/canonical/models/front/Sirfetch__0027d.gif b/src/canonical/models/front/865--0--Sirfetch__0027d.gif similarity index 100% rename from src/canonical/models/front/Sirfetch__0027d.gif rename to src/canonical/models/front/865--0--Sirfetch__0027d.gif diff --git a/src/canonical/models/front/Mr._Rime.gif b/src/canonical/models/front/866--0--Mr._Rime.gif similarity index 100% rename from src/canonical/models/front/Mr._Rime.gif rename to src/canonical/models/front/866--0--Mr._Rime.gif diff --git a/src/canonical/models/front/Runerigus.gif b/src/canonical/models/front/867--0--Runerigus.gif similarity index 100% rename from src/canonical/models/front/Runerigus.gif rename to src/canonical/models/front/867--0--Runerigus.gif diff --git a/src/canonical/models/front/Milcery.gif b/src/canonical/models/front/868--0--Milcery.gif similarity index 100% rename from src/canonical/models/front/Milcery.gif rename to src/canonical/models/front/868--0--Milcery.gif diff --git a/src/canonical/models/front/Alcremie.gif b/src/canonical/models/front/869--0--Alcremie.gif similarity index 100% rename from src/canonical/models/front/Alcremie.gif rename to src/canonical/models/front/869--0--Alcremie.gif diff --git a/src/canonical/models/front/Alcremie--Gmax.gif b/src/canonical/models/front/869--420--Alcremie--Gmax.gif similarity index 100% rename from src/canonical/models/front/Alcremie--Gmax.gif rename to src/canonical/models/front/869--420--Alcremie--Gmax.gif diff --git a/src/canonical/models/front/Dewgong.gif b/src/canonical/models/front/87--0--Dewgong.gif similarity index 100% rename from src/canonical/models/front/Dewgong.gif rename to src/canonical/models/front/87--0--Dewgong.gif diff --git a/src/canonical/models/front/Falinks.gif b/src/canonical/models/front/870--0--Falinks.gif similarity index 100% rename from src/canonical/models/front/Falinks.gif rename to src/canonical/models/front/870--0--Falinks.gif diff --git a/src/canonical/models/front/Pincurchin.gif b/src/canonical/models/front/871--0--Pincurchin.gif similarity index 100% rename from src/canonical/models/front/Pincurchin.gif rename to src/canonical/models/front/871--0--Pincurchin.gif diff --git a/src/canonical/models/front/Snom.gif b/src/canonical/models/front/872--0--Snom.gif similarity index 100% rename from src/canonical/models/front/Snom.gif rename to src/canonical/models/front/872--0--Snom.gif diff --git a/src/canonical/models/front/Frosmoth.gif b/src/canonical/models/front/873--0--Frosmoth.gif similarity index 100% rename from src/canonical/models/front/Frosmoth.gif rename to src/canonical/models/front/873--0--Frosmoth.gif diff --git a/src/canonical/models/front/Stonjourner.gif b/src/canonical/models/front/874--0--Stonjourner.gif similarity index 100% rename from src/canonical/models/front/Stonjourner.gif rename to src/canonical/models/front/874--0--Stonjourner.gif diff --git a/src/canonical/models/front/Eiscue.gif b/src/canonical/models/front/875--0--Eiscue.gif similarity index 100% rename from src/canonical/models/front/Eiscue.gif rename to src/canonical/models/front/875--0--Eiscue.gif diff --git a/src/canonical/models/front/Eiscue--Noice.gif b/src/canonical/models/front/875--420--Eiscue--Noice.gif similarity index 100% rename from src/canonical/models/front/Eiscue--Noice.gif rename to src/canonical/models/front/875--420--Eiscue--Noice.gif diff --git a/src/canonical/models/front/Indeedee.gif b/src/canonical/models/front/876--0--Indeedee.gif similarity index 100% rename from src/canonical/models/front/Indeedee.gif rename to src/canonical/models/front/876--0--Indeedee.gif diff --git a/src/canonical/models/front/Indeedee--F.gif b/src/canonical/models/front/876--420--Indeedee--F.gif similarity index 100% rename from src/canonical/models/front/Indeedee--F.gif rename to src/canonical/models/front/876--420--Indeedee--F.gif diff --git a/src/canonical/models/front/Morpeko.gif b/src/canonical/models/front/877--0--Morpeko.gif similarity index 100% rename from src/canonical/models/front/Morpeko.gif rename to src/canonical/models/front/877--0--Morpeko.gif diff --git a/src/canonical/models/front/Morpeko--Hangry.gif b/src/canonical/models/front/877--420--Morpeko--Hangry.gif similarity index 100% rename from src/canonical/models/front/Morpeko--Hangry.gif rename to src/canonical/models/front/877--420--Morpeko--Hangry.gif diff --git a/src/canonical/models/front/Cufant.gif b/src/canonical/models/front/878--0--Cufant.gif similarity index 100% rename from src/canonical/models/front/Cufant.gif rename to src/canonical/models/front/878--0--Cufant.gif diff --git a/src/canonical/models/front/Copperajah.gif b/src/canonical/models/front/879--0--Copperajah.gif similarity index 100% rename from src/canonical/models/front/Copperajah.gif rename to src/canonical/models/front/879--0--Copperajah.gif diff --git a/src/canonical/models/front/Copperajah--Gmax.gif b/src/canonical/models/front/879--420--Copperajah--Gmax.gif similarity index 100% rename from src/canonical/models/front/Copperajah--Gmax.gif rename to src/canonical/models/front/879--420--Copperajah--Gmax.gif diff --git a/src/canonical/models/front/Grimer.gif b/src/canonical/models/front/88--0--Grimer.gif similarity index 100% rename from src/canonical/models/front/Grimer.gif rename to src/canonical/models/front/88--0--Grimer.gif diff --git a/src/canonical/models/front/Grimer--Alola.gif b/src/canonical/models/front/88--420--Grimer--Alola.gif similarity index 100% rename from src/canonical/models/front/Grimer--Alola.gif rename to src/canonical/models/front/88--420--Grimer--Alola.gif diff --git a/src/canonical/models/front/Dracozolt.gif b/src/canonical/models/front/880--0--Dracozolt.gif similarity index 100% rename from src/canonical/models/front/Dracozolt.gif rename to src/canonical/models/front/880--0--Dracozolt.gif diff --git a/src/canonical/models/front/Arctozolt.gif b/src/canonical/models/front/881--0--Arctozolt.gif similarity index 100% rename from src/canonical/models/front/Arctozolt.gif rename to src/canonical/models/front/881--0--Arctozolt.gif diff --git a/src/canonical/models/front/Dracovish.gif b/src/canonical/models/front/882--0--Dracovish.gif similarity index 100% rename from src/canonical/models/front/Dracovish.gif rename to src/canonical/models/front/882--0--Dracovish.gif diff --git a/src/canonical/models/front/Arctovish.gif b/src/canonical/models/front/883--0--Arctovish.gif similarity index 100% rename from src/canonical/models/front/Arctovish.gif rename to src/canonical/models/front/883--0--Arctovish.gif diff --git a/src/canonical/models/front/Duraludon.gif b/src/canonical/models/front/884--0--Duraludon.gif similarity index 100% rename from src/canonical/models/front/Duraludon.gif rename to src/canonical/models/front/884--0--Duraludon.gif diff --git a/src/canonical/models/front/Duraludon--Gmax.gif b/src/canonical/models/front/884--420--Duraludon--Gmax.gif similarity index 100% rename from src/canonical/models/front/Duraludon--Gmax.gif rename to src/canonical/models/front/884--420--Duraludon--Gmax.gif diff --git a/src/canonical/models/front/Dreepy.gif b/src/canonical/models/front/885--0--Dreepy.gif similarity index 100% rename from src/canonical/models/front/Dreepy.gif rename to src/canonical/models/front/885--0--Dreepy.gif diff --git a/src/canonical/models/front/Drakloak.gif b/src/canonical/models/front/886--0--Drakloak.gif similarity index 100% rename from src/canonical/models/front/Drakloak.gif rename to src/canonical/models/front/886--0--Drakloak.gif diff --git a/src/canonical/models/front/Dragapult.gif b/src/canonical/models/front/887--0--Dragapult.gif similarity index 100% rename from src/canonical/models/front/Dragapult.gif rename to src/canonical/models/front/887--0--Dragapult.gif diff --git a/src/canonical/models/front/Zacian.gif b/src/canonical/models/front/888--0--Zacian.gif similarity index 100% rename from src/canonical/models/front/Zacian.gif rename to src/canonical/models/front/888--0--Zacian.gif diff --git a/src/canonical/models/front/Zacian--Crowned.gif b/src/canonical/models/front/888--420--Zacian--Crowned.gif similarity index 100% rename from src/canonical/models/front/Zacian--Crowned.gif rename to src/canonical/models/front/888--420--Zacian--Crowned.gif diff --git a/src/canonical/models/front/Zamazenta.gif b/src/canonical/models/front/889--0--Zamazenta.gif similarity index 100% rename from src/canonical/models/front/Zamazenta.gif rename to src/canonical/models/front/889--0--Zamazenta.gif diff --git a/src/canonical/models/front/Zamazenta--Crowned.gif b/src/canonical/models/front/889--420--Zamazenta--Crowned.gif similarity index 100% rename from src/canonical/models/front/Zamazenta--Crowned.gif rename to src/canonical/models/front/889--420--Zamazenta--Crowned.gif diff --git a/src/canonical/models/front/Muk.gif b/src/canonical/models/front/89--0--Muk.gif similarity index 100% rename from src/canonical/models/front/Muk.gif rename to src/canonical/models/front/89--0--Muk.gif diff --git a/src/canonical/models/front/Muk--Alola.gif b/src/canonical/models/front/89--420--Muk--Alola.gif similarity index 100% rename from src/canonical/models/front/Muk--Alola.gif rename to src/canonical/models/front/89--420--Muk--Alola.gif diff --git a/src/canonical/models/front/Eternatus.gif b/src/canonical/models/front/890--0--Eternatus.gif similarity index 100% rename from src/canonical/models/front/Eternatus.gif rename to src/canonical/models/front/890--0--Eternatus.gif diff --git a/src/canonical/models/front/Eternatus--Eternamax.gif b/src/canonical/models/front/890--420--Eternatus--Eternamax.gif similarity index 100% rename from src/canonical/models/front/Eternatus--Eternamax.gif rename to src/canonical/models/front/890--420--Eternatus--Eternamax.gif diff --git a/src/canonical/models/front/Blastoise.gif b/src/canonical/models/front/9--0--Blastoise.gif similarity index 100% rename from src/canonical/models/front/Blastoise.gif rename to src/canonical/models/front/9--0--Blastoise.gif diff --git a/src/canonical/models/front/Blastoise--Mega.gif b/src/canonical/models/front/9--420--Blastoise--Mega.gif similarity index 100% rename from src/canonical/models/front/Blastoise--Mega.gif rename to src/canonical/models/front/9--420--Blastoise--Mega.gif diff --git a/src/canonical/models/front/Shellder.gif b/src/canonical/models/front/90--0--Shellder.gif similarity index 100% rename from src/canonical/models/front/Shellder.gif rename to src/canonical/models/front/90--0--Shellder.gif diff --git a/src/canonical/models/front/Cloyster.gif b/src/canonical/models/front/91--0--Cloyster.gif similarity index 100% rename from src/canonical/models/front/Cloyster.gif rename to src/canonical/models/front/91--0--Cloyster.gif diff --git a/src/canonical/models/front/Gastly.gif b/src/canonical/models/front/92--0--Gastly.gif similarity index 100% rename from src/canonical/models/front/Gastly.gif rename to src/canonical/models/front/92--0--Gastly.gif diff --git a/src/canonical/models/front/Haunter.gif b/src/canonical/models/front/93--0--Haunter.gif similarity index 100% rename from src/canonical/models/front/Haunter.gif rename to src/canonical/models/front/93--0--Haunter.gif diff --git a/src/canonical/models/front/Gengar.gif b/src/canonical/models/front/94--0--Gengar.gif similarity index 100% rename from src/canonical/models/front/Gengar.gif rename to src/canonical/models/front/94--0--Gengar.gif diff --git a/src/canonical/models/front/Gengar--Gmax.gif b/src/canonical/models/front/94--420--Gengar--Gmax.gif similarity index 100% rename from src/canonical/models/front/Gengar--Gmax.gif rename to src/canonical/models/front/94--420--Gengar--Gmax.gif diff --git a/src/canonical/models/front/Gengar--Mega.gif b/src/canonical/models/front/94--420--Gengar--Mega.gif similarity index 100% rename from src/canonical/models/front/Gengar--Mega.gif rename to src/canonical/models/front/94--420--Gengar--Mega.gif diff --git a/src/canonical/models/front/Onix.gif b/src/canonical/models/front/95--0--Onix.gif similarity index 100% rename from src/canonical/models/front/Onix.gif rename to src/canonical/models/front/95--0--Onix.gif diff --git a/src/canonical/models/front/Drowzee.gif b/src/canonical/models/front/96--0--Drowzee.gif similarity index 100% rename from src/canonical/models/front/Drowzee.gif rename to src/canonical/models/front/96--0--Drowzee.gif diff --git a/src/canonical/models/front/Hypno.gif b/src/canonical/models/front/97--0--Hypno.gif similarity index 100% rename from src/canonical/models/front/Hypno.gif rename to src/canonical/models/front/97--0--Hypno.gif diff --git a/src/canonical/models/front/Krabby.gif b/src/canonical/models/front/98--0--Krabby.gif similarity index 100% rename from src/canonical/models/front/Krabby.gif rename to src/canonical/models/front/98--0--Krabby.gif diff --git a/src/canonical/models/front/Kingler.gif b/src/canonical/models/front/99--0--Kingler.gif similarity index 100% rename from src/canonical/models/front/Kingler.gif rename to src/canonical/models/front/99--0--Kingler.gif diff --git a/src/canonical/models/front/Kingler--Gmax.gif b/src/canonical/models/front/99--420--Kingler--Gmax.gif similarity index 100% rename from src/canonical/models/front/Kingler--Gmax.gif rename to src/canonical/models/front/99--420--Kingler--Gmax.gif diff --git a/src/canonical/models/front/Unown.gif b/src/canonical/models/front/Unown.gif deleted file mode 120000 index 1035d3c4..00000000 --- a/src/canonical/models/front/Unown.gif +++ /dev/null @@ -1 +0,0 @@ -../front-cosmetic/Unown--A.gif \ No newline at end of file diff --git a/src/cap/dex/front-cosmetic/Kitsunoh--Female.png b/src/cap/dex/front-cosmetic/14--0--Kitsunoh--Female.png similarity index 100% rename from src/cap/dex/front-cosmetic/Kitsunoh--Female.png rename to src/cap/dex/front-cosmetic/14--0--Kitsunoh--Female.png diff --git a/src/cap/dex/front-cosmetic/Kerfluffle--Female.png b/src/cap/dex/front-cosmetic/41--0--Kerfluffle--Female.png similarity index 100% rename from src/cap/dex/front-cosmetic/Kerfluffle--Female.png rename to src/cap/dex/front-cosmetic/41--0--Kerfluffle--Female.png diff --git a/src/cap/dex/front-cosmetic/Pyroak--Female.png b/src/cap/dex/front-cosmetic/6--0--Pyroak--Female.png similarity index 100% rename from src/cap/dex/front-cosmetic/Pyroak--Female.png rename to src/cap/dex/front-cosmetic/6--0--Pyroak--Female.png diff --git a/src/cap/dex/front-shiny-cosmetic/Kitsunoh--Female.png b/src/cap/dex/front-shiny-cosmetic/14--0--Kitsunoh--Female.png similarity index 100% rename from src/cap/dex/front-shiny-cosmetic/Kitsunoh--Female.png rename to src/cap/dex/front-shiny-cosmetic/14--0--Kitsunoh--Female.png diff --git a/src/cap/dex/front-shiny-cosmetic/Kerfluffle--Female.png b/src/cap/dex/front-shiny-cosmetic/41--0--Kerfluffle--Female.png similarity index 100% rename from src/cap/dex/front-shiny-cosmetic/Kerfluffle--Female.png rename to src/cap/dex/front-shiny-cosmetic/41--0--Kerfluffle--Female.png diff --git a/src/cap/dex/front-shiny-cosmetic/Pyroak--Female.png b/src/cap/dex/front-shiny-cosmetic/6--0--Pyroak--Female.png similarity index 100% rename from src/cap/dex/front-shiny-cosmetic/Pyroak--Female.png rename to src/cap/dex/front-shiny-cosmetic/6--0--Pyroak--Female.png diff --git a/src/cap/dex/front-shiny/Stratagem.png b/src/cap/dex/front-shiny/11--0--Stratagem.png similarity index 100% rename from src/cap/dex/front-shiny/Stratagem.png rename to src/cap/dex/front-shiny/11--0--Stratagem.png diff --git a/src/cap/dex/front-shiny/Kitsunoh.png b/src/cap/dex/front-shiny/14--0--Kitsunoh.png similarity index 100% rename from src/cap/dex/front-shiny/Kitsunoh.png rename to src/cap/dex/front-shiny/14--0--Kitsunoh.png diff --git a/src/cap/dex/front-shiny/Scratchet.png b/src/cap/dex/front-shiny/20--0--Scratchet.png similarity index 100% rename from src/cap/dex/front-shiny/Scratchet.png rename to src/cap/dex/front-shiny/20--0--Scratchet.png diff --git a/src/cap/dex/front-shiny/Tomohawk.png b/src/cap/dex/front-shiny/21--0--Tomohawk.png similarity index 100% rename from src/cap/dex/front-shiny/Tomohawk.png rename to src/cap/dex/front-shiny/21--0--Tomohawk.png diff --git a/src/cap/dex/front-shiny/Mollux.png b/src/cap/dex/front-shiny/24--0--Mollux.png similarity index 100% rename from src/cap/dex/front-shiny/Mollux.png rename to src/cap/dex/front-shiny/24--0--Mollux.png diff --git a/src/cap/dex/front-shiny/Crucibelle.png b/src/cap/dex/front-shiny/39--0--Crucibelle.png similarity index 100% rename from src/cap/dex/front-shiny/Crucibelle.png rename to src/cap/dex/front-shiny/39--0--Crucibelle.png diff --git a/src/cap/dex/front-shiny/Crucibelle--Mega.png b/src/cap/dex/front-shiny/39--420--Crucibelle--Mega.png similarity index 100% rename from src/cap/dex/front-shiny/Crucibelle--Mega.png rename to src/cap/dex/front-shiny/39--420--Crucibelle--Mega.png diff --git a/src/cap/dex/front-shiny/Pluffle.png b/src/cap/dex/front-shiny/40--0--Pluffle.png similarity index 100% rename from src/cap/dex/front-shiny/Pluffle.png rename to src/cap/dex/front-shiny/40--0--Pluffle.png diff --git a/src/cap/dex/front-shiny/Kerfluffle.png b/src/cap/dex/front-shiny/41--0--Kerfluffle.png similarity index 100% rename from src/cap/dex/front-shiny/Kerfluffle.png rename to src/cap/dex/front-shiny/41--0--Kerfluffle.png diff --git a/src/cap/dex/front-shiny/Pajantom.png b/src/cap/dex/front-shiny/42--0--Pajantom.png similarity index 100% rename from src/cap/dex/front-shiny/Pajantom.png rename to src/cap/dex/front-shiny/42--0--Pajantom.png diff --git a/src/cap/dex/front-shiny/Jumbao.png b/src/cap/dex/front-shiny/44--0--Jumbao.png similarity index 100% rename from src/cap/dex/front-shiny/Jumbao.png rename to src/cap/dex/front-shiny/44--0--Jumbao.png diff --git a/src/cap/dex/front-shiny/Caribolt.png b/src/cap/dex/front-shiny/47--0--Caribolt.png similarity index 100% rename from src/cap/dex/front-shiny/Caribolt.png rename to src/cap/dex/front-shiny/47--0--Caribolt.png diff --git a/src/cap/dex/front-shiny/Smogecko.png b/src/cap/dex/front-shiny/48--0--Smogecko.png similarity index 100% rename from src/cap/dex/front-shiny/Smogecko.png rename to src/cap/dex/front-shiny/48--0--Smogecko.png diff --git a/src/cap/dex/front-shiny/Smoguana.png b/src/cap/dex/front-shiny/49--0--Smoguana.png similarity index 100% rename from src/cap/dex/front-shiny/Smoguana.png rename to src/cap/dex/front-shiny/49--0--Smoguana.png diff --git a/src/cap/dex/front-shiny/Smokomodo.png b/src/cap/dex/front-shiny/50--0--Smokomodo.png similarity index 100% rename from src/cap/dex/front-shiny/Smokomodo.png rename to src/cap/dex/front-shiny/50--0--Smokomodo.png diff --git a/src/cap/dex/front-shiny/Snaelstrom.png b/src/cap/dex/front-shiny/53--0--Snaelstrom.png similarity index 100% rename from src/cap/dex/front-shiny/Snaelstrom.png rename to src/cap/dex/front-shiny/53--0--Snaelstrom.png diff --git a/src/cap/dex/front-shiny/Equilibra.png b/src/cap/dex/front-shiny/54--0--Equilibra.png similarity index 100% rename from src/cap/dex/front-shiny/Equilibra.png rename to src/cap/dex/front-shiny/54--0--Equilibra.png diff --git a/src/cap/dex/front-shiny/Pyroak.png b/src/cap/dex/front-shiny/6--0--Pyroak.png similarity index 100% rename from src/cap/dex/front-shiny/Pyroak.png rename to src/cap/dex/front-shiny/6--0--Pyroak.png diff --git a/src/cap/dex/front-shiny/Fidgit.png b/src/cap/dex/front-shiny/8--0--Fidgit.png similarity index 100% rename from src/cap/dex/front-shiny/Fidgit.png rename to src/cap/dex/front-shiny/8--0--Fidgit.png diff --git a/src/cap/dex/front/Stratagem.png b/src/cap/dex/front/11--0--Stratagem.png similarity index 100% rename from src/cap/dex/front/Stratagem.png rename to src/cap/dex/front/11--0--Stratagem.png diff --git a/src/cap/dex/front/Kitsunoh.png b/src/cap/dex/front/14--0--Kitsunoh.png similarity index 100% rename from src/cap/dex/front/Kitsunoh.png rename to src/cap/dex/front/14--0--Kitsunoh.png diff --git a/src/cap/dex/front/Scratchet.png b/src/cap/dex/front/20--0--Scratchet.png similarity index 100% rename from src/cap/dex/front/Scratchet.png rename to src/cap/dex/front/20--0--Scratchet.png diff --git a/src/cap/dex/front/Tomohawk.png b/src/cap/dex/front/21--0--Tomohawk.png similarity index 100% rename from src/cap/dex/front/Tomohawk.png rename to src/cap/dex/front/21--0--Tomohawk.png diff --git a/src/cap/dex/front/Mollux.png b/src/cap/dex/front/24--0--Mollux.png similarity index 100% rename from src/cap/dex/front/Mollux.png rename to src/cap/dex/front/24--0--Mollux.png diff --git a/src/cap/dex/front/Crucibelle.png b/src/cap/dex/front/39--0--Crucibelle.png similarity index 100% rename from src/cap/dex/front/Crucibelle.png rename to src/cap/dex/front/39--0--Crucibelle.png diff --git a/src/cap/dex/front/Crucibelle--Mega.png b/src/cap/dex/front/39--420--Crucibelle--Mega.png similarity index 100% rename from src/cap/dex/front/Crucibelle--Mega.png rename to src/cap/dex/front/39--420--Crucibelle--Mega.png diff --git a/src/cap/dex/front/Pluffle.png b/src/cap/dex/front/40--0--Pluffle.png similarity index 100% rename from src/cap/dex/front/Pluffle.png rename to src/cap/dex/front/40--0--Pluffle.png diff --git a/src/cap/dex/front/Kerfluffle.png b/src/cap/dex/front/41--0--Kerfluffle.png similarity index 100% rename from src/cap/dex/front/Kerfluffle.png rename to src/cap/dex/front/41--0--Kerfluffle.png diff --git a/src/cap/dex/front/Pajantom.png b/src/cap/dex/front/42--0--Pajantom.png similarity index 100% rename from src/cap/dex/front/Pajantom.png rename to src/cap/dex/front/42--0--Pajantom.png diff --git a/src/cap/dex/front/Jumbao.png b/src/cap/dex/front/44--0--Jumbao.png similarity index 100% rename from src/cap/dex/front/Jumbao.png rename to src/cap/dex/front/44--0--Jumbao.png diff --git a/src/cap/dex/front/Caribolt.png b/src/cap/dex/front/47--0--Caribolt.png similarity index 100% rename from src/cap/dex/front/Caribolt.png rename to src/cap/dex/front/47--0--Caribolt.png diff --git a/src/cap/dex/front/Smogecko.png b/src/cap/dex/front/48--0--Smogecko.png similarity index 100% rename from src/cap/dex/front/Smogecko.png rename to src/cap/dex/front/48--0--Smogecko.png diff --git a/src/cap/dex/front/Smoguana.png b/src/cap/dex/front/49--0--Smoguana.png similarity index 100% rename from src/cap/dex/front/Smoguana.png rename to src/cap/dex/front/49--0--Smoguana.png diff --git a/src/cap/dex/front/Smokomodo.png b/src/cap/dex/front/50--0--Smokomodo.png similarity index 100% rename from src/cap/dex/front/Smokomodo.png rename to src/cap/dex/front/50--0--Smokomodo.png diff --git a/src/cap/dex/front/Snaelstrom.png b/src/cap/dex/front/53--0--Snaelstrom.png similarity index 100% rename from src/cap/dex/front/Snaelstrom.png rename to src/cap/dex/front/53--0--Snaelstrom.png diff --git a/src/cap/dex/front/Equilibra.png b/src/cap/dex/front/54--0--Equilibra.png similarity index 100% rename from src/cap/dex/front/Equilibra.png rename to src/cap/dex/front/54--0--Equilibra.png diff --git a/src/cap/dex/front/Pyroak.png b/src/cap/dex/front/6--0--Pyroak.png similarity index 100% rename from src/cap/dex/front/Pyroak.png rename to src/cap/dex/front/6--0--Pyroak.png diff --git a/src/cap/dex/front/Fidgit.png b/src/cap/dex/front/8--0--Fidgit.png similarity index 100% rename from src/cap/dex/front/Fidgit.png rename to src/cap/dex/front/8--0--Fidgit.png diff --git a/src/cap/minisprites/gen5/pokemon/Stratagem.png b/src/cap/minisprites/gen5/pokemon/11--0--Stratagem.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Stratagem.png rename to src/cap/minisprites/gen5/pokemon/11--0--Stratagem.png diff --git a/src/cap/minisprites/gen5/pokemon/Arghonaut.png b/src/cap/minisprites/gen5/pokemon/13--0--Arghonaut.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Arghonaut.png rename to src/cap/minisprites/gen5/pokemon/13--0--Arghonaut.png diff --git a/src/cap/minisprites/gen5/pokemon/Kitsunoh.png b/src/cap/minisprites/gen5/pokemon/14--0--Kitsunoh.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Kitsunoh.png rename to src/cap/minisprites/gen5/pokemon/14--0--Kitsunoh.png diff --git a/src/cap/minisprites/gen5/pokemon/Cyclohm.png b/src/cap/minisprites/gen5/pokemon/15--0--Cyclohm.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Cyclohm.png rename to src/cap/minisprites/gen5/pokemon/15--0--Cyclohm.png diff --git a/src/cap/minisprites/gen5/pokemon/Colossoil.png b/src/cap/minisprites/gen5/pokemon/16--0--Colossoil.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Colossoil.png rename to src/cap/minisprites/gen5/pokemon/16--0--Colossoil.png diff --git a/src/cap/minisprites/gen5/pokemon/Krilowatt.png b/src/cap/minisprites/gen5/pokemon/17--0--Krilowatt.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Krilowatt.png rename to src/cap/minisprites/gen5/pokemon/17--0--Krilowatt.png diff --git a/src/cap/minisprites/gen5/pokemon/Voodoom.png b/src/cap/minisprites/gen5/pokemon/19--0--Voodoom.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Voodoom.png rename to src/cap/minisprites/gen5/pokemon/19--0--Voodoom.png diff --git a/src/cap/minisprites/gen5/pokemon/Syclant.png b/src/cap/minisprites/gen5/pokemon/2--0--Syclant.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Syclant.png rename to src/cap/minisprites/gen5/pokemon/2--0--Syclant.png diff --git a/src/cap/minisprites/gen5/pokemon/Tomohawk.png b/src/cap/minisprites/gen5/pokemon/21--0--Tomohawk.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Tomohawk.png rename to src/cap/minisprites/gen5/pokemon/21--0--Tomohawk.png diff --git a/src/cap/minisprites/gen5/pokemon/Necturna.png b/src/cap/minisprites/gen5/pokemon/23--0--Necturna.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Necturna.png rename to src/cap/minisprites/gen5/pokemon/23--0--Necturna.png diff --git a/src/cap/minisprites/gen5/pokemon/Mollux.png b/src/cap/minisprites/gen5/pokemon/24--0--Mollux.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Mollux.png rename to src/cap/minisprites/gen5/pokemon/24--0--Mollux.png diff --git a/src/cap/minisprites/gen5/pokemon/Aurumoth.png b/src/cap/minisprites/gen5/pokemon/27--0--Aurumoth.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Aurumoth.png rename to src/cap/minisprites/gen5/pokemon/27--0--Aurumoth.png diff --git a/src/cap/minisprites/gen5/pokemon/Malaconda.png b/src/cap/minisprites/gen5/pokemon/29--0--Malaconda.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Malaconda.png rename to src/cap/minisprites/gen5/pokemon/29--0--Malaconda.png diff --git a/src/cap/minisprites/gen5/pokemon/Revenankh.png b/src/cap/minisprites/gen5/pokemon/3--0--Revenankh.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Revenankh.png rename to src/cap/minisprites/gen5/pokemon/3--0--Revenankh.png diff --git a/src/cap/minisprites/gen5/pokemon/Cawmodore.png b/src/cap/minisprites/gen5/pokemon/31--0--Cawmodore.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Cawmodore.png rename to src/cap/minisprites/gen5/pokemon/31--0--Cawmodore.png diff --git a/src/cap/minisprites/gen5/pokemon/Volkraken.png b/src/cap/minisprites/gen5/pokemon/33--0--Volkraken.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Volkraken.png rename to src/cap/minisprites/gen5/pokemon/33--0--Volkraken.png diff --git a/src/cap/minisprites/gen5/pokemon/Plasmanta.png b/src/cap/minisprites/gen5/pokemon/35--0--Plasmanta.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Plasmanta.png rename to src/cap/minisprites/gen5/pokemon/35--0--Plasmanta.png diff --git a/src/cap/minisprites/gen5/pokemon/Naviathan.png b/src/cap/minisprites/gen5/pokemon/38--0--Naviathan.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Naviathan.png rename to src/cap/minisprites/gen5/pokemon/38--0--Naviathan.png diff --git a/src/cap/minisprites/gen5/pokemon/Crucibelle.png b/src/cap/minisprites/gen5/pokemon/39--0--Crucibelle.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Crucibelle.png rename to src/cap/minisprites/gen5/pokemon/39--0--Crucibelle.png diff --git a/src/cap/minisprites/gen5/pokemon/Crucibelle--Mega.png b/src/cap/minisprites/gen5/pokemon/39--420--Crucibelle--Mega.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Crucibelle--Mega.png rename to src/cap/minisprites/gen5/pokemon/39--420--Crucibelle--Mega.png diff --git a/src/cap/minisprites/gen5/pokemon/Kerfluffle.png b/src/cap/minisprites/gen5/pokemon/41--0--Kerfluffle.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Kerfluffle.png rename to src/cap/minisprites/gen5/pokemon/41--0--Kerfluffle.png diff --git a/src/cap/minisprites/gen5/pokemon/Pyroak.png b/src/cap/minisprites/gen5/pokemon/6--0--Pyroak.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Pyroak.png rename to src/cap/minisprites/gen5/pokemon/6--0--Pyroak.png diff --git a/src/cap/minisprites/gen5/pokemon/Fidgit.png b/src/cap/minisprites/gen5/pokemon/8--0--Fidgit.png similarity index 100% rename from src/cap/minisprites/gen5/pokemon/Fidgit.png rename to src/cap/minisprites/gen5/pokemon/8--0--Fidgit.png diff --git a/src/cap/minisprites/gen6/pokemon/Syclar.png b/src/cap/minisprites/gen6/pokemon/1--0--Syclar.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Syclar.png rename to src/cap/minisprites/gen6/pokemon/1--0--Syclar.png diff --git a/src/cap/minisprites/gen6/pokemon/Tactite.png b/src/cap/minisprites/gen6/pokemon/10--0--Tactite.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Tactite.png rename to src/cap/minisprites/gen6/pokemon/10--0--Tactite.png diff --git a/src/cap/minisprites/gen6/pokemon/Stratagem.png b/src/cap/minisprites/gen6/pokemon/11--0--Stratagem.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Stratagem.png rename to src/cap/minisprites/gen6/pokemon/11--0--Stratagem.png diff --git a/src/cap/minisprites/gen6/pokemon/Privatyke.png b/src/cap/minisprites/gen6/pokemon/12--0--Privatyke.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Privatyke.png rename to src/cap/minisprites/gen6/pokemon/12--0--Privatyke.png diff --git a/src/cap/minisprites/gen6/pokemon/Arghonaut.png b/src/cap/minisprites/gen6/pokemon/13--0--Arghonaut.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Arghonaut.png rename to src/cap/minisprites/gen6/pokemon/13--0--Arghonaut.png diff --git a/src/cap/minisprites/gen6/pokemon/Kitsunoh.png b/src/cap/minisprites/gen6/pokemon/14--0--Kitsunoh.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Kitsunoh.png rename to src/cap/minisprites/gen6/pokemon/14--0--Kitsunoh.png diff --git a/src/cap/minisprites/gen6/pokemon/Cyclohm.png b/src/cap/minisprites/gen6/pokemon/15--0--Cyclohm.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Cyclohm.png rename to src/cap/minisprites/gen6/pokemon/15--0--Cyclohm.png diff --git a/src/cap/minisprites/gen6/pokemon/Colossoil.png b/src/cap/minisprites/gen6/pokemon/16--0--Colossoil.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Colossoil.png rename to src/cap/minisprites/gen6/pokemon/16--0--Colossoil.png diff --git a/src/cap/minisprites/gen6/pokemon/Krilowatt.png b/src/cap/minisprites/gen6/pokemon/17--0--Krilowatt.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Krilowatt.png rename to src/cap/minisprites/gen6/pokemon/17--0--Krilowatt.png diff --git a/src/cap/minisprites/gen6/pokemon/Voodoll.png b/src/cap/minisprites/gen6/pokemon/18--0--Voodoll.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Voodoll.png rename to src/cap/minisprites/gen6/pokemon/18--0--Voodoll.png diff --git a/src/cap/minisprites/gen6/pokemon/Voodoom.png b/src/cap/minisprites/gen6/pokemon/19--0--Voodoom.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Voodoom.png rename to src/cap/minisprites/gen6/pokemon/19--0--Voodoom.png diff --git a/src/cap/minisprites/gen6/pokemon/Syclant.png b/src/cap/minisprites/gen6/pokemon/2--0--Syclant.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Syclant.png rename to src/cap/minisprites/gen6/pokemon/2--0--Syclant.png diff --git a/src/cap/minisprites/gen6/pokemon/Scratchet.png b/src/cap/minisprites/gen6/pokemon/20--0--Scratchet.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Scratchet.png rename to src/cap/minisprites/gen6/pokemon/20--0--Scratchet.png diff --git a/src/cap/minisprites/gen6/pokemon/Tomohawk.png b/src/cap/minisprites/gen6/pokemon/21--0--Tomohawk.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Tomohawk.png rename to src/cap/minisprites/gen6/pokemon/21--0--Tomohawk.png diff --git a/src/cap/minisprites/gen6/pokemon/Necturine.png b/src/cap/minisprites/gen6/pokemon/22--0--Necturine.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Necturine.png rename to src/cap/minisprites/gen6/pokemon/22--0--Necturine.png diff --git a/src/cap/minisprites/gen6/pokemon/Necturna.png b/src/cap/minisprites/gen6/pokemon/23--0--Necturna.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Necturna.png rename to src/cap/minisprites/gen6/pokemon/23--0--Necturna.png diff --git a/src/cap/minisprites/gen6/pokemon/Mollux.png b/src/cap/minisprites/gen6/pokemon/24--0--Mollux.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Mollux.png rename to src/cap/minisprites/gen6/pokemon/24--0--Mollux.png diff --git a/src/cap/minisprites/gen6/pokemon/Cupra.png b/src/cap/minisprites/gen6/pokemon/25--0--Cupra.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Cupra.png rename to src/cap/minisprites/gen6/pokemon/25--0--Cupra.png diff --git a/src/cap/minisprites/gen6/pokemon/Argalis.png b/src/cap/minisprites/gen6/pokemon/26--0--Argalis.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Argalis.png rename to src/cap/minisprites/gen6/pokemon/26--0--Argalis.png diff --git a/src/cap/minisprites/gen6/pokemon/Aurumoth.png b/src/cap/minisprites/gen6/pokemon/27--0--Aurumoth.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Aurumoth.png rename to src/cap/minisprites/gen6/pokemon/27--0--Aurumoth.png diff --git a/src/cap/minisprites/gen6/pokemon/Brattler.png b/src/cap/minisprites/gen6/pokemon/28--0--Brattler.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Brattler.png rename to src/cap/minisprites/gen6/pokemon/28--0--Brattler.png diff --git a/src/cap/minisprites/gen6/pokemon/Malaconda.png b/src/cap/minisprites/gen6/pokemon/29--0--Malaconda.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Malaconda.png rename to src/cap/minisprites/gen6/pokemon/29--0--Malaconda.png diff --git a/src/cap/minisprites/gen6/pokemon/Revenankh.png b/src/cap/minisprites/gen6/pokemon/3--0--Revenankh.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Revenankh.png rename to src/cap/minisprites/gen6/pokemon/3--0--Revenankh.png diff --git a/src/cap/minisprites/gen6/pokemon/Cawdet.png b/src/cap/minisprites/gen6/pokemon/30--0--Cawdet.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Cawdet.png rename to src/cap/minisprites/gen6/pokemon/30--0--Cawdet.png diff --git a/src/cap/minisprites/gen6/pokemon/Cawmodore.png b/src/cap/minisprites/gen6/pokemon/31--0--Cawmodore.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Cawmodore.png rename to src/cap/minisprites/gen6/pokemon/31--0--Cawmodore.png diff --git a/src/cap/minisprites/gen6/pokemon/Volkritter.png b/src/cap/minisprites/gen6/pokemon/32--0--Volkritter.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Volkritter.png rename to src/cap/minisprites/gen6/pokemon/32--0--Volkritter.png diff --git a/src/cap/minisprites/gen6/pokemon/Volkraken.png b/src/cap/minisprites/gen6/pokemon/33--0--Volkraken.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Volkraken.png rename to src/cap/minisprites/gen6/pokemon/33--0--Volkraken.png diff --git a/src/cap/minisprites/gen6/pokemon/Snugglow.png b/src/cap/minisprites/gen6/pokemon/34--0--Snugglow.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Snugglow.png rename to src/cap/minisprites/gen6/pokemon/34--0--Snugglow.png diff --git a/src/cap/minisprites/gen6/pokemon/Plasmanta.png b/src/cap/minisprites/gen6/pokemon/35--0--Plasmanta.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Plasmanta.png rename to src/cap/minisprites/gen6/pokemon/35--0--Plasmanta.png diff --git a/src/cap/minisprites/gen6/pokemon/Floatoy.png b/src/cap/minisprites/gen6/pokemon/36--0--Floatoy.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Floatoy.png rename to src/cap/minisprites/gen6/pokemon/36--0--Floatoy.png diff --git a/src/cap/minisprites/gen6/pokemon/Caimanoe.png b/src/cap/minisprites/gen6/pokemon/37--0--Caimanoe.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Caimanoe.png rename to src/cap/minisprites/gen6/pokemon/37--0--Caimanoe.png diff --git a/src/cap/minisprites/gen6/pokemon/Naviathan.png b/src/cap/minisprites/gen6/pokemon/38--0--Naviathan.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Naviathan.png rename to src/cap/minisprites/gen6/pokemon/38--0--Naviathan.png diff --git a/src/cap/minisprites/gen6/pokemon/Crucibelle.png b/src/cap/minisprites/gen6/pokemon/39--0--Crucibelle.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Crucibelle.png rename to src/cap/minisprites/gen6/pokemon/39--0--Crucibelle.png diff --git a/src/cap/minisprites/gen6/pokemon/Crucibelle--Mega.png b/src/cap/minisprites/gen6/pokemon/39--420--Crucibelle--Mega.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Crucibelle--Mega.png rename to src/cap/minisprites/gen6/pokemon/39--420--Crucibelle--Mega.png diff --git a/src/cap/minisprites/gen6/pokemon/Embirch.png b/src/cap/minisprites/gen6/pokemon/4--0--Embirch.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Embirch.png rename to src/cap/minisprites/gen6/pokemon/4--0--Embirch.png diff --git a/src/cap/minisprites/gen6/pokemon/Pluffle.png b/src/cap/minisprites/gen6/pokemon/40--0--Pluffle.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Pluffle.png rename to src/cap/minisprites/gen6/pokemon/40--0--Pluffle.png diff --git a/src/cap/minisprites/gen6/pokemon/Kerfluffle.png b/src/cap/minisprites/gen6/pokemon/41--0--Kerfluffle.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Kerfluffle.png rename to src/cap/minisprites/gen6/pokemon/41--0--Kerfluffle.png diff --git a/src/cap/minisprites/gen6/pokemon/Pajantom.png b/src/cap/minisprites/gen6/pokemon/42--0--Pajantom.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Pajantom.png rename to src/cap/minisprites/gen6/pokemon/42--0--Pajantom.png diff --git a/src/cap/minisprites/gen6/pokemon/Mumbao.png b/src/cap/minisprites/gen6/pokemon/43--0--Mumbao.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Mumbao.png rename to src/cap/minisprites/gen6/pokemon/43--0--Mumbao.png diff --git a/src/cap/minisprites/gen6/pokemon/Jumbao.png b/src/cap/minisprites/gen6/pokemon/44--0--Jumbao.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Jumbao.png rename to src/cap/minisprites/gen6/pokemon/44--0--Jumbao.png diff --git a/src/cap/minisprites/gen6/pokemon/Fawnifer.png b/src/cap/minisprites/gen6/pokemon/45--0--Fawnifer.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Fawnifer.png rename to src/cap/minisprites/gen6/pokemon/45--0--Fawnifer.png diff --git a/src/cap/minisprites/gen6/pokemon/Electrelk.png b/src/cap/minisprites/gen6/pokemon/46--0--Electrelk.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Electrelk.png rename to src/cap/minisprites/gen6/pokemon/46--0--Electrelk.png diff --git a/src/cap/minisprites/gen6/pokemon/Caribolt.png b/src/cap/minisprites/gen6/pokemon/47--0--Caribolt.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Caribolt.png rename to src/cap/minisprites/gen6/pokemon/47--0--Caribolt.png diff --git a/src/cap/minisprites/gen6/pokemon/Smogecko.png b/src/cap/minisprites/gen6/pokemon/48--0--Smogecko.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Smogecko.png rename to src/cap/minisprites/gen6/pokemon/48--0--Smogecko.png diff --git a/src/cap/minisprites/gen6/pokemon/Smoguana.png b/src/cap/minisprites/gen6/pokemon/49--0--Smoguana.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Smoguana.png rename to src/cap/minisprites/gen6/pokemon/49--0--Smoguana.png diff --git a/src/cap/minisprites/gen6/pokemon/Flarelm.png b/src/cap/minisprites/gen6/pokemon/5--0--Flarelm.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Flarelm.png rename to src/cap/minisprites/gen6/pokemon/5--0--Flarelm.png diff --git a/src/cap/minisprites/gen6/pokemon/Smokomodo.png b/src/cap/minisprites/gen6/pokemon/50--0--Smokomodo.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Smokomodo.png rename to src/cap/minisprites/gen6/pokemon/50--0--Smokomodo.png diff --git a/src/cap/minisprites/gen6/pokemon/Swirlpool.png b/src/cap/minisprites/gen6/pokemon/51--0--Swirlpool.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Swirlpool.png rename to src/cap/minisprites/gen6/pokemon/51--0--Swirlpool.png diff --git a/src/cap/minisprites/gen6/pokemon/Coribalis.png b/src/cap/minisprites/gen6/pokemon/52--0--Coribalis.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Coribalis.png rename to src/cap/minisprites/gen6/pokemon/52--0--Coribalis.png diff --git a/src/cap/minisprites/gen6/pokemon/Snaelstrom.png b/src/cap/minisprites/gen6/pokemon/53--0--Snaelstrom.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Snaelstrom.png rename to src/cap/minisprites/gen6/pokemon/53--0--Snaelstrom.png diff --git a/src/cap/minisprites/gen6/pokemon/Equilibra.png b/src/cap/minisprites/gen6/pokemon/54--0--Equilibra.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Equilibra.png rename to src/cap/minisprites/gen6/pokemon/54--0--Equilibra.png diff --git a/src/cap/minisprites/gen6/pokemon/Pyroak.png b/src/cap/minisprites/gen6/pokemon/6--0--Pyroak.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Pyroak.png rename to src/cap/minisprites/gen6/pokemon/6--0--Pyroak.png diff --git a/src/cap/minisprites/gen6/pokemon/Breezi.png b/src/cap/minisprites/gen6/pokemon/7--0--Breezi.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Breezi.png rename to src/cap/minisprites/gen6/pokemon/7--0--Breezi.png diff --git a/src/cap/minisprites/gen6/pokemon/Fidgit.png b/src/cap/minisprites/gen6/pokemon/8--0--Fidgit.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Fidgit.png rename to src/cap/minisprites/gen6/pokemon/8--0--Fidgit.png diff --git a/src/cap/minisprites/gen6/pokemon/Rebble.png b/src/cap/minisprites/gen6/pokemon/9--0--Rebble.png similarity index 100% rename from src/cap/minisprites/gen6/pokemon/Rebble.png rename to src/cap/minisprites/gen6/pokemon/9--0--Rebble.png diff --git a/src/cap/models/back-cosmetic/Kitsunoh--Female.gif b/src/cap/models/back-cosmetic/14--0--Kitsunoh--Female.gif similarity index 100% rename from src/cap/models/back-cosmetic/Kitsunoh--Female.gif rename to src/cap/models/back-cosmetic/14--0--Kitsunoh--Female.gif diff --git a/src/cap/models/back-shiny-cosmetic/Kitsunoh--Female.gif b/src/cap/models/back-shiny-cosmetic/14--0--Kitsunoh--Female.gif similarity index 100% rename from src/cap/models/back-shiny-cosmetic/Kitsunoh--Female.gif rename to src/cap/models/back-shiny-cosmetic/14--0--Kitsunoh--Female.gif diff --git a/src/cap/models/back-shiny/Stratagem.gif b/src/cap/models/back-shiny/11--0--Stratagem.gif similarity index 100% rename from src/cap/models/back-shiny/Stratagem.gif rename to src/cap/models/back-shiny/11--0--Stratagem.gif diff --git a/src/cap/models/back-shiny/Kitsunoh.gif b/src/cap/models/back-shiny/14--0--Kitsunoh.gif similarity index 100% rename from src/cap/models/back-shiny/Kitsunoh.gif rename to src/cap/models/back-shiny/14--0--Kitsunoh.gif diff --git a/src/cap/models/back-shiny/Krilowatt.gif b/src/cap/models/back-shiny/17--0--Krilowatt.gif similarity index 100% rename from src/cap/models/back-shiny/Krilowatt.gif rename to src/cap/models/back-shiny/17--0--Krilowatt.gif diff --git a/src/cap/models/back-shiny/Scratchet.gif b/src/cap/models/back-shiny/20--0--Scratchet.gif similarity index 100% rename from src/cap/models/back-shiny/Scratchet.gif rename to src/cap/models/back-shiny/20--0--Scratchet.gif diff --git a/src/cap/models/back-shiny/Tomohawk.gif b/src/cap/models/back-shiny/21--0--Tomohawk.gif similarity index 100% rename from src/cap/models/back-shiny/Tomohawk.gif rename to src/cap/models/back-shiny/21--0--Tomohawk.gif diff --git a/src/cap/models/back-shiny/Mollux.gif b/src/cap/models/back-shiny/24--0--Mollux.gif similarity index 100% rename from src/cap/models/back-shiny/Mollux.gif rename to src/cap/models/back-shiny/24--0--Mollux.gif diff --git a/src/cap/models/back-shiny/Aurumoth.gif b/src/cap/models/back-shiny/27--0--Aurumoth.gif similarity index 100% rename from src/cap/models/back-shiny/Aurumoth.gif rename to src/cap/models/back-shiny/27--0--Aurumoth.gif diff --git a/src/cap/models/back-shiny/Cawmodore.gif b/src/cap/models/back-shiny/31--0--Cawmodore.gif similarity index 100% rename from src/cap/models/back-shiny/Cawmodore.gif rename to src/cap/models/back-shiny/31--0--Cawmodore.gif diff --git a/src/cap/models/back-shiny/Volkraken.gif b/src/cap/models/back-shiny/33--0--Volkraken.gif similarity index 100% rename from src/cap/models/back-shiny/Volkraken.gif rename to src/cap/models/back-shiny/33--0--Volkraken.gif diff --git a/src/cap/models/back-shiny/Plasmanta.gif b/src/cap/models/back-shiny/35--0--Plasmanta.gif similarity index 100% rename from src/cap/models/back-shiny/Plasmanta.gif rename to src/cap/models/back-shiny/35--0--Plasmanta.gif diff --git a/src/cap/models/back-shiny/Naviathan.gif b/src/cap/models/back-shiny/38--0--Naviathan.gif similarity index 100% rename from src/cap/models/back-shiny/Naviathan.gif rename to src/cap/models/back-shiny/38--0--Naviathan.gif diff --git a/src/cap/models/back-shiny/Crucibelle.gif b/src/cap/models/back-shiny/39--0--Crucibelle.gif similarity index 100% rename from src/cap/models/back-shiny/Crucibelle.gif rename to src/cap/models/back-shiny/39--0--Crucibelle.gif diff --git a/src/cap/models/back-shiny/Crucibelle--Mega.gif b/src/cap/models/back-shiny/39--420--Crucibelle--Mega.gif similarity index 100% rename from src/cap/models/back-shiny/Crucibelle--Mega.gif rename to src/cap/models/back-shiny/39--420--Crucibelle--Mega.gif diff --git a/src/cap/models/back-shiny/Pluffle.gif b/src/cap/models/back-shiny/40--0--Pluffle.gif similarity index 100% rename from src/cap/models/back-shiny/Pluffle.gif rename to src/cap/models/back-shiny/40--0--Pluffle.gif diff --git a/src/cap/models/back-shiny/Kerfluffle.gif b/src/cap/models/back-shiny/41--0--Kerfluffle.gif similarity index 100% rename from src/cap/models/back-shiny/Kerfluffle.gif rename to src/cap/models/back-shiny/41--0--Kerfluffle.gif diff --git a/src/cap/models/back-shiny/Pajantom.gif b/src/cap/models/back-shiny/42--0--Pajantom.gif similarity index 100% rename from src/cap/models/back-shiny/Pajantom.gif rename to src/cap/models/back-shiny/42--0--Pajantom.gif diff --git a/src/cap/models/back-shiny/Jumbao.gif b/src/cap/models/back-shiny/44--0--Jumbao.gif similarity index 100% rename from src/cap/models/back-shiny/Jumbao.gif rename to src/cap/models/back-shiny/44--0--Jumbao.gif diff --git a/src/cap/models/back-shiny/Caribolt.gif b/src/cap/models/back-shiny/47--0--Caribolt.gif similarity index 100% rename from src/cap/models/back-shiny/Caribolt.gif rename to src/cap/models/back-shiny/47--0--Caribolt.gif diff --git a/src/cap/models/back-shiny/Smogecko.gif b/src/cap/models/back-shiny/48--0--Smogecko.gif similarity index 100% rename from src/cap/models/back-shiny/Smogecko.gif rename to src/cap/models/back-shiny/48--0--Smogecko.gif diff --git a/src/cap/models/back-shiny/Smoguana.gif b/src/cap/models/back-shiny/49--0--Smoguana.gif similarity index 100% rename from src/cap/models/back-shiny/Smoguana.gif rename to src/cap/models/back-shiny/49--0--Smoguana.gif diff --git a/src/cap/models/back-shiny/Smokomodo.gif b/src/cap/models/back-shiny/50--0--Smokomodo.gif similarity index 100% rename from src/cap/models/back-shiny/Smokomodo.gif rename to src/cap/models/back-shiny/50--0--Smokomodo.gif diff --git a/src/cap/models/back-shiny/Snaelstrom.gif b/src/cap/models/back-shiny/53--0--Snaelstrom.gif similarity index 100% rename from src/cap/models/back-shiny/Snaelstrom.gif rename to src/cap/models/back-shiny/53--0--Snaelstrom.gif diff --git a/src/cap/models/back-shiny/Equilibra.gif b/src/cap/models/back-shiny/54--0--Equilibra.gif similarity index 100% rename from src/cap/models/back-shiny/Equilibra.gif rename to src/cap/models/back-shiny/54--0--Equilibra.gif diff --git a/src/cap/models/back-shiny/Fidgit.gif b/src/cap/models/back-shiny/8--0--Fidgit.gif similarity index 100% rename from src/cap/models/back-shiny/Fidgit.gif rename to src/cap/models/back-shiny/8--0--Fidgit.gif diff --git a/src/cap/models/back/Stratagem.gif b/src/cap/models/back/11--0--Stratagem.gif similarity index 100% rename from src/cap/models/back/Stratagem.gif rename to src/cap/models/back/11--0--Stratagem.gif diff --git a/src/cap/models/back/Kitsunoh.gif b/src/cap/models/back/14--0--Kitsunoh.gif similarity index 100% rename from src/cap/models/back/Kitsunoh.gif rename to src/cap/models/back/14--0--Kitsunoh.gif diff --git a/src/cap/models/back/Krilowatt.gif b/src/cap/models/back/17--0--Krilowatt.gif similarity index 100% rename from src/cap/models/back/Krilowatt.gif rename to src/cap/models/back/17--0--Krilowatt.gif diff --git a/src/cap/models/back/Scratchet.gif b/src/cap/models/back/20--0--Scratchet.gif similarity index 100% rename from src/cap/models/back/Scratchet.gif rename to src/cap/models/back/20--0--Scratchet.gif diff --git a/src/cap/models/back/Tomohawk.gif b/src/cap/models/back/21--0--Tomohawk.gif similarity index 100% rename from src/cap/models/back/Tomohawk.gif rename to src/cap/models/back/21--0--Tomohawk.gif diff --git a/src/cap/models/back/Mollux.gif b/src/cap/models/back/24--0--Mollux.gif similarity index 100% rename from src/cap/models/back/Mollux.gif rename to src/cap/models/back/24--0--Mollux.gif diff --git a/src/cap/models/back/Aurumoth.gif b/src/cap/models/back/27--0--Aurumoth.gif similarity index 100% rename from src/cap/models/back/Aurumoth.gif rename to src/cap/models/back/27--0--Aurumoth.gif diff --git a/src/cap/models/back/Cawmodore.gif b/src/cap/models/back/31--0--Cawmodore.gif similarity index 100% rename from src/cap/models/back/Cawmodore.gif rename to src/cap/models/back/31--0--Cawmodore.gif diff --git a/src/cap/models/back/Volkraken.gif b/src/cap/models/back/33--0--Volkraken.gif similarity index 100% rename from src/cap/models/back/Volkraken.gif rename to src/cap/models/back/33--0--Volkraken.gif diff --git a/src/cap/models/back/Plasmanta.gif b/src/cap/models/back/35--0--Plasmanta.gif similarity index 100% rename from src/cap/models/back/Plasmanta.gif rename to src/cap/models/back/35--0--Plasmanta.gif diff --git a/src/cap/models/back/Naviathan.gif b/src/cap/models/back/38--0--Naviathan.gif similarity index 100% rename from src/cap/models/back/Naviathan.gif rename to src/cap/models/back/38--0--Naviathan.gif diff --git a/src/cap/models/back/Crucibelle.gif b/src/cap/models/back/39--0--Crucibelle.gif similarity index 100% rename from src/cap/models/back/Crucibelle.gif rename to src/cap/models/back/39--0--Crucibelle.gif diff --git a/src/cap/models/back/Crucibelle--Mega.gif b/src/cap/models/back/39--420--Crucibelle--Mega.gif similarity index 100% rename from src/cap/models/back/Crucibelle--Mega.gif rename to src/cap/models/back/39--420--Crucibelle--Mega.gif diff --git a/src/cap/models/back/Pluffle.gif b/src/cap/models/back/40--0--Pluffle.gif similarity index 100% rename from src/cap/models/back/Pluffle.gif rename to src/cap/models/back/40--0--Pluffle.gif diff --git a/src/cap/models/back/Kerfluffle.gif b/src/cap/models/back/41--0--Kerfluffle.gif similarity index 100% rename from src/cap/models/back/Kerfluffle.gif rename to src/cap/models/back/41--0--Kerfluffle.gif diff --git a/src/cap/models/back/Pajantom.gif b/src/cap/models/back/42--0--Pajantom.gif similarity index 100% rename from src/cap/models/back/Pajantom.gif rename to src/cap/models/back/42--0--Pajantom.gif diff --git a/src/cap/models/back/Jumbao.gif b/src/cap/models/back/44--0--Jumbao.gif similarity index 100% rename from src/cap/models/back/Jumbao.gif rename to src/cap/models/back/44--0--Jumbao.gif diff --git a/src/cap/models/back/Caribolt.gif b/src/cap/models/back/47--0--Caribolt.gif similarity index 100% rename from src/cap/models/back/Caribolt.gif rename to src/cap/models/back/47--0--Caribolt.gif diff --git a/src/cap/models/back/Smogecko.gif b/src/cap/models/back/48--0--Smogecko.gif similarity index 100% rename from src/cap/models/back/Smogecko.gif rename to src/cap/models/back/48--0--Smogecko.gif diff --git a/src/cap/models/back/Smoguana.gif b/src/cap/models/back/49--0--Smoguana.gif similarity index 100% rename from src/cap/models/back/Smoguana.gif rename to src/cap/models/back/49--0--Smoguana.gif diff --git a/src/cap/models/back/Smokomodo.gif b/src/cap/models/back/50--0--Smokomodo.gif similarity index 100% rename from src/cap/models/back/Smokomodo.gif rename to src/cap/models/back/50--0--Smokomodo.gif diff --git a/src/cap/models/back/Snaelstrom.gif b/src/cap/models/back/53--0--Snaelstrom.gif similarity index 100% rename from src/cap/models/back/Snaelstrom.gif rename to src/cap/models/back/53--0--Snaelstrom.gif diff --git a/src/cap/models/back/Equilibra.gif b/src/cap/models/back/54--0--Equilibra.gif similarity index 100% rename from src/cap/models/back/Equilibra.gif rename to src/cap/models/back/54--0--Equilibra.gif diff --git a/src/cap/models/back/Fidgit.gif b/src/cap/models/back/8--0--Fidgit.gif similarity index 100% rename from src/cap/models/back/Fidgit.gif rename to src/cap/models/back/8--0--Fidgit.gif diff --git a/src/cap/models/front-cosmetic/Kitsunoh--Female.gif b/src/cap/models/front-cosmetic/14--0--Kitsunoh--Female.gif similarity index 100% rename from src/cap/models/front-cosmetic/Kitsunoh--Female.gif rename to src/cap/models/front-cosmetic/14--0--Kitsunoh--Female.gif diff --git a/src/cap/models/front-shiny-cosmetic/Kitsunoh--Female.gif b/src/cap/models/front-shiny-cosmetic/14--0--Kitsunoh--Female.gif similarity index 100% rename from src/cap/models/front-shiny-cosmetic/Kitsunoh--Female.gif rename to src/cap/models/front-shiny-cosmetic/14--0--Kitsunoh--Female.gif diff --git a/src/cap/models/front-shiny/Stratagem.gif b/src/cap/models/front-shiny/11--0--Stratagem.gif similarity index 100% rename from src/cap/models/front-shiny/Stratagem.gif rename to src/cap/models/front-shiny/11--0--Stratagem.gif diff --git a/src/cap/models/front-shiny/Kitsunoh.gif b/src/cap/models/front-shiny/14--0--Kitsunoh.gif similarity index 100% rename from src/cap/models/front-shiny/Kitsunoh.gif rename to src/cap/models/front-shiny/14--0--Kitsunoh.gif diff --git a/src/cap/models/front-shiny/Krilowatt.gif b/src/cap/models/front-shiny/17--0--Krilowatt.gif similarity index 100% rename from src/cap/models/front-shiny/Krilowatt.gif rename to src/cap/models/front-shiny/17--0--Krilowatt.gif diff --git a/src/cap/models/front-shiny/Scratchet.gif b/src/cap/models/front-shiny/20--0--Scratchet.gif similarity index 100% rename from src/cap/models/front-shiny/Scratchet.gif rename to src/cap/models/front-shiny/20--0--Scratchet.gif diff --git a/src/cap/models/front-shiny/Tomohawk.gif b/src/cap/models/front-shiny/21--0--Tomohawk.gif similarity index 100% rename from src/cap/models/front-shiny/Tomohawk.gif rename to src/cap/models/front-shiny/21--0--Tomohawk.gif diff --git a/src/cap/models/front-shiny/Mollux.gif b/src/cap/models/front-shiny/24--0--Mollux.gif similarity index 100% rename from src/cap/models/front-shiny/Mollux.gif rename to src/cap/models/front-shiny/24--0--Mollux.gif diff --git a/src/cap/models/front-shiny/Aurumoth.gif b/src/cap/models/front-shiny/27--0--Aurumoth.gif similarity index 100% rename from src/cap/models/front-shiny/Aurumoth.gif rename to src/cap/models/front-shiny/27--0--Aurumoth.gif diff --git a/src/cap/models/front-shiny/Cawmodore.gif b/src/cap/models/front-shiny/31--0--Cawmodore.gif similarity index 100% rename from src/cap/models/front-shiny/Cawmodore.gif rename to src/cap/models/front-shiny/31--0--Cawmodore.gif diff --git a/src/cap/models/front-shiny/Volkraken.gif b/src/cap/models/front-shiny/33--0--Volkraken.gif similarity index 100% rename from src/cap/models/front-shiny/Volkraken.gif rename to src/cap/models/front-shiny/33--0--Volkraken.gif diff --git a/src/cap/models/front-shiny/Plasmanta.gif b/src/cap/models/front-shiny/35--0--Plasmanta.gif similarity index 100% rename from src/cap/models/front-shiny/Plasmanta.gif rename to src/cap/models/front-shiny/35--0--Plasmanta.gif diff --git a/src/cap/models/front-shiny/Naviathan.gif b/src/cap/models/front-shiny/38--0--Naviathan.gif similarity index 100% rename from src/cap/models/front-shiny/Naviathan.gif rename to src/cap/models/front-shiny/38--0--Naviathan.gif diff --git a/src/cap/models/front-shiny/Crucibelle.gif b/src/cap/models/front-shiny/39--0--Crucibelle.gif similarity index 100% rename from src/cap/models/front-shiny/Crucibelle.gif rename to src/cap/models/front-shiny/39--0--Crucibelle.gif diff --git a/src/cap/models/front-shiny/Crucibelle--Mega.gif b/src/cap/models/front-shiny/39--420--Crucibelle--Mega.gif similarity index 100% rename from src/cap/models/front-shiny/Crucibelle--Mega.gif rename to src/cap/models/front-shiny/39--420--Crucibelle--Mega.gif diff --git a/src/cap/models/front-shiny/Pluffle.gif b/src/cap/models/front-shiny/40--0--Pluffle.gif similarity index 100% rename from src/cap/models/front-shiny/Pluffle.gif rename to src/cap/models/front-shiny/40--0--Pluffle.gif diff --git a/src/cap/models/front-shiny/Kerfluffle.gif b/src/cap/models/front-shiny/41--0--Kerfluffle.gif similarity index 100% rename from src/cap/models/front-shiny/Kerfluffle.gif rename to src/cap/models/front-shiny/41--0--Kerfluffle.gif diff --git a/src/cap/models/front-shiny/Pajantom.gif b/src/cap/models/front-shiny/42--0--Pajantom.gif similarity index 100% rename from src/cap/models/front-shiny/Pajantom.gif rename to src/cap/models/front-shiny/42--0--Pajantom.gif diff --git a/src/cap/models/front-shiny/Jumbao.gif b/src/cap/models/front-shiny/44--0--Jumbao.gif similarity index 100% rename from src/cap/models/front-shiny/Jumbao.gif rename to src/cap/models/front-shiny/44--0--Jumbao.gif diff --git a/src/cap/models/front-shiny/Caribolt.gif b/src/cap/models/front-shiny/47--0--Caribolt.gif similarity index 100% rename from src/cap/models/front-shiny/Caribolt.gif rename to src/cap/models/front-shiny/47--0--Caribolt.gif diff --git a/src/cap/models/front-shiny/Smogecko.gif b/src/cap/models/front-shiny/48--0--Smogecko.gif similarity index 100% rename from src/cap/models/front-shiny/Smogecko.gif rename to src/cap/models/front-shiny/48--0--Smogecko.gif diff --git a/src/cap/models/front-shiny/Smoguana.gif b/src/cap/models/front-shiny/49--0--Smoguana.gif similarity index 100% rename from src/cap/models/front-shiny/Smoguana.gif rename to src/cap/models/front-shiny/49--0--Smoguana.gif diff --git a/src/cap/models/front-shiny/Smokomodo.gif b/src/cap/models/front-shiny/50--0--Smokomodo.gif similarity index 100% rename from src/cap/models/front-shiny/Smokomodo.gif rename to src/cap/models/front-shiny/50--0--Smokomodo.gif diff --git a/src/cap/models/front-shiny/Snaelstrom.gif b/src/cap/models/front-shiny/53--0--Snaelstrom.gif similarity index 100% rename from src/cap/models/front-shiny/Snaelstrom.gif rename to src/cap/models/front-shiny/53--0--Snaelstrom.gif diff --git a/src/cap/models/front-shiny/Equilibra.gif b/src/cap/models/front-shiny/54--0--Equilibra.gif similarity index 100% rename from src/cap/models/front-shiny/Equilibra.gif rename to src/cap/models/front-shiny/54--0--Equilibra.gif diff --git a/src/cap/models/front-shiny/Pyroak.gif b/src/cap/models/front-shiny/6--0--Pyroak.gif similarity index 100% rename from src/cap/models/front-shiny/Pyroak.gif rename to src/cap/models/front-shiny/6--0--Pyroak.gif diff --git a/src/cap/models/front-shiny/Fidgit.gif b/src/cap/models/front-shiny/8--0--Fidgit.gif similarity index 100% rename from src/cap/models/front-shiny/Fidgit.gif rename to src/cap/models/front-shiny/8--0--Fidgit.gif diff --git a/src/cap/models/front/Stratagem.gif b/src/cap/models/front/11--0--Stratagem.gif similarity index 100% rename from src/cap/models/front/Stratagem.gif rename to src/cap/models/front/11--0--Stratagem.gif diff --git a/src/cap/models/front/Kitsunoh.gif b/src/cap/models/front/14--0--Kitsunoh.gif similarity index 100% rename from src/cap/models/front/Kitsunoh.gif rename to src/cap/models/front/14--0--Kitsunoh.gif diff --git a/src/cap/models/front/Krilowatt.gif b/src/cap/models/front/17--0--Krilowatt.gif similarity index 100% rename from src/cap/models/front/Krilowatt.gif rename to src/cap/models/front/17--0--Krilowatt.gif diff --git a/src/cap/models/front/Scratchet.gif b/src/cap/models/front/20--0--Scratchet.gif similarity index 100% rename from src/cap/models/front/Scratchet.gif rename to src/cap/models/front/20--0--Scratchet.gif diff --git a/src/cap/models/front/Tomohawk.gif b/src/cap/models/front/21--0--Tomohawk.gif similarity index 100% rename from src/cap/models/front/Tomohawk.gif rename to src/cap/models/front/21--0--Tomohawk.gif diff --git a/src/cap/models/front/Mollux.gif b/src/cap/models/front/24--0--Mollux.gif similarity index 100% rename from src/cap/models/front/Mollux.gif rename to src/cap/models/front/24--0--Mollux.gif diff --git a/src/cap/models/front/Aurumoth.gif b/src/cap/models/front/27--0--Aurumoth.gif similarity index 100% rename from src/cap/models/front/Aurumoth.gif rename to src/cap/models/front/27--0--Aurumoth.gif diff --git a/src/cap/models/front/Cawmodore.gif b/src/cap/models/front/31--0--Cawmodore.gif similarity index 100% rename from src/cap/models/front/Cawmodore.gif rename to src/cap/models/front/31--0--Cawmodore.gif diff --git a/src/cap/models/front/Volkraken.gif b/src/cap/models/front/33--0--Volkraken.gif similarity index 100% rename from src/cap/models/front/Volkraken.gif rename to src/cap/models/front/33--0--Volkraken.gif diff --git a/src/cap/models/front/Plasmanta.gif b/src/cap/models/front/35--0--Plasmanta.gif similarity index 100% rename from src/cap/models/front/Plasmanta.gif rename to src/cap/models/front/35--0--Plasmanta.gif diff --git a/src/cap/models/front/Naviathan.gif b/src/cap/models/front/38--0--Naviathan.gif similarity index 100% rename from src/cap/models/front/Naviathan.gif rename to src/cap/models/front/38--0--Naviathan.gif diff --git a/src/cap/models/front/Crucibelle.gif b/src/cap/models/front/39--0--Crucibelle.gif similarity index 100% rename from src/cap/models/front/Crucibelle.gif rename to src/cap/models/front/39--0--Crucibelle.gif diff --git a/src/cap/models/front/Crucibelle--Mega.gif b/src/cap/models/front/39--420--Crucibelle--Mega.gif similarity index 100% rename from src/cap/models/front/Crucibelle--Mega.gif rename to src/cap/models/front/39--420--Crucibelle--Mega.gif diff --git a/src/cap/models/front/Pluffle.gif b/src/cap/models/front/40--0--Pluffle.gif similarity index 100% rename from src/cap/models/front/Pluffle.gif rename to src/cap/models/front/40--0--Pluffle.gif diff --git a/src/cap/models/front/Kerfluffle.gif b/src/cap/models/front/41--0--Kerfluffle.gif similarity index 100% rename from src/cap/models/front/Kerfluffle.gif rename to src/cap/models/front/41--0--Kerfluffle.gif diff --git a/src/cap/models/front/Pajantom.gif b/src/cap/models/front/42--0--Pajantom.gif similarity index 100% rename from src/cap/models/front/Pajantom.gif rename to src/cap/models/front/42--0--Pajantom.gif diff --git a/src/cap/models/front/Jumbao.gif b/src/cap/models/front/44--0--Jumbao.gif similarity index 100% rename from src/cap/models/front/Jumbao.gif rename to src/cap/models/front/44--0--Jumbao.gif diff --git a/src/cap/models/front/Caribolt.gif b/src/cap/models/front/47--0--Caribolt.gif similarity index 100% rename from src/cap/models/front/Caribolt.gif rename to src/cap/models/front/47--0--Caribolt.gif diff --git a/src/cap/models/front/Smogecko.gif b/src/cap/models/front/48--0--Smogecko.gif similarity index 100% rename from src/cap/models/front/Smogecko.gif rename to src/cap/models/front/48--0--Smogecko.gif diff --git a/src/cap/models/front/Smoguana.gif b/src/cap/models/front/49--0--Smoguana.gif similarity index 100% rename from src/cap/models/front/Smoguana.gif rename to src/cap/models/front/49--0--Smoguana.gif diff --git a/src/cap/models/front/Smokomodo.gif b/src/cap/models/front/50--0--Smokomodo.gif similarity index 100% rename from src/cap/models/front/Smokomodo.gif rename to src/cap/models/front/50--0--Smokomodo.gif diff --git a/src/cap/models/front/Snaelstrom.gif b/src/cap/models/front/53--0--Snaelstrom.gif similarity index 100% rename from src/cap/models/front/Snaelstrom.gif rename to src/cap/models/front/53--0--Snaelstrom.gif diff --git a/src/cap/models/front/Equilibra.gif b/src/cap/models/front/54--0--Equilibra.gif similarity index 100% rename from src/cap/models/front/Equilibra.gif rename to src/cap/models/front/54--0--Equilibra.gif diff --git a/src/cap/models/front/Pyroak.gif b/src/cap/models/front/6--0--Pyroak.gif similarity index 100% rename from src/cap/models/front/Pyroak.gif rename to src/cap/models/front/6--0--Pyroak.gif diff --git a/src/cap/models/front/Fidgit.gif b/src/cap/models/front/8--0--Fidgit.gif similarity index 100% rename from src/cap/models/front/Fidgit.gif rename to src/cap/models/front/8--0--Fidgit.gif diff --git a/src/cap/sprites/gen5/back-shiny/Tomohawk.gif b/src/cap/sprites/gen5/back-shiny/21--0--Tomohawk.gif similarity index 100% rename from src/cap/sprites/gen5/back-shiny/Tomohawk.gif rename to src/cap/sprites/gen5/back-shiny/21--0--Tomohawk.gif diff --git a/src/cap/sprites/gen5/back-shiny/Necturna.gif b/src/cap/sprites/gen5/back-shiny/23--0--Necturna.gif similarity index 100% rename from src/cap/sprites/gen5/back-shiny/Necturna.gif rename to src/cap/sprites/gen5/back-shiny/23--0--Necturna.gif diff --git a/src/cap/sprites/gen5/back-shiny/Mollux.gif b/src/cap/sprites/gen5/back-shiny/24--0--Mollux.gif similarity index 100% rename from src/cap/sprites/gen5/back-shiny/Mollux.gif rename to src/cap/sprites/gen5/back-shiny/24--0--Mollux.gif diff --git a/src/cap/sprites/gen5/back-shiny/Aurumoth.gif b/src/cap/sprites/gen5/back-shiny/27--0--Aurumoth.gif similarity index 100% rename from src/cap/sprites/gen5/back-shiny/Aurumoth.gif rename to src/cap/sprites/gen5/back-shiny/27--0--Aurumoth.gif diff --git a/src/cap/sprites/gen5/back-shiny/Malaconda.gif b/src/cap/sprites/gen5/back-shiny/29--0--Malaconda.gif similarity index 100% rename from src/cap/sprites/gen5/back-shiny/Malaconda.gif rename to src/cap/sprites/gen5/back-shiny/29--0--Malaconda.gif diff --git a/src/cap/sprites/gen5/back-shiny/Cawmodore.gif b/src/cap/sprites/gen5/back-shiny/31--0--Cawmodore.gif similarity index 100% rename from src/cap/sprites/gen5/back-shiny/Cawmodore.gif rename to src/cap/sprites/gen5/back-shiny/31--0--Cawmodore.gif diff --git a/src/cap/sprites/gen5/back-shiny/Volkraken.gif b/src/cap/sprites/gen5/back-shiny/33--0--Volkraken.gif similarity index 100% rename from src/cap/sprites/gen5/back-shiny/Volkraken.gif rename to src/cap/sprites/gen5/back-shiny/33--0--Volkraken.gif diff --git a/src/cap/sprites/gen5/back-shiny/Plasmanta.gif b/src/cap/sprites/gen5/back-shiny/35--0--Plasmanta.gif similarity index 100% rename from src/cap/sprites/gen5/back-shiny/Plasmanta.gif rename to src/cap/sprites/gen5/back-shiny/35--0--Plasmanta.gif diff --git a/src/cap/sprites/gen5/back/Tomohawk.gif b/src/cap/sprites/gen5/back/21--0--Tomohawk.gif similarity index 100% rename from src/cap/sprites/gen5/back/Tomohawk.gif rename to src/cap/sprites/gen5/back/21--0--Tomohawk.gif diff --git a/src/cap/sprites/gen5/back/Necturna.gif b/src/cap/sprites/gen5/back/23--0--Necturna.gif similarity index 100% rename from src/cap/sprites/gen5/back/Necturna.gif rename to src/cap/sprites/gen5/back/23--0--Necturna.gif diff --git a/src/cap/sprites/gen5/back/Mollux.gif b/src/cap/sprites/gen5/back/24--0--Mollux.gif similarity index 100% rename from src/cap/sprites/gen5/back/Mollux.gif rename to src/cap/sprites/gen5/back/24--0--Mollux.gif diff --git a/src/cap/sprites/gen5/back/Aurumoth.gif b/src/cap/sprites/gen5/back/27--0--Aurumoth.gif similarity index 100% rename from src/cap/sprites/gen5/back/Aurumoth.gif rename to src/cap/sprites/gen5/back/27--0--Aurumoth.gif diff --git a/src/cap/sprites/gen5/back/Malaconda.gif b/src/cap/sprites/gen5/back/29--0--Malaconda.gif similarity index 100% rename from src/cap/sprites/gen5/back/Malaconda.gif rename to src/cap/sprites/gen5/back/29--0--Malaconda.gif diff --git a/src/cap/sprites/gen5/back/Cawmodore.gif b/src/cap/sprites/gen5/back/31--0--Cawmodore.gif similarity index 100% rename from src/cap/sprites/gen5/back/Cawmodore.gif rename to src/cap/sprites/gen5/back/31--0--Cawmodore.gif diff --git a/src/cap/sprites/gen5/back/Volkraken.gif b/src/cap/sprites/gen5/back/33--0--Volkraken.gif similarity index 100% rename from src/cap/sprites/gen5/back/Volkraken.gif rename to src/cap/sprites/gen5/back/33--0--Volkraken.gif diff --git a/src/cap/sprites/gen5/back/Plasmanta.gif b/src/cap/sprites/gen5/back/35--0--Plasmanta.gif similarity index 100% rename from src/cap/sprites/gen5/back/Plasmanta.gif rename to src/cap/sprites/gen5/back/35--0--Plasmanta.gif diff --git a/src/cap/sprites/gen5/front-shiny/Tomohawk.gif b/src/cap/sprites/gen5/front-shiny/21--0--Tomohawk.gif similarity index 100% rename from src/cap/sprites/gen5/front-shiny/Tomohawk.gif rename to src/cap/sprites/gen5/front-shiny/21--0--Tomohawk.gif diff --git a/src/cap/sprites/gen5/front-shiny/Necturna.gif b/src/cap/sprites/gen5/front-shiny/23--0--Necturna.gif similarity index 100% rename from src/cap/sprites/gen5/front-shiny/Necturna.gif rename to src/cap/sprites/gen5/front-shiny/23--0--Necturna.gif diff --git a/src/cap/sprites/gen5/front-shiny/Mollux.gif b/src/cap/sprites/gen5/front-shiny/24--0--Mollux.gif similarity index 100% rename from src/cap/sprites/gen5/front-shiny/Mollux.gif rename to src/cap/sprites/gen5/front-shiny/24--0--Mollux.gif diff --git a/src/cap/sprites/gen5/front-shiny/Aurumoth.gif b/src/cap/sprites/gen5/front-shiny/27--0--Aurumoth.gif similarity index 100% rename from src/cap/sprites/gen5/front-shiny/Aurumoth.gif rename to src/cap/sprites/gen5/front-shiny/27--0--Aurumoth.gif diff --git a/src/cap/sprites/gen5/front-shiny/Malaconda.gif b/src/cap/sprites/gen5/front-shiny/29--0--Malaconda.gif similarity index 100% rename from src/cap/sprites/gen5/front-shiny/Malaconda.gif rename to src/cap/sprites/gen5/front-shiny/29--0--Malaconda.gif diff --git a/src/cap/sprites/gen5/front-shiny/Cawmodore.gif b/src/cap/sprites/gen5/front-shiny/31--0--Cawmodore.gif similarity index 100% rename from src/cap/sprites/gen5/front-shiny/Cawmodore.gif rename to src/cap/sprites/gen5/front-shiny/31--0--Cawmodore.gif diff --git a/src/cap/sprites/gen5/front-shiny/Volkraken.gif b/src/cap/sprites/gen5/front-shiny/33--0--Volkraken.gif similarity index 100% rename from src/cap/sprites/gen5/front-shiny/Volkraken.gif rename to src/cap/sprites/gen5/front-shiny/33--0--Volkraken.gif diff --git a/src/cap/sprites/gen5/front-shiny/Plasmanta.gif b/src/cap/sprites/gen5/front-shiny/35--0--Plasmanta.gif similarity index 100% rename from src/cap/sprites/gen5/front-shiny/Plasmanta.gif rename to src/cap/sprites/gen5/front-shiny/35--0--Plasmanta.gif diff --git a/src/cap/sprites/gen5/front/Tomohawk.gif b/src/cap/sprites/gen5/front/21--0--Tomohawk.gif similarity index 100% rename from src/cap/sprites/gen5/front/Tomohawk.gif rename to src/cap/sprites/gen5/front/21--0--Tomohawk.gif diff --git a/src/cap/sprites/gen5/front/Necturna.gif b/src/cap/sprites/gen5/front/23--0--Necturna.gif similarity index 100% rename from src/cap/sprites/gen5/front/Necturna.gif rename to src/cap/sprites/gen5/front/23--0--Necturna.gif diff --git a/src/cap/sprites/gen5/front/Mollux.gif b/src/cap/sprites/gen5/front/24--0--Mollux.gif similarity index 100% rename from src/cap/sprites/gen5/front/Mollux.gif rename to src/cap/sprites/gen5/front/24--0--Mollux.gif diff --git a/src/cap/sprites/gen5/front/Aurumoth.gif b/src/cap/sprites/gen5/front/27--0--Aurumoth.gif similarity index 100% rename from src/cap/sprites/gen5/front/Aurumoth.gif rename to src/cap/sprites/gen5/front/27--0--Aurumoth.gif diff --git a/src/cap/sprites/gen5/front/Malaconda.gif b/src/cap/sprites/gen5/front/29--0--Malaconda.gif similarity index 100% rename from src/cap/sprites/gen5/front/Malaconda.gif rename to src/cap/sprites/gen5/front/29--0--Malaconda.gif diff --git a/src/cap/sprites/gen5/front/Cawmodore.gif b/src/cap/sprites/gen5/front/31--0--Cawmodore.gif similarity index 100% rename from src/cap/sprites/gen5/front/Cawmodore.gif rename to src/cap/sprites/gen5/front/31--0--Cawmodore.gif diff --git a/src/cap/sprites/gen5/front/Volkraken.gif b/src/cap/sprites/gen5/front/33--0--Volkraken.gif similarity index 100% rename from src/cap/sprites/gen5/front/Volkraken.gif rename to src/cap/sprites/gen5/front/33--0--Volkraken.gif diff --git a/src/cap/sprites/gen5/front/Plasmanta.gif b/src/cap/sprites/gen5/front/35--0--Plasmanta.gif similarity index 100% rename from src/cap/sprites/gen5/front/Plasmanta.gif rename to src/cap/sprites/gen5/front/35--0--Plasmanta.gif