diff --git a/src/afd/sprites/back-cosmetic/0002--000--Syclant--Female.png b/src/afd/sprites/back-cosmetic/0002-000-Syclant-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0002--000--Syclant--Female.png
rename to src/afd/sprites/back-cosmetic/0002-000-Syclant-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0003--000--Revenankh--Female.png b/src/afd/sprites/back-cosmetic/0003-000-Revenankh-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0003--000--Revenankh--Female.png
rename to src/afd/sprites/back-cosmetic/0003-000-Revenankh-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0003--000--Venusaur--Female.png b/src/afd/sprites/back-cosmetic/0003-000-Venusaur-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0003--000--Venusaur--Female.png
rename to src/afd/sprites/back-cosmetic/0003-000-Venusaur-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0006--000--Pyroak--Female.png b/src/afd/sprites/back-cosmetic/0006-000-Pyroak-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0006--000--Pyroak--Female.png
rename to src/afd/sprites/back-cosmetic/0006-000-Pyroak-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0008--000--Fidgit--Female.png b/src/afd/sprites/back-cosmetic/0008-000-Fidgit-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0008--000--Fidgit--Female.png
rename to src/afd/sprites/back-cosmetic/0008-000-Fidgit-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0012--000--Butterfree--Female.png b/src/afd/sprites/back-cosmetic/0012-000-Butterfree-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0012--000--Butterfree--Female.png
rename to src/afd/sprites/back-cosmetic/0012-000-Butterfree-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0013--000--Arghonaut--Female.png b/src/afd/sprites/back-cosmetic/0013-000-Arghonaut-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0013--000--Arghonaut--Female.png
rename to src/afd/sprites/back-cosmetic/0013-000-Arghonaut-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0014--000--Kitsunoh--Female.png b/src/afd/sprites/back-cosmetic/0014-000-Kitsunoh-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0014--000--Kitsunoh--Female.png
rename to src/afd/sprites/back-cosmetic/0014-000-Kitsunoh-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0015--000--Cyclohm--Female.png b/src/afd/sprites/back-cosmetic/0015-000-Cyclohm-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0015--000--Cyclohm--Female.png
rename to src/afd/sprites/back-cosmetic/0015-000-Cyclohm-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0016--000--Colossoil--Female.png b/src/afd/sprites/back-cosmetic/0016-000-Colossoil-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0016--000--Colossoil--Female.png
rename to src/afd/sprites/back-cosmetic/0016-000-Colossoil-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0017--000--Krilowatt--Female.png b/src/afd/sprites/back-cosmetic/0017-000-Krilowatt-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0017--000--Krilowatt--Female.png
rename to src/afd/sprites/back-cosmetic/0017-000-Krilowatt-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0019--000--Rattata--Female.png b/src/afd/sprites/back-cosmetic/0019-000-Rattata-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0019--000--Rattata--Female.png
rename to src/afd/sprites/back-cosmetic/0019-000-Rattata-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0019--000--Voodoom--Female.png b/src/afd/sprites/back-cosmetic/0019-000-Voodoom-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0019--000--Voodoom--Female.png
rename to src/afd/sprites/back-cosmetic/0019-000-Voodoom-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0020--000--Raticate--Female.png b/src/afd/sprites/back-cosmetic/0020-000-Raticate-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0020--000--Raticate--Female.png
rename to src/afd/sprites/back-cosmetic/0020-000-Raticate-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0021--000--Tomohawk--Female.png b/src/afd/sprites/back-cosmetic/0021-000-Tomohawk-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0021--000--Tomohawk--Female.png
rename to src/afd/sprites/back-cosmetic/0021-000-Tomohawk-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0025--000--Pikachu--Female.png b/src/afd/sprites/back-cosmetic/0025-000-Pikachu-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0025--000--Pikachu--Female.png
rename to src/afd/sprites/back-cosmetic/0025-000-Pikachu-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0026--000--Raichu--Female.png b/src/afd/sprites/back-cosmetic/0026-000-Raichu-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0026--000--Raichu--Female.png
rename to src/afd/sprites/back-cosmetic/0026-000-Raichu-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0041--000--Zubat--Female.png b/src/afd/sprites/back-cosmetic/0041-000-Zubat-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0041--000--Zubat--Female.png
rename to src/afd/sprites/back-cosmetic/0041-000-Zubat-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0042--000--Golbat--Female.png b/src/afd/sprites/back-cosmetic/0042-000-Golbat-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0042--000--Golbat--Female.png
rename to src/afd/sprites/back-cosmetic/0042-000-Golbat-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0044--000--Gloom--Female.png b/src/afd/sprites/back-cosmetic/0044-000-Gloom-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0044--000--Gloom--Female.png
rename to src/afd/sprites/back-cosmetic/0044-000-Gloom-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0045--000--Vileplume--Female.png b/src/afd/sprites/back-cosmetic/0045-000-Vileplume-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0045--000--Vileplume--Female.png
rename to src/afd/sprites/back-cosmetic/0045-000-Vileplume-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0064--000--Kadabra--Female.png b/src/afd/sprites/back-cosmetic/0064-000-Kadabra-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0064--000--Kadabra--Female.png
rename to src/afd/sprites/back-cosmetic/0064-000-Kadabra-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0065--000--Alakazam--Female.png b/src/afd/sprites/back-cosmetic/0065-000-Alakazam-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0065--000--Alakazam--Female.png
rename to src/afd/sprites/back-cosmetic/0065-000-Alakazam-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0084--000--Doduo--Female.png b/src/afd/sprites/back-cosmetic/0084-000-Doduo-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0084--000--Doduo--Female.png
rename to src/afd/sprites/back-cosmetic/0084-000-Doduo-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0085--000--Dodrio--Female.png b/src/afd/sprites/back-cosmetic/0085-000-Dodrio-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0085--000--Dodrio--Female.png
rename to src/afd/sprites/back-cosmetic/0085-000-Dodrio-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0097--000--Hypno--Female.png b/src/afd/sprites/back-cosmetic/0097-000-Hypno-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0097--000--Hypno--Female.png
rename to src/afd/sprites/back-cosmetic/0097-000-Hypno-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0111--000--Rhyhorn--Female.png b/src/afd/sprites/back-cosmetic/0111-000-Rhyhorn-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0111--000--Rhyhorn--Female.png
rename to src/afd/sprites/back-cosmetic/0111-000-Rhyhorn-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0112--000--Rhydon--Female.png b/src/afd/sprites/back-cosmetic/0112-000-Rhydon-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0112--000--Rhydon--Female.png
rename to src/afd/sprites/back-cosmetic/0112-000-Rhydon-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0118--000--Goldeen--Female.png b/src/afd/sprites/back-cosmetic/0118-000-Goldeen-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0118--000--Goldeen--Female.png
rename to src/afd/sprites/back-cosmetic/0118-000-Goldeen-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0123--000--Scyther--Female.png b/src/afd/sprites/back-cosmetic/0123-000-Scyther-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0123--000--Scyther--Female.png
rename to src/afd/sprites/back-cosmetic/0123-000-Scyther-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0129--000--Magikarp--Female.png b/src/afd/sprites/back-cosmetic/0129-000-Magikarp-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0129--000--Magikarp--Female.png
rename to src/afd/sprites/back-cosmetic/0129-000-Magikarp-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0130--000--Gyarados--Female.png b/src/afd/sprites/back-cosmetic/0130-000-Gyarados-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0130--000--Gyarados--Female.png
rename to src/afd/sprites/back-cosmetic/0130-000-Gyarados-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0154--000--Meganium--Female.png b/src/afd/sprites/back-cosmetic/0154-000-Meganium-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0154--000--Meganium--Female.png
rename to src/afd/sprites/back-cosmetic/0154-000-Meganium-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0165--000--Ledyba--Female.png b/src/afd/sprites/back-cosmetic/0165-000-Ledyba-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0165--000--Ledyba--Female.png
rename to src/afd/sprites/back-cosmetic/0165-000-Ledyba-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0166--000--Ledian--Female.png b/src/afd/sprites/back-cosmetic/0166-000-Ledian-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0166--000--Ledian--Female.png
rename to src/afd/sprites/back-cosmetic/0166-000-Ledian-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0178--000--Xatu--Female.png b/src/afd/sprites/back-cosmetic/0178-000-Xatu-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0178--000--Xatu--Female.png
rename to src/afd/sprites/back-cosmetic/0178-000-Xatu-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0185--000--Sudowoodo--Female.png b/src/afd/sprites/back-cosmetic/0185-000-Sudowoodo-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0185--000--Sudowoodo--Female.png
rename to src/afd/sprites/back-cosmetic/0185-000-Sudowoodo-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0186--000--Politoed--Female.png b/src/afd/sprites/back-cosmetic/0186-000-Politoed-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0186--000--Politoed--Female.png
rename to src/afd/sprites/back-cosmetic/0186-000-Politoed-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0190--000--Aipom--Female.png b/src/afd/sprites/back-cosmetic/0190-000-Aipom-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0190--000--Aipom--Female.png
rename to src/afd/sprites/back-cosmetic/0190-000-Aipom-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0194--000--Wooper--Female.png b/src/afd/sprites/back-cosmetic/0194-000-Wooper-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0194--000--Wooper--Female.png
rename to src/afd/sprites/back-cosmetic/0194-000-Wooper-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0195--000--Quagsire--Female.png b/src/afd/sprites/back-cosmetic/0195-000-Quagsire-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0195--000--Quagsire--Female.png
rename to src/afd/sprites/back-cosmetic/0195-000-Quagsire-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0198--000--Murkrow--Female.png b/src/afd/sprites/back-cosmetic/0198-000-Murkrow-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0198--000--Murkrow--Female.png
rename to src/afd/sprites/back-cosmetic/0198-000-Murkrow-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0202--000--Wobbuffet--Female.png b/src/afd/sprites/back-cosmetic/0202-000-Wobbuffet-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0202--000--Wobbuffet--Female.png
rename to src/afd/sprites/back-cosmetic/0202-000-Wobbuffet-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0203--000--Girafarig--Female.png b/src/afd/sprites/back-cosmetic/0203-000-Girafarig-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0203--000--Girafarig--Female.png
rename to src/afd/sprites/back-cosmetic/0203-000-Girafarig-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0207--000--Gligar--Female.png b/src/afd/sprites/back-cosmetic/0207-000-Gligar-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0207--000--Gligar--Female.png
rename to src/afd/sprites/back-cosmetic/0207-000-Gligar-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0208--000--Steelix--Female.png b/src/afd/sprites/back-cosmetic/0208-000-Steelix-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0208--000--Steelix--Female.png
rename to src/afd/sprites/back-cosmetic/0208-000-Steelix-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0212--000--Scizor--Female.png b/src/afd/sprites/back-cosmetic/0212-000-Scizor-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0212--000--Scizor--Female.png
rename to src/afd/sprites/back-cosmetic/0212-000-Scizor-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0214--000--Heracross--Female.png b/src/afd/sprites/back-cosmetic/0214-000-Heracross-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0214--000--Heracross--Female.png
rename to src/afd/sprites/back-cosmetic/0214-000-Heracross-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0215--000--Sneasel--Female.png b/src/afd/sprites/back-cosmetic/0215-000-Sneasel-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0215--000--Sneasel--Female.png
rename to src/afd/sprites/back-cosmetic/0215-000-Sneasel-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0217--000--Ursaring--Female.png b/src/afd/sprites/back-cosmetic/0217-000-Ursaring-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0217--000--Ursaring--Female.png
rename to src/afd/sprites/back-cosmetic/0217-000-Ursaring-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0221--000--Piloswine--Female.png b/src/afd/sprites/back-cosmetic/0221-000-Piloswine-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0221--000--Piloswine--Female.png
rename to src/afd/sprites/back-cosmetic/0221-000-Piloswine-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0224--000--Octillery--Female.png b/src/afd/sprites/back-cosmetic/0224-000-Octillery-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0224--000--Octillery--Female.png
rename to src/afd/sprites/back-cosmetic/0224-000-Octillery-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0229--000--Houndoom--Female.png b/src/afd/sprites/back-cosmetic/0229-000-Houndoom-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0229--000--Houndoom--Female.png
rename to src/afd/sprites/back-cosmetic/0229-000-Houndoom-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0232--000--Donphan--Female.png b/src/afd/sprites/back-cosmetic/0232-000-Donphan-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0232--000--Donphan--Female.png
rename to src/afd/sprites/back-cosmetic/0232-000-Donphan-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0255--000--Torchic--Female.png b/src/afd/sprites/back-cosmetic/0255-000-Torchic-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0255--000--Torchic--Female.png
rename to src/afd/sprites/back-cosmetic/0255-000-Torchic-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0256--000--Combusken--Female.png b/src/afd/sprites/back-cosmetic/0256-000-Combusken-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0256--000--Combusken--Female.png
rename to src/afd/sprites/back-cosmetic/0256-000-Combusken-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0257--000--Blaziken--Female.png b/src/afd/sprites/back-cosmetic/0257-000-Blaziken-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0257--000--Blaziken--Female.png
rename to src/afd/sprites/back-cosmetic/0257-000-Blaziken-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0267--000--Beautifly--Female.png b/src/afd/sprites/back-cosmetic/0267-000-Beautifly-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0267--000--Beautifly--Female.png
rename to src/afd/sprites/back-cosmetic/0267-000-Beautifly-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0269--000--Dustox--Female.png b/src/afd/sprites/back-cosmetic/0269-000-Dustox-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0269--000--Dustox--Female.png
rename to src/afd/sprites/back-cosmetic/0269-000-Dustox-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0272--000--Ludicolo--Female.png b/src/afd/sprites/back-cosmetic/0272-000-Ludicolo-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0272--000--Ludicolo--Female.png
rename to src/afd/sprites/back-cosmetic/0272-000-Ludicolo-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0274--000--Nuzleaf--Female.png b/src/afd/sprites/back-cosmetic/0274-000-Nuzleaf-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0274--000--Nuzleaf--Female.png
rename to src/afd/sprites/back-cosmetic/0274-000-Nuzleaf-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0275--000--Shiftry--Female.png b/src/afd/sprites/back-cosmetic/0275-000-Shiftry-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0275--000--Shiftry--Female.png
rename to src/afd/sprites/back-cosmetic/0275-000-Shiftry-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0307--000--Meditite--Female.png b/src/afd/sprites/back-cosmetic/0307-000-Meditite-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0307--000--Meditite--Female.png
rename to src/afd/sprites/back-cosmetic/0307-000-Meditite-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0308--000--Medicham--Female.png b/src/afd/sprites/back-cosmetic/0308-000-Medicham-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0308--000--Medicham--Female.png
rename to src/afd/sprites/back-cosmetic/0308-000-Medicham-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0315--000--Roselia--Female.png b/src/afd/sprites/back-cosmetic/0315-000-Roselia-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0315--000--Roselia--Female.png
rename to src/afd/sprites/back-cosmetic/0315-000-Roselia-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0316--000--Gulpin--Female.png b/src/afd/sprites/back-cosmetic/0316-000-Gulpin-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0316--000--Gulpin--Female.png
rename to src/afd/sprites/back-cosmetic/0316-000-Gulpin-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0317--000--Swalot--Female.png b/src/afd/sprites/back-cosmetic/0317-000-Swalot-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0317--000--Swalot--Female.png
rename to src/afd/sprites/back-cosmetic/0317-000-Swalot-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0322--000--Numel--Female.png b/src/afd/sprites/back-cosmetic/0322-000-Numel-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0322--000--Numel--Female.png
rename to src/afd/sprites/back-cosmetic/0322-000-Numel-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0323--000--Camerupt--Female.png b/src/afd/sprites/back-cosmetic/0323-000-Camerupt-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0323--000--Camerupt--Female.png
rename to src/afd/sprites/back-cosmetic/0323-000-Camerupt-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0332--000--Cacturne--Female.png b/src/afd/sprites/back-cosmetic/0332-000-Cacturne-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0332--000--Cacturne--Female.png
rename to src/afd/sprites/back-cosmetic/0332-000-Cacturne-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0350--000--Milotic--Female.png b/src/afd/sprites/back-cosmetic/0350-000-Milotic-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0350--000--Milotic--Female.png
rename to src/afd/sprites/back-cosmetic/0350-000-Milotic-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0369--000--Relicanth--Female.png b/src/afd/sprites/back-cosmetic/0369-000-Relicanth-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0369--000--Relicanth--Female.png
rename to src/afd/sprites/back-cosmetic/0369-000-Relicanth-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0396--000--Starly--Female.png b/src/afd/sprites/back-cosmetic/0396-000-Starly-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0396--000--Starly--Female.png
rename to src/afd/sprites/back-cosmetic/0396-000-Starly-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0397--000--Staravia--Female.png b/src/afd/sprites/back-cosmetic/0397-000-Staravia-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0397--000--Staravia--Female.png
rename to src/afd/sprites/back-cosmetic/0397-000-Staravia-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0398--000--Staraptor--Female.png b/src/afd/sprites/back-cosmetic/0398-000-Staraptor-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0398--000--Staraptor--Female.png
rename to src/afd/sprites/back-cosmetic/0398-000-Staraptor-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0399--000--Bidoof--Female.png b/src/afd/sprites/back-cosmetic/0399-000-Bidoof-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0399--000--Bidoof--Female.png
rename to src/afd/sprites/back-cosmetic/0399-000-Bidoof-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0400--000--Bibarel--Female.png b/src/afd/sprites/back-cosmetic/0400-000-Bibarel-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0400--000--Bibarel--Female.png
rename to src/afd/sprites/back-cosmetic/0400-000-Bibarel-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0401--000--Kricketot--Female.png b/src/afd/sprites/back-cosmetic/0401-000-Kricketot-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0401--000--Kricketot--Female.png
rename to src/afd/sprites/back-cosmetic/0401-000-Kricketot-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0402--000--Kricketune--Female.png b/src/afd/sprites/back-cosmetic/0402-000-Kricketune-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0402--000--Kricketune--Female.png
rename to src/afd/sprites/back-cosmetic/0402-000-Kricketune-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0403--000--Shinx--Female.png b/src/afd/sprites/back-cosmetic/0403-000-Shinx-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0403--000--Shinx--Female.png
rename to src/afd/sprites/back-cosmetic/0403-000-Shinx-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0404--000--Luxio--Female.png b/src/afd/sprites/back-cosmetic/0404-000-Luxio-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0404--000--Luxio--Female.png
rename to src/afd/sprites/back-cosmetic/0404-000-Luxio-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0405--000--Luxray--Female.png b/src/afd/sprites/back-cosmetic/0405-000-Luxray-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0405--000--Luxray--Female.png
rename to src/afd/sprites/back-cosmetic/0405-000-Luxray-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0407--000--Roserade--Female.png b/src/afd/sprites/back-cosmetic/0407-000-Roserade-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0407--000--Roserade--Female.png
rename to src/afd/sprites/back-cosmetic/0407-000-Roserade-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0412--420--Burmy--Sandy.png b/src/afd/sprites/back-cosmetic/0412-420-Burmy-Sandy.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0412--420--Burmy--Sandy.png
rename to src/afd/sprites/back-cosmetic/0412-420-Burmy-Sandy.png
diff --git a/src/afd/sprites/back-cosmetic/0412--420--Burmy--Trash.png b/src/afd/sprites/back-cosmetic/0412-420-Burmy-Trash.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0412--420--Burmy--Trash.png
rename to src/afd/sprites/back-cosmetic/0412-420-Burmy-Trash.png
diff --git a/src/afd/sprites/back-cosmetic/0415--000--Combee--Female.png b/src/afd/sprites/back-cosmetic/0415-000-Combee-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0415--000--Combee--Female.png
rename to src/afd/sprites/back-cosmetic/0415-000-Combee-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0417--000--Pachirisu--Female.png b/src/afd/sprites/back-cosmetic/0417-000-Pachirisu-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0417--000--Pachirisu--Female.png
rename to src/afd/sprites/back-cosmetic/0417-000-Pachirisu-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0418--000--Buizel--Female.png b/src/afd/sprites/back-cosmetic/0418-000-Buizel-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0418--000--Buizel--Female.png
rename to src/afd/sprites/back-cosmetic/0418-000-Buizel-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0419--000--Floatzel--Female.png b/src/afd/sprites/back-cosmetic/0419-000-Floatzel-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0419--000--Floatzel--Female.png
rename to src/afd/sprites/back-cosmetic/0419-000-Floatzel-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0424--000--Ambipom--Female.png b/src/afd/sprites/back-cosmetic/0424-000-Ambipom-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0424--000--Ambipom--Female.png
rename to src/afd/sprites/back-cosmetic/0424-000-Ambipom-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0443--000--Gible--Female.png b/src/afd/sprites/back-cosmetic/0443-000-Gible-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0443--000--Gible--Female.png
rename to src/afd/sprites/back-cosmetic/0443-000-Gible-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0445--000--Garchomp--Female.png b/src/afd/sprites/back-cosmetic/0445-000-Garchomp-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0445--000--Garchomp--Female.png
rename to src/afd/sprites/back-cosmetic/0445-000-Garchomp-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0449--000--Hippopotas--Female.png b/src/afd/sprites/back-cosmetic/0449-000-Hippopotas-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0449--000--Hippopotas--Female.png
rename to src/afd/sprites/back-cosmetic/0449-000-Hippopotas-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0450--000--Hippowdon--Female.png b/src/afd/sprites/back-cosmetic/0450-000-Hippowdon-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0450--000--Hippowdon--Female.png
rename to src/afd/sprites/back-cosmetic/0450-000-Hippowdon-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0453--000--Croagunk--Female.png b/src/afd/sprites/back-cosmetic/0453-000-Croagunk-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0453--000--Croagunk--Female.png
rename to src/afd/sprites/back-cosmetic/0453-000-Croagunk-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0454--000--Toxicroak--Female.png b/src/afd/sprites/back-cosmetic/0454-000-Toxicroak-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0454--000--Toxicroak--Female.png
rename to src/afd/sprites/back-cosmetic/0454-000-Toxicroak-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0456--000--Finneon--Female.png b/src/afd/sprites/back-cosmetic/0456-000-Finneon-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0456--000--Finneon--Female.png
rename to src/afd/sprites/back-cosmetic/0456-000-Finneon-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0457--000--Lumineon--Female.png b/src/afd/sprites/back-cosmetic/0457-000-Lumineon-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0457--000--Lumineon--Female.png
rename to src/afd/sprites/back-cosmetic/0457-000-Lumineon-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0459--000--Snover--Female.png b/src/afd/sprites/back-cosmetic/0459-000-Snover-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0459--000--Snover--Female.png
rename to src/afd/sprites/back-cosmetic/0459-000-Snover-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0460--000--Abomasnow--Female.png b/src/afd/sprites/back-cosmetic/0460-000-Abomasnow-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0460--000--Abomasnow--Female.png
rename to src/afd/sprites/back-cosmetic/0460-000-Abomasnow-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0461--000--Weavile--Female.png b/src/afd/sprites/back-cosmetic/0461-000-Weavile-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0461--000--Weavile--Female.png
rename to src/afd/sprites/back-cosmetic/0461-000-Weavile-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0464--000--Rhyperior--Female.png b/src/afd/sprites/back-cosmetic/0464-000-Rhyperior-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0464--000--Rhyperior--Female.png
rename to src/afd/sprites/back-cosmetic/0464-000-Rhyperior-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0465--000--Tangrowth--Female.png b/src/afd/sprites/back-cosmetic/0465-000-Tangrowth-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0465--000--Tangrowth--Female.png
rename to src/afd/sprites/back-cosmetic/0465-000-Tangrowth-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0473--000--Mamoswine--Female.png b/src/afd/sprites/back-cosmetic/0473-000-Mamoswine-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0473--000--Mamoswine--Female.png
rename to src/afd/sprites/back-cosmetic/0473-000-Mamoswine-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0521--000--Unfezant--Female.png b/src/afd/sprites/back-cosmetic/0521-000-Unfezant-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0521--000--Unfezant--Female.png
rename to src/afd/sprites/back-cosmetic/0521-000-Unfezant-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0592--000--Frillish--Female.png b/src/afd/sprites/back-cosmetic/0592-000-Frillish-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0592--000--Frillish--Female.png
rename to src/afd/sprites/back-cosmetic/0592-000-Frillish-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0593--000--Jellicent--Female.png b/src/afd/sprites/back-cosmetic/0593-000-Jellicent-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0593--000--Jellicent--Female.png
rename to src/afd/sprites/back-cosmetic/0593-000-Jellicent-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0668--000--Pyroar--Female.png b/src/afd/sprites/back-cosmetic/0668-000-Pyroar-Female.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0668--000--Pyroar--Female.png
rename to src/afd/sprites/back-cosmetic/0668-000-Pyroar-Female.png
diff --git a/src/afd/sprites/back-cosmetic/0801--420--Magearna--Original.png b/src/afd/sprites/back-cosmetic/0801-420-Magearna-Original.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0801--420--Magearna--Original.png
rename to src/afd/sprites/back-cosmetic/0801-420-Magearna-Original.png
diff --git a/src/afd/sprites/back-cosmetic/0869--420--Alcremie--Caramel_Swirl.png b/src/afd/sprites/back-cosmetic/0869-420-Alcremie-Caramel_Swirl.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0869--420--Alcremie--Caramel_Swirl.png
rename to src/afd/sprites/back-cosmetic/0869-420-Alcremie-Caramel_Swirl.png
diff --git a/src/afd/sprites/back-cosmetic/0869--420--Alcremie--Lemon_Cream.png b/src/afd/sprites/back-cosmetic/0869-420-Alcremie-Lemon_Cream.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0869--420--Alcremie--Lemon_Cream.png
rename to src/afd/sprites/back-cosmetic/0869-420-Alcremie-Lemon_Cream.png
diff --git a/src/afd/sprites/back-cosmetic/0869--420--Alcremie--Matcha_Cream.png b/src/afd/sprites/back-cosmetic/0869-420-Alcremie-Matcha_Cream.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0869--420--Alcremie--Matcha_Cream.png
rename to src/afd/sprites/back-cosmetic/0869-420-Alcremie-Matcha_Cream.png
diff --git a/src/afd/sprites/back-cosmetic/0869--420--Alcremie--Mint_Cream.png b/src/afd/sprites/back-cosmetic/0869-420-Alcremie-Mint_Cream.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0869--420--Alcremie--Mint_Cream.png
rename to src/afd/sprites/back-cosmetic/0869-420-Alcremie-Mint_Cream.png
diff --git a/src/afd/sprites/back-cosmetic/0869--420--Alcremie--Rainbow_Swirl.png b/src/afd/sprites/back-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0869--420--Alcremie--Rainbow_Swirl.png
rename to src/afd/sprites/back-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png
diff --git a/src/afd/sprites/back-cosmetic/0869--420--Alcremie--Ruby_Cream.png b/src/afd/sprites/back-cosmetic/0869-420-Alcremie-Ruby_Cream.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0869--420--Alcremie--Ruby_Cream.png
rename to src/afd/sprites/back-cosmetic/0869-420-Alcremie-Ruby_Cream.png
diff --git a/src/afd/sprites/back-cosmetic/0869--420--Alcremie--Ruby_Swirl.png b/src/afd/sprites/back-cosmetic/0869-420-Alcremie-Ruby_Swirl.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0869--420--Alcremie--Ruby_Swirl.png
rename to src/afd/sprites/back-cosmetic/0869-420-Alcremie-Ruby_Swirl.png
diff --git a/src/afd/sprites/back-cosmetic/0869--420--Alcremie--Salted_Cream.png b/src/afd/sprites/back-cosmetic/0869-420-Alcremie-Salted_Cream.png
similarity index 100%
rename from src/afd/sprites/back-cosmetic/0869--420--Alcremie--Salted_Cream.png
rename to src/afd/sprites/back-cosmetic/0869-420-Alcremie-Salted_Cream.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0002--000--Syclant--Female.png b/src/afd/sprites/back-shiny-cosmetic/0002-000-Syclant-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0002--000--Syclant--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0002-000-Syclant-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0003--000--Revenankh--Female.png b/src/afd/sprites/back-shiny-cosmetic/0003-000-Revenankh-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0003--000--Revenankh--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0003-000-Revenankh-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0003--000--Venusaur--Female.png b/src/afd/sprites/back-shiny-cosmetic/0003-000-Venusaur-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0003--000--Venusaur--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0003-000-Venusaur-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0006--000--Pyroak--Female.png b/src/afd/sprites/back-shiny-cosmetic/0006-000-Pyroak-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0006--000--Pyroak--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0006-000-Pyroak-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0008--000--Fidgit--Female.png b/src/afd/sprites/back-shiny-cosmetic/0008-000-Fidgit-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0008--000--Fidgit--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0008-000-Fidgit-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0012--000--Butterfree--Female.png b/src/afd/sprites/back-shiny-cosmetic/0012-000-Butterfree-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0012--000--Butterfree--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0012-000-Butterfree-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0013--000--Arghonaut--Female.png b/src/afd/sprites/back-shiny-cosmetic/0013-000-Arghonaut-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0013--000--Arghonaut--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0013-000-Arghonaut-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0014--000--Kitsunoh--Female.png b/src/afd/sprites/back-shiny-cosmetic/0014-000-Kitsunoh-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0014--000--Kitsunoh--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0014-000-Kitsunoh-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0015--000--Cyclohm--Female.png b/src/afd/sprites/back-shiny-cosmetic/0015-000-Cyclohm-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0015--000--Cyclohm--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0015-000-Cyclohm-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0016--000--Colossoil--Female.png b/src/afd/sprites/back-shiny-cosmetic/0016-000-Colossoil-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0016--000--Colossoil--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0016-000-Colossoil-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0017--000--Krilowatt--Female.png b/src/afd/sprites/back-shiny-cosmetic/0017-000-Krilowatt-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0017--000--Krilowatt--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0017-000-Krilowatt-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0019--000--Rattata--Female.png b/src/afd/sprites/back-shiny-cosmetic/0019-000-Rattata-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0019--000--Rattata--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0019-000-Rattata-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0019--000--Voodoom--Female.png b/src/afd/sprites/back-shiny-cosmetic/0019-000-Voodoom-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0019--000--Voodoom--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0019-000-Voodoom-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0020--000--Raticate--Female.png b/src/afd/sprites/back-shiny-cosmetic/0020-000-Raticate-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0020--000--Raticate--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0020-000-Raticate-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0021--000--Tomohawk--Female.png b/src/afd/sprites/back-shiny-cosmetic/0021-000-Tomohawk-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0021--000--Tomohawk--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0021-000-Tomohawk-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0025--000--Pikachu--Female.png b/src/afd/sprites/back-shiny-cosmetic/0025-000-Pikachu-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0025--000--Pikachu--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0025-000-Pikachu-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0026--000--Raichu--Female.png b/src/afd/sprites/back-shiny-cosmetic/0026-000-Raichu-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0026--000--Raichu--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0026-000-Raichu-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0041--000--Zubat--Female.png b/src/afd/sprites/back-shiny-cosmetic/0041-000-Zubat-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0041--000--Zubat--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0041-000-Zubat-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0042--000--Golbat--Female.png b/src/afd/sprites/back-shiny-cosmetic/0042-000-Golbat-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0042--000--Golbat--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0042-000-Golbat-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0044--000--Gloom--Female.png b/src/afd/sprites/back-shiny-cosmetic/0044-000-Gloom-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0044--000--Gloom--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0044-000-Gloom-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0045--000--Vileplume--Female.png b/src/afd/sprites/back-shiny-cosmetic/0045-000-Vileplume-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0045--000--Vileplume--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0045-000-Vileplume-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0064--000--Kadabra--Female.png b/src/afd/sprites/back-shiny-cosmetic/0064-000-Kadabra-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0064--000--Kadabra--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0064-000-Kadabra-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0065--000--Alakazam--Female.png b/src/afd/sprites/back-shiny-cosmetic/0065-000-Alakazam-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0065--000--Alakazam--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0065-000-Alakazam-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0084--000--Doduo--Female.png b/src/afd/sprites/back-shiny-cosmetic/0084-000-Doduo-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0084--000--Doduo--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0084-000-Doduo-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0085--000--Dodrio--Female.png b/src/afd/sprites/back-shiny-cosmetic/0085-000-Dodrio-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0085--000--Dodrio--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0085-000-Dodrio-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0097--000--Hypno--Female.png b/src/afd/sprites/back-shiny-cosmetic/0097-000-Hypno-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0097--000--Hypno--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0097-000-Hypno-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0111--000--Rhyhorn--Female.png b/src/afd/sprites/back-shiny-cosmetic/0111-000-Rhyhorn-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0111--000--Rhyhorn--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0111-000-Rhyhorn-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0112--000--Rhydon--Female.png b/src/afd/sprites/back-shiny-cosmetic/0112-000-Rhydon-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0112--000--Rhydon--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0112-000-Rhydon-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0118--000--Goldeen--Female.png b/src/afd/sprites/back-shiny-cosmetic/0118-000-Goldeen-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0118--000--Goldeen--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0118-000-Goldeen-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0123--000--Scyther--Female.png b/src/afd/sprites/back-shiny-cosmetic/0123-000-Scyther-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0123--000--Scyther--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0123-000-Scyther-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0129--000--Magikarp--Female.png b/src/afd/sprites/back-shiny-cosmetic/0129-000-Magikarp-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0129--000--Magikarp--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0129-000-Magikarp-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0130--000--Gyarados--Female.png b/src/afd/sprites/back-shiny-cosmetic/0130-000-Gyarados-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0130--000--Gyarados--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0130-000-Gyarados-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0154--000--Meganium--Female.png b/src/afd/sprites/back-shiny-cosmetic/0154-000-Meganium-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0154--000--Meganium--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0154-000-Meganium-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0165--000--Ledyba--Female.png b/src/afd/sprites/back-shiny-cosmetic/0165-000-Ledyba-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0165--000--Ledyba--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0165-000-Ledyba-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0166--000--Ledian--Female.png b/src/afd/sprites/back-shiny-cosmetic/0166-000-Ledian-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0166--000--Ledian--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0166-000-Ledian-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0178--000--Xatu--Female.png b/src/afd/sprites/back-shiny-cosmetic/0178-000-Xatu-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0178--000--Xatu--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0178-000-Xatu-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0185--000--Sudowoodo--Female.png b/src/afd/sprites/back-shiny-cosmetic/0185-000-Sudowoodo-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0185--000--Sudowoodo--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0185-000-Sudowoodo-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0186--000--Politoed--Female.png b/src/afd/sprites/back-shiny-cosmetic/0186-000-Politoed-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0186--000--Politoed--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0186-000-Politoed-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0190--000--Aipom--Female.png b/src/afd/sprites/back-shiny-cosmetic/0190-000-Aipom-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0190--000--Aipom--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0190-000-Aipom-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0194--000--Wooper--Female.png b/src/afd/sprites/back-shiny-cosmetic/0194-000-Wooper-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0194--000--Wooper--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0194-000-Wooper-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0195--000--Quagsire--Female.png b/src/afd/sprites/back-shiny-cosmetic/0195-000-Quagsire-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0195--000--Quagsire--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0195-000-Quagsire-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0198--000--Murkrow--Female.png b/src/afd/sprites/back-shiny-cosmetic/0198-000-Murkrow-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0198--000--Murkrow--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0198-000-Murkrow-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0202--000--Wobbuffet--Female.png b/src/afd/sprites/back-shiny-cosmetic/0202-000-Wobbuffet-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0202--000--Wobbuffet--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0202-000-Wobbuffet-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0203--000--Girafarig--Female.png b/src/afd/sprites/back-shiny-cosmetic/0203-000-Girafarig-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0203--000--Girafarig--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0203-000-Girafarig-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0207--000--Gligar--Female.png b/src/afd/sprites/back-shiny-cosmetic/0207-000-Gligar-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0207--000--Gligar--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0207-000-Gligar-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0208--000--Steelix--Female.png b/src/afd/sprites/back-shiny-cosmetic/0208-000-Steelix-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0208--000--Steelix--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0208-000-Steelix-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0212--000--Scizor--Female.png b/src/afd/sprites/back-shiny-cosmetic/0212-000-Scizor-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0212--000--Scizor--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0212-000-Scizor-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0214--000--Heracross--Female.png b/src/afd/sprites/back-shiny-cosmetic/0214-000-Heracross-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0214--000--Heracross--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0214-000-Heracross-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0215--000--Sneasel--Female.png b/src/afd/sprites/back-shiny-cosmetic/0215-000-Sneasel-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0215--000--Sneasel--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0215-000-Sneasel-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0217--000--Ursaring--Female.png b/src/afd/sprites/back-shiny-cosmetic/0217-000-Ursaring-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0217--000--Ursaring--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0217-000-Ursaring-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0221--000--Piloswine--Female.png b/src/afd/sprites/back-shiny-cosmetic/0221-000-Piloswine-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0221--000--Piloswine--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0221-000-Piloswine-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0224--000--Octillery--Female.png b/src/afd/sprites/back-shiny-cosmetic/0224-000-Octillery-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0224--000--Octillery--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0224-000-Octillery-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0229--000--Houndoom--Female.png b/src/afd/sprites/back-shiny-cosmetic/0229-000-Houndoom-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0229--000--Houndoom--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0229-000-Houndoom-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0232--000--Donphan--Female.png b/src/afd/sprites/back-shiny-cosmetic/0232-000-Donphan-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0232--000--Donphan--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0232-000-Donphan-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0255--000--Torchic--Female.png b/src/afd/sprites/back-shiny-cosmetic/0255-000-Torchic-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0255--000--Torchic--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0255-000-Torchic-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0256--000--Combusken--Female.png b/src/afd/sprites/back-shiny-cosmetic/0256-000-Combusken-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0256--000--Combusken--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0256-000-Combusken-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0257--000--Blaziken--Female.png b/src/afd/sprites/back-shiny-cosmetic/0257-000-Blaziken-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0257--000--Blaziken--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0257-000-Blaziken-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0267--000--Beautifly--Female.png b/src/afd/sprites/back-shiny-cosmetic/0267-000-Beautifly-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0267--000--Beautifly--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0267-000-Beautifly-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0269--000--Dustox--Female.png b/src/afd/sprites/back-shiny-cosmetic/0269-000-Dustox-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0269--000--Dustox--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0269-000-Dustox-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0272--000--Ludicolo--Female.png b/src/afd/sprites/back-shiny-cosmetic/0272-000-Ludicolo-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0272--000--Ludicolo--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0272-000-Ludicolo-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0274--000--Nuzleaf--Female.png b/src/afd/sprites/back-shiny-cosmetic/0274-000-Nuzleaf-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0274--000--Nuzleaf--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0274-000-Nuzleaf-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0275--000--Shiftry--Female.png b/src/afd/sprites/back-shiny-cosmetic/0275-000-Shiftry-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0275--000--Shiftry--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0275-000-Shiftry-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0307--000--Meditite--Female.png b/src/afd/sprites/back-shiny-cosmetic/0307-000-Meditite-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0307--000--Meditite--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0307-000-Meditite-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0308--000--Medicham--Female.png b/src/afd/sprites/back-shiny-cosmetic/0308-000-Medicham-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0308--000--Medicham--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0308-000-Medicham-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0315--000--Roselia--Female.png b/src/afd/sprites/back-shiny-cosmetic/0315-000-Roselia-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0315--000--Roselia--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0315-000-Roselia-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0316--000--Gulpin--Female.png b/src/afd/sprites/back-shiny-cosmetic/0316-000-Gulpin-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0316--000--Gulpin--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0316-000-Gulpin-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0317--000--Swalot--Female.png b/src/afd/sprites/back-shiny-cosmetic/0317-000-Swalot-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0317--000--Swalot--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0317-000-Swalot-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0322--000--Numel--Female.png b/src/afd/sprites/back-shiny-cosmetic/0322-000-Numel-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0322--000--Numel--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0322-000-Numel-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0323--000--Camerupt--Female.png b/src/afd/sprites/back-shiny-cosmetic/0323-000-Camerupt-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0323--000--Camerupt--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0323-000-Camerupt-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0332--000--Cacturne--Female.png b/src/afd/sprites/back-shiny-cosmetic/0332-000-Cacturne-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0332--000--Cacturne--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0332-000-Cacturne-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0350--000--Milotic--Female.png b/src/afd/sprites/back-shiny-cosmetic/0350-000-Milotic-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0350--000--Milotic--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0350-000-Milotic-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0369--000--Relicanth--Female.png b/src/afd/sprites/back-shiny-cosmetic/0369-000-Relicanth-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0369--000--Relicanth--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0369-000-Relicanth-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0396--000--Starly--Female.png b/src/afd/sprites/back-shiny-cosmetic/0396-000-Starly-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0396--000--Starly--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0396-000-Starly-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0397--000--Staravia--Female.png b/src/afd/sprites/back-shiny-cosmetic/0397-000-Staravia-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0397--000--Staravia--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0397-000-Staravia-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0398--000--Staraptor--Female.png b/src/afd/sprites/back-shiny-cosmetic/0398-000-Staraptor-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0398--000--Staraptor--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0398-000-Staraptor-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0399--000--Bidoof--Female.png b/src/afd/sprites/back-shiny-cosmetic/0399-000-Bidoof-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0399--000--Bidoof--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0399-000-Bidoof-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0400--000--Bibarel--Female.png b/src/afd/sprites/back-shiny-cosmetic/0400-000-Bibarel-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0400--000--Bibarel--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0400-000-Bibarel-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0401--000--Kricketot--Female.png b/src/afd/sprites/back-shiny-cosmetic/0401-000-Kricketot-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0401--000--Kricketot--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0401-000-Kricketot-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0402--000--Kricketune--Female.png b/src/afd/sprites/back-shiny-cosmetic/0402-000-Kricketune-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0402--000--Kricketune--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0402-000-Kricketune-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0403--000--Shinx--Female.png b/src/afd/sprites/back-shiny-cosmetic/0403-000-Shinx-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0403--000--Shinx--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0403-000-Shinx-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0404--000--Luxio--Female.png b/src/afd/sprites/back-shiny-cosmetic/0404-000-Luxio-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0404--000--Luxio--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0404-000-Luxio-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0405--000--Luxray--Female.png b/src/afd/sprites/back-shiny-cosmetic/0405-000-Luxray-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0405--000--Luxray--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0405-000-Luxray-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0407--000--Roserade--Female.png b/src/afd/sprites/back-shiny-cosmetic/0407-000-Roserade-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0407--000--Roserade--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0407-000-Roserade-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0412--420--Burmy--Sandy.png b/src/afd/sprites/back-shiny-cosmetic/0412-420-Burmy-Sandy.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0412--420--Burmy--Sandy.png
rename to src/afd/sprites/back-shiny-cosmetic/0412-420-Burmy-Sandy.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0412--420--Burmy--Trash.png b/src/afd/sprites/back-shiny-cosmetic/0412-420-Burmy-Trash.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0412--420--Burmy--Trash.png
rename to src/afd/sprites/back-shiny-cosmetic/0412-420-Burmy-Trash.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0415--000--Combee--Female.png b/src/afd/sprites/back-shiny-cosmetic/0415-000-Combee-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0415--000--Combee--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0415-000-Combee-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0417--000--Pachirisu--Female.png b/src/afd/sprites/back-shiny-cosmetic/0417-000-Pachirisu-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0417--000--Pachirisu--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0417-000-Pachirisu-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0418--000--Buizel--Female.png b/src/afd/sprites/back-shiny-cosmetic/0418-000-Buizel-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0418--000--Buizel--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0418-000-Buizel-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0419--000--Floatzel--Female.png b/src/afd/sprites/back-shiny-cosmetic/0419-000-Floatzel-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0419--000--Floatzel--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0419-000-Floatzel-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0424--000--Ambipom--Female.png b/src/afd/sprites/back-shiny-cosmetic/0424-000-Ambipom-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0424--000--Ambipom--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0424-000-Ambipom-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0443--000--Gible--Female.png b/src/afd/sprites/back-shiny-cosmetic/0443-000-Gible-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0443--000--Gible--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0443-000-Gible-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0445--000--Garchomp--Female.png b/src/afd/sprites/back-shiny-cosmetic/0445-000-Garchomp-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0445--000--Garchomp--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0445-000-Garchomp-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0449--000--Hippopotas--Female.png b/src/afd/sprites/back-shiny-cosmetic/0449-000-Hippopotas-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0449--000--Hippopotas--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0449-000-Hippopotas-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0450--000--Hippowdon--Female.png b/src/afd/sprites/back-shiny-cosmetic/0450-000-Hippowdon-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0450--000--Hippowdon--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0450-000-Hippowdon-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0453--000--Croagunk--Female.png b/src/afd/sprites/back-shiny-cosmetic/0453-000-Croagunk-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0453--000--Croagunk--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0453-000-Croagunk-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0454--000--Toxicroak--Female.png b/src/afd/sprites/back-shiny-cosmetic/0454-000-Toxicroak-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0454--000--Toxicroak--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0454-000-Toxicroak-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0456--000--Finneon--Female.png b/src/afd/sprites/back-shiny-cosmetic/0456-000-Finneon-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0456--000--Finneon--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0456-000-Finneon-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0457--000--Lumineon--Female.png b/src/afd/sprites/back-shiny-cosmetic/0457-000-Lumineon-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0457--000--Lumineon--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0457-000-Lumineon-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0459--000--Snover--Female.png b/src/afd/sprites/back-shiny-cosmetic/0459-000-Snover-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0459--000--Snover--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0459-000-Snover-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0460--000--Abomasnow--Female.png b/src/afd/sprites/back-shiny-cosmetic/0460-000-Abomasnow-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0460--000--Abomasnow--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0460-000-Abomasnow-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0461--000--Weavile--Female.png b/src/afd/sprites/back-shiny-cosmetic/0461-000-Weavile-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0461--000--Weavile--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0461-000-Weavile-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0464--000--Rhyperior--Female.png b/src/afd/sprites/back-shiny-cosmetic/0464-000-Rhyperior-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0464--000--Rhyperior--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0464-000-Rhyperior-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0465--000--Tangrowth--Female.png b/src/afd/sprites/back-shiny-cosmetic/0465-000-Tangrowth-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0465--000--Tangrowth--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0465-000-Tangrowth-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0473--000--Mamoswine--Female.png b/src/afd/sprites/back-shiny-cosmetic/0473-000-Mamoswine-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0473--000--Mamoswine--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0473-000-Mamoswine-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0521--000--Unfezant--Female.png b/src/afd/sprites/back-shiny-cosmetic/0521-000-Unfezant-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0521--000--Unfezant--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0521-000-Unfezant-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0592--000--Frillish--Female.png b/src/afd/sprites/back-shiny-cosmetic/0592-000-Frillish-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0592--000--Frillish--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0592-000-Frillish-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0593--000--Jellicent--Female.png b/src/afd/sprites/back-shiny-cosmetic/0593-000-Jellicent-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0593--000--Jellicent--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0593-000-Jellicent-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0668--000--Pyroar--Female.png b/src/afd/sprites/back-shiny-cosmetic/0668-000-Pyroar-Female.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0668--000--Pyroar--Female.png
rename to src/afd/sprites/back-shiny-cosmetic/0668-000-Pyroar-Female.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0801--420--Magearna--Original.png b/src/afd/sprites/back-shiny-cosmetic/0801-420-Magearna-Original.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0801--420--Magearna--Original.png
rename to src/afd/sprites/back-shiny-cosmetic/0801-420-Magearna-Original.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Caramel_Swirl.png b/src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Caramel_Swirl.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Caramel_Swirl.png
rename to src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Caramel_Swirl.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Lemon_Cream.png b/src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Lemon_Cream.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Lemon_Cream.png
rename to src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Lemon_Cream.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Matcha_Cream.png b/src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Matcha_Cream.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Matcha_Cream.png
rename to src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Matcha_Cream.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Mint_Cream.png b/src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Mint_Cream.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Mint_Cream.png
rename to src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Mint_Cream.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Rainbow_Swirl.png b/src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Rainbow_Swirl.png
rename to src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Ruby_Cream.png b/src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Ruby_Cream.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Ruby_Cream.png
rename to src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Ruby_Cream.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Ruby_Swirl.png b/src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Ruby_Swirl.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Ruby_Swirl.png
rename to src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Ruby_Swirl.png
diff --git a/src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Salted_Cream.png b/src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Salted_Cream.png
similarity index 100%
rename from src/afd/sprites/back-shiny-cosmetic/0869--420--Alcremie--Salted_Cream.png
rename to src/afd/sprites/back-shiny-cosmetic/0869-420-Alcremie-Salted_Cream.png
diff --git a/src/afd/sprites/back-shiny/0000--000--Missingno..png b/src/afd/sprites/back-shiny/0000-000-Missingno..png
similarity index 100%
rename from src/afd/sprites/back-shiny/0000--000--Missingno..png
rename to src/afd/sprites/back-shiny/0000-000-Missingno..png
diff --git a/src/afd/sprites/back-shiny/0001--000--Bulbasaur.png b/src/afd/sprites/back-shiny/0001-000-Bulbasaur.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0001--000--Bulbasaur.png
rename to src/afd/sprites/back-shiny/0001-000-Bulbasaur.png
diff --git a/src/afd/sprites/back-shiny/0002--000--Ivysaur.png b/src/afd/sprites/back-shiny/0002-000-Ivysaur.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0002--000--Ivysaur.png
rename to src/afd/sprites/back-shiny/0002-000-Ivysaur.png
diff --git a/src/afd/sprites/back-shiny/0002--000--Syclant.png b/src/afd/sprites/back-shiny/0002-000-Syclant.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0002--000--Syclant.png
rename to src/afd/sprites/back-shiny/0002-000-Syclant.png
diff --git a/src/afd/sprites/back-shiny/0003--000--Revenankh.png b/src/afd/sprites/back-shiny/0003-000-Revenankh.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0003--000--Revenankh.png
rename to src/afd/sprites/back-shiny/0003-000-Revenankh.png
diff --git a/src/afd/sprites/back-shiny/0003--000--Venusaur.png b/src/afd/sprites/back-shiny/0003-000-Venusaur.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0003--000--Venusaur.png
rename to src/afd/sprites/back-shiny/0003-000-Venusaur.png
diff --git a/src/afd/sprites/back-shiny/0003--420--Venusaur--Mega.png b/src/afd/sprites/back-shiny/0003-420-Venusaur-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0003--420--Venusaur--Mega.png
rename to src/afd/sprites/back-shiny/0003-420-Venusaur-Mega.png
diff --git a/src/afd/sprites/back-shiny/0004--000--Charmander.png b/src/afd/sprites/back-shiny/0004-000-Charmander.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0004--000--Charmander.png
rename to src/afd/sprites/back-shiny/0004-000-Charmander.png
diff --git a/src/afd/sprites/back-shiny/0005--000--Charmeleon.png b/src/afd/sprites/back-shiny/0005-000-Charmeleon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0005--000--Charmeleon.png
rename to src/afd/sprites/back-shiny/0005-000-Charmeleon.png
diff --git a/src/afd/sprites/back-shiny/0006--000--Charizard.png b/src/afd/sprites/back-shiny/0006-000-Charizard.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0006--000--Charizard.png
rename to src/afd/sprites/back-shiny/0006-000-Charizard.png
diff --git a/src/afd/sprites/back-shiny/0006--000--Pyroak.png b/src/afd/sprites/back-shiny/0006-000-Pyroak.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0006--000--Pyroak.png
rename to src/afd/sprites/back-shiny/0006-000-Pyroak.png
diff --git a/src/afd/sprites/back-shiny/0006--420--Charizard--Gmax.png b/src/afd/sprites/back-shiny/0006-420-Charizard-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0006--420--Charizard--Gmax.png
rename to src/afd/sprites/back-shiny/0006-420-Charizard-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0006--420--Charizard--Mega-X.png b/src/afd/sprites/back-shiny/0006-420-Charizard-Mega~X.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0006--420--Charizard--Mega-X.png
rename to src/afd/sprites/back-shiny/0006-420-Charizard-Mega~X.png
diff --git a/src/afd/sprites/back-shiny/0006--420--Charizard--Mega-Y.png b/src/afd/sprites/back-shiny/0006-420-Charizard-Mega~Y.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0006--420--Charizard--Mega-Y.png
rename to src/afd/sprites/back-shiny/0006-420-Charizard-Mega~Y.png
diff --git a/src/afd/sprites/back-shiny/0007--000--Squirtle.png b/src/afd/sprites/back-shiny/0007-000-Squirtle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0007--000--Squirtle.png
rename to src/afd/sprites/back-shiny/0007-000-Squirtle.png
diff --git a/src/afd/sprites/back-shiny/0008--000--Fidgit.png b/src/afd/sprites/back-shiny/0008-000-Fidgit.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0008--000--Fidgit.png
rename to src/afd/sprites/back-shiny/0008-000-Fidgit.png
diff --git a/src/afd/sprites/back-shiny/0008--000--Wartortle.png b/src/afd/sprites/back-shiny/0008-000-Wartortle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0008--000--Wartortle.png
rename to src/afd/sprites/back-shiny/0008-000-Wartortle.png
diff --git a/src/afd/sprites/back-shiny/0009--000--Blastoise.png b/src/afd/sprites/back-shiny/0009-000-Blastoise.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0009--000--Blastoise.png
rename to src/afd/sprites/back-shiny/0009-000-Blastoise.png
diff --git a/src/afd/sprites/back-shiny/0009--420--Blastoise--Mega.png b/src/afd/sprites/back-shiny/0009-420-Blastoise-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0009--420--Blastoise--Mega.png
rename to src/afd/sprites/back-shiny/0009-420-Blastoise-Mega.png
diff --git a/src/afd/sprites/back-shiny/0010--000--Caterpie.png b/src/afd/sprites/back-shiny/0010-000-Caterpie.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0010--000--Caterpie.png
rename to src/afd/sprites/back-shiny/0010-000-Caterpie.png
diff --git a/src/afd/sprites/back-shiny/0011--000--Metapod.png b/src/afd/sprites/back-shiny/0011-000-Metapod.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0011--000--Metapod.png
rename to src/afd/sprites/back-shiny/0011-000-Metapod.png
diff --git a/src/afd/sprites/back-shiny/0011--000--Stratagem.png b/src/afd/sprites/back-shiny/0011-000-Stratagem.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0011--000--Stratagem.png
rename to src/afd/sprites/back-shiny/0011-000-Stratagem.png
diff --git a/src/afd/sprites/back-shiny/0012--000--Butterfree.png b/src/afd/sprites/back-shiny/0012-000-Butterfree.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0012--000--Butterfree.png
rename to src/afd/sprites/back-shiny/0012-000-Butterfree.png
diff --git a/src/afd/sprites/back-shiny/0012--420--Butterfree--Gmax.png b/src/afd/sprites/back-shiny/0012-420-Butterfree-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0012--420--Butterfree--Gmax.png
rename to src/afd/sprites/back-shiny/0012-420-Butterfree-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0013--000--Arghonaut.png b/src/afd/sprites/back-shiny/0013-000-Arghonaut.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0013--000--Arghonaut.png
rename to src/afd/sprites/back-shiny/0013-000-Arghonaut.png
diff --git a/src/afd/sprites/back-shiny/0013--000--Weedle.png b/src/afd/sprites/back-shiny/0013-000-Weedle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0013--000--Weedle.png
rename to src/afd/sprites/back-shiny/0013-000-Weedle.png
diff --git a/src/afd/sprites/back-shiny/0014--000--Kakuna.png b/src/afd/sprites/back-shiny/0014-000-Kakuna.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0014--000--Kakuna.png
rename to src/afd/sprites/back-shiny/0014-000-Kakuna.png
diff --git a/src/afd/sprites/back-shiny/0014--000--Kitsunoh.png b/src/afd/sprites/back-shiny/0014-000-Kitsunoh.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0014--000--Kitsunoh.png
rename to src/afd/sprites/back-shiny/0014-000-Kitsunoh.png
diff --git a/src/afd/sprites/back-shiny/0015--000--Beedrill.png b/src/afd/sprites/back-shiny/0015-000-Beedrill.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0015--000--Beedrill.png
rename to src/afd/sprites/back-shiny/0015-000-Beedrill.png
diff --git a/src/afd/sprites/back-shiny/0015--000--Cyclohm.png b/src/afd/sprites/back-shiny/0015-000-Cyclohm.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0015--000--Cyclohm.png
rename to src/afd/sprites/back-shiny/0015-000-Cyclohm.png
diff --git a/src/afd/sprites/back-shiny/0015--420--Beedrill--Mega.png b/src/afd/sprites/back-shiny/0015-420-Beedrill-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0015--420--Beedrill--Mega.png
rename to src/afd/sprites/back-shiny/0015-420-Beedrill-Mega.png
diff --git a/src/afd/sprites/back-shiny/0016--000--Colossoil.png b/src/afd/sprites/back-shiny/0016-000-Colossoil.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0016--000--Colossoil.png
rename to src/afd/sprites/back-shiny/0016-000-Colossoil.png
diff --git a/src/afd/sprites/back-shiny/0016--000--Pidgey.png b/src/afd/sprites/back-shiny/0016-000-Pidgey.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0016--000--Pidgey.png
rename to src/afd/sprites/back-shiny/0016-000-Pidgey.png
diff --git a/src/afd/sprites/back-shiny/0017--000--Krilowatt.png b/src/afd/sprites/back-shiny/0017-000-Krilowatt.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0017--000--Krilowatt.png
rename to src/afd/sprites/back-shiny/0017-000-Krilowatt.png
diff --git a/src/afd/sprites/back-shiny/0017--000--Pidgeotto.png b/src/afd/sprites/back-shiny/0017-000-Pidgeotto.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0017--000--Pidgeotto.png
rename to src/afd/sprites/back-shiny/0017-000-Pidgeotto.png
diff --git a/src/afd/sprites/back-shiny/0018--000--Pidgeot.png b/src/afd/sprites/back-shiny/0018-000-Pidgeot.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0018--000--Pidgeot.png
rename to src/afd/sprites/back-shiny/0018-000-Pidgeot.png
diff --git a/src/afd/sprites/back-shiny/0018--420--Pidgeot--Mega.png b/src/afd/sprites/back-shiny/0018-420-Pidgeot-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0018--420--Pidgeot--Mega.png
rename to src/afd/sprites/back-shiny/0018-420-Pidgeot-Mega.png
diff --git a/src/afd/sprites/back-shiny/0019--000--Rattata.png b/src/afd/sprites/back-shiny/0019-000-Rattata.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0019--000--Rattata.png
rename to src/afd/sprites/back-shiny/0019-000-Rattata.png
diff --git a/src/afd/sprites/back-shiny/0019--000--Voodoom.png b/src/afd/sprites/back-shiny/0019-000-Voodoom.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0019--000--Voodoom.png
rename to src/afd/sprites/back-shiny/0019-000-Voodoom.png
diff --git a/src/afd/sprites/back-shiny/0019--420--Rattata--Alola.png b/src/afd/sprites/back-shiny/0019-420-Rattata-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0019--420--Rattata--Alola.png
rename to src/afd/sprites/back-shiny/0019-420-Rattata-Alola.png
diff --git a/src/afd/sprites/back-shiny/0020--000--Raticate.png b/src/afd/sprites/back-shiny/0020-000-Raticate.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0020--000--Raticate.png
rename to src/afd/sprites/back-shiny/0020-000-Raticate.png
diff --git a/src/afd/sprites/back-shiny/0020--420--Raticate--Alola.png b/src/afd/sprites/back-shiny/0020-420-Raticate-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0020--420--Raticate--Alola.png
rename to src/afd/sprites/back-shiny/0020-420-Raticate-Alola.png
diff --git a/src/afd/sprites/back-shiny/0021--000--Spearow.png b/src/afd/sprites/back-shiny/0021-000-Spearow.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0021--000--Spearow.png
rename to src/afd/sprites/back-shiny/0021-000-Spearow.png
diff --git a/src/afd/sprites/back-shiny/0021--000--Tomohawk.png b/src/afd/sprites/back-shiny/0021-000-Tomohawk.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0021--000--Tomohawk.png
rename to src/afd/sprites/back-shiny/0021-000-Tomohawk.png
diff --git a/src/afd/sprites/back-shiny/0022--000--Fearow.png b/src/afd/sprites/back-shiny/0022-000-Fearow.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0022--000--Fearow.png
rename to src/afd/sprites/back-shiny/0022-000-Fearow.png
diff --git a/src/afd/sprites/back-shiny/0023--000--Ekans.png b/src/afd/sprites/back-shiny/0023-000-Ekans.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0023--000--Ekans.png
rename to src/afd/sprites/back-shiny/0023-000-Ekans.png
diff --git a/src/afd/sprites/back-shiny/0023--000--Necturna.png b/src/afd/sprites/back-shiny/0023-000-Necturna.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0023--000--Necturna.png
rename to src/afd/sprites/back-shiny/0023-000-Necturna.png
diff --git a/src/afd/sprites/back-shiny/0024--000--Arbok.png b/src/afd/sprites/back-shiny/0024-000-Arbok.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0024--000--Arbok.png
rename to src/afd/sprites/back-shiny/0024-000-Arbok.png
diff --git a/src/afd/sprites/back-shiny/0024--000--Mollux.png b/src/afd/sprites/back-shiny/0024-000-Mollux.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0024--000--Mollux.png
rename to src/afd/sprites/back-shiny/0024-000-Mollux.png
diff --git a/src/afd/sprites/back-shiny/0025--000--Pikachu.png b/src/afd/sprites/back-shiny/0025-000-Pikachu.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--000--Pikachu.png
rename to src/afd/sprites/back-shiny/0025-000-Pikachu.png
diff --git a/src/afd/sprites/back-shiny/0025--420--Pikachu--Alola.png b/src/afd/sprites/back-shiny/0025-420-Pikachu-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--420--Pikachu--Alola.png
rename to src/afd/sprites/back-shiny/0025-420-Pikachu-Alola.png
diff --git a/src/afd/sprites/back-shiny/0025--420--Pikachu--Belle.png b/src/afd/sprites/back-shiny/0025-420-Pikachu-Belle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--420--Pikachu--Belle.png
rename to src/afd/sprites/back-shiny/0025-420-Pikachu-Belle.png
diff --git a/src/afd/sprites/back-shiny/0025--420--Pikachu--Gmax.png b/src/afd/sprites/back-shiny/0025-420-Pikachu-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--420--Pikachu--Gmax.png
rename to src/afd/sprites/back-shiny/0025-420-Pikachu-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0025--420--Pikachu--Hoenn.png b/src/afd/sprites/back-shiny/0025-420-Pikachu-Hoenn.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--420--Pikachu--Hoenn.png
rename to src/afd/sprites/back-shiny/0025-420-Pikachu-Hoenn.png
diff --git a/src/afd/sprites/back-shiny/0025--420--Pikachu--Kalos.png b/src/afd/sprites/back-shiny/0025-420-Pikachu-Kalos.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--420--Pikachu--Kalos.png
rename to src/afd/sprites/back-shiny/0025-420-Pikachu-Kalos.png
diff --git a/src/afd/sprites/back-shiny/0025--420--Pikachu--Libre.png b/src/afd/sprites/back-shiny/0025-420-Pikachu-Libre.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--420--Pikachu--Libre.png
rename to src/afd/sprites/back-shiny/0025-420-Pikachu-Libre.png
diff --git a/src/afd/sprites/back-shiny/0025--420--Pikachu--Original.png b/src/afd/sprites/back-shiny/0025-420-Pikachu-Original.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--420--Pikachu--Original.png
rename to src/afd/sprites/back-shiny/0025-420-Pikachu-Original.png
diff --git a/src/afd/sprites/back-shiny/0025--420--Pikachu--Partner.png b/src/afd/sprites/back-shiny/0025-420-Pikachu-Partner.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--420--Pikachu--Partner.png
rename to src/afd/sprites/back-shiny/0025-420-Pikachu-Partner.png
diff --git a/src/afd/sprites/back-shiny/0025--420--Pikachu--PhD.png b/src/afd/sprites/back-shiny/0025-420-Pikachu-PhD.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--420--Pikachu--PhD.png
rename to src/afd/sprites/back-shiny/0025-420-Pikachu-PhD.png
diff --git a/src/afd/sprites/back-shiny/0025--420--Pikachu--Pop-Star.png b/src/afd/sprites/back-shiny/0025-420-Pikachu-Pop~Star.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--420--Pikachu--Pop-Star.png
rename to src/afd/sprites/back-shiny/0025-420-Pikachu-Pop~Star.png
diff --git a/src/afd/sprites/back-shiny/0025--420--Pikachu--Rock-Star.png b/src/afd/sprites/back-shiny/0025-420-Pikachu-Rock~Star.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--420--Pikachu--Rock-Star.png
rename to src/afd/sprites/back-shiny/0025-420-Pikachu-Rock~Star.png
diff --git a/src/afd/sprites/back-shiny/0025--420--Pikachu--Sinnoh.png b/src/afd/sprites/back-shiny/0025-420-Pikachu-Sinnoh.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--420--Pikachu--Sinnoh.png
rename to src/afd/sprites/back-shiny/0025-420-Pikachu-Sinnoh.png
diff --git a/src/afd/sprites/back-shiny/0025--420--Pikachu--Starter.png b/src/afd/sprites/back-shiny/0025-420-Pikachu-Starter.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--420--Pikachu--Starter.png
rename to src/afd/sprites/back-shiny/0025-420-Pikachu-Starter.png
diff --git a/src/afd/sprites/back-shiny/0025--420--Pikachu--Unova.png b/src/afd/sprites/back-shiny/0025-420-Pikachu-Unova.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0025--420--Pikachu--Unova.png
rename to src/afd/sprites/back-shiny/0025-420-Pikachu-Unova.png
diff --git a/src/afd/sprites/back-shiny/0026--000--Raichu.png b/src/afd/sprites/back-shiny/0026-000-Raichu.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0026--000--Raichu.png
rename to src/afd/sprites/back-shiny/0026-000-Raichu.png
diff --git a/src/afd/sprites/back-shiny/0026--420--Raichu--Alola.png b/src/afd/sprites/back-shiny/0026-420-Raichu-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0026--420--Raichu--Alola.png
rename to src/afd/sprites/back-shiny/0026-420-Raichu-Alola.png
diff --git a/src/afd/sprites/back-shiny/0027--000--Aurumoth.png b/src/afd/sprites/back-shiny/0027-000-Aurumoth.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0027--000--Aurumoth.png
rename to src/afd/sprites/back-shiny/0027-000-Aurumoth.png
diff --git a/src/afd/sprites/back-shiny/0027--000--Sandshrew.png b/src/afd/sprites/back-shiny/0027-000-Sandshrew.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0027--000--Sandshrew.png
rename to src/afd/sprites/back-shiny/0027-000-Sandshrew.png
diff --git a/src/afd/sprites/back-shiny/0027--420--Sandshrew--Alola.png b/src/afd/sprites/back-shiny/0027-420-Sandshrew-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0027--420--Sandshrew--Alola.png
rename to src/afd/sprites/back-shiny/0027-420-Sandshrew-Alola.png
diff --git a/src/afd/sprites/back-shiny/0028--000--Sandslash.png b/src/afd/sprites/back-shiny/0028-000-Sandslash.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0028--000--Sandslash.png
rename to src/afd/sprites/back-shiny/0028-000-Sandslash.png
diff --git a/src/afd/sprites/back-shiny/0028--420--Sandslash--Alola.png b/src/afd/sprites/back-shiny/0028-420-Sandslash-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0028--420--Sandslash--Alola.png
rename to src/afd/sprites/back-shiny/0028-420-Sandslash-Alola.png
diff --git a/src/afd/sprites/back-shiny/0029--000--Malaconda.png b/src/afd/sprites/back-shiny/0029-000-Malaconda.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0029--000--Malaconda.png
rename to src/afd/sprites/back-shiny/0029-000-Malaconda.png
diff --git a/src/afd/sprites/back-shiny/0029--000--Nidoran-F.png b/src/afd/sprites/back-shiny/0029-000-Nidoran~F.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0029--000--Nidoran-F.png
rename to src/afd/sprites/back-shiny/0029-000-Nidoran~F.png
diff --git a/src/afd/sprites/back-shiny/0030--000--Nidorina.png b/src/afd/sprites/back-shiny/0030-000-Nidorina.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0030--000--Nidorina.png
rename to src/afd/sprites/back-shiny/0030-000-Nidorina.png
diff --git a/src/afd/sprites/back-shiny/0031--000--Cawmodore.png b/src/afd/sprites/back-shiny/0031-000-Cawmodore.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0031--000--Cawmodore.png
rename to src/afd/sprites/back-shiny/0031-000-Cawmodore.png
diff --git a/src/afd/sprites/back-shiny/0031--000--Nidoqueen.png b/src/afd/sprites/back-shiny/0031-000-Nidoqueen.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0031--000--Nidoqueen.png
rename to src/afd/sprites/back-shiny/0031-000-Nidoqueen.png
diff --git a/src/afd/sprites/back-shiny/0032--000--Nidoran-M.png b/src/afd/sprites/back-shiny/0032-000-Nidoran~M.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0032--000--Nidoran-M.png
rename to src/afd/sprites/back-shiny/0032-000-Nidoran~M.png
diff --git a/src/afd/sprites/back-shiny/0033--000--Nidorino.png b/src/afd/sprites/back-shiny/0033-000-Nidorino.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0033--000--Nidorino.png
rename to src/afd/sprites/back-shiny/0033-000-Nidorino.png
diff --git a/src/afd/sprites/back-shiny/0034--000--Nidoking.png b/src/afd/sprites/back-shiny/0034-000-Nidoking.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0034--000--Nidoking.png
rename to src/afd/sprites/back-shiny/0034-000-Nidoking.png
diff --git a/src/afd/sprites/back-shiny/0035--000--Clefairy.png b/src/afd/sprites/back-shiny/0035-000-Clefairy.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0035--000--Clefairy.png
rename to src/afd/sprites/back-shiny/0035-000-Clefairy.png
diff --git a/src/afd/sprites/back-shiny/0035--000--Plasmanta.png b/src/afd/sprites/back-shiny/0035-000-Plasmanta.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0035--000--Plasmanta.png
rename to src/afd/sprites/back-shiny/0035-000-Plasmanta.png
diff --git a/src/afd/sprites/back-shiny/0036--000--Clefable.png b/src/afd/sprites/back-shiny/0036-000-Clefable.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0036--000--Clefable.png
rename to src/afd/sprites/back-shiny/0036-000-Clefable.png
diff --git a/src/afd/sprites/back-shiny/0037--000--Vulpix.png b/src/afd/sprites/back-shiny/0037-000-Vulpix.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0037--000--Vulpix.png
rename to src/afd/sprites/back-shiny/0037-000-Vulpix.png
diff --git a/src/afd/sprites/back-shiny/0037--420--Vulpix--Alola.png b/src/afd/sprites/back-shiny/0037-420-Vulpix-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0037--420--Vulpix--Alola.png
rename to src/afd/sprites/back-shiny/0037-420-Vulpix-Alola.png
diff --git a/src/afd/sprites/back-shiny/0038--420--Ninetales--Alola.png b/src/afd/sprites/back-shiny/0038-420-Ninetales-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0038--420--Ninetales--Alola.png
rename to src/afd/sprites/back-shiny/0038-420-Ninetales-Alola.png
diff --git a/src/afd/sprites/back-shiny/0039--000--Jigglypuff.png b/src/afd/sprites/back-shiny/0039-000-Jigglypuff.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0039--000--Jigglypuff.png
rename to src/afd/sprites/back-shiny/0039-000-Jigglypuff.png
diff --git a/src/afd/sprites/back-shiny/0040--000--Wigglytuff.png b/src/afd/sprites/back-shiny/0040-000-Wigglytuff.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0040--000--Wigglytuff.png
rename to src/afd/sprites/back-shiny/0040-000-Wigglytuff.png
diff --git a/src/afd/sprites/back-shiny/0041--000--Zubat.png b/src/afd/sprites/back-shiny/0041-000-Zubat.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0041--000--Zubat.png
rename to src/afd/sprites/back-shiny/0041-000-Zubat.png
diff --git a/src/afd/sprites/back-shiny/0042--000--Golbat.png b/src/afd/sprites/back-shiny/0042-000-Golbat.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0042--000--Golbat.png
rename to src/afd/sprites/back-shiny/0042-000-Golbat.png
diff --git a/src/afd/sprites/back-shiny/0043--000--Oddish.png b/src/afd/sprites/back-shiny/0043-000-Oddish.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0043--000--Oddish.png
rename to src/afd/sprites/back-shiny/0043-000-Oddish.png
diff --git a/src/afd/sprites/back-shiny/0044--000--Gloom.png b/src/afd/sprites/back-shiny/0044-000-Gloom.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0044--000--Gloom.png
rename to src/afd/sprites/back-shiny/0044-000-Gloom.png
diff --git a/src/afd/sprites/back-shiny/0045--000--Vileplume.png b/src/afd/sprites/back-shiny/0045-000-Vileplume.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0045--000--Vileplume.png
rename to src/afd/sprites/back-shiny/0045-000-Vileplume.png
diff --git a/src/afd/sprites/back-shiny/0046--000--Paras.png b/src/afd/sprites/back-shiny/0046-000-Paras.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0046--000--Paras.png
rename to src/afd/sprites/back-shiny/0046-000-Paras.png
diff --git a/src/afd/sprites/back-shiny/0047--000--Parasect.png b/src/afd/sprites/back-shiny/0047-000-Parasect.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0047--000--Parasect.png
rename to src/afd/sprites/back-shiny/0047-000-Parasect.png
diff --git a/src/afd/sprites/back-shiny/0048--000--Venonat.png b/src/afd/sprites/back-shiny/0048-000-Venonat.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0048--000--Venonat.png
rename to src/afd/sprites/back-shiny/0048-000-Venonat.png
diff --git a/src/afd/sprites/back-shiny/0049--000--Venomoth.png b/src/afd/sprites/back-shiny/0049-000-Venomoth.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0049--000--Venomoth.png
rename to src/afd/sprites/back-shiny/0049-000-Venomoth.png
diff --git a/src/afd/sprites/back-shiny/0050--000--Diglett.png b/src/afd/sprites/back-shiny/0050-000-Diglett.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0050--000--Diglett.png
rename to src/afd/sprites/back-shiny/0050-000-Diglett.png
diff --git a/src/afd/sprites/back-shiny/0050--420--Diglett--Alola.png b/src/afd/sprites/back-shiny/0050-420-Diglett-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0050--420--Diglett--Alola.png
rename to src/afd/sprites/back-shiny/0050-420-Diglett-Alola.png
diff --git a/src/afd/sprites/back-shiny/0051--000--Dugtrio.png b/src/afd/sprites/back-shiny/0051-000-Dugtrio.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0051--000--Dugtrio.png
rename to src/afd/sprites/back-shiny/0051-000-Dugtrio.png
diff --git a/src/afd/sprites/back-shiny/0051--420--Dugtrio--Alola.png b/src/afd/sprites/back-shiny/0051-420-Dugtrio-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0051--420--Dugtrio--Alola.png
rename to src/afd/sprites/back-shiny/0051-420-Dugtrio-Alola.png
diff --git a/src/afd/sprites/back-shiny/0052--000--Meowth.png b/src/afd/sprites/back-shiny/0052-000-Meowth.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0052--000--Meowth.png
rename to src/afd/sprites/back-shiny/0052-000-Meowth.png
diff --git a/src/afd/sprites/back-shiny/0052--420--Meowth--Alola.png b/src/afd/sprites/back-shiny/0052-420-Meowth-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0052--420--Meowth--Alola.png
rename to src/afd/sprites/back-shiny/0052-420-Meowth-Alola.png
diff --git a/src/afd/sprites/back-shiny/0052--420--Meowth--Galar.png b/src/afd/sprites/back-shiny/0052-420-Meowth-Galar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0052--420--Meowth--Galar.png
rename to src/afd/sprites/back-shiny/0052-420-Meowth-Galar.png
diff --git a/src/afd/sprites/back-shiny/0052--420--Meowth--Gmax.png b/src/afd/sprites/back-shiny/0052-420-Meowth-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0052--420--Meowth--Gmax.png
rename to src/afd/sprites/back-shiny/0052-420-Meowth-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0053--000--Persian.png b/src/afd/sprites/back-shiny/0053-000-Persian.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0053--000--Persian.png
rename to src/afd/sprites/back-shiny/0053-000-Persian.png
diff --git a/src/afd/sprites/back-shiny/0053--420--Persian--Alola.png b/src/afd/sprites/back-shiny/0053-420-Persian-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0053--420--Persian--Alola.png
rename to src/afd/sprites/back-shiny/0053-420-Persian-Alola.png
diff --git a/src/afd/sprites/back-shiny/0054--000--Psyduck.png b/src/afd/sprites/back-shiny/0054-000-Psyduck.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0054--000--Psyduck.png
rename to src/afd/sprites/back-shiny/0054-000-Psyduck.png
diff --git a/src/afd/sprites/back-shiny/0055--000--Golduck.png b/src/afd/sprites/back-shiny/0055-000-Golduck.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0055--000--Golduck.png
rename to src/afd/sprites/back-shiny/0055-000-Golduck.png
diff --git a/src/afd/sprites/back-shiny/0056--000--Mankey.png b/src/afd/sprites/back-shiny/0056-000-Mankey.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0056--000--Mankey.png
rename to src/afd/sprites/back-shiny/0056-000-Mankey.png
diff --git a/src/afd/sprites/back-shiny/0057--000--Primeape.png b/src/afd/sprites/back-shiny/0057-000-Primeape.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0057--000--Primeape.png
rename to src/afd/sprites/back-shiny/0057-000-Primeape.png
diff --git a/src/afd/sprites/back-shiny/0058--000--Growlithe.png b/src/afd/sprites/back-shiny/0058-000-Growlithe.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0058--000--Growlithe.png
rename to src/afd/sprites/back-shiny/0058-000-Growlithe.png
diff --git a/src/afd/sprites/back-shiny/0059--000--Arcanine.png b/src/afd/sprites/back-shiny/0059-000-Arcanine.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0059--000--Arcanine.png
rename to src/afd/sprites/back-shiny/0059-000-Arcanine.png
diff --git a/src/afd/sprites/back-shiny/0060--000--Poliwag.png b/src/afd/sprites/back-shiny/0060-000-Poliwag.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0060--000--Poliwag.png
rename to src/afd/sprites/back-shiny/0060-000-Poliwag.png
diff --git a/src/afd/sprites/back-shiny/0061--000--Poliwhirl.png b/src/afd/sprites/back-shiny/0061-000-Poliwhirl.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0061--000--Poliwhirl.png
rename to src/afd/sprites/back-shiny/0061-000-Poliwhirl.png
diff --git a/src/afd/sprites/back-shiny/0062--000--Poliwrath.png b/src/afd/sprites/back-shiny/0062-000-Poliwrath.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0062--000--Poliwrath.png
rename to src/afd/sprites/back-shiny/0062-000-Poliwrath.png
diff --git a/src/afd/sprites/back-shiny/0063--000--Abra.png b/src/afd/sprites/back-shiny/0063-000-Abra.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0063--000--Abra.png
rename to src/afd/sprites/back-shiny/0063-000-Abra.png
diff --git a/src/afd/sprites/back-shiny/0064--000--Kadabra.png b/src/afd/sprites/back-shiny/0064-000-Kadabra.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0064--000--Kadabra.png
rename to src/afd/sprites/back-shiny/0064-000-Kadabra.png
diff --git a/src/afd/sprites/back-shiny/0065--000--Alakazam.png b/src/afd/sprites/back-shiny/0065-000-Alakazam.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0065--000--Alakazam.png
rename to src/afd/sprites/back-shiny/0065-000-Alakazam.png
diff --git a/src/afd/sprites/back-shiny/0065--420--Alakazam--Mega.png b/src/afd/sprites/back-shiny/0065-420-Alakazam-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0065--420--Alakazam--Mega.png
rename to src/afd/sprites/back-shiny/0065-420-Alakazam-Mega.png
diff --git a/src/afd/sprites/back-shiny/0066--000--Machop.png b/src/afd/sprites/back-shiny/0066-000-Machop.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0066--000--Machop.png
rename to src/afd/sprites/back-shiny/0066-000-Machop.png
diff --git a/src/afd/sprites/back-shiny/0067--000--Machoke.png b/src/afd/sprites/back-shiny/0067-000-Machoke.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0067--000--Machoke.png
rename to src/afd/sprites/back-shiny/0067-000-Machoke.png
diff --git a/src/afd/sprites/back-shiny/0068--000--Machamp.png b/src/afd/sprites/back-shiny/0068-000-Machamp.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0068--000--Machamp.png
rename to src/afd/sprites/back-shiny/0068-000-Machamp.png
diff --git a/src/afd/sprites/back-shiny/0068--420--Machamp--Gmax.png b/src/afd/sprites/back-shiny/0068-420-Machamp-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0068--420--Machamp--Gmax.png
rename to src/afd/sprites/back-shiny/0068-420-Machamp-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0069--000--Bellsprout.png b/src/afd/sprites/back-shiny/0069-000-Bellsprout.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0069--000--Bellsprout.png
rename to src/afd/sprites/back-shiny/0069-000-Bellsprout.png
diff --git a/src/afd/sprites/back-shiny/0070--000--Weepinbell.png b/src/afd/sprites/back-shiny/0070-000-Weepinbell.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0070--000--Weepinbell.png
rename to src/afd/sprites/back-shiny/0070-000-Weepinbell.png
diff --git a/src/afd/sprites/back-shiny/0071--000--Victreebel.png b/src/afd/sprites/back-shiny/0071-000-Victreebel.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0071--000--Victreebel.png
rename to src/afd/sprites/back-shiny/0071-000-Victreebel.png
diff --git a/src/afd/sprites/back-shiny/0072--000--Tentacool.png b/src/afd/sprites/back-shiny/0072-000-Tentacool.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0072--000--Tentacool.png
rename to src/afd/sprites/back-shiny/0072-000-Tentacool.png
diff --git a/src/afd/sprites/back-shiny/0073--000--Tentacruel.png b/src/afd/sprites/back-shiny/0073-000-Tentacruel.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0073--000--Tentacruel.png
rename to src/afd/sprites/back-shiny/0073-000-Tentacruel.png
diff --git a/src/afd/sprites/back-shiny/0074--000--Geodude.png b/src/afd/sprites/back-shiny/0074-000-Geodude.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0074--000--Geodude.png
rename to src/afd/sprites/back-shiny/0074-000-Geodude.png
diff --git a/src/afd/sprites/back-shiny/0074--420--Geodude--Alola.png b/src/afd/sprites/back-shiny/0074-420-Geodude-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0074--420--Geodude--Alola.png
rename to src/afd/sprites/back-shiny/0074-420-Geodude-Alola.png
diff --git a/src/afd/sprites/back-shiny/0075--000--Graveler.png b/src/afd/sprites/back-shiny/0075-000-Graveler.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0075--000--Graveler.png
rename to src/afd/sprites/back-shiny/0075-000-Graveler.png
diff --git a/src/afd/sprites/back-shiny/0075--420--Graveler--Alola.png b/src/afd/sprites/back-shiny/0075-420-Graveler-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0075--420--Graveler--Alola.png
rename to src/afd/sprites/back-shiny/0075-420-Graveler-Alola.png
diff --git a/src/afd/sprites/back-shiny/0076--000--Golem.png b/src/afd/sprites/back-shiny/0076-000-Golem.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0076--000--Golem.png
rename to src/afd/sprites/back-shiny/0076-000-Golem.png
diff --git a/src/afd/sprites/back-shiny/0076--420--Golem--Alola.png b/src/afd/sprites/back-shiny/0076-420-Golem-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0076--420--Golem--Alola.png
rename to src/afd/sprites/back-shiny/0076-420-Golem-Alola.png
diff --git a/src/afd/sprites/back-shiny/0077--000--Ponyta.png b/src/afd/sprites/back-shiny/0077-000-Ponyta.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0077--000--Ponyta.png
rename to src/afd/sprites/back-shiny/0077-000-Ponyta.png
diff --git a/src/afd/sprites/back-shiny/0077--420--Ponyta--Galar.png b/src/afd/sprites/back-shiny/0077-420-Ponyta-Galar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0077--420--Ponyta--Galar.png
rename to src/afd/sprites/back-shiny/0077-420-Ponyta-Galar.png
diff --git a/src/afd/sprites/back-shiny/0078--000--Rapidash.png b/src/afd/sprites/back-shiny/0078-000-Rapidash.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0078--000--Rapidash.png
rename to src/afd/sprites/back-shiny/0078-000-Rapidash.png
diff --git a/src/afd/sprites/back-shiny/0078--420--Rapidash--Galar.png b/src/afd/sprites/back-shiny/0078-420-Rapidash-Galar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0078--420--Rapidash--Galar.png
rename to src/afd/sprites/back-shiny/0078-420-Rapidash-Galar.png
diff --git a/src/afd/sprites/back-shiny/0079--000--Slowpoke.png b/src/afd/sprites/back-shiny/0079-000-Slowpoke.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0079--000--Slowpoke.png
rename to src/afd/sprites/back-shiny/0079-000-Slowpoke.png
diff --git a/src/afd/sprites/back-shiny/0079--420--Slowpoke--Galar.png b/src/afd/sprites/back-shiny/0079-420-Slowpoke-Galar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0079--420--Slowpoke--Galar.png
rename to src/afd/sprites/back-shiny/0079-420-Slowpoke-Galar.png
diff --git a/src/afd/sprites/back-shiny/0080--000--Slowbro.png b/src/afd/sprites/back-shiny/0080-000-Slowbro.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0080--000--Slowbro.png
rename to src/afd/sprites/back-shiny/0080-000-Slowbro.png
diff --git a/src/afd/sprites/back-shiny/0080--420--Slowbro--Mega.png b/src/afd/sprites/back-shiny/0080-420-Slowbro-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0080--420--Slowbro--Mega.png
rename to src/afd/sprites/back-shiny/0080-420-Slowbro-Mega.png
diff --git a/src/afd/sprites/back-shiny/0081--000--Magnemite.png b/src/afd/sprites/back-shiny/0081-000-Magnemite.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0081--000--Magnemite.png
rename to src/afd/sprites/back-shiny/0081-000-Magnemite.png
diff --git a/src/afd/sprites/back-shiny/0082--000--Magneton.png b/src/afd/sprites/back-shiny/0082-000-Magneton.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0082--000--Magneton.png
rename to src/afd/sprites/back-shiny/0082-000-Magneton.png
diff --git a/src/afd/sprites/back-shiny/0083--000--Farfetch__0027d.png b/src/afd/sprites/back-shiny/0083-000-Farfetch__0027d.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0083--000--Farfetch__0027d.png
rename to src/afd/sprites/back-shiny/0083-000-Farfetch__0027d.png
diff --git a/src/afd/sprites/back-shiny/0083--420--Farfetch__0027d--Galar.png b/src/afd/sprites/back-shiny/0083-420-Farfetch__0027d-Galar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0083--420--Farfetch__0027d--Galar.png
rename to src/afd/sprites/back-shiny/0083-420-Farfetch__0027d-Galar.png
diff --git a/src/afd/sprites/back-shiny/0084--000--Doduo.png b/src/afd/sprites/back-shiny/0084-000-Doduo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0084--000--Doduo.png
rename to src/afd/sprites/back-shiny/0084-000-Doduo.png
diff --git a/src/afd/sprites/back-shiny/0085--000--Dodrio.png b/src/afd/sprites/back-shiny/0085-000-Dodrio.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0085--000--Dodrio.png
rename to src/afd/sprites/back-shiny/0085-000-Dodrio.png
diff --git a/src/afd/sprites/back-shiny/0086--000--Seel.png b/src/afd/sprites/back-shiny/0086-000-Seel.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0086--000--Seel.png
rename to src/afd/sprites/back-shiny/0086-000-Seel.png
diff --git a/src/afd/sprites/back-shiny/0087--000--Dewgong.png b/src/afd/sprites/back-shiny/0087-000-Dewgong.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0087--000--Dewgong.png
rename to src/afd/sprites/back-shiny/0087-000-Dewgong.png
diff --git a/src/afd/sprites/back-shiny/0088--000--Grimer.png b/src/afd/sprites/back-shiny/0088-000-Grimer.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0088--000--Grimer.png
rename to src/afd/sprites/back-shiny/0088-000-Grimer.png
diff --git a/src/afd/sprites/back-shiny/0088--420--Grimer--Alola.png b/src/afd/sprites/back-shiny/0088-420-Grimer-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0088--420--Grimer--Alola.png
rename to src/afd/sprites/back-shiny/0088-420-Grimer-Alola.png
diff --git a/src/afd/sprites/back-shiny/0089--000--Muk.png b/src/afd/sprites/back-shiny/0089-000-Muk.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0089--000--Muk.png
rename to src/afd/sprites/back-shiny/0089-000-Muk.png
diff --git a/src/afd/sprites/back-shiny/0089--420--Muk--Alola.png b/src/afd/sprites/back-shiny/0089-420-Muk-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0089--420--Muk--Alola.png
rename to src/afd/sprites/back-shiny/0089-420-Muk-Alola.png
diff --git a/src/afd/sprites/back-shiny/0090--000--Shellder.png b/src/afd/sprites/back-shiny/0090-000-Shellder.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0090--000--Shellder.png
rename to src/afd/sprites/back-shiny/0090-000-Shellder.png
diff --git a/src/afd/sprites/back-shiny/0091--000--Cloyster.png b/src/afd/sprites/back-shiny/0091-000-Cloyster.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0091--000--Cloyster.png
rename to src/afd/sprites/back-shiny/0091-000-Cloyster.png
diff --git a/src/afd/sprites/back-shiny/0092--000--Gastly.png b/src/afd/sprites/back-shiny/0092-000-Gastly.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0092--000--Gastly.png
rename to src/afd/sprites/back-shiny/0092-000-Gastly.png
diff --git a/src/afd/sprites/back-shiny/0093--000--Haunter.png b/src/afd/sprites/back-shiny/0093-000-Haunter.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0093--000--Haunter.png
rename to src/afd/sprites/back-shiny/0093-000-Haunter.png
diff --git a/src/afd/sprites/back-shiny/0094--000--Gengar.png b/src/afd/sprites/back-shiny/0094-000-Gengar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0094--000--Gengar.png
rename to src/afd/sprites/back-shiny/0094-000-Gengar.png
diff --git a/src/afd/sprites/back-shiny/0094--420--Gengar--Gmax.png b/src/afd/sprites/back-shiny/0094-420-Gengar-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0094--420--Gengar--Gmax.png
rename to src/afd/sprites/back-shiny/0094-420-Gengar-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0094--420--Gengar--Mega.png b/src/afd/sprites/back-shiny/0094-420-Gengar-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0094--420--Gengar--Mega.png
rename to src/afd/sprites/back-shiny/0094-420-Gengar-Mega.png
diff --git a/src/afd/sprites/back-shiny/0095--000--Onix.png b/src/afd/sprites/back-shiny/0095-000-Onix.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0095--000--Onix.png
rename to src/afd/sprites/back-shiny/0095-000-Onix.png
diff --git a/src/afd/sprites/back-shiny/0096--000--Drowzee.png b/src/afd/sprites/back-shiny/0096-000-Drowzee.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0096--000--Drowzee.png
rename to src/afd/sprites/back-shiny/0096-000-Drowzee.png
diff --git a/src/afd/sprites/back-shiny/0097--000--Hypno.png b/src/afd/sprites/back-shiny/0097-000-Hypno.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0097--000--Hypno.png
rename to src/afd/sprites/back-shiny/0097-000-Hypno.png
diff --git a/src/afd/sprites/back-shiny/0098--000--Krabby.png b/src/afd/sprites/back-shiny/0098-000-Krabby.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0098--000--Krabby.png
rename to src/afd/sprites/back-shiny/0098-000-Krabby.png
diff --git a/src/afd/sprites/back-shiny/0099--000--Kingler.png b/src/afd/sprites/back-shiny/0099-000-Kingler.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0099--000--Kingler.png
rename to src/afd/sprites/back-shiny/0099-000-Kingler.png
diff --git a/src/afd/sprites/back-shiny/0099--420--Kingler--Gmax.png b/src/afd/sprites/back-shiny/0099-420-Kingler-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0099--420--Kingler--Gmax.png
rename to src/afd/sprites/back-shiny/0099-420-Kingler-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0100--000--Voltorb.png b/src/afd/sprites/back-shiny/0100-000-Voltorb.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0100--000--Voltorb.png
rename to src/afd/sprites/back-shiny/0100-000-Voltorb.png
diff --git a/src/afd/sprites/back-shiny/0101--000--Electrode.png b/src/afd/sprites/back-shiny/0101-000-Electrode.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0101--000--Electrode.png
rename to src/afd/sprites/back-shiny/0101-000-Electrode.png
diff --git a/src/afd/sprites/back-shiny/0102--000--Exeggcute.png b/src/afd/sprites/back-shiny/0102-000-Exeggcute.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0102--000--Exeggcute.png
rename to src/afd/sprites/back-shiny/0102-000-Exeggcute.png
diff --git a/src/afd/sprites/back-shiny/0103--000--Exeggutor.png b/src/afd/sprites/back-shiny/0103-000-Exeggutor.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0103--000--Exeggutor.png
rename to src/afd/sprites/back-shiny/0103-000-Exeggutor.png
diff --git a/src/afd/sprites/back-shiny/0103--420--Exeggutor--Alola.png b/src/afd/sprites/back-shiny/0103-420-Exeggutor-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0103--420--Exeggutor--Alola.png
rename to src/afd/sprites/back-shiny/0103-420-Exeggutor-Alola.png
diff --git a/src/afd/sprites/back-shiny/0104--000--Cubone.png b/src/afd/sprites/back-shiny/0104-000-Cubone.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0104--000--Cubone.png
rename to src/afd/sprites/back-shiny/0104-000-Cubone.png
diff --git a/src/afd/sprites/back-shiny/0105--000--Marowak.png b/src/afd/sprites/back-shiny/0105-000-Marowak.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0105--000--Marowak.png
rename to src/afd/sprites/back-shiny/0105-000-Marowak.png
diff --git a/src/afd/sprites/back-shiny/0105--420--Marowak--Alola.png b/src/afd/sprites/back-shiny/0105-420-Marowak-Alola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0105--420--Marowak--Alola.png
rename to src/afd/sprites/back-shiny/0105-420-Marowak-Alola.png
diff --git a/src/afd/sprites/back-shiny/0106--000--Hitmonlee.png b/src/afd/sprites/back-shiny/0106-000-Hitmonlee.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0106--000--Hitmonlee.png
rename to src/afd/sprites/back-shiny/0106-000-Hitmonlee.png
diff --git a/src/afd/sprites/back-shiny/0107--000--Hitmonchan.png b/src/afd/sprites/back-shiny/0107-000-Hitmonchan.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0107--000--Hitmonchan.png
rename to src/afd/sprites/back-shiny/0107-000-Hitmonchan.png
diff --git a/src/afd/sprites/back-shiny/0108--000--Lickitung.png b/src/afd/sprites/back-shiny/0108-000-Lickitung.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0108--000--Lickitung.png
rename to src/afd/sprites/back-shiny/0108-000-Lickitung.png
diff --git a/src/afd/sprites/back-shiny/0109--000--Koffing.png b/src/afd/sprites/back-shiny/0109-000-Koffing.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0109--000--Koffing.png
rename to src/afd/sprites/back-shiny/0109-000-Koffing.png
diff --git a/src/afd/sprites/back-shiny/0110--000--Weezing.png b/src/afd/sprites/back-shiny/0110-000-Weezing.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0110--000--Weezing.png
rename to src/afd/sprites/back-shiny/0110-000-Weezing.png
diff --git a/src/afd/sprites/back-shiny/0110--420--Weezing--Galar.png b/src/afd/sprites/back-shiny/0110-420-Weezing-Galar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0110--420--Weezing--Galar.png
rename to src/afd/sprites/back-shiny/0110-420-Weezing-Galar.png
diff --git a/src/afd/sprites/back-shiny/0111--000--Rhyhorn.png b/src/afd/sprites/back-shiny/0111-000-Rhyhorn.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0111--000--Rhyhorn.png
rename to src/afd/sprites/back-shiny/0111-000-Rhyhorn.png
diff --git a/src/afd/sprites/back-shiny/0112--000--Rhydon.png b/src/afd/sprites/back-shiny/0112-000-Rhydon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0112--000--Rhydon.png
rename to src/afd/sprites/back-shiny/0112-000-Rhydon.png
diff --git a/src/afd/sprites/back-shiny/0113--000--Chansey.png b/src/afd/sprites/back-shiny/0113-000-Chansey.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0113--000--Chansey.png
rename to src/afd/sprites/back-shiny/0113-000-Chansey.png
diff --git a/src/afd/sprites/back-shiny/0114--000--Tangela.png b/src/afd/sprites/back-shiny/0114-000-Tangela.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0114--000--Tangela.png
rename to src/afd/sprites/back-shiny/0114-000-Tangela.png
diff --git a/src/afd/sprites/back-shiny/0115--000--Kangaskhan.png b/src/afd/sprites/back-shiny/0115-000-Kangaskhan.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0115--000--Kangaskhan.png
rename to src/afd/sprites/back-shiny/0115-000-Kangaskhan.png
diff --git a/src/afd/sprites/back-shiny/0115--420--Kangaskhan--Mega.png b/src/afd/sprites/back-shiny/0115-420-Kangaskhan-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0115--420--Kangaskhan--Mega.png
rename to src/afd/sprites/back-shiny/0115-420-Kangaskhan-Mega.png
diff --git a/src/afd/sprites/back-shiny/0116--000--Horsea.png b/src/afd/sprites/back-shiny/0116-000-Horsea.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0116--000--Horsea.png
rename to src/afd/sprites/back-shiny/0116-000-Horsea.png
diff --git a/src/afd/sprites/back-shiny/0117--000--Seadra.png b/src/afd/sprites/back-shiny/0117-000-Seadra.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0117--000--Seadra.png
rename to src/afd/sprites/back-shiny/0117-000-Seadra.png
diff --git a/src/afd/sprites/back-shiny/0118--000--Goldeen.png b/src/afd/sprites/back-shiny/0118-000-Goldeen.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0118--000--Goldeen.png
rename to src/afd/sprites/back-shiny/0118-000-Goldeen.png
diff --git a/src/afd/sprites/back-shiny/0119--000--Seaking.png b/src/afd/sprites/back-shiny/0119-000-Seaking.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0119--000--Seaking.png
rename to src/afd/sprites/back-shiny/0119-000-Seaking.png
diff --git a/src/afd/sprites/back-shiny/0120--000--Staryu.png b/src/afd/sprites/back-shiny/0120-000-Staryu.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0120--000--Staryu.png
rename to src/afd/sprites/back-shiny/0120-000-Staryu.png
diff --git a/src/afd/sprites/back-shiny/0121--000--Starmie.png b/src/afd/sprites/back-shiny/0121-000-Starmie.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0121--000--Starmie.png
rename to src/afd/sprites/back-shiny/0121-000-Starmie.png
diff --git a/src/afd/sprites/back-shiny/0122--000--Mr._Mime.png b/src/afd/sprites/back-shiny/0122-000-Mr._Mime.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0122--000--Mr._Mime.png
rename to src/afd/sprites/back-shiny/0122-000-Mr._Mime.png
diff --git a/src/afd/sprites/back-shiny/0122--420--Mr._Mime--Galar.png b/src/afd/sprites/back-shiny/0122-420-Mr._Mime-Galar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0122--420--Mr._Mime--Galar.png
rename to src/afd/sprites/back-shiny/0122-420-Mr._Mime-Galar.png
diff --git a/src/afd/sprites/back-shiny/0123--000--Scyther.png b/src/afd/sprites/back-shiny/0123-000-Scyther.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0123--000--Scyther.png
rename to src/afd/sprites/back-shiny/0123-000-Scyther.png
diff --git a/src/afd/sprites/back-shiny/0124--000--Jynx.png b/src/afd/sprites/back-shiny/0124-000-Jynx.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0124--000--Jynx.png
rename to src/afd/sprites/back-shiny/0124-000-Jynx.png
diff --git a/src/afd/sprites/back-shiny/0125--000--Electabuzz.png b/src/afd/sprites/back-shiny/0125-000-Electabuzz.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0125--000--Electabuzz.png
rename to src/afd/sprites/back-shiny/0125-000-Electabuzz.png
diff --git a/src/afd/sprites/back-shiny/0126--000--Magmar.png b/src/afd/sprites/back-shiny/0126-000-Magmar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0126--000--Magmar.png
rename to src/afd/sprites/back-shiny/0126-000-Magmar.png
diff --git a/src/afd/sprites/back-shiny/0127--000--Pinsir.png b/src/afd/sprites/back-shiny/0127-000-Pinsir.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0127--000--Pinsir.png
rename to src/afd/sprites/back-shiny/0127-000-Pinsir.png
diff --git a/src/afd/sprites/back-shiny/0127--420--Pinsir--Mega.png b/src/afd/sprites/back-shiny/0127-420-Pinsir-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0127--420--Pinsir--Mega.png
rename to src/afd/sprites/back-shiny/0127-420-Pinsir-Mega.png
diff --git a/src/afd/sprites/back-shiny/0128--000--Tauros.png b/src/afd/sprites/back-shiny/0128-000-Tauros.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0128--000--Tauros.png
rename to src/afd/sprites/back-shiny/0128-000-Tauros.png
diff --git a/src/afd/sprites/back-shiny/0129--000--Magikarp.png b/src/afd/sprites/back-shiny/0129-000-Magikarp.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0129--000--Magikarp.png
rename to src/afd/sprites/back-shiny/0129-000-Magikarp.png
diff --git a/src/afd/sprites/back-shiny/0130--000--Gyarados.png b/src/afd/sprites/back-shiny/0130-000-Gyarados.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0130--000--Gyarados.png
rename to src/afd/sprites/back-shiny/0130-000-Gyarados.png
diff --git a/src/afd/sprites/back-shiny/0130--420--Gyarados--Mega.png b/src/afd/sprites/back-shiny/0130-420-Gyarados-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0130--420--Gyarados--Mega.png
rename to src/afd/sprites/back-shiny/0130-420-Gyarados-Mega.png
diff --git a/src/afd/sprites/back-shiny/0131--000--Lapras.png b/src/afd/sprites/back-shiny/0131-000-Lapras.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0131--000--Lapras.png
rename to src/afd/sprites/back-shiny/0131-000-Lapras.png
diff --git a/src/afd/sprites/back-shiny/0131--420--Lapras--Gmax.png b/src/afd/sprites/back-shiny/0131-420-Lapras-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0131--420--Lapras--Gmax.png
rename to src/afd/sprites/back-shiny/0131-420-Lapras-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0132--000--Ditto.png b/src/afd/sprites/back-shiny/0132-000-Ditto.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0132--000--Ditto.png
rename to src/afd/sprites/back-shiny/0132-000-Ditto.png
diff --git a/src/afd/sprites/back-shiny/0133--000--Eevee.png b/src/afd/sprites/back-shiny/0133-000-Eevee.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0133--000--Eevee.png
rename to src/afd/sprites/back-shiny/0133-000-Eevee.png
diff --git a/src/afd/sprites/back-shiny/0133--420--Eevee--Gmax.png b/src/afd/sprites/back-shiny/0133-420-Eevee-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0133--420--Eevee--Gmax.png
rename to src/afd/sprites/back-shiny/0133-420-Eevee-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0133--420--Eevee--Starter.png b/src/afd/sprites/back-shiny/0133-420-Eevee-Starter.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0133--420--Eevee--Starter.png
rename to src/afd/sprites/back-shiny/0133-420-Eevee-Starter.png
diff --git a/src/afd/sprites/back-shiny/0134--000--Vaporeon.png b/src/afd/sprites/back-shiny/0134-000-Vaporeon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0134--000--Vaporeon.png
rename to src/afd/sprites/back-shiny/0134-000-Vaporeon.png
diff --git a/src/afd/sprites/back-shiny/0135--000--Jolteon.png b/src/afd/sprites/back-shiny/0135-000-Jolteon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0135--000--Jolteon.png
rename to src/afd/sprites/back-shiny/0135-000-Jolteon.png
diff --git a/src/afd/sprites/back-shiny/0136--000--Flareon.png b/src/afd/sprites/back-shiny/0136-000-Flareon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0136--000--Flareon.png
rename to src/afd/sprites/back-shiny/0136-000-Flareon.png
diff --git a/src/afd/sprites/back-shiny/0137--000--Porygon.png b/src/afd/sprites/back-shiny/0137-000-Porygon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0137--000--Porygon.png
rename to src/afd/sprites/back-shiny/0137-000-Porygon.png
diff --git a/src/afd/sprites/back-shiny/0138--000--Omanyte.png b/src/afd/sprites/back-shiny/0138-000-Omanyte.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0138--000--Omanyte.png
rename to src/afd/sprites/back-shiny/0138-000-Omanyte.png
diff --git a/src/afd/sprites/back-shiny/0139--000--Omastar.png b/src/afd/sprites/back-shiny/0139-000-Omastar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0139--000--Omastar.png
rename to src/afd/sprites/back-shiny/0139-000-Omastar.png
diff --git a/src/afd/sprites/back-shiny/0140--000--Kabuto.png b/src/afd/sprites/back-shiny/0140-000-Kabuto.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0140--000--Kabuto.png
rename to src/afd/sprites/back-shiny/0140-000-Kabuto.png
diff --git a/src/afd/sprites/back-shiny/0141--000--Kabutops.png b/src/afd/sprites/back-shiny/0141-000-Kabutops.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0141--000--Kabutops.png
rename to src/afd/sprites/back-shiny/0141-000-Kabutops.png
diff --git a/src/afd/sprites/back-shiny/0142--420--Aerodactyl--Mega.png b/src/afd/sprites/back-shiny/0142-420-Aerodactyl-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0142--420--Aerodactyl--Mega.png
rename to src/afd/sprites/back-shiny/0142-420-Aerodactyl-Mega.png
diff --git a/src/afd/sprites/back-shiny/0143--000--Snorlax.png b/src/afd/sprites/back-shiny/0143-000-Snorlax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0143--000--Snorlax.png
rename to src/afd/sprites/back-shiny/0143-000-Snorlax.png
diff --git a/src/afd/sprites/back-shiny/0143--420--Snorlax--Gmax.png b/src/afd/sprites/back-shiny/0143-420-Snorlax-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0143--420--Snorlax--Gmax.png
rename to src/afd/sprites/back-shiny/0143-420-Snorlax-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0144--000--Articuno.png b/src/afd/sprites/back-shiny/0144-000-Articuno.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0144--000--Articuno.png
rename to src/afd/sprites/back-shiny/0144-000-Articuno.png
diff --git a/src/afd/sprites/back-shiny/0145--000--Zapdos.png b/src/afd/sprites/back-shiny/0145-000-Zapdos.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0145--000--Zapdos.png
rename to src/afd/sprites/back-shiny/0145-000-Zapdos.png
diff --git a/src/afd/sprites/back-shiny/0146--000--Moltres.png b/src/afd/sprites/back-shiny/0146-000-Moltres.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0146--000--Moltres.png
rename to src/afd/sprites/back-shiny/0146-000-Moltres.png
diff --git a/src/afd/sprites/back-shiny/0147--000--Dratini.png b/src/afd/sprites/back-shiny/0147-000-Dratini.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0147--000--Dratini.png
rename to src/afd/sprites/back-shiny/0147-000-Dratini.png
diff --git a/src/afd/sprites/back-shiny/0148--000--Dragonair.png b/src/afd/sprites/back-shiny/0148-000-Dragonair.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0148--000--Dragonair.png
rename to src/afd/sprites/back-shiny/0148-000-Dragonair.png
diff --git a/src/afd/sprites/back-shiny/0149--000--Dragonite.png b/src/afd/sprites/back-shiny/0149-000-Dragonite.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0149--000--Dragonite.png
rename to src/afd/sprites/back-shiny/0149-000-Dragonite.png
diff --git a/src/afd/sprites/back-shiny/0150--000--Mewtwo.png b/src/afd/sprites/back-shiny/0150-000-Mewtwo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0150--000--Mewtwo.png
rename to src/afd/sprites/back-shiny/0150-000-Mewtwo.png
diff --git a/src/afd/sprites/back-shiny/0150--420--Mewtwo--Mega-X.png b/src/afd/sprites/back-shiny/0150-420-Mewtwo-Mega~X.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0150--420--Mewtwo--Mega-X.png
rename to src/afd/sprites/back-shiny/0150-420-Mewtwo-Mega~X.png
diff --git a/src/afd/sprites/back-shiny/0150--420--Mewtwo--Mega-Y.png b/src/afd/sprites/back-shiny/0150-420-Mewtwo-Mega~Y.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0150--420--Mewtwo--Mega-Y.png
rename to src/afd/sprites/back-shiny/0150-420-Mewtwo-Mega~Y.png
diff --git a/src/afd/sprites/back-shiny/0151--000--Mew.png b/src/afd/sprites/back-shiny/0151-000-Mew.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0151--000--Mew.png
rename to src/afd/sprites/back-shiny/0151-000-Mew.png
diff --git a/src/afd/sprites/back-shiny/0152--000--Chikorita.png b/src/afd/sprites/back-shiny/0152-000-Chikorita.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0152--000--Chikorita.png
rename to src/afd/sprites/back-shiny/0152-000-Chikorita.png
diff --git a/src/afd/sprites/back-shiny/0153--000--Bayleef.png b/src/afd/sprites/back-shiny/0153-000-Bayleef.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0153--000--Bayleef.png
rename to src/afd/sprites/back-shiny/0153-000-Bayleef.png
diff --git a/src/afd/sprites/back-shiny/0154--000--Meganium.png b/src/afd/sprites/back-shiny/0154-000-Meganium.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0154--000--Meganium.png
rename to src/afd/sprites/back-shiny/0154-000-Meganium.png
diff --git a/src/afd/sprites/back-shiny/0155--000--Cyndaquil.png b/src/afd/sprites/back-shiny/0155-000-Cyndaquil.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0155--000--Cyndaquil.png
rename to src/afd/sprites/back-shiny/0155-000-Cyndaquil.png
diff --git a/src/afd/sprites/back-shiny/0156--000--Quilava.png b/src/afd/sprites/back-shiny/0156-000-Quilava.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0156--000--Quilava.png
rename to src/afd/sprites/back-shiny/0156-000-Quilava.png
diff --git a/src/afd/sprites/back-shiny/0157--000--Typhlosion.png b/src/afd/sprites/back-shiny/0157-000-Typhlosion.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0157--000--Typhlosion.png
rename to src/afd/sprites/back-shiny/0157-000-Typhlosion.png
diff --git a/src/afd/sprites/back-shiny/0158--000--Totodile.png b/src/afd/sprites/back-shiny/0158-000-Totodile.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0158--000--Totodile.png
rename to src/afd/sprites/back-shiny/0158-000-Totodile.png
diff --git a/src/afd/sprites/back-shiny/0159--000--Croconaw.png b/src/afd/sprites/back-shiny/0159-000-Croconaw.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0159--000--Croconaw.png
rename to src/afd/sprites/back-shiny/0159-000-Croconaw.png
diff --git a/src/afd/sprites/back-shiny/0160--000--Feraligatr.png b/src/afd/sprites/back-shiny/0160-000-Feraligatr.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0160--000--Feraligatr.png
rename to src/afd/sprites/back-shiny/0160-000-Feraligatr.png
diff --git a/src/afd/sprites/back-shiny/0161--000--Sentret.png b/src/afd/sprites/back-shiny/0161-000-Sentret.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0161--000--Sentret.png
rename to src/afd/sprites/back-shiny/0161-000-Sentret.png
diff --git a/src/afd/sprites/back-shiny/0162--000--Furret.png b/src/afd/sprites/back-shiny/0162-000-Furret.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0162--000--Furret.png
rename to src/afd/sprites/back-shiny/0162-000-Furret.png
diff --git a/src/afd/sprites/back-shiny/0163--000--Hoothoot.png b/src/afd/sprites/back-shiny/0163-000-Hoothoot.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0163--000--Hoothoot.png
rename to src/afd/sprites/back-shiny/0163-000-Hoothoot.png
diff --git a/src/afd/sprites/back-shiny/0164--000--Noctowl.png b/src/afd/sprites/back-shiny/0164-000-Noctowl.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0164--000--Noctowl.png
rename to src/afd/sprites/back-shiny/0164-000-Noctowl.png
diff --git a/src/afd/sprites/back-shiny/0165--000--Ledyba.png b/src/afd/sprites/back-shiny/0165-000-Ledyba.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0165--000--Ledyba.png
rename to src/afd/sprites/back-shiny/0165-000-Ledyba.png
diff --git a/src/afd/sprites/back-shiny/0166--000--Ledian.png b/src/afd/sprites/back-shiny/0166-000-Ledian.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0166--000--Ledian.png
rename to src/afd/sprites/back-shiny/0166-000-Ledian.png
diff --git a/src/afd/sprites/back-shiny/0167--000--Spinarak.png b/src/afd/sprites/back-shiny/0167-000-Spinarak.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0167--000--Spinarak.png
rename to src/afd/sprites/back-shiny/0167-000-Spinarak.png
diff --git a/src/afd/sprites/back-shiny/0168--000--Ariados.png b/src/afd/sprites/back-shiny/0168-000-Ariados.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0168--000--Ariados.png
rename to src/afd/sprites/back-shiny/0168-000-Ariados.png
diff --git a/src/afd/sprites/back-shiny/0169--000--Crobat.png b/src/afd/sprites/back-shiny/0169-000-Crobat.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0169--000--Crobat.png
rename to src/afd/sprites/back-shiny/0169-000-Crobat.png
diff --git a/src/afd/sprites/back-shiny/0170--000--Chinchou.png b/src/afd/sprites/back-shiny/0170-000-Chinchou.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0170--000--Chinchou.png
rename to src/afd/sprites/back-shiny/0170-000-Chinchou.png
diff --git a/src/afd/sprites/back-shiny/0171--000--Lanturn.png b/src/afd/sprites/back-shiny/0171-000-Lanturn.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0171--000--Lanturn.png
rename to src/afd/sprites/back-shiny/0171-000-Lanturn.png
diff --git a/src/afd/sprites/back-shiny/0172--000--Pichu.png b/src/afd/sprites/back-shiny/0172-000-Pichu.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0172--000--Pichu.png
rename to src/afd/sprites/back-shiny/0172-000-Pichu.png
diff --git a/src/afd/sprites/back-shiny/0173--000--Cleffa.png b/src/afd/sprites/back-shiny/0173-000-Cleffa.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0173--000--Cleffa.png
rename to src/afd/sprites/back-shiny/0173-000-Cleffa.png
diff --git a/src/afd/sprites/back-shiny/0174--000--Igglybuff.png b/src/afd/sprites/back-shiny/0174-000-Igglybuff.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0174--000--Igglybuff.png
rename to src/afd/sprites/back-shiny/0174-000-Igglybuff.png
diff --git a/src/afd/sprites/back-shiny/0175--000--Togepi.png b/src/afd/sprites/back-shiny/0175-000-Togepi.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0175--000--Togepi.png
rename to src/afd/sprites/back-shiny/0175-000-Togepi.png
diff --git a/src/afd/sprites/back-shiny/0176--000--Togetic.png b/src/afd/sprites/back-shiny/0176-000-Togetic.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0176--000--Togetic.png
rename to src/afd/sprites/back-shiny/0176-000-Togetic.png
diff --git a/src/afd/sprites/back-shiny/0177--000--Natu.png b/src/afd/sprites/back-shiny/0177-000-Natu.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0177--000--Natu.png
rename to src/afd/sprites/back-shiny/0177-000-Natu.png
diff --git a/src/afd/sprites/back-shiny/0178--000--Xatu.png b/src/afd/sprites/back-shiny/0178-000-Xatu.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0178--000--Xatu.png
rename to src/afd/sprites/back-shiny/0178-000-Xatu.png
diff --git a/src/afd/sprites/back-shiny/0179--000--Mareep.png b/src/afd/sprites/back-shiny/0179-000-Mareep.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0179--000--Mareep.png
rename to src/afd/sprites/back-shiny/0179-000-Mareep.png
diff --git a/src/afd/sprites/back-shiny/0181--000--Ampharos.png b/src/afd/sprites/back-shiny/0181-000-Ampharos.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0181--000--Ampharos.png
rename to src/afd/sprites/back-shiny/0181-000-Ampharos.png
diff --git a/src/afd/sprites/back-shiny/0181--420--Ampharos--Mega.png b/src/afd/sprites/back-shiny/0181-420-Ampharos-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0181--420--Ampharos--Mega.png
rename to src/afd/sprites/back-shiny/0181-420-Ampharos-Mega.png
diff --git a/src/afd/sprites/back-shiny/0182--000--Bellossom.png b/src/afd/sprites/back-shiny/0182-000-Bellossom.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0182--000--Bellossom.png
rename to src/afd/sprites/back-shiny/0182-000-Bellossom.png
diff --git a/src/afd/sprites/back-shiny/0183--000--Marill.png b/src/afd/sprites/back-shiny/0183-000-Marill.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0183--000--Marill.png
rename to src/afd/sprites/back-shiny/0183-000-Marill.png
diff --git a/src/afd/sprites/back-shiny/0184--000--Azumarill.png b/src/afd/sprites/back-shiny/0184-000-Azumarill.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0184--000--Azumarill.png
rename to src/afd/sprites/back-shiny/0184-000-Azumarill.png
diff --git a/src/afd/sprites/back-shiny/0185--000--Sudowoodo.png b/src/afd/sprites/back-shiny/0185-000-Sudowoodo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0185--000--Sudowoodo.png
rename to src/afd/sprites/back-shiny/0185-000-Sudowoodo.png
diff --git a/src/afd/sprites/back-shiny/0186--000--Politoed.png b/src/afd/sprites/back-shiny/0186-000-Politoed.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0186--000--Politoed.png
rename to src/afd/sprites/back-shiny/0186-000-Politoed.png
diff --git a/src/afd/sprites/back-shiny/0187--000--Hoppip.png b/src/afd/sprites/back-shiny/0187-000-Hoppip.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0187--000--Hoppip.png
rename to src/afd/sprites/back-shiny/0187-000-Hoppip.png
diff --git a/src/afd/sprites/back-shiny/0188--000--Skiploom.png b/src/afd/sprites/back-shiny/0188-000-Skiploom.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0188--000--Skiploom.png
rename to src/afd/sprites/back-shiny/0188-000-Skiploom.png
diff --git a/src/afd/sprites/back-shiny/0189--000--Jumpluff.png b/src/afd/sprites/back-shiny/0189-000-Jumpluff.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0189--000--Jumpluff.png
rename to src/afd/sprites/back-shiny/0189-000-Jumpluff.png
diff --git a/src/afd/sprites/back-shiny/0190--000--Aipom.png b/src/afd/sprites/back-shiny/0190-000-Aipom.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0190--000--Aipom.png
rename to src/afd/sprites/back-shiny/0190-000-Aipom.png
diff --git a/src/afd/sprites/back-shiny/0191--000--Sunkern.png b/src/afd/sprites/back-shiny/0191-000-Sunkern.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0191--000--Sunkern.png
rename to src/afd/sprites/back-shiny/0191-000-Sunkern.png
diff --git a/src/afd/sprites/back-shiny/0192--000--Sunflora.png b/src/afd/sprites/back-shiny/0192-000-Sunflora.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0192--000--Sunflora.png
rename to src/afd/sprites/back-shiny/0192-000-Sunflora.png
diff --git a/src/afd/sprites/back-shiny/0193--000--Yanma.png b/src/afd/sprites/back-shiny/0193-000-Yanma.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0193--000--Yanma.png
rename to src/afd/sprites/back-shiny/0193-000-Yanma.png
diff --git a/src/afd/sprites/back-shiny/0194--000--Wooper.png b/src/afd/sprites/back-shiny/0194-000-Wooper.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0194--000--Wooper.png
rename to src/afd/sprites/back-shiny/0194-000-Wooper.png
diff --git a/src/afd/sprites/back-shiny/0195--000--Quagsire.png b/src/afd/sprites/back-shiny/0195-000-Quagsire.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0195--000--Quagsire.png
rename to src/afd/sprites/back-shiny/0195-000-Quagsire.png
diff --git a/src/afd/sprites/back-shiny/0196--000--Espeon.png b/src/afd/sprites/back-shiny/0196-000-Espeon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0196--000--Espeon.png
rename to src/afd/sprites/back-shiny/0196-000-Espeon.png
diff --git a/src/afd/sprites/back-shiny/0197--000--Umbreon.png b/src/afd/sprites/back-shiny/0197-000-Umbreon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0197--000--Umbreon.png
rename to src/afd/sprites/back-shiny/0197-000-Umbreon.png
diff --git a/src/afd/sprites/back-shiny/0198--000--Murkrow.png b/src/afd/sprites/back-shiny/0198-000-Murkrow.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0198--000--Murkrow.png
rename to src/afd/sprites/back-shiny/0198-000-Murkrow.png
diff --git a/src/afd/sprites/back-shiny/0199--000--Slowking.png b/src/afd/sprites/back-shiny/0199-000-Slowking.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0199--000--Slowking.png
rename to src/afd/sprites/back-shiny/0199-000-Slowking.png
diff --git a/src/afd/sprites/back-shiny/0200--000--Misdreavus.png b/src/afd/sprites/back-shiny/0200-000-Misdreavus.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0200--000--Misdreavus.png
rename to src/afd/sprites/back-shiny/0200-000-Misdreavus.png
diff --git a/src/afd/sprites/back-shiny/0201--000--Unown.png b/src/afd/sprites/back-shiny/0201-000-Unown.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0201--000--Unown.png
rename to src/afd/sprites/back-shiny/0201-000-Unown.png
diff --git a/src/afd/sprites/back-shiny/0202--000--Wobbuffet.png b/src/afd/sprites/back-shiny/0202-000-Wobbuffet.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0202--000--Wobbuffet.png
rename to src/afd/sprites/back-shiny/0202-000-Wobbuffet.png
diff --git a/src/afd/sprites/back-shiny/0203--000--Girafarig.png b/src/afd/sprites/back-shiny/0203-000-Girafarig.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0203--000--Girafarig.png
rename to src/afd/sprites/back-shiny/0203-000-Girafarig.png
diff --git a/src/afd/sprites/back-shiny/0204--000--Pineco.png b/src/afd/sprites/back-shiny/0204-000-Pineco.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0204--000--Pineco.png
rename to src/afd/sprites/back-shiny/0204-000-Pineco.png
diff --git a/src/afd/sprites/back-shiny/0205--000--Forretress.png b/src/afd/sprites/back-shiny/0205-000-Forretress.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0205--000--Forretress.png
rename to src/afd/sprites/back-shiny/0205-000-Forretress.png
diff --git a/src/afd/sprites/back-shiny/0206--000--Dunsparce.png b/src/afd/sprites/back-shiny/0206-000-Dunsparce.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0206--000--Dunsparce.png
rename to src/afd/sprites/back-shiny/0206-000-Dunsparce.png
diff --git a/src/afd/sprites/back-shiny/0207--000--Gligar.png b/src/afd/sprites/back-shiny/0207-000-Gligar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0207--000--Gligar.png
rename to src/afd/sprites/back-shiny/0207-000-Gligar.png
diff --git a/src/afd/sprites/back-shiny/0208--000--Steelix.png b/src/afd/sprites/back-shiny/0208-000-Steelix.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0208--000--Steelix.png
rename to src/afd/sprites/back-shiny/0208-000-Steelix.png
diff --git a/src/afd/sprites/back-shiny/0208--420--Steelix--Mega.png b/src/afd/sprites/back-shiny/0208-420-Steelix-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0208--420--Steelix--Mega.png
rename to src/afd/sprites/back-shiny/0208-420-Steelix-Mega.png
diff --git a/src/afd/sprites/back-shiny/0209--000--Snubbull.png b/src/afd/sprites/back-shiny/0209-000-Snubbull.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0209--000--Snubbull.png
rename to src/afd/sprites/back-shiny/0209-000-Snubbull.png
diff --git a/src/afd/sprites/back-shiny/0210--000--Granbull.png b/src/afd/sprites/back-shiny/0210-000-Granbull.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0210--000--Granbull.png
rename to src/afd/sprites/back-shiny/0210-000-Granbull.png
diff --git a/src/afd/sprites/back-shiny/0211--000--Qwilfish.png b/src/afd/sprites/back-shiny/0211-000-Qwilfish.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0211--000--Qwilfish.png
rename to src/afd/sprites/back-shiny/0211-000-Qwilfish.png
diff --git a/src/afd/sprites/back-shiny/0212--000--Scizor.png b/src/afd/sprites/back-shiny/0212-000-Scizor.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0212--000--Scizor.png
rename to src/afd/sprites/back-shiny/0212-000-Scizor.png
diff --git a/src/afd/sprites/back-shiny/0212--420--Scizor--Mega.png b/src/afd/sprites/back-shiny/0212-420-Scizor-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0212--420--Scizor--Mega.png
rename to src/afd/sprites/back-shiny/0212-420-Scizor-Mega.png
diff --git a/src/afd/sprites/back-shiny/0213--000--Shuckle.png b/src/afd/sprites/back-shiny/0213-000-Shuckle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0213--000--Shuckle.png
rename to src/afd/sprites/back-shiny/0213-000-Shuckle.png
diff --git a/src/afd/sprites/back-shiny/0214--000--Heracross.png b/src/afd/sprites/back-shiny/0214-000-Heracross.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0214--000--Heracross.png
rename to src/afd/sprites/back-shiny/0214-000-Heracross.png
diff --git a/src/afd/sprites/back-shiny/0214--420--Heracross--Mega.png b/src/afd/sprites/back-shiny/0214-420-Heracross-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0214--420--Heracross--Mega.png
rename to src/afd/sprites/back-shiny/0214-420-Heracross-Mega.png
diff --git a/src/afd/sprites/back-shiny/0215--000--Sneasel.png b/src/afd/sprites/back-shiny/0215-000-Sneasel.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0215--000--Sneasel.png
rename to src/afd/sprites/back-shiny/0215-000-Sneasel.png
diff --git a/src/afd/sprites/back-shiny/0216--000--Teddiursa.png b/src/afd/sprites/back-shiny/0216-000-Teddiursa.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0216--000--Teddiursa.png
rename to src/afd/sprites/back-shiny/0216-000-Teddiursa.png
diff --git a/src/afd/sprites/back-shiny/0217--000--Ursaring.png b/src/afd/sprites/back-shiny/0217-000-Ursaring.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0217--000--Ursaring.png
rename to src/afd/sprites/back-shiny/0217-000-Ursaring.png
diff --git a/src/afd/sprites/back-shiny/0218--000--Slugma.png b/src/afd/sprites/back-shiny/0218-000-Slugma.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0218--000--Slugma.png
rename to src/afd/sprites/back-shiny/0218-000-Slugma.png
diff --git a/src/afd/sprites/back-shiny/0219--000--Magcargo.png b/src/afd/sprites/back-shiny/0219-000-Magcargo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0219--000--Magcargo.png
rename to src/afd/sprites/back-shiny/0219-000-Magcargo.png
diff --git a/src/afd/sprites/back-shiny/0220--000--Swinub.png b/src/afd/sprites/back-shiny/0220-000-Swinub.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0220--000--Swinub.png
rename to src/afd/sprites/back-shiny/0220-000-Swinub.png
diff --git a/src/afd/sprites/back-shiny/0221--000--Piloswine.png b/src/afd/sprites/back-shiny/0221-000-Piloswine.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0221--000--Piloswine.png
rename to src/afd/sprites/back-shiny/0221-000-Piloswine.png
diff --git a/src/afd/sprites/back-shiny/0222--000--Corsola.png b/src/afd/sprites/back-shiny/0222-000-Corsola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0222--000--Corsola.png
rename to src/afd/sprites/back-shiny/0222-000-Corsola.png
diff --git a/src/afd/sprites/back-shiny/0222--420--Corsola--Galar.png b/src/afd/sprites/back-shiny/0222-420-Corsola-Galar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0222--420--Corsola--Galar.png
rename to src/afd/sprites/back-shiny/0222-420-Corsola-Galar.png
diff --git a/src/afd/sprites/back-shiny/0223--000--Remoraid.png b/src/afd/sprites/back-shiny/0223-000-Remoraid.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0223--000--Remoraid.png
rename to src/afd/sprites/back-shiny/0223-000-Remoraid.png
diff --git a/src/afd/sprites/back-shiny/0224--000--Octillery.png b/src/afd/sprites/back-shiny/0224-000-Octillery.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0224--000--Octillery.png
rename to src/afd/sprites/back-shiny/0224-000-Octillery.png
diff --git a/src/afd/sprites/back-shiny/0225--000--Delibird.png b/src/afd/sprites/back-shiny/0225-000-Delibird.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0225--000--Delibird.png
rename to src/afd/sprites/back-shiny/0225-000-Delibird.png
diff --git a/src/afd/sprites/back-shiny/0226--000--Mantine.png b/src/afd/sprites/back-shiny/0226-000-Mantine.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0226--000--Mantine.png
rename to src/afd/sprites/back-shiny/0226-000-Mantine.png
diff --git a/src/afd/sprites/back-shiny/0227--000--Skarmory.png b/src/afd/sprites/back-shiny/0227-000-Skarmory.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0227--000--Skarmory.png
rename to src/afd/sprites/back-shiny/0227-000-Skarmory.png
diff --git a/src/afd/sprites/back-shiny/0228--000--Houndour.png b/src/afd/sprites/back-shiny/0228-000-Houndour.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0228--000--Houndour.png
rename to src/afd/sprites/back-shiny/0228-000-Houndour.png
diff --git a/src/afd/sprites/back-shiny/0229--000--Houndoom.png b/src/afd/sprites/back-shiny/0229-000-Houndoom.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0229--000--Houndoom.png
rename to src/afd/sprites/back-shiny/0229-000-Houndoom.png
diff --git a/src/afd/sprites/back-shiny/0229--420--Houndoom--Mega.png b/src/afd/sprites/back-shiny/0229-420-Houndoom-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0229--420--Houndoom--Mega.png
rename to src/afd/sprites/back-shiny/0229-420-Houndoom-Mega.png
diff --git a/src/afd/sprites/back-shiny/0231--000--Phanpy.png b/src/afd/sprites/back-shiny/0231-000-Phanpy.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0231--000--Phanpy.png
rename to src/afd/sprites/back-shiny/0231-000-Phanpy.png
diff --git a/src/afd/sprites/back-shiny/0232--000--Donphan.png b/src/afd/sprites/back-shiny/0232-000-Donphan.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0232--000--Donphan.png
rename to src/afd/sprites/back-shiny/0232-000-Donphan.png
diff --git a/src/afd/sprites/back-shiny/0233--000--Porygon2.png b/src/afd/sprites/back-shiny/0233-000-Porygon2.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0233--000--Porygon2.png
rename to src/afd/sprites/back-shiny/0233-000-Porygon2.png
diff --git a/src/afd/sprites/back-shiny/0234--000--Stantler.png b/src/afd/sprites/back-shiny/0234-000-Stantler.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0234--000--Stantler.png
rename to src/afd/sprites/back-shiny/0234-000-Stantler.png
diff --git a/src/afd/sprites/back-shiny/0235--000--Smeargle.png b/src/afd/sprites/back-shiny/0235-000-Smeargle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0235--000--Smeargle.png
rename to src/afd/sprites/back-shiny/0235-000-Smeargle.png
diff --git a/src/afd/sprites/back-shiny/0236--000--Tyrogue.png b/src/afd/sprites/back-shiny/0236-000-Tyrogue.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0236--000--Tyrogue.png
rename to src/afd/sprites/back-shiny/0236-000-Tyrogue.png
diff --git a/src/afd/sprites/back-shiny/0237--000--Hitmontop.png b/src/afd/sprites/back-shiny/0237-000-Hitmontop.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0237--000--Hitmontop.png
rename to src/afd/sprites/back-shiny/0237-000-Hitmontop.png
diff --git a/src/afd/sprites/back-shiny/0238--000--Smoochum.png b/src/afd/sprites/back-shiny/0238-000-Smoochum.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0238--000--Smoochum.png
rename to src/afd/sprites/back-shiny/0238-000-Smoochum.png
diff --git a/src/afd/sprites/back-shiny/0239--000--Elekid.png b/src/afd/sprites/back-shiny/0239-000-Elekid.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0239--000--Elekid.png
rename to src/afd/sprites/back-shiny/0239-000-Elekid.png
diff --git a/src/afd/sprites/back-shiny/0240--000--Magby.png b/src/afd/sprites/back-shiny/0240-000-Magby.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0240--000--Magby.png
rename to src/afd/sprites/back-shiny/0240-000-Magby.png
diff --git a/src/afd/sprites/back-shiny/0241--000--Miltank.png b/src/afd/sprites/back-shiny/0241-000-Miltank.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0241--000--Miltank.png
rename to src/afd/sprites/back-shiny/0241-000-Miltank.png
diff --git a/src/afd/sprites/back-shiny/0242--000--Blissey.png b/src/afd/sprites/back-shiny/0242-000-Blissey.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0242--000--Blissey.png
rename to src/afd/sprites/back-shiny/0242-000-Blissey.png
diff --git a/src/afd/sprites/back-shiny/0243--000--Raikou.png b/src/afd/sprites/back-shiny/0243-000-Raikou.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0243--000--Raikou.png
rename to src/afd/sprites/back-shiny/0243-000-Raikou.png
diff --git a/src/afd/sprites/back-shiny/0244--000--Entei.png b/src/afd/sprites/back-shiny/0244-000-Entei.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0244--000--Entei.png
rename to src/afd/sprites/back-shiny/0244-000-Entei.png
diff --git a/src/afd/sprites/back-shiny/0245--000--Suicune.png b/src/afd/sprites/back-shiny/0245-000-Suicune.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0245--000--Suicune.png
rename to src/afd/sprites/back-shiny/0245-000-Suicune.png
diff --git a/src/afd/sprites/back-shiny/0246--000--Larvitar.png b/src/afd/sprites/back-shiny/0246-000-Larvitar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0246--000--Larvitar.png
rename to src/afd/sprites/back-shiny/0246-000-Larvitar.png
diff --git a/src/afd/sprites/back-shiny/0247--000--Pupitar.png b/src/afd/sprites/back-shiny/0247-000-Pupitar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0247--000--Pupitar.png
rename to src/afd/sprites/back-shiny/0247-000-Pupitar.png
diff --git a/src/afd/sprites/back-shiny/0248--000--Tyranitar.png b/src/afd/sprites/back-shiny/0248-000-Tyranitar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0248--000--Tyranitar.png
rename to src/afd/sprites/back-shiny/0248-000-Tyranitar.png
diff --git a/src/afd/sprites/back-shiny/0248--420--Tyranitar--Mega.png b/src/afd/sprites/back-shiny/0248-420-Tyranitar-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0248--420--Tyranitar--Mega.png
rename to src/afd/sprites/back-shiny/0248-420-Tyranitar-Mega.png
diff --git a/src/afd/sprites/back-shiny/0249--000--Lugia.png b/src/afd/sprites/back-shiny/0249-000-Lugia.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0249--000--Lugia.png
rename to src/afd/sprites/back-shiny/0249-000-Lugia.png
diff --git a/src/afd/sprites/back-shiny/0250--000--Ho-Oh.png b/src/afd/sprites/back-shiny/0250-000-Ho~Oh.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0250--000--Ho-Oh.png
rename to src/afd/sprites/back-shiny/0250-000-Ho~Oh.png
diff --git a/src/afd/sprites/back-shiny/0251--000--Celebi.gif b/src/afd/sprites/back-shiny/0251-000-Celebi.gif
similarity index 100%
rename from src/afd/sprites/back-shiny/0251--000--Celebi.gif
rename to src/afd/sprites/back-shiny/0251-000-Celebi.gif
diff --git a/src/afd/sprites/back-shiny/0252--000--Treecko.png b/src/afd/sprites/back-shiny/0252-000-Treecko.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0252--000--Treecko.png
rename to src/afd/sprites/back-shiny/0252-000-Treecko.png
diff --git a/src/afd/sprites/back-shiny/0253--000--Grovyle.png b/src/afd/sprites/back-shiny/0253-000-Grovyle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0253--000--Grovyle.png
rename to src/afd/sprites/back-shiny/0253-000-Grovyle.png
diff --git a/src/afd/sprites/back-shiny/0254--000--Sceptile.png b/src/afd/sprites/back-shiny/0254-000-Sceptile.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0254--000--Sceptile.png
rename to src/afd/sprites/back-shiny/0254-000-Sceptile.png
diff --git a/src/afd/sprites/back-shiny/0254--420--Sceptile--Mega.png b/src/afd/sprites/back-shiny/0254-420-Sceptile-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0254--420--Sceptile--Mega.png
rename to src/afd/sprites/back-shiny/0254-420-Sceptile-Mega.png
diff --git a/src/afd/sprites/back-shiny/0255--000--Torchic.png b/src/afd/sprites/back-shiny/0255-000-Torchic.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0255--000--Torchic.png
rename to src/afd/sprites/back-shiny/0255-000-Torchic.png
diff --git a/src/afd/sprites/back-shiny/0256--000--Combusken.png b/src/afd/sprites/back-shiny/0256-000-Combusken.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0256--000--Combusken.png
rename to src/afd/sprites/back-shiny/0256-000-Combusken.png
diff --git a/src/afd/sprites/back-shiny/0257--000--Blaziken.png b/src/afd/sprites/back-shiny/0257-000-Blaziken.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0257--000--Blaziken.png
rename to src/afd/sprites/back-shiny/0257-000-Blaziken.png
diff --git a/src/afd/sprites/back-shiny/0257--420--Blaziken--Mega.png b/src/afd/sprites/back-shiny/0257-420-Blaziken-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0257--420--Blaziken--Mega.png
rename to src/afd/sprites/back-shiny/0257-420-Blaziken-Mega.png
diff --git a/src/afd/sprites/back-shiny/0258--000--Mudkip.png b/src/afd/sprites/back-shiny/0258-000-Mudkip.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0258--000--Mudkip.png
rename to src/afd/sprites/back-shiny/0258-000-Mudkip.png
diff --git a/src/afd/sprites/back-shiny/0259--000--Marshtomp.png b/src/afd/sprites/back-shiny/0259-000-Marshtomp.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0259--000--Marshtomp.png
rename to src/afd/sprites/back-shiny/0259-000-Marshtomp.png
diff --git a/src/afd/sprites/back-shiny/0260--000--Swampert.png b/src/afd/sprites/back-shiny/0260-000-Swampert.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0260--000--Swampert.png
rename to src/afd/sprites/back-shiny/0260-000-Swampert.png
diff --git a/src/afd/sprites/back-shiny/0260--420--Swampert--Mega.png b/src/afd/sprites/back-shiny/0260-420-Swampert-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0260--420--Swampert--Mega.png
rename to src/afd/sprites/back-shiny/0260-420-Swampert-Mega.png
diff --git a/src/afd/sprites/back-shiny/0261--000--Poochyena.png b/src/afd/sprites/back-shiny/0261-000-Poochyena.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0261--000--Poochyena.png
rename to src/afd/sprites/back-shiny/0261-000-Poochyena.png
diff --git a/src/afd/sprites/back-shiny/0262--000--Mightyena.png b/src/afd/sprites/back-shiny/0262-000-Mightyena.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0262--000--Mightyena.png
rename to src/afd/sprites/back-shiny/0262-000-Mightyena.png
diff --git a/src/afd/sprites/back-shiny/0263--000--Zigzagoon.png b/src/afd/sprites/back-shiny/0263-000-Zigzagoon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0263--000--Zigzagoon.png
rename to src/afd/sprites/back-shiny/0263-000-Zigzagoon.png
diff --git a/src/afd/sprites/back-shiny/0263--420--Zigzagoon--Galar.png b/src/afd/sprites/back-shiny/0263-420-Zigzagoon-Galar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0263--420--Zigzagoon--Galar.png
rename to src/afd/sprites/back-shiny/0263-420-Zigzagoon-Galar.png
diff --git a/src/afd/sprites/back-shiny/0264--000--Linoone.png b/src/afd/sprites/back-shiny/0264-000-Linoone.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0264--000--Linoone.png
rename to src/afd/sprites/back-shiny/0264-000-Linoone.png
diff --git a/src/afd/sprites/back-shiny/0264--420--Linoone--Galar.png b/src/afd/sprites/back-shiny/0264-420-Linoone-Galar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0264--420--Linoone--Galar.png
rename to src/afd/sprites/back-shiny/0264-420-Linoone-Galar.png
diff --git a/src/afd/sprites/back-shiny/0265--000--Wurmple.png b/src/afd/sprites/back-shiny/0265-000-Wurmple.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0265--000--Wurmple.png
rename to src/afd/sprites/back-shiny/0265-000-Wurmple.png
diff --git a/src/afd/sprites/back-shiny/0266--000--Silcoon.png b/src/afd/sprites/back-shiny/0266-000-Silcoon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0266--000--Silcoon.png
rename to src/afd/sprites/back-shiny/0266-000-Silcoon.png
diff --git a/src/afd/sprites/back-shiny/0267--000--Beautifly.png b/src/afd/sprites/back-shiny/0267-000-Beautifly.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0267--000--Beautifly.png
rename to src/afd/sprites/back-shiny/0267-000-Beautifly.png
diff --git a/src/afd/sprites/back-shiny/0268--000--Cascoon.png b/src/afd/sprites/back-shiny/0268-000-Cascoon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0268--000--Cascoon.png
rename to src/afd/sprites/back-shiny/0268-000-Cascoon.png
diff --git a/src/afd/sprites/back-shiny/0269--000--Dustox.png b/src/afd/sprites/back-shiny/0269-000-Dustox.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0269--000--Dustox.png
rename to src/afd/sprites/back-shiny/0269-000-Dustox.png
diff --git a/src/afd/sprites/back-shiny/0270--000--Lotad.png b/src/afd/sprites/back-shiny/0270-000-Lotad.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0270--000--Lotad.png
rename to src/afd/sprites/back-shiny/0270-000-Lotad.png
diff --git a/src/afd/sprites/back-shiny/0271--000--Lombre.png b/src/afd/sprites/back-shiny/0271-000-Lombre.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0271--000--Lombre.png
rename to src/afd/sprites/back-shiny/0271-000-Lombre.png
diff --git a/src/afd/sprites/back-shiny/0272--000--Ludicolo.png b/src/afd/sprites/back-shiny/0272-000-Ludicolo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0272--000--Ludicolo.png
rename to src/afd/sprites/back-shiny/0272-000-Ludicolo.png
diff --git a/src/afd/sprites/back-shiny/0273--000--Seedot.png b/src/afd/sprites/back-shiny/0273-000-Seedot.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0273--000--Seedot.png
rename to src/afd/sprites/back-shiny/0273-000-Seedot.png
diff --git a/src/afd/sprites/back-shiny/0274--000--Nuzleaf.png b/src/afd/sprites/back-shiny/0274-000-Nuzleaf.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0274--000--Nuzleaf.png
rename to src/afd/sprites/back-shiny/0274-000-Nuzleaf.png
diff --git a/src/afd/sprites/back-shiny/0275--000--Shiftry.png b/src/afd/sprites/back-shiny/0275-000-Shiftry.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0275--000--Shiftry.png
rename to src/afd/sprites/back-shiny/0275-000-Shiftry.png
diff --git a/src/afd/sprites/back-shiny/0276--000--Taillow.png b/src/afd/sprites/back-shiny/0276-000-Taillow.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0276--000--Taillow.png
rename to src/afd/sprites/back-shiny/0276-000-Taillow.png
diff --git a/src/afd/sprites/back-shiny/0277--000--Swellow.png b/src/afd/sprites/back-shiny/0277-000-Swellow.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0277--000--Swellow.png
rename to src/afd/sprites/back-shiny/0277-000-Swellow.png
diff --git a/src/afd/sprites/back-shiny/0278--000--Wingull.png b/src/afd/sprites/back-shiny/0278-000-Wingull.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0278--000--Wingull.png
rename to src/afd/sprites/back-shiny/0278-000-Wingull.png
diff --git a/src/afd/sprites/back-shiny/0279--000--Pelipper.png b/src/afd/sprites/back-shiny/0279-000-Pelipper.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0279--000--Pelipper.png
rename to src/afd/sprites/back-shiny/0279-000-Pelipper.png
diff --git a/src/afd/sprites/back-shiny/0280--000--Ralts.png b/src/afd/sprites/back-shiny/0280-000-Ralts.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0280--000--Ralts.png
rename to src/afd/sprites/back-shiny/0280-000-Ralts.png
diff --git a/src/afd/sprites/back-shiny/0281--000--Kirlia.png b/src/afd/sprites/back-shiny/0281-000-Kirlia.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0281--000--Kirlia.png
rename to src/afd/sprites/back-shiny/0281-000-Kirlia.png
diff --git a/src/afd/sprites/back-shiny/0282--000--Gardevoir.png b/src/afd/sprites/back-shiny/0282-000-Gardevoir.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0282--000--Gardevoir.png
rename to src/afd/sprites/back-shiny/0282-000-Gardevoir.png
diff --git a/src/afd/sprites/back-shiny/0282--420--Gardevoir--Mega.png b/src/afd/sprites/back-shiny/0282-420-Gardevoir-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0282--420--Gardevoir--Mega.png
rename to src/afd/sprites/back-shiny/0282-420-Gardevoir-Mega.png
diff --git a/src/afd/sprites/back-shiny/0283--000--Surskit.png b/src/afd/sprites/back-shiny/0283-000-Surskit.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0283--000--Surskit.png
rename to src/afd/sprites/back-shiny/0283-000-Surskit.png
diff --git a/src/afd/sprites/back-shiny/0284--000--Masquerain.png b/src/afd/sprites/back-shiny/0284-000-Masquerain.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0284--000--Masquerain.png
rename to src/afd/sprites/back-shiny/0284-000-Masquerain.png
diff --git a/src/afd/sprites/back-shiny/0285--000--Shroomish.png b/src/afd/sprites/back-shiny/0285-000-Shroomish.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0285--000--Shroomish.png
rename to src/afd/sprites/back-shiny/0285-000-Shroomish.png
diff --git a/src/afd/sprites/back-shiny/0286--000--Breloom.png b/src/afd/sprites/back-shiny/0286-000-Breloom.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0286--000--Breloom.png
rename to src/afd/sprites/back-shiny/0286-000-Breloom.png
diff --git a/src/afd/sprites/back-shiny/0287--000--Slakoth.png b/src/afd/sprites/back-shiny/0287-000-Slakoth.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0287--000--Slakoth.png
rename to src/afd/sprites/back-shiny/0287-000-Slakoth.png
diff --git a/src/afd/sprites/back-shiny/0288--000--Vigoroth.png b/src/afd/sprites/back-shiny/0288-000-Vigoroth.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0288--000--Vigoroth.png
rename to src/afd/sprites/back-shiny/0288-000-Vigoroth.png
diff --git a/src/afd/sprites/back-shiny/0289--000--Slaking.png b/src/afd/sprites/back-shiny/0289-000-Slaking.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0289--000--Slaking.png
rename to src/afd/sprites/back-shiny/0289-000-Slaking.png
diff --git a/src/afd/sprites/back-shiny/0290--000--Nincada.png b/src/afd/sprites/back-shiny/0290-000-Nincada.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0290--000--Nincada.png
rename to src/afd/sprites/back-shiny/0290-000-Nincada.png
diff --git a/src/afd/sprites/back-shiny/0291--000--Ninjask.png b/src/afd/sprites/back-shiny/0291-000-Ninjask.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0291--000--Ninjask.png
rename to src/afd/sprites/back-shiny/0291-000-Ninjask.png
diff --git a/src/afd/sprites/back-shiny/0292--000--Shedinja.png b/src/afd/sprites/back-shiny/0292-000-Shedinja.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0292--000--Shedinja.png
rename to src/afd/sprites/back-shiny/0292-000-Shedinja.png
diff --git a/src/afd/sprites/back-shiny/0293--000--Whismur.png b/src/afd/sprites/back-shiny/0293-000-Whismur.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0293--000--Whismur.png
rename to src/afd/sprites/back-shiny/0293-000-Whismur.png
diff --git a/src/afd/sprites/back-shiny/0294--000--Loudred.png b/src/afd/sprites/back-shiny/0294-000-Loudred.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0294--000--Loudred.png
rename to src/afd/sprites/back-shiny/0294-000-Loudred.png
diff --git a/src/afd/sprites/back-shiny/0295--000--Exploud.png b/src/afd/sprites/back-shiny/0295-000-Exploud.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0295--000--Exploud.png
rename to src/afd/sprites/back-shiny/0295-000-Exploud.png
diff --git a/src/afd/sprites/back-shiny/0296--000--Makuhita.png b/src/afd/sprites/back-shiny/0296-000-Makuhita.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0296--000--Makuhita.png
rename to src/afd/sprites/back-shiny/0296-000-Makuhita.png
diff --git a/src/afd/sprites/back-shiny/0297--000--Hariyama.png b/src/afd/sprites/back-shiny/0297-000-Hariyama.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0297--000--Hariyama.png
rename to src/afd/sprites/back-shiny/0297-000-Hariyama.png
diff --git a/src/afd/sprites/back-shiny/0298--000--Azurill.png b/src/afd/sprites/back-shiny/0298-000-Azurill.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0298--000--Azurill.png
rename to src/afd/sprites/back-shiny/0298-000-Azurill.png
diff --git a/src/afd/sprites/back-shiny/0299--000--Nosepass.png b/src/afd/sprites/back-shiny/0299-000-Nosepass.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0299--000--Nosepass.png
rename to src/afd/sprites/back-shiny/0299-000-Nosepass.png
diff --git a/src/afd/sprites/back-shiny/0300--000--Skitty.png b/src/afd/sprites/back-shiny/0300-000-Skitty.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0300--000--Skitty.png
rename to src/afd/sprites/back-shiny/0300-000-Skitty.png
diff --git a/src/afd/sprites/back-shiny/0301--000--Delcatty.png b/src/afd/sprites/back-shiny/0301-000-Delcatty.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0301--000--Delcatty.png
rename to src/afd/sprites/back-shiny/0301-000-Delcatty.png
diff --git a/src/afd/sprites/back-shiny/0302--000--Sableye.png b/src/afd/sprites/back-shiny/0302-000-Sableye.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0302--000--Sableye.png
rename to src/afd/sprites/back-shiny/0302-000-Sableye.png
diff --git a/src/afd/sprites/back-shiny/0302--420--Sableye--Mega.png b/src/afd/sprites/back-shiny/0302-420-Sableye-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0302--420--Sableye--Mega.png
rename to src/afd/sprites/back-shiny/0302-420-Sableye-Mega.png
diff --git a/src/afd/sprites/back-shiny/0303--000--Mawile.png b/src/afd/sprites/back-shiny/0303-000-Mawile.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0303--000--Mawile.png
rename to src/afd/sprites/back-shiny/0303-000-Mawile.png
diff --git a/src/afd/sprites/back-shiny/0303--420--Mawile--Mega.png b/src/afd/sprites/back-shiny/0303-420-Mawile-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0303--420--Mawile--Mega.png
rename to src/afd/sprites/back-shiny/0303-420-Mawile-Mega.png
diff --git a/src/afd/sprites/back-shiny/0304--000--Aron.png b/src/afd/sprites/back-shiny/0304-000-Aron.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0304--000--Aron.png
rename to src/afd/sprites/back-shiny/0304-000-Aron.png
diff --git a/src/afd/sprites/back-shiny/0305--000--Lairon.png b/src/afd/sprites/back-shiny/0305-000-Lairon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0305--000--Lairon.png
rename to src/afd/sprites/back-shiny/0305-000-Lairon.png
diff --git a/src/afd/sprites/back-shiny/0306--000--Aggron.png b/src/afd/sprites/back-shiny/0306-000-Aggron.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0306--000--Aggron.png
rename to src/afd/sprites/back-shiny/0306-000-Aggron.png
diff --git a/src/afd/sprites/back-shiny/0306--420--Aggron--Mega.png b/src/afd/sprites/back-shiny/0306-420-Aggron-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0306--420--Aggron--Mega.png
rename to src/afd/sprites/back-shiny/0306-420-Aggron-Mega.png
diff --git a/src/afd/sprites/back-shiny/0307--000--Meditite.png b/src/afd/sprites/back-shiny/0307-000-Meditite.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0307--000--Meditite.png
rename to src/afd/sprites/back-shiny/0307-000-Meditite.png
diff --git a/src/afd/sprites/back-shiny/0308--000--Medicham.png b/src/afd/sprites/back-shiny/0308-000-Medicham.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0308--000--Medicham.png
rename to src/afd/sprites/back-shiny/0308-000-Medicham.png
diff --git a/src/afd/sprites/back-shiny/0308--420--Medicham--Mega.png b/src/afd/sprites/back-shiny/0308-420-Medicham-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0308--420--Medicham--Mega.png
rename to src/afd/sprites/back-shiny/0308-420-Medicham-Mega.png
diff --git a/src/afd/sprites/back-shiny/0309--000--Electrike.png b/src/afd/sprites/back-shiny/0309-000-Electrike.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0309--000--Electrike.png
rename to src/afd/sprites/back-shiny/0309-000-Electrike.png
diff --git a/src/afd/sprites/back-shiny/0310--000--Manectric.png b/src/afd/sprites/back-shiny/0310-000-Manectric.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0310--000--Manectric.png
rename to src/afd/sprites/back-shiny/0310-000-Manectric.png
diff --git a/src/afd/sprites/back-shiny/0310--420--Manectric--Mega.png b/src/afd/sprites/back-shiny/0310-420-Manectric-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0310--420--Manectric--Mega.png
rename to src/afd/sprites/back-shiny/0310-420-Manectric-Mega.png
diff --git a/src/afd/sprites/back-shiny/0311--000--Plusle.png b/src/afd/sprites/back-shiny/0311-000-Plusle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0311--000--Plusle.png
rename to src/afd/sprites/back-shiny/0311-000-Plusle.png
diff --git a/src/afd/sprites/back-shiny/0312--000--Minun.png b/src/afd/sprites/back-shiny/0312-000-Minun.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0312--000--Minun.png
rename to src/afd/sprites/back-shiny/0312-000-Minun.png
diff --git a/src/afd/sprites/back-shiny/0313--000--Volbeat.png b/src/afd/sprites/back-shiny/0313-000-Volbeat.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0313--000--Volbeat.png
rename to src/afd/sprites/back-shiny/0313-000-Volbeat.png
diff --git a/src/afd/sprites/back-shiny/0314--000--Illumise.png b/src/afd/sprites/back-shiny/0314-000-Illumise.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0314--000--Illumise.png
rename to src/afd/sprites/back-shiny/0314-000-Illumise.png
diff --git a/src/afd/sprites/back-shiny/0315--000--Roselia.png b/src/afd/sprites/back-shiny/0315-000-Roselia.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0315--000--Roselia.png
rename to src/afd/sprites/back-shiny/0315-000-Roselia.png
diff --git a/src/afd/sprites/back-shiny/0316--000--Gulpin.png b/src/afd/sprites/back-shiny/0316-000-Gulpin.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0316--000--Gulpin.png
rename to src/afd/sprites/back-shiny/0316-000-Gulpin.png
diff --git a/src/afd/sprites/back-shiny/0317--000--Swalot.png b/src/afd/sprites/back-shiny/0317-000-Swalot.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0317--000--Swalot.png
rename to src/afd/sprites/back-shiny/0317-000-Swalot.png
diff --git a/src/afd/sprites/back-shiny/0318--000--Carvanha.png b/src/afd/sprites/back-shiny/0318-000-Carvanha.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0318--000--Carvanha.png
rename to src/afd/sprites/back-shiny/0318-000-Carvanha.png
diff --git a/src/afd/sprites/back-shiny/0319--000--Sharpedo.png b/src/afd/sprites/back-shiny/0319-000-Sharpedo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0319--000--Sharpedo.png
rename to src/afd/sprites/back-shiny/0319-000-Sharpedo.png
diff --git a/src/afd/sprites/back-shiny/0319--420--Sharpedo--Mega.png b/src/afd/sprites/back-shiny/0319-420-Sharpedo-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0319--420--Sharpedo--Mega.png
rename to src/afd/sprites/back-shiny/0319-420-Sharpedo-Mega.png
diff --git a/src/afd/sprites/back-shiny/0320--000--Wailmer.png b/src/afd/sprites/back-shiny/0320-000-Wailmer.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0320--000--Wailmer.png
rename to src/afd/sprites/back-shiny/0320-000-Wailmer.png
diff --git a/src/afd/sprites/back-shiny/0321--000--Wailord.png b/src/afd/sprites/back-shiny/0321-000-Wailord.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0321--000--Wailord.png
rename to src/afd/sprites/back-shiny/0321-000-Wailord.png
diff --git a/src/afd/sprites/back-shiny/0322--000--Numel.png b/src/afd/sprites/back-shiny/0322-000-Numel.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0322--000--Numel.png
rename to src/afd/sprites/back-shiny/0322-000-Numel.png
diff --git a/src/afd/sprites/back-shiny/0323--000--Camerupt.png b/src/afd/sprites/back-shiny/0323-000-Camerupt.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0323--000--Camerupt.png
rename to src/afd/sprites/back-shiny/0323-000-Camerupt.png
diff --git a/src/afd/sprites/back-shiny/0323--420--Camerupt--Mega.png b/src/afd/sprites/back-shiny/0323-420-Camerupt-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0323--420--Camerupt--Mega.png
rename to src/afd/sprites/back-shiny/0323-420-Camerupt-Mega.png
diff --git a/src/afd/sprites/back-shiny/0324--000--Torkoal.png b/src/afd/sprites/back-shiny/0324-000-Torkoal.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0324--000--Torkoal.png
rename to src/afd/sprites/back-shiny/0324-000-Torkoal.png
diff --git a/src/afd/sprites/back-shiny/0325--000--Spoink.png b/src/afd/sprites/back-shiny/0325-000-Spoink.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0325--000--Spoink.png
rename to src/afd/sprites/back-shiny/0325-000-Spoink.png
diff --git a/src/afd/sprites/back-shiny/0326--000--Grumpig.png b/src/afd/sprites/back-shiny/0326-000-Grumpig.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0326--000--Grumpig.png
rename to src/afd/sprites/back-shiny/0326-000-Grumpig.png
diff --git a/src/afd/sprites/back-shiny/0327--000--Spinda.png b/src/afd/sprites/back-shiny/0327-000-Spinda.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0327--000--Spinda.png
rename to src/afd/sprites/back-shiny/0327-000-Spinda.png
diff --git a/src/afd/sprites/back-shiny/0328--000--Trapinch.png b/src/afd/sprites/back-shiny/0328-000-Trapinch.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0328--000--Trapinch.png
rename to src/afd/sprites/back-shiny/0328-000-Trapinch.png
diff --git a/src/afd/sprites/back-shiny/0329--000--Vibrava.png b/src/afd/sprites/back-shiny/0329-000-Vibrava.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0329--000--Vibrava.png
rename to src/afd/sprites/back-shiny/0329-000-Vibrava.png
diff --git a/src/afd/sprites/back-shiny/0330--000--Flygon.png b/src/afd/sprites/back-shiny/0330-000-Flygon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0330--000--Flygon.png
rename to src/afd/sprites/back-shiny/0330-000-Flygon.png
diff --git a/src/afd/sprites/back-shiny/0331--000--Cacnea.png b/src/afd/sprites/back-shiny/0331-000-Cacnea.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0331--000--Cacnea.png
rename to src/afd/sprites/back-shiny/0331-000-Cacnea.png
diff --git a/src/afd/sprites/back-shiny/0332--000--Cacturne.png b/src/afd/sprites/back-shiny/0332-000-Cacturne.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0332--000--Cacturne.png
rename to src/afd/sprites/back-shiny/0332-000-Cacturne.png
diff --git a/src/afd/sprites/back-shiny/0333--000--Swablu.png b/src/afd/sprites/back-shiny/0333-000-Swablu.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0333--000--Swablu.png
rename to src/afd/sprites/back-shiny/0333-000-Swablu.png
diff --git a/src/afd/sprites/back-shiny/0334--000--Altaria.png b/src/afd/sprites/back-shiny/0334-000-Altaria.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0334--000--Altaria.png
rename to src/afd/sprites/back-shiny/0334-000-Altaria.png
diff --git a/src/afd/sprites/back-shiny/0334--420--Altaria--Mega.png b/src/afd/sprites/back-shiny/0334-420-Altaria-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0334--420--Altaria--Mega.png
rename to src/afd/sprites/back-shiny/0334-420-Altaria-Mega.png
diff --git a/src/afd/sprites/back-shiny/0335--000--Zangoose.png b/src/afd/sprites/back-shiny/0335-000-Zangoose.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0335--000--Zangoose.png
rename to src/afd/sprites/back-shiny/0335-000-Zangoose.png
diff --git a/src/afd/sprites/back-shiny/0336--000--Seviper.png b/src/afd/sprites/back-shiny/0336-000-Seviper.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0336--000--Seviper.png
rename to src/afd/sprites/back-shiny/0336-000-Seviper.png
diff --git a/src/afd/sprites/back-shiny/0337--000--Lunatone.png b/src/afd/sprites/back-shiny/0337-000-Lunatone.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0337--000--Lunatone.png
rename to src/afd/sprites/back-shiny/0337-000-Lunatone.png
diff --git a/src/afd/sprites/back-shiny/0338--000--Solrock.png b/src/afd/sprites/back-shiny/0338-000-Solrock.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0338--000--Solrock.png
rename to src/afd/sprites/back-shiny/0338-000-Solrock.png
diff --git a/src/afd/sprites/back-shiny/0339--000--Barboach.png b/src/afd/sprites/back-shiny/0339-000-Barboach.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0339--000--Barboach.png
rename to src/afd/sprites/back-shiny/0339-000-Barboach.png
diff --git a/src/afd/sprites/back-shiny/0340--000--Whiscash.png b/src/afd/sprites/back-shiny/0340-000-Whiscash.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0340--000--Whiscash.png
rename to src/afd/sprites/back-shiny/0340-000-Whiscash.png
diff --git a/src/afd/sprites/back-shiny/0341--000--Corphish.png b/src/afd/sprites/back-shiny/0341-000-Corphish.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0341--000--Corphish.png
rename to src/afd/sprites/back-shiny/0341-000-Corphish.png
diff --git a/src/afd/sprites/back-shiny/0342--000--Crawdaunt.png b/src/afd/sprites/back-shiny/0342-000-Crawdaunt.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0342--000--Crawdaunt.png
rename to src/afd/sprites/back-shiny/0342-000-Crawdaunt.png
diff --git a/src/afd/sprites/back-shiny/0343--000--Baltoy.png b/src/afd/sprites/back-shiny/0343-000-Baltoy.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0343--000--Baltoy.png
rename to src/afd/sprites/back-shiny/0343-000-Baltoy.png
diff --git a/src/afd/sprites/back-shiny/0344--000--Claydol.png b/src/afd/sprites/back-shiny/0344-000-Claydol.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0344--000--Claydol.png
rename to src/afd/sprites/back-shiny/0344-000-Claydol.png
diff --git a/src/afd/sprites/back-shiny/0345--000--Lileep.png b/src/afd/sprites/back-shiny/0345-000-Lileep.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0345--000--Lileep.png
rename to src/afd/sprites/back-shiny/0345-000-Lileep.png
diff --git a/src/afd/sprites/back-shiny/0346--000--Cradily.png b/src/afd/sprites/back-shiny/0346-000-Cradily.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0346--000--Cradily.png
rename to src/afd/sprites/back-shiny/0346-000-Cradily.png
diff --git a/src/afd/sprites/back-shiny/0347--000--Anorith.png b/src/afd/sprites/back-shiny/0347-000-Anorith.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0347--000--Anorith.png
rename to src/afd/sprites/back-shiny/0347-000-Anorith.png
diff --git a/src/afd/sprites/back-shiny/0348--000--Armaldo.png b/src/afd/sprites/back-shiny/0348-000-Armaldo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0348--000--Armaldo.png
rename to src/afd/sprites/back-shiny/0348-000-Armaldo.png
diff --git a/src/afd/sprites/back-shiny/0349--000--Feebas.png b/src/afd/sprites/back-shiny/0349-000-Feebas.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0349--000--Feebas.png
rename to src/afd/sprites/back-shiny/0349-000-Feebas.png
diff --git a/src/afd/sprites/back-shiny/0350--000--Milotic.png b/src/afd/sprites/back-shiny/0350-000-Milotic.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0350--000--Milotic.png
rename to src/afd/sprites/back-shiny/0350-000-Milotic.png
diff --git a/src/afd/sprites/back-shiny/0351--000--Castform.png b/src/afd/sprites/back-shiny/0351-000-Castform.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0351--000--Castform.png
rename to src/afd/sprites/back-shiny/0351-000-Castform.png
diff --git a/src/afd/sprites/back-shiny/0351--420--Castform--Rainy.png b/src/afd/sprites/back-shiny/0351-420-Castform-Rainy.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0351--420--Castform--Rainy.png
rename to src/afd/sprites/back-shiny/0351-420-Castform-Rainy.png
diff --git a/src/afd/sprites/back-shiny/0351--420--Castform--Snowy.png b/src/afd/sprites/back-shiny/0351-420-Castform-Snowy.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0351--420--Castform--Snowy.png
rename to src/afd/sprites/back-shiny/0351-420-Castform-Snowy.png
diff --git a/src/afd/sprites/back-shiny/0351--420--Castform--Sunny.png b/src/afd/sprites/back-shiny/0351-420-Castform-Sunny.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0351--420--Castform--Sunny.png
rename to src/afd/sprites/back-shiny/0351-420-Castform-Sunny.png
diff --git a/src/afd/sprites/back-shiny/0352--000--Kecleon.png b/src/afd/sprites/back-shiny/0352-000-Kecleon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0352--000--Kecleon.png
rename to src/afd/sprites/back-shiny/0352-000-Kecleon.png
diff --git a/src/afd/sprites/back-shiny/0353--000--Shuppet.png b/src/afd/sprites/back-shiny/0353-000-Shuppet.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0353--000--Shuppet.png
rename to src/afd/sprites/back-shiny/0353-000-Shuppet.png
diff --git a/src/afd/sprites/back-shiny/0354--000--Banette.png b/src/afd/sprites/back-shiny/0354-000-Banette.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0354--000--Banette.png
rename to src/afd/sprites/back-shiny/0354-000-Banette.png
diff --git a/src/afd/sprites/back-shiny/0354--420--Banette--Mega.png b/src/afd/sprites/back-shiny/0354-420-Banette-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0354--420--Banette--Mega.png
rename to src/afd/sprites/back-shiny/0354-420-Banette-Mega.png
diff --git a/src/afd/sprites/back-shiny/0355--000--Duskull.png b/src/afd/sprites/back-shiny/0355-000-Duskull.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0355--000--Duskull.png
rename to src/afd/sprites/back-shiny/0355-000-Duskull.png
diff --git a/src/afd/sprites/back-shiny/0356--000--Dusclops.png b/src/afd/sprites/back-shiny/0356-000-Dusclops.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0356--000--Dusclops.png
rename to src/afd/sprites/back-shiny/0356-000-Dusclops.png
diff --git a/src/afd/sprites/back-shiny/0357--000--Tropius.png b/src/afd/sprites/back-shiny/0357-000-Tropius.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0357--000--Tropius.png
rename to src/afd/sprites/back-shiny/0357-000-Tropius.png
diff --git a/src/afd/sprites/back-shiny/0358--000--Chimecho.png b/src/afd/sprites/back-shiny/0358-000-Chimecho.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0358--000--Chimecho.png
rename to src/afd/sprites/back-shiny/0358-000-Chimecho.png
diff --git a/src/afd/sprites/back-shiny/0359--000--Absol.png b/src/afd/sprites/back-shiny/0359-000-Absol.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0359--000--Absol.png
rename to src/afd/sprites/back-shiny/0359-000-Absol.png
diff --git a/src/afd/sprites/back-shiny/0359--420--Absol--Mega.png b/src/afd/sprites/back-shiny/0359-420-Absol-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0359--420--Absol--Mega.png
rename to src/afd/sprites/back-shiny/0359-420-Absol-Mega.png
diff --git a/src/afd/sprites/back-shiny/0360--000--Wynaut.png b/src/afd/sprites/back-shiny/0360-000-Wynaut.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0360--000--Wynaut.png
rename to src/afd/sprites/back-shiny/0360-000-Wynaut.png
diff --git a/src/afd/sprites/back-shiny/0362--000--Glalie.png b/src/afd/sprites/back-shiny/0362-000-Glalie.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0362--000--Glalie.png
rename to src/afd/sprites/back-shiny/0362-000-Glalie.png
diff --git a/src/afd/sprites/back-shiny/0363--000--Spheal.png b/src/afd/sprites/back-shiny/0363-000-Spheal.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0363--000--Spheal.png
rename to src/afd/sprites/back-shiny/0363-000-Spheal.png
diff --git a/src/afd/sprites/back-shiny/0364--000--Sealeo.png b/src/afd/sprites/back-shiny/0364-000-Sealeo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0364--000--Sealeo.png
rename to src/afd/sprites/back-shiny/0364-000-Sealeo.png
diff --git a/src/afd/sprites/back-shiny/0365--000--Walrein.png b/src/afd/sprites/back-shiny/0365-000-Walrein.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0365--000--Walrein.png
rename to src/afd/sprites/back-shiny/0365-000-Walrein.png
diff --git a/src/afd/sprites/back-shiny/0366--000--Clamperl.png b/src/afd/sprites/back-shiny/0366-000-Clamperl.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0366--000--Clamperl.png
rename to src/afd/sprites/back-shiny/0366-000-Clamperl.png
diff --git a/src/afd/sprites/back-shiny/0367--000--Huntail.png b/src/afd/sprites/back-shiny/0367-000-Huntail.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0367--000--Huntail.png
rename to src/afd/sprites/back-shiny/0367-000-Huntail.png
diff --git a/src/afd/sprites/back-shiny/0368--000--Gorebyss.png b/src/afd/sprites/back-shiny/0368-000-Gorebyss.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0368--000--Gorebyss.png
rename to src/afd/sprites/back-shiny/0368-000-Gorebyss.png
diff --git a/src/afd/sprites/back-shiny/0369--000--Relicanth.png b/src/afd/sprites/back-shiny/0369-000-Relicanth.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0369--000--Relicanth.png
rename to src/afd/sprites/back-shiny/0369-000-Relicanth.png
diff --git a/src/afd/sprites/back-shiny/0370--000--Luvdisc.png b/src/afd/sprites/back-shiny/0370-000-Luvdisc.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0370--000--Luvdisc.png
rename to src/afd/sprites/back-shiny/0370-000-Luvdisc.png
diff --git a/src/afd/sprites/back-shiny/0371--000--Bagon.png b/src/afd/sprites/back-shiny/0371-000-Bagon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0371--000--Bagon.png
rename to src/afd/sprites/back-shiny/0371-000-Bagon.png
diff --git a/src/afd/sprites/back-shiny/0372--000--Shelgon.png b/src/afd/sprites/back-shiny/0372-000-Shelgon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0372--000--Shelgon.png
rename to src/afd/sprites/back-shiny/0372-000-Shelgon.png
diff --git a/src/afd/sprites/back-shiny/0373--000--Salamence.png b/src/afd/sprites/back-shiny/0373-000-Salamence.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0373--000--Salamence.png
rename to src/afd/sprites/back-shiny/0373-000-Salamence.png
diff --git a/src/afd/sprites/back-shiny/0373--420--Salamence--Mega.png b/src/afd/sprites/back-shiny/0373-420-Salamence-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0373--420--Salamence--Mega.png
rename to src/afd/sprites/back-shiny/0373-420-Salamence-Mega.png
diff --git a/src/afd/sprites/back-shiny/0374--000--Beldum.png b/src/afd/sprites/back-shiny/0374-000-Beldum.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0374--000--Beldum.png
rename to src/afd/sprites/back-shiny/0374-000-Beldum.png
diff --git a/src/afd/sprites/back-shiny/0375--000--Metang.png b/src/afd/sprites/back-shiny/0375-000-Metang.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0375--000--Metang.png
rename to src/afd/sprites/back-shiny/0375-000-Metang.png
diff --git a/src/afd/sprites/back-shiny/0376--000--Metagross.png b/src/afd/sprites/back-shiny/0376-000-Metagross.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0376--000--Metagross.png
rename to src/afd/sprites/back-shiny/0376-000-Metagross.png
diff --git a/src/afd/sprites/back-shiny/0376--420--Metagross--Mega.png b/src/afd/sprites/back-shiny/0376-420-Metagross-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0376--420--Metagross--Mega.png
rename to src/afd/sprites/back-shiny/0376-420-Metagross-Mega.png
diff --git a/src/afd/sprites/back-shiny/0377--000--Regirock.png b/src/afd/sprites/back-shiny/0377-000-Regirock.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0377--000--Regirock.png
rename to src/afd/sprites/back-shiny/0377-000-Regirock.png
diff --git a/src/afd/sprites/back-shiny/0378--000--Regice.png b/src/afd/sprites/back-shiny/0378-000-Regice.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0378--000--Regice.png
rename to src/afd/sprites/back-shiny/0378-000-Regice.png
diff --git a/src/afd/sprites/back-shiny/0379--000--Registeel.png b/src/afd/sprites/back-shiny/0379-000-Registeel.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0379--000--Registeel.png
rename to src/afd/sprites/back-shiny/0379-000-Registeel.png
diff --git a/src/afd/sprites/back-shiny/0380--000--Latias.png b/src/afd/sprites/back-shiny/0380-000-Latias.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0380--000--Latias.png
rename to src/afd/sprites/back-shiny/0380-000-Latias.png
diff --git a/src/afd/sprites/back-shiny/0380--420--Latias--Mega.png b/src/afd/sprites/back-shiny/0380-420-Latias-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0380--420--Latias--Mega.png
rename to src/afd/sprites/back-shiny/0380-420-Latias-Mega.png
diff --git a/src/afd/sprites/back-shiny/0381--000--Latios.png b/src/afd/sprites/back-shiny/0381-000-Latios.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0381--000--Latios.png
rename to src/afd/sprites/back-shiny/0381-000-Latios.png
diff --git a/src/afd/sprites/back-shiny/0381--420--Latios--Mega.png b/src/afd/sprites/back-shiny/0381-420-Latios-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0381--420--Latios--Mega.png
rename to src/afd/sprites/back-shiny/0381-420-Latios-Mega.png
diff --git a/src/afd/sprites/back-shiny/0382--000--Kyogre.png b/src/afd/sprites/back-shiny/0382-000-Kyogre.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0382--000--Kyogre.png
rename to src/afd/sprites/back-shiny/0382-000-Kyogre.png
diff --git a/src/afd/sprites/back-shiny/0382--420--Kyogre--Primal.png b/src/afd/sprites/back-shiny/0382-420-Kyogre-Primal.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0382--420--Kyogre--Primal.png
rename to src/afd/sprites/back-shiny/0382-420-Kyogre-Primal.png
diff --git a/src/afd/sprites/back-shiny/0383--000--Groudon.png b/src/afd/sprites/back-shiny/0383-000-Groudon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0383--000--Groudon.png
rename to src/afd/sprites/back-shiny/0383-000-Groudon.png
diff --git a/src/afd/sprites/back-shiny/0383--420--Groudon--Primal.png b/src/afd/sprites/back-shiny/0383-420-Groudon-Primal.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0383--420--Groudon--Primal.png
rename to src/afd/sprites/back-shiny/0383-420-Groudon-Primal.png
diff --git a/src/afd/sprites/back-shiny/0384--000--Rayquaza.png b/src/afd/sprites/back-shiny/0384-000-Rayquaza.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0384--000--Rayquaza.png
rename to src/afd/sprites/back-shiny/0384-000-Rayquaza.png
diff --git a/src/afd/sprites/back-shiny/0384--420--Rayquaza--Mega.png b/src/afd/sprites/back-shiny/0384-420-Rayquaza-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0384--420--Rayquaza--Mega.png
rename to src/afd/sprites/back-shiny/0384-420-Rayquaza-Mega.png
diff --git a/src/afd/sprites/back-shiny/0385--000--Jirachi.png b/src/afd/sprites/back-shiny/0385-000-Jirachi.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0385--000--Jirachi.png
rename to src/afd/sprites/back-shiny/0385-000-Jirachi.png
diff --git a/src/afd/sprites/back-shiny/0386--000--Deoxys.png b/src/afd/sprites/back-shiny/0386-000-Deoxys.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0386--000--Deoxys.png
rename to src/afd/sprites/back-shiny/0386-000-Deoxys.png
diff --git a/src/afd/sprites/back-shiny/0386--420--Deoxys--Attack.png b/src/afd/sprites/back-shiny/0386-420-Deoxys-Attack.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0386--420--Deoxys--Attack.png
rename to src/afd/sprites/back-shiny/0386-420-Deoxys-Attack.png
diff --git a/src/afd/sprites/back-shiny/0386--420--Deoxys--Defense.png b/src/afd/sprites/back-shiny/0386-420-Deoxys-Defense.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0386--420--Deoxys--Defense.png
rename to src/afd/sprites/back-shiny/0386-420-Deoxys-Defense.png
diff --git a/src/afd/sprites/back-shiny/0386--420--Deoxys--Speed.png b/src/afd/sprites/back-shiny/0386-420-Deoxys-Speed.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0386--420--Deoxys--Speed.png
rename to src/afd/sprites/back-shiny/0386-420-Deoxys-Speed.png
diff --git a/src/afd/sprites/back-shiny/0387--000--Turtwig.png b/src/afd/sprites/back-shiny/0387-000-Turtwig.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0387--000--Turtwig.png
rename to src/afd/sprites/back-shiny/0387-000-Turtwig.png
diff --git a/src/afd/sprites/back-shiny/0388--000--Grotle.png b/src/afd/sprites/back-shiny/0388-000-Grotle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0388--000--Grotle.png
rename to src/afd/sprites/back-shiny/0388-000-Grotle.png
diff --git a/src/afd/sprites/back-shiny/0389--000--Torterra.png b/src/afd/sprites/back-shiny/0389-000-Torterra.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0389--000--Torterra.png
rename to src/afd/sprites/back-shiny/0389-000-Torterra.png
diff --git a/src/afd/sprites/back-shiny/0390--000--Chimchar.png b/src/afd/sprites/back-shiny/0390-000-Chimchar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0390--000--Chimchar.png
rename to src/afd/sprites/back-shiny/0390-000-Chimchar.png
diff --git a/src/afd/sprites/back-shiny/0391--000--Monferno.png b/src/afd/sprites/back-shiny/0391-000-Monferno.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0391--000--Monferno.png
rename to src/afd/sprites/back-shiny/0391-000-Monferno.png
diff --git a/src/afd/sprites/back-shiny/0392--000--Infernape.png b/src/afd/sprites/back-shiny/0392-000-Infernape.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0392--000--Infernape.png
rename to src/afd/sprites/back-shiny/0392-000-Infernape.png
diff --git a/src/afd/sprites/back-shiny/0393--000--Piplup.png b/src/afd/sprites/back-shiny/0393-000-Piplup.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0393--000--Piplup.png
rename to src/afd/sprites/back-shiny/0393-000-Piplup.png
diff --git a/src/afd/sprites/back-shiny/0394--000--Prinplup.png b/src/afd/sprites/back-shiny/0394-000-Prinplup.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0394--000--Prinplup.png
rename to src/afd/sprites/back-shiny/0394-000-Prinplup.png
diff --git a/src/afd/sprites/back-shiny/0395--000--Empoleon.png b/src/afd/sprites/back-shiny/0395-000-Empoleon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0395--000--Empoleon.png
rename to src/afd/sprites/back-shiny/0395-000-Empoleon.png
diff --git a/src/afd/sprites/back-shiny/0396--000--Starly.png b/src/afd/sprites/back-shiny/0396-000-Starly.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0396--000--Starly.png
rename to src/afd/sprites/back-shiny/0396-000-Starly.png
diff --git a/src/afd/sprites/back-shiny/0397--000--Staravia.png b/src/afd/sprites/back-shiny/0397-000-Staravia.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0397--000--Staravia.png
rename to src/afd/sprites/back-shiny/0397-000-Staravia.png
diff --git a/src/afd/sprites/back-shiny/0398--000--Staraptor.png b/src/afd/sprites/back-shiny/0398-000-Staraptor.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0398--000--Staraptor.png
rename to src/afd/sprites/back-shiny/0398-000-Staraptor.png
diff --git a/src/afd/sprites/back-shiny/0399--000--Bidoof.png b/src/afd/sprites/back-shiny/0399-000-Bidoof.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0399--000--Bidoof.png
rename to src/afd/sprites/back-shiny/0399-000-Bidoof.png
diff --git a/src/afd/sprites/back-shiny/0400--000--Bibarel.png b/src/afd/sprites/back-shiny/0400-000-Bibarel.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0400--000--Bibarel.png
rename to src/afd/sprites/back-shiny/0400-000-Bibarel.png
diff --git a/src/afd/sprites/back-shiny/0401--000--Kricketot.png b/src/afd/sprites/back-shiny/0401-000-Kricketot.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0401--000--Kricketot.png
rename to src/afd/sprites/back-shiny/0401-000-Kricketot.png
diff --git a/src/afd/sprites/back-shiny/0402--000--Kricketune.png b/src/afd/sprites/back-shiny/0402-000-Kricketune.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0402--000--Kricketune.png
rename to src/afd/sprites/back-shiny/0402-000-Kricketune.png
diff --git a/src/afd/sprites/back-shiny/0403--000--Shinx.png b/src/afd/sprites/back-shiny/0403-000-Shinx.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0403--000--Shinx.png
rename to src/afd/sprites/back-shiny/0403-000-Shinx.png
diff --git a/src/afd/sprites/back-shiny/0404--000--Luxio.png b/src/afd/sprites/back-shiny/0404-000-Luxio.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0404--000--Luxio.png
rename to src/afd/sprites/back-shiny/0404-000-Luxio.png
diff --git a/src/afd/sprites/back-shiny/0405--000--Luxray.png b/src/afd/sprites/back-shiny/0405-000-Luxray.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0405--000--Luxray.png
rename to src/afd/sprites/back-shiny/0405-000-Luxray.png
diff --git a/src/afd/sprites/back-shiny/0406--000--Budew.png b/src/afd/sprites/back-shiny/0406-000-Budew.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0406--000--Budew.png
rename to src/afd/sprites/back-shiny/0406-000-Budew.png
diff --git a/src/afd/sprites/back-shiny/0407--000--Roserade.png b/src/afd/sprites/back-shiny/0407-000-Roserade.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0407--000--Roserade.png
rename to src/afd/sprites/back-shiny/0407-000-Roserade.png
diff --git a/src/afd/sprites/back-shiny/0409--000--Rampardos.png b/src/afd/sprites/back-shiny/0409-000-Rampardos.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0409--000--Rampardos.png
rename to src/afd/sprites/back-shiny/0409-000-Rampardos.png
diff --git a/src/afd/sprites/back-shiny/0410--000--Shieldon.png b/src/afd/sprites/back-shiny/0410-000-Shieldon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0410--000--Shieldon.png
rename to src/afd/sprites/back-shiny/0410-000-Shieldon.png
diff --git a/src/afd/sprites/back-shiny/0411--000--Bastiodon.png b/src/afd/sprites/back-shiny/0411-000-Bastiodon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0411--000--Bastiodon.png
rename to src/afd/sprites/back-shiny/0411-000-Bastiodon.png
diff --git a/src/afd/sprites/back-shiny/0412--000--Burmy.png b/src/afd/sprites/back-shiny/0412-000-Burmy.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0412--000--Burmy.png
rename to src/afd/sprites/back-shiny/0412-000-Burmy.png
diff --git a/src/afd/sprites/back-shiny/0413--000--Wormadam.png b/src/afd/sprites/back-shiny/0413-000-Wormadam.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0413--000--Wormadam.png
rename to src/afd/sprites/back-shiny/0413-000-Wormadam.png
diff --git a/src/afd/sprites/back-shiny/0413--420--Wormadam--Sandy.png b/src/afd/sprites/back-shiny/0413-420-Wormadam-Sandy.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0413--420--Wormadam--Sandy.png
rename to src/afd/sprites/back-shiny/0413-420-Wormadam-Sandy.png
diff --git a/src/afd/sprites/back-shiny/0413--420--Wormadam--Trash.png b/src/afd/sprites/back-shiny/0413-420-Wormadam-Trash.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0413--420--Wormadam--Trash.png
rename to src/afd/sprites/back-shiny/0413-420-Wormadam-Trash.png
diff --git a/src/afd/sprites/back-shiny/0414--000--Mothim.png b/src/afd/sprites/back-shiny/0414-000-Mothim.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0414--000--Mothim.png
rename to src/afd/sprites/back-shiny/0414-000-Mothim.png
diff --git a/src/afd/sprites/back-shiny/0415--000--Combee.png b/src/afd/sprites/back-shiny/0415-000-Combee.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0415--000--Combee.png
rename to src/afd/sprites/back-shiny/0415-000-Combee.png
diff --git a/src/afd/sprites/back-shiny/0416--000--Vespiquen.png b/src/afd/sprites/back-shiny/0416-000-Vespiquen.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0416--000--Vespiquen.png
rename to src/afd/sprites/back-shiny/0416-000-Vespiquen.png
diff --git a/src/afd/sprites/back-shiny/0417--000--Pachirisu.png b/src/afd/sprites/back-shiny/0417-000-Pachirisu.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0417--000--Pachirisu.png
rename to src/afd/sprites/back-shiny/0417-000-Pachirisu.png
diff --git a/src/afd/sprites/back-shiny/0418--000--Buizel.png b/src/afd/sprites/back-shiny/0418-000-Buizel.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0418--000--Buizel.png
rename to src/afd/sprites/back-shiny/0418-000-Buizel.png
diff --git a/src/afd/sprites/back-shiny/0419--000--Floatzel.png b/src/afd/sprites/back-shiny/0419-000-Floatzel.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0419--000--Floatzel.png
rename to src/afd/sprites/back-shiny/0419-000-Floatzel.png
diff --git a/src/afd/sprites/back-shiny/0420--000--Cherubi.png b/src/afd/sprites/back-shiny/0420-000-Cherubi.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0420--000--Cherubi.png
rename to src/afd/sprites/back-shiny/0420-000-Cherubi.png
diff --git a/src/afd/sprites/back-shiny/0421--000--Cherrim.png b/src/afd/sprites/back-shiny/0421-000-Cherrim.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0421--000--Cherrim.png
rename to src/afd/sprites/back-shiny/0421-000-Cherrim.png
diff --git a/src/afd/sprites/back-shiny/0421--420--Cherrim--Sunshine.png b/src/afd/sprites/back-shiny/0421-420-Cherrim-Sunshine.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0421--420--Cherrim--Sunshine.png
rename to src/afd/sprites/back-shiny/0421-420-Cherrim-Sunshine.png
diff --git a/src/afd/sprites/back-shiny/0422--000--Shellos.png b/src/afd/sprites/back-shiny/0422-000-Shellos.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0422--000--Shellos.png
rename to src/afd/sprites/back-shiny/0422-000-Shellos.png
diff --git a/src/afd/sprites/back-shiny/0423--000--Gastrodon.png b/src/afd/sprites/back-shiny/0423-000-Gastrodon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0423--000--Gastrodon.png
rename to src/afd/sprites/back-shiny/0423-000-Gastrodon.png
diff --git a/src/afd/sprites/back-shiny/0424--000--Ambipom.png b/src/afd/sprites/back-shiny/0424-000-Ambipom.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0424--000--Ambipom.png
rename to src/afd/sprites/back-shiny/0424-000-Ambipom.png
diff --git a/src/afd/sprites/back-shiny/0425--000--Drifloon.png b/src/afd/sprites/back-shiny/0425-000-Drifloon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0425--000--Drifloon.png
rename to src/afd/sprites/back-shiny/0425-000-Drifloon.png
diff --git a/src/afd/sprites/back-shiny/0426--000--Drifblim.png b/src/afd/sprites/back-shiny/0426-000-Drifblim.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0426--000--Drifblim.png
rename to src/afd/sprites/back-shiny/0426-000-Drifblim.png
diff --git a/src/afd/sprites/back-shiny/0427--000--Buneary.png b/src/afd/sprites/back-shiny/0427-000-Buneary.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0427--000--Buneary.png
rename to src/afd/sprites/back-shiny/0427-000-Buneary.png
diff --git a/src/afd/sprites/back-shiny/0428--000--Lopunny.png b/src/afd/sprites/back-shiny/0428-000-Lopunny.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0428--000--Lopunny.png
rename to src/afd/sprites/back-shiny/0428-000-Lopunny.png
diff --git a/src/afd/sprites/back-shiny/0428--420--Lopunny--Mega.png b/src/afd/sprites/back-shiny/0428-420-Lopunny-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0428--420--Lopunny--Mega.png
rename to src/afd/sprites/back-shiny/0428-420-Lopunny-Mega.png
diff --git a/src/afd/sprites/back-shiny/0429--000--Mismagius.png b/src/afd/sprites/back-shiny/0429-000-Mismagius.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0429--000--Mismagius.png
rename to src/afd/sprites/back-shiny/0429-000-Mismagius.png
diff --git a/src/afd/sprites/back-shiny/0430--000--Honchkrow.png b/src/afd/sprites/back-shiny/0430-000-Honchkrow.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0430--000--Honchkrow.png
rename to src/afd/sprites/back-shiny/0430-000-Honchkrow.png
diff --git a/src/afd/sprites/back-shiny/0431--000--Glameow.png b/src/afd/sprites/back-shiny/0431-000-Glameow.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0431--000--Glameow.png
rename to src/afd/sprites/back-shiny/0431-000-Glameow.png
diff --git a/src/afd/sprites/back-shiny/0432--000--Purugly.png b/src/afd/sprites/back-shiny/0432-000-Purugly.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0432--000--Purugly.png
rename to src/afd/sprites/back-shiny/0432-000-Purugly.png
diff --git a/src/afd/sprites/back-shiny/0433--000--Chingling.png b/src/afd/sprites/back-shiny/0433-000-Chingling.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0433--000--Chingling.png
rename to src/afd/sprites/back-shiny/0433-000-Chingling.png
diff --git a/src/afd/sprites/back-shiny/0434--000--Stunky.png b/src/afd/sprites/back-shiny/0434-000-Stunky.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0434--000--Stunky.png
rename to src/afd/sprites/back-shiny/0434-000-Stunky.png
diff --git a/src/afd/sprites/back-shiny/0436--000--Bronzor.png b/src/afd/sprites/back-shiny/0436-000-Bronzor.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0436--000--Bronzor.png
rename to src/afd/sprites/back-shiny/0436-000-Bronzor.png
diff --git a/src/afd/sprites/back-shiny/0437--000--Bronzong.png b/src/afd/sprites/back-shiny/0437-000-Bronzong.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0437--000--Bronzong.png
rename to src/afd/sprites/back-shiny/0437-000-Bronzong.png
diff --git a/src/afd/sprites/back-shiny/0438--000--Bonsly.png b/src/afd/sprites/back-shiny/0438-000-Bonsly.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0438--000--Bonsly.png
rename to src/afd/sprites/back-shiny/0438-000-Bonsly.png
diff --git a/src/afd/sprites/back-shiny/0439--000--Mime_Jr..png b/src/afd/sprites/back-shiny/0439-000-Mime_Jr..png
similarity index 100%
rename from src/afd/sprites/back-shiny/0439--000--Mime_Jr..png
rename to src/afd/sprites/back-shiny/0439-000-Mime_Jr..png
diff --git a/src/afd/sprites/back-shiny/0440--000--Happiny.png b/src/afd/sprites/back-shiny/0440-000-Happiny.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0440--000--Happiny.png
rename to src/afd/sprites/back-shiny/0440-000-Happiny.png
diff --git a/src/afd/sprites/back-shiny/0441--000--Chatot.png b/src/afd/sprites/back-shiny/0441-000-Chatot.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0441--000--Chatot.png
rename to src/afd/sprites/back-shiny/0441-000-Chatot.png
diff --git a/src/afd/sprites/back-shiny/0442--000--Spiritomb.png b/src/afd/sprites/back-shiny/0442-000-Spiritomb.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0442--000--Spiritomb.png
rename to src/afd/sprites/back-shiny/0442-000-Spiritomb.png
diff --git a/src/afd/sprites/back-shiny/0443--000--Gible.png b/src/afd/sprites/back-shiny/0443-000-Gible.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0443--000--Gible.png
rename to src/afd/sprites/back-shiny/0443-000-Gible.png
diff --git a/src/afd/sprites/back-shiny/0444--000--Gabite.png b/src/afd/sprites/back-shiny/0444-000-Gabite.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0444--000--Gabite.png
rename to src/afd/sprites/back-shiny/0444-000-Gabite.png
diff --git a/src/afd/sprites/back-shiny/0445--000--Garchomp.png b/src/afd/sprites/back-shiny/0445-000-Garchomp.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0445--000--Garchomp.png
rename to src/afd/sprites/back-shiny/0445-000-Garchomp.png
diff --git a/src/afd/sprites/back-shiny/0445--420--Garchomp--Mega.png b/src/afd/sprites/back-shiny/0445-420-Garchomp-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0445--420--Garchomp--Mega.png
rename to src/afd/sprites/back-shiny/0445-420-Garchomp-Mega.png
diff --git a/src/afd/sprites/back-shiny/0446--000--Munchlax.png b/src/afd/sprites/back-shiny/0446-000-Munchlax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0446--000--Munchlax.png
rename to src/afd/sprites/back-shiny/0446-000-Munchlax.png
diff --git a/src/afd/sprites/back-shiny/0447--000--Riolu.png b/src/afd/sprites/back-shiny/0447-000-Riolu.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0447--000--Riolu.png
rename to src/afd/sprites/back-shiny/0447-000-Riolu.png
diff --git a/src/afd/sprites/back-shiny/0448--000--Lucario.png b/src/afd/sprites/back-shiny/0448-000-Lucario.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0448--000--Lucario.png
rename to src/afd/sprites/back-shiny/0448-000-Lucario.png
diff --git a/src/afd/sprites/back-shiny/0448--420--Lucario--Mega.png b/src/afd/sprites/back-shiny/0448-420-Lucario-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0448--420--Lucario--Mega.png
rename to src/afd/sprites/back-shiny/0448-420-Lucario-Mega.png
diff --git a/src/afd/sprites/back-shiny/0449--000--Hippopotas.png b/src/afd/sprites/back-shiny/0449-000-Hippopotas.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0449--000--Hippopotas.png
rename to src/afd/sprites/back-shiny/0449-000-Hippopotas.png
diff --git a/src/afd/sprites/back-shiny/0450--000--Hippowdon.png b/src/afd/sprites/back-shiny/0450-000-Hippowdon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0450--000--Hippowdon.png
rename to src/afd/sprites/back-shiny/0450-000-Hippowdon.png
diff --git a/src/afd/sprites/back-shiny/0451--000--Skorupi.png b/src/afd/sprites/back-shiny/0451-000-Skorupi.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0451--000--Skorupi.png
rename to src/afd/sprites/back-shiny/0451-000-Skorupi.png
diff --git a/src/afd/sprites/back-shiny/0452--000--Drapion.png b/src/afd/sprites/back-shiny/0452-000-Drapion.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0452--000--Drapion.png
rename to src/afd/sprites/back-shiny/0452-000-Drapion.png
diff --git a/src/afd/sprites/back-shiny/0453--000--Croagunk.png b/src/afd/sprites/back-shiny/0453-000-Croagunk.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0453--000--Croagunk.png
rename to src/afd/sprites/back-shiny/0453-000-Croagunk.png
diff --git a/src/afd/sprites/back-shiny/0454--000--Toxicroak.png b/src/afd/sprites/back-shiny/0454-000-Toxicroak.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0454--000--Toxicroak.png
rename to src/afd/sprites/back-shiny/0454-000-Toxicroak.png
diff --git a/src/afd/sprites/back-shiny/0455--000--Carnivine.png b/src/afd/sprites/back-shiny/0455-000-Carnivine.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0455--000--Carnivine.png
rename to src/afd/sprites/back-shiny/0455-000-Carnivine.png
diff --git a/src/afd/sprites/back-shiny/0456--000--Finneon.png b/src/afd/sprites/back-shiny/0456-000-Finneon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0456--000--Finneon.png
rename to src/afd/sprites/back-shiny/0456-000-Finneon.png
diff --git a/src/afd/sprites/back-shiny/0457--000--Lumineon.png b/src/afd/sprites/back-shiny/0457-000-Lumineon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0457--000--Lumineon.png
rename to src/afd/sprites/back-shiny/0457-000-Lumineon.png
diff --git a/src/afd/sprites/back-shiny/0458--000--Mantyke.png b/src/afd/sprites/back-shiny/0458-000-Mantyke.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0458--000--Mantyke.png
rename to src/afd/sprites/back-shiny/0458-000-Mantyke.png
diff --git a/src/afd/sprites/back-shiny/0459--000--Snover.png b/src/afd/sprites/back-shiny/0459-000-Snover.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0459--000--Snover.png
rename to src/afd/sprites/back-shiny/0459-000-Snover.png
diff --git a/src/afd/sprites/back-shiny/0460--000--Abomasnow.png b/src/afd/sprites/back-shiny/0460-000-Abomasnow.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0460--000--Abomasnow.png
rename to src/afd/sprites/back-shiny/0460-000-Abomasnow.png
diff --git a/src/afd/sprites/back-shiny/0460--420--Abomasnow--Mega.png b/src/afd/sprites/back-shiny/0460-420-Abomasnow-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0460--420--Abomasnow--Mega.png
rename to src/afd/sprites/back-shiny/0460-420-Abomasnow-Mega.png
diff --git a/src/afd/sprites/back-shiny/0461--000--Weavile.png b/src/afd/sprites/back-shiny/0461-000-Weavile.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0461--000--Weavile.png
rename to src/afd/sprites/back-shiny/0461-000-Weavile.png
diff --git a/src/afd/sprites/back-shiny/0462--000--Magnezone.png b/src/afd/sprites/back-shiny/0462-000-Magnezone.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0462--000--Magnezone.png
rename to src/afd/sprites/back-shiny/0462-000-Magnezone.png
diff --git a/src/afd/sprites/back-shiny/0463--000--Lickilicky.png b/src/afd/sprites/back-shiny/0463-000-Lickilicky.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0463--000--Lickilicky.png
rename to src/afd/sprites/back-shiny/0463-000-Lickilicky.png
diff --git a/src/afd/sprites/back-shiny/0464--000--Rhyperior.png b/src/afd/sprites/back-shiny/0464-000-Rhyperior.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0464--000--Rhyperior.png
rename to src/afd/sprites/back-shiny/0464-000-Rhyperior.png
diff --git a/src/afd/sprites/back-shiny/0465--000--Tangrowth.png b/src/afd/sprites/back-shiny/0465-000-Tangrowth.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0465--000--Tangrowth.png
rename to src/afd/sprites/back-shiny/0465-000-Tangrowth.png
diff --git a/src/afd/sprites/back-shiny/0466--000--Electivire.png b/src/afd/sprites/back-shiny/0466-000-Electivire.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0466--000--Electivire.png
rename to src/afd/sprites/back-shiny/0466-000-Electivire.png
diff --git a/src/afd/sprites/back-shiny/0468--000--Togekiss.png b/src/afd/sprites/back-shiny/0468-000-Togekiss.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0468--000--Togekiss.png
rename to src/afd/sprites/back-shiny/0468-000-Togekiss.png
diff --git a/src/afd/sprites/back-shiny/0469--000--Yanmega.png b/src/afd/sprites/back-shiny/0469-000-Yanmega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0469--000--Yanmega.png
rename to src/afd/sprites/back-shiny/0469-000-Yanmega.png
diff --git a/src/afd/sprites/back-shiny/0470--000--Leafeon.png b/src/afd/sprites/back-shiny/0470-000-Leafeon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0470--000--Leafeon.png
rename to src/afd/sprites/back-shiny/0470-000-Leafeon.png
diff --git a/src/afd/sprites/back-shiny/0471--000--Glaceon.png b/src/afd/sprites/back-shiny/0471-000-Glaceon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0471--000--Glaceon.png
rename to src/afd/sprites/back-shiny/0471-000-Glaceon.png
diff --git a/src/afd/sprites/back-shiny/0472--000--Gliscor.png b/src/afd/sprites/back-shiny/0472-000-Gliscor.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0472--000--Gliscor.png
rename to src/afd/sprites/back-shiny/0472-000-Gliscor.png
diff --git a/src/afd/sprites/back-shiny/0473--000--Mamoswine.png b/src/afd/sprites/back-shiny/0473-000-Mamoswine.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0473--000--Mamoswine.png
rename to src/afd/sprites/back-shiny/0473-000-Mamoswine.png
diff --git a/src/afd/sprites/back-shiny/0474--000--Porygon-Z.png b/src/afd/sprites/back-shiny/0474-000-Porygon~Z.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0474--000--Porygon-Z.png
rename to src/afd/sprites/back-shiny/0474-000-Porygon~Z.png
diff --git a/src/afd/sprites/back-shiny/0475--000--Gallade.png b/src/afd/sprites/back-shiny/0475-000-Gallade.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0475--000--Gallade.png
rename to src/afd/sprites/back-shiny/0475-000-Gallade.png
diff --git a/src/afd/sprites/back-shiny/0475--420--Gallade--Mega.png b/src/afd/sprites/back-shiny/0475-420-Gallade-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0475--420--Gallade--Mega.png
rename to src/afd/sprites/back-shiny/0475-420-Gallade-Mega.png
diff --git a/src/afd/sprites/back-shiny/0476--000--Probopass.png b/src/afd/sprites/back-shiny/0476-000-Probopass.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0476--000--Probopass.png
rename to src/afd/sprites/back-shiny/0476-000-Probopass.png
diff --git a/src/afd/sprites/back-shiny/0477--000--Dusknoir.png b/src/afd/sprites/back-shiny/0477-000-Dusknoir.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0477--000--Dusknoir.png
rename to src/afd/sprites/back-shiny/0477-000-Dusknoir.png
diff --git a/src/afd/sprites/back-shiny/0478--000--Froslass.png b/src/afd/sprites/back-shiny/0478-000-Froslass.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0478--000--Froslass.png
rename to src/afd/sprites/back-shiny/0478-000-Froslass.png
diff --git a/src/afd/sprites/back-shiny/0479--000--Rotom.png b/src/afd/sprites/back-shiny/0479-000-Rotom.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0479--000--Rotom.png
rename to src/afd/sprites/back-shiny/0479-000-Rotom.png
diff --git a/src/afd/sprites/back-shiny/0479--420--Rotom--Fan.png b/src/afd/sprites/back-shiny/0479-420-Rotom-Fan.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0479--420--Rotom--Fan.png
rename to src/afd/sprites/back-shiny/0479-420-Rotom-Fan.png
diff --git a/src/afd/sprites/back-shiny/0479--420--Rotom--Frost.png b/src/afd/sprites/back-shiny/0479-420-Rotom-Frost.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0479--420--Rotom--Frost.png
rename to src/afd/sprites/back-shiny/0479-420-Rotom-Frost.png
diff --git a/src/afd/sprites/back-shiny/0479--420--Rotom--Heat.png b/src/afd/sprites/back-shiny/0479-420-Rotom-Heat.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0479--420--Rotom--Heat.png
rename to src/afd/sprites/back-shiny/0479-420-Rotom-Heat.png
diff --git a/src/afd/sprites/back-shiny/0479--420--Rotom--Mow.png b/src/afd/sprites/back-shiny/0479-420-Rotom-Mow.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0479--420--Rotom--Mow.png
rename to src/afd/sprites/back-shiny/0479-420-Rotom-Mow.png
diff --git a/src/afd/sprites/back-shiny/0479--420--Rotom--Wash.png b/src/afd/sprites/back-shiny/0479-420-Rotom-Wash.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0479--420--Rotom--Wash.png
rename to src/afd/sprites/back-shiny/0479-420-Rotom-Wash.png
diff --git a/src/afd/sprites/back-shiny/0480--000--Uxie.png b/src/afd/sprites/back-shiny/0480-000-Uxie.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0480--000--Uxie.png
rename to src/afd/sprites/back-shiny/0480-000-Uxie.png
diff --git a/src/afd/sprites/back-shiny/0481--000--Mesprit.png b/src/afd/sprites/back-shiny/0481-000-Mesprit.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0481--000--Mesprit.png
rename to src/afd/sprites/back-shiny/0481-000-Mesprit.png
diff --git a/src/afd/sprites/back-shiny/0482--000--Azelf.png b/src/afd/sprites/back-shiny/0482-000-Azelf.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0482--000--Azelf.png
rename to src/afd/sprites/back-shiny/0482-000-Azelf.png
diff --git a/src/afd/sprites/back-shiny/0483--000--Dialga.png b/src/afd/sprites/back-shiny/0483-000-Dialga.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0483--000--Dialga.png
rename to src/afd/sprites/back-shiny/0483-000-Dialga.png
diff --git a/src/afd/sprites/back-shiny/0484--000--Palkia.png b/src/afd/sprites/back-shiny/0484-000-Palkia.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0484--000--Palkia.png
rename to src/afd/sprites/back-shiny/0484-000-Palkia.png
diff --git a/src/afd/sprites/back-shiny/0485--000--Heatran.png b/src/afd/sprites/back-shiny/0485-000-Heatran.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0485--000--Heatran.png
rename to src/afd/sprites/back-shiny/0485-000-Heatran.png
diff --git a/src/afd/sprites/back-shiny/0486--000--Regigigas.png b/src/afd/sprites/back-shiny/0486-000-Regigigas.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0486--000--Regigigas.png
rename to src/afd/sprites/back-shiny/0486-000-Regigigas.png
diff --git a/src/afd/sprites/back-shiny/0487--000--Giratina.png b/src/afd/sprites/back-shiny/0487-000-Giratina.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0487--000--Giratina.png
rename to src/afd/sprites/back-shiny/0487-000-Giratina.png
diff --git a/src/afd/sprites/back-shiny/0487--420--Giratina--Origin.png b/src/afd/sprites/back-shiny/0487-420-Giratina-Origin.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0487--420--Giratina--Origin.png
rename to src/afd/sprites/back-shiny/0487-420-Giratina-Origin.png
diff --git a/src/afd/sprites/back-shiny/0488--000--Cresselia.png b/src/afd/sprites/back-shiny/0488-000-Cresselia.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0488--000--Cresselia.png
rename to src/afd/sprites/back-shiny/0488-000-Cresselia.png
diff --git a/src/afd/sprites/back-shiny/0489--000--Phione.png b/src/afd/sprites/back-shiny/0489-000-Phione.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0489--000--Phione.png
rename to src/afd/sprites/back-shiny/0489-000-Phione.png
diff --git a/src/afd/sprites/back-shiny/0490--000--Manaphy.png b/src/afd/sprites/back-shiny/0490-000-Manaphy.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0490--000--Manaphy.png
rename to src/afd/sprites/back-shiny/0490-000-Manaphy.png
diff --git a/src/afd/sprites/back-shiny/0491--000--Darkrai.png b/src/afd/sprites/back-shiny/0491-000-Darkrai.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0491--000--Darkrai.png
rename to src/afd/sprites/back-shiny/0491-000-Darkrai.png
diff --git a/src/afd/sprites/back-shiny/0492--000--Shaymin.png b/src/afd/sprites/back-shiny/0492-000-Shaymin.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0492--000--Shaymin.png
rename to src/afd/sprites/back-shiny/0492-000-Shaymin.png
diff --git a/src/afd/sprites/back-shiny/0492--420--Shaymin--Sky.png b/src/afd/sprites/back-shiny/0492-420-Shaymin-Sky.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0492--420--Shaymin--Sky.png
rename to src/afd/sprites/back-shiny/0492-420-Shaymin-Sky.png
diff --git a/src/afd/sprites/back-shiny/0493--000--Arceus.png b/src/afd/sprites/back-shiny/0493-000-Arceus.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--000--Arceus.png
rename to src/afd/sprites/back-shiny/0493-000-Arceus.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Bug.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Bug.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Bug.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Bug.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Dark.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Dark.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Dark.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Dark.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Dragon.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Dragon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Dragon.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Dragon.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Electric.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Electric.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Electric.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Electric.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Fairy.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Fairy.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Fairy.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Fairy.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Fighting.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Fighting.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Fighting.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Fighting.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Fire.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Fire.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Fire.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Fire.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Flying.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Flying.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Flying.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Flying.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Ghost.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Ghost.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Ghost.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Ghost.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Grass.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Grass.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Grass.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Grass.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Ground.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Ground.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Ground.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Ground.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Ice.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Ice.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Ice.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Ice.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Poison.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Poison.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Poison.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Poison.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Psychic.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Psychic.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Psychic.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Psychic.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Rock.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Rock.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Rock.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Rock.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Steel.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Steel.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Steel.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Steel.png
diff --git a/src/afd/sprites/back-shiny/0493--420--Arceus--Water.png b/src/afd/sprites/back-shiny/0493-420-Arceus-Water.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0493--420--Arceus--Water.png
rename to src/afd/sprites/back-shiny/0493-420-Arceus-Water.png
diff --git a/src/afd/sprites/back-shiny/0494--000--Victini.png b/src/afd/sprites/back-shiny/0494-000-Victini.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0494--000--Victini.png
rename to src/afd/sprites/back-shiny/0494-000-Victini.png
diff --git a/src/afd/sprites/back-shiny/0495--000--Snivy.png b/src/afd/sprites/back-shiny/0495-000-Snivy.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0495--000--Snivy.png
rename to src/afd/sprites/back-shiny/0495-000-Snivy.png
diff --git a/src/afd/sprites/back-shiny/0496--000--Servine.png b/src/afd/sprites/back-shiny/0496-000-Servine.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0496--000--Servine.png
rename to src/afd/sprites/back-shiny/0496-000-Servine.png
diff --git a/src/afd/sprites/back-shiny/0497--000--Serperior.png b/src/afd/sprites/back-shiny/0497-000-Serperior.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0497--000--Serperior.png
rename to src/afd/sprites/back-shiny/0497-000-Serperior.png
diff --git a/src/afd/sprites/back-shiny/0498--000--Tepig.png b/src/afd/sprites/back-shiny/0498-000-Tepig.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0498--000--Tepig.png
rename to src/afd/sprites/back-shiny/0498-000-Tepig.png
diff --git a/src/afd/sprites/back-shiny/0499--000--Pignite.png b/src/afd/sprites/back-shiny/0499-000-Pignite.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0499--000--Pignite.png
rename to src/afd/sprites/back-shiny/0499-000-Pignite.png
diff --git a/src/afd/sprites/back-shiny/0500--000--Emboar.png b/src/afd/sprites/back-shiny/0500-000-Emboar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0500--000--Emboar.png
rename to src/afd/sprites/back-shiny/0500-000-Emboar.png
diff --git a/src/afd/sprites/back-shiny/0501--000--Oshawott.png b/src/afd/sprites/back-shiny/0501-000-Oshawott.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0501--000--Oshawott.png
rename to src/afd/sprites/back-shiny/0501-000-Oshawott.png
diff --git a/src/afd/sprites/back-shiny/0502--000--Dewott.png b/src/afd/sprites/back-shiny/0502-000-Dewott.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0502--000--Dewott.png
rename to src/afd/sprites/back-shiny/0502-000-Dewott.png
diff --git a/src/afd/sprites/back-shiny/0503--000--Samurott.png b/src/afd/sprites/back-shiny/0503-000-Samurott.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0503--000--Samurott.png
rename to src/afd/sprites/back-shiny/0503-000-Samurott.png
diff --git a/src/afd/sprites/back-shiny/0504--000--Patrat.png b/src/afd/sprites/back-shiny/0504-000-Patrat.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0504--000--Patrat.png
rename to src/afd/sprites/back-shiny/0504-000-Patrat.png
diff --git a/src/afd/sprites/back-shiny/0505--000--Watchog.png b/src/afd/sprites/back-shiny/0505-000-Watchog.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0505--000--Watchog.png
rename to src/afd/sprites/back-shiny/0505-000-Watchog.png
diff --git a/src/afd/sprites/back-shiny/0506--000--Lillipup.png b/src/afd/sprites/back-shiny/0506-000-Lillipup.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0506--000--Lillipup.png
rename to src/afd/sprites/back-shiny/0506-000-Lillipup.png
diff --git a/src/afd/sprites/back-shiny/0507--000--Herdier.png b/src/afd/sprites/back-shiny/0507-000-Herdier.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0507--000--Herdier.png
rename to src/afd/sprites/back-shiny/0507-000-Herdier.png
diff --git a/src/afd/sprites/back-shiny/0508--000--Stoutland.png b/src/afd/sprites/back-shiny/0508-000-Stoutland.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0508--000--Stoutland.png
rename to src/afd/sprites/back-shiny/0508-000-Stoutland.png
diff --git a/src/afd/sprites/back-shiny/0509--000--Purrloin.png b/src/afd/sprites/back-shiny/0509-000-Purrloin.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0509--000--Purrloin.png
rename to src/afd/sprites/back-shiny/0509-000-Purrloin.png
diff --git a/src/afd/sprites/back-shiny/0510--000--Liepard.png b/src/afd/sprites/back-shiny/0510-000-Liepard.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0510--000--Liepard.png
rename to src/afd/sprites/back-shiny/0510-000-Liepard.png
diff --git a/src/afd/sprites/back-shiny/0511--000--Pansage.png b/src/afd/sprites/back-shiny/0511-000-Pansage.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0511--000--Pansage.png
rename to src/afd/sprites/back-shiny/0511-000-Pansage.png
diff --git a/src/afd/sprites/back-shiny/0512--000--Simisage.png b/src/afd/sprites/back-shiny/0512-000-Simisage.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0512--000--Simisage.png
rename to src/afd/sprites/back-shiny/0512-000-Simisage.png
diff --git a/src/afd/sprites/back-shiny/0513--000--Pansear.png b/src/afd/sprites/back-shiny/0513-000-Pansear.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0513--000--Pansear.png
rename to src/afd/sprites/back-shiny/0513-000-Pansear.png
diff --git a/src/afd/sprites/back-shiny/0514--000--Simisear.png b/src/afd/sprites/back-shiny/0514-000-Simisear.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0514--000--Simisear.png
rename to src/afd/sprites/back-shiny/0514-000-Simisear.png
diff --git a/src/afd/sprites/back-shiny/0515--000--Panpour.png b/src/afd/sprites/back-shiny/0515-000-Panpour.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0515--000--Panpour.png
rename to src/afd/sprites/back-shiny/0515-000-Panpour.png
diff --git a/src/afd/sprites/back-shiny/0516--000--Simipour.png b/src/afd/sprites/back-shiny/0516-000-Simipour.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0516--000--Simipour.png
rename to src/afd/sprites/back-shiny/0516-000-Simipour.png
diff --git a/src/afd/sprites/back-shiny/0517--000--Munna.png b/src/afd/sprites/back-shiny/0517-000-Munna.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0517--000--Munna.png
rename to src/afd/sprites/back-shiny/0517-000-Munna.png
diff --git a/src/afd/sprites/back-shiny/0518--000--Musharna.png b/src/afd/sprites/back-shiny/0518-000-Musharna.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0518--000--Musharna.png
rename to src/afd/sprites/back-shiny/0518-000-Musharna.png
diff --git a/src/afd/sprites/back-shiny/0519--000--Pidove.png b/src/afd/sprites/back-shiny/0519-000-Pidove.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0519--000--Pidove.png
rename to src/afd/sprites/back-shiny/0519-000-Pidove.png
diff --git a/src/afd/sprites/back-shiny/0520--000--Tranquill.png b/src/afd/sprites/back-shiny/0520-000-Tranquill.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0520--000--Tranquill.png
rename to src/afd/sprites/back-shiny/0520-000-Tranquill.png
diff --git a/src/afd/sprites/back-shiny/0521--000--Unfezant.png b/src/afd/sprites/back-shiny/0521-000-Unfezant.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0521--000--Unfezant.png
rename to src/afd/sprites/back-shiny/0521-000-Unfezant.png
diff --git a/src/afd/sprites/back-shiny/0522--000--Blitzle.png b/src/afd/sprites/back-shiny/0522-000-Blitzle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0522--000--Blitzle.png
rename to src/afd/sprites/back-shiny/0522-000-Blitzle.png
diff --git a/src/afd/sprites/back-shiny/0523--000--Zebstrika.png b/src/afd/sprites/back-shiny/0523-000-Zebstrika.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0523--000--Zebstrika.png
rename to src/afd/sprites/back-shiny/0523-000-Zebstrika.png
diff --git a/src/afd/sprites/back-shiny/0524--000--Roggenrola.png b/src/afd/sprites/back-shiny/0524-000-Roggenrola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0524--000--Roggenrola.png
rename to src/afd/sprites/back-shiny/0524-000-Roggenrola.png
diff --git a/src/afd/sprites/back-shiny/0525--000--Boldore.png b/src/afd/sprites/back-shiny/0525-000-Boldore.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0525--000--Boldore.png
rename to src/afd/sprites/back-shiny/0525-000-Boldore.png
diff --git a/src/afd/sprites/back-shiny/0526--000--Gigalith.png b/src/afd/sprites/back-shiny/0526-000-Gigalith.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0526--000--Gigalith.png
rename to src/afd/sprites/back-shiny/0526-000-Gigalith.png
diff --git a/src/afd/sprites/back-shiny/0527--000--Woobat.png b/src/afd/sprites/back-shiny/0527-000-Woobat.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0527--000--Woobat.png
rename to src/afd/sprites/back-shiny/0527-000-Woobat.png
diff --git a/src/afd/sprites/back-shiny/0528--000--Swoobat.png b/src/afd/sprites/back-shiny/0528-000-Swoobat.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0528--000--Swoobat.png
rename to src/afd/sprites/back-shiny/0528-000-Swoobat.png
diff --git a/src/afd/sprites/back-shiny/0529--000--Drilbur.png b/src/afd/sprites/back-shiny/0529-000-Drilbur.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0529--000--Drilbur.png
rename to src/afd/sprites/back-shiny/0529-000-Drilbur.png
diff --git a/src/afd/sprites/back-shiny/0530--000--Excadrill.png b/src/afd/sprites/back-shiny/0530-000-Excadrill.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0530--000--Excadrill.png
rename to src/afd/sprites/back-shiny/0530-000-Excadrill.png
diff --git a/src/afd/sprites/back-shiny/0531--000--Audino.png b/src/afd/sprites/back-shiny/0531-000-Audino.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0531--000--Audino.png
rename to src/afd/sprites/back-shiny/0531-000-Audino.png
diff --git a/src/afd/sprites/back-shiny/0531--420--Audino--Mega.png b/src/afd/sprites/back-shiny/0531-420-Audino-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0531--420--Audino--Mega.png
rename to src/afd/sprites/back-shiny/0531-420-Audino-Mega.png
diff --git a/src/afd/sprites/back-shiny/0532--000--Timburr.png b/src/afd/sprites/back-shiny/0532-000-Timburr.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0532--000--Timburr.png
rename to src/afd/sprites/back-shiny/0532-000-Timburr.png
diff --git a/src/afd/sprites/back-shiny/0533--000--Gurdurr.png b/src/afd/sprites/back-shiny/0533-000-Gurdurr.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0533--000--Gurdurr.png
rename to src/afd/sprites/back-shiny/0533-000-Gurdurr.png
diff --git a/src/afd/sprites/back-shiny/0534--000--Conkeldurr.png b/src/afd/sprites/back-shiny/0534-000-Conkeldurr.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0534--000--Conkeldurr.png
rename to src/afd/sprites/back-shiny/0534-000-Conkeldurr.png
diff --git a/src/afd/sprites/back-shiny/0535--000--Tympole.png b/src/afd/sprites/back-shiny/0535-000-Tympole.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0535--000--Tympole.png
rename to src/afd/sprites/back-shiny/0535-000-Tympole.png
diff --git a/src/afd/sprites/back-shiny/0536--000--Palpitoad.png b/src/afd/sprites/back-shiny/0536-000-Palpitoad.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0536--000--Palpitoad.png
rename to src/afd/sprites/back-shiny/0536-000-Palpitoad.png
diff --git a/src/afd/sprites/back-shiny/0537--000--Seismitoad.png b/src/afd/sprites/back-shiny/0537-000-Seismitoad.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0537--000--Seismitoad.png
rename to src/afd/sprites/back-shiny/0537-000-Seismitoad.png
diff --git a/src/afd/sprites/back-shiny/0538--000--Throh.png b/src/afd/sprites/back-shiny/0538-000-Throh.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0538--000--Throh.png
rename to src/afd/sprites/back-shiny/0538-000-Throh.png
diff --git a/src/afd/sprites/back-shiny/0539--000--Sawk.png b/src/afd/sprites/back-shiny/0539-000-Sawk.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0539--000--Sawk.png
rename to src/afd/sprites/back-shiny/0539-000-Sawk.png
diff --git a/src/afd/sprites/back-shiny/0540--000--Sewaddle.png b/src/afd/sprites/back-shiny/0540-000-Sewaddle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0540--000--Sewaddle.png
rename to src/afd/sprites/back-shiny/0540-000-Sewaddle.png
diff --git a/src/afd/sprites/back-shiny/0541--000--Swadloon.png b/src/afd/sprites/back-shiny/0541-000-Swadloon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0541--000--Swadloon.png
rename to src/afd/sprites/back-shiny/0541-000-Swadloon.png
diff --git a/src/afd/sprites/back-shiny/0542--000--Leavanny.png b/src/afd/sprites/back-shiny/0542-000-Leavanny.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0542--000--Leavanny.png
rename to src/afd/sprites/back-shiny/0542-000-Leavanny.png
diff --git a/src/afd/sprites/back-shiny/0543--000--Venipede.png b/src/afd/sprites/back-shiny/0543-000-Venipede.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0543--000--Venipede.png
rename to src/afd/sprites/back-shiny/0543-000-Venipede.png
diff --git a/src/afd/sprites/back-shiny/0544--000--Whirlipede.png b/src/afd/sprites/back-shiny/0544-000-Whirlipede.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0544--000--Whirlipede.png
rename to src/afd/sprites/back-shiny/0544-000-Whirlipede.png
diff --git a/src/afd/sprites/back-shiny/0545--000--Scolipede.png b/src/afd/sprites/back-shiny/0545-000-Scolipede.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0545--000--Scolipede.png
rename to src/afd/sprites/back-shiny/0545-000-Scolipede.png
diff --git a/src/afd/sprites/back-shiny/0546--000--Cottonee.png b/src/afd/sprites/back-shiny/0546-000-Cottonee.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0546--000--Cottonee.png
rename to src/afd/sprites/back-shiny/0546-000-Cottonee.png
diff --git a/src/afd/sprites/back-shiny/0547--000--Whimsicott.png b/src/afd/sprites/back-shiny/0547-000-Whimsicott.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0547--000--Whimsicott.png
rename to src/afd/sprites/back-shiny/0547-000-Whimsicott.png
diff --git a/src/afd/sprites/back-shiny/0548--000--Petilil.png b/src/afd/sprites/back-shiny/0548-000-Petilil.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0548--000--Petilil.png
rename to src/afd/sprites/back-shiny/0548-000-Petilil.png
diff --git a/src/afd/sprites/back-shiny/0549--000--Lilligant.png b/src/afd/sprites/back-shiny/0549-000-Lilligant.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0549--000--Lilligant.png
rename to src/afd/sprites/back-shiny/0549-000-Lilligant.png
diff --git a/src/afd/sprites/back-shiny/0550--000--Basculin.png b/src/afd/sprites/back-shiny/0550-000-Basculin.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0550--000--Basculin.png
rename to src/afd/sprites/back-shiny/0550-000-Basculin.png
diff --git a/src/afd/sprites/back-shiny/0551--000--Sandile.png b/src/afd/sprites/back-shiny/0551-000-Sandile.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0551--000--Sandile.png
rename to src/afd/sprites/back-shiny/0551-000-Sandile.png
diff --git a/src/afd/sprites/back-shiny/0552--000--Krokorok.png b/src/afd/sprites/back-shiny/0552-000-Krokorok.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0552--000--Krokorok.png
rename to src/afd/sprites/back-shiny/0552-000-Krokorok.png
diff --git a/src/afd/sprites/back-shiny/0553--000--Krookodile.png b/src/afd/sprites/back-shiny/0553-000-Krookodile.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0553--000--Krookodile.png
rename to src/afd/sprites/back-shiny/0553-000-Krookodile.png
diff --git a/src/afd/sprites/back-shiny/0554--000--Darumaka.png b/src/afd/sprites/back-shiny/0554-000-Darumaka.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0554--000--Darumaka.png
rename to src/afd/sprites/back-shiny/0554-000-Darumaka.png
diff --git a/src/afd/sprites/back-shiny/0554--420--Darumaka--Galar.png b/src/afd/sprites/back-shiny/0554-420-Darumaka-Galar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0554--420--Darumaka--Galar.png
rename to src/afd/sprites/back-shiny/0554-420-Darumaka-Galar.png
diff --git a/src/afd/sprites/back-shiny/0555--000--Darmanitan.png b/src/afd/sprites/back-shiny/0555-000-Darmanitan.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0555--000--Darmanitan.png
rename to src/afd/sprites/back-shiny/0555-000-Darmanitan.png
diff --git a/src/afd/sprites/back-shiny/0555--420--Darmanitan--Galar.png b/src/afd/sprites/back-shiny/0555-420-Darmanitan-Galar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0555--420--Darmanitan--Galar.png
rename to src/afd/sprites/back-shiny/0555-420-Darmanitan-Galar.png
diff --git a/src/afd/sprites/back-shiny/0555--420--Darmanitan--Galar-Zen.png b/src/afd/sprites/back-shiny/0555-420-Darmanitan-Galar~Zen.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0555--420--Darmanitan--Galar-Zen.png
rename to src/afd/sprites/back-shiny/0555-420-Darmanitan-Galar~Zen.png
diff --git a/src/afd/sprites/back-shiny/0555--420--Darmanitan--Zen.png b/src/afd/sprites/back-shiny/0555-420-Darmanitan-Zen.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0555--420--Darmanitan--Zen.png
rename to src/afd/sprites/back-shiny/0555-420-Darmanitan-Zen.png
diff --git a/src/afd/sprites/back-shiny/0556--000--Maractus.png b/src/afd/sprites/back-shiny/0556-000-Maractus.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0556--000--Maractus.png
rename to src/afd/sprites/back-shiny/0556-000-Maractus.png
diff --git a/src/afd/sprites/back-shiny/0557--000--Dwebble.png b/src/afd/sprites/back-shiny/0557-000-Dwebble.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0557--000--Dwebble.png
rename to src/afd/sprites/back-shiny/0557-000-Dwebble.png
diff --git a/src/afd/sprites/back-shiny/0558--000--Crustle.png b/src/afd/sprites/back-shiny/0558-000-Crustle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0558--000--Crustle.png
rename to src/afd/sprites/back-shiny/0558-000-Crustle.png
diff --git a/src/afd/sprites/back-shiny/0559--000--Scraggy.png b/src/afd/sprites/back-shiny/0559-000-Scraggy.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0559--000--Scraggy.png
rename to src/afd/sprites/back-shiny/0559-000-Scraggy.png
diff --git a/src/afd/sprites/back-shiny/0560--000--Scrafty.png b/src/afd/sprites/back-shiny/0560-000-Scrafty.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0560--000--Scrafty.png
rename to src/afd/sprites/back-shiny/0560-000-Scrafty.png
diff --git a/src/afd/sprites/back-shiny/0561--000--Sigilyph.png b/src/afd/sprites/back-shiny/0561-000-Sigilyph.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0561--000--Sigilyph.png
rename to src/afd/sprites/back-shiny/0561-000-Sigilyph.png
diff --git a/src/afd/sprites/back-shiny/0562--000--Yamask.png b/src/afd/sprites/back-shiny/0562-000-Yamask.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0562--000--Yamask.png
rename to src/afd/sprites/back-shiny/0562-000-Yamask.png
diff --git a/src/afd/sprites/back-shiny/0562--420--Yamask--Galar.png b/src/afd/sprites/back-shiny/0562-420-Yamask-Galar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0562--420--Yamask--Galar.png
rename to src/afd/sprites/back-shiny/0562-420-Yamask-Galar.png
diff --git a/src/afd/sprites/back-shiny/0563--000--Cofagrigus.png b/src/afd/sprites/back-shiny/0563-000-Cofagrigus.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0563--000--Cofagrigus.png
rename to src/afd/sprites/back-shiny/0563-000-Cofagrigus.png
diff --git a/src/afd/sprites/back-shiny/0564--000--Tirtouga.png b/src/afd/sprites/back-shiny/0564-000-Tirtouga.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0564--000--Tirtouga.png
rename to src/afd/sprites/back-shiny/0564-000-Tirtouga.png
diff --git a/src/afd/sprites/back-shiny/0565--000--Carracosta.png b/src/afd/sprites/back-shiny/0565-000-Carracosta.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0565--000--Carracosta.png
rename to src/afd/sprites/back-shiny/0565-000-Carracosta.png
diff --git a/src/afd/sprites/back-shiny/0566--000--Archen.png b/src/afd/sprites/back-shiny/0566-000-Archen.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0566--000--Archen.png
rename to src/afd/sprites/back-shiny/0566-000-Archen.png
diff --git a/src/afd/sprites/back-shiny/0567--000--Archeops.png b/src/afd/sprites/back-shiny/0567-000-Archeops.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0567--000--Archeops.png
rename to src/afd/sprites/back-shiny/0567-000-Archeops.png
diff --git a/src/afd/sprites/back-shiny/0568--000--Trubbish.png b/src/afd/sprites/back-shiny/0568-000-Trubbish.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0568--000--Trubbish.png
rename to src/afd/sprites/back-shiny/0568-000-Trubbish.png
diff --git a/src/afd/sprites/back-shiny/0569--000--Garbodor.png b/src/afd/sprites/back-shiny/0569-000-Garbodor.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0569--000--Garbodor.png
rename to src/afd/sprites/back-shiny/0569-000-Garbodor.png
diff --git a/src/afd/sprites/back-shiny/0569--420--Garbodor--Gmax.png b/src/afd/sprites/back-shiny/0569-420-Garbodor-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0569--420--Garbodor--Gmax.png
rename to src/afd/sprites/back-shiny/0569-420-Garbodor-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0570--000--Zorua.png b/src/afd/sprites/back-shiny/0570-000-Zorua.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0570--000--Zorua.png
rename to src/afd/sprites/back-shiny/0570-000-Zorua.png
diff --git a/src/afd/sprites/back-shiny/0571--000--Zoroark.png b/src/afd/sprites/back-shiny/0571-000-Zoroark.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0571--000--Zoroark.png
rename to src/afd/sprites/back-shiny/0571-000-Zoroark.png
diff --git a/src/afd/sprites/back-shiny/0572--000--Minccino.png b/src/afd/sprites/back-shiny/0572-000-Minccino.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0572--000--Minccino.png
rename to src/afd/sprites/back-shiny/0572-000-Minccino.png
diff --git a/src/afd/sprites/back-shiny/0573--000--Cinccino.png b/src/afd/sprites/back-shiny/0573-000-Cinccino.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0573--000--Cinccino.png
rename to src/afd/sprites/back-shiny/0573-000-Cinccino.png
diff --git a/src/afd/sprites/back-shiny/0574--000--Gothita.png b/src/afd/sprites/back-shiny/0574-000-Gothita.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0574--000--Gothita.png
rename to src/afd/sprites/back-shiny/0574-000-Gothita.png
diff --git a/src/afd/sprites/back-shiny/0575--000--Gothorita.png b/src/afd/sprites/back-shiny/0575-000-Gothorita.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0575--000--Gothorita.png
rename to src/afd/sprites/back-shiny/0575-000-Gothorita.png
diff --git a/src/afd/sprites/back-shiny/0576--000--Gothitelle.png b/src/afd/sprites/back-shiny/0576-000-Gothitelle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0576--000--Gothitelle.png
rename to src/afd/sprites/back-shiny/0576-000-Gothitelle.png
diff --git a/src/afd/sprites/back-shiny/0577--000--Solosis.png b/src/afd/sprites/back-shiny/0577-000-Solosis.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0577--000--Solosis.png
rename to src/afd/sprites/back-shiny/0577-000-Solosis.png
diff --git a/src/afd/sprites/back-shiny/0578--000--Duosion.png b/src/afd/sprites/back-shiny/0578-000-Duosion.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0578--000--Duosion.png
rename to src/afd/sprites/back-shiny/0578-000-Duosion.png
diff --git a/src/afd/sprites/back-shiny/0579--000--Reuniclus.png b/src/afd/sprites/back-shiny/0579-000-Reuniclus.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0579--000--Reuniclus.png
rename to src/afd/sprites/back-shiny/0579-000-Reuniclus.png
diff --git a/src/afd/sprites/back-shiny/0580--000--Ducklett.png b/src/afd/sprites/back-shiny/0580-000-Ducklett.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0580--000--Ducklett.png
rename to src/afd/sprites/back-shiny/0580-000-Ducklett.png
diff --git a/src/afd/sprites/back-shiny/0581--000--Swanna.png b/src/afd/sprites/back-shiny/0581-000-Swanna.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0581--000--Swanna.png
rename to src/afd/sprites/back-shiny/0581-000-Swanna.png
diff --git a/src/afd/sprites/back-shiny/0582--000--Vanillite.png b/src/afd/sprites/back-shiny/0582-000-Vanillite.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0582--000--Vanillite.png
rename to src/afd/sprites/back-shiny/0582-000-Vanillite.png
diff --git a/src/afd/sprites/back-shiny/0583--000--Vanillish.png b/src/afd/sprites/back-shiny/0583-000-Vanillish.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0583--000--Vanillish.png
rename to src/afd/sprites/back-shiny/0583-000-Vanillish.png
diff --git a/src/afd/sprites/back-shiny/0584--000--Vanilluxe.png b/src/afd/sprites/back-shiny/0584-000-Vanilluxe.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0584--000--Vanilluxe.png
rename to src/afd/sprites/back-shiny/0584-000-Vanilluxe.png
diff --git a/src/afd/sprites/back-shiny/0585--000--Deerling.png b/src/afd/sprites/back-shiny/0585-000-Deerling.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0585--000--Deerling.png
rename to src/afd/sprites/back-shiny/0585-000-Deerling.png
diff --git a/src/afd/sprites/back-shiny/0586--000--Sawsbuck.png b/src/afd/sprites/back-shiny/0586-000-Sawsbuck.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0586--000--Sawsbuck.png
rename to src/afd/sprites/back-shiny/0586-000-Sawsbuck.png
diff --git a/src/afd/sprites/back-shiny/0587--000--Emolga.png b/src/afd/sprites/back-shiny/0587-000-Emolga.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0587--000--Emolga.png
rename to src/afd/sprites/back-shiny/0587-000-Emolga.png
diff --git a/src/afd/sprites/back-shiny/0588--000--Karrablast.png b/src/afd/sprites/back-shiny/0588-000-Karrablast.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0588--000--Karrablast.png
rename to src/afd/sprites/back-shiny/0588-000-Karrablast.png
diff --git a/src/afd/sprites/back-shiny/0589--000--Escavalier.png b/src/afd/sprites/back-shiny/0589-000-Escavalier.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0589--000--Escavalier.png
rename to src/afd/sprites/back-shiny/0589-000-Escavalier.png
diff --git a/src/afd/sprites/back-shiny/0590--000--Foongus.png b/src/afd/sprites/back-shiny/0590-000-Foongus.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0590--000--Foongus.png
rename to src/afd/sprites/back-shiny/0590-000-Foongus.png
diff --git a/src/afd/sprites/back-shiny/0591--000--Amoonguss.png b/src/afd/sprites/back-shiny/0591-000-Amoonguss.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0591--000--Amoonguss.png
rename to src/afd/sprites/back-shiny/0591-000-Amoonguss.png
diff --git a/src/afd/sprites/back-shiny/0592--000--Frillish.png b/src/afd/sprites/back-shiny/0592-000-Frillish.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0592--000--Frillish.png
rename to src/afd/sprites/back-shiny/0592-000-Frillish.png
diff --git a/src/afd/sprites/back-shiny/0593--000--Jellicent.png b/src/afd/sprites/back-shiny/0593-000-Jellicent.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0593--000--Jellicent.png
rename to src/afd/sprites/back-shiny/0593-000-Jellicent.png
diff --git a/src/afd/sprites/back-shiny/0594--000--Alomomola.png b/src/afd/sprites/back-shiny/0594-000-Alomomola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0594--000--Alomomola.png
rename to src/afd/sprites/back-shiny/0594-000-Alomomola.png
diff --git a/src/afd/sprites/back-shiny/0595--000--Joltik.png b/src/afd/sprites/back-shiny/0595-000-Joltik.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0595--000--Joltik.png
rename to src/afd/sprites/back-shiny/0595-000-Joltik.png
diff --git a/src/afd/sprites/back-shiny/0596--000--Galvantula.png b/src/afd/sprites/back-shiny/0596-000-Galvantula.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0596--000--Galvantula.png
rename to src/afd/sprites/back-shiny/0596-000-Galvantula.png
diff --git a/src/afd/sprites/back-shiny/0597--000--Ferroseed.png b/src/afd/sprites/back-shiny/0597-000-Ferroseed.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0597--000--Ferroseed.png
rename to src/afd/sprites/back-shiny/0597-000-Ferroseed.png
diff --git a/src/afd/sprites/back-shiny/0598--000--Ferrothorn.png b/src/afd/sprites/back-shiny/0598-000-Ferrothorn.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0598--000--Ferrothorn.png
rename to src/afd/sprites/back-shiny/0598-000-Ferrothorn.png
diff --git a/src/afd/sprites/back-shiny/0599--000--Klink.png b/src/afd/sprites/back-shiny/0599-000-Klink.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0599--000--Klink.png
rename to src/afd/sprites/back-shiny/0599-000-Klink.png
diff --git a/src/afd/sprites/back-shiny/0600--000--Klang.png b/src/afd/sprites/back-shiny/0600-000-Klang.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0600--000--Klang.png
rename to src/afd/sprites/back-shiny/0600-000-Klang.png
diff --git a/src/afd/sprites/back-shiny/0601--000--Klinklang.png b/src/afd/sprites/back-shiny/0601-000-Klinklang.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0601--000--Klinklang.png
rename to src/afd/sprites/back-shiny/0601-000-Klinklang.png
diff --git a/src/afd/sprites/back-shiny/0602--000--Tynamo.png b/src/afd/sprites/back-shiny/0602-000-Tynamo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0602--000--Tynamo.png
rename to src/afd/sprites/back-shiny/0602-000-Tynamo.png
diff --git a/src/afd/sprites/back-shiny/0603--000--Eelektrik.png b/src/afd/sprites/back-shiny/0603-000-Eelektrik.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0603--000--Eelektrik.png
rename to src/afd/sprites/back-shiny/0603-000-Eelektrik.png
diff --git a/src/afd/sprites/back-shiny/0604--000--Eelektross.png b/src/afd/sprites/back-shiny/0604-000-Eelektross.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0604--000--Eelektross.png
rename to src/afd/sprites/back-shiny/0604-000-Eelektross.png
diff --git a/src/afd/sprites/back-shiny/0605--000--Elgyem.png b/src/afd/sprites/back-shiny/0605-000-Elgyem.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0605--000--Elgyem.png
rename to src/afd/sprites/back-shiny/0605-000-Elgyem.png
diff --git a/src/afd/sprites/back-shiny/0606--000--Beheeyem.png b/src/afd/sprites/back-shiny/0606-000-Beheeyem.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0606--000--Beheeyem.png
rename to src/afd/sprites/back-shiny/0606-000-Beheeyem.png
diff --git a/src/afd/sprites/back-shiny/0607--000--Litwick.png b/src/afd/sprites/back-shiny/0607-000-Litwick.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0607--000--Litwick.png
rename to src/afd/sprites/back-shiny/0607-000-Litwick.png
diff --git a/src/afd/sprites/back-shiny/0608--000--Lampent.png b/src/afd/sprites/back-shiny/0608-000-Lampent.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0608--000--Lampent.png
rename to src/afd/sprites/back-shiny/0608-000-Lampent.png
diff --git a/src/afd/sprites/back-shiny/0609--000--Chandelure.png b/src/afd/sprites/back-shiny/0609-000-Chandelure.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0609--000--Chandelure.png
rename to src/afd/sprites/back-shiny/0609-000-Chandelure.png
diff --git a/src/afd/sprites/back-shiny/0610--000--Axew.png b/src/afd/sprites/back-shiny/0610-000-Axew.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0610--000--Axew.png
rename to src/afd/sprites/back-shiny/0610-000-Axew.png
diff --git a/src/afd/sprites/back-shiny/0611--000--Fraxure.png b/src/afd/sprites/back-shiny/0611-000-Fraxure.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0611--000--Fraxure.png
rename to src/afd/sprites/back-shiny/0611-000-Fraxure.png
diff --git a/src/afd/sprites/back-shiny/0612--000--Haxorus.png b/src/afd/sprites/back-shiny/0612-000-Haxorus.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0612--000--Haxorus.png
rename to src/afd/sprites/back-shiny/0612-000-Haxorus.png
diff --git a/src/afd/sprites/back-shiny/0613--000--Cubchoo.png b/src/afd/sprites/back-shiny/0613-000-Cubchoo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0613--000--Cubchoo.png
rename to src/afd/sprites/back-shiny/0613-000-Cubchoo.png
diff --git a/src/afd/sprites/back-shiny/0614--000--Beartic.png b/src/afd/sprites/back-shiny/0614-000-Beartic.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0614--000--Beartic.png
rename to src/afd/sprites/back-shiny/0614-000-Beartic.png
diff --git a/src/afd/sprites/back-shiny/0615--000--Cryogonal.png b/src/afd/sprites/back-shiny/0615-000-Cryogonal.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0615--000--Cryogonal.png
rename to src/afd/sprites/back-shiny/0615-000-Cryogonal.png
diff --git a/src/afd/sprites/back-shiny/0616--000--Shelmet.png b/src/afd/sprites/back-shiny/0616-000-Shelmet.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0616--000--Shelmet.png
rename to src/afd/sprites/back-shiny/0616-000-Shelmet.png
diff --git a/src/afd/sprites/back-shiny/0617--000--Accelgor.png b/src/afd/sprites/back-shiny/0617-000-Accelgor.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0617--000--Accelgor.png
rename to src/afd/sprites/back-shiny/0617-000-Accelgor.png
diff --git a/src/afd/sprites/back-shiny/0618--000--Stunfisk.png b/src/afd/sprites/back-shiny/0618-000-Stunfisk.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0618--000--Stunfisk.png
rename to src/afd/sprites/back-shiny/0618-000-Stunfisk.png
diff --git a/src/afd/sprites/back-shiny/0618--420--Stunfisk--Galar.png b/src/afd/sprites/back-shiny/0618-420-Stunfisk-Galar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0618--420--Stunfisk--Galar.png
rename to src/afd/sprites/back-shiny/0618-420-Stunfisk-Galar.png
diff --git a/src/afd/sprites/back-shiny/0619--000--Mienfoo.png b/src/afd/sprites/back-shiny/0619-000-Mienfoo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0619--000--Mienfoo.png
rename to src/afd/sprites/back-shiny/0619-000-Mienfoo.png
diff --git a/src/afd/sprites/back-shiny/0620--000--Mienshao.png b/src/afd/sprites/back-shiny/0620-000-Mienshao.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0620--000--Mienshao.png
rename to src/afd/sprites/back-shiny/0620-000-Mienshao.png
diff --git a/src/afd/sprites/back-shiny/0621--000--Druddigon.png b/src/afd/sprites/back-shiny/0621-000-Druddigon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0621--000--Druddigon.png
rename to src/afd/sprites/back-shiny/0621-000-Druddigon.png
diff --git a/src/afd/sprites/back-shiny/0622--000--Golett.png b/src/afd/sprites/back-shiny/0622-000-Golett.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0622--000--Golett.png
rename to src/afd/sprites/back-shiny/0622-000-Golett.png
diff --git a/src/afd/sprites/back-shiny/0623--000--Golurk.png b/src/afd/sprites/back-shiny/0623-000-Golurk.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0623--000--Golurk.png
rename to src/afd/sprites/back-shiny/0623-000-Golurk.png
diff --git a/src/afd/sprites/back-shiny/0624--000--Pawniard.png b/src/afd/sprites/back-shiny/0624-000-Pawniard.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0624--000--Pawniard.png
rename to src/afd/sprites/back-shiny/0624-000-Pawniard.png
diff --git a/src/afd/sprites/back-shiny/0625--000--Bisharp.png b/src/afd/sprites/back-shiny/0625-000-Bisharp.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0625--000--Bisharp.png
rename to src/afd/sprites/back-shiny/0625-000-Bisharp.png
diff --git a/src/afd/sprites/back-shiny/0626--000--Bouffalant.png b/src/afd/sprites/back-shiny/0626-000-Bouffalant.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0626--000--Bouffalant.png
rename to src/afd/sprites/back-shiny/0626-000-Bouffalant.png
diff --git a/src/afd/sprites/back-shiny/0627--000--Rufflet.png b/src/afd/sprites/back-shiny/0627-000-Rufflet.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0627--000--Rufflet.png
rename to src/afd/sprites/back-shiny/0627-000-Rufflet.png
diff --git a/src/afd/sprites/back-shiny/0628--000--Braviary.png b/src/afd/sprites/back-shiny/0628-000-Braviary.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0628--000--Braviary.png
rename to src/afd/sprites/back-shiny/0628-000-Braviary.png
diff --git a/src/afd/sprites/back-shiny/0629--000--Vullaby.png b/src/afd/sprites/back-shiny/0629-000-Vullaby.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0629--000--Vullaby.png
rename to src/afd/sprites/back-shiny/0629-000-Vullaby.png
diff --git a/src/afd/sprites/back-shiny/0630--000--Mandibuzz.png b/src/afd/sprites/back-shiny/0630-000-Mandibuzz.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0630--000--Mandibuzz.png
rename to src/afd/sprites/back-shiny/0630-000-Mandibuzz.png
diff --git a/src/afd/sprites/back-shiny/0631--000--Heatmor.png b/src/afd/sprites/back-shiny/0631-000-Heatmor.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0631--000--Heatmor.png
rename to src/afd/sprites/back-shiny/0631-000-Heatmor.png
diff --git a/src/afd/sprites/back-shiny/0632--000--Durant.png b/src/afd/sprites/back-shiny/0632-000-Durant.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0632--000--Durant.png
rename to src/afd/sprites/back-shiny/0632-000-Durant.png
diff --git a/src/afd/sprites/back-shiny/0633--000--Deino.png b/src/afd/sprites/back-shiny/0633-000-Deino.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0633--000--Deino.png
rename to src/afd/sprites/back-shiny/0633-000-Deino.png
diff --git a/src/afd/sprites/back-shiny/0634--000--Zweilous.png b/src/afd/sprites/back-shiny/0634-000-Zweilous.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0634--000--Zweilous.png
rename to src/afd/sprites/back-shiny/0634-000-Zweilous.png
diff --git a/src/afd/sprites/back-shiny/0635--000--Hydreigon.png b/src/afd/sprites/back-shiny/0635-000-Hydreigon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0635--000--Hydreigon.png
rename to src/afd/sprites/back-shiny/0635-000-Hydreigon.png
diff --git a/src/afd/sprites/back-shiny/0636--000--Larvesta.png b/src/afd/sprites/back-shiny/0636-000-Larvesta.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0636--000--Larvesta.png
rename to src/afd/sprites/back-shiny/0636-000-Larvesta.png
diff --git a/src/afd/sprites/back-shiny/0637--000--Volcarona.png b/src/afd/sprites/back-shiny/0637-000-Volcarona.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0637--000--Volcarona.png
rename to src/afd/sprites/back-shiny/0637-000-Volcarona.png
diff --git a/src/afd/sprites/back-shiny/0638--000--Cobalion.png b/src/afd/sprites/back-shiny/0638-000-Cobalion.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0638--000--Cobalion.png
rename to src/afd/sprites/back-shiny/0638-000-Cobalion.png
diff --git a/src/afd/sprites/back-shiny/0639--000--Terrakion.png b/src/afd/sprites/back-shiny/0639-000-Terrakion.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0639--000--Terrakion.png
rename to src/afd/sprites/back-shiny/0639-000-Terrakion.png
diff --git a/src/afd/sprites/back-shiny/0640--000--Virizion.png b/src/afd/sprites/back-shiny/0640-000-Virizion.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0640--000--Virizion.png
rename to src/afd/sprites/back-shiny/0640-000-Virizion.png
diff --git a/src/afd/sprites/back-shiny/0641--000--Tornadus.png b/src/afd/sprites/back-shiny/0641-000-Tornadus.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0641--000--Tornadus.png
rename to src/afd/sprites/back-shiny/0641-000-Tornadus.png
diff --git a/src/afd/sprites/back-shiny/0642--000--Thundurus.png b/src/afd/sprites/back-shiny/0642-000-Thundurus.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0642--000--Thundurus.png
rename to src/afd/sprites/back-shiny/0642-000-Thundurus.png
diff --git a/src/afd/sprites/back-shiny/0642--420--Thundurus--Therian.png b/src/afd/sprites/back-shiny/0642-420-Thundurus-Therian.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0642--420--Thundurus--Therian.png
rename to src/afd/sprites/back-shiny/0642-420-Thundurus-Therian.png
diff --git a/src/afd/sprites/back-shiny/0643--000--Reshiram.png b/src/afd/sprites/back-shiny/0643-000-Reshiram.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0643--000--Reshiram.png
rename to src/afd/sprites/back-shiny/0643-000-Reshiram.png
diff --git a/src/afd/sprites/back-shiny/0644--000--Zekrom.png b/src/afd/sprites/back-shiny/0644-000-Zekrom.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0644--000--Zekrom.png
rename to src/afd/sprites/back-shiny/0644-000-Zekrom.png
diff --git a/src/afd/sprites/back-shiny/0645--000--Landorus.png b/src/afd/sprites/back-shiny/0645-000-Landorus.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0645--000--Landorus.png
rename to src/afd/sprites/back-shiny/0645-000-Landorus.png
diff --git a/src/afd/sprites/back-shiny/0645--420--Landorus--Therian.png b/src/afd/sprites/back-shiny/0645-420-Landorus-Therian.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0645--420--Landorus--Therian.png
rename to src/afd/sprites/back-shiny/0645-420-Landorus-Therian.png
diff --git a/src/afd/sprites/back-shiny/0646--000--Kyurem.png b/src/afd/sprites/back-shiny/0646-000-Kyurem.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0646--000--Kyurem.png
rename to src/afd/sprites/back-shiny/0646-000-Kyurem.png
diff --git a/src/afd/sprites/back-shiny/0646--420--Kyurem--Black.png b/src/afd/sprites/back-shiny/0646-420-Kyurem-Black.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0646--420--Kyurem--Black.png
rename to src/afd/sprites/back-shiny/0646-420-Kyurem-Black.png
diff --git a/src/afd/sprites/back-shiny/0646--420--Kyurem--White.png b/src/afd/sprites/back-shiny/0646-420-Kyurem-White.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0646--420--Kyurem--White.png
rename to src/afd/sprites/back-shiny/0646-420-Kyurem-White.png
diff --git a/src/afd/sprites/back-shiny/0647--000--Keldeo.png b/src/afd/sprites/back-shiny/0647-000-Keldeo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0647--000--Keldeo.png
rename to src/afd/sprites/back-shiny/0647-000-Keldeo.png
diff --git a/src/afd/sprites/back-shiny/0647--420--Keldeo--Resolute.png b/src/afd/sprites/back-shiny/0647-420-Keldeo-Resolute.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0647--420--Keldeo--Resolute.png
rename to src/afd/sprites/back-shiny/0647-420-Keldeo-Resolute.png
diff --git a/src/afd/sprites/back-shiny/0648--000--Meloetta.png b/src/afd/sprites/back-shiny/0648-000-Meloetta.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0648--000--Meloetta.png
rename to src/afd/sprites/back-shiny/0648-000-Meloetta.png
diff --git a/src/afd/sprites/back-shiny/0648--420--Meloetta--Pirouette.png b/src/afd/sprites/back-shiny/0648-420-Meloetta-Pirouette.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0648--420--Meloetta--Pirouette.png
rename to src/afd/sprites/back-shiny/0648-420-Meloetta-Pirouette.png
diff --git a/src/afd/sprites/back-shiny/0649--000--Genesect.png b/src/afd/sprites/back-shiny/0649-000-Genesect.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0649--000--Genesect.png
rename to src/afd/sprites/back-shiny/0649-000-Genesect.png
diff --git a/src/afd/sprites/back-shiny/0649--420--Genesect--Burn.png b/src/afd/sprites/back-shiny/0649-420-Genesect-Burn.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0649--420--Genesect--Burn.png
rename to src/afd/sprites/back-shiny/0649-420-Genesect-Burn.png
diff --git a/src/afd/sprites/back-shiny/0649--420--Genesect--Chill.png b/src/afd/sprites/back-shiny/0649-420-Genesect-Chill.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0649--420--Genesect--Chill.png
rename to src/afd/sprites/back-shiny/0649-420-Genesect-Chill.png
diff --git a/src/afd/sprites/back-shiny/0649--420--Genesect--Douse.png b/src/afd/sprites/back-shiny/0649-420-Genesect-Douse.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0649--420--Genesect--Douse.png
rename to src/afd/sprites/back-shiny/0649-420-Genesect-Douse.png
diff --git a/src/afd/sprites/back-shiny/0649--420--Genesect--Shock.png b/src/afd/sprites/back-shiny/0649-420-Genesect-Shock.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0649--420--Genesect--Shock.png
rename to src/afd/sprites/back-shiny/0649-420-Genesect-Shock.png
diff --git a/src/afd/sprites/back-shiny/0650--000--Chespin.png b/src/afd/sprites/back-shiny/0650-000-Chespin.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0650--000--Chespin.png
rename to src/afd/sprites/back-shiny/0650-000-Chespin.png
diff --git a/src/afd/sprites/back-shiny/0651--000--Quilladin.png b/src/afd/sprites/back-shiny/0651-000-Quilladin.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0651--000--Quilladin.png
rename to src/afd/sprites/back-shiny/0651-000-Quilladin.png
diff --git a/src/afd/sprites/back-shiny/0652--000--Chesnaught.png b/src/afd/sprites/back-shiny/0652-000-Chesnaught.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0652--000--Chesnaught.png
rename to src/afd/sprites/back-shiny/0652-000-Chesnaught.png
diff --git a/src/afd/sprites/back-shiny/0653--000--Fennekin.png b/src/afd/sprites/back-shiny/0653-000-Fennekin.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0653--000--Fennekin.png
rename to src/afd/sprites/back-shiny/0653-000-Fennekin.png
diff --git a/src/afd/sprites/back-shiny/0654--000--Braixen.png b/src/afd/sprites/back-shiny/0654-000-Braixen.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0654--000--Braixen.png
rename to src/afd/sprites/back-shiny/0654-000-Braixen.png
diff --git a/src/afd/sprites/back-shiny/0655--000--Delphox.png b/src/afd/sprites/back-shiny/0655-000-Delphox.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0655--000--Delphox.png
rename to src/afd/sprites/back-shiny/0655-000-Delphox.png
diff --git a/src/afd/sprites/back-shiny/0656--000--Froakie.png b/src/afd/sprites/back-shiny/0656-000-Froakie.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0656--000--Froakie.png
rename to src/afd/sprites/back-shiny/0656-000-Froakie.png
diff --git a/src/afd/sprites/back-shiny/0657--000--Frogadier.png b/src/afd/sprites/back-shiny/0657-000-Frogadier.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0657--000--Frogadier.png
rename to src/afd/sprites/back-shiny/0657-000-Frogadier.png
diff --git a/src/afd/sprites/back-shiny/0658--000--Greninja.png b/src/afd/sprites/back-shiny/0658-000-Greninja.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0658--000--Greninja.png
rename to src/afd/sprites/back-shiny/0658-000-Greninja.png
diff --git a/src/afd/sprites/back-shiny/0658--420--Greninja--Ash.png b/src/afd/sprites/back-shiny/0658-420-Greninja-Ash.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0658--420--Greninja--Ash.png
rename to src/afd/sprites/back-shiny/0658-420-Greninja-Ash.png
diff --git a/src/afd/sprites/back-shiny/0659--000--Bunnelby.png b/src/afd/sprites/back-shiny/0659-000-Bunnelby.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0659--000--Bunnelby.png
rename to src/afd/sprites/back-shiny/0659-000-Bunnelby.png
diff --git a/src/afd/sprites/back-shiny/0660--000--Diggersby.png b/src/afd/sprites/back-shiny/0660-000-Diggersby.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0660--000--Diggersby.png
rename to src/afd/sprites/back-shiny/0660-000-Diggersby.png
diff --git a/src/afd/sprites/back-shiny/0661--000--Fletchling.png b/src/afd/sprites/back-shiny/0661-000-Fletchling.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0661--000--Fletchling.png
rename to src/afd/sprites/back-shiny/0661-000-Fletchling.png
diff --git a/src/afd/sprites/back-shiny/0662--000--Fletchinder.png b/src/afd/sprites/back-shiny/0662-000-Fletchinder.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0662--000--Fletchinder.png
rename to src/afd/sprites/back-shiny/0662-000-Fletchinder.png
diff --git a/src/afd/sprites/back-shiny/0663--000--Talonflame.png b/src/afd/sprites/back-shiny/0663-000-Talonflame.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0663--000--Talonflame.png
rename to src/afd/sprites/back-shiny/0663-000-Talonflame.png
diff --git a/src/afd/sprites/back-shiny/0664--000--Scatterbug.png b/src/afd/sprites/back-shiny/0664-000-Scatterbug.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0664--000--Scatterbug.png
rename to src/afd/sprites/back-shiny/0664-000-Scatterbug.png
diff --git a/src/afd/sprites/back-shiny/0665--000--Spewpa.png b/src/afd/sprites/back-shiny/0665-000-Spewpa.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0665--000--Spewpa.png
rename to src/afd/sprites/back-shiny/0665-000-Spewpa.png
diff --git a/src/afd/sprites/back-shiny/0666--000--Vivillon.png b/src/afd/sprites/back-shiny/0666-000-Vivillon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0666--000--Vivillon.png
rename to src/afd/sprites/back-shiny/0666-000-Vivillon.png
diff --git a/src/afd/sprites/back-shiny/0667--000--Litleo.png b/src/afd/sprites/back-shiny/0667-000-Litleo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0667--000--Litleo.png
rename to src/afd/sprites/back-shiny/0667-000-Litleo.png
diff --git a/src/afd/sprites/back-shiny/0668--000--Pyroar.png b/src/afd/sprites/back-shiny/0668-000-Pyroar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0668--000--Pyroar.png
rename to src/afd/sprites/back-shiny/0668-000-Pyroar.png
diff --git a/src/afd/sprites/back-shiny/0669--000--Flabe__0301be__0301.png b/src/afd/sprites/back-shiny/0669-000-Flabe__0301be__0301.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0669--000--Flabe__0301be__0301.png
rename to src/afd/sprites/back-shiny/0669-000-Flabe__0301be__0301.png
diff --git a/src/afd/sprites/back-shiny/0670--000--Floette.png b/src/afd/sprites/back-shiny/0670-000-Floette.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0670--000--Floette.png
rename to src/afd/sprites/back-shiny/0670-000-Floette.png
diff --git a/src/afd/sprites/back-shiny/0670--420--Floette--Eternal.png b/src/afd/sprites/back-shiny/0670-420-Floette-Eternal.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0670--420--Floette--Eternal.png
rename to src/afd/sprites/back-shiny/0670-420-Floette-Eternal.png
diff --git a/src/afd/sprites/back-shiny/0671--000--Florges.png b/src/afd/sprites/back-shiny/0671-000-Florges.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0671--000--Florges.png
rename to src/afd/sprites/back-shiny/0671-000-Florges.png
diff --git a/src/afd/sprites/back-shiny/0672--000--Skiddo.png b/src/afd/sprites/back-shiny/0672-000-Skiddo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0672--000--Skiddo.png
rename to src/afd/sprites/back-shiny/0672-000-Skiddo.png
diff --git a/src/afd/sprites/back-shiny/0673--000--Gogoat.png b/src/afd/sprites/back-shiny/0673-000-Gogoat.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0673--000--Gogoat.png
rename to src/afd/sprites/back-shiny/0673-000-Gogoat.png
diff --git a/src/afd/sprites/back-shiny/0674--000--Pancham.png b/src/afd/sprites/back-shiny/0674-000-Pancham.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0674--000--Pancham.png
rename to src/afd/sprites/back-shiny/0674-000-Pancham.png
diff --git a/src/afd/sprites/back-shiny/0675--000--Pangoro.png b/src/afd/sprites/back-shiny/0675-000-Pangoro.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0675--000--Pangoro.png
rename to src/afd/sprites/back-shiny/0675-000-Pangoro.png
diff --git a/src/afd/sprites/back-shiny/0676--000--Furfrou.png b/src/afd/sprites/back-shiny/0676-000-Furfrou.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0676--000--Furfrou.png
rename to src/afd/sprites/back-shiny/0676-000-Furfrou.png
diff --git a/src/afd/sprites/back-shiny/0677--000--Espurr.png b/src/afd/sprites/back-shiny/0677-000-Espurr.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0677--000--Espurr.png
rename to src/afd/sprites/back-shiny/0677-000-Espurr.png
diff --git a/src/afd/sprites/back-shiny/0678--000--Meowstic.png b/src/afd/sprites/back-shiny/0678-000-Meowstic.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0678--000--Meowstic.png
rename to src/afd/sprites/back-shiny/0678-000-Meowstic.png
diff --git a/src/afd/sprites/back-shiny/0678--420--Meowstic--F.png b/src/afd/sprites/back-shiny/0678-420-Meowstic-F.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0678--420--Meowstic--F.png
rename to src/afd/sprites/back-shiny/0678-420-Meowstic-F.png
diff --git a/src/afd/sprites/back-shiny/0679--000--Honedge.png b/src/afd/sprites/back-shiny/0679-000-Honedge.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0679--000--Honedge.png
rename to src/afd/sprites/back-shiny/0679-000-Honedge.png
diff --git a/src/afd/sprites/back-shiny/0680--000--Doublade.png b/src/afd/sprites/back-shiny/0680-000-Doublade.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0680--000--Doublade.png
rename to src/afd/sprites/back-shiny/0680-000-Doublade.png
diff --git a/src/afd/sprites/back-shiny/0681--000--Aegislash.png b/src/afd/sprites/back-shiny/0681-000-Aegislash.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0681--000--Aegislash.png
rename to src/afd/sprites/back-shiny/0681-000-Aegislash.png
diff --git a/src/afd/sprites/back-shiny/0681--420--Aegislash--Blade.png b/src/afd/sprites/back-shiny/0681-420-Aegislash-Blade.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0681--420--Aegislash--Blade.png
rename to src/afd/sprites/back-shiny/0681-420-Aegislash-Blade.png
diff --git a/src/afd/sprites/back-shiny/0682--000--Spritzee.png b/src/afd/sprites/back-shiny/0682-000-Spritzee.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0682--000--Spritzee.png
rename to src/afd/sprites/back-shiny/0682-000-Spritzee.png
diff --git a/src/afd/sprites/back-shiny/0683--000--Aromatisse.png b/src/afd/sprites/back-shiny/0683-000-Aromatisse.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0683--000--Aromatisse.png
rename to src/afd/sprites/back-shiny/0683-000-Aromatisse.png
diff --git a/src/afd/sprites/back-shiny/0684--000--Swirlix.png b/src/afd/sprites/back-shiny/0684-000-Swirlix.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0684--000--Swirlix.png
rename to src/afd/sprites/back-shiny/0684-000-Swirlix.png
diff --git a/src/afd/sprites/back-shiny/0685--000--Slurpuff.png b/src/afd/sprites/back-shiny/0685-000-Slurpuff.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0685--000--Slurpuff.png
rename to src/afd/sprites/back-shiny/0685-000-Slurpuff.png
diff --git a/src/afd/sprites/back-shiny/0686--000--Inkay.png b/src/afd/sprites/back-shiny/0686-000-Inkay.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0686--000--Inkay.png
rename to src/afd/sprites/back-shiny/0686-000-Inkay.png
diff --git a/src/afd/sprites/back-shiny/0687--000--Malamar.png b/src/afd/sprites/back-shiny/0687-000-Malamar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0687--000--Malamar.png
rename to src/afd/sprites/back-shiny/0687-000-Malamar.png
diff --git a/src/afd/sprites/back-shiny/0688--000--Binacle.png b/src/afd/sprites/back-shiny/0688-000-Binacle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0688--000--Binacle.png
rename to src/afd/sprites/back-shiny/0688-000-Binacle.png
diff --git a/src/afd/sprites/back-shiny/0689--000--Barbaracle.png b/src/afd/sprites/back-shiny/0689-000-Barbaracle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0689--000--Barbaracle.png
rename to src/afd/sprites/back-shiny/0689-000-Barbaracle.png
diff --git a/src/afd/sprites/back-shiny/0690--000--Skrelp.png b/src/afd/sprites/back-shiny/0690-000-Skrelp.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0690--000--Skrelp.png
rename to src/afd/sprites/back-shiny/0690-000-Skrelp.png
diff --git a/src/afd/sprites/back-shiny/0691--000--Dragalge.png b/src/afd/sprites/back-shiny/0691-000-Dragalge.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0691--000--Dragalge.png
rename to src/afd/sprites/back-shiny/0691-000-Dragalge.png
diff --git a/src/afd/sprites/back-shiny/0692--000--Clauncher.png b/src/afd/sprites/back-shiny/0692-000-Clauncher.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0692--000--Clauncher.png
rename to src/afd/sprites/back-shiny/0692-000-Clauncher.png
diff --git a/src/afd/sprites/back-shiny/0693--000--Clawitzer.png b/src/afd/sprites/back-shiny/0693-000-Clawitzer.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0693--000--Clawitzer.png
rename to src/afd/sprites/back-shiny/0693-000-Clawitzer.png
diff --git a/src/afd/sprites/back-shiny/0694--000--Helioptile.png b/src/afd/sprites/back-shiny/0694-000-Helioptile.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0694--000--Helioptile.png
rename to src/afd/sprites/back-shiny/0694-000-Helioptile.png
diff --git a/src/afd/sprites/back-shiny/0695--000--Heliolisk.png b/src/afd/sprites/back-shiny/0695-000-Heliolisk.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0695--000--Heliolisk.png
rename to src/afd/sprites/back-shiny/0695-000-Heliolisk.png
diff --git a/src/afd/sprites/back-shiny/0696--000--Tyrunt.png b/src/afd/sprites/back-shiny/0696-000-Tyrunt.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0696--000--Tyrunt.png
rename to src/afd/sprites/back-shiny/0696-000-Tyrunt.png
diff --git a/src/afd/sprites/back-shiny/0697--000--Tyrantrum.png b/src/afd/sprites/back-shiny/0697-000-Tyrantrum.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0697--000--Tyrantrum.png
rename to src/afd/sprites/back-shiny/0697-000-Tyrantrum.png
diff --git a/src/afd/sprites/back-shiny/0698--000--Amaura.png b/src/afd/sprites/back-shiny/0698-000-Amaura.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0698--000--Amaura.png
rename to src/afd/sprites/back-shiny/0698-000-Amaura.png
diff --git a/src/afd/sprites/back-shiny/0699--000--Aurorus.png b/src/afd/sprites/back-shiny/0699-000-Aurorus.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0699--000--Aurorus.png
rename to src/afd/sprites/back-shiny/0699-000-Aurorus.png
diff --git a/src/afd/sprites/back-shiny/0700--000--Sylveon.png b/src/afd/sprites/back-shiny/0700-000-Sylveon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0700--000--Sylveon.png
rename to src/afd/sprites/back-shiny/0700-000-Sylveon.png
diff --git a/src/afd/sprites/back-shiny/0701--000--Hawlucha.png b/src/afd/sprites/back-shiny/0701-000-Hawlucha.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0701--000--Hawlucha.png
rename to src/afd/sprites/back-shiny/0701-000-Hawlucha.png
diff --git a/src/afd/sprites/back-shiny/0702--000--Dedenne.png b/src/afd/sprites/back-shiny/0702-000-Dedenne.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0702--000--Dedenne.png
rename to src/afd/sprites/back-shiny/0702-000-Dedenne.png
diff --git a/src/afd/sprites/back-shiny/0703--000--Carbink.png b/src/afd/sprites/back-shiny/0703-000-Carbink.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0703--000--Carbink.png
rename to src/afd/sprites/back-shiny/0703-000-Carbink.png
diff --git a/src/afd/sprites/back-shiny/0704--000--Goomy.png b/src/afd/sprites/back-shiny/0704-000-Goomy.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0704--000--Goomy.png
rename to src/afd/sprites/back-shiny/0704-000-Goomy.png
diff --git a/src/afd/sprites/back-shiny/0705--000--Sliggoo.png b/src/afd/sprites/back-shiny/0705-000-Sliggoo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0705--000--Sliggoo.png
rename to src/afd/sprites/back-shiny/0705-000-Sliggoo.png
diff --git a/src/afd/sprites/back-shiny/0706--000--Goodra.png b/src/afd/sprites/back-shiny/0706-000-Goodra.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0706--000--Goodra.png
rename to src/afd/sprites/back-shiny/0706-000-Goodra.png
diff --git a/src/afd/sprites/back-shiny/0707--000--Klefki.png b/src/afd/sprites/back-shiny/0707-000-Klefki.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0707--000--Klefki.png
rename to src/afd/sprites/back-shiny/0707-000-Klefki.png
diff --git a/src/afd/sprites/back-shiny/0708--000--Phantump.png b/src/afd/sprites/back-shiny/0708-000-Phantump.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0708--000--Phantump.png
rename to src/afd/sprites/back-shiny/0708-000-Phantump.png
diff --git a/src/afd/sprites/back-shiny/0709--000--Trevenant.png b/src/afd/sprites/back-shiny/0709-000-Trevenant.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0709--000--Trevenant.png
rename to src/afd/sprites/back-shiny/0709-000-Trevenant.png
diff --git a/src/afd/sprites/back-shiny/0710--000--Pumpkaboo.png b/src/afd/sprites/back-shiny/0710-000-Pumpkaboo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0710--000--Pumpkaboo.png
rename to src/afd/sprites/back-shiny/0710-000-Pumpkaboo.png
diff --git a/src/afd/sprites/back-shiny/0710--420--Pumpkaboo--Large.png b/src/afd/sprites/back-shiny/0710-420-Pumpkaboo-Large.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0710--420--Pumpkaboo--Large.png
rename to src/afd/sprites/back-shiny/0710-420-Pumpkaboo-Large.png
diff --git a/src/afd/sprites/back-shiny/0710--420--Pumpkaboo--Small.png b/src/afd/sprites/back-shiny/0710-420-Pumpkaboo-Small.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0710--420--Pumpkaboo--Small.png
rename to src/afd/sprites/back-shiny/0710-420-Pumpkaboo-Small.png
diff --git a/src/afd/sprites/back-shiny/0710--420--Pumpkaboo--Super.png b/src/afd/sprites/back-shiny/0710-420-Pumpkaboo-Super.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0710--420--Pumpkaboo--Super.png
rename to src/afd/sprites/back-shiny/0710-420-Pumpkaboo-Super.png
diff --git a/src/afd/sprites/back-shiny/0711--000--Gourgeist.png b/src/afd/sprites/back-shiny/0711-000-Gourgeist.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0711--000--Gourgeist.png
rename to src/afd/sprites/back-shiny/0711-000-Gourgeist.png
diff --git a/src/afd/sprites/back-shiny/0711--420--Gourgeist--Large.png b/src/afd/sprites/back-shiny/0711-420-Gourgeist-Large.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0711--420--Gourgeist--Large.png
rename to src/afd/sprites/back-shiny/0711-420-Gourgeist-Large.png
diff --git a/src/afd/sprites/back-shiny/0711--420--Gourgeist--Small.png b/src/afd/sprites/back-shiny/0711-420-Gourgeist-Small.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0711--420--Gourgeist--Small.png
rename to src/afd/sprites/back-shiny/0711-420-Gourgeist-Small.png
diff --git a/src/afd/sprites/back-shiny/0711--420--Gourgeist--Super.png b/src/afd/sprites/back-shiny/0711-420-Gourgeist-Super.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0711--420--Gourgeist--Super.png
rename to src/afd/sprites/back-shiny/0711-420-Gourgeist-Super.png
diff --git a/src/afd/sprites/back-shiny/0712--000--Bergmite.png b/src/afd/sprites/back-shiny/0712-000-Bergmite.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0712--000--Bergmite.png
rename to src/afd/sprites/back-shiny/0712-000-Bergmite.png
diff --git a/src/afd/sprites/back-shiny/0713--000--Avalugg.png b/src/afd/sprites/back-shiny/0713-000-Avalugg.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0713--000--Avalugg.png
rename to src/afd/sprites/back-shiny/0713-000-Avalugg.png
diff --git a/src/afd/sprites/back-shiny/0714--000--Noibat.png b/src/afd/sprites/back-shiny/0714-000-Noibat.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0714--000--Noibat.png
rename to src/afd/sprites/back-shiny/0714-000-Noibat.png
diff --git a/src/afd/sprites/back-shiny/0715--000--Noivern.png b/src/afd/sprites/back-shiny/0715-000-Noivern.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0715--000--Noivern.png
rename to src/afd/sprites/back-shiny/0715-000-Noivern.png
diff --git a/src/afd/sprites/back-shiny/0716--000--Xerneas.png b/src/afd/sprites/back-shiny/0716-000-Xerneas.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0716--000--Xerneas.png
rename to src/afd/sprites/back-shiny/0716-000-Xerneas.png
diff --git a/src/afd/sprites/back-shiny/0717--000--Yveltal.png b/src/afd/sprites/back-shiny/0717-000-Yveltal.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0717--000--Yveltal.png
rename to src/afd/sprites/back-shiny/0717-000-Yveltal.png
diff --git a/src/afd/sprites/back-shiny/0718--000--Zygarde.png b/src/afd/sprites/back-shiny/0718-000-Zygarde.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0718--000--Zygarde.png
rename to src/afd/sprites/back-shiny/0718-000-Zygarde.png
diff --git a/src/afd/sprites/back-shiny/0718--420--Zygarde--10__0025.png b/src/afd/sprites/back-shiny/0718-420-Zygarde-10__0025.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0718--420--Zygarde--10__0025.png
rename to src/afd/sprites/back-shiny/0718-420-Zygarde-10__0025.png
diff --git a/src/afd/sprites/back-shiny/0718--420--Zygarde--Complete.png b/src/afd/sprites/back-shiny/0718-420-Zygarde-Complete.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0718--420--Zygarde--Complete.png
rename to src/afd/sprites/back-shiny/0718-420-Zygarde-Complete.png
diff --git a/src/afd/sprites/back-shiny/0719--000--Diancie.png b/src/afd/sprites/back-shiny/0719-000-Diancie.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0719--000--Diancie.png
rename to src/afd/sprites/back-shiny/0719-000-Diancie.png
diff --git a/src/afd/sprites/back-shiny/0719--420--Diancie--Mega.png b/src/afd/sprites/back-shiny/0719-420-Diancie-Mega.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0719--420--Diancie--Mega.png
rename to src/afd/sprites/back-shiny/0719-420-Diancie-Mega.png
diff --git a/src/afd/sprites/back-shiny/0720--000--Hoopa.png b/src/afd/sprites/back-shiny/0720-000-Hoopa.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0720--000--Hoopa.png
rename to src/afd/sprites/back-shiny/0720-000-Hoopa.png
diff --git a/src/afd/sprites/back-shiny/0720--420--Hoopa--Unbound.png b/src/afd/sprites/back-shiny/0720-420-Hoopa-Unbound.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0720--420--Hoopa--Unbound.png
rename to src/afd/sprites/back-shiny/0720-420-Hoopa-Unbound.png
diff --git a/src/afd/sprites/back-shiny/0721--000--Volcanion.png b/src/afd/sprites/back-shiny/0721-000-Volcanion.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0721--000--Volcanion.png
rename to src/afd/sprites/back-shiny/0721-000-Volcanion.png
diff --git a/src/afd/sprites/back-shiny/0722--000--Rowlet.png b/src/afd/sprites/back-shiny/0722-000-Rowlet.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0722--000--Rowlet.png
rename to src/afd/sprites/back-shiny/0722-000-Rowlet.png
diff --git a/src/afd/sprites/back-shiny/0723--000--Dartrix.png b/src/afd/sprites/back-shiny/0723-000-Dartrix.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0723--000--Dartrix.png
rename to src/afd/sprites/back-shiny/0723-000-Dartrix.png
diff --git a/src/afd/sprites/back-shiny/0724--000--Decidueye.png b/src/afd/sprites/back-shiny/0724-000-Decidueye.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0724--000--Decidueye.png
rename to src/afd/sprites/back-shiny/0724-000-Decidueye.png
diff --git a/src/afd/sprites/back-shiny/0725--000--Litten.png b/src/afd/sprites/back-shiny/0725-000-Litten.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0725--000--Litten.png
rename to src/afd/sprites/back-shiny/0725-000-Litten.png
diff --git a/src/afd/sprites/back-shiny/0726--000--Torracat.png b/src/afd/sprites/back-shiny/0726-000-Torracat.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0726--000--Torracat.png
rename to src/afd/sprites/back-shiny/0726-000-Torracat.png
diff --git a/src/afd/sprites/back-shiny/0727--000--Incineroar.png b/src/afd/sprites/back-shiny/0727-000-Incineroar.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0727--000--Incineroar.png
rename to src/afd/sprites/back-shiny/0727-000-Incineroar.png
diff --git a/src/afd/sprites/back-shiny/0728--000--Popplio.png b/src/afd/sprites/back-shiny/0728-000-Popplio.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0728--000--Popplio.png
rename to src/afd/sprites/back-shiny/0728-000-Popplio.png
diff --git a/src/afd/sprites/back-shiny/0729--000--Brionne.png b/src/afd/sprites/back-shiny/0729-000-Brionne.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0729--000--Brionne.png
rename to src/afd/sprites/back-shiny/0729-000-Brionne.png
diff --git a/src/afd/sprites/back-shiny/0730--000--Primarina.png b/src/afd/sprites/back-shiny/0730-000-Primarina.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0730--000--Primarina.png
rename to src/afd/sprites/back-shiny/0730-000-Primarina.png
diff --git a/src/afd/sprites/back-shiny/0731--000--Pikipek.png b/src/afd/sprites/back-shiny/0731-000-Pikipek.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0731--000--Pikipek.png
rename to src/afd/sprites/back-shiny/0731-000-Pikipek.png
diff --git a/src/afd/sprites/back-shiny/0732--000--Trumbeak.png b/src/afd/sprites/back-shiny/0732-000-Trumbeak.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0732--000--Trumbeak.png
rename to src/afd/sprites/back-shiny/0732-000-Trumbeak.png
diff --git a/src/afd/sprites/back-shiny/0733--000--Toucannon.png b/src/afd/sprites/back-shiny/0733-000-Toucannon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0733--000--Toucannon.png
rename to src/afd/sprites/back-shiny/0733-000-Toucannon.png
diff --git a/src/afd/sprites/back-shiny/0734--000--Yungoos.png b/src/afd/sprites/back-shiny/0734-000-Yungoos.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0734--000--Yungoos.png
rename to src/afd/sprites/back-shiny/0734-000-Yungoos.png
diff --git a/src/afd/sprites/back-shiny/0735--000--Gumshoos.png b/src/afd/sprites/back-shiny/0735-000-Gumshoos.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0735--000--Gumshoos.png
rename to src/afd/sprites/back-shiny/0735-000-Gumshoos.png
diff --git a/src/afd/sprites/back-shiny/0736--000--Grubbin.png b/src/afd/sprites/back-shiny/0736-000-Grubbin.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0736--000--Grubbin.png
rename to src/afd/sprites/back-shiny/0736-000-Grubbin.png
diff --git a/src/afd/sprites/back-shiny/0737--000--Charjabug.png b/src/afd/sprites/back-shiny/0737-000-Charjabug.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0737--000--Charjabug.png
rename to src/afd/sprites/back-shiny/0737-000-Charjabug.png
diff --git a/src/afd/sprites/back-shiny/0738--000--Vikavolt.png b/src/afd/sprites/back-shiny/0738-000-Vikavolt.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0738--000--Vikavolt.png
rename to src/afd/sprites/back-shiny/0738-000-Vikavolt.png
diff --git a/src/afd/sprites/back-shiny/0739--000--Crabrawler.png b/src/afd/sprites/back-shiny/0739-000-Crabrawler.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0739--000--Crabrawler.png
rename to src/afd/sprites/back-shiny/0739-000-Crabrawler.png
diff --git a/src/afd/sprites/back-shiny/0740--000--Crabominable.png b/src/afd/sprites/back-shiny/0740-000-Crabominable.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0740--000--Crabominable.png
rename to src/afd/sprites/back-shiny/0740-000-Crabominable.png
diff --git a/src/afd/sprites/back-shiny/0741--000--Oricorio.png b/src/afd/sprites/back-shiny/0741-000-Oricorio.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0741--000--Oricorio.png
rename to src/afd/sprites/back-shiny/0741-000-Oricorio.png
diff --git a/src/afd/sprites/back-shiny/0741--420--Oricorio--Pa__0027u.png b/src/afd/sprites/back-shiny/0741-420-Oricorio-Pa__0027u.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0741--420--Oricorio--Pa__0027u.png
rename to src/afd/sprites/back-shiny/0741-420-Oricorio-Pa__0027u.png
diff --git a/src/afd/sprites/back-shiny/0741--420--Oricorio--Pom-Pom.png b/src/afd/sprites/back-shiny/0741-420-Oricorio-Pom~Pom.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0741--420--Oricorio--Pom-Pom.png
rename to src/afd/sprites/back-shiny/0741-420-Oricorio-Pom~Pom.png
diff --git a/src/afd/sprites/back-shiny/0741--420--Oricorio--Sensu.png b/src/afd/sprites/back-shiny/0741-420-Oricorio-Sensu.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0741--420--Oricorio--Sensu.png
rename to src/afd/sprites/back-shiny/0741-420-Oricorio-Sensu.png
diff --git a/src/afd/sprites/back-shiny/0742--000--Cutiefly.png b/src/afd/sprites/back-shiny/0742-000-Cutiefly.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0742--000--Cutiefly.png
rename to src/afd/sprites/back-shiny/0742-000-Cutiefly.png
diff --git a/src/afd/sprites/back-shiny/0743--000--Ribombee.png b/src/afd/sprites/back-shiny/0743-000-Ribombee.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0743--000--Ribombee.png
rename to src/afd/sprites/back-shiny/0743-000-Ribombee.png
diff --git a/src/afd/sprites/back-shiny/0744--000--Rockruff.png b/src/afd/sprites/back-shiny/0744-000-Rockruff.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0744--000--Rockruff.png
rename to src/afd/sprites/back-shiny/0744-000-Rockruff.png
diff --git a/src/afd/sprites/back-shiny/0745--000--Lycanroc.png b/src/afd/sprites/back-shiny/0745-000-Lycanroc.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0745--000--Lycanroc.png
rename to src/afd/sprites/back-shiny/0745-000-Lycanroc.png
diff --git a/src/afd/sprites/back-shiny/0745--420--Lycanroc--Dusk.png b/src/afd/sprites/back-shiny/0745-420-Lycanroc-Dusk.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0745--420--Lycanroc--Dusk.png
rename to src/afd/sprites/back-shiny/0745-420-Lycanroc-Dusk.png
diff --git a/src/afd/sprites/back-shiny/0745--420--Lycanroc--Midnight.png b/src/afd/sprites/back-shiny/0745-420-Lycanroc-Midnight.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0745--420--Lycanroc--Midnight.png
rename to src/afd/sprites/back-shiny/0745-420-Lycanroc-Midnight.png
diff --git a/src/afd/sprites/back-shiny/0746--000--Wishiwashi.png b/src/afd/sprites/back-shiny/0746-000-Wishiwashi.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0746--000--Wishiwashi.png
rename to src/afd/sprites/back-shiny/0746-000-Wishiwashi.png
diff --git a/src/afd/sprites/back-shiny/0746--420--Wishiwashi--School.png b/src/afd/sprites/back-shiny/0746-420-Wishiwashi-School.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0746--420--Wishiwashi--School.png
rename to src/afd/sprites/back-shiny/0746-420-Wishiwashi-School.png
diff --git a/src/afd/sprites/back-shiny/0747--000--Mareanie.png b/src/afd/sprites/back-shiny/0747-000-Mareanie.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0747--000--Mareanie.png
rename to src/afd/sprites/back-shiny/0747-000-Mareanie.png
diff --git a/src/afd/sprites/back-shiny/0748--000--Toxapex.png b/src/afd/sprites/back-shiny/0748-000-Toxapex.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0748--000--Toxapex.png
rename to src/afd/sprites/back-shiny/0748-000-Toxapex.png
diff --git a/src/afd/sprites/back-shiny/0749--000--Mudbray.png b/src/afd/sprites/back-shiny/0749-000-Mudbray.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0749--000--Mudbray.png
rename to src/afd/sprites/back-shiny/0749-000-Mudbray.png
diff --git a/src/afd/sprites/back-shiny/0750--000--Mudsdale.png b/src/afd/sprites/back-shiny/0750-000-Mudsdale.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0750--000--Mudsdale.png
rename to src/afd/sprites/back-shiny/0750-000-Mudsdale.png
diff --git a/src/afd/sprites/back-shiny/0751--000--Dewpider.png b/src/afd/sprites/back-shiny/0751-000-Dewpider.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0751--000--Dewpider.png
rename to src/afd/sprites/back-shiny/0751-000-Dewpider.png
diff --git a/src/afd/sprites/back-shiny/0752--000--Araquanid.png b/src/afd/sprites/back-shiny/0752-000-Araquanid.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0752--000--Araquanid.png
rename to src/afd/sprites/back-shiny/0752-000-Araquanid.png
diff --git a/src/afd/sprites/back-shiny/0753--000--Fomantis.png b/src/afd/sprites/back-shiny/0753-000-Fomantis.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0753--000--Fomantis.png
rename to src/afd/sprites/back-shiny/0753-000-Fomantis.png
diff --git a/src/afd/sprites/back-shiny/0754--000--Lurantis.png b/src/afd/sprites/back-shiny/0754-000-Lurantis.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0754--000--Lurantis.png
rename to src/afd/sprites/back-shiny/0754-000-Lurantis.png
diff --git a/src/afd/sprites/back-shiny/0755--000--Morelull.png b/src/afd/sprites/back-shiny/0755-000-Morelull.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0755--000--Morelull.png
rename to src/afd/sprites/back-shiny/0755-000-Morelull.png
diff --git a/src/afd/sprites/back-shiny/0756--000--Shiinotic.png b/src/afd/sprites/back-shiny/0756-000-Shiinotic.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0756--000--Shiinotic.png
rename to src/afd/sprites/back-shiny/0756-000-Shiinotic.png
diff --git a/src/afd/sprites/back-shiny/0757--000--Salandit.png b/src/afd/sprites/back-shiny/0757-000-Salandit.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0757--000--Salandit.png
rename to src/afd/sprites/back-shiny/0757-000-Salandit.png
diff --git a/src/afd/sprites/back-shiny/0758--000--Salazzle.png b/src/afd/sprites/back-shiny/0758-000-Salazzle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0758--000--Salazzle.png
rename to src/afd/sprites/back-shiny/0758-000-Salazzle.png
diff --git a/src/afd/sprites/back-shiny/0759--000--Stufful.png b/src/afd/sprites/back-shiny/0759-000-Stufful.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0759--000--Stufful.png
rename to src/afd/sprites/back-shiny/0759-000-Stufful.png
diff --git a/src/afd/sprites/back-shiny/0760--000--Bewear.png b/src/afd/sprites/back-shiny/0760-000-Bewear.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0760--000--Bewear.png
rename to src/afd/sprites/back-shiny/0760-000-Bewear.png
diff --git a/src/afd/sprites/back-shiny/0761--000--Bounsweet.png b/src/afd/sprites/back-shiny/0761-000-Bounsweet.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0761--000--Bounsweet.png
rename to src/afd/sprites/back-shiny/0761-000-Bounsweet.png
diff --git a/src/afd/sprites/back-shiny/0762--000--Steenee.png b/src/afd/sprites/back-shiny/0762-000-Steenee.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0762--000--Steenee.png
rename to src/afd/sprites/back-shiny/0762-000-Steenee.png
diff --git a/src/afd/sprites/back-shiny/0763--000--Tsareena.png b/src/afd/sprites/back-shiny/0763-000-Tsareena.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0763--000--Tsareena.png
rename to src/afd/sprites/back-shiny/0763-000-Tsareena.png
diff --git a/src/afd/sprites/back-shiny/0764--000--Comfey.png b/src/afd/sprites/back-shiny/0764-000-Comfey.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0764--000--Comfey.png
rename to src/afd/sprites/back-shiny/0764-000-Comfey.png
diff --git a/src/afd/sprites/back-shiny/0765--000--Oranguru.png b/src/afd/sprites/back-shiny/0765-000-Oranguru.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0765--000--Oranguru.png
rename to src/afd/sprites/back-shiny/0765-000-Oranguru.png
diff --git a/src/afd/sprites/back-shiny/0766--000--Passimian.png b/src/afd/sprites/back-shiny/0766-000-Passimian.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0766--000--Passimian.png
rename to src/afd/sprites/back-shiny/0766-000-Passimian.png
diff --git a/src/afd/sprites/back-shiny/0767--000--Wimpod.png b/src/afd/sprites/back-shiny/0767-000-Wimpod.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0767--000--Wimpod.png
rename to src/afd/sprites/back-shiny/0767-000-Wimpod.png
diff --git a/src/afd/sprites/back-shiny/0768--000--Golisopod.png b/src/afd/sprites/back-shiny/0768-000-Golisopod.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0768--000--Golisopod.png
rename to src/afd/sprites/back-shiny/0768-000-Golisopod.png
diff --git a/src/afd/sprites/back-shiny/0769--000--Sandygast.png b/src/afd/sprites/back-shiny/0769-000-Sandygast.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0769--000--Sandygast.png
rename to src/afd/sprites/back-shiny/0769-000-Sandygast.png
diff --git a/src/afd/sprites/back-shiny/0770--000--Palossand.png b/src/afd/sprites/back-shiny/0770-000-Palossand.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0770--000--Palossand.png
rename to src/afd/sprites/back-shiny/0770-000-Palossand.png
diff --git a/src/afd/sprites/back-shiny/0771--000--Pyukumuku.png b/src/afd/sprites/back-shiny/0771-000-Pyukumuku.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0771--000--Pyukumuku.png
rename to src/afd/sprites/back-shiny/0771-000-Pyukumuku.png
diff --git a/src/afd/sprites/back-shiny/0772--000--Type__003a_Null.png b/src/afd/sprites/back-shiny/0772-000-Type__003a_Null.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0772--000--Type__003a_Null.png
rename to src/afd/sprites/back-shiny/0772-000-Type__003a_Null.png
diff --git a/src/afd/sprites/back-shiny/0773--000--Silvally.png b/src/afd/sprites/back-shiny/0773-000-Silvally.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--000--Silvally.png
rename to src/afd/sprites/back-shiny/0773-000-Silvally.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Bug.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Bug.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Bug.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Bug.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Dark.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Dark.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Dark.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Dark.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Dragon.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Dragon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Dragon.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Dragon.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Electric.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Electric.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Electric.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Electric.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Fairy.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Fairy.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Fairy.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Fairy.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Fighting.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Fighting.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Fighting.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Fighting.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Fire.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Fire.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Fire.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Fire.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Flying.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Flying.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Flying.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Flying.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Ghost.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Ghost.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Ghost.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Ghost.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Grass.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Grass.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Grass.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Grass.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Ground.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Ground.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Ground.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Ground.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Ice.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Ice.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Ice.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Ice.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Poison.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Poison.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Poison.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Poison.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Psychic.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Psychic.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Psychic.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Psychic.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Rock.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Rock.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Rock.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Rock.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Steel.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Steel.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Steel.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Steel.png
diff --git a/src/afd/sprites/back-shiny/0773--420--Silvally--Water.png b/src/afd/sprites/back-shiny/0773-420-Silvally-Water.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0773--420--Silvally--Water.png
rename to src/afd/sprites/back-shiny/0773-420-Silvally-Water.png
diff --git a/src/afd/sprites/back-shiny/0774--000--Minior.png b/src/afd/sprites/back-shiny/0774-000-Minior.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0774--000--Minior.png
rename to src/afd/sprites/back-shiny/0774-000-Minior.png
diff --git a/src/afd/sprites/back-shiny/0774--420--Minior--Meteor.png b/src/afd/sprites/back-shiny/0774-420-Minior-Meteor.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0774--420--Minior--Meteor.png
rename to src/afd/sprites/back-shiny/0774-420-Minior-Meteor.png
diff --git a/src/afd/sprites/back-shiny/0775--000--Komala.png b/src/afd/sprites/back-shiny/0775-000-Komala.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0775--000--Komala.png
rename to src/afd/sprites/back-shiny/0775-000-Komala.png
diff --git a/src/afd/sprites/back-shiny/0776--000--Turtonator.png b/src/afd/sprites/back-shiny/0776-000-Turtonator.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0776--000--Turtonator.png
rename to src/afd/sprites/back-shiny/0776-000-Turtonator.png
diff --git a/src/afd/sprites/back-shiny/0777--000--Togedemaru.png b/src/afd/sprites/back-shiny/0777-000-Togedemaru.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0777--000--Togedemaru.png
rename to src/afd/sprites/back-shiny/0777-000-Togedemaru.png
diff --git a/src/afd/sprites/back-shiny/0778--000--Mimikyu.png b/src/afd/sprites/back-shiny/0778-000-Mimikyu.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0778--000--Mimikyu.png
rename to src/afd/sprites/back-shiny/0778-000-Mimikyu.png
diff --git a/src/afd/sprites/back-shiny/0778--420--Mimikyu--Busted.png b/src/afd/sprites/back-shiny/0778-420-Mimikyu-Busted.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0778--420--Mimikyu--Busted.png
rename to src/afd/sprites/back-shiny/0778-420-Mimikyu-Busted.png
diff --git a/src/afd/sprites/back-shiny/0779--000--Bruxish.png b/src/afd/sprites/back-shiny/0779-000-Bruxish.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0779--000--Bruxish.png
rename to src/afd/sprites/back-shiny/0779-000-Bruxish.png
diff --git a/src/afd/sprites/back-shiny/0780--000--Drampa.png b/src/afd/sprites/back-shiny/0780-000-Drampa.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0780--000--Drampa.png
rename to src/afd/sprites/back-shiny/0780-000-Drampa.png
diff --git a/src/afd/sprites/back-shiny/0781--000--Dhelmise.png b/src/afd/sprites/back-shiny/0781-000-Dhelmise.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0781--000--Dhelmise.png
rename to src/afd/sprites/back-shiny/0781-000-Dhelmise.png
diff --git a/src/afd/sprites/back-shiny/0782--000--Jangmo-o.png b/src/afd/sprites/back-shiny/0782-000-Jangmo~o.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0782--000--Jangmo-o.png
rename to src/afd/sprites/back-shiny/0782-000-Jangmo~o.png
diff --git a/src/afd/sprites/back-shiny/0783--000--Hakamo-o.png b/src/afd/sprites/back-shiny/0783-000-Hakamo~o.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0783--000--Hakamo-o.png
rename to src/afd/sprites/back-shiny/0783-000-Hakamo~o.png
diff --git a/src/afd/sprites/back-shiny/0784--000--Kommo-o.png b/src/afd/sprites/back-shiny/0784-000-Kommo~o.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0784--000--Kommo-o.png
rename to src/afd/sprites/back-shiny/0784-000-Kommo~o.png
diff --git a/src/afd/sprites/back-shiny/0785--000--Tapu_Koko.png b/src/afd/sprites/back-shiny/0785-000-Tapu_Koko.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0785--000--Tapu_Koko.png
rename to src/afd/sprites/back-shiny/0785-000-Tapu_Koko.png
diff --git a/src/afd/sprites/back-shiny/0786--000--Tapu_Lele.png b/src/afd/sprites/back-shiny/0786-000-Tapu_Lele.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0786--000--Tapu_Lele.png
rename to src/afd/sprites/back-shiny/0786-000-Tapu_Lele.png
diff --git a/src/afd/sprites/back-shiny/0787--000--Tapu_Bulu.png b/src/afd/sprites/back-shiny/0787-000-Tapu_Bulu.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0787--000--Tapu_Bulu.png
rename to src/afd/sprites/back-shiny/0787-000-Tapu_Bulu.png
diff --git a/src/afd/sprites/back-shiny/0788--000--Tapu_Fini.png b/src/afd/sprites/back-shiny/0788-000-Tapu_Fini.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0788--000--Tapu_Fini.png
rename to src/afd/sprites/back-shiny/0788-000-Tapu_Fini.png
diff --git a/src/afd/sprites/back-shiny/0789--000--Cosmog.png b/src/afd/sprites/back-shiny/0789-000-Cosmog.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0789--000--Cosmog.png
rename to src/afd/sprites/back-shiny/0789-000-Cosmog.png
diff --git a/src/afd/sprites/back-shiny/0790--000--Cosmoem.png b/src/afd/sprites/back-shiny/0790-000-Cosmoem.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0790--000--Cosmoem.png
rename to src/afd/sprites/back-shiny/0790-000-Cosmoem.png
diff --git a/src/afd/sprites/back-shiny/0791--000--Solgaleo.png b/src/afd/sprites/back-shiny/0791-000-Solgaleo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0791--000--Solgaleo.png
rename to src/afd/sprites/back-shiny/0791-000-Solgaleo.png
diff --git a/src/afd/sprites/back-shiny/0792--000--Lunala.png b/src/afd/sprites/back-shiny/0792-000-Lunala.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0792--000--Lunala.png
rename to src/afd/sprites/back-shiny/0792-000-Lunala.png
diff --git a/src/afd/sprites/back-shiny/0793--000--Nihilego.png b/src/afd/sprites/back-shiny/0793-000-Nihilego.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0793--000--Nihilego.png
rename to src/afd/sprites/back-shiny/0793-000-Nihilego.png
diff --git a/src/afd/sprites/back-shiny/0794--000--Buzzwole.png b/src/afd/sprites/back-shiny/0794-000-Buzzwole.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0794--000--Buzzwole.png
rename to src/afd/sprites/back-shiny/0794-000-Buzzwole.png
diff --git a/src/afd/sprites/back-shiny/0795--000--Pheromosa.png b/src/afd/sprites/back-shiny/0795-000-Pheromosa.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0795--000--Pheromosa.png
rename to src/afd/sprites/back-shiny/0795-000-Pheromosa.png
diff --git a/src/afd/sprites/back-shiny/0796--000--Xurkitree.png b/src/afd/sprites/back-shiny/0796-000-Xurkitree.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0796--000--Xurkitree.png
rename to src/afd/sprites/back-shiny/0796-000-Xurkitree.png
diff --git a/src/afd/sprites/back-shiny/0797--000--Celesteela.png b/src/afd/sprites/back-shiny/0797-000-Celesteela.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0797--000--Celesteela.png
rename to src/afd/sprites/back-shiny/0797-000-Celesteela.png
diff --git a/src/afd/sprites/back-shiny/0798--000--Kartana.png b/src/afd/sprites/back-shiny/0798-000-Kartana.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0798--000--Kartana.png
rename to src/afd/sprites/back-shiny/0798-000-Kartana.png
diff --git a/src/afd/sprites/back-shiny/0799--000--Guzzlord.png b/src/afd/sprites/back-shiny/0799-000-Guzzlord.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0799--000--Guzzlord.png
rename to src/afd/sprites/back-shiny/0799-000-Guzzlord.png
diff --git a/src/afd/sprites/back-shiny/0800--000--Necrozma.png b/src/afd/sprites/back-shiny/0800-000-Necrozma.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0800--000--Necrozma.png
rename to src/afd/sprites/back-shiny/0800-000-Necrozma.png
diff --git a/src/afd/sprites/back-shiny/0800--420--Necrozma--Dawn-Wings.png b/src/afd/sprites/back-shiny/0800-420-Necrozma-Dawn~Wings.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0800--420--Necrozma--Dawn-Wings.png
rename to src/afd/sprites/back-shiny/0800-420-Necrozma-Dawn~Wings.png
diff --git a/src/afd/sprites/back-shiny/0800--420--Necrozma--Dusk-Mane.png b/src/afd/sprites/back-shiny/0800-420-Necrozma-Dusk~Mane.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0800--420--Necrozma--Dusk-Mane.png
rename to src/afd/sprites/back-shiny/0800-420-Necrozma-Dusk~Mane.png
diff --git a/src/afd/sprites/back-shiny/0800--420--Necrozma--Ultra.png b/src/afd/sprites/back-shiny/0800-420-Necrozma-Ultra.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0800--420--Necrozma--Ultra.png
rename to src/afd/sprites/back-shiny/0800-420-Necrozma-Ultra.png
diff --git a/src/afd/sprites/back-shiny/0801--000--Magearna.png b/src/afd/sprites/back-shiny/0801-000-Magearna.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0801--000--Magearna.png
rename to src/afd/sprites/back-shiny/0801-000-Magearna.png
diff --git a/src/afd/sprites/back-shiny/0802--000--Marshadow.png b/src/afd/sprites/back-shiny/0802-000-Marshadow.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0802--000--Marshadow.png
rename to src/afd/sprites/back-shiny/0802-000-Marshadow.png
diff --git a/src/afd/sprites/back-shiny/0803--000--Poipole.png b/src/afd/sprites/back-shiny/0803-000-Poipole.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0803--000--Poipole.png
rename to src/afd/sprites/back-shiny/0803-000-Poipole.png
diff --git a/src/afd/sprites/back-shiny/0804--000--Naganadel.png b/src/afd/sprites/back-shiny/0804-000-Naganadel.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0804--000--Naganadel.png
rename to src/afd/sprites/back-shiny/0804-000-Naganadel.png
diff --git a/src/afd/sprites/back-shiny/0805--000--Stakataka.png b/src/afd/sprites/back-shiny/0805-000-Stakataka.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0805--000--Stakataka.png
rename to src/afd/sprites/back-shiny/0805-000-Stakataka.png
diff --git a/src/afd/sprites/back-shiny/0806--000--Blacephalon.png b/src/afd/sprites/back-shiny/0806-000-Blacephalon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0806--000--Blacephalon.png
rename to src/afd/sprites/back-shiny/0806-000-Blacephalon.png
diff --git a/src/afd/sprites/back-shiny/0807--000--Zeraora.png b/src/afd/sprites/back-shiny/0807-000-Zeraora.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0807--000--Zeraora.png
rename to src/afd/sprites/back-shiny/0807-000-Zeraora.png
diff --git a/src/afd/sprites/back-shiny/0808--000--Meltan.png b/src/afd/sprites/back-shiny/0808-000-Meltan.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0808--000--Meltan.png
rename to src/afd/sprites/back-shiny/0808-000-Meltan.png
diff --git a/src/afd/sprites/back-shiny/0809--000--Melmetal.png b/src/afd/sprites/back-shiny/0809-000-Melmetal.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0809--000--Melmetal.png
rename to src/afd/sprites/back-shiny/0809-000-Melmetal.png
diff --git a/src/afd/sprites/back-shiny/0809--420--Melmetal--Gmax.png b/src/afd/sprites/back-shiny/0809-420-Melmetal-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0809--420--Melmetal--Gmax.png
rename to src/afd/sprites/back-shiny/0809-420-Melmetal-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0810--000--Grookey.png b/src/afd/sprites/back-shiny/0810-000-Grookey.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0810--000--Grookey.png
rename to src/afd/sprites/back-shiny/0810-000-Grookey.png
diff --git a/src/afd/sprites/back-shiny/0811--000--Thwackey.png b/src/afd/sprites/back-shiny/0811-000-Thwackey.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0811--000--Thwackey.png
rename to src/afd/sprites/back-shiny/0811-000-Thwackey.png
diff --git a/src/afd/sprites/back-shiny/0812--000--Rillaboom.png b/src/afd/sprites/back-shiny/0812-000-Rillaboom.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0812--000--Rillaboom.png
rename to src/afd/sprites/back-shiny/0812-000-Rillaboom.png
diff --git a/src/afd/sprites/back-shiny/0813--000--Scorbunny.png b/src/afd/sprites/back-shiny/0813-000-Scorbunny.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0813--000--Scorbunny.png
rename to src/afd/sprites/back-shiny/0813-000-Scorbunny.png
diff --git a/src/afd/sprites/back-shiny/0814--000--Raboot.png b/src/afd/sprites/back-shiny/0814-000-Raboot.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0814--000--Raboot.png
rename to src/afd/sprites/back-shiny/0814-000-Raboot.png
diff --git a/src/afd/sprites/back-shiny/0815--000--Cinderace.png b/src/afd/sprites/back-shiny/0815-000-Cinderace.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0815--000--Cinderace.png
rename to src/afd/sprites/back-shiny/0815-000-Cinderace.png
diff --git a/src/afd/sprites/back-shiny/0816--000--Sobble.png b/src/afd/sprites/back-shiny/0816-000-Sobble.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0816--000--Sobble.png
rename to src/afd/sprites/back-shiny/0816-000-Sobble.png
diff --git a/src/afd/sprites/back-shiny/0817--000--Drizzile.png b/src/afd/sprites/back-shiny/0817-000-Drizzile.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0817--000--Drizzile.png
rename to src/afd/sprites/back-shiny/0817-000-Drizzile.png
diff --git a/src/afd/sprites/back-shiny/0818--000--Inteleon.png b/src/afd/sprites/back-shiny/0818-000-Inteleon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0818--000--Inteleon.png
rename to src/afd/sprites/back-shiny/0818-000-Inteleon.png
diff --git a/src/afd/sprites/back-shiny/0819--000--Skwovet.png b/src/afd/sprites/back-shiny/0819-000-Skwovet.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0819--000--Skwovet.png
rename to src/afd/sprites/back-shiny/0819-000-Skwovet.png
diff --git a/src/afd/sprites/back-shiny/0820--000--Greedent.png b/src/afd/sprites/back-shiny/0820-000-Greedent.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0820--000--Greedent.png
rename to src/afd/sprites/back-shiny/0820-000-Greedent.png
diff --git a/src/afd/sprites/back-shiny/0821--000--Rookidee.png b/src/afd/sprites/back-shiny/0821-000-Rookidee.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0821--000--Rookidee.png
rename to src/afd/sprites/back-shiny/0821-000-Rookidee.png
diff --git a/src/afd/sprites/back-shiny/0822--000--Corvisquire.png b/src/afd/sprites/back-shiny/0822-000-Corvisquire.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0822--000--Corvisquire.png
rename to src/afd/sprites/back-shiny/0822-000-Corvisquire.png
diff --git a/src/afd/sprites/back-shiny/0823--000--Corviknight.png b/src/afd/sprites/back-shiny/0823-000-Corviknight.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0823--000--Corviknight.png
rename to src/afd/sprites/back-shiny/0823-000-Corviknight.png
diff --git a/src/afd/sprites/back-shiny/0823--420--Corviknight--Gmax.png b/src/afd/sprites/back-shiny/0823-420-Corviknight-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0823--420--Corviknight--Gmax.png
rename to src/afd/sprites/back-shiny/0823-420-Corviknight-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0824--000--Blipbug.png b/src/afd/sprites/back-shiny/0824-000-Blipbug.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0824--000--Blipbug.png
rename to src/afd/sprites/back-shiny/0824-000-Blipbug.png
diff --git a/src/afd/sprites/back-shiny/0825--000--Dottler.png b/src/afd/sprites/back-shiny/0825-000-Dottler.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0825--000--Dottler.png
rename to src/afd/sprites/back-shiny/0825-000-Dottler.png
diff --git a/src/afd/sprites/back-shiny/0826--000--Orbeetle.png b/src/afd/sprites/back-shiny/0826-000-Orbeetle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0826--000--Orbeetle.png
rename to src/afd/sprites/back-shiny/0826-000-Orbeetle.png
diff --git a/src/afd/sprites/back-shiny/0826--420--Orbeetle--Gmax.png b/src/afd/sprites/back-shiny/0826-420-Orbeetle-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0826--420--Orbeetle--Gmax.png
rename to src/afd/sprites/back-shiny/0826-420-Orbeetle-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0827--000--Nickit.png b/src/afd/sprites/back-shiny/0827-000-Nickit.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0827--000--Nickit.png
rename to src/afd/sprites/back-shiny/0827-000-Nickit.png
diff --git a/src/afd/sprites/back-shiny/0828--000--Thievul.png b/src/afd/sprites/back-shiny/0828-000-Thievul.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0828--000--Thievul.png
rename to src/afd/sprites/back-shiny/0828-000-Thievul.png
diff --git a/src/afd/sprites/back-shiny/0829--000--Gossifleur.png b/src/afd/sprites/back-shiny/0829-000-Gossifleur.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0829--000--Gossifleur.png
rename to src/afd/sprites/back-shiny/0829-000-Gossifleur.png
diff --git a/src/afd/sprites/back-shiny/0830--000--Eldegoss.png b/src/afd/sprites/back-shiny/0830-000-Eldegoss.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0830--000--Eldegoss.png
rename to src/afd/sprites/back-shiny/0830-000-Eldegoss.png
diff --git a/src/afd/sprites/back-shiny/0831--000--Wooloo.png b/src/afd/sprites/back-shiny/0831-000-Wooloo.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0831--000--Wooloo.png
rename to src/afd/sprites/back-shiny/0831-000-Wooloo.png
diff --git a/src/afd/sprites/back-shiny/0832--000--Dubwool.png b/src/afd/sprites/back-shiny/0832-000-Dubwool.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0832--000--Dubwool.png
rename to src/afd/sprites/back-shiny/0832-000-Dubwool.png
diff --git a/src/afd/sprites/back-shiny/0833--000--Chewtle.png b/src/afd/sprites/back-shiny/0833-000-Chewtle.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0833--000--Chewtle.png
rename to src/afd/sprites/back-shiny/0833-000-Chewtle.png
diff --git a/src/afd/sprites/back-shiny/0834--000--Drednaw.png b/src/afd/sprites/back-shiny/0834-000-Drednaw.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0834--000--Drednaw.png
rename to src/afd/sprites/back-shiny/0834-000-Drednaw.png
diff --git a/src/afd/sprites/back-shiny/0834--420--Drednaw--Gmax.png b/src/afd/sprites/back-shiny/0834-420-Drednaw-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0834--420--Drednaw--Gmax.png
rename to src/afd/sprites/back-shiny/0834-420-Drednaw-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0835--000--Yamper.png b/src/afd/sprites/back-shiny/0835-000-Yamper.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0835--000--Yamper.png
rename to src/afd/sprites/back-shiny/0835-000-Yamper.png
diff --git a/src/afd/sprites/back-shiny/0836--000--Boltund.png b/src/afd/sprites/back-shiny/0836-000-Boltund.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0836--000--Boltund.png
rename to src/afd/sprites/back-shiny/0836-000-Boltund.png
diff --git a/src/afd/sprites/back-shiny/0837--000--Rolycoly.png b/src/afd/sprites/back-shiny/0837-000-Rolycoly.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0837--000--Rolycoly.png
rename to src/afd/sprites/back-shiny/0837-000-Rolycoly.png
diff --git a/src/afd/sprites/back-shiny/0838--000--Carkol.png b/src/afd/sprites/back-shiny/0838-000-Carkol.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0838--000--Carkol.png
rename to src/afd/sprites/back-shiny/0838-000-Carkol.png
diff --git a/src/afd/sprites/back-shiny/0839--000--Coalossal.png b/src/afd/sprites/back-shiny/0839-000-Coalossal.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0839--000--Coalossal.png
rename to src/afd/sprites/back-shiny/0839-000-Coalossal.png
diff --git a/src/afd/sprites/back-shiny/0839--420--Coalossal--Gmax.png b/src/afd/sprites/back-shiny/0839-420-Coalossal-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0839--420--Coalossal--Gmax.png
rename to src/afd/sprites/back-shiny/0839-420-Coalossal-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0840--000--Applin.png b/src/afd/sprites/back-shiny/0840-000-Applin.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0840--000--Applin.png
rename to src/afd/sprites/back-shiny/0840-000-Applin.png
diff --git a/src/afd/sprites/back-shiny/0841--000--Flapple.png b/src/afd/sprites/back-shiny/0841-000-Flapple.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0841--000--Flapple.png
rename to src/afd/sprites/back-shiny/0841-000-Flapple.png
diff --git a/src/afd/sprites/back-shiny/0841--420--Flapple--Gmax.png b/src/afd/sprites/back-shiny/0841-420-Flapple-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0841--420--Flapple--Gmax.png
rename to src/afd/sprites/back-shiny/0841-420-Flapple-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0842--000--Appletun.png b/src/afd/sprites/back-shiny/0842-000-Appletun.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0842--000--Appletun.png
rename to src/afd/sprites/back-shiny/0842-000-Appletun.png
diff --git a/src/afd/sprites/back-shiny/0842--420--Appletun--Gmax.png b/src/afd/sprites/back-shiny/0842-420-Appletun-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0842--420--Appletun--Gmax.png
rename to src/afd/sprites/back-shiny/0842-420-Appletun-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0843--000--Silicobra.png b/src/afd/sprites/back-shiny/0843-000-Silicobra.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0843--000--Silicobra.png
rename to src/afd/sprites/back-shiny/0843-000-Silicobra.png
diff --git a/src/afd/sprites/back-shiny/0844--000--Sandaconda.png b/src/afd/sprites/back-shiny/0844-000-Sandaconda.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0844--000--Sandaconda.png
rename to src/afd/sprites/back-shiny/0844-000-Sandaconda.png
diff --git a/src/afd/sprites/back-shiny/0844--420--Sandaconda--Gmax.png b/src/afd/sprites/back-shiny/0844-420-Sandaconda-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0844--420--Sandaconda--Gmax.png
rename to src/afd/sprites/back-shiny/0844-420-Sandaconda-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0845--000--Cramorant.png b/src/afd/sprites/back-shiny/0845-000-Cramorant.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0845--000--Cramorant.png
rename to src/afd/sprites/back-shiny/0845-000-Cramorant.png
diff --git a/src/afd/sprites/back-shiny/0845--420--Cramorant--Gorging.png b/src/afd/sprites/back-shiny/0845-420-Cramorant-Gorging.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0845--420--Cramorant--Gorging.png
rename to src/afd/sprites/back-shiny/0845-420-Cramorant-Gorging.png
diff --git a/src/afd/sprites/back-shiny/0845--420--Cramorant--Gulping.png b/src/afd/sprites/back-shiny/0845-420-Cramorant-Gulping.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0845--420--Cramorant--Gulping.png
rename to src/afd/sprites/back-shiny/0845-420-Cramorant-Gulping.png
diff --git a/src/afd/sprites/back-shiny/0846--000--Arrokuda.png b/src/afd/sprites/back-shiny/0846-000-Arrokuda.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0846--000--Arrokuda.png
rename to src/afd/sprites/back-shiny/0846-000-Arrokuda.png
diff --git a/src/afd/sprites/back-shiny/0847--000--Barraskewda.png b/src/afd/sprites/back-shiny/0847-000-Barraskewda.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0847--000--Barraskewda.png
rename to src/afd/sprites/back-shiny/0847-000-Barraskewda.png
diff --git a/src/afd/sprites/back-shiny/0848--000--Toxel.png b/src/afd/sprites/back-shiny/0848-000-Toxel.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0848--000--Toxel.png
rename to src/afd/sprites/back-shiny/0848-000-Toxel.png
diff --git a/src/afd/sprites/back-shiny/0849--000--Toxtricity.png b/src/afd/sprites/back-shiny/0849-000-Toxtricity.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0849--000--Toxtricity.png
rename to src/afd/sprites/back-shiny/0849-000-Toxtricity.png
diff --git a/src/afd/sprites/back-shiny/0849--420--Toxtricity--Gmax.png b/src/afd/sprites/back-shiny/0849-420-Toxtricity-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0849--420--Toxtricity--Gmax.png
rename to src/afd/sprites/back-shiny/0849-420-Toxtricity-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0849--420--Toxtricity--Low-Key.png b/src/afd/sprites/back-shiny/0849-420-Toxtricity-Low~Key.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0849--420--Toxtricity--Low-Key.png
rename to src/afd/sprites/back-shiny/0849-420-Toxtricity-Low~Key.png
diff --git a/src/afd/sprites/back-shiny/0849--420--Toxtricity--Low-Key-Gmax.png b/src/afd/sprites/back-shiny/0849-420-Toxtricity-Low~Key~Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0849--420--Toxtricity--Low-Key-Gmax.png
rename to src/afd/sprites/back-shiny/0849-420-Toxtricity-Low~Key~Gmax.png
diff --git a/src/afd/sprites/back-shiny/0850--000--Sizzlipede.png b/src/afd/sprites/back-shiny/0850-000-Sizzlipede.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0850--000--Sizzlipede.png
rename to src/afd/sprites/back-shiny/0850-000-Sizzlipede.png
diff --git a/src/afd/sprites/back-shiny/0851--000--Centiskorch.png b/src/afd/sprites/back-shiny/0851-000-Centiskorch.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0851--000--Centiskorch.png
rename to src/afd/sprites/back-shiny/0851-000-Centiskorch.png
diff --git a/src/afd/sprites/back-shiny/0851--420--Centiskorch--Gmax.png b/src/afd/sprites/back-shiny/0851-420-Centiskorch-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0851--420--Centiskorch--Gmax.png
rename to src/afd/sprites/back-shiny/0851-420-Centiskorch-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0852--000--Clobbopus.png b/src/afd/sprites/back-shiny/0852-000-Clobbopus.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0852--000--Clobbopus.png
rename to src/afd/sprites/back-shiny/0852-000-Clobbopus.png
diff --git a/src/afd/sprites/back-shiny/0853--000--Grapploct.png b/src/afd/sprites/back-shiny/0853-000-Grapploct.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0853--000--Grapploct.png
rename to src/afd/sprites/back-shiny/0853-000-Grapploct.png
diff --git a/src/afd/sprites/back-shiny/0854--000--Sinistea.png b/src/afd/sprites/back-shiny/0854-000-Sinistea.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0854--000--Sinistea.png
rename to src/afd/sprites/back-shiny/0854-000-Sinistea.png
diff --git a/src/afd/sprites/back-shiny/0855--000--Polteageist.png b/src/afd/sprites/back-shiny/0855-000-Polteageist.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0855--000--Polteageist.png
rename to src/afd/sprites/back-shiny/0855-000-Polteageist.png
diff --git a/src/afd/sprites/back-shiny/0856--000--Hatenna.png b/src/afd/sprites/back-shiny/0856-000-Hatenna.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0856--000--Hatenna.png
rename to src/afd/sprites/back-shiny/0856-000-Hatenna.png
diff --git a/src/afd/sprites/back-shiny/0857--000--Hattrem.png b/src/afd/sprites/back-shiny/0857-000-Hattrem.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0857--000--Hattrem.png
rename to src/afd/sprites/back-shiny/0857-000-Hattrem.png
diff --git a/src/afd/sprites/back-shiny/0858--000--Hatterene.png b/src/afd/sprites/back-shiny/0858-000-Hatterene.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0858--000--Hatterene.png
rename to src/afd/sprites/back-shiny/0858-000-Hatterene.png
diff --git a/src/afd/sprites/back-shiny/0858--420--Hatterene--Gmax.png b/src/afd/sprites/back-shiny/0858-420-Hatterene-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0858--420--Hatterene--Gmax.png
rename to src/afd/sprites/back-shiny/0858-420-Hatterene-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0859--000--Impidimp.png b/src/afd/sprites/back-shiny/0859-000-Impidimp.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0859--000--Impidimp.png
rename to src/afd/sprites/back-shiny/0859-000-Impidimp.png
diff --git a/src/afd/sprites/back-shiny/0860--000--Morgrem.png b/src/afd/sprites/back-shiny/0860-000-Morgrem.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0860--000--Morgrem.png
rename to src/afd/sprites/back-shiny/0860-000-Morgrem.png
diff --git a/src/afd/sprites/back-shiny/0861--000--Grimmsnarl.png b/src/afd/sprites/back-shiny/0861-000-Grimmsnarl.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0861--000--Grimmsnarl.png
rename to src/afd/sprites/back-shiny/0861-000-Grimmsnarl.png
diff --git a/src/afd/sprites/back-shiny/0861--420--Grimmsnarl--Gmax.png b/src/afd/sprites/back-shiny/0861-420-Grimmsnarl-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0861--420--Grimmsnarl--Gmax.png
rename to src/afd/sprites/back-shiny/0861-420-Grimmsnarl-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0862--000--Obstagoon.png b/src/afd/sprites/back-shiny/0862-000-Obstagoon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0862--000--Obstagoon.png
rename to src/afd/sprites/back-shiny/0862-000-Obstagoon.png
diff --git a/src/afd/sprites/back-shiny/0863--000--Perrserker.png b/src/afd/sprites/back-shiny/0863-000-Perrserker.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0863--000--Perrserker.png
rename to src/afd/sprites/back-shiny/0863-000-Perrserker.png
diff --git a/src/afd/sprites/back-shiny/0864--000--Cursola.png b/src/afd/sprites/back-shiny/0864-000-Cursola.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0864--000--Cursola.png
rename to src/afd/sprites/back-shiny/0864-000-Cursola.png
diff --git a/src/afd/sprites/back-shiny/0865--000--Sirfetch__0027d.png b/src/afd/sprites/back-shiny/0865-000-Sirfetch__0027d.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0865--000--Sirfetch__0027d.png
rename to src/afd/sprites/back-shiny/0865-000-Sirfetch__0027d.png
diff --git a/src/afd/sprites/back-shiny/0866--000--Mr._Rime.png b/src/afd/sprites/back-shiny/0866-000-Mr._Rime.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0866--000--Mr._Rime.png
rename to src/afd/sprites/back-shiny/0866-000-Mr._Rime.png
diff --git a/src/afd/sprites/back-shiny/0867--000--Runerigus.png b/src/afd/sprites/back-shiny/0867-000-Runerigus.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0867--000--Runerigus.png
rename to src/afd/sprites/back-shiny/0867-000-Runerigus.png
diff --git a/src/afd/sprites/back-shiny/0868--000--Milcery.png b/src/afd/sprites/back-shiny/0868-000-Milcery.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0868--000--Milcery.png
rename to src/afd/sprites/back-shiny/0868-000-Milcery.png
diff --git a/src/afd/sprites/back-shiny/0869--000--Alcremie.png b/src/afd/sprites/back-shiny/0869-000-Alcremie.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0869--000--Alcremie.png
rename to src/afd/sprites/back-shiny/0869-000-Alcremie.png
diff --git a/src/afd/sprites/back-shiny/0869--420--Alcremie--Gmax.png b/src/afd/sprites/back-shiny/0869-420-Alcremie-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0869--420--Alcremie--Gmax.png
rename to src/afd/sprites/back-shiny/0869-420-Alcremie-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0870--000--Falinks.png b/src/afd/sprites/back-shiny/0870-000-Falinks.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0870--000--Falinks.png
rename to src/afd/sprites/back-shiny/0870-000-Falinks.png
diff --git a/src/afd/sprites/back-shiny/0871--000--Pincurchin.png b/src/afd/sprites/back-shiny/0871-000-Pincurchin.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0871--000--Pincurchin.png
rename to src/afd/sprites/back-shiny/0871-000-Pincurchin.png
diff --git a/src/afd/sprites/back-shiny/0872--000--Snom.png b/src/afd/sprites/back-shiny/0872-000-Snom.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0872--000--Snom.png
rename to src/afd/sprites/back-shiny/0872-000-Snom.png
diff --git a/src/afd/sprites/back-shiny/0873--000--Frosmoth.png b/src/afd/sprites/back-shiny/0873-000-Frosmoth.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0873--000--Frosmoth.png
rename to src/afd/sprites/back-shiny/0873-000-Frosmoth.png
diff --git a/src/afd/sprites/back-shiny/0874--000--Stonjourner.png b/src/afd/sprites/back-shiny/0874-000-Stonjourner.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0874--000--Stonjourner.png
rename to src/afd/sprites/back-shiny/0874-000-Stonjourner.png
diff --git a/src/afd/sprites/back-shiny/0875--000--Eiscue.png b/src/afd/sprites/back-shiny/0875-000-Eiscue.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0875--000--Eiscue.png
rename to src/afd/sprites/back-shiny/0875-000-Eiscue.png
diff --git a/src/afd/sprites/back-shiny/0875--420--Eiscue--Noice.png b/src/afd/sprites/back-shiny/0875-420-Eiscue-Noice.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0875--420--Eiscue--Noice.png
rename to src/afd/sprites/back-shiny/0875-420-Eiscue-Noice.png
diff --git a/src/afd/sprites/back-shiny/0876--000--Indeedee.png b/src/afd/sprites/back-shiny/0876-000-Indeedee.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0876--000--Indeedee.png
rename to src/afd/sprites/back-shiny/0876-000-Indeedee.png
diff --git a/src/afd/sprites/back-shiny/0876--420--Indeedee--F.png b/src/afd/sprites/back-shiny/0876-420-Indeedee-F.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0876--420--Indeedee--F.png
rename to src/afd/sprites/back-shiny/0876-420-Indeedee-F.png
diff --git a/src/afd/sprites/back-shiny/0877--000--Morpeko.png b/src/afd/sprites/back-shiny/0877-000-Morpeko.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0877--000--Morpeko.png
rename to src/afd/sprites/back-shiny/0877-000-Morpeko.png
diff --git a/src/afd/sprites/back-shiny/0877--420--Morpeko--Hangry.png b/src/afd/sprites/back-shiny/0877-420-Morpeko-Hangry.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0877--420--Morpeko--Hangry.png
rename to src/afd/sprites/back-shiny/0877-420-Morpeko-Hangry.png
diff --git a/src/afd/sprites/back-shiny/0878--000--Cufant.png b/src/afd/sprites/back-shiny/0878-000-Cufant.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0878--000--Cufant.png
rename to src/afd/sprites/back-shiny/0878-000-Cufant.png
diff --git a/src/afd/sprites/back-shiny/0879--000--Copperajah.png b/src/afd/sprites/back-shiny/0879-000-Copperajah.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0879--000--Copperajah.png
rename to src/afd/sprites/back-shiny/0879-000-Copperajah.png
diff --git a/src/afd/sprites/back-shiny/0879--420--Copperajah--Gmax.png b/src/afd/sprites/back-shiny/0879-420-Copperajah-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0879--420--Copperajah--Gmax.png
rename to src/afd/sprites/back-shiny/0879-420-Copperajah-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0880--000--Dracozolt.png b/src/afd/sprites/back-shiny/0880-000-Dracozolt.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0880--000--Dracozolt.png
rename to src/afd/sprites/back-shiny/0880-000-Dracozolt.png
diff --git a/src/afd/sprites/back-shiny/0881--000--Arctozolt.png b/src/afd/sprites/back-shiny/0881-000-Arctozolt.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0881--000--Arctozolt.png
rename to src/afd/sprites/back-shiny/0881-000-Arctozolt.png
diff --git a/src/afd/sprites/back-shiny/0882--000--Dracovish.png b/src/afd/sprites/back-shiny/0882-000-Dracovish.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0882--000--Dracovish.png
rename to src/afd/sprites/back-shiny/0882-000-Dracovish.png
diff --git a/src/afd/sprites/back-shiny/0883--000--Arctovish.png b/src/afd/sprites/back-shiny/0883-000-Arctovish.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0883--000--Arctovish.png
rename to src/afd/sprites/back-shiny/0883-000-Arctovish.png
diff --git a/src/afd/sprites/back-shiny/0884--000--Duraludon.png b/src/afd/sprites/back-shiny/0884-000-Duraludon.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0884--000--Duraludon.png
rename to src/afd/sprites/back-shiny/0884-000-Duraludon.png
diff --git a/src/afd/sprites/back-shiny/0884--420--Duraludon--Gmax.png b/src/afd/sprites/back-shiny/0884-420-Duraludon-Gmax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0884--420--Duraludon--Gmax.png
rename to src/afd/sprites/back-shiny/0884-420-Duraludon-Gmax.png
diff --git a/src/afd/sprites/back-shiny/0885--000--Dreepy.png b/src/afd/sprites/back-shiny/0885-000-Dreepy.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0885--000--Dreepy.png
rename to src/afd/sprites/back-shiny/0885-000-Dreepy.png
diff --git a/src/afd/sprites/back-shiny/0886--000--Drakloak.png b/src/afd/sprites/back-shiny/0886-000-Drakloak.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0886--000--Drakloak.png
rename to src/afd/sprites/back-shiny/0886-000-Drakloak.png
diff --git a/src/afd/sprites/back-shiny/0887--000--Dragapult.png b/src/afd/sprites/back-shiny/0887-000-Dragapult.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0887--000--Dragapult.png
rename to src/afd/sprites/back-shiny/0887-000-Dragapult.png
diff --git a/src/afd/sprites/back-shiny/0888--000--Zacian.png b/src/afd/sprites/back-shiny/0888-000-Zacian.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0888--000--Zacian.png
rename to src/afd/sprites/back-shiny/0888-000-Zacian.png
diff --git a/src/afd/sprites/back-shiny/0888--420--Zacian--Crowned.png b/src/afd/sprites/back-shiny/0888-420-Zacian-Crowned.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0888--420--Zacian--Crowned.png
rename to src/afd/sprites/back-shiny/0888-420-Zacian-Crowned.png
diff --git a/src/afd/sprites/back-shiny/0889--000--Zamazenta.png b/src/afd/sprites/back-shiny/0889-000-Zamazenta.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0889--000--Zamazenta.png
rename to src/afd/sprites/back-shiny/0889-000-Zamazenta.png
diff --git a/src/afd/sprites/back-shiny/0889--420--Zamazenta--Crowned.png b/src/afd/sprites/back-shiny/0889-420-Zamazenta-Crowned.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0889--420--Zamazenta--Crowned.png
rename to src/afd/sprites/back-shiny/0889-420-Zamazenta-Crowned.png
diff --git a/src/afd/sprites/back-shiny/0890--000--Eternatus.png b/src/afd/sprites/back-shiny/0890-000-Eternatus.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0890--000--Eternatus.png
rename to src/afd/sprites/back-shiny/0890-000-Eternatus.png
diff --git a/src/afd/sprites/back-shiny/0890--420--Eternatus--Eternamax.png b/src/afd/sprites/back-shiny/0890-420-Eternatus-Eternamax.png
similarity index 100%
rename from src/afd/sprites/back-shiny/0890--420--Eternatus--Eternamax.png
rename to src/afd/sprites/back-shiny/0890-420-Eternatus-Eternamax.png
diff --git a/src/afd/sprites/back/0000--000--Missingno..png b/src/afd/sprites/back/0000-000-Missingno..png
similarity index 100%
rename from src/afd/sprites/back/0000--000--Missingno..png
rename to src/afd/sprites/back/0000-000-Missingno..png
diff --git a/src/afd/sprites/back/0001--000--Bulbasaur.png b/src/afd/sprites/back/0001-000-Bulbasaur.png
similarity index 100%
rename from src/afd/sprites/back/0001--000--Bulbasaur.png
rename to src/afd/sprites/back/0001-000-Bulbasaur.png
diff --git a/src/afd/sprites/back/0002--000--Ivysaur.png b/src/afd/sprites/back/0002-000-Ivysaur.png
similarity index 100%
rename from src/afd/sprites/back/0002--000--Ivysaur.png
rename to src/afd/sprites/back/0002-000-Ivysaur.png
diff --git a/src/afd/sprites/back/0002--000--Syclant.png b/src/afd/sprites/back/0002-000-Syclant.png
similarity index 100%
rename from src/afd/sprites/back/0002--000--Syclant.png
rename to src/afd/sprites/back/0002-000-Syclant.png
diff --git a/src/afd/sprites/back/0003--000--Revenankh.png b/src/afd/sprites/back/0003-000-Revenankh.png
similarity index 100%
rename from src/afd/sprites/back/0003--000--Revenankh.png
rename to src/afd/sprites/back/0003-000-Revenankh.png
diff --git a/src/afd/sprites/back/0003--000--Venusaur.png b/src/afd/sprites/back/0003-000-Venusaur.png
similarity index 100%
rename from src/afd/sprites/back/0003--000--Venusaur.png
rename to src/afd/sprites/back/0003-000-Venusaur.png
diff --git a/src/afd/sprites/back/0003--420--Venusaur--Mega.png b/src/afd/sprites/back/0003-420-Venusaur-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0003--420--Venusaur--Mega.png
rename to src/afd/sprites/back/0003-420-Venusaur-Mega.png
diff --git a/src/afd/sprites/back/0004--000--Charmander.png b/src/afd/sprites/back/0004-000-Charmander.png
similarity index 100%
rename from src/afd/sprites/back/0004--000--Charmander.png
rename to src/afd/sprites/back/0004-000-Charmander.png
diff --git a/src/afd/sprites/back/0005--000--Charmeleon.png b/src/afd/sprites/back/0005-000-Charmeleon.png
similarity index 100%
rename from src/afd/sprites/back/0005--000--Charmeleon.png
rename to src/afd/sprites/back/0005-000-Charmeleon.png
diff --git a/src/afd/sprites/back/0006--000--Charizard.png b/src/afd/sprites/back/0006-000-Charizard.png
similarity index 100%
rename from src/afd/sprites/back/0006--000--Charizard.png
rename to src/afd/sprites/back/0006-000-Charizard.png
diff --git a/src/afd/sprites/back/0006--000--Pyroak.png b/src/afd/sprites/back/0006-000-Pyroak.png
similarity index 100%
rename from src/afd/sprites/back/0006--000--Pyroak.png
rename to src/afd/sprites/back/0006-000-Pyroak.png
diff --git a/src/afd/sprites/back/0006--420--Charizard--Gmax.png b/src/afd/sprites/back/0006-420-Charizard-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0006--420--Charizard--Gmax.png
rename to src/afd/sprites/back/0006-420-Charizard-Gmax.png
diff --git a/src/afd/sprites/back/0006--420--Charizard--Mega-X.png b/src/afd/sprites/back/0006-420-Charizard-Mega~X.png
similarity index 100%
rename from src/afd/sprites/back/0006--420--Charizard--Mega-X.png
rename to src/afd/sprites/back/0006-420-Charizard-Mega~X.png
diff --git a/src/afd/sprites/back/0006--420--Charizard--Mega-Y.png b/src/afd/sprites/back/0006-420-Charizard-Mega~Y.png
similarity index 100%
rename from src/afd/sprites/back/0006--420--Charizard--Mega-Y.png
rename to src/afd/sprites/back/0006-420-Charizard-Mega~Y.png
diff --git a/src/afd/sprites/back/0007--000--Squirtle.png b/src/afd/sprites/back/0007-000-Squirtle.png
similarity index 100%
rename from src/afd/sprites/back/0007--000--Squirtle.png
rename to src/afd/sprites/back/0007-000-Squirtle.png
diff --git a/src/afd/sprites/back/0008--000--Fidgit.png b/src/afd/sprites/back/0008-000-Fidgit.png
similarity index 100%
rename from src/afd/sprites/back/0008--000--Fidgit.png
rename to src/afd/sprites/back/0008-000-Fidgit.png
diff --git a/src/afd/sprites/back/0008--000--Wartortle.png b/src/afd/sprites/back/0008-000-Wartortle.png
similarity index 100%
rename from src/afd/sprites/back/0008--000--Wartortle.png
rename to src/afd/sprites/back/0008-000-Wartortle.png
diff --git a/src/afd/sprites/back/0009--000--Blastoise.png b/src/afd/sprites/back/0009-000-Blastoise.png
similarity index 100%
rename from src/afd/sprites/back/0009--000--Blastoise.png
rename to src/afd/sprites/back/0009-000-Blastoise.png
diff --git a/src/afd/sprites/back/0009--420--Blastoise--Mega.png b/src/afd/sprites/back/0009-420-Blastoise-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0009--420--Blastoise--Mega.png
rename to src/afd/sprites/back/0009-420-Blastoise-Mega.png
diff --git a/src/afd/sprites/back/0010--000--Caterpie.png b/src/afd/sprites/back/0010-000-Caterpie.png
similarity index 100%
rename from src/afd/sprites/back/0010--000--Caterpie.png
rename to src/afd/sprites/back/0010-000-Caterpie.png
diff --git a/src/afd/sprites/back/0011--000--Metapod.png b/src/afd/sprites/back/0011-000-Metapod.png
similarity index 100%
rename from src/afd/sprites/back/0011--000--Metapod.png
rename to src/afd/sprites/back/0011-000-Metapod.png
diff --git a/src/afd/sprites/back/0011--000--Stratagem.png b/src/afd/sprites/back/0011-000-Stratagem.png
similarity index 100%
rename from src/afd/sprites/back/0011--000--Stratagem.png
rename to src/afd/sprites/back/0011-000-Stratagem.png
diff --git a/src/afd/sprites/back/0012--000--Butterfree.png b/src/afd/sprites/back/0012-000-Butterfree.png
similarity index 100%
rename from src/afd/sprites/back/0012--000--Butterfree.png
rename to src/afd/sprites/back/0012-000-Butterfree.png
diff --git a/src/afd/sprites/back/0012--420--Butterfree--Gmax.png b/src/afd/sprites/back/0012-420-Butterfree-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0012--420--Butterfree--Gmax.png
rename to src/afd/sprites/back/0012-420-Butterfree-Gmax.png
diff --git a/src/afd/sprites/back/0013--000--Arghonaut.png b/src/afd/sprites/back/0013-000-Arghonaut.png
similarity index 100%
rename from src/afd/sprites/back/0013--000--Arghonaut.png
rename to src/afd/sprites/back/0013-000-Arghonaut.png
diff --git a/src/afd/sprites/back/0013--000--Weedle.png b/src/afd/sprites/back/0013-000-Weedle.png
similarity index 100%
rename from src/afd/sprites/back/0013--000--Weedle.png
rename to src/afd/sprites/back/0013-000-Weedle.png
diff --git a/src/afd/sprites/back/0014--000--Kakuna.png b/src/afd/sprites/back/0014-000-Kakuna.png
similarity index 100%
rename from src/afd/sprites/back/0014--000--Kakuna.png
rename to src/afd/sprites/back/0014-000-Kakuna.png
diff --git a/src/afd/sprites/back/0014--000--Kitsunoh.png b/src/afd/sprites/back/0014-000-Kitsunoh.png
similarity index 100%
rename from src/afd/sprites/back/0014--000--Kitsunoh.png
rename to src/afd/sprites/back/0014-000-Kitsunoh.png
diff --git a/src/afd/sprites/back/0015--000--Beedrill.png b/src/afd/sprites/back/0015-000-Beedrill.png
similarity index 100%
rename from src/afd/sprites/back/0015--000--Beedrill.png
rename to src/afd/sprites/back/0015-000-Beedrill.png
diff --git a/src/afd/sprites/back/0015--000--Cyclohm.png b/src/afd/sprites/back/0015-000-Cyclohm.png
similarity index 100%
rename from src/afd/sprites/back/0015--000--Cyclohm.png
rename to src/afd/sprites/back/0015-000-Cyclohm.png
diff --git a/src/afd/sprites/back/0015--420--Beedrill--Mega.png b/src/afd/sprites/back/0015-420-Beedrill-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0015--420--Beedrill--Mega.png
rename to src/afd/sprites/back/0015-420-Beedrill-Mega.png
diff --git a/src/afd/sprites/back/0016--000--Colossoil.png b/src/afd/sprites/back/0016-000-Colossoil.png
similarity index 100%
rename from src/afd/sprites/back/0016--000--Colossoil.png
rename to src/afd/sprites/back/0016-000-Colossoil.png
diff --git a/src/afd/sprites/back/0016--000--Pidgey.png b/src/afd/sprites/back/0016-000-Pidgey.png
similarity index 100%
rename from src/afd/sprites/back/0016--000--Pidgey.png
rename to src/afd/sprites/back/0016-000-Pidgey.png
diff --git a/src/afd/sprites/back/0017--000--Krilowatt.png b/src/afd/sprites/back/0017-000-Krilowatt.png
similarity index 100%
rename from src/afd/sprites/back/0017--000--Krilowatt.png
rename to src/afd/sprites/back/0017-000-Krilowatt.png
diff --git a/src/afd/sprites/back/0017--000--Pidgeotto.png b/src/afd/sprites/back/0017-000-Pidgeotto.png
similarity index 100%
rename from src/afd/sprites/back/0017--000--Pidgeotto.png
rename to src/afd/sprites/back/0017-000-Pidgeotto.png
diff --git a/src/afd/sprites/back/0018--000--Pidgeot.png b/src/afd/sprites/back/0018-000-Pidgeot.png
similarity index 100%
rename from src/afd/sprites/back/0018--000--Pidgeot.png
rename to src/afd/sprites/back/0018-000-Pidgeot.png
diff --git a/src/afd/sprites/back/0018--420--Pidgeot--Mega.png b/src/afd/sprites/back/0018-420-Pidgeot-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0018--420--Pidgeot--Mega.png
rename to src/afd/sprites/back/0018-420-Pidgeot-Mega.png
diff --git a/src/afd/sprites/back/0019--000--Rattata.png b/src/afd/sprites/back/0019-000-Rattata.png
similarity index 100%
rename from src/afd/sprites/back/0019--000--Rattata.png
rename to src/afd/sprites/back/0019-000-Rattata.png
diff --git a/src/afd/sprites/back/0019--000--Voodoom.png b/src/afd/sprites/back/0019-000-Voodoom.png
similarity index 100%
rename from src/afd/sprites/back/0019--000--Voodoom.png
rename to src/afd/sprites/back/0019-000-Voodoom.png
diff --git a/src/afd/sprites/back/0019--420--Rattata--Alola.png b/src/afd/sprites/back/0019-420-Rattata-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0019--420--Rattata--Alola.png
rename to src/afd/sprites/back/0019-420-Rattata-Alola.png
diff --git a/src/afd/sprites/back/0020--000--Raticate.png b/src/afd/sprites/back/0020-000-Raticate.png
similarity index 100%
rename from src/afd/sprites/back/0020--000--Raticate.png
rename to src/afd/sprites/back/0020-000-Raticate.png
diff --git a/src/afd/sprites/back/0020--420--Raticate--Alola.png b/src/afd/sprites/back/0020-420-Raticate-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0020--420--Raticate--Alola.png
rename to src/afd/sprites/back/0020-420-Raticate-Alola.png
diff --git a/src/afd/sprites/back/0021--000--Spearow.png b/src/afd/sprites/back/0021-000-Spearow.png
similarity index 100%
rename from src/afd/sprites/back/0021--000--Spearow.png
rename to src/afd/sprites/back/0021-000-Spearow.png
diff --git a/src/afd/sprites/back/0021--000--Tomohawk.png b/src/afd/sprites/back/0021-000-Tomohawk.png
similarity index 100%
rename from src/afd/sprites/back/0021--000--Tomohawk.png
rename to src/afd/sprites/back/0021-000-Tomohawk.png
diff --git a/src/afd/sprites/back/0022--000--Fearow.png b/src/afd/sprites/back/0022-000-Fearow.png
similarity index 100%
rename from src/afd/sprites/back/0022--000--Fearow.png
rename to src/afd/sprites/back/0022-000-Fearow.png
diff --git a/src/afd/sprites/back/0023--000--Ekans.png b/src/afd/sprites/back/0023-000-Ekans.png
similarity index 100%
rename from src/afd/sprites/back/0023--000--Ekans.png
rename to src/afd/sprites/back/0023-000-Ekans.png
diff --git a/src/afd/sprites/back/0023--000--Necturna.png b/src/afd/sprites/back/0023-000-Necturna.png
similarity index 100%
rename from src/afd/sprites/back/0023--000--Necturna.png
rename to src/afd/sprites/back/0023-000-Necturna.png
diff --git a/src/afd/sprites/back/0024--000--Arbok.png b/src/afd/sprites/back/0024-000-Arbok.png
similarity index 100%
rename from src/afd/sprites/back/0024--000--Arbok.png
rename to src/afd/sprites/back/0024-000-Arbok.png
diff --git a/src/afd/sprites/back/0024--000--Mollux.png b/src/afd/sprites/back/0024-000-Mollux.png
similarity index 100%
rename from src/afd/sprites/back/0024--000--Mollux.png
rename to src/afd/sprites/back/0024-000-Mollux.png
diff --git a/src/afd/sprites/back/0025--000--Pikachu.png b/src/afd/sprites/back/0025-000-Pikachu.png
similarity index 100%
rename from src/afd/sprites/back/0025--000--Pikachu.png
rename to src/afd/sprites/back/0025-000-Pikachu.png
diff --git a/src/afd/sprites/back/0025--420--Pikachu--Alola.png b/src/afd/sprites/back/0025-420-Pikachu-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0025--420--Pikachu--Alola.png
rename to src/afd/sprites/back/0025-420-Pikachu-Alola.png
diff --git a/src/afd/sprites/back/0025--420--Pikachu--Belle.png b/src/afd/sprites/back/0025-420-Pikachu-Belle.png
similarity index 100%
rename from src/afd/sprites/back/0025--420--Pikachu--Belle.png
rename to src/afd/sprites/back/0025-420-Pikachu-Belle.png
diff --git a/src/afd/sprites/back/0025--420--Pikachu--Gmax.png b/src/afd/sprites/back/0025-420-Pikachu-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0025--420--Pikachu--Gmax.png
rename to src/afd/sprites/back/0025-420-Pikachu-Gmax.png
diff --git a/src/afd/sprites/back/0025--420--Pikachu--Hoenn.png b/src/afd/sprites/back/0025-420-Pikachu-Hoenn.png
similarity index 100%
rename from src/afd/sprites/back/0025--420--Pikachu--Hoenn.png
rename to src/afd/sprites/back/0025-420-Pikachu-Hoenn.png
diff --git a/src/afd/sprites/back/0025--420--Pikachu--Kalos.png b/src/afd/sprites/back/0025-420-Pikachu-Kalos.png
similarity index 100%
rename from src/afd/sprites/back/0025--420--Pikachu--Kalos.png
rename to src/afd/sprites/back/0025-420-Pikachu-Kalos.png
diff --git a/src/afd/sprites/back/0025--420--Pikachu--Libre.png b/src/afd/sprites/back/0025-420-Pikachu-Libre.png
similarity index 100%
rename from src/afd/sprites/back/0025--420--Pikachu--Libre.png
rename to src/afd/sprites/back/0025-420-Pikachu-Libre.png
diff --git a/src/afd/sprites/back/0025--420--Pikachu--Original.png b/src/afd/sprites/back/0025-420-Pikachu-Original.png
similarity index 100%
rename from src/afd/sprites/back/0025--420--Pikachu--Original.png
rename to src/afd/sprites/back/0025-420-Pikachu-Original.png
diff --git a/src/afd/sprites/back/0025--420--Pikachu--Partner.png b/src/afd/sprites/back/0025-420-Pikachu-Partner.png
similarity index 100%
rename from src/afd/sprites/back/0025--420--Pikachu--Partner.png
rename to src/afd/sprites/back/0025-420-Pikachu-Partner.png
diff --git a/src/afd/sprites/back/0025--420--Pikachu--PhD.png b/src/afd/sprites/back/0025-420-Pikachu-PhD.png
similarity index 100%
rename from src/afd/sprites/back/0025--420--Pikachu--PhD.png
rename to src/afd/sprites/back/0025-420-Pikachu-PhD.png
diff --git a/src/afd/sprites/back/0025--420--Pikachu--Pop-Star.png b/src/afd/sprites/back/0025-420-Pikachu-Pop~Star.png
similarity index 100%
rename from src/afd/sprites/back/0025--420--Pikachu--Pop-Star.png
rename to src/afd/sprites/back/0025-420-Pikachu-Pop~Star.png
diff --git a/src/afd/sprites/back/0025--420--Pikachu--Rock-Star.png b/src/afd/sprites/back/0025-420-Pikachu-Rock~Star.png
similarity index 100%
rename from src/afd/sprites/back/0025--420--Pikachu--Rock-Star.png
rename to src/afd/sprites/back/0025-420-Pikachu-Rock~Star.png
diff --git a/src/afd/sprites/back/0025--420--Pikachu--Sinnoh.png b/src/afd/sprites/back/0025-420-Pikachu-Sinnoh.png
similarity index 100%
rename from src/afd/sprites/back/0025--420--Pikachu--Sinnoh.png
rename to src/afd/sprites/back/0025-420-Pikachu-Sinnoh.png
diff --git a/src/afd/sprites/back/0025--420--Pikachu--Starter.png b/src/afd/sprites/back/0025-420-Pikachu-Starter.png
similarity index 100%
rename from src/afd/sprites/back/0025--420--Pikachu--Starter.png
rename to src/afd/sprites/back/0025-420-Pikachu-Starter.png
diff --git a/src/afd/sprites/back/0025--420--Pikachu--Unova.png b/src/afd/sprites/back/0025-420-Pikachu-Unova.png
similarity index 100%
rename from src/afd/sprites/back/0025--420--Pikachu--Unova.png
rename to src/afd/sprites/back/0025-420-Pikachu-Unova.png
diff --git a/src/afd/sprites/back/0026--000--Raichu.png b/src/afd/sprites/back/0026-000-Raichu.png
similarity index 100%
rename from src/afd/sprites/back/0026--000--Raichu.png
rename to src/afd/sprites/back/0026-000-Raichu.png
diff --git a/src/afd/sprites/back/0026--420--Raichu--Alola.png b/src/afd/sprites/back/0026-420-Raichu-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0026--420--Raichu--Alola.png
rename to src/afd/sprites/back/0026-420-Raichu-Alola.png
diff --git a/src/afd/sprites/back/0027--000--Aurumoth.png b/src/afd/sprites/back/0027-000-Aurumoth.png
similarity index 100%
rename from src/afd/sprites/back/0027--000--Aurumoth.png
rename to src/afd/sprites/back/0027-000-Aurumoth.png
diff --git a/src/afd/sprites/back/0027--000--Sandshrew.png b/src/afd/sprites/back/0027-000-Sandshrew.png
similarity index 100%
rename from src/afd/sprites/back/0027--000--Sandshrew.png
rename to src/afd/sprites/back/0027-000-Sandshrew.png
diff --git a/src/afd/sprites/back/0027--420--Sandshrew--Alola.png b/src/afd/sprites/back/0027-420-Sandshrew-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0027--420--Sandshrew--Alola.png
rename to src/afd/sprites/back/0027-420-Sandshrew-Alola.png
diff --git a/src/afd/sprites/back/0028--000--Sandslash.png b/src/afd/sprites/back/0028-000-Sandslash.png
similarity index 100%
rename from src/afd/sprites/back/0028--000--Sandslash.png
rename to src/afd/sprites/back/0028-000-Sandslash.png
diff --git a/src/afd/sprites/back/0028--420--Sandslash--Alola.png b/src/afd/sprites/back/0028-420-Sandslash-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0028--420--Sandslash--Alola.png
rename to src/afd/sprites/back/0028-420-Sandslash-Alola.png
diff --git a/src/afd/sprites/back/0029--000--Malaconda.png b/src/afd/sprites/back/0029-000-Malaconda.png
similarity index 100%
rename from src/afd/sprites/back/0029--000--Malaconda.png
rename to src/afd/sprites/back/0029-000-Malaconda.png
diff --git a/src/afd/sprites/back/0029--000--Nidoran-F.png b/src/afd/sprites/back/0029-000-Nidoran~F.png
similarity index 100%
rename from src/afd/sprites/back/0029--000--Nidoran-F.png
rename to src/afd/sprites/back/0029-000-Nidoran~F.png
diff --git a/src/afd/sprites/back/0030--000--Nidorina.png b/src/afd/sprites/back/0030-000-Nidorina.png
similarity index 100%
rename from src/afd/sprites/back/0030--000--Nidorina.png
rename to src/afd/sprites/back/0030-000-Nidorina.png
diff --git a/src/afd/sprites/back/0031--000--Cawmodore.png b/src/afd/sprites/back/0031-000-Cawmodore.png
similarity index 100%
rename from src/afd/sprites/back/0031--000--Cawmodore.png
rename to src/afd/sprites/back/0031-000-Cawmodore.png
diff --git a/src/afd/sprites/back/0031--000--Nidoqueen.png b/src/afd/sprites/back/0031-000-Nidoqueen.png
similarity index 100%
rename from src/afd/sprites/back/0031--000--Nidoqueen.png
rename to src/afd/sprites/back/0031-000-Nidoqueen.png
diff --git a/src/afd/sprites/back/0032--000--Nidoran-M.png b/src/afd/sprites/back/0032-000-Nidoran~M.png
similarity index 100%
rename from src/afd/sprites/back/0032--000--Nidoran-M.png
rename to src/afd/sprites/back/0032-000-Nidoran~M.png
diff --git a/src/afd/sprites/back/0033--000--Nidorino.png b/src/afd/sprites/back/0033-000-Nidorino.png
similarity index 100%
rename from src/afd/sprites/back/0033--000--Nidorino.png
rename to src/afd/sprites/back/0033-000-Nidorino.png
diff --git a/src/afd/sprites/back/0034--000--Nidoking.png b/src/afd/sprites/back/0034-000-Nidoking.png
similarity index 100%
rename from src/afd/sprites/back/0034--000--Nidoking.png
rename to src/afd/sprites/back/0034-000-Nidoking.png
diff --git a/src/afd/sprites/back/0035--000--Clefairy.png b/src/afd/sprites/back/0035-000-Clefairy.png
similarity index 100%
rename from src/afd/sprites/back/0035--000--Clefairy.png
rename to src/afd/sprites/back/0035-000-Clefairy.png
diff --git a/src/afd/sprites/back/0035--000--Plasmanta.png b/src/afd/sprites/back/0035-000-Plasmanta.png
similarity index 100%
rename from src/afd/sprites/back/0035--000--Plasmanta.png
rename to src/afd/sprites/back/0035-000-Plasmanta.png
diff --git a/src/afd/sprites/back/0036--000--Clefable.png b/src/afd/sprites/back/0036-000-Clefable.png
similarity index 100%
rename from src/afd/sprites/back/0036--000--Clefable.png
rename to src/afd/sprites/back/0036-000-Clefable.png
diff --git a/src/afd/sprites/back/0037--000--Vulpix.png b/src/afd/sprites/back/0037-000-Vulpix.png
similarity index 100%
rename from src/afd/sprites/back/0037--000--Vulpix.png
rename to src/afd/sprites/back/0037-000-Vulpix.png
diff --git a/src/afd/sprites/back/0037--420--Vulpix--Alola.png b/src/afd/sprites/back/0037-420-Vulpix-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0037--420--Vulpix--Alola.png
rename to src/afd/sprites/back/0037-420-Vulpix-Alola.png
diff --git a/src/afd/sprites/back/0038--000--Ninetales.png b/src/afd/sprites/back/0038-000-Ninetales.png
similarity index 100%
rename from src/afd/sprites/back/0038--000--Ninetales.png
rename to src/afd/sprites/back/0038-000-Ninetales.png
diff --git a/src/afd/sprites/back/0038--420--Ninetales--Alola.png b/src/afd/sprites/back/0038-420-Ninetales-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0038--420--Ninetales--Alola.png
rename to src/afd/sprites/back/0038-420-Ninetales-Alola.png
diff --git a/src/afd/sprites/back/0039--000--Jigglypuff.png b/src/afd/sprites/back/0039-000-Jigglypuff.png
similarity index 100%
rename from src/afd/sprites/back/0039--000--Jigglypuff.png
rename to src/afd/sprites/back/0039-000-Jigglypuff.png
diff --git a/src/afd/sprites/back/0040--000--Wigglytuff.png b/src/afd/sprites/back/0040-000-Wigglytuff.png
similarity index 100%
rename from src/afd/sprites/back/0040--000--Wigglytuff.png
rename to src/afd/sprites/back/0040-000-Wigglytuff.png
diff --git a/src/afd/sprites/back/0041--000--Zubat.png b/src/afd/sprites/back/0041-000-Zubat.png
similarity index 100%
rename from src/afd/sprites/back/0041--000--Zubat.png
rename to src/afd/sprites/back/0041-000-Zubat.png
diff --git a/src/afd/sprites/back/0042--000--Golbat.png b/src/afd/sprites/back/0042-000-Golbat.png
similarity index 100%
rename from src/afd/sprites/back/0042--000--Golbat.png
rename to src/afd/sprites/back/0042-000-Golbat.png
diff --git a/src/afd/sprites/back/0043--000--Oddish.png b/src/afd/sprites/back/0043-000-Oddish.png
similarity index 100%
rename from src/afd/sprites/back/0043--000--Oddish.png
rename to src/afd/sprites/back/0043-000-Oddish.png
diff --git a/src/afd/sprites/back/0044--000--Gloom.png b/src/afd/sprites/back/0044-000-Gloom.png
similarity index 100%
rename from src/afd/sprites/back/0044--000--Gloom.png
rename to src/afd/sprites/back/0044-000-Gloom.png
diff --git a/src/afd/sprites/back/0045--000--Vileplume.png b/src/afd/sprites/back/0045-000-Vileplume.png
similarity index 100%
rename from src/afd/sprites/back/0045--000--Vileplume.png
rename to src/afd/sprites/back/0045-000-Vileplume.png
diff --git a/src/afd/sprites/back/0046--000--Paras.png b/src/afd/sprites/back/0046-000-Paras.png
similarity index 100%
rename from src/afd/sprites/back/0046--000--Paras.png
rename to src/afd/sprites/back/0046-000-Paras.png
diff --git a/src/afd/sprites/back/0047--000--Parasect.png b/src/afd/sprites/back/0047-000-Parasect.png
similarity index 100%
rename from src/afd/sprites/back/0047--000--Parasect.png
rename to src/afd/sprites/back/0047-000-Parasect.png
diff --git a/src/afd/sprites/back/0048--000--Venonat.png b/src/afd/sprites/back/0048-000-Venonat.png
similarity index 100%
rename from src/afd/sprites/back/0048--000--Venonat.png
rename to src/afd/sprites/back/0048-000-Venonat.png
diff --git a/src/afd/sprites/back/0049--000--Venomoth.png b/src/afd/sprites/back/0049-000-Venomoth.png
similarity index 100%
rename from src/afd/sprites/back/0049--000--Venomoth.png
rename to src/afd/sprites/back/0049-000-Venomoth.png
diff --git a/src/afd/sprites/back/0050--000--Diglett.png b/src/afd/sprites/back/0050-000-Diglett.png
similarity index 100%
rename from src/afd/sprites/back/0050--000--Diglett.png
rename to src/afd/sprites/back/0050-000-Diglett.png
diff --git a/src/afd/sprites/back/0050--420--Diglett--Alola.png b/src/afd/sprites/back/0050-420-Diglett-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0050--420--Diglett--Alola.png
rename to src/afd/sprites/back/0050-420-Diglett-Alola.png
diff --git a/src/afd/sprites/back/0051--000--Dugtrio.png b/src/afd/sprites/back/0051-000-Dugtrio.png
similarity index 100%
rename from src/afd/sprites/back/0051--000--Dugtrio.png
rename to src/afd/sprites/back/0051-000-Dugtrio.png
diff --git a/src/afd/sprites/back/0051--420--Dugtrio--Alola.png b/src/afd/sprites/back/0051-420-Dugtrio-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0051--420--Dugtrio--Alola.png
rename to src/afd/sprites/back/0051-420-Dugtrio-Alola.png
diff --git a/src/afd/sprites/back/0052--000--Meowth.png b/src/afd/sprites/back/0052-000-Meowth.png
similarity index 100%
rename from src/afd/sprites/back/0052--000--Meowth.png
rename to src/afd/sprites/back/0052-000-Meowth.png
diff --git a/src/afd/sprites/back/0052--420--Meowth--Alola.png b/src/afd/sprites/back/0052-420-Meowth-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0052--420--Meowth--Alola.png
rename to src/afd/sprites/back/0052-420-Meowth-Alola.png
diff --git a/src/afd/sprites/back/0052--420--Meowth--Galar.png b/src/afd/sprites/back/0052-420-Meowth-Galar.png
similarity index 100%
rename from src/afd/sprites/back/0052--420--Meowth--Galar.png
rename to src/afd/sprites/back/0052-420-Meowth-Galar.png
diff --git a/src/afd/sprites/back/0052--420--Meowth--Gmax.png b/src/afd/sprites/back/0052-420-Meowth-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0052--420--Meowth--Gmax.png
rename to src/afd/sprites/back/0052-420-Meowth-Gmax.png
diff --git a/src/afd/sprites/back/0053--000--Persian.png b/src/afd/sprites/back/0053-000-Persian.png
similarity index 100%
rename from src/afd/sprites/back/0053--000--Persian.png
rename to src/afd/sprites/back/0053-000-Persian.png
diff --git a/src/afd/sprites/back/0053--420--Persian--Alola.png b/src/afd/sprites/back/0053-420-Persian-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0053--420--Persian--Alola.png
rename to src/afd/sprites/back/0053-420-Persian-Alola.png
diff --git a/src/afd/sprites/back/0054--000--Psyduck.png b/src/afd/sprites/back/0054-000-Psyduck.png
similarity index 100%
rename from src/afd/sprites/back/0054--000--Psyduck.png
rename to src/afd/sprites/back/0054-000-Psyduck.png
diff --git a/src/afd/sprites/back/0055--000--Golduck.png b/src/afd/sprites/back/0055-000-Golduck.png
similarity index 100%
rename from src/afd/sprites/back/0055--000--Golduck.png
rename to src/afd/sprites/back/0055-000-Golduck.png
diff --git a/src/afd/sprites/back/0056--000--Mankey.png b/src/afd/sprites/back/0056-000-Mankey.png
similarity index 100%
rename from src/afd/sprites/back/0056--000--Mankey.png
rename to src/afd/sprites/back/0056-000-Mankey.png
diff --git a/src/afd/sprites/back/0057--000--Primeape.png b/src/afd/sprites/back/0057-000-Primeape.png
similarity index 100%
rename from src/afd/sprites/back/0057--000--Primeape.png
rename to src/afd/sprites/back/0057-000-Primeape.png
diff --git a/src/afd/sprites/back/0058--000--Growlithe.png b/src/afd/sprites/back/0058-000-Growlithe.png
similarity index 100%
rename from src/afd/sprites/back/0058--000--Growlithe.png
rename to src/afd/sprites/back/0058-000-Growlithe.png
diff --git a/src/afd/sprites/back/0059--000--Arcanine.png b/src/afd/sprites/back/0059-000-Arcanine.png
similarity index 100%
rename from src/afd/sprites/back/0059--000--Arcanine.png
rename to src/afd/sprites/back/0059-000-Arcanine.png
diff --git a/src/afd/sprites/back/0060--000--Poliwag.png b/src/afd/sprites/back/0060-000-Poliwag.png
similarity index 100%
rename from src/afd/sprites/back/0060--000--Poliwag.png
rename to src/afd/sprites/back/0060-000-Poliwag.png
diff --git a/src/afd/sprites/back/0061--000--Poliwhirl.png b/src/afd/sprites/back/0061-000-Poliwhirl.png
similarity index 100%
rename from src/afd/sprites/back/0061--000--Poliwhirl.png
rename to src/afd/sprites/back/0061-000-Poliwhirl.png
diff --git a/src/afd/sprites/back/0062--000--Poliwrath.png b/src/afd/sprites/back/0062-000-Poliwrath.png
similarity index 100%
rename from src/afd/sprites/back/0062--000--Poliwrath.png
rename to src/afd/sprites/back/0062-000-Poliwrath.png
diff --git a/src/afd/sprites/back/0063--000--Abra.png b/src/afd/sprites/back/0063-000-Abra.png
similarity index 100%
rename from src/afd/sprites/back/0063--000--Abra.png
rename to src/afd/sprites/back/0063-000-Abra.png
diff --git a/src/afd/sprites/back/0064--000--Kadabra.png b/src/afd/sprites/back/0064-000-Kadabra.png
similarity index 100%
rename from src/afd/sprites/back/0064--000--Kadabra.png
rename to src/afd/sprites/back/0064-000-Kadabra.png
diff --git a/src/afd/sprites/back/0065--000--Alakazam.png b/src/afd/sprites/back/0065-000-Alakazam.png
similarity index 100%
rename from src/afd/sprites/back/0065--000--Alakazam.png
rename to src/afd/sprites/back/0065-000-Alakazam.png
diff --git a/src/afd/sprites/back/0065--420--Alakazam--Mega.png b/src/afd/sprites/back/0065-420-Alakazam-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0065--420--Alakazam--Mega.png
rename to src/afd/sprites/back/0065-420-Alakazam-Mega.png
diff --git a/src/afd/sprites/back/0066--000--Machop.png b/src/afd/sprites/back/0066-000-Machop.png
similarity index 100%
rename from src/afd/sprites/back/0066--000--Machop.png
rename to src/afd/sprites/back/0066-000-Machop.png
diff --git a/src/afd/sprites/back/0067--000--Machoke.png b/src/afd/sprites/back/0067-000-Machoke.png
similarity index 100%
rename from src/afd/sprites/back/0067--000--Machoke.png
rename to src/afd/sprites/back/0067-000-Machoke.png
diff --git a/src/afd/sprites/back/0068--000--Machamp.png b/src/afd/sprites/back/0068-000-Machamp.png
similarity index 100%
rename from src/afd/sprites/back/0068--000--Machamp.png
rename to src/afd/sprites/back/0068-000-Machamp.png
diff --git a/src/afd/sprites/back/0068--420--Machamp--Gmax.png b/src/afd/sprites/back/0068-420-Machamp-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0068--420--Machamp--Gmax.png
rename to src/afd/sprites/back/0068-420-Machamp-Gmax.png
diff --git a/src/afd/sprites/back/0069--000--Bellsprout.png b/src/afd/sprites/back/0069-000-Bellsprout.png
similarity index 100%
rename from src/afd/sprites/back/0069--000--Bellsprout.png
rename to src/afd/sprites/back/0069-000-Bellsprout.png
diff --git a/src/afd/sprites/back/0070--000--Weepinbell.png b/src/afd/sprites/back/0070-000-Weepinbell.png
similarity index 100%
rename from src/afd/sprites/back/0070--000--Weepinbell.png
rename to src/afd/sprites/back/0070-000-Weepinbell.png
diff --git a/src/afd/sprites/back/0071--000--Victreebel.png b/src/afd/sprites/back/0071-000-Victreebel.png
similarity index 100%
rename from src/afd/sprites/back/0071--000--Victreebel.png
rename to src/afd/sprites/back/0071-000-Victreebel.png
diff --git a/src/afd/sprites/back/0072--000--Tentacool.png b/src/afd/sprites/back/0072-000-Tentacool.png
similarity index 100%
rename from src/afd/sprites/back/0072--000--Tentacool.png
rename to src/afd/sprites/back/0072-000-Tentacool.png
diff --git a/src/afd/sprites/back/0073--000--Tentacruel.png b/src/afd/sprites/back/0073-000-Tentacruel.png
similarity index 100%
rename from src/afd/sprites/back/0073--000--Tentacruel.png
rename to src/afd/sprites/back/0073-000-Tentacruel.png
diff --git a/src/afd/sprites/back/0074--000--Geodude.png b/src/afd/sprites/back/0074-000-Geodude.png
similarity index 100%
rename from src/afd/sprites/back/0074--000--Geodude.png
rename to src/afd/sprites/back/0074-000-Geodude.png
diff --git a/src/afd/sprites/back/0074--420--Geodude--Alola.png b/src/afd/sprites/back/0074-420-Geodude-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0074--420--Geodude--Alola.png
rename to src/afd/sprites/back/0074-420-Geodude-Alola.png
diff --git a/src/afd/sprites/back/0075--000--Graveler.png b/src/afd/sprites/back/0075-000-Graveler.png
similarity index 100%
rename from src/afd/sprites/back/0075--000--Graveler.png
rename to src/afd/sprites/back/0075-000-Graveler.png
diff --git a/src/afd/sprites/back/0075--420--Graveler--Alola.png b/src/afd/sprites/back/0075-420-Graveler-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0075--420--Graveler--Alola.png
rename to src/afd/sprites/back/0075-420-Graveler-Alola.png
diff --git a/src/afd/sprites/back/0076--000--Golem.png b/src/afd/sprites/back/0076-000-Golem.png
similarity index 100%
rename from src/afd/sprites/back/0076--000--Golem.png
rename to src/afd/sprites/back/0076-000-Golem.png
diff --git a/src/afd/sprites/back/0076--420--Golem--Alola.png b/src/afd/sprites/back/0076-420-Golem-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0076--420--Golem--Alola.png
rename to src/afd/sprites/back/0076-420-Golem-Alola.png
diff --git a/src/afd/sprites/back/0077--000--Ponyta.png b/src/afd/sprites/back/0077-000-Ponyta.png
similarity index 100%
rename from src/afd/sprites/back/0077--000--Ponyta.png
rename to src/afd/sprites/back/0077-000-Ponyta.png
diff --git a/src/afd/sprites/back/0077--420--Ponyta--Galar.png b/src/afd/sprites/back/0077-420-Ponyta-Galar.png
similarity index 100%
rename from src/afd/sprites/back/0077--420--Ponyta--Galar.png
rename to src/afd/sprites/back/0077-420-Ponyta-Galar.png
diff --git a/src/afd/sprites/back/0078--000--Rapidash.png b/src/afd/sprites/back/0078-000-Rapidash.png
similarity index 100%
rename from src/afd/sprites/back/0078--000--Rapidash.png
rename to src/afd/sprites/back/0078-000-Rapidash.png
diff --git a/src/afd/sprites/back/0078--420--Rapidash--Galar.png b/src/afd/sprites/back/0078-420-Rapidash-Galar.png
similarity index 100%
rename from src/afd/sprites/back/0078--420--Rapidash--Galar.png
rename to src/afd/sprites/back/0078-420-Rapidash-Galar.png
diff --git a/src/afd/sprites/back/0079--000--Slowpoke.png b/src/afd/sprites/back/0079-000-Slowpoke.png
similarity index 100%
rename from src/afd/sprites/back/0079--000--Slowpoke.png
rename to src/afd/sprites/back/0079-000-Slowpoke.png
diff --git a/src/afd/sprites/back/0079--420--Slowpoke--Galar.png b/src/afd/sprites/back/0079-420-Slowpoke-Galar.png
similarity index 100%
rename from src/afd/sprites/back/0079--420--Slowpoke--Galar.png
rename to src/afd/sprites/back/0079-420-Slowpoke-Galar.png
diff --git a/src/afd/sprites/back/0080--000--Slowbro.png b/src/afd/sprites/back/0080-000-Slowbro.png
similarity index 100%
rename from src/afd/sprites/back/0080--000--Slowbro.png
rename to src/afd/sprites/back/0080-000-Slowbro.png
diff --git a/src/afd/sprites/back/0080--420--Slowbro--Mega.png b/src/afd/sprites/back/0080-420-Slowbro-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0080--420--Slowbro--Mega.png
rename to src/afd/sprites/back/0080-420-Slowbro-Mega.png
diff --git a/src/afd/sprites/back/0081--000--Magnemite.png b/src/afd/sprites/back/0081-000-Magnemite.png
similarity index 100%
rename from src/afd/sprites/back/0081--000--Magnemite.png
rename to src/afd/sprites/back/0081-000-Magnemite.png
diff --git a/src/afd/sprites/back/0082--000--Magneton.png b/src/afd/sprites/back/0082-000-Magneton.png
similarity index 100%
rename from src/afd/sprites/back/0082--000--Magneton.png
rename to src/afd/sprites/back/0082-000-Magneton.png
diff --git a/src/afd/sprites/back/0083--000--Farfetch__0027d.png b/src/afd/sprites/back/0083-000-Farfetch__0027d.png
similarity index 100%
rename from src/afd/sprites/back/0083--000--Farfetch__0027d.png
rename to src/afd/sprites/back/0083-000-Farfetch__0027d.png
diff --git a/src/afd/sprites/back/0083--420--Farfetch__0027d--Galar.png b/src/afd/sprites/back/0083-420-Farfetch__0027d-Galar.png
similarity index 100%
rename from src/afd/sprites/back/0083--420--Farfetch__0027d--Galar.png
rename to src/afd/sprites/back/0083-420-Farfetch__0027d-Galar.png
diff --git a/src/afd/sprites/back/0084--000--Doduo.png b/src/afd/sprites/back/0084-000-Doduo.png
similarity index 100%
rename from src/afd/sprites/back/0084--000--Doduo.png
rename to src/afd/sprites/back/0084-000-Doduo.png
diff --git a/src/afd/sprites/back/0085--000--Dodrio.png b/src/afd/sprites/back/0085-000-Dodrio.png
similarity index 100%
rename from src/afd/sprites/back/0085--000--Dodrio.png
rename to src/afd/sprites/back/0085-000-Dodrio.png
diff --git a/src/afd/sprites/back/0086--000--Seel.png b/src/afd/sprites/back/0086-000-Seel.png
similarity index 100%
rename from src/afd/sprites/back/0086--000--Seel.png
rename to src/afd/sprites/back/0086-000-Seel.png
diff --git a/src/afd/sprites/back/0087--000--Dewgong.png b/src/afd/sprites/back/0087-000-Dewgong.png
similarity index 100%
rename from src/afd/sprites/back/0087--000--Dewgong.png
rename to src/afd/sprites/back/0087-000-Dewgong.png
diff --git a/src/afd/sprites/back/0088--000--Grimer.png b/src/afd/sprites/back/0088-000-Grimer.png
similarity index 100%
rename from src/afd/sprites/back/0088--000--Grimer.png
rename to src/afd/sprites/back/0088-000-Grimer.png
diff --git a/src/afd/sprites/back/0088--420--Grimer--Alola.png b/src/afd/sprites/back/0088-420-Grimer-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0088--420--Grimer--Alola.png
rename to src/afd/sprites/back/0088-420-Grimer-Alola.png
diff --git a/src/afd/sprites/back/0089--000--Muk.png b/src/afd/sprites/back/0089-000-Muk.png
similarity index 100%
rename from src/afd/sprites/back/0089--000--Muk.png
rename to src/afd/sprites/back/0089-000-Muk.png
diff --git a/src/afd/sprites/back/0089--420--Muk--Alola.png b/src/afd/sprites/back/0089-420-Muk-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0089--420--Muk--Alola.png
rename to src/afd/sprites/back/0089-420-Muk-Alola.png
diff --git a/src/afd/sprites/back/0090--000--Shellder.png b/src/afd/sprites/back/0090-000-Shellder.png
similarity index 100%
rename from src/afd/sprites/back/0090--000--Shellder.png
rename to src/afd/sprites/back/0090-000-Shellder.png
diff --git a/src/afd/sprites/back/0091--000--Cloyster.png b/src/afd/sprites/back/0091-000-Cloyster.png
similarity index 100%
rename from src/afd/sprites/back/0091--000--Cloyster.png
rename to src/afd/sprites/back/0091-000-Cloyster.png
diff --git a/src/afd/sprites/back/0092--000--Gastly.png b/src/afd/sprites/back/0092-000-Gastly.png
similarity index 100%
rename from src/afd/sprites/back/0092--000--Gastly.png
rename to src/afd/sprites/back/0092-000-Gastly.png
diff --git a/src/afd/sprites/back/0093--000--Haunter.png b/src/afd/sprites/back/0093-000-Haunter.png
similarity index 100%
rename from src/afd/sprites/back/0093--000--Haunter.png
rename to src/afd/sprites/back/0093-000-Haunter.png
diff --git a/src/afd/sprites/back/0094--000--Gengar.png b/src/afd/sprites/back/0094-000-Gengar.png
similarity index 100%
rename from src/afd/sprites/back/0094--000--Gengar.png
rename to src/afd/sprites/back/0094-000-Gengar.png
diff --git a/src/afd/sprites/back/0094--420--Gengar--Gmax.png b/src/afd/sprites/back/0094-420-Gengar-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0094--420--Gengar--Gmax.png
rename to src/afd/sprites/back/0094-420-Gengar-Gmax.png
diff --git a/src/afd/sprites/back/0094--420--Gengar--Mega.png b/src/afd/sprites/back/0094-420-Gengar-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0094--420--Gengar--Mega.png
rename to src/afd/sprites/back/0094-420-Gengar-Mega.png
diff --git a/src/afd/sprites/back/0095--000--Onix.png b/src/afd/sprites/back/0095-000-Onix.png
similarity index 100%
rename from src/afd/sprites/back/0095--000--Onix.png
rename to src/afd/sprites/back/0095-000-Onix.png
diff --git a/src/afd/sprites/back/0096--000--Drowzee.png b/src/afd/sprites/back/0096-000-Drowzee.png
similarity index 100%
rename from src/afd/sprites/back/0096--000--Drowzee.png
rename to src/afd/sprites/back/0096-000-Drowzee.png
diff --git a/src/afd/sprites/back/0097--000--Hypno.png b/src/afd/sprites/back/0097-000-Hypno.png
similarity index 100%
rename from src/afd/sprites/back/0097--000--Hypno.png
rename to src/afd/sprites/back/0097-000-Hypno.png
diff --git a/src/afd/sprites/back/0098--000--Krabby.png b/src/afd/sprites/back/0098-000-Krabby.png
similarity index 100%
rename from src/afd/sprites/back/0098--000--Krabby.png
rename to src/afd/sprites/back/0098-000-Krabby.png
diff --git a/src/afd/sprites/back/0099--000--Kingler.png b/src/afd/sprites/back/0099-000-Kingler.png
similarity index 100%
rename from src/afd/sprites/back/0099--000--Kingler.png
rename to src/afd/sprites/back/0099-000-Kingler.png
diff --git a/src/afd/sprites/back/0099--420--Kingler--Gmax.png b/src/afd/sprites/back/0099-420-Kingler-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0099--420--Kingler--Gmax.png
rename to src/afd/sprites/back/0099-420-Kingler-Gmax.png
diff --git a/src/afd/sprites/back/0100--000--Voltorb.png b/src/afd/sprites/back/0100-000-Voltorb.png
similarity index 100%
rename from src/afd/sprites/back/0100--000--Voltorb.png
rename to src/afd/sprites/back/0100-000-Voltorb.png
diff --git a/src/afd/sprites/back/0101--000--Electrode.png b/src/afd/sprites/back/0101-000-Electrode.png
similarity index 100%
rename from src/afd/sprites/back/0101--000--Electrode.png
rename to src/afd/sprites/back/0101-000-Electrode.png
diff --git a/src/afd/sprites/back/0102--000--Exeggcute.png b/src/afd/sprites/back/0102-000-Exeggcute.png
similarity index 100%
rename from src/afd/sprites/back/0102--000--Exeggcute.png
rename to src/afd/sprites/back/0102-000-Exeggcute.png
diff --git a/src/afd/sprites/back/0103--000--Exeggutor.png b/src/afd/sprites/back/0103-000-Exeggutor.png
similarity index 100%
rename from src/afd/sprites/back/0103--000--Exeggutor.png
rename to src/afd/sprites/back/0103-000-Exeggutor.png
diff --git a/src/afd/sprites/back/0103--420--Exeggutor--Alola.png b/src/afd/sprites/back/0103-420-Exeggutor-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0103--420--Exeggutor--Alola.png
rename to src/afd/sprites/back/0103-420-Exeggutor-Alola.png
diff --git a/src/afd/sprites/back/0104--000--Cubone.png b/src/afd/sprites/back/0104-000-Cubone.png
similarity index 100%
rename from src/afd/sprites/back/0104--000--Cubone.png
rename to src/afd/sprites/back/0104-000-Cubone.png
diff --git a/src/afd/sprites/back/0105--000--Marowak.png b/src/afd/sprites/back/0105-000-Marowak.png
similarity index 100%
rename from src/afd/sprites/back/0105--000--Marowak.png
rename to src/afd/sprites/back/0105-000-Marowak.png
diff --git a/src/afd/sprites/back/0105--420--Marowak--Alola.png b/src/afd/sprites/back/0105-420-Marowak-Alola.png
similarity index 100%
rename from src/afd/sprites/back/0105--420--Marowak--Alola.png
rename to src/afd/sprites/back/0105-420-Marowak-Alola.png
diff --git a/src/afd/sprites/back/0106--000--Hitmonlee.png b/src/afd/sprites/back/0106-000-Hitmonlee.png
similarity index 100%
rename from src/afd/sprites/back/0106--000--Hitmonlee.png
rename to src/afd/sprites/back/0106-000-Hitmonlee.png
diff --git a/src/afd/sprites/back/0107--000--Hitmonchan.png b/src/afd/sprites/back/0107-000-Hitmonchan.png
similarity index 100%
rename from src/afd/sprites/back/0107--000--Hitmonchan.png
rename to src/afd/sprites/back/0107-000-Hitmonchan.png
diff --git a/src/afd/sprites/back/0108--000--Lickitung.png b/src/afd/sprites/back/0108-000-Lickitung.png
similarity index 100%
rename from src/afd/sprites/back/0108--000--Lickitung.png
rename to src/afd/sprites/back/0108-000-Lickitung.png
diff --git a/src/afd/sprites/back/0109--000--Koffing.png b/src/afd/sprites/back/0109-000-Koffing.png
similarity index 100%
rename from src/afd/sprites/back/0109--000--Koffing.png
rename to src/afd/sprites/back/0109-000-Koffing.png
diff --git a/src/afd/sprites/back/0110--000--Weezing.png b/src/afd/sprites/back/0110-000-Weezing.png
similarity index 100%
rename from src/afd/sprites/back/0110--000--Weezing.png
rename to src/afd/sprites/back/0110-000-Weezing.png
diff --git a/src/afd/sprites/back/0110--420--Weezing--Galar.png b/src/afd/sprites/back/0110-420-Weezing-Galar.png
similarity index 100%
rename from src/afd/sprites/back/0110--420--Weezing--Galar.png
rename to src/afd/sprites/back/0110-420-Weezing-Galar.png
diff --git a/src/afd/sprites/back/0111--000--Rhyhorn.png b/src/afd/sprites/back/0111-000-Rhyhorn.png
similarity index 100%
rename from src/afd/sprites/back/0111--000--Rhyhorn.png
rename to src/afd/sprites/back/0111-000-Rhyhorn.png
diff --git a/src/afd/sprites/back/0112--000--Rhydon.png b/src/afd/sprites/back/0112-000-Rhydon.png
similarity index 100%
rename from src/afd/sprites/back/0112--000--Rhydon.png
rename to src/afd/sprites/back/0112-000-Rhydon.png
diff --git a/src/afd/sprites/back/0113--000--Chansey.png b/src/afd/sprites/back/0113-000-Chansey.png
similarity index 100%
rename from src/afd/sprites/back/0113--000--Chansey.png
rename to src/afd/sprites/back/0113-000-Chansey.png
diff --git a/src/afd/sprites/back/0114--000--Tangela.png b/src/afd/sprites/back/0114-000-Tangela.png
similarity index 100%
rename from src/afd/sprites/back/0114--000--Tangela.png
rename to src/afd/sprites/back/0114-000-Tangela.png
diff --git a/src/afd/sprites/back/0115--000--Kangaskhan.png b/src/afd/sprites/back/0115-000-Kangaskhan.png
similarity index 100%
rename from src/afd/sprites/back/0115--000--Kangaskhan.png
rename to src/afd/sprites/back/0115-000-Kangaskhan.png
diff --git a/src/afd/sprites/back/0115--420--Kangaskhan--Mega.png b/src/afd/sprites/back/0115-420-Kangaskhan-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0115--420--Kangaskhan--Mega.png
rename to src/afd/sprites/back/0115-420-Kangaskhan-Mega.png
diff --git a/src/afd/sprites/back/0116--000--Horsea.png b/src/afd/sprites/back/0116-000-Horsea.png
similarity index 100%
rename from src/afd/sprites/back/0116--000--Horsea.png
rename to src/afd/sprites/back/0116-000-Horsea.png
diff --git a/src/afd/sprites/back/0117--000--Seadra.png b/src/afd/sprites/back/0117-000-Seadra.png
similarity index 100%
rename from src/afd/sprites/back/0117--000--Seadra.png
rename to src/afd/sprites/back/0117-000-Seadra.png
diff --git a/src/afd/sprites/back/0118--000--Goldeen.png b/src/afd/sprites/back/0118-000-Goldeen.png
similarity index 100%
rename from src/afd/sprites/back/0118--000--Goldeen.png
rename to src/afd/sprites/back/0118-000-Goldeen.png
diff --git a/src/afd/sprites/back/0119--000--Seaking.png b/src/afd/sprites/back/0119-000-Seaking.png
similarity index 100%
rename from src/afd/sprites/back/0119--000--Seaking.png
rename to src/afd/sprites/back/0119-000-Seaking.png
diff --git a/src/afd/sprites/back/0120--000--Staryu.png b/src/afd/sprites/back/0120-000-Staryu.png
similarity index 100%
rename from src/afd/sprites/back/0120--000--Staryu.png
rename to src/afd/sprites/back/0120-000-Staryu.png
diff --git a/src/afd/sprites/back/0121--000--Starmie.png b/src/afd/sprites/back/0121-000-Starmie.png
similarity index 100%
rename from src/afd/sprites/back/0121--000--Starmie.png
rename to src/afd/sprites/back/0121-000-Starmie.png
diff --git a/src/afd/sprites/back/0122--000--Mr._Mime.png b/src/afd/sprites/back/0122-000-Mr._Mime.png
similarity index 100%
rename from src/afd/sprites/back/0122--000--Mr._Mime.png
rename to src/afd/sprites/back/0122-000-Mr._Mime.png
diff --git a/src/afd/sprites/back/0122--420--Mr._Mime--Galar.png b/src/afd/sprites/back/0122-420-Mr._Mime-Galar.png
similarity index 100%
rename from src/afd/sprites/back/0122--420--Mr._Mime--Galar.png
rename to src/afd/sprites/back/0122-420-Mr._Mime-Galar.png
diff --git a/src/afd/sprites/back/0123--000--Scyther.png b/src/afd/sprites/back/0123-000-Scyther.png
similarity index 100%
rename from src/afd/sprites/back/0123--000--Scyther.png
rename to src/afd/sprites/back/0123-000-Scyther.png
diff --git a/src/afd/sprites/back/0124--000--Jynx.png b/src/afd/sprites/back/0124-000-Jynx.png
similarity index 100%
rename from src/afd/sprites/back/0124--000--Jynx.png
rename to src/afd/sprites/back/0124-000-Jynx.png
diff --git a/src/afd/sprites/back/0125--000--Electabuzz.png b/src/afd/sprites/back/0125-000-Electabuzz.png
similarity index 100%
rename from src/afd/sprites/back/0125--000--Electabuzz.png
rename to src/afd/sprites/back/0125-000-Electabuzz.png
diff --git a/src/afd/sprites/back/0126--000--Magmar.png b/src/afd/sprites/back/0126-000-Magmar.png
similarity index 100%
rename from src/afd/sprites/back/0126--000--Magmar.png
rename to src/afd/sprites/back/0126-000-Magmar.png
diff --git a/src/afd/sprites/back/0127--000--Pinsir.png b/src/afd/sprites/back/0127-000-Pinsir.png
similarity index 100%
rename from src/afd/sprites/back/0127--000--Pinsir.png
rename to src/afd/sprites/back/0127-000-Pinsir.png
diff --git a/src/afd/sprites/back/0127--420--Pinsir--Mega.png b/src/afd/sprites/back/0127-420-Pinsir-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0127--420--Pinsir--Mega.png
rename to src/afd/sprites/back/0127-420-Pinsir-Mega.png
diff --git a/src/afd/sprites/back/0128--000--Tauros.png b/src/afd/sprites/back/0128-000-Tauros.png
similarity index 100%
rename from src/afd/sprites/back/0128--000--Tauros.png
rename to src/afd/sprites/back/0128-000-Tauros.png
diff --git a/src/afd/sprites/back/0129--000--Magikarp.png b/src/afd/sprites/back/0129-000-Magikarp.png
similarity index 100%
rename from src/afd/sprites/back/0129--000--Magikarp.png
rename to src/afd/sprites/back/0129-000-Magikarp.png
diff --git a/src/afd/sprites/back/0130--000--Gyarados.png b/src/afd/sprites/back/0130-000-Gyarados.png
similarity index 100%
rename from src/afd/sprites/back/0130--000--Gyarados.png
rename to src/afd/sprites/back/0130-000-Gyarados.png
diff --git a/src/afd/sprites/back/0130--420--Gyarados--Mega.png b/src/afd/sprites/back/0130-420-Gyarados-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0130--420--Gyarados--Mega.png
rename to src/afd/sprites/back/0130-420-Gyarados-Mega.png
diff --git a/src/afd/sprites/back/0131--000--Lapras.png b/src/afd/sprites/back/0131-000-Lapras.png
similarity index 100%
rename from src/afd/sprites/back/0131--000--Lapras.png
rename to src/afd/sprites/back/0131-000-Lapras.png
diff --git a/src/afd/sprites/back/0131--420--Lapras--Gmax.png b/src/afd/sprites/back/0131-420-Lapras-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0131--420--Lapras--Gmax.png
rename to src/afd/sprites/back/0131-420-Lapras-Gmax.png
diff --git a/src/afd/sprites/back/0132--000--Ditto.png b/src/afd/sprites/back/0132-000-Ditto.png
similarity index 100%
rename from src/afd/sprites/back/0132--000--Ditto.png
rename to src/afd/sprites/back/0132-000-Ditto.png
diff --git a/src/afd/sprites/back/0133--000--Eevee.png b/src/afd/sprites/back/0133-000-Eevee.png
similarity index 100%
rename from src/afd/sprites/back/0133--000--Eevee.png
rename to src/afd/sprites/back/0133-000-Eevee.png
diff --git a/src/afd/sprites/back/0133--420--Eevee--Gmax.png b/src/afd/sprites/back/0133-420-Eevee-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0133--420--Eevee--Gmax.png
rename to src/afd/sprites/back/0133-420-Eevee-Gmax.png
diff --git a/src/afd/sprites/back/0133--420--Eevee--Starter.png b/src/afd/sprites/back/0133-420-Eevee-Starter.png
similarity index 100%
rename from src/afd/sprites/back/0133--420--Eevee--Starter.png
rename to src/afd/sprites/back/0133-420-Eevee-Starter.png
diff --git a/src/afd/sprites/back/0134--000--Vaporeon.png b/src/afd/sprites/back/0134-000-Vaporeon.png
similarity index 100%
rename from src/afd/sprites/back/0134--000--Vaporeon.png
rename to src/afd/sprites/back/0134-000-Vaporeon.png
diff --git a/src/afd/sprites/back/0135--000--Jolteon.png b/src/afd/sprites/back/0135-000-Jolteon.png
similarity index 100%
rename from src/afd/sprites/back/0135--000--Jolteon.png
rename to src/afd/sprites/back/0135-000-Jolteon.png
diff --git a/src/afd/sprites/back/0136--000--Flareon.png b/src/afd/sprites/back/0136-000-Flareon.png
similarity index 100%
rename from src/afd/sprites/back/0136--000--Flareon.png
rename to src/afd/sprites/back/0136-000-Flareon.png
diff --git a/src/afd/sprites/back/0137--000--Porygon.png b/src/afd/sprites/back/0137-000-Porygon.png
similarity index 100%
rename from src/afd/sprites/back/0137--000--Porygon.png
rename to src/afd/sprites/back/0137-000-Porygon.png
diff --git a/src/afd/sprites/back/0138--000--Omanyte.png b/src/afd/sprites/back/0138-000-Omanyte.png
similarity index 100%
rename from src/afd/sprites/back/0138--000--Omanyte.png
rename to src/afd/sprites/back/0138-000-Omanyte.png
diff --git a/src/afd/sprites/back/0139--000--Omastar.png b/src/afd/sprites/back/0139-000-Omastar.png
similarity index 100%
rename from src/afd/sprites/back/0139--000--Omastar.png
rename to src/afd/sprites/back/0139-000-Omastar.png
diff --git a/src/afd/sprites/back/0140--000--Kabuto.png b/src/afd/sprites/back/0140-000-Kabuto.png
similarity index 100%
rename from src/afd/sprites/back/0140--000--Kabuto.png
rename to src/afd/sprites/back/0140-000-Kabuto.png
diff --git a/src/afd/sprites/back/0141--000--Kabutops.png b/src/afd/sprites/back/0141-000-Kabutops.png
similarity index 100%
rename from src/afd/sprites/back/0141--000--Kabutops.png
rename to src/afd/sprites/back/0141-000-Kabutops.png
diff --git a/src/afd/sprites/back/0142--000--Aerodactyl.png b/src/afd/sprites/back/0142-000-Aerodactyl.png
similarity index 100%
rename from src/afd/sprites/back/0142--000--Aerodactyl.png
rename to src/afd/sprites/back/0142-000-Aerodactyl.png
diff --git a/src/afd/sprites/back/0142--420--Aerodactyl--Mega.png b/src/afd/sprites/back/0142-420-Aerodactyl-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0142--420--Aerodactyl--Mega.png
rename to src/afd/sprites/back/0142-420-Aerodactyl-Mega.png
diff --git a/src/afd/sprites/back/0143--000--Snorlax.png b/src/afd/sprites/back/0143-000-Snorlax.png
similarity index 100%
rename from src/afd/sprites/back/0143--000--Snorlax.png
rename to src/afd/sprites/back/0143-000-Snorlax.png
diff --git a/src/afd/sprites/back/0143--420--Snorlax--Gmax.png b/src/afd/sprites/back/0143-420-Snorlax-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0143--420--Snorlax--Gmax.png
rename to src/afd/sprites/back/0143-420-Snorlax-Gmax.png
diff --git a/src/afd/sprites/back/0144--000--Articuno.png b/src/afd/sprites/back/0144-000-Articuno.png
similarity index 100%
rename from src/afd/sprites/back/0144--000--Articuno.png
rename to src/afd/sprites/back/0144-000-Articuno.png
diff --git a/src/afd/sprites/back/0145--000--Zapdos.png b/src/afd/sprites/back/0145-000-Zapdos.png
similarity index 100%
rename from src/afd/sprites/back/0145--000--Zapdos.png
rename to src/afd/sprites/back/0145-000-Zapdos.png
diff --git a/src/afd/sprites/back/0146--000--Moltres.png b/src/afd/sprites/back/0146-000-Moltres.png
similarity index 100%
rename from src/afd/sprites/back/0146--000--Moltres.png
rename to src/afd/sprites/back/0146-000-Moltres.png
diff --git a/src/afd/sprites/back/0147--000--Dratini.png b/src/afd/sprites/back/0147-000-Dratini.png
similarity index 100%
rename from src/afd/sprites/back/0147--000--Dratini.png
rename to src/afd/sprites/back/0147-000-Dratini.png
diff --git a/src/afd/sprites/back/0148--000--Dragonair.png b/src/afd/sprites/back/0148-000-Dragonair.png
similarity index 100%
rename from src/afd/sprites/back/0148--000--Dragonair.png
rename to src/afd/sprites/back/0148-000-Dragonair.png
diff --git a/src/afd/sprites/back/0149--000--Dragonite.png b/src/afd/sprites/back/0149-000-Dragonite.png
similarity index 100%
rename from src/afd/sprites/back/0149--000--Dragonite.png
rename to src/afd/sprites/back/0149-000-Dragonite.png
diff --git a/src/afd/sprites/back/0150--000--Mewtwo.png b/src/afd/sprites/back/0150-000-Mewtwo.png
similarity index 100%
rename from src/afd/sprites/back/0150--000--Mewtwo.png
rename to src/afd/sprites/back/0150-000-Mewtwo.png
diff --git a/src/afd/sprites/back/0150--420--Mewtwo--Mega-X.png b/src/afd/sprites/back/0150-420-Mewtwo-Mega~X.png
similarity index 100%
rename from src/afd/sprites/back/0150--420--Mewtwo--Mega-X.png
rename to src/afd/sprites/back/0150-420-Mewtwo-Mega~X.png
diff --git a/src/afd/sprites/back/0150--420--Mewtwo--Mega-Y.png b/src/afd/sprites/back/0150-420-Mewtwo-Mega~Y.png
similarity index 100%
rename from src/afd/sprites/back/0150--420--Mewtwo--Mega-Y.png
rename to src/afd/sprites/back/0150-420-Mewtwo-Mega~Y.png
diff --git a/src/afd/sprites/back/0151--000--Mew.png b/src/afd/sprites/back/0151-000-Mew.png
similarity index 100%
rename from src/afd/sprites/back/0151--000--Mew.png
rename to src/afd/sprites/back/0151-000-Mew.png
diff --git a/src/afd/sprites/back/0152--000--Chikorita.png b/src/afd/sprites/back/0152-000-Chikorita.png
similarity index 100%
rename from src/afd/sprites/back/0152--000--Chikorita.png
rename to src/afd/sprites/back/0152-000-Chikorita.png
diff --git a/src/afd/sprites/back/0153--000--Bayleef.png b/src/afd/sprites/back/0153-000-Bayleef.png
similarity index 100%
rename from src/afd/sprites/back/0153--000--Bayleef.png
rename to src/afd/sprites/back/0153-000-Bayleef.png
diff --git a/src/afd/sprites/back/0154--000--Meganium.png b/src/afd/sprites/back/0154-000-Meganium.png
similarity index 100%
rename from src/afd/sprites/back/0154--000--Meganium.png
rename to src/afd/sprites/back/0154-000-Meganium.png
diff --git a/src/afd/sprites/back/0155--000--Cyndaquil.png b/src/afd/sprites/back/0155-000-Cyndaquil.png
similarity index 100%
rename from src/afd/sprites/back/0155--000--Cyndaquil.png
rename to src/afd/sprites/back/0155-000-Cyndaquil.png
diff --git a/src/afd/sprites/back/0156--000--Quilava.png b/src/afd/sprites/back/0156-000-Quilava.png
similarity index 100%
rename from src/afd/sprites/back/0156--000--Quilava.png
rename to src/afd/sprites/back/0156-000-Quilava.png
diff --git a/src/afd/sprites/back/0157--000--Typhlosion.png b/src/afd/sprites/back/0157-000-Typhlosion.png
similarity index 100%
rename from src/afd/sprites/back/0157--000--Typhlosion.png
rename to src/afd/sprites/back/0157-000-Typhlosion.png
diff --git a/src/afd/sprites/back/0158--000--Totodile.png b/src/afd/sprites/back/0158-000-Totodile.png
similarity index 100%
rename from src/afd/sprites/back/0158--000--Totodile.png
rename to src/afd/sprites/back/0158-000-Totodile.png
diff --git a/src/afd/sprites/back/0159--000--Croconaw.png b/src/afd/sprites/back/0159-000-Croconaw.png
similarity index 100%
rename from src/afd/sprites/back/0159--000--Croconaw.png
rename to src/afd/sprites/back/0159-000-Croconaw.png
diff --git a/src/afd/sprites/back/0160--000--Feraligatr.png b/src/afd/sprites/back/0160-000-Feraligatr.png
similarity index 100%
rename from src/afd/sprites/back/0160--000--Feraligatr.png
rename to src/afd/sprites/back/0160-000-Feraligatr.png
diff --git a/src/afd/sprites/back/0161--000--Sentret.png b/src/afd/sprites/back/0161-000-Sentret.png
similarity index 100%
rename from src/afd/sprites/back/0161--000--Sentret.png
rename to src/afd/sprites/back/0161-000-Sentret.png
diff --git a/src/afd/sprites/back/0162--000--Furret.png b/src/afd/sprites/back/0162-000-Furret.png
similarity index 100%
rename from src/afd/sprites/back/0162--000--Furret.png
rename to src/afd/sprites/back/0162-000-Furret.png
diff --git a/src/afd/sprites/back/0163--000--Hoothoot.png b/src/afd/sprites/back/0163-000-Hoothoot.png
similarity index 100%
rename from src/afd/sprites/back/0163--000--Hoothoot.png
rename to src/afd/sprites/back/0163-000-Hoothoot.png
diff --git a/src/afd/sprites/back/0164--000--Noctowl.png b/src/afd/sprites/back/0164-000-Noctowl.png
similarity index 100%
rename from src/afd/sprites/back/0164--000--Noctowl.png
rename to src/afd/sprites/back/0164-000-Noctowl.png
diff --git a/src/afd/sprites/back/0165--000--Ledyba.png b/src/afd/sprites/back/0165-000-Ledyba.png
similarity index 100%
rename from src/afd/sprites/back/0165--000--Ledyba.png
rename to src/afd/sprites/back/0165-000-Ledyba.png
diff --git a/src/afd/sprites/back/0166--000--Ledian.png b/src/afd/sprites/back/0166-000-Ledian.png
similarity index 100%
rename from src/afd/sprites/back/0166--000--Ledian.png
rename to src/afd/sprites/back/0166-000-Ledian.png
diff --git a/src/afd/sprites/back/0167--000--Spinarak.png b/src/afd/sprites/back/0167-000-Spinarak.png
similarity index 100%
rename from src/afd/sprites/back/0167--000--Spinarak.png
rename to src/afd/sprites/back/0167-000-Spinarak.png
diff --git a/src/afd/sprites/back/0168--000--Ariados.png b/src/afd/sprites/back/0168-000-Ariados.png
similarity index 100%
rename from src/afd/sprites/back/0168--000--Ariados.png
rename to src/afd/sprites/back/0168-000-Ariados.png
diff --git a/src/afd/sprites/back/0169--000--Crobat.png b/src/afd/sprites/back/0169-000-Crobat.png
similarity index 100%
rename from src/afd/sprites/back/0169--000--Crobat.png
rename to src/afd/sprites/back/0169-000-Crobat.png
diff --git a/src/afd/sprites/back/0170--000--Chinchou.png b/src/afd/sprites/back/0170-000-Chinchou.png
similarity index 100%
rename from src/afd/sprites/back/0170--000--Chinchou.png
rename to src/afd/sprites/back/0170-000-Chinchou.png
diff --git a/src/afd/sprites/back/0171--000--Lanturn.png b/src/afd/sprites/back/0171-000-Lanturn.png
similarity index 100%
rename from src/afd/sprites/back/0171--000--Lanturn.png
rename to src/afd/sprites/back/0171-000-Lanturn.png
diff --git a/src/afd/sprites/back/0172--000--Pichu.png b/src/afd/sprites/back/0172-000-Pichu.png
similarity index 100%
rename from src/afd/sprites/back/0172--000--Pichu.png
rename to src/afd/sprites/back/0172-000-Pichu.png
diff --git a/src/afd/sprites/back/0173--000--Cleffa.png b/src/afd/sprites/back/0173-000-Cleffa.png
similarity index 100%
rename from src/afd/sprites/back/0173--000--Cleffa.png
rename to src/afd/sprites/back/0173-000-Cleffa.png
diff --git a/src/afd/sprites/back/0174--000--Igglybuff.png b/src/afd/sprites/back/0174-000-Igglybuff.png
similarity index 100%
rename from src/afd/sprites/back/0174--000--Igglybuff.png
rename to src/afd/sprites/back/0174-000-Igglybuff.png
diff --git a/src/afd/sprites/back/0175--000--Togepi.png b/src/afd/sprites/back/0175-000-Togepi.png
similarity index 100%
rename from src/afd/sprites/back/0175--000--Togepi.png
rename to src/afd/sprites/back/0175-000-Togepi.png
diff --git a/src/afd/sprites/back/0176--000--Togetic.png b/src/afd/sprites/back/0176-000-Togetic.png
similarity index 100%
rename from src/afd/sprites/back/0176--000--Togetic.png
rename to src/afd/sprites/back/0176-000-Togetic.png
diff --git a/src/afd/sprites/back/0177--000--Natu.png b/src/afd/sprites/back/0177-000-Natu.png
similarity index 100%
rename from src/afd/sprites/back/0177--000--Natu.png
rename to src/afd/sprites/back/0177-000-Natu.png
diff --git a/src/afd/sprites/back/0178--000--Xatu.png b/src/afd/sprites/back/0178-000-Xatu.png
similarity index 100%
rename from src/afd/sprites/back/0178--000--Xatu.png
rename to src/afd/sprites/back/0178-000-Xatu.png
diff --git a/src/afd/sprites/back/0179--000--Mareep.png b/src/afd/sprites/back/0179-000-Mareep.png
similarity index 100%
rename from src/afd/sprites/back/0179--000--Mareep.png
rename to src/afd/sprites/back/0179-000-Mareep.png
diff --git a/src/afd/sprites/back/0180--000--Flaaffy.png b/src/afd/sprites/back/0180-000-Flaaffy.png
similarity index 100%
rename from src/afd/sprites/back/0180--000--Flaaffy.png
rename to src/afd/sprites/back/0180-000-Flaaffy.png
diff --git a/src/afd/sprites/back/0181--000--Ampharos.png b/src/afd/sprites/back/0181-000-Ampharos.png
similarity index 100%
rename from src/afd/sprites/back/0181--000--Ampharos.png
rename to src/afd/sprites/back/0181-000-Ampharos.png
diff --git a/src/afd/sprites/back/0181--420--Ampharos--Mega.png b/src/afd/sprites/back/0181-420-Ampharos-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0181--420--Ampharos--Mega.png
rename to src/afd/sprites/back/0181-420-Ampharos-Mega.png
diff --git a/src/afd/sprites/back/0182--000--Bellossom.png b/src/afd/sprites/back/0182-000-Bellossom.png
similarity index 100%
rename from src/afd/sprites/back/0182--000--Bellossom.png
rename to src/afd/sprites/back/0182-000-Bellossom.png
diff --git a/src/afd/sprites/back/0183--000--Marill.png b/src/afd/sprites/back/0183-000-Marill.png
similarity index 100%
rename from src/afd/sprites/back/0183--000--Marill.png
rename to src/afd/sprites/back/0183-000-Marill.png
diff --git a/src/afd/sprites/back/0184--000--Azumarill.png b/src/afd/sprites/back/0184-000-Azumarill.png
similarity index 100%
rename from src/afd/sprites/back/0184--000--Azumarill.png
rename to src/afd/sprites/back/0184-000-Azumarill.png
diff --git a/src/afd/sprites/back/0185--000--Sudowoodo.png b/src/afd/sprites/back/0185-000-Sudowoodo.png
similarity index 100%
rename from src/afd/sprites/back/0185--000--Sudowoodo.png
rename to src/afd/sprites/back/0185-000-Sudowoodo.png
diff --git a/src/afd/sprites/back/0186--000--Politoed.png b/src/afd/sprites/back/0186-000-Politoed.png
similarity index 100%
rename from src/afd/sprites/back/0186--000--Politoed.png
rename to src/afd/sprites/back/0186-000-Politoed.png
diff --git a/src/afd/sprites/back/0187--000--Hoppip.png b/src/afd/sprites/back/0187-000-Hoppip.png
similarity index 100%
rename from src/afd/sprites/back/0187--000--Hoppip.png
rename to src/afd/sprites/back/0187-000-Hoppip.png
diff --git a/src/afd/sprites/back/0188--000--Skiploom.png b/src/afd/sprites/back/0188-000-Skiploom.png
similarity index 100%
rename from src/afd/sprites/back/0188--000--Skiploom.png
rename to src/afd/sprites/back/0188-000-Skiploom.png
diff --git a/src/afd/sprites/back/0189--000--Jumpluff.png b/src/afd/sprites/back/0189-000-Jumpluff.png
similarity index 100%
rename from src/afd/sprites/back/0189--000--Jumpluff.png
rename to src/afd/sprites/back/0189-000-Jumpluff.png
diff --git a/src/afd/sprites/back/0190--000--Aipom.png b/src/afd/sprites/back/0190-000-Aipom.png
similarity index 100%
rename from src/afd/sprites/back/0190--000--Aipom.png
rename to src/afd/sprites/back/0190-000-Aipom.png
diff --git a/src/afd/sprites/back/0191--000--Sunkern.png b/src/afd/sprites/back/0191-000-Sunkern.png
similarity index 100%
rename from src/afd/sprites/back/0191--000--Sunkern.png
rename to src/afd/sprites/back/0191-000-Sunkern.png
diff --git a/src/afd/sprites/back/0192--000--Sunflora.png b/src/afd/sprites/back/0192-000-Sunflora.png
similarity index 100%
rename from src/afd/sprites/back/0192--000--Sunflora.png
rename to src/afd/sprites/back/0192-000-Sunflora.png
diff --git a/src/afd/sprites/back/0193--000--Yanma.png b/src/afd/sprites/back/0193-000-Yanma.png
similarity index 100%
rename from src/afd/sprites/back/0193--000--Yanma.png
rename to src/afd/sprites/back/0193-000-Yanma.png
diff --git a/src/afd/sprites/back/0194--000--Wooper.png b/src/afd/sprites/back/0194-000-Wooper.png
similarity index 100%
rename from src/afd/sprites/back/0194--000--Wooper.png
rename to src/afd/sprites/back/0194-000-Wooper.png
diff --git a/src/afd/sprites/back/0195--000--Quagsire.png b/src/afd/sprites/back/0195-000-Quagsire.png
similarity index 100%
rename from src/afd/sprites/back/0195--000--Quagsire.png
rename to src/afd/sprites/back/0195-000-Quagsire.png
diff --git a/src/afd/sprites/back/0196--000--Espeon.png b/src/afd/sprites/back/0196-000-Espeon.png
similarity index 100%
rename from src/afd/sprites/back/0196--000--Espeon.png
rename to src/afd/sprites/back/0196-000-Espeon.png
diff --git a/src/afd/sprites/back/0197--000--Umbreon.png b/src/afd/sprites/back/0197-000-Umbreon.png
similarity index 100%
rename from src/afd/sprites/back/0197--000--Umbreon.png
rename to src/afd/sprites/back/0197-000-Umbreon.png
diff --git a/src/afd/sprites/back/0198--000--Murkrow.png b/src/afd/sprites/back/0198-000-Murkrow.png
similarity index 100%
rename from src/afd/sprites/back/0198--000--Murkrow.png
rename to src/afd/sprites/back/0198-000-Murkrow.png
diff --git a/src/afd/sprites/back/0199--000--Slowking.png b/src/afd/sprites/back/0199-000-Slowking.png
similarity index 100%
rename from src/afd/sprites/back/0199--000--Slowking.png
rename to src/afd/sprites/back/0199-000-Slowking.png
diff --git a/src/afd/sprites/back/0200--000--Misdreavus.png b/src/afd/sprites/back/0200-000-Misdreavus.png
similarity index 100%
rename from src/afd/sprites/back/0200--000--Misdreavus.png
rename to src/afd/sprites/back/0200-000-Misdreavus.png
diff --git a/src/afd/sprites/back/0201--000--Unown.png b/src/afd/sprites/back/0201-000-Unown.png
similarity index 100%
rename from src/afd/sprites/back/0201--000--Unown.png
rename to src/afd/sprites/back/0201-000-Unown.png
diff --git a/src/afd/sprites/back/0202--000--Wobbuffet.png b/src/afd/sprites/back/0202-000-Wobbuffet.png
similarity index 100%
rename from src/afd/sprites/back/0202--000--Wobbuffet.png
rename to src/afd/sprites/back/0202-000-Wobbuffet.png
diff --git a/src/afd/sprites/back/0203--000--Girafarig.png b/src/afd/sprites/back/0203-000-Girafarig.png
similarity index 100%
rename from src/afd/sprites/back/0203--000--Girafarig.png
rename to src/afd/sprites/back/0203-000-Girafarig.png
diff --git a/src/afd/sprites/back/0204--000--Pineco.png b/src/afd/sprites/back/0204-000-Pineco.png
similarity index 100%
rename from src/afd/sprites/back/0204--000--Pineco.png
rename to src/afd/sprites/back/0204-000-Pineco.png
diff --git a/src/afd/sprites/back/0205--000--Forretress.png b/src/afd/sprites/back/0205-000-Forretress.png
similarity index 100%
rename from src/afd/sprites/back/0205--000--Forretress.png
rename to src/afd/sprites/back/0205-000-Forretress.png
diff --git a/src/afd/sprites/back/0206--000--Dunsparce.png b/src/afd/sprites/back/0206-000-Dunsparce.png
similarity index 100%
rename from src/afd/sprites/back/0206--000--Dunsparce.png
rename to src/afd/sprites/back/0206-000-Dunsparce.png
diff --git a/src/afd/sprites/back/0207--000--Gligar.png b/src/afd/sprites/back/0207-000-Gligar.png
similarity index 100%
rename from src/afd/sprites/back/0207--000--Gligar.png
rename to src/afd/sprites/back/0207-000-Gligar.png
diff --git a/src/afd/sprites/back/0208--000--Steelix.png b/src/afd/sprites/back/0208-000-Steelix.png
similarity index 100%
rename from src/afd/sprites/back/0208--000--Steelix.png
rename to src/afd/sprites/back/0208-000-Steelix.png
diff --git a/src/afd/sprites/back/0208--420--Steelix--Mega.png b/src/afd/sprites/back/0208-420-Steelix-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0208--420--Steelix--Mega.png
rename to src/afd/sprites/back/0208-420-Steelix-Mega.png
diff --git a/src/afd/sprites/back/0209--000--Snubbull.png b/src/afd/sprites/back/0209-000-Snubbull.png
similarity index 100%
rename from src/afd/sprites/back/0209--000--Snubbull.png
rename to src/afd/sprites/back/0209-000-Snubbull.png
diff --git a/src/afd/sprites/back/0210--000--Granbull.png b/src/afd/sprites/back/0210-000-Granbull.png
similarity index 100%
rename from src/afd/sprites/back/0210--000--Granbull.png
rename to src/afd/sprites/back/0210-000-Granbull.png
diff --git a/src/afd/sprites/back/0211--000--Qwilfish.png b/src/afd/sprites/back/0211-000-Qwilfish.png
similarity index 100%
rename from src/afd/sprites/back/0211--000--Qwilfish.png
rename to src/afd/sprites/back/0211-000-Qwilfish.png
diff --git a/src/afd/sprites/back/0212--000--Scizor.png b/src/afd/sprites/back/0212-000-Scizor.png
similarity index 100%
rename from src/afd/sprites/back/0212--000--Scizor.png
rename to src/afd/sprites/back/0212-000-Scizor.png
diff --git a/src/afd/sprites/back/0212--420--Scizor--Mega.png b/src/afd/sprites/back/0212-420-Scizor-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0212--420--Scizor--Mega.png
rename to src/afd/sprites/back/0212-420-Scizor-Mega.png
diff --git a/src/afd/sprites/back/0213--000--Shuckle.png b/src/afd/sprites/back/0213-000-Shuckle.png
similarity index 100%
rename from src/afd/sprites/back/0213--000--Shuckle.png
rename to src/afd/sprites/back/0213-000-Shuckle.png
diff --git a/src/afd/sprites/back/0214--000--Heracross.png b/src/afd/sprites/back/0214-000-Heracross.png
similarity index 100%
rename from src/afd/sprites/back/0214--000--Heracross.png
rename to src/afd/sprites/back/0214-000-Heracross.png
diff --git a/src/afd/sprites/back/0214--420--Heracross--Mega.png b/src/afd/sprites/back/0214-420-Heracross-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0214--420--Heracross--Mega.png
rename to src/afd/sprites/back/0214-420-Heracross-Mega.png
diff --git a/src/afd/sprites/back/0215--000--Sneasel.png b/src/afd/sprites/back/0215-000-Sneasel.png
similarity index 100%
rename from src/afd/sprites/back/0215--000--Sneasel.png
rename to src/afd/sprites/back/0215-000-Sneasel.png
diff --git a/src/afd/sprites/back/0216--000--Teddiursa.png b/src/afd/sprites/back/0216-000-Teddiursa.png
similarity index 100%
rename from src/afd/sprites/back/0216--000--Teddiursa.png
rename to src/afd/sprites/back/0216-000-Teddiursa.png
diff --git a/src/afd/sprites/back/0217--000--Ursaring.png b/src/afd/sprites/back/0217-000-Ursaring.png
similarity index 100%
rename from src/afd/sprites/back/0217--000--Ursaring.png
rename to src/afd/sprites/back/0217-000-Ursaring.png
diff --git a/src/afd/sprites/back/0218--000--Slugma.png b/src/afd/sprites/back/0218-000-Slugma.png
similarity index 100%
rename from src/afd/sprites/back/0218--000--Slugma.png
rename to src/afd/sprites/back/0218-000-Slugma.png
diff --git a/src/afd/sprites/back/0219--000--Magcargo.png b/src/afd/sprites/back/0219-000-Magcargo.png
similarity index 100%
rename from src/afd/sprites/back/0219--000--Magcargo.png
rename to src/afd/sprites/back/0219-000-Magcargo.png
diff --git a/src/afd/sprites/back/0220--000--Swinub.png b/src/afd/sprites/back/0220-000-Swinub.png
similarity index 100%
rename from src/afd/sprites/back/0220--000--Swinub.png
rename to src/afd/sprites/back/0220-000-Swinub.png
diff --git a/src/afd/sprites/back/0221--000--Piloswine.png b/src/afd/sprites/back/0221-000-Piloswine.png
similarity index 100%
rename from src/afd/sprites/back/0221--000--Piloswine.png
rename to src/afd/sprites/back/0221-000-Piloswine.png
diff --git a/src/afd/sprites/back/0222--000--Corsola.png b/src/afd/sprites/back/0222-000-Corsola.png
similarity index 100%
rename from src/afd/sprites/back/0222--000--Corsola.png
rename to src/afd/sprites/back/0222-000-Corsola.png
diff --git a/src/afd/sprites/back/0222--420--Corsola--Galar.png b/src/afd/sprites/back/0222-420-Corsola-Galar.png
similarity index 100%
rename from src/afd/sprites/back/0222--420--Corsola--Galar.png
rename to src/afd/sprites/back/0222-420-Corsola-Galar.png
diff --git a/src/afd/sprites/back/0223--000--Remoraid.png b/src/afd/sprites/back/0223-000-Remoraid.png
similarity index 100%
rename from src/afd/sprites/back/0223--000--Remoraid.png
rename to src/afd/sprites/back/0223-000-Remoraid.png
diff --git a/src/afd/sprites/back/0224--000--Octillery.png b/src/afd/sprites/back/0224-000-Octillery.png
similarity index 100%
rename from src/afd/sprites/back/0224--000--Octillery.png
rename to src/afd/sprites/back/0224-000-Octillery.png
diff --git a/src/afd/sprites/back/0225--000--Delibird.png b/src/afd/sprites/back/0225-000-Delibird.png
similarity index 100%
rename from src/afd/sprites/back/0225--000--Delibird.png
rename to src/afd/sprites/back/0225-000-Delibird.png
diff --git a/src/afd/sprites/back/0226--000--Mantine.png b/src/afd/sprites/back/0226-000-Mantine.png
similarity index 100%
rename from src/afd/sprites/back/0226--000--Mantine.png
rename to src/afd/sprites/back/0226-000-Mantine.png
diff --git a/src/afd/sprites/back/0227--000--Skarmory.png b/src/afd/sprites/back/0227-000-Skarmory.png
similarity index 100%
rename from src/afd/sprites/back/0227--000--Skarmory.png
rename to src/afd/sprites/back/0227-000-Skarmory.png
diff --git a/src/afd/sprites/back/0228--000--Houndour.png b/src/afd/sprites/back/0228-000-Houndour.png
similarity index 100%
rename from src/afd/sprites/back/0228--000--Houndour.png
rename to src/afd/sprites/back/0228-000-Houndour.png
diff --git a/src/afd/sprites/back/0229--000--Houndoom.png b/src/afd/sprites/back/0229-000-Houndoom.png
similarity index 100%
rename from src/afd/sprites/back/0229--000--Houndoom.png
rename to src/afd/sprites/back/0229-000-Houndoom.png
diff --git a/src/afd/sprites/back/0229--420--Houndoom--Mega.png b/src/afd/sprites/back/0229-420-Houndoom-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0229--420--Houndoom--Mega.png
rename to src/afd/sprites/back/0229-420-Houndoom-Mega.png
diff --git a/src/afd/sprites/back/0230--000--Kingdra.png b/src/afd/sprites/back/0230-000-Kingdra.png
similarity index 100%
rename from src/afd/sprites/back/0230--000--Kingdra.png
rename to src/afd/sprites/back/0230-000-Kingdra.png
diff --git a/src/afd/sprites/back/0231--000--Phanpy.png b/src/afd/sprites/back/0231-000-Phanpy.png
similarity index 100%
rename from src/afd/sprites/back/0231--000--Phanpy.png
rename to src/afd/sprites/back/0231-000-Phanpy.png
diff --git a/src/afd/sprites/back/0232--000--Donphan.png b/src/afd/sprites/back/0232-000-Donphan.png
similarity index 100%
rename from src/afd/sprites/back/0232--000--Donphan.png
rename to src/afd/sprites/back/0232-000-Donphan.png
diff --git a/src/afd/sprites/back/0233--000--Porygon2.png b/src/afd/sprites/back/0233-000-Porygon2.png
similarity index 100%
rename from src/afd/sprites/back/0233--000--Porygon2.png
rename to src/afd/sprites/back/0233-000-Porygon2.png
diff --git a/src/afd/sprites/back/0234--000--Stantler.png b/src/afd/sprites/back/0234-000-Stantler.png
similarity index 100%
rename from src/afd/sprites/back/0234--000--Stantler.png
rename to src/afd/sprites/back/0234-000-Stantler.png
diff --git a/src/afd/sprites/back/0235--000--Smeargle.png b/src/afd/sprites/back/0235-000-Smeargle.png
similarity index 100%
rename from src/afd/sprites/back/0235--000--Smeargle.png
rename to src/afd/sprites/back/0235-000-Smeargle.png
diff --git a/src/afd/sprites/back/0236--000--Tyrogue.png b/src/afd/sprites/back/0236-000-Tyrogue.png
similarity index 100%
rename from src/afd/sprites/back/0236--000--Tyrogue.png
rename to src/afd/sprites/back/0236-000-Tyrogue.png
diff --git a/src/afd/sprites/back/0237--000--Hitmontop.png b/src/afd/sprites/back/0237-000-Hitmontop.png
similarity index 100%
rename from src/afd/sprites/back/0237--000--Hitmontop.png
rename to src/afd/sprites/back/0237-000-Hitmontop.png
diff --git a/src/afd/sprites/back/0238--000--Smoochum.png b/src/afd/sprites/back/0238-000-Smoochum.png
similarity index 100%
rename from src/afd/sprites/back/0238--000--Smoochum.png
rename to src/afd/sprites/back/0238-000-Smoochum.png
diff --git a/src/afd/sprites/back/0239--000--Elekid.png b/src/afd/sprites/back/0239-000-Elekid.png
similarity index 100%
rename from src/afd/sprites/back/0239--000--Elekid.png
rename to src/afd/sprites/back/0239-000-Elekid.png
diff --git a/src/afd/sprites/back/0240--000--Magby.png b/src/afd/sprites/back/0240-000-Magby.png
similarity index 100%
rename from src/afd/sprites/back/0240--000--Magby.png
rename to src/afd/sprites/back/0240-000-Magby.png
diff --git a/src/afd/sprites/back/0241--000--Miltank.png b/src/afd/sprites/back/0241-000-Miltank.png
similarity index 100%
rename from src/afd/sprites/back/0241--000--Miltank.png
rename to src/afd/sprites/back/0241-000-Miltank.png
diff --git a/src/afd/sprites/back/0242--000--Blissey.png b/src/afd/sprites/back/0242-000-Blissey.png
similarity index 100%
rename from src/afd/sprites/back/0242--000--Blissey.png
rename to src/afd/sprites/back/0242-000-Blissey.png
diff --git a/src/afd/sprites/back/0243--000--Raikou.png b/src/afd/sprites/back/0243-000-Raikou.png
similarity index 100%
rename from src/afd/sprites/back/0243--000--Raikou.png
rename to src/afd/sprites/back/0243-000-Raikou.png
diff --git a/src/afd/sprites/back/0244--000--Entei.png b/src/afd/sprites/back/0244-000-Entei.png
similarity index 100%
rename from src/afd/sprites/back/0244--000--Entei.png
rename to src/afd/sprites/back/0244-000-Entei.png
diff --git a/src/afd/sprites/back/0245--000--Suicune.png b/src/afd/sprites/back/0245-000-Suicune.png
similarity index 100%
rename from src/afd/sprites/back/0245--000--Suicune.png
rename to src/afd/sprites/back/0245-000-Suicune.png
diff --git a/src/afd/sprites/back/0246--000--Larvitar.png b/src/afd/sprites/back/0246-000-Larvitar.png
similarity index 100%
rename from src/afd/sprites/back/0246--000--Larvitar.png
rename to src/afd/sprites/back/0246-000-Larvitar.png
diff --git a/src/afd/sprites/back/0247--000--Pupitar.png b/src/afd/sprites/back/0247-000-Pupitar.png
similarity index 100%
rename from src/afd/sprites/back/0247--000--Pupitar.png
rename to src/afd/sprites/back/0247-000-Pupitar.png
diff --git a/src/afd/sprites/back/0248--000--Tyranitar.png b/src/afd/sprites/back/0248-000-Tyranitar.png
similarity index 100%
rename from src/afd/sprites/back/0248--000--Tyranitar.png
rename to src/afd/sprites/back/0248-000-Tyranitar.png
diff --git a/src/afd/sprites/back/0248--420--Tyranitar--Mega.png b/src/afd/sprites/back/0248-420-Tyranitar-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0248--420--Tyranitar--Mega.png
rename to src/afd/sprites/back/0248-420-Tyranitar-Mega.png
diff --git a/src/afd/sprites/back/0249--000--Lugia.png b/src/afd/sprites/back/0249-000-Lugia.png
similarity index 100%
rename from src/afd/sprites/back/0249--000--Lugia.png
rename to src/afd/sprites/back/0249-000-Lugia.png
diff --git a/src/afd/sprites/back/0250--000--Ho-Oh.png b/src/afd/sprites/back/0250-000-Ho~Oh.png
similarity index 100%
rename from src/afd/sprites/back/0250--000--Ho-Oh.png
rename to src/afd/sprites/back/0250-000-Ho~Oh.png
diff --git a/src/afd/sprites/back/0251--000--Celebi.gif b/src/afd/sprites/back/0251-000-Celebi.gif
similarity index 100%
rename from src/afd/sprites/back/0251--000--Celebi.gif
rename to src/afd/sprites/back/0251-000-Celebi.gif
diff --git a/src/afd/sprites/back/0252--000--Treecko.png b/src/afd/sprites/back/0252-000-Treecko.png
similarity index 100%
rename from src/afd/sprites/back/0252--000--Treecko.png
rename to src/afd/sprites/back/0252-000-Treecko.png
diff --git a/src/afd/sprites/back/0253--000--Grovyle.png b/src/afd/sprites/back/0253-000-Grovyle.png
similarity index 100%
rename from src/afd/sprites/back/0253--000--Grovyle.png
rename to src/afd/sprites/back/0253-000-Grovyle.png
diff --git a/src/afd/sprites/back/0254--000--Sceptile.png b/src/afd/sprites/back/0254-000-Sceptile.png
similarity index 100%
rename from src/afd/sprites/back/0254--000--Sceptile.png
rename to src/afd/sprites/back/0254-000-Sceptile.png
diff --git a/src/afd/sprites/back/0254--420--Sceptile--Mega.png b/src/afd/sprites/back/0254-420-Sceptile-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0254--420--Sceptile--Mega.png
rename to src/afd/sprites/back/0254-420-Sceptile-Mega.png
diff --git a/src/afd/sprites/back/0255--000--Torchic.png b/src/afd/sprites/back/0255-000-Torchic.png
similarity index 100%
rename from src/afd/sprites/back/0255--000--Torchic.png
rename to src/afd/sprites/back/0255-000-Torchic.png
diff --git a/src/afd/sprites/back/0256--000--Combusken.png b/src/afd/sprites/back/0256-000-Combusken.png
similarity index 100%
rename from src/afd/sprites/back/0256--000--Combusken.png
rename to src/afd/sprites/back/0256-000-Combusken.png
diff --git a/src/afd/sprites/back/0257--000--Blaziken.png b/src/afd/sprites/back/0257-000-Blaziken.png
similarity index 100%
rename from src/afd/sprites/back/0257--000--Blaziken.png
rename to src/afd/sprites/back/0257-000-Blaziken.png
diff --git a/src/afd/sprites/back/0257--420--Blaziken--Mega.png b/src/afd/sprites/back/0257-420-Blaziken-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0257--420--Blaziken--Mega.png
rename to src/afd/sprites/back/0257-420-Blaziken-Mega.png
diff --git a/src/afd/sprites/back/0258--000--Mudkip.png b/src/afd/sprites/back/0258-000-Mudkip.png
similarity index 100%
rename from src/afd/sprites/back/0258--000--Mudkip.png
rename to src/afd/sprites/back/0258-000-Mudkip.png
diff --git a/src/afd/sprites/back/0259--000--Marshtomp.png b/src/afd/sprites/back/0259-000-Marshtomp.png
similarity index 100%
rename from src/afd/sprites/back/0259--000--Marshtomp.png
rename to src/afd/sprites/back/0259-000-Marshtomp.png
diff --git a/src/afd/sprites/back/0260--000--Swampert.png b/src/afd/sprites/back/0260-000-Swampert.png
similarity index 100%
rename from src/afd/sprites/back/0260--000--Swampert.png
rename to src/afd/sprites/back/0260-000-Swampert.png
diff --git a/src/afd/sprites/back/0260--420--Swampert--Mega.png b/src/afd/sprites/back/0260-420-Swampert-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0260--420--Swampert--Mega.png
rename to src/afd/sprites/back/0260-420-Swampert-Mega.png
diff --git a/src/afd/sprites/back/0261--000--Poochyena.png b/src/afd/sprites/back/0261-000-Poochyena.png
similarity index 100%
rename from src/afd/sprites/back/0261--000--Poochyena.png
rename to src/afd/sprites/back/0261-000-Poochyena.png
diff --git a/src/afd/sprites/back/0262--000--Mightyena.png b/src/afd/sprites/back/0262-000-Mightyena.png
similarity index 100%
rename from src/afd/sprites/back/0262--000--Mightyena.png
rename to src/afd/sprites/back/0262-000-Mightyena.png
diff --git a/src/afd/sprites/back/0263--000--Zigzagoon.png b/src/afd/sprites/back/0263-000-Zigzagoon.png
similarity index 100%
rename from src/afd/sprites/back/0263--000--Zigzagoon.png
rename to src/afd/sprites/back/0263-000-Zigzagoon.png
diff --git a/src/afd/sprites/back/0263--420--Zigzagoon--Galar.png b/src/afd/sprites/back/0263-420-Zigzagoon-Galar.png
similarity index 100%
rename from src/afd/sprites/back/0263--420--Zigzagoon--Galar.png
rename to src/afd/sprites/back/0263-420-Zigzagoon-Galar.png
diff --git a/src/afd/sprites/back/0264--000--Linoone.png b/src/afd/sprites/back/0264-000-Linoone.png
similarity index 100%
rename from src/afd/sprites/back/0264--000--Linoone.png
rename to src/afd/sprites/back/0264-000-Linoone.png
diff --git a/src/afd/sprites/back/0264--420--Linoone--Galar.png b/src/afd/sprites/back/0264-420-Linoone-Galar.png
similarity index 100%
rename from src/afd/sprites/back/0264--420--Linoone--Galar.png
rename to src/afd/sprites/back/0264-420-Linoone-Galar.png
diff --git a/src/afd/sprites/back/0265--000--Wurmple.png b/src/afd/sprites/back/0265-000-Wurmple.png
similarity index 100%
rename from src/afd/sprites/back/0265--000--Wurmple.png
rename to src/afd/sprites/back/0265-000-Wurmple.png
diff --git a/src/afd/sprites/back/0266--000--Silcoon.png b/src/afd/sprites/back/0266-000-Silcoon.png
similarity index 100%
rename from src/afd/sprites/back/0266--000--Silcoon.png
rename to src/afd/sprites/back/0266-000-Silcoon.png
diff --git a/src/afd/sprites/back/0267--000--Beautifly.png b/src/afd/sprites/back/0267-000-Beautifly.png
similarity index 100%
rename from src/afd/sprites/back/0267--000--Beautifly.png
rename to src/afd/sprites/back/0267-000-Beautifly.png
diff --git a/src/afd/sprites/back/0268--000--Cascoon.png b/src/afd/sprites/back/0268-000-Cascoon.png
similarity index 100%
rename from src/afd/sprites/back/0268--000--Cascoon.png
rename to src/afd/sprites/back/0268-000-Cascoon.png
diff --git a/src/afd/sprites/back/0269--000--Dustox.png b/src/afd/sprites/back/0269-000-Dustox.png
similarity index 100%
rename from src/afd/sprites/back/0269--000--Dustox.png
rename to src/afd/sprites/back/0269-000-Dustox.png
diff --git a/src/afd/sprites/back/0270--000--Lotad.png b/src/afd/sprites/back/0270-000-Lotad.png
similarity index 100%
rename from src/afd/sprites/back/0270--000--Lotad.png
rename to src/afd/sprites/back/0270-000-Lotad.png
diff --git a/src/afd/sprites/back/0271--000--Lombre.png b/src/afd/sprites/back/0271-000-Lombre.png
similarity index 100%
rename from src/afd/sprites/back/0271--000--Lombre.png
rename to src/afd/sprites/back/0271-000-Lombre.png
diff --git a/src/afd/sprites/back/0272--000--Ludicolo.png b/src/afd/sprites/back/0272-000-Ludicolo.png
similarity index 100%
rename from src/afd/sprites/back/0272--000--Ludicolo.png
rename to src/afd/sprites/back/0272-000-Ludicolo.png
diff --git a/src/afd/sprites/back/0273--000--Seedot.png b/src/afd/sprites/back/0273-000-Seedot.png
similarity index 100%
rename from src/afd/sprites/back/0273--000--Seedot.png
rename to src/afd/sprites/back/0273-000-Seedot.png
diff --git a/src/afd/sprites/back/0274--000--Nuzleaf.png b/src/afd/sprites/back/0274-000-Nuzleaf.png
similarity index 100%
rename from src/afd/sprites/back/0274--000--Nuzleaf.png
rename to src/afd/sprites/back/0274-000-Nuzleaf.png
diff --git a/src/afd/sprites/back/0275--000--Shiftry.png b/src/afd/sprites/back/0275-000-Shiftry.png
similarity index 100%
rename from src/afd/sprites/back/0275--000--Shiftry.png
rename to src/afd/sprites/back/0275-000-Shiftry.png
diff --git a/src/afd/sprites/back/0276--000--Taillow.png b/src/afd/sprites/back/0276-000-Taillow.png
similarity index 100%
rename from src/afd/sprites/back/0276--000--Taillow.png
rename to src/afd/sprites/back/0276-000-Taillow.png
diff --git a/src/afd/sprites/back/0277--000--Swellow.png b/src/afd/sprites/back/0277-000-Swellow.png
similarity index 100%
rename from src/afd/sprites/back/0277--000--Swellow.png
rename to src/afd/sprites/back/0277-000-Swellow.png
diff --git a/src/afd/sprites/back/0278--000--Wingull.png b/src/afd/sprites/back/0278-000-Wingull.png
similarity index 100%
rename from src/afd/sprites/back/0278--000--Wingull.png
rename to src/afd/sprites/back/0278-000-Wingull.png
diff --git a/src/afd/sprites/back/0279--000--Pelipper.png b/src/afd/sprites/back/0279-000-Pelipper.png
similarity index 100%
rename from src/afd/sprites/back/0279--000--Pelipper.png
rename to src/afd/sprites/back/0279-000-Pelipper.png
diff --git a/src/afd/sprites/back/0280--000--Ralts.png b/src/afd/sprites/back/0280-000-Ralts.png
similarity index 100%
rename from src/afd/sprites/back/0280--000--Ralts.png
rename to src/afd/sprites/back/0280-000-Ralts.png
diff --git a/src/afd/sprites/back/0281--000--Kirlia.png b/src/afd/sprites/back/0281-000-Kirlia.png
similarity index 100%
rename from src/afd/sprites/back/0281--000--Kirlia.png
rename to src/afd/sprites/back/0281-000-Kirlia.png
diff --git a/src/afd/sprites/back/0282--000--Gardevoir.png b/src/afd/sprites/back/0282-000-Gardevoir.png
similarity index 100%
rename from src/afd/sprites/back/0282--000--Gardevoir.png
rename to src/afd/sprites/back/0282-000-Gardevoir.png
diff --git a/src/afd/sprites/back/0282--420--Gardevoir--Mega.png b/src/afd/sprites/back/0282-420-Gardevoir-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0282--420--Gardevoir--Mega.png
rename to src/afd/sprites/back/0282-420-Gardevoir-Mega.png
diff --git a/src/afd/sprites/back/0283--000--Surskit.png b/src/afd/sprites/back/0283-000-Surskit.png
similarity index 100%
rename from src/afd/sprites/back/0283--000--Surskit.png
rename to src/afd/sprites/back/0283-000-Surskit.png
diff --git a/src/afd/sprites/back/0284--000--Masquerain.png b/src/afd/sprites/back/0284-000-Masquerain.png
similarity index 100%
rename from src/afd/sprites/back/0284--000--Masquerain.png
rename to src/afd/sprites/back/0284-000-Masquerain.png
diff --git a/src/afd/sprites/back/0285--000--Shroomish.png b/src/afd/sprites/back/0285-000-Shroomish.png
similarity index 100%
rename from src/afd/sprites/back/0285--000--Shroomish.png
rename to src/afd/sprites/back/0285-000-Shroomish.png
diff --git a/src/afd/sprites/back/0286--000--Breloom.png b/src/afd/sprites/back/0286-000-Breloom.png
similarity index 100%
rename from src/afd/sprites/back/0286--000--Breloom.png
rename to src/afd/sprites/back/0286-000-Breloom.png
diff --git a/src/afd/sprites/back/0287--000--Slakoth.png b/src/afd/sprites/back/0287-000-Slakoth.png
similarity index 100%
rename from src/afd/sprites/back/0287--000--Slakoth.png
rename to src/afd/sprites/back/0287-000-Slakoth.png
diff --git a/src/afd/sprites/back/0288--000--Vigoroth.png b/src/afd/sprites/back/0288-000-Vigoroth.png
similarity index 100%
rename from src/afd/sprites/back/0288--000--Vigoroth.png
rename to src/afd/sprites/back/0288-000-Vigoroth.png
diff --git a/src/afd/sprites/back/0289--000--Slaking.png b/src/afd/sprites/back/0289-000-Slaking.png
similarity index 100%
rename from src/afd/sprites/back/0289--000--Slaking.png
rename to src/afd/sprites/back/0289-000-Slaking.png
diff --git a/src/afd/sprites/back/0290--000--Nincada.png b/src/afd/sprites/back/0290-000-Nincada.png
similarity index 100%
rename from src/afd/sprites/back/0290--000--Nincada.png
rename to src/afd/sprites/back/0290-000-Nincada.png
diff --git a/src/afd/sprites/back/0291--000--Ninjask.png b/src/afd/sprites/back/0291-000-Ninjask.png
similarity index 100%
rename from src/afd/sprites/back/0291--000--Ninjask.png
rename to src/afd/sprites/back/0291-000-Ninjask.png
diff --git a/src/afd/sprites/back/0292--000--Shedinja.png b/src/afd/sprites/back/0292-000-Shedinja.png
similarity index 100%
rename from src/afd/sprites/back/0292--000--Shedinja.png
rename to src/afd/sprites/back/0292-000-Shedinja.png
diff --git a/src/afd/sprites/back/0293--000--Whismur.png b/src/afd/sprites/back/0293-000-Whismur.png
similarity index 100%
rename from src/afd/sprites/back/0293--000--Whismur.png
rename to src/afd/sprites/back/0293-000-Whismur.png
diff --git a/src/afd/sprites/back/0294--000--Loudred.png b/src/afd/sprites/back/0294-000-Loudred.png
similarity index 100%
rename from src/afd/sprites/back/0294--000--Loudred.png
rename to src/afd/sprites/back/0294-000-Loudred.png
diff --git a/src/afd/sprites/back/0295--000--Exploud.png b/src/afd/sprites/back/0295-000-Exploud.png
similarity index 100%
rename from src/afd/sprites/back/0295--000--Exploud.png
rename to src/afd/sprites/back/0295-000-Exploud.png
diff --git a/src/afd/sprites/back/0296--000--Makuhita.png b/src/afd/sprites/back/0296-000-Makuhita.png
similarity index 100%
rename from src/afd/sprites/back/0296--000--Makuhita.png
rename to src/afd/sprites/back/0296-000-Makuhita.png
diff --git a/src/afd/sprites/back/0297--000--Hariyama.png b/src/afd/sprites/back/0297-000-Hariyama.png
similarity index 100%
rename from src/afd/sprites/back/0297--000--Hariyama.png
rename to src/afd/sprites/back/0297-000-Hariyama.png
diff --git a/src/afd/sprites/back/0298--000--Azurill.png b/src/afd/sprites/back/0298-000-Azurill.png
similarity index 100%
rename from src/afd/sprites/back/0298--000--Azurill.png
rename to src/afd/sprites/back/0298-000-Azurill.png
diff --git a/src/afd/sprites/back/0299--000--Nosepass.png b/src/afd/sprites/back/0299-000-Nosepass.png
similarity index 100%
rename from src/afd/sprites/back/0299--000--Nosepass.png
rename to src/afd/sprites/back/0299-000-Nosepass.png
diff --git a/src/afd/sprites/back/0300--000--Skitty.png b/src/afd/sprites/back/0300-000-Skitty.png
similarity index 100%
rename from src/afd/sprites/back/0300--000--Skitty.png
rename to src/afd/sprites/back/0300-000-Skitty.png
diff --git a/src/afd/sprites/back/0301--000--Delcatty.png b/src/afd/sprites/back/0301-000-Delcatty.png
similarity index 100%
rename from src/afd/sprites/back/0301--000--Delcatty.png
rename to src/afd/sprites/back/0301-000-Delcatty.png
diff --git a/src/afd/sprites/back/0302--000--Sableye.png b/src/afd/sprites/back/0302-000-Sableye.png
similarity index 100%
rename from src/afd/sprites/back/0302--000--Sableye.png
rename to src/afd/sprites/back/0302-000-Sableye.png
diff --git a/src/afd/sprites/back/0302--420--Sableye--Mega.png b/src/afd/sprites/back/0302-420-Sableye-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0302--420--Sableye--Mega.png
rename to src/afd/sprites/back/0302-420-Sableye-Mega.png
diff --git a/src/afd/sprites/back/0303--000--Mawile.png b/src/afd/sprites/back/0303-000-Mawile.png
similarity index 100%
rename from src/afd/sprites/back/0303--000--Mawile.png
rename to src/afd/sprites/back/0303-000-Mawile.png
diff --git a/src/afd/sprites/back/0303--420--Mawile--Mega.png b/src/afd/sprites/back/0303-420-Mawile-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0303--420--Mawile--Mega.png
rename to src/afd/sprites/back/0303-420-Mawile-Mega.png
diff --git a/src/afd/sprites/back/0304--000--Aron.png b/src/afd/sprites/back/0304-000-Aron.png
similarity index 100%
rename from src/afd/sprites/back/0304--000--Aron.png
rename to src/afd/sprites/back/0304-000-Aron.png
diff --git a/src/afd/sprites/back/0305--000--Lairon.png b/src/afd/sprites/back/0305-000-Lairon.png
similarity index 100%
rename from src/afd/sprites/back/0305--000--Lairon.png
rename to src/afd/sprites/back/0305-000-Lairon.png
diff --git a/src/afd/sprites/back/0306--000--Aggron.png b/src/afd/sprites/back/0306-000-Aggron.png
similarity index 100%
rename from src/afd/sprites/back/0306--000--Aggron.png
rename to src/afd/sprites/back/0306-000-Aggron.png
diff --git a/src/afd/sprites/back/0306--420--Aggron--Mega.png b/src/afd/sprites/back/0306-420-Aggron-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0306--420--Aggron--Mega.png
rename to src/afd/sprites/back/0306-420-Aggron-Mega.png
diff --git a/src/afd/sprites/back/0307--000--Meditite.png b/src/afd/sprites/back/0307-000-Meditite.png
similarity index 100%
rename from src/afd/sprites/back/0307--000--Meditite.png
rename to src/afd/sprites/back/0307-000-Meditite.png
diff --git a/src/afd/sprites/back/0308--000--Medicham.png b/src/afd/sprites/back/0308-000-Medicham.png
similarity index 100%
rename from src/afd/sprites/back/0308--000--Medicham.png
rename to src/afd/sprites/back/0308-000-Medicham.png
diff --git a/src/afd/sprites/back/0308--420--Medicham--Mega.png b/src/afd/sprites/back/0308-420-Medicham-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0308--420--Medicham--Mega.png
rename to src/afd/sprites/back/0308-420-Medicham-Mega.png
diff --git a/src/afd/sprites/back/0309--000--Electrike.png b/src/afd/sprites/back/0309-000-Electrike.png
similarity index 100%
rename from src/afd/sprites/back/0309--000--Electrike.png
rename to src/afd/sprites/back/0309-000-Electrike.png
diff --git a/src/afd/sprites/back/0310--000--Manectric.png b/src/afd/sprites/back/0310-000-Manectric.png
similarity index 100%
rename from src/afd/sprites/back/0310--000--Manectric.png
rename to src/afd/sprites/back/0310-000-Manectric.png
diff --git a/src/afd/sprites/back/0310--420--Manectric--Mega.png b/src/afd/sprites/back/0310-420-Manectric-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0310--420--Manectric--Mega.png
rename to src/afd/sprites/back/0310-420-Manectric-Mega.png
diff --git a/src/afd/sprites/back/0311--000--Plusle.png b/src/afd/sprites/back/0311-000-Plusle.png
similarity index 100%
rename from src/afd/sprites/back/0311--000--Plusle.png
rename to src/afd/sprites/back/0311-000-Plusle.png
diff --git a/src/afd/sprites/back/0312--000--Minun.png b/src/afd/sprites/back/0312-000-Minun.png
similarity index 100%
rename from src/afd/sprites/back/0312--000--Minun.png
rename to src/afd/sprites/back/0312-000-Minun.png
diff --git a/src/afd/sprites/back/0313--000--Volbeat.png b/src/afd/sprites/back/0313-000-Volbeat.png
similarity index 100%
rename from src/afd/sprites/back/0313--000--Volbeat.png
rename to src/afd/sprites/back/0313-000-Volbeat.png
diff --git a/src/afd/sprites/back/0314--000--Illumise.png b/src/afd/sprites/back/0314-000-Illumise.png
similarity index 100%
rename from src/afd/sprites/back/0314--000--Illumise.png
rename to src/afd/sprites/back/0314-000-Illumise.png
diff --git a/src/afd/sprites/back/0315--000--Roselia.png b/src/afd/sprites/back/0315-000-Roselia.png
similarity index 100%
rename from src/afd/sprites/back/0315--000--Roselia.png
rename to src/afd/sprites/back/0315-000-Roselia.png
diff --git a/src/afd/sprites/back/0316--000--Gulpin.png b/src/afd/sprites/back/0316-000-Gulpin.png
similarity index 100%
rename from src/afd/sprites/back/0316--000--Gulpin.png
rename to src/afd/sprites/back/0316-000-Gulpin.png
diff --git a/src/afd/sprites/back/0317--000--Swalot.png b/src/afd/sprites/back/0317-000-Swalot.png
similarity index 100%
rename from src/afd/sprites/back/0317--000--Swalot.png
rename to src/afd/sprites/back/0317-000-Swalot.png
diff --git a/src/afd/sprites/back/0318--000--Carvanha.png b/src/afd/sprites/back/0318-000-Carvanha.png
similarity index 100%
rename from src/afd/sprites/back/0318--000--Carvanha.png
rename to src/afd/sprites/back/0318-000-Carvanha.png
diff --git a/src/afd/sprites/back/0319--000--Sharpedo.png b/src/afd/sprites/back/0319-000-Sharpedo.png
similarity index 100%
rename from src/afd/sprites/back/0319--000--Sharpedo.png
rename to src/afd/sprites/back/0319-000-Sharpedo.png
diff --git a/src/afd/sprites/back/0319--420--Sharpedo--Mega.png b/src/afd/sprites/back/0319-420-Sharpedo-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0319--420--Sharpedo--Mega.png
rename to src/afd/sprites/back/0319-420-Sharpedo-Mega.png
diff --git a/src/afd/sprites/back/0320--000--Wailmer.png b/src/afd/sprites/back/0320-000-Wailmer.png
similarity index 100%
rename from src/afd/sprites/back/0320--000--Wailmer.png
rename to src/afd/sprites/back/0320-000-Wailmer.png
diff --git a/src/afd/sprites/back/0321--000--Wailord.png b/src/afd/sprites/back/0321-000-Wailord.png
similarity index 100%
rename from src/afd/sprites/back/0321--000--Wailord.png
rename to src/afd/sprites/back/0321-000-Wailord.png
diff --git a/src/afd/sprites/back/0322--000--Numel.png b/src/afd/sprites/back/0322-000-Numel.png
similarity index 100%
rename from src/afd/sprites/back/0322--000--Numel.png
rename to src/afd/sprites/back/0322-000-Numel.png
diff --git a/src/afd/sprites/back/0323--000--Camerupt.png b/src/afd/sprites/back/0323-000-Camerupt.png
similarity index 100%
rename from src/afd/sprites/back/0323--000--Camerupt.png
rename to src/afd/sprites/back/0323-000-Camerupt.png
diff --git a/src/afd/sprites/back/0323--420--Camerupt--Mega.png b/src/afd/sprites/back/0323-420-Camerupt-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0323--420--Camerupt--Mega.png
rename to src/afd/sprites/back/0323-420-Camerupt-Mega.png
diff --git a/src/afd/sprites/back/0324--000--Torkoal.png b/src/afd/sprites/back/0324-000-Torkoal.png
similarity index 100%
rename from src/afd/sprites/back/0324--000--Torkoal.png
rename to src/afd/sprites/back/0324-000-Torkoal.png
diff --git a/src/afd/sprites/back/0325--000--Spoink.png b/src/afd/sprites/back/0325-000-Spoink.png
similarity index 100%
rename from src/afd/sprites/back/0325--000--Spoink.png
rename to src/afd/sprites/back/0325-000-Spoink.png
diff --git a/src/afd/sprites/back/0326--000--Grumpig.png b/src/afd/sprites/back/0326-000-Grumpig.png
similarity index 100%
rename from src/afd/sprites/back/0326--000--Grumpig.png
rename to src/afd/sprites/back/0326-000-Grumpig.png
diff --git a/src/afd/sprites/back/0327--000--Spinda.png b/src/afd/sprites/back/0327-000-Spinda.png
similarity index 100%
rename from src/afd/sprites/back/0327--000--Spinda.png
rename to src/afd/sprites/back/0327-000-Spinda.png
diff --git a/src/afd/sprites/back/0328--000--Trapinch.png b/src/afd/sprites/back/0328-000-Trapinch.png
similarity index 100%
rename from src/afd/sprites/back/0328--000--Trapinch.png
rename to src/afd/sprites/back/0328-000-Trapinch.png
diff --git a/src/afd/sprites/back/0329--000--Vibrava.png b/src/afd/sprites/back/0329-000-Vibrava.png
similarity index 100%
rename from src/afd/sprites/back/0329--000--Vibrava.png
rename to src/afd/sprites/back/0329-000-Vibrava.png
diff --git a/src/afd/sprites/back/0330--000--Flygon.png b/src/afd/sprites/back/0330-000-Flygon.png
similarity index 100%
rename from src/afd/sprites/back/0330--000--Flygon.png
rename to src/afd/sprites/back/0330-000-Flygon.png
diff --git a/src/afd/sprites/back/0331--000--Cacnea.png b/src/afd/sprites/back/0331-000-Cacnea.png
similarity index 100%
rename from src/afd/sprites/back/0331--000--Cacnea.png
rename to src/afd/sprites/back/0331-000-Cacnea.png
diff --git a/src/afd/sprites/back/0332--000--Cacturne.png b/src/afd/sprites/back/0332-000-Cacturne.png
similarity index 100%
rename from src/afd/sprites/back/0332--000--Cacturne.png
rename to src/afd/sprites/back/0332-000-Cacturne.png
diff --git a/src/afd/sprites/back/0333--000--Swablu.png b/src/afd/sprites/back/0333-000-Swablu.png
similarity index 100%
rename from src/afd/sprites/back/0333--000--Swablu.png
rename to src/afd/sprites/back/0333-000-Swablu.png
diff --git a/src/afd/sprites/back/0334--000--Altaria.png b/src/afd/sprites/back/0334-000-Altaria.png
similarity index 100%
rename from src/afd/sprites/back/0334--000--Altaria.png
rename to src/afd/sprites/back/0334-000-Altaria.png
diff --git a/src/afd/sprites/back/0334--420--Altaria--Mega.png b/src/afd/sprites/back/0334-420-Altaria-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0334--420--Altaria--Mega.png
rename to src/afd/sprites/back/0334-420-Altaria-Mega.png
diff --git a/src/afd/sprites/back/0335--000--Zangoose.png b/src/afd/sprites/back/0335-000-Zangoose.png
similarity index 100%
rename from src/afd/sprites/back/0335--000--Zangoose.png
rename to src/afd/sprites/back/0335-000-Zangoose.png
diff --git a/src/afd/sprites/back/0336--000--Seviper.png b/src/afd/sprites/back/0336-000-Seviper.png
similarity index 100%
rename from src/afd/sprites/back/0336--000--Seviper.png
rename to src/afd/sprites/back/0336-000-Seviper.png
diff --git a/src/afd/sprites/back/0337--000--Lunatone.png b/src/afd/sprites/back/0337-000-Lunatone.png
similarity index 100%
rename from src/afd/sprites/back/0337--000--Lunatone.png
rename to src/afd/sprites/back/0337-000-Lunatone.png
diff --git a/src/afd/sprites/back/0338--000--Solrock.png b/src/afd/sprites/back/0338-000-Solrock.png
similarity index 100%
rename from src/afd/sprites/back/0338--000--Solrock.png
rename to src/afd/sprites/back/0338-000-Solrock.png
diff --git a/src/afd/sprites/back/0339--000--Barboach.png b/src/afd/sprites/back/0339-000-Barboach.png
similarity index 100%
rename from src/afd/sprites/back/0339--000--Barboach.png
rename to src/afd/sprites/back/0339-000-Barboach.png
diff --git a/src/afd/sprites/back/0340--000--Whiscash.png b/src/afd/sprites/back/0340-000-Whiscash.png
similarity index 100%
rename from src/afd/sprites/back/0340--000--Whiscash.png
rename to src/afd/sprites/back/0340-000-Whiscash.png
diff --git a/src/afd/sprites/back/0341--000--Corphish.png b/src/afd/sprites/back/0341-000-Corphish.png
similarity index 100%
rename from src/afd/sprites/back/0341--000--Corphish.png
rename to src/afd/sprites/back/0341-000-Corphish.png
diff --git a/src/afd/sprites/back/0342--000--Crawdaunt.png b/src/afd/sprites/back/0342-000-Crawdaunt.png
similarity index 100%
rename from src/afd/sprites/back/0342--000--Crawdaunt.png
rename to src/afd/sprites/back/0342-000-Crawdaunt.png
diff --git a/src/afd/sprites/back/0343--000--Baltoy.png b/src/afd/sprites/back/0343-000-Baltoy.png
similarity index 100%
rename from src/afd/sprites/back/0343--000--Baltoy.png
rename to src/afd/sprites/back/0343-000-Baltoy.png
diff --git a/src/afd/sprites/back/0344--000--Claydol.png b/src/afd/sprites/back/0344-000-Claydol.png
similarity index 100%
rename from src/afd/sprites/back/0344--000--Claydol.png
rename to src/afd/sprites/back/0344-000-Claydol.png
diff --git a/src/afd/sprites/back/0345--000--Lileep.png b/src/afd/sprites/back/0345-000-Lileep.png
similarity index 100%
rename from src/afd/sprites/back/0345--000--Lileep.png
rename to src/afd/sprites/back/0345-000-Lileep.png
diff --git a/src/afd/sprites/back/0346--000--Cradily.png b/src/afd/sprites/back/0346-000-Cradily.png
similarity index 100%
rename from src/afd/sprites/back/0346--000--Cradily.png
rename to src/afd/sprites/back/0346-000-Cradily.png
diff --git a/src/afd/sprites/back/0347--000--Anorith.png b/src/afd/sprites/back/0347-000-Anorith.png
similarity index 100%
rename from src/afd/sprites/back/0347--000--Anorith.png
rename to src/afd/sprites/back/0347-000-Anorith.png
diff --git a/src/afd/sprites/back/0348--000--Armaldo.png b/src/afd/sprites/back/0348-000-Armaldo.png
similarity index 100%
rename from src/afd/sprites/back/0348--000--Armaldo.png
rename to src/afd/sprites/back/0348-000-Armaldo.png
diff --git a/src/afd/sprites/back/0349--000--Feebas.png b/src/afd/sprites/back/0349-000-Feebas.png
similarity index 100%
rename from src/afd/sprites/back/0349--000--Feebas.png
rename to src/afd/sprites/back/0349-000-Feebas.png
diff --git a/src/afd/sprites/back/0350--000--Milotic.png b/src/afd/sprites/back/0350-000-Milotic.png
similarity index 100%
rename from src/afd/sprites/back/0350--000--Milotic.png
rename to src/afd/sprites/back/0350-000-Milotic.png
diff --git a/src/afd/sprites/back/0351--000--Castform.png b/src/afd/sprites/back/0351-000-Castform.png
similarity index 100%
rename from src/afd/sprites/back/0351--000--Castform.png
rename to src/afd/sprites/back/0351-000-Castform.png
diff --git a/src/afd/sprites/back/0351--420--Castform--Rainy.png b/src/afd/sprites/back/0351-420-Castform-Rainy.png
similarity index 100%
rename from src/afd/sprites/back/0351--420--Castform--Rainy.png
rename to src/afd/sprites/back/0351-420-Castform-Rainy.png
diff --git a/src/afd/sprites/back/0351--420--Castform--Snowy.png b/src/afd/sprites/back/0351-420-Castform-Snowy.png
similarity index 100%
rename from src/afd/sprites/back/0351--420--Castform--Snowy.png
rename to src/afd/sprites/back/0351-420-Castform-Snowy.png
diff --git a/src/afd/sprites/back/0351--420--Castform--Sunny.png b/src/afd/sprites/back/0351-420-Castform-Sunny.png
similarity index 100%
rename from src/afd/sprites/back/0351--420--Castform--Sunny.png
rename to src/afd/sprites/back/0351-420-Castform-Sunny.png
diff --git a/src/afd/sprites/back/0352--000--Kecleon.png b/src/afd/sprites/back/0352-000-Kecleon.png
similarity index 100%
rename from src/afd/sprites/back/0352--000--Kecleon.png
rename to src/afd/sprites/back/0352-000-Kecleon.png
diff --git a/src/afd/sprites/back/0353--000--Shuppet.png b/src/afd/sprites/back/0353-000-Shuppet.png
similarity index 100%
rename from src/afd/sprites/back/0353--000--Shuppet.png
rename to src/afd/sprites/back/0353-000-Shuppet.png
diff --git a/src/afd/sprites/back/0354--000--Banette.png b/src/afd/sprites/back/0354-000-Banette.png
similarity index 100%
rename from src/afd/sprites/back/0354--000--Banette.png
rename to src/afd/sprites/back/0354-000-Banette.png
diff --git a/src/afd/sprites/back/0354--420--Banette--Mega.png b/src/afd/sprites/back/0354-420-Banette-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0354--420--Banette--Mega.png
rename to src/afd/sprites/back/0354-420-Banette-Mega.png
diff --git a/src/afd/sprites/back/0355--000--Duskull.png b/src/afd/sprites/back/0355-000-Duskull.png
similarity index 100%
rename from src/afd/sprites/back/0355--000--Duskull.png
rename to src/afd/sprites/back/0355-000-Duskull.png
diff --git a/src/afd/sprites/back/0356--000--Dusclops.png b/src/afd/sprites/back/0356-000-Dusclops.png
similarity index 100%
rename from src/afd/sprites/back/0356--000--Dusclops.png
rename to src/afd/sprites/back/0356-000-Dusclops.png
diff --git a/src/afd/sprites/back/0357--000--Tropius.png b/src/afd/sprites/back/0357-000-Tropius.png
similarity index 100%
rename from src/afd/sprites/back/0357--000--Tropius.png
rename to src/afd/sprites/back/0357-000-Tropius.png
diff --git a/src/afd/sprites/back/0358--000--Chimecho.png b/src/afd/sprites/back/0358-000-Chimecho.png
similarity index 100%
rename from src/afd/sprites/back/0358--000--Chimecho.png
rename to src/afd/sprites/back/0358-000-Chimecho.png
diff --git a/src/afd/sprites/back/0359--000--Absol.png b/src/afd/sprites/back/0359-000-Absol.png
similarity index 100%
rename from src/afd/sprites/back/0359--000--Absol.png
rename to src/afd/sprites/back/0359-000-Absol.png
diff --git a/src/afd/sprites/back/0359--420--Absol--Mega.png b/src/afd/sprites/back/0359-420-Absol-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0359--420--Absol--Mega.png
rename to src/afd/sprites/back/0359-420-Absol-Mega.png
diff --git a/src/afd/sprites/back/0360--000--Wynaut.png b/src/afd/sprites/back/0360-000-Wynaut.png
similarity index 100%
rename from src/afd/sprites/back/0360--000--Wynaut.png
rename to src/afd/sprites/back/0360-000-Wynaut.png
diff --git a/src/afd/sprites/back/0361--000--Snorunt.png b/src/afd/sprites/back/0361-000-Snorunt.png
similarity index 100%
rename from src/afd/sprites/back/0361--000--Snorunt.png
rename to src/afd/sprites/back/0361-000-Snorunt.png
diff --git a/src/afd/sprites/back/0362--000--Glalie.png b/src/afd/sprites/back/0362-000-Glalie.png
similarity index 100%
rename from src/afd/sprites/back/0362--000--Glalie.png
rename to src/afd/sprites/back/0362-000-Glalie.png
diff --git a/src/afd/sprites/back/0363--000--Spheal.png b/src/afd/sprites/back/0363-000-Spheal.png
similarity index 100%
rename from src/afd/sprites/back/0363--000--Spheal.png
rename to src/afd/sprites/back/0363-000-Spheal.png
diff --git a/src/afd/sprites/back/0364--000--Sealeo.png b/src/afd/sprites/back/0364-000-Sealeo.png
similarity index 100%
rename from src/afd/sprites/back/0364--000--Sealeo.png
rename to src/afd/sprites/back/0364-000-Sealeo.png
diff --git a/src/afd/sprites/back/0365--000--Walrein.png b/src/afd/sprites/back/0365-000-Walrein.png
similarity index 100%
rename from src/afd/sprites/back/0365--000--Walrein.png
rename to src/afd/sprites/back/0365-000-Walrein.png
diff --git a/src/afd/sprites/back/0366--000--Clamperl.png b/src/afd/sprites/back/0366-000-Clamperl.png
similarity index 100%
rename from src/afd/sprites/back/0366--000--Clamperl.png
rename to src/afd/sprites/back/0366-000-Clamperl.png
diff --git a/src/afd/sprites/back/0367--000--Huntail.png b/src/afd/sprites/back/0367-000-Huntail.png
similarity index 100%
rename from src/afd/sprites/back/0367--000--Huntail.png
rename to src/afd/sprites/back/0367-000-Huntail.png
diff --git a/src/afd/sprites/back/0368--000--Gorebyss.png b/src/afd/sprites/back/0368-000-Gorebyss.png
similarity index 100%
rename from src/afd/sprites/back/0368--000--Gorebyss.png
rename to src/afd/sprites/back/0368-000-Gorebyss.png
diff --git a/src/afd/sprites/back/0369--000--Relicanth.png b/src/afd/sprites/back/0369-000-Relicanth.png
similarity index 100%
rename from src/afd/sprites/back/0369--000--Relicanth.png
rename to src/afd/sprites/back/0369-000-Relicanth.png
diff --git a/src/afd/sprites/back/0370--000--Luvdisc.png b/src/afd/sprites/back/0370-000-Luvdisc.png
similarity index 100%
rename from src/afd/sprites/back/0370--000--Luvdisc.png
rename to src/afd/sprites/back/0370-000-Luvdisc.png
diff --git a/src/afd/sprites/back/0371--000--Bagon.png b/src/afd/sprites/back/0371-000-Bagon.png
similarity index 100%
rename from src/afd/sprites/back/0371--000--Bagon.png
rename to src/afd/sprites/back/0371-000-Bagon.png
diff --git a/src/afd/sprites/back/0372--000--Shelgon.png b/src/afd/sprites/back/0372-000-Shelgon.png
similarity index 100%
rename from src/afd/sprites/back/0372--000--Shelgon.png
rename to src/afd/sprites/back/0372-000-Shelgon.png
diff --git a/src/afd/sprites/back/0373--000--Salamence.png b/src/afd/sprites/back/0373-000-Salamence.png
similarity index 100%
rename from src/afd/sprites/back/0373--000--Salamence.png
rename to src/afd/sprites/back/0373-000-Salamence.png
diff --git a/src/afd/sprites/back/0373--420--Salamence--Mega.png b/src/afd/sprites/back/0373-420-Salamence-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0373--420--Salamence--Mega.png
rename to src/afd/sprites/back/0373-420-Salamence-Mega.png
diff --git a/src/afd/sprites/back/0374--000--Beldum.png b/src/afd/sprites/back/0374-000-Beldum.png
similarity index 100%
rename from src/afd/sprites/back/0374--000--Beldum.png
rename to src/afd/sprites/back/0374-000-Beldum.png
diff --git a/src/afd/sprites/back/0375--000--Metang.png b/src/afd/sprites/back/0375-000-Metang.png
similarity index 100%
rename from src/afd/sprites/back/0375--000--Metang.png
rename to src/afd/sprites/back/0375-000-Metang.png
diff --git a/src/afd/sprites/back/0376--000--Metagross.png b/src/afd/sprites/back/0376-000-Metagross.png
similarity index 100%
rename from src/afd/sprites/back/0376--000--Metagross.png
rename to src/afd/sprites/back/0376-000-Metagross.png
diff --git a/src/afd/sprites/back/0376--420--Metagross--Mega.png b/src/afd/sprites/back/0376-420-Metagross-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0376--420--Metagross--Mega.png
rename to src/afd/sprites/back/0376-420-Metagross-Mega.png
diff --git a/src/afd/sprites/back/0377--000--Regirock.png b/src/afd/sprites/back/0377-000-Regirock.png
similarity index 100%
rename from src/afd/sprites/back/0377--000--Regirock.png
rename to src/afd/sprites/back/0377-000-Regirock.png
diff --git a/src/afd/sprites/back/0378--000--Regice.png b/src/afd/sprites/back/0378-000-Regice.png
similarity index 100%
rename from src/afd/sprites/back/0378--000--Regice.png
rename to src/afd/sprites/back/0378-000-Regice.png
diff --git a/src/afd/sprites/back/0379--000--Registeel.png b/src/afd/sprites/back/0379-000-Registeel.png
similarity index 100%
rename from src/afd/sprites/back/0379--000--Registeel.png
rename to src/afd/sprites/back/0379-000-Registeel.png
diff --git a/src/afd/sprites/back/0380--000--Latias.png b/src/afd/sprites/back/0380-000-Latias.png
similarity index 100%
rename from src/afd/sprites/back/0380--000--Latias.png
rename to src/afd/sprites/back/0380-000-Latias.png
diff --git a/src/afd/sprites/back/0380--420--Latias--Mega.png b/src/afd/sprites/back/0380-420-Latias-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0380--420--Latias--Mega.png
rename to src/afd/sprites/back/0380-420-Latias-Mega.png
diff --git a/src/afd/sprites/back/0381--000--Latios.png b/src/afd/sprites/back/0381-000-Latios.png
similarity index 100%
rename from src/afd/sprites/back/0381--000--Latios.png
rename to src/afd/sprites/back/0381-000-Latios.png
diff --git a/src/afd/sprites/back/0381--420--Latios--Mega.png b/src/afd/sprites/back/0381-420-Latios-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0381--420--Latios--Mega.png
rename to src/afd/sprites/back/0381-420-Latios-Mega.png
diff --git a/src/afd/sprites/back/0382--000--Kyogre.png b/src/afd/sprites/back/0382-000-Kyogre.png
similarity index 100%
rename from src/afd/sprites/back/0382--000--Kyogre.png
rename to src/afd/sprites/back/0382-000-Kyogre.png
diff --git a/src/afd/sprites/back/0382--420--Kyogre--Primal.png b/src/afd/sprites/back/0382-420-Kyogre-Primal.png
similarity index 100%
rename from src/afd/sprites/back/0382--420--Kyogre--Primal.png
rename to src/afd/sprites/back/0382-420-Kyogre-Primal.png
diff --git a/src/afd/sprites/back/0383--000--Groudon.png b/src/afd/sprites/back/0383-000-Groudon.png
similarity index 100%
rename from src/afd/sprites/back/0383--000--Groudon.png
rename to src/afd/sprites/back/0383-000-Groudon.png
diff --git a/src/afd/sprites/back/0383--420--Groudon--Primal.png b/src/afd/sprites/back/0383-420-Groudon-Primal.png
similarity index 100%
rename from src/afd/sprites/back/0383--420--Groudon--Primal.png
rename to src/afd/sprites/back/0383-420-Groudon-Primal.png
diff --git a/src/afd/sprites/back/0384--000--Rayquaza.png b/src/afd/sprites/back/0384-000-Rayquaza.png
similarity index 100%
rename from src/afd/sprites/back/0384--000--Rayquaza.png
rename to src/afd/sprites/back/0384-000-Rayquaza.png
diff --git a/src/afd/sprites/back/0384--420--Rayquaza--Mega.png b/src/afd/sprites/back/0384-420-Rayquaza-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0384--420--Rayquaza--Mega.png
rename to src/afd/sprites/back/0384-420-Rayquaza-Mega.png
diff --git a/src/afd/sprites/back/0385--000--Jirachi.png b/src/afd/sprites/back/0385-000-Jirachi.png
similarity index 100%
rename from src/afd/sprites/back/0385--000--Jirachi.png
rename to src/afd/sprites/back/0385-000-Jirachi.png
diff --git a/src/afd/sprites/back/0386--000--Deoxys.png b/src/afd/sprites/back/0386-000-Deoxys.png
similarity index 100%
rename from src/afd/sprites/back/0386--000--Deoxys.png
rename to src/afd/sprites/back/0386-000-Deoxys.png
diff --git a/src/afd/sprites/back/0386--420--Deoxys--Attack.png b/src/afd/sprites/back/0386-420-Deoxys-Attack.png
similarity index 100%
rename from src/afd/sprites/back/0386--420--Deoxys--Attack.png
rename to src/afd/sprites/back/0386-420-Deoxys-Attack.png
diff --git a/src/afd/sprites/back/0386--420--Deoxys--Defense.png b/src/afd/sprites/back/0386-420-Deoxys-Defense.png
similarity index 100%
rename from src/afd/sprites/back/0386--420--Deoxys--Defense.png
rename to src/afd/sprites/back/0386-420-Deoxys-Defense.png
diff --git a/src/afd/sprites/back/0386--420--Deoxys--Speed.png b/src/afd/sprites/back/0386-420-Deoxys-Speed.png
similarity index 100%
rename from src/afd/sprites/back/0386--420--Deoxys--Speed.png
rename to src/afd/sprites/back/0386-420-Deoxys-Speed.png
diff --git a/src/afd/sprites/back/0387--000--Turtwig.png b/src/afd/sprites/back/0387-000-Turtwig.png
similarity index 100%
rename from src/afd/sprites/back/0387--000--Turtwig.png
rename to src/afd/sprites/back/0387-000-Turtwig.png
diff --git a/src/afd/sprites/back/0388--000--Grotle.png b/src/afd/sprites/back/0388-000-Grotle.png
similarity index 100%
rename from src/afd/sprites/back/0388--000--Grotle.png
rename to src/afd/sprites/back/0388-000-Grotle.png
diff --git a/src/afd/sprites/back/0389--000--Torterra.png b/src/afd/sprites/back/0389-000-Torterra.png
similarity index 100%
rename from src/afd/sprites/back/0389--000--Torterra.png
rename to src/afd/sprites/back/0389-000-Torterra.png
diff --git a/src/afd/sprites/back/0390--000--Chimchar.png b/src/afd/sprites/back/0390-000-Chimchar.png
similarity index 100%
rename from src/afd/sprites/back/0390--000--Chimchar.png
rename to src/afd/sprites/back/0390-000-Chimchar.png
diff --git a/src/afd/sprites/back/0391--000--Monferno.png b/src/afd/sprites/back/0391-000-Monferno.png
similarity index 100%
rename from src/afd/sprites/back/0391--000--Monferno.png
rename to src/afd/sprites/back/0391-000-Monferno.png
diff --git a/src/afd/sprites/back/0392--000--Infernape.png b/src/afd/sprites/back/0392-000-Infernape.png
similarity index 100%
rename from src/afd/sprites/back/0392--000--Infernape.png
rename to src/afd/sprites/back/0392-000-Infernape.png
diff --git a/src/afd/sprites/back/0393--000--Piplup.png b/src/afd/sprites/back/0393-000-Piplup.png
similarity index 100%
rename from src/afd/sprites/back/0393--000--Piplup.png
rename to src/afd/sprites/back/0393-000-Piplup.png
diff --git a/src/afd/sprites/back/0394--000--Prinplup.png b/src/afd/sprites/back/0394-000-Prinplup.png
similarity index 100%
rename from src/afd/sprites/back/0394--000--Prinplup.png
rename to src/afd/sprites/back/0394-000-Prinplup.png
diff --git a/src/afd/sprites/back/0395--000--Empoleon.png b/src/afd/sprites/back/0395-000-Empoleon.png
similarity index 100%
rename from src/afd/sprites/back/0395--000--Empoleon.png
rename to src/afd/sprites/back/0395-000-Empoleon.png
diff --git a/src/afd/sprites/back/0396--000--Starly.png b/src/afd/sprites/back/0396-000-Starly.png
similarity index 100%
rename from src/afd/sprites/back/0396--000--Starly.png
rename to src/afd/sprites/back/0396-000-Starly.png
diff --git a/src/afd/sprites/back/0397--000--Staravia.png b/src/afd/sprites/back/0397-000-Staravia.png
similarity index 100%
rename from src/afd/sprites/back/0397--000--Staravia.png
rename to src/afd/sprites/back/0397-000-Staravia.png
diff --git a/src/afd/sprites/back/0398--000--Staraptor.png b/src/afd/sprites/back/0398-000-Staraptor.png
similarity index 100%
rename from src/afd/sprites/back/0398--000--Staraptor.png
rename to src/afd/sprites/back/0398-000-Staraptor.png
diff --git a/src/afd/sprites/back/0399--000--Bidoof.png b/src/afd/sprites/back/0399-000-Bidoof.png
similarity index 100%
rename from src/afd/sprites/back/0399--000--Bidoof.png
rename to src/afd/sprites/back/0399-000-Bidoof.png
diff --git a/src/afd/sprites/back/0400--000--Bibarel.png b/src/afd/sprites/back/0400-000-Bibarel.png
similarity index 100%
rename from src/afd/sprites/back/0400--000--Bibarel.png
rename to src/afd/sprites/back/0400-000-Bibarel.png
diff --git a/src/afd/sprites/back/0401--000--Kricketot.png b/src/afd/sprites/back/0401-000-Kricketot.png
similarity index 100%
rename from src/afd/sprites/back/0401--000--Kricketot.png
rename to src/afd/sprites/back/0401-000-Kricketot.png
diff --git a/src/afd/sprites/back/0402--000--Kricketune.png b/src/afd/sprites/back/0402-000-Kricketune.png
similarity index 100%
rename from src/afd/sprites/back/0402--000--Kricketune.png
rename to src/afd/sprites/back/0402-000-Kricketune.png
diff --git a/src/afd/sprites/back/0403--000--Shinx.png b/src/afd/sprites/back/0403-000-Shinx.png
similarity index 100%
rename from src/afd/sprites/back/0403--000--Shinx.png
rename to src/afd/sprites/back/0403-000-Shinx.png
diff --git a/src/afd/sprites/back/0404--000--Luxio.png b/src/afd/sprites/back/0404-000-Luxio.png
similarity index 100%
rename from src/afd/sprites/back/0404--000--Luxio.png
rename to src/afd/sprites/back/0404-000-Luxio.png
diff --git a/src/afd/sprites/back/0405--000--Luxray.png b/src/afd/sprites/back/0405-000-Luxray.png
similarity index 100%
rename from src/afd/sprites/back/0405--000--Luxray.png
rename to src/afd/sprites/back/0405-000-Luxray.png
diff --git a/src/afd/sprites/back/0406--000--Budew.png b/src/afd/sprites/back/0406-000-Budew.png
similarity index 100%
rename from src/afd/sprites/back/0406--000--Budew.png
rename to src/afd/sprites/back/0406-000-Budew.png
diff --git a/src/afd/sprites/back/0407--000--Roserade.png b/src/afd/sprites/back/0407-000-Roserade.png
similarity index 100%
rename from src/afd/sprites/back/0407--000--Roserade.png
rename to src/afd/sprites/back/0407-000-Roserade.png
diff --git a/src/afd/sprites/back/0408--000--Cranidos.png b/src/afd/sprites/back/0408-000-Cranidos.png
similarity index 100%
rename from src/afd/sprites/back/0408--000--Cranidos.png
rename to src/afd/sprites/back/0408-000-Cranidos.png
diff --git a/src/afd/sprites/back/0409--000--Rampardos.png b/src/afd/sprites/back/0409-000-Rampardos.png
similarity index 100%
rename from src/afd/sprites/back/0409--000--Rampardos.png
rename to src/afd/sprites/back/0409-000-Rampardos.png
diff --git a/src/afd/sprites/back/0410--000--Shieldon.png b/src/afd/sprites/back/0410-000-Shieldon.png
similarity index 100%
rename from src/afd/sprites/back/0410--000--Shieldon.png
rename to src/afd/sprites/back/0410-000-Shieldon.png
diff --git a/src/afd/sprites/back/0411--000--Bastiodon.png b/src/afd/sprites/back/0411-000-Bastiodon.png
similarity index 100%
rename from src/afd/sprites/back/0411--000--Bastiodon.png
rename to src/afd/sprites/back/0411-000-Bastiodon.png
diff --git a/src/afd/sprites/back/0412--000--Burmy.png b/src/afd/sprites/back/0412-000-Burmy.png
similarity index 100%
rename from src/afd/sprites/back/0412--000--Burmy.png
rename to src/afd/sprites/back/0412-000-Burmy.png
diff --git a/src/afd/sprites/back/0413--000--Wormadam.png b/src/afd/sprites/back/0413-000-Wormadam.png
similarity index 100%
rename from src/afd/sprites/back/0413--000--Wormadam.png
rename to src/afd/sprites/back/0413-000-Wormadam.png
diff --git a/src/afd/sprites/back/0413--420--Wormadam--Sandy.png b/src/afd/sprites/back/0413-420-Wormadam-Sandy.png
similarity index 100%
rename from src/afd/sprites/back/0413--420--Wormadam--Sandy.png
rename to src/afd/sprites/back/0413-420-Wormadam-Sandy.png
diff --git a/src/afd/sprites/back/0413--420--Wormadam--Trash.png b/src/afd/sprites/back/0413-420-Wormadam-Trash.png
similarity index 100%
rename from src/afd/sprites/back/0413--420--Wormadam--Trash.png
rename to src/afd/sprites/back/0413-420-Wormadam-Trash.png
diff --git a/src/afd/sprites/back/0414--000--Mothim.png b/src/afd/sprites/back/0414-000-Mothim.png
similarity index 100%
rename from src/afd/sprites/back/0414--000--Mothim.png
rename to src/afd/sprites/back/0414-000-Mothim.png
diff --git a/src/afd/sprites/back/0415--000--Combee.png b/src/afd/sprites/back/0415-000-Combee.png
similarity index 100%
rename from src/afd/sprites/back/0415--000--Combee.png
rename to src/afd/sprites/back/0415-000-Combee.png
diff --git a/src/afd/sprites/back/0416--000--Vespiquen.png b/src/afd/sprites/back/0416-000-Vespiquen.png
similarity index 100%
rename from src/afd/sprites/back/0416--000--Vespiquen.png
rename to src/afd/sprites/back/0416-000-Vespiquen.png
diff --git a/src/afd/sprites/back/0417--000--Pachirisu.png b/src/afd/sprites/back/0417-000-Pachirisu.png
similarity index 100%
rename from src/afd/sprites/back/0417--000--Pachirisu.png
rename to src/afd/sprites/back/0417-000-Pachirisu.png
diff --git a/src/afd/sprites/back/0418--000--Buizel.png b/src/afd/sprites/back/0418-000-Buizel.png
similarity index 100%
rename from src/afd/sprites/back/0418--000--Buizel.png
rename to src/afd/sprites/back/0418-000-Buizel.png
diff --git a/src/afd/sprites/back/0419--000--Floatzel.png b/src/afd/sprites/back/0419-000-Floatzel.png
similarity index 100%
rename from src/afd/sprites/back/0419--000--Floatzel.png
rename to src/afd/sprites/back/0419-000-Floatzel.png
diff --git a/src/afd/sprites/back/0420--000--Cherubi.png b/src/afd/sprites/back/0420-000-Cherubi.png
similarity index 100%
rename from src/afd/sprites/back/0420--000--Cherubi.png
rename to src/afd/sprites/back/0420-000-Cherubi.png
diff --git a/src/afd/sprites/back/0421--000--Cherrim.png b/src/afd/sprites/back/0421-000-Cherrim.png
similarity index 100%
rename from src/afd/sprites/back/0421--000--Cherrim.png
rename to src/afd/sprites/back/0421-000-Cherrim.png
diff --git a/src/afd/sprites/back/0421--420--Cherrim--Sunshine.png b/src/afd/sprites/back/0421-420-Cherrim-Sunshine.png
similarity index 100%
rename from src/afd/sprites/back/0421--420--Cherrim--Sunshine.png
rename to src/afd/sprites/back/0421-420-Cherrim-Sunshine.png
diff --git a/src/afd/sprites/back/0422--000--Shellos.png b/src/afd/sprites/back/0422-000-Shellos.png
similarity index 100%
rename from src/afd/sprites/back/0422--000--Shellos.png
rename to src/afd/sprites/back/0422-000-Shellos.png
diff --git a/src/afd/sprites/back/0423--000--Gastrodon.png b/src/afd/sprites/back/0423-000-Gastrodon.png
similarity index 100%
rename from src/afd/sprites/back/0423--000--Gastrodon.png
rename to src/afd/sprites/back/0423-000-Gastrodon.png
diff --git a/src/afd/sprites/back/0424--000--Ambipom.png b/src/afd/sprites/back/0424-000-Ambipom.png
similarity index 100%
rename from src/afd/sprites/back/0424--000--Ambipom.png
rename to src/afd/sprites/back/0424-000-Ambipom.png
diff --git a/src/afd/sprites/back/0425--000--Drifloon.png b/src/afd/sprites/back/0425-000-Drifloon.png
similarity index 100%
rename from src/afd/sprites/back/0425--000--Drifloon.png
rename to src/afd/sprites/back/0425-000-Drifloon.png
diff --git a/src/afd/sprites/back/0426--000--Drifblim.png b/src/afd/sprites/back/0426-000-Drifblim.png
similarity index 100%
rename from src/afd/sprites/back/0426--000--Drifblim.png
rename to src/afd/sprites/back/0426-000-Drifblim.png
diff --git a/src/afd/sprites/back/0427--000--Buneary.png b/src/afd/sprites/back/0427-000-Buneary.png
similarity index 100%
rename from src/afd/sprites/back/0427--000--Buneary.png
rename to src/afd/sprites/back/0427-000-Buneary.png
diff --git a/src/afd/sprites/back/0428--000--Lopunny.png b/src/afd/sprites/back/0428-000-Lopunny.png
similarity index 100%
rename from src/afd/sprites/back/0428--000--Lopunny.png
rename to src/afd/sprites/back/0428-000-Lopunny.png
diff --git a/src/afd/sprites/back/0428--420--Lopunny--Mega.png b/src/afd/sprites/back/0428-420-Lopunny-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0428--420--Lopunny--Mega.png
rename to src/afd/sprites/back/0428-420-Lopunny-Mega.png
diff --git a/src/afd/sprites/back/0429--000--Mismagius.png b/src/afd/sprites/back/0429-000-Mismagius.png
similarity index 100%
rename from src/afd/sprites/back/0429--000--Mismagius.png
rename to src/afd/sprites/back/0429-000-Mismagius.png
diff --git a/src/afd/sprites/back/0430--000--Honchkrow.png b/src/afd/sprites/back/0430-000-Honchkrow.png
similarity index 100%
rename from src/afd/sprites/back/0430--000--Honchkrow.png
rename to src/afd/sprites/back/0430-000-Honchkrow.png
diff --git a/src/afd/sprites/back/0431--000--Glameow.png b/src/afd/sprites/back/0431-000-Glameow.png
similarity index 100%
rename from src/afd/sprites/back/0431--000--Glameow.png
rename to src/afd/sprites/back/0431-000-Glameow.png
diff --git a/src/afd/sprites/back/0432--000--Purugly.png b/src/afd/sprites/back/0432-000-Purugly.png
similarity index 100%
rename from src/afd/sprites/back/0432--000--Purugly.png
rename to src/afd/sprites/back/0432-000-Purugly.png
diff --git a/src/afd/sprites/back/0433--000--Chingling.png b/src/afd/sprites/back/0433-000-Chingling.png
similarity index 100%
rename from src/afd/sprites/back/0433--000--Chingling.png
rename to src/afd/sprites/back/0433-000-Chingling.png
diff --git a/src/afd/sprites/back/0434--000--Stunky.png b/src/afd/sprites/back/0434-000-Stunky.png
similarity index 100%
rename from src/afd/sprites/back/0434--000--Stunky.png
rename to src/afd/sprites/back/0434-000-Stunky.png
diff --git a/src/afd/sprites/back/0435--000--Skuntank.png b/src/afd/sprites/back/0435-000-Skuntank.png
similarity index 100%
rename from src/afd/sprites/back/0435--000--Skuntank.png
rename to src/afd/sprites/back/0435-000-Skuntank.png
diff --git a/src/afd/sprites/back/0436--000--Bronzor.png b/src/afd/sprites/back/0436-000-Bronzor.png
similarity index 100%
rename from src/afd/sprites/back/0436--000--Bronzor.png
rename to src/afd/sprites/back/0436-000-Bronzor.png
diff --git a/src/afd/sprites/back/0437--000--Bronzong.png b/src/afd/sprites/back/0437-000-Bronzong.png
similarity index 100%
rename from src/afd/sprites/back/0437--000--Bronzong.png
rename to src/afd/sprites/back/0437-000-Bronzong.png
diff --git a/src/afd/sprites/back/0438--000--Bonsly.png b/src/afd/sprites/back/0438-000-Bonsly.png
similarity index 100%
rename from src/afd/sprites/back/0438--000--Bonsly.png
rename to src/afd/sprites/back/0438-000-Bonsly.png
diff --git a/src/afd/sprites/back/0439--000--Mime_Jr..png b/src/afd/sprites/back/0439-000-Mime_Jr..png
similarity index 100%
rename from src/afd/sprites/back/0439--000--Mime_Jr..png
rename to src/afd/sprites/back/0439-000-Mime_Jr..png
diff --git a/src/afd/sprites/back/0440--000--Happiny.png b/src/afd/sprites/back/0440-000-Happiny.png
similarity index 100%
rename from src/afd/sprites/back/0440--000--Happiny.png
rename to src/afd/sprites/back/0440-000-Happiny.png
diff --git a/src/afd/sprites/back/0441--000--Chatot.png b/src/afd/sprites/back/0441-000-Chatot.png
similarity index 100%
rename from src/afd/sprites/back/0441--000--Chatot.png
rename to src/afd/sprites/back/0441-000-Chatot.png
diff --git a/src/afd/sprites/back/0442--000--Spiritomb.png b/src/afd/sprites/back/0442-000-Spiritomb.png
similarity index 100%
rename from src/afd/sprites/back/0442--000--Spiritomb.png
rename to src/afd/sprites/back/0442-000-Spiritomb.png
diff --git a/src/afd/sprites/back/0443--000--Gible.png b/src/afd/sprites/back/0443-000-Gible.png
similarity index 100%
rename from src/afd/sprites/back/0443--000--Gible.png
rename to src/afd/sprites/back/0443-000-Gible.png
diff --git a/src/afd/sprites/back/0444--000--Gabite.png b/src/afd/sprites/back/0444-000-Gabite.png
similarity index 100%
rename from src/afd/sprites/back/0444--000--Gabite.png
rename to src/afd/sprites/back/0444-000-Gabite.png
diff --git a/src/afd/sprites/back/0445--000--Garchomp.png b/src/afd/sprites/back/0445-000-Garchomp.png
similarity index 100%
rename from src/afd/sprites/back/0445--000--Garchomp.png
rename to src/afd/sprites/back/0445-000-Garchomp.png
diff --git a/src/afd/sprites/back/0445--420--Garchomp--Mega.png b/src/afd/sprites/back/0445-420-Garchomp-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0445--420--Garchomp--Mega.png
rename to src/afd/sprites/back/0445-420-Garchomp-Mega.png
diff --git a/src/afd/sprites/back/0446--000--Munchlax.png b/src/afd/sprites/back/0446-000-Munchlax.png
similarity index 100%
rename from src/afd/sprites/back/0446--000--Munchlax.png
rename to src/afd/sprites/back/0446-000-Munchlax.png
diff --git a/src/afd/sprites/back/0447--000--Riolu.png b/src/afd/sprites/back/0447-000-Riolu.png
similarity index 100%
rename from src/afd/sprites/back/0447--000--Riolu.png
rename to src/afd/sprites/back/0447-000-Riolu.png
diff --git a/src/afd/sprites/back/0448--000--Lucario.png b/src/afd/sprites/back/0448-000-Lucario.png
similarity index 100%
rename from src/afd/sprites/back/0448--000--Lucario.png
rename to src/afd/sprites/back/0448-000-Lucario.png
diff --git a/src/afd/sprites/back/0448--420--Lucario--Mega.png b/src/afd/sprites/back/0448-420-Lucario-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0448--420--Lucario--Mega.png
rename to src/afd/sprites/back/0448-420-Lucario-Mega.png
diff --git a/src/afd/sprites/back/0449--000--Hippopotas.png b/src/afd/sprites/back/0449-000-Hippopotas.png
similarity index 100%
rename from src/afd/sprites/back/0449--000--Hippopotas.png
rename to src/afd/sprites/back/0449-000-Hippopotas.png
diff --git a/src/afd/sprites/back/0450--000--Hippowdon.png b/src/afd/sprites/back/0450-000-Hippowdon.png
similarity index 100%
rename from src/afd/sprites/back/0450--000--Hippowdon.png
rename to src/afd/sprites/back/0450-000-Hippowdon.png
diff --git a/src/afd/sprites/back/0451--000--Skorupi.png b/src/afd/sprites/back/0451-000-Skorupi.png
similarity index 100%
rename from src/afd/sprites/back/0451--000--Skorupi.png
rename to src/afd/sprites/back/0451-000-Skorupi.png
diff --git a/src/afd/sprites/back/0452--000--Drapion.png b/src/afd/sprites/back/0452-000-Drapion.png
similarity index 100%
rename from src/afd/sprites/back/0452--000--Drapion.png
rename to src/afd/sprites/back/0452-000-Drapion.png
diff --git a/src/afd/sprites/back/0453--000--Croagunk.png b/src/afd/sprites/back/0453-000-Croagunk.png
similarity index 100%
rename from src/afd/sprites/back/0453--000--Croagunk.png
rename to src/afd/sprites/back/0453-000-Croagunk.png
diff --git a/src/afd/sprites/back/0454--000--Toxicroak.png b/src/afd/sprites/back/0454-000-Toxicroak.png
similarity index 100%
rename from src/afd/sprites/back/0454--000--Toxicroak.png
rename to src/afd/sprites/back/0454-000-Toxicroak.png
diff --git a/src/afd/sprites/back/0455--000--Carnivine.png b/src/afd/sprites/back/0455-000-Carnivine.png
similarity index 100%
rename from src/afd/sprites/back/0455--000--Carnivine.png
rename to src/afd/sprites/back/0455-000-Carnivine.png
diff --git a/src/afd/sprites/back/0456--000--Finneon.png b/src/afd/sprites/back/0456-000-Finneon.png
similarity index 100%
rename from src/afd/sprites/back/0456--000--Finneon.png
rename to src/afd/sprites/back/0456-000-Finneon.png
diff --git a/src/afd/sprites/back/0457--000--Lumineon.png b/src/afd/sprites/back/0457-000-Lumineon.png
similarity index 100%
rename from src/afd/sprites/back/0457--000--Lumineon.png
rename to src/afd/sprites/back/0457-000-Lumineon.png
diff --git a/src/afd/sprites/back/0458--000--Mantyke.png b/src/afd/sprites/back/0458-000-Mantyke.png
similarity index 100%
rename from src/afd/sprites/back/0458--000--Mantyke.png
rename to src/afd/sprites/back/0458-000-Mantyke.png
diff --git a/src/afd/sprites/back/0459--000--Snover.png b/src/afd/sprites/back/0459-000-Snover.png
similarity index 100%
rename from src/afd/sprites/back/0459--000--Snover.png
rename to src/afd/sprites/back/0459-000-Snover.png
diff --git a/src/afd/sprites/back/0460--000--Abomasnow.png b/src/afd/sprites/back/0460-000-Abomasnow.png
similarity index 100%
rename from src/afd/sprites/back/0460--000--Abomasnow.png
rename to src/afd/sprites/back/0460-000-Abomasnow.png
diff --git a/src/afd/sprites/back/0460--420--Abomasnow--Mega.png b/src/afd/sprites/back/0460-420-Abomasnow-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0460--420--Abomasnow--Mega.png
rename to src/afd/sprites/back/0460-420-Abomasnow-Mega.png
diff --git a/src/afd/sprites/back/0461--000--Weavile.png b/src/afd/sprites/back/0461-000-Weavile.png
similarity index 100%
rename from src/afd/sprites/back/0461--000--Weavile.png
rename to src/afd/sprites/back/0461-000-Weavile.png
diff --git a/src/afd/sprites/back/0462--000--Magnezone.png b/src/afd/sprites/back/0462-000-Magnezone.png
similarity index 100%
rename from src/afd/sprites/back/0462--000--Magnezone.png
rename to src/afd/sprites/back/0462-000-Magnezone.png
diff --git a/src/afd/sprites/back/0463--000--Lickilicky.png b/src/afd/sprites/back/0463-000-Lickilicky.png
similarity index 100%
rename from src/afd/sprites/back/0463--000--Lickilicky.png
rename to src/afd/sprites/back/0463-000-Lickilicky.png
diff --git a/src/afd/sprites/back/0464--000--Rhyperior.png b/src/afd/sprites/back/0464-000-Rhyperior.png
similarity index 100%
rename from src/afd/sprites/back/0464--000--Rhyperior.png
rename to src/afd/sprites/back/0464-000-Rhyperior.png
diff --git a/src/afd/sprites/back/0465--000--Tangrowth.png b/src/afd/sprites/back/0465-000-Tangrowth.png
similarity index 100%
rename from src/afd/sprites/back/0465--000--Tangrowth.png
rename to src/afd/sprites/back/0465-000-Tangrowth.png
diff --git a/src/afd/sprites/back/0466--000--Electivire.png b/src/afd/sprites/back/0466-000-Electivire.png
similarity index 100%
rename from src/afd/sprites/back/0466--000--Electivire.png
rename to src/afd/sprites/back/0466-000-Electivire.png
diff --git a/src/afd/sprites/back/0467--000--Magmortar.png b/src/afd/sprites/back/0467-000-Magmortar.png
similarity index 100%
rename from src/afd/sprites/back/0467--000--Magmortar.png
rename to src/afd/sprites/back/0467-000-Magmortar.png
diff --git a/src/afd/sprites/back/0468--000--Togekiss.png b/src/afd/sprites/back/0468-000-Togekiss.png
similarity index 100%
rename from src/afd/sprites/back/0468--000--Togekiss.png
rename to src/afd/sprites/back/0468-000-Togekiss.png
diff --git a/src/afd/sprites/back/0469--000--Yanmega.png b/src/afd/sprites/back/0469-000-Yanmega.png
similarity index 100%
rename from src/afd/sprites/back/0469--000--Yanmega.png
rename to src/afd/sprites/back/0469-000-Yanmega.png
diff --git a/src/afd/sprites/back/0470--000--Leafeon.png b/src/afd/sprites/back/0470-000-Leafeon.png
similarity index 100%
rename from src/afd/sprites/back/0470--000--Leafeon.png
rename to src/afd/sprites/back/0470-000-Leafeon.png
diff --git a/src/afd/sprites/back/0471--000--Glaceon.png b/src/afd/sprites/back/0471-000-Glaceon.png
similarity index 100%
rename from src/afd/sprites/back/0471--000--Glaceon.png
rename to src/afd/sprites/back/0471-000-Glaceon.png
diff --git a/src/afd/sprites/back/0472--000--Gliscor.png b/src/afd/sprites/back/0472-000-Gliscor.png
similarity index 100%
rename from src/afd/sprites/back/0472--000--Gliscor.png
rename to src/afd/sprites/back/0472-000-Gliscor.png
diff --git a/src/afd/sprites/back/0473--000--Mamoswine.png b/src/afd/sprites/back/0473-000-Mamoswine.png
similarity index 100%
rename from src/afd/sprites/back/0473--000--Mamoswine.png
rename to src/afd/sprites/back/0473-000-Mamoswine.png
diff --git a/src/afd/sprites/back/0474--000--Porygon-Z.png b/src/afd/sprites/back/0474-000-Porygon~Z.png
similarity index 100%
rename from src/afd/sprites/back/0474--000--Porygon-Z.png
rename to src/afd/sprites/back/0474-000-Porygon~Z.png
diff --git a/src/afd/sprites/back/0475--000--Gallade.png b/src/afd/sprites/back/0475-000-Gallade.png
similarity index 100%
rename from src/afd/sprites/back/0475--000--Gallade.png
rename to src/afd/sprites/back/0475-000-Gallade.png
diff --git a/src/afd/sprites/back/0475--420--Gallade--Mega.png b/src/afd/sprites/back/0475-420-Gallade-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0475--420--Gallade--Mega.png
rename to src/afd/sprites/back/0475-420-Gallade-Mega.png
diff --git a/src/afd/sprites/back/0476--000--Probopass.png b/src/afd/sprites/back/0476-000-Probopass.png
similarity index 100%
rename from src/afd/sprites/back/0476--000--Probopass.png
rename to src/afd/sprites/back/0476-000-Probopass.png
diff --git a/src/afd/sprites/back/0477--000--Dusknoir.png b/src/afd/sprites/back/0477-000-Dusknoir.png
similarity index 100%
rename from src/afd/sprites/back/0477--000--Dusknoir.png
rename to src/afd/sprites/back/0477-000-Dusknoir.png
diff --git a/src/afd/sprites/back/0478--000--Froslass.png b/src/afd/sprites/back/0478-000-Froslass.png
similarity index 100%
rename from src/afd/sprites/back/0478--000--Froslass.png
rename to src/afd/sprites/back/0478-000-Froslass.png
diff --git a/src/afd/sprites/back/0479--000--Rotom.png b/src/afd/sprites/back/0479-000-Rotom.png
similarity index 100%
rename from src/afd/sprites/back/0479--000--Rotom.png
rename to src/afd/sprites/back/0479-000-Rotom.png
diff --git a/src/afd/sprites/back/0479--420--Rotom--Fan.png b/src/afd/sprites/back/0479-420-Rotom-Fan.png
similarity index 100%
rename from src/afd/sprites/back/0479--420--Rotom--Fan.png
rename to src/afd/sprites/back/0479-420-Rotom-Fan.png
diff --git a/src/afd/sprites/back/0479--420--Rotom--Frost.png b/src/afd/sprites/back/0479-420-Rotom-Frost.png
similarity index 100%
rename from src/afd/sprites/back/0479--420--Rotom--Frost.png
rename to src/afd/sprites/back/0479-420-Rotom-Frost.png
diff --git a/src/afd/sprites/back/0479--420--Rotom--Heat.png b/src/afd/sprites/back/0479-420-Rotom-Heat.png
similarity index 100%
rename from src/afd/sprites/back/0479--420--Rotom--Heat.png
rename to src/afd/sprites/back/0479-420-Rotom-Heat.png
diff --git a/src/afd/sprites/back/0479--420--Rotom--Mow.png b/src/afd/sprites/back/0479-420-Rotom-Mow.png
similarity index 100%
rename from src/afd/sprites/back/0479--420--Rotom--Mow.png
rename to src/afd/sprites/back/0479-420-Rotom-Mow.png
diff --git a/src/afd/sprites/back/0479--420--Rotom--Wash.png b/src/afd/sprites/back/0479-420-Rotom-Wash.png
similarity index 100%
rename from src/afd/sprites/back/0479--420--Rotom--Wash.png
rename to src/afd/sprites/back/0479-420-Rotom-Wash.png
diff --git a/src/afd/sprites/back/0480--000--Uxie.png b/src/afd/sprites/back/0480-000-Uxie.png
similarity index 100%
rename from src/afd/sprites/back/0480--000--Uxie.png
rename to src/afd/sprites/back/0480-000-Uxie.png
diff --git a/src/afd/sprites/back/0481--000--Mesprit.png b/src/afd/sprites/back/0481-000-Mesprit.png
similarity index 100%
rename from src/afd/sprites/back/0481--000--Mesprit.png
rename to src/afd/sprites/back/0481-000-Mesprit.png
diff --git a/src/afd/sprites/back/0482--000--Azelf.png b/src/afd/sprites/back/0482-000-Azelf.png
similarity index 100%
rename from src/afd/sprites/back/0482--000--Azelf.png
rename to src/afd/sprites/back/0482-000-Azelf.png
diff --git a/src/afd/sprites/back/0483--000--Dialga.png b/src/afd/sprites/back/0483-000-Dialga.png
similarity index 100%
rename from src/afd/sprites/back/0483--000--Dialga.png
rename to src/afd/sprites/back/0483-000-Dialga.png
diff --git a/src/afd/sprites/back/0484--000--Palkia.png b/src/afd/sprites/back/0484-000-Palkia.png
similarity index 100%
rename from src/afd/sprites/back/0484--000--Palkia.png
rename to src/afd/sprites/back/0484-000-Palkia.png
diff --git a/src/afd/sprites/back/0485--000--Heatran.png b/src/afd/sprites/back/0485-000-Heatran.png
similarity index 100%
rename from src/afd/sprites/back/0485--000--Heatran.png
rename to src/afd/sprites/back/0485-000-Heatran.png
diff --git a/src/afd/sprites/back/0486--000--Regigigas.png b/src/afd/sprites/back/0486-000-Regigigas.png
similarity index 100%
rename from src/afd/sprites/back/0486--000--Regigigas.png
rename to src/afd/sprites/back/0486-000-Regigigas.png
diff --git a/src/afd/sprites/back/0487--000--Giratina.png b/src/afd/sprites/back/0487-000-Giratina.png
similarity index 100%
rename from src/afd/sprites/back/0487--000--Giratina.png
rename to src/afd/sprites/back/0487-000-Giratina.png
diff --git a/src/afd/sprites/back/0487--420--Giratina--Origin.png b/src/afd/sprites/back/0487-420-Giratina-Origin.png
similarity index 100%
rename from src/afd/sprites/back/0487--420--Giratina--Origin.png
rename to src/afd/sprites/back/0487-420-Giratina-Origin.png
diff --git a/src/afd/sprites/back/0488--000--Cresselia.png b/src/afd/sprites/back/0488-000-Cresselia.png
similarity index 100%
rename from src/afd/sprites/back/0488--000--Cresselia.png
rename to src/afd/sprites/back/0488-000-Cresselia.png
diff --git a/src/afd/sprites/back/0489--000--Phione.png b/src/afd/sprites/back/0489-000-Phione.png
similarity index 100%
rename from src/afd/sprites/back/0489--000--Phione.png
rename to src/afd/sprites/back/0489-000-Phione.png
diff --git a/src/afd/sprites/back/0490--000--Manaphy.png b/src/afd/sprites/back/0490-000-Manaphy.png
similarity index 100%
rename from src/afd/sprites/back/0490--000--Manaphy.png
rename to src/afd/sprites/back/0490-000-Manaphy.png
diff --git a/src/afd/sprites/back/0491--000--Darkrai.png b/src/afd/sprites/back/0491-000-Darkrai.png
similarity index 100%
rename from src/afd/sprites/back/0491--000--Darkrai.png
rename to src/afd/sprites/back/0491-000-Darkrai.png
diff --git a/src/afd/sprites/back/0492--000--Shaymin.png b/src/afd/sprites/back/0492-000-Shaymin.png
similarity index 100%
rename from src/afd/sprites/back/0492--000--Shaymin.png
rename to src/afd/sprites/back/0492-000-Shaymin.png
diff --git a/src/afd/sprites/back/0492--420--Shaymin--Sky.png b/src/afd/sprites/back/0492-420-Shaymin-Sky.png
similarity index 100%
rename from src/afd/sprites/back/0492--420--Shaymin--Sky.png
rename to src/afd/sprites/back/0492-420-Shaymin-Sky.png
diff --git a/src/afd/sprites/back/0493--000--Arceus.png b/src/afd/sprites/back/0493-000-Arceus.png
similarity index 100%
rename from src/afd/sprites/back/0493--000--Arceus.png
rename to src/afd/sprites/back/0493-000-Arceus.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Bug.png b/src/afd/sprites/back/0493-420-Arceus-Bug.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Bug.png
rename to src/afd/sprites/back/0493-420-Arceus-Bug.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Dark.png b/src/afd/sprites/back/0493-420-Arceus-Dark.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Dark.png
rename to src/afd/sprites/back/0493-420-Arceus-Dark.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Dragon.png b/src/afd/sprites/back/0493-420-Arceus-Dragon.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Dragon.png
rename to src/afd/sprites/back/0493-420-Arceus-Dragon.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Electric.png b/src/afd/sprites/back/0493-420-Arceus-Electric.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Electric.png
rename to src/afd/sprites/back/0493-420-Arceus-Electric.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Fairy.png b/src/afd/sprites/back/0493-420-Arceus-Fairy.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Fairy.png
rename to src/afd/sprites/back/0493-420-Arceus-Fairy.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Fighting.png b/src/afd/sprites/back/0493-420-Arceus-Fighting.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Fighting.png
rename to src/afd/sprites/back/0493-420-Arceus-Fighting.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Fire.png b/src/afd/sprites/back/0493-420-Arceus-Fire.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Fire.png
rename to src/afd/sprites/back/0493-420-Arceus-Fire.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Flying.png b/src/afd/sprites/back/0493-420-Arceus-Flying.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Flying.png
rename to src/afd/sprites/back/0493-420-Arceus-Flying.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Ghost.png b/src/afd/sprites/back/0493-420-Arceus-Ghost.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Ghost.png
rename to src/afd/sprites/back/0493-420-Arceus-Ghost.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Grass.png b/src/afd/sprites/back/0493-420-Arceus-Grass.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Grass.png
rename to src/afd/sprites/back/0493-420-Arceus-Grass.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Ground.png b/src/afd/sprites/back/0493-420-Arceus-Ground.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Ground.png
rename to src/afd/sprites/back/0493-420-Arceus-Ground.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Ice.png b/src/afd/sprites/back/0493-420-Arceus-Ice.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Ice.png
rename to src/afd/sprites/back/0493-420-Arceus-Ice.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Poison.png b/src/afd/sprites/back/0493-420-Arceus-Poison.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Poison.png
rename to src/afd/sprites/back/0493-420-Arceus-Poison.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Psychic.png b/src/afd/sprites/back/0493-420-Arceus-Psychic.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Psychic.png
rename to src/afd/sprites/back/0493-420-Arceus-Psychic.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Rock.png b/src/afd/sprites/back/0493-420-Arceus-Rock.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Rock.png
rename to src/afd/sprites/back/0493-420-Arceus-Rock.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Steel.png b/src/afd/sprites/back/0493-420-Arceus-Steel.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Steel.png
rename to src/afd/sprites/back/0493-420-Arceus-Steel.png
diff --git a/src/afd/sprites/back/0493--420--Arceus--Water.png b/src/afd/sprites/back/0493-420-Arceus-Water.png
similarity index 100%
rename from src/afd/sprites/back/0493--420--Arceus--Water.png
rename to src/afd/sprites/back/0493-420-Arceus-Water.png
diff --git a/src/afd/sprites/back/0494--000--Victini.png b/src/afd/sprites/back/0494-000-Victini.png
similarity index 100%
rename from src/afd/sprites/back/0494--000--Victini.png
rename to src/afd/sprites/back/0494-000-Victini.png
diff --git a/src/afd/sprites/back/0495--000--Snivy.png b/src/afd/sprites/back/0495-000-Snivy.png
similarity index 100%
rename from src/afd/sprites/back/0495--000--Snivy.png
rename to src/afd/sprites/back/0495-000-Snivy.png
diff --git a/src/afd/sprites/back/0496--000--Servine.png b/src/afd/sprites/back/0496-000-Servine.png
similarity index 100%
rename from src/afd/sprites/back/0496--000--Servine.png
rename to src/afd/sprites/back/0496-000-Servine.png
diff --git a/src/afd/sprites/back/0497--000--Serperior.png b/src/afd/sprites/back/0497-000-Serperior.png
similarity index 100%
rename from src/afd/sprites/back/0497--000--Serperior.png
rename to src/afd/sprites/back/0497-000-Serperior.png
diff --git a/src/afd/sprites/back/0498--000--Tepig.png b/src/afd/sprites/back/0498-000-Tepig.png
similarity index 100%
rename from src/afd/sprites/back/0498--000--Tepig.png
rename to src/afd/sprites/back/0498-000-Tepig.png
diff --git a/src/afd/sprites/back/0499--000--Pignite.png b/src/afd/sprites/back/0499-000-Pignite.png
similarity index 100%
rename from src/afd/sprites/back/0499--000--Pignite.png
rename to src/afd/sprites/back/0499-000-Pignite.png
diff --git a/src/afd/sprites/back/0500--000--Emboar.png b/src/afd/sprites/back/0500-000-Emboar.png
similarity index 100%
rename from src/afd/sprites/back/0500--000--Emboar.png
rename to src/afd/sprites/back/0500-000-Emboar.png
diff --git a/src/afd/sprites/back/0501--000--Oshawott.png b/src/afd/sprites/back/0501-000-Oshawott.png
similarity index 100%
rename from src/afd/sprites/back/0501--000--Oshawott.png
rename to src/afd/sprites/back/0501-000-Oshawott.png
diff --git a/src/afd/sprites/back/0502--000--Dewott.png b/src/afd/sprites/back/0502-000-Dewott.png
similarity index 100%
rename from src/afd/sprites/back/0502--000--Dewott.png
rename to src/afd/sprites/back/0502-000-Dewott.png
diff --git a/src/afd/sprites/back/0503--000--Samurott.png b/src/afd/sprites/back/0503-000-Samurott.png
similarity index 100%
rename from src/afd/sprites/back/0503--000--Samurott.png
rename to src/afd/sprites/back/0503-000-Samurott.png
diff --git a/src/afd/sprites/back/0504--000--Patrat.png b/src/afd/sprites/back/0504-000-Patrat.png
similarity index 100%
rename from src/afd/sprites/back/0504--000--Patrat.png
rename to src/afd/sprites/back/0504-000-Patrat.png
diff --git a/src/afd/sprites/back/0505--000--Watchog.png b/src/afd/sprites/back/0505-000-Watchog.png
similarity index 100%
rename from src/afd/sprites/back/0505--000--Watchog.png
rename to src/afd/sprites/back/0505-000-Watchog.png
diff --git a/src/afd/sprites/back/0506--000--Lillipup.png b/src/afd/sprites/back/0506-000-Lillipup.png
similarity index 100%
rename from src/afd/sprites/back/0506--000--Lillipup.png
rename to src/afd/sprites/back/0506-000-Lillipup.png
diff --git a/src/afd/sprites/back/0507--000--Herdier.png b/src/afd/sprites/back/0507-000-Herdier.png
similarity index 100%
rename from src/afd/sprites/back/0507--000--Herdier.png
rename to src/afd/sprites/back/0507-000-Herdier.png
diff --git a/src/afd/sprites/back/0508--000--Stoutland.png b/src/afd/sprites/back/0508-000-Stoutland.png
similarity index 100%
rename from src/afd/sprites/back/0508--000--Stoutland.png
rename to src/afd/sprites/back/0508-000-Stoutland.png
diff --git a/src/afd/sprites/back/0509--000--Purrloin.png b/src/afd/sprites/back/0509-000-Purrloin.png
similarity index 100%
rename from src/afd/sprites/back/0509--000--Purrloin.png
rename to src/afd/sprites/back/0509-000-Purrloin.png
diff --git a/src/afd/sprites/back/0510--000--Liepard.png b/src/afd/sprites/back/0510-000-Liepard.png
similarity index 100%
rename from src/afd/sprites/back/0510--000--Liepard.png
rename to src/afd/sprites/back/0510-000-Liepard.png
diff --git a/src/afd/sprites/back/0511--000--Pansage.png b/src/afd/sprites/back/0511-000-Pansage.png
similarity index 100%
rename from src/afd/sprites/back/0511--000--Pansage.png
rename to src/afd/sprites/back/0511-000-Pansage.png
diff --git a/src/afd/sprites/back/0512--000--Simisage.png b/src/afd/sprites/back/0512-000-Simisage.png
similarity index 100%
rename from src/afd/sprites/back/0512--000--Simisage.png
rename to src/afd/sprites/back/0512-000-Simisage.png
diff --git a/src/afd/sprites/back/0513--000--Pansear.png b/src/afd/sprites/back/0513-000-Pansear.png
similarity index 100%
rename from src/afd/sprites/back/0513--000--Pansear.png
rename to src/afd/sprites/back/0513-000-Pansear.png
diff --git a/src/afd/sprites/back/0514--000--Simisear.png b/src/afd/sprites/back/0514-000-Simisear.png
similarity index 100%
rename from src/afd/sprites/back/0514--000--Simisear.png
rename to src/afd/sprites/back/0514-000-Simisear.png
diff --git a/src/afd/sprites/back/0515--000--Panpour.png b/src/afd/sprites/back/0515-000-Panpour.png
similarity index 100%
rename from src/afd/sprites/back/0515--000--Panpour.png
rename to src/afd/sprites/back/0515-000-Panpour.png
diff --git a/src/afd/sprites/back/0516--000--Simipour.png b/src/afd/sprites/back/0516-000-Simipour.png
similarity index 100%
rename from src/afd/sprites/back/0516--000--Simipour.png
rename to src/afd/sprites/back/0516-000-Simipour.png
diff --git a/src/afd/sprites/back/0517--000--Munna.png b/src/afd/sprites/back/0517-000-Munna.png
similarity index 100%
rename from src/afd/sprites/back/0517--000--Munna.png
rename to src/afd/sprites/back/0517-000-Munna.png
diff --git a/src/afd/sprites/back/0518--000--Musharna.png b/src/afd/sprites/back/0518-000-Musharna.png
similarity index 100%
rename from src/afd/sprites/back/0518--000--Musharna.png
rename to src/afd/sprites/back/0518-000-Musharna.png
diff --git a/src/afd/sprites/back/0519--000--Pidove.png b/src/afd/sprites/back/0519-000-Pidove.png
similarity index 100%
rename from src/afd/sprites/back/0519--000--Pidove.png
rename to src/afd/sprites/back/0519-000-Pidove.png
diff --git a/src/afd/sprites/back/0520--000--Tranquill.png b/src/afd/sprites/back/0520-000-Tranquill.png
similarity index 100%
rename from src/afd/sprites/back/0520--000--Tranquill.png
rename to src/afd/sprites/back/0520-000-Tranquill.png
diff --git a/src/afd/sprites/back/0521--000--Unfezant.png b/src/afd/sprites/back/0521-000-Unfezant.png
similarity index 100%
rename from src/afd/sprites/back/0521--000--Unfezant.png
rename to src/afd/sprites/back/0521-000-Unfezant.png
diff --git a/src/afd/sprites/back/0522--000--Blitzle.png b/src/afd/sprites/back/0522-000-Blitzle.png
similarity index 100%
rename from src/afd/sprites/back/0522--000--Blitzle.png
rename to src/afd/sprites/back/0522-000-Blitzle.png
diff --git a/src/afd/sprites/back/0523--000--Zebstrika.png b/src/afd/sprites/back/0523-000-Zebstrika.png
similarity index 100%
rename from src/afd/sprites/back/0523--000--Zebstrika.png
rename to src/afd/sprites/back/0523-000-Zebstrika.png
diff --git a/src/afd/sprites/back/0524--000--Roggenrola.png b/src/afd/sprites/back/0524-000-Roggenrola.png
similarity index 100%
rename from src/afd/sprites/back/0524--000--Roggenrola.png
rename to src/afd/sprites/back/0524-000-Roggenrola.png
diff --git a/src/afd/sprites/back/0525--000--Boldore.png b/src/afd/sprites/back/0525-000-Boldore.png
similarity index 100%
rename from src/afd/sprites/back/0525--000--Boldore.png
rename to src/afd/sprites/back/0525-000-Boldore.png
diff --git a/src/afd/sprites/back/0526--000--Gigalith.png b/src/afd/sprites/back/0526-000-Gigalith.png
similarity index 100%
rename from src/afd/sprites/back/0526--000--Gigalith.png
rename to src/afd/sprites/back/0526-000-Gigalith.png
diff --git a/src/afd/sprites/back/0527--000--Woobat.png b/src/afd/sprites/back/0527-000-Woobat.png
similarity index 100%
rename from src/afd/sprites/back/0527--000--Woobat.png
rename to src/afd/sprites/back/0527-000-Woobat.png
diff --git a/src/afd/sprites/back/0528--000--Swoobat.png b/src/afd/sprites/back/0528-000-Swoobat.png
similarity index 100%
rename from src/afd/sprites/back/0528--000--Swoobat.png
rename to src/afd/sprites/back/0528-000-Swoobat.png
diff --git a/src/afd/sprites/back/0529--000--Drilbur.png b/src/afd/sprites/back/0529-000-Drilbur.png
similarity index 100%
rename from src/afd/sprites/back/0529--000--Drilbur.png
rename to src/afd/sprites/back/0529-000-Drilbur.png
diff --git a/src/afd/sprites/back/0530--000--Excadrill.png b/src/afd/sprites/back/0530-000-Excadrill.png
similarity index 100%
rename from src/afd/sprites/back/0530--000--Excadrill.png
rename to src/afd/sprites/back/0530-000-Excadrill.png
diff --git a/src/afd/sprites/back/0531--000--Audino.png b/src/afd/sprites/back/0531-000-Audino.png
similarity index 100%
rename from src/afd/sprites/back/0531--000--Audino.png
rename to src/afd/sprites/back/0531-000-Audino.png
diff --git a/src/afd/sprites/back/0531--420--Audino--Mega.png b/src/afd/sprites/back/0531-420-Audino-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0531--420--Audino--Mega.png
rename to src/afd/sprites/back/0531-420-Audino-Mega.png
diff --git a/src/afd/sprites/back/0532--000--Timburr.png b/src/afd/sprites/back/0532-000-Timburr.png
similarity index 100%
rename from src/afd/sprites/back/0532--000--Timburr.png
rename to src/afd/sprites/back/0532-000-Timburr.png
diff --git a/src/afd/sprites/back/0533--000--Gurdurr.png b/src/afd/sprites/back/0533-000-Gurdurr.png
similarity index 100%
rename from src/afd/sprites/back/0533--000--Gurdurr.png
rename to src/afd/sprites/back/0533-000-Gurdurr.png
diff --git a/src/afd/sprites/back/0534--000--Conkeldurr.png b/src/afd/sprites/back/0534-000-Conkeldurr.png
similarity index 100%
rename from src/afd/sprites/back/0534--000--Conkeldurr.png
rename to src/afd/sprites/back/0534-000-Conkeldurr.png
diff --git a/src/afd/sprites/back/0535--000--Tympole.png b/src/afd/sprites/back/0535-000-Tympole.png
similarity index 100%
rename from src/afd/sprites/back/0535--000--Tympole.png
rename to src/afd/sprites/back/0535-000-Tympole.png
diff --git a/src/afd/sprites/back/0536--000--Palpitoad.png b/src/afd/sprites/back/0536-000-Palpitoad.png
similarity index 100%
rename from src/afd/sprites/back/0536--000--Palpitoad.png
rename to src/afd/sprites/back/0536-000-Palpitoad.png
diff --git a/src/afd/sprites/back/0537--000--Seismitoad.png b/src/afd/sprites/back/0537-000-Seismitoad.png
similarity index 100%
rename from src/afd/sprites/back/0537--000--Seismitoad.png
rename to src/afd/sprites/back/0537-000-Seismitoad.png
diff --git a/src/afd/sprites/back/0538--000--Throh.png b/src/afd/sprites/back/0538-000-Throh.png
similarity index 100%
rename from src/afd/sprites/back/0538--000--Throh.png
rename to src/afd/sprites/back/0538-000-Throh.png
diff --git a/src/afd/sprites/back/0539--000--Sawk.png b/src/afd/sprites/back/0539-000-Sawk.png
similarity index 100%
rename from src/afd/sprites/back/0539--000--Sawk.png
rename to src/afd/sprites/back/0539-000-Sawk.png
diff --git a/src/afd/sprites/back/0540--000--Sewaddle.png b/src/afd/sprites/back/0540-000-Sewaddle.png
similarity index 100%
rename from src/afd/sprites/back/0540--000--Sewaddle.png
rename to src/afd/sprites/back/0540-000-Sewaddle.png
diff --git a/src/afd/sprites/back/0541--000--Swadloon.png b/src/afd/sprites/back/0541-000-Swadloon.png
similarity index 100%
rename from src/afd/sprites/back/0541--000--Swadloon.png
rename to src/afd/sprites/back/0541-000-Swadloon.png
diff --git a/src/afd/sprites/back/0542--000--Leavanny.png b/src/afd/sprites/back/0542-000-Leavanny.png
similarity index 100%
rename from src/afd/sprites/back/0542--000--Leavanny.png
rename to src/afd/sprites/back/0542-000-Leavanny.png
diff --git a/src/afd/sprites/back/0543--000--Venipede.png b/src/afd/sprites/back/0543-000-Venipede.png
similarity index 100%
rename from src/afd/sprites/back/0543--000--Venipede.png
rename to src/afd/sprites/back/0543-000-Venipede.png
diff --git a/src/afd/sprites/back/0544--000--Whirlipede.png b/src/afd/sprites/back/0544-000-Whirlipede.png
similarity index 100%
rename from src/afd/sprites/back/0544--000--Whirlipede.png
rename to src/afd/sprites/back/0544-000-Whirlipede.png
diff --git a/src/afd/sprites/back/0545--000--Scolipede.png b/src/afd/sprites/back/0545-000-Scolipede.png
similarity index 100%
rename from src/afd/sprites/back/0545--000--Scolipede.png
rename to src/afd/sprites/back/0545-000-Scolipede.png
diff --git a/src/afd/sprites/back/0546--000--Cottonee.png b/src/afd/sprites/back/0546-000-Cottonee.png
similarity index 100%
rename from src/afd/sprites/back/0546--000--Cottonee.png
rename to src/afd/sprites/back/0546-000-Cottonee.png
diff --git a/src/afd/sprites/back/0547--000--Whimsicott.png b/src/afd/sprites/back/0547-000-Whimsicott.png
similarity index 100%
rename from src/afd/sprites/back/0547--000--Whimsicott.png
rename to src/afd/sprites/back/0547-000-Whimsicott.png
diff --git a/src/afd/sprites/back/0548--000--Petilil.png b/src/afd/sprites/back/0548-000-Petilil.png
similarity index 100%
rename from src/afd/sprites/back/0548--000--Petilil.png
rename to src/afd/sprites/back/0548-000-Petilil.png
diff --git a/src/afd/sprites/back/0549--000--Lilligant.png b/src/afd/sprites/back/0549-000-Lilligant.png
similarity index 100%
rename from src/afd/sprites/back/0549--000--Lilligant.png
rename to src/afd/sprites/back/0549-000-Lilligant.png
diff --git a/src/afd/sprites/back/0550--000--Basculin.png b/src/afd/sprites/back/0550-000-Basculin.png
similarity index 100%
rename from src/afd/sprites/back/0550--000--Basculin.png
rename to src/afd/sprites/back/0550-000-Basculin.png
diff --git a/src/afd/sprites/back/0550--420--Basculin--Blue-Striped.png b/src/afd/sprites/back/0550-420-Basculin-Blue~Striped.png
similarity index 100%
rename from src/afd/sprites/back/0550--420--Basculin--Blue-Striped.png
rename to src/afd/sprites/back/0550-420-Basculin-Blue~Striped.png
diff --git a/src/afd/sprites/back/0551--000--Sandile.png b/src/afd/sprites/back/0551-000-Sandile.png
similarity index 100%
rename from src/afd/sprites/back/0551--000--Sandile.png
rename to src/afd/sprites/back/0551-000-Sandile.png
diff --git a/src/afd/sprites/back/0552--000--Krokorok.png b/src/afd/sprites/back/0552-000-Krokorok.png
similarity index 100%
rename from src/afd/sprites/back/0552--000--Krokorok.png
rename to src/afd/sprites/back/0552-000-Krokorok.png
diff --git a/src/afd/sprites/back/0553--000--Krookodile.png b/src/afd/sprites/back/0553-000-Krookodile.png
similarity index 100%
rename from src/afd/sprites/back/0553--000--Krookodile.png
rename to src/afd/sprites/back/0553-000-Krookodile.png
diff --git a/src/afd/sprites/back/0554--000--Darumaka.png b/src/afd/sprites/back/0554-000-Darumaka.png
similarity index 100%
rename from src/afd/sprites/back/0554--000--Darumaka.png
rename to src/afd/sprites/back/0554-000-Darumaka.png
diff --git a/src/afd/sprites/back/0554--420--Darumaka--Galar.png b/src/afd/sprites/back/0554-420-Darumaka-Galar.png
similarity index 100%
rename from src/afd/sprites/back/0554--420--Darumaka--Galar.png
rename to src/afd/sprites/back/0554-420-Darumaka-Galar.png
diff --git a/src/afd/sprites/back/0555--000--Darmanitan.png b/src/afd/sprites/back/0555-000-Darmanitan.png
similarity index 100%
rename from src/afd/sprites/back/0555--000--Darmanitan.png
rename to src/afd/sprites/back/0555-000-Darmanitan.png
diff --git a/src/afd/sprites/back/0555--420--Darmanitan--Galar.png b/src/afd/sprites/back/0555-420-Darmanitan-Galar.png
similarity index 100%
rename from src/afd/sprites/back/0555--420--Darmanitan--Galar.png
rename to src/afd/sprites/back/0555-420-Darmanitan-Galar.png
diff --git a/src/afd/sprites/back/0555--420--Darmanitan--Galar-Zen.png b/src/afd/sprites/back/0555-420-Darmanitan-Galar~Zen.png
similarity index 100%
rename from src/afd/sprites/back/0555--420--Darmanitan--Galar-Zen.png
rename to src/afd/sprites/back/0555-420-Darmanitan-Galar~Zen.png
diff --git a/src/afd/sprites/back/0555--420--Darmanitan--Zen.png b/src/afd/sprites/back/0555-420-Darmanitan-Zen.png
similarity index 100%
rename from src/afd/sprites/back/0555--420--Darmanitan--Zen.png
rename to src/afd/sprites/back/0555-420-Darmanitan-Zen.png
diff --git a/src/afd/sprites/back/0556--000--Maractus.png b/src/afd/sprites/back/0556-000-Maractus.png
similarity index 100%
rename from src/afd/sprites/back/0556--000--Maractus.png
rename to src/afd/sprites/back/0556-000-Maractus.png
diff --git a/src/afd/sprites/back/0557--000--Dwebble.png b/src/afd/sprites/back/0557-000-Dwebble.png
similarity index 100%
rename from src/afd/sprites/back/0557--000--Dwebble.png
rename to src/afd/sprites/back/0557-000-Dwebble.png
diff --git a/src/afd/sprites/back/0558--000--Crustle.png b/src/afd/sprites/back/0558-000-Crustle.png
similarity index 100%
rename from src/afd/sprites/back/0558--000--Crustle.png
rename to src/afd/sprites/back/0558-000-Crustle.png
diff --git a/src/afd/sprites/back/0559--000--Scraggy.png b/src/afd/sprites/back/0559-000-Scraggy.png
similarity index 100%
rename from src/afd/sprites/back/0559--000--Scraggy.png
rename to src/afd/sprites/back/0559-000-Scraggy.png
diff --git a/src/afd/sprites/back/0560--000--Scrafty.png b/src/afd/sprites/back/0560-000-Scrafty.png
similarity index 100%
rename from src/afd/sprites/back/0560--000--Scrafty.png
rename to src/afd/sprites/back/0560-000-Scrafty.png
diff --git a/src/afd/sprites/back/0561--000--Sigilyph.png b/src/afd/sprites/back/0561-000-Sigilyph.png
similarity index 100%
rename from src/afd/sprites/back/0561--000--Sigilyph.png
rename to src/afd/sprites/back/0561-000-Sigilyph.png
diff --git a/src/afd/sprites/back/0562--000--Yamask.png b/src/afd/sprites/back/0562-000-Yamask.png
similarity index 100%
rename from src/afd/sprites/back/0562--000--Yamask.png
rename to src/afd/sprites/back/0562-000-Yamask.png
diff --git a/src/afd/sprites/back/0562--420--Yamask--Galar.png b/src/afd/sprites/back/0562-420-Yamask-Galar.png
similarity index 100%
rename from src/afd/sprites/back/0562--420--Yamask--Galar.png
rename to src/afd/sprites/back/0562-420-Yamask-Galar.png
diff --git a/src/afd/sprites/back/0563--000--Cofagrigus.png b/src/afd/sprites/back/0563-000-Cofagrigus.png
similarity index 100%
rename from src/afd/sprites/back/0563--000--Cofagrigus.png
rename to src/afd/sprites/back/0563-000-Cofagrigus.png
diff --git a/src/afd/sprites/back/0564--000--Tirtouga.png b/src/afd/sprites/back/0564-000-Tirtouga.png
similarity index 100%
rename from src/afd/sprites/back/0564--000--Tirtouga.png
rename to src/afd/sprites/back/0564-000-Tirtouga.png
diff --git a/src/afd/sprites/back/0565--000--Carracosta.png b/src/afd/sprites/back/0565-000-Carracosta.png
similarity index 100%
rename from src/afd/sprites/back/0565--000--Carracosta.png
rename to src/afd/sprites/back/0565-000-Carracosta.png
diff --git a/src/afd/sprites/back/0566--000--Archen.png b/src/afd/sprites/back/0566-000-Archen.png
similarity index 100%
rename from src/afd/sprites/back/0566--000--Archen.png
rename to src/afd/sprites/back/0566-000-Archen.png
diff --git a/src/afd/sprites/back/0567--000--Archeops.png b/src/afd/sprites/back/0567-000-Archeops.png
similarity index 100%
rename from src/afd/sprites/back/0567--000--Archeops.png
rename to src/afd/sprites/back/0567-000-Archeops.png
diff --git a/src/afd/sprites/back/0568--000--Trubbish.png b/src/afd/sprites/back/0568-000-Trubbish.png
similarity index 100%
rename from src/afd/sprites/back/0568--000--Trubbish.png
rename to src/afd/sprites/back/0568-000-Trubbish.png
diff --git a/src/afd/sprites/back/0569--000--Garbodor.png b/src/afd/sprites/back/0569-000-Garbodor.png
similarity index 100%
rename from src/afd/sprites/back/0569--000--Garbodor.png
rename to src/afd/sprites/back/0569-000-Garbodor.png
diff --git a/src/afd/sprites/back/0569--420--Garbodor--Gmax.png b/src/afd/sprites/back/0569-420-Garbodor-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0569--420--Garbodor--Gmax.png
rename to src/afd/sprites/back/0569-420-Garbodor-Gmax.png
diff --git a/src/afd/sprites/back/0570--000--Zorua.png b/src/afd/sprites/back/0570-000-Zorua.png
similarity index 100%
rename from src/afd/sprites/back/0570--000--Zorua.png
rename to src/afd/sprites/back/0570-000-Zorua.png
diff --git a/src/afd/sprites/back/0571--000--Zoroark.png b/src/afd/sprites/back/0571-000-Zoroark.png
similarity index 100%
rename from src/afd/sprites/back/0571--000--Zoroark.png
rename to src/afd/sprites/back/0571-000-Zoroark.png
diff --git a/src/afd/sprites/back/0572--000--Minccino.png b/src/afd/sprites/back/0572-000-Minccino.png
similarity index 100%
rename from src/afd/sprites/back/0572--000--Minccino.png
rename to src/afd/sprites/back/0572-000-Minccino.png
diff --git a/src/afd/sprites/back/0573--000--Cinccino.png b/src/afd/sprites/back/0573-000-Cinccino.png
similarity index 100%
rename from src/afd/sprites/back/0573--000--Cinccino.png
rename to src/afd/sprites/back/0573-000-Cinccino.png
diff --git a/src/afd/sprites/back/0574--000--Gothita.png b/src/afd/sprites/back/0574-000-Gothita.png
similarity index 100%
rename from src/afd/sprites/back/0574--000--Gothita.png
rename to src/afd/sprites/back/0574-000-Gothita.png
diff --git a/src/afd/sprites/back/0575--000--Gothorita.png b/src/afd/sprites/back/0575-000-Gothorita.png
similarity index 100%
rename from src/afd/sprites/back/0575--000--Gothorita.png
rename to src/afd/sprites/back/0575-000-Gothorita.png
diff --git a/src/afd/sprites/back/0576--000--Gothitelle.png b/src/afd/sprites/back/0576-000-Gothitelle.png
similarity index 100%
rename from src/afd/sprites/back/0576--000--Gothitelle.png
rename to src/afd/sprites/back/0576-000-Gothitelle.png
diff --git a/src/afd/sprites/back/0577--000--Solosis.png b/src/afd/sprites/back/0577-000-Solosis.png
similarity index 100%
rename from src/afd/sprites/back/0577--000--Solosis.png
rename to src/afd/sprites/back/0577-000-Solosis.png
diff --git a/src/afd/sprites/back/0578--000--Duosion.png b/src/afd/sprites/back/0578-000-Duosion.png
similarity index 100%
rename from src/afd/sprites/back/0578--000--Duosion.png
rename to src/afd/sprites/back/0578-000-Duosion.png
diff --git a/src/afd/sprites/back/0579--000--Reuniclus.png b/src/afd/sprites/back/0579-000-Reuniclus.png
similarity index 100%
rename from src/afd/sprites/back/0579--000--Reuniclus.png
rename to src/afd/sprites/back/0579-000-Reuniclus.png
diff --git a/src/afd/sprites/back/0580--000--Ducklett.png b/src/afd/sprites/back/0580-000-Ducklett.png
similarity index 100%
rename from src/afd/sprites/back/0580--000--Ducklett.png
rename to src/afd/sprites/back/0580-000-Ducklett.png
diff --git a/src/afd/sprites/back/0581--000--Swanna.png b/src/afd/sprites/back/0581-000-Swanna.png
similarity index 100%
rename from src/afd/sprites/back/0581--000--Swanna.png
rename to src/afd/sprites/back/0581-000-Swanna.png
diff --git a/src/afd/sprites/back/0582--000--Vanillite.png b/src/afd/sprites/back/0582-000-Vanillite.png
similarity index 100%
rename from src/afd/sprites/back/0582--000--Vanillite.png
rename to src/afd/sprites/back/0582-000-Vanillite.png
diff --git a/src/afd/sprites/back/0583--000--Vanillish.png b/src/afd/sprites/back/0583-000-Vanillish.png
similarity index 100%
rename from src/afd/sprites/back/0583--000--Vanillish.png
rename to src/afd/sprites/back/0583-000-Vanillish.png
diff --git a/src/afd/sprites/back/0584--000--Vanilluxe.png b/src/afd/sprites/back/0584-000-Vanilluxe.png
similarity index 100%
rename from src/afd/sprites/back/0584--000--Vanilluxe.png
rename to src/afd/sprites/back/0584-000-Vanilluxe.png
diff --git a/src/afd/sprites/back/0585--000--Deerling.png b/src/afd/sprites/back/0585-000-Deerling.png
similarity index 100%
rename from src/afd/sprites/back/0585--000--Deerling.png
rename to src/afd/sprites/back/0585-000-Deerling.png
diff --git a/src/afd/sprites/back/0586--000--Sawsbuck.png b/src/afd/sprites/back/0586-000-Sawsbuck.png
similarity index 100%
rename from src/afd/sprites/back/0586--000--Sawsbuck.png
rename to src/afd/sprites/back/0586-000-Sawsbuck.png
diff --git a/src/afd/sprites/back/0587--000--Emolga.png b/src/afd/sprites/back/0587-000-Emolga.png
similarity index 100%
rename from src/afd/sprites/back/0587--000--Emolga.png
rename to src/afd/sprites/back/0587-000-Emolga.png
diff --git a/src/afd/sprites/back/0588--000--Karrablast.png b/src/afd/sprites/back/0588-000-Karrablast.png
similarity index 100%
rename from src/afd/sprites/back/0588--000--Karrablast.png
rename to src/afd/sprites/back/0588-000-Karrablast.png
diff --git a/src/afd/sprites/back/0589--000--Escavalier.png b/src/afd/sprites/back/0589-000-Escavalier.png
similarity index 100%
rename from src/afd/sprites/back/0589--000--Escavalier.png
rename to src/afd/sprites/back/0589-000-Escavalier.png
diff --git a/src/afd/sprites/back/0590--000--Foongus.png b/src/afd/sprites/back/0590-000-Foongus.png
similarity index 100%
rename from src/afd/sprites/back/0590--000--Foongus.png
rename to src/afd/sprites/back/0590-000-Foongus.png
diff --git a/src/afd/sprites/back/0591--000--Amoonguss.png b/src/afd/sprites/back/0591-000-Amoonguss.png
similarity index 100%
rename from src/afd/sprites/back/0591--000--Amoonguss.png
rename to src/afd/sprites/back/0591-000-Amoonguss.png
diff --git a/src/afd/sprites/back/0592--000--Frillish.png b/src/afd/sprites/back/0592-000-Frillish.png
similarity index 100%
rename from src/afd/sprites/back/0592--000--Frillish.png
rename to src/afd/sprites/back/0592-000-Frillish.png
diff --git a/src/afd/sprites/back/0593--000--Jellicent.png b/src/afd/sprites/back/0593-000-Jellicent.png
similarity index 100%
rename from src/afd/sprites/back/0593--000--Jellicent.png
rename to src/afd/sprites/back/0593-000-Jellicent.png
diff --git a/src/afd/sprites/back/0594--000--Alomomola.png b/src/afd/sprites/back/0594-000-Alomomola.png
similarity index 100%
rename from src/afd/sprites/back/0594--000--Alomomola.png
rename to src/afd/sprites/back/0594-000-Alomomola.png
diff --git a/src/afd/sprites/back/0595--000--Joltik.png b/src/afd/sprites/back/0595-000-Joltik.png
similarity index 100%
rename from src/afd/sprites/back/0595--000--Joltik.png
rename to src/afd/sprites/back/0595-000-Joltik.png
diff --git a/src/afd/sprites/back/0596--000--Galvantula.png b/src/afd/sprites/back/0596-000-Galvantula.png
similarity index 100%
rename from src/afd/sprites/back/0596--000--Galvantula.png
rename to src/afd/sprites/back/0596-000-Galvantula.png
diff --git a/src/afd/sprites/back/0597--000--Ferroseed.png b/src/afd/sprites/back/0597-000-Ferroseed.png
similarity index 100%
rename from src/afd/sprites/back/0597--000--Ferroseed.png
rename to src/afd/sprites/back/0597-000-Ferroseed.png
diff --git a/src/afd/sprites/back/0598--000--Ferrothorn.png b/src/afd/sprites/back/0598-000-Ferrothorn.png
similarity index 100%
rename from src/afd/sprites/back/0598--000--Ferrothorn.png
rename to src/afd/sprites/back/0598-000-Ferrothorn.png
diff --git a/src/afd/sprites/back/0599--000--Klink.png b/src/afd/sprites/back/0599-000-Klink.png
similarity index 100%
rename from src/afd/sprites/back/0599--000--Klink.png
rename to src/afd/sprites/back/0599-000-Klink.png
diff --git a/src/afd/sprites/back/0600--000--Klang.png b/src/afd/sprites/back/0600-000-Klang.png
similarity index 100%
rename from src/afd/sprites/back/0600--000--Klang.png
rename to src/afd/sprites/back/0600-000-Klang.png
diff --git a/src/afd/sprites/back/0601--000--Klinklang.png b/src/afd/sprites/back/0601-000-Klinklang.png
similarity index 100%
rename from src/afd/sprites/back/0601--000--Klinklang.png
rename to src/afd/sprites/back/0601-000-Klinklang.png
diff --git a/src/afd/sprites/back/0602--000--Tynamo.png b/src/afd/sprites/back/0602-000-Tynamo.png
similarity index 100%
rename from src/afd/sprites/back/0602--000--Tynamo.png
rename to src/afd/sprites/back/0602-000-Tynamo.png
diff --git a/src/afd/sprites/back/0603--000--Eelektrik.png b/src/afd/sprites/back/0603-000-Eelektrik.png
similarity index 100%
rename from src/afd/sprites/back/0603--000--Eelektrik.png
rename to src/afd/sprites/back/0603-000-Eelektrik.png
diff --git a/src/afd/sprites/back/0604--000--Eelektross.png b/src/afd/sprites/back/0604-000-Eelektross.png
similarity index 100%
rename from src/afd/sprites/back/0604--000--Eelektross.png
rename to src/afd/sprites/back/0604-000-Eelektross.png
diff --git a/src/afd/sprites/back/0605--000--Elgyem.png b/src/afd/sprites/back/0605-000-Elgyem.png
similarity index 100%
rename from src/afd/sprites/back/0605--000--Elgyem.png
rename to src/afd/sprites/back/0605-000-Elgyem.png
diff --git a/src/afd/sprites/back/0606--000--Beheeyem.png b/src/afd/sprites/back/0606-000-Beheeyem.png
similarity index 100%
rename from src/afd/sprites/back/0606--000--Beheeyem.png
rename to src/afd/sprites/back/0606-000-Beheeyem.png
diff --git a/src/afd/sprites/back/0607--000--Litwick.png b/src/afd/sprites/back/0607-000-Litwick.png
similarity index 100%
rename from src/afd/sprites/back/0607--000--Litwick.png
rename to src/afd/sprites/back/0607-000-Litwick.png
diff --git a/src/afd/sprites/back/0608--000--Lampent.png b/src/afd/sprites/back/0608-000-Lampent.png
similarity index 100%
rename from src/afd/sprites/back/0608--000--Lampent.png
rename to src/afd/sprites/back/0608-000-Lampent.png
diff --git a/src/afd/sprites/back/0609--000--Chandelure.png b/src/afd/sprites/back/0609-000-Chandelure.png
similarity index 100%
rename from src/afd/sprites/back/0609--000--Chandelure.png
rename to src/afd/sprites/back/0609-000-Chandelure.png
diff --git a/src/afd/sprites/back/0610--000--Axew.png b/src/afd/sprites/back/0610-000-Axew.png
similarity index 100%
rename from src/afd/sprites/back/0610--000--Axew.png
rename to src/afd/sprites/back/0610-000-Axew.png
diff --git a/src/afd/sprites/back/0611--000--Fraxure.png b/src/afd/sprites/back/0611-000-Fraxure.png
similarity index 100%
rename from src/afd/sprites/back/0611--000--Fraxure.png
rename to src/afd/sprites/back/0611-000-Fraxure.png
diff --git a/src/afd/sprites/back/0612--000--Haxorus.png b/src/afd/sprites/back/0612-000-Haxorus.png
similarity index 100%
rename from src/afd/sprites/back/0612--000--Haxorus.png
rename to src/afd/sprites/back/0612-000-Haxorus.png
diff --git a/src/afd/sprites/back/0613--000--Cubchoo.png b/src/afd/sprites/back/0613-000-Cubchoo.png
similarity index 100%
rename from src/afd/sprites/back/0613--000--Cubchoo.png
rename to src/afd/sprites/back/0613-000-Cubchoo.png
diff --git a/src/afd/sprites/back/0614--000--Beartic.png b/src/afd/sprites/back/0614-000-Beartic.png
similarity index 100%
rename from src/afd/sprites/back/0614--000--Beartic.png
rename to src/afd/sprites/back/0614-000-Beartic.png
diff --git a/src/afd/sprites/back/0615--000--Cryogonal.png b/src/afd/sprites/back/0615-000-Cryogonal.png
similarity index 100%
rename from src/afd/sprites/back/0615--000--Cryogonal.png
rename to src/afd/sprites/back/0615-000-Cryogonal.png
diff --git a/src/afd/sprites/back/0616--000--Shelmet.png b/src/afd/sprites/back/0616-000-Shelmet.png
similarity index 100%
rename from src/afd/sprites/back/0616--000--Shelmet.png
rename to src/afd/sprites/back/0616-000-Shelmet.png
diff --git a/src/afd/sprites/back/0617--000--Accelgor.png b/src/afd/sprites/back/0617-000-Accelgor.png
similarity index 100%
rename from src/afd/sprites/back/0617--000--Accelgor.png
rename to src/afd/sprites/back/0617-000-Accelgor.png
diff --git a/src/afd/sprites/back/0618--000--Stunfisk.png b/src/afd/sprites/back/0618-000-Stunfisk.png
similarity index 100%
rename from src/afd/sprites/back/0618--000--Stunfisk.png
rename to src/afd/sprites/back/0618-000-Stunfisk.png
diff --git a/src/afd/sprites/back/0618--420--Stunfisk--Galar.png b/src/afd/sprites/back/0618-420-Stunfisk-Galar.png
similarity index 100%
rename from src/afd/sprites/back/0618--420--Stunfisk--Galar.png
rename to src/afd/sprites/back/0618-420-Stunfisk-Galar.png
diff --git a/src/afd/sprites/back/0619--000--Mienfoo.png b/src/afd/sprites/back/0619-000-Mienfoo.png
similarity index 100%
rename from src/afd/sprites/back/0619--000--Mienfoo.png
rename to src/afd/sprites/back/0619-000-Mienfoo.png
diff --git a/src/afd/sprites/back/0620--000--Mienshao.png b/src/afd/sprites/back/0620-000-Mienshao.png
similarity index 100%
rename from src/afd/sprites/back/0620--000--Mienshao.png
rename to src/afd/sprites/back/0620-000-Mienshao.png
diff --git a/src/afd/sprites/back/0621--000--Druddigon.png b/src/afd/sprites/back/0621-000-Druddigon.png
similarity index 100%
rename from src/afd/sprites/back/0621--000--Druddigon.png
rename to src/afd/sprites/back/0621-000-Druddigon.png
diff --git a/src/afd/sprites/back/0622--000--Golett.png b/src/afd/sprites/back/0622-000-Golett.png
similarity index 100%
rename from src/afd/sprites/back/0622--000--Golett.png
rename to src/afd/sprites/back/0622-000-Golett.png
diff --git a/src/afd/sprites/back/0623--000--Golurk.png b/src/afd/sprites/back/0623-000-Golurk.png
similarity index 100%
rename from src/afd/sprites/back/0623--000--Golurk.png
rename to src/afd/sprites/back/0623-000-Golurk.png
diff --git a/src/afd/sprites/back/0624--000--Pawniard.png b/src/afd/sprites/back/0624-000-Pawniard.png
similarity index 100%
rename from src/afd/sprites/back/0624--000--Pawniard.png
rename to src/afd/sprites/back/0624-000-Pawniard.png
diff --git a/src/afd/sprites/back/0625--000--Bisharp.png b/src/afd/sprites/back/0625-000-Bisharp.png
similarity index 100%
rename from src/afd/sprites/back/0625--000--Bisharp.png
rename to src/afd/sprites/back/0625-000-Bisharp.png
diff --git a/src/afd/sprites/back/0626--000--Bouffalant.png b/src/afd/sprites/back/0626-000-Bouffalant.png
similarity index 100%
rename from src/afd/sprites/back/0626--000--Bouffalant.png
rename to src/afd/sprites/back/0626-000-Bouffalant.png
diff --git a/src/afd/sprites/back/0627--000--Rufflet.png b/src/afd/sprites/back/0627-000-Rufflet.png
similarity index 100%
rename from src/afd/sprites/back/0627--000--Rufflet.png
rename to src/afd/sprites/back/0627-000-Rufflet.png
diff --git a/src/afd/sprites/back/0628--000--Braviary.png b/src/afd/sprites/back/0628-000-Braviary.png
similarity index 100%
rename from src/afd/sprites/back/0628--000--Braviary.png
rename to src/afd/sprites/back/0628-000-Braviary.png
diff --git a/src/afd/sprites/back/0629--000--Vullaby.png b/src/afd/sprites/back/0629-000-Vullaby.png
similarity index 100%
rename from src/afd/sprites/back/0629--000--Vullaby.png
rename to src/afd/sprites/back/0629-000-Vullaby.png
diff --git a/src/afd/sprites/back/0630--000--Mandibuzz.png b/src/afd/sprites/back/0630-000-Mandibuzz.png
similarity index 100%
rename from src/afd/sprites/back/0630--000--Mandibuzz.png
rename to src/afd/sprites/back/0630-000-Mandibuzz.png
diff --git a/src/afd/sprites/back/0631--000--Heatmor.png b/src/afd/sprites/back/0631-000-Heatmor.png
similarity index 100%
rename from src/afd/sprites/back/0631--000--Heatmor.png
rename to src/afd/sprites/back/0631-000-Heatmor.png
diff --git a/src/afd/sprites/back/0632--000--Durant.png b/src/afd/sprites/back/0632-000-Durant.png
similarity index 100%
rename from src/afd/sprites/back/0632--000--Durant.png
rename to src/afd/sprites/back/0632-000-Durant.png
diff --git a/src/afd/sprites/back/0633--000--Deino.png b/src/afd/sprites/back/0633-000-Deino.png
similarity index 100%
rename from src/afd/sprites/back/0633--000--Deino.png
rename to src/afd/sprites/back/0633-000-Deino.png
diff --git a/src/afd/sprites/back/0634--000--Zweilous.png b/src/afd/sprites/back/0634-000-Zweilous.png
similarity index 100%
rename from src/afd/sprites/back/0634--000--Zweilous.png
rename to src/afd/sprites/back/0634-000-Zweilous.png
diff --git a/src/afd/sprites/back/0635--000--Hydreigon.png b/src/afd/sprites/back/0635-000-Hydreigon.png
similarity index 100%
rename from src/afd/sprites/back/0635--000--Hydreigon.png
rename to src/afd/sprites/back/0635-000-Hydreigon.png
diff --git a/src/afd/sprites/back/0636--000--Larvesta.png b/src/afd/sprites/back/0636-000-Larvesta.png
similarity index 100%
rename from src/afd/sprites/back/0636--000--Larvesta.png
rename to src/afd/sprites/back/0636-000-Larvesta.png
diff --git a/src/afd/sprites/back/0637--000--Volcarona.png b/src/afd/sprites/back/0637-000-Volcarona.png
similarity index 100%
rename from src/afd/sprites/back/0637--000--Volcarona.png
rename to src/afd/sprites/back/0637-000-Volcarona.png
diff --git a/src/afd/sprites/back/0638--000--Cobalion.png b/src/afd/sprites/back/0638-000-Cobalion.png
similarity index 100%
rename from src/afd/sprites/back/0638--000--Cobalion.png
rename to src/afd/sprites/back/0638-000-Cobalion.png
diff --git a/src/afd/sprites/back/0639--000--Terrakion.png b/src/afd/sprites/back/0639-000-Terrakion.png
similarity index 100%
rename from src/afd/sprites/back/0639--000--Terrakion.png
rename to src/afd/sprites/back/0639-000-Terrakion.png
diff --git a/src/afd/sprites/back/0640--000--Virizion.png b/src/afd/sprites/back/0640-000-Virizion.png
similarity index 100%
rename from src/afd/sprites/back/0640--000--Virizion.png
rename to src/afd/sprites/back/0640-000-Virizion.png
diff --git a/src/afd/sprites/back/0641--000--Tornadus.png b/src/afd/sprites/back/0641-000-Tornadus.png
similarity index 100%
rename from src/afd/sprites/back/0641--000--Tornadus.png
rename to src/afd/sprites/back/0641-000-Tornadus.png
diff --git a/src/afd/sprites/back/0641--420--Tornadus--Therian.png b/src/afd/sprites/back/0641-420-Tornadus-Therian.png
similarity index 100%
rename from src/afd/sprites/back/0641--420--Tornadus--Therian.png
rename to src/afd/sprites/back/0641-420-Tornadus-Therian.png
diff --git a/src/afd/sprites/back/0642--000--Thundurus.png b/src/afd/sprites/back/0642-000-Thundurus.png
similarity index 100%
rename from src/afd/sprites/back/0642--000--Thundurus.png
rename to src/afd/sprites/back/0642-000-Thundurus.png
diff --git a/src/afd/sprites/back/0642--420--Thundurus--Therian.png b/src/afd/sprites/back/0642-420-Thundurus-Therian.png
similarity index 100%
rename from src/afd/sprites/back/0642--420--Thundurus--Therian.png
rename to src/afd/sprites/back/0642-420-Thundurus-Therian.png
diff --git a/src/afd/sprites/back/0643--000--Reshiram.png b/src/afd/sprites/back/0643-000-Reshiram.png
similarity index 100%
rename from src/afd/sprites/back/0643--000--Reshiram.png
rename to src/afd/sprites/back/0643-000-Reshiram.png
diff --git a/src/afd/sprites/back/0644--000--Zekrom.png b/src/afd/sprites/back/0644-000-Zekrom.png
similarity index 100%
rename from src/afd/sprites/back/0644--000--Zekrom.png
rename to src/afd/sprites/back/0644-000-Zekrom.png
diff --git a/src/afd/sprites/back/0645--000--Landorus.png b/src/afd/sprites/back/0645-000-Landorus.png
similarity index 100%
rename from src/afd/sprites/back/0645--000--Landorus.png
rename to src/afd/sprites/back/0645-000-Landorus.png
diff --git a/src/afd/sprites/back/0645--420--Landorus--Therian.png b/src/afd/sprites/back/0645-420-Landorus-Therian.png
similarity index 100%
rename from src/afd/sprites/back/0645--420--Landorus--Therian.png
rename to src/afd/sprites/back/0645-420-Landorus-Therian.png
diff --git a/src/afd/sprites/back/0646--000--Kyurem.png b/src/afd/sprites/back/0646-000-Kyurem.png
similarity index 100%
rename from src/afd/sprites/back/0646--000--Kyurem.png
rename to src/afd/sprites/back/0646-000-Kyurem.png
diff --git a/src/afd/sprites/back/0646--420--Kyurem--Black.png b/src/afd/sprites/back/0646-420-Kyurem-Black.png
similarity index 100%
rename from src/afd/sprites/back/0646--420--Kyurem--Black.png
rename to src/afd/sprites/back/0646-420-Kyurem-Black.png
diff --git a/src/afd/sprites/back/0646--420--Kyurem--White.png b/src/afd/sprites/back/0646-420-Kyurem-White.png
similarity index 100%
rename from src/afd/sprites/back/0646--420--Kyurem--White.png
rename to src/afd/sprites/back/0646-420-Kyurem-White.png
diff --git a/src/afd/sprites/back/0647--000--Keldeo.png b/src/afd/sprites/back/0647-000-Keldeo.png
similarity index 100%
rename from src/afd/sprites/back/0647--000--Keldeo.png
rename to src/afd/sprites/back/0647-000-Keldeo.png
diff --git a/src/afd/sprites/back/0647--420--Keldeo--Resolute.png b/src/afd/sprites/back/0647-420-Keldeo-Resolute.png
similarity index 100%
rename from src/afd/sprites/back/0647--420--Keldeo--Resolute.png
rename to src/afd/sprites/back/0647-420-Keldeo-Resolute.png
diff --git a/src/afd/sprites/back/0648--000--Meloetta.png b/src/afd/sprites/back/0648-000-Meloetta.png
similarity index 100%
rename from src/afd/sprites/back/0648--000--Meloetta.png
rename to src/afd/sprites/back/0648-000-Meloetta.png
diff --git a/src/afd/sprites/back/0648--420--Meloetta--Pirouette.png b/src/afd/sprites/back/0648-420-Meloetta-Pirouette.png
similarity index 100%
rename from src/afd/sprites/back/0648--420--Meloetta--Pirouette.png
rename to src/afd/sprites/back/0648-420-Meloetta-Pirouette.png
diff --git a/src/afd/sprites/back/0649--000--Genesect.png b/src/afd/sprites/back/0649-000-Genesect.png
similarity index 100%
rename from src/afd/sprites/back/0649--000--Genesect.png
rename to src/afd/sprites/back/0649-000-Genesect.png
diff --git a/src/afd/sprites/back/0649--420--Genesect--Burn.png b/src/afd/sprites/back/0649-420-Genesect-Burn.png
similarity index 100%
rename from src/afd/sprites/back/0649--420--Genesect--Burn.png
rename to src/afd/sprites/back/0649-420-Genesect-Burn.png
diff --git a/src/afd/sprites/back/0649--420--Genesect--Chill.png b/src/afd/sprites/back/0649-420-Genesect-Chill.png
similarity index 100%
rename from src/afd/sprites/back/0649--420--Genesect--Chill.png
rename to src/afd/sprites/back/0649-420-Genesect-Chill.png
diff --git a/src/afd/sprites/back/0649--420--Genesect--Douse.png b/src/afd/sprites/back/0649-420-Genesect-Douse.png
similarity index 100%
rename from src/afd/sprites/back/0649--420--Genesect--Douse.png
rename to src/afd/sprites/back/0649-420-Genesect-Douse.png
diff --git a/src/afd/sprites/back/0649--420--Genesect--Shock.png b/src/afd/sprites/back/0649-420-Genesect-Shock.png
similarity index 100%
rename from src/afd/sprites/back/0649--420--Genesect--Shock.png
rename to src/afd/sprites/back/0649-420-Genesect-Shock.png
diff --git a/src/afd/sprites/back/0650--000--Chespin.png b/src/afd/sprites/back/0650-000-Chespin.png
similarity index 100%
rename from src/afd/sprites/back/0650--000--Chespin.png
rename to src/afd/sprites/back/0650-000-Chespin.png
diff --git a/src/afd/sprites/back/0651--000--Quilladin.png b/src/afd/sprites/back/0651-000-Quilladin.png
similarity index 100%
rename from src/afd/sprites/back/0651--000--Quilladin.png
rename to src/afd/sprites/back/0651-000-Quilladin.png
diff --git a/src/afd/sprites/back/0652--000--Chesnaught.png b/src/afd/sprites/back/0652-000-Chesnaught.png
similarity index 100%
rename from src/afd/sprites/back/0652--000--Chesnaught.png
rename to src/afd/sprites/back/0652-000-Chesnaught.png
diff --git a/src/afd/sprites/back/0653--000--Fennekin.png b/src/afd/sprites/back/0653-000-Fennekin.png
similarity index 100%
rename from src/afd/sprites/back/0653--000--Fennekin.png
rename to src/afd/sprites/back/0653-000-Fennekin.png
diff --git a/src/afd/sprites/back/0654--000--Braixen.png b/src/afd/sprites/back/0654-000-Braixen.png
similarity index 100%
rename from src/afd/sprites/back/0654--000--Braixen.png
rename to src/afd/sprites/back/0654-000-Braixen.png
diff --git a/src/afd/sprites/back/0655--000--Delphox.png b/src/afd/sprites/back/0655-000-Delphox.png
similarity index 100%
rename from src/afd/sprites/back/0655--000--Delphox.png
rename to src/afd/sprites/back/0655-000-Delphox.png
diff --git a/src/afd/sprites/back/0656--000--Froakie.png b/src/afd/sprites/back/0656-000-Froakie.png
similarity index 100%
rename from src/afd/sprites/back/0656--000--Froakie.png
rename to src/afd/sprites/back/0656-000-Froakie.png
diff --git a/src/afd/sprites/back/0657--000--Frogadier.png b/src/afd/sprites/back/0657-000-Frogadier.png
similarity index 100%
rename from src/afd/sprites/back/0657--000--Frogadier.png
rename to src/afd/sprites/back/0657-000-Frogadier.png
diff --git a/src/afd/sprites/back/0658--000--Greninja.png b/src/afd/sprites/back/0658-000-Greninja.png
similarity index 100%
rename from src/afd/sprites/back/0658--000--Greninja.png
rename to src/afd/sprites/back/0658-000-Greninja.png
diff --git a/src/afd/sprites/back/0658--420--Greninja--Ash.png b/src/afd/sprites/back/0658-420-Greninja-Ash.png
similarity index 100%
rename from src/afd/sprites/back/0658--420--Greninja--Ash.png
rename to src/afd/sprites/back/0658-420-Greninja-Ash.png
diff --git a/src/afd/sprites/back/0659--000--Bunnelby.png b/src/afd/sprites/back/0659-000-Bunnelby.png
similarity index 100%
rename from src/afd/sprites/back/0659--000--Bunnelby.png
rename to src/afd/sprites/back/0659-000-Bunnelby.png
diff --git a/src/afd/sprites/back/0660--000--Diggersby.png b/src/afd/sprites/back/0660-000-Diggersby.png
similarity index 100%
rename from src/afd/sprites/back/0660--000--Diggersby.png
rename to src/afd/sprites/back/0660-000-Diggersby.png
diff --git a/src/afd/sprites/back/0661--000--Fletchling.png b/src/afd/sprites/back/0661-000-Fletchling.png
similarity index 100%
rename from src/afd/sprites/back/0661--000--Fletchling.png
rename to src/afd/sprites/back/0661-000-Fletchling.png
diff --git a/src/afd/sprites/back/0662--000--Fletchinder.png b/src/afd/sprites/back/0662-000-Fletchinder.png
similarity index 100%
rename from src/afd/sprites/back/0662--000--Fletchinder.png
rename to src/afd/sprites/back/0662-000-Fletchinder.png
diff --git a/src/afd/sprites/back/0663--000--Talonflame.png b/src/afd/sprites/back/0663-000-Talonflame.png
similarity index 100%
rename from src/afd/sprites/back/0663--000--Talonflame.png
rename to src/afd/sprites/back/0663-000-Talonflame.png
diff --git a/src/afd/sprites/back/0664--000--Scatterbug.png b/src/afd/sprites/back/0664-000-Scatterbug.png
similarity index 100%
rename from src/afd/sprites/back/0664--000--Scatterbug.png
rename to src/afd/sprites/back/0664-000-Scatterbug.png
diff --git a/src/afd/sprites/back/0665--000--Spewpa.png b/src/afd/sprites/back/0665-000-Spewpa.png
similarity index 100%
rename from src/afd/sprites/back/0665--000--Spewpa.png
rename to src/afd/sprites/back/0665-000-Spewpa.png
diff --git a/src/afd/sprites/back/0666--000--Vivillon.png b/src/afd/sprites/back/0666-000-Vivillon.png
similarity index 100%
rename from src/afd/sprites/back/0666--000--Vivillon.png
rename to src/afd/sprites/back/0666-000-Vivillon.png
diff --git a/src/afd/sprites/back/0667--000--Litleo.png b/src/afd/sprites/back/0667-000-Litleo.png
similarity index 100%
rename from src/afd/sprites/back/0667--000--Litleo.png
rename to src/afd/sprites/back/0667-000-Litleo.png
diff --git a/src/afd/sprites/back/0668--000--Pyroar.png b/src/afd/sprites/back/0668-000-Pyroar.png
similarity index 100%
rename from src/afd/sprites/back/0668--000--Pyroar.png
rename to src/afd/sprites/back/0668-000-Pyroar.png
diff --git a/src/afd/sprites/back/0669--000--Flabe__0301be__0301.png b/src/afd/sprites/back/0669-000-Flabe__0301be__0301.png
similarity index 100%
rename from src/afd/sprites/back/0669--000--Flabe__0301be__0301.png
rename to src/afd/sprites/back/0669-000-Flabe__0301be__0301.png
diff --git a/src/afd/sprites/back/0670--000--Floette.png b/src/afd/sprites/back/0670-000-Floette.png
similarity index 100%
rename from src/afd/sprites/back/0670--000--Floette.png
rename to src/afd/sprites/back/0670-000-Floette.png
diff --git a/src/afd/sprites/back/0670--420--Floette--Eternal.png b/src/afd/sprites/back/0670-420-Floette-Eternal.png
similarity index 100%
rename from src/afd/sprites/back/0670--420--Floette--Eternal.png
rename to src/afd/sprites/back/0670-420-Floette-Eternal.png
diff --git a/src/afd/sprites/back/0671--000--Florges.png b/src/afd/sprites/back/0671-000-Florges.png
similarity index 100%
rename from src/afd/sprites/back/0671--000--Florges.png
rename to src/afd/sprites/back/0671-000-Florges.png
diff --git a/src/afd/sprites/back/0672--000--Skiddo.png b/src/afd/sprites/back/0672-000-Skiddo.png
similarity index 100%
rename from src/afd/sprites/back/0672--000--Skiddo.png
rename to src/afd/sprites/back/0672-000-Skiddo.png
diff --git a/src/afd/sprites/back/0673--000--Gogoat.png b/src/afd/sprites/back/0673-000-Gogoat.png
similarity index 100%
rename from src/afd/sprites/back/0673--000--Gogoat.png
rename to src/afd/sprites/back/0673-000-Gogoat.png
diff --git a/src/afd/sprites/back/0674--000--Pancham.png b/src/afd/sprites/back/0674-000-Pancham.png
similarity index 100%
rename from src/afd/sprites/back/0674--000--Pancham.png
rename to src/afd/sprites/back/0674-000-Pancham.png
diff --git a/src/afd/sprites/back/0675--000--Pangoro.png b/src/afd/sprites/back/0675-000-Pangoro.png
similarity index 100%
rename from src/afd/sprites/back/0675--000--Pangoro.png
rename to src/afd/sprites/back/0675-000-Pangoro.png
diff --git a/src/afd/sprites/back/0676--000--Furfrou.png b/src/afd/sprites/back/0676-000-Furfrou.png
similarity index 100%
rename from src/afd/sprites/back/0676--000--Furfrou.png
rename to src/afd/sprites/back/0676-000-Furfrou.png
diff --git a/src/afd/sprites/back/0677--000--Espurr.png b/src/afd/sprites/back/0677-000-Espurr.png
similarity index 100%
rename from src/afd/sprites/back/0677--000--Espurr.png
rename to src/afd/sprites/back/0677-000-Espurr.png
diff --git a/src/afd/sprites/back/0678--000--Meowstic.png b/src/afd/sprites/back/0678-000-Meowstic.png
similarity index 100%
rename from src/afd/sprites/back/0678--000--Meowstic.png
rename to src/afd/sprites/back/0678-000-Meowstic.png
diff --git a/src/afd/sprites/back/0678--420--Meowstic--F.png b/src/afd/sprites/back/0678-420-Meowstic-F.png
similarity index 100%
rename from src/afd/sprites/back/0678--420--Meowstic--F.png
rename to src/afd/sprites/back/0678-420-Meowstic-F.png
diff --git a/src/afd/sprites/back/0679--000--Honedge.png b/src/afd/sprites/back/0679-000-Honedge.png
similarity index 100%
rename from src/afd/sprites/back/0679--000--Honedge.png
rename to src/afd/sprites/back/0679-000-Honedge.png
diff --git a/src/afd/sprites/back/0680--000--Doublade.png b/src/afd/sprites/back/0680-000-Doublade.png
similarity index 100%
rename from src/afd/sprites/back/0680--000--Doublade.png
rename to src/afd/sprites/back/0680-000-Doublade.png
diff --git a/src/afd/sprites/back/0681--000--Aegislash.png b/src/afd/sprites/back/0681-000-Aegislash.png
similarity index 100%
rename from src/afd/sprites/back/0681--000--Aegislash.png
rename to src/afd/sprites/back/0681-000-Aegislash.png
diff --git a/src/afd/sprites/back/0681--420--Aegislash--Blade.png b/src/afd/sprites/back/0681-420-Aegislash-Blade.png
similarity index 100%
rename from src/afd/sprites/back/0681--420--Aegislash--Blade.png
rename to src/afd/sprites/back/0681-420-Aegislash-Blade.png
diff --git a/src/afd/sprites/back/0682--000--Spritzee.png b/src/afd/sprites/back/0682-000-Spritzee.png
similarity index 100%
rename from src/afd/sprites/back/0682--000--Spritzee.png
rename to src/afd/sprites/back/0682-000-Spritzee.png
diff --git a/src/afd/sprites/back/0683--000--Aromatisse.png b/src/afd/sprites/back/0683-000-Aromatisse.png
similarity index 100%
rename from src/afd/sprites/back/0683--000--Aromatisse.png
rename to src/afd/sprites/back/0683-000-Aromatisse.png
diff --git a/src/afd/sprites/back/0684--000--Swirlix.png b/src/afd/sprites/back/0684-000-Swirlix.png
similarity index 100%
rename from src/afd/sprites/back/0684--000--Swirlix.png
rename to src/afd/sprites/back/0684-000-Swirlix.png
diff --git a/src/afd/sprites/back/0685--000--Slurpuff.png b/src/afd/sprites/back/0685-000-Slurpuff.png
similarity index 100%
rename from src/afd/sprites/back/0685--000--Slurpuff.png
rename to src/afd/sprites/back/0685-000-Slurpuff.png
diff --git a/src/afd/sprites/back/0686--000--Inkay.png b/src/afd/sprites/back/0686-000-Inkay.png
similarity index 100%
rename from src/afd/sprites/back/0686--000--Inkay.png
rename to src/afd/sprites/back/0686-000-Inkay.png
diff --git a/src/afd/sprites/back/0687--000--Malamar.png b/src/afd/sprites/back/0687-000-Malamar.png
similarity index 100%
rename from src/afd/sprites/back/0687--000--Malamar.png
rename to src/afd/sprites/back/0687-000-Malamar.png
diff --git a/src/afd/sprites/back/0688--000--Binacle.png b/src/afd/sprites/back/0688-000-Binacle.png
similarity index 100%
rename from src/afd/sprites/back/0688--000--Binacle.png
rename to src/afd/sprites/back/0688-000-Binacle.png
diff --git a/src/afd/sprites/back/0689--000--Barbaracle.png b/src/afd/sprites/back/0689-000-Barbaracle.png
similarity index 100%
rename from src/afd/sprites/back/0689--000--Barbaracle.png
rename to src/afd/sprites/back/0689-000-Barbaracle.png
diff --git a/src/afd/sprites/back/0690--000--Skrelp.png b/src/afd/sprites/back/0690-000-Skrelp.png
similarity index 100%
rename from src/afd/sprites/back/0690--000--Skrelp.png
rename to src/afd/sprites/back/0690-000-Skrelp.png
diff --git a/src/afd/sprites/back/0691--000--Dragalge.png b/src/afd/sprites/back/0691-000-Dragalge.png
similarity index 100%
rename from src/afd/sprites/back/0691--000--Dragalge.png
rename to src/afd/sprites/back/0691-000-Dragalge.png
diff --git a/src/afd/sprites/back/0692--000--Clauncher.png b/src/afd/sprites/back/0692-000-Clauncher.png
similarity index 100%
rename from src/afd/sprites/back/0692--000--Clauncher.png
rename to src/afd/sprites/back/0692-000-Clauncher.png
diff --git a/src/afd/sprites/back/0693--000--Clawitzer.png b/src/afd/sprites/back/0693-000-Clawitzer.png
similarity index 100%
rename from src/afd/sprites/back/0693--000--Clawitzer.png
rename to src/afd/sprites/back/0693-000-Clawitzer.png
diff --git a/src/afd/sprites/back/0694--000--Helioptile.png b/src/afd/sprites/back/0694-000-Helioptile.png
similarity index 100%
rename from src/afd/sprites/back/0694--000--Helioptile.png
rename to src/afd/sprites/back/0694-000-Helioptile.png
diff --git a/src/afd/sprites/back/0695--000--Heliolisk.png b/src/afd/sprites/back/0695-000-Heliolisk.png
similarity index 100%
rename from src/afd/sprites/back/0695--000--Heliolisk.png
rename to src/afd/sprites/back/0695-000-Heliolisk.png
diff --git a/src/afd/sprites/back/0696--000--Tyrunt.png b/src/afd/sprites/back/0696-000-Tyrunt.png
similarity index 100%
rename from src/afd/sprites/back/0696--000--Tyrunt.png
rename to src/afd/sprites/back/0696-000-Tyrunt.png
diff --git a/src/afd/sprites/back/0697--000--Tyrantrum.png b/src/afd/sprites/back/0697-000-Tyrantrum.png
similarity index 100%
rename from src/afd/sprites/back/0697--000--Tyrantrum.png
rename to src/afd/sprites/back/0697-000-Tyrantrum.png
diff --git a/src/afd/sprites/back/0698--000--Amaura.png b/src/afd/sprites/back/0698-000-Amaura.png
similarity index 100%
rename from src/afd/sprites/back/0698--000--Amaura.png
rename to src/afd/sprites/back/0698-000-Amaura.png
diff --git a/src/afd/sprites/back/0699--000--Aurorus.png b/src/afd/sprites/back/0699-000-Aurorus.png
similarity index 100%
rename from src/afd/sprites/back/0699--000--Aurorus.png
rename to src/afd/sprites/back/0699-000-Aurorus.png
diff --git a/src/afd/sprites/back/0700--000--Sylveon.png b/src/afd/sprites/back/0700-000-Sylveon.png
similarity index 100%
rename from src/afd/sprites/back/0700--000--Sylveon.png
rename to src/afd/sprites/back/0700-000-Sylveon.png
diff --git a/src/afd/sprites/back/0701--000--Hawlucha.png b/src/afd/sprites/back/0701-000-Hawlucha.png
similarity index 100%
rename from src/afd/sprites/back/0701--000--Hawlucha.png
rename to src/afd/sprites/back/0701-000-Hawlucha.png
diff --git a/src/afd/sprites/back/0702--000--Dedenne.png b/src/afd/sprites/back/0702-000-Dedenne.png
similarity index 100%
rename from src/afd/sprites/back/0702--000--Dedenne.png
rename to src/afd/sprites/back/0702-000-Dedenne.png
diff --git a/src/afd/sprites/back/0703--000--Carbink.png b/src/afd/sprites/back/0703-000-Carbink.png
similarity index 100%
rename from src/afd/sprites/back/0703--000--Carbink.png
rename to src/afd/sprites/back/0703-000-Carbink.png
diff --git a/src/afd/sprites/back/0704--000--Goomy.png b/src/afd/sprites/back/0704-000-Goomy.png
similarity index 100%
rename from src/afd/sprites/back/0704--000--Goomy.png
rename to src/afd/sprites/back/0704-000-Goomy.png
diff --git a/src/afd/sprites/back/0705--000--Sliggoo.png b/src/afd/sprites/back/0705-000-Sliggoo.png
similarity index 100%
rename from src/afd/sprites/back/0705--000--Sliggoo.png
rename to src/afd/sprites/back/0705-000-Sliggoo.png
diff --git a/src/afd/sprites/back/0706--000--Goodra.png b/src/afd/sprites/back/0706-000-Goodra.png
similarity index 100%
rename from src/afd/sprites/back/0706--000--Goodra.png
rename to src/afd/sprites/back/0706-000-Goodra.png
diff --git a/src/afd/sprites/back/0707--000--Klefki.png b/src/afd/sprites/back/0707-000-Klefki.png
similarity index 100%
rename from src/afd/sprites/back/0707--000--Klefki.png
rename to src/afd/sprites/back/0707-000-Klefki.png
diff --git a/src/afd/sprites/back/0708--000--Phantump.png b/src/afd/sprites/back/0708-000-Phantump.png
similarity index 100%
rename from src/afd/sprites/back/0708--000--Phantump.png
rename to src/afd/sprites/back/0708-000-Phantump.png
diff --git a/src/afd/sprites/back/0709--000--Trevenant.png b/src/afd/sprites/back/0709-000-Trevenant.png
similarity index 100%
rename from src/afd/sprites/back/0709--000--Trevenant.png
rename to src/afd/sprites/back/0709-000-Trevenant.png
diff --git a/src/afd/sprites/back/0710--000--Pumpkaboo.png b/src/afd/sprites/back/0710-000-Pumpkaboo.png
similarity index 100%
rename from src/afd/sprites/back/0710--000--Pumpkaboo.png
rename to src/afd/sprites/back/0710-000-Pumpkaboo.png
diff --git a/src/afd/sprites/back/0710--420--Pumpkaboo--Large.png b/src/afd/sprites/back/0710-420-Pumpkaboo-Large.png
similarity index 100%
rename from src/afd/sprites/back/0710--420--Pumpkaboo--Large.png
rename to src/afd/sprites/back/0710-420-Pumpkaboo-Large.png
diff --git a/src/afd/sprites/back/0710--420--Pumpkaboo--Small.png b/src/afd/sprites/back/0710-420-Pumpkaboo-Small.png
similarity index 100%
rename from src/afd/sprites/back/0710--420--Pumpkaboo--Small.png
rename to src/afd/sprites/back/0710-420-Pumpkaboo-Small.png
diff --git a/src/afd/sprites/back/0710--420--Pumpkaboo--Super.png b/src/afd/sprites/back/0710-420-Pumpkaboo-Super.png
similarity index 100%
rename from src/afd/sprites/back/0710--420--Pumpkaboo--Super.png
rename to src/afd/sprites/back/0710-420-Pumpkaboo-Super.png
diff --git a/src/afd/sprites/back/0711--000--Gourgeist.png b/src/afd/sprites/back/0711-000-Gourgeist.png
similarity index 100%
rename from src/afd/sprites/back/0711--000--Gourgeist.png
rename to src/afd/sprites/back/0711-000-Gourgeist.png
diff --git a/src/afd/sprites/back/0711--420--Gourgeist--Large.png b/src/afd/sprites/back/0711-420-Gourgeist-Large.png
similarity index 100%
rename from src/afd/sprites/back/0711--420--Gourgeist--Large.png
rename to src/afd/sprites/back/0711-420-Gourgeist-Large.png
diff --git a/src/afd/sprites/back/0711--420--Gourgeist--Small.png b/src/afd/sprites/back/0711-420-Gourgeist-Small.png
similarity index 100%
rename from src/afd/sprites/back/0711--420--Gourgeist--Small.png
rename to src/afd/sprites/back/0711-420-Gourgeist-Small.png
diff --git a/src/afd/sprites/back/0711--420--Gourgeist--Super.png b/src/afd/sprites/back/0711-420-Gourgeist-Super.png
similarity index 100%
rename from src/afd/sprites/back/0711--420--Gourgeist--Super.png
rename to src/afd/sprites/back/0711-420-Gourgeist-Super.png
diff --git a/src/afd/sprites/back/0712--000--Bergmite.png b/src/afd/sprites/back/0712-000-Bergmite.png
similarity index 100%
rename from src/afd/sprites/back/0712--000--Bergmite.png
rename to src/afd/sprites/back/0712-000-Bergmite.png
diff --git a/src/afd/sprites/back/0713--000--Avalugg.png b/src/afd/sprites/back/0713-000-Avalugg.png
similarity index 100%
rename from src/afd/sprites/back/0713--000--Avalugg.png
rename to src/afd/sprites/back/0713-000-Avalugg.png
diff --git a/src/afd/sprites/back/0714--000--Noibat.png b/src/afd/sprites/back/0714-000-Noibat.png
similarity index 100%
rename from src/afd/sprites/back/0714--000--Noibat.png
rename to src/afd/sprites/back/0714-000-Noibat.png
diff --git a/src/afd/sprites/back/0715--000--Noivern.png b/src/afd/sprites/back/0715-000-Noivern.png
similarity index 100%
rename from src/afd/sprites/back/0715--000--Noivern.png
rename to src/afd/sprites/back/0715-000-Noivern.png
diff --git a/src/afd/sprites/back/0716--000--Xerneas.png b/src/afd/sprites/back/0716-000-Xerneas.png
similarity index 100%
rename from src/afd/sprites/back/0716--000--Xerneas.png
rename to src/afd/sprites/back/0716-000-Xerneas.png
diff --git a/src/afd/sprites/back/0717--000--Yveltal.png b/src/afd/sprites/back/0717-000-Yveltal.png
similarity index 100%
rename from src/afd/sprites/back/0717--000--Yveltal.png
rename to src/afd/sprites/back/0717-000-Yveltal.png
diff --git a/src/afd/sprites/back/0718--000--Zygarde.png b/src/afd/sprites/back/0718-000-Zygarde.png
similarity index 100%
rename from src/afd/sprites/back/0718--000--Zygarde.png
rename to src/afd/sprites/back/0718-000-Zygarde.png
diff --git a/src/afd/sprites/back/0718--420--Zygarde--10__0025.png b/src/afd/sprites/back/0718-420-Zygarde-10__0025.png
similarity index 100%
rename from src/afd/sprites/back/0718--420--Zygarde--10__0025.png
rename to src/afd/sprites/back/0718-420-Zygarde-10__0025.png
diff --git a/src/afd/sprites/back/0718--420--Zygarde--Complete.png b/src/afd/sprites/back/0718-420-Zygarde-Complete.png
similarity index 100%
rename from src/afd/sprites/back/0718--420--Zygarde--Complete.png
rename to src/afd/sprites/back/0718-420-Zygarde-Complete.png
diff --git a/src/afd/sprites/back/0719--000--Diancie.png b/src/afd/sprites/back/0719-000-Diancie.png
similarity index 100%
rename from src/afd/sprites/back/0719--000--Diancie.png
rename to src/afd/sprites/back/0719-000-Diancie.png
diff --git a/src/afd/sprites/back/0719--420--Diancie--Mega.png b/src/afd/sprites/back/0719-420-Diancie-Mega.png
similarity index 100%
rename from src/afd/sprites/back/0719--420--Diancie--Mega.png
rename to src/afd/sprites/back/0719-420-Diancie-Mega.png
diff --git a/src/afd/sprites/back/0720--000--Hoopa.png b/src/afd/sprites/back/0720-000-Hoopa.png
similarity index 100%
rename from src/afd/sprites/back/0720--000--Hoopa.png
rename to src/afd/sprites/back/0720-000-Hoopa.png
diff --git a/src/afd/sprites/back/0720--420--Hoopa--Unbound.png b/src/afd/sprites/back/0720-420-Hoopa-Unbound.png
similarity index 100%
rename from src/afd/sprites/back/0720--420--Hoopa--Unbound.png
rename to src/afd/sprites/back/0720-420-Hoopa-Unbound.png
diff --git a/src/afd/sprites/back/0721--000--Volcanion.png b/src/afd/sprites/back/0721-000-Volcanion.png
similarity index 100%
rename from src/afd/sprites/back/0721--000--Volcanion.png
rename to src/afd/sprites/back/0721-000-Volcanion.png
diff --git a/src/afd/sprites/back/0722--000--Rowlet.png b/src/afd/sprites/back/0722-000-Rowlet.png
similarity index 100%
rename from src/afd/sprites/back/0722--000--Rowlet.png
rename to src/afd/sprites/back/0722-000-Rowlet.png
diff --git a/src/afd/sprites/back/0723--000--Dartrix.png b/src/afd/sprites/back/0723-000-Dartrix.png
similarity index 100%
rename from src/afd/sprites/back/0723--000--Dartrix.png
rename to src/afd/sprites/back/0723-000-Dartrix.png
diff --git a/src/afd/sprites/back/0724--000--Decidueye.png b/src/afd/sprites/back/0724-000-Decidueye.png
similarity index 100%
rename from src/afd/sprites/back/0724--000--Decidueye.png
rename to src/afd/sprites/back/0724-000-Decidueye.png
diff --git a/src/afd/sprites/back/0725--000--Litten.png b/src/afd/sprites/back/0725-000-Litten.png
similarity index 100%
rename from src/afd/sprites/back/0725--000--Litten.png
rename to src/afd/sprites/back/0725-000-Litten.png
diff --git a/src/afd/sprites/back/0726--000--Torracat.png b/src/afd/sprites/back/0726-000-Torracat.png
similarity index 100%
rename from src/afd/sprites/back/0726--000--Torracat.png
rename to src/afd/sprites/back/0726-000-Torracat.png
diff --git a/src/afd/sprites/back/0727--000--Incineroar.png b/src/afd/sprites/back/0727-000-Incineroar.png
similarity index 100%
rename from src/afd/sprites/back/0727--000--Incineroar.png
rename to src/afd/sprites/back/0727-000-Incineroar.png
diff --git a/src/afd/sprites/back/0728--000--Popplio.png b/src/afd/sprites/back/0728-000-Popplio.png
similarity index 100%
rename from src/afd/sprites/back/0728--000--Popplio.png
rename to src/afd/sprites/back/0728-000-Popplio.png
diff --git a/src/afd/sprites/back/0729--000--Brionne.png b/src/afd/sprites/back/0729-000-Brionne.png
similarity index 100%
rename from src/afd/sprites/back/0729--000--Brionne.png
rename to src/afd/sprites/back/0729-000-Brionne.png
diff --git a/src/afd/sprites/back/0730--000--Primarina.png b/src/afd/sprites/back/0730-000-Primarina.png
similarity index 100%
rename from src/afd/sprites/back/0730--000--Primarina.png
rename to src/afd/sprites/back/0730-000-Primarina.png
diff --git a/src/afd/sprites/back/0731--000--Pikipek.png b/src/afd/sprites/back/0731-000-Pikipek.png
similarity index 100%
rename from src/afd/sprites/back/0731--000--Pikipek.png
rename to src/afd/sprites/back/0731-000-Pikipek.png
diff --git a/src/afd/sprites/back/0732--000--Trumbeak.png b/src/afd/sprites/back/0732-000-Trumbeak.png
similarity index 100%
rename from src/afd/sprites/back/0732--000--Trumbeak.png
rename to src/afd/sprites/back/0732-000-Trumbeak.png
diff --git a/src/afd/sprites/back/0733--000--Toucannon.png b/src/afd/sprites/back/0733-000-Toucannon.png
similarity index 100%
rename from src/afd/sprites/back/0733--000--Toucannon.png
rename to src/afd/sprites/back/0733-000-Toucannon.png
diff --git a/src/afd/sprites/back/0734--000--Yungoos.png b/src/afd/sprites/back/0734-000-Yungoos.png
similarity index 100%
rename from src/afd/sprites/back/0734--000--Yungoos.png
rename to src/afd/sprites/back/0734-000-Yungoos.png
diff --git a/src/afd/sprites/back/0735--000--Gumshoos.png b/src/afd/sprites/back/0735-000-Gumshoos.png
similarity index 100%
rename from src/afd/sprites/back/0735--000--Gumshoos.png
rename to src/afd/sprites/back/0735-000-Gumshoos.png
diff --git a/src/afd/sprites/back/0736--000--Grubbin.png b/src/afd/sprites/back/0736-000-Grubbin.png
similarity index 100%
rename from src/afd/sprites/back/0736--000--Grubbin.png
rename to src/afd/sprites/back/0736-000-Grubbin.png
diff --git a/src/afd/sprites/back/0737--000--Charjabug.png b/src/afd/sprites/back/0737-000-Charjabug.png
similarity index 100%
rename from src/afd/sprites/back/0737--000--Charjabug.png
rename to src/afd/sprites/back/0737-000-Charjabug.png
diff --git a/src/afd/sprites/back/0738--000--Vikavolt.png b/src/afd/sprites/back/0738-000-Vikavolt.png
similarity index 100%
rename from src/afd/sprites/back/0738--000--Vikavolt.png
rename to src/afd/sprites/back/0738-000-Vikavolt.png
diff --git a/src/afd/sprites/back/0739--000--Crabrawler.png b/src/afd/sprites/back/0739-000-Crabrawler.png
similarity index 100%
rename from src/afd/sprites/back/0739--000--Crabrawler.png
rename to src/afd/sprites/back/0739-000-Crabrawler.png
diff --git a/src/afd/sprites/back/0740--000--Crabominable.png b/src/afd/sprites/back/0740-000-Crabominable.png
similarity index 100%
rename from src/afd/sprites/back/0740--000--Crabominable.png
rename to src/afd/sprites/back/0740-000-Crabominable.png
diff --git a/src/afd/sprites/back/0741--000--Oricorio.png b/src/afd/sprites/back/0741-000-Oricorio.png
similarity index 100%
rename from src/afd/sprites/back/0741--000--Oricorio.png
rename to src/afd/sprites/back/0741-000-Oricorio.png
diff --git a/src/afd/sprites/back/0741--420--Oricorio--Pa__0027u.png b/src/afd/sprites/back/0741-420-Oricorio-Pa__0027u.png
similarity index 100%
rename from src/afd/sprites/back/0741--420--Oricorio--Pa__0027u.png
rename to src/afd/sprites/back/0741-420-Oricorio-Pa__0027u.png
diff --git a/src/afd/sprites/back/0741--420--Oricorio--Pom-Pom.png b/src/afd/sprites/back/0741-420-Oricorio-Pom~Pom.png
similarity index 100%
rename from src/afd/sprites/back/0741--420--Oricorio--Pom-Pom.png
rename to src/afd/sprites/back/0741-420-Oricorio-Pom~Pom.png
diff --git a/src/afd/sprites/back/0741--420--Oricorio--Sensu.png b/src/afd/sprites/back/0741-420-Oricorio-Sensu.png
similarity index 100%
rename from src/afd/sprites/back/0741--420--Oricorio--Sensu.png
rename to src/afd/sprites/back/0741-420-Oricorio-Sensu.png
diff --git a/src/afd/sprites/back/0742--000--Cutiefly.png b/src/afd/sprites/back/0742-000-Cutiefly.png
similarity index 100%
rename from src/afd/sprites/back/0742--000--Cutiefly.png
rename to src/afd/sprites/back/0742-000-Cutiefly.png
diff --git a/src/afd/sprites/back/0743--000--Ribombee.png b/src/afd/sprites/back/0743-000-Ribombee.png
similarity index 100%
rename from src/afd/sprites/back/0743--000--Ribombee.png
rename to src/afd/sprites/back/0743-000-Ribombee.png
diff --git a/src/afd/sprites/back/0744--000--Rockruff.png b/src/afd/sprites/back/0744-000-Rockruff.png
similarity index 100%
rename from src/afd/sprites/back/0744--000--Rockruff.png
rename to src/afd/sprites/back/0744-000-Rockruff.png
diff --git a/src/afd/sprites/back/0745--000--Lycanroc.png b/src/afd/sprites/back/0745-000-Lycanroc.png
similarity index 100%
rename from src/afd/sprites/back/0745--000--Lycanroc.png
rename to src/afd/sprites/back/0745-000-Lycanroc.png
diff --git a/src/afd/sprites/back/0745--420--Lycanroc--Dusk.png b/src/afd/sprites/back/0745-420-Lycanroc-Dusk.png
similarity index 100%
rename from src/afd/sprites/back/0745--420--Lycanroc--Dusk.png
rename to src/afd/sprites/back/0745-420-Lycanroc-Dusk.png
diff --git a/src/afd/sprites/back/0745--420--Lycanroc--Midnight.png b/src/afd/sprites/back/0745-420-Lycanroc-Midnight.png
similarity index 100%
rename from src/afd/sprites/back/0745--420--Lycanroc--Midnight.png
rename to src/afd/sprites/back/0745-420-Lycanroc-Midnight.png
diff --git a/src/afd/sprites/back/0746--000--Wishiwashi.png b/src/afd/sprites/back/0746-000-Wishiwashi.png
similarity index 100%
rename from src/afd/sprites/back/0746--000--Wishiwashi.png
rename to src/afd/sprites/back/0746-000-Wishiwashi.png
diff --git a/src/afd/sprites/back/0746--420--Wishiwashi--School.png b/src/afd/sprites/back/0746-420-Wishiwashi-School.png
similarity index 100%
rename from src/afd/sprites/back/0746--420--Wishiwashi--School.png
rename to src/afd/sprites/back/0746-420-Wishiwashi-School.png
diff --git a/src/afd/sprites/back/0747--000--Mareanie.png b/src/afd/sprites/back/0747-000-Mareanie.png
similarity index 100%
rename from src/afd/sprites/back/0747--000--Mareanie.png
rename to src/afd/sprites/back/0747-000-Mareanie.png
diff --git a/src/afd/sprites/back/0748--000--Toxapex.png b/src/afd/sprites/back/0748-000-Toxapex.png
similarity index 100%
rename from src/afd/sprites/back/0748--000--Toxapex.png
rename to src/afd/sprites/back/0748-000-Toxapex.png
diff --git a/src/afd/sprites/back/0749--000--Mudbray.png b/src/afd/sprites/back/0749-000-Mudbray.png
similarity index 100%
rename from src/afd/sprites/back/0749--000--Mudbray.png
rename to src/afd/sprites/back/0749-000-Mudbray.png
diff --git a/src/afd/sprites/back/0750--000--Mudsdale.png b/src/afd/sprites/back/0750-000-Mudsdale.png
similarity index 100%
rename from src/afd/sprites/back/0750--000--Mudsdale.png
rename to src/afd/sprites/back/0750-000-Mudsdale.png
diff --git a/src/afd/sprites/back/0751--000--Dewpider.png b/src/afd/sprites/back/0751-000-Dewpider.png
similarity index 100%
rename from src/afd/sprites/back/0751--000--Dewpider.png
rename to src/afd/sprites/back/0751-000-Dewpider.png
diff --git a/src/afd/sprites/back/0752--000--Araquanid.png b/src/afd/sprites/back/0752-000-Araquanid.png
similarity index 100%
rename from src/afd/sprites/back/0752--000--Araquanid.png
rename to src/afd/sprites/back/0752-000-Araquanid.png
diff --git a/src/afd/sprites/back/0753--000--Fomantis.png b/src/afd/sprites/back/0753-000-Fomantis.png
similarity index 100%
rename from src/afd/sprites/back/0753--000--Fomantis.png
rename to src/afd/sprites/back/0753-000-Fomantis.png
diff --git a/src/afd/sprites/back/0754--000--Lurantis.png b/src/afd/sprites/back/0754-000-Lurantis.png
similarity index 100%
rename from src/afd/sprites/back/0754--000--Lurantis.png
rename to src/afd/sprites/back/0754-000-Lurantis.png
diff --git a/src/afd/sprites/back/0755--000--Morelull.png b/src/afd/sprites/back/0755-000-Morelull.png
similarity index 100%
rename from src/afd/sprites/back/0755--000--Morelull.png
rename to src/afd/sprites/back/0755-000-Morelull.png
diff --git a/src/afd/sprites/back/0756--000--Shiinotic.png b/src/afd/sprites/back/0756-000-Shiinotic.png
similarity index 100%
rename from src/afd/sprites/back/0756--000--Shiinotic.png
rename to src/afd/sprites/back/0756-000-Shiinotic.png
diff --git a/src/afd/sprites/back/0757--000--Salandit.png b/src/afd/sprites/back/0757-000-Salandit.png
similarity index 100%
rename from src/afd/sprites/back/0757--000--Salandit.png
rename to src/afd/sprites/back/0757-000-Salandit.png
diff --git a/src/afd/sprites/back/0758--000--Salazzle.png b/src/afd/sprites/back/0758-000-Salazzle.png
similarity index 100%
rename from src/afd/sprites/back/0758--000--Salazzle.png
rename to src/afd/sprites/back/0758-000-Salazzle.png
diff --git a/src/afd/sprites/back/0759--000--Stufful.png b/src/afd/sprites/back/0759-000-Stufful.png
similarity index 100%
rename from src/afd/sprites/back/0759--000--Stufful.png
rename to src/afd/sprites/back/0759-000-Stufful.png
diff --git a/src/afd/sprites/back/0760--000--Bewear.png b/src/afd/sprites/back/0760-000-Bewear.png
similarity index 100%
rename from src/afd/sprites/back/0760--000--Bewear.png
rename to src/afd/sprites/back/0760-000-Bewear.png
diff --git a/src/afd/sprites/back/0761--000--Bounsweet.png b/src/afd/sprites/back/0761-000-Bounsweet.png
similarity index 100%
rename from src/afd/sprites/back/0761--000--Bounsweet.png
rename to src/afd/sprites/back/0761-000-Bounsweet.png
diff --git a/src/afd/sprites/back/0762--000--Steenee.png b/src/afd/sprites/back/0762-000-Steenee.png
similarity index 100%
rename from src/afd/sprites/back/0762--000--Steenee.png
rename to src/afd/sprites/back/0762-000-Steenee.png
diff --git a/src/afd/sprites/back/0763--000--Tsareena.png b/src/afd/sprites/back/0763-000-Tsareena.png
similarity index 100%
rename from src/afd/sprites/back/0763--000--Tsareena.png
rename to src/afd/sprites/back/0763-000-Tsareena.png
diff --git a/src/afd/sprites/back/0764--000--Comfey.png b/src/afd/sprites/back/0764-000-Comfey.png
similarity index 100%
rename from src/afd/sprites/back/0764--000--Comfey.png
rename to src/afd/sprites/back/0764-000-Comfey.png
diff --git a/src/afd/sprites/back/0765--000--Oranguru.png b/src/afd/sprites/back/0765-000-Oranguru.png
similarity index 100%
rename from src/afd/sprites/back/0765--000--Oranguru.png
rename to src/afd/sprites/back/0765-000-Oranguru.png
diff --git a/src/afd/sprites/back/0766--000--Passimian.png b/src/afd/sprites/back/0766-000-Passimian.png
similarity index 100%
rename from src/afd/sprites/back/0766--000--Passimian.png
rename to src/afd/sprites/back/0766-000-Passimian.png
diff --git a/src/afd/sprites/back/0767--000--Wimpod.png b/src/afd/sprites/back/0767-000-Wimpod.png
similarity index 100%
rename from src/afd/sprites/back/0767--000--Wimpod.png
rename to src/afd/sprites/back/0767-000-Wimpod.png
diff --git a/src/afd/sprites/back/0768--000--Golisopod.png b/src/afd/sprites/back/0768-000-Golisopod.png
similarity index 100%
rename from src/afd/sprites/back/0768--000--Golisopod.png
rename to src/afd/sprites/back/0768-000-Golisopod.png
diff --git a/src/afd/sprites/back/0769--000--Sandygast.png b/src/afd/sprites/back/0769-000-Sandygast.png
similarity index 100%
rename from src/afd/sprites/back/0769--000--Sandygast.png
rename to src/afd/sprites/back/0769-000-Sandygast.png
diff --git a/src/afd/sprites/back/0770--000--Palossand.png b/src/afd/sprites/back/0770-000-Palossand.png
similarity index 100%
rename from src/afd/sprites/back/0770--000--Palossand.png
rename to src/afd/sprites/back/0770-000-Palossand.png
diff --git a/src/afd/sprites/back/0771--000--Pyukumuku.png b/src/afd/sprites/back/0771-000-Pyukumuku.png
similarity index 100%
rename from src/afd/sprites/back/0771--000--Pyukumuku.png
rename to src/afd/sprites/back/0771-000-Pyukumuku.png
diff --git a/src/afd/sprites/back/0772--000--Type__003a_Null.png b/src/afd/sprites/back/0772-000-Type__003a_Null.png
similarity index 100%
rename from src/afd/sprites/back/0772--000--Type__003a_Null.png
rename to src/afd/sprites/back/0772-000-Type__003a_Null.png
diff --git a/src/afd/sprites/back/0773--000--Silvally.png b/src/afd/sprites/back/0773-000-Silvally.png
similarity index 100%
rename from src/afd/sprites/back/0773--000--Silvally.png
rename to src/afd/sprites/back/0773-000-Silvally.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Bug.png b/src/afd/sprites/back/0773-420-Silvally-Bug.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Bug.png
rename to src/afd/sprites/back/0773-420-Silvally-Bug.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Dark.png b/src/afd/sprites/back/0773-420-Silvally-Dark.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Dark.png
rename to src/afd/sprites/back/0773-420-Silvally-Dark.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Dragon.png b/src/afd/sprites/back/0773-420-Silvally-Dragon.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Dragon.png
rename to src/afd/sprites/back/0773-420-Silvally-Dragon.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Electric.png b/src/afd/sprites/back/0773-420-Silvally-Electric.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Electric.png
rename to src/afd/sprites/back/0773-420-Silvally-Electric.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Fairy.png b/src/afd/sprites/back/0773-420-Silvally-Fairy.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Fairy.png
rename to src/afd/sprites/back/0773-420-Silvally-Fairy.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Fighting.png b/src/afd/sprites/back/0773-420-Silvally-Fighting.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Fighting.png
rename to src/afd/sprites/back/0773-420-Silvally-Fighting.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Fire.png b/src/afd/sprites/back/0773-420-Silvally-Fire.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Fire.png
rename to src/afd/sprites/back/0773-420-Silvally-Fire.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Flying.png b/src/afd/sprites/back/0773-420-Silvally-Flying.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Flying.png
rename to src/afd/sprites/back/0773-420-Silvally-Flying.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Ghost.png b/src/afd/sprites/back/0773-420-Silvally-Ghost.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Ghost.png
rename to src/afd/sprites/back/0773-420-Silvally-Ghost.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Grass.png b/src/afd/sprites/back/0773-420-Silvally-Grass.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Grass.png
rename to src/afd/sprites/back/0773-420-Silvally-Grass.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Ground.png b/src/afd/sprites/back/0773-420-Silvally-Ground.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Ground.png
rename to src/afd/sprites/back/0773-420-Silvally-Ground.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Ice.png b/src/afd/sprites/back/0773-420-Silvally-Ice.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Ice.png
rename to src/afd/sprites/back/0773-420-Silvally-Ice.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Poison.png b/src/afd/sprites/back/0773-420-Silvally-Poison.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Poison.png
rename to src/afd/sprites/back/0773-420-Silvally-Poison.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Psychic.png b/src/afd/sprites/back/0773-420-Silvally-Psychic.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Psychic.png
rename to src/afd/sprites/back/0773-420-Silvally-Psychic.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Rock.png b/src/afd/sprites/back/0773-420-Silvally-Rock.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Rock.png
rename to src/afd/sprites/back/0773-420-Silvally-Rock.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Steel.png b/src/afd/sprites/back/0773-420-Silvally-Steel.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Steel.png
rename to src/afd/sprites/back/0773-420-Silvally-Steel.png
diff --git a/src/afd/sprites/back/0773--420--Silvally--Water.png b/src/afd/sprites/back/0773-420-Silvally-Water.png
similarity index 100%
rename from src/afd/sprites/back/0773--420--Silvally--Water.png
rename to src/afd/sprites/back/0773-420-Silvally-Water.png
diff --git a/src/afd/sprites/back/0774--000--Minior.png b/src/afd/sprites/back/0774-000-Minior.png
similarity index 100%
rename from src/afd/sprites/back/0774--000--Minior.png
rename to src/afd/sprites/back/0774-000-Minior.png
diff --git a/src/afd/sprites/back/0774--420--Minior--Meteor.png b/src/afd/sprites/back/0774-420-Minior-Meteor.png
similarity index 100%
rename from src/afd/sprites/back/0774--420--Minior--Meteor.png
rename to src/afd/sprites/back/0774-420-Minior-Meteor.png
diff --git a/src/afd/sprites/back/0775--000--Komala.png b/src/afd/sprites/back/0775-000-Komala.png
similarity index 100%
rename from src/afd/sprites/back/0775--000--Komala.png
rename to src/afd/sprites/back/0775-000-Komala.png
diff --git a/src/afd/sprites/back/0776--000--Turtonator.png b/src/afd/sprites/back/0776-000-Turtonator.png
similarity index 100%
rename from src/afd/sprites/back/0776--000--Turtonator.png
rename to src/afd/sprites/back/0776-000-Turtonator.png
diff --git a/src/afd/sprites/back/0777--000--Togedemaru.png b/src/afd/sprites/back/0777-000-Togedemaru.png
similarity index 100%
rename from src/afd/sprites/back/0777--000--Togedemaru.png
rename to src/afd/sprites/back/0777-000-Togedemaru.png
diff --git a/src/afd/sprites/back/0778--000--Mimikyu.png b/src/afd/sprites/back/0778-000-Mimikyu.png
similarity index 100%
rename from src/afd/sprites/back/0778--000--Mimikyu.png
rename to src/afd/sprites/back/0778-000-Mimikyu.png
diff --git a/src/afd/sprites/back/0778--420--Mimikyu--Busted.png b/src/afd/sprites/back/0778-420-Mimikyu-Busted.png
similarity index 100%
rename from src/afd/sprites/back/0778--420--Mimikyu--Busted.png
rename to src/afd/sprites/back/0778-420-Mimikyu-Busted.png
diff --git a/src/afd/sprites/back/0779--000--Bruxish.png b/src/afd/sprites/back/0779-000-Bruxish.png
similarity index 100%
rename from src/afd/sprites/back/0779--000--Bruxish.png
rename to src/afd/sprites/back/0779-000-Bruxish.png
diff --git a/src/afd/sprites/back/0780--000--Drampa.png b/src/afd/sprites/back/0780-000-Drampa.png
similarity index 100%
rename from src/afd/sprites/back/0780--000--Drampa.png
rename to src/afd/sprites/back/0780-000-Drampa.png
diff --git a/src/afd/sprites/back/0781--000--Dhelmise.png b/src/afd/sprites/back/0781-000-Dhelmise.png
similarity index 100%
rename from src/afd/sprites/back/0781--000--Dhelmise.png
rename to src/afd/sprites/back/0781-000-Dhelmise.png
diff --git a/src/afd/sprites/back/0782--000--Jangmo-o.png b/src/afd/sprites/back/0782-000-Jangmo~o.png
similarity index 100%
rename from src/afd/sprites/back/0782--000--Jangmo-o.png
rename to src/afd/sprites/back/0782-000-Jangmo~o.png
diff --git a/src/afd/sprites/back/0783--000--Hakamo-o.png b/src/afd/sprites/back/0783-000-Hakamo~o.png
similarity index 100%
rename from src/afd/sprites/back/0783--000--Hakamo-o.png
rename to src/afd/sprites/back/0783-000-Hakamo~o.png
diff --git a/src/afd/sprites/back/0784--000--Kommo-o.png b/src/afd/sprites/back/0784-000-Kommo~o.png
similarity index 100%
rename from src/afd/sprites/back/0784--000--Kommo-o.png
rename to src/afd/sprites/back/0784-000-Kommo~o.png
diff --git a/src/afd/sprites/back/0785--000--Tapu_Koko.png b/src/afd/sprites/back/0785-000-Tapu_Koko.png
similarity index 100%
rename from src/afd/sprites/back/0785--000--Tapu_Koko.png
rename to src/afd/sprites/back/0785-000-Tapu_Koko.png
diff --git a/src/afd/sprites/back/0786--000--Tapu_Lele.png b/src/afd/sprites/back/0786-000-Tapu_Lele.png
similarity index 100%
rename from src/afd/sprites/back/0786--000--Tapu_Lele.png
rename to src/afd/sprites/back/0786-000-Tapu_Lele.png
diff --git a/src/afd/sprites/back/0787--000--Tapu_Bulu.png b/src/afd/sprites/back/0787-000-Tapu_Bulu.png
similarity index 100%
rename from src/afd/sprites/back/0787--000--Tapu_Bulu.png
rename to src/afd/sprites/back/0787-000-Tapu_Bulu.png
diff --git a/src/afd/sprites/back/0788--000--Tapu_Fini.png b/src/afd/sprites/back/0788-000-Tapu_Fini.png
similarity index 100%
rename from src/afd/sprites/back/0788--000--Tapu_Fini.png
rename to src/afd/sprites/back/0788-000-Tapu_Fini.png
diff --git a/src/afd/sprites/back/0789--000--Cosmog.png b/src/afd/sprites/back/0789-000-Cosmog.png
similarity index 100%
rename from src/afd/sprites/back/0789--000--Cosmog.png
rename to src/afd/sprites/back/0789-000-Cosmog.png
diff --git a/src/afd/sprites/back/0790--000--Cosmoem.png b/src/afd/sprites/back/0790-000-Cosmoem.png
similarity index 100%
rename from src/afd/sprites/back/0790--000--Cosmoem.png
rename to src/afd/sprites/back/0790-000-Cosmoem.png
diff --git a/src/afd/sprites/back/0791--000--Solgaleo.png b/src/afd/sprites/back/0791-000-Solgaleo.png
similarity index 100%
rename from src/afd/sprites/back/0791--000--Solgaleo.png
rename to src/afd/sprites/back/0791-000-Solgaleo.png
diff --git a/src/afd/sprites/back/0792--000--Lunala.png b/src/afd/sprites/back/0792-000-Lunala.png
similarity index 100%
rename from src/afd/sprites/back/0792--000--Lunala.png
rename to src/afd/sprites/back/0792-000-Lunala.png
diff --git a/src/afd/sprites/back/0793--000--Nihilego.png b/src/afd/sprites/back/0793-000-Nihilego.png
similarity index 100%
rename from src/afd/sprites/back/0793--000--Nihilego.png
rename to src/afd/sprites/back/0793-000-Nihilego.png
diff --git a/src/afd/sprites/back/0794--000--Buzzwole.png b/src/afd/sprites/back/0794-000-Buzzwole.png
similarity index 100%
rename from src/afd/sprites/back/0794--000--Buzzwole.png
rename to src/afd/sprites/back/0794-000-Buzzwole.png
diff --git a/src/afd/sprites/back/0795--000--Pheromosa.png b/src/afd/sprites/back/0795-000-Pheromosa.png
similarity index 100%
rename from src/afd/sprites/back/0795--000--Pheromosa.png
rename to src/afd/sprites/back/0795-000-Pheromosa.png
diff --git a/src/afd/sprites/back/0796--000--Xurkitree.png b/src/afd/sprites/back/0796-000-Xurkitree.png
similarity index 100%
rename from src/afd/sprites/back/0796--000--Xurkitree.png
rename to src/afd/sprites/back/0796-000-Xurkitree.png
diff --git a/src/afd/sprites/back/0797--000--Celesteela.png b/src/afd/sprites/back/0797-000-Celesteela.png
similarity index 100%
rename from src/afd/sprites/back/0797--000--Celesteela.png
rename to src/afd/sprites/back/0797-000-Celesteela.png
diff --git a/src/afd/sprites/back/0798--000--Kartana.png b/src/afd/sprites/back/0798-000-Kartana.png
similarity index 100%
rename from src/afd/sprites/back/0798--000--Kartana.png
rename to src/afd/sprites/back/0798-000-Kartana.png
diff --git a/src/afd/sprites/back/0799--000--Guzzlord.png b/src/afd/sprites/back/0799-000-Guzzlord.png
similarity index 100%
rename from src/afd/sprites/back/0799--000--Guzzlord.png
rename to src/afd/sprites/back/0799-000-Guzzlord.png
diff --git a/src/afd/sprites/back/0800--000--Necrozma.png b/src/afd/sprites/back/0800-000-Necrozma.png
similarity index 100%
rename from src/afd/sprites/back/0800--000--Necrozma.png
rename to src/afd/sprites/back/0800-000-Necrozma.png
diff --git a/src/afd/sprites/back/0800--420--Necrozma--Dawn-Wings.png b/src/afd/sprites/back/0800-420-Necrozma-Dawn~Wings.png
similarity index 100%
rename from src/afd/sprites/back/0800--420--Necrozma--Dawn-Wings.png
rename to src/afd/sprites/back/0800-420-Necrozma-Dawn~Wings.png
diff --git a/src/afd/sprites/back/0800--420--Necrozma--Dusk-Mane.png b/src/afd/sprites/back/0800-420-Necrozma-Dusk~Mane.png
similarity index 100%
rename from src/afd/sprites/back/0800--420--Necrozma--Dusk-Mane.png
rename to src/afd/sprites/back/0800-420-Necrozma-Dusk~Mane.png
diff --git a/src/afd/sprites/back/0800--420--Necrozma--Ultra.png b/src/afd/sprites/back/0800-420-Necrozma-Ultra.png
similarity index 100%
rename from src/afd/sprites/back/0800--420--Necrozma--Ultra.png
rename to src/afd/sprites/back/0800-420-Necrozma-Ultra.png
diff --git a/src/afd/sprites/back/0801--000--Magearna.png b/src/afd/sprites/back/0801-000-Magearna.png
similarity index 100%
rename from src/afd/sprites/back/0801--000--Magearna.png
rename to src/afd/sprites/back/0801-000-Magearna.png
diff --git a/src/afd/sprites/back/0802--000--Marshadow.png b/src/afd/sprites/back/0802-000-Marshadow.png
similarity index 100%
rename from src/afd/sprites/back/0802--000--Marshadow.png
rename to src/afd/sprites/back/0802-000-Marshadow.png
diff --git a/src/afd/sprites/back/0803--000--Poipole.png b/src/afd/sprites/back/0803-000-Poipole.png
similarity index 100%
rename from src/afd/sprites/back/0803--000--Poipole.png
rename to src/afd/sprites/back/0803-000-Poipole.png
diff --git a/src/afd/sprites/back/0804--000--Naganadel.png b/src/afd/sprites/back/0804-000-Naganadel.png
similarity index 100%
rename from src/afd/sprites/back/0804--000--Naganadel.png
rename to src/afd/sprites/back/0804-000-Naganadel.png
diff --git a/src/afd/sprites/back/0805--000--Stakataka.png b/src/afd/sprites/back/0805-000-Stakataka.png
similarity index 100%
rename from src/afd/sprites/back/0805--000--Stakataka.png
rename to src/afd/sprites/back/0805-000-Stakataka.png
diff --git a/src/afd/sprites/back/0806--000--Blacephalon.png b/src/afd/sprites/back/0806-000-Blacephalon.png
similarity index 100%
rename from src/afd/sprites/back/0806--000--Blacephalon.png
rename to src/afd/sprites/back/0806-000-Blacephalon.png
diff --git a/src/afd/sprites/back/0807--000--Zeraora.png b/src/afd/sprites/back/0807-000-Zeraora.png
similarity index 100%
rename from src/afd/sprites/back/0807--000--Zeraora.png
rename to src/afd/sprites/back/0807-000-Zeraora.png
diff --git a/src/afd/sprites/back/0808--000--Meltan.png b/src/afd/sprites/back/0808-000-Meltan.png
similarity index 100%
rename from src/afd/sprites/back/0808--000--Meltan.png
rename to src/afd/sprites/back/0808-000-Meltan.png
diff --git a/src/afd/sprites/back/0809--000--Melmetal.png b/src/afd/sprites/back/0809-000-Melmetal.png
similarity index 100%
rename from src/afd/sprites/back/0809--000--Melmetal.png
rename to src/afd/sprites/back/0809-000-Melmetal.png
diff --git a/src/afd/sprites/back/0809--420--Melmetal--Gmax.png b/src/afd/sprites/back/0809-420-Melmetal-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0809--420--Melmetal--Gmax.png
rename to src/afd/sprites/back/0809-420-Melmetal-Gmax.png
diff --git a/src/afd/sprites/back/0810--000--Grookey.png b/src/afd/sprites/back/0810-000-Grookey.png
similarity index 100%
rename from src/afd/sprites/back/0810--000--Grookey.png
rename to src/afd/sprites/back/0810-000-Grookey.png
diff --git a/src/afd/sprites/back/0811--000--Thwackey.png b/src/afd/sprites/back/0811-000-Thwackey.png
similarity index 100%
rename from src/afd/sprites/back/0811--000--Thwackey.png
rename to src/afd/sprites/back/0811-000-Thwackey.png
diff --git a/src/afd/sprites/back/0812--000--Rillaboom.png b/src/afd/sprites/back/0812-000-Rillaboom.png
similarity index 100%
rename from src/afd/sprites/back/0812--000--Rillaboom.png
rename to src/afd/sprites/back/0812-000-Rillaboom.png
diff --git a/src/afd/sprites/back/0813--000--Scorbunny.png b/src/afd/sprites/back/0813-000-Scorbunny.png
similarity index 100%
rename from src/afd/sprites/back/0813--000--Scorbunny.png
rename to src/afd/sprites/back/0813-000-Scorbunny.png
diff --git a/src/afd/sprites/back/0814--000--Raboot.png b/src/afd/sprites/back/0814-000-Raboot.png
similarity index 100%
rename from src/afd/sprites/back/0814--000--Raboot.png
rename to src/afd/sprites/back/0814-000-Raboot.png
diff --git a/src/afd/sprites/back/0815--000--Cinderace.png b/src/afd/sprites/back/0815-000-Cinderace.png
similarity index 100%
rename from src/afd/sprites/back/0815--000--Cinderace.png
rename to src/afd/sprites/back/0815-000-Cinderace.png
diff --git a/src/afd/sprites/back/0816--000--Sobble.png b/src/afd/sprites/back/0816-000-Sobble.png
similarity index 100%
rename from src/afd/sprites/back/0816--000--Sobble.png
rename to src/afd/sprites/back/0816-000-Sobble.png
diff --git a/src/afd/sprites/back/0817--000--Drizzile.png b/src/afd/sprites/back/0817-000-Drizzile.png
similarity index 100%
rename from src/afd/sprites/back/0817--000--Drizzile.png
rename to src/afd/sprites/back/0817-000-Drizzile.png
diff --git a/src/afd/sprites/back/0818--000--Inteleon.png b/src/afd/sprites/back/0818-000-Inteleon.png
similarity index 100%
rename from src/afd/sprites/back/0818--000--Inteleon.png
rename to src/afd/sprites/back/0818-000-Inteleon.png
diff --git a/src/afd/sprites/back/0819--000--Skwovet.png b/src/afd/sprites/back/0819-000-Skwovet.png
similarity index 100%
rename from src/afd/sprites/back/0819--000--Skwovet.png
rename to src/afd/sprites/back/0819-000-Skwovet.png
diff --git a/src/afd/sprites/back/0820--000--Greedent.png b/src/afd/sprites/back/0820-000-Greedent.png
similarity index 100%
rename from src/afd/sprites/back/0820--000--Greedent.png
rename to src/afd/sprites/back/0820-000-Greedent.png
diff --git a/src/afd/sprites/back/0821--000--Rookidee.png b/src/afd/sprites/back/0821-000-Rookidee.png
similarity index 100%
rename from src/afd/sprites/back/0821--000--Rookidee.png
rename to src/afd/sprites/back/0821-000-Rookidee.png
diff --git a/src/afd/sprites/back/0822--000--Corvisquire.png b/src/afd/sprites/back/0822-000-Corvisquire.png
similarity index 100%
rename from src/afd/sprites/back/0822--000--Corvisquire.png
rename to src/afd/sprites/back/0822-000-Corvisquire.png
diff --git a/src/afd/sprites/back/0823--000--Corviknight.png b/src/afd/sprites/back/0823-000-Corviknight.png
similarity index 100%
rename from src/afd/sprites/back/0823--000--Corviknight.png
rename to src/afd/sprites/back/0823-000-Corviknight.png
diff --git a/src/afd/sprites/back/0823--420--Corviknight--Gmax.png b/src/afd/sprites/back/0823-420-Corviknight-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0823--420--Corviknight--Gmax.png
rename to src/afd/sprites/back/0823-420-Corviknight-Gmax.png
diff --git a/src/afd/sprites/back/0824--000--Blipbug.png b/src/afd/sprites/back/0824-000-Blipbug.png
similarity index 100%
rename from src/afd/sprites/back/0824--000--Blipbug.png
rename to src/afd/sprites/back/0824-000-Blipbug.png
diff --git a/src/afd/sprites/back/0825--000--Dottler.png b/src/afd/sprites/back/0825-000-Dottler.png
similarity index 100%
rename from src/afd/sprites/back/0825--000--Dottler.png
rename to src/afd/sprites/back/0825-000-Dottler.png
diff --git a/src/afd/sprites/back/0826--000--Orbeetle.png b/src/afd/sprites/back/0826-000-Orbeetle.png
similarity index 100%
rename from src/afd/sprites/back/0826--000--Orbeetle.png
rename to src/afd/sprites/back/0826-000-Orbeetle.png
diff --git a/src/afd/sprites/back/0826--420--Orbeetle--Gmax.png b/src/afd/sprites/back/0826-420-Orbeetle-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0826--420--Orbeetle--Gmax.png
rename to src/afd/sprites/back/0826-420-Orbeetle-Gmax.png
diff --git a/src/afd/sprites/back/0827--000--Nickit.png b/src/afd/sprites/back/0827-000-Nickit.png
similarity index 100%
rename from src/afd/sprites/back/0827--000--Nickit.png
rename to src/afd/sprites/back/0827-000-Nickit.png
diff --git a/src/afd/sprites/back/0828--000--Thievul.png b/src/afd/sprites/back/0828-000-Thievul.png
similarity index 100%
rename from src/afd/sprites/back/0828--000--Thievul.png
rename to src/afd/sprites/back/0828-000-Thievul.png
diff --git a/src/afd/sprites/back/0829--000--Gossifleur.png b/src/afd/sprites/back/0829-000-Gossifleur.png
similarity index 100%
rename from src/afd/sprites/back/0829--000--Gossifleur.png
rename to src/afd/sprites/back/0829-000-Gossifleur.png
diff --git a/src/afd/sprites/back/0830--000--Eldegoss.png b/src/afd/sprites/back/0830-000-Eldegoss.png
similarity index 100%
rename from src/afd/sprites/back/0830--000--Eldegoss.png
rename to src/afd/sprites/back/0830-000-Eldegoss.png
diff --git a/src/afd/sprites/back/0831--000--Wooloo.png b/src/afd/sprites/back/0831-000-Wooloo.png
similarity index 100%
rename from src/afd/sprites/back/0831--000--Wooloo.png
rename to src/afd/sprites/back/0831-000-Wooloo.png
diff --git a/src/afd/sprites/back/0832--000--Dubwool.png b/src/afd/sprites/back/0832-000-Dubwool.png
similarity index 100%
rename from src/afd/sprites/back/0832--000--Dubwool.png
rename to src/afd/sprites/back/0832-000-Dubwool.png
diff --git a/src/afd/sprites/back/0833--000--Chewtle.png b/src/afd/sprites/back/0833-000-Chewtle.png
similarity index 100%
rename from src/afd/sprites/back/0833--000--Chewtle.png
rename to src/afd/sprites/back/0833-000-Chewtle.png
diff --git a/src/afd/sprites/back/0834--000--Drednaw.png b/src/afd/sprites/back/0834-000-Drednaw.png
similarity index 100%
rename from src/afd/sprites/back/0834--000--Drednaw.png
rename to src/afd/sprites/back/0834-000-Drednaw.png
diff --git a/src/afd/sprites/back/0834--420--Drednaw--Gmax.png b/src/afd/sprites/back/0834-420-Drednaw-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0834--420--Drednaw--Gmax.png
rename to src/afd/sprites/back/0834-420-Drednaw-Gmax.png
diff --git a/src/afd/sprites/back/0835--000--Yamper.png b/src/afd/sprites/back/0835-000-Yamper.png
similarity index 100%
rename from src/afd/sprites/back/0835--000--Yamper.png
rename to src/afd/sprites/back/0835-000-Yamper.png
diff --git a/src/afd/sprites/back/0836--000--Boltund.png b/src/afd/sprites/back/0836-000-Boltund.png
similarity index 100%
rename from src/afd/sprites/back/0836--000--Boltund.png
rename to src/afd/sprites/back/0836-000-Boltund.png
diff --git a/src/afd/sprites/back/0837--000--Rolycoly.png b/src/afd/sprites/back/0837-000-Rolycoly.png
similarity index 100%
rename from src/afd/sprites/back/0837--000--Rolycoly.png
rename to src/afd/sprites/back/0837-000-Rolycoly.png
diff --git a/src/afd/sprites/back/0838--000--Carkol.png b/src/afd/sprites/back/0838-000-Carkol.png
similarity index 100%
rename from src/afd/sprites/back/0838--000--Carkol.png
rename to src/afd/sprites/back/0838-000-Carkol.png
diff --git a/src/afd/sprites/back/0839--000--Coalossal.png b/src/afd/sprites/back/0839-000-Coalossal.png
similarity index 100%
rename from src/afd/sprites/back/0839--000--Coalossal.png
rename to src/afd/sprites/back/0839-000-Coalossal.png
diff --git a/src/afd/sprites/back/0839--420--Coalossal--Gmax.png b/src/afd/sprites/back/0839-420-Coalossal-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0839--420--Coalossal--Gmax.png
rename to src/afd/sprites/back/0839-420-Coalossal-Gmax.png
diff --git a/src/afd/sprites/back/0840--000--Applin.png b/src/afd/sprites/back/0840-000-Applin.png
similarity index 100%
rename from src/afd/sprites/back/0840--000--Applin.png
rename to src/afd/sprites/back/0840-000-Applin.png
diff --git a/src/afd/sprites/back/0841--000--Flapple.png b/src/afd/sprites/back/0841-000-Flapple.png
similarity index 100%
rename from src/afd/sprites/back/0841--000--Flapple.png
rename to src/afd/sprites/back/0841-000-Flapple.png
diff --git a/src/afd/sprites/back/0841--420--Flapple--Gmax.png b/src/afd/sprites/back/0841-420-Flapple-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0841--420--Flapple--Gmax.png
rename to src/afd/sprites/back/0841-420-Flapple-Gmax.png
diff --git a/src/afd/sprites/back/0842--000--Appletun.png b/src/afd/sprites/back/0842-000-Appletun.png
similarity index 100%
rename from src/afd/sprites/back/0842--000--Appletun.png
rename to src/afd/sprites/back/0842-000-Appletun.png
diff --git a/src/afd/sprites/back/0842--420--Appletun--Gmax.png b/src/afd/sprites/back/0842-420-Appletun-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0842--420--Appletun--Gmax.png
rename to src/afd/sprites/back/0842-420-Appletun-Gmax.png
diff --git a/src/afd/sprites/back/0843--000--Silicobra.png b/src/afd/sprites/back/0843-000-Silicobra.png
similarity index 100%
rename from src/afd/sprites/back/0843--000--Silicobra.png
rename to src/afd/sprites/back/0843-000-Silicobra.png
diff --git a/src/afd/sprites/back/0844--000--Sandaconda.png b/src/afd/sprites/back/0844-000-Sandaconda.png
similarity index 100%
rename from src/afd/sprites/back/0844--000--Sandaconda.png
rename to src/afd/sprites/back/0844-000-Sandaconda.png
diff --git a/src/afd/sprites/back/0844--420--Sandaconda--Gmax.png b/src/afd/sprites/back/0844-420-Sandaconda-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0844--420--Sandaconda--Gmax.png
rename to src/afd/sprites/back/0844-420-Sandaconda-Gmax.png
diff --git a/src/afd/sprites/back/0845--000--Cramorant.png b/src/afd/sprites/back/0845-000-Cramorant.png
similarity index 100%
rename from src/afd/sprites/back/0845--000--Cramorant.png
rename to src/afd/sprites/back/0845-000-Cramorant.png
diff --git a/src/afd/sprites/back/0845--420--Cramorant--Gorging.png b/src/afd/sprites/back/0845-420-Cramorant-Gorging.png
similarity index 100%
rename from src/afd/sprites/back/0845--420--Cramorant--Gorging.png
rename to src/afd/sprites/back/0845-420-Cramorant-Gorging.png
diff --git a/src/afd/sprites/back/0845--420--Cramorant--Gulping.png b/src/afd/sprites/back/0845-420-Cramorant-Gulping.png
similarity index 100%
rename from src/afd/sprites/back/0845--420--Cramorant--Gulping.png
rename to src/afd/sprites/back/0845-420-Cramorant-Gulping.png
diff --git a/src/afd/sprites/back/0846--000--Arrokuda.png b/src/afd/sprites/back/0846-000-Arrokuda.png
similarity index 100%
rename from src/afd/sprites/back/0846--000--Arrokuda.png
rename to src/afd/sprites/back/0846-000-Arrokuda.png
diff --git a/src/afd/sprites/back/0847--000--Barraskewda.png b/src/afd/sprites/back/0847-000-Barraskewda.png
similarity index 100%
rename from src/afd/sprites/back/0847--000--Barraskewda.png
rename to src/afd/sprites/back/0847-000-Barraskewda.png
diff --git a/src/afd/sprites/back/0848--000--Toxel.png b/src/afd/sprites/back/0848-000-Toxel.png
similarity index 100%
rename from src/afd/sprites/back/0848--000--Toxel.png
rename to src/afd/sprites/back/0848-000-Toxel.png
diff --git a/src/afd/sprites/back/0849--000--Toxtricity.png b/src/afd/sprites/back/0849-000-Toxtricity.png
similarity index 100%
rename from src/afd/sprites/back/0849--000--Toxtricity.png
rename to src/afd/sprites/back/0849-000-Toxtricity.png
diff --git a/src/afd/sprites/back/0849--420--Toxtricity--Gmax.png b/src/afd/sprites/back/0849-420-Toxtricity-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0849--420--Toxtricity--Gmax.png
rename to src/afd/sprites/back/0849-420-Toxtricity-Gmax.png
diff --git a/src/afd/sprites/back/0849--420--Toxtricity--Low-Key.png b/src/afd/sprites/back/0849-420-Toxtricity-Low~Key.png
similarity index 100%
rename from src/afd/sprites/back/0849--420--Toxtricity--Low-Key.png
rename to src/afd/sprites/back/0849-420-Toxtricity-Low~Key.png
diff --git a/src/afd/sprites/back/0849--420--Toxtricity--Low-Key-Gmax.png b/src/afd/sprites/back/0849-420-Toxtricity-Low~Key~Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0849--420--Toxtricity--Low-Key-Gmax.png
rename to src/afd/sprites/back/0849-420-Toxtricity-Low~Key~Gmax.png
diff --git a/src/afd/sprites/back/0850--000--Sizzlipede.png b/src/afd/sprites/back/0850-000-Sizzlipede.png
similarity index 100%
rename from src/afd/sprites/back/0850--000--Sizzlipede.png
rename to src/afd/sprites/back/0850-000-Sizzlipede.png
diff --git a/src/afd/sprites/back/0851--000--Centiskorch.png b/src/afd/sprites/back/0851-000-Centiskorch.png
similarity index 100%
rename from src/afd/sprites/back/0851--000--Centiskorch.png
rename to src/afd/sprites/back/0851-000-Centiskorch.png
diff --git a/src/afd/sprites/back/0851--420--Centiskorch--Gmax.png b/src/afd/sprites/back/0851-420-Centiskorch-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0851--420--Centiskorch--Gmax.png
rename to src/afd/sprites/back/0851-420-Centiskorch-Gmax.png
diff --git a/src/afd/sprites/back/0852--000--Clobbopus.png b/src/afd/sprites/back/0852-000-Clobbopus.png
similarity index 100%
rename from src/afd/sprites/back/0852--000--Clobbopus.png
rename to src/afd/sprites/back/0852-000-Clobbopus.png
diff --git a/src/afd/sprites/back/0853--000--Grapploct.png b/src/afd/sprites/back/0853-000-Grapploct.png
similarity index 100%
rename from src/afd/sprites/back/0853--000--Grapploct.png
rename to src/afd/sprites/back/0853-000-Grapploct.png
diff --git a/src/afd/sprites/back/0854--000--Sinistea.png b/src/afd/sprites/back/0854-000-Sinistea.png
similarity index 100%
rename from src/afd/sprites/back/0854--000--Sinistea.png
rename to src/afd/sprites/back/0854-000-Sinistea.png
diff --git a/src/afd/sprites/back/0855--000--Polteageist.png b/src/afd/sprites/back/0855-000-Polteageist.png
similarity index 100%
rename from src/afd/sprites/back/0855--000--Polteageist.png
rename to src/afd/sprites/back/0855-000-Polteageist.png
diff --git a/src/afd/sprites/back/0856--000--Hatenna.png b/src/afd/sprites/back/0856-000-Hatenna.png
similarity index 100%
rename from src/afd/sprites/back/0856--000--Hatenna.png
rename to src/afd/sprites/back/0856-000-Hatenna.png
diff --git a/src/afd/sprites/back/0857--000--Hattrem.png b/src/afd/sprites/back/0857-000-Hattrem.png
similarity index 100%
rename from src/afd/sprites/back/0857--000--Hattrem.png
rename to src/afd/sprites/back/0857-000-Hattrem.png
diff --git a/src/afd/sprites/back/0858--000--Hatterene.png b/src/afd/sprites/back/0858-000-Hatterene.png
similarity index 100%
rename from src/afd/sprites/back/0858--000--Hatterene.png
rename to src/afd/sprites/back/0858-000-Hatterene.png
diff --git a/src/afd/sprites/back/0858--420--Hatterene--Gmax.png b/src/afd/sprites/back/0858-420-Hatterene-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0858--420--Hatterene--Gmax.png
rename to src/afd/sprites/back/0858-420-Hatterene-Gmax.png
diff --git a/src/afd/sprites/back/0859--000--Impidimp.png b/src/afd/sprites/back/0859-000-Impidimp.png
similarity index 100%
rename from src/afd/sprites/back/0859--000--Impidimp.png
rename to src/afd/sprites/back/0859-000-Impidimp.png
diff --git a/src/afd/sprites/back/0860--000--Morgrem.png b/src/afd/sprites/back/0860-000-Morgrem.png
similarity index 100%
rename from src/afd/sprites/back/0860--000--Morgrem.png
rename to src/afd/sprites/back/0860-000-Morgrem.png
diff --git a/src/afd/sprites/back/0861--000--Grimmsnarl.png b/src/afd/sprites/back/0861-000-Grimmsnarl.png
similarity index 100%
rename from src/afd/sprites/back/0861--000--Grimmsnarl.png
rename to src/afd/sprites/back/0861-000-Grimmsnarl.png
diff --git a/src/afd/sprites/back/0861--420--Grimmsnarl--Gmax.png b/src/afd/sprites/back/0861-420-Grimmsnarl-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0861--420--Grimmsnarl--Gmax.png
rename to src/afd/sprites/back/0861-420-Grimmsnarl-Gmax.png
diff --git a/src/afd/sprites/back/0862--000--Obstagoon.png b/src/afd/sprites/back/0862-000-Obstagoon.png
similarity index 100%
rename from src/afd/sprites/back/0862--000--Obstagoon.png
rename to src/afd/sprites/back/0862-000-Obstagoon.png
diff --git a/src/afd/sprites/back/0863--000--Perrserker.png b/src/afd/sprites/back/0863-000-Perrserker.png
similarity index 100%
rename from src/afd/sprites/back/0863--000--Perrserker.png
rename to src/afd/sprites/back/0863-000-Perrserker.png
diff --git a/src/afd/sprites/back/0864--000--Cursola.png b/src/afd/sprites/back/0864-000-Cursola.png
similarity index 100%
rename from src/afd/sprites/back/0864--000--Cursola.png
rename to src/afd/sprites/back/0864-000-Cursola.png
diff --git a/src/afd/sprites/back/0865--000--Sirfetch__0027d.png b/src/afd/sprites/back/0865-000-Sirfetch__0027d.png
similarity index 100%
rename from src/afd/sprites/back/0865--000--Sirfetch__0027d.png
rename to src/afd/sprites/back/0865-000-Sirfetch__0027d.png
diff --git a/src/afd/sprites/back/0866--000--Mr._Rime.png b/src/afd/sprites/back/0866-000-Mr._Rime.png
similarity index 100%
rename from src/afd/sprites/back/0866--000--Mr._Rime.png
rename to src/afd/sprites/back/0866-000-Mr._Rime.png
diff --git a/src/afd/sprites/back/0867--000--Runerigus.png b/src/afd/sprites/back/0867-000-Runerigus.png
similarity index 100%
rename from src/afd/sprites/back/0867--000--Runerigus.png
rename to src/afd/sprites/back/0867-000-Runerigus.png
diff --git a/src/afd/sprites/back/0868--000--Milcery.png b/src/afd/sprites/back/0868-000-Milcery.png
similarity index 100%
rename from src/afd/sprites/back/0868--000--Milcery.png
rename to src/afd/sprites/back/0868-000-Milcery.png
diff --git a/src/afd/sprites/back/0869--000--Alcremie.png b/src/afd/sprites/back/0869-000-Alcremie.png
similarity index 100%
rename from src/afd/sprites/back/0869--000--Alcremie.png
rename to src/afd/sprites/back/0869-000-Alcremie.png
diff --git a/src/afd/sprites/back/0869--420--Alcremie--Gmax.png b/src/afd/sprites/back/0869-420-Alcremie-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0869--420--Alcremie--Gmax.png
rename to src/afd/sprites/back/0869-420-Alcremie-Gmax.png
diff --git a/src/afd/sprites/back/0870--000--Falinks.png b/src/afd/sprites/back/0870-000-Falinks.png
similarity index 100%
rename from src/afd/sprites/back/0870--000--Falinks.png
rename to src/afd/sprites/back/0870-000-Falinks.png
diff --git a/src/afd/sprites/back/0871--000--Pincurchin.png b/src/afd/sprites/back/0871-000-Pincurchin.png
similarity index 100%
rename from src/afd/sprites/back/0871--000--Pincurchin.png
rename to src/afd/sprites/back/0871-000-Pincurchin.png
diff --git a/src/afd/sprites/back/0872--000--Snom.png b/src/afd/sprites/back/0872-000-Snom.png
similarity index 100%
rename from src/afd/sprites/back/0872--000--Snom.png
rename to src/afd/sprites/back/0872-000-Snom.png
diff --git a/src/afd/sprites/back/0873--000--Frosmoth.png b/src/afd/sprites/back/0873-000-Frosmoth.png
similarity index 100%
rename from src/afd/sprites/back/0873--000--Frosmoth.png
rename to src/afd/sprites/back/0873-000-Frosmoth.png
diff --git a/src/afd/sprites/back/0874--000--Stonjourner.png b/src/afd/sprites/back/0874-000-Stonjourner.png
similarity index 100%
rename from src/afd/sprites/back/0874--000--Stonjourner.png
rename to src/afd/sprites/back/0874-000-Stonjourner.png
diff --git a/src/afd/sprites/back/0875--000--Eiscue.png b/src/afd/sprites/back/0875-000-Eiscue.png
similarity index 100%
rename from src/afd/sprites/back/0875--000--Eiscue.png
rename to src/afd/sprites/back/0875-000-Eiscue.png
diff --git a/src/afd/sprites/back/0875--420--Eiscue--Noice.png b/src/afd/sprites/back/0875-420-Eiscue-Noice.png
similarity index 100%
rename from src/afd/sprites/back/0875--420--Eiscue--Noice.png
rename to src/afd/sprites/back/0875-420-Eiscue-Noice.png
diff --git a/src/afd/sprites/back/0876--000--Indeedee.png b/src/afd/sprites/back/0876-000-Indeedee.png
similarity index 100%
rename from src/afd/sprites/back/0876--000--Indeedee.png
rename to src/afd/sprites/back/0876-000-Indeedee.png
diff --git a/src/afd/sprites/back/0876--420--Indeedee--F.png b/src/afd/sprites/back/0876-420-Indeedee-F.png
similarity index 100%
rename from src/afd/sprites/back/0876--420--Indeedee--F.png
rename to src/afd/sprites/back/0876-420-Indeedee-F.png
diff --git a/src/afd/sprites/back/0877--000--Morpeko.png b/src/afd/sprites/back/0877-000-Morpeko.png
similarity index 100%
rename from src/afd/sprites/back/0877--000--Morpeko.png
rename to src/afd/sprites/back/0877-000-Morpeko.png
diff --git a/src/afd/sprites/back/0877--420--Morpeko--Hangry.png b/src/afd/sprites/back/0877-420-Morpeko-Hangry.png
similarity index 100%
rename from src/afd/sprites/back/0877--420--Morpeko--Hangry.png
rename to src/afd/sprites/back/0877-420-Morpeko-Hangry.png
diff --git a/src/afd/sprites/back/0878--000--Cufant.png b/src/afd/sprites/back/0878-000-Cufant.png
similarity index 100%
rename from src/afd/sprites/back/0878--000--Cufant.png
rename to src/afd/sprites/back/0878-000-Cufant.png
diff --git a/src/afd/sprites/back/0879--000--Copperajah.png b/src/afd/sprites/back/0879-000-Copperajah.png
similarity index 100%
rename from src/afd/sprites/back/0879--000--Copperajah.png
rename to src/afd/sprites/back/0879-000-Copperajah.png
diff --git a/src/afd/sprites/back/0879--420--Copperajah--Gmax.png b/src/afd/sprites/back/0879-420-Copperajah-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0879--420--Copperajah--Gmax.png
rename to src/afd/sprites/back/0879-420-Copperajah-Gmax.png
diff --git a/src/afd/sprites/back/0880--000--Dracozolt.png b/src/afd/sprites/back/0880-000-Dracozolt.png
similarity index 100%
rename from src/afd/sprites/back/0880--000--Dracozolt.png
rename to src/afd/sprites/back/0880-000-Dracozolt.png
diff --git a/src/afd/sprites/back/0881--000--Arctozolt.png b/src/afd/sprites/back/0881-000-Arctozolt.png
similarity index 100%
rename from src/afd/sprites/back/0881--000--Arctozolt.png
rename to src/afd/sprites/back/0881-000-Arctozolt.png
diff --git a/src/afd/sprites/back/0882--000--Dracovish.png b/src/afd/sprites/back/0882-000-Dracovish.png
similarity index 100%
rename from src/afd/sprites/back/0882--000--Dracovish.png
rename to src/afd/sprites/back/0882-000-Dracovish.png
diff --git a/src/afd/sprites/back/0883--000--Arctovish.png b/src/afd/sprites/back/0883-000-Arctovish.png
similarity index 100%
rename from src/afd/sprites/back/0883--000--Arctovish.png
rename to src/afd/sprites/back/0883-000-Arctovish.png
diff --git a/src/afd/sprites/back/0884--000--Duraludon.png b/src/afd/sprites/back/0884-000-Duraludon.png
similarity index 100%
rename from src/afd/sprites/back/0884--000--Duraludon.png
rename to src/afd/sprites/back/0884-000-Duraludon.png
diff --git a/src/afd/sprites/back/0884--420--Duraludon--Gmax.png b/src/afd/sprites/back/0884-420-Duraludon-Gmax.png
similarity index 100%
rename from src/afd/sprites/back/0884--420--Duraludon--Gmax.png
rename to src/afd/sprites/back/0884-420-Duraludon-Gmax.png
diff --git a/src/afd/sprites/back/0885--000--Dreepy.png b/src/afd/sprites/back/0885-000-Dreepy.png
similarity index 100%
rename from src/afd/sprites/back/0885--000--Dreepy.png
rename to src/afd/sprites/back/0885-000-Dreepy.png
diff --git a/src/afd/sprites/back/0886--000--Drakloak.png b/src/afd/sprites/back/0886-000-Drakloak.png
similarity index 100%
rename from src/afd/sprites/back/0886--000--Drakloak.png
rename to src/afd/sprites/back/0886-000-Drakloak.png
diff --git a/src/afd/sprites/back/0887--000--Dragapult.png b/src/afd/sprites/back/0887-000-Dragapult.png
similarity index 100%
rename from src/afd/sprites/back/0887--000--Dragapult.png
rename to src/afd/sprites/back/0887-000-Dragapult.png
diff --git a/src/afd/sprites/back/0888--000--Zacian.png b/src/afd/sprites/back/0888-000-Zacian.png
similarity index 100%
rename from src/afd/sprites/back/0888--000--Zacian.png
rename to src/afd/sprites/back/0888-000-Zacian.png
diff --git a/src/afd/sprites/back/0888--420--Zacian--Crowned.png b/src/afd/sprites/back/0888-420-Zacian-Crowned.png
similarity index 100%
rename from src/afd/sprites/back/0888--420--Zacian--Crowned.png
rename to src/afd/sprites/back/0888-420-Zacian-Crowned.png
diff --git a/src/afd/sprites/back/0889--000--Zamazenta.png b/src/afd/sprites/back/0889-000-Zamazenta.png
similarity index 100%
rename from src/afd/sprites/back/0889--000--Zamazenta.png
rename to src/afd/sprites/back/0889-000-Zamazenta.png
diff --git a/src/afd/sprites/back/0889--420--Zamazenta--Crowned.png b/src/afd/sprites/back/0889-420-Zamazenta-Crowned.png
similarity index 100%
rename from src/afd/sprites/back/0889--420--Zamazenta--Crowned.png
rename to src/afd/sprites/back/0889-420-Zamazenta-Crowned.png
diff --git a/src/afd/sprites/back/0890--000--Eternatus.png b/src/afd/sprites/back/0890-000-Eternatus.png
similarity index 100%
rename from src/afd/sprites/back/0890--000--Eternatus.png
rename to src/afd/sprites/back/0890-000-Eternatus.png
diff --git a/src/afd/sprites/back/0890--420--Eternatus--Eternamax.png b/src/afd/sprites/back/0890-420-Eternatus-Eternamax.png
similarity index 100%
rename from src/afd/sprites/back/0890--420--Eternatus--Eternamax.png
rename to src/afd/sprites/back/0890-420-Eternatus-Eternamax.png
diff --git a/src/afd/sprites/front-cosmetic/0002--000--Syclant--Female.png b/src/afd/sprites/front-cosmetic/0002-000-Syclant-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0002--000--Syclant--Female.png
rename to src/afd/sprites/front-cosmetic/0002-000-Syclant-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0003--000--Revenankh--Female.png b/src/afd/sprites/front-cosmetic/0003-000-Revenankh-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0003--000--Revenankh--Female.png
rename to src/afd/sprites/front-cosmetic/0003-000-Revenankh-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0003--000--Venusaur--Female.png b/src/afd/sprites/front-cosmetic/0003-000-Venusaur-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0003--000--Venusaur--Female.png
rename to src/afd/sprites/front-cosmetic/0003-000-Venusaur-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0006--000--Pyroak--Female.png b/src/afd/sprites/front-cosmetic/0006-000-Pyroak-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0006--000--Pyroak--Female.png
rename to src/afd/sprites/front-cosmetic/0006-000-Pyroak-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0008--000--Fidgit--Female.png b/src/afd/sprites/front-cosmetic/0008-000-Fidgit-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0008--000--Fidgit--Female.png
rename to src/afd/sprites/front-cosmetic/0008-000-Fidgit-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0012--000--Butterfree--Female.png b/src/afd/sprites/front-cosmetic/0012-000-Butterfree-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0012--000--Butterfree--Female.png
rename to src/afd/sprites/front-cosmetic/0012-000-Butterfree-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0013--000--Arghonaut--Female.png b/src/afd/sprites/front-cosmetic/0013-000-Arghonaut-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0013--000--Arghonaut--Female.png
rename to src/afd/sprites/front-cosmetic/0013-000-Arghonaut-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0014--000--Kitsunoh--Female.png b/src/afd/sprites/front-cosmetic/0014-000-Kitsunoh-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0014--000--Kitsunoh--Female.png
rename to src/afd/sprites/front-cosmetic/0014-000-Kitsunoh-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0015--000--Cyclohm--Female.png b/src/afd/sprites/front-cosmetic/0015-000-Cyclohm-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0015--000--Cyclohm--Female.png
rename to src/afd/sprites/front-cosmetic/0015-000-Cyclohm-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0016--000--Colossoil--Female.png b/src/afd/sprites/front-cosmetic/0016-000-Colossoil-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0016--000--Colossoil--Female.png
rename to src/afd/sprites/front-cosmetic/0016-000-Colossoil-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0017--000--Krilowatt--Female.png b/src/afd/sprites/front-cosmetic/0017-000-Krilowatt-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0017--000--Krilowatt--Female.png
rename to src/afd/sprites/front-cosmetic/0017-000-Krilowatt-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0019--000--Rattata--Female.png b/src/afd/sprites/front-cosmetic/0019-000-Rattata-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0019--000--Rattata--Female.png
rename to src/afd/sprites/front-cosmetic/0019-000-Rattata-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0019--000--Voodoom--Female.png b/src/afd/sprites/front-cosmetic/0019-000-Voodoom-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0019--000--Voodoom--Female.png
rename to src/afd/sprites/front-cosmetic/0019-000-Voodoom-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0020--000--Raticate--Female.png b/src/afd/sprites/front-cosmetic/0020-000-Raticate-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0020--000--Raticate--Female.png
rename to src/afd/sprites/front-cosmetic/0020-000-Raticate-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0021--000--Tomohawk--Female.png b/src/afd/sprites/front-cosmetic/0021-000-Tomohawk-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0021--000--Tomohawk--Female.png
rename to src/afd/sprites/front-cosmetic/0021-000-Tomohawk-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0025--000--Pikachu--Female.png b/src/afd/sprites/front-cosmetic/0025-000-Pikachu-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0025--000--Pikachu--Female.png
rename to src/afd/sprites/front-cosmetic/0025-000-Pikachu-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0026--000--Raichu--Female.png b/src/afd/sprites/front-cosmetic/0026-000-Raichu-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0026--000--Raichu--Female.png
rename to src/afd/sprites/front-cosmetic/0026-000-Raichu-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0041--000--Zubat--Female.png b/src/afd/sprites/front-cosmetic/0041-000-Zubat-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0041--000--Zubat--Female.png
rename to src/afd/sprites/front-cosmetic/0041-000-Zubat-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0042--000--Golbat--Female.png b/src/afd/sprites/front-cosmetic/0042-000-Golbat-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0042--000--Golbat--Female.png
rename to src/afd/sprites/front-cosmetic/0042-000-Golbat-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0044--000--Gloom--Female.png b/src/afd/sprites/front-cosmetic/0044-000-Gloom-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0044--000--Gloom--Female.png
rename to src/afd/sprites/front-cosmetic/0044-000-Gloom-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0045--000--Vileplume--Female.png b/src/afd/sprites/front-cosmetic/0045-000-Vileplume-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0045--000--Vileplume--Female.png
rename to src/afd/sprites/front-cosmetic/0045-000-Vileplume-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0064--000--Kadabra--Female.png b/src/afd/sprites/front-cosmetic/0064-000-Kadabra-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0064--000--Kadabra--Female.png
rename to src/afd/sprites/front-cosmetic/0064-000-Kadabra-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0065--000--Alakazam--Female.png b/src/afd/sprites/front-cosmetic/0065-000-Alakazam-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0065--000--Alakazam--Female.png
rename to src/afd/sprites/front-cosmetic/0065-000-Alakazam-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0084--000--Doduo--Female.png b/src/afd/sprites/front-cosmetic/0084-000-Doduo-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0084--000--Doduo--Female.png
rename to src/afd/sprites/front-cosmetic/0084-000-Doduo-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0085--000--Dodrio--Female.png b/src/afd/sprites/front-cosmetic/0085-000-Dodrio-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0085--000--Dodrio--Female.png
rename to src/afd/sprites/front-cosmetic/0085-000-Dodrio-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0097--000--Hypno--Female.png b/src/afd/sprites/front-cosmetic/0097-000-Hypno-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0097--000--Hypno--Female.png
rename to src/afd/sprites/front-cosmetic/0097-000-Hypno-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0111--000--Rhyhorn--Female.png b/src/afd/sprites/front-cosmetic/0111-000-Rhyhorn-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0111--000--Rhyhorn--Female.png
rename to src/afd/sprites/front-cosmetic/0111-000-Rhyhorn-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0112--000--Rhydon--Female.png b/src/afd/sprites/front-cosmetic/0112-000-Rhydon-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0112--000--Rhydon--Female.png
rename to src/afd/sprites/front-cosmetic/0112-000-Rhydon-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0118--000--Goldeen--Female.png b/src/afd/sprites/front-cosmetic/0118-000-Goldeen-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0118--000--Goldeen--Female.png
rename to src/afd/sprites/front-cosmetic/0118-000-Goldeen-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0123--000--Scyther--Female.png b/src/afd/sprites/front-cosmetic/0123-000-Scyther-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0123--000--Scyther--Female.png
rename to src/afd/sprites/front-cosmetic/0123-000-Scyther-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0129--000--Magikarp--Female.png b/src/afd/sprites/front-cosmetic/0129-000-Magikarp-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0129--000--Magikarp--Female.png
rename to src/afd/sprites/front-cosmetic/0129-000-Magikarp-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0130--000--Gyarados--Female.png b/src/afd/sprites/front-cosmetic/0130-000-Gyarados-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0130--000--Gyarados--Female.png
rename to src/afd/sprites/front-cosmetic/0130-000-Gyarados-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0154--000--Meganium--Female.png b/src/afd/sprites/front-cosmetic/0154-000-Meganium-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0154--000--Meganium--Female.png
rename to src/afd/sprites/front-cosmetic/0154-000-Meganium-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0165--000--Ledyba--Female.png b/src/afd/sprites/front-cosmetic/0165-000-Ledyba-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0165--000--Ledyba--Female.png
rename to src/afd/sprites/front-cosmetic/0165-000-Ledyba-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0166--000--Ledian--Female.png b/src/afd/sprites/front-cosmetic/0166-000-Ledian-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0166--000--Ledian--Female.png
rename to src/afd/sprites/front-cosmetic/0166-000-Ledian-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0178--000--Xatu--Female.png b/src/afd/sprites/front-cosmetic/0178-000-Xatu-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0178--000--Xatu--Female.png
rename to src/afd/sprites/front-cosmetic/0178-000-Xatu-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0185--000--Sudowoodo--Female.png b/src/afd/sprites/front-cosmetic/0185-000-Sudowoodo-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0185--000--Sudowoodo--Female.png
rename to src/afd/sprites/front-cosmetic/0185-000-Sudowoodo-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0186--000--Politoed--Female.png b/src/afd/sprites/front-cosmetic/0186-000-Politoed-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0186--000--Politoed--Female.png
rename to src/afd/sprites/front-cosmetic/0186-000-Politoed-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0190--000--Aipom--Female.png b/src/afd/sprites/front-cosmetic/0190-000-Aipom-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0190--000--Aipom--Female.png
rename to src/afd/sprites/front-cosmetic/0190-000-Aipom-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0194--000--Wooper--Female.png b/src/afd/sprites/front-cosmetic/0194-000-Wooper-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0194--000--Wooper--Female.png
rename to src/afd/sprites/front-cosmetic/0194-000-Wooper-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0195--000--Quagsire--Female.png b/src/afd/sprites/front-cosmetic/0195-000-Quagsire-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0195--000--Quagsire--Female.png
rename to src/afd/sprites/front-cosmetic/0195-000-Quagsire-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0198--000--Murkrow--Female.png b/src/afd/sprites/front-cosmetic/0198-000-Murkrow-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0198--000--Murkrow--Female.png
rename to src/afd/sprites/front-cosmetic/0198-000-Murkrow-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0202--000--Wobbuffet--Female.png b/src/afd/sprites/front-cosmetic/0202-000-Wobbuffet-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0202--000--Wobbuffet--Female.png
rename to src/afd/sprites/front-cosmetic/0202-000-Wobbuffet-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0203--000--Girafarig--Female.png b/src/afd/sprites/front-cosmetic/0203-000-Girafarig-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0203--000--Girafarig--Female.png
rename to src/afd/sprites/front-cosmetic/0203-000-Girafarig-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0207--000--Gligar--Female.png b/src/afd/sprites/front-cosmetic/0207-000-Gligar-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0207--000--Gligar--Female.png
rename to src/afd/sprites/front-cosmetic/0207-000-Gligar-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0208--000--Steelix--Female.png b/src/afd/sprites/front-cosmetic/0208-000-Steelix-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0208--000--Steelix--Female.png
rename to src/afd/sprites/front-cosmetic/0208-000-Steelix-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0212--000--Scizor--Female.png b/src/afd/sprites/front-cosmetic/0212-000-Scizor-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0212--000--Scizor--Female.png
rename to src/afd/sprites/front-cosmetic/0212-000-Scizor-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0214--000--Heracross--Female.png b/src/afd/sprites/front-cosmetic/0214-000-Heracross-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0214--000--Heracross--Female.png
rename to src/afd/sprites/front-cosmetic/0214-000-Heracross-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0215--000--Sneasel--Female.png b/src/afd/sprites/front-cosmetic/0215-000-Sneasel-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0215--000--Sneasel--Female.png
rename to src/afd/sprites/front-cosmetic/0215-000-Sneasel-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0217--000--Ursaring--Female.png b/src/afd/sprites/front-cosmetic/0217-000-Ursaring-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0217--000--Ursaring--Female.png
rename to src/afd/sprites/front-cosmetic/0217-000-Ursaring-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0221--000--Piloswine--Female.png b/src/afd/sprites/front-cosmetic/0221-000-Piloswine-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0221--000--Piloswine--Female.png
rename to src/afd/sprites/front-cosmetic/0221-000-Piloswine-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0224--000--Octillery--Female.png b/src/afd/sprites/front-cosmetic/0224-000-Octillery-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0224--000--Octillery--Female.png
rename to src/afd/sprites/front-cosmetic/0224-000-Octillery-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0229--000--Houndoom--Female.png b/src/afd/sprites/front-cosmetic/0229-000-Houndoom-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0229--000--Houndoom--Female.png
rename to src/afd/sprites/front-cosmetic/0229-000-Houndoom-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0232--000--Donphan--Female.png b/src/afd/sprites/front-cosmetic/0232-000-Donphan-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0232--000--Donphan--Female.png
rename to src/afd/sprites/front-cosmetic/0232-000-Donphan-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0255--000--Torchic--Female.png b/src/afd/sprites/front-cosmetic/0255-000-Torchic-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0255--000--Torchic--Female.png
rename to src/afd/sprites/front-cosmetic/0255-000-Torchic-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0256--000--Combusken--Female.png b/src/afd/sprites/front-cosmetic/0256-000-Combusken-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0256--000--Combusken--Female.png
rename to src/afd/sprites/front-cosmetic/0256-000-Combusken-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0257--000--Blaziken--Female.png b/src/afd/sprites/front-cosmetic/0257-000-Blaziken-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0257--000--Blaziken--Female.png
rename to src/afd/sprites/front-cosmetic/0257-000-Blaziken-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0267--000--Beautifly--Female.png b/src/afd/sprites/front-cosmetic/0267-000-Beautifly-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0267--000--Beautifly--Female.png
rename to src/afd/sprites/front-cosmetic/0267-000-Beautifly-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0269--000--Dustox--Female.png b/src/afd/sprites/front-cosmetic/0269-000-Dustox-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0269--000--Dustox--Female.png
rename to src/afd/sprites/front-cosmetic/0269-000-Dustox-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0272--000--Ludicolo--Female.png b/src/afd/sprites/front-cosmetic/0272-000-Ludicolo-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0272--000--Ludicolo--Female.png
rename to src/afd/sprites/front-cosmetic/0272-000-Ludicolo-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0274--000--Nuzleaf--Female.png b/src/afd/sprites/front-cosmetic/0274-000-Nuzleaf-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0274--000--Nuzleaf--Female.png
rename to src/afd/sprites/front-cosmetic/0274-000-Nuzleaf-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0275--000--Shiftry--Female.png b/src/afd/sprites/front-cosmetic/0275-000-Shiftry-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0275--000--Shiftry--Female.png
rename to src/afd/sprites/front-cosmetic/0275-000-Shiftry-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0307--000--Meditite--Female.png b/src/afd/sprites/front-cosmetic/0307-000-Meditite-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0307--000--Meditite--Female.png
rename to src/afd/sprites/front-cosmetic/0307-000-Meditite-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0308--000--Medicham--Female.png b/src/afd/sprites/front-cosmetic/0308-000-Medicham-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0308--000--Medicham--Female.png
rename to src/afd/sprites/front-cosmetic/0308-000-Medicham-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0315--000--Roselia--Female.png b/src/afd/sprites/front-cosmetic/0315-000-Roselia-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0315--000--Roselia--Female.png
rename to src/afd/sprites/front-cosmetic/0315-000-Roselia-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0316--000--Gulpin--Female.png b/src/afd/sprites/front-cosmetic/0316-000-Gulpin-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0316--000--Gulpin--Female.png
rename to src/afd/sprites/front-cosmetic/0316-000-Gulpin-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0317--000--Swalot--Female.png b/src/afd/sprites/front-cosmetic/0317-000-Swalot-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0317--000--Swalot--Female.png
rename to src/afd/sprites/front-cosmetic/0317-000-Swalot-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0322--000--Numel--Female.png b/src/afd/sprites/front-cosmetic/0322-000-Numel-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0322--000--Numel--Female.png
rename to src/afd/sprites/front-cosmetic/0322-000-Numel-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0323--000--Camerupt--Female.png b/src/afd/sprites/front-cosmetic/0323-000-Camerupt-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0323--000--Camerupt--Female.png
rename to src/afd/sprites/front-cosmetic/0323-000-Camerupt-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0332--000--Cacturne--Female.png b/src/afd/sprites/front-cosmetic/0332-000-Cacturne-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0332--000--Cacturne--Female.png
rename to src/afd/sprites/front-cosmetic/0332-000-Cacturne-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0350--000--Milotic--Female.png b/src/afd/sprites/front-cosmetic/0350-000-Milotic-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0350--000--Milotic--Female.png
rename to src/afd/sprites/front-cosmetic/0350-000-Milotic-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0369--000--Relicanth--Female.png b/src/afd/sprites/front-cosmetic/0369-000-Relicanth-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0369--000--Relicanth--Female.png
rename to src/afd/sprites/front-cosmetic/0369-000-Relicanth-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0396--000--Starly--Female.png b/src/afd/sprites/front-cosmetic/0396-000-Starly-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0396--000--Starly--Female.png
rename to src/afd/sprites/front-cosmetic/0396-000-Starly-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0397--000--Staravia--Female.png b/src/afd/sprites/front-cosmetic/0397-000-Staravia-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0397--000--Staravia--Female.png
rename to src/afd/sprites/front-cosmetic/0397-000-Staravia-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0398--000--Staraptor--Female.png b/src/afd/sprites/front-cosmetic/0398-000-Staraptor-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0398--000--Staraptor--Female.png
rename to src/afd/sprites/front-cosmetic/0398-000-Staraptor-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0399--000--Bidoof--Female.png b/src/afd/sprites/front-cosmetic/0399-000-Bidoof-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0399--000--Bidoof--Female.png
rename to src/afd/sprites/front-cosmetic/0399-000-Bidoof-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0400--000--Bibarel--Female.png b/src/afd/sprites/front-cosmetic/0400-000-Bibarel-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0400--000--Bibarel--Female.png
rename to src/afd/sprites/front-cosmetic/0400-000-Bibarel-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0401--000--Kricketot--Female.png b/src/afd/sprites/front-cosmetic/0401-000-Kricketot-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0401--000--Kricketot--Female.png
rename to src/afd/sprites/front-cosmetic/0401-000-Kricketot-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0402--000--Kricketune--Female.png b/src/afd/sprites/front-cosmetic/0402-000-Kricketune-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0402--000--Kricketune--Female.png
rename to src/afd/sprites/front-cosmetic/0402-000-Kricketune-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0403--000--Shinx--Female.png b/src/afd/sprites/front-cosmetic/0403-000-Shinx-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0403--000--Shinx--Female.png
rename to src/afd/sprites/front-cosmetic/0403-000-Shinx-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0404--000--Luxio--Female.png b/src/afd/sprites/front-cosmetic/0404-000-Luxio-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0404--000--Luxio--Female.png
rename to src/afd/sprites/front-cosmetic/0404-000-Luxio-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0405--000--Luxray--Female.png b/src/afd/sprites/front-cosmetic/0405-000-Luxray-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0405--000--Luxray--Female.png
rename to src/afd/sprites/front-cosmetic/0405-000-Luxray-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0407--000--Roserade--Female.png b/src/afd/sprites/front-cosmetic/0407-000-Roserade-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0407--000--Roserade--Female.png
rename to src/afd/sprites/front-cosmetic/0407-000-Roserade-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0412--420--Burmy--Sandy.png b/src/afd/sprites/front-cosmetic/0412-420-Burmy-Sandy.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0412--420--Burmy--Sandy.png
rename to src/afd/sprites/front-cosmetic/0412-420-Burmy-Sandy.png
diff --git a/src/afd/sprites/front-cosmetic/0412--420--Burmy--Trash.png b/src/afd/sprites/front-cosmetic/0412-420-Burmy-Trash.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0412--420--Burmy--Trash.png
rename to src/afd/sprites/front-cosmetic/0412-420-Burmy-Trash.png
diff --git a/src/afd/sprites/front-cosmetic/0415--000--Combee--Female.png b/src/afd/sprites/front-cosmetic/0415-000-Combee-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0415--000--Combee--Female.png
rename to src/afd/sprites/front-cosmetic/0415-000-Combee-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0417--000--Pachirisu--Female.png b/src/afd/sprites/front-cosmetic/0417-000-Pachirisu-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0417--000--Pachirisu--Female.png
rename to src/afd/sprites/front-cosmetic/0417-000-Pachirisu-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0418--000--Buizel--Female.png b/src/afd/sprites/front-cosmetic/0418-000-Buizel-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0418--000--Buizel--Female.png
rename to src/afd/sprites/front-cosmetic/0418-000-Buizel-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0419--000--Floatzel--Female.png b/src/afd/sprites/front-cosmetic/0419-000-Floatzel-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0419--000--Floatzel--Female.png
rename to src/afd/sprites/front-cosmetic/0419-000-Floatzel-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0424--000--Ambipom--Female.png b/src/afd/sprites/front-cosmetic/0424-000-Ambipom-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0424--000--Ambipom--Female.png
rename to src/afd/sprites/front-cosmetic/0424-000-Ambipom-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0443--000--Gible--Female.png b/src/afd/sprites/front-cosmetic/0443-000-Gible-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0443--000--Gible--Female.png
rename to src/afd/sprites/front-cosmetic/0443-000-Gible-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0445--000--Garchomp--Female.png b/src/afd/sprites/front-cosmetic/0445-000-Garchomp-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0445--000--Garchomp--Female.png
rename to src/afd/sprites/front-cosmetic/0445-000-Garchomp-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0449--000--Hippopotas--Female.png b/src/afd/sprites/front-cosmetic/0449-000-Hippopotas-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0449--000--Hippopotas--Female.png
rename to src/afd/sprites/front-cosmetic/0449-000-Hippopotas-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0450--000--Hippowdon--Female.png b/src/afd/sprites/front-cosmetic/0450-000-Hippowdon-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0450--000--Hippowdon--Female.png
rename to src/afd/sprites/front-cosmetic/0450-000-Hippowdon-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0453--000--Croagunk--Female.png b/src/afd/sprites/front-cosmetic/0453-000-Croagunk-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0453--000--Croagunk--Female.png
rename to src/afd/sprites/front-cosmetic/0453-000-Croagunk-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0454--000--Toxicroak--Female.png b/src/afd/sprites/front-cosmetic/0454-000-Toxicroak-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0454--000--Toxicroak--Female.png
rename to src/afd/sprites/front-cosmetic/0454-000-Toxicroak-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0456--000--Finneon--Female.png b/src/afd/sprites/front-cosmetic/0456-000-Finneon-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0456--000--Finneon--Female.png
rename to src/afd/sprites/front-cosmetic/0456-000-Finneon-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0457--000--Lumineon--Female.png b/src/afd/sprites/front-cosmetic/0457-000-Lumineon-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0457--000--Lumineon--Female.png
rename to src/afd/sprites/front-cosmetic/0457-000-Lumineon-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0459--000--Snover--Female.png b/src/afd/sprites/front-cosmetic/0459-000-Snover-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0459--000--Snover--Female.png
rename to src/afd/sprites/front-cosmetic/0459-000-Snover-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0460--000--Abomasnow--Female.png b/src/afd/sprites/front-cosmetic/0460-000-Abomasnow-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0460--000--Abomasnow--Female.png
rename to src/afd/sprites/front-cosmetic/0460-000-Abomasnow-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0461--000--Weavile--Female.png b/src/afd/sprites/front-cosmetic/0461-000-Weavile-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0461--000--Weavile--Female.png
rename to src/afd/sprites/front-cosmetic/0461-000-Weavile-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0464--000--Rhyperior--Female.png b/src/afd/sprites/front-cosmetic/0464-000-Rhyperior-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0464--000--Rhyperior--Female.png
rename to src/afd/sprites/front-cosmetic/0464-000-Rhyperior-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0465--000--Tangrowth--Female.png b/src/afd/sprites/front-cosmetic/0465-000-Tangrowth-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0465--000--Tangrowth--Female.png
rename to src/afd/sprites/front-cosmetic/0465-000-Tangrowth-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0473--000--Mamoswine--Female.png b/src/afd/sprites/front-cosmetic/0473-000-Mamoswine-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0473--000--Mamoswine--Female.png
rename to src/afd/sprites/front-cosmetic/0473-000-Mamoswine-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0521--000--Unfezant--Female.png b/src/afd/sprites/front-cosmetic/0521-000-Unfezant-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0521--000--Unfezant--Female.png
rename to src/afd/sprites/front-cosmetic/0521-000-Unfezant-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0592--000--Frillish--Female.png b/src/afd/sprites/front-cosmetic/0592-000-Frillish-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0592--000--Frillish--Female.png
rename to src/afd/sprites/front-cosmetic/0592-000-Frillish-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0593--000--Jellicent--Female.png b/src/afd/sprites/front-cosmetic/0593-000-Jellicent-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0593--000--Jellicent--Female.png
rename to src/afd/sprites/front-cosmetic/0593-000-Jellicent-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0668--000--Pyroar--Female.png b/src/afd/sprites/front-cosmetic/0668-000-Pyroar-Female.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0668--000--Pyroar--Female.png
rename to src/afd/sprites/front-cosmetic/0668-000-Pyroar-Female.png
diff --git a/src/afd/sprites/front-cosmetic/0801--420--Magearna--Original.png b/src/afd/sprites/front-cosmetic/0801-420-Magearna-Original.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0801--420--Magearna--Original.png
rename to src/afd/sprites/front-cosmetic/0801-420-Magearna-Original.png
diff --git a/src/afd/sprites/front-cosmetic/0869--420--Alcremie--Caramel_Swirl.png b/src/afd/sprites/front-cosmetic/0869-420-Alcremie-Caramel_Swirl.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0869--420--Alcremie--Caramel_Swirl.png
rename to src/afd/sprites/front-cosmetic/0869-420-Alcremie-Caramel_Swirl.png
diff --git a/src/afd/sprites/front-cosmetic/0869--420--Alcremie--Lemon_Cream.png b/src/afd/sprites/front-cosmetic/0869-420-Alcremie-Lemon_Cream.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0869--420--Alcremie--Lemon_Cream.png
rename to src/afd/sprites/front-cosmetic/0869-420-Alcremie-Lemon_Cream.png
diff --git a/src/afd/sprites/front-cosmetic/0869--420--Alcremie--Matcha_Cream.png b/src/afd/sprites/front-cosmetic/0869-420-Alcremie-Matcha_Cream.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0869--420--Alcremie--Matcha_Cream.png
rename to src/afd/sprites/front-cosmetic/0869-420-Alcremie-Matcha_Cream.png
diff --git a/src/afd/sprites/front-cosmetic/0869--420--Alcremie--Mint_Cream.png b/src/afd/sprites/front-cosmetic/0869-420-Alcremie-Mint_Cream.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0869--420--Alcremie--Mint_Cream.png
rename to src/afd/sprites/front-cosmetic/0869-420-Alcremie-Mint_Cream.png
diff --git a/src/afd/sprites/front-cosmetic/0869--420--Alcremie--Rainbow_Swirl.png b/src/afd/sprites/front-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0869--420--Alcremie--Rainbow_Swirl.png
rename to src/afd/sprites/front-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png
diff --git a/src/afd/sprites/front-cosmetic/0869--420--Alcremie--Ruby_Cream.png b/src/afd/sprites/front-cosmetic/0869-420-Alcremie-Ruby_Cream.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0869--420--Alcremie--Ruby_Cream.png
rename to src/afd/sprites/front-cosmetic/0869-420-Alcremie-Ruby_Cream.png
diff --git a/src/afd/sprites/front-cosmetic/0869--420--Alcremie--Ruby_Swirl.png b/src/afd/sprites/front-cosmetic/0869-420-Alcremie-Ruby_Swirl.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0869--420--Alcremie--Ruby_Swirl.png
rename to src/afd/sprites/front-cosmetic/0869-420-Alcremie-Ruby_Swirl.png
diff --git a/src/afd/sprites/front-cosmetic/0869--420--Alcremie--Salted_Cream.png b/src/afd/sprites/front-cosmetic/0869-420-Alcremie-Salted_Cream.png
similarity index 100%
rename from src/afd/sprites/front-cosmetic/0869--420--Alcremie--Salted_Cream.png
rename to src/afd/sprites/front-cosmetic/0869-420-Alcremie-Salted_Cream.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0002--000--Syclant--Female.png b/src/afd/sprites/front-shiny-cosmetic/0002-000-Syclant-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0002--000--Syclant--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0002-000-Syclant-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0003--000--Revenankh--Female.png b/src/afd/sprites/front-shiny-cosmetic/0003-000-Revenankh-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0003--000--Revenankh--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0003-000-Revenankh-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0003--000--Venusaur--Female.png b/src/afd/sprites/front-shiny-cosmetic/0003-000-Venusaur-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0003--000--Venusaur--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0003-000-Venusaur-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0006--000--Pyroak--Female.png b/src/afd/sprites/front-shiny-cosmetic/0006-000-Pyroak-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0006--000--Pyroak--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0006-000-Pyroak-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0008--000--Fidgit--Female.png b/src/afd/sprites/front-shiny-cosmetic/0008-000-Fidgit-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0008--000--Fidgit--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0008-000-Fidgit-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0012--000--Butterfree--Female.png b/src/afd/sprites/front-shiny-cosmetic/0012-000-Butterfree-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0012--000--Butterfree--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0012-000-Butterfree-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0013--000--Arghonaut--Female.png b/src/afd/sprites/front-shiny-cosmetic/0013-000-Arghonaut-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0013--000--Arghonaut--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0013-000-Arghonaut-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0014--000--Kitsunoh--Female.png b/src/afd/sprites/front-shiny-cosmetic/0014-000-Kitsunoh-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0014--000--Kitsunoh--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0014-000-Kitsunoh-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0015--000--Cyclohm--Female.png b/src/afd/sprites/front-shiny-cosmetic/0015-000-Cyclohm-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0015--000--Cyclohm--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0015-000-Cyclohm-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0016--000--Colossoil--Female.png b/src/afd/sprites/front-shiny-cosmetic/0016-000-Colossoil-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0016--000--Colossoil--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0016-000-Colossoil-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0017--000--Krilowatt--Female.png b/src/afd/sprites/front-shiny-cosmetic/0017-000-Krilowatt-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0017--000--Krilowatt--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0017-000-Krilowatt-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0019--000--Rattata--Female.png b/src/afd/sprites/front-shiny-cosmetic/0019-000-Rattata-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0019--000--Rattata--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0019-000-Rattata-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0019--000--Voodoom--Female.png b/src/afd/sprites/front-shiny-cosmetic/0019-000-Voodoom-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0019--000--Voodoom--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0019-000-Voodoom-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0020--000--Raticate--Female.png b/src/afd/sprites/front-shiny-cosmetic/0020-000-Raticate-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0020--000--Raticate--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0020-000-Raticate-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0021--000--Tomohawk--Female.png b/src/afd/sprites/front-shiny-cosmetic/0021-000-Tomohawk-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0021--000--Tomohawk--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0021-000-Tomohawk-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0025--000--Pikachu--Female.png b/src/afd/sprites/front-shiny-cosmetic/0025-000-Pikachu-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0025--000--Pikachu--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0025-000-Pikachu-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0026--000--Raichu--Female.png b/src/afd/sprites/front-shiny-cosmetic/0026-000-Raichu-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0026--000--Raichu--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0026-000-Raichu-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0041--000--Zubat--Female.png b/src/afd/sprites/front-shiny-cosmetic/0041-000-Zubat-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0041--000--Zubat--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0041-000-Zubat-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0042--000--Golbat--Female.png b/src/afd/sprites/front-shiny-cosmetic/0042-000-Golbat-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0042--000--Golbat--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0042-000-Golbat-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0044--000--Gloom--Female.png b/src/afd/sprites/front-shiny-cosmetic/0044-000-Gloom-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0044--000--Gloom--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0044-000-Gloom-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0045--000--Vileplume--Female.png b/src/afd/sprites/front-shiny-cosmetic/0045-000-Vileplume-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0045--000--Vileplume--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0045-000-Vileplume-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0064--000--Kadabra--Female.png b/src/afd/sprites/front-shiny-cosmetic/0064-000-Kadabra-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0064--000--Kadabra--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0064-000-Kadabra-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0065--000--Alakazam--Female.png b/src/afd/sprites/front-shiny-cosmetic/0065-000-Alakazam-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0065--000--Alakazam--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0065-000-Alakazam-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0084--000--Doduo--Female.png b/src/afd/sprites/front-shiny-cosmetic/0084-000-Doduo-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0084--000--Doduo--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0084-000-Doduo-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0085--000--Dodrio--Female.png b/src/afd/sprites/front-shiny-cosmetic/0085-000-Dodrio-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0085--000--Dodrio--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0085-000-Dodrio-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0097--000--Hypno--Female.png b/src/afd/sprites/front-shiny-cosmetic/0097-000-Hypno-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0097--000--Hypno--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0097-000-Hypno-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0111--000--Rhyhorn--Female.png b/src/afd/sprites/front-shiny-cosmetic/0111-000-Rhyhorn-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0111--000--Rhyhorn--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0111-000-Rhyhorn-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0112--000--Rhydon--Female.png b/src/afd/sprites/front-shiny-cosmetic/0112-000-Rhydon-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0112--000--Rhydon--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0112-000-Rhydon-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0118--000--Goldeen--Female.png b/src/afd/sprites/front-shiny-cosmetic/0118-000-Goldeen-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0118--000--Goldeen--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0118-000-Goldeen-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0123--000--Scyther--Female.png b/src/afd/sprites/front-shiny-cosmetic/0123-000-Scyther-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0123--000--Scyther--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0123-000-Scyther-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0129--000--Magikarp--Female.png b/src/afd/sprites/front-shiny-cosmetic/0129-000-Magikarp-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0129--000--Magikarp--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0129-000-Magikarp-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0130--000--Gyarados--Female.png b/src/afd/sprites/front-shiny-cosmetic/0130-000-Gyarados-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0130--000--Gyarados--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0130-000-Gyarados-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0154--000--Meganium--Female.png b/src/afd/sprites/front-shiny-cosmetic/0154-000-Meganium-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0154--000--Meganium--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0154-000-Meganium-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0165--000--Ledyba--Female.png b/src/afd/sprites/front-shiny-cosmetic/0165-000-Ledyba-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0165--000--Ledyba--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0165-000-Ledyba-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0166--000--Ledian--Female.png b/src/afd/sprites/front-shiny-cosmetic/0166-000-Ledian-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0166--000--Ledian--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0166-000-Ledian-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0178--000--Xatu--Female.png b/src/afd/sprites/front-shiny-cosmetic/0178-000-Xatu-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0178--000--Xatu--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0178-000-Xatu-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0185--000--Sudowoodo--Female.png b/src/afd/sprites/front-shiny-cosmetic/0185-000-Sudowoodo-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0185--000--Sudowoodo--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0185-000-Sudowoodo-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0186--000--Politoed--Female.png b/src/afd/sprites/front-shiny-cosmetic/0186-000-Politoed-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0186--000--Politoed--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0186-000-Politoed-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0190--000--Aipom--Female.png b/src/afd/sprites/front-shiny-cosmetic/0190-000-Aipom-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0190--000--Aipom--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0190-000-Aipom-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0194--000--Wooper--Female.png b/src/afd/sprites/front-shiny-cosmetic/0194-000-Wooper-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0194--000--Wooper--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0194-000-Wooper-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0195--000--Quagsire--Female.png b/src/afd/sprites/front-shiny-cosmetic/0195-000-Quagsire-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0195--000--Quagsire--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0195-000-Quagsire-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0198--000--Murkrow--Female.png b/src/afd/sprites/front-shiny-cosmetic/0198-000-Murkrow-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0198--000--Murkrow--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0198-000-Murkrow-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0202--000--Wobbuffet--Female.png b/src/afd/sprites/front-shiny-cosmetic/0202-000-Wobbuffet-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0202--000--Wobbuffet--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0202-000-Wobbuffet-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0203--000--Girafarig--Female.png b/src/afd/sprites/front-shiny-cosmetic/0203-000-Girafarig-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0203--000--Girafarig--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0203-000-Girafarig-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0207--000--Gligar--Female.png b/src/afd/sprites/front-shiny-cosmetic/0207-000-Gligar-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0207--000--Gligar--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0207-000-Gligar-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0208--000--Steelix--Female.png b/src/afd/sprites/front-shiny-cosmetic/0208-000-Steelix-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0208--000--Steelix--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0208-000-Steelix-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0212--000--Scizor--Female.png b/src/afd/sprites/front-shiny-cosmetic/0212-000-Scizor-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0212--000--Scizor--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0212-000-Scizor-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0214--000--Heracross--Female.png b/src/afd/sprites/front-shiny-cosmetic/0214-000-Heracross-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0214--000--Heracross--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0214-000-Heracross-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0215--000--Sneasel--Female.png b/src/afd/sprites/front-shiny-cosmetic/0215-000-Sneasel-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0215--000--Sneasel--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0215-000-Sneasel-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0217--000--Ursaring--Female.png b/src/afd/sprites/front-shiny-cosmetic/0217-000-Ursaring-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0217--000--Ursaring--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0217-000-Ursaring-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0221--000--Piloswine--Female.png b/src/afd/sprites/front-shiny-cosmetic/0221-000-Piloswine-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0221--000--Piloswine--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0221-000-Piloswine-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0224--000--Octillery--Female.png b/src/afd/sprites/front-shiny-cosmetic/0224-000-Octillery-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0224--000--Octillery--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0224-000-Octillery-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0229--000--Houndoom--Female.png b/src/afd/sprites/front-shiny-cosmetic/0229-000-Houndoom-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0229--000--Houndoom--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0229-000-Houndoom-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0232--000--Donphan--Female.png b/src/afd/sprites/front-shiny-cosmetic/0232-000-Donphan-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0232--000--Donphan--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0232-000-Donphan-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0255--000--Torchic--Female.png b/src/afd/sprites/front-shiny-cosmetic/0255-000-Torchic-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0255--000--Torchic--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0255-000-Torchic-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0256--000--Combusken--Female.png b/src/afd/sprites/front-shiny-cosmetic/0256-000-Combusken-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0256--000--Combusken--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0256-000-Combusken-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0257--000--Blaziken--Female.png b/src/afd/sprites/front-shiny-cosmetic/0257-000-Blaziken-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0257--000--Blaziken--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0257-000-Blaziken-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0267--000--Beautifly--Female.png b/src/afd/sprites/front-shiny-cosmetic/0267-000-Beautifly-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0267--000--Beautifly--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0267-000-Beautifly-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0269--000--Dustox--Female.png b/src/afd/sprites/front-shiny-cosmetic/0269-000-Dustox-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0269--000--Dustox--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0269-000-Dustox-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0272--000--Ludicolo--Female.png b/src/afd/sprites/front-shiny-cosmetic/0272-000-Ludicolo-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0272--000--Ludicolo--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0272-000-Ludicolo-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0274--000--Nuzleaf--Female.png b/src/afd/sprites/front-shiny-cosmetic/0274-000-Nuzleaf-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0274--000--Nuzleaf--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0274-000-Nuzleaf-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0275--000--Shiftry--Female.png b/src/afd/sprites/front-shiny-cosmetic/0275-000-Shiftry-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0275--000--Shiftry--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0275-000-Shiftry-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0307--000--Meditite--Female.png b/src/afd/sprites/front-shiny-cosmetic/0307-000-Meditite-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0307--000--Meditite--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0307-000-Meditite-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0308--000--Medicham--Female.png b/src/afd/sprites/front-shiny-cosmetic/0308-000-Medicham-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0308--000--Medicham--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0308-000-Medicham-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0315--000--Roselia--Female.png b/src/afd/sprites/front-shiny-cosmetic/0315-000-Roselia-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0315--000--Roselia--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0315-000-Roselia-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0316--000--Gulpin--Female.png b/src/afd/sprites/front-shiny-cosmetic/0316-000-Gulpin-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0316--000--Gulpin--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0316-000-Gulpin-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0317--000--Swalot--Female.png b/src/afd/sprites/front-shiny-cosmetic/0317-000-Swalot-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0317--000--Swalot--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0317-000-Swalot-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0322--000--Numel--Female.png b/src/afd/sprites/front-shiny-cosmetic/0322-000-Numel-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0322--000--Numel--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0322-000-Numel-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0323--000--Camerupt--Female.png b/src/afd/sprites/front-shiny-cosmetic/0323-000-Camerupt-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0323--000--Camerupt--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0323-000-Camerupt-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0332--000--Cacturne--Female.png b/src/afd/sprites/front-shiny-cosmetic/0332-000-Cacturne-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0332--000--Cacturne--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0332-000-Cacturne-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0350--000--Milotic--Female.png b/src/afd/sprites/front-shiny-cosmetic/0350-000-Milotic-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0350--000--Milotic--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0350-000-Milotic-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0369--000--Relicanth--Female.png b/src/afd/sprites/front-shiny-cosmetic/0369-000-Relicanth-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0369--000--Relicanth--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0369-000-Relicanth-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0396--000--Starly--Female.png b/src/afd/sprites/front-shiny-cosmetic/0396-000-Starly-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0396--000--Starly--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0396-000-Starly-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0397--000--Staravia--Female.png b/src/afd/sprites/front-shiny-cosmetic/0397-000-Staravia-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0397--000--Staravia--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0397-000-Staravia-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0398--000--Staraptor--Female.png b/src/afd/sprites/front-shiny-cosmetic/0398-000-Staraptor-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0398--000--Staraptor--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0398-000-Staraptor-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0399--000--Bidoof--Female.png b/src/afd/sprites/front-shiny-cosmetic/0399-000-Bidoof-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0399--000--Bidoof--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0399-000-Bidoof-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0400--000--Bibarel--Female.png b/src/afd/sprites/front-shiny-cosmetic/0400-000-Bibarel-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0400--000--Bibarel--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0400-000-Bibarel-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0401--000--Kricketot--Female.png b/src/afd/sprites/front-shiny-cosmetic/0401-000-Kricketot-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0401--000--Kricketot--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0401-000-Kricketot-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0402--000--Kricketune--Female.png b/src/afd/sprites/front-shiny-cosmetic/0402-000-Kricketune-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0402--000--Kricketune--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0402-000-Kricketune-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0403--000--Shinx--Female.png b/src/afd/sprites/front-shiny-cosmetic/0403-000-Shinx-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0403--000--Shinx--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0403-000-Shinx-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0404--000--Luxio--Female.png b/src/afd/sprites/front-shiny-cosmetic/0404-000-Luxio-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0404--000--Luxio--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0404-000-Luxio-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0405--000--Luxray--Female.png b/src/afd/sprites/front-shiny-cosmetic/0405-000-Luxray-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0405--000--Luxray--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0405-000-Luxray-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0407--000--Roserade--Female.png b/src/afd/sprites/front-shiny-cosmetic/0407-000-Roserade-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0407--000--Roserade--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0407-000-Roserade-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0412--420--Burmy--Sandy.png b/src/afd/sprites/front-shiny-cosmetic/0412-420-Burmy-Sandy.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0412--420--Burmy--Sandy.png
rename to src/afd/sprites/front-shiny-cosmetic/0412-420-Burmy-Sandy.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0412--420--Burmy--Trash.png b/src/afd/sprites/front-shiny-cosmetic/0412-420-Burmy-Trash.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0412--420--Burmy--Trash.png
rename to src/afd/sprites/front-shiny-cosmetic/0412-420-Burmy-Trash.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0415--000--Combee--Female.png b/src/afd/sprites/front-shiny-cosmetic/0415-000-Combee-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0415--000--Combee--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0415-000-Combee-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0417--000--Pachirisu--Female.png b/src/afd/sprites/front-shiny-cosmetic/0417-000-Pachirisu-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0417--000--Pachirisu--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0417-000-Pachirisu-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0418--000--Buizel--Female.png b/src/afd/sprites/front-shiny-cosmetic/0418-000-Buizel-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0418--000--Buizel--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0418-000-Buizel-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0419--000--Floatzel--Female.png b/src/afd/sprites/front-shiny-cosmetic/0419-000-Floatzel-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0419--000--Floatzel--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0419-000-Floatzel-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0424--000--Ambipom--Female.png b/src/afd/sprites/front-shiny-cosmetic/0424-000-Ambipom-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0424--000--Ambipom--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0424-000-Ambipom-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0443--000--Gible--Female.png b/src/afd/sprites/front-shiny-cosmetic/0443-000-Gible-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0443--000--Gible--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0443-000-Gible-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0445--000--Garchomp--Female.png b/src/afd/sprites/front-shiny-cosmetic/0445-000-Garchomp-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0445--000--Garchomp--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0445-000-Garchomp-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0449--000--Hippopotas--Female.png b/src/afd/sprites/front-shiny-cosmetic/0449-000-Hippopotas-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0449--000--Hippopotas--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0449-000-Hippopotas-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0450--000--Hippowdon--Female.png b/src/afd/sprites/front-shiny-cosmetic/0450-000-Hippowdon-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0450--000--Hippowdon--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0450-000-Hippowdon-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0453--000--Croagunk--Female.png b/src/afd/sprites/front-shiny-cosmetic/0453-000-Croagunk-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0453--000--Croagunk--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0453-000-Croagunk-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0454--000--Toxicroak--Female.png b/src/afd/sprites/front-shiny-cosmetic/0454-000-Toxicroak-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0454--000--Toxicroak--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0454-000-Toxicroak-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0456--000--Finneon--Female.png b/src/afd/sprites/front-shiny-cosmetic/0456-000-Finneon-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0456--000--Finneon--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0456-000-Finneon-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0457--000--Lumineon--Female.png b/src/afd/sprites/front-shiny-cosmetic/0457-000-Lumineon-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0457--000--Lumineon--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0457-000-Lumineon-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0459--000--Snover--Female.png b/src/afd/sprites/front-shiny-cosmetic/0459-000-Snover-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0459--000--Snover--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0459-000-Snover-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0460--000--Abomasnow--Female.png b/src/afd/sprites/front-shiny-cosmetic/0460-000-Abomasnow-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0460--000--Abomasnow--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0460-000-Abomasnow-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0461--000--Weavile--Female.png b/src/afd/sprites/front-shiny-cosmetic/0461-000-Weavile-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0461--000--Weavile--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0461-000-Weavile-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0464--000--Rhyperior--Female.png b/src/afd/sprites/front-shiny-cosmetic/0464-000-Rhyperior-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0464--000--Rhyperior--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0464-000-Rhyperior-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0465--000--Tangrowth--Female.png b/src/afd/sprites/front-shiny-cosmetic/0465-000-Tangrowth-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0465--000--Tangrowth--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0465-000-Tangrowth-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0473--000--Mamoswine--Female.png b/src/afd/sprites/front-shiny-cosmetic/0473-000-Mamoswine-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0473--000--Mamoswine--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0473-000-Mamoswine-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0521--000--Unfezant--Female.png b/src/afd/sprites/front-shiny-cosmetic/0521-000-Unfezant-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0521--000--Unfezant--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0521-000-Unfezant-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0592--000--Frillish--Female.png b/src/afd/sprites/front-shiny-cosmetic/0592-000-Frillish-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0592--000--Frillish--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0592-000-Frillish-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0593--000--Jellicent--Female.png b/src/afd/sprites/front-shiny-cosmetic/0593-000-Jellicent-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0593--000--Jellicent--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0593-000-Jellicent-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0668--000--Pyroar--Female.png b/src/afd/sprites/front-shiny-cosmetic/0668-000-Pyroar-Female.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0668--000--Pyroar--Female.png
rename to src/afd/sprites/front-shiny-cosmetic/0668-000-Pyroar-Female.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0801--420--Magearna--Original.png b/src/afd/sprites/front-shiny-cosmetic/0801-420-Magearna-Original.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0801--420--Magearna--Original.png
rename to src/afd/sprites/front-shiny-cosmetic/0801-420-Magearna-Original.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Caramel_Swirl.png b/src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Caramel_Swirl.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Caramel_Swirl.png
rename to src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Caramel_Swirl.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Lemon_Cream.png b/src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Lemon_Cream.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Lemon_Cream.png
rename to src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Lemon_Cream.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Matcha_Cream.png b/src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Matcha_Cream.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Matcha_Cream.png
rename to src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Matcha_Cream.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Mint_Cream.png b/src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Mint_Cream.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Mint_Cream.png
rename to src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Mint_Cream.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Rainbow_Swirl.png b/src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Rainbow_Swirl.png
rename to src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Ruby_Cream.png b/src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Ruby_Cream.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Ruby_Cream.png
rename to src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Ruby_Cream.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Ruby_Swirl.png b/src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Ruby_Swirl.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Ruby_Swirl.png
rename to src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Ruby_Swirl.png
diff --git a/src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Salted_Cream.png b/src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Salted_Cream.png
similarity index 100%
rename from src/afd/sprites/front-shiny-cosmetic/0869--420--Alcremie--Salted_Cream.png
rename to src/afd/sprites/front-shiny-cosmetic/0869-420-Alcremie-Salted_Cream.png
diff --git a/src/afd/sprites/front-shiny/0000--000--Missingno..png b/src/afd/sprites/front-shiny/0000-000-Missingno..png
similarity index 100%
rename from src/afd/sprites/front-shiny/0000--000--Missingno..png
rename to src/afd/sprites/front-shiny/0000-000-Missingno..png
diff --git a/src/afd/sprites/front-shiny/0001--000--Bulbasaur.png b/src/afd/sprites/front-shiny/0001-000-Bulbasaur.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0001--000--Bulbasaur.png
rename to src/afd/sprites/front-shiny/0001-000-Bulbasaur.png
diff --git a/src/afd/sprites/front-shiny/0002--000--Ivysaur.png b/src/afd/sprites/front-shiny/0002-000-Ivysaur.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0002--000--Ivysaur.png
rename to src/afd/sprites/front-shiny/0002-000-Ivysaur.png
diff --git a/src/afd/sprites/front-shiny/0002--000--Syclant.png b/src/afd/sprites/front-shiny/0002-000-Syclant.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0002--000--Syclant.png
rename to src/afd/sprites/front-shiny/0002-000-Syclant.png
diff --git a/src/afd/sprites/front-shiny/0003--000--Revenankh.png b/src/afd/sprites/front-shiny/0003-000-Revenankh.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0003--000--Revenankh.png
rename to src/afd/sprites/front-shiny/0003-000-Revenankh.png
diff --git a/src/afd/sprites/front-shiny/0003--000--Venusaur.png b/src/afd/sprites/front-shiny/0003-000-Venusaur.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0003--000--Venusaur.png
rename to src/afd/sprites/front-shiny/0003-000-Venusaur.png
diff --git a/src/afd/sprites/front-shiny/0003--420--Venusaur--Mega.png b/src/afd/sprites/front-shiny/0003-420-Venusaur-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0003--420--Venusaur--Mega.png
rename to src/afd/sprites/front-shiny/0003-420-Venusaur-Mega.png
diff --git a/src/afd/sprites/front-shiny/0004--000--Charmander.png b/src/afd/sprites/front-shiny/0004-000-Charmander.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0004--000--Charmander.png
rename to src/afd/sprites/front-shiny/0004-000-Charmander.png
diff --git a/src/afd/sprites/front-shiny/0005--000--Charmeleon.png b/src/afd/sprites/front-shiny/0005-000-Charmeleon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0005--000--Charmeleon.png
rename to src/afd/sprites/front-shiny/0005-000-Charmeleon.png
diff --git a/src/afd/sprites/front-shiny/0006--000--Charizard.png b/src/afd/sprites/front-shiny/0006-000-Charizard.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0006--000--Charizard.png
rename to src/afd/sprites/front-shiny/0006-000-Charizard.png
diff --git a/src/afd/sprites/front-shiny/0006--000--Pyroak.png b/src/afd/sprites/front-shiny/0006-000-Pyroak.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0006--000--Pyroak.png
rename to src/afd/sprites/front-shiny/0006-000-Pyroak.png
diff --git a/src/afd/sprites/front-shiny/0006--420--Charizard--Gmax.png b/src/afd/sprites/front-shiny/0006-420-Charizard-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0006--420--Charizard--Gmax.png
rename to src/afd/sprites/front-shiny/0006-420-Charizard-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0006--420--Charizard--Mega-X.png b/src/afd/sprites/front-shiny/0006-420-Charizard-Mega~X.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0006--420--Charizard--Mega-X.png
rename to src/afd/sprites/front-shiny/0006-420-Charizard-Mega~X.png
diff --git a/src/afd/sprites/front-shiny/0006--420--Charizard--Mega-Y.png b/src/afd/sprites/front-shiny/0006-420-Charizard-Mega~Y.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0006--420--Charizard--Mega-Y.png
rename to src/afd/sprites/front-shiny/0006-420-Charizard-Mega~Y.png
diff --git a/src/afd/sprites/front-shiny/0007--000--Squirtle.png b/src/afd/sprites/front-shiny/0007-000-Squirtle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0007--000--Squirtle.png
rename to src/afd/sprites/front-shiny/0007-000-Squirtle.png
diff --git a/src/afd/sprites/front-shiny/0008--000--Fidgit.png b/src/afd/sprites/front-shiny/0008-000-Fidgit.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0008--000--Fidgit.png
rename to src/afd/sprites/front-shiny/0008-000-Fidgit.png
diff --git a/src/afd/sprites/front-shiny/0008--000--Wartortle.png b/src/afd/sprites/front-shiny/0008-000-Wartortle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0008--000--Wartortle.png
rename to src/afd/sprites/front-shiny/0008-000-Wartortle.png
diff --git a/src/afd/sprites/front-shiny/0009--000--Blastoise.png b/src/afd/sprites/front-shiny/0009-000-Blastoise.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0009--000--Blastoise.png
rename to src/afd/sprites/front-shiny/0009-000-Blastoise.png
diff --git a/src/afd/sprites/front-shiny/0009--420--Blastoise--Mega.png b/src/afd/sprites/front-shiny/0009-420-Blastoise-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0009--420--Blastoise--Mega.png
rename to src/afd/sprites/front-shiny/0009-420-Blastoise-Mega.png
diff --git a/src/afd/sprites/front-shiny/0010--000--Caterpie.png b/src/afd/sprites/front-shiny/0010-000-Caterpie.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0010--000--Caterpie.png
rename to src/afd/sprites/front-shiny/0010-000-Caterpie.png
diff --git a/src/afd/sprites/front-shiny/0011--000--Metapod.png b/src/afd/sprites/front-shiny/0011-000-Metapod.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0011--000--Metapod.png
rename to src/afd/sprites/front-shiny/0011-000-Metapod.png
diff --git a/src/afd/sprites/front-shiny/0011--000--Stratagem.png b/src/afd/sprites/front-shiny/0011-000-Stratagem.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0011--000--Stratagem.png
rename to src/afd/sprites/front-shiny/0011-000-Stratagem.png
diff --git a/src/afd/sprites/front-shiny/0012--000--Butterfree.png b/src/afd/sprites/front-shiny/0012-000-Butterfree.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0012--000--Butterfree.png
rename to src/afd/sprites/front-shiny/0012-000-Butterfree.png
diff --git a/src/afd/sprites/front-shiny/0012--420--Butterfree--Gmax.png b/src/afd/sprites/front-shiny/0012-420-Butterfree-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0012--420--Butterfree--Gmax.png
rename to src/afd/sprites/front-shiny/0012-420-Butterfree-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0013--000--Arghonaut.png b/src/afd/sprites/front-shiny/0013-000-Arghonaut.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0013--000--Arghonaut.png
rename to src/afd/sprites/front-shiny/0013-000-Arghonaut.png
diff --git a/src/afd/sprites/front-shiny/0013--000--Weedle.png b/src/afd/sprites/front-shiny/0013-000-Weedle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0013--000--Weedle.png
rename to src/afd/sprites/front-shiny/0013-000-Weedle.png
diff --git a/src/afd/sprites/front-shiny/0014--000--Kakuna.png b/src/afd/sprites/front-shiny/0014-000-Kakuna.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0014--000--Kakuna.png
rename to src/afd/sprites/front-shiny/0014-000-Kakuna.png
diff --git a/src/afd/sprites/front-shiny/0014--000--Kitsunoh.png b/src/afd/sprites/front-shiny/0014-000-Kitsunoh.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0014--000--Kitsunoh.png
rename to src/afd/sprites/front-shiny/0014-000-Kitsunoh.png
diff --git a/src/afd/sprites/front-shiny/0015--000--Beedrill.png b/src/afd/sprites/front-shiny/0015-000-Beedrill.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0015--000--Beedrill.png
rename to src/afd/sprites/front-shiny/0015-000-Beedrill.png
diff --git a/src/afd/sprites/front-shiny/0015--000--Cyclohm.png b/src/afd/sprites/front-shiny/0015-000-Cyclohm.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0015--000--Cyclohm.png
rename to src/afd/sprites/front-shiny/0015-000-Cyclohm.png
diff --git a/src/afd/sprites/front-shiny/0015--420--Beedrill--Mega.png b/src/afd/sprites/front-shiny/0015-420-Beedrill-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0015--420--Beedrill--Mega.png
rename to src/afd/sprites/front-shiny/0015-420-Beedrill-Mega.png
diff --git a/src/afd/sprites/front-shiny/0016--000--Colossoil.png b/src/afd/sprites/front-shiny/0016-000-Colossoil.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0016--000--Colossoil.png
rename to src/afd/sprites/front-shiny/0016-000-Colossoil.png
diff --git a/src/afd/sprites/front-shiny/0016--000--Pidgey.png b/src/afd/sprites/front-shiny/0016-000-Pidgey.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0016--000--Pidgey.png
rename to src/afd/sprites/front-shiny/0016-000-Pidgey.png
diff --git a/src/afd/sprites/front-shiny/0017--000--Krilowatt.png b/src/afd/sprites/front-shiny/0017-000-Krilowatt.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0017--000--Krilowatt.png
rename to src/afd/sprites/front-shiny/0017-000-Krilowatt.png
diff --git a/src/afd/sprites/front-shiny/0017--000--Pidgeotto.png b/src/afd/sprites/front-shiny/0017-000-Pidgeotto.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0017--000--Pidgeotto.png
rename to src/afd/sprites/front-shiny/0017-000-Pidgeotto.png
diff --git a/src/afd/sprites/front-shiny/0018--000--Pidgeot.png b/src/afd/sprites/front-shiny/0018-000-Pidgeot.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0018--000--Pidgeot.png
rename to src/afd/sprites/front-shiny/0018-000-Pidgeot.png
diff --git a/src/afd/sprites/front-shiny/0018--420--Pidgeot--Mega.gif b/src/afd/sprites/front-shiny/0018-420-Pidgeot-Mega.gif
similarity index 100%
rename from src/afd/sprites/front-shiny/0018--420--Pidgeot--Mega.gif
rename to src/afd/sprites/front-shiny/0018-420-Pidgeot-Mega.gif
diff --git a/src/afd/sprites/front-shiny/0019--000--Rattata.png b/src/afd/sprites/front-shiny/0019-000-Rattata.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0019--000--Rattata.png
rename to src/afd/sprites/front-shiny/0019-000-Rattata.png
diff --git a/src/afd/sprites/front-shiny/0019--000--Voodoom.png b/src/afd/sprites/front-shiny/0019-000-Voodoom.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0019--000--Voodoom.png
rename to src/afd/sprites/front-shiny/0019-000-Voodoom.png
diff --git a/src/afd/sprites/front-shiny/0019--420--Rattata--Alola.png b/src/afd/sprites/front-shiny/0019-420-Rattata-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0019--420--Rattata--Alola.png
rename to src/afd/sprites/front-shiny/0019-420-Rattata-Alola.png
diff --git a/src/afd/sprites/front-shiny/0020--000--Raticate.png b/src/afd/sprites/front-shiny/0020-000-Raticate.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0020--000--Raticate.png
rename to src/afd/sprites/front-shiny/0020-000-Raticate.png
diff --git a/src/afd/sprites/front-shiny/0020--420--Raticate--Alola.png b/src/afd/sprites/front-shiny/0020-420-Raticate-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0020--420--Raticate--Alola.png
rename to src/afd/sprites/front-shiny/0020-420-Raticate-Alola.png
diff --git a/src/afd/sprites/front-shiny/0021--000--Spearow.png b/src/afd/sprites/front-shiny/0021-000-Spearow.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0021--000--Spearow.png
rename to src/afd/sprites/front-shiny/0021-000-Spearow.png
diff --git a/src/afd/sprites/front-shiny/0021--000--Tomohawk.png b/src/afd/sprites/front-shiny/0021-000-Tomohawk.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0021--000--Tomohawk.png
rename to src/afd/sprites/front-shiny/0021-000-Tomohawk.png
diff --git a/src/afd/sprites/front-shiny/0022--000--Fearow.png b/src/afd/sprites/front-shiny/0022-000-Fearow.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0022--000--Fearow.png
rename to src/afd/sprites/front-shiny/0022-000-Fearow.png
diff --git a/src/afd/sprites/front-shiny/0023--000--Ekans.png b/src/afd/sprites/front-shiny/0023-000-Ekans.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0023--000--Ekans.png
rename to src/afd/sprites/front-shiny/0023-000-Ekans.png
diff --git a/src/afd/sprites/front-shiny/0023--000--Necturna.png b/src/afd/sprites/front-shiny/0023-000-Necturna.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0023--000--Necturna.png
rename to src/afd/sprites/front-shiny/0023-000-Necturna.png
diff --git a/src/afd/sprites/front-shiny/0024--000--Arbok.png b/src/afd/sprites/front-shiny/0024-000-Arbok.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0024--000--Arbok.png
rename to src/afd/sprites/front-shiny/0024-000-Arbok.png
diff --git a/src/afd/sprites/front-shiny/0024--000--Mollux.png b/src/afd/sprites/front-shiny/0024-000-Mollux.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0024--000--Mollux.png
rename to src/afd/sprites/front-shiny/0024-000-Mollux.png
diff --git a/src/afd/sprites/front-shiny/0025--000--Pikachu.png b/src/afd/sprites/front-shiny/0025-000-Pikachu.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--000--Pikachu.png
rename to src/afd/sprites/front-shiny/0025-000-Pikachu.png
diff --git a/src/afd/sprites/front-shiny/0025--420--Pikachu--Alola.png b/src/afd/sprites/front-shiny/0025-420-Pikachu-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--420--Pikachu--Alola.png
rename to src/afd/sprites/front-shiny/0025-420-Pikachu-Alola.png
diff --git a/src/afd/sprites/front-shiny/0025--420--Pikachu--Belle.png b/src/afd/sprites/front-shiny/0025-420-Pikachu-Belle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--420--Pikachu--Belle.png
rename to src/afd/sprites/front-shiny/0025-420-Pikachu-Belle.png
diff --git a/src/afd/sprites/front-shiny/0025--420--Pikachu--Gmax.png b/src/afd/sprites/front-shiny/0025-420-Pikachu-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--420--Pikachu--Gmax.png
rename to src/afd/sprites/front-shiny/0025-420-Pikachu-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0025--420--Pikachu--Hoenn.png b/src/afd/sprites/front-shiny/0025-420-Pikachu-Hoenn.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--420--Pikachu--Hoenn.png
rename to src/afd/sprites/front-shiny/0025-420-Pikachu-Hoenn.png
diff --git a/src/afd/sprites/front-shiny/0025--420--Pikachu--Kalos.png b/src/afd/sprites/front-shiny/0025-420-Pikachu-Kalos.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--420--Pikachu--Kalos.png
rename to src/afd/sprites/front-shiny/0025-420-Pikachu-Kalos.png
diff --git a/src/afd/sprites/front-shiny/0025--420--Pikachu--Libre.png b/src/afd/sprites/front-shiny/0025-420-Pikachu-Libre.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--420--Pikachu--Libre.png
rename to src/afd/sprites/front-shiny/0025-420-Pikachu-Libre.png
diff --git a/src/afd/sprites/front-shiny/0025--420--Pikachu--Original.png b/src/afd/sprites/front-shiny/0025-420-Pikachu-Original.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--420--Pikachu--Original.png
rename to src/afd/sprites/front-shiny/0025-420-Pikachu-Original.png
diff --git a/src/afd/sprites/front-shiny/0025--420--Pikachu--Partner.png b/src/afd/sprites/front-shiny/0025-420-Pikachu-Partner.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--420--Pikachu--Partner.png
rename to src/afd/sprites/front-shiny/0025-420-Pikachu-Partner.png
diff --git a/src/afd/sprites/front-shiny/0025--420--Pikachu--PhD.png b/src/afd/sprites/front-shiny/0025-420-Pikachu-PhD.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--420--Pikachu--PhD.png
rename to src/afd/sprites/front-shiny/0025-420-Pikachu-PhD.png
diff --git a/src/afd/sprites/front-shiny/0025--420--Pikachu--Pop-Star.png b/src/afd/sprites/front-shiny/0025-420-Pikachu-Pop~Star.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--420--Pikachu--Pop-Star.png
rename to src/afd/sprites/front-shiny/0025-420-Pikachu-Pop~Star.png
diff --git a/src/afd/sprites/front-shiny/0025--420--Pikachu--Rock-Star.png b/src/afd/sprites/front-shiny/0025-420-Pikachu-Rock~Star.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--420--Pikachu--Rock-Star.png
rename to src/afd/sprites/front-shiny/0025-420-Pikachu-Rock~Star.png
diff --git a/src/afd/sprites/front-shiny/0025--420--Pikachu--Sinnoh.png b/src/afd/sprites/front-shiny/0025-420-Pikachu-Sinnoh.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--420--Pikachu--Sinnoh.png
rename to src/afd/sprites/front-shiny/0025-420-Pikachu-Sinnoh.png
diff --git a/src/afd/sprites/front-shiny/0025--420--Pikachu--Starter.png b/src/afd/sprites/front-shiny/0025-420-Pikachu-Starter.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--420--Pikachu--Starter.png
rename to src/afd/sprites/front-shiny/0025-420-Pikachu-Starter.png
diff --git a/src/afd/sprites/front-shiny/0025--420--Pikachu--Unova.png b/src/afd/sprites/front-shiny/0025-420-Pikachu-Unova.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0025--420--Pikachu--Unova.png
rename to src/afd/sprites/front-shiny/0025-420-Pikachu-Unova.png
diff --git a/src/afd/sprites/front-shiny/0026--000--Raichu.png b/src/afd/sprites/front-shiny/0026-000-Raichu.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0026--000--Raichu.png
rename to src/afd/sprites/front-shiny/0026-000-Raichu.png
diff --git a/src/afd/sprites/front-shiny/0026--420--Raichu--Alola.png b/src/afd/sprites/front-shiny/0026-420-Raichu-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0026--420--Raichu--Alola.png
rename to src/afd/sprites/front-shiny/0026-420-Raichu-Alola.png
diff --git a/src/afd/sprites/front-shiny/0027--000--Aurumoth.png b/src/afd/sprites/front-shiny/0027-000-Aurumoth.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0027--000--Aurumoth.png
rename to src/afd/sprites/front-shiny/0027-000-Aurumoth.png
diff --git a/src/afd/sprites/front-shiny/0027--000--Sandshrew.png b/src/afd/sprites/front-shiny/0027-000-Sandshrew.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0027--000--Sandshrew.png
rename to src/afd/sprites/front-shiny/0027-000-Sandshrew.png
diff --git a/src/afd/sprites/front-shiny/0027--420--Sandshrew--Alola.png b/src/afd/sprites/front-shiny/0027-420-Sandshrew-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0027--420--Sandshrew--Alola.png
rename to src/afd/sprites/front-shiny/0027-420-Sandshrew-Alola.png
diff --git a/src/afd/sprites/front-shiny/0028--000--Sandslash.png b/src/afd/sprites/front-shiny/0028-000-Sandslash.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0028--000--Sandslash.png
rename to src/afd/sprites/front-shiny/0028-000-Sandslash.png
diff --git a/src/afd/sprites/front-shiny/0028--420--Sandslash--Alola.png b/src/afd/sprites/front-shiny/0028-420-Sandslash-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0028--420--Sandslash--Alola.png
rename to src/afd/sprites/front-shiny/0028-420-Sandslash-Alola.png
diff --git a/src/afd/sprites/front-shiny/0029--000--Malaconda.png b/src/afd/sprites/front-shiny/0029-000-Malaconda.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0029--000--Malaconda.png
rename to src/afd/sprites/front-shiny/0029-000-Malaconda.png
diff --git a/src/afd/sprites/front-shiny/0029--000--Nidoran-F.png b/src/afd/sprites/front-shiny/0029-000-Nidoran~F.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0029--000--Nidoran-F.png
rename to src/afd/sprites/front-shiny/0029-000-Nidoran~F.png
diff --git a/src/afd/sprites/front-shiny/0030--000--Nidorina.png b/src/afd/sprites/front-shiny/0030-000-Nidorina.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0030--000--Nidorina.png
rename to src/afd/sprites/front-shiny/0030-000-Nidorina.png
diff --git a/src/afd/sprites/front-shiny/0031--000--Cawmodore.png b/src/afd/sprites/front-shiny/0031-000-Cawmodore.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0031--000--Cawmodore.png
rename to src/afd/sprites/front-shiny/0031-000-Cawmodore.png
diff --git a/src/afd/sprites/front-shiny/0031--000--Nidoqueen.png b/src/afd/sprites/front-shiny/0031-000-Nidoqueen.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0031--000--Nidoqueen.png
rename to src/afd/sprites/front-shiny/0031-000-Nidoqueen.png
diff --git a/src/afd/sprites/front-shiny/0032--000--Nidoran-M.png b/src/afd/sprites/front-shiny/0032-000-Nidoran~M.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0032--000--Nidoran-M.png
rename to src/afd/sprites/front-shiny/0032-000-Nidoran~M.png
diff --git a/src/afd/sprites/front-shiny/0033--000--Nidorino.png b/src/afd/sprites/front-shiny/0033-000-Nidorino.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0033--000--Nidorino.png
rename to src/afd/sprites/front-shiny/0033-000-Nidorino.png
diff --git a/src/afd/sprites/front-shiny/0034--000--Nidoking.png b/src/afd/sprites/front-shiny/0034-000-Nidoking.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0034--000--Nidoking.png
rename to src/afd/sprites/front-shiny/0034-000-Nidoking.png
diff --git a/src/afd/sprites/front-shiny/0035--000--Clefairy.png b/src/afd/sprites/front-shiny/0035-000-Clefairy.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0035--000--Clefairy.png
rename to src/afd/sprites/front-shiny/0035-000-Clefairy.png
diff --git a/src/afd/sprites/front-shiny/0035--000--Plasmanta.png b/src/afd/sprites/front-shiny/0035-000-Plasmanta.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0035--000--Plasmanta.png
rename to src/afd/sprites/front-shiny/0035-000-Plasmanta.png
diff --git a/src/afd/sprites/front-shiny/0036--000--Clefable.png b/src/afd/sprites/front-shiny/0036-000-Clefable.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0036--000--Clefable.png
rename to src/afd/sprites/front-shiny/0036-000-Clefable.png
diff --git a/src/afd/sprites/front-shiny/0037--000--Vulpix.png b/src/afd/sprites/front-shiny/0037-000-Vulpix.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0037--000--Vulpix.png
rename to src/afd/sprites/front-shiny/0037-000-Vulpix.png
diff --git a/src/afd/sprites/front-shiny/0037--420--Vulpix--Alola.png b/src/afd/sprites/front-shiny/0037-420-Vulpix-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0037--420--Vulpix--Alola.png
rename to src/afd/sprites/front-shiny/0037-420-Vulpix-Alola.png
diff --git a/src/afd/sprites/front-shiny/0038--420--Ninetales--Alola.png b/src/afd/sprites/front-shiny/0038-420-Ninetales-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0038--420--Ninetales--Alola.png
rename to src/afd/sprites/front-shiny/0038-420-Ninetales-Alola.png
diff --git a/src/afd/sprites/front-shiny/0039--000--Jigglypuff.png b/src/afd/sprites/front-shiny/0039-000-Jigglypuff.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0039--000--Jigglypuff.png
rename to src/afd/sprites/front-shiny/0039-000-Jigglypuff.png
diff --git a/src/afd/sprites/front-shiny/0040--000--Wigglytuff.png b/src/afd/sprites/front-shiny/0040-000-Wigglytuff.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0040--000--Wigglytuff.png
rename to src/afd/sprites/front-shiny/0040-000-Wigglytuff.png
diff --git a/src/afd/sprites/front-shiny/0041--000--Zubat.png b/src/afd/sprites/front-shiny/0041-000-Zubat.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0041--000--Zubat.png
rename to src/afd/sprites/front-shiny/0041-000-Zubat.png
diff --git a/src/afd/sprites/front-shiny/0042--000--Golbat.png b/src/afd/sprites/front-shiny/0042-000-Golbat.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0042--000--Golbat.png
rename to src/afd/sprites/front-shiny/0042-000-Golbat.png
diff --git a/src/afd/sprites/front-shiny/0043--000--Oddish.png b/src/afd/sprites/front-shiny/0043-000-Oddish.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0043--000--Oddish.png
rename to src/afd/sprites/front-shiny/0043-000-Oddish.png
diff --git a/src/afd/sprites/front-shiny/0044--000--Gloom.png b/src/afd/sprites/front-shiny/0044-000-Gloom.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0044--000--Gloom.png
rename to src/afd/sprites/front-shiny/0044-000-Gloom.png
diff --git a/src/afd/sprites/front-shiny/0045--000--Vileplume.png b/src/afd/sprites/front-shiny/0045-000-Vileplume.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0045--000--Vileplume.png
rename to src/afd/sprites/front-shiny/0045-000-Vileplume.png
diff --git a/src/afd/sprites/front-shiny/0046--000--Paras.png b/src/afd/sprites/front-shiny/0046-000-Paras.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0046--000--Paras.png
rename to src/afd/sprites/front-shiny/0046-000-Paras.png
diff --git a/src/afd/sprites/front-shiny/0047--000--Parasect.png b/src/afd/sprites/front-shiny/0047-000-Parasect.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0047--000--Parasect.png
rename to src/afd/sprites/front-shiny/0047-000-Parasect.png
diff --git a/src/afd/sprites/front-shiny/0048--000--Venonat.png b/src/afd/sprites/front-shiny/0048-000-Venonat.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0048--000--Venonat.png
rename to src/afd/sprites/front-shiny/0048-000-Venonat.png
diff --git a/src/afd/sprites/front-shiny/0049--000--Venomoth.png b/src/afd/sprites/front-shiny/0049-000-Venomoth.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0049--000--Venomoth.png
rename to src/afd/sprites/front-shiny/0049-000-Venomoth.png
diff --git a/src/afd/sprites/front-shiny/0050--000--Diglett.png b/src/afd/sprites/front-shiny/0050-000-Diglett.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0050--000--Diglett.png
rename to src/afd/sprites/front-shiny/0050-000-Diglett.png
diff --git a/src/afd/sprites/front-shiny/0050--420--Diglett--Alola.png b/src/afd/sprites/front-shiny/0050-420-Diglett-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0050--420--Diglett--Alola.png
rename to src/afd/sprites/front-shiny/0050-420-Diglett-Alola.png
diff --git a/src/afd/sprites/front-shiny/0051--000--Dugtrio.png b/src/afd/sprites/front-shiny/0051-000-Dugtrio.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0051--000--Dugtrio.png
rename to src/afd/sprites/front-shiny/0051-000-Dugtrio.png
diff --git a/src/afd/sprites/front-shiny/0051--420--Dugtrio--Alola.png b/src/afd/sprites/front-shiny/0051-420-Dugtrio-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0051--420--Dugtrio--Alola.png
rename to src/afd/sprites/front-shiny/0051-420-Dugtrio-Alola.png
diff --git a/src/afd/sprites/front-shiny/0052--000--Meowth.png b/src/afd/sprites/front-shiny/0052-000-Meowth.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0052--000--Meowth.png
rename to src/afd/sprites/front-shiny/0052-000-Meowth.png
diff --git a/src/afd/sprites/front-shiny/0052--420--Meowth--Alola.png b/src/afd/sprites/front-shiny/0052-420-Meowth-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0052--420--Meowth--Alola.png
rename to src/afd/sprites/front-shiny/0052-420-Meowth-Alola.png
diff --git a/src/afd/sprites/front-shiny/0052--420--Meowth--Galar.png b/src/afd/sprites/front-shiny/0052-420-Meowth-Galar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0052--420--Meowth--Galar.png
rename to src/afd/sprites/front-shiny/0052-420-Meowth-Galar.png
diff --git a/src/afd/sprites/front-shiny/0052--420--Meowth--Gmax.png b/src/afd/sprites/front-shiny/0052-420-Meowth-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0052--420--Meowth--Gmax.png
rename to src/afd/sprites/front-shiny/0052-420-Meowth-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0053--000--Persian.png b/src/afd/sprites/front-shiny/0053-000-Persian.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0053--000--Persian.png
rename to src/afd/sprites/front-shiny/0053-000-Persian.png
diff --git a/src/afd/sprites/front-shiny/0053--420--Persian--Alola.png b/src/afd/sprites/front-shiny/0053-420-Persian-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0053--420--Persian--Alola.png
rename to src/afd/sprites/front-shiny/0053-420-Persian-Alola.png
diff --git a/src/afd/sprites/front-shiny/0054--000--Psyduck.png b/src/afd/sprites/front-shiny/0054-000-Psyduck.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0054--000--Psyduck.png
rename to src/afd/sprites/front-shiny/0054-000-Psyduck.png
diff --git a/src/afd/sprites/front-shiny/0055--000--Golduck.png b/src/afd/sprites/front-shiny/0055-000-Golduck.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0055--000--Golduck.png
rename to src/afd/sprites/front-shiny/0055-000-Golduck.png
diff --git a/src/afd/sprites/front-shiny/0056--000--Mankey.png b/src/afd/sprites/front-shiny/0056-000-Mankey.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0056--000--Mankey.png
rename to src/afd/sprites/front-shiny/0056-000-Mankey.png
diff --git a/src/afd/sprites/front-shiny/0057--000--Primeape.png b/src/afd/sprites/front-shiny/0057-000-Primeape.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0057--000--Primeape.png
rename to src/afd/sprites/front-shiny/0057-000-Primeape.png
diff --git a/src/afd/sprites/front-shiny/0058--000--Growlithe.png b/src/afd/sprites/front-shiny/0058-000-Growlithe.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0058--000--Growlithe.png
rename to src/afd/sprites/front-shiny/0058-000-Growlithe.png
diff --git a/src/afd/sprites/front-shiny/0059--000--Arcanine.png b/src/afd/sprites/front-shiny/0059-000-Arcanine.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0059--000--Arcanine.png
rename to src/afd/sprites/front-shiny/0059-000-Arcanine.png
diff --git a/src/afd/sprites/front-shiny/0060--000--Poliwag.png b/src/afd/sprites/front-shiny/0060-000-Poliwag.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0060--000--Poliwag.png
rename to src/afd/sprites/front-shiny/0060-000-Poliwag.png
diff --git a/src/afd/sprites/front-shiny/0061--000--Poliwhirl.png b/src/afd/sprites/front-shiny/0061-000-Poliwhirl.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0061--000--Poliwhirl.png
rename to src/afd/sprites/front-shiny/0061-000-Poliwhirl.png
diff --git a/src/afd/sprites/front-shiny/0062--000--Poliwrath.png b/src/afd/sprites/front-shiny/0062-000-Poliwrath.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0062--000--Poliwrath.png
rename to src/afd/sprites/front-shiny/0062-000-Poliwrath.png
diff --git a/src/afd/sprites/front-shiny/0063--000--Abra.png b/src/afd/sprites/front-shiny/0063-000-Abra.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0063--000--Abra.png
rename to src/afd/sprites/front-shiny/0063-000-Abra.png
diff --git a/src/afd/sprites/front-shiny/0064--000--Kadabra.png b/src/afd/sprites/front-shiny/0064-000-Kadabra.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0064--000--Kadabra.png
rename to src/afd/sprites/front-shiny/0064-000-Kadabra.png
diff --git a/src/afd/sprites/front-shiny/0065--000--Alakazam.png b/src/afd/sprites/front-shiny/0065-000-Alakazam.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0065--000--Alakazam.png
rename to src/afd/sprites/front-shiny/0065-000-Alakazam.png
diff --git a/src/afd/sprites/front-shiny/0065--420--Alakazam--Mega.png b/src/afd/sprites/front-shiny/0065-420-Alakazam-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0065--420--Alakazam--Mega.png
rename to src/afd/sprites/front-shiny/0065-420-Alakazam-Mega.png
diff --git a/src/afd/sprites/front-shiny/0066--000--Machop.png b/src/afd/sprites/front-shiny/0066-000-Machop.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0066--000--Machop.png
rename to src/afd/sprites/front-shiny/0066-000-Machop.png
diff --git a/src/afd/sprites/front-shiny/0067--000--Machoke.png b/src/afd/sprites/front-shiny/0067-000-Machoke.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0067--000--Machoke.png
rename to src/afd/sprites/front-shiny/0067-000-Machoke.png
diff --git a/src/afd/sprites/front-shiny/0068--000--Machamp.png b/src/afd/sprites/front-shiny/0068-000-Machamp.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0068--000--Machamp.png
rename to src/afd/sprites/front-shiny/0068-000-Machamp.png
diff --git a/src/afd/sprites/front-shiny/0068--420--Machamp--Gmax.png b/src/afd/sprites/front-shiny/0068-420-Machamp-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0068--420--Machamp--Gmax.png
rename to src/afd/sprites/front-shiny/0068-420-Machamp-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0069--000--Bellsprout.png b/src/afd/sprites/front-shiny/0069-000-Bellsprout.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0069--000--Bellsprout.png
rename to src/afd/sprites/front-shiny/0069-000-Bellsprout.png
diff --git a/src/afd/sprites/front-shiny/0070--000--Weepinbell.png b/src/afd/sprites/front-shiny/0070-000-Weepinbell.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0070--000--Weepinbell.png
rename to src/afd/sprites/front-shiny/0070-000-Weepinbell.png
diff --git a/src/afd/sprites/front-shiny/0071--000--Victreebel.png b/src/afd/sprites/front-shiny/0071-000-Victreebel.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0071--000--Victreebel.png
rename to src/afd/sprites/front-shiny/0071-000-Victreebel.png
diff --git a/src/afd/sprites/front-shiny/0072--000--Tentacool.png b/src/afd/sprites/front-shiny/0072-000-Tentacool.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0072--000--Tentacool.png
rename to src/afd/sprites/front-shiny/0072-000-Tentacool.png
diff --git a/src/afd/sprites/front-shiny/0073--000--Tentacruel.png b/src/afd/sprites/front-shiny/0073-000-Tentacruel.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0073--000--Tentacruel.png
rename to src/afd/sprites/front-shiny/0073-000-Tentacruel.png
diff --git a/src/afd/sprites/front-shiny/0074--000--Geodude.png b/src/afd/sprites/front-shiny/0074-000-Geodude.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0074--000--Geodude.png
rename to src/afd/sprites/front-shiny/0074-000-Geodude.png
diff --git a/src/afd/sprites/front-shiny/0074--420--Geodude--Alola.png b/src/afd/sprites/front-shiny/0074-420-Geodude-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0074--420--Geodude--Alola.png
rename to src/afd/sprites/front-shiny/0074-420-Geodude-Alola.png
diff --git a/src/afd/sprites/front-shiny/0075--000--Graveler.png b/src/afd/sprites/front-shiny/0075-000-Graveler.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0075--000--Graveler.png
rename to src/afd/sprites/front-shiny/0075-000-Graveler.png
diff --git a/src/afd/sprites/front-shiny/0075--420--Graveler--Alola.png b/src/afd/sprites/front-shiny/0075-420-Graveler-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0075--420--Graveler--Alola.png
rename to src/afd/sprites/front-shiny/0075-420-Graveler-Alola.png
diff --git a/src/afd/sprites/front-shiny/0076--000--Golem.png b/src/afd/sprites/front-shiny/0076-000-Golem.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0076--000--Golem.png
rename to src/afd/sprites/front-shiny/0076-000-Golem.png
diff --git a/src/afd/sprites/front-shiny/0076--420--Golem--Alola.png b/src/afd/sprites/front-shiny/0076-420-Golem-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0076--420--Golem--Alola.png
rename to src/afd/sprites/front-shiny/0076-420-Golem-Alola.png
diff --git a/src/afd/sprites/front-shiny/0077--000--Ponyta.png b/src/afd/sprites/front-shiny/0077-000-Ponyta.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0077--000--Ponyta.png
rename to src/afd/sprites/front-shiny/0077-000-Ponyta.png
diff --git a/src/afd/sprites/front-shiny/0077--420--Ponyta--Galar.png b/src/afd/sprites/front-shiny/0077-420-Ponyta-Galar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0077--420--Ponyta--Galar.png
rename to src/afd/sprites/front-shiny/0077-420-Ponyta-Galar.png
diff --git a/src/afd/sprites/front-shiny/0078--000--Rapidash.png b/src/afd/sprites/front-shiny/0078-000-Rapidash.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0078--000--Rapidash.png
rename to src/afd/sprites/front-shiny/0078-000-Rapidash.png
diff --git a/src/afd/sprites/front-shiny/0078--420--Rapidash--Galar.png b/src/afd/sprites/front-shiny/0078-420-Rapidash-Galar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0078--420--Rapidash--Galar.png
rename to src/afd/sprites/front-shiny/0078-420-Rapidash-Galar.png
diff --git a/src/afd/sprites/front-shiny/0079--000--Slowpoke.png b/src/afd/sprites/front-shiny/0079-000-Slowpoke.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0079--000--Slowpoke.png
rename to src/afd/sprites/front-shiny/0079-000-Slowpoke.png
diff --git a/src/afd/sprites/front-shiny/0079--420--Slowpoke--Galar.png b/src/afd/sprites/front-shiny/0079-420-Slowpoke-Galar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0079--420--Slowpoke--Galar.png
rename to src/afd/sprites/front-shiny/0079-420-Slowpoke-Galar.png
diff --git a/src/afd/sprites/front-shiny/0080--000--Slowbro.png b/src/afd/sprites/front-shiny/0080-000-Slowbro.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0080--000--Slowbro.png
rename to src/afd/sprites/front-shiny/0080-000-Slowbro.png
diff --git a/src/afd/sprites/front-shiny/0080--420--Slowbro--Mega.png b/src/afd/sprites/front-shiny/0080-420-Slowbro-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0080--420--Slowbro--Mega.png
rename to src/afd/sprites/front-shiny/0080-420-Slowbro-Mega.png
diff --git a/src/afd/sprites/front-shiny/0081--000--Magnemite.png b/src/afd/sprites/front-shiny/0081-000-Magnemite.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0081--000--Magnemite.png
rename to src/afd/sprites/front-shiny/0081-000-Magnemite.png
diff --git a/src/afd/sprites/front-shiny/0082--000--Magneton.png b/src/afd/sprites/front-shiny/0082-000-Magneton.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0082--000--Magneton.png
rename to src/afd/sprites/front-shiny/0082-000-Magneton.png
diff --git a/src/afd/sprites/front-shiny/0083--000--Farfetch__0027d.png b/src/afd/sprites/front-shiny/0083-000-Farfetch__0027d.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0083--000--Farfetch__0027d.png
rename to src/afd/sprites/front-shiny/0083-000-Farfetch__0027d.png
diff --git a/src/afd/sprites/front-shiny/0083--420--Farfetch__0027d--Galar.png b/src/afd/sprites/front-shiny/0083-420-Farfetch__0027d-Galar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0083--420--Farfetch__0027d--Galar.png
rename to src/afd/sprites/front-shiny/0083-420-Farfetch__0027d-Galar.png
diff --git a/src/afd/sprites/front-shiny/0084--000--Doduo.png b/src/afd/sprites/front-shiny/0084-000-Doduo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0084--000--Doduo.png
rename to src/afd/sprites/front-shiny/0084-000-Doduo.png
diff --git a/src/afd/sprites/front-shiny/0085--000--Dodrio.png b/src/afd/sprites/front-shiny/0085-000-Dodrio.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0085--000--Dodrio.png
rename to src/afd/sprites/front-shiny/0085-000-Dodrio.png
diff --git a/src/afd/sprites/front-shiny/0086--000--Seel.png b/src/afd/sprites/front-shiny/0086-000-Seel.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0086--000--Seel.png
rename to src/afd/sprites/front-shiny/0086-000-Seel.png
diff --git a/src/afd/sprites/front-shiny/0087--000--Dewgong.png b/src/afd/sprites/front-shiny/0087-000-Dewgong.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0087--000--Dewgong.png
rename to src/afd/sprites/front-shiny/0087-000-Dewgong.png
diff --git a/src/afd/sprites/front-shiny/0088--000--Grimer.png b/src/afd/sprites/front-shiny/0088-000-Grimer.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0088--000--Grimer.png
rename to src/afd/sprites/front-shiny/0088-000-Grimer.png
diff --git a/src/afd/sprites/front-shiny/0088--420--Grimer--Alola.png b/src/afd/sprites/front-shiny/0088-420-Grimer-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0088--420--Grimer--Alola.png
rename to src/afd/sprites/front-shiny/0088-420-Grimer-Alola.png
diff --git a/src/afd/sprites/front-shiny/0089--000--Muk.png b/src/afd/sprites/front-shiny/0089-000-Muk.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0089--000--Muk.png
rename to src/afd/sprites/front-shiny/0089-000-Muk.png
diff --git a/src/afd/sprites/front-shiny/0089--420--Muk--Alola.png b/src/afd/sprites/front-shiny/0089-420-Muk-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0089--420--Muk--Alola.png
rename to src/afd/sprites/front-shiny/0089-420-Muk-Alola.png
diff --git a/src/afd/sprites/front-shiny/0090--000--Shellder.png b/src/afd/sprites/front-shiny/0090-000-Shellder.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0090--000--Shellder.png
rename to src/afd/sprites/front-shiny/0090-000-Shellder.png
diff --git a/src/afd/sprites/front-shiny/0091--000--Cloyster.png b/src/afd/sprites/front-shiny/0091-000-Cloyster.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0091--000--Cloyster.png
rename to src/afd/sprites/front-shiny/0091-000-Cloyster.png
diff --git a/src/afd/sprites/front-shiny/0092--000--Gastly.png b/src/afd/sprites/front-shiny/0092-000-Gastly.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0092--000--Gastly.png
rename to src/afd/sprites/front-shiny/0092-000-Gastly.png
diff --git a/src/afd/sprites/front-shiny/0093--000--Haunter.png b/src/afd/sprites/front-shiny/0093-000-Haunter.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0093--000--Haunter.png
rename to src/afd/sprites/front-shiny/0093-000-Haunter.png
diff --git a/src/afd/sprites/front-shiny/0094--000--Gengar.png b/src/afd/sprites/front-shiny/0094-000-Gengar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0094--000--Gengar.png
rename to src/afd/sprites/front-shiny/0094-000-Gengar.png
diff --git a/src/afd/sprites/front-shiny/0094--420--Gengar--Gmax.png b/src/afd/sprites/front-shiny/0094-420-Gengar-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0094--420--Gengar--Gmax.png
rename to src/afd/sprites/front-shiny/0094-420-Gengar-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0094--420--Gengar--Mega.png b/src/afd/sprites/front-shiny/0094-420-Gengar-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0094--420--Gengar--Mega.png
rename to src/afd/sprites/front-shiny/0094-420-Gengar-Mega.png
diff --git a/src/afd/sprites/front-shiny/0095--000--Onix.png b/src/afd/sprites/front-shiny/0095-000-Onix.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0095--000--Onix.png
rename to src/afd/sprites/front-shiny/0095-000-Onix.png
diff --git a/src/afd/sprites/front-shiny/0096--000--Drowzee.png b/src/afd/sprites/front-shiny/0096-000-Drowzee.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0096--000--Drowzee.png
rename to src/afd/sprites/front-shiny/0096-000-Drowzee.png
diff --git a/src/afd/sprites/front-shiny/0097--000--Hypno.png b/src/afd/sprites/front-shiny/0097-000-Hypno.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0097--000--Hypno.png
rename to src/afd/sprites/front-shiny/0097-000-Hypno.png
diff --git a/src/afd/sprites/front-shiny/0098--000--Krabby.png b/src/afd/sprites/front-shiny/0098-000-Krabby.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0098--000--Krabby.png
rename to src/afd/sprites/front-shiny/0098-000-Krabby.png
diff --git a/src/afd/sprites/front-shiny/0099--000--Kingler.png b/src/afd/sprites/front-shiny/0099-000-Kingler.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0099--000--Kingler.png
rename to src/afd/sprites/front-shiny/0099-000-Kingler.png
diff --git a/src/afd/sprites/front-shiny/0099--420--Kingler--Gmax.png b/src/afd/sprites/front-shiny/0099-420-Kingler-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0099--420--Kingler--Gmax.png
rename to src/afd/sprites/front-shiny/0099-420-Kingler-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0100--000--Voltorb.png b/src/afd/sprites/front-shiny/0100-000-Voltorb.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0100--000--Voltorb.png
rename to src/afd/sprites/front-shiny/0100-000-Voltorb.png
diff --git a/src/afd/sprites/front-shiny/0101--000--Electrode.png b/src/afd/sprites/front-shiny/0101-000-Electrode.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0101--000--Electrode.png
rename to src/afd/sprites/front-shiny/0101-000-Electrode.png
diff --git a/src/afd/sprites/front-shiny/0102--000--Exeggcute.png b/src/afd/sprites/front-shiny/0102-000-Exeggcute.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0102--000--Exeggcute.png
rename to src/afd/sprites/front-shiny/0102-000-Exeggcute.png
diff --git a/src/afd/sprites/front-shiny/0103--000--Exeggutor.png b/src/afd/sprites/front-shiny/0103-000-Exeggutor.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0103--000--Exeggutor.png
rename to src/afd/sprites/front-shiny/0103-000-Exeggutor.png
diff --git a/src/afd/sprites/front-shiny/0103--420--Exeggutor--Alola.png b/src/afd/sprites/front-shiny/0103-420-Exeggutor-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0103--420--Exeggutor--Alola.png
rename to src/afd/sprites/front-shiny/0103-420-Exeggutor-Alola.png
diff --git a/src/afd/sprites/front-shiny/0104--000--Cubone.png b/src/afd/sprites/front-shiny/0104-000-Cubone.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0104--000--Cubone.png
rename to src/afd/sprites/front-shiny/0104-000-Cubone.png
diff --git a/src/afd/sprites/front-shiny/0105--000--Marowak.png b/src/afd/sprites/front-shiny/0105-000-Marowak.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0105--000--Marowak.png
rename to src/afd/sprites/front-shiny/0105-000-Marowak.png
diff --git a/src/afd/sprites/front-shiny/0105--420--Marowak--Alola.png b/src/afd/sprites/front-shiny/0105-420-Marowak-Alola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0105--420--Marowak--Alola.png
rename to src/afd/sprites/front-shiny/0105-420-Marowak-Alola.png
diff --git a/src/afd/sprites/front-shiny/0106--000--Hitmonlee.png b/src/afd/sprites/front-shiny/0106-000-Hitmonlee.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0106--000--Hitmonlee.png
rename to src/afd/sprites/front-shiny/0106-000-Hitmonlee.png
diff --git a/src/afd/sprites/front-shiny/0107--000--Hitmonchan.png b/src/afd/sprites/front-shiny/0107-000-Hitmonchan.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0107--000--Hitmonchan.png
rename to src/afd/sprites/front-shiny/0107-000-Hitmonchan.png
diff --git a/src/afd/sprites/front-shiny/0108--000--Lickitung.png b/src/afd/sprites/front-shiny/0108-000-Lickitung.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0108--000--Lickitung.png
rename to src/afd/sprites/front-shiny/0108-000-Lickitung.png
diff --git a/src/afd/sprites/front-shiny/0109--000--Koffing.png b/src/afd/sprites/front-shiny/0109-000-Koffing.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0109--000--Koffing.png
rename to src/afd/sprites/front-shiny/0109-000-Koffing.png
diff --git a/src/afd/sprites/front-shiny/0110--000--Weezing.png b/src/afd/sprites/front-shiny/0110-000-Weezing.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0110--000--Weezing.png
rename to src/afd/sprites/front-shiny/0110-000-Weezing.png
diff --git a/src/afd/sprites/front-shiny/0110--420--Weezing--Galar.png b/src/afd/sprites/front-shiny/0110-420-Weezing-Galar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0110--420--Weezing--Galar.png
rename to src/afd/sprites/front-shiny/0110-420-Weezing-Galar.png
diff --git a/src/afd/sprites/front-shiny/0111--000--Rhyhorn.png b/src/afd/sprites/front-shiny/0111-000-Rhyhorn.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0111--000--Rhyhorn.png
rename to src/afd/sprites/front-shiny/0111-000-Rhyhorn.png
diff --git a/src/afd/sprites/front-shiny/0112--000--Rhydon.png b/src/afd/sprites/front-shiny/0112-000-Rhydon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0112--000--Rhydon.png
rename to src/afd/sprites/front-shiny/0112-000-Rhydon.png
diff --git a/src/afd/sprites/front-shiny/0113--000--Chansey.png b/src/afd/sprites/front-shiny/0113-000-Chansey.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0113--000--Chansey.png
rename to src/afd/sprites/front-shiny/0113-000-Chansey.png
diff --git a/src/afd/sprites/front-shiny/0114--000--Tangela.png b/src/afd/sprites/front-shiny/0114-000-Tangela.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0114--000--Tangela.png
rename to src/afd/sprites/front-shiny/0114-000-Tangela.png
diff --git a/src/afd/sprites/front-shiny/0115--000--Kangaskhan.png b/src/afd/sprites/front-shiny/0115-000-Kangaskhan.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0115--000--Kangaskhan.png
rename to src/afd/sprites/front-shiny/0115-000-Kangaskhan.png
diff --git a/src/afd/sprites/front-shiny/0115--420--Kangaskhan--Mega.png b/src/afd/sprites/front-shiny/0115-420-Kangaskhan-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0115--420--Kangaskhan--Mega.png
rename to src/afd/sprites/front-shiny/0115-420-Kangaskhan-Mega.png
diff --git a/src/afd/sprites/front-shiny/0116--000--Horsea.png b/src/afd/sprites/front-shiny/0116-000-Horsea.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0116--000--Horsea.png
rename to src/afd/sprites/front-shiny/0116-000-Horsea.png
diff --git a/src/afd/sprites/front-shiny/0117--000--Seadra.png b/src/afd/sprites/front-shiny/0117-000-Seadra.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0117--000--Seadra.png
rename to src/afd/sprites/front-shiny/0117-000-Seadra.png
diff --git a/src/afd/sprites/front-shiny/0118--000--Goldeen.png b/src/afd/sprites/front-shiny/0118-000-Goldeen.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0118--000--Goldeen.png
rename to src/afd/sprites/front-shiny/0118-000-Goldeen.png
diff --git a/src/afd/sprites/front-shiny/0119--000--Seaking.png b/src/afd/sprites/front-shiny/0119-000-Seaking.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0119--000--Seaking.png
rename to src/afd/sprites/front-shiny/0119-000-Seaking.png
diff --git a/src/afd/sprites/front-shiny/0120--000--Staryu.png b/src/afd/sprites/front-shiny/0120-000-Staryu.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0120--000--Staryu.png
rename to src/afd/sprites/front-shiny/0120-000-Staryu.png
diff --git a/src/afd/sprites/front-shiny/0121--000--Starmie.png b/src/afd/sprites/front-shiny/0121-000-Starmie.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0121--000--Starmie.png
rename to src/afd/sprites/front-shiny/0121-000-Starmie.png
diff --git a/src/afd/sprites/front-shiny/0122--000--Mr._Mime.png b/src/afd/sprites/front-shiny/0122-000-Mr._Mime.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0122--000--Mr._Mime.png
rename to src/afd/sprites/front-shiny/0122-000-Mr._Mime.png
diff --git a/src/afd/sprites/front-shiny/0122--420--Mr._Mime--Galar.png b/src/afd/sprites/front-shiny/0122-420-Mr._Mime-Galar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0122--420--Mr._Mime--Galar.png
rename to src/afd/sprites/front-shiny/0122-420-Mr._Mime-Galar.png
diff --git a/src/afd/sprites/front-shiny/0123--000--Scyther.png b/src/afd/sprites/front-shiny/0123-000-Scyther.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0123--000--Scyther.png
rename to src/afd/sprites/front-shiny/0123-000-Scyther.png
diff --git a/src/afd/sprites/front-shiny/0124--000--Jynx.png b/src/afd/sprites/front-shiny/0124-000-Jynx.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0124--000--Jynx.png
rename to src/afd/sprites/front-shiny/0124-000-Jynx.png
diff --git a/src/afd/sprites/front-shiny/0125--000--Electabuzz.png b/src/afd/sprites/front-shiny/0125-000-Electabuzz.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0125--000--Electabuzz.png
rename to src/afd/sprites/front-shiny/0125-000-Electabuzz.png
diff --git a/src/afd/sprites/front-shiny/0126--000--Magmar.png b/src/afd/sprites/front-shiny/0126-000-Magmar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0126--000--Magmar.png
rename to src/afd/sprites/front-shiny/0126-000-Magmar.png
diff --git a/src/afd/sprites/front-shiny/0127--000--Pinsir.png b/src/afd/sprites/front-shiny/0127-000-Pinsir.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0127--000--Pinsir.png
rename to src/afd/sprites/front-shiny/0127-000-Pinsir.png
diff --git a/src/afd/sprites/front-shiny/0127--420--Pinsir--Mega.png b/src/afd/sprites/front-shiny/0127-420-Pinsir-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0127--420--Pinsir--Mega.png
rename to src/afd/sprites/front-shiny/0127-420-Pinsir-Mega.png
diff --git a/src/afd/sprites/front-shiny/0128--000--Tauros.png b/src/afd/sprites/front-shiny/0128-000-Tauros.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0128--000--Tauros.png
rename to src/afd/sprites/front-shiny/0128-000-Tauros.png
diff --git a/src/afd/sprites/front-shiny/0129--000--Magikarp.png b/src/afd/sprites/front-shiny/0129-000-Magikarp.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0129--000--Magikarp.png
rename to src/afd/sprites/front-shiny/0129-000-Magikarp.png
diff --git a/src/afd/sprites/front-shiny/0130--000--Gyarados.png b/src/afd/sprites/front-shiny/0130-000-Gyarados.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0130--000--Gyarados.png
rename to src/afd/sprites/front-shiny/0130-000-Gyarados.png
diff --git a/src/afd/sprites/front-shiny/0130--420--Gyarados--Mega.png b/src/afd/sprites/front-shiny/0130-420-Gyarados-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0130--420--Gyarados--Mega.png
rename to src/afd/sprites/front-shiny/0130-420-Gyarados-Mega.png
diff --git a/src/afd/sprites/front-shiny/0131--000--Lapras.png b/src/afd/sprites/front-shiny/0131-000-Lapras.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0131--000--Lapras.png
rename to src/afd/sprites/front-shiny/0131-000-Lapras.png
diff --git a/src/afd/sprites/front-shiny/0131--420--Lapras--Gmax.png b/src/afd/sprites/front-shiny/0131-420-Lapras-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0131--420--Lapras--Gmax.png
rename to src/afd/sprites/front-shiny/0131-420-Lapras-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0132--000--Ditto.png b/src/afd/sprites/front-shiny/0132-000-Ditto.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0132--000--Ditto.png
rename to src/afd/sprites/front-shiny/0132-000-Ditto.png
diff --git a/src/afd/sprites/front-shiny/0133--000--Eevee.png b/src/afd/sprites/front-shiny/0133-000-Eevee.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0133--000--Eevee.png
rename to src/afd/sprites/front-shiny/0133-000-Eevee.png
diff --git a/src/afd/sprites/front-shiny/0133--420--Eevee--Gmax.png b/src/afd/sprites/front-shiny/0133-420-Eevee-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0133--420--Eevee--Gmax.png
rename to src/afd/sprites/front-shiny/0133-420-Eevee-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0133--420--Eevee--Starter.png b/src/afd/sprites/front-shiny/0133-420-Eevee-Starter.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0133--420--Eevee--Starter.png
rename to src/afd/sprites/front-shiny/0133-420-Eevee-Starter.png
diff --git a/src/afd/sprites/front-shiny/0134--000--Vaporeon.png b/src/afd/sprites/front-shiny/0134-000-Vaporeon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0134--000--Vaporeon.png
rename to src/afd/sprites/front-shiny/0134-000-Vaporeon.png
diff --git a/src/afd/sprites/front-shiny/0135--000--Jolteon.png b/src/afd/sprites/front-shiny/0135-000-Jolteon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0135--000--Jolteon.png
rename to src/afd/sprites/front-shiny/0135-000-Jolteon.png
diff --git a/src/afd/sprites/front-shiny/0136--000--Flareon.png b/src/afd/sprites/front-shiny/0136-000-Flareon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0136--000--Flareon.png
rename to src/afd/sprites/front-shiny/0136-000-Flareon.png
diff --git a/src/afd/sprites/front-shiny/0137--000--Porygon.png b/src/afd/sprites/front-shiny/0137-000-Porygon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0137--000--Porygon.png
rename to src/afd/sprites/front-shiny/0137-000-Porygon.png
diff --git a/src/afd/sprites/front-shiny/0138--000--Omanyte.png b/src/afd/sprites/front-shiny/0138-000-Omanyte.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0138--000--Omanyte.png
rename to src/afd/sprites/front-shiny/0138-000-Omanyte.png
diff --git a/src/afd/sprites/front-shiny/0139--000--Omastar.png b/src/afd/sprites/front-shiny/0139-000-Omastar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0139--000--Omastar.png
rename to src/afd/sprites/front-shiny/0139-000-Omastar.png
diff --git a/src/afd/sprites/front-shiny/0140--000--Kabuto.png b/src/afd/sprites/front-shiny/0140-000-Kabuto.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0140--000--Kabuto.png
rename to src/afd/sprites/front-shiny/0140-000-Kabuto.png
diff --git a/src/afd/sprites/front-shiny/0141--000--Kabutops.png b/src/afd/sprites/front-shiny/0141-000-Kabutops.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0141--000--Kabutops.png
rename to src/afd/sprites/front-shiny/0141-000-Kabutops.png
diff --git a/src/afd/sprites/front-shiny/0142--420--Aerodactyl--Mega.png b/src/afd/sprites/front-shiny/0142-420-Aerodactyl-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0142--420--Aerodactyl--Mega.png
rename to src/afd/sprites/front-shiny/0142-420-Aerodactyl-Mega.png
diff --git a/src/afd/sprites/front-shiny/0143--000--Snorlax.png b/src/afd/sprites/front-shiny/0143-000-Snorlax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0143--000--Snorlax.png
rename to src/afd/sprites/front-shiny/0143-000-Snorlax.png
diff --git a/src/afd/sprites/front-shiny/0143--420--Snorlax--Gmax.png b/src/afd/sprites/front-shiny/0143-420-Snorlax-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0143--420--Snorlax--Gmax.png
rename to src/afd/sprites/front-shiny/0143-420-Snorlax-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0144--000--Articuno.png b/src/afd/sprites/front-shiny/0144-000-Articuno.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0144--000--Articuno.png
rename to src/afd/sprites/front-shiny/0144-000-Articuno.png
diff --git a/src/afd/sprites/front-shiny/0145--000--Zapdos.png b/src/afd/sprites/front-shiny/0145-000-Zapdos.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0145--000--Zapdos.png
rename to src/afd/sprites/front-shiny/0145-000-Zapdos.png
diff --git a/src/afd/sprites/front-shiny/0146--000--Moltres.png b/src/afd/sprites/front-shiny/0146-000-Moltres.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0146--000--Moltres.png
rename to src/afd/sprites/front-shiny/0146-000-Moltres.png
diff --git a/src/afd/sprites/front-shiny/0147--000--Dratini.png b/src/afd/sprites/front-shiny/0147-000-Dratini.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0147--000--Dratini.png
rename to src/afd/sprites/front-shiny/0147-000-Dratini.png
diff --git a/src/afd/sprites/front-shiny/0148--000--Dragonair.png b/src/afd/sprites/front-shiny/0148-000-Dragonair.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0148--000--Dragonair.png
rename to src/afd/sprites/front-shiny/0148-000-Dragonair.png
diff --git a/src/afd/sprites/front-shiny/0149--000--Dragonite.png b/src/afd/sprites/front-shiny/0149-000-Dragonite.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0149--000--Dragonite.png
rename to src/afd/sprites/front-shiny/0149-000-Dragonite.png
diff --git a/src/afd/sprites/front-shiny/0150--000--Mewtwo.png b/src/afd/sprites/front-shiny/0150-000-Mewtwo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0150--000--Mewtwo.png
rename to src/afd/sprites/front-shiny/0150-000-Mewtwo.png
diff --git a/src/afd/sprites/front-shiny/0150--420--Mewtwo--Mega-X.png b/src/afd/sprites/front-shiny/0150-420-Mewtwo-Mega~X.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0150--420--Mewtwo--Mega-X.png
rename to src/afd/sprites/front-shiny/0150-420-Mewtwo-Mega~X.png
diff --git a/src/afd/sprites/front-shiny/0150--420--Mewtwo--Mega-Y.png b/src/afd/sprites/front-shiny/0150-420-Mewtwo-Mega~Y.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0150--420--Mewtwo--Mega-Y.png
rename to src/afd/sprites/front-shiny/0150-420-Mewtwo-Mega~Y.png
diff --git a/src/afd/sprites/front-shiny/0151--000--Mew.png b/src/afd/sprites/front-shiny/0151-000-Mew.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0151--000--Mew.png
rename to src/afd/sprites/front-shiny/0151-000-Mew.png
diff --git a/src/afd/sprites/front-shiny/0152--000--Chikorita.png b/src/afd/sprites/front-shiny/0152-000-Chikorita.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0152--000--Chikorita.png
rename to src/afd/sprites/front-shiny/0152-000-Chikorita.png
diff --git a/src/afd/sprites/front-shiny/0153--000--Bayleef.png b/src/afd/sprites/front-shiny/0153-000-Bayleef.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0153--000--Bayleef.png
rename to src/afd/sprites/front-shiny/0153-000-Bayleef.png
diff --git a/src/afd/sprites/front-shiny/0154--000--Meganium.png b/src/afd/sprites/front-shiny/0154-000-Meganium.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0154--000--Meganium.png
rename to src/afd/sprites/front-shiny/0154-000-Meganium.png
diff --git a/src/afd/sprites/front-shiny/0155--000--Cyndaquil.png b/src/afd/sprites/front-shiny/0155-000-Cyndaquil.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0155--000--Cyndaquil.png
rename to src/afd/sprites/front-shiny/0155-000-Cyndaquil.png
diff --git a/src/afd/sprites/front-shiny/0156--000--Quilava.png b/src/afd/sprites/front-shiny/0156-000-Quilava.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0156--000--Quilava.png
rename to src/afd/sprites/front-shiny/0156-000-Quilava.png
diff --git a/src/afd/sprites/front-shiny/0157--000--Typhlosion.png b/src/afd/sprites/front-shiny/0157-000-Typhlosion.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0157--000--Typhlosion.png
rename to src/afd/sprites/front-shiny/0157-000-Typhlosion.png
diff --git a/src/afd/sprites/front-shiny/0158--000--Totodile.png b/src/afd/sprites/front-shiny/0158-000-Totodile.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0158--000--Totodile.png
rename to src/afd/sprites/front-shiny/0158-000-Totodile.png
diff --git a/src/afd/sprites/front-shiny/0159--000--Croconaw.png b/src/afd/sprites/front-shiny/0159-000-Croconaw.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0159--000--Croconaw.png
rename to src/afd/sprites/front-shiny/0159-000-Croconaw.png
diff --git a/src/afd/sprites/front-shiny/0160--000--Feraligatr.png b/src/afd/sprites/front-shiny/0160-000-Feraligatr.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0160--000--Feraligatr.png
rename to src/afd/sprites/front-shiny/0160-000-Feraligatr.png
diff --git a/src/afd/sprites/front-shiny/0161--000--Sentret.png b/src/afd/sprites/front-shiny/0161-000-Sentret.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0161--000--Sentret.png
rename to src/afd/sprites/front-shiny/0161-000-Sentret.png
diff --git a/src/afd/sprites/front-shiny/0162--000--Furret.png b/src/afd/sprites/front-shiny/0162-000-Furret.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0162--000--Furret.png
rename to src/afd/sprites/front-shiny/0162-000-Furret.png
diff --git a/src/afd/sprites/front-shiny/0163--000--Hoothoot.png b/src/afd/sprites/front-shiny/0163-000-Hoothoot.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0163--000--Hoothoot.png
rename to src/afd/sprites/front-shiny/0163-000-Hoothoot.png
diff --git a/src/afd/sprites/front-shiny/0164--000--Noctowl.png b/src/afd/sprites/front-shiny/0164-000-Noctowl.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0164--000--Noctowl.png
rename to src/afd/sprites/front-shiny/0164-000-Noctowl.png
diff --git a/src/afd/sprites/front-shiny/0165--000--Ledyba.png b/src/afd/sprites/front-shiny/0165-000-Ledyba.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0165--000--Ledyba.png
rename to src/afd/sprites/front-shiny/0165-000-Ledyba.png
diff --git a/src/afd/sprites/front-shiny/0166--000--Ledian.png b/src/afd/sprites/front-shiny/0166-000-Ledian.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0166--000--Ledian.png
rename to src/afd/sprites/front-shiny/0166-000-Ledian.png
diff --git a/src/afd/sprites/front-shiny/0167--000--Spinarak.png b/src/afd/sprites/front-shiny/0167-000-Spinarak.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0167--000--Spinarak.png
rename to src/afd/sprites/front-shiny/0167-000-Spinarak.png
diff --git a/src/afd/sprites/front-shiny/0168--000--Ariados.png b/src/afd/sprites/front-shiny/0168-000-Ariados.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0168--000--Ariados.png
rename to src/afd/sprites/front-shiny/0168-000-Ariados.png
diff --git a/src/afd/sprites/front-shiny/0169--000--Crobat.png b/src/afd/sprites/front-shiny/0169-000-Crobat.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0169--000--Crobat.png
rename to src/afd/sprites/front-shiny/0169-000-Crobat.png
diff --git a/src/afd/sprites/front-shiny/0170--000--Chinchou.png b/src/afd/sprites/front-shiny/0170-000-Chinchou.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0170--000--Chinchou.png
rename to src/afd/sprites/front-shiny/0170-000-Chinchou.png
diff --git a/src/afd/sprites/front-shiny/0171--000--Lanturn.png b/src/afd/sprites/front-shiny/0171-000-Lanturn.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0171--000--Lanturn.png
rename to src/afd/sprites/front-shiny/0171-000-Lanturn.png
diff --git a/src/afd/sprites/front-shiny/0172--000--Pichu.png b/src/afd/sprites/front-shiny/0172-000-Pichu.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0172--000--Pichu.png
rename to src/afd/sprites/front-shiny/0172-000-Pichu.png
diff --git a/src/afd/sprites/front-shiny/0173--000--Cleffa.png b/src/afd/sprites/front-shiny/0173-000-Cleffa.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0173--000--Cleffa.png
rename to src/afd/sprites/front-shiny/0173-000-Cleffa.png
diff --git a/src/afd/sprites/front-shiny/0174--000--Igglybuff.png b/src/afd/sprites/front-shiny/0174-000-Igglybuff.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0174--000--Igglybuff.png
rename to src/afd/sprites/front-shiny/0174-000-Igglybuff.png
diff --git a/src/afd/sprites/front-shiny/0175--000--Togepi.png b/src/afd/sprites/front-shiny/0175-000-Togepi.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0175--000--Togepi.png
rename to src/afd/sprites/front-shiny/0175-000-Togepi.png
diff --git a/src/afd/sprites/front-shiny/0176--000--Togetic.png b/src/afd/sprites/front-shiny/0176-000-Togetic.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0176--000--Togetic.png
rename to src/afd/sprites/front-shiny/0176-000-Togetic.png
diff --git a/src/afd/sprites/front-shiny/0177--000--Natu.png b/src/afd/sprites/front-shiny/0177-000-Natu.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0177--000--Natu.png
rename to src/afd/sprites/front-shiny/0177-000-Natu.png
diff --git a/src/afd/sprites/front-shiny/0178--000--Xatu.png b/src/afd/sprites/front-shiny/0178-000-Xatu.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0178--000--Xatu.png
rename to src/afd/sprites/front-shiny/0178-000-Xatu.png
diff --git a/src/afd/sprites/front-shiny/0179--000--Mareep.png b/src/afd/sprites/front-shiny/0179-000-Mareep.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0179--000--Mareep.png
rename to src/afd/sprites/front-shiny/0179-000-Mareep.png
diff --git a/src/afd/sprites/front-shiny/0181--000--Ampharos.png b/src/afd/sprites/front-shiny/0181-000-Ampharos.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0181--000--Ampharos.png
rename to src/afd/sprites/front-shiny/0181-000-Ampharos.png
diff --git a/src/afd/sprites/front-shiny/0181--420--Ampharos--Mega.png b/src/afd/sprites/front-shiny/0181-420-Ampharos-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0181--420--Ampharos--Mega.png
rename to src/afd/sprites/front-shiny/0181-420-Ampharos-Mega.png
diff --git a/src/afd/sprites/front-shiny/0182--000--Bellossom.png b/src/afd/sprites/front-shiny/0182-000-Bellossom.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0182--000--Bellossom.png
rename to src/afd/sprites/front-shiny/0182-000-Bellossom.png
diff --git a/src/afd/sprites/front-shiny/0183--000--Marill.png b/src/afd/sprites/front-shiny/0183-000-Marill.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0183--000--Marill.png
rename to src/afd/sprites/front-shiny/0183-000-Marill.png
diff --git a/src/afd/sprites/front-shiny/0184--000--Azumarill.png b/src/afd/sprites/front-shiny/0184-000-Azumarill.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0184--000--Azumarill.png
rename to src/afd/sprites/front-shiny/0184-000-Azumarill.png
diff --git a/src/afd/sprites/front-shiny/0185--000--Sudowoodo.png b/src/afd/sprites/front-shiny/0185-000-Sudowoodo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0185--000--Sudowoodo.png
rename to src/afd/sprites/front-shiny/0185-000-Sudowoodo.png
diff --git a/src/afd/sprites/front-shiny/0186--000--Politoed.png b/src/afd/sprites/front-shiny/0186-000-Politoed.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0186--000--Politoed.png
rename to src/afd/sprites/front-shiny/0186-000-Politoed.png
diff --git a/src/afd/sprites/front-shiny/0187--000--Hoppip.png b/src/afd/sprites/front-shiny/0187-000-Hoppip.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0187--000--Hoppip.png
rename to src/afd/sprites/front-shiny/0187-000-Hoppip.png
diff --git a/src/afd/sprites/front-shiny/0188--000--Skiploom.png b/src/afd/sprites/front-shiny/0188-000-Skiploom.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0188--000--Skiploom.png
rename to src/afd/sprites/front-shiny/0188-000-Skiploom.png
diff --git a/src/afd/sprites/front-shiny/0189--000--Jumpluff.png b/src/afd/sprites/front-shiny/0189-000-Jumpluff.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0189--000--Jumpluff.png
rename to src/afd/sprites/front-shiny/0189-000-Jumpluff.png
diff --git a/src/afd/sprites/front-shiny/0190--000--Aipom.png b/src/afd/sprites/front-shiny/0190-000-Aipom.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0190--000--Aipom.png
rename to src/afd/sprites/front-shiny/0190-000-Aipom.png
diff --git a/src/afd/sprites/front-shiny/0191--000--Sunkern.png b/src/afd/sprites/front-shiny/0191-000-Sunkern.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0191--000--Sunkern.png
rename to src/afd/sprites/front-shiny/0191-000-Sunkern.png
diff --git a/src/afd/sprites/front-shiny/0192--000--Sunflora.png b/src/afd/sprites/front-shiny/0192-000-Sunflora.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0192--000--Sunflora.png
rename to src/afd/sprites/front-shiny/0192-000-Sunflora.png
diff --git a/src/afd/sprites/front-shiny/0193--000--Yanma.png b/src/afd/sprites/front-shiny/0193-000-Yanma.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0193--000--Yanma.png
rename to src/afd/sprites/front-shiny/0193-000-Yanma.png
diff --git a/src/afd/sprites/front-shiny/0194--000--Wooper.png b/src/afd/sprites/front-shiny/0194-000-Wooper.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0194--000--Wooper.png
rename to src/afd/sprites/front-shiny/0194-000-Wooper.png
diff --git a/src/afd/sprites/front-shiny/0195--000--Quagsire.png b/src/afd/sprites/front-shiny/0195-000-Quagsire.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0195--000--Quagsire.png
rename to src/afd/sprites/front-shiny/0195-000-Quagsire.png
diff --git a/src/afd/sprites/front-shiny/0196--000--Espeon.png b/src/afd/sprites/front-shiny/0196-000-Espeon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0196--000--Espeon.png
rename to src/afd/sprites/front-shiny/0196-000-Espeon.png
diff --git a/src/afd/sprites/front-shiny/0197--000--Umbreon.png b/src/afd/sprites/front-shiny/0197-000-Umbreon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0197--000--Umbreon.png
rename to src/afd/sprites/front-shiny/0197-000-Umbreon.png
diff --git a/src/afd/sprites/front-shiny/0198--000--Murkrow.png b/src/afd/sprites/front-shiny/0198-000-Murkrow.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0198--000--Murkrow.png
rename to src/afd/sprites/front-shiny/0198-000-Murkrow.png
diff --git a/src/afd/sprites/front-shiny/0199--000--Slowking.png b/src/afd/sprites/front-shiny/0199-000-Slowking.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0199--000--Slowking.png
rename to src/afd/sprites/front-shiny/0199-000-Slowking.png
diff --git a/src/afd/sprites/front-shiny/0200--000--Misdreavus.png b/src/afd/sprites/front-shiny/0200-000-Misdreavus.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0200--000--Misdreavus.png
rename to src/afd/sprites/front-shiny/0200-000-Misdreavus.png
diff --git a/src/afd/sprites/front-shiny/0201--000--Unown.png b/src/afd/sprites/front-shiny/0201-000-Unown.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0201--000--Unown.png
rename to src/afd/sprites/front-shiny/0201-000-Unown.png
diff --git a/src/afd/sprites/front-shiny/0202--000--Wobbuffet.png b/src/afd/sprites/front-shiny/0202-000-Wobbuffet.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0202--000--Wobbuffet.png
rename to src/afd/sprites/front-shiny/0202-000-Wobbuffet.png
diff --git a/src/afd/sprites/front-shiny/0203--000--Girafarig.png b/src/afd/sprites/front-shiny/0203-000-Girafarig.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0203--000--Girafarig.png
rename to src/afd/sprites/front-shiny/0203-000-Girafarig.png
diff --git a/src/afd/sprites/front-shiny/0204--000--Pineco.png b/src/afd/sprites/front-shiny/0204-000-Pineco.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0204--000--Pineco.png
rename to src/afd/sprites/front-shiny/0204-000-Pineco.png
diff --git a/src/afd/sprites/front-shiny/0205--000--Forretress.png b/src/afd/sprites/front-shiny/0205-000-Forretress.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0205--000--Forretress.png
rename to src/afd/sprites/front-shiny/0205-000-Forretress.png
diff --git a/src/afd/sprites/front-shiny/0206--000--Dunsparce.png b/src/afd/sprites/front-shiny/0206-000-Dunsparce.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0206--000--Dunsparce.png
rename to src/afd/sprites/front-shiny/0206-000-Dunsparce.png
diff --git a/src/afd/sprites/front-shiny/0207--000--Gligar.png b/src/afd/sprites/front-shiny/0207-000-Gligar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0207--000--Gligar.png
rename to src/afd/sprites/front-shiny/0207-000-Gligar.png
diff --git a/src/afd/sprites/front-shiny/0208--000--Steelix.png b/src/afd/sprites/front-shiny/0208-000-Steelix.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0208--000--Steelix.png
rename to src/afd/sprites/front-shiny/0208-000-Steelix.png
diff --git a/src/afd/sprites/front-shiny/0208--420--Steelix--Mega.png b/src/afd/sprites/front-shiny/0208-420-Steelix-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0208--420--Steelix--Mega.png
rename to src/afd/sprites/front-shiny/0208-420-Steelix-Mega.png
diff --git a/src/afd/sprites/front-shiny/0209--000--Snubbull.png b/src/afd/sprites/front-shiny/0209-000-Snubbull.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0209--000--Snubbull.png
rename to src/afd/sprites/front-shiny/0209-000-Snubbull.png
diff --git a/src/afd/sprites/front-shiny/0210--000--Granbull.png b/src/afd/sprites/front-shiny/0210-000-Granbull.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0210--000--Granbull.png
rename to src/afd/sprites/front-shiny/0210-000-Granbull.png
diff --git a/src/afd/sprites/front-shiny/0211--000--Qwilfish.png b/src/afd/sprites/front-shiny/0211-000-Qwilfish.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0211--000--Qwilfish.png
rename to src/afd/sprites/front-shiny/0211-000-Qwilfish.png
diff --git a/src/afd/sprites/front-shiny/0212--000--Scizor.png b/src/afd/sprites/front-shiny/0212-000-Scizor.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0212--000--Scizor.png
rename to src/afd/sprites/front-shiny/0212-000-Scizor.png
diff --git a/src/afd/sprites/front-shiny/0212--420--Scizor--Mega.png b/src/afd/sprites/front-shiny/0212-420-Scizor-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0212--420--Scizor--Mega.png
rename to src/afd/sprites/front-shiny/0212-420-Scizor-Mega.png
diff --git a/src/afd/sprites/front-shiny/0213--000--Shuckle.png b/src/afd/sprites/front-shiny/0213-000-Shuckle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0213--000--Shuckle.png
rename to src/afd/sprites/front-shiny/0213-000-Shuckle.png
diff --git a/src/afd/sprites/front-shiny/0214--000--Heracross.png b/src/afd/sprites/front-shiny/0214-000-Heracross.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0214--000--Heracross.png
rename to src/afd/sprites/front-shiny/0214-000-Heracross.png
diff --git a/src/afd/sprites/front-shiny/0214--420--Heracross--Mega.png b/src/afd/sprites/front-shiny/0214-420-Heracross-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0214--420--Heracross--Mega.png
rename to src/afd/sprites/front-shiny/0214-420-Heracross-Mega.png
diff --git a/src/afd/sprites/front-shiny/0215--000--Sneasel.png b/src/afd/sprites/front-shiny/0215-000-Sneasel.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0215--000--Sneasel.png
rename to src/afd/sprites/front-shiny/0215-000-Sneasel.png
diff --git a/src/afd/sprites/front-shiny/0216--000--Teddiursa.png b/src/afd/sprites/front-shiny/0216-000-Teddiursa.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0216--000--Teddiursa.png
rename to src/afd/sprites/front-shiny/0216-000-Teddiursa.png
diff --git a/src/afd/sprites/front-shiny/0217--000--Ursaring.png b/src/afd/sprites/front-shiny/0217-000-Ursaring.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0217--000--Ursaring.png
rename to src/afd/sprites/front-shiny/0217-000-Ursaring.png
diff --git a/src/afd/sprites/front-shiny/0218--000--Slugma.png b/src/afd/sprites/front-shiny/0218-000-Slugma.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0218--000--Slugma.png
rename to src/afd/sprites/front-shiny/0218-000-Slugma.png
diff --git a/src/afd/sprites/front-shiny/0219--000--Magcargo.png b/src/afd/sprites/front-shiny/0219-000-Magcargo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0219--000--Magcargo.png
rename to src/afd/sprites/front-shiny/0219-000-Magcargo.png
diff --git a/src/afd/sprites/front-shiny/0220--000--Swinub.png b/src/afd/sprites/front-shiny/0220-000-Swinub.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0220--000--Swinub.png
rename to src/afd/sprites/front-shiny/0220-000-Swinub.png
diff --git a/src/afd/sprites/front-shiny/0221--000--Piloswine.png b/src/afd/sprites/front-shiny/0221-000-Piloswine.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0221--000--Piloswine.png
rename to src/afd/sprites/front-shiny/0221-000-Piloswine.png
diff --git a/src/afd/sprites/front-shiny/0222--000--Corsola.png b/src/afd/sprites/front-shiny/0222-000-Corsola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0222--000--Corsola.png
rename to src/afd/sprites/front-shiny/0222-000-Corsola.png
diff --git a/src/afd/sprites/front-shiny/0222--420--Corsola--Galar.png b/src/afd/sprites/front-shiny/0222-420-Corsola-Galar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0222--420--Corsola--Galar.png
rename to src/afd/sprites/front-shiny/0222-420-Corsola-Galar.png
diff --git a/src/afd/sprites/front-shiny/0223--000--Remoraid.png b/src/afd/sprites/front-shiny/0223-000-Remoraid.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0223--000--Remoraid.png
rename to src/afd/sprites/front-shiny/0223-000-Remoraid.png
diff --git a/src/afd/sprites/front-shiny/0224--000--Octillery.png b/src/afd/sprites/front-shiny/0224-000-Octillery.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0224--000--Octillery.png
rename to src/afd/sprites/front-shiny/0224-000-Octillery.png
diff --git a/src/afd/sprites/front-shiny/0225--000--Delibird.png b/src/afd/sprites/front-shiny/0225-000-Delibird.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0225--000--Delibird.png
rename to src/afd/sprites/front-shiny/0225-000-Delibird.png
diff --git a/src/afd/sprites/front-shiny/0226--000--Mantine.png b/src/afd/sprites/front-shiny/0226-000-Mantine.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0226--000--Mantine.png
rename to src/afd/sprites/front-shiny/0226-000-Mantine.png
diff --git a/src/afd/sprites/front-shiny/0227--000--Skarmory.png b/src/afd/sprites/front-shiny/0227-000-Skarmory.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0227--000--Skarmory.png
rename to src/afd/sprites/front-shiny/0227-000-Skarmory.png
diff --git a/src/afd/sprites/front-shiny/0228--000--Houndour.png b/src/afd/sprites/front-shiny/0228-000-Houndour.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0228--000--Houndour.png
rename to src/afd/sprites/front-shiny/0228-000-Houndour.png
diff --git a/src/afd/sprites/front-shiny/0229--000--Houndoom.png b/src/afd/sprites/front-shiny/0229-000-Houndoom.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0229--000--Houndoom.png
rename to src/afd/sprites/front-shiny/0229-000-Houndoom.png
diff --git a/src/afd/sprites/front-shiny/0229--420--Houndoom--Mega.png b/src/afd/sprites/front-shiny/0229-420-Houndoom-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0229--420--Houndoom--Mega.png
rename to src/afd/sprites/front-shiny/0229-420-Houndoom-Mega.png
diff --git a/src/afd/sprites/front-shiny/0231--000--Phanpy.png b/src/afd/sprites/front-shiny/0231-000-Phanpy.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0231--000--Phanpy.png
rename to src/afd/sprites/front-shiny/0231-000-Phanpy.png
diff --git a/src/afd/sprites/front-shiny/0232--000--Donphan.png b/src/afd/sprites/front-shiny/0232-000-Donphan.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0232--000--Donphan.png
rename to src/afd/sprites/front-shiny/0232-000-Donphan.png
diff --git a/src/afd/sprites/front-shiny/0233--000--Porygon2.png b/src/afd/sprites/front-shiny/0233-000-Porygon2.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0233--000--Porygon2.png
rename to src/afd/sprites/front-shiny/0233-000-Porygon2.png
diff --git a/src/afd/sprites/front-shiny/0234--000--Stantler.png b/src/afd/sprites/front-shiny/0234-000-Stantler.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0234--000--Stantler.png
rename to src/afd/sprites/front-shiny/0234-000-Stantler.png
diff --git a/src/afd/sprites/front-shiny/0235--000--Smeargle.png b/src/afd/sprites/front-shiny/0235-000-Smeargle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0235--000--Smeargle.png
rename to src/afd/sprites/front-shiny/0235-000-Smeargle.png
diff --git a/src/afd/sprites/front-shiny/0236--000--Tyrogue.png b/src/afd/sprites/front-shiny/0236-000-Tyrogue.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0236--000--Tyrogue.png
rename to src/afd/sprites/front-shiny/0236-000-Tyrogue.png
diff --git a/src/afd/sprites/front-shiny/0237--000--Hitmontop.png b/src/afd/sprites/front-shiny/0237-000-Hitmontop.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0237--000--Hitmontop.png
rename to src/afd/sprites/front-shiny/0237-000-Hitmontop.png
diff --git a/src/afd/sprites/front-shiny/0238--000--Smoochum.png b/src/afd/sprites/front-shiny/0238-000-Smoochum.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0238--000--Smoochum.png
rename to src/afd/sprites/front-shiny/0238-000-Smoochum.png
diff --git a/src/afd/sprites/front-shiny/0239--000--Elekid.png b/src/afd/sprites/front-shiny/0239-000-Elekid.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0239--000--Elekid.png
rename to src/afd/sprites/front-shiny/0239-000-Elekid.png
diff --git a/src/afd/sprites/front-shiny/0240--000--Magby.png b/src/afd/sprites/front-shiny/0240-000-Magby.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0240--000--Magby.png
rename to src/afd/sprites/front-shiny/0240-000-Magby.png
diff --git a/src/afd/sprites/front-shiny/0241--000--Miltank.png b/src/afd/sprites/front-shiny/0241-000-Miltank.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0241--000--Miltank.png
rename to src/afd/sprites/front-shiny/0241-000-Miltank.png
diff --git a/src/afd/sprites/front-shiny/0242--000--Blissey.png b/src/afd/sprites/front-shiny/0242-000-Blissey.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0242--000--Blissey.png
rename to src/afd/sprites/front-shiny/0242-000-Blissey.png
diff --git a/src/afd/sprites/front-shiny/0243--000--Raikou.png b/src/afd/sprites/front-shiny/0243-000-Raikou.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0243--000--Raikou.png
rename to src/afd/sprites/front-shiny/0243-000-Raikou.png
diff --git a/src/afd/sprites/front-shiny/0244--000--Entei.png b/src/afd/sprites/front-shiny/0244-000-Entei.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0244--000--Entei.png
rename to src/afd/sprites/front-shiny/0244-000-Entei.png
diff --git a/src/afd/sprites/front-shiny/0245--000--Suicune.png b/src/afd/sprites/front-shiny/0245-000-Suicune.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0245--000--Suicune.png
rename to src/afd/sprites/front-shiny/0245-000-Suicune.png
diff --git a/src/afd/sprites/front-shiny/0246--000--Larvitar.png b/src/afd/sprites/front-shiny/0246-000-Larvitar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0246--000--Larvitar.png
rename to src/afd/sprites/front-shiny/0246-000-Larvitar.png
diff --git a/src/afd/sprites/front-shiny/0247--000--Pupitar.png b/src/afd/sprites/front-shiny/0247-000-Pupitar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0247--000--Pupitar.png
rename to src/afd/sprites/front-shiny/0247-000-Pupitar.png
diff --git a/src/afd/sprites/front-shiny/0248--000--Tyranitar.png b/src/afd/sprites/front-shiny/0248-000-Tyranitar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0248--000--Tyranitar.png
rename to src/afd/sprites/front-shiny/0248-000-Tyranitar.png
diff --git a/src/afd/sprites/front-shiny/0248--420--Tyranitar--Mega.png b/src/afd/sprites/front-shiny/0248-420-Tyranitar-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0248--420--Tyranitar--Mega.png
rename to src/afd/sprites/front-shiny/0248-420-Tyranitar-Mega.png
diff --git a/src/afd/sprites/front-shiny/0249--000--Lugia.png b/src/afd/sprites/front-shiny/0249-000-Lugia.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0249--000--Lugia.png
rename to src/afd/sprites/front-shiny/0249-000-Lugia.png
diff --git a/src/afd/sprites/front-shiny/0250--000--Ho-Oh.png b/src/afd/sprites/front-shiny/0250-000-Ho~Oh.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0250--000--Ho-Oh.png
rename to src/afd/sprites/front-shiny/0250-000-Ho~Oh.png
diff --git a/src/afd/sprites/front-shiny/0251--000--Celebi.gif b/src/afd/sprites/front-shiny/0251-000-Celebi.gif
similarity index 100%
rename from src/afd/sprites/front-shiny/0251--000--Celebi.gif
rename to src/afd/sprites/front-shiny/0251-000-Celebi.gif
diff --git a/src/afd/sprites/front-shiny/0252--000--Treecko.png b/src/afd/sprites/front-shiny/0252-000-Treecko.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0252--000--Treecko.png
rename to src/afd/sprites/front-shiny/0252-000-Treecko.png
diff --git a/src/afd/sprites/front-shiny/0253--000--Grovyle.png b/src/afd/sprites/front-shiny/0253-000-Grovyle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0253--000--Grovyle.png
rename to src/afd/sprites/front-shiny/0253-000-Grovyle.png
diff --git a/src/afd/sprites/front-shiny/0254--000--Sceptile.png b/src/afd/sprites/front-shiny/0254-000-Sceptile.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0254--000--Sceptile.png
rename to src/afd/sprites/front-shiny/0254-000-Sceptile.png
diff --git a/src/afd/sprites/front-shiny/0254--420--Sceptile--Mega.gif b/src/afd/sprites/front-shiny/0254-420-Sceptile-Mega.gif
similarity index 100%
rename from src/afd/sprites/front-shiny/0254--420--Sceptile--Mega.gif
rename to src/afd/sprites/front-shiny/0254-420-Sceptile-Mega.gif
diff --git a/src/afd/sprites/front-shiny/0255--000--Torchic.png b/src/afd/sprites/front-shiny/0255-000-Torchic.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0255--000--Torchic.png
rename to src/afd/sprites/front-shiny/0255-000-Torchic.png
diff --git a/src/afd/sprites/front-shiny/0256--000--Combusken.png b/src/afd/sprites/front-shiny/0256-000-Combusken.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0256--000--Combusken.png
rename to src/afd/sprites/front-shiny/0256-000-Combusken.png
diff --git a/src/afd/sprites/front-shiny/0257--000--Blaziken.png b/src/afd/sprites/front-shiny/0257-000-Blaziken.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0257--000--Blaziken.png
rename to src/afd/sprites/front-shiny/0257-000-Blaziken.png
diff --git a/src/afd/sprites/front-shiny/0257--420--Blaziken--Mega.png b/src/afd/sprites/front-shiny/0257-420-Blaziken-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0257--420--Blaziken--Mega.png
rename to src/afd/sprites/front-shiny/0257-420-Blaziken-Mega.png
diff --git a/src/afd/sprites/front-shiny/0258--000--Mudkip.png b/src/afd/sprites/front-shiny/0258-000-Mudkip.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0258--000--Mudkip.png
rename to src/afd/sprites/front-shiny/0258-000-Mudkip.png
diff --git a/src/afd/sprites/front-shiny/0259--000--Marshtomp.png b/src/afd/sprites/front-shiny/0259-000-Marshtomp.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0259--000--Marshtomp.png
rename to src/afd/sprites/front-shiny/0259-000-Marshtomp.png
diff --git a/src/afd/sprites/front-shiny/0260--000--Swampert.png b/src/afd/sprites/front-shiny/0260-000-Swampert.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0260--000--Swampert.png
rename to src/afd/sprites/front-shiny/0260-000-Swampert.png
diff --git a/src/afd/sprites/front-shiny/0260--420--Swampert--Mega.png b/src/afd/sprites/front-shiny/0260-420-Swampert-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0260--420--Swampert--Mega.png
rename to src/afd/sprites/front-shiny/0260-420-Swampert-Mega.png
diff --git a/src/afd/sprites/front-shiny/0261--000--Poochyena.png b/src/afd/sprites/front-shiny/0261-000-Poochyena.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0261--000--Poochyena.png
rename to src/afd/sprites/front-shiny/0261-000-Poochyena.png
diff --git a/src/afd/sprites/front-shiny/0262--000--Mightyena.png b/src/afd/sprites/front-shiny/0262-000-Mightyena.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0262--000--Mightyena.png
rename to src/afd/sprites/front-shiny/0262-000-Mightyena.png
diff --git a/src/afd/sprites/front-shiny/0263--000--Zigzagoon.png b/src/afd/sprites/front-shiny/0263-000-Zigzagoon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0263--000--Zigzagoon.png
rename to src/afd/sprites/front-shiny/0263-000-Zigzagoon.png
diff --git a/src/afd/sprites/front-shiny/0263--420--Zigzagoon--Galar.png b/src/afd/sprites/front-shiny/0263-420-Zigzagoon-Galar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0263--420--Zigzagoon--Galar.png
rename to src/afd/sprites/front-shiny/0263-420-Zigzagoon-Galar.png
diff --git a/src/afd/sprites/front-shiny/0264--000--Linoone.png b/src/afd/sprites/front-shiny/0264-000-Linoone.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0264--000--Linoone.png
rename to src/afd/sprites/front-shiny/0264-000-Linoone.png
diff --git a/src/afd/sprites/front-shiny/0264--420--Linoone--Galar.png b/src/afd/sprites/front-shiny/0264-420-Linoone-Galar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0264--420--Linoone--Galar.png
rename to src/afd/sprites/front-shiny/0264-420-Linoone-Galar.png
diff --git a/src/afd/sprites/front-shiny/0265--000--Wurmple.png b/src/afd/sprites/front-shiny/0265-000-Wurmple.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0265--000--Wurmple.png
rename to src/afd/sprites/front-shiny/0265-000-Wurmple.png
diff --git a/src/afd/sprites/front-shiny/0266--000--Silcoon.png b/src/afd/sprites/front-shiny/0266-000-Silcoon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0266--000--Silcoon.png
rename to src/afd/sprites/front-shiny/0266-000-Silcoon.png
diff --git a/src/afd/sprites/front-shiny/0267--000--Beautifly.png b/src/afd/sprites/front-shiny/0267-000-Beautifly.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0267--000--Beautifly.png
rename to src/afd/sprites/front-shiny/0267-000-Beautifly.png
diff --git a/src/afd/sprites/front-shiny/0268--000--Cascoon.png b/src/afd/sprites/front-shiny/0268-000-Cascoon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0268--000--Cascoon.png
rename to src/afd/sprites/front-shiny/0268-000-Cascoon.png
diff --git a/src/afd/sprites/front-shiny/0269--000--Dustox.png b/src/afd/sprites/front-shiny/0269-000-Dustox.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0269--000--Dustox.png
rename to src/afd/sprites/front-shiny/0269-000-Dustox.png
diff --git a/src/afd/sprites/front-shiny/0270--000--Lotad.png b/src/afd/sprites/front-shiny/0270-000-Lotad.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0270--000--Lotad.png
rename to src/afd/sprites/front-shiny/0270-000-Lotad.png
diff --git a/src/afd/sprites/front-shiny/0271--000--Lombre.png b/src/afd/sprites/front-shiny/0271-000-Lombre.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0271--000--Lombre.png
rename to src/afd/sprites/front-shiny/0271-000-Lombre.png
diff --git a/src/afd/sprites/front-shiny/0272--000--Ludicolo.png b/src/afd/sprites/front-shiny/0272-000-Ludicolo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0272--000--Ludicolo.png
rename to src/afd/sprites/front-shiny/0272-000-Ludicolo.png
diff --git a/src/afd/sprites/front-shiny/0273--000--Seedot.png b/src/afd/sprites/front-shiny/0273-000-Seedot.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0273--000--Seedot.png
rename to src/afd/sprites/front-shiny/0273-000-Seedot.png
diff --git a/src/afd/sprites/front-shiny/0274--000--Nuzleaf.png b/src/afd/sprites/front-shiny/0274-000-Nuzleaf.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0274--000--Nuzleaf.png
rename to src/afd/sprites/front-shiny/0274-000-Nuzleaf.png
diff --git a/src/afd/sprites/front-shiny/0275--000--Shiftry.png b/src/afd/sprites/front-shiny/0275-000-Shiftry.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0275--000--Shiftry.png
rename to src/afd/sprites/front-shiny/0275-000-Shiftry.png
diff --git a/src/afd/sprites/front-shiny/0276--000--Taillow.png b/src/afd/sprites/front-shiny/0276-000-Taillow.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0276--000--Taillow.png
rename to src/afd/sprites/front-shiny/0276-000-Taillow.png
diff --git a/src/afd/sprites/front-shiny/0277--000--Swellow.png b/src/afd/sprites/front-shiny/0277-000-Swellow.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0277--000--Swellow.png
rename to src/afd/sprites/front-shiny/0277-000-Swellow.png
diff --git a/src/afd/sprites/front-shiny/0278--000--Wingull.png b/src/afd/sprites/front-shiny/0278-000-Wingull.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0278--000--Wingull.png
rename to src/afd/sprites/front-shiny/0278-000-Wingull.png
diff --git a/src/afd/sprites/front-shiny/0279--000--Pelipper.png b/src/afd/sprites/front-shiny/0279-000-Pelipper.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0279--000--Pelipper.png
rename to src/afd/sprites/front-shiny/0279-000-Pelipper.png
diff --git a/src/afd/sprites/front-shiny/0280--000--Ralts.png b/src/afd/sprites/front-shiny/0280-000-Ralts.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0280--000--Ralts.png
rename to src/afd/sprites/front-shiny/0280-000-Ralts.png
diff --git a/src/afd/sprites/front-shiny/0281--000--Kirlia.png b/src/afd/sprites/front-shiny/0281-000-Kirlia.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0281--000--Kirlia.png
rename to src/afd/sprites/front-shiny/0281-000-Kirlia.png
diff --git a/src/afd/sprites/front-shiny/0282--000--Gardevoir.png b/src/afd/sprites/front-shiny/0282-000-Gardevoir.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0282--000--Gardevoir.png
rename to src/afd/sprites/front-shiny/0282-000-Gardevoir.png
diff --git a/src/afd/sprites/front-shiny/0282--420--Gardevoir--Mega.png b/src/afd/sprites/front-shiny/0282-420-Gardevoir-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0282--420--Gardevoir--Mega.png
rename to src/afd/sprites/front-shiny/0282-420-Gardevoir-Mega.png
diff --git a/src/afd/sprites/front-shiny/0283--000--Surskit.png b/src/afd/sprites/front-shiny/0283-000-Surskit.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0283--000--Surskit.png
rename to src/afd/sprites/front-shiny/0283-000-Surskit.png
diff --git a/src/afd/sprites/front-shiny/0284--000--Masquerain.png b/src/afd/sprites/front-shiny/0284-000-Masquerain.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0284--000--Masquerain.png
rename to src/afd/sprites/front-shiny/0284-000-Masquerain.png
diff --git a/src/afd/sprites/front-shiny/0285--000--Shroomish.png b/src/afd/sprites/front-shiny/0285-000-Shroomish.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0285--000--Shroomish.png
rename to src/afd/sprites/front-shiny/0285-000-Shroomish.png
diff --git a/src/afd/sprites/front-shiny/0286--000--Breloom.png b/src/afd/sprites/front-shiny/0286-000-Breloom.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0286--000--Breloom.png
rename to src/afd/sprites/front-shiny/0286-000-Breloom.png
diff --git a/src/afd/sprites/front-shiny/0287--000--Slakoth.png b/src/afd/sprites/front-shiny/0287-000-Slakoth.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0287--000--Slakoth.png
rename to src/afd/sprites/front-shiny/0287-000-Slakoth.png
diff --git a/src/afd/sprites/front-shiny/0288--000--Vigoroth.png b/src/afd/sprites/front-shiny/0288-000-Vigoroth.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0288--000--Vigoroth.png
rename to src/afd/sprites/front-shiny/0288-000-Vigoroth.png
diff --git a/src/afd/sprites/front-shiny/0289--000--Slaking.png b/src/afd/sprites/front-shiny/0289-000-Slaking.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0289--000--Slaking.png
rename to src/afd/sprites/front-shiny/0289-000-Slaking.png
diff --git a/src/afd/sprites/front-shiny/0290--000--Nincada.png b/src/afd/sprites/front-shiny/0290-000-Nincada.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0290--000--Nincada.png
rename to src/afd/sprites/front-shiny/0290-000-Nincada.png
diff --git a/src/afd/sprites/front-shiny/0291--000--Ninjask.png b/src/afd/sprites/front-shiny/0291-000-Ninjask.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0291--000--Ninjask.png
rename to src/afd/sprites/front-shiny/0291-000-Ninjask.png
diff --git a/src/afd/sprites/front-shiny/0292--000--Shedinja.png b/src/afd/sprites/front-shiny/0292-000-Shedinja.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0292--000--Shedinja.png
rename to src/afd/sprites/front-shiny/0292-000-Shedinja.png
diff --git a/src/afd/sprites/front-shiny/0293--000--Whismur.png b/src/afd/sprites/front-shiny/0293-000-Whismur.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0293--000--Whismur.png
rename to src/afd/sprites/front-shiny/0293-000-Whismur.png
diff --git a/src/afd/sprites/front-shiny/0294--000--Loudred.png b/src/afd/sprites/front-shiny/0294-000-Loudred.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0294--000--Loudred.png
rename to src/afd/sprites/front-shiny/0294-000-Loudred.png
diff --git a/src/afd/sprites/front-shiny/0295--000--Exploud.png b/src/afd/sprites/front-shiny/0295-000-Exploud.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0295--000--Exploud.png
rename to src/afd/sprites/front-shiny/0295-000-Exploud.png
diff --git a/src/afd/sprites/front-shiny/0296--000--Makuhita.png b/src/afd/sprites/front-shiny/0296-000-Makuhita.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0296--000--Makuhita.png
rename to src/afd/sprites/front-shiny/0296-000-Makuhita.png
diff --git a/src/afd/sprites/front-shiny/0297--000--Hariyama.png b/src/afd/sprites/front-shiny/0297-000-Hariyama.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0297--000--Hariyama.png
rename to src/afd/sprites/front-shiny/0297-000-Hariyama.png
diff --git a/src/afd/sprites/front-shiny/0298--000--Azurill.png b/src/afd/sprites/front-shiny/0298-000-Azurill.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0298--000--Azurill.png
rename to src/afd/sprites/front-shiny/0298-000-Azurill.png
diff --git a/src/afd/sprites/front-shiny/0299--000--Nosepass.png b/src/afd/sprites/front-shiny/0299-000-Nosepass.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0299--000--Nosepass.png
rename to src/afd/sprites/front-shiny/0299-000-Nosepass.png
diff --git a/src/afd/sprites/front-shiny/0300--000--Skitty.png b/src/afd/sprites/front-shiny/0300-000-Skitty.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0300--000--Skitty.png
rename to src/afd/sprites/front-shiny/0300-000-Skitty.png
diff --git a/src/afd/sprites/front-shiny/0301--000--Delcatty.png b/src/afd/sprites/front-shiny/0301-000-Delcatty.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0301--000--Delcatty.png
rename to src/afd/sprites/front-shiny/0301-000-Delcatty.png
diff --git a/src/afd/sprites/front-shiny/0302--000--Sableye.png b/src/afd/sprites/front-shiny/0302-000-Sableye.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0302--000--Sableye.png
rename to src/afd/sprites/front-shiny/0302-000-Sableye.png
diff --git a/src/afd/sprites/front-shiny/0302--420--Sableye--Mega.png b/src/afd/sprites/front-shiny/0302-420-Sableye-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0302--420--Sableye--Mega.png
rename to src/afd/sprites/front-shiny/0302-420-Sableye-Mega.png
diff --git a/src/afd/sprites/front-shiny/0303--000--Mawile.png b/src/afd/sprites/front-shiny/0303-000-Mawile.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0303--000--Mawile.png
rename to src/afd/sprites/front-shiny/0303-000-Mawile.png
diff --git a/src/afd/sprites/front-shiny/0303--420--Mawile--Mega.png b/src/afd/sprites/front-shiny/0303-420-Mawile-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0303--420--Mawile--Mega.png
rename to src/afd/sprites/front-shiny/0303-420-Mawile-Mega.png
diff --git a/src/afd/sprites/front-shiny/0304--000--Aron.png b/src/afd/sprites/front-shiny/0304-000-Aron.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0304--000--Aron.png
rename to src/afd/sprites/front-shiny/0304-000-Aron.png
diff --git a/src/afd/sprites/front-shiny/0305--000--Lairon.png b/src/afd/sprites/front-shiny/0305-000-Lairon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0305--000--Lairon.png
rename to src/afd/sprites/front-shiny/0305-000-Lairon.png
diff --git a/src/afd/sprites/front-shiny/0306--000--Aggron.png b/src/afd/sprites/front-shiny/0306-000-Aggron.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0306--000--Aggron.png
rename to src/afd/sprites/front-shiny/0306-000-Aggron.png
diff --git a/src/afd/sprites/front-shiny/0306--420--Aggron--Mega.png b/src/afd/sprites/front-shiny/0306-420-Aggron-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0306--420--Aggron--Mega.png
rename to src/afd/sprites/front-shiny/0306-420-Aggron-Mega.png
diff --git a/src/afd/sprites/front-shiny/0307--000--Meditite.png b/src/afd/sprites/front-shiny/0307-000-Meditite.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0307--000--Meditite.png
rename to src/afd/sprites/front-shiny/0307-000-Meditite.png
diff --git a/src/afd/sprites/front-shiny/0308--000--Medicham.png b/src/afd/sprites/front-shiny/0308-000-Medicham.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0308--000--Medicham.png
rename to src/afd/sprites/front-shiny/0308-000-Medicham.png
diff --git a/src/afd/sprites/front-shiny/0308--420--Medicham--Mega.png b/src/afd/sprites/front-shiny/0308-420-Medicham-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0308--420--Medicham--Mega.png
rename to src/afd/sprites/front-shiny/0308-420-Medicham-Mega.png
diff --git a/src/afd/sprites/front-shiny/0309--000--Electrike.png b/src/afd/sprites/front-shiny/0309-000-Electrike.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0309--000--Electrike.png
rename to src/afd/sprites/front-shiny/0309-000-Electrike.png
diff --git a/src/afd/sprites/front-shiny/0310--000--Manectric.png b/src/afd/sprites/front-shiny/0310-000-Manectric.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0310--000--Manectric.png
rename to src/afd/sprites/front-shiny/0310-000-Manectric.png
diff --git a/src/afd/sprites/front-shiny/0310--420--Manectric--Mega.png b/src/afd/sprites/front-shiny/0310-420-Manectric-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0310--420--Manectric--Mega.png
rename to src/afd/sprites/front-shiny/0310-420-Manectric-Mega.png
diff --git a/src/afd/sprites/front-shiny/0311--000--Plusle.png b/src/afd/sprites/front-shiny/0311-000-Plusle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0311--000--Plusle.png
rename to src/afd/sprites/front-shiny/0311-000-Plusle.png
diff --git a/src/afd/sprites/front-shiny/0312--000--Minun.png b/src/afd/sprites/front-shiny/0312-000-Minun.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0312--000--Minun.png
rename to src/afd/sprites/front-shiny/0312-000-Minun.png
diff --git a/src/afd/sprites/front-shiny/0313--000--Volbeat.png b/src/afd/sprites/front-shiny/0313-000-Volbeat.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0313--000--Volbeat.png
rename to src/afd/sprites/front-shiny/0313-000-Volbeat.png
diff --git a/src/afd/sprites/front-shiny/0314--000--Illumise.png b/src/afd/sprites/front-shiny/0314-000-Illumise.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0314--000--Illumise.png
rename to src/afd/sprites/front-shiny/0314-000-Illumise.png
diff --git a/src/afd/sprites/front-shiny/0315--000--Roselia.png b/src/afd/sprites/front-shiny/0315-000-Roselia.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0315--000--Roselia.png
rename to src/afd/sprites/front-shiny/0315-000-Roselia.png
diff --git a/src/afd/sprites/front-shiny/0316--000--Gulpin.png b/src/afd/sprites/front-shiny/0316-000-Gulpin.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0316--000--Gulpin.png
rename to src/afd/sprites/front-shiny/0316-000-Gulpin.png
diff --git a/src/afd/sprites/front-shiny/0317--000--Swalot.png b/src/afd/sprites/front-shiny/0317-000-Swalot.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0317--000--Swalot.png
rename to src/afd/sprites/front-shiny/0317-000-Swalot.png
diff --git a/src/afd/sprites/front-shiny/0318--000--Carvanha.png b/src/afd/sprites/front-shiny/0318-000-Carvanha.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0318--000--Carvanha.png
rename to src/afd/sprites/front-shiny/0318-000-Carvanha.png
diff --git a/src/afd/sprites/front-shiny/0319--000--Sharpedo.png b/src/afd/sprites/front-shiny/0319-000-Sharpedo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0319--000--Sharpedo.png
rename to src/afd/sprites/front-shiny/0319-000-Sharpedo.png
diff --git a/src/afd/sprites/front-shiny/0319--420--Sharpedo--Mega.png b/src/afd/sprites/front-shiny/0319-420-Sharpedo-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0319--420--Sharpedo--Mega.png
rename to src/afd/sprites/front-shiny/0319-420-Sharpedo-Mega.png
diff --git a/src/afd/sprites/front-shiny/0320--000--Wailmer.png b/src/afd/sprites/front-shiny/0320-000-Wailmer.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0320--000--Wailmer.png
rename to src/afd/sprites/front-shiny/0320-000-Wailmer.png
diff --git a/src/afd/sprites/front-shiny/0321--000--Wailord.png b/src/afd/sprites/front-shiny/0321-000-Wailord.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0321--000--Wailord.png
rename to src/afd/sprites/front-shiny/0321-000-Wailord.png
diff --git a/src/afd/sprites/front-shiny/0322--000--Numel.png b/src/afd/sprites/front-shiny/0322-000-Numel.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0322--000--Numel.png
rename to src/afd/sprites/front-shiny/0322-000-Numel.png
diff --git a/src/afd/sprites/front-shiny/0323--000--Camerupt.png b/src/afd/sprites/front-shiny/0323-000-Camerupt.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0323--000--Camerupt.png
rename to src/afd/sprites/front-shiny/0323-000-Camerupt.png
diff --git a/src/afd/sprites/front-shiny/0323--420--Camerupt--Mega.png b/src/afd/sprites/front-shiny/0323-420-Camerupt-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0323--420--Camerupt--Mega.png
rename to src/afd/sprites/front-shiny/0323-420-Camerupt-Mega.png
diff --git a/src/afd/sprites/front-shiny/0324--000--Torkoal.png b/src/afd/sprites/front-shiny/0324-000-Torkoal.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0324--000--Torkoal.png
rename to src/afd/sprites/front-shiny/0324-000-Torkoal.png
diff --git a/src/afd/sprites/front-shiny/0325--000--Spoink.png b/src/afd/sprites/front-shiny/0325-000-Spoink.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0325--000--Spoink.png
rename to src/afd/sprites/front-shiny/0325-000-Spoink.png
diff --git a/src/afd/sprites/front-shiny/0326--000--Grumpig.png b/src/afd/sprites/front-shiny/0326-000-Grumpig.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0326--000--Grumpig.png
rename to src/afd/sprites/front-shiny/0326-000-Grumpig.png
diff --git a/src/afd/sprites/front-shiny/0327--000--Spinda.png b/src/afd/sprites/front-shiny/0327-000-Spinda.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0327--000--Spinda.png
rename to src/afd/sprites/front-shiny/0327-000-Spinda.png
diff --git a/src/afd/sprites/front-shiny/0328--000--Trapinch.png b/src/afd/sprites/front-shiny/0328-000-Trapinch.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0328--000--Trapinch.png
rename to src/afd/sprites/front-shiny/0328-000-Trapinch.png
diff --git a/src/afd/sprites/front-shiny/0329--000--Vibrava.png b/src/afd/sprites/front-shiny/0329-000-Vibrava.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0329--000--Vibrava.png
rename to src/afd/sprites/front-shiny/0329-000-Vibrava.png
diff --git a/src/afd/sprites/front-shiny/0330--000--Flygon.png b/src/afd/sprites/front-shiny/0330-000-Flygon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0330--000--Flygon.png
rename to src/afd/sprites/front-shiny/0330-000-Flygon.png
diff --git a/src/afd/sprites/front-shiny/0331--000--Cacnea.png b/src/afd/sprites/front-shiny/0331-000-Cacnea.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0331--000--Cacnea.png
rename to src/afd/sprites/front-shiny/0331-000-Cacnea.png
diff --git a/src/afd/sprites/front-shiny/0332--000--Cacturne.png b/src/afd/sprites/front-shiny/0332-000-Cacturne.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0332--000--Cacturne.png
rename to src/afd/sprites/front-shiny/0332-000-Cacturne.png
diff --git a/src/afd/sprites/front-shiny/0333--000--Swablu.png b/src/afd/sprites/front-shiny/0333-000-Swablu.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0333--000--Swablu.png
rename to src/afd/sprites/front-shiny/0333-000-Swablu.png
diff --git a/src/afd/sprites/front-shiny/0334--000--Altaria.png b/src/afd/sprites/front-shiny/0334-000-Altaria.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0334--000--Altaria.png
rename to src/afd/sprites/front-shiny/0334-000-Altaria.png
diff --git a/src/afd/sprites/front-shiny/0334--420--Altaria--Mega.png b/src/afd/sprites/front-shiny/0334-420-Altaria-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0334--420--Altaria--Mega.png
rename to src/afd/sprites/front-shiny/0334-420-Altaria-Mega.png
diff --git a/src/afd/sprites/front-shiny/0335--000--Zangoose.png b/src/afd/sprites/front-shiny/0335-000-Zangoose.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0335--000--Zangoose.png
rename to src/afd/sprites/front-shiny/0335-000-Zangoose.png
diff --git a/src/afd/sprites/front-shiny/0336--000--Seviper.png b/src/afd/sprites/front-shiny/0336-000-Seviper.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0336--000--Seviper.png
rename to src/afd/sprites/front-shiny/0336-000-Seviper.png
diff --git a/src/afd/sprites/front-shiny/0337--000--Lunatone.png b/src/afd/sprites/front-shiny/0337-000-Lunatone.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0337--000--Lunatone.png
rename to src/afd/sprites/front-shiny/0337-000-Lunatone.png
diff --git a/src/afd/sprites/front-shiny/0338--000--Solrock.png b/src/afd/sprites/front-shiny/0338-000-Solrock.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0338--000--Solrock.png
rename to src/afd/sprites/front-shiny/0338-000-Solrock.png
diff --git a/src/afd/sprites/front-shiny/0339--000--Barboach.png b/src/afd/sprites/front-shiny/0339-000-Barboach.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0339--000--Barboach.png
rename to src/afd/sprites/front-shiny/0339-000-Barboach.png
diff --git a/src/afd/sprites/front-shiny/0340--000--Whiscash.png b/src/afd/sprites/front-shiny/0340-000-Whiscash.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0340--000--Whiscash.png
rename to src/afd/sprites/front-shiny/0340-000-Whiscash.png
diff --git a/src/afd/sprites/front-shiny/0341--000--Corphish.png b/src/afd/sprites/front-shiny/0341-000-Corphish.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0341--000--Corphish.png
rename to src/afd/sprites/front-shiny/0341-000-Corphish.png
diff --git a/src/afd/sprites/front-shiny/0342--000--Crawdaunt.png b/src/afd/sprites/front-shiny/0342-000-Crawdaunt.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0342--000--Crawdaunt.png
rename to src/afd/sprites/front-shiny/0342-000-Crawdaunt.png
diff --git a/src/afd/sprites/front-shiny/0343--000--Baltoy.png b/src/afd/sprites/front-shiny/0343-000-Baltoy.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0343--000--Baltoy.png
rename to src/afd/sprites/front-shiny/0343-000-Baltoy.png
diff --git a/src/afd/sprites/front-shiny/0344--000--Claydol.png b/src/afd/sprites/front-shiny/0344-000-Claydol.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0344--000--Claydol.png
rename to src/afd/sprites/front-shiny/0344-000-Claydol.png
diff --git a/src/afd/sprites/front-shiny/0345--000--Lileep.png b/src/afd/sprites/front-shiny/0345-000-Lileep.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0345--000--Lileep.png
rename to src/afd/sprites/front-shiny/0345-000-Lileep.png
diff --git a/src/afd/sprites/front-shiny/0346--000--Cradily.png b/src/afd/sprites/front-shiny/0346-000-Cradily.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0346--000--Cradily.png
rename to src/afd/sprites/front-shiny/0346-000-Cradily.png
diff --git a/src/afd/sprites/front-shiny/0347--000--Anorith.png b/src/afd/sprites/front-shiny/0347-000-Anorith.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0347--000--Anorith.png
rename to src/afd/sprites/front-shiny/0347-000-Anorith.png
diff --git a/src/afd/sprites/front-shiny/0348--000--Armaldo.png b/src/afd/sprites/front-shiny/0348-000-Armaldo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0348--000--Armaldo.png
rename to src/afd/sprites/front-shiny/0348-000-Armaldo.png
diff --git a/src/afd/sprites/front-shiny/0349--000--Feebas.png b/src/afd/sprites/front-shiny/0349-000-Feebas.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0349--000--Feebas.png
rename to src/afd/sprites/front-shiny/0349-000-Feebas.png
diff --git a/src/afd/sprites/front-shiny/0350--000--Milotic.png b/src/afd/sprites/front-shiny/0350-000-Milotic.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0350--000--Milotic.png
rename to src/afd/sprites/front-shiny/0350-000-Milotic.png
diff --git a/src/afd/sprites/front-shiny/0351--000--Castform.png b/src/afd/sprites/front-shiny/0351-000-Castform.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0351--000--Castform.png
rename to src/afd/sprites/front-shiny/0351-000-Castform.png
diff --git a/src/afd/sprites/front-shiny/0351--420--Castform--Rainy.png b/src/afd/sprites/front-shiny/0351-420-Castform-Rainy.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0351--420--Castform--Rainy.png
rename to src/afd/sprites/front-shiny/0351-420-Castform-Rainy.png
diff --git a/src/afd/sprites/front-shiny/0351--420--Castform--Snowy.png b/src/afd/sprites/front-shiny/0351-420-Castform-Snowy.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0351--420--Castform--Snowy.png
rename to src/afd/sprites/front-shiny/0351-420-Castform-Snowy.png
diff --git a/src/afd/sprites/front-shiny/0351--420--Castform--Sunny.png b/src/afd/sprites/front-shiny/0351-420-Castform-Sunny.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0351--420--Castform--Sunny.png
rename to src/afd/sprites/front-shiny/0351-420-Castform-Sunny.png
diff --git a/src/afd/sprites/front-shiny/0352--000--Kecleon.png b/src/afd/sprites/front-shiny/0352-000-Kecleon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0352--000--Kecleon.png
rename to src/afd/sprites/front-shiny/0352-000-Kecleon.png
diff --git a/src/afd/sprites/front-shiny/0353--000--Shuppet.png b/src/afd/sprites/front-shiny/0353-000-Shuppet.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0353--000--Shuppet.png
rename to src/afd/sprites/front-shiny/0353-000-Shuppet.png
diff --git a/src/afd/sprites/front-shiny/0354--000--Banette.png b/src/afd/sprites/front-shiny/0354-000-Banette.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0354--000--Banette.png
rename to src/afd/sprites/front-shiny/0354-000-Banette.png
diff --git a/src/afd/sprites/front-shiny/0354--420--Banette--Mega.png b/src/afd/sprites/front-shiny/0354-420-Banette-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0354--420--Banette--Mega.png
rename to src/afd/sprites/front-shiny/0354-420-Banette-Mega.png
diff --git a/src/afd/sprites/front-shiny/0355--000--Duskull.png b/src/afd/sprites/front-shiny/0355-000-Duskull.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0355--000--Duskull.png
rename to src/afd/sprites/front-shiny/0355-000-Duskull.png
diff --git a/src/afd/sprites/front-shiny/0356--000--Dusclops.png b/src/afd/sprites/front-shiny/0356-000-Dusclops.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0356--000--Dusclops.png
rename to src/afd/sprites/front-shiny/0356-000-Dusclops.png
diff --git a/src/afd/sprites/front-shiny/0357--000--Tropius.png b/src/afd/sprites/front-shiny/0357-000-Tropius.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0357--000--Tropius.png
rename to src/afd/sprites/front-shiny/0357-000-Tropius.png
diff --git a/src/afd/sprites/front-shiny/0358--000--Chimecho.png b/src/afd/sprites/front-shiny/0358-000-Chimecho.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0358--000--Chimecho.png
rename to src/afd/sprites/front-shiny/0358-000-Chimecho.png
diff --git a/src/afd/sprites/front-shiny/0359--000--Absol.png b/src/afd/sprites/front-shiny/0359-000-Absol.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0359--000--Absol.png
rename to src/afd/sprites/front-shiny/0359-000-Absol.png
diff --git a/src/afd/sprites/front-shiny/0359--420--Absol--Mega.png b/src/afd/sprites/front-shiny/0359-420-Absol-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0359--420--Absol--Mega.png
rename to src/afd/sprites/front-shiny/0359-420-Absol-Mega.png
diff --git a/src/afd/sprites/front-shiny/0360--000--Wynaut.png b/src/afd/sprites/front-shiny/0360-000-Wynaut.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0360--000--Wynaut.png
rename to src/afd/sprites/front-shiny/0360-000-Wynaut.png
diff --git a/src/afd/sprites/front-shiny/0362--000--Glalie.png b/src/afd/sprites/front-shiny/0362-000-Glalie.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0362--000--Glalie.png
rename to src/afd/sprites/front-shiny/0362-000-Glalie.png
diff --git a/src/afd/sprites/front-shiny/0363--000--Spheal.png b/src/afd/sprites/front-shiny/0363-000-Spheal.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0363--000--Spheal.png
rename to src/afd/sprites/front-shiny/0363-000-Spheal.png
diff --git a/src/afd/sprites/front-shiny/0364--000--Sealeo.png b/src/afd/sprites/front-shiny/0364-000-Sealeo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0364--000--Sealeo.png
rename to src/afd/sprites/front-shiny/0364-000-Sealeo.png
diff --git a/src/afd/sprites/front-shiny/0365--000--Walrein.png b/src/afd/sprites/front-shiny/0365-000-Walrein.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0365--000--Walrein.png
rename to src/afd/sprites/front-shiny/0365-000-Walrein.png
diff --git a/src/afd/sprites/front-shiny/0366--000--Clamperl.png b/src/afd/sprites/front-shiny/0366-000-Clamperl.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0366--000--Clamperl.png
rename to src/afd/sprites/front-shiny/0366-000-Clamperl.png
diff --git a/src/afd/sprites/front-shiny/0367--000--Huntail.png b/src/afd/sprites/front-shiny/0367-000-Huntail.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0367--000--Huntail.png
rename to src/afd/sprites/front-shiny/0367-000-Huntail.png
diff --git a/src/afd/sprites/front-shiny/0368--000--Gorebyss.png b/src/afd/sprites/front-shiny/0368-000-Gorebyss.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0368--000--Gorebyss.png
rename to src/afd/sprites/front-shiny/0368-000-Gorebyss.png
diff --git a/src/afd/sprites/front-shiny/0369--000--Relicanth.png b/src/afd/sprites/front-shiny/0369-000-Relicanth.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0369--000--Relicanth.png
rename to src/afd/sprites/front-shiny/0369-000-Relicanth.png
diff --git a/src/afd/sprites/front-shiny/0370--000--Luvdisc.png b/src/afd/sprites/front-shiny/0370-000-Luvdisc.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0370--000--Luvdisc.png
rename to src/afd/sprites/front-shiny/0370-000-Luvdisc.png
diff --git a/src/afd/sprites/front-shiny/0371--000--Bagon.png b/src/afd/sprites/front-shiny/0371-000-Bagon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0371--000--Bagon.png
rename to src/afd/sprites/front-shiny/0371-000-Bagon.png
diff --git a/src/afd/sprites/front-shiny/0372--000--Shelgon.png b/src/afd/sprites/front-shiny/0372-000-Shelgon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0372--000--Shelgon.png
rename to src/afd/sprites/front-shiny/0372-000-Shelgon.png
diff --git a/src/afd/sprites/front-shiny/0373--000--Salamence.png b/src/afd/sprites/front-shiny/0373-000-Salamence.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0373--000--Salamence.png
rename to src/afd/sprites/front-shiny/0373-000-Salamence.png
diff --git a/src/afd/sprites/front-shiny/0373--420--Salamence--Mega.png b/src/afd/sprites/front-shiny/0373-420-Salamence-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0373--420--Salamence--Mega.png
rename to src/afd/sprites/front-shiny/0373-420-Salamence-Mega.png
diff --git a/src/afd/sprites/front-shiny/0374--000--Beldum.png b/src/afd/sprites/front-shiny/0374-000-Beldum.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0374--000--Beldum.png
rename to src/afd/sprites/front-shiny/0374-000-Beldum.png
diff --git a/src/afd/sprites/front-shiny/0375--000--Metang.png b/src/afd/sprites/front-shiny/0375-000-Metang.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0375--000--Metang.png
rename to src/afd/sprites/front-shiny/0375-000-Metang.png
diff --git a/src/afd/sprites/front-shiny/0376--000--Metagross.png b/src/afd/sprites/front-shiny/0376-000-Metagross.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0376--000--Metagross.png
rename to src/afd/sprites/front-shiny/0376-000-Metagross.png
diff --git a/src/afd/sprites/front-shiny/0376--420--Metagross--Mega.png b/src/afd/sprites/front-shiny/0376-420-Metagross-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0376--420--Metagross--Mega.png
rename to src/afd/sprites/front-shiny/0376-420-Metagross-Mega.png
diff --git a/src/afd/sprites/front-shiny/0377--000--Regirock.png b/src/afd/sprites/front-shiny/0377-000-Regirock.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0377--000--Regirock.png
rename to src/afd/sprites/front-shiny/0377-000-Regirock.png
diff --git a/src/afd/sprites/front-shiny/0378--000--Regice.png b/src/afd/sprites/front-shiny/0378-000-Regice.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0378--000--Regice.png
rename to src/afd/sprites/front-shiny/0378-000-Regice.png
diff --git a/src/afd/sprites/front-shiny/0379--000--Registeel.png b/src/afd/sprites/front-shiny/0379-000-Registeel.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0379--000--Registeel.png
rename to src/afd/sprites/front-shiny/0379-000-Registeel.png
diff --git a/src/afd/sprites/front-shiny/0380--000--Latias.png b/src/afd/sprites/front-shiny/0380-000-Latias.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0380--000--Latias.png
rename to src/afd/sprites/front-shiny/0380-000-Latias.png
diff --git a/src/afd/sprites/front-shiny/0380--420--Latias--Mega.png b/src/afd/sprites/front-shiny/0380-420-Latias-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0380--420--Latias--Mega.png
rename to src/afd/sprites/front-shiny/0380-420-Latias-Mega.png
diff --git a/src/afd/sprites/front-shiny/0381--000--Latios.png b/src/afd/sprites/front-shiny/0381-000-Latios.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0381--000--Latios.png
rename to src/afd/sprites/front-shiny/0381-000-Latios.png
diff --git a/src/afd/sprites/front-shiny/0381--420--Latios--Mega.png b/src/afd/sprites/front-shiny/0381-420-Latios-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0381--420--Latios--Mega.png
rename to src/afd/sprites/front-shiny/0381-420-Latios-Mega.png
diff --git a/src/afd/sprites/front-shiny/0382--000--Kyogre.png b/src/afd/sprites/front-shiny/0382-000-Kyogre.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0382--000--Kyogre.png
rename to src/afd/sprites/front-shiny/0382-000-Kyogre.png
diff --git a/src/afd/sprites/front-shiny/0382--420--Kyogre--Primal.png b/src/afd/sprites/front-shiny/0382-420-Kyogre-Primal.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0382--420--Kyogre--Primal.png
rename to src/afd/sprites/front-shiny/0382-420-Kyogre-Primal.png
diff --git a/src/afd/sprites/front-shiny/0383--000--Groudon.png b/src/afd/sprites/front-shiny/0383-000-Groudon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0383--000--Groudon.png
rename to src/afd/sprites/front-shiny/0383-000-Groudon.png
diff --git a/src/afd/sprites/front-shiny/0383--420--Groudon--Primal.png b/src/afd/sprites/front-shiny/0383-420-Groudon-Primal.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0383--420--Groudon--Primal.png
rename to src/afd/sprites/front-shiny/0383-420-Groudon-Primal.png
diff --git a/src/afd/sprites/front-shiny/0384--000--Rayquaza.png b/src/afd/sprites/front-shiny/0384-000-Rayquaza.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0384--000--Rayquaza.png
rename to src/afd/sprites/front-shiny/0384-000-Rayquaza.png
diff --git a/src/afd/sprites/front-shiny/0384--420--Rayquaza--Mega.png b/src/afd/sprites/front-shiny/0384-420-Rayquaza-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0384--420--Rayquaza--Mega.png
rename to src/afd/sprites/front-shiny/0384-420-Rayquaza-Mega.png
diff --git a/src/afd/sprites/front-shiny/0385--000--Jirachi.png b/src/afd/sprites/front-shiny/0385-000-Jirachi.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0385--000--Jirachi.png
rename to src/afd/sprites/front-shiny/0385-000-Jirachi.png
diff --git a/src/afd/sprites/front-shiny/0386--000--Deoxys.png b/src/afd/sprites/front-shiny/0386-000-Deoxys.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0386--000--Deoxys.png
rename to src/afd/sprites/front-shiny/0386-000-Deoxys.png
diff --git a/src/afd/sprites/front-shiny/0386--420--Deoxys--Attack.png b/src/afd/sprites/front-shiny/0386-420-Deoxys-Attack.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0386--420--Deoxys--Attack.png
rename to src/afd/sprites/front-shiny/0386-420-Deoxys-Attack.png
diff --git a/src/afd/sprites/front-shiny/0386--420--Deoxys--Defense.png b/src/afd/sprites/front-shiny/0386-420-Deoxys-Defense.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0386--420--Deoxys--Defense.png
rename to src/afd/sprites/front-shiny/0386-420-Deoxys-Defense.png
diff --git a/src/afd/sprites/front-shiny/0386--420--Deoxys--Speed.png b/src/afd/sprites/front-shiny/0386-420-Deoxys-Speed.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0386--420--Deoxys--Speed.png
rename to src/afd/sprites/front-shiny/0386-420-Deoxys-Speed.png
diff --git a/src/afd/sprites/front-shiny/0387--000--Turtwig.png b/src/afd/sprites/front-shiny/0387-000-Turtwig.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0387--000--Turtwig.png
rename to src/afd/sprites/front-shiny/0387-000-Turtwig.png
diff --git a/src/afd/sprites/front-shiny/0388--000--Grotle.png b/src/afd/sprites/front-shiny/0388-000-Grotle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0388--000--Grotle.png
rename to src/afd/sprites/front-shiny/0388-000-Grotle.png
diff --git a/src/afd/sprites/front-shiny/0389--000--Torterra.png b/src/afd/sprites/front-shiny/0389-000-Torterra.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0389--000--Torterra.png
rename to src/afd/sprites/front-shiny/0389-000-Torterra.png
diff --git a/src/afd/sprites/front-shiny/0390--000--Chimchar.png b/src/afd/sprites/front-shiny/0390-000-Chimchar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0390--000--Chimchar.png
rename to src/afd/sprites/front-shiny/0390-000-Chimchar.png
diff --git a/src/afd/sprites/front-shiny/0391--000--Monferno.png b/src/afd/sprites/front-shiny/0391-000-Monferno.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0391--000--Monferno.png
rename to src/afd/sprites/front-shiny/0391-000-Monferno.png
diff --git a/src/afd/sprites/front-shiny/0392--000--Infernape.png b/src/afd/sprites/front-shiny/0392-000-Infernape.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0392--000--Infernape.png
rename to src/afd/sprites/front-shiny/0392-000-Infernape.png
diff --git a/src/afd/sprites/front-shiny/0393--000--Piplup.png b/src/afd/sprites/front-shiny/0393-000-Piplup.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0393--000--Piplup.png
rename to src/afd/sprites/front-shiny/0393-000-Piplup.png
diff --git a/src/afd/sprites/front-shiny/0394--000--Prinplup.png b/src/afd/sprites/front-shiny/0394-000-Prinplup.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0394--000--Prinplup.png
rename to src/afd/sprites/front-shiny/0394-000-Prinplup.png
diff --git a/src/afd/sprites/front-shiny/0395--000--Empoleon.png b/src/afd/sprites/front-shiny/0395-000-Empoleon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0395--000--Empoleon.png
rename to src/afd/sprites/front-shiny/0395-000-Empoleon.png
diff --git a/src/afd/sprites/front-shiny/0396--000--Starly.png b/src/afd/sprites/front-shiny/0396-000-Starly.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0396--000--Starly.png
rename to src/afd/sprites/front-shiny/0396-000-Starly.png
diff --git a/src/afd/sprites/front-shiny/0397--000--Staravia.png b/src/afd/sprites/front-shiny/0397-000-Staravia.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0397--000--Staravia.png
rename to src/afd/sprites/front-shiny/0397-000-Staravia.png
diff --git a/src/afd/sprites/front-shiny/0398--000--Staraptor.png b/src/afd/sprites/front-shiny/0398-000-Staraptor.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0398--000--Staraptor.png
rename to src/afd/sprites/front-shiny/0398-000-Staraptor.png
diff --git a/src/afd/sprites/front-shiny/0399--000--Bidoof.png b/src/afd/sprites/front-shiny/0399-000-Bidoof.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0399--000--Bidoof.png
rename to src/afd/sprites/front-shiny/0399-000-Bidoof.png
diff --git a/src/afd/sprites/front-shiny/0400--000--Bibarel.png b/src/afd/sprites/front-shiny/0400-000-Bibarel.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0400--000--Bibarel.png
rename to src/afd/sprites/front-shiny/0400-000-Bibarel.png
diff --git a/src/afd/sprites/front-shiny/0401--000--Kricketot.png b/src/afd/sprites/front-shiny/0401-000-Kricketot.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0401--000--Kricketot.png
rename to src/afd/sprites/front-shiny/0401-000-Kricketot.png
diff --git a/src/afd/sprites/front-shiny/0402--000--Kricketune.png b/src/afd/sprites/front-shiny/0402-000-Kricketune.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0402--000--Kricketune.png
rename to src/afd/sprites/front-shiny/0402-000-Kricketune.png
diff --git a/src/afd/sprites/front-shiny/0403--000--Shinx.png b/src/afd/sprites/front-shiny/0403-000-Shinx.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0403--000--Shinx.png
rename to src/afd/sprites/front-shiny/0403-000-Shinx.png
diff --git a/src/afd/sprites/front-shiny/0404--000--Luxio.png b/src/afd/sprites/front-shiny/0404-000-Luxio.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0404--000--Luxio.png
rename to src/afd/sprites/front-shiny/0404-000-Luxio.png
diff --git a/src/afd/sprites/front-shiny/0405--000--Luxray.png b/src/afd/sprites/front-shiny/0405-000-Luxray.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0405--000--Luxray.png
rename to src/afd/sprites/front-shiny/0405-000-Luxray.png
diff --git a/src/afd/sprites/front-shiny/0406--000--Budew.gif b/src/afd/sprites/front-shiny/0406-000-Budew.gif
similarity index 100%
rename from src/afd/sprites/front-shiny/0406--000--Budew.gif
rename to src/afd/sprites/front-shiny/0406-000-Budew.gif
diff --git a/src/afd/sprites/front-shiny/0407--000--Roserade.png b/src/afd/sprites/front-shiny/0407-000-Roserade.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0407--000--Roserade.png
rename to src/afd/sprites/front-shiny/0407-000-Roserade.png
diff --git a/src/afd/sprites/front-shiny/0409--000--Rampardos.png b/src/afd/sprites/front-shiny/0409-000-Rampardos.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0409--000--Rampardos.png
rename to src/afd/sprites/front-shiny/0409-000-Rampardos.png
diff --git a/src/afd/sprites/front-shiny/0410--000--Shieldon.png b/src/afd/sprites/front-shiny/0410-000-Shieldon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0410--000--Shieldon.png
rename to src/afd/sprites/front-shiny/0410-000-Shieldon.png
diff --git a/src/afd/sprites/front-shiny/0411--000--Bastiodon.png b/src/afd/sprites/front-shiny/0411-000-Bastiodon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0411--000--Bastiodon.png
rename to src/afd/sprites/front-shiny/0411-000-Bastiodon.png
diff --git a/src/afd/sprites/front-shiny/0412--000--Burmy.png b/src/afd/sprites/front-shiny/0412-000-Burmy.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0412--000--Burmy.png
rename to src/afd/sprites/front-shiny/0412-000-Burmy.png
diff --git a/src/afd/sprites/front-shiny/0413--000--Wormadam.png b/src/afd/sprites/front-shiny/0413-000-Wormadam.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0413--000--Wormadam.png
rename to src/afd/sprites/front-shiny/0413-000-Wormadam.png
diff --git a/src/afd/sprites/front-shiny/0413--420--Wormadam--Sandy.png b/src/afd/sprites/front-shiny/0413-420-Wormadam-Sandy.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0413--420--Wormadam--Sandy.png
rename to src/afd/sprites/front-shiny/0413-420-Wormadam-Sandy.png
diff --git a/src/afd/sprites/front-shiny/0413--420--Wormadam--Trash.png b/src/afd/sprites/front-shiny/0413-420-Wormadam-Trash.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0413--420--Wormadam--Trash.png
rename to src/afd/sprites/front-shiny/0413-420-Wormadam-Trash.png
diff --git a/src/afd/sprites/front-shiny/0414--000--Mothim.png b/src/afd/sprites/front-shiny/0414-000-Mothim.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0414--000--Mothim.png
rename to src/afd/sprites/front-shiny/0414-000-Mothim.png
diff --git a/src/afd/sprites/front-shiny/0415--000--Combee.png b/src/afd/sprites/front-shiny/0415-000-Combee.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0415--000--Combee.png
rename to src/afd/sprites/front-shiny/0415-000-Combee.png
diff --git a/src/afd/sprites/front-shiny/0416--000--Vespiquen.png b/src/afd/sprites/front-shiny/0416-000-Vespiquen.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0416--000--Vespiquen.png
rename to src/afd/sprites/front-shiny/0416-000-Vespiquen.png
diff --git a/src/afd/sprites/front-shiny/0417--000--Pachirisu.png b/src/afd/sprites/front-shiny/0417-000-Pachirisu.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0417--000--Pachirisu.png
rename to src/afd/sprites/front-shiny/0417-000-Pachirisu.png
diff --git a/src/afd/sprites/front-shiny/0418--000--Buizel.png b/src/afd/sprites/front-shiny/0418-000-Buizel.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0418--000--Buizel.png
rename to src/afd/sprites/front-shiny/0418-000-Buizel.png
diff --git a/src/afd/sprites/front-shiny/0419--000--Floatzel.png b/src/afd/sprites/front-shiny/0419-000-Floatzel.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0419--000--Floatzel.png
rename to src/afd/sprites/front-shiny/0419-000-Floatzel.png
diff --git a/src/afd/sprites/front-shiny/0420--000--Cherubi.png b/src/afd/sprites/front-shiny/0420-000-Cherubi.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0420--000--Cherubi.png
rename to src/afd/sprites/front-shiny/0420-000-Cherubi.png
diff --git a/src/afd/sprites/front-shiny/0421--000--Cherrim.png b/src/afd/sprites/front-shiny/0421-000-Cherrim.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0421--000--Cherrim.png
rename to src/afd/sprites/front-shiny/0421-000-Cherrim.png
diff --git a/src/afd/sprites/front-shiny/0421--420--Cherrim--Sunshine.png b/src/afd/sprites/front-shiny/0421-420-Cherrim-Sunshine.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0421--420--Cherrim--Sunshine.png
rename to src/afd/sprites/front-shiny/0421-420-Cherrim-Sunshine.png
diff --git a/src/afd/sprites/front-shiny/0422--000--Shellos.png b/src/afd/sprites/front-shiny/0422-000-Shellos.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0422--000--Shellos.png
rename to src/afd/sprites/front-shiny/0422-000-Shellos.png
diff --git a/src/afd/sprites/front-shiny/0423--000--Gastrodon.png b/src/afd/sprites/front-shiny/0423-000-Gastrodon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0423--000--Gastrodon.png
rename to src/afd/sprites/front-shiny/0423-000-Gastrodon.png
diff --git a/src/afd/sprites/front-shiny/0424--000--Ambipom.png b/src/afd/sprites/front-shiny/0424-000-Ambipom.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0424--000--Ambipom.png
rename to src/afd/sprites/front-shiny/0424-000-Ambipom.png
diff --git a/src/afd/sprites/front-shiny/0425--000--Drifloon.png b/src/afd/sprites/front-shiny/0425-000-Drifloon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0425--000--Drifloon.png
rename to src/afd/sprites/front-shiny/0425-000-Drifloon.png
diff --git a/src/afd/sprites/front-shiny/0426--000--Drifblim.png b/src/afd/sprites/front-shiny/0426-000-Drifblim.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0426--000--Drifblim.png
rename to src/afd/sprites/front-shiny/0426-000-Drifblim.png
diff --git a/src/afd/sprites/front-shiny/0427--000--Buneary.png b/src/afd/sprites/front-shiny/0427-000-Buneary.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0427--000--Buneary.png
rename to src/afd/sprites/front-shiny/0427-000-Buneary.png
diff --git a/src/afd/sprites/front-shiny/0428--000--Lopunny.png b/src/afd/sprites/front-shiny/0428-000-Lopunny.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0428--000--Lopunny.png
rename to src/afd/sprites/front-shiny/0428-000-Lopunny.png
diff --git a/src/afd/sprites/front-shiny/0428--420--Lopunny--Mega.png b/src/afd/sprites/front-shiny/0428-420-Lopunny-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0428--420--Lopunny--Mega.png
rename to src/afd/sprites/front-shiny/0428-420-Lopunny-Mega.png
diff --git a/src/afd/sprites/front-shiny/0429--000--Mismagius.png b/src/afd/sprites/front-shiny/0429-000-Mismagius.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0429--000--Mismagius.png
rename to src/afd/sprites/front-shiny/0429-000-Mismagius.png
diff --git a/src/afd/sprites/front-shiny/0430--000--Honchkrow.png b/src/afd/sprites/front-shiny/0430-000-Honchkrow.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0430--000--Honchkrow.png
rename to src/afd/sprites/front-shiny/0430-000-Honchkrow.png
diff --git a/src/afd/sprites/front-shiny/0431--000--Glameow.png b/src/afd/sprites/front-shiny/0431-000-Glameow.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0431--000--Glameow.png
rename to src/afd/sprites/front-shiny/0431-000-Glameow.png
diff --git a/src/afd/sprites/front-shiny/0432--000--Purugly.png b/src/afd/sprites/front-shiny/0432-000-Purugly.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0432--000--Purugly.png
rename to src/afd/sprites/front-shiny/0432-000-Purugly.png
diff --git a/src/afd/sprites/front-shiny/0433--000--Chingling.png b/src/afd/sprites/front-shiny/0433-000-Chingling.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0433--000--Chingling.png
rename to src/afd/sprites/front-shiny/0433-000-Chingling.png
diff --git a/src/afd/sprites/front-shiny/0434--000--Stunky.png b/src/afd/sprites/front-shiny/0434-000-Stunky.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0434--000--Stunky.png
rename to src/afd/sprites/front-shiny/0434-000-Stunky.png
diff --git a/src/afd/sprites/front-shiny/0436--000--Bronzor.png b/src/afd/sprites/front-shiny/0436-000-Bronzor.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0436--000--Bronzor.png
rename to src/afd/sprites/front-shiny/0436-000-Bronzor.png
diff --git a/src/afd/sprites/front-shiny/0437--000--Bronzong.png b/src/afd/sprites/front-shiny/0437-000-Bronzong.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0437--000--Bronzong.png
rename to src/afd/sprites/front-shiny/0437-000-Bronzong.png
diff --git a/src/afd/sprites/front-shiny/0438--000--Bonsly.png b/src/afd/sprites/front-shiny/0438-000-Bonsly.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0438--000--Bonsly.png
rename to src/afd/sprites/front-shiny/0438-000-Bonsly.png
diff --git a/src/afd/sprites/front-shiny/0439--000--Mime_Jr..png b/src/afd/sprites/front-shiny/0439-000-Mime_Jr..png
similarity index 100%
rename from src/afd/sprites/front-shiny/0439--000--Mime_Jr..png
rename to src/afd/sprites/front-shiny/0439-000-Mime_Jr..png
diff --git a/src/afd/sprites/front-shiny/0440--000--Happiny.png b/src/afd/sprites/front-shiny/0440-000-Happiny.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0440--000--Happiny.png
rename to src/afd/sprites/front-shiny/0440-000-Happiny.png
diff --git a/src/afd/sprites/front-shiny/0441--000--Chatot.png b/src/afd/sprites/front-shiny/0441-000-Chatot.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0441--000--Chatot.png
rename to src/afd/sprites/front-shiny/0441-000-Chatot.png
diff --git a/src/afd/sprites/front-shiny/0442--000--Spiritomb.png b/src/afd/sprites/front-shiny/0442-000-Spiritomb.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0442--000--Spiritomb.png
rename to src/afd/sprites/front-shiny/0442-000-Spiritomb.png
diff --git a/src/afd/sprites/front-shiny/0443--000--Gible.png b/src/afd/sprites/front-shiny/0443-000-Gible.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0443--000--Gible.png
rename to src/afd/sprites/front-shiny/0443-000-Gible.png
diff --git a/src/afd/sprites/front-shiny/0444--000--Gabite.png b/src/afd/sprites/front-shiny/0444-000-Gabite.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0444--000--Gabite.png
rename to src/afd/sprites/front-shiny/0444-000-Gabite.png
diff --git a/src/afd/sprites/front-shiny/0445--000--Garchomp.png b/src/afd/sprites/front-shiny/0445-000-Garchomp.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0445--000--Garchomp.png
rename to src/afd/sprites/front-shiny/0445-000-Garchomp.png
diff --git a/src/afd/sprites/front-shiny/0445--420--Garchomp--Mega.png b/src/afd/sprites/front-shiny/0445-420-Garchomp-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0445--420--Garchomp--Mega.png
rename to src/afd/sprites/front-shiny/0445-420-Garchomp-Mega.png
diff --git a/src/afd/sprites/front-shiny/0446--000--Munchlax.png b/src/afd/sprites/front-shiny/0446-000-Munchlax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0446--000--Munchlax.png
rename to src/afd/sprites/front-shiny/0446-000-Munchlax.png
diff --git a/src/afd/sprites/front-shiny/0447--000--Riolu.png b/src/afd/sprites/front-shiny/0447-000-Riolu.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0447--000--Riolu.png
rename to src/afd/sprites/front-shiny/0447-000-Riolu.png
diff --git a/src/afd/sprites/front-shiny/0448--000--Lucario.png b/src/afd/sprites/front-shiny/0448-000-Lucario.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0448--000--Lucario.png
rename to src/afd/sprites/front-shiny/0448-000-Lucario.png
diff --git a/src/afd/sprites/front-shiny/0448--420--Lucario--Mega.png b/src/afd/sprites/front-shiny/0448-420-Lucario-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0448--420--Lucario--Mega.png
rename to src/afd/sprites/front-shiny/0448-420-Lucario-Mega.png
diff --git a/src/afd/sprites/front-shiny/0449--000--Hippopotas.png b/src/afd/sprites/front-shiny/0449-000-Hippopotas.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0449--000--Hippopotas.png
rename to src/afd/sprites/front-shiny/0449-000-Hippopotas.png
diff --git a/src/afd/sprites/front-shiny/0450--000--Hippowdon.png b/src/afd/sprites/front-shiny/0450-000-Hippowdon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0450--000--Hippowdon.png
rename to src/afd/sprites/front-shiny/0450-000-Hippowdon.png
diff --git a/src/afd/sprites/front-shiny/0451--000--Skorupi.png b/src/afd/sprites/front-shiny/0451-000-Skorupi.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0451--000--Skorupi.png
rename to src/afd/sprites/front-shiny/0451-000-Skorupi.png
diff --git a/src/afd/sprites/front-shiny/0452--000--Drapion.png b/src/afd/sprites/front-shiny/0452-000-Drapion.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0452--000--Drapion.png
rename to src/afd/sprites/front-shiny/0452-000-Drapion.png
diff --git a/src/afd/sprites/front-shiny/0453--000--Croagunk.png b/src/afd/sprites/front-shiny/0453-000-Croagunk.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0453--000--Croagunk.png
rename to src/afd/sprites/front-shiny/0453-000-Croagunk.png
diff --git a/src/afd/sprites/front-shiny/0454--000--Toxicroak.png b/src/afd/sprites/front-shiny/0454-000-Toxicroak.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0454--000--Toxicroak.png
rename to src/afd/sprites/front-shiny/0454-000-Toxicroak.png
diff --git a/src/afd/sprites/front-shiny/0455--000--Carnivine.png b/src/afd/sprites/front-shiny/0455-000-Carnivine.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0455--000--Carnivine.png
rename to src/afd/sprites/front-shiny/0455-000-Carnivine.png
diff --git a/src/afd/sprites/front-shiny/0456--000--Finneon.png b/src/afd/sprites/front-shiny/0456-000-Finneon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0456--000--Finneon.png
rename to src/afd/sprites/front-shiny/0456-000-Finneon.png
diff --git a/src/afd/sprites/front-shiny/0457--000--Lumineon.png b/src/afd/sprites/front-shiny/0457-000-Lumineon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0457--000--Lumineon.png
rename to src/afd/sprites/front-shiny/0457-000-Lumineon.png
diff --git a/src/afd/sprites/front-shiny/0458--000--Mantyke.png b/src/afd/sprites/front-shiny/0458-000-Mantyke.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0458--000--Mantyke.png
rename to src/afd/sprites/front-shiny/0458-000-Mantyke.png
diff --git a/src/afd/sprites/front-shiny/0459--000--Snover.png b/src/afd/sprites/front-shiny/0459-000-Snover.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0459--000--Snover.png
rename to src/afd/sprites/front-shiny/0459-000-Snover.png
diff --git a/src/afd/sprites/front-shiny/0460--000--Abomasnow.png b/src/afd/sprites/front-shiny/0460-000-Abomasnow.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0460--000--Abomasnow.png
rename to src/afd/sprites/front-shiny/0460-000-Abomasnow.png
diff --git a/src/afd/sprites/front-shiny/0460--420--Abomasnow--Mega.png b/src/afd/sprites/front-shiny/0460-420-Abomasnow-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0460--420--Abomasnow--Mega.png
rename to src/afd/sprites/front-shiny/0460-420-Abomasnow-Mega.png
diff --git a/src/afd/sprites/front-shiny/0461--000--Weavile.png b/src/afd/sprites/front-shiny/0461-000-Weavile.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0461--000--Weavile.png
rename to src/afd/sprites/front-shiny/0461-000-Weavile.png
diff --git a/src/afd/sprites/front-shiny/0462--000--Magnezone.png b/src/afd/sprites/front-shiny/0462-000-Magnezone.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0462--000--Magnezone.png
rename to src/afd/sprites/front-shiny/0462-000-Magnezone.png
diff --git a/src/afd/sprites/front-shiny/0463--000--Lickilicky.png b/src/afd/sprites/front-shiny/0463-000-Lickilicky.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0463--000--Lickilicky.png
rename to src/afd/sprites/front-shiny/0463-000-Lickilicky.png
diff --git a/src/afd/sprites/front-shiny/0464--000--Rhyperior.png b/src/afd/sprites/front-shiny/0464-000-Rhyperior.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0464--000--Rhyperior.png
rename to src/afd/sprites/front-shiny/0464-000-Rhyperior.png
diff --git a/src/afd/sprites/front-shiny/0465--000--Tangrowth.png b/src/afd/sprites/front-shiny/0465-000-Tangrowth.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0465--000--Tangrowth.png
rename to src/afd/sprites/front-shiny/0465-000-Tangrowth.png
diff --git a/src/afd/sprites/front-shiny/0466--000--Electivire.png b/src/afd/sprites/front-shiny/0466-000-Electivire.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0466--000--Electivire.png
rename to src/afd/sprites/front-shiny/0466-000-Electivire.png
diff --git a/src/afd/sprites/front-shiny/0468--000--Togekiss.png b/src/afd/sprites/front-shiny/0468-000-Togekiss.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0468--000--Togekiss.png
rename to src/afd/sprites/front-shiny/0468-000-Togekiss.png
diff --git a/src/afd/sprites/front-shiny/0469--000--Yanmega.png b/src/afd/sprites/front-shiny/0469-000-Yanmega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0469--000--Yanmega.png
rename to src/afd/sprites/front-shiny/0469-000-Yanmega.png
diff --git a/src/afd/sprites/front-shiny/0470--000--Leafeon.png b/src/afd/sprites/front-shiny/0470-000-Leafeon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0470--000--Leafeon.png
rename to src/afd/sprites/front-shiny/0470-000-Leafeon.png
diff --git a/src/afd/sprites/front-shiny/0471--000--Glaceon.png b/src/afd/sprites/front-shiny/0471-000-Glaceon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0471--000--Glaceon.png
rename to src/afd/sprites/front-shiny/0471-000-Glaceon.png
diff --git a/src/afd/sprites/front-shiny/0472--000--Gliscor.png b/src/afd/sprites/front-shiny/0472-000-Gliscor.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0472--000--Gliscor.png
rename to src/afd/sprites/front-shiny/0472-000-Gliscor.png
diff --git a/src/afd/sprites/front-shiny/0473--000--Mamoswine.png b/src/afd/sprites/front-shiny/0473-000-Mamoswine.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0473--000--Mamoswine.png
rename to src/afd/sprites/front-shiny/0473-000-Mamoswine.png
diff --git a/src/afd/sprites/front-shiny/0474--000--Porygon-Z.png b/src/afd/sprites/front-shiny/0474-000-Porygon~Z.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0474--000--Porygon-Z.png
rename to src/afd/sprites/front-shiny/0474-000-Porygon~Z.png
diff --git a/src/afd/sprites/front-shiny/0475--000--Gallade.png b/src/afd/sprites/front-shiny/0475-000-Gallade.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0475--000--Gallade.png
rename to src/afd/sprites/front-shiny/0475-000-Gallade.png
diff --git a/src/afd/sprites/front-shiny/0475--420--Gallade--Mega.png b/src/afd/sprites/front-shiny/0475-420-Gallade-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0475--420--Gallade--Mega.png
rename to src/afd/sprites/front-shiny/0475-420-Gallade-Mega.png
diff --git a/src/afd/sprites/front-shiny/0476--000--Probopass.png b/src/afd/sprites/front-shiny/0476-000-Probopass.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0476--000--Probopass.png
rename to src/afd/sprites/front-shiny/0476-000-Probopass.png
diff --git a/src/afd/sprites/front-shiny/0477--000--Dusknoir.png b/src/afd/sprites/front-shiny/0477-000-Dusknoir.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0477--000--Dusknoir.png
rename to src/afd/sprites/front-shiny/0477-000-Dusknoir.png
diff --git a/src/afd/sprites/front-shiny/0478--000--Froslass.png b/src/afd/sprites/front-shiny/0478-000-Froslass.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0478--000--Froslass.png
rename to src/afd/sprites/front-shiny/0478-000-Froslass.png
diff --git a/src/afd/sprites/front-shiny/0479--000--Rotom.png b/src/afd/sprites/front-shiny/0479-000-Rotom.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0479--000--Rotom.png
rename to src/afd/sprites/front-shiny/0479-000-Rotom.png
diff --git a/src/afd/sprites/front-shiny/0479--420--Rotom--Fan.png b/src/afd/sprites/front-shiny/0479-420-Rotom-Fan.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0479--420--Rotom--Fan.png
rename to src/afd/sprites/front-shiny/0479-420-Rotom-Fan.png
diff --git a/src/afd/sprites/front-shiny/0479--420--Rotom--Frost.png b/src/afd/sprites/front-shiny/0479-420-Rotom-Frost.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0479--420--Rotom--Frost.png
rename to src/afd/sprites/front-shiny/0479-420-Rotom-Frost.png
diff --git a/src/afd/sprites/front-shiny/0479--420--Rotom--Heat.png b/src/afd/sprites/front-shiny/0479-420-Rotom-Heat.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0479--420--Rotom--Heat.png
rename to src/afd/sprites/front-shiny/0479-420-Rotom-Heat.png
diff --git a/src/afd/sprites/front-shiny/0479--420--Rotom--Mow.png b/src/afd/sprites/front-shiny/0479-420-Rotom-Mow.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0479--420--Rotom--Mow.png
rename to src/afd/sprites/front-shiny/0479-420-Rotom-Mow.png
diff --git a/src/afd/sprites/front-shiny/0479--420--Rotom--Wash.png b/src/afd/sprites/front-shiny/0479-420-Rotom-Wash.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0479--420--Rotom--Wash.png
rename to src/afd/sprites/front-shiny/0479-420-Rotom-Wash.png
diff --git a/src/afd/sprites/front-shiny/0480--000--Uxie.png b/src/afd/sprites/front-shiny/0480-000-Uxie.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0480--000--Uxie.png
rename to src/afd/sprites/front-shiny/0480-000-Uxie.png
diff --git a/src/afd/sprites/front-shiny/0481--000--Mesprit.png b/src/afd/sprites/front-shiny/0481-000-Mesprit.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0481--000--Mesprit.png
rename to src/afd/sprites/front-shiny/0481-000-Mesprit.png
diff --git a/src/afd/sprites/front-shiny/0482--000--Azelf.png b/src/afd/sprites/front-shiny/0482-000-Azelf.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0482--000--Azelf.png
rename to src/afd/sprites/front-shiny/0482-000-Azelf.png
diff --git a/src/afd/sprites/front-shiny/0483--000--Dialga.png b/src/afd/sprites/front-shiny/0483-000-Dialga.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0483--000--Dialga.png
rename to src/afd/sprites/front-shiny/0483-000-Dialga.png
diff --git a/src/afd/sprites/front-shiny/0484--000--Palkia.png b/src/afd/sprites/front-shiny/0484-000-Palkia.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0484--000--Palkia.png
rename to src/afd/sprites/front-shiny/0484-000-Palkia.png
diff --git a/src/afd/sprites/front-shiny/0485--000--Heatran.png b/src/afd/sprites/front-shiny/0485-000-Heatran.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0485--000--Heatran.png
rename to src/afd/sprites/front-shiny/0485-000-Heatran.png
diff --git a/src/afd/sprites/front-shiny/0486--000--Regigigas.png b/src/afd/sprites/front-shiny/0486-000-Regigigas.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0486--000--Regigigas.png
rename to src/afd/sprites/front-shiny/0486-000-Regigigas.png
diff --git a/src/afd/sprites/front-shiny/0487--000--Giratina.png b/src/afd/sprites/front-shiny/0487-000-Giratina.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0487--000--Giratina.png
rename to src/afd/sprites/front-shiny/0487-000-Giratina.png
diff --git a/src/afd/sprites/front-shiny/0487--420--Giratina--Origin.png b/src/afd/sprites/front-shiny/0487-420-Giratina-Origin.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0487--420--Giratina--Origin.png
rename to src/afd/sprites/front-shiny/0487-420-Giratina-Origin.png
diff --git a/src/afd/sprites/front-shiny/0488--000--Cresselia.png b/src/afd/sprites/front-shiny/0488-000-Cresselia.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0488--000--Cresselia.png
rename to src/afd/sprites/front-shiny/0488-000-Cresselia.png
diff --git a/src/afd/sprites/front-shiny/0489--000--Phione.png b/src/afd/sprites/front-shiny/0489-000-Phione.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0489--000--Phione.png
rename to src/afd/sprites/front-shiny/0489-000-Phione.png
diff --git a/src/afd/sprites/front-shiny/0490--000--Manaphy.png b/src/afd/sprites/front-shiny/0490-000-Manaphy.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0490--000--Manaphy.png
rename to src/afd/sprites/front-shiny/0490-000-Manaphy.png
diff --git a/src/afd/sprites/front-shiny/0491--000--Darkrai.png b/src/afd/sprites/front-shiny/0491-000-Darkrai.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0491--000--Darkrai.png
rename to src/afd/sprites/front-shiny/0491-000-Darkrai.png
diff --git a/src/afd/sprites/front-shiny/0492--000--Shaymin.png b/src/afd/sprites/front-shiny/0492-000-Shaymin.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0492--000--Shaymin.png
rename to src/afd/sprites/front-shiny/0492-000-Shaymin.png
diff --git a/src/afd/sprites/front-shiny/0492--420--Shaymin--Sky.png b/src/afd/sprites/front-shiny/0492-420-Shaymin-Sky.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0492--420--Shaymin--Sky.png
rename to src/afd/sprites/front-shiny/0492-420-Shaymin-Sky.png
diff --git a/src/afd/sprites/front-shiny/0493--000--Arceus.png b/src/afd/sprites/front-shiny/0493-000-Arceus.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--000--Arceus.png
rename to src/afd/sprites/front-shiny/0493-000-Arceus.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Bug.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Bug.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Bug.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Bug.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Dark.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Dark.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Dark.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Dark.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Dragon.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Dragon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Dragon.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Dragon.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Electric.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Electric.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Electric.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Electric.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Fairy.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Fairy.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Fairy.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Fairy.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Fighting.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Fighting.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Fighting.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Fighting.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Fire.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Fire.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Fire.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Fire.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Flying.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Flying.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Flying.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Flying.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Ghost.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Ghost.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Ghost.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Ghost.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Grass.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Grass.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Grass.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Grass.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Ground.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Ground.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Ground.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Ground.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Ice.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Ice.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Ice.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Ice.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Poison.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Poison.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Poison.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Poison.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Psychic.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Psychic.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Psychic.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Psychic.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Rock.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Rock.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Rock.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Rock.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Steel.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Steel.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Steel.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Steel.png
diff --git a/src/afd/sprites/front-shiny/0493--420--Arceus--Water.png b/src/afd/sprites/front-shiny/0493-420-Arceus-Water.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0493--420--Arceus--Water.png
rename to src/afd/sprites/front-shiny/0493-420-Arceus-Water.png
diff --git a/src/afd/sprites/front-shiny/0494--000--Victini.png b/src/afd/sprites/front-shiny/0494-000-Victini.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0494--000--Victini.png
rename to src/afd/sprites/front-shiny/0494-000-Victini.png
diff --git a/src/afd/sprites/front-shiny/0495--000--Snivy.png b/src/afd/sprites/front-shiny/0495-000-Snivy.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0495--000--Snivy.png
rename to src/afd/sprites/front-shiny/0495-000-Snivy.png
diff --git a/src/afd/sprites/front-shiny/0496--000--Servine.png b/src/afd/sprites/front-shiny/0496-000-Servine.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0496--000--Servine.png
rename to src/afd/sprites/front-shiny/0496-000-Servine.png
diff --git a/src/afd/sprites/front-shiny/0497--000--Serperior.png b/src/afd/sprites/front-shiny/0497-000-Serperior.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0497--000--Serperior.png
rename to src/afd/sprites/front-shiny/0497-000-Serperior.png
diff --git a/src/afd/sprites/front-shiny/0498--000--Tepig.png b/src/afd/sprites/front-shiny/0498-000-Tepig.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0498--000--Tepig.png
rename to src/afd/sprites/front-shiny/0498-000-Tepig.png
diff --git a/src/afd/sprites/front-shiny/0499--000--Pignite.png b/src/afd/sprites/front-shiny/0499-000-Pignite.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0499--000--Pignite.png
rename to src/afd/sprites/front-shiny/0499-000-Pignite.png
diff --git a/src/afd/sprites/front-shiny/0500--000--Emboar.png b/src/afd/sprites/front-shiny/0500-000-Emboar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0500--000--Emboar.png
rename to src/afd/sprites/front-shiny/0500-000-Emboar.png
diff --git a/src/afd/sprites/front-shiny/0501--000--Oshawott.png b/src/afd/sprites/front-shiny/0501-000-Oshawott.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0501--000--Oshawott.png
rename to src/afd/sprites/front-shiny/0501-000-Oshawott.png
diff --git a/src/afd/sprites/front-shiny/0502--000--Dewott.png b/src/afd/sprites/front-shiny/0502-000-Dewott.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0502--000--Dewott.png
rename to src/afd/sprites/front-shiny/0502-000-Dewott.png
diff --git a/src/afd/sprites/front-shiny/0503--000--Samurott.png b/src/afd/sprites/front-shiny/0503-000-Samurott.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0503--000--Samurott.png
rename to src/afd/sprites/front-shiny/0503-000-Samurott.png
diff --git a/src/afd/sprites/front-shiny/0504--000--Patrat.png b/src/afd/sprites/front-shiny/0504-000-Patrat.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0504--000--Patrat.png
rename to src/afd/sprites/front-shiny/0504-000-Patrat.png
diff --git a/src/afd/sprites/front-shiny/0505--000--Watchog.png b/src/afd/sprites/front-shiny/0505-000-Watchog.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0505--000--Watchog.png
rename to src/afd/sprites/front-shiny/0505-000-Watchog.png
diff --git a/src/afd/sprites/front-shiny/0506--000--Lillipup.png b/src/afd/sprites/front-shiny/0506-000-Lillipup.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0506--000--Lillipup.png
rename to src/afd/sprites/front-shiny/0506-000-Lillipup.png
diff --git a/src/afd/sprites/front-shiny/0507--000--Herdier.png b/src/afd/sprites/front-shiny/0507-000-Herdier.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0507--000--Herdier.png
rename to src/afd/sprites/front-shiny/0507-000-Herdier.png
diff --git a/src/afd/sprites/front-shiny/0508--000--Stoutland.png b/src/afd/sprites/front-shiny/0508-000-Stoutland.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0508--000--Stoutland.png
rename to src/afd/sprites/front-shiny/0508-000-Stoutland.png
diff --git a/src/afd/sprites/front-shiny/0509--000--Purrloin.png b/src/afd/sprites/front-shiny/0509-000-Purrloin.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0509--000--Purrloin.png
rename to src/afd/sprites/front-shiny/0509-000-Purrloin.png
diff --git a/src/afd/sprites/front-shiny/0510--000--Liepard.png b/src/afd/sprites/front-shiny/0510-000-Liepard.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0510--000--Liepard.png
rename to src/afd/sprites/front-shiny/0510-000-Liepard.png
diff --git a/src/afd/sprites/front-shiny/0511--000--Pansage.png b/src/afd/sprites/front-shiny/0511-000-Pansage.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0511--000--Pansage.png
rename to src/afd/sprites/front-shiny/0511-000-Pansage.png
diff --git a/src/afd/sprites/front-shiny/0512--000--Simisage.png b/src/afd/sprites/front-shiny/0512-000-Simisage.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0512--000--Simisage.png
rename to src/afd/sprites/front-shiny/0512-000-Simisage.png
diff --git a/src/afd/sprites/front-shiny/0513--000--Pansear.png b/src/afd/sprites/front-shiny/0513-000-Pansear.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0513--000--Pansear.png
rename to src/afd/sprites/front-shiny/0513-000-Pansear.png
diff --git a/src/afd/sprites/front-shiny/0514--000--Simisear.png b/src/afd/sprites/front-shiny/0514-000-Simisear.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0514--000--Simisear.png
rename to src/afd/sprites/front-shiny/0514-000-Simisear.png
diff --git a/src/afd/sprites/front-shiny/0515--000--Panpour.png b/src/afd/sprites/front-shiny/0515-000-Panpour.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0515--000--Panpour.png
rename to src/afd/sprites/front-shiny/0515-000-Panpour.png
diff --git a/src/afd/sprites/front-shiny/0516--000--Simipour.png b/src/afd/sprites/front-shiny/0516-000-Simipour.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0516--000--Simipour.png
rename to src/afd/sprites/front-shiny/0516-000-Simipour.png
diff --git a/src/afd/sprites/front-shiny/0517--000--Munna.png b/src/afd/sprites/front-shiny/0517-000-Munna.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0517--000--Munna.png
rename to src/afd/sprites/front-shiny/0517-000-Munna.png
diff --git a/src/afd/sprites/front-shiny/0518--000--Musharna.png b/src/afd/sprites/front-shiny/0518-000-Musharna.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0518--000--Musharna.png
rename to src/afd/sprites/front-shiny/0518-000-Musharna.png
diff --git a/src/afd/sprites/front-shiny/0519--000--Pidove.png b/src/afd/sprites/front-shiny/0519-000-Pidove.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0519--000--Pidove.png
rename to src/afd/sprites/front-shiny/0519-000-Pidove.png
diff --git a/src/afd/sprites/front-shiny/0520--000--Tranquill.png b/src/afd/sprites/front-shiny/0520-000-Tranquill.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0520--000--Tranquill.png
rename to src/afd/sprites/front-shiny/0520-000-Tranquill.png
diff --git a/src/afd/sprites/front-shiny/0521--000--Unfezant.png b/src/afd/sprites/front-shiny/0521-000-Unfezant.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0521--000--Unfezant.png
rename to src/afd/sprites/front-shiny/0521-000-Unfezant.png
diff --git a/src/afd/sprites/front-shiny/0522--000--Blitzle.png b/src/afd/sprites/front-shiny/0522-000-Blitzle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0522--000--Blitzle.png
rename to src/afd/sprites/front-shiny/0522-000-Blitzle.png
diff --git a/src/afd/sprites/front-shiny/0523--000--Zebstrika.png b/src/afd/sprites/front-shiny/0523-000-Zebstrika.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0523--000--Zebstrika.png
rename to src/afd/sprites/front-shiny/0523-000-Zebstrika.png
diff --git a/src/afd/sprites/front-shiny/0524--000--Roggenrola.png b/src/afd/sprites/front-shiny/0524-000-Roggenrola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0524--000--Roggenrola.png
rename to src/afd/sprites/front-shiny/0524-000-Roggenrola.png
diff --git a/src/afd/sprites/front-shiny/0525--000--Boldore.png b/src/afd/sprites/front-shiny/0525-000-Boldore.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0525--000--Boldore.png
rename to src/afd/sprites/front-shiny/0525-000-Boldore.png
diff --git a/src/afd/sprites/front-shiny/0526--000--Gigalith.png b/src/afd/sprites/front-shiny/0526-000-Gigalith.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0526--000--Gigalith.png
rename to src/afd/sprites/front-shiny/0526-000-Gigalith.png
diff --git a/src/afd/sprites/front-shiny/0527--000--Woobat.png b/src/afd/sprites/front-shiny/0527-000-Woobat.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0527--000--Woobat.png
rename to src/afd/sprites/front-shiny/0527-000-Woobat.png
diff --git a/src/afd/sprites/front-shiny/0528--000--Swoobat.png b/src/afd/sprites/front-shiny/0528-000-Swoobat.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0528--000--Swoobat.png
rename to src/afd/sprites/front-shiny/0528-000-Swoobat.png
diff --git a/src/afd/sprites/front-shiny/0529--000--Drilbur.png b/src/afd/sprites/front-shiny/0529-000-Drilbur.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0529--000--Drilbur.png
rename to src/afd/sprites/front-shiny/0529-000-Drilbur.png
diff --git a/src/afd/sprites/front-shiny/0530--000--Excadrill.png b/src/afd/sprites/front-shiny/0530-000-Excadrill.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0530--000--Excadrill.png
rename to src/afd/sprites/front-shiny/0530-000-Excadrill.png
diff --git a/src/afd/sprites/front-shiny/0531--000--Audino.png b/src/afd/sprites/front-shiny/0531-000-Audino.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0531--000--Audino.png
rename to src/afd/sprites/front-shiny/0531-000-Audino.png
diff --git a/src/afd/sprites/front-shiny/0531--420--Audino--Mega.png b/src/afd/sprites/front-shiny/0531-420-Audino-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0531--420--Audino--Mega.png
rename to src/afd/sprites/front-shiny/0531-420-Audino-Mega.png
diff --git a/src/afd/sprites/front-shiny/0532--000--Timburr.png b/src/afd/sprites/front-shiny/0532-000-Timburr.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0532--000--Timburr.png
rename to src/afd/sprites/front-shiny/0532-000-Timburr.png
diff --git a/src/afd/sprites/front-shiny/0533--000--Gurdurr.png b/src/afd/sprites/front-shiny/0533-000-Gurdurr.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0533--000--Gurdurr.png
rename to src/afd/sprites/front-shiny/0533-000-Gurdurr.png
diff --git a/src/afd/sprites/front-shiny/0534--000--Conkeldurr.png b/src/afd/sprites/front-shiny/0534-000-Conkeldurr.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0534--000--Conkeldurr.png
rename to src/afd/sprites/front-shiny/0534-000-Conkeldurr.png
diff --git a/src/afd/sprites/front-shiny/0535--000--Tympole.png b/src/afd/sprites/front-shiny/0535-000-Tympole.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0535--000--Tympole.png
rename to src/afd/sprites/front-shiny/0535-000-Tympole.png
diff --git a/src/afd/sprites/front-shiny/0536--000--Palpitoad.png b/src/afd/sprites/front-shiny/0536-000-Palpitoad.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0536--000--Palpitoad.png
rename to src/afd/sprites/front-shiny/0536-000-Palpitoad.png
diff --git a/src/afd/sprites/front-shiny/0537--000--Seismitoad.png b/src/afd/sprites/front-shiny/0537-000-Seismitoad.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0537--000--Seismitoad.png
rename to src/afd/sprites/front-shiny/0537-000-Seismitoad.png
diff --git a/src/afd/sprites/front-shiny/0538--000--Throh.png b/src/afd/sprites/front-shiny/0538-000-Throh.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0538--000--Throh.png
rename to src/afd/sprites/front-shiny/0538-000-Throh.png
diff --git a/src/afd/sprites/front-shiny/0539--000--Sawk.png b/src/afd/sprites/front-shiny/0539-000-Sawk.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0539--000--Sawk.png
rename to src/afd/sprites/front-shiny/0539-000-Sawk.png
diff --git a/src/afd/sprites/front-shiny/0540--000--Sewaddle.png b/src/afd/sprites/front-shiny/0540-000-Sewaddle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0540--000--Sewaddle.png
rename to src/afd/sprites/front-shiny/0540-000-Sewaddle.png
diff --git a/src/afd/sprites/front-shiny/0541--000--Swadloon.png b/src/afd/sprites/front-shiny/0541-000-Swadloon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0541--000--Swadloon.png
rename to src/afd/sprites/front-shiny/0541-000-Swadloon.png
diff --git a/src/afd/sprites/front-shiny/0542--000--Leavanny.png b/src/afd/sprites/front-shiny/0542-000-Leavanny.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0542--000--Leavanny.png
rename to src/afd/sprites/front-shiny/0542-000-Leavanny.png
diff --git a/src/afd/sprites/front-shiny/0543--000--Venipede.png b/src/afd/sprites/front-shiny/0543-000-Venipede.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0543--000--Venipede.png
rename to src/afd/sprites/front-shiny/0543-000-Venipede.png
diff --git a/src/afd/sprites/front-shiny/0544--000--Whirlipede.png b/src/afd/sprites/front-shiny/0544-000-Whirlipede.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0544--000--Whirlipede.png
rename to src/afd/sprites/front-shiny/0544-000-Whirlipede.png
diff --git a/src/afd/sprites/front-shiny/0545--000--Scolipede.png b/src/afd/sprites/front-shiny/0545-000-Scolipede.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0545--000--Scolipede.png
rename to src/afd/sprites/front-shiny/0545-000-Scolipede.png
diff --git a/src/afd/sprites/front-shiny/0546--000--Cottonee.png b/src/afd/sprites/front-shiny/0546-000-Cottonee.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0546--000--Cottonee.png
rename to src/afd/sprites/front-shiny/0546-000-Cottonee.png
diff --git a/src/afd/sprites/front-shiny/0547--000--Whimsicott.png b/src/afd/sprites/front-shiny/0547-000-Whimsicott.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0547--000--Whimsicott.png
rename to src/afd/sprites/front-shiny/0547-000-Whimsicott.png
diff --git a/src/afd/sprites/front-shiny/0548--000--Petilil.png b/src/afd/sprites/front-shiny/0548-000-Petilil.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0548--000--Petilil.png
rename to src/afd/sprites/front-shiny/0548-000-Petilil.png
diff --git a/src/afd/sprites/front-shiny/0549--000--Lilligant.png b/src/afd/sprites/front-shiny/0549-000-Lilligant.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0549--000--Lilligant.png
rename to src/afd/sprites/front-shiny/0549-000-Lilligant.png
diff --git a/src/afd/sprites/front-shiny/0550--000--Basculin.png b/src/afd/sprites/front-shiny/0550-000-Basculin.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0550--000--Basculin.png
rename to src/afd/sprites/front-shiny/0550-000-Basculin.png
diff --git a/src/afd/sprites/front-shiny/0551--000--Sandile.png b/src/afd/sprites/front-shiny/0551-000-Sandile.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0551--000--Sandile.png
rename to src/afd/sprites/front-shiny/0551-000-Sandile.png
diff --git a/src/afd/sprites/front-shiny/0552--000--Krokorok.png b/src/afd/sprites/front-shiny/0552-000-Krokorok.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0552--000--Krokorok.png
rename to src/afd/sprites/front-shiny/0552-000-Krokorok.png
diff --git a/src/afd/sprites/front-shiny/0553--000--Krookodile.png b/src/afd/sprites/front-shiny/0553-000-Krookodile.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0553--000--Krookodile.png
rename to src/afd/sprites/front-shiny/0553-000-Krookodile.png
diff --git a/src/afd/sprites/front-shiny/0554--000--Darumaka.png b/src/afd/sprites/front-shiny/0554-000-Darumaka.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0554--000--Darumaka.png
rename to src/afd/sprites/front-shiny/0554-000-Darumaka.png
diff --git a/src/afd/sprites/front-shiny/0554--420--Darumaka--Galar.png b/src/afd/sprites/front-shiny/0554-420-Darumaka-Galar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0554--420--Darumaka--Galar.png
rename to src/afd/sprites/front-shiny/0554-420-Darumaka-Galar.png
diff --git a/src/afd/sprites/front-shiny/0555--000--Darmanitan.png b/src/afd/sprites/front-shiny/0555-000-Darmanitan.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0555--000--Darmanitan.png
rename to src/afd/sprites/front-shiny/0555-000-Darmanitan.png
diff --git a/src/afd/sprites/front-shiny/0555--420--Darmanitan--Galar.png b/src/afd/sprites/front-shiny/0555-420-Darmanitan-Galar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0555--420--Darmanitan--Galar.png
rename to src/afd/sprites/front-shiny/0555-420-Darmanitan-Galar.png
diff --git a/src/afd/sprites/front-shiny/0555--420--Darmanitan--Galar-Zen.png b/src/afd/sprites/front-shiny/0555-420-Darmanitan-Galar~Zen.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0555--420--Darmanitan--Galar-Zen.png
rename to src/afd/sprites/front-shiny/0555-420-Darmanitan-Galar~Zen.png
diff --git a/src/afd/sprites/front-shiny/0555--420--Darmanitan--Zen.png b/src/afd/sprites/front-shiny/0555-420-Darmanitan-Zen.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0555--420--Darmanitan--Zen.png
rename to src/afd/sprites/front-shiny/0555-420-Darmanitan-Zen.png
diff --git a/src/afd/sprites/front-shiny/0556--000--Maractus.png b/src/afd/sprites/front-shiny/0556-000-Maractus.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0556--000--Maractus.png
rename to src/afd/sprites/front-shiny/0556-000-Maractus.png
diff --git a/src/afd/sprites/front-shiny/0557--000--Dwebble.png b/src/afd/sprites/front-shiny/0557-000-Dwebble.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0557--000--Dwebble.png
rename to src/afd/sprites/front-shiny/0557-000-Dwebble.png
diff --git a/src/afd/sprites/front-shiny/0558--000--Crustle.png b/src/afd/sprites/front-shiny/0558-000-Crustle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0558--000--Crustle.png
rename to src/afd/sprites/front-shiny/0558-000-Crustle.png
diff --git a/src/afd/sprites/front-shiny/0559--000--Scraggy.png b/src/afd/sprites/front-shiny/0559-000-Scraggy.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0559--000--Scraggy.png
rename to src/afd/sprites/front-shiny/0559-000-Scraggy.png
diff --git a/src/afd/sprites/front-shiny/0560--000--Scrafty.png b/src/afd/sprites/front-shiny/0560-000-Scrafty.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0560--000--Scrafty.png
rename to src/afd/sprites/front-shiny/0560-000-Scrafty.png
diff --git a/src/afd/sprites/front-shiny/0561--000--Sigilyph.png b/src/afd/sprites/front-shiny/0561-000-Sigilyph.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0561--000--Sigilyph.png
rename to src/afd/sprites/front-shiny/0561-000-Sigilyph.png
diff --git a/src/afd/sprites/front-shiny/0562--000--Yamask.png b/src/afd/sprites/front-shiny/0562-000-Yamask.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0562--000--Yamask.png
rename to src/afd/sprites/front-shiny/0562-000-Yamask.png
diff --git a/src/afd/sprites/front-shiny/0562--420--Yamask--Galar.png b/src/afd/sprites/front-shiny/0562-420-Yamask-Galar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0562--420--Yamask--Galar.png
rename to src/afd/sprites/front-shiny/0562-420-Yamask-Galar.png
diff --git a/src/afd/sprites/front-shiny/0563--000--Cofagrigus.png b/src/afd/sprites/front-shiny/0563-000-Cofagrigus.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0563--000--Cofagrigus.png
rename to src/afd/sprites/front-shiny/0563-000-Cofagrigus.png
diff --git a/src/afd/sprites/front-shiny/0564--000--Tirtouga.png b/src/afd/sprites/front-shiny/0564-000-Tirtouga.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0564--000--Tirtouga.png
rename to src/afd/sprites/front-shiny/0564-000-Tirtouga.png
diff --git a/src/afd/sprites/front-shiny/0565--000--Carracosta.png b/src/afd/sprites/front-shiny/0565-000-Carracosta.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0565--000--Carracosta.png
rename to src/afd/sprites/front-shiny/0565-000-Carracosta.png
diff --git a/src/afd/sprites/front-shiny/0566--000--Archen.png b/src/afd/sprites/front-shiny/0566-000-Archen.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0566--000--Archen.png
rename to src/afd/sprites/front-shiny/0566-000-Archen.png
diff --git a/src/afd/sprites/front-shiny/0567--000--Archeops.png b/src/afd/sprites/front-shiny/0567-000-Archeops.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0567--000--Archeops.png
rename to src/afd/sprites/front-shiny/0567-000-Archeops.png
diff --git a/src/afd/sprites/front-shiny/0568--000--Trubbish.png b/src/afd/sprites/front-shiny/0568-000-Trubbish.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0568--000--Trubbish.png
rename to src/afd/sprites/front-shiny/0568-000-Trubbish.png
diff --git a/src/afd/sprites/front-shiny/0569--000--Garbodor.png b/src/afd/sprites/front-shiny/0569-000-Garbodor.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0569--000--Garbodor.png
rename to src/afd/sprites/front-shiny/0569-000-Garbodor.png
diff --git a/src/afd/sprites/front-shiny/0569--420--Garbodor--Gmax.png b/src/afd/sprites/front-shiny/0569-420-Garbodor-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0569--420--Garbodor--Gmax.png
rename to src/afd/sprites/front-shiny/0569-420-Garbodor-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0570--000--Zorua.png b/src/afd/sprites/front-shiny/0570-000-Zorua.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0570--000--Zorua.png
rename to src/afd/sprites/front-shiny/0570-000-Zorua.png
diff --git a/src/afd/sprites/front-shiny/0571--000--Zoroark.png b/src/afd/sprites/front-shiny/0571-000-Zoroark.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0571--000--Zoroark.png
rename to src/afd/sprites/front-shiny/0571-000-Zoroark.png
diff --git a/src/afd/sprites/front-shiny/0572--000--Minccino.png b/src/afd/sprites/front-shiny/0572-000-Minccino.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0572--000--Minccino.png
rename to src/afd/sprites/front-shiny/0572-000-Minccino.png
diff --git a/src/afd/sprites/front-shiny/0573--000--Cinccino.png b/src/afd/sprites/front-shiny/0573-000-Cinccino.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0573--000--Cinccino.png
rename to src/afd/sprites/front-shiny/0573-000-Cinccino.png
diff --git a/src/afd/sprites/front-shiny/0574--000--Gothita.png b/src/afd/sprites/front-shiny/0574-000-Gothita.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0574--000--Gothita.png
rename to src/afd/sprites/front-shiny/0574-000-Gothita.png
diff --git a/src/afd/sprites/front-shiny/0575--000--Gothorita.png b/src/afd/sprites/front-shiny/0575-000-Gothorita.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0575--000--Gothorita.png
rename to src/afd/sprites/front-shiny/0575-000-Gothorita.png
diff --git a/src/afd/sprites/front-shiny/0576--000--Gothitelle.png b/src/afd/sprites/front-shiny/0576-000-Gothitelle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0576--000--Gothitelle.png
rename to src/afd/sprites/front-shiny/0576-000-Gothitelle.png
diff --git a/src/afd/sprites/front-shiny/0577--000--Solosis.png b/src/afd/sprites/front-shiny/0577-000-Solosis.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0577--000--Solosis.png
rename to src/afd/sprites/front-shiny/0577-000-Solosis.png
diff --git a/src/afd/sprites/front-shiny/0578--000--Duosion.png b/src/afd/sprites/front-shiny/0578-000-Duosion.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0578--000--Duosion.png
rename to src/afd/sprites/front-shiny/0578-000-Duosion.png
diff --git a/src/afd/sprites/front-shiny/0579--000--Reuniclus.png b/src/afd/sprites/front-shiny/0579-000-Reuniclus.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0579--000--Reuniclus.png
rename to src/afd/sprites/front-shiny/0579-000-Reuniclus.png
diff --git a/src/afd/sprites/front-shiny/0580--000--Ducklett.png b/src/afd/sprites/front-shiny/0580-000-Ducklett.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0580--000--Ducklett.png
rename to src/afd/sprites/front-shiny/0580-000-Ducklett.png
diff --git a/src/afd/sprites/front-shiny/0581--000--Swanna.png b/src/afd/sprites/front-shiny/0581-000-Swanna.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0581--000--Swanna.png
rename to src/afd/sprites/front-shiny/0581-000-Swanna.png
diff --git a/src/afd/sprites/front-shiny/0582--000--Vanillite.png b/src/afd/sprites/front-shiny/0582-000-Vanillite.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0582--000--Vanillite.png
rename to src/afd/sprites/front-shiny/0582-000-Vanillite.png
diff --git a/src/afd/sprites/front-shiny/0583--000--Vanillish.png b/src/afd/sprites/front-shiny/0583-000-Vanillish.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0583--000--Vanillish.png
rename to src/afd/sprites/front-shiny/0583-000-Vanillish.png
diff --git a/src/afd/sprites/front-shiny/0584--000--Vanilluxe.png b/src/afd/sprites/front-shiny/0584-000-Vanilluxe.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0584--000--Vanilluxe.png
rename to src/afd/sprites/front-shiny/0584-000-Vanilluxe.png
diff --git a/src/afd/sprites/front-shiny/0585--000--Deerling.png b/src/afd/sprites/front-shiny/0585-000-Deerling.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0585--000--Deerling.png
rename to src/afd/sprites/front-shiny/0585-000-Deerling.png
diff --git a/src/afd/sprites/front-shiny/0586--000--Sawsbuck.png b/src/afd/sprites/front-shiny/0586-000-Sawsbuck.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0586--000--Sawsbuck.png
rename to src/afd/sprites/front-shiny/0586-000-Sawsbuck.png
diff --git a/src/afd/sprites/front-shiny/0587--000--Emolga.png b/src/afd/sprites/front-shiny/0587-000-Emolga.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0587--000--Emolga.png
rename to src/afd/sprites/front-shiny/0587-000-Emolga.png
diff --git a/src/afd/sprites/front-shiny/0588--000--Karrablast.png b/src/afd/sprites/front-shiny/0588-000-Karrablast.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0588--000--Karrablast.png
rename to src/afd/sprites/front-shiny/0588-000-Karrablast.png
diff --git a/src/afd/sprites/front-shiny/0589--000--Escavalier.png b/src/afd/sprites/front-shiny/0589-000-Escavalier.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0589--000--Escavalier.png
rename to src/afd/sprites/front-shiny/0589-000-Escavalier.png
diff --git a/src/afd/sprites/front-shiny/0590--000--Foongus.png b/src/afd/sprites/front-shiny/0590-000-Foongus.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0590--000--Foongus.png
rename to src/afd/sprites/front-shiny/0590-000-Foongus.png
diff --git a/src/afd/sprites/front-shiny/0591--000--Amoonguss.png b/src/afd/sprites/front-shiny/0591-000-Amoonguss.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0591--000--Amoonguss.png
rename to src/afd/sprites/front-shiny/0591-000-Amoonguss.png
diff --git a/src/afd/sprites/front-shiny/0592--000--Frillish.png b/src/afd/sprites/front-shiny/0592-000-Frillish.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0592--000--Frillish.png
rename to src/afd/sprites/front-shiny/0592-000-Frillish.png
diff --git a/src/afd/sprites/front-shiny/0593--000--Jellicent.png b/src/afd/sprites/front-shiny/0593-000-Jellicent.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0593--000--Jellicent.png
rename to src/afd/sprites/front-shiny/0593-000-Jellicent.png
diff --git a/src/afd/sprites/front-shiny/0594--000--Alomomola.png b/src/afd/sprites/front-shiny/0594-000-Alomomola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0594--000--Alomomola.png
rename to src/afd/sprites/front-shiny/0594-000-Alomomola.png
diff --git a/src/afd/sprites/front-shiny/0595--000--Joltik.png b/src/afd/sprites/front-shiny/0595-000-Joltik.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0595--000--Joltik.png
rename to src/afd/sprites/front-shiny/0595-000-Joltik.png
diff --git a/src/afd/sprites/front-shiny/0596--000--Galvantula.png b/src/afd/sprites/front-shiny/0596-000-Galvantula.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0596--000--Galvantula.png
rename to src/afd/sprites/front-shiny/0596-000-Galvantula.png
diff --git a/src/afd/sprites/front-shiny/0597--000--Ferroseed.png b/src/afd/sprites/front-shiny/0597-000-Ferroseed.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0597--000--Ferroseed.png
rename to src/afd/sprites/front-shiny/0597-000-Ferroseed.png
diff --git a/src/afd/sprites/front-shiny/0598--000--Ferrothorn.png b/src/afd/sprites/front-shiny/0598-000-Ferrothorn.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0598--000--Ferrothorn.png
rename to src/afd/sprites/front-shiny/0598-000-Ferrothorn.png
diff --git a/src/afd/sprites/front-shiny/0599--000--Klink.png b/src/afd/sprites/front-shiny/0599-000-Klink.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0599--000--Klink.png
rename to src/afd/sprites/front-shiny/0599-000-Klink.png
diff --git a/src/afd/sprites/front-shiny/0600--000--Klang.png b/src/afd/sprites/front-shiny/0600-000-Klang.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0600--000--Klang.png
rename to src/afd/sprites/front-shiny/0600-000-Klang.png
diff --git a/src/afd/sprites/front-shiny/0601--000--Klinklang.png b/src/afd/sprites/front-shiny/0601-000-Klinklang.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0601--000--Klinklang.png
rename to src/afd/sprites/front-shiny/0601-000-Klinklang.png
diff --git a/src/afd/sprites/front-shiny/0602--000--Tynamo.png b/src/afd/sprites/front-shiny/0602-000-Tynamo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0602--000--Tynamo.png
rename to src/afd/sprites/front-shiny/0602-000-Tynamo.png
diff --git a/src/afd/sprites/front-shiny/0603--000--Eelektrik.png b/src/afd/sprites/front-shiny/0603-000-Eelektrik.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0603--000--Eelektrik.png
rename to src/afd/sprites/front-shiny/0603-000-Eelektrik.png
diff --git a/src/afd/sprites/front-shiny/0604--000--Eelektross.png b/src/afd/sprites/front-shiny/0604-000-Eelektross.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0604--000--Eelektross.png
rename to src/afd/sprites/front-shiny/0604-000-Eelektross.png
diff --git a/src/afd/sprites/front-shiny/0605--000--Elgyem.png b/src/afd/sprites/front-shiny/0605-000-Elgyem.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0605--000--Elgyem.png
rename to src/afd/sprites/front-shiny/0605-000-Elgyem.png
diff --git a/src/afd/sprites/front-shiny/0606--000--Beheeyem.png b/src/afd/sprites/front-shiny/0606-000-Beheeyem.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0606--000--Beheeyem.png
rename to src/afd/sprites/front-shiny/0606-000-Beheeyem.png
diff --git a/src/afd/sprites/front-shiny/0607--000--Litwick.png b/src/afd/sprites/front-shiny/0607-000-Litwick.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0607--000--Litwick.png
rename to src/afd/sprites/front-shiny/0607-000-Litwick.png
diff --git a/src/afd/sprites/front-shiny/0608--000--Lampent.png b/src/afd/sprites/front-shiny/0608-000-Lampent.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0608--000--Lampent.png
rename to src/afd/sprites/front-shiny/0608-000-Lampent.png
diff --git a/src/afd/sprites/front-shiny/0609--000--Chandelure.png b/src/afd/sprites/front-shiny/0609-000-Chandelure.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0609--000--Chandelure.png
rename to src/afd/sprites/front-shiny/0609-000-Chandelure.png
diff --git a/src/afd/sprites/front-shiny/0610--000--Axew.png b/src/afd/sprites/front-shiny/0610-000-Axew.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0610--000--Axew.png
rename to src/afd/sprites/front-shiny/0610-000-Axew.png
diff --git a/src/afd/sprites/front-shiny/0611--000--Fraxure.png b/src/afd/sprites/front-shiny/0611-000-Fraxure.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0611--000--Fraxure.png
rename to src/afd/sprites/front-shiny/0611-000-Fraxure.png
diff --git a/src/afd/sprites/front-shiny/0612--000--Haxorus.png b/src/afd/sprites/front-shiny/0612-000-Haxorus.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0612--000--Haxorus.png
rename to src/afd/sprites/front-shiny/0612-000-Haxorus.png
diff --git a/src/afd/sprites/front-shiny/0613--000--Cubchoo.png b/src/afd/sprites/front-shiny/0613-000-Cubchoo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0613--000--Cubchoo.png
rename to src/afd/sprites/front-shiny/0613-000-Cubchoo.png
diff --git a/src/afd/sprites/front-shiny/0614--000--Beartic.png b/src/afd/sprites/front-shiny/0614-000-Beartic.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0614--000--Beartic.png
rename to src/afd/sprites/front-shiny/0614-000-Beartic.png
diff --git a/src/afd/sprites/front-shiny/0615--000--Cryogonal.png b/src/afd/sprites/front-shiny/0615-000-Cryogonal.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0615--000--Cryogonal.png
rename to src/afd/sprites/front-shiny/0615-000-Cryogonal.png
diff --git a/src/afd/sprites/front-shiny/0616--000--Shelmet.png b/src/afd/sprites/front-shiny/0616-000-Shelmet.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0616--000--Shelmet.png
rename to src/afd/sprites/front-shiny/0616-000-Shelmet.png
diff --git a/src/afd/sprites/front-shiny/0617--000--Accelgor.png b/src/afd/sprites/front-shiny/0617-000-Accelgor.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0617--000--Accelgor.png
rename to src/afd/sprites/front-shiny/0617-000-Accelgor.png
diff --git a/src/afd/sprites/front-shiny/0618--000--Stunfisk.png b/src/afd/sprites/front-shiny/0618-000-Stunfisk.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0618--000--Stunfisk.png
rename to src/afd/sprites/front-shiny/0618-000-Stunfisk.png
diff --git a/src/afd/sprites/front-shiny/0618--420--Stunfisk--Galar.png b/src/afd/sprites/front-shiny/0618-420-Stunfisk-Galar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0618--420--Stunfisk--Galar.png
rename to src/afd/sprites/front-shiny/0618-420-Stunfisk-Galar.png
diff --git a/src/afd/sprites/front-shiny/0619--000--Mienfoo.png b/src/afd/sprites/front-shiny/0619-000-Mienfoo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0619--000--Mienfoo.png
rename to src/afd/sprites/front-shiny/0619-000-Mienfoo.png
diff --git a/src/afd/sprites/front-shiny/0620--000--Mienshao.png b/src/afd/sprites/front-shiny/0620-000-Mienshao.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0620--000--Mienshao.png
rename to src/afd/sprites/front-shiny/0620-000-Mienshao.png
diff --git a/src/afd/sprites/front-shiny/0621--000--Druddigon.png b/src/afd/sprites/front-shiny/0621-000-Druddigon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0621--000--Druddigon.png
rename to src/afd/sprites/front-shiny/0621-000-Druddigon.png
diff --git a/src/afd/sprites/front-shiny/0622--000--Golett.png b/src/afd/sprites/front-shiny/0622-000-Golett.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0622--000--Golett.png
rename to src/afd/sprites/front-shiny/0622-000-Golett.png
diff --git a/src/afd/sprites/front-shiny/0623--000--Golurk.png b/src/afd/sprites/front-shiny/0623-000-Golurk.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0623--000--Golurk.png
rename to src/afd/sprites/front-shiny/0623-000-Golurk.png
diff --git a/src/afd/sprites/front-shiny/0624--000--Pawniard.png b/src/afd/sprites/front-shiny/0624-000-Pawniard.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0624--000--Pawniard.png
rename to src/afd/sprites/front-shiny/0624-000-Pawniard.png
diff --git a/src/afd/sprites/front-shiny/0625--000--Bisharp.png b/src/afd/sprites/front-shiny/0625-000-Bisharp.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0625--000--Bisharp.png
rename to src/afd/sprites/front-shiny/0625-000-Bisharp.png
diff --git a/src/afd/sprites/front-shiny/0626--000--Bouffalant.png b/src/afd/sprites/front-shiny/0626-000-Bouffalant.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0626--000--Bouffalant.png
rename to src/afd/sprites/front-shiny/0626-000-Bouffalant.png
diff --git a/src/afd/sprites/front-shiny/0627--000--Rufflet.png b/src/afd/sprites/front-shiny/0627-000-Rufflet.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0627--000--Rufflet.png
rename to src/afd/sprites/front-shiny/0627-000-Rufflet.png
diff --git a/src/afd/sprites/front-shiny/0628--000--Braviary.png b/src/afd/sprites/front-shiny/0628-000-Braviary.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0628--000--Braviary.png
rename to src/afd/sprites/front-shiny/0628-000-Braviary.png
diff --git a/src/afd/sprites/front-shiny/0629--000--Vullaby.png b/src/afd/sprites/front-shiny/0629-000-Vullaby.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0629--000--Vullaby.png
rename to src/afd/sprites/front-shiny/0629-000-Vullaby.png
diff --git a/src/afd/sprites/front-shiny/0630--000--Mandibuzz.png b/src/afd/sprites/front-shiny/0630-000-Mandibuzz.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0630--000--Mandibuzz.png
rename to src/afd/sprites/front-shiny/0630-000-Mandibuzz.png
diff --git a/src/afd/sprites/front-shiny/0631--000--Heatmor.png b/src/afd/sprites/front-shiny/0631-000-Heatmor.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0631--000--Heatmor.png
rename to src/afd/sprites/front-shiny/0631-000-Heatmor.png
diff --git a/src/afd/sprites/front-shiny/0632--000--Durant.png b/src/afd/sprites/front-shiny/0632-000-Durant.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0632--000--Durant.png
rename to src/afd/sprites/front-shiny/0632-000-Durant.png
diff --git a/src/afd/sprites/front-shiny/0633--000--Deino.png b/src/afd/sprites/front-shiny/0633-000-Deino.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0633--000--Deino.png
rename to src/afd/sprites/front-shiny/0633-000-Deino.png
diff --git a/src/afd/sprites/front-shiny/0634--000--Zweilous.png b/src/afd/sprites/front-shiny/0634-000-Zweilous.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0634--000--Zweilous.png
rename to src/afd/sprites/front-shiny/0634-000-Zweilous.png
diff --git a/src/afd/sprites/front-shiny/0635--000--Hydreigon.png b/src/afd/sprites/front-shiny/0635-000-Hydreigon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0635--000--Hydreigon.png
rename to src/afd/sprites/front-shiny/0635-000-Hydreigon.png
diff --git a/src/afd/sprites/front-shiny/0636--000--Larvesta.png b/src/afd/sprites/front-shiny/0636-000-Larvesta.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0636--000--Larvesta.png
rename to src/afd/sprites/front-shiny/0636-000-Larvesta.png
diff --git a/src/afd/sprites/front-shiny/0637--000--Volcarona.png b/src/afd/sprites/front-shiny/0637-000-Volcarona.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0637--000--Volcarona.png
rename to src/afd/sprites/front-shiny/0637-000-Volcarona.png
diff --git a/src/afd/sprites/front-shiny/0638--000--Cobalion.png b/src/afd/sprites/front-shiny/0638-000-Cobalion.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0638--000--Cobalion.png
rename to src/afd/sprites/front-shiny/0638-000-Cobalion.png
diff --git a/src/afd/sprites/front-shiny/0639--000--Terrakion.png b/src/afd/sprites/front-shiny/0639-000-Terrakion.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0639--000--Terrakion.png
rename to src/afd/sprites/front-shiny/0639-000-Terrakion.png
diff --git a/src/afd/sprites/front-shiny/0640--000--Virizion.png b/src/afd/sprites/front-shiny/0640-000-Virizion.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0640--000--Virizion.png
rename to src/afd/sprites/front-shiny/0640-000-Virizion.png
diff --git a/src/afd/sprites/front-shiny/0641--000--Tornadus.png b/src/afd/sprites/front-shiny/0641-000-Tornadus.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0641--000--Tornadus.png
rename to src/afd/sprites/front-shiny/0641-000-Tornadus.png
diff --git a/src/afd/sprites/front-shiny/0642--000--Thundurus.png b/src/afd/sprites/front-shiny/0642-000-Thundurus.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0642--000--Thundurus.png
rename to src/afd/sprites/front-shiny/0642-000-Thundurus.png
diff --git a/src/afd/sprites/front-shiny/0642--420--Thundurus--Therian.png b/src/afd/sprites/front-shiny/0642-420-Thundurus-Therian.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0642--420--Thundurus--Therian.png
rename to src/afd/sprites/front-shiny/0642-420-Thundurus-Therian.png
diff --git a/src/afd/sprites/front-shiny/0643--000--Reshiram.png b/src/afd/sprites/front-shiny/0643-000-Reshiram.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0643--000--Reshiram.png
rename to src/afd/sprites/front-shiny/0643-000-Reshiram.png
diff --git a/src/afd/sprites/front-shiny/0644--000--Zekrom.png b/src/afd/sprites/front-shiny/0644-000-Zekrom.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0644--000--Zekrom.png
rename to src/afd/sprites/front-shiny/0644-000-Zekrom.png
diff --git a/src/afd/sprites/front-shiny/0645--000--Landorus.png b/src/afd/sprites/front-shiny/0645-000-Landorus.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0645--000--Landorus.png
rename to src/afd/sprites/front-shiny/0645-000-Landorus.png
diff --git a/src/afd/sprites/front-shiny/0645--420--Landorus--Therian.png b/src/afd/sprites/front-shiny/0645-420-Landorus-Therian.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0645--420--Landorus--Therian.png
rename to src/afd/sprites/front-shiny/0645-420-Landorus-Therian.png
diff --git a/src/afd/sprites/front-shiny/0646--000--Kyurem.png b/src/afd/sprites/front-shiny/0646-000-Kyurem.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0646--000--Kyurem.png
rename to src/afd/sprites/front-shiny/0646-000-Kyurem.png
diff --git a/src/afd/sprites/front-shiny/0646--420--Kyurem--Black.png b/src/afd/sprites/front-shiny/0646-420-Kyurem-Black.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0646--420--Kyurem--Black.png
rename to src/afd/sprites/front-shiny/0646-420-Kyurem-Black.png
diff --git a/src/afd/sprites/front-shiny/0646--420--Kyurem--White.png b/src/afd/sprites/front-shiny/0646-420-Kyurem-White.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0646--420--Kyurem--White.png
rename to src/afd/sprites/front-shiny/0646-420-Kyurem-White.png
diff --git a/src/afd/sprites/front-shiny/0647--000--Keldeo.png b/src/afd/sprites/front-shiny/0647-000-Keldeo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0647--000--Keldeo.png
rename to src/afd/sprites/front-shiny/0647-000-Keldeo.png
diff --git a/src/afd/sprites/front-shiny/0647--420--Keldeo--Resolute.png b/src/afd/sprites/front-shiny/0647-420-Keldeo-Resolute.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0647--420--Keldeo--Resolute.png
rename to src/afd/sprites/front-shiny/0647-420-Keldeo-Resolute.png
diff --git a/src/afd/sprites/front-shiny/0648--000--Meloetta.png b/src/afd/sprites/front-shiny/0648-000-Meloetta.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0648--000--Meloetta.png
rename to src/afd/sprites/front-shiny/0648-000-Meloetta.png
diff --git a/src/afd/sprites/front-shiny/0648--420--Meloetta--Pirouette.png b/src/afd/sprites/front-shiny/0648-420-Meloetta-Pirouette.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0648--420--Meloetta--Pirouette.png
rename to src/afd/sprites/front-shiny/0648-420-Meloetta-Pirouette.png
diff --git a/src/afd/sprites/front-shiny/0649--000--Genesect.png b/src/afd/sprites/front-shiny/0649-000-Genesect.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0649--000--Genesect.png
rename to src/afd/sprites/front-shiny/0649-000-Genesect.png
diff --git a/src/afd/sprites/front-shiny/0649--420--Genesect--Burn.png b/src/afd/sprites/front-shiny/0649-420-Genesect-Burn.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0649--420--Genesect--Burn.png
rename to src/afd/sprites/front-shiny/0649-420-Genesect-Burn.png
diff --git a/src/afd/sprites/front-shiny/0649--420--Genesect--Chill.png b/src/afd/sprites/front-shiny/0649-420-Genesect-Chill.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0649--420--Genesect--Chill.png
rename to src/afd/sprites/front-shiny/0649-420-Genesect-Chill.png
diff --git a/src/afd/sprites/front-shiny/0649--420--Genesect--Douse.png b/src/afd/sprites/front-shiny/0649-420-Genesect-Douse.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0649--420--Genesect--Douse.png
rename to src/afd/sprites/front-shiny/0649-420-Genesect-Douse.png
diff --git a/src/afd/sprites/front-shiny/0649--420--Genesect--Shock.png b/src/afd/sprites/front-shiny/0649-420-Genesect-Shock.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0649--420--Genesect--Shock.png
rename to src/afd/sprites/front-shiny/0649-420-Genesect-Shock.png
diff --git a/src/afd/sprites/front-shiny/0650--000--Chespin.png b/src/afd/sprites/front-shiny/0650-000-Chespin.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0650--000--Chespin.png
rename to src/afd/sprites/front-shiny/0650-000-Chespin.png
diff --git a/src/afd/sprites/front-shiny/0651--000--Quilladin.png b/src/afd/sprites/front-shiny/0651-000-Quilladin.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0651--000--Quilladin.png
rename to src/afd/sprites/front-shiny/0651-000-Quilladin.png
diff --git a/src/afd/sprites/front-shiny/0652--000--Chesnaught.png b/src/afd/sprites/front-shiny/0652-000-Chesnaught.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0652--000--Chesnaught.png
rename to src/afd/sprites/front-shiny/0652-000-Chesnaught.png
diff --git a/src/afd/sprites/front-shiny/0653--000--Fennekin.png b/src/afd/sprites/front-shiny/0653-000-Fennekin.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0653--000--Fennekin.png
rename to src/afd/sprites/front-shiny/0653-000-Fennekin.png
diff --git a/src/afd/sprites/front-shiny/0654--000--Braixen.png b/src/afd/sprites/front-shiny/0654-000-Braixen.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0654--000--Braixen.png
rename to src/afd/sprites/front-shiny/0654-000-Braixen.png
diff --git a/src/afd/sprites/front-shiny/0655--000--Delphox.png b/src/afd/sprites/front-shiny/0655-000-Delphox.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0655--000--Delphox.png
rename to src/afd/sprites/front-shiny/0655-000-Delphox.png
diff --git a/src/afd/sprites/front-shiny/0656--000--Froakie.png b/src/afd/sprites/front-shiny/0656-000-Froakie.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0656--000--Froakie.png
rename to src/afd/sprites/front-shiny/0656-000-Froakie.png
diff --git a/src/afd/sprites/front-shiny/0657--000--Frogadier.png b/src/afd/sprites/front-shiny/0657-000-Frogadier.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0657--000--Frogadier.png
rename to src/afd/sprites/front-shiny/0657-000-Frogadier.png
diff --git a/src/afd/sprites/front-shiny/0658--000--Greninja.png b/src/afd/sprites/front-shiny/0658-000-Greninja.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0658--000--Greninja.png
rename to src/afd/sprites/front-shiny/0658-000-Greninja.png
diff --git a/src/afd/sprites/front-shiny/0658--420--Greninja--Ash.png b/src/afd/sprites/front-shiny/0658-420-Greninja-Ash.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0658--420--Greninja--Ash.png
rename to src/afd/sprites/front-shiny/0658-420-Greninja-Ash.png
diff --git a/src/afd/sprites/front-shiny/0659--000--Bunnelby.png b/src/afd/sprites/front-shiny/0659-000-Bunnelby.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0659--000--Bunnelby.png
rename to src/afd/sprites/front-shiny/0659-000-Bunnelby.png
diff --git a/src/afd/sprites/front-shiny/0660--000--Diggersby.png b/src/afd/sprites/front-shiny/0660-000-Diggersby.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0660--000--Diggersby.png
rename to src/afd/sprites/front-shiny/0660-000-Diggersby.png
diff --git a/src/afd/sprites/front-shiny/0661--000--Fletchling.png b/src/afd/sprites/front-shiny/0661-000-Fletchling.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0661--000--Fletchling.png
rename to src/afd/sprites/front-shiny/0661-000-Fletchling.png
diff --git a/src/afd/sprites/front-shiny/0662--000--Fletchinder.png b/src/afd/sprites/front-shiny/0662-000-Fletchinder.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0662--000--Fletchinder.png
rename to src/afd/sprites/front-shiny/0662-000-Fletchinder.png
diff --git a/src/afd/sprites/front-shiny/0663--000--Talonflame.png b/src/afd/sprites/front-shiny/0663-000-Talonflame.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0663--000--Talonflame.png
rename to src/afd/sprites/front-shiny/0663-000-Talonflame.png
diff --git a/src/afd/sprites/front-shiny/0664--000--Scatterbug.png b/src/afd/sprites/front-shiny/0664-000-Scatterbug.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0664--000--Scatterbug.png
rename to src/afd/sprites/front-shiny/0664-000-Scatterbug.png
diff --git a/src/afd/sprites/front-shiny/0665--000--Spewpa.png b/src/afd/sprites/front-shiny/0665-000-Spewpa.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0665--000--Spewpa.png
rename to src/afd/sprites/front-shiny/0665-000-Spewpa.png
diff --git a/src/afd/sprites/front-shiny/0666--000--Vivillon.png b/src/afd/sprites/front-shiny/0666-000-Vivillon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0666--000--Vivillon.png
rename to src/afd/sprites/front-shiny/0666-000-Vivillon.png
diff --git a/src/afd/sprites/front-shiny/0667--000--Litleo.png b/src/afd/sprites/front-shiny/0667-000-Litleo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0667--000--Litleo.png
rename to src/afd/sprites/front-shiny/0667-000-Litleo.png
diff --git a/src/afd/sprites/front-shiny/0668--000--Pyroar.png b/src/afd/sprites/front-shiny/0668-000-Pyroar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0668--000--Pyroar.png
rename to src/afd/sprites/front-shiny/0668-000-Pyroar.png
diff --git a/src/afd/sprites/front-shiny/0669--000--Flabe__0301be__0301.png b/src/afd/sprites/front-shiny/0669-000-Flabe__0301be__0301.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0669--000--Flabe__0301be__0301.png
rename to src/afd/sprites/front-shiny/0669-000-Flabe__0301be__0301.png
diff --git a/src/afd/sprites/front-shiny/0670--000--Floette.png b/src/afd/sprites/front-shiny/0670-000-Floette.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0670--000--Floette.png
rename to src/afd/sprites/front-shiny/0670-000-Floette.png
diff --git a/src/afd/sprites/front-shiny/0670--420--Floette--Eternal.png b/src/afd/sprites/front-shiny/0670-420-Floette-Eternal.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0670--420--Floette--Eternal.png
rename to src/afd/sprites/front-shiny/0670-420-Floette-Eternal.png
diff --git a/src/afd/sprites/front-shiny/0671--000--Florges.png b/src/afd/sprites/front-shiny/0671-000-Florges.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0671--000--Florges.png
rename to src/afd/sprites/front-shiny/0671-000-Florges.png
diff --git a/src/afd/sprites/front-shiny/0672--000--Skiddo.png b/src/afd/sprites/front-shiny/0672-000-Skiddo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0672--000--Skiddo.png
rename to src/afd/sprites/front-shiny/0672-000-Skiddo.png
diff --git a/src/afd/sprites/front-shiny/0673--000--Gogoat.png b/src/afd/sprites/front-shiny/0673-000-Gogoat.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0673--000--Gogoat.png
rename to src/afd/sprites/front-shiny/0673-000-Gogoat.png
diff --git a/src/afd/sprites/front-shiny/0674--000--Pancham.png b/src/afd/sprites/front-shiny/0674-000-Pancham.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0674--000--Pancham.png
rename to src/afd/sprites/front-shiny/0674-000-Pancham.png
diff --git a/src/afd/sprites/front-shiny/0675--000--Pangoro.png b/src/afd/sprites/front-shiny/0675-000-Pangoro.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0675--000--Pangoro.png
rename to src/afd/sprites/front-shiny/0675-000-Pangoro.png
diff --git a/src/afd/sprites/front-shiny/0676--000--Furfrou.png b/src/afd/sprites/front-shiny/0676-000-Furfrou.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0676--000--Furfrou.png
rename to src/afd/sprites/front-shiny/0676-000-Furfrou.png
diff --git a/src/afd/sprites/front-shiny/0677--000--Espurr.png b/src/afd/sprites/front-shiny/0677-000-Espurr.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0677--000--Espurr.png
rename to src/afd/sprites/front-shiny/0677-000-Espurr.png
diff --git a/src/afd/sprites/front-shiny/0678--000--Meowstic.png b/src/afd/sprites/front-shiny/0678-000-Meowstic.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0678--000--Meowstic.png
rename to src/afd/sprites/front-shiny/0678-000-Meowstic.png
diff --git a/src/afd/sprites/front-shiny/0678--420--Meowstic--F.png b/src/afd/sprites/front-shiny/0678-420-Meowstic-F.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0678--420--Meowstic--F.png
rename to src/afd/sprites/front-shiny/0678-420-Meowstic-F.png
diff --git a/src/afd/sprites/front-shiny/0679--000--Honedge.png b/src/afd/sprites/front-shiny/0679-000-Honedge.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0679--000--Honedge.png
rename to src/afd/sprites/front-shiny/0679-000-Honedge.png
diff --git a/src/afd/sprites/front-shiny/0680--000--Doublade.png b/src/afd/sprites/front-shiny/0680-000-Doublade.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0680--000--Doublade.png
rename to src/afd/sprites/front-shiny/0680-000-Doublade.png
diff --git a/src/afd/sprites/front-shiny/0681--000--Aegislash.png b/src/afd/sprites/front-shiny/0681-000-Aegislash.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0681--000--Aegislash.png
rename to src/afd/sprites/front-shiny/0681-000-Aegislash.png
diff --git a/src/afd/sprites/front-shiny/0681--420--Aegislash--Blade.png b/src/afd/sprites/front-shiny/0681-420-Aegislash-Blade.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0681--420--Aegislash--Blade.png
rename to src/afd/sprites/front-shiny/0681-420-Aegislash-Blade.png
diff --git a/src/afd/sprites/front-shiny/0682--000--Spritzee.png b/src/afd/sprites/front-shiny/0682-000-Spritzee.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0682--000--Spritzee.png
rename to src/afd/sprites/front-shiny/0682-000-Spritzee.png
diff --git a/src/afd/sprites/front-shiny/0683--000--Aromatisse.png b/src/afd/sprites/front-shiny/0683-000-Aromatisse.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0683--000--Aromatisse.png
rename to src/afd/sprites/front-shiny/0683-000-Aromatisse.png
diff --git a/src/afd/sprites/front-shiny/0684--000--Swirlix.png b/src/afd/sprites/front-shiny/0684-000-Swirlix.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0684--000--Swirlix.png
rename to src/afd/sprites/front-shiny/0684-000-Swirlix.png
diff --git a/src/afd/sprites/front-shiny/0685--000--Slurpuff.png b/src/afd/sprites/front-shiny/0685-000-Slurpuff.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0685--000--Slurpuff.png
rename to src/afd/sprites/front-shiny/0685-000-Slurpuff.png
diff --git a/src/afd/sprites/front-shiny/0686--000--Inkay.png b/src/afd/sprites/front-shiny/0686-000-Inkay.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0686--000--Inkay.png
rename to src/afd/sprites/front-shiny/0686-000-Inkay.png
diff --git a/src/afd/sprites/front-shiny/0687--000--Malamar.png b/src/afd/sprites/front-shiny/0687-000-Malamar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0687--000--Malamar.png
rename to src/afd/sprites/front-shiny/0687-000-Malamar.png
diff --git a/src/afd/sprites/front-shiny/0688--000--Binacle.png b/src/afd/sprites/front-shiny/0688-000-Binacle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0688--000--Binacle.png
rename to src/afd/sprites/front-shiny/0688-000-Binacle.png
diff --git a/src/afd/sprites/front-shiny/0689--000--Barbaracle.png b/src/afd/sprites/front-shiny/0689-000-Barbaracle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0689--000--Barbaracle.png
rename to src/afd/sprites/front-shiny/0689-000-Barbaracle.png
diff --git a/src/afd/sprites/front-shiny/0690--000--Skrelp.png b/src/afd/sprites/front-shiny/0690-000-Skrelp.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0690--000--Skrelp.png
rename to src/afd/sprites/front-shiny/0690-000-Skrelp.png
diff --git a/src/afd/sprites/front-shiny/0691--000--Dragalge.png b/src/afd/sprites/front-shiny/0691-000-Dragalge.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0691--000--Dragalge.png
rename to src/afd/sprites/front-shiny/0691-000-Dragalge.png
diff --git a/src/afd/sprites/front-shiny/0692--000--Clauncher.png b/src/afd/sprites/front-shiny/0692-000-Clauncher.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0692--000--Clauncher.png
rename to src/afd/sprites/front-shiny/0692-000-Clauncher.png
diff --git a/src/afd/sprites/front-shiny/0693--000--Clawitzer.png b/src/afd/sprites/front-shiny/0693-000-Clawitzer.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0693--000--Clawitzer.png
rename to src/afd/sprites/front-shiny/0693-000-Clawitzer.png
diff --git a/src/afd/sprites/front-shiny/0694--000--Helioptile.png b/src/afd/sprites/front-shiny/0694-000-Helioptile.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0694--000--Helioptile.png
rename to src/afd/sprites/front-shiny/0694-000-Helioptile.png
diff --git a/src/afd/sprites/front-shiny/0695--000--Heliolisk.png b/src/afd/sprites/front-shiny/0695-000-Heliolisk.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0695--000--Heliolisk.png
rename to src/afd/sprites/front-shiny/0695-000-Heliolisk.png
diff --git a/src/afd/sprites/front-shiny/0696--000--Tyrunt.png b/src/afd/sprites/front-shiny/0696-000-Tyrunt.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0696--000--Tyrunt.png
rename to src/afd/sprites/front-shiny/0696-000-Tyrunt.png
diff --git a/src/afd/sprites/front-shiny/0697--000--Tyrantrum.png b/src/afd/sprites/front-shiny/0697-000-Tyrantrum.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0697--000--Tyrantrum.png
rename to src/afd/sprites/front-shiny/0697-000-Tyrantrum.png
diff --git a/src/afd/sprites/front-shiny/0698--000--Amaura.png b/src/afd/sprites/front-shiny/0698-000-Amaura.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0698--000--Amaura.png
rename to src/afd/sprites/front-shiny/0698-000-Amaura.png
diff --git a/src/afd/sprites/front-shiny/0699--000--Aurorus.png b/src/afd/sprites/front-shiny/0699-000-Aurorus.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0699--000--Aurorus.png
rename to src/afd/sprites/front-shiny/0699-000-Aurorus.png
diff --git a/src/afd/sprites/front-shiny/0700--000--Sylveon.png b/src/afd/sprites/front-shiny/0700-000-Sylveon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0700--000--Sylveon.png
rename to src/afd/sprites/front-shiny/0700-000-Sylveon.png
diff --git a/src/afd/sprites/front-shiny/0701--000--Hawlucha.png b/src/afd/sprites/front-shiny/0701-000-Hawlucha.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0701--000--Hawlucha.png
rename to src/afd/sprites/front-shiny/0701-000-Hawlucha.png
diff --git a/src/afd/sprites/front-shiny/0702--000--Dedenne.png b/src/afd/sprites/front-shiny/0702-000-Dedenne.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0702--000--Dedenne.png
rename to src/afd/sprites/front-shiny/0702-000-Dedenne.png
diff --git a/src/afd/sprites/front-shiny/0703--000--Carbink.png b/src/afd/sprites/front-shiny/0703-000-Carbink.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0703--000--Carbink.png
rename to src/afd/sprites/front-shiny/0703-000-Carbink.png
diff --git a/src/afd/sprites/front-shiny/0704--000--Goomy.png b/src/afd/sprites/front-shiny/0704-000-Goomy.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0704--000--Goomy.png
rename to src/afd/sprites/front-shiny/0704-000-Goomy.png
diff --git a/src/afd/sprites/front-shiny/0705--000--Sliggoo.png b/src/afd/sprites/front-shiny/0705-000-Sliggoo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0705--000--Sliggoo.png
rename to src/afd/sprites/front-shiny/0705-000-Sliggoo.png
diff --git a/src/afd/sprites/front-shiny/0706--000--Goodra.png b/src/afd/sprites/front-shiny/0706-000-Goodra.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0706--000--Goodra.png
rename to src/afd/sprites/front-shiny/0706-000-Goodra.png
diff --git a/src/afd/sprites/front-shiny/0707--000--Klefki.png b/src/afd/sprites/front-shiny/0707-000-Klefki.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0707--000--Klefki.png
rename to src/afd/sprites/front-shiny/0707-000-Klefki.png
diff --git a/src/afd/sprites/front-shiny/0708--000--Phantump.png b/src/afd/sprites/front-shiny/0708-000-Phantump.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0708--000--Phantump.png
rename to src/afd/sprites/front-shiny/0708-000-Phantump.png
diff --git a/src/afd/sprites/front-shiny/0709--000--Trevenant.png b/src/afd/sprites/front-shiny/0709-000-Trevenant.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0709--000--Trevenant.png
rename to src/afd/sprites/front-shiny/0709-000-Trevenant.png
diff --git a/src/afd/sprites/front-shiny/0710--000--Pumpkaboo.png b/src/afd/sprites/front-shiny/0710-000-Pumpkaboo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0710--000--Pumpkaboo.png
rename to src/afd/sprites/front-shiny/0710-000-Pumpkaboo.png
diff --git a/src/afd/sprites/front-shiny/0710--420--Pumpkaboo--Large.png b/src/afd/sprites/front-shiny/0710-420-Pumpkaboo-Large.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0710--420--Pumpkaboo--Large.png
rename to src/afd/sprites/front-shiny/0710-420-Pumpkaboo-Large.png
diff --git a/src/afd/sprites/front-shiny/0710--420--Pumpkaboo--Small.png b/src/afd/sprites/front-shiny/0710-420-Pumpkaboo-Small.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0710--420--Pumpkaboo--Small.png
rename to src/afd/sprites/front-shiny/0710-420-Pumpkaboo-Small.png
diff --git a/src/afd/sprites/front-shiny/0710--420--Pumpkaboo--Super.png b/src/afd/sprites/front-shiny/0710-420-Pumpkaboo-Super.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0710--420--Pumpkaboo--Super.png
rename to src/afd/sprites/front-shiny/0710-420-Pumpkaboo-Super.png
diff --git a/src/afd/sprites/front-shiny/0711--000--Gourgeist.png b/src/afd/sprites/front-shiny/0711-000-Gourgeist.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0711--000--Gourgeist.png
rename to src/afd/sprites/front-shiny/0711-000-Gourgeist.png
diff --git a/src/afd/sprites/front-shiny/0711--420--Gourgeist--Large.png b/src/afd/sprites/front-shiny/0711-420-Gourgeist-Large.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0711--420--Gourgeist--Large.png
rename to src/afd/sprites/front-shiny/0711-420-Gourgeist-Large.png
diff --git a/src/afd/sprites/front-shiny/0711--420--Gourgeist--Small.png b/src/afd/sprites/front-shiny/0711-420-Gourgeist-Small.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0711--420--Gourgeist--Small.png
rename to src/afd/sprites/front-shiny/0711-420-Gourgeist-Small.png
diff --git a/src/afd/sprites/front-shiny/0711--420--Gourgeist--Super.png b/src/afd/sprites/front-shiny/0711-420-Gourgeist-Super.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0711--420--Gourgeist--Super.png
rename to src/afd/sprites/front-shiny/0711-420-Gourgeist-Super.png
diff --git a/src/afd/sprites/front-shiny/0712--000--Bergmite.png b/src/afd/sprites/front-shiny/0712-000-Bergmite.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0712--000--Bergmite.png
rename to src/afd/sprites/front-shiny/0712-000-Bergmite.png
diff --git a/src/afd/sprites/front-shiny/0713--000--Avalugg.png b/src/afd/sprites/front-shiny/0713-000-Avalugg.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0713--000--Avalugg.png
rename to src/afd/sprites/front-shiny/0713-000-Avalugg.png
diff --git a/src/afd/sprites/front-shiny/0714--000--Noibat.png b/src/afd/sprites/front-shiny/0714-000-Noibat.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0714--000--Noibat.png
rename to src/afd/sprites/front-shiny/0714-000-Noibat.png
diff --git a/src/afd/sprites/front-shiny/0715--000--Noivern.png b/src/afd/sprites/front-shiny/0715-000-Noivern.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0715--000--Noivern.png
rename to src/afd/sprites/front-shiny/0715-000-Noivern.png
diff --git a/src/afd/sprites/front-shiny/0716--000--Xerneas.png b/src/afd/sprites/front-shiny/0716-000-Xerneas.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0716--000--Xerneas.png
rename to src/afd/sprites/front-shiny/0716-000-Xerneas.png
diff --git a/src/afd/sprites/front-shiny/0717--000--Yveltal.png b/src/afd/sprites/front-shiny/0717-000-Yveltal.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0717--000--Yveltal.png
rename to src/afd/sprites/front-shiny/0717-000-Yveltal.png
diff --git a/src/afd/sprites/front-shiny/0718--000--Zygarde.png b/src/afd/sprites/front-shiny/0718-000-Zygarde.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0718--000--Zygarde.png
rename to src/afd/sprites/front-shiny/0718-000-Zygarde.png
diff --git a/src/afd/sprites/front-shiny/0718--420--Zygarde--10__0025.png b/src/afd/sprites/front-shiny/0718-420-Zygarde-10__0025.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0718--420--Zygarde--10__0025.png
rename to src/afd/sprites/front-shiny/0718-420-Zygarde-10__0025.png
diff --git a/src/afd/sprites/front-shiny/0718--420--Zygarde--Complete.png b/src/afd/sprites/front-shiny/0718-420-Zygarde-Complete.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0718--420--Zygarde--Complete.png
rename to src/afd/sprites/front-shiny/0718-420-Zygarde-Complete.png
diff --git a/src/afd/sprites/front-shiny/0719--000--Diancie.png b/src/afd/sprites/front-shiny/0719-000-Diancie.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0719--000--Diancie.png
rename to src/afd/sprites/front-shiny/0719-000-Diancie.png
diff --git a/src/afd/sprites/front-shiny/0719--420--Diancie--Mega.png b/src/afd/sprites/front-shiny/0719-420-Diancie-Mega.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0719--420--Diancie--Mega.png
rename to src/afd/sprites/front-shiny/0719-420-Diancie-Mega.png
diff --git a/src/afd/sprites/front-shiny/0720--000--Hoopa.png b/src/afd/sprites/front-shiny/0720-000-Hoopa.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0720--000--Hoopa.png
rename to src/afd/sprites/front-shiny/0720-000-Hoopa.png
diff --git a/src/afd/sprites/front-shiny/0720--420--Hoopa--Unbound.png b/src/afd/sprites/front-shiny/0720-420-Hoopa-Unbound.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0720--420--Hoopa--Unbound.png
rename to src/afd/sprites/front-shiny/0720-420-Hoopa-Unbound.png
diff --git a/src/afd/sprites/front-shiny/0721--000--Volcanion.png b/src/afd/sprites/front-shiny/0721-000-Volcanion.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0721--000--Volcanion.png
rename to src/afd/sprites/front-shiny/0721-000-Volcanion.png
diff --git a/src/afd/sprites/front-shiny/0722--000--Rowlet.png b/src/afd/sprites/front-shiny/0722-000-Rowlet.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0722--000--Rowlet.png
rename to src/afd/sprites/front-shiny/0722-000-Rowlet.png
diff --git a/src/afd/sprites/front-shiny/0723--000--Dartrix.png b/src/afd/sprites/front-shiny/0723-000-Dartrix.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0723--000--Dartrix.png
rename to src/afd/sprites/front-shiny/0723-000-Dartrix.png
diff --git a/src/afd/sprites/front-shiny/0724--000--Decidueye.png b/src/afd/sprites/front-shiny/0724-000-Decidueye.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0724--000--Decidueye.png
rename to src/afd/sprites/front-shiny/0724-000-Decidueye.png
diff --git a/src/afd/sprites/front-shiny/0725--000--Litten.png b/src/afd/sprites/front-shiny/0725-000-Litten.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0725--000--Litten.png
rename to src/afd/sprites/front-shiny/0725-000-Litten.png
diff --git a/src/afd/sprites/front-shiny/0726--000--Torracat.png b/src/afd/sprites/front-shiny/0726-000-Torracat.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0726--000--Torracat.png
rename to src/afd/sprites/front-shiny/0726-000-Torracat.png
diff --git a/src/afd/sprites/front-shiny/0727--000--Incineroar.png b/src/afd/sprites/front-shiny/0727-000-Incineroar.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0727--000--Incineroar.png
rename to src/afd/sprites/front-shiny/0727-000-Incineroar.png
diff --git a/src/afd/sprites/front-shiny/0728--000--Popplio.png b/src/afd/sprites/front-shiny/0728-000-Popplio.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0728--000--Popplio.png
rename to src/afd/sprites/front-shiny/0728-000-Popplio.png
diff --git a/src/afd/sprites/front-shiny/0729--000--Brionne.png b/src/afd/sprites/front-shiny/0729-000-Brionne.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0729--000--Brionne.png
rename to src/afd/sprites/front-shiny/0729-000-Brionne.png
diff --git a/src/afd/sprites/front-shiny/0730--000--Primarina.png b/src/afd/sprites/front-shiny/0730-000-Primarina.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0730--000--Primarina.png
rename to src/afd/sprites/front-shiny/0730-000-Primarina.png
diff --git a/src/afd/sprites/front-shiny/0731--000--Pikipek.png b/src/afd/sprites/front-shiny/0731-000-Pikipek.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0731--000--Pikipek.png
rename to src/afd/sprites/front-shiny/0731-000-Pikipek.png
diff --git a/src/afd/sprites/front-shiny/0732--000--Trumbeak.png b/src/afd/sprites/front-shiny/0732-000-Trumbeak.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0732--000--Trumbeak.png
rename to src/afd/sprites/front-shiny/0732-000-Trumbeak.png
diff --git a/src/afd/sprites/front-shiny/0733--000--Toucannon.png b/src/afd/sprites/front-shiny/0733-000-Toucannon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0733--000--Toucannon.png
rename to src/afd/sprites/front-shiny/0733-000-Toucannon.png
diff --git a/src/afd/sprites/front-shiny/0734--000--Yungoos.png b/src/afd/sprites/front-shiny/0734-000-Yungoos.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0734--000--Yungoos.png
rename to src/afd/sprites/front-shiny/0734-000-Yungoos.png
diff --git a/src/afd/sprites/front-shiny/0735--000--Gumshoos.png b/src/afd/sprites/front-shiny/0735-000-Gumshoos.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0735--000--Gumshoos.png
rename to src/afd/sprites/front-shiny/0735-000-Gumshoos.png
diff --git a/src/afd/sprites/front-shiny/0736--000--Grubbin.png b/src/afd/sprites/front-shiny/0736-000-Grubbin.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0736--000--Grubbin.png
rename to src/afd/sprites/front-shiny/0736-000-Grubbin.png
diff --git a/src/afd/sprites/front-shiny/0737--000--Charjabug.png b/src/afd/sprites/front-shiny/0737-000-Charjabug.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0737--000--Charjabug.png
rename to src/afd/sprites/front-shiny/0737-000-Charjabug.png
diff --git a/src/afd/sprites/front-shiny/0738--000--Vikavolt.png b/src/afd/sprites/front-shiny/0738-000-Vikavolt.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0738--000--Vikavolt.png
rename to src/afd/sprites/front-shiny/0738-000-Vikavolt.png
diff --git a/src/afd/sprites/front-shiny/0739--000--Crabrawler.png b/src/afd/sprites/front-shiny/0739-000-Crabrawler.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0739--000--Crabrawler.png
rename to src/afd/sprites/front-shiny/0739-000-Crabrawler.png
diff --git a/src/afd/sprites/front-shiny/0740--000--Crabominable.png b/src/afd/sprites/front-shiny/0740-000-Crabominable.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0740--000--Crabominable.png
rename to src/afd/sprites/front-shiny/0740-000-Crabominable.png
diff --git a/src/afd/sprites/front-shiny/0741--000--Oricorio.png b/src/afd/sprites/front-shiny/0741-000-Oricorio.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0741--000--Oricorio.png
rename to src/afd/sprites/front-shiny/0741-000-Oricorio.png
diff --git a/src/afd/sprites/front-shiny/0741--420--Oricorio--Pa__0027u.png b/src/afd/sprites/front-shiny/0741-420-Oricorio-Pa__0027u.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0741--420--Oricorio--Pa__0027u.png
rename to src/afd/sprites/front-shiny/0741-420-Oricorio-Pa__0027u.png
diff --git a/src/afd/sprites/front-shiny/0741--420--Oricorio--Pom-Pom.png b/src/afd/sprites/front-shiny/0741-420-Oricorio-Pom~Pom.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0741--420--Oricorio--Pom-Pom.png
rename to src/afd/sprites/front-shiny/0741-420-Oricorio-Pom~Pom.png
diff --git a/src/afd/sprites/front-shiny/0741--420--Oricorio--Sensu.png b/src/afd/sprites/front-shiny/0741-420-Oricorio-Sensu.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0741--420--Oricorio--Sensu.png
rename to src/afd/sprites/front-shiny/0741-420-Oricorio-Sensu.png
diff --git a/src/afd/sprites/front-shiny/0742--000--Cutiefly.png b/src/afd/sprites/front-shiny/0742-000-Cutiefly.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0742--000--Cutiefly.png
rename to src/afd/sprites/front-shiny/0742-000-Cutiefly.png
diff --git a/src/afd/sprites/front-shiny/0743--000--Ribombee.png b/src/afd/sprites/front-shiny/0743-000-Ribombee.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0743--000--Ribombee.png
rename to src/afd/sprites/front-shiny/0743-000-Ribombee.png
diff --git a/src/afd/sprites/front-shiny/0744--000--Rockruff.png b/src/afd/sprites/front-shiny/0744-000-Rockruff.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0744--000--Rockruff.png
rename to src/afd/sprites/front-shiny/0744-000-Rockruff.png
diff --git a/src/afd/sprites/front-shiny/0745--000--Lycanroc.png b/src/afd/sprites/front-shiny/0745-000-Lycanroc.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0745--000--Lycanroc.png
rename to src/afd/sprites/front-shiny/0745-000-Lycanroc.png
diff --git a/src/afd/sprites/front-shiny/0745--420--Lycanroc--Dusk.png b/src/afd/sprites/front-shiny/0745-420-Lycanroc-Dusk.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0745--420--Lycanroc--Dusk.png
rename to src/afd/sprites/front-shiny/0745-420-Lycanroc-Dusk.png
diff --git a/src/afd/sprites/front-shiny/0745--420--Lycanroc--Midnight.png b/src/afd/sprites/front-shiny/0745-420-Lycanroc-Midnight.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0745--420--Lycanroc--Midnight.png
rename to src/afd/sprites/front-shiny/0745-420-Lycanroc-Midnight.png
diff --git a/src/afd/sprites/front-shiny/0746--000--Wishiwashi.png b/src/afd/sprites/front-shiny/0746-000-Wishiwashi.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0746--000--Wishiwashi.png
rename to src/afd/sprites/front-shiny/0746-000-Wishiwashi.png
diff --git a/src/afd/sprites/front-shiny/0746--420--Wishiwashi--School.png b/src/afd/sprites/front-shiny/0746-420-Wishiwashi-School.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0746--420--Wishiwashi--School.png
rename to src/afd/sprites/front-shiny/0746-420-Wishiwashi-School.png
diff --git a/src/afd/sprites/front-shiny/0747--000--Mareanie.png b/src/afd/sprites/front-shiny/0747-000-Mareanie.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0747--000--Mareanie.png
rename to src/afd/sprites/front-shiny/0747-000-Mareanie.png
diff --git a/src/afd/sprites/front-shiny/0748--000--Toxapex.png b/src/afd/sprites/front-shiny/0748-000-Toxapex.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0748--000--Toxapex.png
rename to src/afd/sprites/front-shiny/0748-000-Toxapex.png
diff --git a/src/afd/sprites/front-shiny/0749--000--Mudbray.png b/src/afd/sprites/front-shiny/0749-000-Mudbray.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0749--000--Mudbray.png
rename to src/afd/sprites/front-shiny/0749-000-Mudbray.png
diff --git a/src/afd/sprites/front-shiny/0750--000--Mudsdale.png b/src/afd/sprites/front-shiny/0750-000-Mudsdale.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0750--000--Mudsdale.png
rename to src/afd/sprites/front-shiny/0750-000-Mudsdale.png
diff --git a/src/afd/sprites/front-shiny/0751--000--Dewpider.png b/src/afd/sprites/front-shiny/0751-000-Dewpider.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0751--000--Dewpider.png
rename to src/afd/sprites/front-shiny/0751-000-Dewpider.png
diff --git a/src/afd/sprites/front-shiny/0752--000--Araquanid.png b/src/afd/sprites/front-shiny/0752-000-Araquanid.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0752--000--Araquanid.png
rename to src/afd/sprites/front-shiny/0752-000-Araquanid.png
diff --git a/src/afd/sprites/front-shiny/0754--000--Lurantis.png b/src/afd/sprites/front-shiny/0754-000-Lurantis.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0754--000--Lurantis.png
rename to src/afd/sprites/front-shiny/0754-000-Lurantis.png
diff --git a/src/afd/sprites/front-shiny/0755--000--Morelull.png b/src/afd/sprites/front-shiny/0755-000-Morelull.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0755--000--Morelull.png
rename to src/afd/sprites/front-shiny/0755-000-Morelull.png
diff --git a/src/afd/sprites/front-shiny/0756--000--Shiinotic.png b/src/afd/sprites/front-shiny/0756-000-Shiinotic.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0756--000--Shiinotic.png
rename to src/afd/sprites/front-shiny/0756-000-Shiinotic.png
diff --git a/src/afd/sprites/front-shiny/0757--000--Salandit.png b/src/afd/sprites/front-shiny/0757-000-Salandit.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0757--000--Salandit.png
rename to src/afd/sprites/front-shiny/0757-000-Salandit.png
diff --git a/src/afd/sprites/front-shiny/0758--000--Salazzle.png b/src/afd/sprites/front-shiny/0758-000-Salazzle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0758--000--Salazzle.png
rename to src/afd/sprites/front-shiny/0758-000-Salazzle.png
diff --git a/src/afd/sprites/front-shiny/0759--000--Stufful.png b/src/afd/sprites/front-shiny/0759-000-Stufful.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0759--000--Stufful.png
rename to src/afd/sprites/front-shiny/0759-000-Stufful.png
diff --git a/src/afd/sprites/front-shiny/0760--000--Bewear.png b/src/afd/sprites/front-shiny/0760-000-Bewear.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0760--000--Bewear.png
rename to src/afd/sprites/front-shiny/0760-000-Bewear.png
diff --git a/src/afd/sprites/front-shiny/0761--000--Bounsweet.png b/src/afd/sprites/front-shiny/0761-000-Bounsweet.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0761--000--Bounsweet.png
rename to src/afd/sprites/front-shiny/0761-000-Bounsweet.png
diff --git a/src/afd/sprites/front-shiny/0762--000--Steenee.png b/src/afd/sprites/front-shiny/0762-000-Steenee.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0762--000--Steenee.png
rename to src/afd/sprites/front-shiny/0762-000-Steenee.png
diff --git a/src/afd/sprites/front-shiny/0763--000--Tsareena.png b/src/afd/sprites/front-shiny/0763-000-Tsareena.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0763--000--Tsareena.png
rename to src/afd/sprites/front-shiny/0763-000-Tsareena.png
diff --git a/src/afd/sprites/front-shiny/0764--000--Comfey.png b/src/afd/sprites/front-shiny/0764-000-Comfey.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0764--000--Comfey.png
rename to src/afd/sprites/front-shiny/0764-000-Comfey.png
diff --git a/src/afd/sprites/front-shiny/0765--000--Oranguru.png b/src/afd/sprites/front-shiny/0765-000-Oranguru.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0765--000--Oranguru.png
rename to src/afd/sprites/front-shiny/0765-000-Oranguru.png
diff --git a/src/afd/sprites/front-shiny/0766--000--Passimian.png b/src/afd/sprites/front-shiny/0766-000-Passimian.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0766--000--Passimian.png
rename to src/afd/sprites/front-shiny/0766-000-Passimian.png
diff --git a/src/afd/sprites/front-shiny/0767--000--Wimpod.png b/src/afd/sprites/front-shiny/0767-000-Wimpod.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0767--000--Wimpod.png
rename to src/afd/sprites/front-shiny/0767-000-Wimpod.png
diff --git a/src/afd/sprites/front-shiny/0768--000--Golisopod.png b/src/afd/sprites/front-shiny/0768-000-Golisopod.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0768--000--Golisopod.png
rename to src/afd/sprites/front-shiny/0768-000-Golisopod.png
diff --git a/src/afd/sprites/front-shiny/0769--000--Sandygast.png b/src/afd/sprites/front-shiny/0769-000-Sandygast.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0769--000--Sandygast.png
rename to src/afd/sprites/front-shiny/0769-000-Sandygast.png
diff --git a/src/afd/sprites/front-shiny/0770--000--Palossand.png b/src/afd/sprites/front-shiny/0770-000-Palossand.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0770--000--Palossand.png
rename to src/afd/sprites/front-shiny/0770-000-Palossand.png
diff --git a/src/afd/sprites/front-shiny/0771--000--Pyukumuku.png b/src/afd/sprites/front-shiny/0771-000-Pyukumuku.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0771--000--Pyukumuku.png
rename to src/afd/sprites/front-shiny/0771-000-Pyukumuku.png
diff --git a/src/afd/sprites/front-shiny/0772--000--Type__003a_Null.png b/src/afd/sprites/front-shiny/0772-000-Type__003a_Null.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0772--000--Type__003a_Null.png
rename to src/afd/sprites/front-shiny/0772-000-Type__003a_Null.png
diff --git a/src/afd/sprites/front-shiny/0773--000--Silvally.png b/src/afd/sprites/front-shiny/0773-000-Silvally.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--000--Silvally.png
rename to src/afd/sprites/front-shiny/0773-000-Silvally.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Bug.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Bug.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Bug.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Bug.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Dark.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Dark.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Dark.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Dark.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Dragon.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Dragon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Dragon.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Dragon.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Electric.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Electric.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Electric.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Electric.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Fairy.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Fairy.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Fairy.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Fairy.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Fighting.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Fighting.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Fighting.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Fighting.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Fire.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Fire.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Fire.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Fire.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Flying.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Flying.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Flying.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Flying.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Ghost.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Ghost.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Ghost.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Ghost.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Grass.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Grass.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Grass.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Grass.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Ground.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Ground.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Ground.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Ground.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Ice.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Ice.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Ice.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Ice.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Poison.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Poison.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Poison.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Poison.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Psychic.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Psychic.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Psychic.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Psychic.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Rock.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Rock.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Rock.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Rock.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Steel.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Steel.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Steel.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Steel.png
diff --git a/src/afd/sprites/front-shiny/0773--420--Silvally--Water.png b/src/afd/sprites/front-shiny/0773-420-Silvally-Water.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0773--420--Silvally--Water.png
rename to src/afd/sprites/front-shiny/0773-420-Silvally-Water.png
diff --git a/src/afd/sprites/front-shiny/0774--000--Minior.png b/src/afd/sprites/front-shiny/0774-000-Minior.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0774--000--Minior.png
rename to src/afd/sprites/front-shiny/0774-000-Minior.png
diff --git a/src/afd/sprites/front-shiny/0774--420--Minior--Meteor.png b/src/afd/sprites/front-shiny/0774-420-Minior-Meteor.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0774--420--Minior--Meteor.png
rename to src/afd/sprites/front-shiny/0774-420-Minior-Meteor.png
diff --git a/src/afd/sprites/front-shiny/0775--000--Komala.png b/src/afd/sprites/front-shiny/0775-000-Komala.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0775--000--Komala.png
rename to src/afd/sprites/front-shiny/0775-000-Komala.png
diff --git a/src/afd/sprites/front-shiny/0776--000--Turtonator.png b/src/afd/sprites/front-shiny/0776-000-Turtonator.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0776--000--Turtonator.png
rename to src/afd/sprites/front-shiny/0776-000-Turtonator.png
diff --git a/src/afd/sprites/front-shiny/0777--000--Togedemaru.png b/src/afd/sprites/front-shiny/0777-000-Togedemaru.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0777--000--Togedemaru.png
rename to src/afd/sprites/front-shiny/0777-000-Togedemaru.png
diff --git a/src/afd/sprites/front-shiny/0778--000--Mimikyu.png b/src/afd/sprites/front-shiny/0778-000-Mimikyu.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0778--000--Mimikyu.png
rename to src/afd/sprites/front-shiny/0778-000-Mimikyu.png
diff --git a/src/afd/sprites/front-shiny/0778--420--Mimikyu--Busted.png b/src/afd/sprites/front-shiny/0778-420-Mimikyu-Busted.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0778--420--Mimikyu--Busted.png
rename to src/afd/sprites/front-shiny/0778-420-Mimikyu-Busted.png
diff --git a/src/afd/sprites/front-shiny/0779--000--Bruxish.png b/src/afd/sprites/front-shiny/0779-000-Bruxish.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0779--000--Bruxish.png
rename to src/afd/sprites/front-shiny/0779-000-Bruxish.png
diff --git a/src/afd/sprites/front-shiny/0780--000--Drampa.png b/src/afd/sprites/front-shiny/0780-000-Drampa.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0780--000--Drampa.png
rename to src/afd/sprites/front-shiny/0780-000-Drampa.png
diff --git a/src/afd/sprites/front-shiny/0781--000--Dhelmise.png b/src/afd/sprites/front-shiny/0781-000-Dhelmise.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0781--000--Dhelmise.png
rename to src/afd/sprites/front-shiny/0781-000-Dhelmise.png
diff --git a/src/afd/sprites/front-shiny/0782--000--Jangmo-o.png b/src/afd/sprites/front-shiny/0782-000-Jangmo~o.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0782--000--Jangmo-o.png
rename to src/afd/sprites/front-shiny/0782-000-Jangmo~o.png
diff --git a/src/afd/sprites/front-shiny/0783--000--Hakamo-o.png b/src/afd/sprites/front-shiny/0783-000-Hakamo~o.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0783--000--Hakamo-o.png
rename to src/afd/sprites/front-shiny/0783-000-Hakamo~o.png
diff --git a/src/afd/sprites/front-shiny/0784--000--Kommo-o.png b/src/afd/sprites/front-shiny/0784-000-Kommo~o.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0784--000--Kommo-o.png
rename to src/afd/sprites/front-shiny/0784-000-Kommo~o.png
diff --git a/src/afd/sprites/front-shiny/0785--000--Tapu_Koko.png b/src/afd/sprites/front-shiny/0785-000-Tapu_Koko.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0785--000--Tapu_Koko.png
rename to src/afd/sprites/front-shiny/0785-000-Tapu_Koko.png
diff --git a/src/afd/sprites/front-shiny/0786--000--Tapu_Lele.png b/src/afd/sprites/front-shiny/0786-000-Tapu_Lele.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0786--000--Tapu_Lele.png
rename to src/afd/sprites/front-shiny/0786-000-Tapu_Lele.png
diff --git a/src/afd/sprites/front-shiny/0787--000--Tapu_Bulu.png b/src/afd/sprites/front-shiny/0787-000-Tapu_Bulu.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0787--000--Tapu_Bulu.png
rename to src/afd/sprites/front-shiny/0787-000-Tapu_Bulu.png
diff --git a/src/afd/sprites/front-shiny/0788--000--Tapu_Fini.png b/src/afd/sprites/front-shiny/0788-000-Tapu_Fini.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0788--000--Tapu_Fini.png
rename to src/afd/sprites/front-shiny/0788-000-Tapu_Fini.png
diff --git a/src/afd/sprites/front-shiny/0789--000--Cosmog.png b/src/afd/sprites/front-shiny/0789-000-Cosmog.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0789--000--Cosmog.png
rename to src/afd/sprites/front-shiny/0789-000-Cosmog.png
diff --git a/src/afd/sprites/front-shiny/0790--000--Cosmoem.png b/src/afd/sprites/front-shiny/0790-000-Cosmoem.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0790--000--Cosmoem.png
rename to src/afd/sprites/front-shiny/0790-000-Cosmoem.png
diff --git a/src/afd/sprites/front-shiny/0791--000--Solgaleo.png b/src/afd/sprites/front-shiny/0791-000-Solgaleo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0791--000--Solgaleo.png
rename to src/afd/sprites/front-shiny/0791-000-Solgaleo.png
diff --git a/src/afd/sprites/front-shiny/0792--000--Lunala.png b/src/afd/sprites/front-shiny/0792-000-Lunala.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0792--000--Lunala.png
rename to src/afd/sprites/front-shiny/0792-000-Lunala.png
diff --git a/src/afd/sprites/front-shiny/0793--000--Nihilego.png b/src/afd/sprites/front-shiny/0793-000-Nihilego.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0793--000--Nihilego.png
rename to src/afd/sprites/front-shiny/0793-000-Nihilego.png
diff --git a/src/afd/sprites/front-shiny/0794--000--Buzzwole.png b/src/afd/sprites/front-shiny/0794-000-Buzzwole.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0794--000--Buzzwole.png
rename to src/afd/sprites/front-shiny/0794-000-Buzzwole.png
diff --git a/src/afd/sprites/front-shiny/0795--000--Pheromosa.png b/src/afd/sprites/front-shiny/0795-000-Pheromosa.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0795--000--Pheromosa.png
rename to src/afd/sprites/front-shiny/0795-000-Pheromosa.png
diff --git a/src/afd/sprites/front-shiny/0796--000--Xurkitree.png b/src/afd/sprites/front-shiny/0796-000-Xurkitree.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0796--000--Xurkitree.png
rename to src/afd/sprites/front-shiny/0796-000-Xurkitree.png
diff --git a/src/afd/sprites/front-shiny/0797--000--Celesteela.png b/src/afd/sprites/front-shiny/0797-000-Celesteela.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0797--000--Celesteela.png
rename to src/afd/sprites/front-shiny/0797-000-Celesteela.png
diff --git a/src/afd/sprites/front-shiny/0798--000--Kartana.png b/src/afd/sprites/front-shiny/0798-000-Kartana.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0798--000--Kartana.png
rename to src/afd/sprites/front-shiny/0798-000-Kartana.png
diff --git a/src/afd/sprites/front-shiny/0799--000--Guzzlord.png b/src/afd/sprites/front-shiny/0799-000-Guzzlord.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0799--000--Guzzlord.png
rename to src/afd/sprites/front-shiny/0799-000-Guzzlord.png
diff --git a/src/afd/sprites/front-shiny/0800--000--Necrozma.png b/src/afd/sprites/front-shiny/0800-000-Necrozma.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0800--000--Necrozma.png
rename to src/afd/sprites/front-shiny/0800-000-Necrozma.png
diff --git a/src/afd/sprites/front-shiny/0800--420--Necrozma--Dawn-Wings.png b/src/afd/sprites/front-shiny/0800-420-Necrozma-Dawn~Wings.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0800--420--Necrozma--Dawn-Wings.png
rename to src/afd/sprites/front-shiny/0800-420-Necrozma-Dawn~Wings.png
diff --git a/src/afd/sprites/front-shiny/0800--420--Necrozma--Dusk-Mane.png b/src/afd/sprites/front-shiny/0800-420-Necrozma-Dusk~Mane.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0800--420--Necrozma--Dusk-Mane.png
rename to src/afd/sprites/front-shiny/0800-420-Necrozma-Dusk~Mane.png
diff --git a/src/afd/sprites/front-shiny/0800--420--Necrozma--Ultra.png b/src/afd/sprites/front-shiny/0800-420-Necrozma-Ultra.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0800--420--Necrozma--Ultra.png
rename to src/afd/sprites/front-shiny/0800-420-Necrozma-Ultra.png
diff --git a/src/afd/sprites/front-shiny/0801--000--Magearna.png b/src/afd/sprites/front-shiny/0801-000-Magearna.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0801--000--Magearna.png
rename to src/afd/sprites/front-shiny/0801-000-Magearna.png
diff --git a/src/afd/sprites/front-shiny/0802--000--Marshadow.png b/src/afd/sprites/front-shiny/0802-000-Marshadow.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0802--000--Marshadow.png
rename to src/afd/sprites/front-shiny/0802-000-Marshadow.png
diff --git a/src/afd/sprites/front-shiny/0803--000--Poipole.png b/src/afd/sprites/front-shiny/0803-000-Poipole.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0803--000--Poipole.png
rename to src/afd/sprites/front-shiny/0803-000-Poipole.png
diff --git a/src/afd/sprites/front-shiny/0804--000--Naganadel.png b/src/afd/sprites/front-shiny/0804-000-Naganadel.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0804--000--Naganadel.png
rename to src/afd/sprites/front-shiny/0804-000-Naganadel.png
diff --git a/src/afd/sprites/front-shiny/0805--000--Stakataka.png b/src/afd/sprites/front-shiny/0805-000-Stakataka.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0805--000--Stakataka.png
rename to src/afd/sprites/front-shiny/0805-000-Stakataka.png
diff --git a/src/afd/sprites/front-shiny/0806--000--Blacephalon.png b/src/afd/sprites/front-shiny/0806-000-Blacephalon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0806--000--Blacephalon.png
rename to src/afd/sprites/front-shiny/0806-000-Blacephalon.png
diff --git a/src/afd/sprites/front-shiny/0807--000--Zeraora.png b/src/afd/sprites/front-shiny/0807-000-Zeraora.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0807--000--Zeraora.png
rename to src/afd/sprites/front-shiny/0807-000-Zeraora.png
diff --git a/src/afd/sprites/front-shiny/0808--000--Meltan.png b/src/afd/sprites/front-shiny/0808-000-Meltan.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0808--000--Meltan.png
rename to src/afd/sprites/front-shiny/0808-000-Meltan.png
diff --git a/src/afd/sprites/front-shiny/0809--000--Melmetal.png b/src/afd/sprites/front-shiny/0809-000-Melmetal.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0809--000--Melmetal.png
rename to src/afd/sprites/front-shiny/0809-000-Melmetal.png
diff --git a/src/afd/sprites/front-shiny/0809--420--Melmetal--Gmax.png b/src/afd/sprites/front-shiny/0809-420-Melmetal-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0809--420--Melmetal--Gmax.png
rename to src/afd/sprites/front-shiny/0809-420-Melmetal-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0810--000--Grookey.png b/src/afd/sprites/front-shiny/0810-000-Grookey.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0810--000--Grookey.png
rename to src/afd/sprites/front-shiny/0810-000-Grookey.png
diff --git a/src/afd/sprites/front-shiny/0811--000--Thwackey.png b/src/afd/sprites/front-shiny/0811-000-Thwackey.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0811--000--Thwackey.png
rename to src/afd/sprites/front-shiny/0811-000-Thwackey.png
diff --git a/src/afd/sprites/front-shiny/0812--000--Rillaboom.png b/src/afd/sprites/front-shiny/0812-000-Rillaboom.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0812--000--Rillaboom.png
rename to src/afd/sprites/front-shiny/0812-000-Rillaboom.png
diff --git a/src/afd/sprites/front-shiny/0813--000--Scorbunny.png b/src/afd/sprites/front-shiny/0813-000-Scorbunny.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0813--000--Scorbunny.png
rename to src/afd/sprites/front-shiny/0813-000-Scorbunny.png
diff --git a/src/afd/sprites/front-shiny/0814--000--Raboot.png b/src/afd/sprites/front-shiny/0814-000-Raboot.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0814--000--Raboot.png
rename to src/afd/sprites/front-shiny/0814-000-Raboot.png
diff --git a/src/afd/sprites/front-shiny/0815--000--Cinderace.png b/src/afd/sprites/front-shiny/0815-000-Cinderace.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0815--000--Cinderace.png
rename to src/afd/sprites/front-shiny/0815-000-Cinderace.png
diff --git a/src/afd/sprites/front-shiny/0816--000--Sobble.png b/src/afd/sprites/front-shiny/0816-000-Sobble.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0816--000--Sobble.png
rename to src/afd/sprites/front-shiny/0816-000-Sobble.png
diff --git a/src/afd/sprites/front-shiny/0817--000--Drizzile.png b/src/afd/sprites/front-shiny/0817-000-Drizzile.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0817--000--Drizzile.png
rename to src/afd/sprites/front-shiny/0817-000-Drizzile.png
diff --git a/src/afd/sprites/front-shiny/0818--000--Inteleon.png b/src/afd/sprites/front-shiny/0818-000-Inteleon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0818--000--Inteleon.png
rename to src/afd/sprites/front-shiny/0818-000-Inteleon.png
diff --git a/src/afd/sprites/front-shiny/0819--000--Skwovet.png b/src/afd/sprites/front-shiny/0819-000-Skwovet.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0819--000--Skwovet.png
rename to src/afd/sprites/front-shiny/0819-000-Skwovet.png
diff --git a/src/afd/sprites/front-shiny/0820--000--Greedent.png b/src/afd/sprites/front-shiny/0820-000-Greedent.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0820--000--Greedent.png
rename to src/afd/sprites/front-shiny/0820-000-Greedent.png
diff --git a/src/afd/sprites/front-shiny/0821--000--Rookidee.png b/src/afd/sprites/front-shiny/0821-000-Rookidee.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0821--000--Rookidee.png
rename to src/afd/sprites/front-shiny/0821-000-Rookidee.png
diff --git a/src/afd/sprites/front-shiny/0822--000--Corvisquire.png b/src/afd/sprites/front-shiny/0822-000-Corvisquire.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0822--000--Corvisquire.png
rename to src/afd/sprites/front-shiny/0822-000-Corvisquire.png
diff --git a/src/afd/sprites/front-shiny/0823--000--Corviknight.png b/src/afd/sprites/front-shiny/0823-000-Corviknight.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0823--000--Corviknight.png
rename to src/afd/sprites/front-shiny/0823-000-Corviknight.png
diff --git a/src/afd/sprites/front-shiny/0823--420--Corviknight--Gmax.png b/src/afd/sprites/front-shiny/0823-420-Corviknight-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0823--420--Corviknight--Gmax.png
rename to src/afd/sprites/front-shiny/0823-420-Corviknight-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0824--000--Blipbug.png b/src/afd/sprites/front-shiny/0824-000-Blipbug.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0824--000--Blipbug.png
rename to src/afd/sprites/front-shiny/0824-000-Blipbug.png
diff --git a/src/afd/sprites/front-shiny/0825--000--Dottler.png b/src/afd/sprites/front-shiny/0825-000-Dottler.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0825--000--Dottler.png
rename to src/afd/sprites/front-shiny/0825-000-Dottler.png
diff --git a/src/afd/sprites/front-shiny/0826--000--Orbeetle.png b/src/afd/sprites/front-shiny/0826-000-Orbeetle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0826--000--Orbeetle.png
rename to src/afd/sprites/front-shiny/0826-000-Orbeetle.png
diff --git a/src/afd/sprites/front-shiny/0826--420--Orbeetle--Gmax.png b/src/afd/sprites/front-shiny/0826-420-Orbeetle-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0826--420--Orbeetle--Gmax.png
rename to src/afd/sprites/front-shiny/0826-420-Orbeetle-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0827--000--Nickit.png b/src/afd/sprites/front-shiny/0827-000-Nickit.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0827--000--Nickit.png
rename to src/afd/sprites/front-shiny/0827-000-Nickit.png
diff --git a/src/afd/sprites/front-shiny/0828--000--Thievul.png b/src/afd/sprites/front-shiny/0828-000-Thievul.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0828--000--Thievul.png
rename to src/afd/sprites/front-shiny/0828-000-Thievul.png
diff --git a/src/afd/sprites/front-shiny/0829--000--Gossifleur.png b/src/afd/sprites/front-shiny/0829-000-Gossifleur.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0829--000--Gossifleur.png
rename to src/afd/sprites/front-shiny/0829-000-Gossifleur.png
diff --git a/src/afd/sprites/front-shiny/0830--000--Eldegoss.png b/src/afd/sprites/front-shiny/0830-000-Eldegoss.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0830--000--Eldegoss.png
rename to src/afd/sprites/front-shiny/0830-000-Eldegoss.png
diff --git a/src/afd/sprites/front-shiny/0831--000--Wooloo.png b/src/afd/sprites/front-shiny/0831-000-Wooloo.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0831--000--Wooloo.png
rename to src/afd/sprites/front-shiny/0831-000-Wooloo.png
diff --git a/src/afd/sprites/front-shiny/0832--000--Dubwool.png b/src/afd/sprites/front-shiny/0832-000-Dubwool.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0832--000--Dubwool.png
rename to src/afd/sprites/front-shiny/0832-000-Dubwool.png
diff --git a/src/afd/sprites/front-shiny/0833--000--Chewtle.png b/src/afd/sprites/front-shiny/0833-000-Chewtle.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0833--000--Chewtle.png
rename to src/afd/sprites/front-shiny/0833-000-Chewtle.png
diff --git a/src/afd/sprites/front-shiny/0834--000--Drednaw.png b/src/afd/sprites/front-shiny/0834-000-Drednaw.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0834--000--Drednaw.png
rename to src/afd/sprites/front-shiny/0834-000-Drednaw.png
diff --git a/src/afd/sprites/front-shiny/0834--420--Drednaw--Gmax.png b/src/afd/sprites/front-shiny/0834-420-Drednaw-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0834--420--Drednaw--Gmax.png
rename to src/afd/sprites/front-shiny/0834-420-Drednaw-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0835--000--Yamper.png b/src/afd/sprites/front-shiny/0835-000-Yamper.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0835--000--Yamper.png
rename to src/afd/sprites/front-shiny/0835-000-Yamper.png
diff --git a/src/afd/sprites/front-shiny/0836--000--Boltund.png b/src/afd/sprites/front-shiny/0836-000-Boltund.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0836--000--Boltund.png
rename to src/afd/sprites/front-shiny/0836-000-Boltund.png
diff --git a/src/afd/sprites/front-shiny/0837--000--Rolycoly.png b/src/afd/sprites/front-shiny/0837-000-Rolycoly.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0837--000--Rolycoly.png
rename to src/afd/sprites/front-shiny/0837-000-Rolycoly.png
diff --git a/src/afd/sprites/front-shiny/0838--000--Carkol.png b/src/afd/sprites/front-shiny/0838-000-Carkol.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0838--000--Carkol.png
rename to src/afd/sprites/front-shiny/0838-000-Carkol.png
diff --git a/src/afd/sprites/front-shiny/0839--000--Coalossal.png b/src/afd/sprites/front-shiny/0839-000-Coalossal.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0839--000--Coalossal.png
rename to src/afd/sprites/front-shiny/0839-000-Coalossal.png
diff --git a/src/afd/sprites/front-shiny/0839--420--Coalossal--Gmax.png b/src/afd/sprites/front-shiny/0839-420-Coalossal-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0839--420--Coalossal--Gmax.png
rename to src/afd/sprites/front-shiny/0839-420-Coalossal-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0840--000--Applin.png b/src/afd/sprites/front-shiny/0840-000-Applin.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0840--000--Applin.png
rename to src/afd/sprites/front-shiny/0840-000-Applin.png
diff --git a/src/afd/sprites/front-shiny/0841--000--Flapple.png b/src/afd/sprites/front-shiny/0841-000-Flapple.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0841--000--Flapple.png
rename to src/afd/sprites/front-shiny/0841-000-Flapple.png
diff --git a/src/afd/sprites/front-shiny/0841--420--Flapple--Gmax.png b/src/afd/sprites/front-shiny/0841-420-Flapple-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0841--420--Flapple--Gmax.png
rename to src/afd/sprites/front-shiny/0841-420-Flapple-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0842--000--Appletun.png b/src/afd/sprites/front-shiny/0842-000-Appletun.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0842--000--Appletun.png
rename to src/afd/sprites/front-shiny/0842-000-Appletun.png
diff --git a/src/afd/sprites/front-shiny/0842--420--Appletun--Gmax.png b/src/afd/sprites/front-shiny/0842-420-Appletun-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0842--420--Appletun--Gmax.png
rename to src/afd/sprites/front-shiny/0842-420-Appletun-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0843--000--Silicobra.png b/src/afd/sprites/front-shiny/0843-000-Silicobra.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0843--000--Silicobra.png
rename to src/afd/sprites/front-shiny/0843-000-Silicobra.png
diff --git a/src/afd/sprites/front-shiny/0844--000--Sandaconda.png b/src/afd/sprites/front-shiny/0844-000-Sandaconda.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0844--000--Sandaconda.png
rename to src/afd/sprites/front-shiny/0844-000-Sandaconda.png
diff --git a/src/afd/sprites/front-shiny/0844--420--Sandaconda--Gmax.png b/src/afd/sprites/front-shiny/0844-420-Sandaconda-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0844--420--Sandaconda--Gmax.png
rename to src/afd/sprites/front-shiny/0844-420-Sandaconda-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0845--000--Cramorant.png b/src/afd/sprites/front-shiny/0845-000-Cramorant.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0845--000--Cramorant.png
rename to src/afd/sprites/front-shiny/0845-000-Cramorant.png
diff --git a/src/afd/sprites/front-shiny/0845--420--Cramorant--Gorging.png b/src/afd/sprites/front-shiny/0845-420-Cramorant-Gorging.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0845--420--Cramorant--Gorging.png
rename to src/afd/sprites/front-shiny/0845-420-Cramorant-Gorging.png
diff --git a/src/afd/sprites/front-shiny/0845--420--Cramorant--Gulping.png b/src/afd/sprites/front-shiny/0845-420-Cramorant-Gulping.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0845--420--Cramorant--Gulping.png
rename to src/afd/sprites/front-shiny/0845-420-Cramorant-Gulping.png
diff --git a/src/afd/sprites/front-shiny/0846--000--Arrokuda.png b/src/afd/sprites/front-shiny/0846-000-Arrokuda.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0846--000--Arrokuda.png
rename to src/afd/sprites/front-shiny/0846-000-Arrokuda.png
diff --git a/src/afd/sprites/front-shiny/0847--000--Barraskewda.png b/src/afd/sprites/front-shiny/0847-000-Barraskewda.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0847--000--Barraskewda.png
rename to src/afd/sprites/front-shiny/0847-000-Barraskewda.png
diff --git a/src/afd/sprites/front-shiny/0848--000--Toxel.png b/src/afd/sprites/front-shiny/0848-000-Toxel.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0848--000--Toxel.png
rename to src/afd/sprites/front-shiny/0848-000-Toxel.png
diff --git a/src/afd/sprites/front-shiny/0849--000--Toxtricity.png b/src/afd/sprites/front-shiny/0849-000-Toxtricity.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0849--000--Toxtricity.png
rename to src/afd/sprites/front-shiny/0849-000-Toxtricity.png
diff --git a/src/afd/sprites/front-shiny/0849--420--Toxtricity--Gmax.png b/src/afd/sprites/front-shiny/0849-420-Toxtricity-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0849--420--Toxtricity--Gmax.png
rename to src/afd/sprites/front-shiny/0849-420-Toxtricity-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0849--420--Toxtricity--Low-Key.png b/src/afd/sprites/front-shiny/0849-420-Toxtricity-Low~Key.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0849--420--Toxtricity--Low-Key.png
rename to src/afd/sprites/front-shiny/0849-420-Toxtricity-Low~Key.png
diff --git a/src/afd/sprites/front-shiny/0849--420--Toxtricity--Low-Key-Gmax.png b/src/afd/sprites/front-shiny/0849-420-Toxtricity-Low~Key~Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0849--420--Toxtricity--Low-Key-Gmax.png
rename to src/afd/sprites/front-shiny/0849-420-Toxtricity-Low~Key~Gmax.png
diff --git a/src/afd/sprites/front-shiny/0850--000--Sizzlipede.png b/src/afd/sprites/front-shiny/0850-000-Sizzlipede.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0850--000--Sizzlipede.png
rename to src/afd/sprites/front-shiny/0850-000-Sizzlipede.png
diff --git a/src/afd/sprites/front-shiny/0851--000--Centiskorch.png b/src/afd/sprites/front-shiny/0851-000-Centiskorch.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0851--000--Centiskorch.png
rename to src/afd/sprites/front-shiny/0851-000-Centiskorch.png
diff --git a/src/afd/sprites/front-shiny/0851--420--Centiskorch--Gmax.png b/src/afd/sprites/front-shiny/0851-420-Centiskorch-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0851--420--Centiskorch--Gmax.png
rename to src/afd/sprites/front-shiny/0851-420-Centiskorch-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0852--000--Clobbopus.png b/src/afd/sprites/front-shiny/0852-000-Clobbopus.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0852--000--Clobbopus.png
rename to src/afd/sprites/front-shiny/0852-000-Clobbopus.png
diff --git a/src/afd/sprites/front-shiny/0853--000--Grapploct.png b/src/afd/sprites/front-shiny/0853-000-Grapploct.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0853--000--Grapploct.png
rename to src/afd/sprites/front-shiny/0853-000-Grapploct.png
diff --git a/src/afd/sprites/front-shiny/0854--000--Sinistea.png b/src/afd/sprites/front-shiny/0854-000-Sinistea.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0854--000--Sinistea.png
rename to src/afd/sprites/front-shiny/0854-000-Sinistea.png
diff --git a/src/afd/sprites/front-shiny/0855--000--Polteageist.png b/src/afd/sprites/front-shiny/0855-000-Polteageist.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0855--000--Polteageist.png
rename to src/afd/sprites/front-shiny/0855-000-Polteageist.png
diff --git a/src/afd/sprites/front-shiny/0856--000--Hatenna.png b/src/afd/sprites/front-shiny/0856-000-Hatenna.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0856--000--Hatenna.png
rename to src/afd/sprites/front-shiny/0856-000-Hatenna.png
diff --git a/src/afd/sprites/front-shiny/0857--000--Hattrem.png b/src/afd/sprites/front-shiny/0857-000-Hattrem.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0857--000--Hattrem.png
rename to src/afd/sprites/front-shiny/0857-000-Hattrem.png
diff --git a/src/afd/sprites/front-shiny/0858--000--Hatterene.png b/src/afd/sprites/front-shiny/0858-000-Hatterene.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0858--000--Hatterene.png
rename to src/afd/sprites/front-shiny/0858-000-Hatterene.png
diff --git a/src/afd/sprites/front-shiny/0858--420--Hatterene--Gmax.png b/src/afd/sprites/front-shiny/0858-420-Hatterene-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0858--420--Hatterene--Gmax.png
rename to src/afd/sprites/front-shiny/0858-420-Hatterene-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0859--000--Impidimp.png b/src/afd/sprites/front-shiny/0859-000-Impidimp.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0859--000--Impidimp.png
rename to src/afd/sprites/front-shiny/0859-000-Impidimp.png
diff --git a/src/afd/sprites/front-shiny/0860--000--Morgrem.png b/src/afd/sprites/front-shiny/0860-000-Morgrem.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0860--000--Morgrem.png
rename to src/afd/sprites/front-shiny/0860-000-Morgrem.png
diff --git a/src/afd/sprites/front-shiny/0861--000--Grimmsnarl.png b/src/afd/sprites/front-shiny/0861-000-Grimmsnarl.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0861--000--Grimmsnarl.png
rename to src/afd/sprites/front-shiny/0861-000-Grimmsnarl.png
diff --git a/src/afd/sprites/front-shiny/0861--420--Grimmsnarl--Gmax.png b/src/afd/sprites/front-shiny/0861-420-Grimmsnarl-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0861--420--Grimmsnarl--Gmax.png
rename to src/afd/sprites/front-shiny/0861-420-Grimmsnarl-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0862--000--Obstagoon.png b/src/afd/sprites/front-shiny/0862-000-Obstagoon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0862--000--Obstagoon.png
rename to src/afd/sprites/front-shiny/0862-000-Obstagoon.png
diff --git a/src/afd/sprites/front-shiny/0863--000--Perrserker.png b/src/afd/sprites/front-shiny/0863-000-Perrserker.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0863--000--Perrserker.png
rename to src/afd/sprites/front-shiny/0863-000-Perrserker.png
diff --git a/src/afd/sprites/front-shiny/0864--000--Cursola.png b/src/afd/sprites/front-shiny/0864-000-Cursola.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0864--000--Cursola.png
rename to src/afd/sprites/front-shiny/0864-000-Cursola.png
diff --git a/src/afd/sprites/front-shiny/0865--000--Sirfetch__0027d.png b/src/afd/sprites/front-shiny/0865-000-Sirfetch__0027d.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0865--000--Sirfetch__0027d.png
rename to src/afd/sprites/front-shiny/0865-000-Sirfetch__0027d.png
diff --git a/src/afd/sprites/front-shiny/0866--000--Mr._Rime.png b/src/afd/sprites/front-shiny/0866-000-Mr._Rime.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0866--000--Mr._Rime.png
rename to src/afd/sprites/front-shiny/0866-000-Mr._Rime.png
diff --git a/src/afd/sprites/front-shiny/0867--000--Runerigus.png b/src/afd/sprites/front-shiny/0867-000-Runerigus.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0867--000--Runerigus.png
rename to src/afd/sprites/front-shiny/0867-000-Runerigus.png
diff --git a/src/afd/sprites/front-shiny/0868--000--Milcery.png b/src/afd/sprites/front-shiny/0868-000-Milcery.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0868--000--Milcery.png
rename to src/afd/sprites/front-shiny/0868-000-Milcery.png
diff --git a/src/afd/sprites/front-shiny/0869--000--Alcremie.png b/src/afd/sprites/front-shiny/0869-000-Alcremie.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0869--000--Alcremie.png
rename to src/afd/sprites/front-shiny/0869-000-Alcremie.png
diff --git a/src/afd/sprites/front-shiny/0869--420--Alcremie--Gmax.png b/src/afd/sprites/front-shiny/0869-420-Alcremie-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0869--420--Alcremie--Gmax.png
rename to src/afd/sprites/front-shiny/0869-420-Alcremie-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0870--000--Falinks.png b/src/afd/sprites/front-shiny/0870-000-Falinks.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0870--000--Falinks.png
rename to src/afd/sprites/front-shiny/0870-000-Falinks.png
diff --git a/src/afd/sprites/front-shiny/0871--000--Pincurchin.png b/src/afd/sprites/front-shiny/0871-000-Pincurchin.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0871--000--Pincurchin.png
rename to src/afd/sprites/front-shiny/0871-000-Pincurchin.png
diff --git a/src/afd/sprites/front-shiny/0872--000--Snom.png b/src/afd/sprites/front-shiny/0872-000-Snom.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0872--000--Snom.png
rename to src/afd/sprites/front-shiny/0872-000-Snom.png
diff --git a/src/afd/sprites/front-shiny/0873--000--Frosmoth.png b/src/afd/sprites/front-shiny/0873-000-Frosmoth.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0873--000--Frosmoth.png
rename to src/afd/sprites/front-shiny/0873-000-Frosmoth.png
diff --git a/src/afd/sprites/front-shiny/0874--000--Stonjourner.png b/src/afd/sprites/front-shiny/0874-000-Stonjourner.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0874--000--Stonjourner.png
rename to src/afd/sprites/front-shiny/0874-000-Stonjourner.png
diff --git a/src/afd/sprites/front-shiny/0875--000--Eiscue.png b/src/afd/sprites/front-shiny/0875-000-Eiscue.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0875--000--Eiscue.png
rename to src/afd/sprites/front-shiny/0875-000-Eiscue.png
diff --git a/src/afd/sprites/front-shiny/0875--420--Eiscue--Noice.png b/src/afd/sprites/front-shiny/0875-420-Eiscue-Noice.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0875--420--Eiscue--Noice.png
rename to src/afd/sprites/front-shiny/0875-420-Eiscue-Noice.png
diff --git a/src/afd/sprites/front-shiny/0876--000--Indeedee.png b/src/afd/sprites/front-shiny/0876-000-Indeedee.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0876--000--Indeedee.png
rename to src/afd/sprites/front-shiny/0876-000-Indeedee.png
diff --git a/src/afd/sprites/front-shiny/0876--420--Indeedee--F.png b/src/afd/sprites/front-shiny/0876-420-Indeedee-F.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0876--420--Indeedee--F.png
rename to src/afd/sprites/front-shiny/0876-420-Indeedee-F.png
diff --git a/src/afd/sprites/front-shiny/0877--000--Morpeko.png b/src/afd/sprites/front-shiny/0877-000-Morpeko.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0877--000--Morpeko.png
rename to src/afd/sprites/front-shiny/0877-000-Morpeko.png
diff --git a/src/afd/sprites/front-shiny/0877--420--Morpeko--Hangry.png b/src/afd/sprites/front-shiny/0877-420-Morpeko-Hangry.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0877--420--Morpeko--Hangry.png
rename to src/afd/sprites/front-shiny/0877-420-Morpeko-Hangry.png
diff --git a/src/afd/sprites/front-shiny/0878--000--Cufant.png b/src/afd/sprites/front-shiny/0878-000-Cufant.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0878--000--Cufant.png
rename to src/afd/sprites/front-shiny/0878-000-Cufant.png
diff --git a/src/afd/sprites/front-shiny/0879--000--Copperajah.png b/src/afd/sprites/front-shiny/0879-000-Copperajah.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0879--000--Copperajah.png
rename to src/afd/sprites/front-shiny/0879-000-Copperajah.png
diff --git a/src/afd/sprites/front-shiny/0879--420--Copperajah--Gmax.png b/src/afd/sprites/front-shiny/0879-420-Copperajah-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0879--420--Copperajah--Gmax.png
rename to src/afd/sprites/front-shiny/0879-420-Copperajah-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0880--000--Dracozolt.png b/src/afd/sprites/front-shiny/0880-000-Dracozolt.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0880--000--Dracozolt.png
rename to src/afd/sprites/front-shiny/0880-000-Dracozolt.png
diff --git a/src/afd/sprites/front-shiny/0881--000--Arctozolt.png b/src/afd/sprites/front-shiny/0881-000-Arctozolt.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0881--000--Arctozolt.png
rename to src/afd/sprites/front-shiny/0881-000-Arctozolt.png
diff --git a/src/afd/sprites/front-shiny/0882--000--Dracovish.png b/src/afd/sprites/front-shiny/0882-000-Dracovish.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0882--000--Dracovish.png
rename to src/afd/sprites/front-shiny/0882-000-Dracovish.png
diff --git a/src/afd/sprites/front-shiny/0883--000--Arctovish.png b/src/afd/sprites/front-shiny/0883-000-Arctovish.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0883--000--Arctovish.png
rename to src/afd/sprites/front-shiny/0883-000-Arctovish.png
diff --git a/src/afd/sprites/front-shiny/0884--000--Duraludon.png b/src/afd/sprites/front-shiny/0884-000-Duraludon.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0884--000--Duraludon.png
rename to src/afd/sprites/front-shiny/0884-000-Duraludon.png
diff --git a/src/afd/sprites/front-shiny/0884--420--Duraludon--Gmax.png b/src/afd/sprites/front-shiny/0884-420-Duraludon-Gmax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0884--420--Duraludon--Gmax.png
rename to src/afd/sprites/front-shiny/0884-420-Duraludon-Gmax.png
diff --git a/src/afd/sprites/front-shiny/0885--000--Dreepy.png b/src/afd/sprites/front-shiny/0885-000-Dreepy.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0885--000--Dreepy.png
rename to src/afd/sprites/front-shiny/0885-000-Dreepy.png
diff --git a/src/afd/sprites/front-shiny/0886--000--Drakloak.png b/src/afd/sprites/front-shiny/0886-000-Drakloak.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0886--000--Drakloak.png
rename to src/afd/sprites/front-shiny/0886-000-Drakloak.png
diff --git a/src/afd/sprites/front-shiny/0887--000--Dragapult.png b/src/afd/sprites/front-shiny/0887-000-Dragapult.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0887--000--Dragapult.png
rename to src/afd/sprites/front-shiny/0887-000-Dragapult.png
diff --git a/src/afd/sprites/front-shiny/0888--000--Zacian.png b/src/afd/sprites/front-shiny/0888-000-Zacian.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0888--000--Zacian.png
rename to src/afd/sprites/front-shiny/0888-000-Zacian.png
diff --git a/src/afd/sprites/front-shiny/0888--420--Zacian--Crowned.png b/src/afd/sprites/front-shiny/0888-420-Zacian-Crowned.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0888--420--Zacian--Crowned.png
rename to src/afd/sprites/front-shiny/0888-420-Zacian-Crowned.png
diff --git a/src/afd/sprites/front-shiny/0889--000--Zamazenta.png b/src/afd/sprites/front-shiny/0889-000-Zamazenta.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0889--000--Zamazenta.png
rename to src/afd/sprites/front-shiny/0889-000-Zamazenta.png
diff --git a/src/afd/sprites/front-shiny/0889--420--Zamazenta--Crowned.png b/src/afd/sprites/front-shiny/0889-420-Zamazenta-Crowned.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0889--420--Zamazenta--Crowned.png
rename to src/afd/sprites/front-shiny/0889-420-Zamazenta-Crowned.png
diff --git a/src/afd/sprites/front-shiny/0890--000--Eternatus.png b/src/afd/sprites/front-shiny/0890-000-Eternatus.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0890--000--Eternatus.png
rename to src/afd/sprites/front-shiny/0890-000-Eternatus.png
diff --git a/src/afd/sprites/front-shiny/0890--420--Eternatus--Eternamax.png b/src/afd/sprites/front-shiny/0890-420-Eternatus-Eternamax.png
similarity index 100%
rename from src/afd/sprites/front-shiny/0890--420--Eternatus--Eternamax.png
rename to src/afd/sprites/front-shiny/0890-420-Eternatus-Eternamax.png
diff --git a/src/afd/sprites/front/0000--000--Missingno..png b/src/afd/sprites/front/0000-000-Missingno..png
similarity index 100%
rename from src/afd/sprites/front/0000--000--Missingno..png
rename to src/afd/sprites/front/0000-000-Missingno..png
diff --git a/src/afd/sprites/front/0001--000--Bulbasaur.png b/src/afd/sprites/front/0001-000-Bulbasaur.png
similarity index 100%
rename from src/afd/sprites/front/0001--000--Bulbasaur.png
rename to src/afd/sprites/front/0001-000-Bulbasaur.png
diff --git a/src/afd/sprites/front/0002--000--Ivysaur.png b/src/afd/sprites/front/0002-000-Ivysaur.png
similarity index 100%
rename from src/afd/sprites/front/0002--000--Ivysaur.png
rename to src/afd/sprites/front/0002-000-Ivysaur.png
diff --git a/src/afd/sprites/front/0002--000--Syclant.png b/src/afd/sprites/front/0002-000-Syclant.png
similarity index 100%
rename from src/afd/sprites/front/0002--000--Syclant.png
rename to src/afd/sprites/front/0002-000-Syclant.png
diff --git a/src/afd/sprites/front/0003--000--Revenankh.png b/src/afd/sprites/front/0003-000-Revenankh.png
similarity index 100%
rename from src/afd/sprites/front/0003--000--Revenankh.png
rename to src/afd/sprites/front/0003-000-Revenankh.png
diff --git a/src/afd/sprites/front/0003--000--Venusaur.png b/src/afd/sprites/front/0003-000-Venusaur.png
similarity index 100%
rename from src/afd/sprites/front/0003--000--Venusaur.png
rename to src/afd/sprites/front/0003-000-Venusaur.png
diff --git a/src/afd/sprites/front/0003--420--Venusaur--Mega.png b/src/afd/sprites/front/0003-420-Venusaur-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0003--420--Venusaur--Mega.png
rename to src/afd/sprites/front/0003-420-Venusaur-Mega.png
diff --git a/src/afd/sprites/front/0004--000--Charmander.png b/src/afd/sprites/front/0004-000-Charmander.png
similarity index 100%
rename from src/afd/sprites/front/0004--000--Charmander.png
rename to src/afd/sprites/front/0004-000-Charmander.png
diff --git a/src/afd/sprites/front/0005--000--Charmeleon.png b/src/afd/sprites/front/0005-000-Charmeleon.png
similarity index 100%
rename from src/afd/sprites/front/0005--000--Charmeleon.png
rename to src/afd/sprites/front/0005-000-Charmeleon.png
diff --git a/src/afd/sprites/front/0006--000--Charizard.png b/src/afd/sprites/front/0006-000-Charizard.png
similarity index 100%
rename from src/afd/sprites/front/0006--000--Charizard.png
rename to src/afd/sprites/front/0006-000-Charizard.png
diff --git a/src/afd/sprites/front/0006--000--Pyroak.png b/src/afd/sprites/front/0006-000-Pyroak.png
similarity index 100%
rename from src/afd/sprites/front/0006--000--Pyroak.png
rename to src/afd/sprites/front/0006-000-Pyroak.png
diff --git a/src/afd/sprites/front/0006--420--Charizard--Gmax.png b/src/afd/sprites/front/0006-420-Charizard-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0006--420--Charizard--Gmax.png
rename to src/afd/sprites/front/0006-420-Charizard-Gmax.png
diff --git a/src/afd/sprites/front/0006--420--Charizard--Mega-X.png b/src/afd/sprites/front/0006-420-Charizard-Mega~X.png
similarity index 100%
rename from src/afd/sprites/front/0006--420--Charizard--Mega-X.png
rename to src/afd/sprites/front/0006-420-Charizard-Mega~X.png
diff --git a/src/afd/sprites/front/0006--420--Charizard--Mega-Y.png b/src/afd/sprites/front/0006-420-Charizard-Mega~Y.png
similarity index 100%
rename from src/afd/sprites/front/0006--420--Charizard--Mega-Y.png
rename to src/afd/sprites/front/0006-420-Charizard-Mega~Y.png
diff --git a/src/afd/sprites/front/0007--000--Squirtle.png b/src/afd/sprites/front/0007-000-Squirtle.png
similarity index 100%
rename from src/afd/sprites/front/0007--000--Squirtle.png
rename to src/afd/sprites/front/0007-000-Squirtle.png
diff --git a/src/afd/sprites/front/0008--000--Fidgit.png b/src/afd/sprites/front/0008-000-Fidgit.png
similarity index 100%
rename from src/afd/sprites/front/0008--000--Fidgit.png
rename to src/afd/sprites/front/0008-000-Fidgit.png
diff --git a/src/afd/sprites/front/0008--000--Wartortle.png b/src/afd/sprites/front/0008-000-Wartortle.png
similarity index 100%
rename from src/afd/sprites/front/0008--000--Wartortle.png
rename to src/afd/sprites/front/0008-000-Wartortle.png
diff --git a/src/afd/sprites/front/0009--000--Blastoise.png b/src/afd/sprites/front/0009-000-Blastoise.png
similarity index 100%
rename from src/afd/sprites/front/0009--000--Blastoise.png
rename to src/afd/sprites/front/0009-000-Blastoise.png
diff --git a/src/afd/sprites/front/0009--420--Blastoise--Mega.png b/src/afd/sprites/front/0009-420-Blastoise-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0009--420--Blastoise--Mega.png
rename to src/afd/sprites/front/0009-420-Blastoise-Mega.png
diff --git a/src/afd/sprites/front/0010--000--Caterpie.png b/src/afd/sprites/front/0010-000-Caterpie.png
similarity index 100%
rename from src/afd/sprites/front/0010--000--Caterpie.png
rename to src/afd/sprites/front/0010-000-Caterpie.png
diff --git a/src/afd/sprites/front/0011--000--Metapod.png b/src/afd/sprites/front/0011-000-Metapod.png
similarity index 100%
rename from src/afd/sprites/front/0011--000--Metapod.png
rename to src/afd/sprites/front/0011-000-Metapod.png
diff --git a/src/afd/sprites/front/0011--000--Stratagem.png b/src/afd/sprites/front/0011-000-Stratagem.png
similarity index 100%
rename from src/afd/sprites/front/0011--000--Stratagem.png
rename to src/afd/sprites/front/0011-000-Stratagem.png
diff --git a/src/afd/sprites/front/0012--000--Butterfree.png b/src/afd/sprites/front/0012-000-Butterfree.png
similarity index 100%
rename from src/afd/sprites/front/0012--000--Butterfree.png
rename to src/afd/sprites/front/0012-000-Butterfree.png
diff --git a/src/afd/sprites/front/0012--420--Butterfree--Gmax.png b/src/afd/sprites/front/0012-420-Butterfree-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0012--420--Butterfree--Gmax.png
rename to src/afd/sprites/front/0012-420-Butterfree-Gmax.png
diff --git a/src/afd/sprites/front/0013--000--Arghonaut.png b/src/afd/sprites/front/0013-000-Arghonaut.png
similarity index 100%
rename from src/afd/sprites/front/0013--000--Arghonaut.png
rename to src/afd/sprites/front/0013-000-Arghonaut.png
diff --git a/src/afd/sprites/front/0013--000--Weedle.png b/src/afd/sprites/front/0013-000-Weedle.png
similarity index 100%
rename from src/afd/sprites/front/0013--000--Weedle.png
rename to src/afd/sprites/front/0013-000-Weedle.png
diff --git a/src/afd/sprites/front/0014--000--Kakuna.png b/src/afd/sprites/front/0014-000-Kakuna.png
similarity index 100%
rename from src/afd/sprites/front/0014--000--Kakuna.png
rename to src/afd/sprites/front/0014-000-Kakuna.png
diff --git a/src/afd/sprites/front/0014--000--Kitsunoh.png b/src/afd/sprites/front/0014-000-Kitsunoh.png
similarity index 100%
rename from src/afd/sprites/front/0014--000--Kitsunoh.png
rename to src/afd/sprites/front/0014-000-Kitsunoh.png
diff --git a/src/afd/sprites/front/0015--000--Beedrill.png b/src/afd/sprites/front/0015-000-Beedrill.png
similarity index 100%
rename from src/afd/sprites/front/0015--000--Beedrill.png
rename to src/afd/sprites/front/0015-000-Beedrill.png
diff --git a/src/afd/sprites/front/0015--000--Cyclohm.png b/src/afd/sprites/front/0015-000-Cyclohm.png
similarity index 100%
rename from src/afd/sprites/front/0015--000--Cyclohm.png
rename to src/afd/sprites/front/0015-000-Cyclohm.png
diff --git a/src/afd/sprites/front/0015--420--Beedrill--Mega.png b/src/afd/sprites/front/0015-420-Beedrill-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0015--420--Beedrill--Mega.png
rename to src/afd/sprites/front/0015-420-Beedrill-Mega.png
diff --git a/src/afd/sprites/front/0016--000--Colossoil.png b/src/afd/sprites/front/0016-000-Colossoil.png
similarity index 100%
rename from src/afd/sprites/front/0016--000--Colossoil.png
rename to src/afd/sprites/front/0016-000-Colossoil.png
diff --git a/src/afd/sprites/front/0016--000--Pidgey.png b/src/afd/sprites/front/0016-000-Pidgey.png
similarity index 100%
rename from src/afd/sprites/front/0016--000--Pidgey.png
rename to src/afd/sprites/front/0016-000-Pidgey.png
diff --git a/src/afd/sprites/front/0017--000--Krilowatt.png b/src/afd/sprites/front/0017-000-Krilowatt.png
similarity index 100%
rename from src/afd/sprites/front/0017--000--Krilowatt.png
rename to src/afd/sprites/front/0017-000-Krilowatt.png
diff --git a/src/afd/sprites/front/0017--000--Pidgeotto.png b/src/afd/sprites/front/0017-000-Pidgeotto.png
similarity index 100%
rename from src/afd/sprites/front/0017--000--Pidgeotto.png
rename to src/afd/sprites/front/0017-000-Pidgeotto.png
diff --git a/src/afd/sprites/front/0018--000--Pidgeot.png b/src/afd/sprites/front/0018-000-Pidgeot.png
similarity index 100%
rename from src/afd/sprites/front/0018--000--Pidgeot.png
rename to src/afd/sprites/front/0018-000-Pidgeot.png
diff --git a/src/afd/sprites/front/0018--420--Pidgeot--Mega.gif b/src/afd/sprites/front/0018-420-Pidgeot-Mega.gif
similarity index 100%
rename from src/afd/sprites/front/0018--420--Pidgeot--Mega.gif
rename to src/afd/sprites/front/0018-420-Pidgeot-Mega.gif
diff --git a/src/afd/sprites/front/0019--000--Rattata.png b/src/afd/sprites/front/0019-000-Rattata.png
similarity index 100%
rename from src/afd/sprites/front/0019--000--Rattata.png
rename to src/afd/sprites/front/0019-000-Rattata.png
diff --git a/src/afd/sprites/front/0019--000--Voodoom.png b/src/afd/sprites/front/0019-000-Voodoom.png
similarity index 100%
rename from src/afd/sprites/front/0019--000--Voodoom.png
rename to src/afd/sprites/front/0019-000-Voodoom.png
diff --git a/src/afd/sprites/front/0019--420--Rattata--Alola.png b/src/afd/sprites/front/0019-420-Rattata-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0019--420--Rattata--Alola.png
rename to src/afd/sprites/front/0019-420-Rattata-Alola.png
diff --git a/src/afd/sprites/front/0020--000--Raticate.png b/src/afd/sprites/front/0020-000-Raticate.png
similarity index 100%
rename from src/afd/sprites/front/0020--000--Raticate.png
rename to src/afd/sprites/front/0020-000-Raticate.png
diff --git a/src/afd/sprites/front/0020--420--Raticate--Alola.png b/src/afd/sprites/front/0020-420-Raticate-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0020--420--Raticate--Alola.png
rename to src/afd/sprites/front/0020-420-Raticate-Alola.png
diff --git a/src/afd/sprites/front/0021--000--Spearow.png b/src/afd/sprites/front/0021-000-Spearow.png
similarity index 100%
rename from src/afd/sprites/front/0021--000--Spearow.png
rename to src/afd/sprites/front/0021-000-Spearow.png
diff --git a/src/afd/sprites/front/0021--000--Tomohawk.png b/src/afd/sprites/front/0021-000-Tomohawk.png
similarity index 100%
rename from src/afd/sprites/front/0021--000--Tomohawk.png
rename to src/afd/sprites/front/0021-000-Tomohawk.png
diff --git a/src/afd/sprites/front/0022--000--Fearow.png b/src/afd/sprites/front/0022-000-Fearow.png
similarity index 100%
rename from src/afd/sprites/front/0022--000--Fearow.png
rename to src/afd/sprites/front/0022-000-Fearow.png
diff --git a/src/afd/sprites/front/0023--000--Ekans.png b/src/afd/sprites/front/0023-000-Ekans.png
similarity index 100%
rename from src/afd/sprites/front/0023--000--Ekans.png
rename to src/afd/sprites/front/0023-000-Ekans.png
diff --git a/src/afd/sprites/front/0023--000--Necturna.png b/src/afd/sprites/front/0023-000-Necturna.png
similarity index 100%
rename from src/afd/sprites/front/0023--000--Necturna.png
rename to src/afd/sprites/front/0023-000-Necturna.png
diff --git a/src/afd/sprites/front/0024--000--Arbok.png b/src/afd/sprites/front/0024-000-Arbok.png
similarity index 100%
rename from src/afd/sprites/front/0024--000--Arbok.png
rename to src/afd/sprites/front/0024-000-Arbok.png
diff --git a/src/afd/sprites/front/0024--000--Mollux.png b/src/afd/sprites/front/0024-000-Mollux.png
similarity index 100%
rename from src/afd/sprites/front/0024--000--Mollux.png
rename to src/afd/sprites/front/0024-000-Mollux.png
diff --git a/src/afd/sprites/front/0025--000--Pikachu.png b/src/afd/sprites/front/0025-000-Pikachu.png
similarity index 100%
rename from src/afd/sprites/front/0025--000--Pikachu.png
rename to src/afd/sprites/front/0025-000-Pikachu.png
diff --git a/src/afd/sprites/front/0025--420--Pikachu--Alola.png b/src/afd/sprites/front/0025-420-Pikachu-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0025--420--Pikachu--Alola.png
rename to src/afd/sprites/front/0025-420-Pikachu-Alola.png
diff --git a/src/afd/sprites/front/0025--420--Pikachu--Belle.png b/src/afd/sprites/front/0025-420-Pikachu-Belle.png
similarity index 100%
rename from src/afd/sprites/front/0025--420--Pikachu--Belle.png
rename to src/afd/sprites/front/0025-420-Pikachu-Belle.png
diff --git a/src/afd/sprites/front/0025--420--Pikachu--Gmax.png b/src/afd/sprites/front/0025-420-Pikachu-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0025--420--Pikachu--Gmax.png
rename to src/afd/sprites/front/0025-420-Pikachu-Gmax.png
diff --git a/src/afd/sprites/front/0025--420--Pikachu--Hoenn.png b/src/afd/sprites/front/0025-420-Pikachu-Hoenn.png
similarity index 100%
rename from src/afd/sprites/front/0025--420--Pikachu--Hoenn.png
rename to src/afd/sprites/front/0025-420-Pikachu-Hoenn.png
diff --git a/src/afd/sprites/front/0025--420--Pikachu--Kalos.png b/src/afd/sprites/front/0025-420-Pikachu-Kalos.png
similarity index 100%
rename from src/afd/sprites/front/0025--420--Pikachu--Kalos.png
rename to src/afd/sprites/front/0025-420-Pikachu-Kalos.png
diff --git a/src/afd/sprites/front/0025--420--Pikachu--Libre.png b/src/afd/sprites/front/0025-420-Pikachu-Libre.png
similarity index 100%
rename from src/afd/sprites/front/0025--420--Pikachu--Libre.png
rename to src/afd/sprites/front/0025-420-Pikachu-Libre.png
diff --git a/src/afd/sprites/front/0025--420--Pikachu--Original.png b/src/afd/sprites/front/0025-420-Pikachu-Original.png
similarity index 100%
rename from src/afd/sprites/front/0025--420--Pikachu--Original.png
rename to src/afd/sprites/front/0025-420-Pikachu-Original.png
diff --git a/src/afd/sprites/front/0025--420--Pikachu--Partner.png b/src/afd/sprites/front/0025-420-Pikachu-Partner.png
similarity index 100%
rename from src/afd/sprites/front/0025--420--Pikachu--Partner.png
rename to src/afd/sprites/front/0025-420-Pikachu-Partner.png
diff --git a/src/afd/sprites/front/0025--420--Pikachu--PhD.png b/src/afd/sprites/front/0025-420-Pikachu-PhD.png
similarity index 100%
rename from src/afd/sprites/front/0025--420--Pikachu--PhD.png
rename to src/afd/sprites/front/0025-420-Pikachu-PhD.png
diff --git a/src/afd/sprites/front/0025--420--Pikachu--Pop-Star.png b/src/afd/sprites/front/0025-420-Pikachu-Pop~Star.png
similarity index 100%
rename from src/afd/sprites/front/0025--420--Pikachu--Pop-Star.png
rename to src/afd/sprites/front/0025-420-Pikachu-Pop~Star.png
diff --git a/src/afd/sprites/front/0025--420--Pikachu--Rock-Star.png b/src/afd/sprites/front/0025-420-Pikachu-Rock~Star.png
similarity index 100%
rename from src/afd/sprites/front/0025--420--Pikachu--Rock-Star.png
rename to src/afd/sprites/front/0025-420-Pikachu-Rock~Star.png
diff --git a/src/afd/sprites/front/0025--420--Pikachu--Sinnoh.png b/src/afd/sprites/front/0025-420-Pikachu-Sinnoh.png
similarity index 100%
rename from src/afd/sprites/front/0025--420--Pikachu--Sinnoh.png
rename to src/afd/sprites/front/0025-420-Pikachu-Sinnoh.png
diff --git a/src/afd/sprites/front/0025--420--Pikachu--Starter.png b/src/afd/sprites/front/0025-420-Pikachu-Starter.png
similarity index 100%
rename from src/afd/sprites/front/0025--420--Pikachu--Starter.png
rename to src/afd/sprites/front/0025-420-Pikachu-Starter.png
diff --git a/src/afd/sprites/front/0025--420--Pikachu--Unova.png b/src/afd/sprites/front/0025-420-Pikachu-Unova.png
similarity index 100%
rename from src/afd/sprites/front/0025--420--Pikachu--Unova.png
rename to src/afd/sprites/front/0025-420-Pikachu-Unova.png
diff --git a/src/afd/sprites/front/0026--000--Raichu.png b/src/afd/sprites/front/0026-000-Raichu.png
similarity index 100%
rename from src/afd/sprites/front/0026--000--Raichu.png
rename to src/afd/sprites/front/0026-000-Raichu.png
diff --git a/src/afd/sprites/front/0026--420--Raichu--Alola.png b/src/afd/sprites/front/0026-420-Raichu-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0026--420--Raichu--Alola.png
rename to src/afd/sprites/front/0026-420-Raichu-Alola.png
diff --git a/src/afd/sprites/front/0027--000--Aurumoth.png b/src/afd/sprites/front/0027-000-Aurumoth.png
similarity index 100%
rename from src/afd/sprites/front/0027--000--Aurumoth.png
rename to src/afd/sprites/front/0027-000-Aurumoth.png
diff --git a/src/afd/sprites/front/0027--000--Sandshrew.png b/src/afd/sprites/front/0027-000-Sandshrew.png
similarity index 100%
rename from src/afd/sprites/front/0027--000--Sandshrew.png
rename to src/afd/sprites/front/0027-000-Sandshrew.png
diff --git a/src/afd/sprites/front/0027--420--Sandshrew--Alola.png b/src/afd/sprites/front/0027-420-Sandshrew-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0027--420--Sandshrew--Alola.png
rename to src/afd/sprites/front/0027-420-Sandshrew-Alola.png
diff --git a/src/afd/sprites/front/0028--000--Sandslash.png b/src/afd/sprites/front/0028-000-Sandslash.png
similarity index 100%
rename from src/afd/sprites/front/0028--000--Sandslash.png
rename to src/afd/sprites/front/0028-000-Sandslash.png
diff --git a/src/afd/sprites/front/0028--420--Sandslash--Alola.png b/src/afd/sprites/front/0028-420-Sandslash-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0028--420--Sandslash--Alola.png
rename to src/afd/sprites/front/0028-420-Sandslash-Alola.png
diff --git a/src/afd/sprites/front/0029--000--Malaconda.png b/src/afd/sprites/front/0029-000-Malaconda.png
similarity index 100%
rename from src/afd/sprites/front/0029--000--Malaconda.png
rename to src/afd/sprites/front/0029-000-Malaconda.png
diff --git a/src/afd/sprites/front/0029--000--Nidoran-F.png b/src/afd/sprites/front/0029-000-Nidoran~F.png
similarity index 100%
rename from src/afd/sprites/front/0029--000--Nidoran-F.png
rename to src/afd/sprites/front/0029-000-Nidoran~F.png
diff --git a/src/afd/sprites/front/0030--000--Nidorina.png b/src/afd/sprites/front/0030-000-Nidorina.png
similarity index 100%
rename from src/afd/sprites/front/0030--000--Nidorina.png
rename to src/afd/sprites/front/0030-000-Nidorina.png
diff --git a/src/afd/sprites/front/0031--000--Cawmodore.png b/src/afd/sprites/front/0031-000-Cawmodore.png
similarity index 100%
rename from src/afd/sprites/front/0031--000--Cawmodore.png
rename to src/afd/sprites/front/0031-000-Cawmodore.png
diff --git a/src/afd/sprites/front/0031--000--Nidoqueen.png b/src/afd/sprites/front/0031-000-Nidoqueen.png
similarity index 100%
rename from src/afd/sprites/front/0031--000--Nidoqueen.png
rename to src/afd/sprites/front/0031-000-Nidoqueen.png
diff --git a/src/afd/sprites/front/0032--000--Nidoran-M.png b/src/afd/sprites/front/0032-000-Nidoran~M.png
similarity index 100%
rename from src/afd/sprites/front/0032--000--Nidoran-M.png
rename to src/afd/sprites/front/0032-000-Nidoran~M.png
diff --git a/src/afd/sprites/front/0033--000--Nidorino.png b/src/afd/sprites/front/0033-000-Nidorino.png
similarity index 100%
rename from src/afd/sprites/front/0033--000--Nidorino.png
rename to src/afd/sprites/front/0033-000-Nidorino.png
diff --git a/src/afd/sprites/front/0034--000--Nidoking.png b/src/afd/sprites/front/0034-000-Nidoking.png
similarity index 100%
rename from src/afd/sprites/front/0034--000--Nidoking.png
rename to src/afd/sprites/front/0034-000-Nidoking.png
diff --git a/src/afd/sprites/front/0035--000--Clefairy.png b/src/afd/sprites/front/0035-000-Clefairy.png
similarity index 100%
rename from src/afd/sprites/front/0035--000--Clefairy.png
rename to src/afd/sprites/front/0035-000-Clefairy.png
diff --git a/src/afd/sprites/front/0035--000--Plasmanta.png b/src/afd/sprites/front/0035-000-Plasmanta.png
similarity index 100%
rename from src/afd/sprites/front/0035--000--Plasmanta.png
rename to src/afd/sprites/front/0035-000-Plasmanta.png
diff --git a/src/afd/sprites/front/0036--000--Clefable.png b/src/afd/sprites/front/0036-000-Clefable.png
similarity index 100%
rename from src/afd/sprites/front/0036--000--Clefable.png
rename to src/afd/sprites/front/0036-000-Clefable.png
diff --git a/src/afd/sprites/front/0037--000--Vulpix.png b/src/afd/sprites/front/0037-000-Vulpix.png
similarity index 100%
rename from src/afd/sprites/front/0037--000--Vulpix.png
rename to src/afd/sprites/front/0037-000-Vulpix.png
diff --git a/src/afd/sprites/front/0037--420--Vulpix--Alola.png b/src/afd/sprites/front/0037-420-Vulpix-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0037--420--Vulpix--Alola.png
rename to src/afd/sprites/front/0037-420-Vulpix-Alola.png
diff --git a/src/afd/sprites/front/0038--000--Ninetales.png b/src/afd/sprites/front/0038-000-Ninetales.png
similarity index 100%
rename from src/afd/sprites/front/0038--000--Ninetales.png
rename to src/afd/sprites/front/0038-000-Ninetales.png
diff --git a/src/afd/sprites/front/0038--420--Ninetales--Alola.png b/src/afd/sprites/front/0038-420-Ninetales-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0038--420--Ninetales--Alola.png
rename to src/afd/sprites/front/0038-420-Ninetales-Alola.png
diff --git a/src/afd/sprites/front/0039--000--Jigglypuff.png b/src/afd/sprites/front/0039-000-Jigglypuff.png
similarity index 100%
rename from src/afd/sprites/front/0039--000--Jigglypuff.png
rename to src/afd/sprites/front/0039-000-Jigglypuff.png
diff --git a/src/afd/sprites/front/0040--000--Wigglytuff.png b/src/afd/sprites/front/0040-000-Wigglytuff.png
similarity index 100%
rename from src/afd/sprites/front/0040--000--Wigglytuff.png
rename to src/afd/sprites/front/0040-000-Wigglytuff.png
diff --git a/src/afd/sprites/front/0041--000--Zubat.png b/src/afd/sprites/front/0041-000-Zubat.png
similarity index 100%
rename from src/afd/sprites/front/0041--000--Zubat.png
rename to src/afd/sprites/front/0041-000-Zubat.png
diff --git a/src/afd/sprites/front/0042--000--Golbat.png b/src/afd/sprites/front/0042-000-Golbat.png
similarity index 100%
rename from src/afd/sprites/front/0042--000--Golbat.png
rename to src/afd/sprites/front/0042-000-Golbat.png
diff --git a/src/afd/sprites/front/0043--000--Oddish.png b/src/afd/sprites/front/0043-000-Oddish.png
similarity index 100%
rename from src/afd/sprites/front/0043--000--Oddish.png
rename to src/afd/sprites/front/0043-000-Oddish.png
diff --git a/src/afd/sprites/front/0044--000--Gloom.png b/src/afd/sprites/front/0044-000-Gloom.png
similarity index 100%
rename from src/afd/sprites/front/0044--000--Gloom.png
rename to src/afd/sprites/front/0044-000-Gloom.png
diff --git a/src/afd/sprites/front/0045--000--Vileplume.png b/src/afd/sprites/front/0045-000-Vileplume.png
similarity index 100%
rename from src/afd/sprites/front/0045--000--Vileplume.png
rename to src/afd/sprites/front/0045-000-Vileplume.png
diff --git a/src/afd/sprites/front/0046--000--Paras.png b/src/afd/sprites/front/0046-000-Paras.png
similarity index 100%
rename from src/afd/sprites/front/0046--000--Paras.png
rename to src/afd/sprites/front/0046-000-Paras.png
diff --git a/src/afd/sprites/front/0047--000--Parasect.png b/src/afd/sprites/front/0047-000-Parasect.png
similarity index 100%
rename from src/afd/sprites/front/0047--000--Parasect.png
rename to src/afd/sprites/front/0047-000-Parasect.png
diff --git a/src/afd/sprites/front/0048--000--Venonat.png b/src/afd/sprites/front/0048-000-Venonat.png
similarity index 100%
rename from src/afd/sprites/front/0048--000--Venonat.png
rename to src/afd/sprites/front/0048-000-Venonat.png
diff --git a/src/afd/sprites/front/0049--000--Venomoth.png b/src/afd/sprites/front/0049-000-Venomoth.png
similarity index 100%
rename from src/afd/sprites/front/0049--000--Venomoth.png
rename to src/afd/sprites/front/0049-000-Venomoth.png
diff --git a/src/afd/sprites/front/0050--000--Diglett.png b/src/afd/sprites/front/0050-000-Diglett.png
similarity index 100%
rename from src/afd/sprites/front/0050--000--Diglett.png
rename to src/afd/sprites/front/0050-000-Diglett.png
diff --git a/src/afd/sprites/front/0050--420--Diglett--Alola.png b/src/afd/sprites/front/0050-420-Diglett-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0050--420--Diglett--Alola.png
rename to src/afd/sprites/front/0050-420-Diglett-Alola.png
diff --git a/src/afd/sprites/front/0051--000--Dugtrio.png b/src/afd/sprites/front/0051-000-Dugtrio.png
similarity index 100%
rename from src/afd/sprites/front/0051--000--Dugtrio.png
rename to src/afd/sprites/front/0051-000-Dugtrio.png
diff --git a/src/afd/sprites/front/0051--420--Dugtrio--Alola.png b/src/afd/sprites/front/0051-420-Dugtrio-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0051--420--Dugtrio--Alola.png
rename to src/afd/sprites/front/0051-420-Dugtrio-Alola.png
diff --git a/src/afd/sprites/front/0052--000--Meowth.png b/src/afd/sprites/front/0052-000-Meowth.png
similarity index 100%
rename from src/afd/sprites/front/0052--000--Meowth.png
rename to src/afd/sprites/front/0052-000-Meowth.png
diff --git a/src/afd/sprites/front/0052--420--Meowth--Alola.png b/src/afd/sprites/front/0052-420-Meowth-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0052--420--Meowth--Alola.png
rename to src/afd/sprites/front/0052-420-Meowth-Alola.png
diff --git a/src/afd/sprites/front/0052--420--Meowth--Galar.png b/src/afd/sprites/front/0052-420-Meowth-Galar.png
similarity index 100%
rename from src/afd/sprites/front/0052--420--Meowth--Galar.png
rename to src/afd/sprites/front/0052-420-Meowth-Galar.png
diff --git a/src/afd/sprites/front/0052--420--Meowth--Gmax.png b/src/afd/sprites/front/0052-420-Meowth-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0052--420--Meowth--Gmax.png
rename to src/afd/sprites/front/0052-420-Meowth-Gmax.png
diff --git a/src/afd/sprites/front/0053--000--Persian.png b/src/afd/sprites/front/0053-000-Persian.png
similarity index 100%
rename from src/afd/sprites/front/0053--000--Persian.png
rename to src/afd/sprites/front/0053-000-Persian.png
diff --git a/src/afd/sprites/front/0053--420--Persian--Alola.png b/src/afd/sprites/front/0053-420-Persian-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0053--420--Persian--Alola.png
rename to src/afd/sprites/front/0053-420-Persian-Alola.png
diff --git a/src/afd/sprites/front/0054--000--Psyduck.png b/src/afd/sprites/front/0054-000-Psyduck.png
similarity index 100%
rename from src/afd/sprites/front/0054--000--Psyduck.png
rename to src/afd/sprites/front/0054-000-Psyduck.png
diff --git a/src/afd/sprites/front/0055--000--Golduck.png b/src/afd/sprites/front/0055-000-Golduck.png
similarity index 100%
rename from src/afd/sprites/front/0055--000--Golduck.png
rename to src/afd/sprites/front/0055-000-Golduck.png
diff --git a/src/afd/sprites/front/0056--000--Mankey.png b/src/afd/sprites/front/0056-000-Mankey.png
similarity index 100%
rename from src/afd/sprites/front/0056--000--Mankey.png
rename to src/afd/sprites/front/0056-000-Mankey.png
diff --git a/src/afd/sprites/front/0057--000--Primeape.png b/src/afd/sprites/front/0057-000-Primeape.png
similarity index 100%
rename from src/afd/sprites/front/0057--000--Primeape.png
rename to src/afd/sprites/front/0057-000-Primeape.png
diff --git a/src/afd/sprites/front/0058--000--Growlithe.png b/src/afd/sprites/front/0058-000-Growlithe.png
similarity index 100%
rename from src/afd/sprites/front/0058--000--Growlithe.png
rename to src/afd/sprites/front/0058-000-Growlithe.png
diff --git a/src/afd/sprites/front/0059--000--Arcanine.png b/src/afd/sprites/front/0059-000-Arcanine.png
similarity index 100%
rename from src/afd/sprites/front/0059--000--Arcanine.png
rename to src/afd/sprites/front/0059-000-Arcanine.png
diff --git a/src/afd/sprites/front/0060--000--Poliwag.png b/src/afd/sprites/front/0060-000-Poliwag.png
similarity index 100%
rename from src/afd/sprites/front/0060--000--Poliwag.png
rename to src/afd/sprites/front/0060-000-Poliwag.png
diff --git a/src/afd/sprites/front/0061--000--Poliwhirl.png b/src/afd/sprites/front/0061-000-Poliwhirl.png
similarity index 100%
rename from src/afd/sprites/front/0061--000--Poliwhirl.png
rename to src/afd/sprites/front/0061-000-Poliwhirl.png
diff --git a/src/afd/sprites/front/0062--000--Poliwrath.png b/src/afd/sprites/front/0062-000-Poliwrath.png
similarity index 100%
rename from src/afd/sprites/front/0062--000--Poliwrath.png
rename to src/afd/sprites/front/0062-000-Poliwrath.png
diff --git a/src/afd/sprites/front/0063--000--Abra.png b/src/afd/sprites/front/0063-000-Abra.png
similarity index 100%
rename from src/afd/sprites/front/0063--000--Abra.png
rename to src/afd/sprites/front/0063-000-Abra.png
diff --git a/src/afd/sprites/front/0064--000--Kadabra.png b/src/afd/sprites/front/0064-000-Kadabra.png
similarity index 100%
rename from src/afd/sprites/front/0064--000--Kadabra.png
rename to src/afd/sprites/front/0064-000-Kadabra.png
diff --git a/src/afd/sprites/front/0065--000--Alakazam.png b/src/afd/sprites/front/0065-000-Alakazam.png
similarity index 100%
rename from src/afd/sprites/front/0065--000--Alakazam.png
rename to src/afd/sprites/front/0065-000-Alakazam.png
diff --git a/src/afd/sprites/front/0065--420--Alakazam--Mega.png b/src/afd/sprites/front/0065-420-Alakazam-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0065--420--Alakazam--Mega.png
rename to src/afd/sprites/front/0065-420-Alakazam-Mega.png
diff --git a/src/afd/sprites/front/0066--000--Machop.png b/src/afd/sprites/front/0066-000-Machop.png
similarity index 100%
rename from src/afd/sprites/front/0066--000--Machop.png
rename to src/afd/sprites/front/0066-000-Machop.png
diff --git a/src/afd/sprites/front/0067--000--Machoke.png b/src/afd/sprites/front/0067-000-Machoke.png
similarity index 100%
rename from src/afd/sprites/front/0067--000--Machoke.png
rename to src/afd/sprites/front/0067-000-Machoke.png
diff --git a/src/afd/sprites/front/0068--000--Machamp.png b/src/afd/sprites/front/0068-000-Machamp.png
similarity index 100%
rename from src/afd/sprites/front/0068--000--Machamp.png
rename to src/afd/sprites/front/0068-000-Machamp.png
diff --git a/src/afd/sprites/front/0068--420--Machamp--Gmax.png b/src/afd/sprites/front/0068-420-Machamp-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0068--420--Machamp--Gmax.png
rename to src/afd/sprites/front/0068-420-Machamp-Gmax.png
diff --git a/src/afd/sprites/front/0069--000--Bellsprout.png b/src/afd/sprites/front/0069-000-Bellsprout.png
similarity index 100%
rename from src/afd/sprites/front/0069--000--Bellsprout.png
rename to src/afd/sprites/front/0069-000-Bellsprout.png
diff --git a/src/afd/sprites/front/0070--000--Weepinbell.png b/src/afd/sprites/front/0070-000-Weepinbell.png
similarity index 100%
rename from src/afd/sprites/front/0070--000--Weepinbell.png
rename to src/afd/sprites/front/0070-000-Weepinbell.png
diff --git a/src/afd/sprites/front/0071--000--Victreebel.png b/src/afd/sprites/front/0071-000-Victreebel.png
similarity index 100%
rename from src/afd/sprites/front/0071--000--Victreebel.png
rename to src/afd/sprites/front/0071-000-Victreebel.png
diff --git a/src/afd/sprites/front/0072--000--Tentacool.png b/src/afd/sprites/front/0072-000-Tentacool.png
similarity index 100%
rename from src/afd/sprites/front/0072--000--Tentacool.png
rename to src/afd/sprites/front/0072-000-Tentacool.png
diff --git a/src/afd/sprites/front/0073--000--Tentacruel.png b/src/afd/sprites/front/0073-000-Tentacruel.png
similarity index 100%
rename from src/afd/sprites/front/0073--000--Tentacruel.png
rename to src/afd/sprites/front/0073-000-Tentacruel.png
diff --git a/src/afd/sprites/front/0074--000--Geodude.png b/src/afd/sprites/front/0074-000-Geodude.png
similarity index 100%
rename from src/afd/sprites/front/0074--000--Geodude.png
rename to src/afd/sprites/front/0074-000-Geodude.png
diff --git a/src/afd/sprites/front/0074--420--Geodude--Alola.png b/src/afd/sprites/front/0074-420-Geodude-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0074--420--Geodude--Alola.png
rename to src/afd/sprites/front/0074-420-Geodude-Alola.png
diff --git a/src/afd/sprites/front/0075--000--Graveler.png b/src/afd/sprites/front/0075-000-Graveler.png
similarity index 100%
rename from src/afd/sprites/front/0075--000--Graveler.png
rename to src/afd/sprites/front/0075-000-Graveler.png
diff --git a/src/afd/sprites/front/0075--420--Graveler--Alola.png b/src/afd/sprites/front/0075-420-Graveler-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0075--420--Graveler--Alola.png
rename to src/afd/sprites/front/0075-420-Graveler-Alola.png
diff --git a/src/afd/sprites/front/0076--000--Golem.png b/src/afd/sprites/front/0076-000-Golem.png
similarity index 100%
rename from src/afd/sprites/front/0076--000--Golem.png
rename to src/afd/sprites/front/0076-000-Golem.png
diff --git a/src/afd/sprites/front/0076--420--Golem--Alola.png b/src/afd/sprites/front/0076-420-Golem-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0076--420--Golem--Alola.png
rename to src/afd/sprites/front/0076-420-Golem-Alola.png
diff --git a/src/afd/sprites/front/0077--000--Ponyta.png b/src/afd/sprites/front/0077-000-Ponyta.png
similarity index 100%
rename from src/afd/sprites/front/0077--000--Ponyta.png
rename to src/afd/sprites/front/0077-000-Ponyta.png
diff --git a/src/afd/sprites/front/0077--420--Ponyta--Galar.png b/src/afd/sprites/front/0077-420-Ponyta-Galar.png
similarity index 100%
rename from src/afd/sprites/front/0077--420--Ponyta--Galar.png
rename to src/afd/sprites/front/0077-420-Ponyta-Galar.png
diff --git a/src/afd/sprites/front/0078--000--Rapidash.png b/src/afd/sprites/front/0078-000-Rapidash.png
similarity index 100%
rename from src/afd/sprites/front/0078--000--Rapidash.png
rename to src/afd/sprites/front/0078-000-Rapidash.png
diff --git a/src/afd/sprites/front/0078--420--Rapidash--Galar.png b/src/afd/sprites/front/0078-420-Rapidash-Galar.png
similarity index 100%
rename from src/afd/sprites/front/0078--420--Rapidash--Galar.png
rename to src/afd/sprites/front/0078-420-Rapidash-Galar.png
diff --git a/src/afd/sprites/front/0079--000--Slowpoke.png b/src/afd/sprites/front/0079-000-Slowpoke.png
similarity index 100%
rename from src/afd/sprites/front/0079--000--Slowpoke.png
rename to src/afd/sprites/front/0079-000-Slowpoke.png
diff --git a/src/afd/sprites/front/0079--420--Slowpoke--Galar.png b/src/afd/sprites/front/0079-420-Slowpoke-Galar.png
similarity index 100%
rename from src/afd/sprites/front/0079--420--Slowpoke--Galar.png
rename to src/afd/sprites/front/0079-420-Slowpoke-Galar.png
diff --git a/src/afd/sprites/front/0080--000--Slowbro.png b/src/afd/sprites/front/0080-000-Slowbro.png
similarity index 100%
rename from src/afd/sprites/front/0080--000--Slowbro.png
rename to src/afd/sprites/front/0080-000-Slowbro.png
diff --git a/src/afd/sprites/front/0080--420--Slowbro--Mega.png b/src/afd/sprites/front/0080-420-Slowbro-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0080--420--Slowbro--Mega.png
rename to src/afd/sprites/front/0080-420-Slowbro-Mega.png
diff --git a/src/afd/sprites/front/0081--000--Magnemite.png b/src/afd/sprites/front/0081-000-Magnemite.png
similarity index 100%
rename from src/afd/sprites/front/0081--000--Magnemite.png
rename to src/afd/sprites/front/0081-000-Magnemite.png
diff --git a/src/afd/sprites/front/0082--000--Magneton.png b/src/afd/sprites/front/0082-000-Magneton.png
similarity index 100%
rename from src/afd/sprites/front/0082--000--Magneton.png
rename to src/afd/sprites/front/0082-000-Magneton.png
diff --git a/src/afd/sprites/front/0083--000--Farfetch__0027d.png b/src/afd/sprites/front/0083-000-Farfetch__0027d.png
similarity index 100%
rename from src/afd/sprites/front/0083--000--Farfetch__0027d.png
rename to src/afd/sprites/front/0083-000-Farfetch__0027d.png
diff --git a/src/afd/sprites/front/0083--420--Farfetch__0027d--Galar.png b/src/afd/sprites/front/0083-420-Farfetch__0027d-Galar.png
similarity index 100%
rename from src/afd/sprites/front/0083--420--Farfetch__0027d--Galar.png
rename to src/afd/sprites/front/0083-420-Farfetch__0027d-Galar.png
diff --git a/src/afd/sprites/front/0084--000--Doduo.png b/src/afd/sprites/front/0084-000-Doduo.png
similarity index 100%
rename from src/afd/sprites/front/0084--000--Doduo.png
rename to src/afd/sprites/front/0084-000-Doduo.png
diff --git a/src/afd/sprites/front/0085--000--Dodrio.png b/src/afd/sprites/front/0085-000-Dodrio.png
similarity index 100%
rename from src/afd/sprites/front/0085--000--Dodrio.png
rename to src/afd/sprites/front/0085-000-Dodrio.png
diff --git a/src/afd/sprites/front/0086--000--Seel.png b/src/afd/sprites/front/0086-000-Seel.png
similarity index 100%
rename from src/afd/sprites/front/0086--000--Seel.png
rename to src/afd/sprites/front/0086-000-Seel.png
diff --git a/src/afd/sprites/front/0087--000--Dewgong.png b/src/afd/sprites/front/0087-000-Dewgong.png
similarity index 100%
rename from src/afd/sprites/front/0087--000--Dewgong.png
rename to src/afd/sprites/front/0087-000-Dewgong.png
diff --git a/src/afd/sprites/front/0088--000--Grimer.png b/src/afd/sprites/front/0088-000-Grimer.png
similarity index 100%
rename from src/afd/sprites/front/0088--000--Grimer.png
rename to src/afd/sprites/front/0088-000-Grimer.png
diff --git a/src/afd/sprites/front/0088--420--Grimer--Alola.png b/src/afd/sprites/front/0088-420-Grimer-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0088--420--Grimer--Alola.png
rename to src/afd/sprites/front/0088-420-Grimer-Alola.png
diff --git a/src/afd/sprites/front/0089--000--Muk.png b/src/afd/sprites/front/0089-000-Muk.png
similarity index 100%
rename from src/afd/sprites/front/0089--000--Muk.png
rename to src/afd/sprites/front/0089-000-Muk.png
diff --git a/src/afd/sprites/front/0089--420--Muk--Alola.png b/src/afd/sprites/front/0089-420-Muk-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0089--420--Muk--Alola.png
rename to src/afd/sprites/front/0089-420-Muk-Alola.png
diff --git a/src/afd/sprites/front/0090--000--Shellder.png b/src/afd/sprites/front/0090-000-Shellder.png
similarity index 100%
rename from src/afd/sprites/front/0090--000--Shellder.png
rename to src/afd/sprites/front/0090-000-Shellder.png
diff --git a/src/afd/sprites/front/0091--000--Cloyster.png b/src/afd/sprites/front/0091-000-Cloyster.png
similarity index 100%
rename from src/afd/sprites/front/0091--000--Cloyster.png
rename to src/afd/sprites/front/0091-000-Cloyster.png
diff --git a/src/afd/sprites/front/0092--000--Gastly.png b/src/afd/sprites/front/0092-000-Gastly.png
similarity index 100%
rename from src/afd/sprites/front/0092--000--Gastly.png
rename to src/afd/sprites/front/0092-000-Gastly.png
diff --git a/src/afd/sprites/front/0093--000--Haunter.png b/src/afd/sprites/front/0093-000-Haunter.png
similarity index 100%
rename from src/afd/sprites/front/0093--000--Haunter.png
rename to src/afd/sprites/front/0093-000-Haunter.png
diff --git a/src/afd/sprites/front/0094--000--Gengar.png b/src/afd/sprites/front/0094-000-Gengar.png
similarity index 100%
rename from src/afd/sprites/front/0094--000--Gengar.png
rename to src/afd/sprites/front/0094-000-Gengar.png
diff --git a/src/afd/sprites/front/0094--420--Gengar--Gmax.png b/src/afd/sprites/front/0094-420-Gengar-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0094--420--Gengar--Gmax.png
rename to src/afd/sprites/front/0094-420-Gengar-Gmax.png
diff --git a/src/afd/sprites/front/0094--420--Gengar--Mega.png b/src/afd/sprites/front/0094-420-Gengar-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0094--420--Gengar--Mega.png
rename to src/afd/sprites/front/0094-420-Gengar-Mega.png
diff --git a/src/afd/sprites/front/0095--000--Onix.png b/src/afd/sprites/front/0095-000-Onix.png
similarity index 100%
rename from src/afd/sprites/front/0095--000--Onix.png
rename to src/afd/sprites/front/0095-000-Onix.png
diff --git a/src/afd/sprites/front/0096--000--Drowzee.png b/src/afd/sprites/front/0096-000-Drowzee.png
similarity index 100%
rename from src/afd/sprites/front/0096--000--Drowzee.png
rename to src/afd/sprites/front/0096-000-Drowzee.png
diff --git a/src/afd/sprites/front/0097--000--Hypno.png b/src/afd/sprites/front/0097-000-Hypno.png
similarity index 100%
rename from src/afd/sprites/front/0097--000--Hypno.png
rename to src/afd/sprites/front/0097-000-Hypno.png
diff --git a/src/afd/sprites/front/0098--000--Krabby.png b/src/afd/sprites/front/0098-000-Krabby.png
similarity index 100%
rename from src/afd/sprites/front/0098--000--Krabby.png
rename to src/afd/sprites/front/0098-000-Krabby.png
diff --git a/src/afd/sprites/front/0099--000--Kingler.png b/src/afd/sprites/front/0099-000-Kingler.png
similarity index 100%
rename from src/afd/sprites/front/0099--000--Kingler.png
rename to src/afd/sprites/front/0099-000-Kingler.png
diff --git a/src/afd/sprites/front/0099--420--Kingler--Gmax.png b/src/afd/sprites/front/0099-420-Kingler-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0099--420--Kingler--Gmax.png
rename to src/afd/sprites/front/0099-420-Kingler-Gmax.png
diff --git a/src/afd/sprites/front/0100--000--Voltorb.png b/src/afd/sprites/front/0100-000-Voltorb.png
similarity index 100%
rename from src/afd/sprites/front/0100--000--Voltorb.png
rename to src/afd/sprites/front/0100-000-Voltorb.png
diff --git a/src/afd/sprites/front/0101--000--Electrode.png b/src/afd/sprites/front/0101-000-Electrode.png
similarity index 100%
rename from src/afd/sprites/front/0101--000--Electrode.png
rename to src/afd/sprites/front/0101-000-Electrode.png
diff --git a/src/afd/sprites/front/0102--000--Exeggcute.png b/src/afd/sprites/front/0102-000-Exeggcute.png
similarity index 100%
rename from src/afd/sprites/front/0102--000--Exeggcute.png
rename to src/afd/sprites/front/0102-000-Exeggcute.png
diff --git a/src/afd/sprites/front/0103--000--Exeggutor.png b/src/afd/sprites/front/0103-000-Exeggutor.png
similarity index 100%
rename from src/afd/sprites/front/0103--000--Exeggutor.png
rename to src/afd/sprites/front/0103-000-Exeggutor.png
diff --git a/src/afd/sprites/front/0103--420--Exeggutor--Alola.png b/src/afd/sprites/front/0103-420-Exeggutor-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0103--420--Exeggutor--Alola.png
rename to src/afd/sprites/front/0103-420-Exeggutor-Alola.png
diff --git a/src/afd/sprites/front/0104--000--Cubone.png b/src/afd/sprites/front/0104-000-Cubone.png
similarity index 100%
rename from src/afd/sprites/front/0104--000--Cubone.png
rename to src/afd/sprites/front/0104-000-Cubone.png
diff --git a/src/afd/sprites/front/0105--000--Marowak.png b/src/afd/sprites/front/0105-000-Marowak.png
similarity index 100%
rename from src/afd/sprites/front/0105--000--Marowak.png
rename to src/afd/sprites/front/0105-000-Marowak.png
diff --git a/src/afd/sprites/front/0105--420--Marowak--Alola.png b/src/afd/sprites/front/0105-420-Marowak-Alola.png
similarity index 100%
rename from src/afd/sprites/front/0105--420--Marowak--Alola.png
rename to src/afd/sprites/front/0105-420-Marowak-Alola.png
diff --git a/src/afd/sprites/front/0106--000--Hitmonlee.png b/src/afd/sprites/front/0106-000-Hitmonlee.png
similarity index 100%
rename from src/afd/sprites/front/0106--000--Hitmonlee.png
rename to src/afd/sprites/front/0106-000-Hitmonlee.png
diff --git a/src/afd/sprites/front/0107--000--Hitmonchan.png b/src/afd/sprites/front/0107-000-Hitmonchan.png
similarity index 100%
rename from src/afd/sprites/front/0107--000--Hitmonchan.png
rename to src/afd/sprites/front/0107-000-Hitmonchan.png
diff --git a/src/afd/sprites/front/0108--000--Lickitung.png b/src/afd/sprites/front/0108-000-Lickitung.png
similarity index 100%
rename from src/afd/sprites/front/0108--000--Lickitung.png
rename to src/afd/sprites/front/0108-000-Lickitung.png
diff --git a/src/afd/sprites/front/0109--000--Koffing.png b/src/afd/sprites/front/0109-000-Koffing.png
similarity index 100%
rename from src/afd/sprites/front/0109--000--Koffing.png
rename to src/afd/sprites/front/0109-000-Koffing.png
diff --git a/src/afd/sprites/front/0110--000--Weezing.png b/src/afd/sprites/front/0110-000-Weezing.png
similarity index 100%
rename from src/afd/sprites/front/0110--000--Weezing.png
rename to src/afd/sprites/front/0110-000-Weezing.png
diff --git a/src/afd/sprites/front/0110--420--Weezing--Galar.png b/src/afd/sprites/front/0110-420-Weezing-Galar.png
similarity index 100%
rename from src/afd/sprites/front/0110--420--Weezing--Galar.png
rename to src/afd/sprites/front/0110-420-Weezing-Galar.png
diff --git a/src/afd/sprites/front/0111--000--Rhyhorn.png b/src/afd/sprites/front/0111-000-Rhyhorn.png
similarity index 100%
rename from src/afd/sprites/front/0111--000--Rhyhorn.png
rename to src/afd/sprites/front/0111-000-Rhyhorn.png
diff --git a/src/afd/sprites/front/0112--000--Rhydon.png b/src/afd/sprites/front/0112-000-Rhydon.png
similarity index 100%
rename from src/afd/sprites/front/0112--000--Rhydon.png
rename to src/afd/sprites/front/0112-000-Rhydon.png
diff --git a/src/afd/sprites/front/0113--000--Chansey.png b/src/afd/sprites/front/0113-000-Chansey.png
similarity index 100%
rename from src/afd/sprites/front/0113--000--Chansey.png
rename to src/afd/sprites/front/0113-000-Chansey.png
diff --git a/src/afd/sprites/front/0114--000--Tangela.png b/src/afd/sprites/front/0114-000-Tangela.png
similarity index 100%
rename from src/afd/sprites/front/0114--000--Tangela.png
rename to src/afd/sprites/front/0114-000-Tangela.png
diff --git a/src/afd/sprites/front/0115--000--Kangaskhan.png b/src/afd/sprites/front/0115-000-Kangaskhan.png
similarity index 100%
rename from src/afd/sprites/front/0115--000--Kangaskhan.png
rename to src/afd/sprites/front/0115-000-Kangaskhan.png
diff --git a/src/afd/sprites/front/0115--420--Kangaskhan--Mega.png b/src/afd/sprites/front/0115-420-Kangaskhan-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0115--420--Kangaskhan--Mega.png
rename to src/afd/sprites/front/0115-420-Kangaskhan-Mega.png
diff --git a/src/afd/sprites/front/0116--000--Horsea.png b/src/afd/sprites/front/0116-000-Horsea.png
similarity index 100%
rename from src/afd/sprites/front/0116--000--Horsea.png
rename to src/afd/sprites/front/0116-000-Horsea.png
diff --git a/src/afd/sprites/front/0117--000--Seadra.png b/src/afd/sprites/front/0117-000-Seadra.png
similarity index 100%
rename from src/afd/sprites/front/0117--000--Seadra.png
rename to src/afd/sprites/front/0117-000-Seadra.png
diff --git a/src/afd/sprites/front/0118--000--Goldeen.png b/src/afd/sprites/front/0118-000-Goldeen.png
similarity index 100%
rename from src/afd/sprites/front/0118--000--Goldeen.png
rename to src/afd/sprites/front/0118-000-Goldeen.png
diff --git a/src/afd/sprites/front/0119--000--Seaking.png b/src/afd/sprites/front/0119-000-Seaking.png
similarity index 100%
rename from src/afd/sprites/front/0119--000--Seaking.png
rename to src/afd/sprites/front/0119-000-Seaking.png
diff --git a/src/afd/sprites/front/0120--000--Staryu.png b/src/afd/sprites/front/0120-000-Staryu.png
similarity index 100%
rename from src/afd/sprites/front/0120--000--Staryu.png
rename to src/afd/sprites/front/0120-000-Staryu.png
diff --git a/src/afd/sprites/front/0121--000--Starmie.png b/src/afd/sprites/front/0121-000-Starmie.png
similarity index 100%
rename from src/afd/sprites/front/0121--000--Starmie.png
rename to src/afd/sprites/front/0121-000-Starmie.png
diff --git a/src/afd/sprites/front/0122--000--Mr._Mime.png b/src/afd/sprites/front/0122-000-Mr._Mime.png
similarity index 100%
rename from src/afd/sprites/front/0122--000--Mr._Mime.png
rename to src/afd/sprites/front/0122-000-Mr._Mime.png
diff --git a/src/afd/sprites/front/0122--420--Mr._Mime--Galar.png b/src/afd/sprites/front/0122-420-Mr._Mime-Galar.png
similarity index 100%
rename from src/afd/sprites/front/0122--420--Mr._Mime--Galar.png
rename to src/afd/sprites/front/0122-420-Mr._Mime-Galar.png
diff --git a/src/afd/sprites/front/0123--000--Scyther.png b/src/afd/sprites/front/0123-000-Scyther.png
similarity index 100%
rename from src/afd/sprites/front/0123--000--Scyther.png
rename to src/afd/sprites/front/0123-000-Scyther.png
diff --git a/src/afd/sprites/front/0124--000--Jynx.png b/src/afd/sprites/front/0124-000-Jynx.png
similarity index 100%
rename from src/afd/sprites/front/0124--000--Jynx.png
rename to src/afd/sprites/front/0124-000-Jynx.png
diff --git a/src/afd/sprites/front/0125--000--Electabuzz.png b/src/afd/sprites/front/0125-000-Electabuzz.png
similarity index 100%
rename from src/afd/sprites/front/0125--000--Electabuzz.png
rename to src/afd/sprites/front/0125-000-Electabuzz.png
diff --git a/src/afd/sprites/front/0126--000--Magmar.png b/src/afd/sprites/front/0126-000-Magmar.png
similarity index 100%
rename from src/afd/sprites/front/0126--000--Magmar.png
rename to src/afd/sprites/front/0126-000-Magmar.png
diff --git a/src/afd/sprites/front/0127--000--Pinsir.png b/src/afd/sprites/front/0127-000-Pinsir.png
similarity index 100%
rename from src/afd/sprites/front/0127--000--Pinsir.png
rename to src/afd/sprites/front/0127-000-Pinsir.png
diff --git a/src/afd/sprites/front/0127--420--Pinsir--Mega.png b/src/afd/sprites/front/0127-420-Pinsir-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0127--420--Pinsir--Mega.png
rename to src/afd/sprites/front/0127-420-Pinsir-Mega.png
diff --git a/src/afd/sprites/front/0128--000--Tauros.png b/src/afd/sprites/front/0128-000-Tauros.png
similarity index 100%
rename from src/afd/sprites/front/0128--000--Tauros.png
rename to src/afd/sprites/front/0128-000-Tauros.png
diff --git a/src/afd/sprites/front/0129--000--Magikarp.png b/src/afd/sprites/front/0129-000-Magikarp.png
similarity index 100%
rename from src/afd/sprites/front/0129--000--Magikarp.png
rename to src/afd/sprites/front/0129-000-Magikarp.png
diff --git a/src/afd/sprites/front/0130--000--Gyarados.png b/src/afd/sprites/front/0130-000-Gyarados.png
similarity index 100%
rename from src/afd/sprites/front/0130--000--Gyarados.png
rename to src/afd/sprites/front/0130-000-Gyarados.png
diff --git a/src/afd/sprites/front/0130--420--Gyarados--Mega.png b/src/afd/sprites/front/0130-420-Gyarados-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0130--420--Gyarados--Mega.png
rename to src/afd/sprites/front/0130-420-Gyarados-Mega.png
diff --git a/src/afd/sprites/front/0131--000--Lapras.png b/src/afd/sprites/front/0131-000-Lapras.png
similarity index 100%
rename from src/afd/sprites/front/0131--000--Lapras.png
rename to src/afd/sprites/front/0131-000-Lapras.png
diff --git a/src/afd/sprites/front/0131--420--Lapras--Gmax.png b/src/afd/sprites/front/0131-420-Lapras-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0131--420--Lapras--Gmax.png
rename to src/afd/sprites/front/0131-420-Lapras-Gmax.png
diff --git a/src/afd/sprites/front/0132--000--Ditto.png b/src/afd/sprites/front/0132-000-Ditto.png
similarity index 100%
rename from src/afd/sprites/front/0132--000--Ditto.png
rename to src/afd/sprites/front/0132-000-Ditto.png
diff --git a/src/afd/sprites/front/0133--000--Eevee.png b/src/afd/sprites/front/0133-000-Eevee.png
similarity index 100%
rename from src/afd/sprites/front/0133--000--Eevee.png
rename to src/afd/sprites/front/0133-000-Eevee.png
diff --git a/src/afd/sprites/front/0133--420--Eevee--Gmax.png b/src/afd/sprites/front/0133-420-Eevee-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0133--420--Eevee--Gmax.png
rename to src/afd/sprites/front/0133-420-Eevee-Gmax.png
diff --git a/src/afd/sprites/front/0133--420--Eevee--Starter.png b/src/afd/sprites/front/0133-420-Eevee-Starter.png
similarity index 100%
rename from src/afd/sprites/front/0133--420--Eevee--Starter.png
rename to src/afd/sprites/front/0133-420-Eevee-Starter.png
diff --git a/src/afd/sprites/front/0134--000--Vaporeon.png b/src/afd/sprites/front/0134-000-Vaporeon.png
similarity index 100%
rename from src/afd/sprites/front/0134--000--Vaporeon.png
rename to src/afd/sprites/front/0134-000-Vaporeon.png
diff --git a/src/afd/sprites/front/0135--000--Jolteon.png b/src/afd/sprites/front/0135-000-Jolteon.png
similarity index 100%
rename from src/afd/sprites/front/0135--000--Jolteon.png
rename to src/afd/sprites/front/0135-000-Jolteon.png
diff --git a/src/afd/sprites/front/0136--000--Flareon.png b/src/afd/sprites/front/0136-000-Flareon.png
similarity index 100%
rename from src/afd/sprites/front/0136--000--Flareon.png
rename to src/afd/sprites/front/0136-000-Flareon.png
diff --git a/src/afd/sprites/front/0137--000--Porygon.png b/src/afd/sprites/front/0137-000-Porygon.png
similarity index 100%
rename from src/afd/sprites/front/0137--000--Porygon.png
rename to src/afd/sprites/front/0137-000-Porygon.png
diff --git a/src/afd/sprites/front/0138--000--Omanyte.png b/src/afd/sprites/front/0138-000-Omanyte.png
similarity index 100%
rename from src/afd/sprites/front/0138--000--Omanyte.png
rename to src/afd/sprites/front/0138-000-Omanyte.png
diff --git a/src/afd/sprites/front/0139--000--Omastar.png b/src/afd/sprites/front/0139-000-Omastar.png
similarity index 100%
rename from src/afd/sprites/front/0139--000--Omastar.png
rename to src/afd/sprites/front/0139-000-Omastar.png
diff --git a/src/afd/sprites/front/0140--000--Kabuto.png b/src/afd/sprites/front/0140-000-Kabuto.png
similarity index 100%
rename from src/afd/sprites/front/0140--000--Kabuto.png
rename to src/afd/sprites/front/0140-000-Kabuto.png
diff --git a/src/afd/sprites/front/0141--000--Kabutops.png b/src/afd/sprites/front/0141-000-Kabutops.png
similarity index 100%
rename from src/afd/sprites/front/0141--000--Kabutops.png
rename to src/afd/sprites/front/0141-000-Kabutops.png
diff --git a/src/afd/sprites/front/0142--000--Aerodactyl.png b/src/afd/sprites/front/0142-000-Aerodactyl.png
similarity index 100%
rename from src/afd/sprites/front/0142--000--Aerodactyl.png
rename to src/afd/sprites/front/0142-000-Aerodactyl.png
diff --git a/src/afd/sprites/front/0142--420--Aerodactyl--Mega.png b/src/afd/sprites/front/0142-420-Aerodactyl-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0142--420--Aerodactyl--Mega.png
rename to src/afd/sprites/front/0142-420-Aerodactyl-Mega.png
diff --git a/src/afd/sprites/front/0143--000--Snorlax.png b/src/afd/sprites/front/0143-000-Snorlax.png
similarity index 100%
rename from src/afd/sprites/front/0143--000--Snorlax.png
rename to src/afd/sprites/front/0143-000-Snorlax.png
diff --git a/src/afd/sprites/front/0143--420--Snorlax--Gmax.png b/src/afd/sprites/front/0143-420-Snorlax-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0143--420--Snorlax--Gmax.png
rename to src/afd/sprites/front/0143-420-Snorlax-Gmax.png
diff --git a/src/afd/sprites/front/0144--000--Articuno.png b/src/afd/sprites/front/0144-000-Articuno.png
similarity index 100%
rename from src/afd/sprites/front/0144--000--Articuno.png
rename to src/afd/sprites/front/0144-000-Articuno.png
diff --git a/src/afd/sprites/front/0145--000--Zapdos.png b/src/afd/sprites/front/0145-000-Zapdos.png
similarity index 100%
rename from src/afd/sprites/front/0145--000--Zapdos.png
rename to src/afd/sprites/front/0145-000-Zapdos.png
diff --git a/src/afd/sprites/front/0146--000--Moltres.png b/src/afd/sprites/front/0146-000-Moltres.png
similarity index 100%
rename from src/afd/sprites/front/0146--000--Moltres.png
rename to src/afd/sprites/front/0146-000-Moltres.png
diff --git a/src/afd/sprites/front/0147--000--Dratini.png b/src/afd/sprites/front/0147-000-Dratini.png
similarity index 100%
rename from src/afd/sprites/front/0147--000--Dratini.png
rename to src/afd/sprites/front/0147-000-Dratini.png
diff --git a/src/afd/sprites/front/0148--000--Dragonair.png b/src/afd/sprites/front/0148-000-Dragonair.png
similarity index 100%
rename from src/afd/sprites/front/0148--000--Dragonair.png
rename to src/afd/sprites/front/0148-000-Dragonair.png
diff --git a/src/afd/sprites/front/0149--000--Dragonite.png b/src/afd/sprites/front/0149-000-Dragonite.png
similarity index 100%
rename from src/afd/sprites/front/0149--000--Dragonite.png
rename to src/afd/sprites/front/0149-000-Dragonite.png
diff --git a/src/afd/sprites/front/0150--000--Mewtwo.png b/src/afd/sprites/front/0150-000-Mewtwo.png
similarity index 100%
rename from src/afd/sprites/front/0150--000--Mewtwo.png
rename to src/afd/sprites/front/0150-000-Mewtwo.png
diff --git a/src/afd/sprites/front/0150--420--Mewtwo--Mega-X.png b/src/afd/sprites/front/0150-420-Mewtwo-Mega~X.png
similarity index 100%
rename from src/afd/sprites/front/0150--420--Mewtwo--Mega-X.png
rename to src/afd/sprites/front/0150-420-Mewtwo-Mega~X.png
diff --git a/src/afd/sprites/front/0150--420--Mewtwo--Mega-Y.png b/src/afd/sprites/front/0150-420-Mewtwo-Mega~Y.png
similarity index 100%
rename from src/afd/sprites/front/0150--420--Mewtwo--Mega-Y.png
rename to src/afd/sprites/front/0150-420-Mewtwo-Mega~Y.png
diff --git a/src/afd/sprites/front/0151--000--Mew.png b/src/afd/sprites/front/0151-000-Mew.png
similarity index 100%
rename from src/afd/sprites/front/0151--000--Mew.png
rename to src/afd/sprites/front/0151-000-Mew.png
diff --git a/src/afd/sprites/front/0152--000--Chikorita.png b/src/afd/sprites/front/0152-000-Chikorita.png
similarity index 100%
rename from src/afd/sprites/front/0152--000--Chikorita.png
rename to src/afd/sprites/front/0152-000-Chikorita.png
diff --git a/src/afd/sprites/front/0153--000--Bayleef.png b/src/afd/sprites/front/0153-000-Bayleef.png
similarity index 100%
rename from src/afd/sprites/front/0153--000--Bayleef.png
rename to src/afd/sprites/front/0153-000-Bayleef.png
diff --git a/src/afd/sprites/front/0154--000--Meganium.png b/src/afd/sprites/front/0154-000-Meganium.png
similarity index 100%
rename from src/afd/sprites/front/0154--000--Meganium.png
rename to src/afd/sprites/front/0154-000-Meganium.png
diff --git a/src/afd/sprites/front/0155--000--Cyndaquil.png b/src/afd/sprites/front/0155-000-Cyndaquil.png
similarity index 100%
rename from src/afd/sprites/front/0155--000--Cyndaquil.png
rename to src/afd/sprites/front/0155-000-Cyndaquil.png
diff --git a/src/afd/sprites/front/0156--000--Quilava.png b/src/afd/sprites/front/0156-000-Quilava.png
similarity index 100%
rename from src/afd/sprites/front/0156--000--Quilava.png
rename to src/afd/sprites/front/0156-000-Quilava.png
diff --git a/src/afd/sprites/front/0157--000--Typhlosion.png b/src/afd/sprites/front/0157-000-Typhlosion.png
similarity index 100%
rename from src/afd/sprites/front/0157--000--Typhlosion.png
rename to src/afd/sprites/front/0157-000-Typhlosion.png
diff --git a/src/afd/sprites/front/0158--000--Totodile.png b/src/afd/sprites/front/0158-000-Totodile.png
similarity index 100%
rename from src/afd/sprites/front/0158--000--Totodile.png
rename to src/afd/sprites/front/0158-000-Totodile.png
diff --git a/src/afd/sprites/front/0159--000--Croconaw.png b/src/afd/sprites/front/0159-000-Croconaw.png
similarity index 100%
rename from src/afd/sprites/front/0159--000--Croconaw.png
rename to src/afd/sprites/front/0159-000-Croconaw.png
diff --git a/src/afd/sprites/front/0160--000--Feraligatr.png b/src/afd/sprites/front/0160-000-Feraligatr.png
similarity index 100%
rename from src/afd/sprites/front/0160--000--Feraligatr.png
rename to src/afd/sprites/front/0160-000-Feraligatr.png
diff --git a/src/afd/sprites/front/0161--000--Sentret.png b/src/afd/sprites/front/0161-000-Sentret.png
similarity index 100%
rename from src/afd/sprites/front/0161--000--Sentret.png
rename to src/afd/sprites/front/0161-000-Sentret.png
diff --git a/src/afd/sprites/front/0162--000--Furret.png b/src/afd/sprites/front/0162-000-Furret.png
similarity index 100%
rename from src/afd/sprites/front/0162--000--Furret.png
rename to src/afd/sprites/front/0162-000-Furret.png
diff --git a/src/afd/sprites/front/0163--000--Hoothoot.png b/src/afd/sprites/front/0163-000-Hoothoot.png
similarity index 100%
rename from src/afd/sprites/front/0163--000--Hoothoot.png
rename to src/afd/sprites/front/0163-000-Hoothoot.png
diff --git a/src/afd/sprites/front/0164--000--Noctowl.png b/src/afd/sprites/front/0164-000-Noctowl.png
similarity index 100%
rename from src/afd/sprites/front/0164--000--Noctowl.png
rename to src/afd/sprites/front/0164-000-Noctowl.png
diff --git a/src/afd/sprites/front/0165--000--Ledyba.png b/src/afd/sprites/front/0165-000-Ledyba.png
similarity index 100%
rename from src/afd/sprites/front/0165--000--Ledyba.png
rename to src/afd/sprites/front/0165-000-Ledyba.png
diff --git a/src/afd/sprites/front/0166--000--Ledian.png b/src/afd/sprites/front/0166-000-Ledian.png
similarity index 100%
rename from src/afd/sprites/front/0166--000--Ledian.png
rename to src/afd/sprites/front/0166-000-Ledian.png
diff --git a/src/afd/sprites/front/0167--000--Spinarak.png b/src/afd/sprites/front/0167-000-Spinarak.png
similarity index 100%
rename from src/afd/sprites/front/0167--000--Spinarak.png
rename to src/afd/sprites/front/0167-000-Spinarak.png
diff --git a/src/afd/sprites/front/0168--000--Ariados.png b/src/afd/sprites/front/0168-000-Ariados.png
similarity index 100%
rename from src/afd/sprites/front/0168--000--Ariados.png
rename to src/afd/sprites/front/0168-000-Ariados.png
diff --git a/src/afd/sprites/front/0169--000--Crobat.png b/src/afd/sprites/front/0169-000-Crobat.png
similarity index 100%
rename from src/afd/sprites/front/0169--000--Crobat.png
rename to src/afd/sprites/front/0169-000-Crobat.png
diff --git a/src/afd/sprites/front/0170--000--Chinchou.png b/src/afd/sprites/front/0170-000-Chinchou.png
similarity index 100%
rename from src/afd/sprites/front/0170--000--Chinchou.png
rename to src/afd/sprites/front/0170-000-Chinchou.png
diff --git a/src/afd/sprites/front/0171--000--Lanturn.png b/src/afd/sprites/front/0171-000-Lanturn.png
similarity index 100%
rename from src/afd/sprites/front/0171--000--Lanturn.png
rename to src/afd/sprites/front/0171-000-Lanturn.png
diff --git a/src/afd/sprites/front/0172--000--Pichu.png b/src/afd/sprites/front/0172-000-Pichu.png
similarity index 100%
rename from src/afd/sprites/front/0172--000--Pichu.png
rename to src/afd/sprites/front/0172-000-Pichu.png
diff --git a/src/afd/sprites/front/0173--000--Cleffa.png b/src/afd/sprites/front/0173-000-Cleffa.png
similarity index 100%
rename from src/afd/sprites/front/0173--000--Cleffa.png
rename to src/afd/sprites/front/0173-000-Cleffa.png
diff --git a/src/afd/sprites/front/0174--000--Igglybuff.png b/src/afd/sprites/front/0174-000-Igglybuff.png
similarity index 100%
rename from src/afd/sprites/front/0174--000--Igglybuff.png
rename to src/afd/sprites/front/0174-000-Igglybuff.png
diff --git a/src/afd/sprites/front/0175--000--Togepi.png b/src/afd/sprites/front/0175-000-Togepi.png
similarity index 100%
rename from src/afd/sprites/front/0175--000--Togepi.png
rename to src/afd/sprites/front/0175-000-Togepi.png
diff --git a/src/afd/sprites/front/0176--000--Togetic.png b/src/afd/sprites/front/0176-000-Togetic.png
similarity index 100%
rename from src/afd/sprites/front/0176--000--Togetic.png
rename to src/afd/sprites/front/0176-000-Togetic.png
diff --git a/src/afd/sprites/front/0177--000--Natu.png b/src/afd/sprites/front/0177-000-Natu.png
similarity index 100%
rename from src/afd/sprites/front/0177--000--Natu.png
rename to src/afd/sprites/front/0177-000-Natu.png
diff --git a/src/afd/sprites/front/0178--000--Xatu.png b/src/afd/sprites/front/0178-000-Xatu.png
similarity index 100%
rename from src/afd/sprites/front/0178--000--Xatu.png
rename to src/afd/sprites/front/0178-000-Xatu.png
diff --git a/src/afd/sprites/front/0179--000--Mareep.png b/src/afd/sprites/front/0179-000-Mareep.png
similarity index 100%
rename from src/afd/sprites/front/0179--000--Mareep.png
rename to src/afd/sprites/front/0179-000-Mareep.png
diff --git a/src/afd/sprites/front/0180--000--Flaaffy.png b/src/afd/sprites/front/0180-000-Flaaffy.png
similarity index 100%
rename from src/afd/sprites/front/0180--000--Flaaffy.png
rename to src/afd/sprites/front/0180-000-Flaaffy.png
diff --git a/src/afd/sprites/front/0181--000--Ampharos.png b/src/afd/sprites/front/0181-000-Ampharos.png
similarity index 100%
rename from src/afd/sprites/front/0181--000--Ampharos.png
rename to src/afd/sprites/front/0181-000-Ampharos.png
diff --git a/src/afd/sprites/front/0181--420--Ampharos--Mega.png b/src/afd/sprites/front/0181-420-Ampharos-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0181--420--Ampharos--Mega.png
rename to src/afd/sprites/front/0181-420-Ampharos-Mega.png
diff --git a/src/afd/sprites/front/0182--000--Bellossom.png b/src/afd/sprites/front/0182-000-Bellossom.png
similarity index 100%
rename from src/afd/sprites/front/0182--000--Bellossom.png
rename to src/afd/sprites/front/0182-000-Bellossom.png
diff --git a/src/afd/sprites/front/0183--000--Marill.png b/src/afd/sprites/front/0183-000-Marill.png
similarity index 100%
rename from src/afd/sprites/front/0183--000--Marill.png
rename to src/afd/sprites/front/0183-000-Marill.png
diff --git a/src/afd/sprites/front/0184--000--Azumarill.png b/src/afd/sprites/front/0184-000-Azumarill.png
similarity index 100%
rename from src/afd/sprites/front/0184--000--Azumarill.png
rename to src/afd/sprites/front/0184-000-Azumarill.png
diff --git a/src/afd/sprites/front/0185--000--Sudowoodo.png b/src/afd/sprites/front/0185-000-Sudowoodo.png
similarity index 100%
rename from src/afd/sprites/front/0185--000--Sudowoodo.png
rename to src/afd/sprites/front/0185-000-Sudowoodo.png
diff --git a/src/afd/sprites/front/0186--000--Politoed.png b/src/afd/sprites/front/0186-000-Politoed.png
similarity index 100%
rename from src/afd/sprites/front/0186--000--Politoed.png
rename to src/afd/sprites/front/0186-000-Politoed.png
diff --git a/src/afd/sprites/front/0187--000--Hoppip.png b/src/afd/sprites/front/0187-000-Hoppip.png
similarity index 100%
rename from src/afd/sprites/front/0187--000--Hoppip.png
rename to src/afd/sprites/front/0187-000-Hoppip.png
diff --git a/src/afd/sprites/front/0188--000--Skiploom.png b/src/afd/sprites/front/0188-000-Skiploom.png
similarity index 100%
rename from src/afd/sprites/front/0188--000--Skiploom.png
rename to src/afd/sprites/front/0188-000-Skiploom.png
diff --git a/src/afd/sprites/front/0189--000--Jumpluff.png b/src/afd/sprites/front/0189-000-Jumpluff.png
similarity index 100%
rename from src/afd/sprites/front/0189--000--Jumpluff.png
rename to src/afd/sprites/front/0189-000-Jumpluff.png
diff --git a/src/afd/sprites/front/0190--000--Aipom.png b/src/afd/sprites/front/0190-000-Aipom.png
similarity index 100%
rename from src/afd/sprites/front/0190--000--Aipom.png
rename to src/afd/sprites/front/0190-000-Aipom.png
diff --git a/src/afd/sprites/front/0191--000--Sunkern.png b/src/afd/sprites/front/0191-000-Sunkern.png
similarity index 100%
rename from src/afd/sprites/front/0191--000--Sunkern.png
rename to src/afd/sprites/front/0191-000-Sunkern.png
diff --git a/src/afd/sprites/front/0192--000--Sunflora.png b/src/afd/sprites/front/0192-000-Sunflora.png
similarity index 100%
rename from src/afd/sprites/front/0192--000--Sunflora.png
rename to src/afd/sprites/front/0192-000-Sunflora.png
diff --git a/src/afd/sprites/front/0193--000--Yanma.png b/src/afd/sprites/front/0193-000-Yanma.png
similarity index 100%
rename from src/afd/sprites/front/0193--000--Yanma.png
rename to src/afd/sprites/front/0193-000-Yanma.png
diff --git a/src/afd/sprites/front/0194--000--Wooper.png b/src/afd/sprites/front/0194-000-Wooper.png
similarity index 100%
rename from src/afd/sprites/front/0194--000--Wooper.png
rename to src/afd/sprites/front/0194-000-Wooper.png
diff --git a/src/afd/sprites/front/0195--000--Quagsire.png b/src/afd/sprites/front/0195-000-Quagsire.png
similarity index 100%
rename from src/afd/sprites/front/0195--000--Quagsire.png
rename to src/afd/sprites/front/0195-000-Quagsire.png
diff --git a/src/afd/sprites/front/0196--000--Espeon.png b/src/afd/sprites/front/0196-000-Espeon.png
similarity index 100%
rename from src/afd/sprites/front/0196--000--Espeon.png
rename to src/afd/sprites/front/0196-000-Espeon.png
diff --git a/src/afd/sprites/front/0197--000--Umbreon.png b/src/afd/sprites/front/0197-000-Umbreon.png
similarity index 100%
rename from src/afd/sprites/front/0197--000--Umbreon.png
rename to src/afd/sprites/front/0197-000-Umbreon.png
diff --git a/src/afd/sprites/front/0198--000--Murkrow.png b/src/afd/sprites/front/0198-000-Murkrow.png
similarity index 100%
rename from src/afd/sprites/front/0198--000--Murkrow.png
rename to src/afd/sprites/front/0198-000-Murkrow.png
diff --git a/src/afd/sprites/front/0199--000--Slowking.png b/src/afd/sprites/front/0199-000-Slowking.png
similarity index 100%
rename from src/afd/sprites/front/0199--000--Slowking.png
rename to src/afd/sprites/front/0199-000-Slowking.png
diff --git a/src/afd/sprites/front/0200--000--Misdreavus.png b/src/afd/sprites/front/0200-000-Misdreavus.png
similarity index 100%
rename from src/afd/sprites/front/0200--000--Misdreavus.png
rename to src/afd/sprites/front/0200-000-Misdreavus.png
diff --git a/src/afd/sprites/front/0201--000--Unown.png b/src/afd/sprites/front/0201-000-Unown.png
similarity index 100%
rename from src/afd/sprites/front/0201--000--Unown.png
rename to src/afd/sprites/front/0201-000-Unown.png
diff --git a/src/afd/sprites/front/0202--000--Wobbuffet.png b/src/afd/sprites/front/0202-000-Wobbuffet.png
similarity index 100%
rename from src/afd/sprites/front/0202--000--Wobbuffet.png
rename to src/afd/sprites/front/0202-000-Wobbuffet.png
diff --git a/src/afd/sprites/front/0203--000--Girafarig.png b/src/afd/sprites/front/0203-000-Girafarig.png
similarity index 100%
rename from src/afd/sprites/front/0203--000--Girafarig.png
rename to src/afd/sprites/front/0203-000-Girafarig.png
diff --git a/src/afd/sprites/front/0204--000--Pineco.png b/src/afd/sprites/front/0204-000-Pineco.png
similarity index 100%
rename from src/afd/sprites/front/0204--000--Pineco.png
rename to src/afd/sprites/front/0204-000-Pineco.png
diff --git a/src/afd/sprites/front/0205--000--Forretress.png b/src/afd/sprites/front/0205-000-Forretress.png
similarity index 100%
rename from src/afd/sprites/front/0205--000--Forretress.png
rename to src/afd/sprites/front/0205-000-Forretress.png
diff --git a/src/afd/sprites/front/0206--000--Dunsparce.png b/src/afd/sprites/front/0206-000-Dunsparce.png
similarity index 100%
rename from src/afd/sprites/front/0206--000--Dunsparce.png
rename to src/afd/sprites/front/0206-000-Dunsparce.png
diff --git a/src/afd/sprites/front/0207--000--Gligar.png b/src/afd/sprites/front/0207-000-Gligar.png
similarity index 100%
rename from src/afd/sprites/front/0207--000--Gligar.png
rename to src/afd/sprites/front/0207-000-Gligar.png
diff --git a/src/afd/sprites/front/0208--000--Steelix.png b/src/afd/sprites/front/0208-000-Steelix.png
similarity index 100%
rename from src/afd/sprites/front/0208--000--Steelix.png
rename to src/afd/sprites/front/0208-000-Steelix.png
diff --git a/src/afd/sprites/front/0208--420--Steelix--Mega.png b/src/afd/sprites/front/0208-420-Steelix-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0208--420--Steelix--Mega.png
rename to src/afd/sprites/front/0208-420-Steelix-Mega.png
diff --git a/src/afd/sprites/front/0209--000--Snubbull.png b/src/afd/sprites/front/0209-000-Snubbull.png
similarity index 100%
rename from src/afd/sprites/front/0209--000--Snubbull.png
rename to src/afd/sprites/front/0209-000-Snubbull.png
diff --git a/src/afd/sprites/front/0210--000--Granbull.png b/src/afd/sprites/front/0210-000-Granbull.png
similarity index 100%
rename from src/afd/sprites/front/0210--000--Granbull.png
rename to src/afd/sprites/front/0210-000-Granbull.png
diff --git a/src/afd/sprites/front/0211--000--Qwilfish.png b/src/afd/sprites/front/0211-000-Qwilfish.png
similarity index 100%
rename from src/afd/sprites/front/0211--000--Qwilfish.png
rename to src/afd/sprites/front/0211-000-Qwilfish.png
diff --git a/src/afd/sprites/front/0212--000--Scizor.png b/src/afd/sprites/front/0212-000-Scizor.png
similarity index 100%
rename from src/afd/sprites/front/0212--000--Scizor.png
rename to src/afd/sprites/front/0212-000-Scizor.png
diff --git a/src/afd/sprites/front/0212--420--Scizor--Mega.png b/src/afd/sprites/front/0212-420-Scizor-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0212--420--Scizor--Mega.png
rename to src/afd/sprites/front/0212-420-Scizor-Mega.png
diff --git a/src/afd/sprites/front/0213--000--Shuckle.png b/src/afd/sprites/front/0213-000-Shuckle.png
similarity index 100%
rename from src/afd/sprites/front/0213--000--Shuckle.png
rename to src/afd/sprites/front/0213-000-Shuckle.png
diff --git a/src/afd/sprites/front/0214--000--Heracross.png b/src/afd/sprites/front/0214-000-Heracross.png
similarity index 100%
rename from src/afd/sprites/front/0214--000--Heracross.png
rename to src/afd/sprites/front/0214-000-Heracross.png
diff --git a/src/afd/sprites/front/0214--420--Heracross--Mega.png b/src/afd/sprites/front/0214-420-Heracross-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0214--420--Heracross--Mega.png
rename to src/afd/sprites/front/0214-420-Heracross-Mega.png
diff --git a/src/afd/sprites/front/0215--000--Sneasel.png b/src/afd/sprites/front/0215-000-Sneasel.png
similarity index 100%
rename from src/afd/sprites/front/0215--000--Sneasel.png
rename to src/afd/sprites/front/0215-000-Sneasel.png
diff --git a/src/afd/sprites/front/0216--000--Teddiursa.png b/src/afd/sprites/front/0216-000-Teddiursa.png
similarity index 100%
rename from src/afd/sprites/front/0216--000--Teddiursa.png
rename to src/afd/sprites/front/0216-000-Teddiursa.png
diff --git a/src/afd/sprites/front/0217--000--Ursaring.png b/src/afd/sprites/front/0217-000-Ursaring.png
similarity index 100%
rename from src/afd/sprites/front/0217--000--Ursaring.png
rename to src/afd/sprites/front/0217-000-Ursaring.png
diff --git a/src/afd/sprites/front/0218--000--Slugma.png b/src/afd/sprites/front/0218-000-Slugma.png
similarity index 100%
rename from src/afd/sprites/front/0218--000--Slugma.png
rename to src/afd/sprites/front/0218-000-Slugma.png
diff --git a/src/afd/sprites/front/0219--000--Magcargo.png b/src/afd/sprites/front/0219-000-Magcargo.png
similarity index 100%
rename from src/afd/sprites/front/0219--000--Magcargo.png
rename to src/afd/sprites/front/0219-000-Magcargo.png
diff --git a/src/afd/sprites/front/0220--000--Swinub.png b/src/afd/sprites/front/0220-000-Swinub.png
similarity index 100%
rename from src/afd/sprites/front/0220--000--Swinub.png
rename to src/afd/sprites/front/0220-000-Swinub.png
diff --git a/src/afd/sprites/front/0221--000--Piloswine.png b/src/afd/sprites/front/0221-000-Piloswine.png
similarity index 100%
rename from src/afd/sprites/front/0221--000--Piloswine.png
rename to src/afd/sprites/front/0221-000-Piloswine.png
diff --git a/src/afd/sprites/front/0222--000--Corsola.png b/src/afd/sprites/front/0222-000-Corsola.png
similarity index 100%
rename from src/afd/sprites/front/0222--000--Corsola.png
rename to src/afd/sprites/front/0222-000-Corsola.png
diff --git a/src/afd/sprites/front/0222--420--Corsola--Galar.png b/src/afd/sprites/front/0222-420-Corsola-Galar.png
similarity index 100%
rename from src/afd/sprites/front/0222--420--Corsola--Galar.png
rename to src/afd/sprites/front/0222-420-Corsola-Galar.png
diff --git a/src/afd/sprites/front/0223--000--Remoraid.png b/src/afd/sprites/front/0223-000-Remoraid.png
similarity index 100%
rename from src/afd/sprites/front/0223--000--Remoraid.png
rename to src/afd/sprites/front/0223-000-Remoraid.png
diff --git a/src/afd/sprites/front/0224--000--Octillery.png b/src/afd/sprites/front/0224-000-Octillery.png
similarity index 100%
rename from src/afd/sprites/front/0224--000--Octillery.png
rename to src/afd/sprites/front/0224-000-Octillery.png
diff --git a/src/afd/sprites/front/0225--000--Delibird.png b/src/afd/sprites/front/0225-000-Delibird.png
similarity index 100%
rename from src/afd/sprites/front/0225--000--Delibird.png
rename to src/afd/sprites/front/0225-000-Delibird.png
diff --git a/src/afd/sprites/front/0226--000--Mantine.png b/src/afd/sprites/front/0226-000-Mantine.png
similarity index 100%
rename from src/afd/sprites/front/0226--000--Mantine.png
rename to src/afd/sprites/front/0226-000-Mantine.png
diff --git a/src/afd/sprites/front/0227--000--Skarmory.png b/src/afd/sprites/front/0227-000-Skarmory.png
similarity index 100%
rename from src/afd/sprites/front/0227--000--Skarmory.png
rename to src/afd/sprites/front/0227-000-Skarmory.png
diff --git a/src/afd/sprites/front/0228--000--Houndour.png b/src/afd/sprites/front/0228-000-Houndour.png
similarity index 100%
rename from src/afd/sprites/front/0228--000--Houndour.png
rename to src/afd/sprites/front/0228-000-Houndour.png
diff --git a/src/afd/sprites/front/0229--000--Houndoom.png b/src/afd/sprites/front/0229-000-Houndoom.png
similarity index 100%
rename from src/afd/sprites/front/0229--000--Houndoom.png
rename to src/afd/sprites/front/0229-000-Houndoom.png
diff --git a/src/afd/sprites/front/0229--420--Houndoom--Mega.png b/src/afd/sprites/front/0229-420-Houndoom-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0229--420--Houndoom--Mega.png
rename to src/afd/sprites/front/0229-420-Houndoom-Mega.png
diff --git a/src/afd/sprites/front/0230--000--Kingdra.png b/src/afd/sprites/front/0230-000-Kingdra.png
similarity index 100%
rename from src/afd/sprites/front/0230--000--Kingdra.png
rename to src/afd/sprites/front/0230-000-Kingdra.png
diff --git a/src/afd/sprites/front/0231--000--Phanpy.png b/src/afd/sprites/front/0231-000-Phanpy.png
similarity index 100%
rename from src/afd/sprites/front/0231--000--Phanpy.png
rename to src/afd/sprites/front/0231-000-Phanpy.png
diff --git a/src/afd/sprites/front/0232--000--Donphan.png b/src/afd/sprites/front/0232-000-Donphan.png
similarity index 100%
rename from src/afd/sprites/front/0232--000--Donphan.png
rename to src/afd/sprites/front/0232-000-Donphan.png
diff --git a/src/afd/sprites/front/0233--000--Porygon2.png b/src/afd/sprites/front/0233-000-Porygon2.png
similarity index 100%
rename from src/afd/sprites/front/0233--000--Porygon2.png
rename to src/afd/sprites/front/0233-000-Porygon2.png
diff --git a/src/afd/sprites/front/0234--000--Stantler.png b/src/afd/sprites/front/0234-000-Stantler.png
similarity index 100%
rename from src/afd/sprites/front/0234--000--Stantler.png
rename to src/afd/sprites/front/0234-000-Stantler.png
diff --git a/src/afd/sprites/front/0235--000--Smeargle.png b/src/afd/sprites/front/0235-000-Smeargle.png
similarity index 100%
rename from src/afd/sprites/front/0235--000--Smeargle.png
rename to src/afd/sprites/front/0235-000-Smeargle.png
diff --git a/src/afd/sprites/front/0236--000--Tyrogue.png b/src/afd/sprites/front/0236-000-Tyrogue.png
similarity index 100%
rename from src/afd/sprites/front/0236--000--Tyrogue.png
rename to src/afd/sprites/front/0236-000-Tyrogue.png
diff --git a/src/afd/sprites/front/0237--000--Hitmontop.png b/src/afd/sprites/front/0237-000-Hitmontop.png
similarity index 100%
rename from src/afd/sprites/front/0237--000--Hitmontop.png
rename to src/afd/sprites/front/0237-000-Hitmontop.png
diff --git a/src/afd/sprites/front/0238--000--Smoochum.png b/src/afd/sprites/front/0238-000-Smoochum.png
similarity index 100%
rename from src/afd/sprites/front/0238--000--Smoochum.png
rename to src/afd/sprites/front/0238-000-Smoochum.png
diff --git a/src/afd/sprites/front/0239--000--Elekid.png b/src/afd/sprites/front/0239-000-Elekid.png
similarity index 100%
rename from src/afd/sprites/front/0239--000--Elekid.png
rename to src/afd/sprites/front/0239-000-Elekid.png
diff --git a/src/afd/sprites/front/0240--000--Magby.png b/src/afd/sprites/front/0240-000-Magby.png
similarity index 100%
rename from src/afd/sprites/front/0240--000--Magby.png
rename to src/afd/sprites/front/0240-000-Magby.png
diff --git a/src/afd/sprites/front/0241--000--Miltank.png b/src/afd/sprites/front/0241-000-Miltank.png
similarity index 100%
rename from src/afd/sprites/front/0241--000--Miltank.png
rename to src/afd/sprites/front/0241-000-Miltank.png
diff --git a/src/afd/sprites/front/0242--000--Blissey.png b/src/afd/sprites/front/0242-000-Blissey.png
similarity index 100%
rename from src/afd/sprites/front/0242--000--Blissey.png
rename to src/afd/sprites/front/0242-000-Blissey.png
diff --git a/src/afd/sprites/front/0243--000--Raikou.png b/src/afd/sprites/front/0243-000-Raikou.png
similarity index 100%
rename from src/afd/sprites/front/0243--000--Raikou.png
rename to src/afd/sprites/front/0243-000-Raikou.png
diff --git a/src/afd/sprites/front/0244--000--Entei.png b/src/afd/sprites/front/0244-000-Entei.png
similarity index 100%
rename from src/afd/sprites/front/0244--000--Entei.png
rename to src/afd/sprites/front/0244-000-Entei.png
diff --git a/src/afd/sprites/front/0245--000--Suicune.png b/src/afd/sprites/front/0245-000-Suicune.png
similarity index 100%
rename from src/afd/sprites/front/0245--000--Suicune.png
rename to src/afd/sprites/front/0245-000-Suicune.png
diff --git a/src/afd/sprites/front/0246--000--Larvitar.png b/src/afd/sprites/front/0246-000-Larvitar.png
similarity index 100%
rename from src/afd/sprites/front/0246--000--Larvitar.png
rename to src/afd/sprites/front/0246-000-Larvitar.png
diff --git a/src/afd/sprites/front/0247--000--Pupitar.png b/src/afd/sprites/front/0247-000-Pupitar.png
similarity index 100%
rename from src/afd/sprites/front/0247--000--Pupitar.png
rename to src/afd/sprites/front/0247-000-Pupitar.png
diff --git a/src/afd/sprites/front/0248--000--Tyranitar.png b/src/afd/sprites/front/0248-000-Tyranitar.png
similarity index 100%
rename from src/afd/sprites/front/0248--000--Tyranitar.png
rename to src/afd/sprites/front/0248-000-Tyranitar.png
diff --git a/src/afd/sprites/front/0248--420--Tyranitar--Mega.png b/src/afd/sprites/front/0248-420-Tyranitar-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0248--420--Tyranitar--Mega.png
rename to src/afd/sprites/front/0248-420-Tyranitar-Mega.png
diff --git a/src/afd/sprites/front/0249--000--Lugia.png b/src/afd/sprites/front/0249-000-Lugia.png
similarity index 100%
rename from src/afd/sprites/front/0249--000--Lugia.png
rename to src/afd/sprites/front/0249-000-Lugia.png
diff --git a/src/afd/sprites/front/0250--000--Ho-Oh.png b/src/afd/sprites/front/0250-000-Ho~Oh.png
similarity index 100%
rename from src/afd/sprites/front/0250--000--Ho-Oh.png
rename to src/afd/sprites/front/0250-000-Ho~Oh.png
diff --git a/src/afd/sprites/front/0251--000--Celebi.gif b/src/afd/sprites/front/0251-000-Celebi.gif
similarity index 100%
rename from src/afd/sprites/front/0251--000--Celebi.gif
rename to src/afd/sprites/front/0251-000-Celebi.gif
diff --git a/src/afd/sprites/front/0252--000--Treecko.png b/src/afd/sprites/front/0252-000-Treecko.png
similarity index 100%
rename from src/afd/sprites/front/0252--000--Treecko.png
rename to src/afd/sprites/front/0252-000-Treecko.png
diff --git a/src/afd/sprites/front/0253--000--Grovyle.png b/src/afd/sprites/front/0253-000-Grovyle.png
similarity index 100%
rename from src/afd/sprites/front/0253--000--Grovyle.png
rename to src/afd/sprites/front/0253-000-Grovyle.png
diff --git a/src/afd/sprites/front/0254--000--Sceptile.png b/src/afd/sprites/front/0254-000-Sceptile.png
similarity index 100%
rename from src/afd/sprites/front/0254--000--Sceptile.png
rename to src/afd/sprites/front/0254-000-Sceptile.png
diff --git a/src/afd/sprites/front/0254--420--Sceptile--Mega.gif b/src/afd/sprites/front/0254-420-Sceptile-Mega.gif
similarity index 100%
rename from src/afd/sprites/front/0254--420--Sceptile--Mega.gif
rename to src/afd/sprites/front/0254-420-Sceptile-Mega.gif
diff --git a/src/afd/sprites/front/0254--420--Sceptile--Mega.png b/src/afd/sprites/front/0254-420-Sceptile-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0254--420--Sceptile--Mega.png
rename to src/afd/sprites/front/0254-420-Sceptile-Mega.png
diff --git a/src/afd/sprites/front/0255--000--Torchic.png b/src/afd/sprites/front/0255-000-Torchic.png
similarity index 100%
rename from src/afd/sprites/front/0255--000--Torchic.png
rename to src/afd/sprites/front/0255-000-Torchic.png
diff --git a/src/afd/sprites/front/0256--000--Combusken.png b/src/afd/sprites/front/0256-000-Combusken.png
similarity index 100%
rename from src/afd/sprites/front/0256--000--Combusken.png
rename to src/afd/sprites/front/0256-000-Combusken.png
diff --git a/src/afd/sprites/front/0257--000--Blaziken.png b/src/afd/sprites/front/0257-000-Blaziken.png
similarity index 100%
rename from src/afd/sprites/front/0257--000--Blaziken.png
rename to src/afd/sprites/front/0257-000-Blaziken.png
diff --git a/src/afd/sprites/front/0257--420--Blaziken--Mega.png b/src/afd/sprites/front/0257-420-Blaziken-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0257--420--Blaziken--Mega.png
rename to src/afd/sprites/front/0257-420-Blaziken-Mega.png
diff --git a/src/afd/sprites/front/0258--000--Mudkip.png b/src/afd/sprites/front/0258-000-Mudkip.png
similarity index 100%
rename from src/afd/sprites/front/0258--000--Mudkip.png
rename to src/afd/sprites/front/0258-000-Mudkip.png
diff --git a/src/afd/sprites/front/0259--000--Marshtomp.png b/src/afd/sprites/front/0259-000-Marshtomp.png
similarity index 100%
rename from src/afd/sprites/front/0259--000--Marshtomp.png
rename to src/afd/sprites/front/0259-000-Marshtomp.png
diff --git a/src/afd/sprites/front/0260--000--Swampert.png b/src/afd/sprites/front/0260-000-Swampert.png
similarity index 100%
rename from src/afd/sprites/front/0260--000--Swampert.png
rename to src/afd/sprites/front/0260-000-Swampert.png
diff --git a/src/afd/sprites/front/0260--420--Swampert--Mega.png b/src/afd/sprites/front/0260-420-Swampert-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0260--420--Swampert--Mega.png
rename to src/afd/sprites/front/0260-420-Swampert-Mega.png
diff --git a/src/afd/sprites/front/0261--000--Poochyena.png b/src/afd/sprites/front/0261-000-Poochyena.png
similarity index 100%
rename from src/afd/sprites/front/0261--000--Poochyena.png
rename to src/afd/sprites/front/0261-000-Poochyena.png
diff --git a/src/afd/sprites/front/0262--000--Mightyena.png b/src/afd/sprites/front/0262-000-Mightyena.png
similarity index 100%
rename from src/afd/sprites/front/0262--000--Mightyena.png
rename to src/afd/sprites/front/0262-000-Mightyena.png
diff --git a/src/afd/sprites/front/0263--000--Zigzagoon.png b/src/afd/sprites/front/0263-000-Zigzagoon.png
similarity index 100%
rename from src/afd/sprites/front/0263--000--Zigzagoon.png
rename to src/afd/sprites/front/0263-000-Zigzagoon.png
diff --git a/src/afd/sprites/front/0263--420--Zigzagoon--Galar.png b/src/afd/sprites/front/0263-420-Zigzagoon-Galar.png
similarity index 100%
rename from src/afd/sprites/front/0263--420--Zigzagoon--Galar.png
rename to src/afd/sprites/front/0263-420-Zigzagoon-Galar.png
diff --git a/src/afd/sprites/front/0264--000--Linoone.png b/src/afd/sprites/front/0264-000-Linoone.png
similarity index 100%
rename from src/afd/sprites/front/0264--000--Linoone.png
rename to src/afd/sprites/front/0264-000-Linoone.png
diff --git a/src/afd/sprites/front/0264--420--Linoone--Galar.png b/src/afd/sprites/front/0264-420-Linoone-Galar.png
similarity index 100%
rename from src/afd/sprites/front/0264--420--Linoone--Galar.png
rename to src/afd/sprites/front/0264-420-Linoone-Galar.png
diff --git a/src/afd/sprites/front/0265--000--Wurmple.png b/src/afd/sprites/front/0265-000-Wurmple.png
similarity index 100%
rename from src/afd/sprites/front/0265--000--Wurmple.png
rename to src/afd/sprites/front/0265-000-Wurmple.png
diff --git a/src/afd/sprites/front/0266--000--Silcoon.png b/src/afd/sprites/front/0266-000-Silcoon.png
similarity index 100%
rename from src/afd/sprites/front/0266--000--Silcoon.png
rename to src/afd/sprites/front/0266-000-Silcoon.png
diff --git a/src/afd/sprites/front/0267--000--Beautifly.png b/src/afd/sprites/front/0267-000-Beautifly.png
similarity index 100%
rename from src/afd/sprites/front/0267--000--Beautifly.png
rename to src/afd/sprites/front/0267-000-Beautifly.png
diff --git a/src/afd/sprites/front/0268--000--Cascoon.png b/src/afd/sprites/front/0268-000-Cascoon.png
similarity index 100%
rename from src/afd/sprites/front/0268--000--Cascoon.png
rename to src/afd/sprites/front/0268-000-Cascoon.png
diff --git a/src/afd/sprites/front/0269--000--Dustox.png b/src/afd/sprites/front/0269-000-Dustox.png
similarity index 100%
rename from src/afd/sprites/front/0269--000--Dustox.png
rename to src/afd/sprites/front/0269-000-Dustox.png
diff --git a/src/afd/sprites/front/0270--000--Lotad.png b/src/afd/sprites/front/0270-000-Lotad.png
similarity index 100%
rename from src/afd/sprites/front/0270--000--Lotad.png
rename to src/afd/sprites/front/0270-000-Lotad.png
diff --git a/src/afd/sprites/front/0271--000--Lombre.png b/src/afd/sprites/front/0271-000-Lombre.png
similarity index 100%
rename from src/afd/sprites/front/0271--000--Lombre.png
rename to src/afd/sprites/front/0271-000-Lombre.png
diff --git a/src/afd/sprites/front/0272--000--Ludicolo.png b/src/afd/sprites/front/0272-000-Ludicolo.png
similarity index 100%
rename from src/afd/sprites/front/0272--000--Ludicolo.png
rename to src/afd/sprites/front/0272-000-Ludicolo.png
diff --git a/src/afd/sprites/front/0273--000--Seedot.png b/src/afd/sprites/front/0273-000-Seedot.png
similarity index 100%
rename from src/afd/sprites/front/0273--000--Seedot.png
rename to src/afd/sprites/front/0273-000-Seedot.png
diff --git a/src/afd/sprites/front/0274--000--Nuzleaf.png b/src/afd/sprites/front/0274-000-Nuzleaf.png
similarity index 100%
rename from src/afd/sprites/front/0274--000--Nuzleaf.png
rename to src/afd/sprites/front/0274-000-Nuzleaf.png
diff --git a/src/afd/sprites/front/0275--000--Shiftry.png b/src/afd/sprites/front/0275-000-Shiftry.png
similarity index 100%
rename from src/afd/sprites/front/0275--000--Shiftry.png
rename to src/afd/sprites/front/0275-000-Shiftry.png
diff --git a/src/afd/sprites/front/0276--000--Taillow.png b/src/afd/sprites/front/0276-000-Taillow.png
similarity index 100%
rename from src/afd/sprites/front/0276--000--Taillow.png
rename to src/afd/sprites/front/0276-000-Taillow.png
diff --git a/src/afd/sprites/front/0277--000--Swellow.png b/src/afd/sprites/front/0277-000-Swellow.png
similarity index 100%
rename from src/afd/sprites/front/0277--000--Swellow.png
rename to src/afd/sprites/front/0277-000-Swellow.png
diff --git a/src/afd/sprites/front/0278--000--Wingull.png b/src/afd/sprites/front/0278-000-Wingull.png
similarity index 100%
rename from src/afd/sprites/front/0278--000--Wingull.png
rename to src/afd/sprites/front/0278-000-Wingull.png
diff --git a/src/afd/sprites/front/0279--000--Pelipper.png b/src/afd/sprites/front/0279-000-Pelipper.png
similarity index 100%
rename from src/afd/sprites/front/0279--000--Pelipper.png
rename to src/afd/sprites/front/0279-000-Pelipper.png
diff --git a/src/afd/sprites/front/0280--000--Ralts.png b/src/afd/sprites/front/0280-000-Ralts.png
similarity index 100%
rename from src/afd/sprites/front/0280--000--Ralts.png
rename to src/afd/sprites/front/0280-000-Ralts.png
diff --git a/src/afd/sprites/front/0281--000--Kirlia.png b/src/afd/sprites/front/0281-000-Kirlia.png
similarity index 100%
rename from src/afd/sprites/front/0281--000--Kirlia.png
rename to src/afd/sprites/front/0281-000-Kirlia.png
diff --git a/src/afd/sprites/front/0282--000--Gardevoir.png b/src/afd/sprites/front/0282-000-Gardevoir.png
similarity index 100%
rename from src/afd/sprites/front/0282--000--Gardevoir.png
rename to src/afd/sprites/front/0282-000-Gardevoir.png
diff --git a/src/afd/sprites/front/0282--420--Gardevoir--Mega.png b/src/afd/sprites/front/0282-420-Gardevoir-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0282--420--Gardevoir--Mega.png
rename to src/afd/sprites/front/0282-420-Gardevoir-Mega.png
diff --git a/src/afd/sprites/front/0283--000--Surskit.png b/src/afd/sprites/front/0283-000-Surskit.png
similarity index 100%
rename from src/afd/sprites/front/0283--000--Surskit.png
rename to src/afd/sprites/front/0283-000-Surskit.png
diff --git a/src/afd/sprites/front/0284--000--Masquerain.png b/src/afd/sprites/front/0284-000-Masquerain.png
similarity index 100%
rename from src/afd/sprites/front/0284--000--Masquerain.png
rename to src/afd/sprites/front/0284-000-Masquerain.png
diff --git a/src/afd/sprites/front/0285--000--Shroomish.png b/src/afd/sprites/front/0285-000-Shroomish.png
similarity index 100%
rename from src/afd/sprites/front/0285--000--Shroomish.png
rename to src/afd/sprites/front/0285-000-Shroomish.png
diff --git a/src/afd/sprites/front/0286--000--Breloom.png b/src/afd/sprites/front/0286-000-Breloom.png
similarity index 100%
rename from src/afd/sprites/front/0286--000--Breloom.png
rename to src/afd/sprites/front/0286-000-Breloom.png
diff --git a/src/afd/sprites/front/0287--000--Slakoth.png b/src/afd/sprites/front/0287-000-Slakoth.png
similarity index 100%
rename from src/afd/sprites/front/0287--000--Slakoth.png
rename to src/afd/sprites/front/0287-000-Slakoth.png
diff --git a/src/afd/sprites/front/0288--000--Vigoroth.png b/src/afd/sprites/front/0288-000-Vigoroth.png
similarity index 100%
rename from src/afd/sprites/front/0288--000--Vigoroth.png
rename to src/afd/sprites/front/0288-000-Vigoroth.png
diff --git a/src/afd/sprites/front/0289--000--Slaking.png b/src/afd/sprites/front/0289-000-Slaking.png
similarity index 100%
rename from src/afd/sprites/front/0289--000--Slaking.png
rename to src/afd/sprites/front/0289-000-Slaking.png
diff --git a/src/afd/sprites/front/0290--000--Nincada.png b/src/afd/sprites/front/0290-000-Nincada.png
similarity index 100%
rename from src/afd/sprites/front/0290--000--Nincada.png
rename to src/afd/sprites/front/0290-000-Nincada.png
diff --git a/src/afd/sprites/front/0291--000--Ninjask.png b/src/afd/sprites/front/0291-000-Ninjask.png
similarity index 100%
rename from src/afd/sprites/front/0291--000--Ninjask.png
rename to src/afd/sprites/front/0291-000-Ninjask.png
diff --git a/src/afd/sprites/front/0292--000--Shedinja.png b/src/afd/sprites/front/0292-000-Shedinja.png
similarity index 100%
rename from src/afd/sprites/front/0292--000--Shedinja.png
rename to src/afd/sprites/front/0292-000-Shedinja.png
diff --git a/src/afd/sprites/front/0293--000--Whismur.png b/src/afd/sprites/front/0293-000-Whismur.png
similarity index 100%
rename from src/afd/sprites/front/0293--000--Whismur.png
rename to src/afd/sprites/front/0293-000-Whismur.png
diff --git a/src/afd/sprites/front/0294--000--Loudred.png b/src/afd/sprites/front/0294-000-Loudred.png
similarity index 100%
rename from src/afd/sprites/front/0294--000--Loudred.png
rename to src/afd/sprites/front/0294-000-Loudred.png
diff --git a/src/afd/sprites/front/0295--000--Exploud.png b/src/afd/sprites/front/0295-000-Exploud.png
similarity index 100%
rename from src/afd/sprites/front/0295--000--Exploud.png
rename to src/afd/sprites/front/0295-000-Exploud.png
diff --git a/src/afd/sprites/front/0296--000--Makuhita.png b/src/afd/sprites/front/0296-000-Makuhita.png
similarity index 100%
rename from src/afd/sprites/front/0296--000--Makuhita.png
rename to src/afd/sprites/front/0296-000-Makuhita.png
diff --git a/src/afd/sprites/front/0297--000--Hariyama.png b/src/afd/sprites/front/0297-000-Hariyama.png
similarity index 100%
rename from src/afd/sprites/front/0297--000--Hariyama.png
rename to src/afd/sprites/front/0297-000-Hariyama.png
diff --git a/src/afd/sprites/front/0298--000--Azurill.png b/src/afd/sprites/front/0298-000-Azurill.png
similarity index 100%
rename from src/afd/sprites/front/0298--000--Azurill.png
rename to src/afd/sprites/front/0298-000-Azurill.png
diff --git a/src/afd/sprites/front/0299--000--Nosepass.png b/src/afd/sprites/front/0299-000-Nosepass.png
similarity index 100%
rename from src/afd/sprites/front/0299--000--Nosepass.png
rename to src/afd/sprites/front/0299-000-Nosepass.png
diff --git a/src/afd/sprites/front/0300--000--Skitty.png b/src/afd/sprites/front/0300-000-Skitty.png
similarity index 100%
rename from src/afd/sprites/front/0300--000--Skitty.png
rename to src/afd/sprites/front/0300-000-Skitty.png
diff --git a/src/afd/sprites/front/0301--000--Delcatty.png b/src/afd/sprites/front/0301-000-Delcatty.png
similarity index 100%
rename from src/afd/sprites/front/0301--000--Delcatty.png
rename to src/afd/sprites/front/0301-000-Delcatty.png
diff --git a/src/afd/sprites/front/0302--000--Sableye.png b/src/afd/sprites/front/0302-000-Sableye.png
similarity index 100%
rename from src/afd/sprites/front/0302--000--Sableye.png
rename to src/afd/sprites/front/0302-000-Sableye.png
diff --git a/src/afd/sprites/front/0302--420--Sableye--Mega.png b/src/afd/sprites/front/0302-420-Sableye-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0302--420--Sableye--Mega.png
rename to src/afd/sprites/front/0302-420-Sableye-Mega.png
diff --git a/src/afd/sprites/front/0303--000--Mawile.png b/src/afd/sprites/front/0303-000-Mawile.png
similarity index 100%
rename from src/afd/sprites/front/0303--000--Mawile.png
rename to src/afd/sprites/front/0303-000-Mawile.png
diff --git a/src/afd/sprites/front/0303--420--Mawile--Mega.png b/src/afd/sprites/front/0303-420-Mawile-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0303--420--Mawile--Mega.png
rename to src/afd/sprites/front/0303-420-Mawile-Mega.png
diff --git a/src/afd/sprites/front/0304--000--Aron.png b/src/afd/sprites/front/0304-000-Aron.png
similarity index 100%
rename from src/afd/sprites/front/0304--000--Aron.png
rename to src/afd/sprites/front/0304-000-Aron.png
diff --git a/src/afd/sprites/front/0305--000--Lairon.png b/src/afd/sprites/front/0305-000-Lairon.png
similarity index 100%
rename from src/afd/sprites/front/0305--000--Lairon.png
rename to src/afd/sprites/front/0305-000-Lairon.png
diff --git a/src/afd/sprites/front/0306--000--Aggron.png b/src/afd/sprites/front/0306-000-Aggron.png
similarity index 100%
rename from src/afd/sprites/front/0306--000--Aggron.png
rename to src/afd/sprites/front/0306-000-Aggron.png
diff --git a/src/afd/sprites/front/0306--420--Aggron--Mega.png b/src/afd/sprites/front/0306-420-Aggron-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0306--420--Aggron--Mega.png
rename to src/afd/sprites/front/0306-420-Aggron-Mega.png
diff --git a/src/afd/sprites/front/0307--000--Meditite.png b/src/afd/sprites/front/0307-000-Meditite.png
similarity index 100%
rename from src/afd/sprites/front/0307--000--Meditite.png
rename to src/afd/sprites/front/0307-000-Meditite.png
diff --git a/src/afd/sprites/front/0308--000--Medicham.png b/src/afd/sprites/front/0308-000-Medicham.png
similarity index 100%
rename from src/afd/sprites/front/0308--000--Medicham.png
rename to src/afd/sprites/front/0308-000-Medicham.png
diff --git a/src/afd/sprites/front/0308--420--Medicham--Mega.png b/src/afd/sprites/front/0308-420-Medicham-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0308--420--Medicham--Mega.png
rename to src/afd/sprites/front/0308-420-Medicham-Mega.png
diff --git a/src/afd/sprites/front/0309--000--Electrike.png b/src/afd/sprites/front/0309-000-Electrike.png
similarity index 100%
rename from src/afd/sprites/front/0309--000--Electrike.png
rename to src/afd/sprites/front/0309-000-Electrike.png
diff --git a/src/afd/sprites/front/0310--000--Manectric.png b/src/afd/sprites/front/0310-000-Manectric.png
similarity index 100%
rename from src/afd/sprites/front/0310--000--Manectric.png
rename to src/afd/sprites/front/0310-000-Manectric.png
diff --git a/src/afd/sprites/front/0310--420--Manectric--Mega.png b/src/afd/sprites/front/0310-420-Manectric-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0310--420--Manectric--Mega.png
rename to src/afd/sprites/front/0310-420-Manectric-Mega.png
diff --git a/src/afd/sprites/front/0311--000--Plusle.png b/src/afd/sprites/front/0311-000-Plusle.png
similarity index 100%
rename from src/afd/sprites/front/0311--000--Plusle.png
rename to src/afd/sprites/front/0311-000-Plusle.png
diff --git a/src/afd/sprites/front/0312--000--Minun.png b/src/afd/sprites/front/0312-000-Minun.png
similarity index 100%
rename from src/afd/sprites/front/0312--000--Minun.png
rename to src/afd/sprites/front/0312-000-Minun.png
diff --git a/src/afd/sprites/front/0313--000--Volbeat.png b/src/afd/sprites/front/0313-000-Volbeat.png
similarity index 100%
rename from src/afd/sprites/front/0313--000--Volbeat.png
rename to src/afd/sprites/front/0313-000-Volbeat.png
diff --git a/src/afd/sprites/front/0314--000--Illumise.png b/src/afd/sprites/front/0314-000-Illumise.png
similarity index 100%
rename from src/afd/sprites/front/0314--000--Illumise.png
rename to src/afd/sprites/front/0314-000-Illumise.png
diff --git a/src/afd/sprites/front/0315--000--Roselia.png b/src/afd/sprites/front/0315-000-Roselia.png
similarity index 100%
rename from src/afd/sprites/front/0315--000--Roselia.png
rename to src/afd/sprites/front/0315-000-Roselia.png
diff --git a/src/afd/sprites/front/0316--000--Gulpin.png b/src/afd/sprites/front/0316-000-Gulpin.png
similarity index 100%
rename from src/afd/sprites/front/0316--000--Gulpin.png
rename to src/afd/sprites/front/0316-000-Gulpin.png
diff --git a/src/afd/sprites/front/0317--000--Swalot.png b/src/afd/sprites/front/0317-000-Swalot.png
similarity index 100%
rename from src/afd/sprites/front/0317--000--Swalot.png
rename to src/afd/sprites/front/0317-000-Swalot.png
diff --git a/src/afd/sprites/front/0318--000--Carvanha.png b/src/afd/sprites/front/0318-000-Carvanha.png
similarity index 100%
rename from src/afd/sprites/front/0318--000--Carvanha.png
rename to src/afd/sprites/front/0318-000-Carvanha.png
diff --git a/src/afd/sprites/front/0319--000--Sharpedo.png b/src/afd/sprites/front/0319-000-Sharpedo.png
similarity index 100%
rename from src/afd/sprites/front/0319--000--Sharpedo.png
rename to src/afd/sprites/front/0319-000-Sharpedo.png
diff --git a/src/afd/sprites/front/0319--420--Sharpedo--Mega.png b/src/afd/sprites/front/0319-420-Sharpedo-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0319--420--Sharpedo--Mega.png
rename to src/afd/sprites/front/0319-420-Sharpedo-Mega.png
diff --git a/src/afd/sprites/front/0320--000--Wailmer.png b/src/afd/sprites/front/0320-000-Wailmer.png
similarity index 100%
rename from src/afd/sprites/front/0320--000--Wailmer.png
rename to src/afd/sprites/front/0320-000-Wailmer.png
diff --git a/src/afd/sprites/front/0321--000--Wailord.png b/src/afd/sprites/front/0321-000-Wailord.png
similarity index 100%
rename from src/afd/sprites/front/0321--000--Wailord.png
rename to src/afd/sprites/front/0321-000-Wailord.png
diff --git a/src/afd/sprites/front/0322--000--Numel.png b/src/afd/sprites/front/0322-000-Numel.png
similarity index 100%
rename from src/afd/sprites/front/0322--000--Numel.png
rename to src/afd/sprites/front/0322-000-Numel.png
diff --git a/src/afd/sprites/front/0323--000--Camerupt.png b/src/afd/sprites/front/0323-000-Camerupt.png
similarity index 100%
rename from src/afd/sprites/front/0323--000--Camerupt.png
rename to src/afd/sprites/front/0323-000-Camerupt.png
diff --git a/src/afd/sprites/front/0323--420--Camerupt--Mega.png b/src/afd/sprites/front/0323-420-Camerupt-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0323--420--Camerupt--Mega.png
rename to src/afd/sprites/front/0323-420-Camerupt-Mega.png
diff --git a/src/afd/sprites/front/0324--000--Torkoal.png b/src/afd/sprites/front/0324-000-Torkoal.png
similarity index 100%
rename from src/afd/sprites/front/0324--000--Torkoal.png
rename to src/afd/sprites/front/0324-000-Torkoal.png
diff --git a/src/afd/sprites/front/0325--000--Spoink.png b/src/afd/sprites/front/0325-000-Spoink.png
similarity index 100%
rename from src/afd/sprites/front/0325--000--Spoink.png
rename to src/afd/sprites/front/0325-000-Spoink.png
diff --git a/src/afd/sprites/front/0326--000--Grumpig.png b/src/afd/sprites/front/0326-000-Grumpig.png
similarity index 100%
rename from src/afd/sprites/front/0326--000--Grumpig.png
rename to src/afd/sprites/front/0326-000-Grumpig.png
diff --git a/src/afd/sprites/front/0327--000--Spinda.png b/src/afd/sprites/front/0327-000-Spinda.png
similarity index 100%
rename from src/afd/sprites/front/0327--000--Spinda.png
rename to src/afd/sprites/front/0327-000-Spinda.png
diff --git a/src/afd/sprites/front/0328--000--Trapinch.png b/src/afd/sprites/front/0328-000-Trapinch.png
similarity index 100%
rename from src/afd/sprites/front/0328--000--Trapinch.png
rename to src/afd/sprites/front/0328-000-Trapinch.png
diff --git a/src/afd/sprites/front/0329--000--Vibrava.png b/src/afd/sprites/front/0329-000-Vibrava.png
similarity index 100%
rename from src/afd/sprites/front/0329--000--Vibrava.png
rename to src/afd/sprites/front/0329-000-Vibrava.png
diff --git a/src/afd/sprites/front/0330--000--Flygon.png b/src/afd/sprites/front/0330-000-Flygon.png
similarity index 100%
rename from src/afd/sprites/front/0330--000--Flygon.png
rename to src/afd/sprites/front/0330-000-Flygon.png
diff --git a/src/afd/sprites/front/0331--000--Cacnea.png b/src/afd/sprites/front/0331-000-Cacnea.png
similarity index 100%
rename from src/afd/sprites/front/0331--000--Cacnea.png
rename to src/afd/sprites/front/0331-000-Cacnea.png
diff --git a/src/afd/sprites/front/0332--000--Cacturne.png b/src/afd/sprites/front/0332-000-Cacturne.png
similarity index 100%
rename from src/afd/sprites/front/0332--000--Cacturne.png
rename to src/afd/sprites/front/0332-000-Cacturne.png
diff --git a/src/afd/sprites/front/0333--000--Swablu.png b/src/afd/sprites/front/0333-000-Swablu.png
similarity index 100%
rename from src/afd/sprites/front/0333--000--Swablu.png
rename to src/afd/sprites/front/0333-000-Swablu.png
diff --git a/src/afd/sprites/front/0334--000--Altaria.png b/src/afd/sprites/front/0334-000-Altaria.png
similarity index 100%
rename from src/afd/sprites/front/0334--000--Altaria.png
rename to src/afd/sprites/front/0334-000-Altaria.png
diff --git a/src/afd/sprites/front/0334--420--Altaria--Mega.png b/src/afd/sprites/front/0334-420-Altaria-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0334--420--Altaria--Mega.png
rename to src/afd/sprites/front/0334-420-Altaria-Mega.png
diff --git a/src/afd/sprites/front/0335--000--Zangoose.png b/src/afd/sprites/front/0335-000-Zangoose.png
similarity index 100%
rename from src/afd/sprites/front/0335--000--Zangoose.png
rename to src/afd/sprites/front/0335-000-Zangoose.png
diff --git a/src/afd/sprites/front/0336--000--Seviper.png b/src/afd/sprites/front/0336-000-Seviper.png
similarity index 100%
rename from src/afd/sprites/front/0336--000--Seviper.png
rename to src/afd/sprites/front/0336-000-Seviper.png
diff --git a/src/afd/sprites/front/0337--000--Lunatone.png b/src/afd/sprites/front/0337-000-Lunatone.png
similarity index 100%
rename from src/afd/sprites/front/0337--000--Lunatone.png
rename to src/afd/sprites/front/0337-000-Lunatone.png
diff --git a/src/afd/sprites/front/0338--000--Solrock.png b/src/afd/sprites/front/0338-000-Solrock.png
similarity index 100%
rename from src/afd/sprites/front/0338--000--Solrock.png
rename to src/afd/sprites/front/0338-000-Solrock.png
diff --git a/src/afd/sprites/front/0339--000--Barboach.png b/src/afd/sprites/front/0339-000-Barboach.png
similarity index 100%
rename from src/afd/sprites/front/0339--000--Barboach.png
rename to src/afd/sprites/front/0339-000-Barboach.png
diff --git a/src/afd/sprites/front/0340--000--Whiscash.png b/src/afd/sprites/front/0340-000-Whiscash.png
similarity index 100%
rename from src/afd/sprites/front/0340--000--Whiscash.png
rename to src/afd/sprites/front/0340-000-Whiscash.png
diff --git a/src/afd/sprites/front/0341--000--Corphish.png b/src/afd/sprites/front/0341-000-Corphish.png
similarity index 100%
rename from src/afd/sprites/front/0341--000--Corphish.png
rename to src/afd/sprites/front/0341-000-Corphish.png
diff --git a/src/afd/sprites/front/0342--000--Crawdaunt.png b/src/afd/sprites/front/0342-000-Crawdaunt.png
similarity index 100%
rename from src/afd/sprites/front/0342--000--Crawdaunt.png
rename to src/afd/sprites/front/0342-000-Crawdaunt.png
diff --git a/src/afd/sprites/front/0343--000--Baltoy.png b/src/afd/sprites/front/0343-000-Baltoy.png
similarity index 100%
rename from src/afd/sprites/front/0343--000--Baltoy.png
rename to src/afd/sprites/front/0343-000-Baltoy.png
diff --git a/src/afd/sprites/front/0344--000--Claydol.png b/src/afd/sprites/front/0344-000-Claydol.png
similarity index 100%
rename from src/afd/sprites/front/0344--000--Claydol.png
rename to src/afd/sprites/front/0344-000-Claydol.png
diff --git a/src/afd/sprites/front/0345--000--Lileep.png b/src/afd/sprites/front/0345-000-Lileep.png
similarity index 100%
rename from src/afd/sprites/front/0345--000--Lileep.png
rename to src/afd/sprites/front/0345-000-Lileep.png
diff --git a/src/afd/sprites/front/0346--000--Cradily.png b/src/afd/sprites/front/0346-000-Cradily.png
similarity index 100%
rename from src/afd/sprites/front/0346--000--Cradily.png
rename to src/afd/sprites/front/0346-000-Cradily.png
diff --git a/src/afd/sprites/front/0347--000--Anorith.png b/src/afd/sprites/front/0347-000-Anorith.png
similarity index 100%
rename from src/afd/sprites/front/0347--000--Anorith.png
rename to src/afd/sprites/front/0347-000-Anorith.png
diff --git a/src/afd/sprites/front/0348--000--Armaldo.png b/src/afd/sprites/front/0348-000-Armaldo.png
similarity index 100%
rename from src/afd/sprites/front/0348--000--Armaldo.png
rename to src/afd/sprites/front/0348-000-Armaldo.png
diff --git a/src/afd/sprites/front/0349--000--Feebas.png b/src/afd/sprites/front/0349-000-Feebas.png
similarity index 100%
rename from src/afd/sprites/front/0349--000--Feebas.png
rename to src/afd/sprites/front/0349-000-Feebas.png
diff --git a/src/afd/sprites/front/0350--000--Milotic.png b/src/afd/sprites/front/0350-000-Milotic.png
similarity index 100%
rename from src/afd/sprites/front/0350--000--Milotic.png
rename to src/afd/sprites/front/0350-000-Milotic.png
diff --git a/src/afd/sprites/front/0351--000--Castform.png b/src/afd/sprites/front/0351-000-Castform.png
similarity index 100%
rename from src/afd/sprites/front/0351--000--Castform.png
rename to src/afd/sprites/front/0351-000-Castform.png
diff --git a/src/afd/sprites/front/0351--420--Castform--Rainy.png b/src/afd/sprites/front/0351-420-Castform-Rainy.png
similarity index 100%
rename from src/afd/sprites/front/0351--420--Castform--Rainy.png
rename to src/afd/sprites/front/0351-420-Castform-Rainy.png
diff --git a/src/afd/sprites/front/0351--420--Castform--Snowy.png b/src/afd/sprites/front/0351-420-Castform-Snowy.png
similarity index 100%
rename from src/afd/sprites/front/0351--420--Castform--Snowy.png
rename to src/afd/sprites/front/0351-420-Castform-Snowy.png
diff --git a/src/afd/sprites/front/0351--420--Castform--Sunny.png b/src/afd/sprites/front/0351-420-Castform-Sunny.png
similarity index 100%
rename from src/afd/sprites/front/0351--420--Castform--Sunny.png
rename to src/afd/sprites/front/0351-420-Castform-Sunny.png
diff --git a/src/afd/sprites/front/0352--000--Kecleon.png b/src/afd/sprites/front/0352-000-Kecleon.png
similarity index 100%
rename from src/afd/sprites/front/0352--000--Kecleon.png
rename to src/afd/sprites/front/0352-000-Kecleon.png
diff --git a/src/afd/sprites/front/0353--000--Shuppet.png b/src/afd/sprites/front/0353-000-Shuppet.png
similarity index 100%
rename from src/afd/sprites/front/0353--000--Shuppet.png
rename to src/afd/sprites/front/0353-000-Shuppet.png
diff --git a/src/afd/sprites/front/0354--000--Banette.png b/src/afd/sprites/front/0354-000-Banette.png
similarity index 100%
rename from src/afd/sprites/front/0354--000--Banette.png
rename to src/afd/sprites/front/0354-000-Banette.png
diff --git a/src/afd/sprites/front/0354--420--Banette--Mega.png b/src/afd/sprites/front/0354-420-Banette-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0354--420--Banette--Mega.png
rename to src/afd/sprites/front/0354-420-Banette-Mega.png
diff --git a/src/afd/sprites/front/0355--000--Duskull.png b/src/afd/sprites/front/0355-000-Duskull.png
similarity index 100%
rename from src/afd/sprites/front/0355--000--Duskull.png
rename to src/afd/sprites/front/0355-000-Duskull.png
diff --git a/src/afd/sprites/front/0356--000--Dusclops.png b/src/afd/sprites/front/0356-000-Dusclops.png
similarity index 100%
rename from src/afd/sprites/front/0356--000--Dusclops.png
rename to src/afd/sprites/front/0356-000-Dusclops.png
diff --git a/src/afd/sprites/front/0357--000--Tropius.png b/src/afd/sprites/front/0357-000-Tropius.png
similarity index 100%
rename from src/afd/sprites/front/0357--000--Tropius.png
rename to src/afd/sprites/front/0357-000-Tropius.png
diff --git a/src/afd/sprites/front/0358--000--Chimecho.png b/src/afd/sprites/front/0358-000-Chimecho.png
similarity index 100%
rename from src/afd/sprites/front/0358--000--Chimecho.png
rename to src/afd/sprites/front/0358-000-Chimecho.png
diff --git a/src/afd/sprites/front/0359--000--Absol.png b/src/afd/sprites/front/0359-000-Absol.png
similarity index 100%
rename from src/afd/sprites/front/0359--000--Absol.png
rename to src/afd/sprites/front/0359-000-Absol.png
diff --git a/src/afd/sprites/front/0359--420--Absol--Mega.png b/src/afd/sprites/front/0359-420-Absol-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0359--420--Absol--Mega.png
rename to src/afd/sprites/front/0359-420-Absol-Mega.png
diff --git a/src/afd/sprites/front/0360--000--Wynaut.png b/src/afd/sprites/front/0360-000-Wynaut.png
similarity index 100%
rename from src/afd/sprites/front/0360--000--Wynaut.png
rename to src/afd/sprites/front/0360-000-Wynaut.png
diff --git a/src/afd/sprites/front/0361--000--Snorunt.png b/src/afd/sprites/front/0361-000-Snorunt.png
similarity index 100%
rename from src/afd/sprites/front/0361--000--Snorunt.png
rename to src/afd/sprites/front/0361-000-Snorunt.png
diff --git a/src/afd/sprites/front/0362--000--Glalie.png b/src/afd/sprites/front/0362-000-Glalie.png
similarity index 100%
rename from src/afd/sprites/front/0362--000--Glalie.png
rename to src/afd/sprites/front/0362-000-Glalie.png
diff --git a/src/afd/sprites/front/0363--000--Spheal.png b/src/afd/sprites/front/0363-000-Spheal.png
similarity index 100%
rename from src/afd/sprites/front/0363--000--Spheal.png
rename to src/afd/sprites/front/0363-000-Spheal.png
diff --git a/src/afd/sprites/front/0364--000--Sealeo.png b/src/afd/sprites/front/0364-000-Sealeo.png
similarity index 100%
rename from src/afd/sprites/front/0364--000--Sealeo.png
rename to src/afd/sprites/front/0364-000-Sealeo.png
diff --git a/src/afd/sprites/front/0365--000--Walrein.png b/src/afd/sprites/front/0365-000-Walrein.png
similarity index 100%
rename from src/afd/sprites/front/0365--000--Walrein.png
rename to src/afd/sprites/front/0365-000-Walrein.png
diff --git a/src/afd/sprites/front/0366--000--Clamperl.png b/src/afd/sprites/front/0366-000-Clamperl.png
similarity index 100%
rename from src/afd/sprites/front/0366--000--Clamperl.png
rename to src/afd/sprites/front/0366-000-Clamperl.png
diff --git a/src/afd/sprites/front/0367--000--Huntail.png b/src/afd/sprites/front/0367-000-Huntail.png
similarity index 100%
rename from src/afd/sprites/front/0367--000--Huntail.png
rename to src/afd/sprites/front/0367-000-Huntail.png
diff --git a/src/afd/sprites/front/0368--000--Gorebyss.png b/src/afd/sprites/front/0368-000-Gorebyss.png
similarity index 100%
rename from src/afd/sprites/front/0368--000--Gorebyss.png
rename to src/afd/sprites/front/0368-000-Gorebyss.png
diff --git a/src/afd/sprites/front/0369--000--Relicanth.png b/src/afd/sprites/front/0369-000-Relicanth.png
similarity index 100%
rename from src/afd/sprites/front/0369--000--Relicanth.png
rename to src/afd/sprites/front/0369-000-Relicanth.png
diff --git a/src/afd/sprites/front/0370--000--Luvdisc.png b/src/afd/sprites/front/0370-000-Luvdisc.png
similarity index 100%
rename from src/afd/sprites/front/0370--000--Luvdisc.png
rename to src/afd/sprites/front/0370-000-Luvdisc.png
diff --git a/src/afd/sprites/front/0371--000--Bagon.png b/src/afd/sprites/front/0371-000-Bagon.png
similarity index 100%
rename from src/afd/sprites/front/0371--000--Bagon.png
rename to src/afd/sprites/front/0371-000-Bagon.png
diff --git a/src/afd/sprites/front/0372--000--Shelgon.png b/src/afd/sprites/front/0372-000-Shelgon.png
similarity index 100%
rename from src/afd/sprites/front/0372--000--Shelgon.png
rename to src/afd/sprites/front/0372-000-Shelgon.png
diff --git a/src/afd/sprites/front/0373--000--Salamence.png b/src/afd/sprites/front/0373-000-Salamence.png
similarity index 100%
rename from src/afd/sprites/front/0373--000--Salamence.png
rename to src/afd/sprites/front/0373-000-Salamence.png
diff --git a/src/afd/sprites/front/0373--420--Salamence--Mega.png b/src/afd/sprites/front/0373-420-Salamence-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0373--420--Salamence--Mega.png
rename to src/afd/sprites/front/0373-420-Salamence-Mega.png
diff --git a/src/afd/sprites/front/0374--000--Beldum.png b/src/afd/sprites/front/0374-000-Beldum.png
similarity index 100%
rename from src/afd/sprites/front/0374--000--Beldum.png
rename to src/afd/sprites/front/0374-000-Beldum.png
diff --git a/src/afd/sprites/front/0375--000--Metang.png b/src/afd/sprites/front/0375-000-Metang.png
similarity index 100%
rename from src/afd/sprites/front/0375--000--Metang.png
rename to src/afd/sprites/front/0375-000-Metang.png
diff --git a/src/afd/sprites/front/0376--000--Metagross.png b/src/afd/sprites/front/0376-000-Metagross.png
similarity index 100%
rename from src/afd/sprites/front/0376--000--Metagross.png
rename to src/afd/sprites/front/0376-000-Metagross.png
diff --git a/src/afd/sprites/front/0376--420--Metagross--Mega.png b/src/afd/sprites/front/0376-420-Metagross-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0376--420--Metagross--Mega.png
rename to src/afd/sprites/front/0376-420-Metagross-Mega.png
diff --git a/src/afd/sprites/front/0377--000--Regirock.png b/src/afd/sprites/front/0377-000-Regirock.png
similarity index 100%
rename from src/afd/sprites/front/0377--000--Regirock.png
rename to src/afd/sprites/front/0377-000-Regirock.png
diff --git a/src/afd/sprites/front/0378--000--Regice.png b/src/afd/sprites/front/0378-000-Regice.png
similarity index 100%
rename from src/afd/sprites/front/0378--000--Regice.png
rename to src/afd/sprites/front/0378-000-Regice.png
diff --git a/src/afd/sprites/front/0379--000--Registeel.png b/src/afd/sprites/front/0379-000-Registeel.png
similarity index 100%
rename from src/afd/sprites/front/0379--000--Registeel.png
rename to src/afd/sprites/front/0379-000-Registeel.png
diff --git a/src/afd/sprites/front/0380--000--Latias.png b/src/afd/sprites/front/0380-000-Latias.png
similarity index 100%
rename from src/afd/sprites/front/0380--000--Latias.png
rename to src/afd/sprites/front/0380-000-Latias.png
diff --git a/src/afd/sprites/front/0380--420--Latias--Mega.png b/src/afd/sprites/front/0380-420-Latias-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0380--420--Latias--Mega.png
rename to src/afd/sprites/front/0380-420-Latias-Mega.png
diff --git a/src/afd/sprites/front/0381--000--Latios.png b/src/afd/sprites/front/0381-000-Latios.png
similarity index 100%
rename from src/afd/sprites/front/0381--000--Latios.png
rename to src/afd/sprites/front/0381-000-Latios.png
diff --git a/src/afd/sprites/front/0381--420--Latios--Mega.png b/src/afd/sprites/front/0381-420-Latios-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0381--420--Latios--Mega.png
rename to src/afd/sprites/front/0381-420-Latios-Mega.png
diff --git a/src/afd/sprites/front/0382--000--Kyogre.png b/src/afd/sprites/front/0382-000-Kyogre.png
similarity index 100%
rename from src/afd/sprites/front/0382--000--Kyogre.png
rename to src/afd/sprites/front/0382-000-Kyogre.png
diff --git a/src/afd/sprites/front/0382--420--Kyogre--Primal.png b/src/afd/sprites/front/0382-420-Kyogre-Primal.png
similarity index 100%
rename from src/afd/sprites/front/0382--420--Kyogre--Primal.png
rename to src/afd/sprites/front/0382-420-Kyogre-Primal.png
diff --git a/src/afd/sprites/front/0383--000--Groudon.png b/src/afd/sprites/front/0383-000-Groudon.png
similarity index 100%
rename from src/afd/sprites/front/0383--000--Groudon.png
rename to src/afd/sprites/front/0383-000-Groudon.png
diff --git a/src/afd/sprites/front/0383--420--Groudon--Primal.png b/src/afd/sprites/front/0383-420-Groudon-Primal.png
similarity index 100%
rename from src/afd/sprites/front/0383--420--Groudon--Primal.png
rename to src/afd/sprites/front/0383-420-Groudon-Primal.png
diff --git a/src/afd/sprites/front/0384--000--Rayquaza.png b/src/afd/sprites/front/0384-000-Rayquaza.png
similarity index 100%
rename from src/afd/sprites/front/0384--000--Rayquaza.png
rename to src/afd/sprites/front/0384-000-Rayquaza.png
diff --git a/src/afd/sprites/front/0384--420--Rayquaza--Mega.png b/src/afd/sprites/front/0384-420-Rayquaza-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0384--420--Rayquaza--Mega.png
rename to src/afd/sprites/front/0384-420-Rayquaza-Mega.png
diff --git a/src/afd/sprites/front/0385--000--Jirachi.png b/src/afd/sprites/front/0385-000-Jirachi.png
similarity index 100%
rename from src/afd/sprites/front/0385--000--Jirachi.png
rename to src/afd/sprites/front/0385-000-Jirachi.png
diff --git a/src/afd/sprites/front/0386--000--Deoxys.png b/src/afd/sprites/front/0386-000-Deoxys.png
similarity index 100%
rename from src/afd/sprites/front/0386--000--Deoxys.png
rename to src/afd/sprites/front/0386-000-Deoxys.png
diff --git a/src/afd/sprites/front/0386--420--Deoxys--Attack.png b/src/afd/sprites/front/0386-420-Deoxys-Attack.png
similarity index 100%
rename from src/afd/sprites/front/0386--420--Deoxys--Attack.png
rename to src/afd/sprites/front/0386-420-Deoxys-Attack.png
diff --git a/src/afd/sprites/front/0386--420--Deoxys--Defense.png b/src/afd/sprites/front/0386-420-Deoxys-Defense.png
similarity index 100%
rename from src/afd/sprites/front/0386--420--Deoxys--Defense.png
rename to src/afd/sprites/front/0386-420-Deoxys-Defense.png
diff --git a/src/afd/sprites/front/0386--420--Deoxys--Speed.png b/src/afd/sprites/front/0386-420-Deoxys-Speed.png
similarity index 100%
rename from src/afd/sprites/front/0386--420--Deoxys--Speed.png
rename to src/afd/sprites/front/0386-420-Deoxys-Speed.png
diff --git a/src/afd/sprites/front/0387--000--Turtwig.png b/src/afd/sprites/front/0387-000-Turtwig.png
similarity index 100%
rename from src/afd/sprites/front/0387--000--Turtwig.png
rename to src/afd/sprites/front/0387-000-Turtwig.png
diff --git a/src/afd/sprites/front/0388--000--Grotle.png b/src/afd/sprites/front/0388-000-Grotle.png
similarity index 100%
rename from src/afd/sprites/front/0388--000--Grotle.png
rename to src/afd/sprites/front/0388-000-Grotle.png
diff --git a/src/afd/sprites/front/0389--000--Torterra.png b/src/afd/sprites/front/0389-000-Torterra.png
similarity index 100%
rename from src/afd/sprites/front/0389--000--Torterra.png
rename to src/afd/sprites/front/0389-000-Torterra.png
diff --git a/src/afd/sprites/front/0390--000--Chimchar.png b/src/afd/sprites/front/0390-000-Chimchar.png
similarity index 100%
rename from src/afd/sprites/front/0390--000--Chimchar.png
rename to src/afd/sprites/front/0390-000-Chimchar.png
diff --git a/src/afd/sprites/front/0391--000--Monferno.png b/src/afd/sprites/front/0391-000-Monferno.png
similarity index 100%
rename from src/afd/sprites/front/0391--000--Monferno.png
rename to src/afd/sprites/front/0391-000-Monferno.png
diff --git a/src/afd/sprites/front/0392--000--Infernape.png b/src/afd/sprites/front/0392-000-Infernape.png
similarity index 100%
rename from src/afd/sprites/front/0392--000--Infernape.png
rename to src/afd/sprites/front/0392-000-Infernape.png
diff --git a/src/afd/sprites/front/0393--000--Piplup.png b/src/afd/sprites/front/0393-000-Piplup.png
similarity index 100%
rename from src/afd/sprites/front/0393--000--Piplup.png
rename to src/afd/sprites/front/0393-000-Piplup.png
diff --git a/src/afd/sprites/front/0394--000--Prinplup.png b/src/afd/sprites/front/0394-000-Prinplup.png
similarity index 100%
rename from src/afd/sprites/front/0394--000--Prinplup.png
rename to src/afd/sprites/front/0394-000-Prinplup.png
diff --git a/src/afd/sprites/front/0395--000--Empoleon.png b/src/afd/sprites/front/0395-000-Empoleon.png
similarity index 100%
rename from src/afd/sprites/front/0395--000--Empoleon.png
rename to src/afd/sprites/front/0395-000-Empoleon.png
diff --git a/src/afd/sprites/front/0396--000--Starly.png b/src/afd/sprites/front/0396-000-Starly.png
similarity index 100%
rename from src/afd/sprites/front/0396--000--Starly.png
rename to src/afd/sprites/front/0396-000-Starly.png
diff --git a/src/afd/sprites/front/0397--000--Staravia.png b/src/afd/sprites/front/0397-000-Staravia.png
similarity index 100%
rename from src/afd/sprites/front/0397--000--Staravia.png
rename to src/afd/sprites/front/0397-000-Staravia.png
diff --git a/src/afd/sprites/front/0398--000--Staraptor.png b/src/afd/sprites/front/0398-000-Staraptor.png
similarity index 100%
rename from src/afd/sprites/front/0398--000--Staraptor.png
rename to src/afd/sprites/front/0398-000-Staraptor.png
diff --git a/src/afd/sprites/front/0399--000--Bidoof.png b/src/afd/sprites/front/0399-000-Bidoof.png
similarity index 100%
rename from src/afd/sprites/front/0399--000--Bidoof.png
rename to src/afd/sprites/front/0399-000-Bidoof.png
diff --git a/src/afd/sprites/front/0400--000--Bibarel.png b/src/afd/sprites/front/0400-000-Bibarel.png
similarity index 100%
rename from src/afd/sprites/front/0400--000--Bibarel.png
rename to src/afd/sprites/front/0400-000-Bibarel.png
diff --git a/src/afd/sprites/front/0401--000--Kricketot.png b/src/afd/sprites/front/0401-000-Kricketot.png
similarity index 100%
rename from src/afd/sprites/front/0401--000--Kricketot.png
rename to src/afd/sprites/front/0401-000-Kricketot.png
diff --git a/src/afd/sprites/front/0402--000--Kricketune.png b/src/afd/sprites/front/0402-000-Kricketune.png
similarity index 100%
rename from src/afd/sprites/front/0402--000--Kricketune.png
rename to src/afd/sprites/front/0402-000-Kricketune.png
diff --git a/src/afd/sprites/front/0403--000--Shinx.png b/src/afd/sprites/front/0403-000-Shinx.png
similarity index 100%
rename from src/afd/sprites/front/0403--000--Shinx.png
rename to src/afd/sprites/front/0403-000-Shinx.png
diff --git a/src/afd/sprites/front/0404--000--Luxio.png b/src/afd/sprites/front/0404-000-Luxio.png
similarity index 100%
rename from src/afd/sprites/front/0404--000--Luxio.png
rename to src/afd/sprites/front/0404-000-Luxio.png
diff --git a/src/afd/sprites/front/0405--000--Luxray.png b/src/afd/sprites/front/0405-000-Luxray.png
similarity index 100%
rename from src/afd/sprites/front/0405--000--Luxray.png
rename to src/afd/sprites/front/0405-000-Luxray.png
diff --git a/src/afd/sprites/front/0406--000--Budew.gif b/src/afd/sprites/front/0406-000-Budew.gif
similarity index 100%
rename from src/afd/sprites/front/0406--000--Budew.gif
rename to src/afd/sprites/front/0406-000-Budew.gif
diff --git a/src/afd/sprites/front/0407--000--Roserade.png b/src/afd/sprites/front/0407-000-Roserade.png
similarity index 100%
rename from src/afd/sprites/front/0407--000--Roserade.png
rename to src/afd/sprites/front/0407-000-Roserade.png
diff --git a/src/afd/sprites/front/0408--000--Cranidos.png b/src/afd/sprites/front/0408-000-Cranidos.png
similarity index 100%
rename from src/afd/sprites/front/0408--000--Cranidos.png
rename to src/afd/sprites/front/0408-000-Cranidos.png
diff --git a/src/afd/sprites/front/0409--000--Rampardos.png b/src/afd/sprites/front/0409-000-Rampardos.png
similarity index 100%
rename from src/afd/sprites/front/0409--000--Rampardos.png
rename to src/afd/sprites/front/0409-000-Rampardos.png
diff --git a/src/afd/sprites/front/0410--000--Shieldon.png b/src/afd/sprites/front/0410-000-Shieldon.png
similarity index 100%
rename from src/afd/sprites/front/0410--000--Shieldon.png
rename to src/afd/sprites/front/0410-000-Shieldon.png
diff --git a/src/afd/sprites/front/0411--000--Bastiodon.png b/src/afd/sprites/front/0411-000-Bastiodon.png
similarity index 100%
rename from src/afd/sprites/front/0411--000--Bastiodon.png
rename to src/afd/sprites/front/0411-000-Bastiodon.png
diff --git a/src/afd/sprites/front/0412--000--Burmy.png b/src/afd/sprites/front/0412-000-Burmy.png
similarity index 100%
rename from src/afd/sprites/front/0412--000--Burmy.png
rename to src/afd/sprites/front/0412-000-Burmy.png
diff --git a/src/afd/sprites/front/0413--000--Wormadam.png b/src/afd/sprites/front/0413-000-Wormadam.png
similarity index 100%
rename from src/afd/sprites/front/0413--000--Wormadam.png
rename to src/afd/sprites/front/0413-000-Wormadam.png
diff --git a/src/afd/sprites/front/0413--420--Wormadam--Sandy.png b/src/afd/sprites/front/0413-420-Wormadam-Sandy.png
similarity index 100%
rename from src/afd/sprites/front/0413--420--Wormadam--Sandy.png
rename to src/afd/sprites/front/0413-420-Wormadam-Sandy.png
diff --git a/src/afd/sprites/front/0413--420--Wormadam--Trash.png b/src/afd/sprites/front/0413-420-Wormadam-Trash.png
similarity index 100%
rename from src/afd/sprites/front/0413--420--Wormadam--Trash.png
rename to src/afd/sprites/front/0413-420-Wormadam-Trash.png
diff --git a/src/afd/sprites/front/0414--000--Mothim.png b/src/afd/sprites/front/0414-000-Mothim.png
similarity index 100%
rename from src/afd/sprites/front/0414--000--Mothim.png
rename to src/afd/sprites/front/0414-000-Mothim.png
diff --git a/src/afd/sprites/front/0415--000--Combee.png b/src/afd/sprites/front/0415-000-Combee.png
similarity index 100%
rename from src/afd/sprites/front/0415--000--Combee.png
rename to src/afd/sprites/front/0415-000-Combee.png
diff --git a/src/afd/sprites/front/0416--000--Vespiquen.png b/src/afd/sprites/front/0416-000-Vespiquen.png
similarity index 100%
rename from src/afd/sprites/front/0416--000--Vespiquen.png
rename to src/afd/sprites/front/0416-000-Vespiquen.png
diff --git a/src/afd/sprites/front/0417--000--Pachirisu.png b/src/afd/sprites/front/0417-000-Pachirisu.png
similarity index 100%
rename from src/afd/sprites/front/0417--000--Pachirisu.png
rename to src/afd/sprites/front/0417-000-Pachirisu.png
diff --git a/src/afd/sprites/front/0418--000--Buizel.png b/src/afd/sprites/front/0418-000-Buizel.png
similarity index 100%
rename from src/afd/sprites/front/0418--000--Buizel.png
rename to src/afd/sprites/front/0418-000-Buizel.png
diff --git a/src/afd/sprites/front/0419--000--Floatzel.png b/src/afd/sprites/front/0419-000-Floatzel.png
similarity index 100%
rename from src/afd/sprites/front/0419--000--Floatzel.png
rename to src/afd/sprites/front/0419-000-Floatzel.png
diff --git a/src/afd/sprites/front/0420--000--Cherubi.png b/src/afd/sprites/front/0420-000-Cherubi.png
similarity index 100%
rename from src/afd/sprites/front/0420--000--Cherubi.png
rename to src/afd/sprites/front/0420-000-Cherubi.png
diff --git a/src/afd/sprites/front/0421--000--Cherrim.png b/src/afd/sprites/front/0421-000-Cherrim.png
similarity index 100%
rename from src/afd/sprites/front/0421--000--Cherrim.png
rename to src/afd/sprites/front/0421-000-Cherrim.png
diff --git a/src/afd/sprites/front/0421--420--Cherrim--Sunshine.png b/src/afd/sprites/front/0421-420-Cherrim-Sunshine.png
similarity index 100%
rename from src/afd/sprites/front/0421--420--Cherrim--Sunshine.png
rename to src/afd/sprites/front/0421-420-Cherrim-Sunshine.png
diff --git a/src/afd/sprites/front/0422--000--Shellos.png b/src/afd/sprites/front/0422-000-Shellos.png
similarity index 100%
rename from src/afd/sprites/front/0422--000--Shellos.png
rename to src/afd/sprites/front/0422-000-Shellos.png
diff --git a/src/afd/sprites/front/0423--000--Gastrodon.png b/src/afd/sprites/front/0423-000-Gastrodon.png
similarity index 100%
rename from src/afd/sprites/front/0423--000--Gastrodon.png
rename to src/afd/sprites/front/0423-000-Gastrodon.png
diff --git a/src/afd/sprites/front/0424--000--Ambipom.png b/src/afd/sprites/front/0424-000-Ambipom.png
similarity index 100%
rename from src/afd/sprites/front/0424--000--Ambipom.png
rename to src/afd/sprites/front/0424-000-Ambipom.png
diff --git a/src/afd/sprites/front/0425--000--Drifloon.png b/src/afd/sprites/front/0425-000-Drifloon.png
similarity index 100%
rename from src/afd/sprites/front/0425--000--Drifloon.png
rename to src/afd/sprites/front/0425-000-Drifloon.png
diff --git a/src/afd/sprites/front/0426--000--Drifblim.png b/src/afd/sprites/front/0426-000-Drifblim.png
similarity index 100%
rename from src/afd/sprites/front/0426--000--Drifblim.png
rename to src/afd/sprites/front/0426-000-Drifblim.png
diff --git a/src/afd/sprites/front/0427--000--Buneary.png b/src/afd/sprites/front/0427-000-Buneary.png
similarity index 100%
rename from src/afd/sprites/front/0427--000--Buneary.png
rename to src/afd/sprites/front/0427-000-Buneary.png
diff --git a/src/afd/sprites/front/0428--000--Lopunny.png b/src/afd/sprites/front/0428-000-Lopunny.png
similarity index 100%
rename from src/afd/sprites/front/0428--000--Lopunny.png
rename to src/afd/sprites/front/0428-000-Lopunny.png
diff --git a/src/afd/sprites/front/0428--420--Lopunny--Mega.png b/src/afd/sprites/front/0428-420-Lopunny-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0428--420--Lopunny--Mega.png
rename to src/afd/sprites/front/0428-420-Lopunny-Mega.png
diff --git a/src/afd/sprites/front/0429--000--Mismagius.png b/src/afd/sprites/front/0429-000-Mismagius.png
similarity index 100%
rename from src/afd/sprites/front/0429--000--Mismagius.png
rename to src/afd/sprites/front/0429-000-Mismagius.png
diff --git a/src/afd/sprites/front/0430--000--Honchkrow.png b/src/afd/sprites/front/0430-000-Honchkrow.png
similarity index 100%
rename from src/afd/sprites/front/0430--000--Honchkrow.png
rename to src/afd/sprites/front/0430-000-Honchkrow.png
diff --git a/src/afd/sprites/front/0431--000--Glameow.png b/src/afd/sprites/front/0431-000-Glameow.png
similarity index 100%
rename from src/afd/sprites/front/0431--000--Glameow.png
rename to src/afd/sprites/front/0431-000-Glameow.png
diff --git a/src/afd/sprites/front/0432--000--Purugly.png b/src/afd/sprites/front/0432-000-Purugly.png
similarity index 100%
rename from src/afd/sprites/front/0432--000--Purugly.png
rename to src/afd/sprites/front/0432-000-Purugly.png
diff --git a/src/afd/sprites/front/0433--000--Chingling.png b/src/afd/sprites/front/0433-000-Chingling.png
similarity index 100%
rename from src/afd/sprites/front/0433--000--Chingling.png
rename to src/afd/sprites/front/0433-000-Chingling.png
diff --git a/src/afd/sprites/front/0434--000--Stunky.png b/src/afd/sprites/front/0434-000-Stunky.png
similarity index 100%
rename from src/afd/sprites/front/0434--000--Stunky.png
rename to src/afd/sprites/front/0434-000-Stunky.png
diff --git a/src/afd/sprites/front/0435--000--Skuntank.png b/src/afd/sprites/front/0435-000-Skuntank.png
similarity index 100%
rename from src/afd/sprites/front/0435--000--Skuntank.png
rename to src/afd/sprites/front/0435-000-Skuntank.png
diff --git a/src/afd/sprites/front/0436--000--Bronzor.png b/src/afd/sprites/front/0436-000-Bronzor.png
similarity index 100%
rename from src/afd/sprites/front/0436--000--Bronzor.png
rename to src/afd/sprites/front/0436-000-Bronzor.png
diff --git a/src/afd/sprites/front/0437--000--Bronzong.png b/src/afd/sprites/front/0437-000-Bronzong.png
similarity index 100%
rename from src/afd/sprites/front/0437--000--Bronzong.png
rename to src/afd/sprites/front/0437-000-Bronzong.png
diff --git a/src/afd/sprites/front/0438--000--Bonsly.png b/src/afd/sprites/front/0438-000-Bonsly.png
similarity index 100%
rename from src/afd/sprites/front/0438--000--Bonsly.png
rename to src/afd/sprites/front/0438-000-Bonsly.png
diff --git a/src/afd/sprites/front/0439--000--Mime_Jr..png b/src/afd/sprites/front/0439-000-Mime_Jr..png
similarity index 100%
rename from src/afd/sprites/front/0439--000--Mime_Jr..png
rename to src/afd/sprites/front/0439-000-Mime_Jr..png
diff --git a/src/afd/sprites/front/0440--000--Happiny.png b/src/afd/sprites/front/0440-000-Happiny.png
similarity index 100%
rename from src/afd/sprites/front/0440--000--Happiny.png
rename to src/afd/sprites/front/0440-000-Happiny.png
diff --git a/src/afd/sprites/front/0441--000--Chatot.png b/src/afd/sprites/front/0441-000-Chatot.png
similarity index 100%
rename from src/afd/sprites/front/0441--000--Chatot.png
rename to src/afd/sprites/front/0441-000-Chatot.png
diff --git a/src/afd/sprites/front/0442--000--Spiritomb.png b/src/afd/sprites/front/0442-000-Spiritomb.png
similarity index 100%
rename from src/afd/sprites/front/0442--000--Spiritomb.png
rename to src/afd/sprites/front/0442-000-Spiritomb.png
diff --git a/src/afd/sprites/front/0443--000--Gible.png b/src/afd/sprites/front/0443-000-Gible.png
similarity index 100%
rename from src/afd/sprites/front/0443--000--Gible.png
rename to src/afd/sprites/front/0443-000-Gible.png
diff --git a/src/afd/sprites/front/0444--000--Gabite.png b/src/afd/sprites/front/0444-000-Gabite.png
similarity index 100%
rename from src/afd/sprites/front/0444--000--Gabite.png
rename to src/afd/sprites/front/0444-000-Gabite.png
diff --git a/src/afd/sprites/front/0445--000--Garchomp.png b/src/afd/sprites/front/0445-000-Garchomp.png
similarity index 100%
rename from src/afd/sprites/front/0445--000--Garchomp.png
rename to src/afd/sprites/front/0445-000-Garchomp.png
diff --git a/src/afd/sprites/front/0445--420--Garchomp--Mega.png b/src/afd/sprites/front/0445-420-Garchomp-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0445--420--Garchomp--Mega.png
rename to src/afd/sprites/front/0445-420-Garchomp-Mega.png
diff --git a/src/afd/sprites/front/0446--000--Munchlax.png b/src/afd/sprites/front/0446-000-Munchlax.png
similarity index 100%
rename from src/afd/sprites/front/0446--000--Munchlax.png
rename to src/afd/sprites/front/0446-000-Munchlax.png
diff --git a/src/afd/sprites/front/0447--000--Riolu.png b/src/afd/sprites/front/0447-000-Riolu.png
similarity index 100%
rename from src/afd/sprites/front/0447--000--Riolu.png
rename to src/afd/sprites/front/0447-000-Riolu.png
diff --git a/src/afd/sprites/front/0448--000--Lucario.png b/src/afd/sprites/front/0448-000-Lucario.png
similarity index 100%
rename from src/afd/sprites/front/0448--000--Lucario.png
rename to src/afd/sprites/front/0448-000-Lucario.png
diff --git a/src/afd/sprites/front/0448--420--Lucario--Mega.png b/src/afd/sprites/front/0448-420-Lucario-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0448--420--Lucario--Mega.png
rename to src/afd/sprites/front/0448-420-Lucario-Mega.png
diff --git a/src/afd/sprites/front/0449--000--Hippopotas.png b/src/afd/sprites/front/0449-000-Hippopotas.png
similarity index 100%
rename from src/afd/sprites/front/0449--000--Hippopotas.png
rename to src/afd/sprites/front/0449-000-Hippopotas.png
diff --git a/src/afd/sprites/front/0450--000--Hippowdon.png b/src/afd/sprites/front/0450-000-Hippowdon.png
similarity index 100%
rename from src/afd/sprites/front/0450--000--Hippowdon.png
rename to src/afd/sprites/front/0450-000-Hippowdon.png
diff --git a/src/afd/sprites/front/0451--000--Skorupi.png b/src/afd/sprites/front/0451-000-Skorupi.png
similarity index 100%
rename from src/afd/sprites/front/0451--000--Skorupi.png
rename to src/afd/sprites/front/0451-000-Skorupi.png
diff --git a/src/afd/sprites/front/0452--000--Drapion.png b/src/afd/sprites/front/0452-000-Drapion.png
similarity index 100%
rename from src/afd/sprites/front/0452--000--Drapion.png
rename to src/afd/sprites/front/0452-000-Drapion.png
diff --git a/src/afd/sprites/front/0453--000--Croagunk.png b/src/afd/sprites/front/0453-000-Croagunk.png
similarity index 100%
rename from src/afd/sprites/front/0453--000--Croagunk.png
rename to src/afd/sprites/front/0453-000-Croagunk.png
diff --git a/src/afd/sprites/front/0454--000--Toxicroak.png b/src/afd/sprites/front/0454-000-Toxicroak.png
similarity index 100%
rename from src/afd/sprites/front/0454--000--Toxicroak.png
rename to src/afd/sprites/front/0454-000-Toxicroak.png
diff --git a/src/afd/sprites/front/0455--000--Carnivine.png b/src/afd/sprites/front/0455-000-Carnivine.png
similarity index 100%
rename from src/afd/sprites/front/0455--000--Carnivine.png
rename to src/afd/sprites/front/0455-000-Carnivine.png
diff --git a/src/afd/sprites/front/0456--000--Finneon.png b/src/afd/sprites/front/0456-000-Finneon.png
similarity index 100%
rename from src/afd/sprites/front/0456--000--Finneon.png
rename to src/afd/sprites/front/0456-000-Finneon.png
diff --git a/src/afd/sprites/front/0457--000--Lumineon.png b/src/afd/sprites/front/0457-000-Lumineon.png
similarity index 100%
rename from src/afd/sprites/front/0457--000--Lumineon.png
rename to src/afd/sprites/front/0457-000-Lumineon.png
diff --git a/src/afd/sprites/front/0458--000--Mantyke.png b/src/afd/sprites/front/0458-000-Mantyke.png
similarity index 100%
rename from src/afd/sprites/front/0458--000--Mantyke.png
rename to src/afd/sprites/front/0458-000-Mantyke.png
diff --git a/src/afd/sprites/front/0459--000--Snover.png b/src/afd/sprites/front/0459-000-Snover.png
similarity index 100%
rename from src/afd/sprites/front/0459--000--Snover.png
rename to src/afd/sprites/front/0459-000-Snover.png
diff --git a/src/afd/sprites/front/0460--000--Abomasnow.png b/src/afd/sprites/front/0460-000-Abomasnow.png
similarity index 100%
rename from src/afd/sprites/front/0460--000--Abomasnow.png
rename to src/afd/sprites/front/0460-000-Abomasnow.png
diff --git a/src/afd/sprites/front/0460--420--Abomasnow--Mega.png b/src/afd/sprites/front/0460-420-Abomasnow-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0460--420--Abomasnow--Mega.png
rename to src/afd/sprites/front/0460-420-Abomasnow-Mega.png
diff --git a/src/afd/sprites/front/0461--000--Weavile.png b/src/afd/sprites/front/0461-000-Weavile.png
similarity index 100%
rename from src/afd/sprites/front/0461--000--Weavile.png
rename to src/afd/sprites/front/0461-000-Weavile.png
diff --git a/src/afd/sprites/front/0462--000--Magnezone.png b/src/afd/sprites/front/0462-000-Magnezone.png
similarity index 100%
rename from src/afd/sprites/front/0462--000--Magnezone.png
rename to src/afd/sprites/front/0462-000-Magnezone.png
diff --git a/src/afd/sprites/front/0463--000--Lickilicky.png b/src/afd/sprites/front/0463-000-Lickilicky.png
similarity index 100%
rename from src/afd/sprites/front/0463--000--Lickilicky.png
rename to src/afd/sprites/front/0463-000-Lickilicky.png
diff --git a/src/afd/sprites/front/0464--000--Rhyperior.png b/src/afd/sprites/front/0464-000-Rhyperior.png
similarity index 100%
rename from src/afd/sprites/front/0464--000--Rhyperior.png
rename to src/afd/sprites/front/0464-000-Rhyperior.png
diff --git a/src/afd/sprites/front/0465--000--Tangrowth.png b/src/afd/sprites/front/0465-000-Tangrowth.png
similarity index 100%
rename from src/afd/sprites/front/0465--000--Tangrowth.png
rename to src/afd/sprites/front/0465-000-Tangrowth.png
diff --git a/src/afd/sprites/front/0466--000--Electivire.png b/src/afd/sprites/front/0466-000-Electivire.png
similarity index 100%
rename from src/afd/sprites/front/0466--000--Electivire.png
rename to src/afd/sprites/front/0466-000-Electivire.png
diff --git a/src/afd/sprites/front/0467--000--Magmortar.png b/src/afd/sprites/front/0467-000-Magmortar.png
similarity index 100%
rename from src/afd/sprites/front/0467--000--Magmortar.png
rename to src/afd/sprites/front/0467-000-Magmortar.png
diff --git a/src/afd/sprites/front/0468--000--Togekiss.png b/src/afd/sprites/front/0468-000-Togekiss.png
similarity index 100%
rename from src/afd/sprites/front/0468--000--Togekiss.png
rename to src/afd/sprites/front/0468-000-Togekiss.png
diff --git a/src/afd/sprites/front/0469--000--Yanmega.png b/src/afd/sprites/front/0469-000-Yanmega.png
similarity index 100%
rename from src/afd/sprites/front/0469--000--Yanmega.png
rename to src/afd/sprites/front/0469-000-Yanmega.png
diff --git a/src/afd/sprites/front/0470--000--Leafeon.png b/src/afd/sprites/front/0470-000-Leafeon.png
similarity index 100%
rename from src/afd/sprites/front/0470--000--Leafeon.png
rename to src/afd/sprites/front/0470-000-Leafeon.png
diff --git a/src/afd/sprites/front/0471--000--Glaceon.png b/src/afd/sprites/front/0471-000-Glaceon.png
similarity index 100%
rename from src/afd/sprites/front/0471--000--Glaceon.png
rename to src/afd/sprites/front/0471-000-Glaceon.png
diff --git a/src/afd/sprites/front/0472--000--Gliscor.png b/src/afd/sprites/front/0472-000-Gliscor.png
similarity index 100%
rename from src/afd/sprites/front/0472--000--Gliscor.png
rename to src/afd/sprites/front/0472-000-Gliscor.png
diff --git a/src/afd/sprites/front/0473--000--Mamoswine.png b/src/afd/sprites/front/0473-000-Mamoswine.png
similarity index 100%
rename from src/afd/sprites/front/0473--000--Mamoswine.png
rename to src/afd/sprites/front/0473-000-Mamoswine.png
diff --git a/src/afd/sprites/front/0474--000--Porygon-Z.png b/src/afd/sprites/front/0474-000-Porygon~Z.png
similarity index 100%
rename from src/afd/sprites/front/0474--000--Porygon-Z.png
rename to src/afd/sprites/front/0474-000-Porygon~Z.png
diff --git a/src/afd/sprites/front/0475--000--Gallade.png b/src/afd/sprites/front/0475-000-Gallade.png
similarity index 100%
rename from src/afd/sprites/front/0475--000--Gallade.png
rename to src/afd/sprites/front/0475-000-Gallade.png
diff --git a/src/afd/sprites/front/0475--420--Gallade--Mega.png b/src/afd/sprites/front/0475-420-Gallade-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0475--420--Gallade--Mega.png
rename to src/afd/sprites/front/0475-420-Gallade-Mega.png
diff --git a/src/afd/sprites/front/0476--000--Probopass.png b/src/afd/sprites/front/0476-000-Probopass.png
similarity index 100%
rename from src/afd/sprites/front/0476--000--Probopass.png
rename to src/afd/sprites/front/0476-000-Probopass.png
diff --git a/src/afd/sprites/front/0477--000--Dusknoir.png b/src/afd/sprites/front/0477-000-Dusknoir.png
similarity index 100%
rename from src/afd/sprites/front/0477--000--Dusknoir.png
rename to src/afd/sprites/front/0477-000-Dusknoir.png
diff --git a/src/afd/sprites/front/0478--000--Froslass.png b/src/afd/sprites/front/0478-000-Froslass.png
similarity index 100%
rename from src/afd/sprites/front/0478--000--Froslass.png
rename to src/afd/sprites/front/0478-000-Froslass.png
diff --git a/src/afd/sprites/front/0479--000--Rotom.png b/src/afd/sprites/front/0479-000-Rotom.png
similarity index 100%
rename from src/afd/sprites/front/0479--000--Rotom.png
rename to src/afd/sprites/front/0479-000-Rotom.png
diff --git a/src/afd/sprites/front/0479--420--Rotom--Fan.png b/src/afd/sprites/front/0479-420-Rotom-Fan.png
similarity index 100%
rename from src/afd/sprites/front/0479--420--Rotom--Fan.png
rename to src/afd/sprites/front/0479-420-Rotom-Fan.png
diff --git a/src/afd/sprites/front/0479--420--Rotom--Frost.png b/src/afd/sprites/front/0479-420-Rotom-Frost.png
similarity index 100%
rename from src/afd/sprites/front/0479--420--Rotom--Frost.png
rename to src/afd/sprites/front/0479-420-Rotom-Frost.png
diff --git a/src/afd/sprites/front/0479--420--Rotom--Heat.png b/src/afd/sprites/front/0479-420-Rotom-Heat.png
similarity index 100%
rename from src/afd/sprites/front/0479--420--Rotom--Heat.png
rename to src/afd/sprites/front/0479-420-Rotom-Heat.png
diff --git a/src/afd/sprites/front/0479--420--Rotom--Mow.png b/src/afd/sprites/front/0479-420-Rotom-Mow.png
similarity index 100%
rename from src/afd/sprites/front/0479--420--Rotom--Mow.png
rename to src/afd/sprites/front/0479-420-Rotom-Mow.png
diff --git a/src/afd/sprites/front/0479--420--Rotom--Wash.png b/src/afd/sprites/front/0479-420-Rotom-Wash.png
similarity index 100%
rename from src/afd/sprites/front/0479--420--Rotom--Wash.png
rename to src/afd/sprites/front/0479-420-Rotom-Wash.png
diff --git a/src/afd/sprites/front/0480--000--Uxie.png b/src/afd/sprites/front/0480-000-Uxie.png
similarity index 100%
rename from src/afd/sprites/front/0480--000--Uxie.png
rename to src/afd/sprites/front/0480-000-Uxie.png
diff --git a/src/afd/sprites/front/0481--000--Mesprit.png b/src/afd/sprites/front/0481-000-Mesprit.png
similarity index 100%
rename from src/afd/sprites/front/0481--000--Mesprit.png
rename to src/afd/sprites/front/0481-000-Mesprit.png
diff --git a/src/afd/sprites/front/0482--000--Azelf.png b/src/afd/sprites/front/0482-000-Azelf.png
similarity index 100%
rename from src/afd/sprites/front/0482--000--Azelf.png
rename to src/afd/sprites/front/0482-000-Azelf.png
diff --git a/src/afd/sprites/front/0483--000--Dialga.png b/src/afd/sprites/front/0483-000-Dialga.png
similarity index 100%
rename from src/afd/sprites/front/0483--000--Dialga.png
rename to src/afd/sprites/front/0483-000-Dialga.png
diff --git a/src/afd/sprites/front/0484--000--Palkia.png b/src/afd/sprites/front/0484-000-Palkia.png
similarity index 100%
rename from src/afd/sprites/front/0484--000--Palkia.png
rename to src/afd/sprites/front/0484-000-Palkia.png
diff --git a/src/afd/sprites/front/0485--000--Heatran.png b/src/afd/sprites/front/0485-000-Heatran.png
similarity index 100%
rename from src/afd/sprites/front/0485--000--Heatran.png
rename to src/afd/sprites/front/0485-000-Heatran.png
diff --git a/src/afd/sprites/front/0486--000--Regigigas.png b/src/afd/sprites/front/0486-000-Regigigas.png
similarity index 100%
rename from src/afd/sprites/front/0486--000--Regigigas.png
rename to src/afd/sprites/front/0486-000-Regigigas.png
diff --git a/src/afd/sprites/front/0487--000--Giratina.png b/src/afd/sprites/front/0487-000-Giratina.png
similarity index 100%
rename from src/afd/sprites/front/0487--000--Giratina.png
rename to src/afd/sprites/front/0487-000-Giratina.png
diff --git a/src/afd/sprites/front/0487--420--Giratina--Origin.png b/src/afd/sprites/front/0487-420-Giratina-Origin.png
similarity index 100%
rename from src/afd/sprites/front/0487--420--Giratina--Origin.png
rename to src/afd/sprites/front/0487-420-Giratina-Origin.png
diff --git a/src/afd/sprites/front/0488--000--Cresselia.png b/src/afd/sprites/front/0488-000-Cresselia.png
similarity index 100%
rename from src/afd/sprites/front/0488--000--Cresselia.png
rename to src/afd/sprites/front/0488-000-Cresselia.png
diff --git a/src/afd/sprites/front/0489--000--Phione.png b/src/afd/sprites/front/0489-000-Phione.png
similarity index 100%
rename from src/afd/sprites/front/0489--000--Phione.png
rename to src/afd/sprites/front/0489-000-Phione.png
diff --git a/src/afd/sprites/front/0490--000--Manaphy.png b/src/afd/sprites/front/0490-000-Manaphy.png
similarity index 100%
rename from src/afd/sprites/front/0490--000--Manaphy.png
rename to src/afd/sprites/front/0490-000-Manaphy.png
diff --git a/src/afd/sprites/front/0491--000--Darkrai.png b/src/afd/sprites/front/0491-000-Darkrai.png
similarity index 100%
rename from src/afd/sprites/front/0491--000--Darkrai.png
rename to src/afd/sprites/front/0491-000-Darkrai.png
diff --git a/src/afd/sprites/front/0492--000--Shaymin.png b/src/afd/sprites/front/0492-000-Shaymin.png
similarity index 100%
rename from src/afd/sprites/front/0492--000--Shaymin.png
rename to src/afd/sprites/front/0492-000-Shaymin.png
diff --git a/src/afd/sprites/front/0492--420--Shaymin--Sky.png b/src/afd/sprites/front/0492-420-Shaymin-Sky.png
similarity index 100%
rename from src/afd/sprites/front/0492--420--Shaymin--Sky.png
rename to src/afd/sprites/front/0492-420-Shaymin-Sky.png
diff --git a/src/afd/sprites/front/0493--000--Arceus.png b/src/afd/sprites/front/0493-000-Arceus.png
similarity index 100%
rename from src/afd/sprites/front/0493--000--Arceus.png
rename to src/afd/sprites/front/0493-000-Arceus.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Bug.png b/src/afd/sprites/front/0493-420-Arceus-Bug.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Bug.png
rename to src/afd/sprites/front/0493-420-Arceus-Bug.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Dark.png b/src/afd/sprites/front/0493-420-Arceus-Dark.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Dark.png
rename to src/afd/sprites/front/0493-420-Arceus-Dark.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Dragon.png b/src/afd/sprites/front/0493-420-Arceus-Dragon.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Dragon.png
rename to src/afd/sprites/front/0493-420-Arceus-Dragon.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Electric.png b/src/afd/sprites/front/0493-420-Arceus-Electric.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Electric.png
rename to src/afd/sprites/front/0493-420-Arceus-Electric.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Fairy.png b/src/afd/sprites/front/0493-420-Arceus-Fairy.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Fairy.png
rename to src/afd/sprites/front/0493-420-Arceus-Fairy.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Fighting.png b/src/afd/sprites/front/0493-420-Arceus-Fighting.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Fighting.png
rename to src/afd/sprites/front/0493-420-Arceus-Fighting.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Fire.png b/src/afd/sprites/front/0493-420-Arceus-Fire.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Fire.png
rename to src/afd/sprites/front/0493-420-Arceus-Fire.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Flying.png b/src/afd/sprites/front/0493-420-Arceus-Flying.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Flying.png
rename to src/afd/sprites/front/0493-420-Arceus-Flying.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Ghost.png b/src/afd/sprites/front/0493-420-Arceus-Ghost.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Ghost.png
rename to src/afd/sprites/front/0493-420-Arceus-Ghost.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Grass.png b/src/afd/sprites/front/0493-420-Arceus-Grass.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Grass.png
rename to src/afd/sprites/front/0493-420-Arceus-Grass.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Ground.png b/src/afd/sprites/front/0493-420-Arceus-Ground.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Ground.png
rename to src/afd/sprites/front/0493-420-Arceus-Ground.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Ice.png b/src/afd/sprites/front/0493-420-Arceus-Ice.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Ice.png
rename to src/afd/sprites/front/0493-420-Arceus-Ice.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Poison.png b/src/afd/sprites/front/0493-420-Arceus-Poison.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Poison.png
rename to src/afd/sprites/front/0493-420-Arceus-Poison.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Psychic.png b/src/afd/sprites/front/0493-420-Arceus-Psychic.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Psychic.png
rename to src/afd/sprites/front/0493-420-Arceus-Psychic.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Rock.png b/src/afd/sprites/front/0493-420-Arceus-Rock.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Rock.png
rename to src/afd/sprites/front/0493-420-Arceus-Rock.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Steel.png b/src/afd/sprites/front/0493-420-Arceus-Steel.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Steel.png
rename to src/afd/sprites/front/0493-420-Arceus-Steel.png
diff --git a/src/afd/sprites/front/0493--420--Arceus--Water.png b/src/afd/sprites/front/0493-420-Arceus-Water.png
similarity index 100%
rename from src/afd/sprites/front/0493--420--Arceus--Water.png
rename to src/afd/sprites/front/0493-420-Arceus-Water.png
diff --git a/src/afd/sprites/front/0494--000--Victini.png b/src/afd/sprites/front/0494-000-Victini.png
similarity index 100%
rename from src/afd/sprites/front/0494--000--Victini.png
rename to src/afd/sprites/front/0494-000-Victini.png
diff --git a/src/afd/sprites/front/0495--000--Snivy.png b/src/afd/sprites/front/0495-000-Snivy.png
similarity index 100%
rename from src/afd/sprites/front/0495--000--Snivy.png
rename to src/afd/sprites/front/0495-000-Snivy.png
diff --git a/src/afd/sprites/front/0496--000--Servine.png b/src/afd/sprites/front/0496-000-Servine.png
similarity index 100%
rename from src/afd/sprites/front/0496--000--Servine.png
rename to src/afd/sprites/front/0496-000-Servine.png
diff --git a/src/afd/sprites/front/0497--000--Serperior.png b/src/afd/sprites/front/0497-000-Serperior.png
similarity index 100%
rename from src/afd/sprites/front/0497--000--Serperior.png
rename to src/afd/sprites/front/0497-000-Serperior.png
diff --git a/src/afd/sprites/front/0498--000--Tepig.png b/src/afd/sprites/front/0498-000-Tepig.png
similarity index 100%
rename from src/afd/sprites/front/0498--000--Tepig.png
rename to src/afd/sprites/front/0498-000-Tepig.png
diff --git a/src/afd/sprites/front/0499--000--Pignite.png b/src/afd/sprites/front/0499-000-Pignite.png
similarity index 100%
rename from src/afd/sprites/front/0499--000--Pignite.png
rename to src/afd/sprites/front/0499-000-Pignite.png
diff --git a/src/afd/sprites/front/0500--000--Emboar.png b/src/afd/sprites/front/0500-000-Emboar.png
similarity index 100%
rename from src/afd/sprites/front/0500--000--Emboar.png
rename to src/afd/sprites/front/0500-000-Emboar.png
diff --git a/src/afd/sprites/front/0501--000--Oshawott.png b/src/afd/sprites/front/0501-000-Oshawott.png
similarity index 100%
rename from src/afd/sprites/front/0501--000--Oshawott.png
rename to src/afd/sprites/front/0501-000-Oshawott.png
diff --git a/src/afd/sprites/front/0502--000--Dewott.png b/src/afd/sprites/front/0502-000-Dewott.png
similarity index 100%
rename from src/afd/sprites/front/0502--000--Dewott.png
rename to src/afd/sprites/front/0502-000-Dewott.png
diff --git a/src/afd/sprites/front/0503--000--Samurott.png b/src/afd/sprites/front/0503-000-Samurott.png
similarity index 100%
rename from src/afd/sprites/front/0503--000--Samurott.png
rename to src/afd/sprites/front/0503-000-Samurott.png
diff --git a/src/afd/sprites/front/0504--000--Patrat.png b/src/afd/sprites/front/0504-000-Patrat.png
similarity index 100%
rename from src/afd/sprites/front/0504--000--Patrat.png
rename to src/afd/sprites/front/0504-000-Patrat.png
diff --git a/src/afd/sprites/front/0505--000--Watchog.png b/src/afd/sprites/front/0505-000-Watchog.png
similarity index 100%
rename from src/afd/sprites/front/0505--000--Watchog.png
rename to src/afd/sprites/front/0505-000-Watchog.png
diff --git a/src/afd/sprites/front/0506--000--Lillipup.png b/src/afd/sprites/front/0506-000-Lillipup.png
similarity index 100%
rename from src/afd/sprites/front/0506--000--Lillipup.png
rename to src/afd/sprites/front/0506-000-Lillipup.png
diff --git a/src/afd/sprites/front/0507--000--Herdier.png b/src/afd/sprites/front/0507-000-Herdier.png
similarity index 100%
rename from src/afd/sprites/front/0507--000--Herdier.png
rename to src/afd/sprites/front/0507-000-Herdier.png
diff --git a/src/afd/sprites/front/0508--000--Stoutland.png b/src/afd/sprites/front/0508-000-Stoutland.png
similarity index 100%
rename from src/afd/sprites/front/0508--000--Stoutland.png
rename to src/afd/sprites/front/0508-000-Stoutland.png
diff --git a/src/afd/sprites/front/0509--000--Purrloin.png b/src/afd/sprites/front/0509-000-Purrloin.png
similarity index 100%
rename from src/afd/sprites/front/0509--000--Purrloin.png
rename to src/afd/sprites/front/0509-000-Purrloin.png
diff --git a/src/afd/sprites/front/0510--000--Liepard.png b/src/afd/sprites/front/0510-000-Liepard.png
similarity index 100%
rename from src/afd/sprites/front/0510--000--Liepard.png
rename to src/afd/sprites/front/0510-000-Liepard.png
diff --git a/src/afd/sprites/front/0511--000--Pansage.png b/src/afd/sprites/front/0511-000-Pansage.png
similarity index 100%
rename from src/afd/sprites/front/0511--000--Pansage.png
rename to src/afd/sprites/front/0511-000-Pansage.png
diff --git a/src/afd/sprites/front/0512--000--Simisage.png b/src/afd/sprites/front/0512-000-Simisage.png
similarity index 100%
rename from src/afd/sprites/front/0512--000--Simisage.png
rename to src/afd/sprites/front/0512-000-Simisage.png
diff --git a/src/afd/sprites/front/0513--000--Pansear.png b/src/afd/sprites/front/0513-000-Pansear.png
similarity index 100%
rename from src/afd/sprites/front/0513--000--Pansear.png
rename to src/afd/sprites/front/0513-000-Pansear.png
diff --git a/src/afd/sprites/front/0514--000--Simisear.png b/src/afd/sprites/front/0514-000-Simisear.png
similarity index 100%
rename from src/afd/sprites/front/0514--000--Simisear.png
rename to src/afd/sprites/front/0514-000-Simisear.png
diff --git a/src/afd/sprites/front/0515--000--Panpour.png b/src/afd/sprites/front/0515-000-Panpour.png
similarity index 100%
rename from src/afd/sprites/front/0515--000--Panpour.png
rename to src/afd/sprites/front/0515-000-Panpour.png
diff --git a/src/afd/sprites/front/0516--000--Simipour.png b/src/afd/sprites/front/0516-000-Simipour.png
similarity index 100%
rename from src/afd/sprites/front/0516--000--Simipour.png
rename to src/afd/sprites/front/0516-000-Simipour.png
diff --git a/src/afd/sprites/front/0517--000--Munna.png b/src/afd/sprites/front/0517-000-Munna.png
similarity index 100%
rename from src/afd/sprites/front/0517--000--Munna.png
rename to src/afd/sprites/front/0517-000-Munna.png
diff --git a/src/afd/sprites/front/0518--000--Musharna.png b/src/afd/sprites/front/0518-000-Musharna.png
similarity index 100%
rename from src/afd/sprites/front/0518--000--Musharna.png
rename to src/afd/sprites/front/0518-000-Musharna.png
diff --git a/src/afd/sprites/front/0519--000--Pidove.png b/src/afd/sprites/front/0519-000-Pidove.png
similarity index 100%
rename from src/afd/sprites/front/0519--000--Pidove.png
rename to src/afd/sprites/front/0519-000-Pidove.png
diff --git a/src/afd/sprites/front/0520--000--Tranquill.png b/src/afd/sprites/front/0520-000-Tranquill.png
similarity index 100%
rename from src/afd/sprites/front/0520--000--Tranquill.png
rename to src/afd/sprites/front/0520-000-Tranquill.png
diff --git a/src/afd/sprites/front/0521--000--Unfezant.png b/src/afd/sprites/front/0521-000-Unfezant.png
similarity index 100%
rename from src/afd/sprites/front/0521--000--Unfezant.png
rename to src/afd/sprites/front/0521-000-Unfezant.png
diff --git a/src/afd/sprites/front/0522--000--Blitzle.png b/src/afd/sprites/front/0522-000-Blitzle.png
similarity index 100%
rename from src/afd/sprites/front/0522--000--Blitzle.png
rename to src/afd/sprites/front/0522-000-Blitzle.png
diff --git a/src/afd/sprites/front/0523--000--Zebstrika.png b/src/afd/sprites/front/0523-000-Zebstrika.png
similarity index 100%
rename from src/afd/sprites/front/0523--000--Zebstrika.png
rename to src/afd/sprites/front/0523-000-Zebstrika.png
diff --git a/src/afd/sprites/front/0524--000--Roggenrola.png b/src/afd/sprites/front/0524-000-Roggenrola.png
similarity index 100%
rename from src/afd/sprites/front/0524--000--Roggenrola.png
rename to src/afd/sprites/front/0524-000-Roggenrola.png
diff --git a/src/afd/sprites/front/0525--000--Boldore.png b/src/afd/sprites/front/0525-000-Boldore.png
similarity index 100%
rename from src/afd/sprites/front/0525--000--Boldore.png
rename to src/afd/sprites/front/0525-000-Boldore.png
diff --git a/src/afd/sprites/front/0526--000--Gigalith.png b/src/afd/sprites/front/0526-000-Gigalith.png
similarity index 100%
rename from src/afd/sprites/front/0526--000--Gigalith.png
rename to src/afd/sprites/front/0526-000-Gigalith.png
diff --git a/src/afd/sprites/front/0527--000--Woobat.png b/src/afd/sprites/front/0527-000-Woobat.png
similarity index 100%
rename from src/afd/sprites/front/0527--000--Woobat.png
rename to src/afd/sprites/front/0527-000-Woobat.png
diff --git a/src/afd/sprites/front/0528--000--Swoobat.png b/src/afd/sprites/front/0528-000-Swoobat.png
similarity index 100%
rename from src/afd/sprites/front/0528--000--Swoobat.png
rename to src/afd/sprites/front/0528-000-Swoobat.png
diff --git a/src/afd/sprites/front/0529--000--Drilbur.png b/src/afd/sprites/front/0529-000-Drilbur.png
similarity index 100%
rename from src/afd/sprites/front/0529--000--Drilbur.png
rename to src/afd/sprites/front/0529-000-Drilbur.png
diff --git a/src/afd/sprites/front/0530--000--Excadrill.png b/src/afd/sprites/front/0530-000-Excadrill.png
similarity index 100%
rename from src/afd/sprites/front/0530--000--Excadrill.png
rename to src/afd/sprites/front/0530-000-Excadrill.png
diff --git a/src/afd/sprites/front/0531--000--Audino.png b/src/afd/sprites/front/0531-000-Audino.png
similarity index 100%
rename from src/afd/sprites/front/0531--000--Audino.png
rename to src/afd/sprites/front/0531-000-Audino.png
diff --git a/src/afd/sprites/front/0531--420--Audino--Mega.png b/src/afd/sprites/front/0531-420-Audino-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0531--420--Audino--Mega.png
rename to src/afd/sprites/front/0531-420-Audino-Mega.png
diff --git a/src/afd/sprites/front/0532--000--Timburr.png b/src/afd/sprites/front/0532-000-Timburr.png
similarity index 100%
rename from src/afd/sprites/front/0532--000--Timburr.png
rename to src/afd/sprites/front/0532-000-Timburr.png
diff --git a/src/afd/sprites/front/0533--000--Gurdurr.png b/src/afd/sprites/front/0533-000-Gurdurr.png
similarity index 100%
rename from src/afd/sprites/front/0533--000--Gurdurr.png
rename to src/afd/sprites/front/0533-000-Gurdurr.png
diff --git a/src/afd/sprites/front/0534--000--Conkeldurr.png b/src/afd/sprites/front/0534-000-Conkeldurr.png
similarity index 100%
rename from src/afd/sprites/front/0534--000--Conkeldurr.png
rename to src/afd/sprites/front/0534-000-Conkeldurr.png
diff --git a/src/afd/sprites/front/0535--000--Tympole.png b/src/afd/sprites/front/0535-000-Tympole.png
similarity index 100%
rename from src/afd/sprites/front/0535--000--Tympole.png
rename to src/afd/sprites/front/0535-000-Tympole.png
diff --git a/src/afd/sprites/front/0536--000--Palpitoad.png b/src/afd/sprites/front/0536-000-Palpitoad.png
similarity index 100%
rename from src/afd/sprites/front/0536--000--Palpitoad.png
rename to src/afd/sprites/front/0536-000-Palpitoad.png
diff --git a/src/afd/sprites/front/0537--000--Seismitoad.png b/src/afd/sprites/front/0537-000-Seismitoad.png
similarity index 100%
rename from src/afd/sprites/front/0537--000--Seismitoad.png
rename to src/afd/sprites/front/0537-000-Seismitoad.png
diff --git a/src/afd/sprites/front/0538--000--Throh.png b/src/afd/sprites/front/0538-000-Throh.png
similarity index 100%
rename from src/afd/sprites/front/0538--000--Throh.png
rename to src/afd/sprites/front/0538-000-Throh.png
diff --git a/src/afd/sprites/front/0539--000--Sawk.png b/src/afd/sprites/front/0539-000-Sawk.png
similarity index 100%
rename from src/afd/sprites/front/0539--000--Sawk.png
rename to src/afd/sprites/front/0539-000-Sawk.png
diff --git a/src/afd/sprites/front/0540--000--Sewaddle.png b/src/afd/sprites/front/0540-000-Sewaddle.png
similarity index 100%
rename from src/afd/sprites/front/0540--000--Sewaddle.png
rename to src/afd/sprites/front/0540-000-Sewaddle.png
diff --git a/src/afd/sprites/front/0541--000--Swadloon.png b/src/afd/sprites/front/0541-000-Swadloon.png
similarity index 100%
rename from src/afd/sprites/front/0541--000--Swadloon.png
rename to src/afd/sprites/front/0541-000-Swadloon.png
diff --git a/src/afd/sprites/front/0542--000--Leavanny.png b/src/afd/sprites/front/0542-000-Leavanny.png
similarity index 100%
rename from src/afd/sprites/front/0542--000--Leavanny.png
rename to src/afd/sprites/front/0542-000-Leavanny.png
diff --git a/src/afd/sprites/front/0543--000--Venipede.png b/src/afd/sprites/front/0543-000-Venipede.png
similarity index 100%
rename from src/afd/sprites/front/0543--000--Venipede.png
rename to src/afd/sprites/front/0543-000-Venipede.png
diff --git a/src/afd/sprites/front/0544--000--Whirlipede.png b/src/afd/sprites/front/0544-000-Whirlipede.png
similarity index 100%
rename from src/afd/sprites/front/0544--000--Whirlipede.png
rename to src/afd/sprites/front/0544-000-Whirlipede.png
diff --git a/src/afd/sprites/front/0545--000--Scolipede.png b/src/afd/sprites/front/0545-000-Scolipede.png
similarity index 100%
rename from src/afd/sprites/front/0545--000--Scolipede.png
rename to src/afd/sprites/front/0545-000-Scolipede.png
diff --git a/src/afd/sprites/front/0546--000--Cottonee.png b/src/afd/sprites/front/0546-000-Cottonee.png
similarity index 100%
rename from src/afd/sprites/front/0546--000--Cottonee.png
rename to src/afd/sprites/front/0546-000-Cottonee.png
diff --git a/src/afd/sprites/front/0547--000--Whimsicott.png b/src/afd/sprites/front/0547-000-Whimsicott.png
similarity index 100%
rename from src/afd/sprites/front/0547--000--Whimsicott.png
rename to src/afd/sprites/front/0547-000-Whimsicott.png
diff --git a/src/afd/sprites/front/0548--000--Petilil.png b/src/afd/sprites/front/0548-000-Petilil.png
similarity index 100%
rename from src/afd/sprites/front/0548--000--Petilil.png
rename to src/afd/sprites/front/0548-000-Petilil.png
diff --git a/src/afd/sprites/front/0549--000--Lilligant.png b/src/afd/sprites/front/0549-000-Lilligant.png
similarity index 100%
rename from src/afd/sprites/front/0549--000--Lilligant.png
rename to src/afd/sprites/front/0549-000-Lilligant.png
diff --git a/src/afd/sprites/front/0550--000--Basculin.png b/src/afd/sprites/front/0550-000-Basculin.png
similarity index 100%
rename from src/afd/sprites/front/0550--000--Basculin.png
rename to src/afd/sprites/front/0550-000-Basculin.png
diff --git a/src/afd/sprites/front/0550--420--Basculin--Blue-Striped.png b/src/afd/sprites/front/0550-420-Basculin-Blue~Striped.png
similarity index 100%
rename from src/afd/sprites/front/0550--420--Basculin--Blue-Striped.png
rename to src/afd/sprites/front/0550-420-Basculin-Blue~Striped.png
diff --git a/src/afd/sprites/front/0551--000--Sandile.png b/src/afd/sprites/front/0551-000-Sandile.png
similarity index 100%
rename from src/afd/sprites/front/0551--000--Sandile.png
rename to src/afd/sprites/front/0551-000-Sandile.png
diff --git a/src/afd/sprites/front/0552--000--Krokorok.png b/src/afd/sprites/front/0552-000-Krokorok.png
similarity index 100%
rename from src/afd/sprites/front/0552--000--Krokorok.png
rename to src/afd/sprites/front/0552-000-Krokorok.png
diff --git a/src/afd/sprites/front/0553--000--Krookodile.png b/src/afd/sprites/front/0553-000-Krookodile.png
similarity index 100%
rename from src/afd/sprites/front/0553--000--Krookodile.png
rename to src/afd/sprites/front/0553-000-Krookodile.png
diff --git a/src/afd/sprites/front/0554--000--Darumaka.png b/src/afd/sprites/front/0554-000-Darumaka.png
similarity index 100%
rename from src/afd/sprites/front/0554--000--Darumaka.png
rename to src/afd/sprites/front/0554-000-Darumaka.png
diff --git a/src/afd/sprites/front/0554--420--Darumaka--Galar.png b/src/afd/sprites/front/0554-420-Darumaka-Galar.png
similarity index 100%
rename from src/afd/sprites/front/0554--420--Darumaka--Galar.png
rename to src/afd/sprites/front/0554-420-Darumaka-Galar.png
diff --git a/src/afd/sprites/front/0555--000--Darmanitan.png b/src/afd/sprites/front/0555-000-Darmanitan.png
similarity index 100%
rename from src/afd/sprites/front/0555--000--Darmanitan.png
rename to src/afd/sprites/front/0555-000-Darmanitan.png
diff --git a/src/afd/sprites/front/0555--420--Darmanitan--Galar.png b/src/afd/sprites/front/0555-420-Darmanitan-Galar.png
similarity index 100%
rename from src/afd/sprites/front/0555--420--Darmanitan--Galar.png
rename to src/afd/sprites/front/0555-420-Darmanitan-Galar.png
diff --git a/src/afd/sprites/front/0555--420--Darmanitan--Galar-Zen.png b/src/afd/sprites/front/0555-420-Darmanitan-Galar~Zen.png
similarity index 100%
rename from src/afd/sprites/front/0555--420--Darmanitan--Galar-Zen.png
rename to src/afd/sprites/front/0555-420-Darmanitan-Galar~Zen.png
diff --git a/src/afd/sprites/front/0555--420--Darmanitan--Zen.png b/src/afd/sprites/front/0555-420-Darmanitan-Zen.png
similarity index 100%
rename from src/afd/sprites/front/0555--420--Darmanitan--Zen.png
rename to src/afd/sprites/front/0555-420-Darmanitan-Zen.png
diff --git a/src/afd/sprites/front/0556--000--Maractus.png b/src/afd/sprites/front/0556-000-Maractus.png
similarity index 100%
rename from src/afd/sprites/front/0556--000--Maractus.png
rename to src/afd/sprites/front/0556-000-Maractus.png
diff --git a/src/afd/sprites/front/0557--000--Dwebble.png b/src/afd/sprites/front/0557-000-Dwebble.png
similarity index 100%
rename from src/afd/sprites/front/0557--000--Dwebble.png
rename to src/afd/sprites/front/0557-000-Dwebble.png
diff --git a/src/afd/sprites/front/0558--000--Crustle.png b/src/afd/sprites/front/0558-000-Crustle.png
similarity index 100%
rename from src/afd/sprites/front/0558--000--Crustle.png
rename to src/afd/sprites/front/0558-000-Crustle.png
diff --git a/src/afd/sprites/front/0559--000--Scraggy.png b/src/afd/sprites/front/0559-000-Scraggy.png
similarity index 100%
rename from src/afd/sprites/front/0559--000--Scraggy.png
rename to src/afd/sprites/front/0559-000-Scraggy.png
diff --git a/src/afd/sprites/front/0560--000--Scrafty.png b/src/afd/sprites/front/0560-000-Scrafty.png
similarity index 100%
rename from src/afd/sprites/front/0560--000--Scrafty.png
rename to src/afd/sprites/front/0560-000-Scrafty.png
diff --git a/src/afd/sprites/front/0561--000--Sigilyph.png b/src/afd/sprites/front/0561-000-Sigilyph.png
similarity index 100%
rename from src/afd/sprites/front/0561--000--Sigilyph.png
rename to src/afd/sprites/front/0561-000-Sigilyph.png
diff --git a/src/afd/sprites/front/0562--000--Yamask.png b/src/afd/sprites/front/0562-000-Yamask.png
similarity index 100%
rename from src/afd/sprites/front/0562--000--Yamask.png
rename to src/afd/sprites/front/0562-000-Yamask.png
diff --git a/src/afd/sprites/front/0562--420--Yamask--Galar.png b/src/afd/sprites/front/0562-420-Yamask-Galar.png
similarity index 100%
rename from src/afd/sprites/front/0562--420--Yamask--Galar.png
rename to src/afd/sprites/front/0562-420-Yamask-Galar.png
diff --git a/src/afd/sprites/front/0563--000--Cofagrigus.png b/src/afd/sprites/front/0563-000-Cofagrigus.png
similarity index 100%
rename from src/afd/sprites/front/0563--000--Cofagrigus.png
rename to src/afd/sprites/front/0563-000-Cofagrigus.png
diff --git a/src/afd/sprites/front/0564--000--Tirtouga.png b/src/afd/sprites/front/0564-000-Tirtouga.png
similarity index 100%
rename from src/afd/sprites/front/0564--000--Tirtouga.png
rename to src/afd/sprites/front/0564-000-Tirtouga.png
diff --git a/src/afd/sprites/front/0565--000--Carracosta.png b/src/afd/sprites/front/0565-000-Carracosta.png
similarity index 100%
rename from src/afd/sprites/front/0565--000--Carracosta.png
rename to src/afd/sprites/front/0565-000-Carracosta.png
diff --git a/src/afd/sprites/front/0566--000--Archen.png b/src/afd/sprites/front/0566-000-Archen.png
similarity index 100%
rename from src/afd/sprites/front/0566--000--Archen.png
rename to src/afd/sprites/front/0566-000-Archen.png
diff --git a/src/afd/sprites/front/0567--000--Archeops.png b/src/afd/sprites/front/0567-000-Archeops.png
similarity index 100%
rename from src/afd/sprites/front/0567--000--Archeops.png
rename to src/afd/sprites/front/0567-000-Archeops.png
diff --git a/src/afd/sprites/front/0568--000--Trubbish.png b/src/afd/sprites/front/0568-000-Trubbish.png
similarity index 100%
rename from src/afd/sprites/front/0568--000--Trubbish.png
rename to src/afd/sprites/front/0568-000-Trubbish.png
diff --git a/src/afd/sprites/front/0569--000--Garbodor.png b/src/afd/sprites/front/0569-000-Garbodor.png
similarity index 100%
rename from src/afd/sprites/front/0569--000--Garbodor.png
rename to src/afd/sprites/front/0569-000-Garbodor.png
diff --git a/src/afd/sprites/front/0569--420--Garbodor--Gmax.png b/src/afd/sprites/front/0569-420-Garbodor-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0569--420--Garbodor--Gmax.png
rename to src/afd/sprites/front/0569-420-Garbodor-Gmax.png
diff --git a/src/afd/sprites/front/0570--000--Zorua.png b/src/afd/sprites/front/0570-000-Zorua.png
similarity index 100%
rename from src/afd/sprites/front/0570--000--Zorua.png
rename to src/afd/sprites/front/0570-000-Zorua.png
diff --git a/src/afd/sprites/front/0571--000--Zoroark.png b/src/afd/sprites/front/0571-000-Zoroark.png
similarity index 100%
rename from src/afd/sprites/front/0571--000--Zoroark.png
rename to src/afd/sprites/front/0571-000-Zoroark.png
diff --git a/src/afd/sprites/front/0572--000--Minccino.png b/src/afd/sprites/front/0572-000-Minccino.png
similarity index 100%
rename from src/afd/sprites/front/0572--000--Minccino.png
rename to src/afd/sprites/front/0572-000-Minccino.png
diff --git a/src/afd/sprites/front/0573--000--Cinccino.png b/src/afd/sprites/front/0573-000-Cinccino.png
similarity index 100%
rename from src/afd/sprites/front/0573--000--Cinccino.png
rename to src/afd/sprites/front/0573-000-Cinccino.png
diff --git a/src/afd/sprites/front/0574--000--Gothita.png b/src/afd/sprites/front/0574-000-Gothita.png
similarity index 100%
rename from src/afd/sprites/front/0574--000--Gothita.png
rename to src/afd/sprites/front/0574-000-Gothita.png
diff --git a/src/afd/sprites/front/0575--000--Gothorita.png b/src/afd/sprites/front/0575-000-Gothorita.png
similarity index 100%
rename from src/afd/sprites/front/0575--000--Gothorita.png
rename to src/afd/sprites/front/0575-000-Gothorita.png
diff --git a/src/afd/sprites/front/0576--000--Gothitelle.png b/src/afd/sprites/front/0576-000-Gothitelle.png
similarity index 100%
rename from src/afd/sprites/front/0576--000--Gothitelle.png
rename to src/afd/sprites/front/0576-000-Gothitelle.png
diff --git a/src/afd/sprites/front/0577--000--Solosis.png b/src/afd/sprites/front/0577-000-Solosis.png
similarity index 100%
rename from src/afd/sprites/front/0577--000--Solosis.png
rename to src/afd/sprites/front/0577-000-Solosis.png
diff --git a/src/afd/sprites/front/0578--000--Duosion.png b/src/afd/sprites/front/0578-000-Duosion.png
similarity index 100%
rename from src/afd/sprites/front/0578--000--Duosion.png
rename to src/afd/sprites/front/0578-000-Duosion.png
diff --git a/src/afd/sprites/front/0579--000--Reuniclus.png b/src/afd/sprites/front/0579-000-Reuniclus.png
similarity index 100%
rename from src/afd/sprites/front/0579--000--Reuniclus.png
rename to src/afd/sprites/front/0579-000-Reuniclus.png
diff --git a/src/afd/sprites/front/0580--000--Ducklett.png b/src/afd/sprites/front/0580-000-Ducklett.png
similarity index 100%
rename from src/afd/sprites/front/0580--000--Ducklett.png
rename to src/afd/sprites/front/0580-000-Ducklett.png
diff --git a/src/afd/sprites/front/0581--000--Swanna.png b/src/afd/sprites/front/0581-000-Swanna.png
similarity index 100%
rename from src/afd/sprites/front/0581--000--Swanna.png
rename to src/afd/sprites/front/0581-000-Swanna.png
diff --git a/src/afd/sprites/front/0582--000--Vanillite.png b/src/afd/sprites/front/0582-000-Vanillite.png
similarity index 100%
rename from src/afd/sprites/front/0582--000--Vanillite.png
rename to src/afd/sprites/front/0582-000-Vanillite.png
diff --git a/src/afd/sprites/front/0583--000--Vanillish.png b/src/afd/sprites/front/0583-000-Vanillish.png
similarity index 100%
rename from src/afd/sprites/front/0583--000--Vanillish.png
rename to src/afd/sprites/front/0583-000-Vanillish.png
diff --git a/src/afd/sprites/front/0584--000--Vanilluxe.png b/src/afd/sprites/front/0584-000-Vanilluxe.png
similarity index 100%
rename from src/afd/sprites/front/0584--000--Vanilluxe.png
rename to src/afd/sprites/front/0584-000-Vanilluxe.png
diff --git a/src/afd/sprites/front/0585--000--Deerling.png b/src/afd/sprites/front/0585-000-Deerling.png
similarity index 100%
rename from src/afd/sprites/front/0585--000--Deerling.png
rename to src/afd/sprites/front/0585-000-Deerling.png
diff --git a/src/afd/sprites/front/0586--000--Sawsbuck.png b/src/afd/sprites/front/0586-000-Sawsbuck.png
similarity index 100%
rename from src/afd/sprites/front/0586--000--Sawsbuck.png
rename to src/afd/sprites/front/0586-000-Sawsbuck.png
diff --git a/src/afd/sprites/front/0587--000--Emolga.png b/src/afd/sprites/front/0587-000-Emolga.png
similarity index 100%
rename from src/afd/sprites/front/0587--000--Emolga.png
rename to src/afd/sprites/front/0587-000-Emolga.png
diff --git a/src/afd/sprites/front/0588--000--Karrablast.png b/src/afd/sprites/front/0588-000-Karrablast.png
similarity index 100%
rename from src/afd/sprites/front/0588--000--Karrablast.png
rename to src/afd/sprites/front/0588-000-Karrablast.png
diff --git a/src/afd/sprites/front/0589--000--Escavalier.png b/src/afd/sprites/front/0589-000-Escavalier.png
similarity index 100%
rename from src/afd/sprites/front/0589--000--Escavalier.png
rename to src/afd/sprites/front/0589-000-Escavalier.png
diff --git a/src/afd/sprites/front/0590--000--Foongus.png b/src/afd/sprites/front/0590-000-Foongus.png
similarity index 100%
rename from src/afd/sprites/front/0590--000--Foongus.png
rename to src/afd/sprites/front/0590-000-Foongus.png
diff --git a/src/afd/sprites/front/0591--000--Amoonguss.png b/src/afd/sprites/front/0591-000-Amoonguss.png
similarity index 100%
rename from src/afd/sprites/front/0591--000--Amoonguss.png
rename to src/afd/sprites/front/0591-000-Amoonguss.png
diff --git a/src/afd/sprites/front/0592--000--Frillish.png b/src/afd/sprites/front/0592-000-Frillish.png
similarity index 100%
rename from src/afd/sprites/front/0592--000--Frillish.png
rename to src/afd/sprites/front/0592-000-Frillish.png
diff --git a/src/afd/sprites/front/0593--000--Jellicent.png b/src/afd/sprites/front/0593-000-Jellicent.png
similarity index 100%
rename from src/afd/sprites/front/0593--000--Jellicent.png
rename to src/afd/sprites/front/0593-000-Jellicent.png
diff --git a/src/afd/sprites/front/0594--000--Alomomola.png b/src/afd/sprites/front/0594-000-Alomomola.png
similarity index 100%
rename from src/afd/sprites/front/0594--000--Alomomola.png
rename to src/afd/sprites/front/0594-000-Alomomola.png
diff --git a/src/afd/sprites/front/0595--000--Joltik.png b/src/afd/sprites/front/0595-000-Joltik.png
similarity index 100%
rename from src/afd/sprites/front/0595--000--Joltik.png
rename to src/afd/sprites/front/0595-000-Joltik.png
diff --git a/src/afd/sprites/front/0596--000--Galvantula.png b/src/afd/sprites/front/0596-000-Galvantula.png
similarity index 100%
rename from src/afd/sprites/front/0596--000--Galvantula.png
rename to src/afd/sprites/front/0596-000-Galvantula.png
diff --git a/src/afd/sprites/front/0597--000--Ferroseed.png b/src/afd/sprites/front/0597-000-Ferroseed.png
similarity index 100%
rename from src/afd/sprites/front/0597--000--Ferroseed.png
rename to src/afd/sprites/front/0597-000-Ferroseed.png
diff --git a/src/afd/sprites/front/0598--000--Ferrothorn.png b/src/afd/sprites/front/0598-000-Ferrothorn.png
similarity index 100%
rename from src/afd/sprites/front/0598--000--Ferrothorn.png
rename to src/afd/sprites/front/0598-000-Ferrothorn.png
diff --git a/src/afd/sprites/front/0599--000--Klink.png b/src/afd/sprites/front/0599-000-Klink.png
similarity index 100%
rename from src/afd/sprites/front/0599--000--Klink.png
rename to src/afd/sprites/front/0599-000-Klink.png
diff --git a/src/afd/sprites/front/0600--000--Klang.png b/src/afd/sprites/front/0600-000-Klang.png
similarity index 100%
rename from src/afd/sprites/front/0600--000--Klang.png
rename to src/afd/sprites/front/0600-000-Klang.png
diff --git a/src/afd/sprites/front/0601--000--Klinklang.png b/src/afd/sprites/front/0601-000-Klinklang.png
similarity index 100%
rename from src/afd/sprites/front/0601--000--Klinklang.png
rename to src/afd/sprites/front/0601-000-Klinklang.png
diff --git a/src/afd/sprites/front/0602--000--Tynamo.png b/src/afd/sprites/front/0602-000-Tynamo.png
similarity index 100%
rename from src/afd/sprites/front/0602--000--Tynamo.png
rename to src/afd/sprites/front/0602-000-Tynamo.png
diff --git a/src/afd/sprites/front/0603--000--Eelektrik.png b/src/afd/sprites/front/0603-000-Eelektrik.png
similarity index 100%
rename from src/afd/sprites/front/0603--000--Eelektrik.png
rename to src/afd/sprites/front/0603-000-Eelektrik.png
diff --git a/src/afd/sprites/front/0604--000--Eelektross.png b/src/afd/sprites/front/0604-000-Eelektross.png
similarity index 100%
rename from src/afd/sprites/front/0604--000--Eelektross.png
rename to src/afd/sprites/front/0604-000-Eelektross.png
diff --git a/src/afd/sprites/front/0605--000--Elgyem.png b/src/afd/sprites/front/0605-000-Elgyem.png
similarity index 100%
rename from src/afd/sprites/front/0605--000--Elgyem.png
rename to src/afd/sprites/front/0605-000-Elgyem.png
diff --git a/src/afd/sprites/front/0606--000--Beheeyem.png b/src/afd/sprites/front/0606-000-Beheeyem.png
similarity index 100%
rename from src/afd/sprites/front/0606--000--Beheeyem.png
rename to src/afd/sprites/front/0606-000-Beheeyem.png
diff --git a/src/afd/sprites/front/0607--000--Litwick.png b/src/afd/sprites/front/0607-000-Litwick.png
similarity index 100%
rename from src/afd/sprites/front/0607--000--Litwick.png
rename to src/afd/sprites/front/0607-000-Litwick.png
diff --git a/src/afd/sprites/front/0608--000--Lampent.png b/src/afd/sprites/front/0608-000-Lampent.png
similarity index 100%
rename from src/afd/sprites/front/0608--000--Lampent.png
rename to src/afd/sprites/front/0608-000-Lampent.png
diff --git a/src/afd/sprites/front/0609--000--Chandelure.png b/src/afd/sprites/front/0609-000-Chandelure.png
similarity index 100%
rename from src/afd/sprites/front/0609--000--Chandelure.png
rename to src/afd/sprites/front/0609-000-Chandelure.png
diff --git a/src/afd/sprites/front/0610--000--Axew.png b/src/afd/sprites/front/0610-000-Axew.png
similarity index 100%
rename from src/afd/sprites/front/0610--000--Axew.png
rename to src/afd/sprites/front/0610-000-Axew.png
diff --git a/src/afd/sprites/front/0611--000--Fraxure.png b/src/afd/sprites/front/0611-000-Fraxure.png
similarity index 100%
rename from src/afd/sprites/front/0611--000--Fraxure.png
rename to src/afd/sprites/front/0611-000-Fraxure.png
diff --git a/src/afd/sprites/front/0612--000--Haxorus.png b/src/afd/sprites/front/0612-000-Haxorus.png
similarity index 100%
rename from src/afd/sprites/front/0612--000--Haxorus.png
rename to src/afd/sprites/front/0612-000-Haxorus.png
diff --git a/src/afd/sprites/front/0613--000--Cubchoo.png b/src/afd/sprites/front/0613-000-Cubchoo.png
similarity index 100%
rename from src/afd/sprites/front/0613--000--Cubchoo.png
rename to src/afd/sprites/front/0613-000-Cubchoo.png
diff --git a/src/afd/sprites/front/0614--000--Beartic.png b/src/afd/sprites/front/0614-000-Beartic.png
similarity index 100%
rename from src/afd/sprites/front/0614--000--Beartic.png
rename to src/afd/sprites/front/0614-000-Beartic.png
diff --git a/src/afd/sprites/front/0615--000--Cryogonal.png b/src/afd/sprites/front/0615-000-Cryogonal.png
similarity index 100%
rename from src/afd/sprites/front/0615--000--Cryogonal.png
rename to src/afd/sprites/front/0615-000-Cryogonal.png
diff --git a/src/afd/sprites/front/0616--000--Shelmet.png b/src/afd/sprites/front/0616-000-Shelmet.png
similarity index 100%
rename from src/afd/sprites/front/0616--000--Shelmet.png
rename to src/afd/sprites/front/0616-000-Shelmet.png
diff --git a/src/afd/sprites/front/0617--000--Accelgor.png b/src/afd/sprites/front/0617-000-Accelgor.png
similarity index 100%
rename from src/afd/sprites/front/0617--000--Accelgor.png
rename to src/afd/sprites/front/0617-000-Accelgor.png
diff --git a/src/afd/sprites/front/0618--000--Stunfisk.png b/src/afd/sprites/front/0618-000-Stunfisk.png
similarity index 100%
rename from src/afd/sprites/front/0618--000--Stunfisk.png
rename to src/afd/sprites/front/0618-000-Stunfisk.png
diff --git a/src/afd/sprites/front/0618--420--Stunfisk--Galar.png b/src/afd/sprites/front/0618-420-Stunfisk-Galar.png
similarity index 100%
rename from src/afd/sprites/front/0618--420--Stunfisk--Galar.png
rename to src/afd/sprites/front/0618-420-Stunfisk-Galar.png
diff --git a/src/afd/sprites/front/0619--000--Mienfoo.png b/src/afd/sprites/front/0619-000-Mienfoo.png
similarity index 100%
rename from src/afd/sprites/front/0619--000--Mienfoo.png
rename to src/afd/sprites/front/0619-000-Mienfoo.png
diff --git a/src/afd/sprites/front/0620--000--Mienshao.png b/src/afd/sprites/front/0620-000-Mienshao.png
similarity index 100%
rename from src/afd/sprites/front/0620--000--Mienshao.png
rename to src/afd/sprites/front/0620-000-Mienshao.png
diff --git a/src/afd/sprites/front/0621--000--Druddigon.png b/src/afd/sprites/front/0621-000-Druddigon.png
similarity index 100%
rename from src/afd/sprites/front/0621--000--Druddigon.png
rename to src/afd/sprites/front/0621-000-Druddigon.png
diff --git a/src/afd/sprites/front/0622--000--Golett.png b/src/afd/sprites/front/0622-000-Golett.png
similarity index 100%
rename from src/afd/sprites/front/0622--000--Golett.png
rename to src/afd/sprites/front/0622-000-Golett.png
diff --git a/src/afd/sprites/front/0623--000--Golurk.png b/src/afd/sprites/front/0623-000-Golurk.png
similarity index 100%
rename from src/afd/sprites/front/0623--000--Golurk.png
rename to src/afd/sprites/front/0623-000-Golurk.png
diff --git a/src/afd/sprites/front/0624--000--Pawniard.png b/src/afd/sprites/front/0624-000-Pawniard.png
similarity index 100%
rename from src/afd/sprites/front/0624--000--Pawniard.png
rename to src/afd/sprites/front/0624-000-Pawniard.png
diff --git a/src/afd/sprites/front/0625--000--Bisharp.png b/src/afd/sprites/front/0625-000-Bisharp.png
similarity index 100%
rename from src/afd/sprites/front/0625--000--Bisharp.png
rename to src/afd/sprites/front/0625-000-Bisharp.png
diff --git a/src/afd/sprites/front/0626--000--Bouffalant.png b/src/afd/sprites/front/0626-000-Bouffalant.png
similarity index 100%
rename from src/afd/sprites/front/0626--000--Bouffalant.png
rename to src/afd/sprites/front/0626-000-Bouffalant.png
diff --git a/src/afd/sprites/front/0627--000--Rufflet.png b/src/afd/sprites/front/0627-000-Rufflet.png
similarity index 100%
rename from src/afd/sprites/front/0627--000--Rufflet.png
rename to src/afd/sprites/front/0627-000-Rufflet.png
diff --git a/src/afd/sprites/front/0628--000--Braviary.png b/src/afd/sprites/front/0628-000-Braviary.png
similarity index 100%
rename from src/afd/sprites/front/0628--000--Braviary.png
rename to src/afd/sprites/front/0628-000-Braviary.png
diff --git a/src/afd/sprites/front/0629--000--Vullaby.png b/src/afd/sprites/front/0629-000-Vullaby.png
similarity index 100%
rename from src/afd/sprites/front/0629--000--Vullaby.png
rename to src/afd/sprites/front/0629-000-Vullaby.png
diff --git a/src/afd/sprites/front/0630--000--Mandibuzz.png b/src/afd/sprites/front/0630-000-Mandibuzz.png
similarity index 100%
rename from src/afd/sprites/front/0630--000--Mandibuzz.png
rename to src/afd/sprites/front/0630-000-Mandibuzz.png
diff --git a/src/afd/sprites/front/0631--000--Heatmor.png b/src/afd/sprites/front/0631-000-Heatmor.png
similarity index 100%
rename from src/afd/sprites/front/0631--000--Heatmor.png
rename to src/afd/sprites/front/0631-000-Heatmor.png
diff --git a/src/afd/sprites/front/0632--000--Durant.png b/src/afd/sprites/front/0632-000-Durant.png
similarity index 100%
rename from src/afd/sprites/front/0632--000--Durant.png
rename to src/afd/sprites/front/0632-000-Durant.png
diff --git a/src/afd/sprites/front/0633--000--Deino.png b/src/afd/sprites/front/0633-000-Deino.png
similarity index 100%
rename from src/afd/sprites/front/0633--000--Deino.png
rename to src/afd/sprites/front/0633-000-Deino.png
diff --git a/src/afd/sprites/front/0634--000--Zweilous.png b/src/afd/sprites/front/0634-000-Zweilous.png
similarity index 100%
rename from src/afd/sprites/front/0634--000--Zweilous.png
rename to src/afd/sprites/front/0634-000-Zweilous.png
diff --git a/src/afd/sprites/front/0635--000--Hydreigon.png b/src/afd/sprites/front/0635-000-Hydreigon.png
similarity index 100%
rename from src/afd/sprites/front/0635--000--Hydreigon.png
rename to src/afd/sprites/front/0635-000-Hydreigon.png
diff --git a/src/afd/sprites/front/0636--000--Larvesta.png b/src/afd/sprites/front/0636-000-Larvesta.png
similarity index 100%
rename from src/afd/sprites/front/0636--000--Larvesta.png
rename to src/afd/sprites/front/0636-000-Larvesta.png
diff --git a/src/afd/sprites/front/0637--000--Volcarona.png b/src/afd/sprites/front/0637-000-Volcarona.png
similarity index 100%
rename from src/afd/sprites/front/0637--000--Volcarona.png
rename to src/afd/sprites/front/0637-000-Volcarona.png
diff --git a/src/afd/sprites/front/0638--000--Cobalion.png b/src/afd/sprites/front/0638-000-Cobalion.png
similarity index 100%
rename from src/afd/sprites/front/0638--000--Cobalion.png
rename to src/afd/sprites/front/0638-000-Cobalion.png
diff --git a/src/afd/sprites/front/0639--000--Terrakion.png b/src/afd/sprites/front/0639-000-Terrakion.png
similarity index 100%
rename from src/afd/sprites/front/0639--000--Terrakion.png
rename to src/afd/sprites/front/0639-000-Terrakion.png
diff --git a/src/afd/sprites/front/0640--000--Virizion.png b/src/afd/sprites/front/0640-000-Virizion.png
similarity index 100%
rename from src/afd/sprites/front/0640--000--Virizion.png
rename to src/afd/sprites/front/0640-000-Virizion.png
diff --git a/src/afd/sprites/front/0641--000--Tornadus.png b/src/afd/sprites/front/0641-000-Tornadus.png
similarity index 100%
rename from src/afd/sprites/front/0641--000--Tornadus.png
rename to src/afd/sprites/front/0641-000-Tornadus.png
diff --git a/src/afd/sprites/front/0641--420--Tornadus--Therian.png b/src/afd/sprites/front/0641-420-Tornadus-Therian.png
similarity index 100%
rename from src/afd/sprites/front/0641--420--Tornadus--Therian.png
rename to src/afd/sprites/front/0641-420-Tornadus-Therian.png
diff --git a/src/afd/sprites/front/0642--000--Thundurus.png b/src/afd/sprites/front/0642-000-Thundurus.png
similarity index 100%
rename from src/afd/sprites/front/0642--000--Thundurus.png
rename to src/afd/sprites/front/0642-000-Thundurus.png
diff --git a/src/afd/sprites/front/0642--420--Thundurus--Therian.png b/src/afd/sprites/front/0642-420-Thundurus-Therian.png
similarity index 100%
rename from src/afd/sprites/front/0642--420--Thundurus--Therian.png
rename to src/afd/sprites/front/0642-420-Thundurus-Therian.png
diff --git a/src/afd/sprites/front/0643--000--Reshiram.png b/src/afd/sprites/front/0643-000-Reshiram.png
similarity index 100%
rename from src/afd/sprites/front/0643--000--Reshiram.png
rename to src/afd/sprites/front/0643-000-Reshiram.png
diff --git a/src/afd/sprites/front/0644--000--Zekrom.png b/src/afd/sprites/front/0644-000-Zekrom.png
similarity index 100%
rename from src/afd/sprites/front/0644--000--Zekrom.png
rename to src/afd/sprites/front/0644-000-Zekrom.png
diff --git a/src/afd/sprites/front/0645--000--Landorus.png b/src/afd/sprites/front/0645-000-Landorus.png
similarity index 100%
rename from src/afd/sprites/front/0645--000--Landorus.png
rename to src/afd/sprites/front/0645-000-Landorus.png
diff --git a/src/afd/sprites/front/0645--420--Landorus--Therian.png b/src/afd/sprites/front/0645-420-Landorus-Therian.png
similarity index 100%
rename from src/afd/sprites/front/0645--420--Landorus--Therian.png
rename to src/afd/sprites/front/0645-420-Landorus-Therian.png
diff --git a/src/afd/sprites/front/0646--000--Kyurem.png b/src/afd/sprites/front/0646-000-Kyurem.png
similarity index 100%
rename from src/afd/sprites/front/0646--000--Kyurem.png
rename to src/afd/sprites/front/0646-000-Kyurem.png
diff --git a/src/afd/sprites/front/0646--420--Kyurem--Black.png b/src/afd/sprites/front/0646-420-Kyurem-Black.png
similarity index 100%
rename from src/afd/sprites/front/0646--420--Kyurem--Black.png
rename to src/afd/sprites/front/0646-420-Kyurem-Black.png
diff --git a/src/afd/sprites/front/0646--420--Kyurem--White.png b/src/afd/sprites/front/0646-420-Kyurem-White.png
similarity index 100%
rename from src/afd/sprites/front/0646--420--Kyurem--White.png
rename to src/afd/sprites/front/0646-420-Kyurem-White.png
diff --git a/src/afd/sprites/front/0647--000--Keldeo.png b/src/afd/sprites/front/0647-000-Keldeo.png
similarity index 100%
rename from src/afd/sprites/front/0647--000--Keldeo.png
rename to src/afd/sprites/front/0647-000-Keldeo.png
diff --git a/src/afd/sprites/front/0647--420--Keldeo--Resolute.png b/src/afd/sprites/front/0647-420-Keldeo-Resolute.png
similarity index 100%
rename from src/afd/sprites/front/0647--420--Keldeo--Resolute.png
rename to src/afd/sprites/front/0647-420-Keldeo-Resolute.png
diff --git a/src/afd/sprites/front/0648--000--Meloetta.png b/src/afd/sprites/front/0648-000-Meloetta.png
similarity index 100%
rename from src/afd/sprites/front/0648--000--Meloetta.png
rename to src/afd/sprites/front/0648-000-Meloetta.png
diff --git a/src/afd/sprites/front/0648--420--Meloetta--Pirouette.png b/src/afd/sprites/front/0648-420-Meloetta-Pirouette.png
similarity index 100%
rename from src/afd/sprites/front/0648--420--Meloetta--Pirouette.png
rename to src/afd/sprites/front/0648-420-Meloetta-Pirouette.png
diff --git a/src/afd/sprites/front/0649--000--Genesect.png b/src/afd/sprites/front/0649-000-Genesect.png
similarity index 100%
rename from src/afd/sprites/front/0649--000--Genesect.png
rename to src/afd/sprites/front/0649-000-Genesect.png
diff --git a/src/afd/sprites/front/0649--420--Genesect--Burn.png b/src/afd/sprites/front/0649-420-Genesect-Burn.png
similarity index 100%
rename from src/afd/sprites/front/0649--420--Genesect--Burn.png
rename to src/afd/sprites/front/0649-420-Genesect-Burn.png
diff --git a/src/afd/sprites/front/0649--420--Genesect--Chill.png b/src/afd/sprites/front/0649-420-Genesect-Chill.png
similarity index 100%
rename from src/afd/sprites/front/0649--420--Genesect--Chill.png
rename to src/afd/sprites/front/0649-420-Genesect-Chill.png
diff --git a/src/afd/sprites/front/0649--420--Genesect--Douse.png b/src/afd/sprites/front/0649-420-Genesect-Douse.png
similarity index 100%
rename from src/afd/sprites/front/0649--420--Genesect--Douse.png
rename to src/afd/sprites/front/0649-420-Genesect-Douse.png
diff --git a/src/afd/sprites/front/0649--420--Genesect--Shock.png b/src/afd/sprites/front/0649-420-Genesect-Shock.png
similarity index 100%
rename from src/afd/sprites/front/0649--420--Genesect--Shock.png
rename to src/afd/sprites/front/0649-420-Genesect-Shock.png
diff --git a/src/afd/sprites/front/0650--000--Chespin.png b/src/afd/sprites/front/0650-000-Chespin.png
similarity index 100%
rename from src/afd/sprites/front/0650--000--Chespin.png
rename to src/afd/sprites/front/0650-000-Chespin.png
diff --git a/src/afd/sprites/front/0651--000--Quilladin.png b/src/afd/sprites/front/0651-000-Quilladin.png
similarity index 100%
rename from src/afd/sprites/front/0651--000--Quilladin.png
rename to src/afd/sprites/front/0651-000-Quilladin.png
diff --git a/src/afd/sprites/front/0652--000--Chesnaught.png b/src/afd/sprites/front/0652-000-Chesnaught.png
similarity index 100%
rename from src/afd/sprites/front/0652--000--Chesnaught.png
rename to src/afd/sprites/front/0652-000-Chesnaught.png
diff --git a/src/afd/sprites/front/0653--000--Fennekin.png b/src/afd/sprites/front/0653-000-Fennekin.png
similarity index 100%
rename from src/afd/sprites/front/0653--000--Fennekin.png
rename to src/afd/sprites/front/0653-000-Fennekin.png
diff --git a/src/afd/sprites/front/0654--000--Braixen.png b/src/afd/sprites/front/0654-000-Braixen.png
similarity index 100%
rename from src/afd/sprites/front/0654--000--Braixen.png
rename to src/afd/sprites/front/0654-000-Braixen.png
diff --git a/src/afd/sprites/front/0655--000--Delphox.png b/src/afd/sprites/front/0655-000-Delphox.png
similarity index 100%
rename from src/afd/sprites/front/0655--000--Delphox.png
rename to src/afd/sprites/front/0655-000-Delphox.png
diff --git a/src/afd/sprites/front/0656--000--Froakie.png b/src/afd/sprites/front/0656-000-Froakie.png
similarity index 100%
rename from src/afd/sprites/front/0656--000--Froakie.png
rename to src/afd/sprites/front/0656-000-Froakie.png
diff --git a/src/afd/sprites/front/0657--000--Frogadier.png b/src/afd/sprites/front/0657-000-Frogadier.png
similarity index 100%
rename from src/afd/sprites/front/0657--000--Frogadier.png
rename to src/afd/sprites/front/0657-000-Frogadier.png
diff --git a/src/afd/sprites/front/0658--000--Greninja.png b/src/afd/sprites/front/0658-000-Greninja.png
similarity index 100%
rename from src/afd/sprites/front/0658--000--Greninja.png
rename to src/afd/sprites/front/0658-000-Greninja.png
diff --git a/src/afd/sprites/front/0658--420--Greninja--Ash.png b/src/afd/sprites/front/0658-420-Greninja-Ash.png
similarity index 100%
rename from src/afd/sprites/front/0658--420--Greninja--Ash.png
rename to src/afd/sprites/front/0658-420-Greninja-Ash.png
diff --git a/src/afd/sprites/front/0659--000--Bunnelby.png b/src/afd/sprites/front/0659-000-Bunnelby.png
similarity index 100%
rename from src/afd/sprites/front/0659--000--Bunnelby.png
rename to src/afd/sprites/front/0659-000-Bunnelby.png
diff --git a/src/afd/sprites/front/0660--000--Diggersby.png b/src/afd/sprites/front/0660-000-Diggersby.png
similarity index 100%
rename from src/afd/sprites/front/0660--000--Diggersby.png
rename to src/afd/sprites/front/0660-000-Diggersby.png
diff --git a/src/afd/sprites/front/0661--000--Fletchling.png b/src/afd/sprites/front/0661-000-Fletchling.png
similarity index 100%
rename from src/afd/sprites/front/0661--000--Fletchling.png
rename to src/afd/sprites/front/0661-000-Fletchling.png
diff --git a/src/afd/sprites/front/0662--000--Fletchinder.png b/src/afd/sprites/front/0662-000-Fletchinder.png
similarity index 100%
rename from src/afd/sprites/front/0662--000--Fletchinder.png
rename to src/afd/sprites/front/0662-000-Fletchinder.png
diff --git a/src/afd/sprites/front/0663--000--Talonflame.png b/src/afd/sprites/front/0663-000-Talonflame.png
similarity index 100%
rename from src/afd/sprites/front/0663--000--Talonflame.png
rename to src/afd/sprites/front/0663-000-Talonflame.png
diff --git a/src/afd/sprites/front/0664--000--Scatterbug.png b/src/afd/sprites/front/0664-000-Scatterbug.png
similarity index 100%
rename from src/afd/sprites/front/0664--000--Scatterbug.png
rename to src/afd/sprites/front/0664-000-Scatterbug.png
diff --git a/src/afd/sprites/front/0665--000--Spewpa.png b/src/afd/sprites/front/0665-000-Spewpa.png
similarity index 100%
rename from src/afd/sprites/front/0665--000--Spewpa.png
rename to src/afd/sprites/front/0665-000-Spewpa.png
diff --git a/src/afd/sprites/front/0666--000--Vivillon.png b/src/afd/sprites/front/0666-000-Vivillon.png
similarity index 100%
rename from src/afd/sprites/front/0666--000--Vivillon.png
rename to src/afd/sprites/front/0666-000-Vivillon.png
diff --git a/src/afd/sprites/front/0667--000--Litleo.png b/src/afd/sprites/front/0667-000-Litleo.png
similarity index 100%
rename from src/afd/sprites/front/0667--000--Litleo.png
rename to src/afd/sprites/front/0667-000-Litleo.png
diff --git a/src/afd/sprites/front/0668--000--Pyroar.png b/src/afd/sprites/front/0668-000-Pyroar.png
similarity index 100%
rename from src/afd/sprites/front/0668--000--Pyroar.png
rename to src/afd/sprites/front/0668-000-Pyroar.png
diff --git a/src/afd/sprites/front/0669--000--Flabe__0301be__0301.png b/src/afd/sprites/front/0669-000-Flabe__0301be__0301.png
similarity index 100%
rename from src/afd/sprites/front/0669--000--Flabe__0301be__0301.png
rename to src/afd/sprites/front/0669-000-Flabe__0301be__0301.png
diff --git a/src/afd/sprites/front/0670--000--Floette.png b/src/afd/sprites/front/0670-000-Floette.png
similarity index 100%
rename from src/afd/sprites/front/0670--000--Floette.png
rename to src/afd/sprites/front/0670-000-Floette.png
diff --git a/src/afd/sprites/front/0670--420--Floette--Eternal.png b/src/afd/sprites/front/0670-420-Floette-Eternal.png
similarity index 100%
rename from src/afd/sprites/front/0670--420--Floette--Eternal.png
rename to src/afd/sprites/front/0670-420-Floette-Eternal.png
diff --git a/src/afd/sprites/front/0671--000--Florges.png b/src/afd/sprites/front/0671-000-Florges.png
similarity index 100%
rename from src/afd/sprites/front/0671--000--Florges.png
rename to src/afd/sprites/front/0671-000-Florges.png
diff --git a/src/afd/sprites/front/0672--000--Skiddo.png b/src/afd/sprites/front/0672-000-Skiddo.png
similarity index 100%
rename from src/afd/sprites/front/0672--000--Skiddo.png
rename to src/afd/sprites/front/0672-000-Skiddo.png
diff --git a/src/afd/sprites/front/0673--000--Gogoat.png b/src/afd/sprites/front/0673-000-Gogoat.png
similarity index 100%
rename from src/afd/sprites/front/0673--000--Gogoat.png
rename to src/afd/sprites/front/0673-000-Gogoat.png
diff --git a/src/afd/sprites/front/0674--000--Pancham.png b/src/afd/sprites/front/0674-000-Pancham.png
similarity index 100%
rename from src/afd/sprites/front/0674--000--Pancham.png
rename to src/afd/sprites/front/0674-000-Pancham.png
diff --git a/src/afd/sprites/front/0675--000--Pangoro.png b/src/afd/sprites/front/0675-000-Pangoro.png
similarity index 100%
rename from src/afd/sprites/front/0675--000--Pangoro.png
rename to src/afd/sprites/front/0675-000-Pangoro.png
diff --git a/src/afd/sprites/front/0676--000--Furfrou.png b/src/afd/sprites/front/0676-000-Furfrou.png
similarity index 100%
rename from src/afd/sprites/front/0676--000--Furfrou.png
rename to src/afd/sprites/front/0676-000-Furfrou.png
diff --git a/src/afd/sprites/front/0677--000--Espurr.png b/src/afd/sprites/front/0677-000-Espurr.png
similarity index 100%
rename from src/afd/sprites/front/0677--000--Espurr.png
rename to src/afd/sprites/front/0677-000-Espurr.png
diff --git a/src/afd/sprites/front/0678--000--Meowstic.png b/src/afd/sprites/front/0678-000-Meowstic.png
similarity index 100%
rename from src/afd/sprites/front/0678--000--Meowstic.png
rename to src/afd/sprites/front/0678-000-Meowstic.png
diff --git a/src/afd/sprites/front/0678--420--Meowstic--F.png b/src/afd/sprites/front/0678-420-Meowstic-F.png
similarity index 100%
rename from src/afd/sprites/front/0678--420--Meowstic--F.png
rename to src/afd/sprites/front/0678-420-Meowstic-F.png
diff --git a/src/afd/sprites/front/0679--000--Honedge.png b/src/afd/sprites/front/0679-000-Honedge.png
similarity index 100%
rename from src/afd/sprites/front/0679--000--Honedge.png
rename to src/afd/sprites/front/0679-000-Honedge.png
diff --git a/src/afd/sprites/front/0680--000--Doublade.png b/src/afd/sprites/front/0680-000-Doublade.png
similarity index 100%
rename from src/afd/sprites/front/0680--000--Doublade.png
rename to src/afd/sprites/front/0680-000-Doublade.png
diff --git a/src/afd/sprites/front/0681--000--Aegislash.png b/src/afd/sprites/front/0681-000-Aegislash.png
similarity index 100%
rename from src/afd/sprites/front/0681--000--Aegislash.png
rename to src/afd/sprites/front/0681-000-Aegislash.png
diff --git a/src/afd/sprites/front/0681--420--Aegislash--Blade.png b/src/afd/sprites/front/0681-420-Aegislash-Blade.png
similarity index 100%
rename from src/afd/sprites/front/0681--420--Aegislash--Blade.png
rename to src/afd/sprites/front/0681-420-Aegislash-Blade.png
diff --git a/src/afd/sprites/front/0682--000--Spritzee.png b/src/afd/sprites/front/0682-000-Spritzee.png
similarity index 100%
rename from src/afd/sprites/front/0682--000--Spritzee.png
rename to src/afd/sprites/front/0682-000-Spritzee.png
diff --git a/src/afd/sprites/front/0683--000--Aromatisse.png b/src/afd/sprites/front/0683-000-Aromatisse.png
similarity index 100%
rename from src/afd/sprites/front/0683--000--Aromatisse.png
rename to src/afd/sprites/front/0683-000-Aromatisse.png
diff --git a/src/afd/sprites/front/0684--000--Swirlix.png b/src/afd/sprites/front/0684-000-Swirlix.png
similarity index 100%
rename from src/afd/sprites/front/0684--000--Swirlix.png
rename to src/afd/sprites/front/0684-000-Swirlix.png
diff --git a/src/afd/sprites/front/0685--000--Slurpuff.png b/src/afd/sprites/front/0685-000-Slurpuff.png
similarity index 100%
rename from src/afd/sprites/front/0685--000--Slurpuff.png
rename to src/afd/sprites/front/0685-000-Slurpuff.png
diff --git a/src/afd/sprites/front/0686--000--Inkay.png b/src/afd/sprites/front/0686-000-Inkay.png
similarity index 100%
rename from src/afd/sprites/front/0686--000--Inkay.png
rename to src/afd/sprites/front/0686-000-Inkay.png
diff --git a/src/afd/sprites/front/0687--000--Malamar.png b/src/afd/sprites/front/0687-000-Malamar.png
similarity index 100%
rename from src/afd/sprites/front/0687--000--Malamar.png
rename to src/afd/sprites/front/0687-000-Malamar.png
diff --git a/src/afd/sprites/front/0688--000--Binacle.png b/src/afd/sprites/front/0688-000-Binacle.png
similarity index 100%
rename from src/afd/sprites/front/0688--000--Binacle.png
rename to src/afd/sprites/front/0688-000-Binacle.png
diff --git a/src/afd/sprites/front/0689--000--Barbaracle.png b/src/afd/sprites/front/0689-000-Barbaracle.png
similarity index 100%
rename from src/afd/sprites/front/0689--000--Barbaracle.png
rename to src/afd/sprites/front/0689-000-Barbaracle.png
diff --git a/src/afd/sprites/front/0690--000--Skrelp.png b/src/afd/sprites/front/0690-000-Skrelp.png
similarity index 100%
rename from src/afd/sprites/front/0690--000--Skrelp.png
rename to src/afd/sprites/front/0690-000-Skrelp.png
diff --git a/src/afd/sprites/front/0691--000--Dragalge.png b/src/afd/sprites/front/0691-000-Dragalge.png
similarity index 100%
rename from src/afd/sprites/front/0691--000--Dragalge.png
rename to src/afd/sprites/front/0691-000-Dragalge.png
diff --git a/src/afd/sprites/front/0692--000--Clauncher.png b/src/afd/sprites/front/0692-000-Clauncher.png
similarity index 100%
rename from src/afd/sprites/front/0692--000--Clauncher.png
rename to src/afd/sprites/front/0692-000-Clauncher.png
diff --git a/src/afd/sprites/front/0693--000--Clawitzer.png b/src/afd/sprites/front/0693-000-Clawitzer.png
similarity index 100%
rename from src/afd/sprites/front/0693--000--Clawitzer.png
rename to src/afd/sprites/front/0693-000-Clawitzer.png
diff --git a/src/afd/sprites/front/0694--000--Helioptile.png b/src/afd/sprites/front/0694-000-Helioptile.png
similarity index 100%
rename from src/afd/sprites/front/0694--000--Helioptile.png
rename to src/afd/sprites/front/0694-000-Helioptile.png
diff --git a/src/afd/sprites/front/0695--000--Heliolisk.png b/src/afd/sprites/front/0695-000-Heliolisk.png
similarity index 100%
rename from src/afd/sprites/front/0695--000--Heliolisk.png
rename to src/afd/sprites/front/0695-000-Heliolisk.png
diff --git a/src/afd/sprites/front/0696--000--Tyrunt.png b/src/afd/sprites/front/0696-000-Tyrunt.png
similarity index 100%
rename from src/afd/sprites/front/0696--000--Tyrunt.png
rename to src/afd/sprites/front/0696-000-Tyrunt.png
diff --git a/src/afd/sprites/front/0697--000--Tyrantrum.png b/src/afd/sprites/front/0697-000-Tyrantrum.png
similarity index 100%
rename from src/afd/sprites/front/0697--000--Tyrantrum.png
rename to src/afd/sprites/front/0697-000-Tyrantrum.png
diff --git a/src/afd/sprites/front/0698--000--Amaura.png b/src/afd/sprites/front/0698-000-Amaura.png
similarity index 100%
rename from src/afd/sprites/front/0698--000--Amaura.png
rename to src/afd/sprites/front/0698-000-Amaura.png
diff --git a/src/afd/sprites/front/0699--000--Aurorus.png b/src/afd/sprites/front/0699-000-Aurorus.png
similarity index 100%
rename from src/afd/sprites/front/0699--000--Aurorus.png
rename to src/afd/sprites/front/0699-000-Aurorus.png
diff --git a/src/afd/sprites/front/0700--000--Sylveon.png b/src/afd/sprites/front/0700-000-Sylveon.png
similarity index 100%
rename from src/afd/sprites/front/0700--000--Sylveon.png
rename to src/afd/sprites/front/0700-000-Sylveon.png
diff --git a/src/afd/sprites/front/0701--000--Hawlucha.png b/src/afd/sprites/front/0701-000-Hawlucha.png
similarity index 100%
rename from src/afd/sprites/front/0701--000--Hawlucha.png
rename to src/afd/sprites/front/0701-000-Hawlucha.png
diff --git a/src/afd/sprites/front/0702--000--Dedenne.png b/src/afd/sprites/front/0702-000-Dedenne.png
similarity index 100%
rename from src/afd/sprites/front/0702--000--Dedenne.png
rename to src/afd/sprites/front/0702-000-Dedenne.png
diff --git a/src/afd/sprites/front/0703--000--Carbink.png b/src/afd/sprites/front/0703-000-Carbink.png
similarity index 100%
rename from src/afd/sprites/front/0703--000--Carbink.png
rename to src/afd/sprites/front/0703-000-Carbink.png
diff --git a/src/afd/sprites/front/0704--000--Goomy.png b/src/afd/sprites/front/0704-000-Goomy.png
similarity index 100%
rename from src/afd/sprites/front/0704--000--Goomy.png
rename to src/afd/sprites/front/0704-000-Goomy.png
diff --git a/src/afd/sprites/front/0705--000--Sliggoo.png b/src/afd/sprites/front/0705-000-Sliggoo.png
similarity index 100%
rename from src/afd/sprites/front/0705--000--Sliggoo.png
rename to src/afd/sprites/front/0705-000-Sliggoo.png
diff --git a/src/afd/sprites/front/0706--000--Goodra.png b/src/afd/sprites/front/0706-000-Goodra.png
similarity index 100%
rename from src/afd/sprites/front/0706--000--Goodra.png
rename to src/afd/sprites/front/0706-000-Goodra.png
diff --git a/src/afd/sprites/front/0707--000--Klefki.png b/src/afd/sprites/front/0707-000-Klefki.png
similarity index 100%
rename from src/afd/sprites/front/0707--000--Klefki.png
rename to src/afd/sprites/front/0707-000-Klefki.png
diff --git a/src/afd/sprites/front/0708--000--Phantump.png b/src/afd/sprites/front/0708-000-Phantump.png
similarity index 100%
rename from src/afd/sprites/front/0708--000--Phantump.png
rename to src/afd/sprites/front/0708-000-Phantump.png
diff --git a/src/afd/sprites/front/0709--000--Trevenant.png b/src/afd/sprites/front/0709-000-Trevenant.png
similarity index 100%
rename from src/afd/sprites/front/0709--000--Trevenant.png
rename to src/afd/sprites/front/0709-000-Trevenant.png
diff --git a/src/afd/sprites/front/0710--000--Pumpkaboo.png b/src/afd/sprites/front/0710-000-Pumpkaboo.png
similarity index 100%
rename from src/afd/sprites/front/0710--000--Pumpkaboo.png
rename to src/afd/sprites/front/0710-000-Pumpkaboo.png
diff --git a/src/afd/sprites/front/0710--420--Pumpkaboo--Large.png b/src/afd/sprites/front/0710-420-Pumpkaboo-Large.png
similarity index 100%
rename from src/afd/sprites/front/0710--420--Pumpkaboo--Large.png
rename to src/afd/sprites/front/0710-420-Pumpkaboo-Large.png
diff --git a/src/afd/sprites/front/0710--420--Pumpkaboo--Small.png b/src/afd/sprites/front/0710-420-Pumpkaboo-Small.png
similarity index 100%
rename from src/afd/sprites/front/0710--420--Pumpkaboo--Small.png
rename to src/afd/sprites/front/0710-420-Pumpkaboo-Small.png
diff --git a/src/afd/sprites/front/0710--420--Pumpkaboo--Super.png b/src/afd/sprites/front/0710-420-Pumpkaboo-Super.png
similarity index 100%
rename from src/afd/sprites/front/0710--420--Pumpkaboo--Super.png
rename to src/afd/sprites/front/0710-420-Pumpkaboo-Super.png
diff --git a/src/afd/sprites/front/0711--000--Gourgeist.png b/src/afd/sprites/front/0711-000-Gourgeist.png
similarity index 100%
rename from src/afd/sprites/front/0711--000--Gourgeist.png
rename to src/afd/sprites/front/0711-000-Gourgeist.png
diff --git a/src/afd/sprites/front/0711--420--Gourgeist--Large.png b/src/afd/sprites/front/0711-420-Gourgeist-Large.png
similarity index 100%
rename from src/afd/sprites/front/0711--420--Gourgeist--Large.png
rename to src/afd/sprites/front/0711-420-Gourgeist-Large.png
diff --git a/src/afd/sprites/front/0711--420--Gourgeist--Small.png b/src/afd/sprites/front/0711-420-Gourgeist-Small.png
similarity index 100%
rename from src/afd/sprites/front/0711--420--Gourgeist--Small.png
rename to src/afd/sprites/front/0711-420-Gourgeist-Small.png
diff --git a/src/afd/sprites/front/0711--420--Gourgeist--Super.png b/src/afd/sprites/front/0711-420-Gourgeist-Super.png
similarity index 100%
rename from src/afd/sprites/front/0711--420--Gourgeist--Super.png
rename to src/afd/sprites/front/0711-420-Gourgeist-Super.png
diff --git a/src/afd/sprites/front/0712--000--Bergmite.png b/src/afd/sprites/front/0712-000-Bergmite.png
similarity index 100%
rename from src/afd/sprites/front/0712--000--Bergmite.png
rename to src/afd/sprites/front/0712-000-Bergmite.png
diff --git a/src/afd/sprites/front/0713--000--Avalugg.png b/src/afd/sprites/front/0713-000-Avalugg.png
similarity index 100%
rename from src/afd/sprites/front/0713--000--Avalugg.png
rename to src/afd/sprites/front/0713-000-Avalugg.png
diff --git a/src/afd/sprites/front/0714--000--Noibat.png b/src/afd/sprites/front/0714-000-Noibat.png
similarity index 100%
rename from src/afd/sprites/front/0714--000--Noibat.png
rename to src/afd/sprites/front/0714-000-Noibat.png
diff --git a/src/afd/sprites/front/0715--000--Noivern.png b/src/afd/sprites/front/0715-000-Noivern.png
similarity index 100%
rename from src/afd/sprites/front/0715--000--Noivern.png
rename to src/afd/sprites/front/0715-000-Noivern.png
diff --git a/src/afd/sprites/front/0716--000--Xerneas.png b/src/afd/sprites/front/0716-000-Xerneas.png
similarity index 100%
rename from src/afd/sprites/front/0716--000--Xerneas.png
rename to src/afd/sprites/front/0716-000-Xerneas.png
diff --git a/src/afd/sprites/front/0717--000--Yveltal.png b/src/afd/sprites/front/0717-000-Yveltal.png
similarity index 100%
rename from src/afd/sprites/front/0717--000--Yveltal.png
rename to src/afd/sprites/front/0717-000-Yveltal.png
diff --git a/src/afd/sprites/front/0718--000--Zygarde.png b/src/afd/sprites/front/0718-000-Zygarde.png
similarity index 100%
rename from src/afd/sprites/front/0718--000--Zygarde.png
rename to src/afd/sprites/front/0718-000-Zygarde.png
diff --git a/src/afd/sprites/front/0718--420--Zygarde--10__0025.png b/src/afd/sprites/front/0718-420-Zygarde-10__0025.png
similarity index 100%
rename from src/afd/sprites/front/0718--420--Zygarde--10__0025.png
rename to src/afd/sprites/front/0718-420-Zygarde-10__0025.png
diff --git a/src/afd/sprites/front/0718--420--Zygarde--Complete.png b/src/afd/sprites/front/0718-420-Zygarde-Complete.png
similarity index 100%
rename from src/afd/sprites/front/0718--420--Zygarde--Complete.png
rename to src/afd/sprites/front/0718-420-Zygarde-Complete.png
diff --git a/src/afd/sprites/front/0719--000--Diancie.png b/src/afd/sprites/front/0719-000-Diancie.png
similarity index 100%
rename from src/afd/sprites/front/0719--000--Diancie.png
rename to src/afd/sprites/front/0719-000-Diancie.png
diff --git a/src/afd/sprites/front/0719--420--Diancie--Mega.png b/src/afd/sprites/front/0719-420-Diancie-Mega.png
similarity index 100%
rename from src/afd/sprites/front/0719--420--Diancie--Mega.png
rename to src/afd/sprites/front/0719-420-Diancie-Mega.png
diff --git a/src/afd/sprites/front/0720--000--Hoopa.png b/src/afd/sprites/front/0720-000-Hoopa.png
similarity index 100%
rename from src/afd/sprites/front/0720--000--Hoopa.png
rename to src/afd/sprites/front/0720-000-Hoopa.png
diff --git a/src/afd/sprites/front/0720--420--Hoopa--Unbound.png b/src/afd/sprites/front/0720-420-Hoopa-Unbound.png
similarity index 100%
rename from src/afd/sprites/front/0720--420--Hoopa--Unbound.png
rename to src/afd/sprites/front/0720-420-Hoopa-Unbound.png
diff --git a/src/afd/sprites/front/0721--000--Volcanion.png b/src/afd/sprites/front/0721-000-Volcanion.png
similarity index 100%
rename from src/afd/sprites/front/0721--000--Volcanion.png
rename to src/afd/sprites/front/0721-000-Volcanion.png
diff --git a/src/afd/sprites/front/0722--000--Rowlet.png b/src/afd/sprites/front/0722-000-Rowlet.png
similarity index 100%
rename from src/afd/sprites/front/0722--000--Rowlet.png
rename to src/afd/sprites/front/0722-000-Rowlet.png
diff --git a/src/afd/sprites/front/0723--000--Dartrix.png b/src/afd/sprites/front/0723-000-Dartrix.png
similarity index 100%
rename from src/afd/sprites/front/0723--000--Dartrix.png
rename to src/afd/sprites/front/0723-000-Dartrix.png
diff --git a/src/afd/sprites/front/0724--000--Decidueye.png b/src/afd/sprites/front/0724-000-Decidueye.png
similarity index 100%
rename from src/afd/sprites/front/0724--000--Decidueye.png
rename to src/afd/sprites/front/0724-000-Decidueye.png
diff --git a/src/afd/sprites/front/0725--000--Litten.png b/src/afd/sprites/front/0725-000-Litten.png
similarity index 100%
rename from src/afd/sprites/front/0725--000--Litten.png
rename to src/afd/sprites/front/0725-000-Litten.png
diff --git a/src/afd/sprites/front/0726--000--Torracat.png b/src/afd/sprites/front/0726-000-Torracat.png
similarity index 100%
rename from src/afd/sprites/front/0726--000--Torracat.png
rename to src/afd/sprites/front/0726-000-Torracat.png
diff --git a/src/afd/sprites/front/0727--000--Incineroar.png b/src/afd/sprites/front/0727-000-Incineroar.png
similarity index 100%
rename from src/afd/sprites/front/0727--000--Incineroar.png
rename to src/afd/sprites/front/0727-000-Incineroar.png
diff --git a/src/afd/sprites/front/0728--000--Popplio.png b/src/afd/sprites/front/0728-000-Popplio.png
similarity index 100%
rename from src/afd/sprites/front/0728--000--Popplio.png
rename to src/afd/sprites/front/0728-000-Popplio.png
diff --git a/src/afd/sprites/front/0729--000--Brionne.png b/src/afd/sprites/front/0729-000-Brionne.png
similarity index 100%
rename from src/afd/sprites/front/0729--000--Brionne.png
rename to src/afd/sprites/front/0729-000-Brionne.png
diff --git a/src/afd/sprites/front/0730--000--Primarina.png b/src/afd/sprites/front/0730-000-Primarina.png
similarity index 100%
rename from src/afd/sprites/front/0730--000--Primarina.png
rename to src/afd/sprites/front/0730-000-Primarina.png
diff --git a/src/afd/sprites/front/0731--000--Pikipek.png b/src/afd/sprites/front/0731-000-Pikipek.png
similarity index 100%
rename from src/afd/sprites/front/0731--000--Pikipek.png
rename to src/afd/sprites/front/0731-000-Pikipek.png
diff --git a/src/afd/sprites/front/0732--000--Trumbeak.png b/src/afd/sprites/front/0732-000-Trumbeak.png
similarity index 100%
rename from src/afd/sprites/front/0732--000--Trumbeak.png
rename to src/afd/sprites/front/0732-000-Trumbeak.png
diff --git a/src/afd/sprites/front/0733--000--Toucannon.png b/src/afd/sprites/front/0733-000-Toucannon.png
similarity index 100%
rename from src/afd/sprites/front/0733--000--Toucannon.png
rename to src/afd/sprites/front/0733-000-Toucannon.png
diff --git a/src/afd/sprites/front/0734--000--Yungoos.png b/src/afd/sprites/front/0734-000-Yungoos.png
similarity index 100%
rename from src/afd/sprites/front/0734--000--Yungoos.png
rename to src/afd/sprites/front/0734-000-Yungoos.png
diff --git a/src/afd/sprites/front/0735--000--Gumshoos.png b/src/afd/sprites/front/0735-000-Gumshoos.png
similarity index 100%
rename from src/afd/sprites/front/0735--000--Gumshoos.png
rename to src/afd/sprites/front/0735-000-Gumshoos.png
diff --git a/src/afd/sprites/front/0736--000--Grubbin.png b/src/afd/sprites/front/0736-000-Grubbin.png
similarity index 100%
rename from src/afd/sprites/front/0736--000--Grubbin.png
rename to src/afd/sprites/front/0736-000-Grubbin.png
diff --git a/src/afd/sprites/front/0737--000--Charjabug.png b/src/afd/sprites/front/0737-000-Charjabug.png
similarity index 100%
rename from src/afd/sprites/front/0737--000--Charjabug.png
rename to src/afd/sprites/front/0737-000-Charjabug.png
diff --git a/src/afd/sprites/front/0738--000--Vikavolt.png b/src/afd/sprites/front/0738-000-Vikavolt.png
similarity index 100%
rename from src/afd/sprites/front/0738--000--Vikavolt.png
rename to src/afd/sprites/front/0738-000-Vikavolt.png
diff --git a/src/afd/sprites/front/0739--000--Crabrawler.png b/src/afd/sprites/front/0739-000-Crabrawler.png
similarity index 100%
rename from src/afd/sprites/front/0739--000--Crabrawler.png
rename to src/afd/sprites/front/0739-000-Crabrawler.png
diff --git a/src/afd/sprites/front/0740--000--Crabominable.png b/src/afd/sprites/front/0740-000-Crabominable.png
similarity index 100%
rename from src/afd/sprites/front/0740--000--Crabominable.png
rename to src/afd/sprites/front/0740-000-Crabominable.png
diff --git a/src/afd/sprites/front/0741--000--Oricorio.png b/src/afd/sprites/front/0741-000-Oricorio.png
similarity index 100%
rename from src/afd/sprites/front/0741--000--Oricorio.png
rename to src/afd/sprites/front/0741-000-Oricorio.png
diff --git a/src/afd/sprites/front/0741--420--Oricorio--Pa__0027u.png b/src/afd/sprites/front/0741-420-Oricorio-Pa__0027u.png
similarity index 100%
rename from src/afd/sprites/front/0741--420--Oricorio--Pa__0027u.png
rename to src/afd/sprites/front/0741-420-Oricorio-Pa__0027u.png
diff --git a/src/afd/sprites/front/0741--420--Oricorio--Pom-Pom.png b/src/afd/sprites/front/0741-420-Oricorio-Pom~Pom.png
similarity index 100%
rename from src/afd/sprites/front/0741--420--Oricorio--Pom-Pom.png
rename to src/afd/sprites/front/0741-420-Oricorio-Pom~Pom.png
diff --git a/src/afd/sprites/front/0741--420--Oricorio--Sensu.png b/src/afd/sprites/front/0741-420-Oricorio-Sensu.png
similarity index 100%
rename from src/afd/sprites/front/0741--420--Oricorio--Sensu.png
rename to src/afd/sprites/front/0741-420-Oricorio-Sensu.png
diff --git a/src/afd/sprites/front/0742--000--Cutiefly.png b/src/afd/sprites/front/0742-000-Cutiefly.png
similarity index 100%
rename from src/afd/sprites/front/0742--000--Cutiefly.png
rename to src/afd/sprites/front/0742-000-Cutiefly.png
diff --git a/src/afd/sprites/front/0743--000--Ribombee.png b/src/afd/sprites/front/0743-000-Ribombee.png
similarity index 100%
rename from src/afd/sprites/front/0743--000--Ribombee.png
rename to src/afd/sprites/front/0743-000-Ribombee.png
diff --git a/src/afd/sprites/front/0744--000--Rockruff.png b/src/afd/sprites/front/0744-000-Rockruff.png
similarity index 100%
rename from src/afd/sprites/front/0744--000--Rockruff.png
rename to src/afd/sprites/front/0744-000-Rockruff.png
diff --git a/src/afd/sprites/front/0745--000--Lycanroc.png b/src/afd/sprites/front/0745-000-Lycanroc.png
similarity index 100%
rename from src/afd/sprites/front/0745--000--Lycanroc.png
rename to src/afd/sprites/front/0745-000-Lycanroc.png
diff --git a/src/afd/sprites/front/0745--420--Lycanroc--Dusk.png b/src/afd/sprites/front/0745-420-Lycanroc-Dusk.png
similarity index 100%
rename from src/afd/sprites/front/0745--420--Lycanroc--Dusk.png
rename to src/afd/sprites/front/0745-420-Lycanroc-Dusk.png
diff --git a/src/afd/sprites/front/0745--420--Lycanroc--Midnight.png b/src/afd/sprites/front/0745-420-Lycanroc-Midnight.png
similarity index 100%
rename from src/afd/sprites/front/0745--420--Lycanroc--Midnight.png
rename to src/afd/sprites/front/0745-420-Lycanroc-Midnight.png
diff --git a/src/afd/sprites/front/0746--000--Wishiwashi.png b/src/afd/sprites/front/0746-000-Wishiwashi.png
similarity index 100%
rename from src/afd/sprites/front/0746--000--Wishiwashi.png
rename to src/afd/sprites/front/0746-000-Wishiwashi.png
diff --git a/src/afd/sprites/front/0746--420--Wishiwashi--School.png b/src/afd/sprites/front/0746-420-Wishiwashi-School.png
similarity index 100%
rename from src/afd/sprites/front/0746--420--Wishiwashi--School.png
rename to src/afd/sprites/front/0746-420-Wishiwashi-School.png
diff --git a/src/afd/sprites/front/0747--000--Mareanie.png b/src/afd/sprites/front/0747-000-Mareanie.png
similarity index 100%
rename from src/afd/sprites/front/0747--000--Mareanie.png
rename to src/afd/sprites/front/0747-000-Mareanie.png
diff --git a/src/afd/sprites/front/0748--000--Toxapex.png b/src/afd/sprites/front/0748-000-Toxapex.png
similarity index 100%
rename from src/afd/sprites/front/0748--000--Toxapex.png
rename to src/afd/sprites/front/0748-000-Toxapex.png
diff --git a/src/afd/sprites/front/0749--000--Mudbray.png b/src/afd/sprites/front/0749-000-Mudbray.png
similarity index 100%
rename from src/afd/sprites/front/0749--000--Mudbray.png
rename to src/afd/sprites/front/0749-000-Mudbray.png
diff --git a/src/afd/sprites/front/0750--000--Mudsdale.png b/src/afd/sprites/front/0750-000-Mudsdale.png
similarity index 100%
rename from src/afd/sprites/front/0750--000--Mudsdale.png
rename to src/afd/sprites/front/0750-000-Mudsdale.png
diff --git a/src/afd/sprites/front/0751--000--Dewpider.png b/src/afd/sprites/front/0751-000-Dewpider.png
similarity index 100%
rename from src/afd/sprites/front/0751--000--Dewpider.png
rename to src/afd/sprites/front/0751-000-Dewpider.png
diff --git a/src/afd/sprites/front/0752--000--Araquanid.png b/src/afd/sprites/front/0752-000-Araquanid.png
similarity index 100%
rename from src/afd/sprites/front/0752--000--Araquanid.png
rename to src/afd/sprites/front/0752-000-Araquanid.png
diff --git a/src/afd/sprites/front/0754--000--Lurantis.png b/src/afd/sprites/front/0754-000-Lurantis.png
similarity index 100%
rename from src/afd/sprites/front/0754--000--Lurantis.png
rename to src/afd/sprites/front/0754-000-Lurantis.png
diff --git a/src/afd/sprites/front/0755--000--Morelull.png b/src/afd/sprites/front/0755-000-Morelull.png
similarity index 100%
rename from src/afd/sprites/front/0755--000--Morelull.png
rename to src/afd/sprites/front/0755-000-Morelull.png
diff --git a/src/afd/sprites/front/0756--000--Shiinotic.png b/src/afd/sprites/front/0756-000-Shiinotic.png
similarity index 100%
rename from src/afd/sprites/front/0756--000--Shiinotic.png
rename to src/afd/sprites/front/0756-000-Shiinotic.png
diff --git a/src/afd/sprites/front/0757--000--Salandit.png b/src/afd/sprites/front/0757-000-Salandit.png
similarity index 100%
rename from src/afd/sprites/front/0757--000--Salandit.png
rename to src/afd/sprites/front/0757-000-Salandit.png
diff --git a/src/afd/sprites/front/0758--000--Salazzle.png b/src/afd/sprites/front/0758-000-Salazzle.png
similarity index 100%
rename from src/afd/sprites/front/0758--000--Salazzle.png
rename to src/afd/sprites/front/0758-000-Salazzle.png
diff --git a/src/afd/sprites/front/0759--000--Stufful.png b/src/afd/sprites/front/0759-000-Stufful.png
similarity index 100%
rename from src/afd/sprites/front/0759--000--Stufful.png
rename to src/afd/sprites/front/0759-000-Stufful.png
diff --git a/src/afd/sprites/front/0760--000--Bewear.png b/src/afd/sprites/front/0760-000-Bewear.png
similarity index 100%
rename from src/afd/sprites/front/0760--000--Bewear.png
rename to src/afd/sprites/front/0760-000-Bewear.png
diff --git a/src/afd/sprites/front/0761--000--Bounsweet.png b/src/afd/sprites/front/0761-000-Bounsweet.png
similarity index 100%
rename from src/afd/sprites/front/0761--000--Bounsweet.png
rename to src/afd/sprites/front/0761-000-Bounsweet.png
diff --git a/src/afd/sprites/front/0762--000--Steenee.png b/src/afd/sprites/front/0762-000-Steenee.png
similarity index 100%
rename from src/afd/sprites/front/0762--000--Steenee.png
rename to src/afd/sprites/front/0762-000-Steenee.png
diff --git a/src/afd/sprites/front/0763--000--Tsareena.png b/src/afd/sprites/front/0763-000-Tsareena.png
similarity index 100%
rename from src/afd/sprites/front/0763--000--Tsareena.png
rename to src/afd/sprites/front/0763-000-Tsareena.png
diff --git a/src/afd/sprites/front/0764--000--Comfey.png b/src/afd/sprites/front/0764-000-Comfey.png
similarity index 100%
rename from src/afd/sprites/front/0764--000--Comfey.png
rename to src/afd/sprites/front/0764-000-Comfey.png
diff --git a/src/afd/sprites/front/0765--000--Oranguru.png b/src/afd/sprites/front/0765-000-Oranguru.png
similarity index 100%
rename from src/afd/sprites/front/0765--000--Oranguru.png
rename to src/afd/sprites/front/0765-000-Oranguru.png
diff --git a/src/afd/sprites/front/0766--000--Passimian.png b/src/afd/sprites/front/0766-000-Passimian.png
similarity index 100%
rename from src/afd/sprites/front/0766--000--Passimian.png
rename to src/afd/sprites/front/0766-000-Passimian.png
diff --git a/src/afd/sprites/front/0767--000--Wimpod.png b/src/afd/sprites/front/0767-000-Wimpod.png
similarity index 100%
rename from src/afd/sprites/front/0767--000--Wimpod.png
rename to src/afd/sprites/front/0767-000-Wimpod.png
diff --git a/src/afd/sprites/front/0768--000--Golisopod.png b/src/afd/sprites/front/0768-000-Golisopod.png
similarity index 100%
rename from src/afd/sprites/front/0768--000--Golisopod.png
rename to src/afd/sprites/front/0768-000-Golisopod.png
diff --git a/src/afd/sprites/front/0769--000--Sandygast.png b/src/afd/sprites/front/0769-000-Sandygast.png
similarity index 100%
rename from src/afd/sprites/front/0769--000--Sandygast.png
rename to src/afd/sprites/front/0769-000-Sandygast.png
diff --git a/src/afd/sprites/front/0770--000--Palossand.png b/src/afd/sprites/front/0770-000-Palossand.png
similarity index 100%
rename from src/afd/sprites/front/0770--000--Palossand.png
rename to src/afd/sprites/front/0770-000-Palossand.png
diff --git a/src/afd/sprites/front/0771--000--Pyukumuku.png b/src/afd/sprites/front/0771-000-Pyukumuku.png
similarity index 100%
rename from src/afd/sprites/front/0771--000--Pyukumuku.png
rename to src/afd/sprites/front/0771-000-Pyukumuku.png
diff --git a/src/afd/sprites/front/0772--000--Type__003a_Null.png b/src/afd/sprites/front/0772-000-Type__003a_Null.png
similarity index 100%
rename from src/afd/sprites/front/0772--000--Type__003a_Null.png
rename to src/afd/sprites/front/0772-000-Type__003a_Null.png
diff --git a/src/afd/sprites/front/0773--000--Silvally.png b/src/afd/sprites/front/0773-000-Silvally.png
similarity index 100%
rename from src/afd/sprites/front/0773--000--Silvally.png
rename to src/afd/sprites/front/0773-000-Silvally.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Bug.png b/src/afd/sprites/front/0773-420-Silvally-Bug.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Bug.png
rename to src/afd/sprites/front/0773-420-Silvally-Bug.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Dark.png b/src/afd/sprites/front/0773-420-Silvally-Dark.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Dark.png
rename to src/afd/sprites/front/0773-420-Silvally-Dark.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Dragon.png b/src/afd/sprites/front/0773-420-Silvally-Dragon.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Dragon.png
rename to src/afd/sprites/front/0773-420-Silvally-Dragon.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Electric.png b/src/afd/sprites/front/0773-420-Silvally-Electric.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Electric.png
rename to src/afd/sprites/front/0773-420-Silvally-Electric.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Fairy.png b/src/afd/sprites/front/0773-420-Silvally-Fairy.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Fairy.png
rename to src/afd/sprites/front/0773-420-Silvally-Fairy.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Fighting.png b/src/afd/sprites/front/0773-420-Silvally-Fighting.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Fighting.png
rename to src/afd/sprites/front/0773-420-Silvally-Fighting.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Fire.png b/src/afd/sprites/front/0773-420-Silvally-Fire.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Fire.png
rename to src/afd/sprites/front/0773-420-Silvally-Fire.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Flying.png b/src/afd/sprites/front/0773-420-Silvally-Flying.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Flying.png
rename to src/afd/sprites/front/0773-420-Silvally-Flying.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Ghost.png b/src/afd/sprites/front/0773-420-Silvally-Ghost.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Ghost.png
rename to src/afd/sprites/front/0773-420-Silvally-Ghost.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Grass.png b/src/afd/sprites/front/0773-420-Silvally-Grass.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Grass.png
rename to src/afd/sprites/front/0773-420-Silvally-Grass.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Ground.png b/src/afd/sprites/front/0773-420-Silvally-Ground.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Ground.png
rename to src/afd/sprites/front/0773-420-Silvally-Ground.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Ice.png b/src/afd/sprites/front/0773-420-Silvally-Ice.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Ice.png
rename to src/afd/sprites/front/0773-420-Silvally-Ice.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Poison.png b/src/afd/sprites/front/0773-420-Silvally-Poison.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Poison.png
rename to src/afd/sprites/front/0773-420-Silvally-Poison.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Psychic.png b/src/afd/sprites/front/0773-420-Silvally-Psychic.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Psychic.png
rename to src/afd/sprites/front/0773-420-Silvally-Psychic.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Rock.png b/src/afd/sprites/front/0773-420-Silvally-Rock.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Rock.png
rename to src/afd/sprites/front/0773-420-Silvally-Rock.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Steel.png b/src/afd/sprites/front/0773-420-Silvally-Steel.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Steel.png
rename to src/afd/sprites/front/0773-420-Silvally-Steel.png
diff --git a/src/afd/sprites/front/0773--420--Silvally--Water.png b/src/afd/sprites/front/0773-420-Silvally-Water.png
similarity index 100%
rename from src/afd/sprites/front/0773--420--Silvally--Water.png
rename to src/afd/sprites/front/0773-420-Silvally-Water.png
diff --git a/src/afd/sprites/front/0774--000--Minior.png b/src/afd/sprites/front/0774-000-Minior.png
similarity index 100%
rename from src/afd/sprites/front/0774--000--Minior.png
rename to src/afd/sprites/front/0774-000-Minior.png
diff --git a/src/afd/sprites/front/0774--420--Minior--Meteor.png b/src/afd/sprites/front/0774-420-Minior-Meteor.png
similarity index 100%
rename from src/afd/sprites/front/0774--420--Minior--Meteor.png
rename to src/afd/sprites/front/0774-420-Minior-Meteor.png
diff --git a/src/afd/sprites/front/0775--000--Komala.png b/src/afd/sprites/front/0775-000-Komala.png
similarity index 100%
rename from src/afd/sprites/front/0775--000--Komala.png
rename to src/afd/sprites/front/0775-000-Komala.png
diff --git a/src/afd/sprites/front/0776--000--Turtonator.png b/src/afd/sprites/front/0776-000-Turtonator.png
similarity index 100%
rename from src/afd/sprites/front/0776--000--Turtonator.png
rename to src/afd/sprites/front/0776-000-Turtonator.png
diff --git a/src/afd/sprites/front/0777--000--Togedemaru.png b/src/afd/sprites/front/0777-000-Togedemaru.png
similarity index 100%
rename from src/afd/sprites/front/0777--000--Togedemaru.png
rename to src/afd/sprites/front/0777-000-Togedemaru.png
diff --git a/src/afd/sprites/front/0778--000--Mimikyu.png b/src/afd/sprites/front/0778-000-Mimikyu.png
similarity index 100%
rename from src/afd/sprites/front/0778--000--Mimikyu.png
rename to src/afd/sprites/front/0778-000-Mimikyu.png
diff --git a/src/afd/sprites/front/0778--420--Mimikyu--Busted.png b/src/afd/sprites/front/0778-420-Mimikyu-Busted.png
similarity index 100%
rename from src/afd/sprites/front/0778--420--Mimikyu--Busted.png
rename to src/afd/sprites/front/0778-420-Mimikyu-Busted.png
diff --git a/src/afd/sprites/front/0779--000--Bruxish.png b/src/afd/sprites/front/0779-000-Bruxish.png
similarity index 100%
rename from src/afd/sprites/front/0779--000--Bruxish.png
rename to src/afd/sprites/front/0779-000-Bruxish.png
diff --git a/src/afd/sprites/front/0780--000--Drampa.png b/src/afd/sprites/front/0780-000-Drampa.png
similarity index 100%
rename from src/afd/sprites/front/0780--000--Drampa.png
rename to src/afd/sprites/front/0780-000-Drampa.png
diff --git a/src/afd/sprites/front/0781--000--Dhelmise.png b/src/afd/sprites/front/0781-000-Dhelmise.png
similarity index 100%
rename from src/afd/sprites/front/0781--000--Dhelmise.png
rename to src/afd/sprites/front/0781-000-Dhelmise.png
diff --git a/src/afd/sprites/front/0782--000--Jangmo-o.png b/src/afd/sprites/front/0782-000-Jangmo~o.png
similarity index 100%
rename from src/afd/sprites/front/0782--000--Jangmo-o.png
rename to src/afd/sprites/front/0782-000-Jangmo~o.png
diff --git a/src/afd/sprites/front/0783--000--Hakamo-o.png b/src/afd/sprites/front/0783-000-Hakamo~o.png
similarity index 100%
rename from src/afd/sprites/front/0783--000--Hakamo-o.png
rename to src/afd/sprites/front/0783-000-Hakamo~o.png
diff --git a/src/afd/sprites/front/0784--000--Kommo-o.png b/src/afd/sprites/front/0784-000-Kommo~o.png
similarity index 100%
rename from src/afd/sprites/front/0784--000--Kommo-o.png
rename to src/afd/sprites/front/0784-000-Kommo~o.png
diff --git a/src/afd/sprites/front/0785--000--Tapu_Koko.png b/src/afd/sprites/front/0785-000-Tapu_Koko.png
similarity index 100%
rename from src/afd/sprites/front/0785--000--Tapu_Koko.png
rename to src/afd/sprites/front/0785-000-Tapu_Koko.png
diff --git a/src/afd/sprites/front/0786--000--Tapu_Lele.png b/src/afd/sprites/front/0786-000-Tapu_Lele.png
similarity index 100%
rename from src/afd/sprites/front/0786--000--Tapu_Lele.png
rename to src/afd/sprites/front/0786-000-Tapu_Lele.png
diff --git a/src/afd/sprites/front/0787--000--Tapu_Bulu.png b/src/afd/sprites/front/0787-000-Tapu_Bulu.png
similarity index 100%
rename from src/afd/sprites/front/0787--000--Tapu_Bulu.png
rename to src/afd/sprites/front/0787-000-Tapu_Bulu.png
diff --git a/src/afd/sprites/front/0788--000--Tapu_Fini.png b/src/afd/sprites/front/0788-000-Tapu_Fini.png
similarity index 100%
rename from src/afd/sprites/front/0788--000--Tapu_Fini.png
rename to src/afd/sprites/front/0788-000-Tapu_Fini.png
diff --git a/src/afd/sprites/front/0789--000--Cosmog.png b/src/afd/sprites/front/0789-000-Cosmog.png
similarity index 100%
rename from src/afd/sprites/front/0789--000--Cosmog.png
rename to src/afd/sprites/front/0789-000-Cosmog.png
diff --git a/src/afd/sprites/front/0790--000--Cosmoem.png b/src/afd/sprites/front/0790-000-Cosmoem.png
similarity index 100%
rename from src/afd/sprites/front/0790--000--Cosmoem.png
rename to src/afd/sprites/front/0790-000-Cosmoem.png
diff --git a/src/afd/sprites/front/0791--000--Solgaleo.png b/src/afd/sprites/front/0791-000-Solgaleo.png
similarity index 100%
rename from src/afd/sprites/front/0791--000--Solgaleo.png
rename to src/afd/sprites/front/0791-000-Solgaleo.png
diff --git a/src/afd/sprites/front/0792--000--Lunala.png b/src/afd/sprites/front/0792-000-Lunala.png
similarity index 100%
rename from src/afd/sprites/front/0792--000--Lunala.png
rename to src/afd/sprites/front/0792-000-Lunala.png
diff --git a/src/afd/sprites/front/0793--000--Nihilego.png b/src/afd/sprites/front/0793-000-Nihilego.png
similarity index 100%
rename from src/afd/sprites/front/0793--000--Nihilego.png
rename to src/afd/sprites/front/0793-000-Nihilego.png
diff --git a/src/afd/sprites/front/0794--000--Buzzwole.png b/src/afd/sprites/front/0794-000-Buzzwole.png
similarity index 100%
rename from src/afd/sprites/front/0794--000--Buzzwole.png
rename to src/afd/sprites/front/0794-000-Buzzwole.png
diff --git a/src/afd/sprites/front/0795--000--Pheromosa.png b/src/afd/sprites/front/0795-000-Pheromosa.png
similarity index 100%
rename from src/afd/sprites/front/0795--000--Pheromosa.png
rename to src/afd/sprites/front/0795-000-Pheromosa.png
diff --git a/src/afd/sprites/front/0796--000--Xurkitree.png b/src/afd/sprites/front/0796-000-Xurkitree.png
similarity index 100%
rename from src/afd/sprites/front/0796--000--Xurkitree.png
rename to src/afd/sprites/front/0796-000-Xurkitree.png
diff --git a/src/afd/sprites/front/0797--000--Celesteela.png b/src/afd/sprites/front/0797-000-Celesteela.png
similarity index 100%
rename from src/afd/sprites/front/0797--000--Celesteela.png
rename to src/afd/sprites/front/0797-000-Celesteela.png
diff --git a/src/afd/sprites/front/0798--000--Kartana.png b/src/afd/sprites/front/0798-000-Kartana.png
similarity index 100%
rename from src/afd/sprites/front/0798--000--Kartana.png
rename to src/afd/sprites/front/0798-000-Kartana.png
diff --git a/src/afd/sprites/front/0799--000--Guzzlord.png b/src/afd/sprites/front/0799-000-Guzzlord.png
similarity index 100%
rename from src/afd/sprites/front/0799--000--Guzzlord.png
rename to src/afd/sprites/front/0799-000-Guzzlord.png
diff --git a/src/afd/sprites/front/0800--000--Necrozma.png b/src/afd/sprites/front/0800-000-Necrozma.png
similarity index 100%
rename from src/afd/sprites/front/0800--000--Necrozma.png
rename to src/afd/sprites/front/0800-000-Necrozma.png
diff --git a/src/afd/sprites/front/0800--420--Necrozma--Dawn-Wings.png b/src/afd/sprites/front/0800-420-Necrozma-Dawn~Wings.png
similarity index 100%
rename from src/afd/sprites/front/0800--420--Necrozma--Dawn-Wings.png
rename to src/afd/sprites/front/0800-420-Necrozma-Dawn~Wings.png
diff --git a/src/afd/sprites/front/0800--420--Necrozma--Dusk-Mane.png b/src/afd/sprites/front/0800-420-Necrozma-Dusk~Mane.png
similarity index 100%
rename from src/afd/sprites/front/0800--420--Necrozma--Dusk-Mane.png
rename to src/afd/sprites/front/0800-420-Necrozma-Dusk~Mane.png
diff --git a/src/afd/sprites/front/0800--420--Necrozma--Ultra.png b/src/afd/sprites/front/0800-420-Necrozma-Ultra.png
similarity index 100%
rename from src/afd/sprites/front/0800--420--Necrozma--Ultra.png
rename to src/afd/sprites/front/0800-420-Necrozma-Ultra.png
diff --git a/src/afd/sprites/front/0801--000--Magearna.png b/src/afd/sprites/front/0801-000-Magearna.png
similarity index 100%
rename from src/afd/sprites/front/0801--000--Magearna.png
rename to src/afd/sprites/front/0801-000-Magearna.png
diff --git a/src/afd/sprites/front/0802--000--Marshadow.png b/src/afd/sprites/front/0802-000-Marshadow.png
similarity index 100%
rename from src/afd/sprites/front/0802--000--Marshadow.png
rename to src/afd/sprites/front/0802-000-Marshadow.png
diff --git a/src/afd/sprites/front/0803--000--Poipole.png b/src/afd/sprites/front/0803-000-Poipole.png
similarity index 100%
rename from src/afd/sprites/front/0803--000--Poipole.png
rename to src/afd/sprites/front/0803-000-Poipole.png
diff --git a/src/afd/sprites/front/0804--000--Naganadel.png b/src/afd/sprites/front/0804-000-Naganadel.png
similarity index 100%
rename from src/afd/sprites/front/0804--000--Naganadel.png
rename to src/afd/sprites/front/0804-000-Naganadel.png
diff --git a/src/afd/sprites/front/0805--000--Stakataka.png b/src/afd/sprites/front/0805-000-Stakataka.png
similarity index 100%
rename from src/afd/sprites/front/0805--000--Stakataka.png
rename to src/afd/sprites/front/0805-000-Stakataka.png
diff --git a/src/afd/sprites/front/0806--000--Blacephalon.png b/src/afd/sprites/front/0806-000-Blacephalon.png
similarity index 100%
rename from src/afd/sprites/front/0806--000--Blacephalon.png
rename to src/afd/sprites/front/0806-000-Blacephalon.png
diff --git a/src/afd/sprites/front/0807--000--Zeraora.png b/src/afd/sprites/front/0807-000-Zeraora.png
similarity index 100%
rename from src/afd/sprites/front/0807--000--Zeraora.png
rename to src/afd/sprites/front/0807-000-Zeraora.png
diff --git a/src/afd/sprites/front/0808--000--Meltan.png b/src/afd/sprites/front/0808-000-Meltan.png
similarity index 100%
rename from src/afd/sprites/front/0808--000--Meltan.png
rename to src/afd/sprites/front/0808-000-Meltan.png
diff --git a/src/afd/sprites/front/0809--000--Melmetal.png b/src/afd/sprites/front/0809-000-Melmetal.png
similarity index 100%
rename from src/afd/sprites/front/0809--000--Melmetal.png
rename to src/afd/sprites/front/0809-000-Melmetal.png
diff --git a/src/afd/sprites/front/0809--420--Melmetal--Gmax.png b/src/afd/sprites/front/0809-420-Melmetal-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0809--420--Melmetal--Gmax.png
rename to src/afd/sprites/front/0809-420-Melmetal-Gmax.png
diff --git a/src/afd/sprites/front/0810--000--Grookey.png b/src/afd/sprites/front/0810-000-Grookey.png
similarity index 100%
rename from src/afd/sprites/front/0810--000--Grookey.png
rename to src/afd/sprites/front/0810-000-Grookey.png
diff --git a/src/afd/sprites/front/0811--000--Thwackey.png b/src/afd/sprites/front/0811-000-Thwackey.png
similarity index 100%
rename from src/afd/sprites/front/0811--000--Thwackey.png
rename to src/afd/sprites/front/0811-000-Thwackey.png
diff --git a/src/afd/sprites/front/0812--000--Rillaboom.png b/src/afd/sprites/front/0812-000-Rillaboom.png
similarity index 100%
rename from src/afd/sprites/front/0812--000--Rillaboom.png
rename to src/afd/sprites/front/0812-000-Rillaboom.png
diff --git a/src/afd/sprites/front/0813--000--Scorbunny.png b/src/afd/sprites/front/0813-000-Scorbunny.png
similarity index 100%
rename from src/afd/sprites/front/0813--000--Scorbunny.png
rename to src/afd/sprites/front/0813-000-Scorbunny.png
diff --git a/src/afd/sprites/front/0814--000--Raboot.png b/src/afd/sprites/front/0814-000-Raboot.png
similarity index 100%
rename from src/afd/sprites/front/0814--000--Raboot.png
rename to src/afd/sprites/front/0814-000-Raboot.png
diff --git a/src/afd/sprites/front/0815--000--Cinderace.png b/src/afd/sprites/front/0815-000-Cinderace.png
similarity index 100%
rename from src/afd/sprites/front/0815--000--Cinderace.png
rename to src/afd/sprites/front/0815-000-Cinderace.png
diff --git a/src/afd/sprites/front/0816--000--Sobble.png b/src/afd/sprites/front/0816-000-Sobble.png
similarity index 100%
rename from src/afd/sprites/front/0816--000--Sobble.png
rename to src/afd/sprites/front/0816-000-Sobble.png
diff --git a/src/afd/sprites/front/0817--000--Drizzile.png b/src/afd/sprites/front/0817-000-Drizzile.png
similarity index 100%
rename from src/afd/sprites/front/0817--000--Drizzile.png
rename to src/afd/sprites/front/0817-000-Drizzile.png
diff --git a/src/afd/sprites/front/0818--000--Inteleon.png b/src/afd/sprites/front/0818-000-Inteleon.png
similarity index 100%
rename from src/afd/sprites/front/0818--000--Inteleon.png
rename to src/afd/sprites/front/0818-000-Inteleon.png
diff --git a/src/afd/sprites/front/0819--000--Skwovet.png b/src/afd/sprites/front/0819-000-Skwovet.png
similarity index 100%
rename from src/afd/sprites/front/0819--000--Skwovet.png
rename to src/afd/sprites/front/0819-000-Skwovet.png
diff --git a/src/afd/sprites/front/0820--000--Greedent.png b/src/afd/sprites/front/0820-000-Greedent.png
similarity index 100%
rename from src/afd/sprites/front/0820--000--Greedent.png
rename to src/afd/sprites/front/0820-000-Greedent.png
diff --git a/src/afd/sprites/front/0821--000--Rookidee.png b/src/afd/sprites/front/0821-000-Rookidee.png
similarity index 100%
rename from src/afd/sprites/front/0821--000--Rookidee.png
rename to src/afd/sprites/front/0821-000-Rookidee.png
diff --git a/src/afd/sprites/front/0822--000--Corvisquire.png b/src/afd/sprites/front/0822-000-Corvisquire.png
similarity index 100%
rename from src/afd/sprites/front/0822--000--Corvisquire.png
rename to src/afd/sprites/front/0822-000-Corvisquire.png
diff --git a/src/afd/sprites/front/0823--000--Corviknight.png b/src/afd/sprites/front/0823-000-Corviknight.png
similarity index 100%
rename from src/afd/sprites/front/0823--000--Corviknight.png
rename to src/afd/sprites/front/0823-000-Corviknight.png
diff --git a/src/afd/sprites/front/0823--420--Corviknight--Gmax.png b/src/afd/sprites/front/0823-420-Corviknight-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0823--420--Corviknight--Gmax.png
rename to src/afd/sprites/front/0823-420-Corviknight-Gmax.png
diff --git a/src/afd/sprites/front/0824--000--Blipbug.png b/src/afd/sprites/front/0824-000-Blipbug.png
similarity index 100%
rename from src/afd/sprites/front/0824--000--Blipbug.png
rename to src/afd/sprites/front/0824-000-Blipbug.png
diff --git a/src/afd/sprites/front/0825--000--Dottler.png b/src/afd/sprites/front/0825-000-Dottler.png
similarity index 100%
rename from src/afd/sprites/front/0825--000--Dottler.png
rename to src/afd/sprites/front/0825-000-Dottler.png
diff --git a/src/afd/sprites/front/0826--000--Orbeetle.png b/src/afd/sprites/front/0826-000-Orbeetle.png
similarity index 100%
rename from src/afd/sprites/front/0826--000--Orbeetle.png
rename to src/afd/sprites/front/0826-000-Orbeetle.png
diff --git a/src/afd/sprites/front/0826--420--Orbeetle--Gmax.png b/src/afd/sprites/front/0826-420-Orbeetle-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0826--420--Orbeetle--Gmax.png
rename to src/afd/sprites/front/0826-420-Orbeetle-Gmax.png
diff --git a/src/afd/sprites/front/0827--000--Nickit.png b/src/afd/sprites/front/0827-000-Nickit.png
similarity index 100%
rename from src/afd/sprites/front/0827--000--Nickit.png
rename to src/afd/sprites/front/0827-000-Nickit.png
diff --git a/src/afd/sprites/front/0828--000--Thievul.png b/src/afd/sprites/front/0828-000-Thievul.png
similarity index 100%
rename from src/afd/sprites/front/0828--000--Thievul.png
rename to src/afd/sprites/front/0828-000-Thievul.png
diff --git a/src/afd/sprites/front/0829--000--Gossifleur.png b/src/afd/sprites/front/0829-000-Gossifleur.png
similarity index 100%
rename from src/afd/sprites/front/0829--000--Gossifleur.png
rename to src/afd/sprites/front/0829-000-Gossifleur.png
diff --git a/src/afd/sprites/front/0830--000--Eldegoss.png b/src/afd/sprites/front/0830-000-Eldegoss.png
similarity index 100%
rename from src/afd/sprites/front/0830--000--Eldegoss.png
rename to src/afd/sprites/front/0830-000-Eldegoss.png
diff --git a/src/afd/sprites/front/0831--000--Wooloo.png b/src/afd/sprites/front/0831-000-Wooloo.png
similarity index 100%
rename from src/afd/sprites/front/0831--000--Wooloo.png
rename to src/afd/sprites/front/0831-000-Wooloo.png
diff --git a/src/afd/sprites/front/0832--000--Dubwool.png b/src/afd/sprites/front/0832-000-Dubwool.png
similarity index 100%
rename from src/afd/sprites/front/0832--000--Dubwool.png
rename to src/afd/sprites/front/0832-000-Dubwool.png
diff --git a/src/afd/sprites/front/0833--000--Chewtle.png b/src/afd/sprites/front/0833-000-Chewtle.png
similarity index 100%
rename from src/afd/sprites/front/0833--000--Chewtle.png
rename to src/afd/sprites/front/0833-000-Chewtle.png
diff --git a/src/afd/sprites/front/0834--000--Drednaw.png b/src/afd/sprites/front/0834-000-Drednaw.png
similarity index 100%
rename from src/afd/sprites/front/0834--000--Drednaw.png
rename to src/afd/sprites/front/0834-000-Drednaw.png
diff --git a/src/afd/sprites/front/0834--420--Drednaw--Gmax.png b/src/afd/sprites/front/0834-420-Drednaw-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0834--420--Drednaw--Gmax.png
rename to src/afd/sprites/front/0834-420-Drednaw-Gmax.png
diff --git a/src/afd/sprites/front/0835--000--Yamper.png b/src/afd/sprites/front/0835-000-Yamper.png
similarity index 100%
rename from src/afd/sprites/front/0835--000--Yamper.png
rename to src/afd/sprites/front/0835-000-Yamper.png
diff --git a/src/afd/sprites/front/0836--000--Boltund.png b/src/afd/sprites/front/0836-000-Boltund.png
similarity index 100%
rename from src/afd/sprites/front/0836--000--Boltund.png
rename to src/afd/sprites/front/0836-000-Boltund.png
diff --git a/src/afd/sprites/front/0837--000--Rolycoly.png b/src/afd/sprites/front/0837-000-Rolycoly.png
similarity index 100%
rename from src/afd/sprites/front/0837--000--Rolycoly.png
rename to src/afd/sprites/front/0837-000-Rolycoly.png
diff --git a/src/afd/sprites/front/0838--000--Carkol.png b/src/afd/sprites/front/0838-000-Carkol.png
similarity index 100%
rename from src/afd/sprites/front/0838--000--Carkol.png
rename to src/afd/sprites/front/0838-000-Carkol.png
diff --git a/src/afd/sprites/front/0839--000--Coalossal.png b/src/afd/sprites/front/0839-000-Coalossal.png
similarity index 100%
rename from src/afd/sprites/front/0839--000--Coalossal.png
rename to src/afd/sprites/front/0839-000-Coalossal.png
diff --git a/src/afd/sprites/front/0839--420--Coalossal--Gmax.png b/src/afd/sprites/front/0839-420-Coalossal-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0839--420--Coalossal--Gmax.png
rename to src/afd/sprites/front/0839-420-Coalossal-Gmax.png
diff --git a/src/afd/sprites/front/0840--000--Applin.png b/src/afd/sprites/front/0840-000-Applin.png
similarity index 100%
rename from src/afd/sprites/front/0840--000--Applin.png
rename to src/afd/sprites/front/0840-000-Applin.png
diff --git a/src/afd/sprites/front/0841--000--Flapple.png b/src/afd/sprites/front/0841-000-Flapple.png
similarity index 100%
rename from src/afd/sprites/front/0841--000--Flapple.png
rename to src/afd/sprites/front/0841-000-Flapple.png
diff --git a/src/afd/sprites/front/0841--420--Flapple--Gmax.png b/src/afd/sprites/front/0841-420-Flapple-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0841--420--Flapple--Gmax.png
rename to src/afd/sprites/front/0841-420-Flapple-Gmax.png
diff --git a/src/afd/sprites/front/0842--000--Appletun.png b/src/afd/sprites/front/0842-000-Appletun.png
similarity index 100%
rename from src/afd/sprites/front/0842--000--Appletun.png
rename to src/afd/sprites/front/0842-000-Appletun.png
diff --git a/src/afd/sprites/front/0842--420--Appletun--Gmax.png b/src/afd/sprites/front/0842-420-Appletun-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0842--420--Appletun--Gmax.png
rename to src/afd/sprites/front/0842-420-Appletun-Gmax.png
diff --git a/src/afd/sprites/front/0843--000--Silicobra.png b/src/afd/sprites/front/0843-000-Silicobra.png
similarity index 100%
rename from src/afd/sprites/front/0843--000--Silicobra.png
rename to src/afd/sprites/front/0843-000-Silicobra.png
diff --git a/src/afd/sprites/front/0844--000--Sandaconda.png b/src/afd/sprites/front/0844-000-Sandaconda.png
similarity index 100%
rename from src/afd/sprites/front/0844--000--Sandaconda.png
rename to src/afd/sprites/front/0844-000-Sandaconda.png
diff --git a/src/afd/sprites/front/0844--420--Sandaconda--Gmax.png b/src/afd/sprites/front/0844-420-Sandaconda-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0844--420--Sandaconda--Gmax.png
rename to src/afd/sprites/front/0844-420-Sandaconda-Gmax.png
diff --git a/src/afd/sprites/front/0845--000--Cramorant.png b/src/afd/sprites/front/0845-000-Cramorant.png
similarity index 100%
rename from src/afd/sprites/front/0845--000--Cramorant.png
rename to src/afd/sprites/front/0845-000-Cramorant.png
diff --git a/src/afd/sprites/front/0845--420--Cramorant--Gorging.png b/src/afd/sprites/front/0845-420-Cramorant-Gorging.png
similarity index 100%
rename from src/afd/sprites/front/0845--420--Cramorant--Gorging.png
rename to src/afd/sprites/front/0845-420-Cramorant-Gorging.png
diff --git a/src/afd/sprites/front/0845--420--Cramorant--Gulping.png b/src/afd/sprites/front/0845-420-Cramorant-Gulping.png
similarity index 100%
rename from src/afd/sprites/front/0845--420--Cramorant--Gulping.png
rename to src/afd/sprites/front/0845-420-Cramorant-Gulping.png
diff --git a/src/afd/sprites/front/0846--000--Arrokuda.png b/src/afd/sprites/front/0846-000-Arrokuda.png
similarity index 100%
rename from src/afd/sprites/front/0846--000--Arrokuda.png
rename to src/afd/sprites/front/0846-000-Arrokuda.png
diff --git a/src/afd/sprites/front/0847--000--Barraskewda.png b/src/afd/sprites/front/0847-000-Barraskewda.png
similarity index 100%
rename from src/afd/sprites/front/0847--000--Barraskewda.png
rename to src/afd/sprites/front/0847-000-Barraskewda.png
diff --git a/src/afd/sprites/front/0848--000--Toxel.png b/src/afd/sprites/front/0848-000-Toxel.png
similarity index 100%
rename from src/afd/sprites/front/0848--000--Toxel.png
rename to src/afd/sprites/front/0848-000-Toxel.png
diff --git a/src/afd/sprites/front/0849--000--Toxtricity.png b/src/afd/sprites/front/0849-000-Toxtricity.png
similarity index 100%
rename from src/afd/sprites/front/0849--000--Toxtricity.png
rename to src/afd/sprites/front/0849-000-Toxtricity.png
diff --git a/src/afd/sprites/front/0849--420--Toxtricity--Gmax.png b/src/afd/sprites/front/0849-420-Toxtricity-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0849--420--Toxtricity--Gmax.png
rename to src/afd/sprites/front/0849-420-Toxtricity-Gmax.png
diff --git a/src/afd/sprites/front/0849--420--Toxtricity--Low-Key.png b/src/afd/sprites/front/0849-420-Toxtricity-Low~Key.png
similarity index 100%
rename from src/afd/sprites/front/0849--420--Toxtricity--Low-Key.png
rename to src/afd/sprites/front/0849-420-Toxtricity-Low~Key.png
diff --git a/src/afd/sprites/front/0849--420--Toxtricity--Low-Key-Gmax.png b/src/afd/sprites/front/0849-420-Toxtricity-Low~Key~Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0849--420--Toxtricity--Low-Key-Gmax.png
rename to src/afd/sprites/front/0849-420-Toxtricity-Low~Key~Gmax.png
diff --git a/src/afd/sprites/front/0850--000--Sizzlipede.png b/src/afd/sprites/front/0850-000-Sizzlipede.png
similarity index 100%
rename from src/afd/sprites/front/0850--000--Sizzlipede.png
rename to src/afd/sprites/front/0850-000-Sizzlipede.png
diff --git a/src/afd/sprites/front/0851--000--Centiskorch.png b/src/afd/sprites/front/0851-000-Centiskorch.png
similarity index 100%
rename from src/afd/sprites/front/0851--000--Centiskorch.png
rename to src/afd/sprites/front/0851-000-Centiskorch.png
diff --git a/src/afd/sprites/front/0851--420--Centiskorch--Gmax.png b/src/afd/sprites/front/0851-420-Centiskorch-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0851--420--Centiskorch--Gmax.png
rename to src/afd/sprites/front/0851-420-Centiskorch-Gmax.png
diff --git a/src/afd/sprites/front/0852--000--Clobbopus.png b/src/afd/sprites/front/0852-000-Clobbopus.png
similarity index 100%
rename from src/afd/sprites/front/0852--000--Clobbopus.png
rename to src/afd/sprites/front/0852-000-Clobbopus.png
diff --git a/src/afd/sprites/front/0853--000--Grapploct.png b/src/afd/sprites/front/0853-000-Grapploct.png
similarity index 100%
rename from src/afd/sprites/front/0853--000--Grapploct.png
rename to src/afd/sprites/front/0853-000-Grapploct.png
diff --git a/src/afd/sprites/front/0854--000--Sinistea.png b/src/afd/sprites/front/0854-000-Sinistea.png
similarity index 100%
rename from src/afd/sprites/front/0854--000--Sinistea.png
rename to src/afd/sprites/front/0854-000-Sinistea.png
diff --git a/src/afd/sprites/front/0855--000--Polteageist.png b/src/afd/sprites/front/0855-000-Polteageist.png
similarity index 100%
rename from src/afd/sprites/front/0855--000--Polteageist.png
rename to src/afd/sprites/front/0855-000-Polteageist.png
diff --git a/src/afd/sprites/front/0856--000--Hatenna.png b/src/afd/sprites/front/0856-000-Hatenna.png
similarity index 100%
rename from src/afd/sprites/front/0856--000--Hatenna.png
rename to src/afd/sprites/front/0856-000-Hatenna.png
diff --git a/src/afd/sprites/front/0857--000--Hattrem.png b/src/afd/sprites/front/0857-000-Hattrem.png
similarity index 100%
rename from src/afd/sprites/front/0857--000--Hattrem.png
rename to src/afd/sprites/front/0857-000-Hattrem.png
diff --git a/src/afd/sprites/front/0858--000--Hatterene.png b/src/afd/sprites/front/0858-000-Hatterene.png
similarity index 100%
rename from src/afd/sprites/front/0858--000--Hatterene.png
rename to src/afd/sprites/front/0858-000-Hatterene.png
diff --git a/src/afd/sprites/front/0858--420--Hatterene--Gmax.png b/src/afd/sprites/front/0858-420-Hatterene-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0858--420--Hatterene--Gmax.png
rename to src/afd/sprites/front/0858-420-Hatterene-Gmax.png
diff --git a/src/afd/sprites/front/0859--000--Impidimp.png b/src/afd/sprites/front/0859-000-Impidimp.png
similarity index 100%
rename from src/afd/sprites/front/0859--000--Impidimp.png
rename to src/afd/sprites/front/0859-000-Impidimp.png
diff --git a/src/afd/sprites/front/0860--000--Morgrem.png b/src/afd/sprites/front/0860-000-Morgrem.png
similarity index 100%
rename from src/afd/sprites/front/0860--000--Morgrem.png
rename to src/afd/sprites/front/0860-000-Morgrem.png
diff --git a/src/afd/sprites/front/0861--000--Grimmsnarl.png b/src/afd/sprites/front/0861-000-Grimmsnarl.png
similarity index 100%
rename from src/afd/sprites/front/0861--000--Grimmsnarl.png
rename to src/afd/sprites/front/0861-000-Grimmsnarl.png
diff --git a/src/afd/sprites/front/0861--420--Grimmsnarl--Gmax.png b/src/afd/sprites/front/0861-420-Grimmsnarl-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0861--420--Grimmsnarl--Gmax.png
rename to src/afd/sprites/front/0861-420-Grimmsnarl-Gmax.png
diff --git a/src/afd/sprites/front/0862--000--Obstagoon.png b/src/afd/sprites/front/0862-000-Obstagoon.png
similarity index 100%
rename from src/afd/sprites/front/0862--000--Obstagoon.png
rename to src/afd/sprites/front/0862-000-Obstagoon.png
diff --git a/src/afd/sprites/front/0863--000--Perrserker.png b/src/afd/sprites/front/0863-000-Perrserker.png
similarity index 100%
rename from src/afd/sprites/front/0863--000--Perrserker.png
rename to src/afd/sprites/front/0863-000-Perrserker.png
diff --git a/src/afd/sprites/front/0864--000--Cursola.png b/src/afd/sprites/front/0864-000-Cursola.png
similarity index 100%
rename from src/afd/sprites/front/0864--000--Cursola.png
rename to src/afd/sprites/front/0864-000-Cursola.png
diff --git a/src/afd/sprites/front/0865--000--Sirfetch__0027d.png b/src/afd/sprites/front/0865-000-Sirfetch__0027d.png
similarity index 100%
rename from src/afd/sprites/front/0865--000--Sirfetch__0027d.png
rename to src/afd/sprites/front/0865-000-Sirfetch__0027d.png
diff --git a/src/afd/sprites/front/0866--000--Mr._Rime.png b/src/afd/sprites/front/0866-000-Mr._Rime.png
similarity index 100%
rename from src/afd/sprites/front/0866--000--Mr._Rime.png
rename to src/afd/sprites/front/0866-000-Mr._Rime.png
diff --git a/src/afd/sprites/front/0867--000--Runerigus.png b/src/afd/sprites/front/0867-000-Runerigus.png
similarity index 100%
rename from src/afd/sprites/front/0867--000--Runerigus.png
rename to src/afd/sprites/front/0867-000-Runerigus.png
diff --git a/src/afd/sprites/front/0868--000--Milcery.png b/src/afd/sprites/front/0868-000-Milcery.png
similarity index 100%
rename from src/afd/sprites/front/0868--000--Milcery.png
rename to src/afd/sprites/front/0868-000-Milcery.png
diff --git a/src/afd/sprites/front/0869--000--Alcremie.png b/src/afd/sprites/front/0869-000-Alcremie.png
similarity index 100%
rename from src/afd/sprites/front/0869--000--Alcremie.png
rename to src/afd/sprites/front/0869-000-Alcremie.png
diff --git a/src/afd/sprites/front/0869--420--Alcremie--Gmax.png b/src/afd/sprites/front/0869-420-Alcremie-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0869--420--Alcremie--Gmax.png
rename to src/afd/sprites/front/0869-420-Alcremie-Gmax.png
diff --git a/src/afd/sprites/front/0870--000--Falinks.png b/src/afd/sprites/front/0870-000-Falinks.png
similarity index 100%
rename from src/afd/sprites/front/0870--000--Falinks.png
rename to src/afd/sprites/front/0870-000-Falinks.png
diff --git a/src/afd/sprites/front/0871--000--Pincurchin.png b/src/afd/sprites/front/0871-000-Pincurchin.png
similarity index 100%
rename from src/afd/sprites/front/0871--000--Pincurchin.png
rename to src/afd/sprites/front/0871-000-Pincurchin.png
diff --git a/src/afd/sprites/front/0872--000--Snom.png b/src/afd/sprites/front/0872-000-Snom.png
similarity index 100%
rename from src/afd/sprites/front/0872--000--Snom.png
rename to src/afd/sprites/front/0872-000-Snom.png
diff --git a/src/afd/sprites/front/0873--000--Frosmoth.png b/src/afd/sprites/front/0873-000-Frosmoth.png
similarity index 100%
rename from src/afd/sprites/front/0873--000--Frosmoth.png
rename to src/afd/sprites/front/0873-000-Frosmoth.png
diff --git a/src/afd/sprites/front/0874--000--Stonjourner.png b/src/afd/sprites/front/0874-000-Stonjourner.png
similarity index 100%
rename from src/afd/sprites/front/0874--000--Stonjourner.png
rename to src/afd/sprites/front/0874-000-Stonjourner.png
diff --git a/src/afd/sprites/front/0875--000--Eiscue.png b/src/afd/sprites/front/0875-000-Eiscue.png
similarity index 100%
rename from src/afd/sprites/front/0875--000--Eiscue.png
rename to src/afd/sprites/front/0875-000-Eiscue.png
diff --git a/src/afd/sprites/front/0875--420--Eiscue--Noice.png b/src/afd/sprites/front/0875-420-Eiscue-Noice.png
similarity index 100%
rename from src/afd/sprites/front/0875--420--Eiscue--Noice.png
rename to src/afd/sprites/front/0875-420-Eiscue-Noice.png
diff --git a/src/afd/sprites/front/0876--000--Indeedee.png b/src/afd/sprites/front/0876-000-Indeedee.png
similarity index 100%
rename from src/afd/sprites/front/0876--000--Indeedee.png
rename to src/afd/sprites/front/0876-000-Indeedee.png
diff --git a/src/afd/sprites/front/0876--420--Indeedee--F.png b/src/afd/sprites/front/0876-420-Indeedee-F.png
similarity index 100%
rename from src/afd/sprites/front/0876--420--Indeedee--F.png
rename to src/afd/sprites/front/0876-420-Indeedee-F.png
diff --git a/src/afd/sprites/front/0877--000--Morpeko.png b/src/afd/sprites/front/0877-000-Morpeko.png
similarity index 100%
rename from src/afd/sprites/front/0877--000--Morpeko.png
rename to src/afd/sprites/front/0877-000-Morpeko.png
diff --git a/src/afd/sprites/front/0877--420--Morpeko--Hangry.png b/src/afd/sprites/front/0877-420-Morpeko-Hangry.png
similarity index 100%
rename from src/afd/sprites/front/0877--420--Morpeko--Hangry.png
rename to src/afd/sprites/front/0877-420-Morpeko-Hangry.png
diff --git a/src/afd/sprites/front/0878--000--Cufant.png b/src/afd/sprites/front/0878-000-Cufant.png
similarity index 100%
rename from src/afd/sprites/front/0878--000--Cufant.png
rename to src/afd/sprites/front/0878-000-Cufant.png
diff --git a/src/afd/sprites/front/0879--000--Copperajah.png b/src/afd/sprites/front/0879-000-Copperajah.png
similarity index 100%
rename from src/afd/sprites/front/0879--000--Copperajah.png
rename to src/afd/sprites/front/0879-000-Copperajah.png
diff --git a/src/afd/sprites/front/0879--420--Copperajah--Gmax.png b/src/afd/sprites/front/0879-420-Copperajah-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0879--420--Copperajah--Gmax.png
rename to src/afd/sprites/front/0879-420-Copperajah-Gmax.png
diff --git a/src/afd/sprites/front/0880--000--Dracozolt.png b/src/afd/sprites/front/0880-000-Dracozolt.png
similarity index 100%
rename from src/afd/sprites/front/0880--000--Dracozolt.png
rename to src/afd/sprites/front/0880-000-Dracozolt.png
diff --git a/src/afd/sprites/front/0881--000--Arctozolt.png b/src/afd/sprites/front/0881-000-Arctozolt.png
similarity index 100%
rename from src/afd/sprites/front/0881--000--Arctozolt.png
rename to src/afd/sprites/front/0881-000-Arctozolt.png
diff --git a/src/afd/sprites/front/0882--000--Dracovish.png b/src/afd/sprites/front/0882-000-Dracovish.png
similarity index 100%
rename from src/afd/sprites/front/0882--000--Dracovish.png
rename to src/afd/sprites/front/0882-000-Dracovish.png
diff --git a/src/afd/sprites/front/0883--000--Arctovish.png b/src/afd/sprites/front/0883-000-Arctovish.png
similarity index 100%
rename from src/afd/sprites/front/0883--000--Arctovish.png
rename to src/afd/sprites/front/0883-000-Arctovish.png
diff --git a/src/afd/sprites/front/0884--000--Duraludon.png b/src/afd/sprites/front/0884-000-Duraludon.png
similarity index 100%
rename from src/afd/sprites/front/0884--000--Duraludon.png
rename to src/afd/sprites/front/0884-000-Duraludon.png
diff --git a/src/afd/sprites/front/0884--420--Duraludon--Gmax.png b/src/afd/sprites/front/0884-420-Duraludon-Gmax.png
similarity index 100%
rename from src/afd/sprites/front/0884--420--Duraludon--Gmax.png
rename to src/afd/sprites/front/0884-420-Duraludon-Gmax.png
diff --git a/src/afd/sprites/front/0885--000--Dreepy.png b/src/afd/sprites/front/0885-000-Dreepy.png
similarity index 100%
rename from src/afd/sprites/front/0885--000--Dreepy.png
rename to src/afd/sprites/front/0885-000-Dreepy.png
diff --git a/src/afd/sprites/front/0886--000--Drakloak.png b/src/afd/sprites/front/0886-000-Drakloak.png
similarity index 100%
rename from src/afd/sprites/front/0886--000--Drakloak.png
rename to src/afd/sprites/front/0886-000-Drakloak.png
diff --git a/src/afd/sprites/front/0887--000--Dragapult.png b/src/afd/sprites/front/0887-000-Dragapult.png
similarity index 100%
rename from src/afd/sprites/front/0887--000--Dragapult.png
rename to src/afd/sprites/front/0887-000-Dragapult.png
diff --git a/src/afd/sprites/front/0888--000--Zacian.png b/src/afd/sprites/front/0888-000-Zacian.png
similarity index 100%
rename from src/afd/sprites/front/0888--000--Zacian.png
rename to src/afd/sprites/front/0888-000-Zacian.png
diff --git a/src/afd/sprites/front/0888--420--Zacian--Crowned.png b/src/afd/sprites/front/0888-420-Zacian-Crowned.png
similarity index 100%
rename from src/afd/sprites/front/0888--420--Zacian--Crowned.png
rename to src/afd/sprites/front/0888-420-Zacian-Crowned.png
diff --git a/src/afd/sprites/front/0889--000--Zamazenta.png b/src/afd/sprites/front/0889-000-Zamazenta.png
similarity index 100%
rename from src/afd/sprites/front/0889--000--Zamazenta.png
rename to src/afd/sprites/front/0889-000-Zamazenta.png
diff --git a/src/afd/sprites/front/0889--420--Zamazenta--Crowned.png b/src/afd/sprites/front/0889-420-Zamazenta-Crowned.png
similarity index 100%
rename from src/afd/sprites/front/0889--420--Zamazenta--Crowned.png
rename to src/afd/sprites/front/0889-420-Zamazenta-Crowned.png
diff --git a/src/afd/sprites/front/0890--000--Eternatus.png b/src/afd/sprites/front/0890-000-Eternatus.png
similarity index 100%
rename from src/afd/sprites/front/0890--000--Eternatus.png
rename to src/afd/sprites/front/0890-000-Eternatus.png
diff --git a/src/afd/sprites/front/0890--420--Eternatus--Eternamax.png b/src/afd/sprites/front/0890-420-Eternatus-Eternamax.png
similarity index 100%
rename from src/afd/sprites/front/0890--420--Eternatus--Eternamax.png
rename to src/afd/sprites/front/0890-420-Eternatus-Eternamax.png
diff --git a/src/canonical/dex/front-cosmetic/0025--000--Pikachu--Female.png b/src/canonical/dex/front-cosmetic/0025-000-Pikachu-Female.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0025--000--Pikachu--Female.png
rename to src/canonical/dex/front-cosmetic/0025-000-Pikachu-Female.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--A.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-A.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--A.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-A.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--B.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-B.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--B.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-B.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--C.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-C.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--C.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-C.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--D.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-D.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--D.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-D.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--E.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-E.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--E.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-E.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--Exclamation.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-Exclamation.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--Exclamation.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-Exclamation.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--F.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-F.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--F.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-F.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--G.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-G.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--G.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-G.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--H.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-H.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--H.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-H.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--I.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-I.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--I.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-I.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--J.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-J.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--J.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-J.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--K.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-K.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--K.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-K.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--L.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-L.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--L.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-L.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--M.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-M.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--M.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-M.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--N.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-N.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--N.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-N.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--O.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-O.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--O.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-O.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--P.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-P.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--P.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-P.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--Q.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-Q.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--Q.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-Q.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--Question.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-Question.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--Question.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-Question.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--R.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-R.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--R.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-R.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--S.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-S.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--S.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-S.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--T.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-T.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--T.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-T.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--U.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-U.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--U.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-U.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--V.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-V.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--V.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-V.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--W.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-W.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--W.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-W.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--X.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-X.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--X.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-X.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--Y.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-Y.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--Y.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-Y.png
diff --git a/src/canonical/dex/front-cosmetic/0201--420--Unown--Z.png b/src/canonical/dex/front-cosmetic/0201-420-Unown-Z.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0201--420--Unown--Z.png
rename to src/canonical/dex/front-cosmetic/0201-420-Unown-Z.png
diff --git a/src/canonical/dex/front-cosmetic/0412--420--Burmy--Sandy.png b/src/canonical/dex/front-cosmetic/0412-420-Burmy-Sandy.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0412--420--Burmy--Sandy.png
rename to src/canonical/dex/front-cosmetic/0412-420-Burmy-Sandy.png
diff --git a/src/canonical/dex/front-cosmetic/0412--420--Burmy--Trash.png b/src/canonical/dex/front-cosmetic/0412-420-Burmy-Trash.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0412--420--Burmy--Trash.png
rename to src/canonical/dex/front-cosmetic/0412-420-Burmy-Trash.png
diff --git a/src/canonical/dex/front-cosmetic/0422--420--Shellos--East.png b/src/canonical/dex/front-cosmetic/0422-420-Shellos-East.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0422--420--Shellos--East.png
rename to src/canonical/dex/front-cosmetic/0422-420-Shellos-East.png
diff --git a/src/canonical/dex/front-cosmetic/0423--420--Gastrodon--East.png b/src/canonical/dex/front-cosmetic/0423-420-Gastrodon-East.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0423--420--Gastrodon--East.png
rename to src/canonical/dex/front-cosmetic/0423-420-Gastrodon-East.png
diff --git a/src/canonical/dex/front-cosmetic/0585--420--Deerling--Autumn.png b/src/canonical/dex/front-cosmetic/0585-420-Deerling-Autumn.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0585--420--Deerling--Autumn.png
rename to src/canonical/dex/front-cosmetic/0585-420-Deerling-Autumn.png
diff --git a/src/canonical/dex/front-cosmetic/0585--420--Deerling--Summer.png b/src/canonical/dex/front-cosmetic/0585-420-Deerling-Summer.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0585--420--Deerling--Summer.png
rename to src/canonical/dex/front-cosmetic/0585-420-Deerling-Summer.png
diff --git a/src/canonical/dex/front-cosmetic/0585--420--Deerling--Winter.png b/src/canonical/dex/front-cosmetic/0585-420-Deerling-Winter.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0585--420--Deerling--Winter.png
rename to src/canonical/dex/front-cosmetic/0585-420-Deerling-Winter.png
diff --git a/src/canonical/dex/front-cosmetic/0586--420--Sawsbuck--Autumn.png b/src/canonical/dex/front-cosmetic/0586-420-Sawsbuck-Autumn.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0586--420--Sawsbuck--Autumn.png
rename to src/canonical/dex/front-cosmetic/0586-420-Sawsbuck-Autumn.png
diff --git a/src/canonical/dex/front-cosmetic/0586--420--Sawsbuck--Summer.png b/src/canonical/dex/front-cosmetic/0586-420-Sawsbuck-Summer.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0586--420--Sawsbuck--Summer.png
rename to src/canonical/dex/front-cosmetic/0586-420-Sawsbuck-Summer.png
diff --git a/src/canonical/dex/front-cosmetic/0586--420--Sawsbuck--Winter.png b/src/canonical/dex/front-cosmetic/0586-420-Sawsbuck-Winter.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0586--420--Sawsbuck--Winter.png
rename to src/canonical/dex/front-cosmetic/0586-420-Sawsbuck-Winter.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Archipelago.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Archipelago.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Archipelago.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Archipelago.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Continental.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Continental.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Continental.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Continental.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Elegant.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Elegant.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Elegant.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Elegant.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Garden.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Garden.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Garden.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Garden.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--High_Plains.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-High_Plains.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--High_Plains.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-High_Plains.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Icy_Snow.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Icy_Snow.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Icy_Snow.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Icy_Snow.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Jungle.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Jungle.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Jungle.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Jungle.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Marine.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Marine.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Marine.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Marine.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Modern.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Modern.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Modern.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Modern.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Monsoon.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Monsoon.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Monsoon.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Monsoon.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Ocean.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Ocean.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Ocean.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Ocean.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Polar.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Polar.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Polar.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Polar.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--River.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-River.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--River.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-River.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Sandstorm.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Sandstorm.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Sandstorm.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Sandstorm.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Savanna.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Savanna.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Savanna.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Savanna.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Sun.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Sun.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Sun.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Sun.png
diff --git a/src/canonical/dex/front-cosmetic/0666--420--Vivillon--Tundra.png b/src/canonical/dex/front-cosmetic/0666-420-Vivillon-Tundra.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0666--420--Vivillon--Tundra.png
rename to src/canonical/dex/front-cosmetic/0666-420-Vivillon-Tundra.png
diff --git a/src/canonical/dex/front-cosmetic/0669--420--Flabe__0301be__0301--Blue.png b/src/canonical/dex/front-cosmetic/0669-420-Flabe__0301be__0301-Blue.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0669--420--Flabe__0301be__0301--Blue.png
rename to src/canonical/dex/front-cosmetic/0669-420-Flabe__0301be__0301-Blue.png
diff --git a/src/canonical/dex/front-cosmetic/0669--420--Flabe__0301be__0301--Orange.png b/src/canonical/dex/front-cosmetic/0669-420-Flabe__0301be__0301-Orange.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0669--420--Flabe__0301be__0301--Orange.png
rename to src/canonical/dex/front-cosmetic/0669-420-Flabe__0301be__0301-Orange.png
diff --git a/src/canonical/dex/front-cosmetic/0669--420--Flabe__0301be__0301--White.png b/src/canonical/dex/front-cosmetic/0669-420-Flabe__0301be__0301-White.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0669--420--Flabe__0301be__0301--White.png
rename to src/canonical/dex/front-cosmetic/0669-420-Flabe__0301be__0301-White.png
diff --git a/src/canonical/dex/front-cosmetic/0669--420--Flabe__0301be__0301--Yellow.png b/src/canonical/dex/front-cosmetic/0669-420-Flabe__0301be__0301-Yellow.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0669--420--Flabe__0301be__0301--Yellow.png
rename to src/canonical/dex/front-cosmetic/0669-420-Flabe__0301be__0301-Yellow.png
diff --git a/src/canonical/dex/front-cosmetic/0670--420--Floette--Blue.png b/src/canonical/dex/front-cosmetic/0670-420-Floette-Blue.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0670--420--Floette--Blue.png
rename to src/canonical/dex/front-cosmetic/0670-420-Floette-Blue.png
diff --git a/src/canonical/dex/front-cosmetic/0670--420--Floette--Orange.png b/src/canonical/dex/front-cosmetic/0670-420-Floette-Orange.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0670--420--Floette--Orange.png
rename to src/canonical/dex/front-cosmetic/0670-420-Floette-Orange.png
diff --git a/src/canonical/dex/front-cosmetic/0670--420--Floette--White.png b/src/canonical/dex/front-cosmetic/0670-420-Floette-White.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0670--420--Floette--White.png
rename to src/canonical/dex/front-cosmetic/0670-420-Floette-White.png
diff --git a/src/canonical/dex/front-cosmetic/0670--420--Floette--Yellow.png b/src/canonical/dex/front-cosmetic/0670-420-Floette-Yellow.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0670--420--Floette--Yellow.png
rename to src/canonical/dex/front-cosmetic/0670-420-Floette-Yellow.png
diff --git a/src/canonical/dex/front-cosmetic/0671--420--Florges--Blue.png b/src/canonical/dex/front-cosmetic/0671-420-Florges-Blue.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0671--420--Florges--Blue.png
rename to src/canonical/dex/front-cosmetic/0671-420-Florges-Blue.png
diff --git a/src/canonical/dex/front-cosmetic/0671--420--Florges--Orange.png b/src/canonical/dex/front-cosmetic/0671-420-Florges-Orange.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0671--420--Florges--Orange.png
rename to src/canonical/dex/front-cosmetic/0671-420-Florges-Orange.png
diff --git a/src/canonical/dex/front-cosmetic/0671--420--Florges--White.png b/src/canonical/dex/front-cosmetic/0671-420-Florges-White.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0671--420--Florges--White.png
rename to src/canonical/dex/front-cosmetic/0671-420-Florges-White.png
diff --git a/src/canonical/dex/front-cosmetic/0671--420--Florges--Yellow.png b/src/canonical/dex/front-cosmetic/0671-420-Florges-Yellow.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0671--420--Florges--Yellow.png
rename to src/canonical/dex/front-cosmetic/0671-420-Florges-Yellow.png
diff --git a/src/canonical/dex/front-cosmetic/0676--420--Furfrou--Dandy.png b/src/canonical/dex/front-cosmetic/0676-420-Furfrou-Dandy.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0676--420--Furfrou--Dandy.png
rename to src/canonical/dex/front-cosmetic/0676-420-Furfrou-Dandy.png
diff --git a/src/canonical/dex/front-cosmetic/0676--420--Furfrou--Debutante.png b/src/canonical/dex/front-cosmetic/0676-420-Furfrou-Debutante.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0676--420--Furfrou--Debutante.png
rename to src/canonical/dex/front-cosmetic/0676-420-Furfrou-Debutante.png
diff --git a/src/canonical/dex/front-cosmetic/0676--420--Furfrou--Diamond.png b/src/canonical/dex/front-cosmetic/0676-420-Furfrou-Diamond.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0676--420--Furfrou--Diamond.png
rename to src/canonical/dex/front-cosmetic/0676-420-Furfrou-Diamond.png
diff --git a/src/canonical/dex/front-cosmetic/0676--420--Furfrou--Heart.png b/src/canonical/dex/front-cosmetic/0676-420-Furfrou-Heart.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0676--420--Furfrou--Heart.png
rename to src/canonical/dex/front-cosmetic/0676-420-Furfrou-Heart.png
diff --git a/src/canonical/dex/front-cosmetic/0676--420--Furfrou--Kabuki.png b/src/canonical/dex/front-cosmetic/0676-420-Furfrou-Kabuki.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0676--420--Furfrou--Kabuki.png
rename to src/canonical/dex/front-cosmetic/0676-420-Furfrou-Kabuki.png
diff --git a/src/canonical/dex/front-cosmetic/0676--420--Furfrou--La_Reine.png b/src/canonical/dex/front-cosmetic/0676-420-Furfrou-La_Reine.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0676--420--Furfrou--La_Reine.png
rename to src/canonical/dex/front-cosmetic/0676-420-Furfrou-La_Reine.png
diff --git a/src/canonical/dex/front-cosmetic/0676--420--Furfrou--Matron.png b/src/canonical/dex/front-cosmetic/0676-420-Furfrou-Matron.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0676--420--Furfrou--Matron.png
rename to src/canonical/dex/front-cosmetic/0676-420-Furfrou-Matron.png
diff --git a/src/canonical/dex/front-cosmetic/0676--420--Furfrou--Pharaoh.png b/src/canonical/dex/front-cosmetic/0676-420-Furfrou-Pharaoh.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0676--420--Furfrou--Pharaoh.png
rename to src/canonical/dex/front-cosmetic/0676-420-Furfrou-Pharaoh.png
diff --git a/src/canonical/dex/front-cosmetic/0676--420--Furfrou--Star.png b/src/canonical/dex/front-cosmetic/0676-420-Furfrou-Star.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0676--420--Furfrou--Star.png
rename to src/canonical/dex/front-cosmetic/0676-420-Furfrou-Star.png
diff --git a/src/canonical/dex/front-cosmetic/0774--420--Minior--Blue.png b/src/canonical/dex/front-cosmetic/0774-420-Minior-Blue.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0774--420--Minior--Blue.png
rename to src/canonical/dex/front-cosmetic/0774-420-Minior-Blue.png
diff --git a/src/canonical/dex/front-cosmetic/0774--420--Minior--Green.png b/src/canonical/dex/front-cosmetic/0774-420-Minior-Green.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0774--420--Minior--Green.png
rename to src/canonical/dex/front-cosmetic/0774-420-Minior-Green.png
diff --git a/src/canonical/dex/front-cosmetic/0774--420--Minior--Indigo.png b/src/canonical/dex/front-cosmetic/0774-420-Minior-Indigo.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0774--420--Minior--Indigo.png
rename to src/canonical/dex/front-cosmetic/0774-420-Minior-Indigo.png
diff --git a/src/canonical/dex/front-cosmetic/0774--420--Minior--Orange.png b/src/canonical/dex/front-cosmetic/0774-420-Minior-Orange.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0774--420--Minior--Orange.png
rename to src/canonical/dex/front-cosmetic/0774-420-Minior-Orange.png
diff --git a/src/canonical/dex/front-cosmetic/0774--420--Minior--Violet.png b/src/canonical/dex/front-cosmetic/0774-420-Minior-Violet.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0774--420--Minior--Violet.png
rename to src/canonical/dex/front-cosmetic/0774-420-Minior-Violet.png
diff --git a/src/canonical/dex/front-cosmetic/0774--420--Minior--Yellow.png b/src/canonical/dex/front-cosmetic/0774-420-Minior-Yellow.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0774--420--Minior--Yellow.png
rename to src/canonical/dex/front-cosmetic/0774-420-Minior-Yellow.png
diff --git a/src/canonical/dex/front-cosmetic/0801--420--Magearna--Original.png b/src/canonical/dex/front-cosmetic/0801-420-Magearna-Original.png
similarity index 100%
rename from src/canonical/dex/front-cosmetic/0801--420--Magearna--Original.png
rename to src/canonical/dex/front-cosmetic/0801-420-Magearna-Original.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--B.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-B.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--B.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-B.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--C.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-C.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--C.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-C.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--D.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-D.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--D.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-D.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--E.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-E.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--E.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-E.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--Exclamation.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-Exclamation.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--Exclamation.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-Exclamation.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--F.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-F.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--F.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-F.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--G.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-G.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--G.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-G.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--H.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-H.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--H.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-H.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--I.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-I.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--I.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-I.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--J.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-J.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--J.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-J.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--K.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-K.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--K.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-K.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--L.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-L.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--L.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-L.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--M.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-M.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--M.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-M.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--N.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-N.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--N.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-N.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--O.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-O.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--O.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-O.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--P.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-P.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--P.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-P.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--Q.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-Q.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--Q.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-Q.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--Question.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-Question.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--Question.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-Question.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--R.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-R.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--R.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-R.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--S.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-S.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--S.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-S.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--T.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-T.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--T.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-T.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--U.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-U.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--U.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-U.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--V.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-V.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--V.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-V.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--W.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-W.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--W.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-W.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--X.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-X.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--X.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-X.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--Y.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-Y.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--Y.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-Y.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--Z.png b/src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-Z.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0201--420--Unown--Z.png
rename to src/canonical/dex/front-shiny-cosmetic/0201-420-Unown-Z.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0412--420--Burmy--Sandy.png b/src/canonical/dex/front-shiny-cosmetic/0412-420-Burmy-Sandy.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0412--420--Burmy--Sandy.png
rename to src/canonical/dex/front-shiny-cosmetic/0412-420-Burmy-Sandy.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0412--420--Burmy--Trash.png b/src/canonical/dex/front-shiny-cosmetic/0412-420-Burmy-Trash.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0412--420--Burmy--Trash.png
rename to src/canonical/dex/front-shiny-cosmetic/0412-420-Burmy-Trash.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0422--420--Shellos--East.png b/src/canonical/dex/front-shiny-cosmetic/0422-420-Shellos-East.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0422--420--Shellos--East.png
rename to src/canonical/dex/front-shiny-cosmetic/0422-420-Shellos-East.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0423--420--Gastrodon--East.png b/src/canonical/dex/front-shiny-cosmetic/0423-420-Gastrodon-East.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0423--420--Gastrodon--East.png
rename to src/canonical/dex/front-shiny-cosmetic/0423-420-Gastrodon-East.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0585--420--Deerling--Autumn.png b/src/canonical/dex/front-shiny-cosmetic/0585-420-Deerling-Autumn.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0585--420--Deerling--Autumn.png
rename to src/canonical/dex/front-shiny-cosmetic/0585-420-Deerling-Autumn.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0585--420--Deerling--Summer.png b/src/canonical/dex/front-shiny-cosmetic/0585-420-Deerling-Summer.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0585--420--Deerling--Summer.png
rename to src/canonical/dex/front-shiny-cosmetic/0585-420-Deerling-Summer.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0585--420--Deerling--Winter.png b/src/canonical/dex/front-shiny-cosmetic/0585-420-Deerling-Winter.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0585--420--Deerling--Winter.png
rename to src/canonical/dex/front-shiny-cosmetic/0585-420-Deerling-Winter.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0586--420--Sawsbuck--Autumn.png b/src/canonical/dex/front-shiny-cosmetic/0586-420-Sawsbuck-Autumn.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0586--420--Sawsbuck--Autumn.png
rename to src/canonical/dex/front-shiny-cosmetic/0586-420-Sawsbuck-Autumn.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0586--420--Sawsbuck--Summer.png b/src/canonical/dex/front-shiny-cosmetic/0586-420-Sawsbuck-Summer.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0586--420--Sawsbuck--Summer.png
rename to src/canonical/dex/front-shiny-cosmetic/0586-420-Sawsbuck-Summer.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0586--420--Sawsbuck--Winter.png b/src/canonical/dex/front-shiny-cosmetic/0586-420-Sawsbuck-Winter.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0586--420--Sawsbuck--Winter.png
rename to src/canonical/dex/front-shiny-cosmetic/0586-420-Sawsbuck-Winter.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Archipelago.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Archipelago.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Archipelago.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Archipelago.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Continental.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Continental.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Continental.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Continental.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Elegant.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Elegant.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Elegant.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Elegant.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Garden.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Garden.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Garden.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Garden.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--High_Plains.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-High_Plains.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--High_Plains.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-High_Plains.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Jungle.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Jungle.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Jungle.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Jungle.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Marine.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Marine.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Marine.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Marine.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Modern.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Modern.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Modern.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Modern.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Monsoon.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Monsoon.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Monsoon.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Monsoon.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Ocean.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Ocean.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Ocean.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Ocean.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Polar.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Polar.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Polar.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Polar.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--River.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-River.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--River.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-River.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Sandstorm.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Sandstorm.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Sandstorm.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Sandstorm.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Savanna.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Savanna.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Savanna.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Savanna.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Sun.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Sun.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Sun.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Sun.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Tundra.png b/src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Tundra.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0666--420--Vivillon--Tundra.png
rename to src/canonical/dex/front-shiny-cosmetic/0666-420-Vivillon-Tundra.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--Blue.png b/src/canonical/dex/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-Blue.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--Blue.png
rename to src/canonical/dex/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-Blue.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--Orange.png b/src/canonical/dex/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-Orange.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--Orange.png
rename to src/canonical/dex/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-Orange.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--White.png b/src/canonical/dex/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-White.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--White.png
rename to src/canonical/dex/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-White.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--Yellow.png b/src/canonical/dex/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-Yellow.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--Yellow.png
rename to src/canonical/dex/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-Yellow.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0670--420--Floette--Blue.png b/src/canonical/dex/front-shiny-cosmetic/0670-420-Floette-Blue.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0670--420--Floette--Blue.png
rename to src/canonical/dex/front-shiny-cosmetic/0670-420-Floette-Blue.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0670--420--Floette--Orange.png b/src/canonical/dex/front-shiny-cosmetic/0670-420-Floette-Orange.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0670--420--Floette--Orange.png
rename to src/canonical/dex/front-shiny-cosmetic/0670-420-Floette-Orange.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0670--420--Floette--White.png b/src/canonical/dex/front-shiny-cosmetic/0670-420-Floette-White.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0670--420--Floette--White.png
rename to src/canonical/dex/front-shiny-cosmetic/0670-420-Floette-White.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0670--420--Floette--Yellow.png b/src/canonical/dex/front-shiny-cosmetic/0670-420-Floette-Yellow.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0670--420--Floette--Yellow.png
rename to src/canonical/dex/front-shiny-cosmetic/0670-420-Floette-Yellow.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0671--420--Florges--Blue.png b/src/canonical/dex/front-shiny-cosmetic/0671-420-Florges-Blue.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0671--420--Florges--Blue.png
rename to src/canonical/dex/front-shiny-cosmetic/0671-420-Florges-Blue.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0671--420--Florges--Orange.png b/src/canonical/dex/front-shiny-cosmetic/0671-420-Florges-Orange.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0671--420--Florges--Orange.png
rename to src/canonical/dex/front-shiny-cosmetic/0671-420-Florges-Orange.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0671--420--Florges--White.png b/src/canonical/dex/front-shiny-cosmetic/0671-420-Florges-White.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0671--420--Florges--White.png
rename to src/canonical/dex/front-shiny-cosmetic/0671-420-Florges-White.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0671--420--Florges--Yellow.png b/src/canonical/dex/front-shiny-cosmetic/0671-420-Florges-Yellow.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0671--420--Florges--Yellow.png
rename to src/canonical/dex/front-shiny-cosmetic/0671-420-Florges-Yellow.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Dandy.png b/src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Dandy.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Dandy.png
rename to src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Dandy.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Debutante.png b/src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Debutante.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Debutante.png
rename to src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Debutante.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Diamond.png b/src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Diamond.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Diamond.png
rename to src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Diamond.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Heart.png b/src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Heart.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Heart.png
rename to src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Heart.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Kabuki.png b/src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Kabuki.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Kabuki.png
rename to src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Kabuki.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--La_Reine.png b/src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-La_Reine.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--La_Reine.png
rename to src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-La_Reine.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Matron.png b/src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Matron.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Matron.png
rename to src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Matron.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Pharaoh.png b/src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Pharaoh.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Pharaoh.png
rename to src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Pharaoh.png
diff --git a/src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Star.png b/src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Star.png
similarity index 100%
rename from src/canonical/dex/front-shiny-cosmetic/0676--420--Furfrou--Star.png
rename to src/canonical/dex/front-shiny-cosmetic/0676-420-Furfrou-Star.png
diff --git a/src/canonical/dex/front-shiny/0001--000--Bulbasaur.png b/src/canonical/dex/front-shiny/0001-000-Bulbasaur.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0001--000--Bulbasaur.png
rename to src/canonical/dex/front-shiny/0001-000-Bulbasaur.png
diff --git a/src/canonical/dex/front-shiny/0002--000--Ivysaur.png b/src/canonical/dex/front-shiny/0002-000-Ivysaur.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0002--000--Ivysaur.png
rename to src/canonical/dex/front-shiny/0002-000-Ivysaur.png
diff --git a/src/canonical/dex/front-shiny/0003--000--Venusaur.png b/src/canonical/dex/front-shiny/0003-000-Venusaur.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0003--000--Venusaur.png
rename to src/canonical/dex/front-shiny/0003-000-Venusaur.png
diff --git a/src/canonical/dex/front-shiny/0003--420--Venusaur--Mega.png b/src/canonical/dex/front-shiny/0003-420-Venusaur-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0003--420--Venusaur--Mega.png
rename to src/canonical/dex/front-shiny/0003-420-Venusaur-Mega.png
diff --git a/src/canonical/dex/front-shiny/0004--000--Charmander.png b/src/canonical/dex/front-shiny/0004-000-Charmander.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0004--000--Charmander.png
rename to src/canonical/dex/front-shiny/0004-000-Charmander.png
diff --git a/src/canonical/dex/front-shiny/0005--000--Charmeleon.png b/src/canonical/dex/front-shiny/0005-000-Charmeleon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0005--000--Charmeleon.png
rename to src/canonical/dex/front-shiny/0005-000-Charmeleon.png
diff --git a/src/canonical/dex/front-shiny/0006--000--Charizard.png b/src/canonical/dex/front-shiny/0006-000-Charizard.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0006--000--Charizard.png
rename to src/canonical/dex/front-shiny/0006-000-Charizard.png
diff --git a/src/canonical/dex/front-shiny/0006--420--Charizard--Mega-X.png b/src/canonical/dex/front-shiny/0006-420-Charizard-Mega~X.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0006--420--Charizard--Mega-X.png
rename to src/canonical/dex/front-shiny/0006-420-Charizard-Mega~X.png
diff --git a/src/canonical/dex/front-shiny/0006--420--Charizard--Mega-Y.png b/src/canonical/dex/front-shiny/0006-420-Charizard-Mega~Y.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0006--420--Charizard--Mega-Y.png
rename to src/canonical/dex/front-shiny/0006-420-Charizard-Mega~Y.png
diff --git a/src/canonical/dex/front-shiny/0007--000--Squirtle.png b/src/canonical/dex/front-shiny/0007-000-Squirtle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0007--000--Squirtle.png
rename to src/canonical/dex/front-shiny/0007-000-Squirtle.png
diff --git a/src/canonical/dex/front-shiny/0008--000--Wartortle.png b/src/canonical/dex/front-shiny/0008-000-Wartortle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0008--000--Wartortle.png
rename to src/canonical/dex/front-shiny/0008-000-Wartortle.png
diff --git a/src/canonical/dex/front-shiny/0009--000--Blastoise.png b/src/canonical/dex/front-shiny/0009-000-Blastoise.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0009--000--Blastoise.png
rename to src/canonical/dex/front-shiny/0009-000-Blastoise.png
diff --git a/src/canonical/dex/front-shiny/0009--420--Blastoise--Mega.png b/src/canonical/dex/front-shiny/0009-420-Blastoise-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0009--420--Blastoise--Mega.png
rename to src/canonical/dex/front-shiny/0009-420-Blastoise-Mega.png
diff --git a/src/canonical/dex/front-shiny/0010--000--Caterpie.png b/src/canonical/dex/front-shiny/0010-000-Caterpie.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0010--000--Caterpie.png
rename to src/canonical/dex/front-shiny/0010-000-Caterpie.png
diff --git a/src/canonical/dex/front-shiny/0011--000--Metapod.png b/src/canonical/dex/front-shiny/0011-000-Metapod.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0011--000--Metapod.png
rename to src/canonical/dex/front-shiny/0011-000-Metapod.png
diff --git a/src/canonical/dex/front-shiny/0012--000--Butterfree.png b/src/canonical/dex/front-shiny/0012-000-Butterfree.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0012--000--Butterfree.png
rename to src/canonical/dex/front-shiny/0012-000-Butterfree.png
diff --git a/src/canonical/dex/front-shiny/0013--000--Weedle.png b/src/canonical/dex/front-shiny/0013-000-Weedle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0013--000--Weedle.png
rename to src/canonical/dex/front-shiny/0013-000-Weedle.png
diff --git a/src/canonical/dex/front-shiny/0014--000--Kakuna.png b/src/canonical/dex/front-shiny/0014-000-Kakuna.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0014--000--Kakuna.png
rename to src/canonical/dex/front-shiny/0014-000-Kakuna.png
diff --git a/src/canonical/dex/front-shiny/0015--000--Beedrill.png b/src/canonical/dex/front-shiny/0015-000-Beedrill.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0015--000--Beedrill.png
rename to src/canonical/dex/front-shiny/0015-000-Beedrill.png
diff --git a/src/canonical/dex/front-shiny/0015--420--Beedrill--Mega.png b/src/canonical/dex/front-shiny/0015-420-Beedrill-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0015--420--Beedrill--Mega.png
rename to src/canonical/dex/front-shiny/0015-420-Beedrill-Mega.png
diff --git a/src/canonical/dex/front-shiny/0016--000--Pidgey.png b/src/canonical/dex/front-shiny/0016-000-Pidgey.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0016--000--Pidgey.png
rename to src/canonical/dex/front-shiny/0016-000-Pidgey.png
diff --git a/src/canonical/dex/front-shiny/0017--000--Pidgeotto.png b/src/canonical/dex/front-shiny/0017-000-Pidgeotto.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0017--000--Pidgeotto.png
rename to src/canonical/dex/front-shiny/0017-000-Pidgeotto.png
diff --git a/src/canonical/dex/front-shiny/0018--000--Pidgeot.png b/src/canonical/dex/front-shiny/0018-000-Pidgeot.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0018--000--Pidgeot.png
rename to src/canonical/dex/front-shiny/0018-000-Pidgeot.png
diff --git a/src/canonical/dex/front-shiny/0018--420--Pidgeot--Mega.png b/src/canonical/dex/front-shiny/0018-420-Pidgeot-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0018--420--Pidgeot--Mega.png
rename to src/canonical/dex/front-shiny/0018-420-Pidgeot-Mega.png
diff --git a/src/canonical/dex/front-shiny/0019--000--Rattata.png b/src/canonical/dex/front-shiny/0019-000-Rattata.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0019--000--Rattata.png
rename to src/canonical/dex/front-shiny/0019-000-Rattata.png
diff --git a/src/canonical/dex/front-shiny/0019--420--Rattata--Alola.png b/src/canonical/dex/front-shiny/0019-420-Rattata-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0019--420--Rattata--Alola.png
rename to src/canonical/dex/front-shiny/0019-420-Rattata-Alola.png
diff --git a/src/canonical/dex/front-shiny/0020--000--Raticate.png b/src/canonical/dex/front-shiny/0020-000-Raticate.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0020--000--Raticate.png
rename to src/canonical/dex/front-shiny/0020-000-Raticate.png
diff --git a/src/canonical/dex/front-shiny/0020--420--Raticate--Alola.png b/src/canonical/dex/front-shiny/0020-420-Raticate-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0020--420--Raticate--Alola.png
rename to src/canonical/dex/front-shiny/0020-420-Raticate-Alola.png
diff --git a/src/canonical/dex/front-shiny/0020--420--Raticate--Alola-Totem.png b/src/canonical/dex/front-shiny/0020-420-Raticate-Alola~Totem.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0020--420--Raticate--Alola-Totem.png
rename to src/canonical/dex/front-shiny/0020-420-Raticate-Alola~Totem.png
diff --git a/src/canonical/dex/front-shiny/0021--000--Spearow.png b/src/canonical/dex/front-shiny/0021-000-Spearow.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0021--000--Spearow.png
rename to src/canonical/dex/front-shiny/0021-000-Spearow.png
diff --git a/src/canonical/dex/front-shiny/0022--000--Fearow.png b/src/canonical/dex/front-shiny/0022-000-Fearow.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0022--000--Fearow.png
rename to src/canonical/dex/front-shiny/0022-000-Fearow.png
diff --git a/src/canonical/dex/front-shiny/0023--000--Ekans.png b/src/canonical/dex/front-shiny/0023-000-Ekans.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0023--000--Ekans.png
rename to src/canonical/dex/front-shiny/0023-000-Ekans.png
diff --git a/src/canonical/dex/front-shiny/0024--000--Arbok.png b/src/canonical/dex/front-shiny/0024-000-Arbok.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0024--000--Arbok.png
rename to src/canonical/dex/front-shiny/0024-000-Arbok.png
diff --git a/src/canonical/dex/front-shiny/0025--000--Pikachu.png b/src/canonical/dex/front-shiny/0025-000-Pikachu.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0025--000--Pikachu.png
rename to src/canonical/dex/front-shiny/0025-000-Pikachu.png
diff --git a/src/canonical/dex/front-shiny/0025--420--Pikachu--Cosplay.png b/src/canonical/dex/front-shiny/0025-420-Pikachu-Cosplay.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0025--420--Pikachu--Cosplay.png
rename to src/canonical/dex/front-shiny/0025-420-Pikachu-Cosplay.png
diff --git a/src/canonical/dex/front-shiny/0025--420--Pikachu--Partner.png b/src/canonical/dex/front-shiny/0025-420-Pikachu-Partner.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0025--420--Pikachu--Partner.png
rename to src/canonical/dex/front-shiny/0025-420-Pikachu-Partner.png
diff --git a/src/canonical/dex/front-shiny/0026--000--Raichu.png b/src/canonical/dex/front-shiny/0026-000-Raichu.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0026--000--Raichu.png
rename to src/canonical/dex/front-shiny/0026-000-Raichu.png
diff --git a/src/canonical/dex/front-shiny/0026--420--Raichu--Alola.png b/src/canonical/dex/front-shiny/0026-420-Raichu-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0026--420--Raichu--Alola.png
rename to src/canonical/dex/front-shiny/0026-420-Raichu-Alola.png
diff --git a/src/canonical/dex/front-shiny/0027--000--Sandshrew.png b/src/canonical/dex/front-shiny/0027-000-Sandshrew.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0027--000--Sandshrew.png
rename to src/canonical/dex/front-shiny/0027-000-Sandshrew.png
diff --git a/src/canonical/dex/front-shiny/0027--420--Sandshrew--Alola.png b/src/canonical/dex/front-shiny/0027-420-Sandshrew-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0027--420--Sandshrew--Alola.png
rename to src/canonical/dex/front-shiny/0027-420-Sandshrew-Alola.png
diff --git a/src/canonical/dex/front-shiny/0028--000--Sandslash.png b/src/canonical/dex/front-shiny/0028-000-Sandslash.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0028--000--Sandslash.png
rename to src/canonical/dex/front-shiny/0028-000-Sandslash.png
diff --git a/src/canonical/dex/front-shiny/0028--420--Sandslash--Alola.png b/src/canonical/dex/front-shiny/0028-420-Sandslash-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0028--420--Sandslash--Alola.png
rename to src/canonical/dex/front-shiny/0028-420-Sandslash-Alola.png
diff --git a/src/canonical/dex/front-shiny/0029--000--Nidoran-F.png b/src/canonical/dex/front-shiny/0029-000-Nidoran~F.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0029--000--Nidoran-F.png
rename to src/canonical/dex/front-shiny/0029-000-Nidoran~F.png
diff --git a/src/canonical/dex/front-shiny/0030--000--Nidorina.png b/src/canonical/dex/front-shiny/0030-000-Nidorina.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0030--000--Nidorina.png
rename to src/canonical/dex/front-shiny/0030-000-Nidorina.png
diff --git a/src/canonical/dex/front-shiny/0031--000--Nidoqueen.png b/src/canonical/dex/front-shiny/0031-000-Nidoqueen.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0031--000--Nidoqueen.png
rename to src/canonical/dex/front-shiny/0031-000-Nidoqueen.png
diff --git a/src/canonical/dex/front-shiny/0032--000--Nidoran-M.png b/src/canonical/dex/front-shiny/0032-000-Nidoran~M.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0032--000--Nidoran-M.png
rename to src/canonical/dex/front-shiny/0032-000-Nidoran~M.png
diff --git a/src/canonical/dex/front-shiny/0033--000--Nidorino.png b/src/canonical/dex/front-shiny/0033-000-Nidorino.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0033--000--Nidorino.png
rename to src/canonical/dex/front-shiny/0033-000-Nidorino.png
diff --git a/src/canonical/dex/front-shiny/0034--000--Nidoking.png b/src/canonical/dex/front-shiny/0034-000-Nidoking.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0034--000--Nidoking.png
rename to src/canonical/dex/front-shiny/0034-000-Nidoking.png
diff --git a/src/canonical/dex/front-shiny/0035--000--Clefairy.png b/src/canonical/dex/front-shiny/0035-000-Clefairy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0035--000--Clefairy.png
rename to src/canonical/dex/front-shiny/0035-000-Clefairy.png
diff --git a/src/canonical/dex/front-shiny/0036--000--Clefable.png b/src/canonical/dex/front-shiny/0036-000-Clefable.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0036--000--Clefable.png
rename to src/canonical/dex/front-shiny/0036-000-Clefable.png
diff --git a/src/canonical/dex/front-shiny/0037--000--Vulpix.png b/src/canonical/dex/front-shiny/0037-000-Vulpix.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0037--000--Vulpix.png
rename to src/canonical/dex/front-shiny/0037-000-Vulpix.png
diff --git a/src/canonical/dex/front-shiny/0037--420--Vulpix--Alola.png b/src/canonical/dex/front-shiny/0037-420-Vulpix-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0037--420--Vulpix--Alola.png
rename to src/canonical/dex/front-shiny/0037-420-Vulpix-Alola.png
diff --git a/src/canonical/dex/front-shiny/0038--000--Ninetales.png b/src/canonical/dex/front-shiny/0038-000-Ninetales.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0038--000--Ninetales.png
rename to src/canonical/dex/front-shiny/0038-000-Ninetales.png
diff --git a/src/canonical/dex/front-shiny/0038--420--Ninetales--Alola.png b/src/canonical/dex/front-shiny/0038-420-Ninetales-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0038--420--Ninetales--Alola.png
rename to src/canonical/dex/front-shiny/0038-420-Ninetales-Alola.png
diff --git a/src/canonical/dex/front-shiny/0039--000--Jigglypuff.png b/src/canonical/dex/front-shiny/0039-000-Jigglypuff.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0039--000--Jigglypuff.png
rename to src/canonical/dex/front-shiny/0039-000-Jigglypuff.png
diff --git a/src/canonical/dex/front-shiny/0040--000--Wigglytuff.png b/src/canonical/dex/front-shiny/0040-000-Wigglytuff.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0040--000--Wigglytuff.png
rename to src/canonical/dex/front-shiny/0040-000-Wigglytuff.png
diff --git a/src/canonical/dex/front-shiny/0041--000--Zubat.png b/src/canonical/dex/front-shiny/0041-000-Zubat.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0041--000--Zubat.png
rename to src/canonical/dex/front-shiny/0041-000-Zubat.png
diff --git a/src/canonical/dex/front-shiny/0042--000--Golbat.png b/src/canonical/dex/front-shiny/0042-000-Golbat.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0042--000--Golbat.png
rename to src/canonical/dex/front-shiny/0042-000-Golbat.png
diff --git a/src/canonical/dex/front-shiny/0043--000--Oddish.png b/src/canonical/dex/front-shiny/0043-000-Oddish.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0043--000--Oddish.png
rename to src/canonical/dex/front-shiny/0043-000-Oddish.png
diff --git a/src/canonical/dex/front-shiny/0044--000--Gloom.png b/src/canonical/dex/front-shiny/0044-000-Gloom.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0044--000--Gloom.png
rename to src/canonical/dex/front-shiny/0044-000-Gloom.png
diff --git a/src/canonical/dex/front-shiny/0045--000--Vileplume.png b/src/canonical/dex/front-shiny/0045-000-Vileplume.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0045--000--Vileplume.png
rename to src/canonical/dex/front-shiny/0045-000-Vileplume.png
diff --git a/src/canonical/dex/front-shiny/0046--000--Paras.png b/src/canonical/dex/front-shiny/0046-000-Paras.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0046--000--Paras.png
rename to src/canonical/dex/front-shiny/0046-000-Paras.png
diff --git a/src/canonical/dex/front-shiny/0047--000--Parasect.png b/src/canonical/dex/front-shiny/0047-000-Parasect.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0047--000--Parasect.png
rename to src/canonical/dex/front-shiny/0047-000-Parasect.png
diff --git a/src/canonical/dex/front-shiny/0048--000--Venonat.png b/src/canonical/dex/front-shiny/0048-000-Venonat.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0048--000--Venonat.png
rename to src/canonical/dex/front-shiny/0048-000-Venonat.png
diff --git a/src/canonical/dex/front-shiny/0049--000--Venomoth.png b/src/canonical/dex/front-shiny/0049-000-Venomoth.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0049--000--Venomoth.png
rename to src/canonical/dex/front-shiny/0049-000-Venomoth.png
diff --git a/src/canonical/dex/front-shiny/0050--000--Diglett.png b/src/canonical/dex/front-shiny/0050-000-Diglett.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0050--000--Diglett.png
rename to src/canonical/dex/front-shiny/0050-000-Diglett.png
diff --git a/src/canonical/dex/front-shiny/0050--420--Diglett--Alola.png b/src/canonical/dex/front-shiny/0050-420-Diglett-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0050--420--Diglett--Alola.png
rename to src/canonical/dex/front-shiny/0050-420-Diglett-Alola.png
diff --git a/src/canonical/dex/front-shiny/0051--000--Dugtrio.png b/src/canonical/dex/front-shiny/0051-000-Dugtrio.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0051--000--Dugtrio.png
rename to src/canonical/dex/front-shiny/0051-000-Dugtrio.png
diff --git a/src/canonical/dex/front-shiny/0051--420--Dugtrio--Alola.png b/src/canonical/dex/front-shiny/0051-420-Dugtrio-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0051--420--Dugtrio--Alola.png
rename to src/canonical/dex/front-shiny/0051-420-Dugtrio-Alola.png
diff --git a/src/canonical/dex/front-shiny/0052--000--Meowth.png b/src/canonical/dex/front-shiny/0052-000-Meowth.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0052--000--Meowth.png
rename to src/canonical/dex/front-shiny/0052-000-Meowth.png
diff --git a/src/canonical/dex/front-shiny/0052--420--Meowth--Alola.png b/src/canonical/dex/front-shiny/0052-420-Meowth-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0052--420--Meowth--Alola.png
rename to src/canonical/dex/front-shiny/0052-420-Meowth-Alola.png
diff --git a/src/canonical/dex/front-shiny/0053--000--Persian.png b/src/canonical/dex/front-shiny/0053-000-Persian.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0053--000--Persian.png
rename to src/canonical/dex/front-shiny/0053-000-Persian.png
diff --git a/src/canonical/dex/front-shiny/0053--420--Persian--Alola.png b/src/canonical/dex/front-shiny/0053-420-Persian-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0053--420--Persian--Alola.png
rename to src/canonical/dex/front-shiny/0053-420-Persian-Alola.png
diff --git a/src/canonical/dex/front-shiny/0054--000--Psyduck.png b/src/canonical/dex/front-shiny/0054-000-Psyduck.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0054--000--Psyduck.png
rename to src/canonical/dex/front-shiny/0054-000-Psyduck.png
diff --git a/src/canonical/dex/front-shiny/0055--000--Golduck.png b/src/canonical/dex/front-shiny/0055-000-Golduck.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0055--000--Golduck.png
rename to src/canonical/dex/front-shiny/0055-000-Golduck.png
diff --git a/src/canonical/dex/front-shiny/0056--000--Mankey.png b/src/canonical/dex/front-shiny/0056-000-Mankey.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0056--000--Mankey.png
rename to src/canonical/dex/front-shiny/0056-000-Mankey.png
diff --git a/src/canonical/dex/front-shiny/0057--000--Primeape.png b/src/canonical/dex/front-shiny/0057-000-Primeape.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0057--000--Primeape.png
rename to src/canonical/dex/front-shiny/0057-000-Primeape.png
diff --git a/src/canonical/dex/front-shiny/0058--000--Growlithe.png b/src/canonical/dex/front-shiny/0058-000-Growlithe.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0058--000--Growlithe.png
rename to src/canonical/dex/front-shiny/0058-000-Growlithe.png
diff --git a/src/canonical/dex/front-shiny/0059--000--Arcanine.png b/src/canonical/dex/front-shiny/0059-000-Arcanine.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0059--000--Arcanine.png
rename to src/canonical/dex/front-shiny/0059-000-Arcanine.png
diff --git a/src/canonical/dex/front-shiny/0060--000--Poliwag.png b/src/canonical/dex/front-shiny/0060-000-Poliwag.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0060--000--Poliwag.png
rename to src/canonical/dex/front-shiny/0060-000-Poliwag.png
diff --git a/src/canonical/dex/front-shiny/0061--000--Poliwhirl.png b/src/canonical/dex/front-shiny/0061-000-Poliwhirl.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0061--000--Poliwhirl.png
rename to src/canonical/dex/front-shiny/0061-000-Poliwhirl.png
diff --git a/src/canonical/dex/front-shiny/0062--000--Poliwrath.png b/src/canonical/dex/front-shiny/0062-000-Poliwrath.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0062--000--Poliwrath.png
rename to src/canonical/dex/front-shiny/0062-000-Poliwrath.png
diff --git a/src/canonical/dex/front-shiny/0063--000--Abra.png b/src/canonical/dex/front-shiny/0063-000-Abra.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0063--000--Abra.png
rename to src/canonical/dex/front-shiny/0063-000-Abra.png
diff --git a/src/canonical/dex/front-shiny/0064--000--Kadabra.png b/src/canonical/dex/front-shiny/0064-000-Kadabra.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0064--000--Kadabra.png
rename to src/canonical/dex/front-shiny/0064-000-Kadabra.png
diff --git a/src/canonical/dex/front-shiny/0065--000--Alakazam.png b/src/canonical/dex/front-shiny/0065-000-Alakazam.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0065--000--Alakazam.png
rename to src/canonical/dex/front-shiny/0065-000-Alakazam.png
diff --git a/src/canonical/dex/front-shiny/0065--420--Alakazam--Mega.png b/src/canonical/dex/front-shiny/0065-420-Alakazam-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0065--420--Alakazam--Mega.png
rename to src/canonical/dex/front-shiny/0065-420-Alakazam-Mega.png
diff --git a/src/canonical/dex/front-shiny/0066--000--Machop.png b/src/canonical/dex/front-shiny/0066-000-Machop.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0066--000--Machop.png
rename to src/canonical/dex/front-shiny/0066-000-Machop.png
diff --git a/src/canonical/dex/front-shiny/0067--000--Machoke.png b/src/canonical/dex/front-shiny/0067-000-Machoke.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0067--000--Machoke.png
rename to src/canonical/dex/front-shiny/0067-000-Machoke.png
diff --git a/src/canonical/dex/front-shiny/0068--000--Machamp.png b/src/canonical/dex/front-shiny/0068-000-Machamp.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0068--000--Machamp.png
rename to src/canonical/dex/front-shiny/0068-000-Machamp.png
diff --git a/src/canonical/dex/front-shiny/0069--000--Bellsprout.png b/src/canonical/dex/front-shiny/0069-000-Bellsprout.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0069--000--Bellsprout.png
rename to src/canonical/dex/front-shiny/0069-000-Bellsprout.png
diff --git a/src/canonical/dex/front-shiny/0070--000--Weepinbell.png b/src/canonical/dex/front-shiny/0070-000-Weepinbell.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0070--000--Weepinbell.png
rename to src/canonical/dex/front-shiny/0070-000-Weepinbell.png
diff --git a/src/canonical/dex/front-shiny/0071--000--Victreebel.png b/src/canonical/dex/front-shiny/0071-000-Victreebel.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0071--000--Victreebel.png
rename to src/canonical/dex/front-shiny/0071-000-Victreebel.png
diff --git a/src/canonical/dex/front-shiny/0072--000--Tentacool.png b/src/canonical/dex/front-shiny/0072-000-Tentacool.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0072--000--Tentacool.png
rename to src/canonical/dex/front-shiny/0072-000-Tentacool.png
diff --git a/src/canonical/dex/front-shiny/0073--000--Tentacruel.png b/src/canonical/dex/front-shiny/0073-000-Tentacruel.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0073--000--Tentacruel.png
rename to src/canonical/dex/front-shiny/0073-000-Tentacruel.png
diff --git a/src/canonical/dex/front-shiny/0074--000--Geodude.png b/src/canonical/dex/front-shiny/0074-000-Geodude.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0074--000--Geodude.png
rename to src/canonical/dex/front-shiny/0074-000-Geodude.png
diff --git a/src/canonical/dex/front-shiny/0074--420--Geodude--Alola.png b/src/canonical/dex/front-shiny/0074-420-Geodude-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0074--420--Geodude--Alola.png
rename to src/canonical/dex/front-shiny/0074-420-Geodude-Alola.png
diff --git a/src/canonical/dex/front-shiny/0075--000--Graveler.png b/src/canonical/dex/front-shiny/0075-000-Graveler.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0075--000--Graveler.png
rename to src/canonical/dex/front-shiny/0075-000-Graveler.png
diff --git a/src/canonical/dex/front-shiny/0075--420--Graveler--Alola.png b/src/canonical/dex/front-shiny/0075-420-Graveler-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0075--420--Graveler--Alola.png
rename to src/canonical/dex/front-shiny/0075-420-Graveler-Alola.png
diff --git a/src/canonical/dex/front-shiny/0076--000--Golem.png b/src/canonical/dex/front-shiny/0076-000-Golem.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0076--000--Golem.png
rename to src/canonical/dex/front-shiny/0076-000-Golem.png
diff --git a/src/canonical/dex/front-shiny/0076--420--Golem--Alola.png b/src/canonical/dex/front-shiny/0076-420-Golem-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0076--420--Golem--Alola.png
rename to src/canonical/dex/front-shiny/0076-420-Golem-Alola.png
diff --git a/src/canonical/dex/front-shiny/0077--000--Ponyta.png b/src/canonical/dex/front-shiny/0077-000-Ponyta.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0077--000--Ponyta.png
rename to src/canonical/dex/front-shiny/0077-000-Ponyta.png
diff --git a/src/canonical/dex/front-shiny/0078--000--Rapidash.png b/src/canonical/dex/front-shiny/0078-000-Rapidash.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0078--000--Rapidash.png
rename to src/canonical/dex/front-shiny/0078-000-Rapidash.png
diff --git a/src/canonical/dex/front-shiny/0079--000--Slowpoke.png b/src/canonical/dex/front-shiny/0079-000-Slowpoke.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0079--000--Slowpoke.png
rename to src/canonical/dex/front-shiny/0079-000-Slowpoke.png
diff --git a/src/canonical/dex/front-shiny/0080--000--Slowbro.png b/src/canonical/dex/front-shiny/0080-000-Slowbro.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0080--000--Slowbro.png
rename to src/canonical/dex/front-shiny/0080-000-Slowbro.png
diff --git a/src/canonical/dex/front-shiny/0080--420--Slowbro--Mega.png b/src/canonical/dex/front-shiny/0080-420-Slowbro-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0080--420--Slowbro--Mega.png
rename to src/canonical/dex/front-shiny/0080-420-Slowbro-Mega.png
diff --git a/src/canonical/dex/front-shiny/0081--000--Magnemite.png b/src/canonical/dex/front-shiny/0081-000-Magnemite.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0081--000--Magnemite.png
rename to src/canonical/dex/front-shiny/0081-000-Magnemite.png
diff --git a/src/canonical/dex/front-shiny/0082--000--Magneton.png b/src/canonical/dex/front-shiny/0082-000-Magneton.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0082--000--Magneton.png
rename to src/canonical/dex/front-shiny/0082-000-Magneton.png
diff --git a/src/canonical/dex/front-shiny/0083--000--Farfetch__0027d.png b/src/canonical/dex/front-shiny/0083-000-Farfetch__0027d.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0083--000--Farfetch__0027d.png
rename to src/canonical/dex/front-shiny/0083-000-Farfetch__0027d.png
diff --git a/src/canonical/dex/front-shiny/0084--000--Doduo.png b/src/canonical/dex/front-shiny/0084-000-Doduo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0084--000--Doduo.png
rename to src/canonical/dex/front-shiny/0084-000-Doduo.png
diff --git a/src/canonical/dex/front-shiny/0085--000--Dodrio.png b/src/canonical/dex/front-shiny/0085-000-Dodrio.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0085--000--Dodrio.png
rename to src/canonical/dex/front-shiny/0085-000-Dodrio.png
diff --git a/src/canonical/dex/front-shiny/0086--000--Seel.png b/src/canonical/dex/front-shiny/0086-000-Seel.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0086--000--Seel.png
rename to src/canonical/dex/front-shiny/0086-000-Seel.png
diff --git a/src/canonical/dex/front-shiny/0087--000--Dewgong.png b/src/canonical/dex/front-shiny/0087-000-Dewgong.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0087--000--Dewgong.png
rename to src/canonical/dex/front-shiny/0087-000-Dewgong.png
diff --git a/src/canonical/dex/front-shiny/0088--000--Grimer.png b/src/canonical/dex/front-shiny/0088-000-Grimer.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0088--000--Grimer.png
rename to src/canonical/dex/front-shiny/0088-000-Grimer.png
diff --git a/src/canonical/dex/front-shiny/0088--420--Grimer--Alola.png b/src/canonical/dex/front-shiny/0088-420-Grimer-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0088--420--Grimer--Alola.png
rename to src/canonical/dex/front-shiny/0088-420-Grimer-Alola.png
diff --git a/src/canonical/dex/front-shiny/0089--000--Muk.png b/src/canonical/dex/front-shiny/0089-000-Muk.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0089--000--Muk.png
rename to src/canonical/dex/front-shiny/0089-000-Muk.png
diff --git a/src/canonical/dex/front-shiny/0089--420--Muk--Alola.png b/src/canonical/dex/front-shiny/0089-420-Muk-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0089--420--Muk--Alola.png
rename to src/canonical/dex/front-shiny/0089-420-Muk-Alola.png
diff --git a/src/canonical/dex/front-shiny/0090--000--Shellder.png b/src/canonical/dex/front-shiny/0090-000-Shellder.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0090--000--Shellder.png
rename to src/canonical/dex/front-shiny/0090-000-Shellder.png
diff --git a/src/canonical/dex/front-shiny/0091--000--Cloyster.png b/src/canonical/dex/front-shiny/0091-000-Cloyster.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0091--000--Cloyster.png
rename to src/canonical/dex/front-shiny/0091-000-Cloyster.png
diff --git a/src/canonical/dex/front-shiny/0092--000--Gastly.png b/src/canonical/dex/front-shiny/0092-000-Gastly.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0092--000--Gastly.png
rename to src/canonical/dex/front-shiny/0092-000-Gastly.png
diff --git a/src/canonical/dex/front-shiny/0093--000--Haunter.png b/src/canonical/dex/front-shiny/0093-000-Haunter.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0093--000--Haunter.png
rename to src/canonical/dex/front-shiny/0093-000-Haunter.png
diff --git a/src/canonical/dex/front-shiny/0094--000--Gengar.png b/src/canonical/dex/front-shiny/0094-000-Gengar.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0094--000--Gengar.png
rename to src/canonical/dex/front-shiny/0094-000-Gengar.png
diff --git a/src/canonical/dex/front-shiny/0094--420--Gengar--Mega.png b/src/canonical/dex/front-shiny/0094-420-Gengar-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0094--420--Gengar--Mega.png
rename to src/canonical/dex/front-shiny/0094-420-Gengar-Mega.png
diff --git a/src/canonical/dex/front-shiny/0095--000--Onix.png b/src/canonical/dex/front-shiny/0095-000-Onix.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0095--000--Onix.png
rename to src/canonical/dex/front-shiny/0095-000-Onix.png
diff --git a/src/canonical/dex/front-shiny/0096--000--Drowzee.png b/src/canonical/dex/front-shiny/0096-000-Drowzee.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0096--000--Drowzee.png
rename to src/canonical/dex/front-shiny/0096-000-Drowzee.png
diff --git a/src/canonical/dex/front-shiny/0097--000--Hypno.png b/src/canonical/dex/front-shiny/0097-000-Hypno.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0097--000--Hypno.png
rename to src/canonical/dex/front-shiny/0097-000-Hypno.png
diff --git a/src/canonical/dex/front-shiny/0098--000--Krabby.png b/src/canonical/dex/front-shiny/0098-000-Krabby.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0098--000--Krabby.png
rename to src/canonical/dex/front-shiny/0098-000-Krabby.png
diff --git a/src/canonical/dex/front-shiny/0099--000--Kingler.png b/src/canonical/dex/front-shiny/0099-000-Kingler.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0099--000--Kingler.png
rename to src/canonical/dex/front-shiny/0099-000-Kingler.png
diff --git a/src/canonical/dex/front-shiny/0100--000--Voltorb.png b/src/canonical/dex/front-shiny/0100-000-Voltorb.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0100--000--Voltorb.png
rename to src/canonical/dex/front-shiny/0100-000-Voltorb.png
diff --git a/src/canonical/dex/front-shiny/0101--000--Electrode.png b/src/canonical/dex/front-shiny/0101-000-Electrode.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0101--000--Electrode.png
rename to src/canonical/dex/front-shiny/0101-000-Electrode.png
diff --git a/src/canonical/dex/front-shiny/0102--000--Exeggcute.png b/src/canonical/dex/front-shiny/0102-000-Exeggcute.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0102--000--Exeggcute.png
rename to src/canonical/dex/front-shiny/0102-000-Exeggcute.png
diff --git a/src/canonical/dex/front-shiny/0103--000--Exeggutor.png b/src/canonical/dex/front-shiny/0103-000-Exeggutor.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0103--000--Exeggutor.png
rename to src/canonical/dex/front-shiny/0103-000-Exeggutor.png
diff --git a/src/canonical/dex/front-shiny/0103--420--Exeggutor--Alola.png b/src/canonical/dex/front-shiny/0103-420-Exeggutor-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0103--420--Exeggutor--Alola.png
rename to src/canonical/dex/front-shiny/0103-420-Exeggutor-Alola.png
diff --git a/src/canonical/dex/front-shiny/0104--000--Cubone.png b/src/canonical/dex/front-shiny/0104-000-Cubone.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0104--000--Cubone.png
rename to src/canonical/dex/front-shiny/0104-000-Cubone.png
diff --git a/src/canonical/dex/front-shiny/0105--000--Marowak.png b/src/canonical/dex/front-shiny/0105-000-Marowak.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0105--000--Marowak.png
rename to src/canonical/dex/front-shiny/0105-000-Marowak.png
diff --git a/src/canonical/dex/front-shiny/0105--420--Marowak--Alola.png b/src/canonical/dex/front-shiny/0105-420-Marowak-Alola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0105--420--Marowak--Alola.png
rename to src/canonical/dex/front-shiny/0105-420-Marowak-Alola.png
diff --git a/src/canonical/dex/front-shiny/0106--000--Hitmonlee.png b/src/canonical/dex/front-shiny/0106-000-Hitmonlee.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0106--000--Hitmonlee.png
rename to src/canonical/dex/front-shiny/0106-000-Hitmonlee.png
diff --git a/src/canonical/dex/front-shiny/0107--000--Hitmonchan.png b/src/canonical/dex/front-shiny/0107-000-Hitmonchan.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0107--000--Hitmonchan.png
rename to src/canonical/dex/front-shiny/0107-000-Hitmonchan.png
diff --git a/src/canonical/dex/front-shiny/0108--000--Lickitung.png b/src/canonical/dex/front-shiny/0108-000-Lickitung.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0108--000--Lickitung.png
rename to src/canonical/dex/front-shiny/0108-000-Lickitung.png
diff --git a/src/canonical/dex/front-shiny/0109--000--Koffing.png b/src/canonical/dex/front-shiny/0109-000-Koffing.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0109--000--Koffing.png
rename to src/canonical/dex/front-shiny/0109-000-Koffing.png
diff --git a/src/canonical/dex/front-shiny/0110--000--Weezing.png b/src/canonical/dex/front-shiny/0110-000-Weezing.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0110--000--Weezing.png
rename to src/canonical/dex/front-shiny/0110-000-Weezing.png
diff --git a/src/canonical/dex/front-shiny/0111--000--Rhyhorn.png b/src/canonical/dex/front-shiny/0111-000-Rhyhorn.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0111--000--Rhyhorn.png
rename to src/canonical/dex/front-shiny/0111-000-Rhyhorn.png
diff --git a/src/canonical/dex/front-shiny/0112--000--Rhydon.png b/src/canonical/dex/front-shiny/0112-000-Rhydon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0112--000--Rhydon.png
rename to src/canonical/dex/front-shiny/0112-000-Rhydon.png
diff --git a/src/canonical/dex/front-shiny/0113--000--Chansey.png b/src/canonical/dex/front-shiny/0113-000-Chansey.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0113--000--Chansey.png
rename to src/canonical/dex/front-shiny/0113-000-Chansey.png
diff --git a/src/canonical/dex/front-shiny/0114--000--Tangela.png b/src/canonical/dex/front-shiny/0114-000-Tangela.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0114--000--Tangela.png
rename to src/canonical/dex/front-shiny/0114-000-Tangela.png
diff --git a/src/canonical/dex/front-shiny/0115--000--Kangaskhan.png b/src/canonical/dex/front-shiny/0115-000-Kangaskhan.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0115--000--Kangaskhan.png
rename to src/canonical/dex/front-shiny/0115-000-Kangaskhan.png
diff --git a/src/canonical/dex/front-shiny/0115--420--Kangaskhan--Mega.png b/src/canonical/dex/front-shiny/0115-420-Kangaskhan-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0115--420--Kangaskhan--Mega.png
rename to src/canonical/dex/front-shiny/0115-420-Kangaskhan-Mega.png
diff --git a/src/canonical/dex/front-shiny/0116--000--Horsea.png b/src/canonical/dex/front-shiny/0116-000-Horsea.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0116--000--Horsea.png
rename to src/canonical/dex/front-shiny/0116-000-Horsea.png
diff --git a/src/canonical/dex/front-shiny/0117--000--Seadra.png b/src/canonical/dex/front-shiny/0117-000-Seadra.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0117--000--Seadra.png
rename to src/canonical/dex/front-shiny/0117-000-Seadra.png
diff --git a/src/canonical/dex/front-shiny/0118--000--Goldeen.png b/src/canonical/dex/front-shiny/0118-000-Goldeen.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0118--000--Goldeen.png
rename to src/canonical/dex/front-shiny/0118-000-Goldeen.png
diff --git a/src/canonical/dex/front-shiny/0119--000--Seaking.png b/src/canonical/dex/front-shiny/0119-000-Seaking.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0119--000--Seaking.png
rename to src/canonical/dex/front-shiny/0119-000-Seaking.png
diff --git a/src/canonical/dex/front-shiny/0120--000--Staryu.png b/src/canonical/dex/front-shiny/0120-000-Staryu.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0120--000--Staryu.png
rename to src/canonical/dex/front-shiny/0120-000-Staryu.png
diff --git a/src/canonical/dex/front-shiny/0121--000--Starmie.png b/src/canonical/dex/front-shiny/0121-000-Starmie.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0121--000--Starmie.png
rename to src/canonical/dex/front-shiny/0121-000-Starmie.png
diff --git a/src/canonical/dex/front-shiny/0122--000--Mr._Mime.png b/src/canonical/dex/front-shiny/0122-000-Mr._Mime.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0122--000--Mr._Mime.png
rename to src/canonical/dex/front-shiny/0122-000-Mr._Mime.png
diff --git a/src/canonical/dex/front-shiny/0123--000--Scyther.png b/src/canonical/dex/front-shiny/0123-000-Scyther.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0123--000--Scyther.png
rename to src/canonical/dex/front-shiny/0123-000-Scyther.png
diff --git a/src/canonical/dex/front-shiny/0124--000--Jynx.png b/src/canonical/dex/front-shiny/0124-000-Jynx.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0124--000--Jynx.png
rename to src/canonical/dex/front-shiny/0124-000-Jynx.png
diff --git a/src/canonical/dex/front-shiny/0125--000--Electabuzz.png b/src/canonical/dex/front-shiny/0125-000-Electabuzz.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0125--000--Electabuzz.png
rename to src/canonical/dex/front-shiny/0125-000-Electabuzz.png
diff --git a/src/canonical/dex/front-shiny/0126--000--Magmar.png b/src/canonical/dex/front-shiny/0126-000-Magmar.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0126--000--Magmar.png
rename to src/canonical/dex/front-shiny/0126-000-Magmar.png
diff --git a/src/canonical/dex/front-shiny/0127--000--Pinsir.png b/src/canonical/dex/front-shiny/0127-000-Pinsir.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0127--000--Pinsir.png
rename to src/canonical/dex/front-shiny/0127-000-Pinsir.png
diff --git a/src/canonical/dex/front-shiny/0127--420--Pinsir--Mega.png b/src/canonical/dex/front-shiny/0127-420-Pinsir-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0127--420--Pinsir--Mega.png
rename to src/canonical/dex/front-shiny/0127-420-Pinsir-Mega.png
diff --git a/src/canonical/dex/front-shiny/0128--000--Tauros.png b/src/canonical/dex/front-shiny/0128-000-Tauros.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0128--000--Tauros.png
rename to src/canonical/dex/front-shiny/0128-000-Tauros.png
diff --git a/src/canonical/dex/front-shiny/0129--000--Magikarp.png b/src/canonical/dex/front-shiny/0129-000-Magikarp.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0129--000--Magikarp.png
rename to src/canonical/dex/front-shiny/0129-000-Magikarp.png
diff --git a/src/canonical/dex/front-shiny/0130--000--Gyarados.png b/src/canonical/dex/front-shiny/0130-000-Gyarados.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0130--000--Gyarados.png
rename to src/canonical/dex/front-shiny/0130-000-Gyarados.png
diff --git a/src/canonical/dex/front-shiny/0130--420--Gyarados--Mega.png b/src/canonical/dex/front-shiny/0130-420-Gyarados-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0130--420--Gyarados--Mega.png
rename to src/canonical/dex/front-shiny/0130-420-Gyarados-Mega.png
diff --git a/src/canonical/dex/front-shiny/0131--000--Lapras.png b/src/canonical/dex/front-shiny/0131-000-Lapras.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0131--000--Lapras.png
rename to src/canonical/dex/front-shiny/0131-000-Lapras.png
diff --git a/src/canonical/dex/front-shiny/0132--000--Ditto.png b/src/canonical/dex/front-shiny/0132-000-Ditto.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0132--000--Ditto.png
rename to src/canonical/dex/front-shiny/0132-000-Ditto.png
diff --git a/src/canonical/dex/front-shiny/0133--000--Eevee.png b/src/canonical/dex/front-shiny/0133-000-Eevee.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0133--000--Eevee.png
rename to src/canonical/dex/front-shiny/0133-000-Eevee.png
diff --git a/src/canonical/dex/front-shiny/0134--000--Vaporeon.png b/src/canonical/dex/front-shiny/0134-000-Vaporeon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0134--000--Vaporeon.png
rename to src/canonical/dex/front-shiny/0134-000-Vaporeon.png
diff --git a/src/canonical/dex/front-shiny/0135--000--Jolteon.png b/src/canonical/dex/front-shiny/0135-000-Jolteon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0135--000--Jolteon.png
rename to src/canonical/dex/front-shiny/0135-000-Jolteon.png
diff --git a/src/canonical/dex/front-shiny/0136--000--Flareon.png b/src/canonical/dex/front-shiny/0136-000-Flareon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0136--000--Flareon.png
rename to src/canonical/dex/front-shiny/0136-000-Flareon.png
diff --git a/src/canonical/dex/front-shiny/0137--000--Porygon.png b/src/canonical/dex/front-shiny/0137-000-Porygon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0137--000--Porygon.png
rename to src/canonical/dex/front-shiny/0137-000-Porygon.png
diff --git a/src/canonical/dex/front-shiny/0138--000--Omanyte.png b/src/canonical/dex/front-shiny/0138-000-Omanyte.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0138--000--Omanyte.png
rename to src/canonical/dex/front-shiny/0138-000-Omanyte.png
diff --git a/src/canonical/dex/front-shiny/0139--000--Omastar.png b/src/canonical/dex/front-shiny/0139-000-Omastar.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0139--000--Omastar.png
rename to src/canonical/dex/front-shiny/0139-000-Omastar.png
diff --git a/src/canonical/dex/front-shiny/0140--000--Kabuto.png b/src/canonical/dex/front-shiny/0140-000-Kabuto.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0140--000--Kabuto.png
rename to src/canonical/dex/front-shiny/0140-000-Kabuto.png
diff --git a/src/canonical/dex/front-shiny/0141--000--Kabutops.png b/src/canonical/dex/front-shiny/0141-000-Kabutops.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0141--000--Kabutops.png
rename to src/canonical/dex/front-shiny/0141-000-Kabutops.png
diff --git a/src/canonical/dex/front-shiny/0142--000--Aerodactyl.png b/src/canonical/dex/front-shiny/0142-000-Aerodactyl.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0142--000--Aerodactyl.png
rename to src/canonical/dex/front-shiny/0142-000-Aerodactyl.png
diff --git a/src/canonical/dex/front-shiny/0142--420--Aerodactyl--Mega.png b/src/canonical/dex/front-shiny/0142-420-Aerodactyl-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0142--420--Aerodactyl--Mega.png
rename to src/canonical/dex/front-shiny/0142-420-Aerodactyl-Mega.png
diff --git a/src/canonical/dex/front-shiny/0143--000--Snorlax.png b/src/canonical/dex/front-shiny/0143-000-Snorlax.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0143--000--Snorlax.png
rename to src/canonical/dex/front-shiny/0143-000-Snorlax.png
diff --git a/src/canonical/dex/front-shiny/0144--000--Articuno.png b/src/canonical/dex/front-shiny/0144-000-Articuno.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0144--000--Articuno.png
rename to src/canonical/dex/front-shiny/0144-000-Articuno.png
diff --git a/src/canonical/dex/front-shiny/0145--000--Zapdos.png b/src/canonical/dex/front-shiny/0145-000-Zapdos.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0145--000--Zapdos.png
rename to src/canonical/dex/front-shiny/0145-000-Zapdos.png
diff --git a/src/canonical/dex/front-shiny/0146--000--Moltres.png b/src/canonical/dex/front-shiny/0146-000-Moltres.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0146--000--Moltres.png
rename to src/canonical/dex/front-shiny/0146-000-Moltres.png
diff --git a/src/canonical/dex/front-shiny/0147--000--Dratini.png b/src/canonical/dex/front-shiny/0147-000-Dratini.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0147--000--Dratini.png
rename to src/canonical/dex/front-shiny/0147-000-Dratini.png
diff --git a/src/canonical/dex/front-shiny/0148--000--Dragonair.png b/src/canonical/dex/front-shiny/0148-000-Dragonair.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0148--000--Dragonair.png
rename to src/canonical/dex/front-shiny/0148-000-Dragonair.png
diff --git a/src/canonical/dex/front-shiny/0149--000--Dragonite.png b/src/canonical/dex/front-shiny/0149-000-Dragonite.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0149--000--Dragonite.png
rename to src/canonical/dex/front-shiny/0149-000-Dragonite.png
diff --git a/src/canonical/dex/front-shiny/0150--000--Mewtwo.png b/src/canonical/dex/front-shiny/0150-000-Mewtwo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0150--000--Mewtwo.png
rename to src/canonical/dex/front-shiny/0150-000-Mewtwo.png
diff --git a/src/canonical/dex/front-shiny/0150--420--Mewtwo--Mega-X.png b/src/canonical/dex/front-shiny/0150-420-Mewtwo-Mega~X.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0150--420--Mewtwo--Mega-X.png
rename to src/canonical/dex/front-shiny/0150-420-Mewtwo-Mega~X.png
diff --git a/src/canonical/dex/front-shiny/0150--420--Mewtwo--Mega-Y.png b/src/canonical/dex/front-shiny/0150-420-Mewtwo-Mega~Y.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0150--420--Mewtwo--Mega-Y.png
rename to src/canonical/dex/front-shiny/0150-420-Mewtwo-Mega~Y.png
diff --git a/src/canonical/dex/front-shiny/0151--000--Mew.png b/src/canonical/dex/front-shiny/0151-000-Mew.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0151--000--Mew.png
rename to src/canonical/dex/front-shiny/0151-000-Mew.png
diff --git a/src/canonical/dex/front-shiny/0152--000--Chikorita.png b/src/canonical/dex/front-shiny/0152-000-Chikorita.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0152--000--Chikorita.png
rename to src/canonical/dex/front-shiny/0152-000-Chikorita.png
diff --git a/src/canonical/dex/front-shiny/0153--000--Bayleef.png b/src/canonical/dex/front-shiny/0153-000-Bayleef.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0153--000--Bayleef.png
rename to src/canonical/dex/front-shiny/0153-000-Bayleef.png
diff --git a/src/canonical/dex/front-shiny/0154--000--Meganium.png b/src/canonical/dex/front-shiny/0154-000-Meganium.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0154--000--Meganium.png
rename to src/canonical/dex/front-shiny/0154-000-Meganium.png
diff --git a/src/canonical/dex/front-shiny/0155--000--Cyndaquil.png b/src/canonical/dex/front-shiny/0155-000-Cyndaquil.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0155--000--Cyndaquil.png
rename to src/canonical/dex/front-shiny/0155-000-Cyndaquil.png
diff --git a/src/canonical/dex/front-shiny/0156--000--Quilava.png b/src/canonical/dex/front-shiny/0156-000-Quilava.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0156--000--Quilava.png
rename to src/canonical/dex/front-shiny/0156-000-Quilava.png
diff --git a/src/canonical/dex/front-shiny/0157--000--Typhlosion.png b/src/canonical/dex/front-shiny/0157-000-Typhlosion.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0157--000--Typhlosion.png
rename to src/canonical/dex/front-shiny/0157-000-Typhlosion.png
diff --git a/src/canonical/dex/front-shiny/0158--000--Totodile.png b/src/canonical/dex/front-shiny/0158-000-Totodile.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0158--000--Totodile.png
rename to src/canonical/dex/front-shiny/0158-000-Totodile.png
diff --git a/src/canonical/dex/front-shiny/0159--000--Croconaw.png b/src/canonical/dex/front-shiny/0159-000-Croconaw.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0159--000--Croconaw.png
rename to src/canonical/dex/front-shiny/0159-000-Croconaw.png
diff --git a/src/canonical/dex/front-shiny/0160--000--Feraligatr.png b/src/canonical/dex/front-shiny/0160-000-Feraligatr.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0160--000--Feraligatr.png
rename to src/canonical/dex/front-shiny/0160-000-Feraligatr.png
diff --git a/src/canonical/dex/front-shiny/0161--000--Sentret.png b/src/canonical/dex/front-shiny/0161-000-Sentret.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0161--000--Sentret.png
rename to src/canonical/dex/front-shiny/0161-000-Sentret.png
diff --git a/src/canonical/dex/front-shiny/0162--000--Furret.png b/src/canonical/dex/front-shiny/0162-000-Furret.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0162--000--Furret.png
rename to src/canonical/dex/front-shiny/0162-000-Furret.png
diff --git a/src/canonical/dex/front-shiny/0163--000--Hoothoot.png b/src/canonical/dex/front-shiny/0163-000-Hoothoot.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0163--000--Hoothoot.png
rename to src/canonical/dex/front-shiny/0163-000-Hoothoot.png
diff --git a/src/canonical/dex/front-shiny/0164--000--Noctowl.png b/src/canonical/dex/front-shiny/0164-000-Noctowl.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0164--000--Noctowl.png
rename to src/canonical/dex/front-shiny/0164-000-Noctowl.png
diff --git a/src/canonical/dex/front-shiny/0165--000--Ledyba.png b/src/canonical/dex/front-shiny/0165-000-Ledyba.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0165--000--Ledyba.png
rename to src/canonical/dex/front-shiny/0165-000-Ledyba.png
diff --git a/src/canonical/dex/front-shiny/0166--000--Ledian.png b/src/canonical/dex/front-shiny/0166-000-Ledian.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0166--000--Ledian.png
rename to src/canonical/dex/front-shiny/0166-000-Ledian.png
diff --git a/src/canonical/dex/front-shiny/0167--000--Spinarak.png b/src/canonical/dex/front-shiny/0167-000-Spinarak.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0167--000--Spinarak.png
rename to src/canonical/dex/front-shiny/0167-000-Spinarak.png
diff --git a/src/canonical/dex/front-shiny/0168--000--Ariados.png b/src/canonical/dex/front-shiny/0168-000-Ariados.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0168--000--Ariados.png
rename to src/canonical/dex/front-shiny/0168-000-Ariados.png
diff --git a/src/canonical/dex/front-shiny/0169--000--Crobat.png b/src/canonical/dex/front-shiny/0169-000-Crobat.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0169--000--Crobat.png
rename to src/canonical/dex/front-shiny/0169-000-Crobat.png
diff --git a/src/canonical/dex/front-shiny/0170--000--Chinchou.png b/src/canonical/dex/front-shiny/0170-000-Chinchou.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0170--000--Chinchou.png
rename to src/canonical/dex/front-shiny/0170-000-Chinchou.png
diff --git a/src/canonical/dex/front-shiny/0171--000--Lanturn.png b/src/canonical/dex/front-shiny/0171-000-Lanturn.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0171--000--Lanturn.png
rename to src/canonical/dex/front-shiny/0171-000-Lanturn.png
diff --git a/src/canonical/dex/front-shiny/0172--000--Pichu.png b/src/canonical/dex/front-shiny/0172-000-Pichu.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0172--000--Pichu.png
rename to src/canonical/dex/front-shiny/0172-000-Pichu.png
diff --git a/src/canonical/dex/front-shiny/0173--000--Cleffa.png b/src/canonical/dex/front-shiny/0173-000-Cleffa.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0173--000--Cleffa.png
rename to src/canonical/dex/front-shiny/0173-000-Cleffa.png
diff --git a/src/canonical/dex/front-shiny/0174--000--Igglybuff.png b/src/canonical/dex/front-shiny/0174-000-Igglybuff.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0174--000--Igglybuff.png
rename to src/canonical/dex/front-shiny/0174-000-Igglybuff.png
diff --git a/src/canonical/dex/front-shiny/0175--000--Togepi.png b/src/canonical/dex/front-shiny/0175-000-Togepi.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0175--000--Togepi.png
rename to src/canonical/dex/front-shiny/0175-000-Togepi.png
diff --git a/src/canonical/dex/front-shiny/0176--000--Togetic.png b/src/canonical/dex/front-shiny/0176-000-Togetic.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0176--000--Togetic.png
rename to src/canonical/dex/front-shiny/0176-000-Togetic.png
diff --git a/src/canonical/dex/front-shiny/0177--000--Natu.png b/src/canonical/dex/front-shiny/0177-000-Natu.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0177--000--Natu.png
rename to src/canonical/dex/front-shiny/0177-000-Natu.png
diff --git a/src/canonical/dex/front-shiny/0178--000--Xatu.png b/src/canonical/dex/front-shiny/0178-000-Xatu.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0178--000--Xatu.png
rename to src/canonical/dex/front-shiny/0178-000-Xatu.png
diff --git a/src/canonical/dex/front-shiny/0179--000--Mareep.png b/src/canonical/dex/front-shiny/0179-000-Mareep.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0179--000--Mareep.png
rename to src/canonical/dex/front-shiny/0179-000-Mareep.png
diff --git a/src/canonical/dex/front-shiny/0180--000--Flaaffy.png b/src/canonical/dex/front-shiny/0180-000-Flaaffy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0180--000--Flaaffy.png
rename to src/canonical/dex/front-shiny/0180-000-Flaaffy.png
diff --git a/src/canonical/dex/front-shiny/0181--000--Ampharos.png b/src/canonical/dex/front-shiny/0181-000-Ampharos.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0181--000--Ampharos.png
rename to src/canonical/dex/front-shiny/0181-000-Ampharos.png
diff --git a/src/canonical/dex/front-shiny/0181--420--Ampharos--Mega.png b/src/canonical/dex/front-shiny/0181-420-Ampharos-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0181--420--Ampharos--Mega.png
rename to src/canonical/dex/front-shiny/0181-420-Ampharos-Mega.png
diff --git a/src/canonical/dex/front-shiny/0182--000--Bellossom.png b/src/canonical/dex/front-shiny/0182-000-Bellossom.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0182--000--Bellossom.png
rename to src/canonical/dex/front-shiny/0182-000-Bellossom.png
diff --git a/src/canonical/dex/front-shiny/0183--000--Marill.png b/src/canonical/dex/front-shiny/0183-000-Marill.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0183--000--Marill.png
rename to src/canonical/dex/front-shiny/0183-000-Marill.png
diff --git a/src/canonical/dex/front-shiny/0184--000--Azumarill.png b/src/canonical/dex/front-shiny/0184-000-Azumarill.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0184--000--Azumarill.png
rename to src/canonical/dex/front-shiny/0184-000-Azumarill.png
diff --git a/src/canonical/dex/front-shiny/0185--000--Sudowoodo.png b/src/canonical/dex/front-shiny/0185-000-Sudowoodo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0185--000--Sudowoodo.png
rename to src/canonical/dex/front-shiny/0185-000-Sudowoodo.png
diff --git a/src/canonical/dex/front-shiny/0186--000--Politoed.png b/src/canonical/dex/front-shiny/0186-000-Politoed.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0186--000--Politoed.png
rename to src/canonical/dex/front-shiny/0186-000-Politoed.png
diff --git a/src/canonical/dex/front-shiny/0187--000--Hoppip.png b/src/canonical/dex/front-shiny/0187-000-Hoppip.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0187--000--Hoppip.png
rename to src/canonical/dex/front-shiny/0187-000-Hoppip.png
diff --git a/src/canonical/dex/front-shiny/0188--000--Skiploom.png b/src/canonical/dex/front-shiny/0188-000-Skiploom.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0188--000--Skiploom.png
rename to src/canonical/dex/front-shiny/0188-000-Skiploom.png
diff --git a/src/canonical/dex/front-shiny/0189--000--Jumpluff.png b/src/canonical/dex/front-shiny/0189-000-Jumpluff.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0189--000--Jumpluff.png
rename to src/canonical/dex/front-shiny/0189-000-Jumpluff.png
diff --git a/src/canonical/dex/front-shiny/0190--000--Aipom.png b/src/canonical/dex/front-shiny/0190-000-Aipom.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0190--000--Aipom.png
rename to src/canonical/dex/front-shiny/0190-000-Aipom.png
diff --git a/src/canonical/dex/front-shiny/0191--000--Sunkern.png b/src/canonical/dex/front-shiny/0191-000-Sunkern.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0191--000--Sunkern.png
rename to src/canonical/dex/front-shiny/0191-000-Sunkern.png
diff --git a/src/canonical/dex/front-shiny/0192--000--Sunflora.png b/src/canonical/dex/front-shiny/0192-000-Sunflora.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0192--000--Sunflora.png
rename to src/canonical/dex/front-shiny/0192-000-Sunflora.png
diff --git a/src/canonical/dex/front-shiny/0193--000--Yanma.png b/src/canonical/dex/front-shiny/0193-000-Yanma.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0193--000--Yanma.png
rename to src/canonical/dex/front-shiny/0193-000-Yanma.png
diff --git a/src/canonical/dex/front-shiny/0194--000--Wooper.png b/src/canonical/dex/front-shiny/0194-000-Wooper.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0194--000--Wooper.png
rename to src/canonical/dex/front-shiny/0194-000-Wooper.png
diff --git a/src/canonical/dex/front-shiny/0195--000--Quagsire.png b/src/canonical/dex/front-shiny/0195-000-Quagsire.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0195--000--Quagsire.png
rename to src/canonical/dex/front-shiny/0195-000-Quagsire.png
diff --git a/src/canonical/dex/front-shiny/0196--000--Espeon.png b/src/canonical/dex/front-shiny/0196-000-Espeon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0196--000--Espeon.png
rename to src/canonical/dex/front-shiny/0196-000-Espeon.png
diff --git a/src/canonical/dex/front-shiny/0197--000--Umbreon.png b/src/canonical/dex/front-shiny/0197-000-Umbreon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0197--000--Umbreon.png
rename to src/canonical/dex/front-shiny/0197-000-Umbreon.png
diff --git a/src/canonical/dex/front-shiny/0198--000--Murkrow.png b/src/canonical/dex/front-shiny/0198-000-Murkrow.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0198--000--Murkrow.png
rename to src/canonical/dex/front-shiny/0198-000-Murkrow.png
diff --git a/src/canonical/dex/front-shiny/0199--000--Slowking.png b/src/canonical/dex/front-shiny/0199-000-Slowking.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0199--000--Slowking.png
rename to src/canonical/dex/front-shiny/0199-000-Slowking.png
diff --git a/src/canonical/dex/front-shiny/0200--000--Misdreavus.png b/src/canonical/dex/front-shiny/0200-000-Misdreavus.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0200--000--Misdreavus.png
rename to src/canonical/dex/front-shiny/0200-000-Misdreavus.png
diff --git a/src/canonical/dex/front-shiny/0201--000--Unown.png b/src/canonical/dex/front-shiny/0201-000-Unown.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0201--000--Unown.png
rename to src/canonical/dex/front-shiny/0201-000-Unown.png
diff --git a/src/canonical/dex/front-shiny/0202--000--Wobbuffet.png b/src/canonical/dex/front-shiny/0202-000-Wobbuffet.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0202--000--Wobbuffet.png
rename to src/canonical/dex/front-shiny/0202-000-Wobbuffet.png
diff --git a/src/canonical/dex/front-shiny/0203--000--Girafarig.png b/src/canonical/dex/front-shiny/0203-000-Girafarig.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0203--000--Girafarig.png
rename to src/canonical/dex/front-shiny/0203-000-Girafarig.png
diff --git a/src/canonical/dex/front-shiny/0204--000--Pineco.png b/src/canonical/dex/front-shiny/0204-000-Pineco.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0204--000--Pineco.png
rename to src/canonical/dex/front-shiny/0204-000-Pineco.png
diff --git a/src/canonical/dex/front-shiny/0205--000--Forretress.png b/src/canonical/dex/front-shiny/0205-000-Forretress.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0205--000--Forretress.png
rename to src/canonical/dex/front-shiny/0205-000-Forretress.png
diff --git a/src/canonical/dex/front-shiny/0206--000--Dunsparce.png b/src/canonical/dex/front-shiny/0206-000-Dunsparce.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0206--000--Dunsparce.png
rename to src/canonical/dex/front-shiny/0206-000-Dunsparce.png
diff --git a/src/canonical/dex/front-shiny/0207--000--Gligar.png b/src/canonical/dex/front-shiny/0207-000-Gligar.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0207--000--Gligar.png
rename to src/canonical/dex/front-shiny/0207-000-Gligar.png
diff --git a/src/canonical/dex/front-shiny/0208--000--Steelix.png b/src/canonical/dex/front-shiny/0208-000-Steelix.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0208--000--Steelix.png
rename to src/canonical/dex/front-shiny/0208-000-Steelix.png
diff --git a/src/canonical/dex/front-shiny/0208--420--Steelix--Mega.png b/src/canonical/dex/front-shiny/0208-420-Steelix-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0208--420--Steelix--Mega.png
rename to src/canonical/dex/front-shiny/0208-420-Steelix-Mega.png
diff --git a/src/canonical/dex/front-shiny/0209--000--Snubbull.png b/src/canonical/dex/front-shiny/0209-000-Snubbull.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0209--000--Snubbull.png
rename to src/canonical/dex/front-shiny/0209-000-Snubbull.png
diff --git a/src/canonical/dex/front-shiny/0210--000--Granbull.png b/src/canonical/dex/front-shiny/0210-000-Granbull.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0210--000--Granbull.png
rename to src/canonical/dex/front-shiny/0210-000-Granbull.png
diff --git a/src/canonical/dex/front-shiny/0211--000--Qwilfish.png b/src/canonical/dex/front-shiny/0211-000-Qwilfish.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0211--000--Qwilfish.png
rename to src/canonical/dex/front-shiny/0211-000-Qwilfish.png
diff --git a/src/canonical/dex/front-shiny/0212--000--Scizor.png b/src/canonical/dex/front-shiny/0212-000-Scizor.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0212--000--Scizor.png
rename to src/canonical/dex/front-shiny/0212-000-Scizor.png
diff --git a/src/canonical/dex/front-shiny/0212--420--Scizor--Mega.png b/src/canonical/dex/front-shiny/0212-420-Scizor-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0212--420--Scizor--Mega.png
rename to src/canonical/dex/front-shiny/0212-420-Scizor-Mega.png
diff --git a/src/canonical/dex/front-shiny/0213--000--Shuckle.png b/src/canonical/dex/front-shiny/0213-000-Shuckle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0213--000--Shuckle.png
rename to src/canonical/dex/front-shiny/0213-000-Shuckle.png
diff --git a/src/canonical/dex/front-shiny/0214--000--Heracross.png b/src/canonical/dex/front-shiny/0214-000-Heracross.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0214--000--Heracross.png
rename to src/canonical/dex/front-shiny/0214-000-Heracross.png
diff --git a/src/canonical/dex/front-shiny/0214--420--Heracross--Mega.png b/src/canonical/dex/front-shiny/0214-420-Heracross-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0214--420--Heracross--Mega.png
rename to src/canonical/dex/front-shiny/0214-420-Heracross-Mega.png
diff --git a/src/canonical/dex/front-shiny/0215--000--Sneasel.png b/src/canonical/dex/front-shiny/0215-000-Sneasel.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0215--000--Sneasel.png
rename to src/canonical/dex/front-shiny/0215-000-Sneasel.png
diff --git a/src/canonical/dex/front-shiny/0216--000--Teddiursa.png b/src/canonical/dex/front-shiny/0216-000-Teddiursa.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0216--000--Teddiursa.png
rename to src/canonical/dex/front-shiny/0216-000-Teddiursa.png
diff --git a/src/canonical/dex/front-shiny/0217--000--Ursaring.png b/src/canonical/dex/front-shiny/0217-000-Ursaring.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0217--000--Ursaring.png
rename to src/canonical/dex/front-shiny/0217-000-Ursaring.png
diff --git a/src/canonical/dex/front-shiny/0218--000--Slugma.png b/src/canonical/dex/front-shiny/0218-000-Slugma.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0218--000--Slugma.png
rename to src/canonical/dex/front-shiny/0218-000-Slugma.png
diff --git a/src/canonical/dex/front-shiny/0219--000--Magcargo.png b/src/canonical/dex/front-shiny/0219-000-Magcargo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0219--000--Magcargo.png
rename to src/canonical/dex/front-shiny/0219-000-Magcargo.png
diff --git a/src/canonical/dex/front-shiny/0220--000--Swinub.png b/src/canonical/dex/front-shiny/0220-000-Swinub.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0220--000--Swinub.png
rename to src/canonical/dex/front-shiny/0220-000-Swinub.png
diff --git a/src/canonical/dex/front-shiny/0221--000--Piloswine.png b/src/canonical/dex/front-shiny/0221-000-Piloswine.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0221--000--Piloswine.png
rename to src/canonical/dex/front-shiny/0221-000-Piloswine.png
diff --git a/src/canonical/dex/front-shiny/0222--000--Corsola.png b/src/canonical/dex/front-shiny/0222-000-Corsola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0222--000--Corsola.png
rename to src/canonical/dex/front-shiny/0222-000-Corsola.png
diff --git a/src/canonical/dex/front-shiny/0223--000--Remoraid.png b/src/canonical/dex/front-shiny/0223-000-Remoraid.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0223--000--Remoraid.png
rename to src/canonical/dex/front-shiny/0223-000-Remoraid.png
diff --git a/src/canonical/dex/front-shiny/0224--000--Octillery.png b/src/canonical/dex/front-shiny/0224-000-Octillery.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0224--000--Octillery.png
rename to src/canonical/dex/front-shiny/0224-000-Octillery.png
diff --git a/src/canonical/dex/front-shiny/0225--000--Delibird.png b/src/canonical/dex/front-shiny/0225-000-Delibird.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0225--000--Delibird.png
rename to src/canonical/dex/front-shiny/0225-000-Delibird.png
diff --git a/src/canonical/dex/front-shiny/0226--000--Mantine.png b/src/canonical/dex/front-shiny/0226-000-Mantine.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0226--000--Mantine.png
rename to src/canonical/dex/front-shiny/0226-000-Mantine.png
diff --git a/src/canonical/dex/front-shiny/0227--000--Skarmory.png b/src/canonical/dex/front-shiny/0227-000-Skarmory.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0227--000--Skarmory.png
rename to src/canonical/dex/front-shiny/0227-000-Skarmory.png
diff --git a/src/canonical/dex/front-shiny/0228--000--Houndour.png b/src/canonical/dex/front-shiny/0228-000-Houndour.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0228--000--Houndour.png
rename to src/canonical/dex/front-shiny/0228-000-Houndour.png
diff --git a/src/canonical/dex/front-shiny/0229--000--Houndoom.png b/src/canonical/dex/front-shiny/0229-000-Houndoom.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0229--000--Houndoom.png
rename to src/canonical/dex/front-shiny/0229-000-Houndoom.png
diff --git a/src/canonical/dex/front-shiny/0229--420--Houndoom--Mega.png b/src/canonical/dex/front-shiny/0229-420-Houndoom-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0229--420--Houndoom--Mega.png
rename to src/canonical/dex/front-shiny/0229-420-Houndoom-Mega.png
diff --git a/src/canonical/dex/front-shiny/0230--000--Kingdra.png b/src/canonical/dex/front-shiny/0230-000-Kingdra.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0230--000--Kingdra.png
rename to src/canonical/dex/front-shiny/0230-000-Kingdra.png
diff --git a/src/canonical/dex/front-shiny/0231--000--Phanpy.png b/src/canonical/dex/front-shiny/0231-000-Phanpy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0231--000--Phanpy.png
rename to src/canonical/dex/front-shiny/0231-000-Phanpy.png
diff --git a/src/canonical/dex/front-shiny/0232--000--Donphan.png b/src/canonical/dex/front-shiny/0232-000-Donphan.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0232--000--Donphan.png
rename to src/canonical/dex/front-shiny/0232-000-Donphan.png
diff --git a/src/canonical/dex/front-shiny/0233--000--Porygon2.png b/src/canonical/dex/front-shiny/0233-000-Porygon2.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0233--000--Porygon2.png
rename to src/canonical/dex/front-shiny/0233-000-Porygon2.png
diff --git a/src/canonical/dex/front-shiny/0234--000--Stantler.png b/src/canonical/dex/front-shiny/0234-000-Stantler.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0234--000--Stantler.png
rename to src/canonical/dex/front-shiny/0234-000-Stantler.png
diff --git a/src/canonical/dex/front-shiny/0235--000--Smeargle.png b/src/canonical/dex/front-shiny/0235-000-Smeargle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0235--000--Smeargle.png
rename to src/canonical/dex/front-shiny/0235-000-Smeargle.png
diff --git a/src/canonical/dex/front-shiny/0236--000--Tyrogue.png b/src/canonical/dex/front-shiny/0236-000-Tyrogue.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0236--000--Tyrogue.png
rename to src/canonical/dex/front-shiny/0236-000-Tyrogue.png
diff --git a/src/canonical/dex/front-shiny/0237--000--Hitmontop.png b/src/canonical/dex/front-shiny/0237-000-Hitmontop.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0237--000--Hitmontop.png
rename to src/canonical/dex/front-shiny/0237-000-Hitmontop.png
diff --git a/src/canonical/dex/front-shiny/0238--000--Smoochum.png b/src/canonical/dex/front-shiny/0238-000-Smoochum.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0238--000--Smoochum.png
rename to src/canonical/dex/front-shiny/0238-000-Smoochum.png
diff --git a/src/canonical/dex/front-shiny/0239--000--Elekid.png b/src/canonical/dex/front-shiny/0239-000-Elekid.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0239--000--Elekid.png
rename to src/canonical/dex/front-shiny/0239-000-Elekid.png
diff --git a/src/canonical/dex/front-shiny/0240--000--Magby.png b/src/canonical/dex/front-shiny/0240-000-Magby.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0240--000--Magby.png
rename to src/canonical/dex/front-shiny/0240-000-Magby.png
diff --git a/src/canonical/dex/front-shiny/0241--000--Miltank.png b/src/canonical/dex/front-shiny/0241-000-Miltank.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0241--000--Miltank.png
rename to src/canonical/dex/front-shiny/0241-000-Miltank.png
diff --git a/src/canonical/dex/front-shiny/0242--000--Blissey.png b/src/canonical/dex/front-shiny/0242-000-Blissey.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0242--000--Blissey.png
rename to src/canonical/dex/front-shiny/0242-000-Blissey.png
diff --git a/src/canonical/dex/front-shiny/0243--000--Raikou.png b/src/canonical/dex/front-shiny/0243-000-Raikou.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0243--000--Raikou.png
rename to src/canonical/dex/front-shiny/0243-000-Raikou.png
diff --git a/src/canonical/dex/front-shiny/0244--000--Entei.png b/src/canonical/dex/front-shiny/0244-000-Entei.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0244--000--Entei.png
rename to src/canonical/dex/front-shiny/0244-000-Entei.png
diff --git a/src/canonical/dex/front-shiny/0245--000--Suicune.png b/src/canonical/dex/front-shiny/0245-000-Suicune.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0245--000--Suicune.png
rename to src/canonical/dex/front-shiny/0245-000-Suicune.png
diff --git a/src/canonical/dex/front-shiny/0246--000--Larvitar.png b/src/canonical/dex/front-shiny/0246-000-Larvitar.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0246--000--Larvitar.png
rename to src/canonical/dex/front-shiny/0246-000-Larvitar.png
diff --git a/src/canonical/dex/front-shiny/0247--000--Pupitar.png b/src/canonical/dex/front-shiny/0247-000-Pupitar.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0247--000--Pupitar.png
rename to src/canonical/dex/front-shiny/0247-000-Pupitar.png
diff --git a/src/canonical/dex/front-shiny/0248--000--Tyranitar.png b/src/canonical/dex/front-shiny/0248-000-Tyranitar.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0248--000--Tyranitar.png
rename to src/canonical/dex/front-shiny/0248-000-Tyranitar.png
diff --git a/src/canonical/dex/front-shiny/0248--420--Tyranitar--Mega.png b/src/canonical/dex/front-shiny/0248-420-Tyranitar-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0248--420--Tyranitar--Mega.png
rename to src/canonical/dex/front-shiny/0248-420-Tyranitar-Mega.png
diff --git a/src/canonical/dex/front-shiny/0249--000--Lugia.png b/src/canonical/dex/front-shiny/0249-000-Lugia.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0249--000--Lugia.png
rename to src/canonical/dex/front-shiny/0249-000-Lugia.png
diff --git a/src/canonical/dex/front-shiny/0250--000--Ho-Oh.png b/src/canonical/dex/front-shiny/0250-000-Ho~Oh.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0250--000--Ho-Oh.png
rename to src/canonical/dex/front-shiny/0250-000-Ho~Oh.png
diff --git a/src/canonical/dex/front-shiny/0251--000--Celebi.png b/src/canonical/dex/front-shiny/0251-000-Celebi.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0251--000--Celebi.png
rename to src/canonical/dex/front-shiny/0251-000-Celebi.png
diff --git a/src/canonical/dex/front-shiny/0252--000--Treecko.png b/src/canonical/dex/front-shiny/0252-000-Treecko.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0252--000--Treecko.png
rename to src/canonical/dex/front-shiny/0252-000-Treecko.png
diff --git a/src/canonical/dex/front-shiny/0253--000--Grovyle.png b/src/canonical/dex/front-shiny/0253-000-Grovyle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0253--000--Grovyle.png
rename to src/canonical/dex/front-shiny/0253-000-Grovyle.png
diff --git a/src/canonical/dex/front-shiny/0254--000--Sceptile.png b/src/canonical/dex/front-shiny/0254-000-Sceptile.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0254--000--Sceptile.png
rename to src/canonical/dex/front-shiny/0254-000-Sceptile.png
diff --git a/src/canonical/dex/front-shiny/0254--420--Sceptile--Mega.png b/src/canonical/dex/front-shiny/0254-420-Sceptile-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0254--420--Sceptile--Mega.png
rename to src/canonical/dex/front-shiny/0254-420-Sceptile-Mega.png
diff --git a/src/canonical/dex/front-shiny/0255--000--Torchic.png b/src/canonical/dex/front-shiny/0255-000-Torchic.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0255--000--Torchic.png
rename to src/canonical/dex/front-shiny/0255-000-Torchic.png
diff --git a/src/canonical/dex/front-shiny/0256--000--Combusken.png b/src/canonical/dex/front-shiny/0256-000-Combusken.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0256--000--Combusken.png
rename to src/canonical/dex/front-shiny/0256-000-Combusken.png
diff --git a/src/canonical/dex/front-shiny/0257--000--Blaziken.png b/src/canonical/dex/front-shiny/0257-000-Blaziken.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0257--000--Blaziken.png
rename to src/canonical/dex/front-shiny/0257-000-Blaziken.png
diff --git a/src/canonical/dex/front-shiny/0257--420--Blaziken--Mega.png b/src/canonical/dex/front-shiny/0257-420-Blaziken-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0257--420--Blaziken--Mega.png
rename to src/canonical/dex/front-shiny/0257-420-Blaziken-Mega.png
diff --git a/src/canonical/dex/front-shiny/0258--000--Mudkip.png b/src/canonical/dex/front-shiny/0258-000-Mudkip.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0258--000--Mudkip.png
rename to src/canonical/dex/front-shiny/0258-000-Mudkip.png
diff --git a/src/canonical/dex/front-shiny/0259--000--Marshtomp.png b/src/canonical/dex/front-shiny/0259-000-Marshtomp.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0259--000--Marshtomp.png
rename to src/canonical/dex/front-shiny/0259-000-Marshtomp.png
diff --git a/src/canonical/dex/front-shiny/0260--000--Swampert.png b/src/canonical/dex/front-shiny/0260-000-Swampert.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0260--000--Swampert.png
rename to src/canonical/dex/front-shiny/0260-000-Swampert.png
diff --git a/src/canonical/dex/front-shiny/0260--420--Swampert--Mega.png b/src/canonical/dex/front-shiny/0260-420-Swampert-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0260--420--Swampert--Mega.png
rename to src/canonical/dex/front-shiny/0260-420-Swampert-Mega.png
diff --git a/src/canonical/dex/front-shiny/0261--000--Poochyena.png b/src/canonical/dex/front-shiny/0261-000-Poochyena.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0261--000--Poochyena.png
rename to src/canonical/dex/front-shiny/0261-000-Poochyena.png
diff --git a/src/canonical/dex/front-shiny/0262--000--Mightyena.png b/src/canonical/dex/front-shiny/0262-000-Mightyena.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0262--000--Mightyena.png
rename to src/canonical/dex/front-shiny/0262-000-Mightyena.png
diff --git a/src/canonical/dex/front-shiny/0263--000--Zigzagoon.png b/src/canonical/dex/front-shiny/0263-000-Zigzagoon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0263--000--Zigzagoon.png
rename to src/canonical/dex/front-shiny/0263-000-Zigzagoon.png
diff --git a/src/canonical/dex/front-shiny/0264--000--Linoone.png b/src/canonical/dex/front-shiny/0264-000-Linoone.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0264--000--Linoone.png
rename to src/canonical/dex/front-shiny/0264-000-Linoone.png
diff --git a/src/canonical/dex/front-shiny/0265--000--Wurmple.png b/src/canonical/dex/front-shiny/0265-000-Wurmple.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0265--000--Wurmple.png
rename to src/canonical/dex/front-shiny/0265-000-Wurmple.png
diff --git a/src/canonical/dex/front-shiny/0266--000--Silcoon.png b/src/canonical/dex/front-shiny/0266-000-Silcoon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0266--000--Silcoon.png
rename to src/canonical/dex/front-shiny/0266-000-Silcoon.png
diff --git a/src/canonical/dex/front-shiny/0267--000--Beautifly.png b/src/canonical/dex/front-shiny/0267-000-Beautifly.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0267--000--Beautifly.png
rename to src/canonical/dex/front-shiny/0267-000-Beautifly.png
diff --git a/src/canonical/dex/front-shiny/0268--000--Cascoon.png b/src/canonical/dex/front-shiny/0268-000-Cascoon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0268--000--Cascoon.png
rename to src/canonical/dex/front-shiny/0268-000-Cascoon.png
diff --git a/src/canonical/dex/front-shiny/0269--000--Dustox.png b/src/canonical/dex/front-shiny/0269-000-Dustox.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0269--000--Dustox.png
rename to src/canonical/dex/front-shiny/0269-000-Dustox.png
diff --git a/src/canonical/dex/front-shiny/0270--000--Lotad.png b/src/canonical/dex/front-shiny/0270-000-Lotad.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0270--000--Lotad.png
rename to src/canonical/dex/front-shiny/0270-000-Lotad.png
diff --git a/src/canonical/dex/front-shiny/0271--000--Lombre.png b/src/canonical/dex/front-shiny/0271-000-Lombre.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0271--000--Lombre.png
rename to src/canonical/dex/front-shiny/0271-000-Lombre.png
diff --git a/src/canonical/dex/front-shiny/0272--000--Ludicolo.png b/src/canonical/dex/front-shiny/0272-000-Ludicolo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0272--000--Ludicolo.png
rename to src/canonical/dex/front-shiny/0272-000-Ludicolo.png
diff --git a/src/canonical/dex/front-shiny/0273--000--Seedot.png b/src/canonical/dex/front-shiny/0273-000-Seedot.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0273--000--Seedot.png
rename to src/canonical/dex/front-shiny/0273-000-Seedot.png
diff --git a/src/canonical/dex/front-shiny/0274--000--Nuzleaf.png b/src/canonical/dex/front-shiny/0274-000-Nuzleaf.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0274--000--Nuzleaf.png
rename to src/canonical/dex/front-shiny/0274-000-Nuzleaf.png
diff --git a/src/canonical/dex/front-shiny/0275--000--Shiftry.png b/src/canonical/dex/front-shiny/0275-000-Shiftry.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0275--000--Shiftry.png
rename to src/canonical/dex/front-shiny/0275-000-Shiftry.png
diff --git a/src/canonical/dex/front-shiny/0276--000--Taillow.png b/src/canonical/dex/front-shiny/0276-000-Taillow.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0276--000--Taillow.png
rename to src/canonical/dex/front-shiny/0276-000-Taillow.png
diff --git a/src/canonical/dex/front-shiny/0277--000--Swellow.png b/src/canonical/dex/front-shiny/0277-000-Swellow.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0277--000--Swellow.png
rename to src/canonical/dex/front-shiny/0277-000-Swellow.png
diff --git a/src/canonical/dex/front-shiny/0278--000--Wingull.png b/src/canonical/dex/front-shiny/0278-000-Wingull.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0278--000--Wingull.png
rename to src/canonical/dex/front-shiny/0278-000-Wingull.png
diff --git a/src/canonical/dex/front-shiny/0279--000--Pelipper.png b/src/canonical/dex/front-shiny/0279-000-Pelipper.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0279--000--Pelipper.png
rename to src/canonical/dex/front-shiny/0279-000-Pelipper.png
diff --git a/src/canonical/dex/front-shiny/0280--000--Ralts.png b/src/canonical/dex/front-shiny/0280-000-Ralts.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0280--000--Ralts.png
rename to src/canonical/dex/front-shiny/0280-000-Ralts.png
diff --git a/src/canonical/dex/front-shiny/0281--000--Kirlia.png b/src/canonical/dex/front-shiny/0281-000-Kirlia.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0281--000--Kirlia.png
rename to src/canonical/dex/front-shiny/0281-000-Kirlia.png
diff --git a/src/canonical/dex/front-shiny/0282--000--Gardevoir.png b/src/canonical/dex/front-shiny/0282-000-Gardevoir.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0282--000--Gardevoir.png
rename to src/canonical/dex/front-shiny/0282-000-Gardevoir.png
diff --git a/src/canonical/dex/front-shiny/0282--420--Gardevoir--Mega.png b/src/canonical/dex/front-shiny/0282-420-Gardevoir-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0282--420--Gardevoir--Mega.png
rename to src/canonical/dex/front-shiny/0282-420-Gardevoir-Mega.png
diff --git a/src/canonical/dex/front-shiny/0283--000--Surskit.png b/src/canonical/dex/front-shiny/0283-000-Surskit.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0283--000--Surskit.png
rename to src/canonical/dex/front-shiny/0283-000-Surskit.png
diff --git a/src/canonical/dex/front-shiny/0284--000--Masquerain.png b/src/canonical/dex/front-shiny/0284-000-Masquerain.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0284--000--Masquerain.png
rename to src/canonical/dex/front-shiny/0284-000-Masquerain.png
diff --git a/src/canonical/dex/front-shiny/0285--000--Shroomish.png b/src/canonical/dex/front-shiny/0285-000-Shroomish.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0285--000--Shroomish.png
rename to src/canonical/dex/front-shiny/0285-000-Shroomish.png
diff --git a/src/canonical/dex/front-shiny/0286--000--Breloom.png b/src/canonical/dex/front-shiny/0286-000-Breloom.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0286--000--Breloom.png
rename to src/canonical/dex/front-shiny/0286-000-Breloom.png
diff --git a/src/canonical/dex/front-shiny/0287--000--Slakoth.png b/src/canonical/dex/front-shiny/0287-000-Slakoth.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0287--000--Slakoth.png
rename to src/canonical/dex/front-shiny/0287-000-Slakoth.png
diff --git a/src/canonical/dex/front-shiny/0288--000--Vigoroth.png b/src/canonical/dex/front-shiny/0288-000-Vigoroth.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0288--000--Vigoroth.png
rename to src/canonical/dex/front-shiny/0288-000-Vigoroth.png
diff --git a/src/canonical/dex/front-shiny/0289--000--Slaking.png b/src/canonical/dex/front-shiny/0289-000-Slaking.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0289--000--Slaking.png
rename to src/canonical/dex/front-shiny/0289-000-Slaking.png
diff --git a/src/canonical/dex/front-shiny/0290--000--Nincada.png b/src/canonical/dex/front-shiny/0290-000-Nincada.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0290--000--Nincada.png
rename to src/canonical/dex/front-shiny/0290-000-Nincada.png
diff --git a/src/canonical/dex/front-shiny/0291--000--Ninjask.png b/src/canonical/dex/front-shiny/0291-000-Ninjask.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0291--000--Ninjask.png
rename to src/canonical/dex/front-shiny/0291-000-Ninjask.png
diff --git a/src/canonical/dex/front-shiny/0292--000--Shedinja.png b/src/canonical/dex/front-shiny/0292-000-Shedinja.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0292--000--Shedinja.png
rename to src/canonical/dex/front-shiny/0292-000-Shedinja.png
diff --git a/src/canonical/dex/front-shiny/0293--000--Whismur.png b/src/canonical/dex/front-shiny/0293-000-Whismur.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0293--000--Whismur.png
rename to src/canonical/dex/front-shiny/0293-000-Whismur.png
diff --git a/src/canonical/dex/front-shiny/0294--000--Loudred.png b/src/canonical/dex/front-shiny/0294-000-Loudred.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0294--000--Loudred.png
rename to src/canonical/dex/front-shiny/0294-000-Loudred.png
diff --git a/src/canonical/dex/front-shiny/0295--000--Exploud.png b/src/canonical/dex/front-shiny/0295-000-Exploud.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0295--000--Exploud.png
rename to src/canonical/dex/front-shiny/0295-000-Exploud.png
diff --git a/src/canonical/dex/front-shiny/0296--000--Makuhita.png b/src/canonical/dex/front-shiny/0296-000-Makuhita.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0296--000--Makuhita.png
rename to src/canonical/dex/front-shiny/0296-000-Makuhita.png
diff --git a/src/canonical/dex/front-shiny/0297--000--Hariyama.png b/src/canonical/dex/front-shiny/0297-000-Hariyama.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0297--000--Hariyama.png
rename to src/canonical/dex/front-shiny/0297-000-Hariyama.png
diff --git a/src/canonical/dex/front-shiny/0298--000--Azurill.png b/src/canonical/dex/front-shiny/0298-000-Azurill.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0298--000--Azurill.png
rename to src/canonical/dex/front-shiny/0298-000-Azurill.png
diff --git a/src/canonical/dex/front-shiny/0299--000--Nosepass.png b/src/canonical/dex/front-shiny/0299-000-Nosepass.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0299--000--Nosepass.png
rename to src/canonical/dex/front-shiny/0299-000-Nosepass.png
diff --git a/src/canonical/dex/front-shiny/0300--000--Skitty.png b/src/canonical/dex/front-shiny/0300-000-Skitty.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0300--000--Skitty.png
rename to src/canonical/dex/front-shiny/0300-000-Skitty.png
diff --git a/src/canonical/dex/front-shiny/0301--000--Delcatty.png b/src/canonical/dex/front-shiny/0301-000-Delcatty.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0301--000--Delcatty.png
rename to src/canonical/dex/front-shiny/0301-000-Delcatty.png
diff --git a/src/canonical/dex/front-shiny/0302--000--Sableye.png b/src/canonical/dex/front-shiny/0302-000-Sableye.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0302--000--Sableye.png
rename to src/canonical/dex/front-shiny/0302-000-Sableye.png
diff --git a/src/canonical/dex/front-shiny/0302--420--Sableye--Mega.png b/src/canonical/dex/front-shiny/0302-420-Sableye-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0302--420--Sableye--Mega.png
rename to src/canonical/dex/front-shiny/0302-420-Sableye-Mega.png
diff --git a/src/canonical/dex/front-shiny/0303--000--Mawile.png b/src/canonical/dex/front-shiny/0303-000-Mawile.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0303--000--Mawile.png
rename to src/canonical/dex/front-shiny/0303-000-Mawile.png
diff --git a/src/canonical/dex/front-shiny/0303--420--Mawile--Mega.png b/src/canonical/dex/front-shiny/0303-420-Mawile-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0303--420--Mawile--Mega.png
rename to src/canonical/dex/front-shiny/0303-420-Mawile-Mega.png
diff --git a/src/canonical/dex/front-shiny/0304--000--Aron.png b/src/canonical/dex/front-shiny/0304-000-Aron.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0304--000--Aron.png
rename to src/canonical/dex/front-shiny/0304-000-Aron.png
diff --git a/src/canonical/dex/front-shiny/0305--000--Lairon.png b/src/canonical/dex/front-shiny/0305-000-Lairon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0305--000--Lairon.png
rename to src/canonical/dex/front-shiny/0305-000-Lairon.png
diff --git a/src/canonical/dex/front-shiny/0306--000--Aggron.png b/src/canonical/dex/front-shiny/0306-000-Aggron.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0306--000--Aggron.png
rename to src/canonical/dex/front-shiny/0306-000-Aggron.png
diff --git a/src/canonical/dex/front-shiny/0306--420--Aggron--Mega.png b/src/canonical/dex/front-shiny/0306-420-Aggron-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0306--420--Aggron--Mega.png
rename to src/canonical/dex/front-shiny/0306-420-Aggron-Mega.png
diff --git a/src/canonical/dex/front-shiny/0307--000--Meditite.png b/src/canonical/dex/front-shiny/0307-000-Meditite.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0307--000--Meditite.png
rename to src/canonical/dex/front-shiny/0307-000-Meditite.png
diff --git a/src/canonical/dex/front-shiny/0308--000--Medicham.png b/src/canonical/dex/front-shiny/0308-000-Medicham.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0308--000--Medicham.png
rename to src/canonical/dex/front-shiny/0308-000-Medicham.png
diff --git a/src/canonical/dex/front-shiny/0308--420--Medicham--Mega.png b/src/canonical/dex/front-shiny/0308-420-Medicham-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0308--420--Medicham--Mega.png
rename to src/canonical/dex/front-shiny/0308-420-Medicham-Mega.png
diff --git a/src/canonical/dex/front-shiny/0309--000--Electrike.png b/src/canonical/dex/front-shiny/0309-000-Electrike.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0309--000--Electrike.png
rename to src/canonical/dex/front-shiny/0309-000-Electrike.png
diff --git a/src/canonical/dex/front-shiny/0310--000--Manectric.png b/src/canonical/dex/front-shiny/0310-000-Manectric.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0310--000--Manectric.png
rename to src/canonical/dex/front-shiny/0310-000-Manectric.png
diff --git a/src/canonical/dex/front-shiny/0310--420--Manectric--Mega.png b/src/canonical/dex/front-shiny/0310-420-Manectric-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0310--420--Manectric--Mega.png
rename to src/canonical/dex/front-shiny/0310-420-Manectric-Mega.png
diff --git a/src/canonical/dex/front-shiny/0311--000--Plusle.png b/src/canonical/dex/front-shiny/0311-000-Plusle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0311--000--Plusle.png
rename to src/canonical/dex/front-shiny/0311-000-Plusle.png
diff --git a/src/canonical/dex/front-shiny/0312--000--Minun.png b/src/canonical/dex/front-shiny/0312-000-Minun.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0312--000--Minun.png
rename to src/canonical/dex/front-shiny/0312-000-Minun.png
diff --git a/src/canonical/dex/front-shiny/0313--000--Volbeat.png b/src/canonical/dex/front-shiny/0313-000-Volbeat.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0313--000--Volbeat.png
rename to src/canonical/dex/front-shiny/0313-000-Volbeat.png
diff --git a/src/canonical/dex/front-shiny/0314--000--Illumise.png b/src/canonical/dex/front-shiny/0314-000-Illumise.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0314--000--Illumise.png
rename to src/canonical/dex/front-shiny/0314-000-Illumise.png
diff --git a/src/canonical/dex/front-shiny/0315--000--Roselia.png b/src/canonical/dex/front-shiny/0315-000-Roselia.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0315--000--Roselia.png
rename to src/canonical/dex/front-shiny/0315-000-Roselia.png
diff --git a/src/canonical/dex/front-shiny/0316--000--Gulpin.png b/src/canonical/dex/front-shiny/0316-000-Gulpin.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0316--000--Gulpin.png
rename to src/canonical/dex/front-shiny/0316-000-Gulpin.png
diff --git a/src/canonical/dex/front-shiny/0317--000--Swalot.png b/src/canonical/dex/front-shiny/0317-000-Swalot.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0317--000--Swalot.png
rename to src/canonical/dex/front-shiny/0317-000-Swalot.png
diff --git a/src/canonical/dex/front-shiny/0318--000--Carvanha.png b/src/canonical/dex/front-shiny/0318-000-Carvanha.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0318--000--Carvanha.png
rename to src/canonical/dex/front-shiny/0318-000-Carvanha.png
diff --git a/src/canonical/dex/front-shiny/0319--000--Sharpedo.png b/src/canonical/dex/front-shiny/0319-000-Sharpedo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0319--000--Sharpedo.png
rename to src/canonical/dex/front-shiny/0319-000-Sharpedo.png
diff --git a/src/canonical/dex/front-shiny/0319--420--Sharpedo--Mega.png b/src/canonical/dex/front-shiny/0319-420-Sharpedo-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0319--420--Sharpedo--Mega.png
rename to src/canonical/dex/front-shiny/0319-420-Sharpedo-Mega.png
diff --git a/src/canonical/dex/front-shiny/0320--000--Wailmer.png b/src/canonical/dex/front-shiny/0320-000-Wailmer.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0320--000--Wailmer.png
rename to src/canonical/dex/front-shiny/0320-000-Wailmer.png
diff --git a/src/canonical/dex/front-shiny/0321--000--Wailord.png b/src/canonical/dex/front-shiny/0321-000-Wailord.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0321--000--Wailord.png
rename to src/canonical/dex/front-shiny/0321-000-Wailord.png
diff --git a/src/canonical/dex/front-shiny/0322--000--Numel.png b/src/canonical/dex/front-shiny/0322-000-Numel.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0322--000--Numel.png
rename to src/canonical/dex/front-shiny/0322-000-Numel.png
diff --git a/src/canonical/dex/front-shiny/0323--000--Camerupt.png b/src/canonical/dex/front-shiny/0323-000-Camerupt.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0323--000--Camerupt.png
rename to src/canonical/dex/front-shiny/0323-000-Camerupt.png
diff --git a/src/canonical/dex/front-shiny/0323--420--Camerupt--Mega.png b/src/canonical/dex/front-shiny/0323-420-Camerupt-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0323--420--Camerupt--Mega.png
rename to src/canonical/dex/front-shiny/0323-420-Camerupt-Mega.png
diff --git a/src/canonical/dex/front-shiny/0324--000--Torkoal.png b/src/canonical/dex/front-shiny/0324-000-Torkoal.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0324--000--Torkoal.png
rename to src/canonical/dex/front-shiny/0324-000-Torkoal.png
diff --git a/src/canonical/dex/front-shiny/0325--000--Spoink.png b/src/canonical/dex/front-shiny/0325-000-Spoink.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0325--000--Spoink.png
rename to src/canonical/dex/front-shiny/0325-000-Spoink.png
diff --git a/src/canonical/dex/front-shiny/0326--000--Grumpig.png b/src/canonical/dex/front-shiny/0326-000-Grumpig.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0326--000--Grumpig.png
rename to src/canonical/dex/front-shiny/0326-000-Grumpig.png
diff --git a/src/canonical/dex/front-shiny/0327--000--Spinda.png b/src/canonical/dex/front-shiny/0327-000-Spinda.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0327--000--Spinda.png
rename to src/canonical/dex/front-shiny/0327-000-Spinda.png
diff --git a/src/canonical/dex/front-shiny/0328--000--Trapinch.png b/src/canonical/dex/front-shiny/0328-000-Trapinch.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0328--000--Trapinch.png
rename to src/canonical/dex/front-shiny/0328-000-Trapinch.png
diff --git a/src/canonical/dex/front-shiny/0329--000--Vibrava.png b/src/canonical/dex/front-shiny/0329-000-Vibrava.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0329--000--Vibrava.png
rename to src/canonical/dex/front-shiny/0329-000-Vibrava.png
diff --git a/src/canonical/dex/front-shiny/0330--000--Flygon.png b/src/canonical/dex/front-shiny/0330-000-Flygon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0330--000--Flygon.png
rename to src/canonical/dex/front-shiny/0330-000-Flygon.png
diff --git a/src/canonical/dex/front-shiny/0331--000--Cacnea.png b/src/canonical/dex/front-shiny/0331-000-Cacnea.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0331--000--Cacnea.png
rename to src/canonical/dex/front-shiny/0331-000-Cacnea.png
diff --git a/src/canonical/dex/front-shiny/0332--000--Cacturne.png b/src/canonical/dex/front-shiny/0332-000-Cacturne.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0332--000--Cacturne.png
rename to src/canonical/dex/front-shiny/0332-000-Cacturne.png
diff --git a/src/canonical/dex/front-shiny/0333--000--Swablu.png b/src/canonical/dex/front-shiny/0333-000-Swablu.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0333--000--Swablu.png
rename to src/canonical/dex/front-shiny/0333-000-Swablu.png
diff --git a/src/canonical/dex/front-shiny/0334--000--Altaria.png b/src/canonical/dex/front-shiny/0334-000-Altaria.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0334--000--Altaria.png
rename to src/canonical/dex/front-shiny/0334-000-Altaria.png
diff --git a/src/canonical/dex/front-shiny/0334--420--Altaria--Mega.png b/src/canonical/dex/front-shiny/0334-420-Altaria-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0334--420--Altaria--Mega.png
rename to src/canonical/dex/front-shiny/0334-420-Altaria-Mega.png
diff --git a/src/canonical/dex/front-shiny/0335--000--Zangoose.png b/src/canonical/dex/front-shiny/0335-000-Zangoose.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0335--000--Zangoose.png
rename to src/canonical/dex/front-shiny/0335-000-Zangoose.png
diff --git a/src/canonical/dex/front-shiny/0336--000--Seviper.png b/src/canonical/dex/front-shiny/0336-000-Seviper.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0336--000--Seviper.png
rename to src/canonical/dex/front-shiny/0336-000-Seviper.png
diff --git a/src/canonical/dex/front-shiny/0337--000--Lunatone.png b/src/canonical/dex/front-shiny/0337-000-Lunatone.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0337--000--Lunatone.png
rename to src/canonical/dex/front-shiny/0337-000-Lunatone.png
diff --git a/src/canonical/dex/front-shiny/0338--000--Solrock.png b/src/canonical/dex/front-shiny/0338-000-Solrock.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0338--000--Solrock.png
rename to src/canonical/dex/front-shiny/0338-000-Solrock.png
diff --git a/src/canonical/dex/front-shiny/0339--000--Barboach.png b/src/canonical/dex/front-shiny/0339-000-Barboach.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0339--000--Barboach.png
rename to src/canonical/dex/front-shiny/0339-000-Barboach.png
diff --git a/src/canonical/dex/front-shiny/0340--000--Whiscash.png b/src/canonical/dex/front-shiny/0340-000-Whiscash.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0340--000--Whiscash.png
rename to src/canonical/dex/front-shiny/0340-000-Whiscash.png
diff --git a/src/canonical/dex/front-shiny/0341--000--Corphish.png b/src/canonical/dex/front-shiny/0341-000-Corphish.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0341--000--Corphish.png
rename to src/canonical/dex/front-shiny/0341-000-Corphish.png
diff --git a/src/canonical/dex/front-shiny/0342--000--Crawdaunt.png b/src/canonical/dex/front-shiny/0342-000-Crawdaunt.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0342--000--Crawdaunt.png
rename to src/canonical/dex/front-shiny/0342-000-Crawdaunt.png
diff --git a/src/canonical/dex/front-shiny/0343--000--Baltoy.png b/src/canonical/dex/front-shiny/0343-000-Baltoy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0343--000--Baltoy.png
rename to src/canonical/dex/front-shiny/0343-000-Baltoy.png
diff --git a/src/canonical/dex/front-shiny/0344--000--Claydol.png b/src/canonical/dex/front-shiny/0344-000-Claydol.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0344--000--Claydol.png
rename to src/canonical/dex/front-shiny/0344-000-Claydol.png
diff --git a/src/canonical/dex/front-shiny/0345--000--Lileep.png b/src/canonical/dex/front-shiny/0345-000-Lileep.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0345--000--Lileep.png
rename to src/canonical/dex/front-shiny/0345-000-Lileep.png
diff --git a/src/canonical/dex/front-shiny/0346--000--Cradily.png b/src/canonical/dex/front-shiny/0346-000-Cradily.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0346--000--Cradily.png
rename to src/canonical/dex/front-shiny/0346-000-Cradily.png
diff --git a/src/canonical/dex/front-shiny/0347--000--Anorith.png b/src/canonical/dex/front-shiny/0347-000-Anorith.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0347--000--Anorith.png
rename to src/canonical/dex/front-shiny/0347-000-Anorith.png
diff --git a/src/canonical/dex/front-shiny/0348--000--Armaldo.png b/src/canonical/dex/front-shiny/0348-000-Armaldo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0348--000--Armaldo.png
rename to src/canonical/dex/front-shiny/0348-000-Armaldo.png
diff --git a/src/canonical/dex/front-shiny/0349--000--Feebas.png b/src/canonical/dex/front-shiny/0349-000-Feebas.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0349--000--Feebas.png
rename to src/canonical/dex/front-shiny/0349-000-Feebas.png
diff --git a/src/canonical/dex/front-shiny/0350--000--Milotic.png b/src/canonical/dex/front-shiny/0350-000-Milotic.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0350--000--Milotic.png
rename to src/canonical/dex/front-shiny/0350-000-Milotic.png
diff --git a/src/canonical/dex/front-shiny/0351--000--Castform.png b/src/canonical/dex/front-shiny/0351-000-Castform.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0351--000--Castform.png
rename to src/canonical/dex/front-shiny/0351-000-Castform.png
diff --git a/src/canonical/dex/front-shiny/0351--420--Castform--Rainy.png b/src/canonical/dex/front-shiny/0351-420-Castform-Rainy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0351--420--Castform--Rainy.png
rename to src/canonical/dex/front-shiny/0351-420-Castform-Rainy.png
diff --git a/src/canonical/dex/front-shiny/0351--420--Castform--Snowy.png b/src/canonical/dex/front-shiny/0351-420-Castform-Snowy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0351--420--Castform--Snowy.png
rename to src/canonical/dex/front-shiny/0351-420-Castform-Snowy.png
diff --git a/src/canonical/dex/front-shiny/0351--420--Castform--Sunny.png b/src/canonical/dex/front-shiny/0351-420-Castform-Sunny.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0351--420--Castform--Sunny.png
rename to src/canonical/dex/front-shiny/0351-420-Castform-Sunny.png
diff --git a/src/canonical/dex/front-shiny/0352--000--Kecleon.png b/src/canonical/dex/front-shiny/0352-000-Kecleon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0352--000--Kecleon.png
rename to src/canonical/dex/front-shiny/0352-000-Kecleon.png
diff --git a/src/canonical/dex/front-shiny/0353--000--Shuppet.png b/src/canonical/dex/front-shiny/0353-000-Shuppet.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0353--000--Shuppet.png
rename to src/canonical/dex/front-shiny/0353-000-Shuppet.png
diff --git a/src/canonical/dex/front-shiny/0354--000--Banette.png b/src/canonical/dex/front-shiny/0354-000-Banette.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0354--000--Banette.png
rename to src/canonical/dex/front-shiny/0354-000-Banette.png
diff --git a/src/canonical/dex/front-shiny/0354--420--Banette--Mega.png b/src/canonical/dex/front-shiny/0354-420-Banette-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0354--420--Banette--Mega.png
rename to src/canonical/dex/front-shiny/0354-420-Banette-Mega.png
diff --git a/src/canonical/dex/front-shiny/0355--000--Duskull.png b/src/canonical/dex/front-shiny/0355-000-Duskull.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0355--000--Duskull.png
rename to src/canonical/dex/front-shiny/0355-000-Duskull.png
diff --git a/src/canonical/dex/front-shiny/0356--000--Dusclops.png b/src/canonical/dex/front-shiny/0356-000-Dusclops.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0356--000--Dusclops.png
rename to src/canonical/dex/front-shiny/0356-000-Dusclops.png
diff --git a/src/canonical/dex/front-shiny/0357--000--Tropius.png b/src/canonical/dex/front-shiny/0357-000-Tropius.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0357--000--Tropius.png
rename to src/canonical/dex/front-shiny/0357-000-Tropius.png
diff --git a/src/canonical/dex/front-shiny/0358--000--Chimecho.png b/src/canonical/dex/front-shiny/0358-000-Chimecho.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0358--000--Chimecho.png
rename to src/canonical/dex/front-shiny/0358-000-Chimecho.png
diff --git a/src/canonical/dex/front-shiny/0359--000--Absol.png b/src/canonical/dex/front-shiny/0359-000-Absol.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0359--000--Absol.png
rename to src/canonical/dex/front-shiny/0359-000-Absol.png
diff --git a/src/canonical/dex/front-shiny/0359--420--Absol--Mega.png b/src/canonical/dex/front-shiny/0359-420-Absol-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0359--420--Absol--Mega.png
rename to src/canonical/dex/front-shiny/0359-420-Absol-Mega.png
diff --git a/src/canonical/dex/front-shiny/0360--000--Wynaut.png b/src/canonical/dex/front-shiny/0360-000-Wynaut.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0360--000--Wynaut.png
rename to src/canonical/dex/front-shiny/0360-000-Wynaut.png
diff --git a/src/canonical/dex/front-shiny/0361--000--Snorunt.png b/src/canonical/dex/front-shiny/0361-000-Snorunt.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0361--000--Snorunt.png
rename to src/canonical/dex/front-shiny/0361-000-Snorunt.png
diff --git a/src/canonical/dex/front-shiny/0362--000--Glalie.png b/src/canonical/dex/front-shiny/0362-000-Glalie.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0362--000--Glalie.png
rename to src/canonical/dex/front-shiny/0362-000-Glalie.png
diff --git a/src/canonical/dex/front-shiny/0362--420--Glalie--Mega.png b/src/canonical/dex/front-shiny/0362-420-Glalie-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0362--420--Glalie--Mega.png
rename to src/canonical/dex/front-shiny/0362-420-Glalie-Mega.png
diff --git a/src/canonical/dex/front-shiny/0363--000--Spheal.png b/src/canonical/dex/front-shiny/0363-000-Spheal.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0363--000--Spheal.png
rename to src/canonical/dex/front-shiny/0363-000-Spheal.png
diff --git a/src/canonical/dex/front-shiny/0364--000--Sealeo.png b/src/canonical/dex/front-shiny/0364-000-Sealeo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0364--000--Sealeo.png
rename to src/canonical/dex/front-shiny/0364-000-Sealeo.png
diff --git a/src/canonical/dex/front-shiny/0365--000--Walrein.png b/src/canonical/dex/front-shiny/0365-000-Walrein.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0365--000--Walrein.png
rename to src/canonical/dex/front-shiny/0365-000-Walrein.png
diff --git a/src/canonical/dex/front-shiny/0366--000--Clamperl.png b/src/canonical/dex/front-shiny/0366-000-Clamperl.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0366--000--Clamperl.png
rename to src/canonical/dex/front-shiny/0366-000-Clamperl.png
diff --git a/src/canonical/dex/front-shiny/0367--000--Huntail.png b/src/canonical/dex/front-shiny/0367-000-Huntail.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0367--000--Huntail.png
rename to src/canonical/dex/front-shiny/0367-000-Huntail.png
diff --git a/src/canonical/dex/front-shiny/0368--000--Gorebyss.png b/src/canonical/dex/front-shiny/0368-000-Gorebyss.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0368--000--Gorebyss.png
rename to src/canonical/dex/front-shiny/0368-000-Gorebyss.png
diff --git a/src/canonical/dex/front-shiny/0369--000--Relicanth.png b/src/canonical/dex/front-shiny/0369-000-Relicanth.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0369--000--Relicanth.png
rename to src/canonical/dex/front-shiny/0369-000-Relicanth.png
diff --git a/src/canonical/dex/front-shiny/0370--000--Luvdisc.png b/src/canonical/dex/front-shiny/0370-000-Luvdisc.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0370--000--Luvdisc.png
rename to src/canonical/dex/front-shiny/0370-000-Luvdisc.png
diff --git a/src/canonical/dex/front-shiny/0371--000--Bagon.png b/src/canonical/dex/front-shiny/0371-000-Bagon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0371--000--Bagon.png
rename to src/canonical/dex/front-shiny/0371-000-Bagon.png
diff --git a/src/canonical/dex/front-shiny/0372--000--Shelgon.png b/src/canonical/dex/front-shiny/0372-000-Shelgon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0372--000--Shelgon.png
rename to src/canonical/dex/front-shiny/0372-000-Shelgon.png
diff --git a/src/canonical/dex/front-shiny/0373--000--Salamence.png b/src/canonical/dex/front-shiny/0373-000-Salamence.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0373--000--Salamence.png
rename to src/canonical/dex/front-shiny/0373-000-Salamence.png
diff --git a/src/canonical/dex/front-shiny/0373--420--Salamence--Mega.png b/src/canonical/dex/front-shiny/0373-420-Salamence-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0373--420--Salamence--Mega.png
rename to src/canonical/dex/front-shiny/0373-420-Salamence-Mega.png
diff --git a/src/canonical/dex/front-shiny/0374--000--Beldum.png b/src/canonical/dex/front-shiny/0374-000-Beldum.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0374--000--Beldum.png
rename to src/canonical/dex/front-shiny/0374-000-Beldum.png
diff --git a/src/canonical/dex/front-shiny/0375--000--Metang.png b/src/canonical/dex/front-shiny/0375-000-Metang.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0375--000--Metang.png
rename to src/canonical/dex/front-shiny/0375-000-Metang.png
diff --git a/src/canonical/dex/front-shiny/0376--000--Metagross.png b/src/canonical/dex/front-shiny/0376-000-Metagross.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0376--000--Metagross.png
rename to src/canonical/dex/front-shiny/0376-000-Metagross.png
diff --git a/src/canonical/dex/front-shiny/0376--420--Metagross--Mega.png b/src/canonical/dex/front-shiny/0376-420-Metagross-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0376--420--Metagross--Mega.png
rename to src/canonical/dex/front-shiny/0376-420-Metagross-Mega.png
diff --git a/src/canonical/dex/front-shiny/0377--000--Regirock.png b/src/canonical/dex/front-shiny/0377-000-Regirock.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0377--000--Regirock.png
rename to src/canonical/dex/front-shiny/0377-000-Regirock.png
diff --git a/src/canonical/dex/front-shiny/0378--000--Regice.png b/src/canonical/dex/front-shiny/0378-000-Regice.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0378--000--Regice.png
rename to src/canonical/dex/front-shiny/0378-000-Regice.png
diff --git a/src/canonical/dex/front-shiny/0379--000--Registeel.png b/src/canonical/dex/front-shiny/0379-000-Registeel.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0379--000--Registeel.png
rename to src/canonical/dex/front-shiny/0379-000-Registeel.png
diff --git a/src/canonical/dex/front-shiny/0380--000--Latias.png b/src/canonical/dex/front-shiny/0380-000-Latias.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0380--000--Latias.png
rename to src/canonical/dex/front-shiny/0380-000-Latias.png
diff --git a/src/canonical/dex/front-shiny/0380--420--Latias--Mega.png b/src/canonical/dex/front-shiny/0380-420-Latias-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0380--420--Latias--Mega.png
rename to src/canonical/dex/front-shiny/0380-420-Latias-Mega.png
diff --git a/src/canonical/dex/front-shiny/0381--000--Latios.png b/src/canonical/dex/front-shiny/0381-000-Latios.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0381--000--Latios.png
rename to src/canonical/dex/front-shiny/0381-000-Latios.png
diff --git a/src/canonical/dex/front-shiny/0381--420--Latios--Mega.png b/src/canonical/dex/front-shiny/0381-420-Latios-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0381--420--Latios--Mega.png
rename to src/canonical/dex/front-shiny/0381-420-Latios-Mega.png
diff --git a/src/canonical/dex/front-shiny/0382--000--Kyogre.png b/src/canonical/dex/front-shiny/0382-000-Kyogre.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0382--000--Kyogre.png
rename to src/canonical/dex/front-shiny/0382-000-Kyogre.png
diff --git a/src/canonical/dex/front-shiny/0382--420--Kyogre--Primal.png b/src/canonical/dex/front-shiny/0382-420-Kyogre-Primal.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0382--420--Kyogre--Primal.png
rename to src/canonical/dex/front-shiny/0382-420-Kyogre-Primal.png
diff --git a/src/canonical/dex/front-shiny/0383--000--Groudon.png b/src/canonical/dex/front-shiny/0383-000-Groudon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0383--000--Groudon.png
rename to src/canonical/dex/front-shiny/0383-000-Groudon.png
diff --git a/src/canonical/dex/front-shiny/0383--420--Groudon--Primal.png b/src/canonical/dex/front-shiny/0383-420-Groudon-Primal.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0383--420--Groudon--Primal.png
rename to src/canonical/dex/front-shiny/0383-420-Groudon-Primal.png
diff --git a/src/canonical/dex/front-shiny/0384--000--Rayquaza.png b/src/canonical/dex/front-shiny/0384-000-Rayquaza.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0384--000--Rayquaza.png
rename to src/canonical/dex/front-shiny/0384-000-Rayquaza.png
diff --git a/src/canonical/dex/front-shiny/0384--420--Rayquaza--Mega.png b/src/canonical/dex/front-shiny/0384-420-Rayquaza-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0384--420--Rayquaza--Mega.png
rename to src/canonical/dex/front-shiny/0384-420-Rayquaza-Mega.png
diff --git a/src/canonical/dex/front-shiny/0385--000--Jirachi.png b/src/canonical/dex/front-shiny/0385-000-Jirachi.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0385--000--Jirachi.png
rename to src/canonical/dex/front-shiny/0385-000-Jirachi.png
diff --git a/src/canonical/dex/front-shiny/0386--000--Deoxys.png b/src/canonical/dex/front-shiny/0386-000-Deoxys.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0386--000--Deoxys.png
rename to src/canonical/dex/front-shiny/0386-000-Deoxys.png
diff --git a/src/canonical/dex/front-shiny/0386--420--Deoxys--Attack.png b/src/canonical/dex/front-shiny/0386-420-Deoxys-Attack.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0386--420--Deoxys--Attack.png
rename to src/canonical/dex/front-shiny/0386-420-Deoxys-Attack.png
diff --git a/src/canonical/dex/front-shiny/0386--420--Deoxys--Defense.png b/src/canonical/dex/front-shiny/0386-420-Deoxys-Defense.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0386--420--Deoxys--Defense.png
rename to src/canonical/dex/front-shiny/0386-420-Deoxys-Defense.png
diff --git a/src/canonical/dex/front-shiny/0386--420--Deoxys--Speed.png b/src/canonical/dex/front-shiny/0386-420-Deoxys-Speed.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0386--420--Deoxys--Speed.png
rename to src/canonical/dex/front-shiny/0386-420-Deoxys-Speed.png
diff --git a/src/canonical/dex/front-shiny/0387--000--Turtwig.png b/src/canonical/dex/front-shiny/0387-000-Turtwig.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0387--000--Turtwig.png
rename to src/canonical/dex/front-shiny/0387-000-Turtwig.png
diff --git a/src/canonical/dex/front-shiny/0388--000--Grotle.png b/src/canonical/dex/front-shiny/0388-000-Grotle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0388--000--Grotle.png
rename to src/canonical/dex/front-shiny/0388-000-Grotle.png
diff --git a/src/canonical/dex/front-shiny/0389--000--Torterra.png b/src/canonical/dex/front-shiny/0389-000-Torterra.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0389--000--Torterra.png
rename to src/canonical/dex/front-shiny/0389-000-Torterra.png
diff --git a/src/canonical/dex/front-shiny/0390--000--Chimchar.png b/src/canonical/dex/front-shiny/0390-000-Chimchar.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0390--000--Chimchar.png
rename to src/canonical/dex/front-shiny/0390-000-Chimchar.png
diff --git a/src/canonical/dex/front-shiny/0391--000--Monferno.png b/src/canonical/dex/front-shiny/0391-000-Monferno.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0391--000--Monferno.png
rename to src/canonical/dex/front-shiny/0391-000-Monferno.png
diff --git a/src/canonical/dex/front-shiny/0392--000--Infernape.png b/src/canonical/dex/front-shiny/0392-000-Infernape.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0392--000--Infernape.png
rename to src/canonical/dex/front-shiny/0392-000-Infernape.png
diff --git a/src/canonical/dex/front-shiny/0393--000--Piplup.png b/src/canonical/dex/front-shiny/0393-000-Piplup.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0393--000--Piplup.png
rename to src/canonical/dex/front-shiny/0393-000-Piplup.png
diff --git a/src/canonical/dex/front-shiny/0394--000--Prinplup.png b/src/canonical/dex/front-shiny/0394-000-Prinplup.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0394--000--Prinplup.png
rename to src/canonical/dex/front-shiny/0394-000-Prinplup.png
diff --git a/src/canonical/dex/front-shiny/0395--000--Empoleon.png b/src/canonical/dex/front-shiny/0395-000-Empoleon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0395--000--Empoleon.png
rename to src/canonical/dex/front-shiny/0395-000-Empoleon.png
diff --git a/src/canonical/dex/front-shiny/0396--000--Starly.png b/src/canonical/dex/front-shiny/0396-000-Starly.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0396--000--Starly.png
rename to src/canonical/dex/front-shiny/0396-000-Starly.png
diff --git a/src/canonical/dex/front-shiny/0397--000--Staravia.png b/src/canonical/dex/front-shiny/0397-000-Staravia.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0397--000--Staravia.png
rename to src/canonical/dex/front-shiny/0397-000-Staravia.png
diff --git a/src/canonical/dex/front-shiny/0398--000--Staraptor.png b/src/canonical/dex/front-shiny/0398-000-Staraptor.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0398--000--Staraptor.png
rename to src/canonical/dex/front-shiny/0398-000-Staraptor.png
diff --git a/src/canonical/dex/front-shiny/0399--000--Bidoof.png b/src/canonical/dex/front-shiny/0399-000-Bidoof.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0399--000--Bidoof.png
rename to src/canonical/dex/front-shiny/0399-000-Bidoof.png
diff --git a/src/canonical/dex/front-shiny/0400--000--Bibarel.png b/src/canonical/dex/front-shiny/0400-000-Bibarel.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0400--000--Bibarel.png
rename to src/canonical/dex/front-shiny/0400-000-Bibarel.png
diff --git a/src/canonical/dex/front-shiny/0401--000--Kricketot.png b/src/canonical/dex/front-shiny/0401-000-Kricketot.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0401--000--Kricketot.png
rename to src/canonical/dex/front-shiny/0401-000-Kricketot.png
diff --git a/src/canonical/dex/front-shiny/0402--000--Kricketune.png b/src/canonical/dex/front-shiny/0402-000-Kricketune.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0402--000--Kricketune.png
rename to src/canonical/dex/front-shiny/0402-000-Kricketune.png
diff --git a/src/canonical/dex/front-shiny/0403--000--Shinx.png b/src/canonical/dex/front-shiny/0403-000-Shinx.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0403--000--Shinx.png
rename to src/canonical/dex/front-shiny/0403-000-Shinx.png
diff --git a/src/canonical/dex/front-shiny/0404--000--Luxio.png b/src/canonical/dex/front-shiny/0404-000-Luxio.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0404--000--Luxio.png
rename to src/canonical/dex/front-shiny/0404-000-Luxio.png
diff --git a/src/canonical/dex/front-shiny/0405--000--Luxray.png b/src/canonical/dex/front-shiny/0405-000-Luxray.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0405--000--Luxray.png
rename to src/canonical/dex/front-shiny/0405-000-Luxray.png
diff --git a/src/canonical/dex/front-shiny/0406--000--Budew.png b/src/canonical/dex/front-shiny/0406-000-Budew.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0406--000--Budew.png
rename to src/canonical/dex/front-shiny/0406-000-Budew.png
diff --git a/src/canonical/dex/front-shiny/0407--000--Roserade.png b/src/canonical/dex/front-shiny/0407-000-Roserade.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0407--000--Roserade.png
rename to src/canonical/dex/front-shiny/0407-000-Roserade.png
diff --git a/src/canonical/dex/front-shiny/0408--000--Cranidos.png b/src/canonical/dex/front-shiny/0408-000-Cranidos.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0408--000--Cranidos.png
rename to src/canonical/dex/front-shiny/0408-000-Cranidos.png
diff --git a/src/canonical/dex/front-shiny/0409--000--Rampardos.png b/src/canonical/dex/front-shiny/0409-000-Rampardos.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0409--000--Rampardos.png
rename to src/canonical/dex/front-shiny/0409-000-Rampardos.png
diff --git a/src/canonical/dex/front-shiny/0410--000--Shieldon.png b/src/canonical/dex/front-shiny/0410-000-Shieldon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0410--000--Shieldon.png
rename to src/canonical/dex/front-shiny/0410-000-Shieldon.png
diff --git a/src/canonical/dex/front-shiny/0411--000--Bastiodon.png b/src/canonical/dex/front-shiny/0411-000-Bastiodon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0411--000--Bastiodon.png
rename to src/canonical/dex/front-shiny/0411-000-Bastiodon.png
diff --git a/src/canonical/dex/front-shiny/0412--000--Burmy.png b/src/canonical/dex/front-shiny/0412-000-Burmy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0412--000--Burmy.png
rename to src/canonical/dex/front-shiny/0412-000-Burmy.png
diff --git a/src/canonical/dex/front-shiny/0413--000--Wormadam.png b/src/canonical/dex/front-shiny/0413-000-Wormadam.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0413--000--Wormadam.png
rename to src/canonical/dex/front-shiny/0413-000-Wormadam.png
diff --git a/src/canonical/dex/front-shiny/0413--420--Wormadam--Sandy.png b/src/canonical/dex/front-shiny/0413-420-Wormadam-Sandy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0413--420--Wormadam--Sandy.png
rename to src/canonical/dex/front-shiny/0413-420-Wormadam-Sandy.png
diff --git a/src/canonical/dex/front-shiny/0413--420--Wormadam--Trash.png b/src/canonical/dex/front-shiny/0413-420-Wormadam-Trash.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0413--420--Wormadam--Trash.png
rename to src/canonical/dex/front-shiny/0413-420-Wormadam-Trash.png
diff --git a/src/canonical/dex/front-shiny/0414--000--Mothim.png b/src/canonical/dex/front-shiny/0414-000-Mothim.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0414--000--Mothim.png
rename to src/canonical/dex/front-shiny/0414-000-Mothim.png
diff --git a/src/canonical/dex/front-shiny/0415--000--Combee.png b/src/canonical/dex/front-shiny/0415-000-Combee.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0415--000--Combee.png
rename to src/canonical/dex/front-shiny/0415-000-Combee.png
diff --git a/src/canonical/dex/front-shiny/0416--000--Vespiquen.png b/src/canonical/dex/front-shiny/0416-000-Vespiquen.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0416--000--Vespiquen.png
rename to src/canonical/dex/front-shiny/0416-000-Vespiquen.png
diff --git a/src/canonical/dex/front-shiny/0417--000--Pachirisu.png b/src/canonical/dex/front-shiny/0417-000-Pachirisu.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0417--000--Pachirisu.png
rename to src/canonical/dex/front-shiny/0417-000-Pachirisu.png
diff --git a/src/canonical/dex/front-shiny/0418--000--Buizel.png b/src/canonical/dex/front-shiny/0418-000-Buizel.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0418--000--Buizel.png
rename to src/canonical/dex/front-shiny/0418-000-Buizel.png
diff --git a/src/canonical/dex/front-shiny/0419--000--Floatzel.png b/src/canonical/dex/front-shiny/0419-000-Floatzel.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0419--000--Floatzel.png
rename to src/canonical/dex/front-shiny/0419-000-Floatzel.png
diff --git a/src/canonical/dex/front-shiny/0420--000--Cherubi.png b/src/canonical/dex/front-shiny/0420-000-Cherubi.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0420--000--Cherubi.png
rename to src/canonical/dex/front-shiny/0420-000-Cherubi.png
diff --git a/src/canonical/dex/front-shiny/0421--000--Cherrim.png b/src/canonical/dex/front-shiny/0421-000-Cherrim.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0421--000--Cherrim.png
rename to src/canonical/dex/front-shiny/0421-000-Cherrim.png
diff --git a/src/canonical/dex/front-shiny/0421--420--Cherrim--Sunshine.png b/src/canonical/dex/front-shiny/0421-420-Cherrim-Sunshine.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0421--420--Cherrim--Sunshine.png
rename to src/canonical/dex/front-shiny/0421-420-Cherrim-Sunshine.png
diff --git a/src/canonical/dex/front-shiny/0422--000--Shellos.png b/src/canonical/dex/front-shiny/0422-000-Shellos.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0422--000--Shellos.png
rename to src/canonical/dex/front-shiny/0422-000-Shellos.png
diff --git a/src/canonical/dex/front-shiny/0423--000--Gastrodon.png b/src/canonical/dex/front-shiny/0423-000-Gastrodon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0423--000--Gastrodon.png
rename to src/canonical/dex/front-shiny/0423-000-Gastrodon.png
diff --git a/src/canonical/dex/front-shiny/0424--000--Ambipom.png b/src/canonical/dex/front-shiny/0424-000-Ambipom.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0424--000--Ambipom.png
rename to src/canonical/dex/front-shiny/0424-000-Ambipom.png
diff --git a/src/canonical/dex/front-shiny/0425--000--Drifloon.png b/src/canonical/dex/front-shiny/0425-000-Drifloon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0425--000--Drifloon.png
rename to src/canonical/dex/front-shiny/0425-000-Drifloon.png
diff --git a/src/canonical/dex/front-shiny/0426--000--Drifblim.png b/src/canonical/dex/front-shiny/0426-000-Drifblim.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0426--000--Drifblim.png
rename to src/canonical/dex/front-shiny/0426-000-Drifblim.png
diff --git a/src/canonical/dex/front-shiny/0427--000--Buneary.png b/src/canonical/dex/front-shiny/0427-000-Buneary.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0427--000--Buneary.png
rename to src/canonical/dex/front-shiny/0427-000-Buneary.png
diff --git a/src/canonical/dex/front-shiny/0428--000--Lopunny.png b/src/canonical/dex/front-shiny/0428-000-Lopunny.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0428--000--Lopunny.png
rename to src/canonical/dex/front-shiny/0428-000-Lopunny.png
diff --git a/src/canonical/dex/front-shiny/0428--420--Lopunny--Mega.png b/src/canonical/dex/front-shiny/0428-420-Lopunny-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0428--420--Lopunny--Mega.png
rename to src/canonical/dex/front-shiny/0428-420-Lopunny-Mega.png
diff --git a/src/canonical/dex/front-shiny/0429--000--Mismagius.png b/src/canonical/dex/front-shiny/0429-000-Mismagius.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0429--000--Mismagius.png
rename to src/canonical/dex/front-shiny/0429-000-Mismagius.png
diff --git a/src/canonical/dex/front-shiny/0430--000--Honchkrow.png b/src/canonical/dex/front-shiny/0430-000-Honchkrow.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0430--000--Honchkrow.png
rename to src/canonical/dex/front-shiny/0430-000-Honchkrow.png
diff --git a/src/canonical/dex/front-shiny/0431--000--Glameow.png b/src/canonical/dex/front-shiny/0431-000-Glameow.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0431--000--Glameow.png
rename to src/canonical/dex/front-shiny/0431-000-Glameow.png
diff --git a/src/canonical/dex/front-shiny/0432--000--Purugly.png b/src/canonical/dex/front-shiny/0432-000-Purugly.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0432--000--Purugly.png
rename to src/canonical/dex/front-shiny/0432-000-Purugly.png
diff --git a/src/canonical/dex/front-shiny/0433--000--Chingling.png b/src/canonical/dex/front-shiny/0433-000-Chingling.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0433--000--Chingling.png
rename to src/canonical/dex/front-shiny/0433-000-Chingling.png
diff --git a/src/canonical/dex/front-shiny/0434--000--Stunky.png b/src/canonical/dex/front-shiny/0434-000-Stunky.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0434--000--Stunky.png
rename to src/canonical/dex/front-shiny/0434-000-Stunky.png
diff --git a/src/canonical/dex/front-shiny/0435--000--Skuntank.png b/src/canonical/dex/front-shiny/0435-000-Skuntank.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0435--000--Skuntank.png
rename to src/canonical/dex/front-shiny/0435-000-Skuntank.png
diff --git a/src/canonical/dex/front-shiny/0436--000--Bronzor.png b/src/canonical/dex/front-shiny/0436-000-Bronzor.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0436--000--Bronzor.png
rename to src/canonical/dex/front-shiny/0436-000-Bronzor.png
diff --git a/src/canonical/dex/front-shiny/0437--000--Bronzong.png b/src/canonical/dex/front-shiny/0437-000-Bronzong.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0437--000--Bronzong.png
rename to src/canonical/dex/front-shiny/0437-000-Bronzong.png
diff --git a/src/canonical/dex/front-shiny/0438--000--Bonsly.png b/src/canonical/dex/front-shiny/0438-000-Bonsly.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0438--000--Bonsly.png
rename to src/canonical/dex/front-shiny/0438-000-Bonsly.png
diff --git a/src/canonical/dex/front-shiny/0439--000--Mime_Jr..png b/src/canonical/dex/front-shiny/0439-000-Mime_Jr..png
similarity index 100%
rename from src/canonical/dex/front-shiny/0439--000--Mime_Jr..png
rename to src/canonical/dex/front-shiny/0439-000-Mime_Jr..png
diff --git a/src/canonical/dex/front-shiny/0440--000--Happiny.png b/src/canonical/dex/front-shiny/0440-000-Happiny.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0440--000--Happiny.png
rename to src/canonical/dex/front-shiny/0440-000-Happiny.png
diff --git a/src/canonical/dex/front-shiny/0441--000--Chatot.png b/src/canonical/dex/front-shiny/0441-000-Chatot.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0441--000--Chatot.png
rename to src/canonical/dex/front-shiny/0441-000-Chatot.png
diff --git a/src/canonical/dex/front-shiny/0442--000--Spiritomb.png b/src/canonical/dex/front-shiny/0442-000-Spiritomb.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0442--000--Spiritomb.png
rename to src/canonical/dex/front-shiny/0442-000-Spiritomb.png
diff --git a/src/canonical/dex/front-shiny/0443--000--Gible.png b/src/canonical/dex/front-shiny/0443-000-Gible.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0443--000--Gible.png
rename to src/canonical/dex/front-shiny/0443-000-Gible.png
diff --git a/src/canonical/dex/front-shiny/0444--000--Gabite.png b/src/canonical/dex/front-shiny/0444-000-Gabite.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0444--000--Gabite.png
rename to src/canonical/dex/front-shiny/0444-000-Gabite.png
diff --git a/src/canonical/dex/front-shiny/0445--000--Garchomp.png b/src/canonical/dex/front-shiny/0445-000-Garchomp.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0445--000--Garchomp.png
rename to src/canonical/dex/front-shiny/0445-000-Garchomp.png
diff --git a/src/canonical/dex/front-shiny/0445--420--Garchomp--Mega.png b/src/canonical/dex/front-shiny/0445-420-Garchomp-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0445--420--Garchomp--Mega.png
rename to src/canonical/dex/front-shiny/0445-420-Garchomp-Mega.png
diff --git a/src/canonical/dex/front-shiny/0446--000--Munchlax.png b/src/canonical/dex/front-shiny/0446-000-Munchlax.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0446--000--Munchlax.png
rename to src/canonical/dex/front-shiny/0446-000-Munchlax.png
diff --git a/src/canonical/dex/front-shiny/0447--000--Riolu.png b/src/canonical/dex/front-shiny/0447-000-Riolu.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0447--000--Riolu.png
rename to src/canonical/dex/front-shiny/0447-000-Riolu.png
diff --git a/src/canonical/dex/front-shiny/0448--000--Lucario.png b/src/canonical/dex/front-shiny/0448-000-Lucario.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0448--000--Lucario.png
rename to src/canonical/dex/front-shiny/0448-000-Lucario.png
diff --git a/src/canonical/dex/front-shiny/0448--420--Lucario--Mega.png b/src/canonical/dex/front-shiny/0448-420-Lucario-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0448--420--Lucario--Mega.png
rename to src/canonical/dex/front-shiny/0448-420-Lucario-Mega.png
diff --git a/src/canonical/dex/front-shiny/0449--000--Hippopotas.png b/src/canonical/dex/front-shiny/0449-000-Hippopotas.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0449--000--Hippopotas.png
rename to src/canonical/dex/front-shiny/0449-000-Hippopotas.png
diff --git a/src/canonical/dex/front-shiny/0450--000--Hippowdon.png b/src/canonical/dex/front-shiny/0450-000-Hippowdon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0450--000--Hippowdon.png
rename to src/canonical/dex/front-shiny/0450-000-Hippowdon.png
diff --git a/src/canonical/dex/front-shiny/0451--000--Skorupi.png b/src/canonical/dex/front-shiny/0451-000-Skorupi.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0451--000--Skorupi.png
rename to src/canonical/dex/front-shiny/0451-000-Skorupi.png
diff --git a/src/canonical/dex/front-shiny/0452--000--Drapion.png b/src/canonical/dex/front-shiny/0452-000-Drapion.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0452--000--Drapion.png
rename to src/canonical/dex/front-shiny/0452-000-Drapion.png
diff --git a/src/canonical/dex/front-shiny/0453--000--Croagunk.png b/src/canonical/dex/front-shiny/0453-000-Croagunk.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0453--000--Croagunk.png
rename to src/canonical/dex/front-shiny/0453-000-Croagunk.png
diff --git a/src/canonical/dex/front-shiny/0454--000--Toxicroak.png b/src/canonical/dex/front-shiny/0454-000-Toxicroak.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0454--000--Toxicroak.png
rename to src/canonical/dex/front-shiny/0454-000-Toxicroak.png
diff --git a/src/canonical/dex/front-shiny/0455--000--Carnivine.png b/src/canonical/dex/front-shiny/0455-000-Carnivine.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0455--000--Carnivine.png
rename to src/canonical/dex/front-shiny/0455-000-Carnivine.png
diff --git a/src/canonical/dex/front-shiny/0456--000--Finneon.png b/src/canonical/dex/front-shiny/0456-000-Finneon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0456--000--Finneon.png
rename to src/canonical/dex/front-shiny/0456-000-Finneon.png
diff --git a/src/canonical/dex/front-shiny/0457--000--Lumineon.png b/src/canonical/dex/front-shiny/0457-000-Lumineon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0457--000--Lumineon.png
rename to src/canonical/dex/front-shiny/0457-000-Lumineon.png
diff --git a/src/canonical/dex/front-shiny/0458--000--Mantyke.png b/src/canonical/dex/front-shiny/0458-000-Mantyke.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0458--000--Mantyke.png
rename to src/canonical/dex/front-shiny/0458-000-Mantyke.png
diff --git a/src/canonical/dex/front-shiny/0459--000--Snover.png b/src/canonical/dex/front-shiny/0459-000-Snover.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0459--000--Snover.png
rename to src/canonical/dex/front-shiny/0459-000-Snover.png
diff --git a/src/canonical/dex/front-shiny/0460--000--Abomasnow.png b/src/canonical/dex/front-shiny/0460-000-Abomasnow.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0460--000--Abomasnow.png
rename to src/canonical/dex/front-shiny/0460-000-Abomasnow.png
diff --git a/src/canonical/dex/front-shiny/0460--420--Abomasnow--Mega.png b/src/canonical/dex/front-shiny/0460-420-Abomasnow-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0460--420--Abomasnow--Mega.png
rename to src/canonical/dex/front-shiny/0460-420-Abomasnow-Mega.png
diff --git a/src/canonical/dex/front-shiny/0461--000--Weavile.png b/src/canonical/dex/front-shiny/0461-000-Weavile.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0461--000--Weavile.png
rename to src/canonical/dex/front-shiny/0461-000-Weavile.png
diff --git a/src/canonical/dex/front-shiny/0462--000--Magnezone.png b/src/canonical/dex/front-shiny/0462-000-Magnezone.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0462--000--Magnezone.png
rename to src/canonical/dex/front-shiny/0462-000-Magnezone.png
diff --git a/src/canonical/dex/front-shiny/0463--000--Lickilicky.png b/src/canonical/dex/front-shiny/0463-000-Lickilicky.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0463--000--Lickilicky.png
rename to src/canonical/dex/front-shiny/0463-000-Lickilicky.png
diff --git a/src/canonical/dex/front-shiny/0464--000--Rhyperior.png b/src/canonical/dex/front-shiny/0464-000-Rhyperior.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0464--000--Rhyperior.png
rename to src/canonical/dex/front-shiny/0464-000-Rhyperior.png
diff --git a/src/canonical/dex/front-shiny/0465--000--Tangrowth.png b/src/canonical/dex/front-shiny/0465-000-Tangrowth.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0465--000--Tangrowth.png
rename to src/canonical/dex/front-shiny/0465-000-Tangrowth.png
diff --git a/src/canonical/dex/front-shiny/0466--000--Electivire.png b/src/canonical/dex/front-shiny/0466-000-Electivire.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0466--000--Electivire.png
rename to src/canonical/dex/front-shiny/0466-000-Electivire.png
diff --git a/src/canonical/dex/front-shiny/0467--000--Magmortar.png b/src/canonical/dex/front-shiny/0467-000-Magmortar.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0467--000--Magmortar.png
rename to src/canonical/dex/front-shiny/0467-000-Magmortar.png
diff --git a/src/canonical/dex/front-shiny/0468--000--Togekiss.png b/src/canonical/dex/front-shiny/0468-000-Togekiss.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0468--000--Togekiss.png
rename to src/canonical/dex/front-shiny/0468-000-Togekiss.png
diff --git a/src/canonical/dex/front-shiny/0469--000--Yanmega.png b/src/canonical/dex/front-shiny/0469-000-Yanmega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0469--000--Yanmega.png
rename to src/canonical/dex/front-shiny/0469-000-Yanmega.png
diff --git a/src/canonical/dex/front-shiny/0470--000--Leafeon.png b/src/canonical/dex/front-shiny/0470-000-Leafeon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0470--000--Leafeon.png
rename to src/canonical/dex/front-shiny/0470-000-Leafeon.png
diff --git a/src/canonical/dex/front-shiny/0471--000--Glaceon.png b/src/canonical/dex/front-shiny/0471-000-Glaceon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0471--000--Glaceon.png
rename to src/canonical/dex/front-shiny/0471-000-Glaceon.png
diff --git a/src/canonical/dex/front-shiny/0472--000--Gliscor.png b/src/canonical/dex/front-shiny/0472-000-Gliscor.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0472--000--Gliscor.png
rename to src/canonical/dex/front-shiny/0472-000-Gliscor.png
diff --git a/src/canonical/dex/front-shiny/0473--000--Mamoswine.png b/src/canonical/dex/front-shiny/0473-000-Mamoswine.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0473--000--Mamoswine.png
rename to src/canonical/dex/front-shiny/0473-000-Mamoswine.png
diff --git a/src/canonical/dex/front-shiny/0474--000--Porygon-Z.png b/src/canonical/dex/front-shiny/0474-000-Porygon~Z.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0474--000--Porygon-Z.png
rename to src/canonical/dex/front-shiny/0474-000-Porygon~Z.png
diff --git a/src/canonical/dex/front-shiny/0475--000--Gallade.png b/src/canonical/dex/front-shiny/0475-000-Gallade.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0475--000--Gallade.png
rename to src/canonical/dex/front-shiny/0475-000-Gallade.png
diff --git a/src/canonical/dex/front-shiny/0475--420--Gallade--Mega.png b/src/canonical/dex/front-shiny/0475-420-Gallade-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0475--420--Gallade--Mega.png
rename to src/canonical/dex/front-shiny/0475-420-Gallade-Mega.png
diff --git a/src/canonical/dex/front-shiny/0476--000--Probopass.png b/src/canonical/dex/front-shiny/0476-000-Probopass.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0476--000--Probopass.png
rename to src/canonical/dex/front-shiny/0476-000-Probopass.png
diff --git a/src/canonical/dex/front-shiny/0477--000--Dusknoir.png b/src/canonical/dex/front-shiny/0477-000-Dusknoir.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0477--000--Dusknoir.png
rename to src/canonical/dex/front-shiny/0477-000-Dusknoir.png
diff --git a/src/canonical/dex/front-shiny/0478--000--Froslass.png b/src/canonical/dex/front-shiny/0478-000-Froslass.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0478--000--Froslass.png
rename to src/canonical/dex/front-shiny/0478-000-Froslass.png
diff --git a/src/canonical/dex/front-shiny/0479--000--Rotom.png b/src/canonical/dex/front-shiny/0479-000-Rotom.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0479--000--Rotom.png
rename to src/canonical/dex/front-shiny/0479-000-Rotom.png
diff --git a/src/canonical/dex/front-shiny/0479--420--Rotom--Fan.png b/src/canonical/dex/front-shiny/0479-420-Rotom-Fan.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0479--420--Rotom--Fan.png
rename to src/canonical/dex/front-shiny/0479-420-Rotom-Fan.png
diff --git a/src/canonical/dex/front-shiny/0479--420--Rotom--Frost.png b/src/canonical/dex/front-shiny/0479-420-Rotom-Frost.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0479--420--Rotom--Frost.png
rename to src/canonical/dex/front-shiny/0479-420-Rotom-Frost.png
diff --git a/src/canonical/dex/front-shiny/0479--420--Rotom--Heat.png b/src/canonical/dex/front-shiny/0479-420-Rotom-Heat.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0479--420--Rotom--Heat.png
rename to src/canonical/dex/front-shiny/0479-420-Rotom-Heat.png
diff --git a/src/canonical/dex/front-shiny/0479--420--Rotom--Mow.png b/src/canonical/dex/front-shiny/0479-420-Rotom-Mow.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0479--420--Rotom--Mow.png
rename to src/canonical/dex/front-shiny/0479-420-Rotom-Mow.png
diff --git a/src/canonical/dex/front-shiny/0479--420--Rotom--Wash.png b/src/canonical/dex/front-shiny/0479-420-Rotom-Wash.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0479--420--Rotom--Wash.png
rename to src/canonical/dex/front-shiny/0479-420-Rotom-Wash.png
diff --git a/src/canonical/dex/front-shiny/0480--000--Uxie.png b/src/canonical/dex/front-shiny/0480-000-Uxie.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0480--000--Uxie.png
rename to src/canonical/dex/front-shiny/0480-000-Uxie.png
diff --git a/src/canonical/dex/front-shiny/0481--000--Mesprit.png b/src/canonical/dex/front-shiny/0481-000-Mesprit.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0481--000--Mesprit.png
rename to src/canonical/dex/front-shiny/0481-000-Mesprit.png
diff --git a/src/canonical/dex/front-shiny/0482--000--Azelf.png b/src/canonical/dex/front-shiny/0482-000-Azelf.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0482--000--Azelf.png
rename to src/canonical/dex/front-shiny/0482-000-Azelf.png
diff --git a/src/canonical/dex/front-shiny/0483--000--Dialga.png b/src/canonical/dex/front-shiny/0483-000-Dialga.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0483--000--Dialga.png
rename to src/canonical/dex/front-shiny/0483-000-Dialga.png
diff --git a/src/canonical/dex/front-shiny/0484--000--Palkia.png b/src/canonical/dex/front-shiny/0484-000-Palkia.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0484--000--Palkia.png
rename to src/canonical/dex/front-shiny/0484-000-Palkia.png
diff --git a/src/canonical/dex/front-shiny/0485--000--Heatran.png b/src/canonical/dex/front-shiny/0485-000-Heatran.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0485--000--Heatran.png
rename to src/canonical/dex/front-shiny/0485-000-Heatran.png
diff --git a/src/canonical/dex/front-shiny/0486--000--Regigigas.png b/src/canonical/dex/front-shiny/0486-000-Regigigas.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0486--000--Regigigas.png
rename to src/canonical/dex/front-shiny/0486-000-Regigigas.png
diff --git a/src/canonical/dex/front-shiny/0487--000--Giratina.png b/src/canonical/dex/front-shiny/0487-000-Giratina.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0487--000--Giratina.png
rename to src/canonical/dex/front-shiny/0487-000-Giratina.png
diff --git a/src/canonical/dex/front-shiny/0487--420--Giratina--Origin.png b/src/canonical/dex/front-shiny/0487-420-Giratina-Origin.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0487--420--Giratina--Origin.png
rename to src/canonical/dex/front-shiny/0487-420-Giratina-Origin.png
diff --git a/src/canonical/dex/front-shiny/0488--000--Cresselia.png b/src/canonical/dex/front-shiny/0488-000-Cresselia.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0488--000--Cresselia.png
rename to src/canonical/dex/front-shiny/0488-000-Cresselia.png
diff --git a/src/canonical/dex/front-shiny/0489--000--Phione.png b/src/canonical/dex/front-shiny/0489-000-Phione.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0489--000--Phione.png
rename to src/canonical/dex/front-shiny/0489-000-Phione.png
diff --git a/src/canonical/dex/front-shiny/0490--000--Manaphy.png b/src/canonical/dex/front-shiny/0490-000-Manaphy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0490--000--Manaphy.png
rename to src/canonical/dex/front-shiny/0490-000-Manaphy.png
diff --git a/src/canonical/dex/front-shiny/0491--000--Darkrai.png b/src/canonical/dex/front-shiny/0491-000-Darkrai.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0491--000--Darkrai.png
rename to src/canonical/dex/front-shiny/0491-000-Darkrai.png
diff --git a/src/canonical/dex/front-shiny/0492--000--Shaymin.png b/src/canonical/dex/front-shiny/0492-000-Shaymin.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0492--000--Shaymin.png
rename to src/canonical/dex/front-shiny/0492-000-Shaymin.png
diff --git a/src/canonical/dex/front-shiny/0492--420--Shaymin--Sky.png b/src/canonical/dex/front-shiny/0492-420-Shaymin-Sky.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0492--420--Shaymin--Sky.png
rename to src/canonical/dex/front-shiny/0492-420-Shaymin-Sky.png
diff --git a/src/canonical/dex/front-shiny/0493--000--Arceus.png b/src/canonical/dex/front-shiny/0493-000-Arceus.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--000--Arceus.png
rename to src/canonical/dex/front-shiny/0493-000-Arceus.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Bug.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Bug.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Bug.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Bug.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Dark.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Dark.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Dark.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Dark.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Dragon.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Dragon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Dragon.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Dragon.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Electric.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Electric.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Electric.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Electric.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Fairy.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Fairy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Fairy.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Fairy.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Fighting.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Fighting.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Fighting.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Fighting.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Fire.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Fire.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Fire.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Fire.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Flying.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Flying.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Flying.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Flying.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Ghost.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Ghost.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Ghost.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Ghost.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Grass.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Grass.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Grass.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Grass.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Ground.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Ground.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Ground.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Ground.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Ice.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Ice.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Ice.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Ice.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Poison.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Poison.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Poison.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Poison.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Psychic.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Psychic.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Psychic.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Psychic.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Rock.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Rock.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Rock.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Rock.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Steel.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Steel.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Steel.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Steel.png
diff --git a/src/canonical/dex/front-shiny/0493--420--Arceus--Water.png b/src/canonical/dex/front-shiny/0493-420-Arceus-Water.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0493--420--Arceus--Water.png
rename to src/canonical/dex/front-shiny/0493-420-Arceus-Water.png
diff --git a/src/canonical/dex/front-shiny/0494--000--Victini.png b/src/canonical/dex/front-shiny/0494-000-Victini.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0494--000--Victini.png
rename to src/canonical/dex/front-shiny/0494-000-Victini.png
diff --git a/src/canonical/dex/front-shiny/0495--000--Snivy.png b/src/canonical/dex/front-shiny/0495-000-Snivy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0495--000--Snivy.png
rename to src/canonical/dex/front-shiny/0495-000-Snivy.png
diff --git a/src/canonical/dex/front-shiny/0496--000--Servine.png b/src/canonical/dex/front-shiny/0496-000-Servine.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0496--000--Servine.png
rename to src/canonical/dex/front-shiny/0496-000-Servine.png
diff --git a/src/canonical/dex/front-shiny/0497--000--Serperior.png b/src/canonical/dex/front-shiny/0497-000-Serperior.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0497--000--Serperior.png
rename to src/canonical/dex/front-shiny/0497-000-Serperior.png
diff --git a/src/canonical/dex/front-shiny/0498--000--Tepig.png b/src/canonical/dex/front-shiny/0498-000-Tepig.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0498--000--Tepig.png
rename to src/canonical/dex/front-shiny/0498-000-Tepig.png
diff --git a/src/canonical/dex/front-shiny/0499--000--Pignite.png b/src/canonical/dex/front-shiny/0499-000-Pignite.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0499--000--Pignite.png
rename to src/canonical/dex/front-shiny/0499-000-Pignite.png
diff --git a/src/canonical/dex/front-shiny/0500--000--Emboar.png b/src/canonical/dex/front-shiny/0500-000-Emboar.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0500--000--Emboar.png
rename to src/canonical/dex/front-shiny/0500-000-Emboar.png
diff --git a/src/canonical/dex/front-shiny/0501--000--Oshawott.png b/src/canonical/dex/front-shiny/0501-000-Oshawott.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0501--000--Oshawott.png
rename to src/canonical/dex/front-shiny/0501-000-Oshawott.png
diff --git a/src/canonical/dex/front-shiny/0502--000--Dewott.png b/src/canonical/dex/front-shiny/0502-000-Dewott.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0502--000--Dewott.png
rename to src/canonical/dex/front-shiny/0502-000-Dewott.png
diff --git a/src/canonical/dex/front-shiny/0503--000--Samurott.png b/src/canonical/dex/front-shiny/0503-000-Samurott.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0503--000--Samurott.png
rename to src/canonical/dex/front-shiny/0503-000-Samurott.png
diff --git a/src/canonical/dex/front-shiny/0504--000--Patrat.png b/src/canonical/dex/front-shiny/0504-000-Patrat.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0504--000--Patrat.png
rename to src/canonical/dex/front-shiny/0504-000-Patrat.png
diff --git a/src/canonical/dex/front-shiny/0505--000--Watchog.png b/src/canonical/dex/front-shiny/0505-000-Watchog.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0505--000--Watchog.png
rename to src/canonical/dex/front-shiny/0505-000-Watchog.png
diff --git a/src/canonical/dex/front-shiny/0506--000--Lillipup.png b/src/canonical/dex/front-shiny/0506-000-Lillipup.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0506--000--Lillipup.png
rename to src/canonical/dex/front-shiny/0506-000-Lillipup.png
diff --git a/src/canonical/dex/front-shiny/0507--000--Herdier.png b/src/canonical/dex/front-shiny/0507-000-Herdier.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0507--000--Herdier.png
rename to src/canonical/dex/front-shiny/0507-000-Herdier.png
diff --git a/src/canonical/dex/front-shiny/0508--000--Stoutland.png b/src/canonical/dex/front-shiny/0508-000-Stoutland.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0508--000--Stoutland.png
rename to src/canonical/dex/front-shiny/0508-000-Stoutland.png
diff --git a/src/canonical/dex/front-shiny/0509--000--Purrloin.png b/src/canonical/dex/front-shiny/0509-000-Purrloin.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0509--000--Purrloin.png
rename to src/canonical/dex/front-shiny/0509-000-Purrloin.png
diff --git a/src/canonical/dex/front-shiny/0510--000--Liepard.png b/src/canonical/dex/front-shiny/0510-000-Liepard.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0510--000--Liepard.png
rename to src/canonical/dex/front-shiny/0510-000-Liepard.png
diff --git a/src/canonical/dex/front-shiny/0511--000--Pansage.png b/src/canonical/dex/front-shiny/0511-000-Pansage.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0511--000--Pansage.png
rename to src/canonical/dex/front-shiny/0511-000-Pansage.png
diff --git a/src/canonical/dex/front-shiny/0512--000--Simisage.png b/src/canonical/dex/front-shiny/0512-000-Simisage.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0512--000--Simisage.png
rename to src/canonical/dex/front-shiny/0512-000-Simisage.png
diff --git a/src/canonical/dex/front-shiny/0513--000--Pansear.png b/src/canonical/dex/front-shiny/0513-000-Pansear.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0513--000--Pansear.png
rename to src/canonical/dex/front-shiny/0513-000-Pansear.png
diff --git a/src/canonical/dex/front-shiny/0514--000--Simisear.png b/src/canonical/dex/front-shiny/0514-000-Simisear.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0514--000--Simisear.png
rename to src/canonical/dex/front-shiny/0514-000-Simisear.png
diff --git a/src/canonical/dex/front-shiny/0515--000--Panpour.png b/src/canonical/dex/front-shiny/0515-000-Panpour.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0515--000--Panpour.png
rename to src/canonical/dex/front-shiny/0515-000-Panpour.png
diff --git a/src/canonical/dex/front-shiny/0516--000--Simipour.png b/src/canonical/dex/front-shiny/0516-000-Simipour.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0516--000--Simipour.png
rename to src/canonical/dex/front-shiny/0516-000-Simipour.png
diff --git a/src/canonical/dex/front-shiny/0517--000--Munna.png b/src/canonical/dex/front-shiny/0517-000-Munna.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0517--000--Munna.png
rename to src/canonical/dex/front-shiny/0517-000-Munna.png
diff --git a/src/canonical/dex/front-shiny/0518--000--Musharna.png b/src/canonical/dex/front-shiny/0518-000-Musharna.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0518--000--Musharna.png
rename to src/canonical/dex/front-shiny/0518-000-Musharna.png
diff --git a/src/canonical/dex/front-shiny/0519--000--Pidove.png b/src/canonical/dex/front-shiny/0519-000-Pidove.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0519--000--Pidove.png
rename to src/canonical/dex/front-shiny/0519-000-Pidove.png
diff --git a/src/canonical/dex/front-shiny/0520--000--Tranquill.png b/src/canonical/dex/front-shiny/0520-000-Tranquill.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0520--000--Tranquill.png
rename to src/canonical/dex/front-shiny/0520-000-Tranquill.png
diff --git a/src/canonical/dex/front-shiny/0521--000--Unfezant.png b/src/canonical/dex/front-shiny/0521-000-Unfezant.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0521--000--Unfezant.png
rename to src/canonical/dex/front-shiny/0521-000-Unfezant.png
diff --git a/src/canonical/dex/front-shiny/0522--000--Blitzle.png b/src/canonical/dex/front-shiny/0522-000-Blitzle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0522--000--Blitzle.png
rename to src/canonical/dex/front-shiny/0522-000-Blitzle.png
diff --git a/src/canonical/dex/front-shiny/0523--000--Zebstrika.png b/src/canonical/dex/front-shiny/0523-000-Zebstrika.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0523--000--Zebstrika.png
rename to src/canonical/dex/front-shiny/0523-000-Zebstrika.png
diff --git a/src/canonical/dex/front-shiny/0524--000--Roggenrola.png b/src/canonical/dex/front-shiny/0524-000-Roggenrola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0524--000--Roggenrola.png
rename to src/canonical/dex/front-shiny/0524-000-Roggenrola.png
diff --git a/src/canonical/dex/front-shiny/0525--000--Boldore.png b/src/canonical/dex/front-shiny/0525-000-Boldore.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0525--000--Boldore.png
rename to src/canonical/dex/front-shiny/0525-000-Boldore.png
diff --git a/src/canonical/dex/front-shiny/0526--000--Gigalith.png b/src/canonical/dex/front-shiny/0526-000-Gigalith.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0526--000--Gigalith.png
rename to src/canonical/dex/front-shiny/0526-000-Gigalith.png
diff --git a/src/canonical/dex/front-shiny/0527--000--Woobat.png b/src/canonical/dex/front-shiny/0527-000-Woobat.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0527--000--Woobat.png
rename to src/canonical/dex/front-shiny/0527-000-Woobat.png
diff --git a/src/canonical/dex/front-shiny/0528--000--Swoobat.png b/src/canonical/dex/front-shiny/0528-000-Swoobat.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0528--000--Swoobat.png
rename to src/canonical/dex/front-shiny/0528-000-Swoobat.png
diff --git a/src/canonical/dex/front-shiny/0529--000--Drilbur.png b/src/canonical/dex/front-shiny/0529-000-Drilbur.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0529--000--Drilbur.png
rename to src/canonical/dex/front-shiny/0529-000-Drilbur.png
diff --git a/src/canonical/dex/front-shiny/0530--000--Excadrill.png b/src/canonical/dex/front-shiny/0530-000-Excadrill.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0530--000--Excadrill.png
rename to src/canonical/dex/front-shiny/0530-000-Excadrill.png
diff --git a/src/canonical/dex/front-shiny/0531--000--Audino.png b/src/canonical/dex/front-shiny/0531-000-Audino.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0531--000--Audino.png
rename to src/canonical/dex/front-shiny/0531-000-Audino.png
diff --git a/src/canonical/dex/front-shiny/0531--420--Audino--Mega.png b/src/canonical/dex/front-shiny/0531-420-Audino-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0531--420--Audino--Mega.png
rename to src/canonical/dex/front-shiny/0531-420-Audino-Mega.png
diff --git a/src/canonical/dex/front-shiny/0532--000--Timburr.png b/src/canonical/dex/front-shiny/0532-000-Timburr.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0532--000--Timburr.png
rename to src/canonical/dex/front-shiny/0532-000-Timburr.png
diff --git a/src/canonical/dex/front-shiny/0533--000--Gurdurr.png b/src/canonical/dex/front-shiny/0533-000-Gurdurr.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0533--000--Gurdurr.png
rename to src/canonical/dex/front-shiny/0533-000-Gurdurr.png
diff --git a/src/canonical/dex/front-shiny/0534--000--Conkeldurr.png b/src/canonical/dex/front-shiny/0534-000-Conkeldurr.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0534--000--Conkeldurr.png
rename to src/canonical/dex/front-shiny/0534-000-Conkeldurr.png
diff --git a/src/canonical/dex/front-shiny/0535--000--Tympole.png b/src/canonical/dex/front-shiny/0535-000-Tympole.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0535--000--Tympole.png
rename to src/canonical/dex/front-shiny/0535-000-Tympole.png
diff --git a/src/canonical/dex/front-shiny/0536--000--Palpitoad.png b/src/canonical/dex/front-shiny/0536-000-Palpitoad.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0536--000--Palpitoad.png
rename to src/canonical/dex/front-shiny/0536-000-Palpitoad.png
diff --git a/src/canonical/dex/front-shiny/0537--000--Seismitoad.png b/src/canonical/dex/front-shiny/0537-000-Seismitoad.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0537--000--Seismitoad.png
rename to src/canonical/dex/front-shiny/0537-000-Seismitoad.png
diff --git a/src/canonical/dex/front-shiny/0538--000--Throh.png b/src/canonical/dex/front-shiny/0538-000-Throh.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0538--000--Throh.png
rename to src/canonical/dex/front-shiny/0538-000-Throh.png
diff --git a/src/canonical/dex/front-shiny/0539--000--Sawk.png b/src/canonical/dex/front-shiny/0539-000-Sawk.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0539--000--Sawk.png
rename to src/canonical/dex/front-shiny/0539-000-Sawk.png
diff --git a/src/canonical/dex/front-shiny/0540--000--Sewaddle.png b/src/canonical/dex/front-shiny/0540-000-Sewaddle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0540--000--Sewaddle.png
rename to src/canonical/dex/front-shiny/0540-000-Sewaddle.png
diff --git a/src/canonical/dex/front-shiny/0541--000--Swadloon.png b/src/canonical/dex/front-shiny/0541-000-Swadloon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0541--000--Swadloon.png
rename to src/canonical/dex/front-shiny/0541-000-Swadloon.png
diff --git a/src/canonical/dex/front-shiny/0542--000--Leavanny.png b/src/canonical/dex/front-shiny/0542-000-Leavanny.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0542--000--Leavanny.png
rename to src/canonical/dex/front-shiny/0542-000-Leavanny.png
diff --git a/src/canonical/dex/front-shiny/0543--000--Venipede.png b/src/canonical/dex/front-shiny/0543-000-Venipede.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0543--000--Venipede.png
rename to src/canonical/dex/front-shiny/0543-000-Venipede.png
diff --git a/src/canonical/dex/front-shiny/0544--000--Whirlipede.png b/src/canonical/dex/front-shiny/0544-000-Whirlipede.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0544--000--Whirlipede.png
rename to src/canonical/dex/front-shiny/0544-000-Whirlipede.png
diff --git a/src/canonical/dex/front-shiny/0545--000--Scolipede.png b/src/canonical/dex/front-shiny/0545-000-Scolipede.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0545--000--Scolipede.png
rename to src/canonical/dex/front-shiny/0545-000-Scolipede.png
diff --git a/src/canonical/dex/front-shiny/0546--000--Cottonee.png b/src/canonical/dex/front-shiny/0546-000-Cottonee.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0546--000--Cottonee.png
rename to src/canonical/dex/front-shiny/0546-000-Cottonee.png
diff --git a/src/canonical/dex/front-shiny/0547--000--Whimsicott.png b/src/canonical/dex/front-shiny/0547-000-Whimsicott.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0547--000--Whimsicott.png
rename to src/canonical/dex/front-shiny/0547-000-Whimsicott.png
diff --git a/src/canonical/dex/front-shiny/0548--000--Petilil.png b/src/canonical/dex/front-shiny/0548-000-Petilil.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0548--000--Petilil.png
rename to src/canonical/dex/front-shiny/0548-000-Petilil.png
diff --git a/src/canonical/dex/front-shiny/0549--000--Lilligant.png b/src/canonical/dex/front-shiny/0549-000-Lilligant.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0549--000--Lilligant.png
rename to src/canonical/dex/front-shiny/0549-000-Lilligant.png
diff --git a/src/canonical/dex/front-shiny/0550--000--Basculin.png b/src/canonical/dex/front-shiny/0550-000-Basculin.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0550--000--Basculin.png
rename to src/canonical/dex/front-shiny/0550-000-Basculin.png
diff --git a/src/canonical/dex/front-shiny/0550--420--Basculin--Blue-Striped.png b/src/canonical/dex/front-shiny/0550-420-Basculin-Blue~Striped.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0550--420--Basculin--Blue-Striped.png
rename to src/canonical/dex/front-shiny/0550-420-Basculin-Blue~Striped.png
diff --git a/src/canonical/dex/front-shiny/0551--000--Sandile.png b/src/canonical/dex/front-shiny/0551-000-Sandile.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0551--000--Sandile.png
rename to src/canonical/dex/front-shiny/0551-000-Sandile.png
diff --git a/src/canonical/dex/front-shiny/0552--000--Krokorok.png b/src/canonical/dex/front-shiny/0552-000-Krokorok.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0552--000--Krokorok.png
rename to src/canonical/dex/front-shiny/0552-000-Krokorok.png
diff --git a/src/canonical/dex/front-shiny/0553--000--Krookodile.png b/src/canonical/dex/front-shiny/0553-000-Krookodile.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0553--000--Krookodile.png
rename to src/canonical/dex/front-shiny/0553-000-Krookodile.png
diff --git a/src/canonical/dex/front-shiny/0554--000--Darumaka.png b/src/canonical/dex/front-shiny/0554-000-Darumaka.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0554--000--Darumaka.png
rename to src/canonical/dex/front-shiny/0554-000-Darumaka.png
diff --git a/src/canonical/dex/front-shiny/0555--000--Darmanitan.png b/src/canonical/dex/front-shiny/0555-000-Darmanitan.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0555--000--Darmanitan.png
rename to src/canonical/dex/front-shiny/0555-000-Darmanitan.png
diff --git a/src/canonical/dex/front-shiny/0555--420--Darmanitan--Zen.png b/src/canonical/dex/front-shiny/0555-420-Darmanitan-Zen.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0555--420--Darmanitan--Zen.png
rename to src/canonical/dex/front-shiny/0555-420-Darmanitan-Zen.png
diff --git a/src/canonical/dex/front-shiny/0556--000--Maractus.png b/src/canonical/dex/front-shiny/0556-000-Maractus.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0556--000--Maractus.png
rename to src/canonical/dex/front-shiny/0556-000-Maractus.png
diff --git a/src/canonical/dex/front-shiny/0557--000--Dwebble.png b/src/canonical/dex/front-shiny/0557-000-Dwebble.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0557--000--Dwebble.png
rename to src/canonical/dex/front-shiny/0557-000-Dwebble.png
diff --git a/src/canonical/dex/front-shiny/0558--000--Crustle.png b/src/canonical/dex/front-shiny/0558-000-Crustle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0558--000--Crustle.png
rename to src/canonical/dex/front-shiny/0558-000-Crustle.png
diff --git a/src/canonical/dex/front-shiny/0559--000--Scraggy.png b/src/canonical/dex/front-shiny/0559-000-Scraggy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0559--000--Scraggy.png
rename to src/canonical/dex/front-shiny/0559-000-Scraggy.png
diff --git a/src/canonical/dex/front-shiny/0560--000--Scrafty.png b/src/canonical/dex/front-shiny/0560-000-Scrafty.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0560--000--Scrafty.png
rename to src/canonical/dex/front-shiny/0560-000-Scrafty.png
diff --git a/src/canonical/dex/front-shiny/0561--000--Sigilyph.png b/src/canonical/dex/front-shiny/0561-000-Sigilyph.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0561--000--Sigilyph.png
rename to src/canonical/dex/front-shiny/0561-000-Sigilyph.png
diff --git a/src/canonical/dex/front-shiny/0562--000--Yamask.png b/src/canonical/dex/front-shiny/0562-000-Yamask.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0562--000--Yamask.png
rename to src/canonical/dex/front-shiny/0562-000-Yamask.png
diff --git a/src/canonical/dex/front-shiny/0563--000--Cofagrigus.png b/src/canonical/dex/front-shiny/0563-000-Cofagrigus.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0563--000--Cofagrigus.png
rename to src/canonical/dex/front-shiny/0563-000-Cofagrigus.png
diff --git a/src/canonical/dex/front-shiny/0564--000--Tirtouga.png b/src/canonical/dex/front-shiny/0564-000-Tirtouga.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0564--000--Tirtouga.png
rename to src/canonical/dex/front-shiny/0564-000-Tirtouga.png
diff --git a/src/canonical/dex/front-shiny/0565--000--Carracosta.png b/src/canonical/dex/front-shiny/0565-000-Carracosta.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0565--000--Carracosta.png
rename to src/canonical/dex/front-shiny/0565-000-Carracosta.png
diff --git a/src/canonical/dex/front-shiny/0566--000--Archen.png b/src/canonical/dex/front-shiny/0566-000-Archen.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0566--000--Archen.png
rename to src/canonical/dex/front-shiny/0566-000-Archen.png
diff --git a/src/canonical/dex/front-shiny/0567--000--Archeops.png b/src/canonical/dex/front-shiny/0567-000-Archeops.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0567--000--Archeops.png
rename to src/canonical/dex/front-shiny/0567-000-Archeops.png
diff --git a/src/canonical/dex/front-shiny/0568--000--Trubbish.png b/src/canonical/dex/front-shiny/0568-000-Trubbish.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0568--000--Trubbish.png
rename to src/canonical/dex/front-shiny/0568-000-Trubbish.png
diff --git a/src/canonical/dex/front-shiny/0569--000--Garbodor.png b/src/canonical/dex/front-shiny/0569-000-Garbodor.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0569--000--Garbodor.png
rename to src/canonical/dex/front-shiny/0569-000-Garbodor.png
diff --git a/src/canonical/dex/front-shiny/0570--000--Zorua.png b/src/canonical/dex/front-shiny/0570-000-Zorua.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0570--000--Zorua.png
rename to src/canonical/dex/front-shiny/0570-000-Zorua.png
diff --git a/src/canonical/dex/front-shiny/0571--000--Zoroark.png b/src/canonical/dex/front-shiny/0571-000-Zoroark.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0571--000--Zoroark.png
rename to src/canonical/dex/front-shiny/0571-000-Zoroark.png
diff --git a/src/canonical/dex/front-shiny/0572--000--Minccino.png b/src/canonical/dex/front-shiny/0572-000-Minccino.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0572--000--Minccino.png
rename to src/canonical/dex/front-shiny/0572-000-Minccino.png
diff --git a/src/canonical/dex/front-shiny/0573--000--Cinccino.png b/src/canonical/dex/front-shiny/0573-000-Cinccino.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0573--000--Cinccino.png
rename to src/canonical/dex/front-shiny/0573-000-Cinccino.png
diff --git a/src/canonical/dex/front-shiny/0574--000--Gothita.png b/src/canonical/dex/front-shiny/0574-000-Gothita.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0574--000--Gothita.png
rename to src/canonical/dex/front-shiny/0574-000-Gothita.png
diff --git a/src/canonical/dex/front-shiny/0575--000--Gothorita.png b/src/canonical/dex/front-shiny/0575-000-Gothorita.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0575--000--Gothorita.png
rename to src/canonical/dex/front-shiny/0575-000-Gothorita.png
diff --git a/src/canonical/dex/front-shiny/0576--000--Gothitelle.png b/src/canonical/dex/front-shiny/0576-000-Gothitelle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0576--000--Gothitelle.png
rename to src/canonical/dex/front-shiny/0576-000-Gothitelle.png
diff --git a/src/canonical/dex/front-shiny/0577--000--Solosis.png b/src/canonical/dex/front-shiny/0577-000-Solosis.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0577--000--Solosis.png
rename to src/canonical/dex/front-shiny/0577-000-Solosis.png
diff --git a/src/canonical/dex/front-shiny/0578--000--Duosion.png b/src/canonical/dex/front-shiny/0578-000-Duosion.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0578--000--Duosion.png
rename to src/canonical/dex/front-shiny/0578-000-Duosion.png
diff --git a/src/canonical/dex/front-shiny/0579--000--Reuniclus.png b/src/canonical/dex/front-shiny/0579-000-Reuniclus.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0579--000--Reuniclus.png
rename to src/canonical/dex/front-shiny/0579-000-Reuniclus.png
diff --git a/src/canonical/dex/front-shiny/0580--000--Ducklett.png b/src/canonical/dex/front-shiny/0580-000-Ducklett.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0580--000--Ducklett.png
rename to src/canonical/dex/front-shiny/0580-000-Ducklett.png
diff --git a/src/canonical/dex/front-shiny/0581--000--Swanna.png b/src/canonical/dex/front-shiny/0581-000-Swanna.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0581--000--Swanna.png
rename to src/canonical/dex/front-shiny/0581-000-Swanna.png
diff --git a/src/canonical/dex/front-shiny/0582--000--Vanillite.png b/src/canonical/dex/front-shiny/0582-000-Vanillite.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0582--000--Vanillite.png
rename to src/canonical/dex/front-shiny/0582-000-Vanillite.png
diff --git a/src/canonical/dex/front-shiny/0583--000--Vanillish.png b/src/canonical/dex/front-shiny/0583-000-Vanillish.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0583--000--Vanillish.png
rename to src/canonical/dex/front-shiny/0583-000-Vanillish.png
diff --git a/src/canonical/dex/front-shiny/0584--000--Vanilluxe.png b/src/canonical/dex/front-shiny/0584-000-Vanilluxe.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0584--000--Vanilluxe.png
rename to src/canonical/dex/front-shiny/0584-000-Vanilluxe.png
diff --git a/src/canonical/dex/front-shiny/0585--000--Deerling.png b/src/canonical/dex/front-shiny/0585-000-Deerling.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0585--000--Deerling.png
rename to src/canonical/dex/front-shiny/0585-000-Deerling.png
diff --git a/src/canonical/dex/front-shiny/0586--000--Sawsbuck.png b/src/canonical/dex/front-shiny/0586-000-Sawsbuck.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0586--000--Sawsbuck.png
rename to src/canonical/dex/front-shiny/0586-000-Sawsbuck.png
diff --git a/src/canonical/dex/front-shiny/0587--000--Emolga.png b/src/canonical/dex/front-shiny/0587-000-Emolga.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0587--000--Emolga.png
rename to src/canonical/dex/front-shiny/0587-000-Emolga.png
diff --git a/src/canonical/dex/front-shiny/0588--000--Karrablast.png b/src/canonical/dex/front-shiny/0588-000-Karrablast.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0588--000--Karrablast.png
rename to src/canonical/dex/front-shiny/0588-000-Karrablast.png
diff --git a/src/canonical/dex/front-shiny/0589--000--Escavalier.png b/src/canonical/dex/front-shiny/0589-000-Escavalier.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0589--000--Escavalier.png
rename to src/canonical/dex/front-shiny/0589-000-Escavalier.png
diff --git a/src/canonical/dex/front-shiny/0590--000--Foongus.png b/src/canonical/dex/front-shiny/0590-000-Foongus.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0590--000--Foongus.png
rename to src/canonical/dex/front-shiny/0590-000-Foongus.png
diff --git a/src/canonical/dex/front-shiny/0591--000--Amoonguss.png b/src/canonical/dex/front-shiny/0591-000-Amoonguss.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0591--000--Amoonguss.png
rename to src/canonical/dex/front-shiny/0591-000-Amoonguss.png
diff --git a/src/canonical/dex/front-shiny/0592--000--Frillish.png b/src/canonical/dex/front-shiny/0592-000-Frillish.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0592--000--Frillish.png
rename to src/canonical/dex/front-shiny/0592-000-Frillish.png
diff --git a/src/canonical/dex/front-shiny/0593--000--Jellicent.png b/src/canonical/dex/front-shiny/0593-000-Jellicent.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0593--000--Jellicent.png
rename to src/canonical/dex/front-shiny/0593-000-Jellicent.png
diff --git a/src/canonical/dex/front-shiny/0594--000--Alomomola.png b/src/canonical/dex/front-shiny/0594-000-Alomomola.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0594--000--Alomomola.png
rename to src/canonical/dex/front-shiny/0594-000-Alomomola.png
diff --git a/src/canonical/dex/front-shiny/0595--000--Joltik.png b/src/canonical/dex/front-shiny/0595-000-Joltik.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0595--000--Joltik.png
rename to src/canonical/dex/front-shiny/0595-000-Joltik.png
diff --git a/src/canonical/dex/front-shiny/0596--000--Galvantula.png b/src/canonical/dex/front-shiny/0596-000-Galvantula.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0596--000--Galvantula.png
rename to src/canonical/dex/front-shiny/0596-000-Galvantula.png
diff --git a/src/canonical/dex/front-shiny/0597--000--Ferroseed.png b/src/canonical/dex/front-shiny/0597-000-Ferroseed.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0597--000--Ferroseed.png
rename to src/canonical/dex/front-shiny/0597-000-Ferroseed.png
diff --git a/src/canonical/dex/front-shiny/0598--000--Ferrothorn.png b/src/canonical/dex/front-shiny/0598-000-Ferrothorn.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0598--000--Ferrothorn.png
rename to src/canonical/dex/front-shiny/0598-000-Ferrothorn.png
diff --git a/src/canonical/dex/front-shiny/0599--000--Klink.png b/src/canonical/dex/front-shiny/0599-000-Klink.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0599--000--Klink.png
rename to src/canonical/dex/front-shiny/0599-000-Klink.png
diff --git a/src/canonical/dex/front-shiny/0600--000--Klang.png b/src/canonical/dex/front-shiny/0600-000-Klang.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0600--000--Klang.png
rename to src/canonical/dex/front-shiny/0600-000-Klang.png
diff --git a/src/canonical/dex/front-shiny/0601--000--Klinklang.png b/src/canonical/dex/front-shiny/0601-000-Klinklang.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0601--000--Klinklang.png
rename to src/canonical/dex/front-shiny/0601-000-Klinklang.png
diff --git a/src/canonical/dex/front-shiny/0602--000--Tynamo.png b/src/canonical/dex/front-shiny/0602-000-Tynamo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0602--000--Tynamo.png
rename to src/canonical/dex/front-shiny/0602-000-Tynamo.png
diff --git a/src/canonical/dex/front-shiny/0603--000--Eelektrik.png b/src/canonical/dex/front-shiny/0603-000-Eelektrik.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0603--000--Eelektrik.png
rename to src/canonical/dex/front-shiny/0603-000-Eelektrik.png
diff --git a/src/canonical/dex/front-shiny/0604--000--Eelektross.png b/src/canonical/dex/front-shiny/0604-000-Eelektross.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0604--000--Eelektross.png
rename to src/canonical/dex/front-shiny/0604-000-Eelektross.png
diff --git a/src/canonical/dex/front-shiny/0605--000--Elgyem.png b/src/canonical/dex/front-shiny/0605-000-Elgyem.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0605--000--Elgyem.png
rename to src/canonical/dex/front-shiny/0605-000-Elgyem.png
diff --git a/src/canonical/dex/front-shiny/0606--000--Beheeyem.png b/src/canonical/dex/front-shiny/0606-000-Beheeyem.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0606--000--Beheeyem.png
rename to src/canonical/dex/front-shiny/0606-000-Beheeyem.png
diff --git a/src/canonical/dex/front-shiny/0607--000--Litwick.png b/src/canonical/dex/front-shiny/0607-000-Litwick.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0607--000--Litwick.png
rename to src/canonical/dex/front-shiny/0607-000-Litwick.png
diff --git a/src/canonical/dex/front-shiny/0608--000--Lampent.png b/src/canonical/dex/front-shiny/0608-000-Lampent.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0608--000--Lampent.png
rename to src/canonical/dex/front-shiny/0608-000-Lampent.png
diff --git a/src/canonical/dex/front-shiny/0609--000--Chandelure.png b/src/canonical/dex/front-shiny/0609-000-Chandelure.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0609--000--Chandelure.png
rename to src/canonical/dex/front-shiny/0609-000-Chandelure.png
diff --git a/src/canonical/dex/front-shiny/0610--000--Axew.png b/src/canonical/dex/front-shiny/0610-000-Axew.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0610--000--Axew.png
rename to src/canonical/dex/front-shiny/0610-000-Axew.png
diff --git a/src/canonical/dex/front-shiny/0611--000--Fraxure.png b/src/canonical/dex/front-shiny/0611-000-Fraxure.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0611--000--Fraxure.png
rename to src/canonical/dex/front-shiny/0611-000-Fraxure.png
diff --git a/src/canonical/dex/front-shiny/0612--000--Haxorus.png b/src/canonical/dex/front-shiny/0612-000-Haxorus.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0612--000--Haxorus.png
rename to src/canonical/dex/front-shiny/0612-000-Haxorus.png
diff --git a/src/canonical/dex/front-shiny/0613--000--Cubchoo.png b/src/canonical/dex/front-shiny/0613-000-Cubchoo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0613--000--Cubchoo.png
rename to src/canonical/dex/front-shiny/0613-000-Cubchoo.png
diff --git a/src/canonical/dex/front-shiny/0614--000--Beartic.png b/src/canonical/dex/front-shiny/0614-000-Beartic.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0614--000--Beartic.png
rename to src/canonical/dex/front-shiny/0614-000-Beartic.png
diff --git a/src/canonical/dex/front-shiny/0615--000--Cryogonal.png b/src/canonical/dex/front-shiny/0615-000-Cryogonal.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0615--000--Cryogonal.png
rename to src/canonical/dex/front-shiny/0615-000-Cryogonal.png
diff --git a/src/canonical/dex/front-shiny/0616--000--Shelmet.png b/src/canonical/dex/front-shiny/0616-000-Shelmet.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0616--000--Shelmet.png
rename to src/canonical/dex/front-shiny/0616-000-Shelmet.png
diff --git a/src/canonical/dex/front-shiny/0617--000--Accelgor.png b/src/canonical/dex/front-shiny/0617-000-Accelgor.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0617--000--Accelgor.png
rename to src/canonical/dex/front-shiny/0617-000-Accelgor.png
diff --git a/src/canonical/dex/front-shiny/0618--000--Stunfisk.png b/src/canonical/dex/front-shiny/0618-000-Stunfisk.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0618--000--Stunfisk.png
rename to src/canonical/dex/front-shiny/0618-000-Stunfisk.png
diff --git a/src/canonical/dex/front-shiny/0619--000--Mienfoo.png b/src/canonical/dex/front-shiny/0619-000-Mienfoo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0619--000--Mienfoo.png
rename to src/canonical/dex/front-shiny/0619-000-Mienfoo.png
diff --git a/src/canonical/dex/front-shiny/0620--000--Mienshao.png b/src/canonical/dex/front-shiny/0620-000-Mienshao.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0620--000--Mienshao.png
rename to src/canonical/dex/front-shiny/0620-000-Mienshao.png
diff --git a/src/canonical/dex/front-shiny/0621--000--Druddigon.png b/src/canonical/dex/front-shiny/0621-000-Druddigon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0621--000--Druddigon.png
rename to src/canonical/dex/front-shiny/0621-000-Druddigon.png
diff --git a/src/canonical/dex/front-shiny/0622--000--Golett.png b/src/canonical/dex/front-shiny/0622-000-Golett.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0622--000--Golett.png
rename to src/canonical/dex/front-shiny/0622-000-Golett.png
diff --git a/src/canonical/dex/front-shiny/0623--000--Golurk.png b/src/canonical/dex/front-shiny/0623-000-Golurk.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0623--000--Golurk.png
rename to src/canonical/dex/front-shiny/0623-000-Golurk.png
diff --git a/src/canonical/dex/front-shiny/0624--000--Pawniard.png b/src/canonical/dex/front-shiny/0624-000-Pawniard.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0624--000--Pawniard.png
rename to src/canonical/dex/front-shiny/0624-000-Pawniard.png
diff --git a/src/canonical/dex/front-shiny/0625--000--Bisharp.png b/src/canonical/dex/front-shiny/0625-000-Bisharp.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0625--000--Bisharp.png
rename to src/canonical/dex/front-shiny/0625-000-Bisharp.png
diff --git a/src/canonical/dex/front-shiny/0626--000--Bouffalant.png b/src/canonical/dex/front-shiny/0626-000-Bouffalant.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0626--000--Bouffalant.png
rename to src/canonical/dex/front-shiny/0626-000-Bouffalant.png
diff --git a/src/canonical/dex/front-shiny/0627--000--Rufflet.png b/src/canonical/dex/front-shiny/0627-000-Rufflet.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0627--000--Rufflet.png
rename to src/canonical/dex/front-shiny/0627-000-Rufflet.png
diff --git a/src/canonical/dex/front-shiny/0628--000--Braviary.png b/src/canonical/dex/front-shiny/0628-000-Braviary.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0628--000--Braviary.png
rename to src/canonical/dex/front-shiny/0628-000-Braviary.png
diff --git a/src/canonical/dex/front-shiny/0629--000--Vullaby.png b/src/canonical/dex/front-shiny/0629-000-Vullaby.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0629--000--Vullaby.png
rename to src/canonical/dex/front-shiny/0629-000-Vullaby.png
diff --git a/src/canonical/dex/front-shiny/0630--000--Mandibuzz.png b/src/canonical/dex/front-shiny/0630-000-Mandibuzz.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0630--000--Mandibuzz.png
rename to src/canonical/dex/front-shiny/0630-000-Mandibuzz.png
diff --git a/src/canonical/dex/front-shiny/0631--000--Heatmor.png b/src/canonical/dex/front-shiny/0631-000-Heatmor.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0631--000--Heatmor.png
rename to src/canonical/dex/front-shiny/0631-000-Heatmor.png
diff --git a/src/canonical/dex/front-shiny/0632--000--Durant.png b/src/canonical/dex/front-shiny/0632-000-Durant.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0632--000--Durant.png
rename to src/canonical/dex/front-shiny/0632-000-Durant.png
diff --git a/src/canonical/dex/front-shiny/0633--000--Deino.png b/src/canonical/dex/front-shiny/0633-000-Deino.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0633--000--Deino.png
rename to src/canonical/dex/front-shiny/0633-000-Deino.png
diff --git a/src/canonical/dex/front-shiny/0634--000--Zweilous.png b/src/canonical/dex/front-shiny/0634-000-Zweilous.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0634--000--Zweilous.png
rename to src/canonical/dex/front-shiny/0634-000-Zweilous.png
diff --git a/src/canonical/dex/front-shiny/0635--000--Hydreigon.png b/src/canonical/dex/front-shiny/0635-000-Hydreigon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0635--000--Hydreigon.png
rename to src/canonical/dex/front-shiny/0635-000-Hydreigon.png
diff --git a/src/canonical/dex/front-shiny/0636--000--Larvesta.png b/src/canonical/dex/front-shiny/0636-000-Larvesta.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0636--000--Larvesta.png
rename to src/canonical/dex/front-shiny/0636-000-Larvesta.png
diff --git a/src/canonical/dex/front-shiny/0637--000--Volcarona.png b/src/canonical/dex/front-shiny/0637-000-Volcarona.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0637--000--Volcarona.png
rename to src/canonical/dex/front-shiny/0637-000-Volcarona.png
diff --git a/src/canonical/dex/front-shiny/0638--000--Cobalion.png b/src/canonical/dex/front-shiny/0638-000-Cobalion.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0638--000--Cobalion.png
rename to src/canonical/dex/front-shiny/0638-000-Cobalion.png
diff --git a/src/canonical/dex/front-shiny/0639--000--Terrakion.png b/src/canonical/dex/front-shiny/0639-000-Terrakion.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0639--000--Terrakion.png
rename to src/canonical/dex/front-shiny/0639-000-Terrakion.png
diff --git a/src/canonical/dex/front-shiny/0640--000--Virizion.png b/src/canonical/dex/front-shiny/0640-000-Virizion.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0640--000--Virizion.png
rename to src/canonical/dex/front-shiny/0640-000-Virizion.png
diff --git a/src/canonical/dex/front-shiny/0641--000--Tornadus.png b/src/canonical/dex/front-shiny/0641-000-Tornadus.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0641--000--Tornadus.png
rename to src/canonical/dex/front-shiny/0641-000-Tornadus.png
diff --git a/src/canonical/dex/front-shiny/0641--420--Tornadus--Therian.png b/src/canonical/dex/front-shiny/0641-420-Tornadus-Therian.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0641--420--Tornadus--Therian.png
rename to src/canonical/dex/front-shiny/0641-420-Tornadus-Therian.png
diff --git a/src/canonical/dex/front-shiny/0642--000--Thundurus.png b/src/canonical/dex/front-shiny/0642-000-Thundurus.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0642--000--Thundurus.png
rename to src/canonical/dex/front-shiny/0642-000-Thundurus.png
diff --git a/src/canonical/dex/front-shiny/0642--420--Thundurus--Therian.png b/src/canonical/dex/front-shiny/0642-420-Thundurus-Therian.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0642--420--Thundurus--Therian.png
rename to src/canonical/dex/front-shiny/0642-420-Thundurus-Therian.png
diff --git a/src/canonical/dex/front-shiny/0643--000--Reshiram.png b/src/canonical/dex/front-shiny/0643-000-Reshiram.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0643--000--Reshiram.png
rename to src/canonical/dex/front-shiny/0643-000-Reshiram.png
diff --git a/src/canonical/dex/front-shiny/0644--000--Zekrom.png b/src/canonical/dex/front-shiny/0644-000-Zekrom.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0644--000--Zekrom.png
rename to src/canonical/dex/front-shiny/0644-000-Zekrom.png
diff --git a/src/canonical/dex/front-shiny/0645--000--Landorus.png b/src/canonical/dex/front-shiny/0645-000-Landorus.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0645--000--Landorus.png
rename to src/canonical/dex/front-shiny/0645-000-Landorus.png
diff --git a/src/canonical/dex/front-shiny/0645--420--Landorus--Therian.png b/src/canonical/dex/front-shiny/0645-420-Landorus-Therian.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0645--420--Landorus--Therian.png
rename to src/canonical/dex/front-shiny/0645-420-Landorus-Therian.png
diff --git a/src/canonical/dex/front-shiny/0646--000--Kyurem.png b/src/canonical/dex/front-shiny/0646-000-Kyurem.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0646--000--Kyurem.png
rename to src/canonical/dex/front-shiny/0646-000-Kyurem.png
diff --git a/src/canonical/dex/front-shiny/0646--420--Kyurem--Black.png b/src/canonical/dex/front-shiny/0646-420-Kyurem-Black.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0646--420--Kyurem--Black.png
rename to src/canonical/dex/front-shiny/0646-420-Kyurem-Black.png
diff --git a/src/canonical/dex/front-shiny/0646--420--Kyurem--White.png b/src/canonical/dex/front-shiny/0646-420-Kyurem-White.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0646--420--Kyurem--White.png
rename to src/canonical/dex/front-shiny/0646-420-Kyurem-White.png
diff --git a/src/canonical/dex/front-shiny/0647--000--Keldeo.png b/src/canonical/dex/front-shiny/0647-000-Keldeo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0647--000--Keldeo.png
rename to src/canonical/dex/front-shiny/0647-000-Keldeo.png
diff --git a/src/canonical/dex/front-shiny/0647--420--Keldeo--Resolute.png b/src/canonical/dex/front-shiny/0647-420-Keldeo-Resolute.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0647--420--Keldeo--Resolute.png
rename to src/canonical/dex/front-shiny/0647-420-Keldeo-Resolute.png
diff --git a/src/canonical/dex/front-shiny/0648--000--Meloetta.png b/src/canonical/dex/front-shiny/0648-000-Meloetta.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0648--000--Meloetta.png
rename to src/canonical/dex/front-shiny/0648-000-Meloetta.png
diff --git a/src/canonical/dex/front-shiny/0648--420--Meloetta--Pirouette.png b/src/canonical/dex/front-shiny/0648-420-Meloetta-Pirouette.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0648--420--Meloetta--Pirouette.png
rename to src/canonical/dex/front-shiny/0648-420-Meloetta-Pirouette.png
diff --git a/src/canonical/dex/front-shiny/0649--000--Genesect.png b/src/canonical/dex/front-shiny/0649-000-Genesect.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0649--000--Genesect.png
rename to src/canonical/dex/front-shiny/0649-000-Genesect.png
diff --git a/src/canonical/dex/front-shiny/0649--420--Genesect--Burn.png b/src/canonical/dex/front-shiny/0649-420-Genesect-Burn.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0649--420--Genesect--Burn.png
rename to src/canonical/dex/front-shiny/0649-420-Genesect-Burn.png
diff --git a/src/canonical/dex/front-shiny/0649--420--Genesect--Chill.png b/src/canonical/dex/front-shiny/0649-420-Genesect-Chill.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0649--420--Genesect--Chill.png
rename to src/canonical/dex/front-shiny/0649-420-Genesect-Chill.png
diff --git a/src/canonical/dex/front-shiny/0649--420--Genesect--Douse.png b/src/canonical/dex/front-shiny/0649-420-Genesect-Douse.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0649--420--Genesect--Douse.png
rename to src/canonical/dex/front-shiny/0649-420-Genesect-Douse.png
diff --git a/src/canonical/dex/front-shiny/0649--420--Genesect--Shock.png b/src/canonical/dex/front-shiny/0649-420-Genesect-Shock.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0649--420--Genesect--Shock.png
rename to src/canonical/dex/front-shiny/0649-420-Genesect-Shock.png
diff --git a/src/canonical/dex/front-shiny/0650--000--Chespin.png b/src/canonical/dex/front-shiny/0650-000-Chespin.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0650--000--Chespin.png
rename to src/canonical/dex/front-shiny/0650-000-Chespin.png
diff --git a/src/canonical/dex/front-shiny/0651--000--Quilladin.png b/src/canonical/dex/front-shiny/0651-000-Quilladin.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0651--000--Quilladin.png
rename to src/canonical/dex/front-shiny/0651-000-Quilladin.png
diff --git a/src/canonical/dex/front-shiny/0652--000--Chesnaught.png b/src/canonical/dex/front-shiny/0652-000-Chesnaught.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0652--000--Chesnaught.png
rename to src/canonical/dex/front-shiny/0652-000-Chesnaught.png
diff --git a/src/canonical/dex/front-shiny/0653--000--Fennekin.png b/src/canonical/dex/front-shiny/0653-000-Fennekin.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0653--000--Fennekin.png
rename to src/canonical/dex/front-shiny/0653-000-Fennekin.png
diff --git a/src/canonical/dex/front-shiny/0654--000--Braixen.png b/src/canonical/dex/front-shiny/0654-000-Braixen.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0654--000--Braixen.png
rename to src/canonical/dex/front-shiny/0654-000-Braixen.png
diff --git a/src/canonical/dex/front-shiny/0655--000--Delphox.png b/src/canonical/dex/front-shiny/0655-000-Delphox.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0655--000--Delphox.png
rename to src/canonical/dex/front-shiny/0655-000-Delphox.png
diff --git a/src/canonical/dex/front-shiny/0656--000--Froakie.png b/src/canonical/dex/front-shiny/0656-000-Froakie.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0656--000--Froakie.png
rename to src/canonical/dex/front-shiny/0656-000-Froakie.png
diff --git a/src/canonical/dex/front-shiny/0657--000--Frogadier.png b/src/canonical/dex/front-shiny/0657-000-Frogadier.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0657--000--Frogadier.png
rename to src/canonical/dex/front-shiny/0657-000-Frogadier.png
diff --git a/src/canonical/dex/front-shiny/0658--000--Greninja.png b/src/canonical/dex/front-shiny/0658-000-Greninja.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0658--000--Greninja.png
rename to src/canonical/dex/front-shiny/0658-000-Greninja.png
diff --git a/src/canonical/dex/front-shiny/0658--420--Greninja--Ash.png b/src/canonical/dex/front-shiny/0658-420-Greninja-Ash.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0658--420--Greninja--Ash.png
rename to src/canonical/dex/front-shiny/0658-420-Greninja-Ash.png
diff --git a/src/canonical/dex/front-shiny/0659--000--Bunnelby.png b/src/canonical/dex/front-shiny/0659-000-Bunnelby.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0659--000--Bunnelby.png
rename to src/canonical/dex/front-shiny/0659-000-Bunnelby.png
diff --git a/src/canonical/dex/front-shiny/0660--000--Diggersby.png b/src/canonical/dex/front-shiny/0660-000-Diggersby.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0660--000--Diggersby.png
rename to src/canonical/dex/front-shiny/0660-000-Diggersby.png
diff --git a/src/canonical/dex/front-shiny/0661--000--Fletchling.png b/src/canonical/dex/front-shiny/0661-000-Fletchling.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0661--000--Fletchling.png
rename to src/canonical/dex/front-shiny/0661-000-Fletchling.png
diff --git a/src/canonical/dex/front-shiny/0662--000--Fletchinder.png b/src/canonical/dex/front-shiny/0662-000-Fletchinder.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0662--000--Fletchinder.png
rename to src/canonical/dex/front-shiny/0662-000-Fletchinder.png
diff --git a/src/canonical/dex/front-shiny/0663--000--Talonflame.png b/src/canonical/dex/front-shiny/0663-000-Talonflame.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0663--000--Talonflame.png
rename to src/canonical/dex/front-shiny/0663-000-Talonflame.png
diff --git a/src/canonical/dex/front-shiny/0664--000--Scatterbug.png b/src/canonical/dex/front-shiny/0664-000-Scatterbug.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0664--000--Scatterbug.png
rename to src/canonical/dex/front-shiny/0664-000-Scatterbug.png
diff --git a/src/canonical/dex/front-shiny/0665--000--Spewpa.png b/src/canonical/dex/front-shiny/0665-000-Spewpa.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0665--000--Spewpa.png
rename to src/canonical/dex/front-shiny/0665-000-Spewpa.png
diff --git a/src/canonical/dex/front-shiny/0666--000--Vivillon.png b/src/canonical/dex/front-shiny/0666-000-Vivillon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0666--000--Vivillon.png
rename to src/canonical/dex/front-shiny/0666-000-Vivillon.png
diff --git a/src/canonical/dex/front-shiny/0666--420--Vivillon--Fancy.png b/src/canonical/dex/front-shiny/0666-420-Vivillon-Fancy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0666--420--Vivillon--Fancy.png
rename to src/canonical/dex/front-shiny/0666-420-Vivillon-Fancy.png
diff --git a/src/canonical/dex/front-shiny/0666--420--Vivillon--Pokeball.png b/src/canonical/dex/front-shiny/0666-420-Vivillon-Pokeball.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0666--420--Vivillon--Pokeball.png
rename to src/canonical/dex/front-shiny/0666-420-Vivillon-Pokeball.png
diff --git a/src/canonical/dex/front-shiny/0667--000--Litleo.png b/src/canonical/dex/front-shiny/0667-000-Litleo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0667--000--Litleo.png
rename to src/canonical/dex/front-shiny/0667-000-Litleo.png
diff --git a/src/canonical/dex/front-shiny/0668--000--Pyroar.png b/src/canonical/dex/front-shiny/0668-000-Pyroar.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0668--000--Pyroar.png
rename to src/canonical/dex/front-shiny/0668-000-Pyroar.png
diff --git a/src/canonical/dex/front-shiny/0669--000--Flabe__0301be__0301.png b/src/canonical/dex/front-shiny/0669-000-Flabe__0301be__0301.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0669--000--Flabe__0301be__0301.png
rename to src/canonical/dex/front-shiny/0669-000-Flabe__0301be__0301.png
diff --git a/src/canonical/dex/front-shiny/0670--000--Floette.png b/src/canonical/dex/front-shiny/0670-000-Floette.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0670--000--Floette.png
rename to src/canonical/dex/front-shiny/0670-000-Floette.png
diff --git a/src/canonical/dex/front-shiny/0670--420--Floette--Eternal.png b/src/canonical/dex/front-shiny/0670-420-Floette-Eternal.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0670--420--Floette--Eternal.png
rename to src/canonical/dex/front-shiny/0670-420-Floette-Eternal.png
diff --git a/src/canonical/dex/front-shiny/0671--000--Florges.png b/src/canonical/dex/front-shiny/0671-000-Florges.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0671--000--Florges.png
rename to src/canonical/dex/front-shiny/0671-000-Florges.png
diff --git a/src/canonical/dex/front-shiny/0672--000--Skiddo.png b/src/canonical/dex/front-shiny/0672-000-Skiddo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0672--000--Skiddo.png
rename to src/canonical/dex/front-shiny/0672-000-Skiddo.png
diff --git a/src/canonical/dex/front-shiny/0673--000--Gogoat.png b/src/canonical/dex/front-shiny/0673-000-Gogoat.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0673--000--Gogoat.png
rename to src/canonical/dex/front-shiny/0673-000-Gogoat.png
diff --git a/src/canonical/dex/front-shiny/0674--000--Pancham.png b/src/canonical/dex/front-shiny/0674-000-Pancham.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0674--000--Pancham.png
rename to src/canonical/dex/front-shiny/0674-000-Pancham.png
diff --git a/src/canonical/dex/front-shiny/0675--000--Pangoro.png b/src/canonical/dex/front-shiny/0675-000-Pangoro.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0675--000--Pangoro.png
rename to src/canonical/dex/front-shiny/0675-000-Pangoro.png
diff --git a/src/canonical/dex/front-shiny/0676--000--Furfrou.png b/src/canonical/dex/front-shiny/0676-000-Furfrou.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0676--000--Furfrou.png
rename to src/canonical/dex/front-shiny/0676-000-Furfrou.png
diff --git a/src/canonical/dex/front-shiny/0677--000--Espurr.png b/src/canonical/dex/front-shiny/0677-000-Espurr.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0677--000--Espurr.png
rename to src/canonical/dex/front-shiny/0677-000-Espurr.png
diff --git a/src/canonical/dex/front-shiny/0678--000--Meowstic.png b/src/canonical/dex/front-shiny/0678-000-Meowstic.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0678--000--Meowstic.png
rename to src/canonical/dex/front-shiny/0678-000-Meowstic.png
diff --git a/src/canonical/dex/front-shiny/0678--420--Meowstic--F.png b/src/canonical/dex/front-shiny/0678-420-Meowstic-F.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0678--420--Meowstic--F.png
rename to src/canonical/dex/front-shiny/0678-420-Meowstic-F.png
diff --git a/src/canonical/dex/front-shiny/0679--000--Honedge.png b/src/canonical/dex/front-shiny/0679-000-Honedge.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0679--000--Honedge.png
rename to src/canonical/dex/front-shiny/0679-000-Honedge.png
diff --git a/src/canonical/dex/front-shiny/0680--000--Doublade.png b/src/canonical/dex/front-shiny/0680-000-Doublade.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0680--000--Doublade.png
rename to src/canonical/dex/front-shiny/0680-000-Doublade.png
diff --git a/src/canonical/dex/front-shiny/0681--000--Aegislash.png b/src/canonical/dex/front-shiny/0681-000-Aegislash.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0681--000--Aegislash.png
rename to src/canonical/dex/front-shiny/0681-000-Aegislash.png
diff --git a/src/canonical/dex/front-shiny/0681--420--Aegislash--Blade.png b/src/canonical/dex/front-shiny/0681-420-Aegislash-Blade.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0681--420--Aegislash--Blade.png
rename to src/canonical/dex/front-shiny/0681-420-Aegislash-Blade.png
diff --git a/src/canonical/dex/front-shiny/0682--000--Spritzee.png b/src/canonical/dex/front-shiny/0682-000-Spritzee.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0682--000--Spritzee.png
rename to src/canonical/dex/front-shiny/0682-000-Spritzee.png
diff --git a/src/canonical/dex/front-shiny/0683--000--Aromatisse.png b/src/canonical/dex/front-shiny/0683-000-Aromatisse.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0683--000--Aromatisse.png
rename to src/canonical/dex/front-shiny/0683-000-Aromatisse.png
diff --git a/src/canonical/dex/front-shiny/0684--000--Swirlix.png b/src/canonical/dex/front-shiny/0684-000-Swirlix.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0684--000--Swirlix.png
rename to src/canonical/dex/front-shiny/0684-000-Swirlix.png
diff --git a/src/canonical/dex/front-shiny/0685--000--Slurpuff.png b/src/canonical/dex/front-shiny/0685-000-Slurpuff.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0685--000--Slurpuff.png
rename to src/canonical/dex/front-shiny/0685-000-Slurpuff.png
diff --git a/src/canonical/dex/front-shiny/0686--000--Inkay.png b/src/canonical/dex/front-shiny/0686-000-Inkay.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0686--000--Inkay.png
rename to src/canonical/dex/front-shiny/0686-000-Inkay.png
diff --git a/src/canonical/dex/front-shiny/0687--000--Malamar.png b/src/canonical/dex/front-shiny/0687-000-Malamar.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0687--000--Malamar.png
rename to src/canonical/dex/front-shiny/0687-000-Malamar.png
diff --git a/src/canonical/dex/front-shiny/0688--000--Binacle.png b/src/canonical/dex/front-shiny/0688-000-Binacle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0688--000--Binacle.png
rename to src/canonical/dex/front-shiny/0688-000-Binacle.png
diff --git a/src/canonical/dex/front-shiny/0689--000--Barbaracle.png b/src/canonical/dex/front-shiny/0689-000-Barbaracle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0689--000--Barbaracle.png
rename to src/canonical/dex/front-shiny/0689-000-Barbaracle.png
diff --git a/src/canonical/dex/front-shiny/0690--000--Skrelp.png b/src/canonical/dex/front-shiny/0690-000-Skrelp.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0690--000--Skrelp.png
rename to src/canonical/dex/front-shiny/0690-000-Skrelp.png
diff --git a/src/canonical/dex/front-shiny/0691--000--Dragalge.png b/src/canonical/dex/front-shiny/0691-000-Dragalge.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0691--000--Dragalge.png
rename to src/canonical/dex/front-shiny/0691-000-Dragalge.png
diff --git a/src/canonical/dex/front-shiny/0692--000--Clauncher.png b/src/canonical/dex/front-shiny/0692-000-Clauncher.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0692--000--Clauncher.png
rename to src/canonical/dex/front-shiny/0692-000-Clauncher.png
diff --git a/src/canonical/dex/front-shiny/0693--000--Clawitzer.png b/src/canonical/dex/front-shiny/0693-000-Clawitzer.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0693--000--Clawitzer.png
rename to src/canonical/dex/front-shiny/0693-000-Clawitzer.png
diff --git a/src/canonical/dex/front-shiny/0694--000--Helioptile.png b/src/canonical/dex/front-shiny/0694-000-Helioptile.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0694--000--Helioptile.png
rename to src/canonical/dex/front-shiny/0694-000-Helioptile.png
diff --git a/src/canonical/dex/front-shiny/0695--000--Heliolisk.png b/src/canonical/dex/front-shiny/0695-000-Heliolisk.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0695--000--Heliolisk.png
rename to src/canonical/dex/front-shiny/0695-000-Heliolisk.png
diff --git a/src/canonical/dex/front-shiny/0696--000--Tyrunt.png b/src/canonical/dex/front-shiny/0696-000-Tyrunt.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0696--000--Tyrunt.png
rename to src/canonical/dex/front-shiny/0696-000-Tyrunt.png
diff --git a/src/canonical/dex/front-shiny/0697--000--Tyrantrum.png b/src/canonical/dex/front-shiny/0697-000-Tyrantrum.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0697--000--Tyrantrum.png
rename to src/canonical/dex/front-shiny/0697-000-Tyrantrum.png
diff --git a/src/canonical/dex/front-shiny/0698--000--Amaura.png b/src/canonical/dex/front-shiny/0698-000-Amaura.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0698--000--Amaura.png
rename to src/canonical/dex/front-shiny/0698-000-Amaura.png
diff --git a/src/canonical/dex/front-shiny/0699--000--Aurorus.png b/src/canonical/dex/front-shiny/0699-000-Aurorus.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0699--000--Aurorus.png
rename to src/canonical/dex/front-shiny/0699-000-Aurorus.png
diff --git a/src/canonical/dex/front-shiny/0700--000--Sylveon.png b/src/canonical/dex/front-shiny/0700-000-Sylveon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0700--000--Sylveon.png
rename to src/canonical/dex/front-shiny/0700-000-Sylveon.png
diff --git a/src/canonical/dex/front-shiny/0701--000--Hawlucha.png b/src/canonical/dex/front-shiny/0701-000-Hawlucha.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0701--000--Hawlucha.png
rename to src/canonical/dex/front-shiny/0701-000-Hawlucha.png
diff --git a/src/canonical/dex/front-shiny/0702--000--Dedenne.png b/src/canonical/dex/front-shiny/0702-000-Dedenne.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0702--000--Dedenne.png
rename to src/canonical/dex/front-shiny/0702-000-Dedenne.png
diff --git a/src/canonical/dex/front-shiny/0703--000--Carbink.png b/src/canonical/dex/front-shiny/0703-000-Carbink.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0703--000--Carbink.png
rename to src/canonical/dex/front-shiny/0703-000-Carbink.png
diff --git a/src/canonical/dex/front-shiny/0704--000--Goomy.png b/src/canonical/dex/front-shiny/0704-000-Goomy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0704--000--Goomy.png
rename to src/canonical/dex/front-shiny/0704-000-Goomy.png
diff --git a/src/canonical/dex/front-shiny/0705--000--Sliggoo.png b/src/canonical/dex/front-shiny/0705-000-Sliggoo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0705--000--Sliggoo.png
rename to src/canonical/dex/front-shiny/0705-000-Sliggoo.png
diff --git a/src/canonical/dex/front-shiny/0706--000--Goodra.png b/src/canonical/dex/front-shiny/0706-000-Goodra.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0706--000--Goodra.png
rename to src/canonical/dex/front-shiny/0706-000-Goodra.png
diff --git a/src/canonical/dex/front-shiny/0707--000--Klefki.png b/src/canonical/dex/front-shiny/0707-000-Klefki.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0707--000--Klefki.png
rename to src/canonical/dex/front-shiny/0707-000-Klefki.png
diff --git a/src/canonical/dex/front-shiny/0708--000--Phantump.png b/src/canonical/dex/front-shiny/0708-000-Phantump.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0708--000--Phantump.png
rename to src/canonical/dex/front-shiny/0708-000-Phantump.png
diff --git a/src/canonical/dex/front-shiny/0709--000--Trevenant.png b/src/canonical/dex/front-shiny/0709-000-Trevenant.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0709--000--Trevenant.png
rename to src/canonical/dex/front-shiny/0709-000-Trevenant.png
diff --git a/src/canonical/dex/front-shiny/0710--000--Pumpkaboo.png b/src/canonical/dex/front-shiny/0710-000-Pumpkaboo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0710--000--Pumpkaboo.png
rename to src/canonical/dex/front-shiny/0710-000-Pumpkaboo.png
diff --git a/src/canonical/dex/front-shiny/0710--420--Pumpkaboo--Large.png b/src/canonical/dex/front-shiny/0710-420-Pumpkaboo-Large.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0710--420--Pumpkaboo--Large.png
rename to src/canonical/dex/front-shiny/0710-420-Pumpkaboo-Large.png
diff --git a/src/canonical/dex/front-shiny/0710--420--Pumpkaboo--Small.png b/src/canonical/dex/front-shiny/0710-420-Pumpkaboo-Small.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0710--420--Pumpkaboo--Small.png
rename to src/canonical/dex/front-shiny/0710-420-Pumpkaboo-Small.png
diff --git a/src/canonical/dex/front-shiny/0710--420--Pumpkaboo--Super.png b/src/canonical/dex/front-shiny/0710-420-Pumpkaboo-Super.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0710--420--Pumpkaboo--Super.png
rename to src/canonical/dex/front-shiny/0710-420-Pumpkaboo-Super.png
diff --git a/src/canonical/dex/front-shiny/0711--000--Gourgeist.png b/src/canonical/dex/front-shiny/0711-000-Gourgeist.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0711--000--Gourgeist.png
rename to src/canonical/dex/front-shiny/0711-000-Gourgeist.png
diff --git a/src/canonical/dex/front-shiny/0711--420--Gourgeist--Large.png b/src/canonical/dex/front-shiny/0711-420-Gourgeist-Large.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0711--420--Gourgeist--Large.png
rename to src/canonical/dex/front-shiny/0711-420-Gourgeist-Large.png
diff --git a/src/canonical/dex/front-shiny/0711--420--Gourgeist--Small.png b/src/canonical/dex/front-shiny/0711-420-Gourgeist-Small.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0711--420--Gourgeist--Small.png
rename to src/canonical/dex/front-shiny/0711-420-Gourgeist-Small.png
diff --git a/src/canonical/dex/front-shiny/0711--420--Gourgeist--Super.png b/src/canonical/dex/front-shiny/0711-420-Gourgeist-Super.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0711--420--Gourgeist--Super.png
rename to src/canonical/dex/front-shiny/0711-420-Gourgeist-Super.png
diff --git a/src/canonical/dex/front-shiny/0712--000--Bergmite.png b/src/canonical/dex/front-shiny/0712-000-Bergmite.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0712--000--Bergmite.png
rename to src/canonical/dex/front-shiny/0712-000-Bergmite.png
diff --git a/src/canonical/dex/front-shiny/0713--000--Avalugg.png b/src/canonical/dex/front-shiny/0713-000-Avalugg.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0713--000--Avalugg.png
rename to src/canonical/dex/front-shiny/0713-000-Avalugg.png
diff --git a/src/canonical/dex/front-shiny/0714--000--Noibat.png b/src/canonical/dex/front-shiny/0714-000-Noibat.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0714--000--Noibat.png
rename to src/canonical/dex/front-shiny/0714-000-Noibat.png
diff --git a/src/canonical/dex/front-shiny/0715--000--Noivern.png b/src/canonical/dex/front-shiny/0715-000-Noivern.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0715--000--Noivern.png
rename to src/canonical/dex/front-shiny/0715-000-Noivern.png
diff --git a/src/canonical/dex/front-shiny/0716--000--Xerneas.png b/src/canonical/dex/front-shiny/0716-000-Xerneas.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0716--000--Xerneas.png
rename to src/canonical/dex/front-shiny/0716-000-Xerneas.png
diff --git a/src/canonical/dex/front-shiny/0717--000--Yveltal.png b/src/canonical/dex/front-shiny/0717-000-Yveltal.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0717--000--Yveltal.png
rename to src/canonical/dex/front-shiny/0717-000-Yveltal.png
diff --git a/src/canonical/dex/front-shiny/0718--000--Zygarde.png b/src/canonical/dex/front-shiny/0718-000-Zygarde.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0718--000--Zygarde.png
rename to src/canonical/dex/front-shiny/0718-000-Zygarde.png
diff --git a/src/canonical/dex/front-shiny/0718--420--Zygarde--10__0025.png b/src/canonical/dex/front-shiny/0718-420-Zygarde-10__0025.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0718--420--Zygarde--10__0025.png
rename to src/canonical/dex/front-shiny/0718-420-Zygarde-10__0025.png
diff --git a/src/canonical/dex/front-shiny/0718--420--Zygarde--Complete.png b/src/canonical/dex/front-shiny/0718-420-Zygarde-Complete.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0718--420--Zygarde--Complete.png
rename to src/canonical/dex/front-shiny/0718-420-Zygarde-Complete.png
diff --git a/src/canonical/dex/front-shiny/0719--000--Diancie.png b/src/canonical/dex/front-shiny/0719-000-Diancie.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0719--000--Diancie.png
rename to src/canonical/dex/front-shiny/0719-000-Diancie.png
diff --git a/src/canonical/dex/front-shiny/0719--420--Diancie--Mega.png b/src/canonical/dex/front-shiny/0719-420-Diancie-Mega.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0719--420--Diancie--Mega.png
rename to src/canonical/dex/front-shiny/0719-420-Diancie-Mega.png
diff --git a/src/canonical/dex/front-shiny/0720--000--Hoopa.png b/src/canonical/dex/front-shiny/0720-000-Hoopa.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0720--000--Hoopa.png
rename to src/canonical/dex/front-shiny/0720-000-Hoopa.png
diff --git a/src/canonical/dex/front-shiny/0720--420--Hoopa--Unbound.png b/src/canonical/dex/front-shiny/0720-420-Hoopa-Unbound.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0720--420--Hoopa--Unbound.png
rename to src/canonical/dex/front-shiny/0720-420-Hoopa-Unbound.png
diff --git a/src/canonical/dex/front-shiny/0721--000--Volcanion.png b/src/canonical/dex/front-shiny/0721-000-Volcanion.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0721--000--Volcanion.png
rename to src/canonical/dex/front-shiny/0721-000-Volcanion.png
diff --git a/src/canonical/dex/front-shiny/0722--000--Rowlet.png b/src/canonical/dex/front-shiny/0722-000-Rowlet.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0722--000--Rowlet.png
rename to src/canonical/dex/front-shiny/0722-000-Rowlet.png
diff --git a/src/canonical/dex/front-shiny/0723--000--Dartrix.png b/src/canonical/dex/front-shiny/0723-000-Dartrix.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0723--000--Dartrix.png
rename to src/canonical/dex/front-shiny/0723-000-Dartrix.png
diff --git a/src/canonical/dex/front-shiny/0724--000--Decidueye.png b/src/canonical/dex/front-shiny/0724-000-Decidueye.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0724--000--Decidueye.png
rename to src/canonical/dex/front-shiny/0724-000-Decidueye.png
diff --git a/src/canonical/dex/front-shiny/0725--000--Litten.png b/src/canonical/dex/front-shiny/0725-000-Litten.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0725--000--Litten.png
rename to src/canonical/dex/front-shiny/0725-000-Litten.png
diff --git a/src/canonical/dex/front-shiny/0726--000--Torracat.png b/src/canonical/dex/front-shiny/0726-000-Torracat.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0726--000--Torracat.png
rename to src/canonical/dex/front-shiny/0726-000-Torracat.png
diff --git a/src/canonical/dex/front-shiny/0727--000--Incineroar.png b/src/canonical/dex/front-shiny/0727-000-Incineroar.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0727--000--Incineroar.png
rename to src/canonical/dex/front-shiny/0727-000-Incineroar.png
diff --git a/src/canonical/dex/front-shiny/0729--000--Brionne.png b/src/canonical/dex/front-shiny/0729-000-Brionne.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0729--000--Brionne.png
rename to src/canonical/dex/front-shiny/0729-000-Brionne.png
diff --git a/src/canonical/dex/front-shiny/0730--000--Primarina.png b/src/canonical/dex/front-shiny/0730-000-Primarina.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0730--000--Primarina.png
rename to src/canonical/dex/front-shiny/0730-000-Primarina.png
diff --git a/src/canonical/dex/front-shiny/0731--000--Pikipek.png b/src/canonical/dex/front-shiny/0731-000-Pikipek.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0731--000--Pikipek.png
rename to src/canonical/dex/front-shiny/0731-000-Pikipek.png
diff --git a/src/canonical/dex/front-shiny/0732--000--Trumbeak.png b/src/canonical/dex/front-shiny/0732-000-Trumbeak.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0732--000--Trumbeak.png
rename to src/canonical/dex/front-shiny/0732-000-Trumbeak.png
diff --git a/src/canonical/dex/front-shiny/0733--000--Toucannon.png b/src/canonical/dex/front-shiny/0733-000-Toucannon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0733--000--Toucannon.png
rename to src/canonical/dex/front-shiny/0733-000-Toucannon.png
diff --git a/src/canonical/dex/front-shiny/0734--000--Yungoos.png b/src/canonical/dex/front-shiny/0734-000-Yungoos.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0734--000--Yungoos.png
rename to src/canonical/dex/front-shiny/0734-000-Yungoos.png
diff --git a/src/canonical/dex/front-shiny/0735--000--Gumshoos.png b/src/canonical/dex/front-shiny/0735-000-Gumshoos.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0735--000--Gumshoos.png
rename to src/canonical/dex/front-shiny/0735-000-Gumshoos.png
diff --git a/src/canonical/dex/front-shiny/0735--420--Gumshoos--Totem.png b/src/canonical/dex/front-shiny/0735-420-Gumshoos-Totem.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0735--420--Gumshoos--Totem.png
rename to src/canonical/dex/front-shiny/0735-420-Gumshoos-Totem.png
diff --git a/src/canonical/dex/front-shiny/0736--000--Grubbin.png b/src/canonical/dex/front-shiny/0736-000-Grubbin.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0736--000--Grubbin.png
rename to src/canonical/dex/front-shiny/0736-000-Grubbin.png
diff --git a/src/canonical/dex/front-shiny/0737--000--Charjabug.png b/src/canonical/dex/front-shiny/0737-000-Charjabug.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0737--000--Charjabug.png
rename to src/canonical/dex/front-shiny/0737-000-Charjabug.png
diff --git a/src/canonical/dex/front-shiny/0738--000--Vikavolt.png b/src/canonical/dex/front-shiny/0738-000-Vikavolt.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0738--000--Vikavolt.png
rename to src/canonical/dex/front-shiny/0738-000-Vikavolt.png
diff --git a/src/canonical/dex/front-shiny/0738--420--Vikavolt--Totem.png b/src/canonical/dex/front-shiny/0738-420-Vikavolt-Totem.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0738--420--Vikavolt--Totem.png
rename to src/canonical/dex/front-shiny/0738-420-Vikavolt-Totem.png
diff --git a/src/canonical/dex/front-shiny/0739--000--Crabrawler.png b/src/canonical/dex/front-shiny/0739-000-Crabrawler.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0739--000--Crabrawler.png
rename to src/canonical/dex/front-shiny/0739-000-Crabrawler.png
diff --git a/src/canonical/dex/front-shiny/0740--000--Crabominable.png b/src/canonical/dex/front-shiny/0740-000-Crabominable.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0740--000--Crabominable.png
rename to src/canonical/dex/front-shiny/0740-000-Crabominable.png
diff --git a/src/canonical/dex/front-shiny/0741--000--Oricorio.png b/src/canonical/dex/front-shiny/0741-000-Oricorio.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0741--000--Oricorio.png
rename to src/canonical/dex/front-shiny/0741-000-Oricorio.png
diff --git a/src/canonical/dex/front-shiny/0741--420--Oricorio--Pa__0027u.png b/src/canonical/dex/front-shiny/0741-420-Oricorio-Pa__0027u.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0741--420--Oricorio--Pa__0027u.png
rename to src/canonical/dex/front-shiny/0741-420-Oricorio-Pa__0027u.png
diff --git a/src/canonical/dex/front-shiny/0741--420--Oricorio--Pom-Pom.png b/src/canonical/dex/front-shiny/0741-420-Oricorio-Pom~Pom.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0741--420--Oricorio--Pom-Pom.png
rename to src/canonical/dex/front-shiny/0741-420-Oricorio-Pom~Pom.png
diff --git a/src/canonical/dex/front-shiny/0741--420--Oricorio--Sensu.png b/src/canonical/dex/front-shiny/0741-420-Oricorio-Sensu.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0741--420--Oricorio--Sensu.png
rename to src/canonical/dex/front-shiny/0741-420-Oricorio-Sensu.png
diff --git a/src/canonical/dex/front-shiny/0742--000--Cutiefly.png b/src/canonical/dex/front-shiny/0742-000-Cutiefly.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0742--000--Cutiefly.png
rename to src/canonical/dex/front-shiny/0742-000-Cutiefly.png
diff --git a/src/canonical/dex/front-shiny/0743--000--Ribombee.png b/src/canonical/dex/front-shiny/0743-000-Ribombee.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0743--000--Ribombee.png
rename to src/canonical/dex/front-shiny/0743-000-Ribombee.png
diff --git a/src/canonical/dex/front-shiny/0744--000--Rockruff.png b/src/canonical/dex/front-shiny/0744-000-Rockruff.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0744--000--Rockruff.png
rename to src/canonical/dex/front-shiny/0744-000-Rockruff.png
diff --git a/src/canonical/dex/front-shiny/0745--000--Lycanroc.png b/src/canonical/dex/front-shiny/0745-000-Lycanroc.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0745--000--Lycanroc.png
rename to src/canonical/dex/front-shiny/0745-000-Lycanroc.png
diff --git a/src/canonical/dex/front-shiny/0745--420--Lycanroc--Dusk.png b/src/canonical/dex/front-shiny/0745-420-Lycanroc-Dusk.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0745--420--Lycanroc--Dusk.png
rename to src/canonical/dex/front-shiny/0745-420-Lycanroc-Dusk.png
diff --git a/src/canonical/dex/front-shiny/0745--420--Lycanroc--Midnight.png b/src/canonical/dex/front-shiny/0745-420-Lycanroc-Midnight.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0745--420--Lycanroc--Midnight.png
rename to src/canonical/dex/front-shiny/0745-420-Lycanroc-Midnight.png
diff --git a/src/canonical/dex/front-shiny/0746--000--Wishiwashi.png b/src/canonical/dex/front-shiny/0746-000-Wishiwashi.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0746--000--Wishiwashi.png
rename to src/canonical/dex/front-shiny/0746-000-Wishiwashi.png
diff --git a/src/canonical/dex/front-shiny/0746--420--Wishiwashi--School.png b/src/canonical/dex/front-shiny/0746-420-Wishiwashi-School.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0746--420--Wishiwashi--School.png
rename to src/canonical/dex/front-shiny/0746-420-Wishiwashi-School.png
diff --git a/src/canonical/dex/front-shiny/0747--000--Mareanie.png b/src/canonical/dex/front-shiny/0747-000-Mareanie.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0747--000--Mareanie.png
rename to src/canonical/dex/front-shiny/0747-000-Mareanie.png
diff --git a/src/canonical/dex/front-shiny/0748--000--Toxapex.png b/src/canonical/dex/front-shiny/0748-000-Toxapex.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0748--000--Toxapex.png
rename to src/canonical/dex/front-shiny/0748-000-Toxapex.png
diff --git a/src/canonical/dex/front-shiny/0749--000--Mudbray.png b/src/canonical/dex/front-shiny/0749-000-Mudbray.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0749--000--Mudbray.png
rename to src/canonical/dex/front-shiny/0749-000-Mudbray.png
diff --git a/src/canonical/dex/front-shiny/0750--000--Mudsdale.png b/src/canonical/dex/front-shiny/0750-000-Mudsdale.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0750--000--Mudsdale.png
rename to src/canonical/dex/front-shiny/0750-000-Mudsdale.png
diff --git a/src/canonical/dex/front-shiny/0751--000--Dewpider.png b/src/canonical/dex/front-shiny/0751-000-Dewpider.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0751--000--Dewpider.png
rename to src/canonical/dex/front-shiny/0751-000-Dewpider.png
diff --git a/src/canonical/dex/front-shiny/0752--000--Araquanid.png b/src/canonical/dex/front-shiny/0752-000-Araquanid.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0752--000--Araquanid.png
rename to src/canonical/dex/front-shiny/0752-000-Araquanid.png
diff --git a/src/canonical/dex/front-shiny/0753--000--Fomantis.png b/src/canonical/dex/front-shiny/0753-000-Fomantis.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0753--000--Fomantis.png
rename to src/canonical/dex/front-shiny/0753-000-Fomantis.png
diff --git a/src/canonical/dex/front-shiny/0754--000--Lurantis.png b/src/canonical/dex/front-shiny/0754-000-Lurantis.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0754--000--Lurantis.png
rename to src/canonical/dex/front-shiny/0754-000-Lurantis.png
diff --git a/src/canonical/dex/front-shiny/0755--000--Morelull.png b/src/canonical/dex/front-shiny/0755-000-Morelull.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0755--000--Morelull.png
rename to src/canonical/dex/front-shiny/0755-000-Morelull.png
diff --git a/src/canonical/dex/front-shiny/0756--000--Shiinotic.png b/src/canonical/dex/front-shiny/0756-000-Shiinotic.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0756--000--Shiinotic.png
rename to src/canonical/dex/front-shiny/0756-000-Shiinotic.png
diff --git a/src/canonical/dex/front-shiny/0757--000--Salandit.png b/src/canonical/dex/front-shiny/0757-000-Salandit.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0757--000--Salandit.png
rename to src/canonical/dex/front-shiny/0757-000-Salandit.png
diff --git a/src/canonical/dex/front-shiny/0758--000--Salazzle.png b/src/canonical/dex/front-shiny/0758-000-Salazzle.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0758--000--Salazzle.png
rename to src/canonical/dex/front-shiny/0758-000-Salazzle.png
diff --git a/src/canonical/dex/front-shiny/0759--000--Stufful.png b/src/canonical/dex/front-shiny/0759-000-Stufful.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0759--000--Stufful.png
rename to src/canonical/dex/front-shiny/0759-000-Stufful.png
diff --git a/src/canonical/dex/front-shiny/0760--000--Bewear.png b/src/canonical/dex/front-shiny/0760-000-Bewear.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0760--000--Bewear.png
rename to src/canonical/dex/front-shiny/0760-000-Bewear.png
diff --git a/src/canonical/dex/front-shiny/0761--000--Bounsweet.png b/src/canonical/dex/front-shiny/0761-000-Bounsweet.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0761--000--Bounsweet.png
rename to src/canonical/dex/front-shiny/0761-000-Bounsweet.png
diff --git a/src/canonical/dex/front-shiny/0762--000--Steenee.png b/src/canonical/dex/front-shiny/0762-000-Steenee.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0762--000--Steenee.png
rename to src/canonical/dex/front-shiny/0762-000-Steenee.png
diff --git a/src/canonical/dex/front-shiny/0763--000--Tsareena.png b/src/canonical/dex/front-shiny/0763-000-Tsareena.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0763--000--Tsareena.png
rename to src/canonical/dex/front-shiny/0763-000-Tsareena.png
diff --git a/src/canonical/dex/front-shiny/0764--000--Comfey.png b/src/canonical/dex/front-shiny/0764-000-Comfey.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0764--000--Comfey.png
rename to src/canonical/dex/front-shiny/0764-000-Comfey.png
diff --git a/src/canonical/dex/front-shiny/0765--000--Oranguru.png b/src/canonical/dex/front-shiny/0765-000-Oranguru.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0765--000--Oranguru.png
rename to src/canonical/dex/front-shiny/0765-000-Oranguru.png
diff --git a/src/canonical/dex/front-shiny/0766--000--Passimian.png b/src/canonical/dex/front-shiny/0766-000-Passimian.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0766--000--Passimian.png
rename to src/canonical/dex/front-shiny/0766-000-Passimian.png
diff --git a/src/canonical/dex/front-shiny/0767--000--Wimpod.png b/src/canonical/dex/front-shiny/0767-000-Wimpod.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0767--000--Wimpod.png
rename to src/canonical/dex/front-shiny/0767-000-Wimpod.png
diff --git a/src/canonical/dex/front-shiny/0768--000--Golisopod.png b/src/canonical/dex/front-shiny/0768-000-Golisopod.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0768--000--Golisopod.png
rename to src/canonical/dex/front-shiny/0768-000-Golisopod.png
diff --git a/src/canonical/dex/front-shiny/0769--000--Sandygast.png b/src/canonical/dex/front-shiny/0769-000-Sandygast.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0769--000--Sandygast.png
rename to src/canonical/dex/front-shiny/0769-000-Sandygast.png
diff --git a/src/canonical/dex/front-shiny/0770--000--Palossand.png b/src/canonical/dex/front-shiny/0770-000-Palossand.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0770--000--Palossand.png
rename to src/canonical/dex/front-shiny/0770-000-Palossand.png
diff --git a/src/canonical/dex/front-shiny/0771--000--Pyukumuku.png b/src/canonical/dex/front-shiny/0771-000-Pyukumuku.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0771--000--Pyukumuku.png
rename to src/canonical/dex/front-shiny/0771-000-Pyukumuku.png
diff --git a/src/canonical/dex/front-shiny/0772--000--Type__003a_Null.png b/src/canonical/dex/front-shiny/0772-000-Type__003a_Null.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0772--000--Type__003a_Null.png
rename to src/canonical/dex/front-shiny/0772-000-Type__003a_Null.png
diff --git a/src/canonical/dex/front-shiny/0773--000--Silvally.png b/src/canonical/dex/front-shiny/0773-000-Silvally.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--000--Silvally.png
rename to src/canonical/dex/front-shiny/0773-000-Silvally.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Bug.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Bug.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Bug.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Bug.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Dark.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Dark.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Dark.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Dark.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Dragon.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Dragon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Dragon.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Dragon.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Electric.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Electric.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Electric.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Electric.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Fairy.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Fairy.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Fairy.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Fairy.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Fighting.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Fighting.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Fighting.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Fighting.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Fire.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Fire.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Fire.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Fire.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Flying.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Flying.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Flying.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Flying.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Ghost.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Ghost.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Ghost.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Ghost.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Grass.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Grass.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Grass.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Grass.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Ground.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Ground.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Ground.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Ground.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Ice.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Ice.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Ice.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Ice.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Poison.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Poison.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Poison.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Poison.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Psychic.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Psychic.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Psychic.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Psychic.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Rock.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Rock.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Rock.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Rock.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Steel.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Steel.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Steel.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Steel.png
diff --git a/src/canonical/dex/front-shiny/0773--420--Silvally--Water.png b/src/canonical/dex/front-shiny/0773-420-Silvally-Water.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0773--420--Silvally--Water.png
rename to src/canonical/dex/front-shiny/0773-420-Silvally-Water.png
diff --git a/src/canonical/dex/front-shiny/0774--000--Minior.png b/src/canonical/dex/front-shiny/0774-000-Minior.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0774--000--Minior.png
rename to src/canonical/dex/front-shiny/0774-000-Minior.png
diff --git a/src/canonical/dex/front-shiny/0774--420--Minior--Meteor.png b/src/canonical/dex/front-shiny/0774-420-Minior-Meteor.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0774--420--Minior--Meteor.png
rename to src/canonical/dex/front-shiny/0774-420-Minior-Meteor.png
diff --git a/src/canonical/dex/front-shiny/0775--000--Komala.png b/src/canonical/dex/front-shiny/0775-000-Komala.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0775--000--Komala.png
rename to src/canonical/dex/front-shiny/0775-000-Komala.png
diff --git a/src/canonical/dex/front-shiny/0776--000--Turtonator.png b/src/canonical/dex/front-shiny/0776-000-Turtonator.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0776--000--Turtonator.png
rename to src/canonical/dex/front-shiny/0776-000-Turtonator.png
diff --git a/src/canonical/dex/front-shiny/0777--000--Togedemaru.png b/src/canonical/dex/front-shiny/0777-000-Togedemaru.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0777--000--Togedemaru.png
rename to src/canonical/dex/front-shiny/0777-000-Togedemaru.png
diff --git a/src/canonical/dex/front-shiny/0778--000--Mimikyu.png b/src/canonical/dex/front-shiny/0778-000-Mimikyu.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0778--000--Mimikyu.png
rename to src/canonical/dex/front-shiny/0778-000-Mimikyu.png
diff --git a/src/canonical/dex/front-shiny/0778--420--Mimikyu--Busted.png b/src/canonical/dex/front-shiny/0778-420-Mimikyu-Busted.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0778--420--Mimikyu--Busted.png
rename to src/canonical/dex/front-shiny/0778-420-Mimikyu-Busted.png
diff --git a/src/canonical/dex/front-shiny/0778--420--Mimikyu--Busted-Totem.png b/src/canonical/dex/front-shiny/0778-420-Mimikyu-Busted~Totem.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0778--420--Mimikyu--Busted-Totem.png
rename to src/canonical/dex/front-shiny/0778-420-Mimikyu-Busted~Totem.png
diff --git a/src/canonical/dex/front-shiny/0778--420--Mimikyu--Totem.png b/src/canonical/dex/front-shiny/0778-420-Mimikyu-Totem.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0778--420--Mimikyu--Totem.png
rename to src/canonical/dex/front-shiny/0778-420-Mimikyu-Totem.png
diff --git a/src/canonical/dex/front-shiny/0779--000--Bruxish.png b/src/canonical/dex/front-shiny/0779-000-Bruxish.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0779--000--Bruxish.png
rename to src/canonical/dex/front-shiny/0779-000-Bruxish.png
diff --git a/src/canonical/dex/front-shiny/0780--000--Drampa.png b/src/canonical/dex/front-shiny/0780-000-Drampa.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0780--000--Drampa.png
rename to src/canonical/dex/front-shiny/0780-000-Drampa.png
diff --git a/src/canonical/dex/front-shiny/0781--000--Dhelmise.png b/src/canonical/dex/front-shiny/0781-000-Dhelmise.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0781--000--Dhelmise.png
rename to src/canonical/dex/front-shiny/0781-000-Dhelmise.png
diff --git a/src/canonical/dex/front-shiny/0782--000--Jangmo-o.png b/src/canonical/dex/front-shiny/0782-000-Jangmo~o.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0782--000--Jangmo-o.png
rename to src/canonical/dex/front-shiny/0782-000-Jangmo~o.png
diff --git a/src/canonical/dex/front-shiny/0783--000--Hakamo-o.png b/src/canonical/dex/front-shiny/0783-000-Hakamo~o.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0783--000--Hakamo-o.png
rename to src/canonical/dex/front-shiny/0783-000-Hakamo~o.png
diff --git a/src/canonical/dex/front-shiny/0784--000--Kommo-o.png b/src/canonical/dex/front-shiny/0784-000-Kommo~o.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0784--000--Kommo-o.png
rename to src/canonical/dex/front-shiny/0784-000-Kommo~o.png
diff --git a/src/canonical/dex/front-shiny/0784--420--Kommo-o--Totem.png b/src/canonical/dex/front-shiny/0784-420-Kommo~o-Totem.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0784--420--Kommo-o--Totem.png
rename to src/canonical/dex/front-shiny/0784-420-Kommo~o-Totem.png
diff --git a/src/canonical/dex/front-shiny/0785--000--Tapu_Koko.png b/src/canonical/dex/front-shiny/0785-000-Tapu_Koko.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0785--000--Tapu_Koko.png
rename to src/canonical/dex/front-shiny/0785-000-Tapu_Koko.png
diff --git a/src/canonical/dex/front-shiny/0786--000--Tapu_Lele.png b/src/canonical/dex/front-shiny/0786-000-Tapu_Lele.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0786--000--Tapu_Lele.png
rename to src/canonical/dex/front-shiny/0786-000-Tapu_Lele.png
diff --git a/src/canonical/dex/front-shiny/0787--000--Tapu_Bulu.png b/src/canonical/dex/front-shiny/0787-000-Tapu_Bulu.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0787--000--Tapu_Bulu.png
rename to src/canonical/dex/front-shiny/0787-000-Tapu_Bulu.png
diff --git a/src/canonical/dex/front-shiny/0788--000--Tapu_Fini.png b/src/canonical/dex/front-shiny/0788-000-Tapu_Fini.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0788--000--Tapu_Fini.png
rename to src/canonical/dex/front-shiny/0788-000-Tapu_Fini.png
diff --git a/src/canonical/dex/front-shiny/0789--000--Cosmog.png b/src/canonical/dex/front-shiny/0789-000-Cosmog.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0789--000--Cosmog.png
rename to src/canonical/dex/front-shiny/0789-000-Cosmog.png
diff --git a/src/canonical/dex/front-shiny/0790--000--Cosmoem.png b/src/canonical/dex/front-shiny/0790-000-Cosmoem.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0790--000--Cosmoem.png
rename to src/canonical/dex/front-shiny/0790-000-Cosmoem.png
diff --git a/src/canonical/dex/front-shiny/0791--000--Solgaleo.png b/src/canonical/dex/front-shiny/0791-000-Solgaleo.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0791--000--Solgaleo.png
rename to src/canonical/dex/front-shiny/0791-000-Solgaleo.png
diff --git a/src/canonical/dex/front-shiny/0792--000--Lunala.png b/src/canonical/dex/front-shiny/0792-000-Lunala.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0792--000--Lunala.png
rename to src/canonical/dex/front-shiny/0792-000-Lunala.png
diff --git a/src/canonical/dex/front-shiny/0793--000--Nihilego.png b/src/canonical/dex/front-shiny/0793-000-Nihilego.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0793--000--Nihilego.png
rename to src/canonical/dex/front-shiny/0793-000-Nihilego.png
diff --git a/src/canonical/dex/front-shiny/0794--000--Buzzwole.png b/src/canonical/dex/front-shiny/0794-000-Buzzwole.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0794--000--Buzzwole.png
rename to src/canonical/dex/front-shiny/0794-000-Buzzwole.png
diff --git a/src/canonical/dex/front-shiny/0795--000--Pheromosa.png b/src/canonical/dex/front-shiny/0795-000-Pheromosa.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0795--000--Pheromosa.png
rename to src/canonical/dex/front-shiny/0795-000-Pheromosa.png
diff --git a/src/canonical/dex/front-shiny/0796--000--Xurkitree.png b/src/canonical/dex/front-shiny/0796-000-Xurkitree.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0796--000--Xurkitree.png
rename to src/canonical/dex/front-shiny/0796-000-Xurkitree.png
diff --git a/src/canonical/dex/front-shiny/0797--000--Celesteela.png b/src/canonical/dex/front-shiny/0797-000-Celesteela.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0797--000--Celesteela.png
rename to src/canonical/dex/front-shiny/0797-000-Celesteela.png
diff --git a/src/canonical/dex/front-shiny/0798--000--Kartana.png b/src/canonical/dex/front-shiny/0798-000-Kartana.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0798--000--Kartana.png
rename to src/canonical/dex/front-shiny/0798-000-Kartana.png
diff --git a/src/canonical/dex/front-shiny/0799--000--Guzzlord.png b/src/canonical/dex/front-shiny/0799-000-Guzzlord.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0799--000--Guzzlord.png
rename to src/canonical/dex/front-shiny/0799-000-Guzzlord.png
diff --git a/src/canonical/dex/front-shiny/0800--000--Necrozma.png b/src/canonical/dex/front-shiny/0800-000-Necrozma.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0800--000--Necrozma.png
rename to src/canonical/dex/front-shiny/0800-000-Necrozma.png
diff --git a/src/canonical/dex/front-shiny/0800--420--Necrozma--Dawn-Wings.png b/src/canonical/dex/front-shiny/0800-420-Necrozma-Dawn~Wings.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0800--420--Necrozma--Dawn-Wings.png
rename to src/canonical/dex/front-shiny/0800-420-Necrozma-Dawn~Wings.png
diff --git a/src/canonical/dex/front-shiny/0800--420--Necrozma--Dusk-Mane.png b/src/canonical/dex/front-shiny/0800-420-Necrozma-Dusk~Mane.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0800--420--Necrozma--Dusk-Mane.png
rename to src/canonical/dex/front-shiny/0800-420-Necrozma-Dusk~Mane.png
diff --git a/src/canonical/dex/front-shiny/0800--420--Necrozma--Ultra.png b/src/canonical/dex/front-shiny/0800-420-Necrozma-Ultra.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0800--420--Necrozma--Ultra.png
rename to src/canonical/dex/front-shiny/0800-420-Necrozma-Ultra.png
diff --git a/src/canonical/dex/front-shiny/0801--000--Magearna.png b/src/canonical/dex/front-shiny/0801-000-Magearna.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0801--000--Magearna.png
rename to src/canonical/dex/front-shiny/0801-000-Magearna.png
diff --git a/src/canonical/dex/front-shiny/0803--000--Poipole.png b/src/canonical/dex/front-shiny/0803-000-Poipole.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0803--000--Poipole.png
rename to src/canonical/dex/front-shiny/0803-000-Poipole.png
diff --git a/src/canonical/dex/front-shiny/0804--000--Naganadel.png b/src/canonical/dex/front-shiny/0804-000-Naganadel.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0804--000--Naganadel.png
rename to src/canonical/dex/front-shiny/0804-000-Naganadel.png
diff --git a/src/canonical/dex/front-shiny/0805--000--Stakataka.png b/src/canonical/dex/front-shiny/0805-000-Stakataka.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0805--000--Stakataka.png
rename to src/canonical/dex/front-shiny/0805-000-Stakataka.png
diff --git a/src/canonical/dex/front-shiny/0806--000--Blacephalon.png b/src/canonical/dex/front-shiny/0806-000-Blacephalon.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0806--000--Blacephalon.png
rename to src/canonical/dex/front-shiny/0806-000-Blacephalon.png
diff --git a/src/canonical/dex/front-shiny/0807--000--Zeraora.png b/src/canonical/dex/front-shiny/0807-000-Zeraora.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0807--000--Zeraora.png
rename to src/canonical/dex/front-shiny/0807-000-Zeraora.png
diff --git a/src/canonical/dex/front-shiny/0808--000--Meltan.png b/src/canonical/dex/front-shiny/0808-000-Meltan.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0808--000--Meltan.png
rename to src/canonical/dex/front-shiny/0808-000-Meltan.png
diff --git a/src/canonical/dex/front-shiny/0809--000--Melmetal.png b/src/canonical/dex/front-shiny/0809-000-Melmetal.png
similarity index 100%
rename from src/canonical/dex/front-shiny/0809--000--Melmetal.png
rename to src/canonical/dex/front-shiny/0809-000-Melmetal.png
diff --git a/src/canonical/dex/front/0001--000--Bulbasaur.png b/src/canonical/dex/front/0001-000-Bulbasaur.png
similarity index 100%
rename from src/canonical/dex/front/0001--000--Bulbasaur.png
rename to src/canonical/dex/front/0001-000-Bulbasaur.png
diff --git a/src/canonical/dex/front/0002--000--Ivysaur.png b/src/canonical/dex/front/0002-000-Ivysaur.png
similarity index 100%
rename from src/canonical/dex/front/0002--000--Ivysaur.png
rename to src/canonical/dex/front/0002-000-Ivysaur.png
diff --git a/src/canonical/dex/front/0003--000--Venusaur.png b/src/canonical/dex/front/0003-000-Venusaur.png
similarity index 100%
rename from src/canonical/dex/front/0003--000--Venusaur.png
rename to src/canonical/dex/front/0003-000-Venusaur.png
diff --git a/src/canonical/dex/front/0003--420--Venusaur--Mega.png b/src/canonical/dex/front/0003-420-Venusaur-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0003--420--Venusaur--Mega.png
rename to src/canonical/dex/front/0003-420-Venusaur-Mega.png
diff --git a/src/canonical/dex/front/0004--000--Charmander.png b/src/canonical/dex/front/0004-000-Charmander.png
similarity index 100%
rename from src/canonical/dex/front/0004--000--Charmander.png
rename to src/canonical/dex/front/0004-000-Charmander.png
diff --git a/src/canonical/dex/front/0005--000--Charmeleon.png b/src/canonical/dex/front/0005-000-Charmeleon.png
similarity index 100%
rename from src/canonical/dex/front/0005--000--Charmeleon.png
rename to src/canonical/dex/front/0005-000-Charmeleon.png
diff --git a/src/canonical/dex/front/0006--000--Charizard.png b/src/canonical/dex/front/0006-000-Charizard.png
similarity index 100%
rename from src/canonical/dex/front/0006--000--Charizard.png
rename to src/canonical/dex/front/0006-000-Charizard.png
diff --git a/src/canonical/dex/front/0006--420--Charizard--Mega-X.png b/src/canonical/dex/front/0006-420-Charizard-Mega~X.png
similarity index 100%
rename from src/canonical/dex/front/0006--420--Charizard--Mega-X.png
rename to src/canonical/dex/front/0006-420-Charizard-Mega~X.png
diff --git a/src/canonical/dex/front/0006--420--Charizard--Mega-Y.png b/src/canonical/dex/front/0006-420-Charizard-Mega~Y.png
similarity index 100%
rename from src/canonical/dex/front/0006--420--Charizard--Mega-Y.png
rename to src/canonical/dex/front/0006-420-Charizard-Mega~Y.png
diff --git a/src/canonical/dex/front/0007--000--Squirtle.png b/src/canonical/dex/front/0007-000-Squirtle.png
similarity index 100%
rename from src/canonical/dex/front/0007--000--Squirtle.png
rename to src/canonical/dex/front/0007-000-Squirtle.png
diff --git a/src/canonical/dex/front/0008--000--Wartortle.png b/src/canonical/dex/front/0008-000-Wartortle.png
similarity index 100%
rename from src/canonical/dex/front/0008--000--Wartortle.png
rename to src/canonical/dex/front/0008-000-Wartortle.png
diff --git a/src/canonical/dex/front/0009--000--Blastoise.png b/src/canonical/dex/front/0009-000-Blastoise.png
similarity index 100%
rename from src/canonical/dex/front/0009--000--Blastoise.png
rename to src/canonical/dex/front/0009-000-Blastoise.png
diff --git a/src/canonical/dex/front/0009--420--Blastoise--Mega.png b/src/canonical/dex/front/0009-420-Blastoise-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0009--420--Blastoise--Mega.png
rename to src/canonical/dex/front/0009-420-Blastoise-Mega.png
diff --git a/src/canonical/dex/front/0010--000--Caterpie.png b/src/canonical/dex/front/0010-000-Caterpie.png
similarity index 100%
rename from src/canonical/dex/front/0010--000--Caterpie.png
rename to src/canonical/dex/front/0010-000-Caterpie.png
diff --git a/src/canonical/dex/front/0011--000--Metapod.png b/src/canonical/dex/front/0011-000-Metapod.png
similarity index 100%
rename from src/canonical/dex/front/0011--000--Metapod.png
rename to src/canonical/dex/front/0011-000-Metapod.png
diff --git a/src/canonical/dex/front/0012--000--Butterfree.png b/src/canonical/dex/front/0012-000-Butterfree.png
similarity index 100%
rename from src/canonical/dex/front/0012--000--Butterfree.png
rename to src/canonical/dex/front/0012-000-Butterfree.png
diff --git a/src/canonical/dex/front/0013--000--Weedle.png b/src/canonical/dex/front/0013-000-Weedle.png
similarity index 100%
rename from src/canonical/dex/front/0013--000--Weedle.png
rename to src/canonical/dex/front/0013-000-Weedle.png
diff --git a/src/canonical/dex/front/0014--000--Kakuna.png b/src/canonical/dex/front/0014-000-Kakuna.png
similarity index 100%
rename from src/canonical/dex/front/0014--000--Kakuna.png
rename to src/canonical/dex/front/0014-000-Kakuna.png
diff --git a/src/canonical/dex/front/0015--000--Beedrill.png b/src/canonical/dex/front/0015-000-Beedrill.png
similarity index 100%
rename from src/canonical/dex/front/0015--000--Beedrill.png
rename to src/canonical/dex/front/0015-000-Beedrill.png
diff --git a/src/canonical/dex/front/0015--420--Beedrill--Mega.png b/src/canonical/dex/front/0015-420-Beedrill-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0015--420--Beedrill--Mega.png
rename to src/canonical/dex/front/0015-420-Beedrill-Mega.png
diff --git a/src/canonical/dex/front/0016--000--Pidgey.png b/src/canonical/dex/front/0016-000-Pidgey.png
similarity index 100%
rename from src/canonical/dex/front/0016--000--Pidgey.png
rename to src/canonical/dex/front/0016-000-Pidgey.png
diff --git a/src/canonical/dex/front/0017--000--Pidgeotto.png b/src/canonical/dex/front/0017-000-Pidgeotto.png
similarity index 100%
rename from src/canonical/dex/front/0017--000--Pidgeotto.png
rename to src/canonical/dex/front/0017-000-Pidgeotto.png
diff --git a/src/canonical/dex/front/0018--000--Pidgeot.png b/src/canonical/dex/front/0018-000-Pidgeot.png
similarity index 100%
rename from src/canonical/dex/front/0018--000--Pidgeot.png
rename to src/canonical/dex/front/0018-000-Pidgeot.png
diff --git a/src/canonical/dex/front/0018--420--Pidgeot--Mega.png b/src/canonical/dex/front/0018-420-Pidgeot-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0018--420--Pidgeot--Mega.png
rename to src/canonical/dex/front/0018-420-Pidgeot-Mega.png
diff --git a/src/canonical/dex/front/0019--000--Rattata.png b/src/canonical/dex/front/0019-000-Rattata.png
similarity index 100%
rename from src/canonical/dex/front/0019--000--Rattata.png
rename to src/canonical/dex/front/0019-000-Rattata.png
diff --git a/src/canonical/dex/front/0019--420--Rattata--Alola.png b/src/canonical/dex/front/0019-420-Rattata-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0019--420--Rattata--Alola.png
rename to src/canonical/dex/front/0019-420-Rattata-Alola.png
diff --git a/src/canonical/dex/front/0020--000--Raticate.png b/src/canonical/dex/front/0020-000-Raticate.png
similarity index 100%
rename from src/canonical/dex/front/0020--000--Raticate.png
rename to src/canonical/dex/front/0020-000-Raticate.png
diff --git a/src/canonical/dex/front/0020--420--Raticate--Alola.png b/src/canonical/dex/front/0020-420-Raticate-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0020--420--Raticate--Alola.png
rename to src/canonical/dex/front/0020-420-Raticate-Alola.png
diff --git a/src/canonical/dex/front/0020--420--Raticate--Alola-Totem.png b/src/canonical/dex/front/0020-420-Raticate-Alola~Totem.png
similarity index 100%
rename from src/canonical/dex/front/0020--420--Raticate--Alola-Totem.png
rename to src/canonical/dex/front/0020-420-Raticate-Alola~Totem.png
diff --git a/src/canonical/dex/front/0021--000--Spearow.png b/src/canonical/dex/front/0021-000-Spearow.png
similarity index 100%
rename from src/canonical/dex/front/0021--000--Spearow.png
rename to src/canonical/dex/front/0021-000-Spearow.png
diff --git a/src/canonical/dex/front/0022--000--Fearow.png b/src/canonical/dex/front/0022-000-Fearow.png
similarity index 100%
rename from src/canonical/dex/front/0022--000--Fearow.png
rename to src/canonical/dex/front/0022-000-Fearow.png
diff --git a/src/canonical/dex/front/0023--000--Ekans.png b/src/canonical/dex/front/0023-000-Ekans.png
similarity index 100%
rename from src/canonical/dex/front/0023--000--Ekans.png
rename to src/canonical/dex/front/0023-000-Ekans.png
diff --git a/src/canonical/dex/front/0024--000--Arbok.png b/src/canonical/dex/front/0024-000-Arbok.png
similarity index 100%
rename from src/canonical/dex/front/0024--000--Arbok.png
rename to src/canonical/dex/front/0024-000-Arbok.png
diff --git a/src/canonical/dex/front/0025--000--Pikachu.png b/src/canonical/dex/front/0025-000-Pikachu.png
similarity index 100%
rename from src/canonical/dex/front/0025--000--Pikachu.png
rename to src/canonical/dex/front/0025-000-Pikachu.png
diff --git a/src/canonical/dex/front/0025--420--Pikachu--Alola.png b/src/canonical/dex/front/0025-420-Pikachu-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0025--420--Pikachu--Alola.png
rename to src/canonical/dex/front/0025-420-Pikachu-Alola.png
diff --git a/src/canonical/dex/front/0025--420--Pikachu--Cosplay.png b/src/canonical/dex/front/0025-420-Pikachu-Cosplay.png
similarity index 100%
rename from src/canonical/dex/front/0025--420--Pikachu--Cosplay.png
rename to src/canonical/dex/front/0025-420-Pikachu-Cosplay.png
diff --git a/src/canonical/dex/front/0025--420--Pikachu--Hoenn.png b/src/canonical/dex/front/0025-420-Pikachu-Hoenn.png
similarity index 100%
rename from src/canonical/dex/front/0025--420--Pikachu--Hoenn.png
rename to src/canonical/dex/front/0025-420-Pikachu-Hoenn.png
diff --git a/src/canonical/dex/front/0025--420--Pikachu--Kalos.png b/src/canonical/dex/front/0025-420-Pikachu-Kalos.png
similarity index 100%
rename from src/canonical/dex/front/0025--420--Pikachu--Kalos.png
rename to src/canonical/dex/front/0025-420-Pikachu-Kalos.png
diff --git a/src/canonical/dex/front/0025--420--Pikachu--Original.png b/src/canonical/dex/front/0025-420-Pikachu-Original.png
similarity index 100%
rename from src/canonical/dex/front/0025--420--Pikachu--Original.png
rename to src/canonical/dex/front/0025-420-Pikachu-Original.png
diff --git a/src/canonical/dex/front/0025--420--Pikachu--Partner.png b/src/canonical/dex/front/0025-420-Pikachu-Partner.png
similarity index 100%
rename from src/canonical/dex/front/0025--420--Pikachu--Partner.png
rename to src/canonical/dex/front/0025-420-Pikachu-Partner.png
diff --git a/src/canonical/dex/front/0025--420--Pikachu--Sinnoh.png b/src/canonical/dex/front/0025-420-Pikachu-Sinnoh.png
similarity index 100%
rename from src/canonical/dex/front/0025--420--Pikachu--Sinnoh.png
rename to src/canonical/dex/front/0025-420-Pikachu-Sinnoh.png
diff --git a/src/canonical/dex/front/0025--420--Pikachu--Starter.png b/src/canonical/dex/front/0025-420-Pikachu-Starter.png
similarity index 100%
rename from src/canonical/dex/front/0025--420--Pikachu--Starter.png
rename to src/canonical/dex/front/0025-420-Pikachu-Starter.png
diff --git a/src/canonical/dex/front/0025--420--Pikachu--Unova.png b/src/canonical/dex/front/0025-420-Pikachu-Unova.png
similarity index 100%
rename from src/canonical/dex/front/0025--420--Pikachu--Unova.png
rename to src/canonical/dex/front/0025-420-Pikachu-Unova.png
diff --git a/src/canonical/dex/front/0026--000--Raichu.png b/src/canonical/dex/front/0026-000-Raichu.png
similarity index 100%
rename from src/canonical/dex/front/0026--000--Raichu.png
rename to src/canonical/dex/front/0026-000-Raichu.png
diff --git a/src/canonical/dex/front/0026--420--Raichu--Alola.png b/src/canonical/dex/front/0026-420-Raichu-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0026--420--Raichu--Alola.png
rename to src/canonical/dex/front/0026-420-Raichu-Alola.png
diff --git a/src/canonical/dex/front/0027--000--Sandshrew.png b/src/canonical/dex/front/0027-000-Sandshrew.png
similarity index 100%
rename from src/canonical/dex/front/0027--000--Sandshrew.png
rename to src/canonical/dex/front/0027-000-Sandshrew.png
diff --git a/src/canonical/dex/front/0027--420--Sandshrew--Alola.png b/src/canonical/dex/front/0027-420-Sandshrew-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0027--420--Sandshrew--Alola.png
rename to src/canonical/dex/front/0027-420-Sandshrew-Alola.png
diff --git a/src/canonical/dex/front/0028--000--Sandslash.png b/src/canonical/dex/front/0028-000-Sandslash.png
similarity index 100%
rename from src/canonical/dex/front/0028--000--Sandslash.png
rename to src/canonical/dex/front/0028-000-Sandslash.png
diff --git a/src/canonical/dex/front/0028--420--Sandslash--Alola.png b/src/canonical/dex/front/0028-420-Sandslash-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0028--420--Sandslash--Alola.png
rename to src/canonical/dex/front/0028-420-Sandslash-Alola.png
diff --git a/src/canonical/dex/front/0029--000--Nidoran-F.png b/src/canonical/dex/front/0029-000-Nidoran~F.png
similarity index 100%
rename from src/canonical/dex/front/0029--000--Nidoran-F.png
rename to src/canonical/dex/front/0029-000-Nidoran~F.png
diff --git a/src/canonical/dex/front/0030--000--Nidorina.png b/src/canonical/dex/front/0030-000-Nidorina.png
similarity index 100%
rename from src/canonical/dex/front/0030--000--Nidorina.png
rename to src/canonical/dex/front/0030-000-Nidorina.png
diff --git a/src/canonical/dex/front/0031--000--Nidoqueen.png b/src/canonical/dex/front/0031-000-Nidoqueen.png
similarity index 100%
rename from src/canonical/dex/front/0031--000--Nidoqueen.png
rename to src/canonical/dex/front/0031-000-Nidoqueen.png
diff --git a/src/canonical/dex/front/0032--000--Nidoran-M.png b/src/canonical/dex/front/0032-000-Nidoran~M.png
similarity index 100%
rename from src/canonical/dex/front/0032--000--Nidoran-M.png
rename to src/canonical/dex/front/0032-000-Nidoran~M.png
diff --git a/src/canonical/dex/front/0033--000--Nidorino.png b/src/canonical/dex/front/0033-000-Nidorino.png
similarity index 100%
rename from src/canonical/dex/front/0033--000--Nidorino.png
rename to src/canonical/dex/front/0033-000-Nidorino.png
diff --git a/src/canonical/dex/front/0034--000--Nidoking.png b/src/canonical/dex/front/0034-000-Nidoking.png
similarity index 100%
rename from src/canonical/dex/front/0034--000--Nidoking.png
rename to src/canonical/dex/front/0034-000-Nidoking.png
diff --git a/src/canonical/dex/front/0035--000--Clefairy.png b/src/canonical/dex/front/0035-000-Clefairy.png
similarity index 100%
rename from src/canonical/dex/front/0035--000--Clefairy.png
rename to src/canonical/dex/front/0035-000-Clefairy.png
diff --git a/src/canonical/dex/front/0036--000--Clefable.png b/src/canonical/dex/front/0036-000-Clefable.png
similarity index 100%
rename from src/canonical/dex/front/0036--000--Clefable.png
rename to src/canonical/dex/front/0036-000-Clefable.png
diff --git a/src/canonical/dex/front/0037--000--Vulpix.png b/src/canonical/dex/front/0037-000-Vulpix.png
similarity index 100%
rename from src/canonical/dex/front/0037--000--Vulpix.png
rename to src/canonical/dex/front/0037-000-Vulpix.png
diff --git a/src/canonical/dex/front/0037--420--Vulpix--Alola.png b/src/canonical/dex/front/0037-420-Vulpix-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0037--420--Vulpix--Alola.png
rename to src/canonical/dex/front/0037-420-Vulpix-Alola.png
diff --git a/src/canonical/dex/front/0038--000--Ninetales.png b/src/canonical/dex/front/0038-000-Ninetales.png
similarity index 100%
rename from src/canonical/dex/front/0038--000--Ninetales.png
rename to src/canonical/dex/front/0038-000-Ninetales.png
diff --git a/src/canonical/dex/front/0038--420--Ninetales--Alola.png b/src/canonical/dex/front/0038-420-Ninetales-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0038--420--Ninetales--Alola.png
rename to src/canonical/dex/front/0038-420-Ninetales-Alola.png
diff --git a/src/canonical/dex/front/0039--000--Jigglypuff.png b/src/canonical/dex/front/0039-000-Jigglypuff.png
similarity index 100%
rename from src/canonical/dex/front/0039--000--Jigglypuff.png
rename to src/canonical/dex/front/0039-000-Jigglypuff.png
diff --git a/src/canonical/dex/front/0040--000--Wigglytuff.png b/src/canonical/dex/front/0040-000-Wigglytuff.png
similarity index 100%
rename from src/canonical/dex/front/0040--000--Wigglytuff.png
rename to src/canonical/dex/front/0040-000-Wigglytuff.png
diff --git a/src/canonical/dex/front/0041--000--Zubat.png b/src/canonical/dex/front/0041-000-Zubat.png
similarity index 100%
rename from src/canonical/dex/front/0041--000--Zubat.png
rename to src/canonical/dex/front/0041-000-Zubat.png
diff --git a/src/canonical/dex/front/0042--000--Golbat.png b/src/canonical/dex/front/0042-000-Golbat.png
similarity index 100%
rename from src/canonical/dex/front/0042--000--Golbat.png
rename to src/canonical/dex/front/0042-000-Golbat.png
diff --git a/src/canonical/dex/front/0043--000--Oddish.png b/src/canonical/dex/front/0043-000-Oddish.png
similarity index 100%
rename from src/canonical/dex/front/0043--000--Oddish.png
rename to src/canonical/dex/front/0043-000-Oddish.png
diff --git a/src/canonical/dex/front/0044--000--Gloom.png b/src/canonical/dex/front/0044-000-Gloom.png
similarity index 100%
rename from src/canonical/dex/front/0044--000--Gloom.png
rename to src/canonical/dex/front/0044-000-Gloom.png
diff --git a/src/canonical/dex/front/0045--000--Vileplume.png b/src/canonical/dex/front/0045-000-Vileplume.png
similarity index 100%
rename from src/canonical/dex/front/0045--000--Vileplume.png
rename to src/canonical/dex/front/0045-000-Vileplume.png
diff --git a/src/canonical/dex/front/0046--000--Paras.png b/src/canonical/dex/front/0046-000-Paras.png
similarity index 100%
rename from src/canonical/dex/front/0046--000--Paras.png
rename to src/canonical/dex/front/0046-000-Paras.png
diff --git a/src/canonical/dex/front/0047--000--Parasect.png b/src/canonical/dex/front/0047-000-Parasect.png
similarity index 100%
rename from src/canonical/dex/front/0047--000--Parasect.png
rename to src/canonical/dex/front/0047-000-Parasect.png
diff --git a/src/canonical/dex/front/0048--000--Venonat.png b/src/canonical/dex/front/0048-000-Venonat.png
similarity index 100%
rename from src/canonical/dex/front/0048--000--Venonat.png
rename to src/canonical/dex/front/0048-000-Venonat.png
diff --git a/src/canonical/dex/front/0049--000--Venomoth.png b/src/canonical/dex/front/0049-000-Venomoth.png
similarity index 100%
rename from src/canonical/dex/front/0049--000--Venomoth.png
rename to src/canonical/dex/front/0049-000-Venomoth.png
diff --git a/src/canonical/dex/front/0050--000--Diglett.png b/src/canonical/dex/front/0050-000-Diglett.png
similarity index 100%
rename from src/canonical/dex/front/0050--000--Diglett.png
rename to src/canonical/dex/front/0050-000-Diglett.png
diff --git a/src/canonical/dex/front/0050--420--Diglett--Alola.png b/src/canonical/dex/front/0050-420-Diglett-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0050--420--Diglett--Alola.png
rename to src/canonical/dex/front/0050-420-Diglett-Alola.png
diff --git a/src/canonical/dex/front/0051--000--Dugtrio.png b/src/canonical/dex/front/0051-000-Dugtrio.png
similarity index 100%
rename from src/canonical/dex/front/0051--000--Dugtrio.png
rename to src/canonical/dex/front/0051-000-Dugtrio.png
diff --git a/src/canonical/dex/front/0051--420--Dugtrio--Alola.png b/src/canonical/dex/front/0051-420-Dugtrio-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0051--420--Dugtrio--Alola.png
rename to src/canonical/dex/front/0051-420-Dugtrio-Alola.png
diff --git a/src/canonical/dex/front/0052--000--Meowth.png b/src/canonical/dex/front/0052-000-Meowth.png
similarity index 100%
rename from src/canonical/dex/front/0052--000--Meowth.png
rename to src/canonical/dex/front/0052-000-Meowth.png
diff --git a/src/canonical/dex/front/0052--420--Meowth--Alola.png b/src/canonical/dex/front/0052-420-Meowth-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0052--420--Meowth--Alola.png
rename to src/canonical/dex/front/0052-420-Meowth-Alola.png
diff --git a/src/canonical/dex/front/0053--000--Persian.png b/src/canonical/dex/front/0053-000-Persian.png
similarity index 100%
rename from src/canonical/dex/front/0053--000--Persian.png
rename to src/canonical/dex/front/0053-000-Persian.png
diff --git a/src/canonical/dex/front/0053--420--Persian--Alola.png b/src/canonical/dex/front/0053-420-Persian-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0053--420--Persian--Alola.png
rename to src/canonical/dex/front/0053-420-Persian-Alola.png
diff --git a/src/canonical/dex/front/0054--000--Psyduck.png b/src/canonical/dex/front/0054-000-Psyduck.png
similarity index 100%
rename from src/canonical/dex/front/0054--000--Psyduck.png
rename to src/canonical/dex/front/0054-000-Psyduck.png
diff --git a/src/canonical/dex/front/0055--000--Golduck.png b/src/canonical/dex/front/0055-000-Golduck.png
similarity index 100%
rename from src/canonical/dex/front/0055--000--Golduck.png
rename to src/canonical/dex/front/0055-000-Golduck.png
diff --git a/src/canonical/dex/front/0056--000--Mankey.png b/src/canonical/dex/front/0056-000-Mankey.png
similarity index 100%
rename from src/canonical/dex/front/0056--000--Mankey.png
rename to src/canonical/dex/front/0056-000-Mankey.png
diff --git a/src/canonical/dex/front/0057--000--Primeape.png b/src/canonical/dex/front/0057-000-Primeape.png
similarity index 100%
rename from src/canonical/dex/front/0057--000--Primeape.png
rename to src/canonical/dex/front/0057-000-Primeape.png
diff --git a/src/canonical/dex/front/0058--000--Growlithe.png b/src/canonical/dex/front/0058-000-Growlithe.png
similarity index 100%
rename from src/canonical/dex/front/0058--000--Growlithe.png
rename to src/canonical/dex/front/0058-000-Growlithe.png
diff --git a/src/canonical/dex/front/0059--000--Arcanine.png b/src/canonical/dex/front/0059-000-Arcanine.png
similarity index 100%
rename from src/canonical/dex/front/0059--000--Arcanine.png
rename to src/canonical/dex/front/0059-000-Arcanine.png
diff --git a/src/canonical/dex/front/0060--000--Poliwag.png b/src/canonical/dex/front/0060-000-Poliwag.png
similarity index 100%
rename from src/canonical/dex/front/0060--000--Poliwag.png
rename to src/canonical/dex/front/0060-000-Poliwag.png
diff --git a/src/canonical/dex/front/0061--000--Poliwhirl.png b/src/canonical/dex/front/0061-000-Poliwhirl.png
similarity index 100%
rename from src/canonical/dex/front/0061--000--Poliwhirl.png
rename to src/canonical/dex/front/0061-000-Poliwhirl.png
diff --git a/src/canonical/dex/front/0062--000--Poliwrath.png b/src/canonical/dex/front/0062-000-Poliwrath.png
similarity index 100%
rename from src/canonical/dex/front/0062--000--Poliwrath.png
rename to src/canonical/dex/front/0062-000-Poliwrath.png
diff --git a/src/canonical/dex/front/0063--000--Abra.png b/src/canonical/dex/front/0063-000-Abra.png
similarity index 100%
rename from src/canonical/dex/front/0063--000--Abra.png
rename to src/canonical/dex/front/0063-000-Abra.png
diff --git a/src/canonical/dex/front/0064--000--Kadabra.png b/src/canonical/dex/front/0064-000-Kadabra.png
similarity index 100%
rename from src/canonical/dex/front/0064--000--Kadabra.png
rename to src/canonical/dex/front/0064-000-Kadabra.png
diff --git a/src/canonical/dex/front/0065--000--Alakazam.png b/src/canonical/dex/front/0065-000-Alakazam.png
similarity index 100%
rename from src/canonical/dex/front/0065--000--Alakazam.png
rename to src/canonical/dex/front/0065-000-Alakazam.png
diff --git a/src/canonical/dex/front/0065--420--Alakazam--Mega.png b/src/canonical/dex/front/0065-420-Alakazam-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0065--420--Alakazam--Mega.png
rename to src/canonical/dex/front/0065-420-Alakazam-Mega.png
diff --git a/src/canonical/dex/front/0066--000--Machop.png b/src/canonical/dex/front/0066-000-Machop.png
similarity index 100%
rename from src/canonical/dex/front/0066--000--Machop.png
rename to src/canonical/dex/front/0066-000-Machop.png
diff --git a/src/canonical/dex/front/0067--000--Machoke.png b/src/canonical/dex/front/0067-000-Machoke.png
similarity index 100%
rename from src/canonical/dex/front/0067--000--Machoke.png
rename to src/canonical/dex/front/0067-000-Machoke.png
diff --git a/src/canonical/dex/front/0068--000--Machamp.png b/src/canonical/dex/front/0068-000-Machamp.png
similarity index 100%
rename from src/canonical/dex/front/0068--000--Machamp.png
rename to src/canonical/dex/front/0068-000-Machamp.png
diff --git a/src/canonical/dex/front/0069--000--Bellsprout.png b/src/canonical/dex/front/0069-000-Bellsprout.png
similarity index 100%
rename from src/canonical/dex/front/0069--000--Bellsprout.png
rename to src/canonical/dex/front/0069-000-Bellsprout.png
diff --git a/src/canonical/dex/front/0070--000--Weepinbell.png b/src/canonical/dex/front/0070-000-Weepinbell.png
similarity index 100%
rename from src/canonical/dex/front/0070--000--Weepinbell.png
rename to src/canonical/dex/front/0070-000-Weepinbell.png
diff --git a/src/canonical/dex/front/0071--000--Victreebel.png b/src/canonical/dex/front/0071-000-Victreebel.png
similarity index 100%
rename from src/canonical/dex/front/0071--000--Victreebel.png
rename to src/canonical/dex/front/0071-000-Victreebel.png
diff --git a/src/canonical/dex/front/0072--000--Tentacool.png b/src/canonical/dex/front/0072-000-Tentacool.png
similarity index 100%
rename from src/canonical/dex/front/0072--000--Tentacool.png
rename to src/canonical/dex/front/0072-000-Tentacool.png
diff --git a/src/canonical/dex/front/0073--000--Tentacruel.png b/src/canonical/dex/front/0073-000-Tentacruel.png
similarity index 100%
rename from src/canonical/dex/front/0073--000--Tentacruel.png
rename to src/canonical/dex/front/0073-000-Tentacruel.png
diff --git a/src/canonical/dex/front/0074--000--Geodude.png b/src/canonical/dex/front/0074-000-Geodude.png
similarity index 100%
rename from src/canonical/dex/front/0074--000--Geodude.png
rename to src/canonical/dex/front/0074-000-Geodude.png
diff --git a/src/canonical/dex/front/0074--420--Geodude--Alola.png b/src/canonical/dex/front/0074-420-Geodude-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0074--420--Geodude--Alola.png
rename to src/canonical/dex/front/0074-420-Geodude-Alola.png
diff --git a/src/canonical/dex/front/0075--000--Graveler.png b/src/canonical/dex/front/0075-000-Graveler.png
similarity index 100%
rename from src/canonical/dex/front/0075--000--Graveler.png
rename to src/canonical/dex/front/0075-000-Graveler.png
diff --git a/src/canonical/dex/front/0075--420--Graveler--Alola.png b/src/canonical/dex/front/0075-420-Graveler-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0075--420--Graveler--Alola.png
rename to src/canonical/dex/front/0075-420-Graveler-Alola.png
diff --git a/src/canonical/dex/front/0076--000--Golem.png b/src/canonical/dex/front/0076-000-Golem.png
similarity index 100%
rename from src/canonical/dex/front/0076--000--Golem.png
rename to src/canonical/dex/front/0076-000-Golem.png
diff --git a/src/canonical/dex/front/0076--420--Golem--Alola.png b/src/canonical/dex/front/0076-420-Golem-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0076--420--Golem--Alola.png
rename to src/canonical/dex/front/0076-420-Golem-Alola.png
diff --git a/src/canonical/dex/front/0077--000--Ponyta.png b/src/canonical/dex/front/0077-000-Ponyta.png
similarity index 100%
rename from src/canonical/dex/front/0077--000--Ponyta.png
rename to src/canonical/dex/front/0077-000-Ponyta.png
diff --git a/src/canonical/dex/front/0078--000--Rapidash.png b/src/canonical/dex/front/0078-000-Rapidash.png
similarity index 100%
rename from src/canonical/dex/front/0078--000--Rapidash.png
rename to src/canonical/dex/front/0078-000-Rapidash.png
diff --git a/src/canonical/dex/front/0079--000--Slowpoke.png b/src/canonical/dex/front/0079-000-Slowpoke.png
similarity index 100%
rename from src/canonical/dex/front/0079--000--Slowpoke.png
rename to src/canonical/dex/front/0079-000-Slowpoke.png
diff --git a/src/canonical/dex/front/0080--000--Slowbro.png b/src/canonical/dex/front/0080-000-Slowbro.png
similarity index 100%
rename from src/canonical/dex/front/0080--000--Slowbro.png
rename to src/canonical/dex/front/0080-000-Slowbro.png
diff --git a/src/canonical/dex/front/0080--420--Slowbro--Mega.png b/src/canonical/dex/front/0080-420-Slowbro-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0080--420--Slowbro--Mega.png
rename to src/canonical/dex/front/0080-420-Slowbro-Mega.png
diff --git a/src/canonical/dex/front/0081--000--Magnemite.png b/src/canonical/dex/front/0081-000-Magnemite.png
similarity index 100%
rename from src/canonical/dex/front/0081--000--Magnemite.png
rename to src/canonical/dex/front/0081-000-Magnemite.png
diff --git a/src/canonical/dex/front/0082--000--Magneton.png b/src/canonical/dex/front/0082-000-Magneton.png
similarity index 100%
rename from src/canonical/dex/front/0082--000--Magneton.png
rename to src/canonical/dex/front/0082-000-Magneton.png
diff --git a/src/canonical/dex/front/0083--000--Farfetch__0027d.png b/src/canonical/dex/front/0083-000-Farfetch__0027d.png
similarity index 100%
rename from src/canonical/dex/front/0083--000--Farfetch__0027d.png
rename to src/canonical/dex/front/0083-000-Farfetch__0027d.png
diff --git a/src/canonical/dex/front/0084--000--Doduo.png b/src/canonical/dex/front/0084-000-Doduo.png
similarity index 100%
rename from src/canonical/dex/front/0084--000--Doduo.png
rename to src/canonical/dex/front/0084-000-Doduo.png
diff --git a/src/canonical/dex/front/0085--000--Dodrio.png b/src/canonical/dex/front/0085-000-Dodrio.png
similarity index 100%
rename from src/canonical/dex/front/0085--000--Dodrio.png
rename to src/canonical/dex/front/0085-000-Dodrio.png
diff --git a/src/canonical/dex/front/0086--000--Seel.png b/src/canonical/dex/front/0086-000-Seel.png
similarity index 100%
rename from src/canonical/dex/front/0086--000--Seel.png
rename to src/canonical/dex/front/0086-000-Seel.png
diff --git a/src/canonical/dex/front/0087--000--Dewgong.png b/src/canonical/dex/front/0087-000-Dewgong.png
similarity index 100%
rename from src/canonical/dex/front/0087--000--Dewgong.png
rename to src/canonical/dex/front/0087-000-Dewgong.png
diff --git a/src/canonical/dex/front/0088--000--Grimer.png b/src/canonical/dex/front/0088-000-Grimer.png
similarity index 100%
rename from src/canonical/dex/front/0088--000--Grimer.png
rename to src/canonical/dex/front/0088-000-Grimer.png
diff --git a/src/canonical/dex/front/0088--420--Grimer--Alola.png b/src/canonical/dex/front/0088-420-Grimer-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0088--420--Grimer--Alola.png
rename to src/canonical/dex/front/0088-420-Grimer-Alola.png
diff --git a/src/canonical/dex/front/0089--000--Muk.png b/src/canonical/dex/front/0089-000-Muk.png
similarity index 100%
rename from src/canonical/dex/front/0089--000--Muk.png
rename to src/canonical/dex/front/0089-000-Muk.png
diff --git a/src/canonical/dex/front/0089--420--Muk--Alola.png b/src/canonical/dex/front/0089-420-Muk-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0089--420--Muk--Alola.png
rename to src/canonical/dex/front/0089-420-Muk-Alola.png
diff --git a/src/canonical/dex/front/0090--000--Shellder.png b/src/canonical/dex/front/0090-000-Shellder.png
similarity index 100%
rename from src/canonical/dex/front/0090--000--Shellder.png
rename to src/canonical/dex/front/0090-000-Shellder.png
diff --git a/src/canonical/dex/front/0091--000--Cloyster.png b/src/canonical/dex/front/0091-000-Cloyster.png
similarity index 100%
rename from src/canonical/dex/front/0091--000--Cloyster.png
rename to src/canonical/dex/front/0091-000-Cloyster.png
diff --git a/src/canonical/dex/front/0092--000--Gastly.png b/src/canonical/dex/front/0092-000-Gastly.png
similarity index 100%
rename from src/canonical/dex/front/0092--000--Gastly.png
rename to src/canonical/dex/front/0092-000-Gastly.png
diff --git a/src/canonical/dex/front/0093--000--Haunter.png b/src/canonical/dex/front/0093-000-Haunter.png
similarity index 100%
rename from src/canonical/dex/front/0093--000--Haunter.png
rename to src/canonical/dex/front/0093-000-Haunter.png
diff --git a/src/canonical/dex/front/0094--000--Gengar.png b/src/canonical/dex/front/0094-000-Gengar.png
similarity index 100%
rename from src/canonical/dex/front/0094--000--Gengar.png
rename to src/canonical/dex/front/0094-000-Gengar.png
diff --git a/src/canonical/dex/front/0094--420--Gengar--Mega.png b/src/canonical/dex/front/0094-420-Gengar-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0094--420--Gengar--Mega.png
rename to src/canonical/dex/front/0094-420-Gengar-Mega.png
diff --git a/src/canonical/dex/front/0095--000--Onix.png b/src/canonical/dex/front/0095-000-Onix.png
similarity index 100%
rename from src/canonical/dex/front/0095--000--Onix.png
rename to src/canonical/dex/front/0095-000-Onix.png
diff --git a/src/canonical/dex/front/0096--000--Drowzee.png b/src/canonical/dex/front/0096-000-Drowzee.png
similarity index 100%
rename from src/canonical/dex/front/0096--000--Drowzee.png
rename to src/canonical/dex/front/0096-000-Drowzee.png
diff --git a/src/canonical/dex/front/0097--000--Hypno.png b/src/canonical/dex/front/0097-000-Hypno.png
similarity index 100%
rename from src/canonical/dex/front/0097--000--Hypno.png
rename to src/canonical/dex/front/0097-000-Hypno.png
diff --git a/src/canonical/dex/front/0098--000--Krabby.png b/src/canonical/dex/front/0098-000-Krabby.png
similarity index 100%
rename from src/canonical/dex/front/0098--000--Krabby.png
rename to src/canonical/dex/front/0098-000-Krabby.png
diff --git a/src/canonical/dex/front/0099--000--Kingler.png b/src/canonical/dex/front/0099-000-Kingler.png
similarity index 100%
rename from src/canonical/dex/front/0099--000--Kingler.png
rename to src/canonical/dex/front/0099-000-Kingler.png
diff --git a/src/canonical/dex/front/0100--000--Voltorb.png b/src/canonical/dex/front/0100-000-Voltorb.png
similarity index 100%
rename from src/canonical/dex/front/0100--000--Voltorb.png
rename to src/canonical/dex/front/0100-000-Voltorb.png
diff --git a/src/canonical/dex/front/0101--000--Electrode.png b/src/canonical/dex/front/0101-000-Electrode.png
similarity index 100%
rename from src/canonical/dex/front/0101--000--Electrode.png
rename to src/canonical/dex/front/0101-000-Electrode.png
diff --git a/src/canonical/dex/front/0102--000--Exeggcute.png b/src/canonical/dex/front/0102-000-Exeggcute.png
similarity index 100%
rename from src/canonical/dex/front/0102--000--Exeggcute.png
rename to src/canonical/dex/front/0102-000-Exeggcute.png
diff --git a/src/canonical/dex/front/0103--000--Exeggutor.png b/src/canonical/dex/front/0103-000-Exeggutor.png
similarity index 100%
rename from src/canonical/dex/front/0103--000--Exeggutor.png
rename to src/canonical/dex/front/0103-000-Exeggutor.png
diff --git a/src/canonical/dex/front/0103--420--Exeggutor--Alola.png b/src/canonical/dex/front/0103-420-Exeggutor-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0103--420--Exeggutor--Alola.png
rename to src/canonical/dex/front/0103-420-Exeggutor-Alola.png
diff --git a/src/canonical/dex/front/0104--000--Cubone.png b/src/canonical/dex/front/0104-000-Cubone.png
similarity index 100%
rename from src/canonical/dex/front/0104--000--Cubone.png
rename to src/canonical/dex/front/0104-000-Cubone.png
diff --git a/src/canonical/dex/front/0105--000--Marowak.png b/src/canonical/dex/front/0105-000-Marowak.png
similarity index 100%
rename from src/canonical/dex/front/0105--000--Marowak.png
rename to src/canonical/dex/front/0105-000-Marowak.png
diff --git a/src/canonical/dex/front/0105--420--Marowak--Alola.png b/src/canonical/dex/front/0105-420-Marowak-Alola.png
similarity index 100%
rename from src/canonical/dex/front/0105--420--Marowak--Alola.png
rename to src/canonical/dex/front/0105-420-Marowak-Alola.png
diff --git a/src/canonical/dex/front/0106--000--Hitmonlee.png b/src/canonical/dex/front/0106-000-Hitmonlee.png
similarity index 100%
rename from src/canonical/dex/front/0106--000--Hitmonlee.png
rename to src/canonical/dex/front/0106-000-Hitmonlee.png
diff --git a/src/canonical/dex/front/0107--000--Hitmonchan.png b/src/canonical/dex/front/0107-000-Hitmonchan.png
similarity index 100%
rename from src/canonical/dex/front/0107--000--Hitmonchan.png
rename to src/canonical/dex/front/0107-000-Hitmonchan.png
diff --git a/src/canonical/dex/front/0108--000--Lickitung.png b/src/canonical/dex/front/0108-000-Lickitung.png
similarity index 100%
rename from src/canonical/dex/front/0108--000--Lickitung.png
rename to src/canonical/dex/front/0108-000-Lickitung.png
diff --git a/src/canonical/dex/front/0109--000--Koffing.png b/src/canonical/dex/front/0109-000-Koffing.png
similarity index 100%
rename from src/canonical/dex/front/0109--000--Koffing.png
rename to src/canonical/dex/front/0109-000-Koffing.png
diff --git a/src/canonical/dex/front/0110--000--Weezing.png b/src/canonical/dex/front/0110-000-Weezing.png
similarity index 100%
rename from src/canonical/dex/front/0110--000--Weezing.png
rename to src/canonical/dex/front/0110-000-Weezing.png
diff --git a/src/canonical/dex/front/0111--000--Rhyhorn.png b/src/canonical/dex/front/0111-000-Rhyhorn.png
similarity index 100%
rename from src/canonical/dex/front/0111--000--Rhyhorn.png
rename to src/canonical/dex/front/0111-000-Rhyhorn.png
diff --git a/src/canonical/dex/front/0112--000--Rhydon.png b/src/canonical/dex/front/0112-000-Rhydon.png
similarity index 100%
rename from src/canonical/dex/front/0112--000--Rhydon.png
rename to src/canonical/dex/front/0112-000-Rhydon.png
diff --git a/src/canonical/dex/front/0113--000--Chansey.png b/src/canonical/dex/front/0113-000-Chansey.png
similarity index 100%
rename from src/canonical/dex/front/0113--000--Chansey.png
rename to src/canonical/dex/front/0113-000-Chansey.png
diff --git a/src/canonical/dex/front/0114--000--Tangela.png b/src/canonical/dex/front/0114-000-Tangela.png
similarity index 100%
rename from src/canonical/dex/front/0114--000--Tangela.png
rename to src/canonical/dex/front/0114-000-Tangela.png
diff --git a/src/canonical/dex/front/0115--000--Kangaskhan.png b/src/canonical/dex/front/0115-000-Kangaskhan.png
similarity index 100%
rename from src/canonical/dex/front/0115--000--Kangaskhan.png
rename to src/canonical/dex/front/0115-000-Kangaskhan.png
diff --git a/src/canonical/dex/front/0115--420--Kangaskhan--Mega.png b/src/canonical/dex/front/0115-420-Kangaskhan-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0115--420--Kangaskhan--Mega.png
rename to src/canonical/dex/front/0115-420-Kangaskhan-Mega.png
diff --git a/src/canonical/dex/front/0116--000--Horsea.png b/src/canonical/dex/front/0116-000-Horsea.png
similarity index 100%
rename from src/canonical/dex/front/0116--000--Horsea.png
rename to src/canonical/dex/front/0116-000-Horsea.png
diff --git a/src/canonical/dex/front/0117--000--Seadra.png b/src/canonical/dex/front/0117-000-Seadra.png
similarity index 100%
rename from src/canonical/dex/front/0117--000--Seadra.png
rename to src/canonical/dex/front/0117-000-Seadra.png
diff --git a/src/canonical/dex/front/0118--000--Goldeen.png b/src/canonical/dex/front/0118-000-Goldeen.png
similarity index 100%
rename from src/canonical/dex/front/0118--000--Goldeen.png
rename to src/canonical/dex/front/0118-000-Goldeen.png
diff --git a/src/canonical/dex/front/0119--000--Seaking.png b/src/canonical/dex/front/0119-000-Seaking.png
similarity index 100%
rename from src/canonical/dex/front/0119--000--Seaking.png
rename to src/canonical/dex/front/0119-000-Seaking.png
diff --git a/src/canonical/dex/front/0120--000--Staryu.png b/src/canonical/dex/front/0120-000-Staryu.png
similarity index 100%
rename from src/canonical/dex/front/0120--000--Staryu.png
rename to src/canonical/dex/front/0120-000-Staryu.png
diff --git a/src/canonical/dex/front/0121--000--Starmie.png b/src/canonical/dex/front/0121-000-Starmie.png
similarity index 100%
rename from src/canonical/dex/front/0121--000--Starmie.png
rename to src/canonical/dex/front/0121-000-Starmie.png
diff --git a/src/canonical/dex/front/0122--000--Mr._Mime.png b/src/canonical/dex/front/0122-000-Mr._Mime.png
similarity index 100%
rename from src/canonical/dex/front/0122--000--Mr._Mime.png
rename to src/canonical/dex/front/0122-000-Mr._Mime.png
diff --git a/src/canonical/dex/front/0123--000--Scyther.png b/src/canonical/dex/front/0123-000-Scyther.png
similarity index 100%
rename from src/canonical/dex/front/0123--000--Scyther.png
rename to src/canonical/dex/front/0123-000-Scyther.png
diff --git a/src/canonical/dex/front/0124--000--Jynx.png b/src/canonical/dex/front/0124-000-Jynx.png
similarity index 100%
rename from src/canonical/dex/front/0124--000--Jynx.png
rename to src/canonical/dex/front/0124-000-Jynx.png
diff --git a/src/canonical/dex/front/0125--000--Electabuzz.png b/src/canonical/dex/front/0125-000-Electabuzz.png
similarity index 100%
rename from src/canonical/dex/front/0125--000--Electabuzz.png
rename to src/canonical/dex/front/0125-000-Electabuzz.png
diff --git a/src/canonical/dex/front/0126--000--Magmar.png b/src/canonical/dex/front/0126-000-Magmar.png
similarity index 100%
rename from src/canonical/dex/front/0126--000--Magmar.png
rename to src/canonical/dex/front/0126-000-Magmar.png
diff --git a/src/canonical/dex/front/0127--000--Pinsir.png b/src/canonical/dex/front/0127-000-Pinsir.png
similarity index 100%
rename from src/canonical/dex/front/0127--000--Pinsir.png
rename to src/canonical/dex/front/0127-000-Pinsir.png
diff --git a/src/canonical/dex/front/0127--420--Pinsir--Mega.png b/src/canonical/dex/front/0127-420-Pinsir-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0127--420--Pinsir--Mega.png
rename to src/canonical/dex/front/0127-420-Pinsir-Mega.png
diff --git a/src/canonical/dex/front/0128--000--Tauros.png b/src/canonical/dex/front/0128-000-Tauros.png
similarity index 100%
rename from src/canonical/dex/front/0128--000--Tauros.png
rename to src/canonical/dex/front/0128-000-Tauros.png
diff --git a/src/canonical/dex/front/0129--000--Magikarp.png b/src/canonical/dex/front/0129-000-Magikarp.png
similarity index 100%
rename from src/canonical/dex/front/0129--000--Magikarp.png
rename to src/canonical/dex/front/0129-000-Magikarp.png
diff --git a/src/canonical/dex/front/0130--000--Gyarados.png b/src/canonical/dex/front/0130-000-Gyarados.png
similarity index 100%
rename from src/canonical/dex/front/0130--000--Gyarados.png
rename to src/canonical/dex/front/0130-000-Gyarados.png
diff --git a/src/canonical/dex/front/0130--420--Gyarados--Mega.png b/src/canonical/dex/front/0130-420-Gyarados-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0130--420--Gyarados--Mega.png
rename to src/canonical/dex/front/0130-420-Gyarados-Mega.png
diff --git a/src/canonical/dex/front/0131--000--Lapras.png b/src/canonical/dex/front/0131-000-Lapras.png
similarity index 100%
rename from src/canonical/dex/front/0131--000--Lapras.png
rename to src/canonical/dex/front/0131-000-Lapras.png
diff --git a/src/canonical/dex/front/0132--000--Ditto.png b/src/canonical/dex/front/0132-000-Ditto.png
similarity index 100%
rename from src/canonical/dex/front/0132--000--Ditto.png
rename to src/canonical/dex/front/0132-000-Ditto.png
diff --git a/src/canonical/dex/front/0133--000--Eevee.png b/src/canonical/dex/front/0133-000-Eevee.png
similarity index 100%
rename from src/canonical/dex/front/0133--000--Eevee.png
rename to src/canonical/dex/front/0133-000-Eevee.png
diff --git a/src/canonical/dex/front/0133--420--Eevee--Starter.png b/src/canonical/dex/front/0133-420-Eevee-Starter.png
similarity index 100%
rename from src/canonical/dex/front/0133--420--Eevee--Starter.png
rename to src/canonical/dex/front/0133-420-Eevee-Starter.png
diff --git a/src/canonical/dex/front/0134--000--Vaporeon.png b/src/canonical/dex/front/0134-000-Vaporeon.png
similarity index 100%
rename from src/canonical/dex/front/0134--000--Vaporeon.png
rename to src/canonical/dex/front/0134-000-Vaporeon.png
diff --git a/src/canonical/dex/front/0135--000--Jolteon.png b/src/canonical/dex/front/0135-000-Jolteon.png
similarity index 100%
rename from src/canonical/dex/front/0135--000--Jolteon.png
rename to src/canonical/dex/front/0135-000-Jolteon.png
diff --git a/src/canonical/dex/front/0136--000--Flareon.png b/src/canonical/dex/front/0136-000-Flareon.png
similarity index 100%
rename from src/canonical/dex/front/0136--000--Flareon.png
rename to src/canonical/dex/front/0136-000-Flareon.png
diff --git a/src/canonical/dex/front/0137--000--Porygon.png b/src/canonical/dex/front/0137-000-Porygon.png
similarity index 100%
rename from src/canonical/dex/front/0137--000--Porygon.png
rename to src/canonical/dex/front/0137-000-Porygon.png
diff --git a/src/canonical/dex/front/0138--000--Omanyte.png b/src/canonical/dex/front/0138-000-Omanyte.png
similarity index 100%
rename from src/canonical/dex/front/0138--000--Omanyte.png
rename to src/canonical/dex/front/0138-000-Omanyte.png
diff --git a/src/canonical/dex/front/0139--000--Omastar.png b/src/canonical/dex/front/0139-000-Omastar.png
similarity index 100%
rename from src/canonical/dex/front/0139--000--Omastar.png
rename to src/canonical/dex/front/0139-000-Omastar.png
diff --git a/src/canonical/dex/front/0140--000--Kabuto.png b/src/canonical/dex/front/0140-000-Kabuto.png
similarity index 100%
rename from src/canonical/dex/front/0140--000--Kabuto.png
rename to src/canonical/dex/front/0140-000-Kabuto.png
diff --git a/src/canonical/dex/front/0141--000--Kabutops.png b/src/canonical/dex/front/0141-000-Kabutops.png
similarity index 100%
rename from src/canonical/dex/front/0141--000--Kabutops.png
rename to src/canonical/dex/front/0141-000-Kabutops.png
diff --git a/src/canonical/dex/front/0142--000--Aerodactyl.png b/src/canonical/dex/front/0142-000-Aerodactyl.png
similarity index 100%
rename from src/canonical/dex/front/0142--000--Aerodactyl.png
rename to src/canonical/dex/front/0142-000-Aerodactyl.png
diff --git a/src/canonical/dex/front/0142--420--Aerodactyl--Mega.png b/src/canonical/dex/front/0142-420-Aerodactyl-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0142--420--Aerodactyl--Mega.png
rename to src/canonical/dex/front/0142-420-Aerodactyl-Mega.png
diff --git a/src/canonical/dex/front/0143--000--Snorlax.png b/src/canonical/dex/front/0143-000-Snorlax.png
similarity index 100%
rename from src/canonical/dex/front/0143--000--Snorlax.png
rename to src/canonical/dex/front/0143-000-Snorlax.png
diff --git a/src/canonical/dex/front/0144--000--Articuno.png b/src/canonical/dex/front/0144-000-Articuno.png
similarity index 100%
rename from src/canonical/dex/front/0144--000--Articuno.png
rename to src/canonical/dex/front/0144-000-Articuno.png
diff --git a/src/canonical/dex/front/0145--000--Zapdos.png b/src/canonical/dex/front/0145-000-Zapdos.png
similarity index 100%
rename from src/canonical/dex/front/0145--000--Zapdos.png
rename to src/canonical/dex/front/0145-000-Zapdos.png
diff --git a/src/canonical/dex/front/0146--000--Moltres.png b/src/canonical/dex/front/0146-000-Moltres.png
similarity index 100%
rename from src/canonical/dex/front/0146--000--Moltres.png
rename to src/canonical/dex/front/0146-000-Moltres.png
diff --git a/src/canonical/dex/front/0147--000--Dratini.png b/src/canonical/dex/front/0147-000-Dratini.png
similarity index 100%
rename from src/canonical/dex/front/0147--000--Dratini.png
rename to src/canonical/dex/front/0147-000-Dratini.png
diff --git a/src/canonical/dex/front/0148--000--Dragonair.png b/src/canonical/dex/front/0148-000-Dragonair.png
similarity index 100%
rename from src/canonical/dex/front/0148--000--Dragonair.png
rename to src/canonical/dex/front/0148-000-Dragonair.png
diff --git a/src/canonical/dex/front/0149--000--Dragonite.png b/src/canonical/dex/front/0149-000-Dragonite.png
similarity index 100%
rename from src/canonical/dex/front/0149--000--Dragonite.png
rename to src/canonical/dex/front/0149-000-Dragonite.png
diff --git a/src/canonical/dex/front/0150--000--Mewtwo.png b/src/canonical/dex/front/0150-000-Mewtwo.png
similarity index 100%
rename from src/canonical/dex/front/0150--000--Mewtwo.png
rename to src/canonical/dex/front/0150-000-Mewtwo.png
diff --git a/src/canonical/dex/front/0150--420--Mewtwo--Mega-X.png b/src/canonical/dex/front/0150-420-Mewtwo-Mega~X.png
similarity index 100%
rename from src/canonical/dex/front/0150--420--Mewtwo--Mega-X.png
rename to src/canonical/dex/front/0150-420-Mewtwo-Mega~X.png
diff --git a/src/canonical/dex/front/0150--420--Mewtwo--Mega-Y.png b/src/canonical/dex/front/0150-420-Mewtwo-Mega~Y.png
similarity index 100%
rename from src/canonical/dex/front/0150--420--Mewtwo--Mega-Y.png
rename to src/canonical/dex/front/0150-420-Mewtwo-Mega~Y.png
diff --git a/src/canonical/dex/front/0151--000--Mew.png b/src/canonical/dex/front/0151-000-Mew.png
similarity index 100%
rename from src/canonical/dex/front/0151--000--Mew.png
rename to src/canonical/dex/front/0151-000-Mew.png
diff --git a/src/canonical/dex/front/0152--000--Chikorita.png b/src/canonical/dex/front/0152-000-Chikorita.png
similarity index 100%
rename from src/canonical/dex/front/0152--000--Chikorita.png
rename to src/canonical/dex/front/0152-000-Chikorita.png
diff --git a/src/canonical/dex/front/0153--000--Bayleef.png b/src/canonical/dex/front/0153-000-Bayleef.png
similarity index 100%
rename from src/canonical/dex/front/0153--000--Bayleef.png
rename to src/canonical/dex/front/0153-000-Bayleef.png
diff --git a/src/canonical/dex/front/0154--000--Meganium.png b/src/canonical/dex/front/0154-000-Meganium.png
similarity index 100%
rename from src/canonical/dex/front/0154--000--Meganium.png
rename to src/canonical/dex/front/0154-000-Meganium.png
diff --git a/src/canonical/dex/front/0155--000--Cyndaquil.png b/src/canonical/dex/front/0155-000-Cyndaquil.png
similarity index 100%
rename from src/canonical/dex/front/0155--000--Cyndaquil.png
rename to src/canonical/dex/front/0155-000-Cyndaquil.png
diff --git a/src/canonical/dex/front/0156--000--Quilava.png b/src/canonical/dex/front/0156-000-Quilava.png
similarity index 100%
rename from src/canonical/dex/front/0156--000--Quilava.png
rename to src/canonical/dex/front/0156-000-Quilava.png
diff --git a/src/canonical/dex/front/0157--000--Typhlosion.png b/src/canonical/dex/front/0157-000-Typhlosion.png
similarity index 100%
rename from src/canonical/dex/front/0157--000--Typhlosion.png
rename to src/canonical/dex/front/0157-000-Typhlosion.png
diff --git a/src/canonical/dex/front/0158--000--Totodile.png b/src/canonical/dex/front/0158-000-Totodile.png
similarity index 100%
rename from src/canonical/dex/front/0158--000--Totodile.png
rename to src/canonical/dex/front/0158-000-Totodile.png
diff --git a/src/canonical/dex/front/0159--000--Croconaw.png b/src/canonical/dex/front/0159-000-Croconaw.png
similarity index 100%
rename from src/canonical/dex/front/0159--000--Croconaw.png
rename to src/canonical/dex/front/0159-000-Croconaw.png
diff --git a/src/canonical/dex/front/0160--000--Feraligatr.png b/src/canonical/dex/front/0160-000-Feraligatr.png
similarity index 100%
rename from src/canonical/dex/front/0160--000--Feraligatr.png
rename to src/canonical/dex/front/0160-000-Feraligatr.png
diff --git a/src/canonical/dex/front/0161--000--Sentret.png b/src/canonical/dex/front/0161-000-Sentret.png
similarity index 100%
rename from src/canonical/dex/front/0161--000--Sentret.png
rename to src/canonical/dex/front/0161-000-Sentret.png
diff --git a/src/canonical/dex/front/0162--000--Furret.png b/src/canonical/dex/front/0162-000-Furret.png
similarity index 100%
rename from src/canonical/dex/front/0162--000--Furret.png
rename to src/canonical/dex/front/0162-000-Furret.png
diff --git a/src/canonical/dex/front/0163--000--Hoothoot.png b/src/canonical/dex/front/0163-000-Hoothoot.png
similarity index 100%
rename from src/canonical/dex/front/0163--000--Hoothoot.png
rename to src/canonical/dex/front/0163-000-Hoothoot.png
diff --git a/src/canonical/dex/front/0164--000--Noctowl.png b/src/canonical/dex/front/0164-000-Noctowl.png
similarity index 100%
rename from src/canonical/dex/front/0164--000--Noctowl.png
rename to src/canonical/dex/front/0164-000-Noctowl.png
diff --git a/src/canonical/dex/front/0165--000--Ledyba.png b/src/canonical/dex/front/0165-000-Ledyba.png
similarity index 100%
rename from src/canonical/dex/front/0165--000--Ledyba.png
rename to src/canonical/dex/front/0165-000-Ledyba.png
diff --git a/src/canonical/dex/front/0166--000--Ledian.png b/src/canonical/dex/front/0166-000-Ledian.png
similarity index 100%
rename from src/canonical/dex/front/0166--000--Ledian.png
rename to src/canonical/dex/front/0166-000-Ledian.png
diff --git a/src/canonical/dex/front/0167--000--Spinarak.png b/src/canonical/dex/front/0167-000-Spinarak.png
similarity index 100%
rename from src/canonical/dex/front/0167--000--Spinarak.png
rename to src/canonical/dex/front/0167-000-Spinarak.png
diff --git a/src/canonical/dex/front/0168--000--Ariados.png b/src/canonical/dex/front/0168-000-Ariados.png
similarity index 100%
rename from src/canonical/dex/front/0168--000--Ariados.png
rename to src/canonical/dex/front/0168-000-Ariados.png
diff --git a/src/canonical/dex/front/0169--000--Crobat.png b/src/canonical/dex/front/0169-000-Crobat.png
similarity index 100%
rename from src/canonical/dex/front/0169--000--Crobat.png
rename to src/canonical/dex/front/0169-000-Crobat.png
diff --git a/src/canonical/dex/front/0170--000--Chinchou.png b/src/canonical/dex/front/0170-000-Chinchou.png
similarity index 100%
rename from src/canonical/dex/front/0170--000--Chinchou.png
rename to src/canonical/dex/front/0170-000-Chinchou.png
diff --git a/src/canonical/dex/front/0171--000--Lanturn.png b/src/canonical/dex/front/0171-000-Lanturn.png
similarity index 100%
rename from src/canonical/dex/front/0171--000--Lanturn.png
rename to src/canonical/dex/front/0171-000-Lanturn.png
diff --git a/src/canonical/dex/front/0172--000--Pichu.png b/src/canonical/dex/front/0172-000-Pichu.png
similarity index 100%
rename from src/canonical/dex/front/0172--000--Pichu.png
rename to src/canonical/dex/front/0172-000-Pichu.png
diff --git a/src/canonical/dex/front/0173--000--Cleffa.png b/src/canonical/dex/front/0173-000-Cleffa.png
similarity index 100%
rename from src/canonical/dex/front/0173--000--Cleffa.png
rename to src/canonical/dex/front/0173-000-Cleffa.png
diff --git a/src/canonical/dex/front/0174--000--Igglybuff.png b/src/canonical/dex/front/0174-000-Igglybuff.png
similarity index 100%
rename from src/canonical/dex/front/0174--000--Igglybuff.png
rename to src/canonical/dex/front/0174-000-Igglybuff.png
diff --git a/src/canonical/dex/front/0175--000--Togepi.png b/src/canonical/dex/front/0175-000-Togepi.png
similarity index 100%
rename from src/canonical/dex/front/0175--000--Togepi.png
rename to src/canonical/dex/front/0175-000-Togepi.png
diff --git a/src/canonical/dex/front/0176--000--Togetic.png b/src/canonical/dex/front/0176-000-Togetic.png
similarity index 100%
rename from src/canonical/dex/front/0176--000--Togetic.png
rename to src/canonical/dex/front/0176-000-Togetic.png
diff --git a/src/canonical/dex/front/0177--000--Natu.png b/src/canonical/dex/front/0177-000-Natu.png
similarity index 100%
rename from src/canonical/dex/front/0177--000--Natu.png
rename to src/canonical/dex/front/0177-000-Natu.png
diff --git a/src/canonical/dex/front/0178--000--Xatu.png b/src/canonical/dex/front/0178-000-Xatu.png
similarity index 100%
rename from src/canonical/dex/front/0178--000--Xatu.png
rename to src/canonical/dex/front/0178-000-Xatu.png
diff --git a/src/canonical/dex/front/0179--000--Mareep.png b/src/canonical/dex/front/0179-000-Mareep.png
similarity index 100%
rename from src/canonical/dex/front/0179--000--Mareep.png
rename to src/canonical/dex/front/0179-000-Mareep.png
diff --git a/src/canonical/dex/front/0180--000--Flaaffy.png b/src/canonical/dex/front/0180-000-Flaaffy.png
similarity index 100%
rename from src/canonical/dex/front/0180--000--Flaaffy.png
rename to src/canonical/dex/front/0180-000-Flaaffy.png
diff --git a/src/canonical/dex/front/0181--000--Ampharos.png b/src/canonical/dex/front/0181-000-Ampharos.png
similarity index 100%
rename from src/canonical/dex/front/0181--000--Ampharos.png
rename to src/canonical/dex/front/0181-000-Ampharos.png
diff --git a/src/canonical/dex/front/0181--420--Ampharos--Mega.png b/src/canonical/dex/front/0181-420-Ampharos-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0181--420--Ampharos--Mega.png
rename to src/canonical/dex/front/0181-420-Ampharos-Mega.png
diff --git a/src/canonical/dex/front/0182--000--Bellossom.png b/src/canonical/dex/front/0182-000-Bellossom.png
similarity index 100%
rename from src/canonical/dex/front/0182--000--Bellossom.png
rename to src/canonical/dex/front/0182-000-Bellossom.png
diff --git a/src/canonical/dex/front/0183--000--Marill.png b/src/canonical/dex/front/0183-000-Marill.png
similarity index 100%
rename from src/canonical/dex/front/0183--000--Marill.png
rename to src/canonical/dex/front/0183-000-Marill.png
diff --git a/src/canonical/dex/front/0184--000--Azumarill.png b/src/canonical/dex/front/0184-000-Azumarill.png
similarity index 100%
rename from src/canonical/dex/front/0184--000--Azumarill.png
rename to src/canonical/dex/front/0184-000-Azumarill.png
diff --git a/src/canonical/dex/front/0185--000--Sudowoodo.png b/src/canonical/dex/front/0185-000-Sudowoodo.png
similarity index 100%
rename from src/canonical/dex/front/0185--000--Sudowoodo.png
rename to src/canonical/dex/front/0185-000-Sudowoodo.png
diff --git a/src/canonical/dex/front/0186--000--Politoed.png b/src/canonical/dex/front/0186-000-Politoed.png
similarity index 100%
rename from src/canonical/dex/front/0186--000--Politoed.png
rename to src/canonical/dex/front/0186-000-Politoed.png
diff --git a/src/canonical/dex/front/0187--000--Hoppip.png b/src/canonical/dex/front/0187-000-Hoppip.png
similarity index 100%
rename from src/canonical/dex/front/0187--000--Hoppip.png
rename to src/canonical/dex/front/0187-000-Hoppip.png
diff --git a/src/canonical/dex/front/0188--000--Skiploom.png b/src/canonical/dex/front/0188-000-Skiploom.png
similarity index 100%
rename from src/canonical/dex/front/0188--000--Skiploom.png
rename to src/canonical/dex/front/0188-000-Skiploom.png
diff --git a/src/canonical/dex/front/0189--000--Jumpluff.png b/src/canonical/dex/front/0189-000-Jumpluff.png
similarity index 100%
rename from src/canonical/dex/front/0189--000--Jumpluff.png
rename to src/canonical/dex/front/0189-000-Jumpluff.png
diff --git a/src/canonical/dex/front/0190--000--Aipom.png b/src/canonical/dex/front/0190-000-Aipom.png
similarity index 100%
rename from src/canonical/dex/front/0190--000--Aipom.png
rename to src/canonical/dex/front/0190-000-Aipom.png
diff --git a/src/canonical/dex/front/0191--000--Sunkern.png b/src/canonical/dex/front/0191-000-Sunkern.png
similarity index 100%
rename from src/canonical/dex/front/0191--000--Sunkern.png
rename to src/canonical/dex/front/0191-000-Sunkern.png
diff --git a/src/canonical/dex/front/0192--000--Sunflora.png b/src/canonical/dex/front/0192-000-Sunflora.png
similarity index 100%
rename from src/canonical/dex/front/0192--000--Sunflora.png
rename to src/canonical/dex/front/0192-000-Sunflora.png
diff --git a/src/canonical/dex/front/0193--000--Yanma.png b/src/canonical/dex/front/0193-000-Yanma.png
similarity index 100%
rename from src/canonical/dex/front/0193--000--Yanma.png
rename to src/canonical/dex/front/0193-000-Yanma.png
diff --git a/src/canonical/dex/front/0194--000--Wooper.png b/src/canonical/dex/front/0194-000-Wooper.png
similarity index 100%
rename from src/canonical/dex/front/0194--000--Wooper.png
rename to src/canonical/dex/front/0194-000-Wooper.png
diff --git a/src/canonical/dex/front/0195--000--Quagsire.png b/src/canonical/dex/front/0195-000-Quagsire.png
similarity index 100%
rename from src/canonical/dex/front/0195--000--Quagsire.png
rename to src/canonical/dex/front/0195-000-Quagsire.png
diff --git a/src/canonical/dex/front/0196--000--Espeon.png b/src/canonical/dex/front/0196-000-Espeon.png
similarity index 100%
rename from src/canonical/dex/front/0196--000--Espeon.png
rename to src/canonical/dex/front/0196-000-Espeon.png
diff --git a/src/canonical/dex/front/0197--000--Umbreon.png b/src/canonical/dex/front/0197-000-Umbreon.png
similarity index 100%
rename from src/canonical/dex/front/0197--000--Umbreon.png
rename to src/canonical/dex/front/0197-000-Umbreon.png
diff --git a/src/canonical/dex/front/0198--000--Murkrow.png b/src/canonical/dex/front/0198-000-Murkrow.png
similarity index 100%
rename from src/canonical/dex/front/0198--000--Murkrow.png
rename to src/canonical/dex/front/0198-000-Murkrow.png
diff --git a/src/canonical/dex/front/0199--000--Slowking.png b/src/canonical/dex/front/0199-000-Slowking.png
similarity index 100%
rename from src/canonical/dex/front/0199--000--Slowking.png
rename to src/canonical/dex/front/0199-000-Slowking.png
diff --git a/src/canonical/dex/front/0200--000--Misdreavus.png b/src/canonical/dex/front/0200-000-Misdreavus.png
similarity index 100%
rename from src/canonical/dex/front/0200--000--Misdreavus.png
rename to src/canonical/dex/front/0200-000-Misdreavus.png
diff --git a/src/canonical/dex/front/0201--000--Unown.png b/src/canonical/dex/front/0201-000-Unown.png
similarity index 100%
rename from src/canonical/dex/front/0201--000--Unown.png
rename to src/canonical/dex/front/0201-000-Unown.png
diff --git a/src/canonical/dex/front/0202--000--Wobbuffet.png b/src/canonical/dex/front/0202-000-Wobbuffet.png
similarity index 100%
rename from src/canonical/dex/front/0202--000--Wobbuffet.png
rename to src/canonical/dex/front/0202-000-Wobbuffet.png
diff --git a/src/canonical/dex/front/0203--000--Girafarig.png b/src/canonical/dex/front/0203-000-Girafarig.png
similarity index 100%
rename from src/canonical/dex/front/0203--000--Girafarig.png
rename to src/canonical/dex/front/0203-000-Girafarig.png
diff --git a/src/canonical/dex/front/0204--000--Pineco.png b/src/canonical/dex/front/0204-000-Pineco.png
similarity index 100%
rename from src/canonical/dex/front/0204--000--Pineco.png
rename to src/canonical/dex/front/0204-000-Pineco.png
diff --git a/src/canonical/dex/front/0205--000--Forretress.png b/src/canonical/dex/front/0205-000-Forretress.png
similarity index 100%
rename from src/canonical/dex/front/0205--000--Forretress.png
rename to src/canonical/dex/front/0205-000-Forretress.png
diff --git a/src/canonical/dex/front/0206--000--Dunsparce.png b/src/canonical/dex/front/0206-000-Dunsparce.png
similarity index 100%
rename from src/canonical/dex/front/0206--000--Dunsparce.png
rename to src/canonical/dex/front/0206-000-Dunsparce.png
diff --git a/src/canonical/dex/front/0207--000--Gligar.png b/src/canonical/dex/front/0207-000-Gligar.png
similarity index 100%
rename from src/canonical/dex/front/0207--000--Gligar.png
rename to src/canonical/dex/front/0207-000-Gligar.png
diff --git a/src/canonical/dex/front/0208--000--Steelix.png b/src/canonical/dex/front/0208-000-Steelix.png
similarity index 100%
rename from src/canonical/dex/front/0208--000--Steelix.png
rename to src/canonical/dex/front/0208-000-Steelix.png
diff --git a/src/canonical/dex/front/0208--420--Steelix--Mega.png b/src/canonical/dex/front/0208-420-Steelix-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0208--420--Steelix--Mega.png
rename to src/canonical/dex/front/0208-420-Steelix-Mega.png
diff --git a/src/canonical/dex/front/0209--000--Snubbull.png b/src/canonical/dex/front/0209-000-Snubbull.png
similarity index 100%
rename from src/canonical/dex/front/0209--000--Snubbull.png
rename to src/canonical/dex/front/0209-000-Snubbull.png
diff --git a/src/canonical/dex/front/0210--000--Granbull.png b/src/canonical/dex/front/0210-000-Granbull.png
similarity index 100%
rename from src/canonical/dex/front/0210--000--Granbull.png
rename to src/canonical/dex/front/0210-000-Granbull.png
diff --git a/src/canonical/dex/front/0211--000--Qwilfish.png b/src/canonical/dex/front/0211-000-Qwilfish.png
similarity index 100%
rename from src/canonical/dex/front/0211--000--Qwilfish.png
rename to src/canonical/dex/front/0211-000-Qwilfish.png
diff --git a/src/canonical/dex/front/0212--000--Scizor.png b/src/canonical/dex/front/0212-000-Scizor.png
similarity index 100%
rename from src/canonical/dex/front/0212--000--Scizor.png
rename to src/canonical/dex/front/0212-000-Scizor.png
diff --git a/src/canonical/dex/front/0212--420--Scizor--Mega.png b/src/canonical/dex/front/0212-420-Scizor-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0212--420--Scizor--Mega.png
rename to src/canonical/dex/front/0212-420-Scizor-Mega.png
diff --git a/src/canonical/dex/front/0213--000--Shuckle.png b/src/canonical/dex/front/0213-000-Shuckle.png
similarity index 100%
rename from src/canonical/dex/front/0213--000--Shuckle.png
rename to src/canonical/dex/front/0213-000-Shuckle.png
diff --git a/src/canonical/dex/front/0214--000--Heracross.png b/src/canonical/dex/front/0214-000-Heracross.png
similarity index 100%
rename from src/canonical/dex/front/0214--000--Heracross.png
rename to src/canonical/dex/front/0214-000-Heracross.png
diff --git a/src/canonical/dex/front/0214--420--Heracross--Mega.png b/src/canonical/dex/front/0214-420-Heracross-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0214--420--Heracross--Mega.png
rename to src/canonical/dex/front/0214-420-Heracross-Mega.png
diff --git a/src/canonical/dex/front/0215--000--Sneasel.png b/src/canonical/dex/front/0215-000-Sneasel.png
similarity index 100%
rename from src/canonical/dex/front/0215--000--Sneasel.png
rename to src/canonical/dex/front/0215-000-Sneasel.png
diff --git a/src/canonical/dex/front/0216--000--Teddiursa.png b/src/canonical/dex/front/0216-000-Teddiursa.png
similarity index 100%
rename from src/canonical/dex/front/0216--000--Teddiursa.png
rename to src/canonical/dex/front/0216-000-Teddiursa.png
diff --git a/src/canonical/dex/front/0217--000--Ursaring.png b/src/canonical/dex/front/0217-000-Ursaring.png
similarity index 100%
rename from src/canonical/dex/front/0217--000--Ursaring.png
rename to src/canonical/dex/front/0217-000-Ursaring.png
diff --git a/src/canonical/dex/front/0218--000--Slugma.png b/src/canonical/dex/front/0218-000-Slugma.png
similarity index 100%
rename from src/canonical/dex/front/0218--000--Slugma.png
rename to src/canonical/dex/front/0218-000-Slugma.png
diff --git a/src/canonical/dex/front/0219--000--Magcargo.png b/src/canonical/dex/front/0219-000-Magcargo.png
similarity index 100%
rename from src/canonical/dex/front/0219--000--Magcargo.png
rename to src/canonical/dex/front/0219-000-Magcargo.png
diff --git a/src/canonical/dex/front/0220--000--Swinub.png b/src/canonical/dex/front/0220-000-Swinub.png
similarity index 100%
rename from src/canonical/dex/front/0220--000--Swinub.png
rename to src/canonical/dex/front/0220-000-Swinub.png
diff --git a/src/canonical/dex/front/0221--000--Piloswine.png b/src/canonical/dex/front/0221-000-Piloswine.png
similarity index 100%
rename from src/canonical/dex/front/0221--000--Piloswine.png
rename to src/canonical/dex/front/0221-000-Piloswine.png
diff --git a/src/canonical/dex/front/0222--000--Corsola.png b/src/canonical/dex/front/0222-000-Corsola.png
similarity index 100%
rename from src/canonical/dex/front/0222--000--Corsola.png
rename to src/canonical/dex/front/0222-000-Corsola.png
diff --git a/src/canonical/dex/front/0223--000--Remoraid.png b/src/canonical/dex/front/0223-000-Remoraid.png
similarity index 100%
rename from src/canonical/dex/front/0223--000--Remoraid.png
rename to src/canonical/dex/front/0223-000-Remoraid.png
diff --git a/src/canonical/dex/front/0224--000--Octillery.png b/src/canonical/dex/front/0224-000-Octillery.png
similarity index 100%
rename from src/canonical/dex/front/0224--000--Octillery.png
rename to src/canonical/dex/front/0224-000-Octillery.png
diff --git a/src/canonical/dex/front/0225--000--Delibird.png b/src/canonical/dex/front/0225-000-Delibird.png
similarity index 100%
rename from src/canonical/dex/front/0225--000--Delibird.png
rename to src/canonical/dex/front/0225-000-Delibird.png
diff --git a/src/canonical/dex/front/0226--000--Mantine.png b/src/canonical/dex/front/0226-000-Mantine.png
similarity index 100%
rename from src/canonical/dex/front/0226--000--Mantine.png
rename to src/canonical/dex/front/0226-000-Mantine.png
diff --git a/src/canonical/dex/front/0227--000--Skarmory.png b/src/canonical/dex/front/0227-000-Skarmory.png
similarity index 100%
rename from src/canonical/dex/front/0227--000--Skarmory.png
rename to src/canonical/dex/front/0227-000-Skarmory.png
diff --git a/src/canonical/dex/front/0228--000--Houndour.png b/src/canonical/dex/front/0228-000-Houndour.png
similarity index 100%
rename from src/canonical/dex/front/0228--000--Houndour.png
rename to src/canonical/dex/front/0228-000-Houndour.png
diff --git a/src/canonical/dex/front/0229--000--Houndoom.png b/src/canonical/dex/front/0229-000-Houndoom.png
similarity index 100%
rename from src/canonical/dex/front/0229--000--Houndoom.png
rename to src/canonical/dex/front/0229-000-Houndoom.png
diff --git a/src/canonical/dex/front/0229--420--Houndoom--Mega.png b/src/canonical/dex/front/0229-420-Houndoom-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0229--420--Houndoom--Mega.png
rename to src/canonical/dex/front/0229-420-Houndoom-Mega.png
diff --git a/src/canonical/dex/front/0230--000--Kingdra.png b/src/canonical/dex/front/0230-000-Kingdra.png
similarity index 100%
rename from src/canonical/dex/front/0230--000--Kingdra.png
rename to src/canonical/dex/front/0230-000-Kingdra.png
diff --git a/src/canonical/dex/front/0231--000--Phanpy.png b/src/canonical/dex/front/0231-000-Phanpy.png
similarity index 100%
rename from src/canonical/dex/front/0231--000--Phanpy.png
rename to src/canonical/dex/front/0231-000-Phanpy.png
diff --git a/src/canonical/dex/front/0232--000--Donphan.png b/src/canonical/dex/front/0232-000-Donphan.png
similarity index 100%
rename from src/canonical/dex/front/0232--000--Donphan.png
rename to src/canonical/dex/front/0232-000-Donphan.png
diff --git a/src/canonical/dex/front/0233--000--Porygon2.png b/src/canonical/dex/front/0233-000-Porygon2.png
similarity index 100%
rename from src/canonical/dex/front/0233--000--Porygon2.png
rename to src/canonical/dex/front/0233-000-Porygon2.png
diff --git a/src/canonical/dex/front/0234--000--Stantler.png b/src/canonical/dex/front/0234-000-Stantler.png
similarity index 100%
rename from src/canonical/dex/front/0234--000--Stantler.png
rename to src/canonical/dex/front/0234-000-Stantler.png
diff --git a/src/canonical/dex/front/0235--000--Smeargle.png b/src/canonical/dex/front/0235-000-Smeargle.png
similarity index 100%
rename from src/canonical/dex/front/0235--000--Smeargle.png
rename to src/canonical/dex/front/0235-000-Smeargle.png
diff --git a/src/canonical/dex/front/0236--000--Tyrogue.png b/src/canonical/dex/front/0236-000-Tyrogue.png
similarity index 100%
rename from src/canonical/dex/front/0236--000--Tyrogue.png
rename to src/canonical/dex/front/0236-000-Tyrogue.png
diff --git a/src/canonical/dex/front/0237--000--Hitmontop.png b/src/canonical/dex/front/0237-000-Hitmontop.png
similarity index 100%
rename from src/canonical/dex/front/0237--000--Hitmontop.png
rename to src/canonical/dex/front/0237-000-Hitmontop.png
diff --git a/src/canonical/dex/front/0238--000--Smoochum.png b/src/canonical/dex/front/0238-000-Smoochum.png
similarity index 100%
rename from src/canonical/dex/front/0238--000--Smoochum.png
rename to src/canonical/dex/front/0238-000-Smoochum.png
diff --git a/src/canonical/dex/front/0239--000--Elekid.png b/src/canonical/dex/front/0239-000-Elekid.png
similarity index 100%
rename from src/canonical/dex/front/0239--000--Elekid.png
rename to src/canonical/dex/front/0239-000-Elekid.png
diff --git a/src/canonical/dex/front/0240--000--Magby.png b/src/canonical/dex/front/0240-000-Magby.png
similarity index 100%
rename from src/canonical/dex/front/0240--000--Magby.png
rename to src/canonical/dex/front/0240-000-Magby.png
diff --git a/src/canonical/dex/front/0241--000--Miltank.png b/src/canonical/dex/front/0241-000-Miltank.png
similarity index 100%
rename from src/canonical/dex/front/0241--000--Miltank.png
rename to src/canonical/dex/front/0241-000-Miltank.png
diff --git a/src/canonical/dex/front/0242--000--Blissey.png b/src/canonical/dex/front/0242-000-Blissey.png
similarity index 100%
rename from src/canonical/dex/front/0242--000--Blissey.png
rename to src/canonical/dex/front/0242-000-Blissey.png
diff --git a/src/canonical/dex/front/0243--000--Raikou.png b/src/canonical/dex/front/0243-000-Raikou.png
similarity index 100%
rename from src/canonical/dex/front/0243--000--Raikou.png
rename to src/canonical/dex/front/0243-000-Raikou.png
diff --git a/src/canonical/dex/front/0244--000--Entei.png b/src/canonical/dex/front/0244-000-Entei.png
similarity index 100%
rename from src/canonical/dex/front/0244--000--Entei.png
rename to src/canonical/dex/front/0244-000-Entei.png
diff --git a/src/canonical/dex/front/0245--000--Suicune.png b/src/canonical/dex/front/0245-000-Suicune.png
similarity index 100%
rename from src/canonical/dex/front/0245--000--Suicune.png
rename to src/canonical/dex/front/0245-000-Suicune.png
diff --git a/src/canonical/dex/front/0246--000--Larvitar.png b/src/canonical/dex/front/0246-000-Larvitar.png
similarity index 100%
rename from src/canonical/dex/front/0246--000--Larvitar.png
rename to src/canonical/dex/front/0246-000-Larvitar.png
diff --git a/src/canonical/dex/front/0247--000--Pupitar.png b/src/canonical/dex/front/0247-000-Pupitar.png
similarity index 100%
rename from src/canonical/dex/front/0247--000--Pupitar.png
rename to src/canonical/dex/front/0247-000-Pupitar.png
diff --git a/src/canonical/dex/front/0248--000--Tyranitar.png b/src/canonical/dex/front/0248-000-Tyranitar.png
similarity index 100%
rename from src/canonical/dex/front/0248--000--Tyranitar.png
rename to src/canonical/dex/front/0248-000-Tyranitar.png
diff --git a/src/canonical/dex/front/0248--420--Tyranitar--Mega.png b/src/canonical/dex/front/0248-420-Tyranitar-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0248--420--Tyranitar--Mega.png
rename to src/canonical/dex/front/0248-420-Tyranitar-Mega.png
diff --git a/src/canonical/dex/front/0249--000--Lugia.png b/src/canonical/dex/front/0249-000-Lugia.png
similarity index 100%
rename from src/canonical/dex/front/0249--000--Lugia.png
rename to src/canonical/dex/front/0249-000-Lugia.png
diff --git a/src/canonical/dex/front/0250--000--Ho-Oh.png b/src/canonical/dex/front/0250-000-Ho~Oh.png
similarity index 100%
rename from src/canonical/dex/front/0250--000--Ho-Oh.png
rename to src/canonical/dex/front/0250-000-Ho~Oh.png
diff --git a/src/canonical/dex/front/0251--000--Celebi.png b/src/canonical/dex/front/0251-000-Celebi.png
similarity index 100%
rename from src/canonical/dex/front/0251--000--Celebi.png
rename to src/canonical/dex/front/0251-000-Celebi.png
diff --git a/src/canonical/dex/front/0252--000--Treecko.png b/src/canonical/dex/front/0252-000-Treecko.png
similarity index 100%
rename from src/canonical/dex/front/0252--000--Treecko.png
rename to src/canonical/dex/front/0252-000-Treecko.png
diff --git a/src/canonical/dex/front/0253--000--Grovyle.png b/src/canonical/dex/front/0253-000-Grovyle.png
similarity index 100%
rename from src/canonical/dex/front/0253--000--Grovyle.png
rename to src/canonical/dex/front/0253-000-Grovyle.png
diff --git a/src/canonical/dex/front/0254--000--Sceptile.png b/src/canonical/dex/front/0254-000-Sceptile.png
similarity index 100%
rename from src/canonical/dex/front/0254--000--Sceptile.png
rename to src/canonical/dex/front/0254-000-Sceptile.png
diff --git a/src/canonical/dex/front/0254--420--Sceptile--Mega.png b/src/canonical/dex/front/0254-420-Sceptile-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0254--420--Sceptile--Mega.png
rename to src/canonical/dex/front/0254-420-Sceptile-Mega.png
diff --git a/src/canonical/dex/front/0255--000--Torchic.png b/src/canonical/dex/front/0255-000-Torchic.png
similarity index 100%
rename from src/canonical/dex/front/0255--000--Torchic.png
rename to src/canonical/dex/front/0255-000-Torchic.png
diff --git a/src/canonical/dex/front/0256--000--Combusken.png b/src/canonical/dex/front/0256-000-Combusken.png
similarity index 100%
rename from src/canonical/dex/front/0256--000--Combusken.png
rename to src/canonical/dex/front/0256-000-Combusken.png
diff --git a/src/canonical/dex/front/0257--000--Blaziken.png b/src/canonical/dex/front/0257-000-Blaziken.png
similarity index 100%
rename from src/canonical/dex/front/0257--000--Blaziken.png
rename to src/canonical/dex/front/0257-000-Blaziken.png
diff --git a/src/canonical/dex/front/0257--420--Blaziken--Mega.png b/src/canonical/dex/front/0257-420-Blaziken-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0257--420--Blaziken--Mega.png
rename to src/canonical/dex/front/0257-420-Blaziken-Mega.png
diff --git a/src/canonical/dex/front/0258--000--Mudkip.png b/src/canonical/dex/front/0258-000-Mudkip.png
similarity index 100%
rename from src/canonical/dex/front/0258--000--Mudkip.png
rename to src/canonical/dex/front/0258-000-Mudkip.png
diff --git a/src/canonical/dex/front/0259--000--Marshtomp.png b/src/canonical/dex/front/0259-000-Marshtomp.png
similarity index 100%
rename from src/canonical/dex/front/0259--000--Marshtomp.png
rename to src/canonical/dex/front/0259-000-Marshtomp.png
diff --git a/src/canonical/dex/front/0260--000--Swampert.png b/src/canonical/dex/front/0260-000-Swampert.png
similarity index 100%
rename from src/canonical/dex/front/0260--000--Swampert.png
rename to src/canonical/dex/front/0260-000-Swampert.png
diff --git a/src/canonical/dex/front/0260--420--Swampert--Mega.png b/src/canonical/dex/front/0260-420-Swampert-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0260--420--Swampert--Mega.png
rename to src/canonical/dex/front/0260-420-Swampert-Mega.png
diff --git a/src/canonical/dex/front/0261--000--Poochyena.png b/src/canonical/dex/front/0261-000-Poochyena.png
similarity index 100%
rename from src/canonical/dex/front/0261--000--Poochyena.png
rename to src/canonical/dex/front/0261-000-Poochyena.png
diff --git a/src/canonical/dex/front/0262--000--Mightyena.png b/src/canonical/dex/front/0262-000-Mightyena.png
similarity index 100%
rename from src/canonical/dex/front/0262--000--Mightyena.png
rename to src/canonical/dex/front/0262-000-Mightyena.png
diff --git a/src/canonical/dex/front/0263--000--Zigzagoon.png b/src/canonical/dex/front/0263-000-Zigzagoon.png
similarity index 100%
rename from src/canonical/dex/front/0263--000--Zigzagoon.png
rename to src/canonical/dex/front/0263-000-Zigzagoon.png
diff --git a/src/canonical/dex/front/0264--000--Linoone.png b/src/canonical/dex/front/0264-000-Linoone.png
similarity index 100%
rename from src/canonical/dex/front/0264--000--Linoone.png
rename to src/canonical/dex/front/0264-000-Linoone.png
diff --git a/src/canonical/dex/front/0265--000--Wurmple.png b/src/canonical/dex/front/0265-000-Wurmple.png
similarity index 100%
rename from src/canonical/dex/front/0265--000--Wurmple.png
rename to src/canonical/dex/front/0265-000-Wurmple.png
diff --git a/src/canonical/dex/front/0266--000--Silcoon.png b/src/canonical/dex/front/0266-000-Silcoon.png
similarity index 100%
rename from src/canonical/dex/front/0266--000--Silcoon.png
rename to src/canonical/dex/front/0266-000-Silcoon.png
diff --git a/src/canonical/dex/front/0267--000--Beautifly.png b/src/canonical/dex/front/0267-000-Beautifly.png
similarity index 100%
rename from src/canonical/dex/front/0267--000--Beautifly.png
rename to src/canonical/dex/front/0267-000-Beautifly.png
diff --git a/src/canonical/dex/front/0268--000--Cascoon.png b/src/canonical/dex/front/0268-000-Cascoon.png
similarity index 100%
rename from src/canonical/dex/front/0268--000--Cascoon.png
rename to src/canonical/dex/front/0268-000-Cascoon.png
diff --git a/src/canonical/dex/front/0269--000--Dustox.png b/src/canonical/dex/front/0269-000-Dustox.png
similarity index 100%
rename from src/canonical/dex/front/0269--000--Dustox.png
rename to src/canonical/dex/front/0269-000-Dustox.png
diff --git a/src/canonical/dex/front/0270--000--Lotad.png b/src/canonical/dex/front/0270-000-Lotad.png
similarity index 100%
rename from src/canonical/dex/front/0270--000--Lotad.png
rename to src/canonical/dex/front/0270-000-Lotad.png
diff --git a/src/canonical/dex/front/0271--000--Lombre.png b/src/canonical/dex/front/0271-000-Lombre.png
similarity index 100%
rename from src/canonical/dex/front/0271--000--Lombre.png
rename to src/canonical/dex/front/0271-000-Lombre.png
diff --git a/src/canonical/dex/front/0272--000--Ludicolo.png b/src/canonical/dex/front/0272-000-Ludicolo.png
similarity index 100%
rename from src/canonical/dex/front/0272--000--Ludicolo.png
rename to src/canonical/dex/front/0272-000-Ludicolo.png
diff --git a/src/canonical/dex/front/0273--000--Seedot.png b/src/canonical/dex/front/0273-000-Seedot.png
similarity index 100%
rename from src/canonical/dex/front/0273--000--Seedot.png
rename to src/canonical/dex/front/0273-000-Seedot.png
diff --git a/src/canonical/dex/front/0274--000--Nuzleaf.png b/src/canonical/dex/front/0274-000-Nuzleaf.png
similarity index 100%
rename from src/canonical/dex/front/0274--000--Nuzleaf.png
rename to src/canonical/dex/front/0274-000-Nuzleaf.png
diff --git a/src/canonical/dex/front/0275--000--Shiftry.png b/src/canonical/dex/front/0275-000-Shiftry.png
similarity index 100%
rename from src/canonical/dex/front/0275--000--Shiftry.png
rename to src/canonical/dex/front/0275-000-Shiftry.png
diff --git a/src/canonical/dex/front/0276--000--Taillow.png b/src/canonical/dex/front/0276-000-Taillow.png
similarity index 100%
rename from src/canonical/dex/front/0276--000--Taillow.png
rename to src/canonical/dex/front/0276-000-Taillow.png
diff --git a/src/canonical/dex/front/0277--000--Swellow.png b/src/canonical/dex/front/0277-000-Swellow.png
similarity index 100%
rename from src/canonical/dex/front/0277--000--Swellow.png
rename to src/canonical/dex/front/0277-000-Swellow.png
diff --git a/src/canonical/dex/front/0278--000--Wingull.png b/src/canonical/dex/front/0278-000-Wingull.png
similarity index 100%
rename from src/canonical/dex/front/0278--000--Wingull.png
rename to src/canonical/dex/front/0278-000-Wingull.png
diff --git a/src/canonical/dex/front/0279--000--Pelipper.png b/src/canonical/dex/front/0279-000-Pelipper.png
similarity index 100%
rename from src/canonical/dex/front/0279--000--Pelipper.png
rename to src/canonical/dex/front/0279-000-Pelipper.png
diff --git a/src/canonical/dex/front/0280--000--Ralts.png b/src/canonical/dex/front/0280-000-Ralts.png
similarity index 100%
rename from src/canonical/dex/front/0280--000--Ralts.png
rename to src/canonical/dex/front/0280-000-Ralts.png
diff --git a/src/canonical/dex/front/0281--000--Kirlia.png b/src/canonical/dex/front/0281-000-Kirlia.png
similarity index 100%
rename from src/canonical/dex/front/0281--000--Kirlia.png
rename to src/canonical/dex/front/0281-000-Kirlia.png
diff --git a/src/canonical/dex/front/0282--000--Gardevoir.png b/src/canonical/dex/front/0282-000-Gardevoir.png
similarity index 100%
rename from src/canonical/dex/front/0282--000--Gardevoir.png
rename to src/canonical/dex/front/0282-000-Gardevoir.png
diff --git a/src/canonical/dex/front/0282--420--Gardevoir--Mega.png b/src/canonical/dex/front/0282-420-Gardevoir-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0282--420--Gardevoir--Mega.png
rename to src/canonical/dex/front/0282-420-Gardevoir-Mega.png
diff --git a/src/canonical/dex/front/0283--000--Surskit.png b/src/canonical/dex/front/0283-000-Surskit.png
similarity index 100%
rename from src/canonical/dex/front/0283--000--Surskit.png
rename to src/canonical/dex/front/0283-000-Surskit.png
diff --git a/src/canonical/dex/front/0284--000--Masquerain.png b/src/canonical/dex/front/0284-000-Masquerain.png
similarity index 100%
rename from src/canonical/dex/front/0284--000--Masquerain.png
rename to src/canonical/dex/front/0284-000-Masquerain.png
diff --git a/src/canonical/dex/front/0285--000--Shroomish.png b/src/canonical/dex/front/0285-000-Shroomish.png
similarity index 100%
rename from src/canonical/dex/front/0285--000--Shroomish.png
rename to src/canonical/dex/front/0285-000-Shroomish.png
diff --git a/src/canonical/dex/front/0286--000--Breloom.png b/src/canonical/dex/front/0286-000-Breloom.png
similarity index 100%
rename from src/canonical/dex/front/0286--000--Breloom.png
rename to src/canonical/dex/front/0286-000-Breloom.png
diff --git a/src/canonical/dex/front/0287--000--Slakoth.png b/src/canonical/dex/front/0287-000-Slakoth.png
similarity index 100%
rename from src/canonical/dex/front/0287--000--Slakoth.png
rename to src/canonical/dex/front/0287-000-Slakoth.png
diff --git a/src/canonical/dex/front/0288--000--Vigoroth.png b/src/canonical/dex/front/0288-000-Vigoroth.png
similarity index 100%
rename from src/canonical/dex/front/0288--000--Vigoroth.png
rename to src/canonical/dex/front/0288-000-Vigoroth.png
diff --git a/src/canonical/dex/front/0289--000--Slaking.png b/src/canonical/dex/front/0289-000-Slaking.png
similarity index 100%
rename from src/canonical/dex/front/0289--000--Slaking.png
rename to src/canonical/dex/front/0289-000-Slaking.png
diff --git a/src/canonical/dex/front/0290--000--Nincada.png b/src/canonical/dex/front/0290-000-Nincada.png
similarity index 100%
rename from src/canonical/dex/front/0290--000--Nincada.png
rename to src/canonical/dex/front/0290-000-Nincada.png
diff --git a/src/canonical/dex/front/0291--000--Ninjask.png b/src/canonical/dex/front/0291-000-Ninjask.png
similarity index 100%
rename from src/canonical/dex/front/0291--000--Ninjask.png
rename to src/canonical/dex/front/0291-000-Ninjask.png
diff --git a/src/canonical/dex/front/0292--000--Shedinja.png b/src/canonical/dex/front/0292-000-Shedinja.png
similarity index 100%
rename from src/canonical/dex/front/0292--000--Shedinja.png
rename to src/canonical/dex/front/0292-000-Shedinja.png
diff --git a/src/canonical/dex/front/0293--000--Whismur.png b/src/canonical/dex/front/0293-000-Whismur.png
similarity index 100%
rename from src/canonical/dex/front/0293--000--Whismur.png
rename to src/canonical/dex/front/0293-000-Whismur.png
diff --git a/src/canonical/dex/front/0294--000--Loudred.png b/src/canonical/dex/front/0294-000-Loudred.png
similarity index 100%
rename from src/canonical/dex/front/0294--000--Loudred.png
rename to src/canonical/dex/front/0294-000-Loudred.png
diff --git a/src/canonical/dex/front/0295--000--Exploud.png b/src/canonical/dex/front/0295-000-Exploud.png
similarity index 100%
rename from src/canonical/dex/front/0295--000--Exploud.png
rename to src/canonical/dex/front/0295-000-Exploud.png
diff --git a/src/canonical/dex/front/0296--000--Makuhita.png b/src/canonical/dex/front/0296-000-Makuhita.png
similarity index 100%
rename from src/canonical/dex/front/0296--000--Makuhita.png
rename to src/canonical/dex/front/0296-000-Makuhita.png
diff --git a/src/canonical/dex/front/0297--000--Hariyama.png b/src/canonical/dex/front/0297-000-Hariyama.png
similarity index 100%
rename from src/canonical/dex/front/0297--000--Hariyama.png
rename to src/canonical/dex/front/0297-000-Hariyama.png
diff --git a/src/canonical/dex/front/0298--000--Azurill.png b/src/canonical/dex/front/0298-000-Azurill.png
similarity index 100%
rename from src/canonical/dex/front/0298--000--Azurill.png
rename to src/canonical/dex/front/0298-000-Azurill.png
diff --git a/src/canonical/dex/front/0299--000--Nosepass.png b/src/canonical/dex/front/0299-000-Nosepass.png
similarity index 100%
rename from src/canonical/dex/front/0299--000--Nosepass.png
rename to src/canonical/dex/front/0299-000-Nosepass.png
diff --git a/src/canonical/dex/front/0300--000--Skitty.png b/src/canonical/dex/front/0300-000-Skitty.png
similarity index 100%
rename from src/canonical/dex/front/0300--000--Skitty.png
rename to src/canonical/dex/front/0300-000-Skitty.png
diff --git a/src/canonical/dex/front/0301--000--Delcatty.png b/src/canonical/dex/front/0301-000-Delcatty.png
similarity index 100%
rename from src/canonical/dex/front/0301--000--Delcatty.png
rename to src/canonical/dex/front/0301-000-Delcatty.png
diff --git a/src/canonical/dex/front/0302--000--Sableye.png b/src/canonical/dex/front/0302-000-Sableye.png
similarity index 100%
rename from src/canonical/dex/front/0302--000--Sableye.png
rename to src/canonical/dex/front/0302-000-Sableye.png
diff --git a/src/canonical/dex/front/0302--420--Sableye--Mega.png b/src/canonical/dex/front/0302-420-Sableye-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0302--420--Sableye--Mega.png
rename to src/canonical/dex/front/0302-420-Sableye-Mega.png
diff --git a/src/canonical/dex/front/0303--000--Mawile.png b/src/canonical/dex/front/0303-000-Mawile.png
similarity index 100%
rename from src/canonical/dex/front/0303--000--Mawile.png
rename to src/canonical/dex/front/0303-000-Mawile.png
diff --git a/src/canonical/dex/front/0303--420--Mawile--Mega.png b/src/canonical/dex/front/0303-420-Mawile-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0303--420--Mawile--Mega.png
rename to src/canonical/dex/front/0303-420-Mawile-Mega.png
diff --git a/src/canonical/dex/front/0304--000--Aron.png b/src/canonical/dex/front/0304-000-Aron.png
similarity index 100%
rename from src/canonical/dex/front/0304--000--Aron.png
rename to src/canonical/dex/front/0304-000-Aron.png
diff --git a/src/canonical/dex/front/0305--000--Lairon.png b/src/canonical/dex/front/0305-000-Lairon.png
similarity index 100%
rename from src/canonical/dex/front/0305--000--Lairon.png
rename to src/canonical/dex/front/0305-000-Lairon.png
diff --git a/src/canonical/dex/front/0306--000--Aggron.png b/src/canonical/dex/front/0306-000-Aggron.png
similarity index 100%
rename from src/canonical/dex/front/0306--000--Aggron.png
rename to src/canonical/dex/front/0306-000-Aggron.png
diff --git a/src/canonical/dex/front/0306--420--Aggron--Mega.png b/src/canonical/dex/front/0306-420-Aggron-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0306--420--Aggron--Mega.png
rename to src/canonical/dex/front/0306-420-Aggron-Mega.png
diff --git a/src/canonical/dex/front/0307--000--Meditite.png b/src/canonical/dex/front/0307-000-Meditite.png
similarity index 100%
rename from src/canonical/dex/front/0307--000--Meditite.png
rename to src/canonical/dex/front/0307-000-Meditite.png
diff --git a/src/canonical/dex/front/0308--000--Medicham.png b/src/canonical/dex/front/0308-000-Medicham.png
similarity index 100%
rename from src/canonical/dex/front/0308--000--Medicham.png
rename to src/canonical/dex/front/0308-000-Medicham.png
diff --git a/src/canonical/dex/front/0308--420--Medicham--Mega.png b/src/canonical/dex/front/0308-420-Medicham-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0308--420--Medicham--Mega.png
rename to src/canonical/dex/front/0308-420-Medicham-Mega.png
diff --git a/src/canonical/dex/front/0309--000--Electrike.png b/src/canonical/dex/front/0309-000-Electrike.png
similarity index 100%
rename from src/canonical/dex/front/0309--000--Electrike.png
rename to src/canonical/dex/front/0309-000-Electrike.png
diff --git a/src/canonical/dex/front/0310--000--Manectric.png b/src/canonical/dex/front/0310-000-Manectric.png
similarity index 100%
rename from src/canonical/dex/front/0310--000--Manectric.png
rename to src/canonical/dex/front/0310-000-Manectric.png
diff --git a/src/canonical/dex/front/0310--420--Manectric--Mega.png b/src/canonical/dex/front/0310-420-Manectric-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0310--420--Manectric--Mega.png
rename to src/canonical/dex/front/0310-420-Manectric-Mega.png
diff --git a/src/canonical/dex/front/0311--000--Plusle.png b/src/canonical/dex/front/0311-000-Plusle.png
similarity index 100%
rename from src/canonical/dex/front/0311--000--Plusle.png
rename to src/canonical/dex/front/0311-000-Plusle.png
diff --git a/src/canonical/dex/front/0312--000--Minun.png b/src/canonical/dex/front/0312-000-Minun.png
similarity index 100%
rename from src/canonical/dex/front/0312--000--Minun.png
rename to src/canonical/dex/front/0312-000-Minun.png
diff --git a/src/canonical/dex/front/0313--000--Volbeat.png b/src/canonical/dex/front/0313-000-Volbeat.png
similarity index 100%
rename from src/canonical/dex/front/0313--000--Volbeat.png
rename to src/canonical/dex/front/0313-000-Volbeat.png
diff --git a/src/canonical/dex/front/0314--000--Illumise.png b/src/canonical/dex/front/0314-000-Illumise.png
similarity index 100%
rename from src/canonical/dex/front/0314--000--Illumise.png
rename to src/canonical/dex/front/0314-000-Illumise.png
diff --git a/src/canonical/dex/front/0315--000--Roselia.png b/src/canonical/dex/front/0315-000-Roselia.png
similarity index 100%
rename from src/canonical/dex/front/0315--000--Roselia.png
rename to src/canonical/dex/front/0315-000-Roselia.png
diff --git a/src/canonical/dex/front/0316--000--Gulpin.png b/src/canonical/dex/front/0316-000-Gulpin.png
similarity index 100%
rename from src/canonical/dex/front/0316--000--Gulpin.png
rename to src/canonical/dex/front/0316-000-Gulpin.png
diff --git a/src/canonical/dex/front/0317--000--Swalot.png b/src/canonical/dex/front/0317-000-Swalot.png
similarity index 100%
rename from src/canonical/dex/front/0317--000--Swalot.png
rename to src/canonical/dex/front/0317-000-Swalot.png
diff --git a/src/canonical/dex/front/0318--000--Carvanha.png b/src/canonical/dex/front/0318-000-Carvanha.png
similarity index 100%
rename from src/canonical/dex/front/0318--000--Carvanha.png
rename to src/canonical/dex/front/0318-000-Carvanha.png
diff --git a/src/canonical/dex/front/0319--000--Sharpedo.png b/src/canonical/dex/front/0319-000-Sharpedo.png
similarity index 100%
rename from src/canonical/dex/front/0319--000--Sharpedo.png
rename to src/canonical/dex/front/0319-000-Sharpedo.png
diff --git a/src/canonical/dex/front/0319--420--Sharpedo--Mega.png b/src/canonical/dex/front/0319-420-Sharpedo-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0319--420--Sharpedo--Mega.png
rename to src/canonical/dex/front/0319-420-Sharpedo-Mega.png
diff --git a/src/canonical/dex/front/0320--000--Wailmer.png b/src/canonical/dex/front/0320-000-Wailmer.png
similarity index 100%
rename from src/canonical/dex/front/0320--000--Wailmer.png
rename to src/canonical/dex/front/0320-000-Wailmer.png
diff --git a/src/canonical/dex/front/0321--000--Wailord.png b/src/canonical/dex/front/0321-000-Wailord.png
similarity index 100%
rename from src/canonical/dex/front/0321--000--Wailord.png
rename to src/canonical/dex/front/0321-000-Wailord.png
diff --git a/src/canonical/dex/front/0322--000--Numel.png b/src/canonical/dex/front/0322-000-Numel.png
similarity index 100%
rename from src/canonical/dex/front/0322--000--Numel.png
rename to src/canonical/dex/front/0322-000-Numel.png
diff --git a/src/canonical/dex/front/0323--000--Camerupt.png b/src/canonical/dex/front/0323-000-Camerupt.png
similarity index 100%
rename from src/canonical/dex/front/0323--000--Camerupt.png
rename to src/canonical/dex/front/0323-000-Camerupt.png
diff --git a/src/canonical/dex/front/0323--420--Camerupt--Mega.png b/src/canonical/dex/front/0323-420-Camerupt-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0323--420--Camerupt--Mega.png
rename to src/canonical/dex/front/0323-420-Camerupt-Mega.png
diff --git a/src/canonical/dex/front/0324--000--Torkoal.png b/src/canonical/dex/front/0324-000-Torkoal.png
similarity index 100%
rename from src/canonical/dex/front/0324--000--Torkoal.png
rename to src/canonical/dex/front/0324-000-Torkoal.png
diff --git a/src/canonical/dex/front/0325--000--Spoink.png b/src/canonical/dex/front/0325-000-Spoink.png
similarity index 100%
rename from src/canonical/dex/front/0325--000--Spoink.png
rename to src/canonical/dex/front/0325-000-Spoink.png
diff --git a/src/canonical/dex/front/0326--000--Grumpig.png b/src/canonical/dex/front/0326-000-Grumpig.png
similarity index 100%
rename from src/canonical/dex/front/0326--000--Grumpig.png
rename to src/canonical/dex/front/0326-000-Grumpig.png
diff --git a/src/canonical/dex/front/0327--000--Spinda.png b/src/canonical/dex/front/0327-000-Spinda.png
similarity index 100%
rename from src/canonical/dex/front/0327--000--Spinda.png
rename to src/canonical/dex/front/0327-000-Spinda.png
diff --git a/src/canonical/dex/front/0328--000--Trapinch.png b/src/canonical/dex/front/0328-000-Trapinch.png
similarity index 100%
rename from src/canonical/dex/front/0328--000--Trapinch.png
rename to src/canonical/dex/front/0328-000-Trapinch.png
diff --git a/src/canonical/dex/front/0329--000--Vibrava.png b/src/canonical/dex/front/0329-000-Vibrava.png
similarity index 100%
rename from src/canonical/dex/front/0329--000--Vibrava.png
rename to src/canonical/dex/front/0329-000-Vibrava.png
diff --git a/src/canonical/dex/front/0330--000--Flygon.png b/src/canonical/dex/front/0330-000-Flygon.png
similarity index 100%
rename from src/canonical/dex/front/0330--000--Flygon.png
rename to src/canonical/dex/front/0330-000-Flygon.png
diff --git a/src/canonical/dex/front/0331--000--Cacnea.png b/src/canonical/dex/front/0331-000-Cacnea.png
similarity index 100%
rename from src/canonical/dex/front/0331--000--Cacnea.png
rename to src/canonical/dex/front/0331-000-Cacnea.png
diff --git a/src/canonical/dex/front/0332--000--Cacturne.png b/src/canonical/dex/front/0332-000-Cacturne.png
similarity index 100%
rename from src/canonical/dex/front/0332--000--Cacturne.png
rename to src/canonical/dex/front/0332-000-Cacturne.png
diff --git a/src/canonical/dex/front/0333--000--Swablu.png b/src/canonical/dex/front/0333-000-Swablu.png
similarity index 100%
rename from src/canonical/dex/front/0333--000--Swablu.png
rename to src/canonical/dex/front/0333-000-Swablu.png
diff --git a/src/canonical/dex/front/0334--000--Altaria.png b/src/canonical/dex/front/0334-000-Altaria.png
similarity index 100%
rename from src/canonical/dex/front/0334--000--Altaria.png
rename to src/canonical/dex/front/0334-000-Altaria.png
diff --git a/src/canonical/dex/front/0334--420--Altaria--Mega.png b/src/canonical/dex/front/0334-420-Altaria-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0334--420--Altaria--Mega.png
rename to src/canonical/dex/front/0334-420-Altaria-Mega.png
diff --git a/src/canonical/dex/front/0335--000--Zangoose.png b/src/canonical/dex/front/0335-000-Zangoose.png
similarity index 100%
rename from src/canonical/dex/front/0335--000--Zangoose.png
rename to src/canonical/dex/front/0335-000-Zangoose.png
diff --git a/src/canonical/dex/front/0336--000--Seviper.png b/src/canonical/dex/front/0336-000-Seviper.png
similarity index 100%
rename from src/canonical/dex/front/0336--000--Seviper.png
rename to src/canonical/dex/front/0336-000-Seviper.png
diff --git a/src/canonical/dex/front/0337--000--Lunatone.png b/src/canonical/dex/front/0337-000-Lunatone.png
similarity index 100%
rename from src/canonical/dex/front/0337--000--Lunatone.png
rename to src/canonical/dex/front/0337-000-Lunatone.png
diff --git a/src/canonical/dex/front/0338--000--Solrock.png b/src/canonical/dex/front/0338-000-Solrock.png
similarity index 100%
rename from src/canonical/dex/front/0338--000--Solrock.png
rename to src/canonical/dex/front/0338-000-Solrock.png
diff --git a/src/canonical/dex/front/0339--000--Barboach.png b/src/canonical/dex/front/0339-000-Barboach.png
similarity index 100%
rename from src/canonical/dex/front/0339--000--Barboach.png
rename to src/canonical/dex/front/0339-000-Barboach.png
diff --git a/src/canonical/dex/front/0340--000--Whiscash.png b/src/canonical/dex/front/0340-000-Whiscash.png
similarity index 100%
rename from src/canonical/dex/front/0340--000--Whiscash.png
rename to src/canonical/dex/front/0340-000-Whiscash.png
diff --git a/src/canonical/dex/front/0341--000--Corphish.png b/src/canonical/dex/front/0341-000-Corphish.png
similarity index 100%
rename from src/canonical/dex/front/0341--000--Corphish.png
rename to src/canonical/dex/front/0341-000-Corphish.png
diff --git a/src/canonical/dex/front/0342--000--Crawdaunt.png b/src/canonical/dex/front/0342-000-Crawdaunt.png
similarity index 100%
rename from src/canonical/dex/front/0342--000--Crawdaunt.png
rename to src/canonical/dex/front/0342-000-Crawdaunt.png
diff --git a/src/canonical/dex/front/0343--000--Baltoy.png b/src/canonical/dex/front/0343-000-Baltoy.png
similarity index 100%
rename from src/canonical/dex/front/0343--000--Baltoy.png
rename to src/canonical/dex/front/0343-000-Baltoy.png
diff --git a/src/canonical/dex/front/0344--000--Claydol.png b/src/canonical/dex/front/0344-000-Claydol.png
similarity index 100%
rename from src/canonical/dex/front/0344--000--Claydol.png
rename to src/canonical/dex/front/0344-000-Claydol.png
diff --git a/src/canonical/dex/front/0345--000--Lileep.png b/src/canonical/dex/front/0345-000-Lileep.png
similarity index 100%
rename from src/canonical/dex/front/0345--000--Lileep.png
rename to src/canonical/dex/front/0345-000-Lileep.png
diff --git a/src/canonical/dex/front/0346--000--Cradily.png b/src/canonical/dex/front/0346-000-Cradily.png
similarity index 100%
rename from src/canonical/dex/front/0346--000--Cradily.png
rename to src/canonical/dex/front/0346-000-Cradily.png
diff --git a/src/canonical/dex/front/0347--000--Anorith.png b/src/canonical/dex/front/0347-000-Anorith.png
similarity index 100%
rename from src/canonical/dex/front/0347--000--Anorith.png
rename to src/canonical/dex/front/0347-000-Anorith.png
diff --git a/src/canonical/dex/front/0348--000--Armaldo.png b/src/canonical/dex/front/0348-000-Armaldo.png
similarity index 100%
rename from src/canonical/dex/front/0348--000--Armaldo.png
rename to src/canonical/dex/front/0348-000-Armaldo.png
diff --git a/src/canonical/dex/front/0349--000--Feebas.png b/src/canonical/dex/front/0349-000-Feebas.png
similarity index 100%
rename from src/canonical/dex/front/0349--000--Feebas.png
rename to src/canonical/dex/front/0349-000-Feebas.png
diff --git a/src/canonical/dex/front/0350--000--Milotic.png b/src/canonical/dex/front/0350-000-Milotic.png
similarity index 100%
rename from src/canonical/dex/front/0350--000--Milotic.png
rename to src/canonical/dex/front/0350-000-Milotic.png
diff --git a/src/canonical/dex/front/0351--000--Castform.png b/src/canonical/dex/front/0351-000-Castform.png
similarity index 100%
rename from src/canonical/dex/front/0351--000--Castform.png
rename to src/canonical/dex/front/0351-000-Castform.png
diff --git a/src/canonical/dex/front/0351--420--Castform--Rainy.png b/src/canonical/dex/front/0351-420-Castform-Rainy.png
similarity index 100%
rename from src/canonical/dex/front/0351--420--Castform--Rainy.png
rename to src/canonical/dex/front/0351-420-Castform-Rainy.png
diff --git a/src/canonical/dex/front/0351--420--Castform--Snowy.png b/src/canonical/dex/front/0351-420-Castform-Snowy.png
similarity index 100%
rename from src/canonical/dex/front/0351--420--Castform--Snowy.png
rename to src/canonical/dex/front/0351-420-Castform-Snowy.png
diff --git a/src/canonical/dex/front/0351--420--Castform--Sunny.png b/src/canonical/dex/front/0351-420-Castform-Sunny.png
similarity index 100%
rename from src/canonical/dex/front/0351--420--Castform--Sunny.png
rename to src/canonical/dex/front/0351-420-Castform-Sunny.png
diff --git a/src/canonical/dex/front/0352--000--Kecleon.png b/src/canonical/dex/front/0352-000-Kecleon.png
similarity index 100%
rename from src/canonical/dex/front/0352--000--Kecleon.png
rename to src/canonical/dex/front/0352-000-Kecleon.png
diff --git a/src/canonical/dex/front/0353--000--Shuppet.png b/src/canonical/dex/front/0353-000-Shuppet.png
similarity index 100%
rename from src/canonical/dex/front/0353--000--Shuppet.png
rename to src/canonical/dex/front/0353-000-Shuppet.png
diff --git a/src/canonical/dex/front/0354--000--Banette.png b/src/canonical/dex/front/0354-000-Banette.png
similarity index 100%
rename from src/canonical/dex/front/0354--000--Banette.png
rename to src/canonical/dex/front/0354-000-Banette.png
diff --git a/src/canonical/dex/front/0354--420--Banette--Mega.png b/src/canonical/dex/front/0354-420-Banette-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0354--420--Banette--Mega.png
rename to src/canonical/dex/front/0354-420-Banette-Mega.png
diff --git a/src/canonical/dex/front/0355--000--Duskull.png b/src/canonical/dex/front/0355-000-Duskull.png
similarity index 100%
rename from src/canonical/dex/front/0355--000--Duskull.png
rename to src/canonical/dex/front/0355-000-Duskull.png
diff --git a/src/canonical/dex/front/0356--000--Dusclops.png b/src/canonical/dex/front/0356-000-Dusclops.png
similarity index 100%
rename from src/canonical/dex/front/0356--000--Dusclops.png
rename to src/canonical/dex/front/0356-000-Dusclops.png
diff --git a/src/canonical/dex/front/0357--000--Tropius.png b/src/canonical/dex/front/0357-000-Tropius.png
similarity index 100%
rename from src/canonical/dex/front/0357--000--Tropius.png
rename to src/canonical/dex/front/0357-000-Tropius.png
diff --git a/src/canonical/dex/front/0358--000--Chimecho.png b/src/canonical/dex/front/0358-000-Chimecho.png
similarity index 100%
rename from src/canonical/dex/front/0358--000--Chimecho.png
rename to src/canonical/dex/front/0358-000-Chimecho.png
diff --git a/src/canonical/dex/front/0359--000--Absol.png b/src/canonical/dex/front/0359-000-Absol.png
similarity index 100%
rename from src/canonical/dex/front/0359--000--Absol.png
rename to src/canonical/dex/front/0359-000-Absol.png
diff --git a/src/canonical/dex/front/0359--420--Absol--Mega.png b/src/canonical/dex/front/0359-420-Absol-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0359--420--Absol--Mega.png
rename to src/canonical/dex/front/0359-420-Absol-Mega.png
diff --git a/src/canonical/dex/front/0360--000--Wynaut.png b/src/canonical/dex/front/0360-000-Wynaut.png
similarity index 100%
rename from src/canonical/dex/front/0360--000--Wynaut.png
rename to src/canonical/dex/front/0360-000-Wynaut.png
diff --git a/src/canonical/dex/front/0361--000--Snorunt.png b/src/canonical/dex/front/0361-000-Snorunt.png
similarity index 100%
rename from src/canonical/dex/front/0361--000--Snorunt.png
rename to src/canonical/dex/front/0361-000-Snorunt.png
diff --git a/src/canonical/dex/front/0362--000--Glalie.png b/src/canonical/dex/front/0362-000-Glalie.png
similarity index 100%
rename from src/canonical/dex/front/0362--000--Glalie.png
rename to src/canonical/dex/front/0362-000-Glalie.png
diff --git a/src/canonical/dex/front/0362--420--Glalie--Mega.png b/src/canonical/dex/front/0362-420-Glalie-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0362--420--Glalie--Mega.png
rename to src/canonical/dex/front/0362-420-Glalie-Mega.png
diff --git a/src/canonical/dex/front/0363--000--Spheal.png b/src/canonical/dex/front/0363-000-Spheal.png
similarity index 100%
rename from src/canonical/dex/front/0363--000--Spheal.png
rename to src/canonical/dex/front/0363-000-Spheal.png
diff --git a/src/canonical/dex/front/0364--000--Sealeo.png b/src/canonical/dex/front/0364-000-Sealeo.png
similarity index 100%
rename from src/canonical/dex/front/0364--000--Sealeo.png
rename to src/canonical/dex/front/0364-000-Sealeo.png
diff --git a/src/canonical/dex/front/0365--000--Walrein.png b/src/canonical/dex/front/0365-000-Walrein.png
similarity index 100%
rename from src/canonical/dex/front/0365--000--Walrein.png
rename to src/canonical/dex/front/0365-000-Walrein.png
diff --git a/src/canonical/dex/front/0366--000--Clamperl.png b/src/canonical/dex/front/0366-000-Clamperl.png
similarity index 100%
rename from src/canonical/dex/front/0366--000--Clamperl.png
rename to src/canonical/dex/front/0366-000-Clamperl.png
diff --git a/src/canonical/dex/front/0367--000--Huntail.png b/src/canonical/dex/front/0367-000-Huntail.png
similarity index 100%
rename from src/canonical/dex/front/0367--000--Huntail.png
rename to src/canonical/dex/front/0367-000-Huntail.png
diff --git a/src/canonical/dex/front/0368--000--Gorebyss.png b/src/canonical/dex/front/0368-000-Gorebyss.png
similarity index 100%
rename from src/canonical/dex/front/0368--000--Gorebyss.png
rename to src/canonical/dex/front/0368-000-Gorebyss.png
diff --git a/src/canonical/dex/front/0369--000--Relicanth.png b/src/canonical/dex/front/0369-000-Relicanth.png
similarity index 100%
rename from src/canonical/dex/front/0369--000--Relicanth.png
rename to src/canonical/dex/front/0369-000-Relicanth.png
diff --git a/src/canonical/dex/front/0370--000--Luvdisc.png b/src/canonical/dex/front/0370-000-Luvdisc.png
similarity index 100%
rename from src/canonical/dex/front/0370--000--Luvdisc.png
rename to src/canonical/dex/front/0370-000-Luvdisc.png
diff --git a/src/canonical/dex/front/0371--000--Bagon.png b/src/canonical/dex/front/0371-000-Bagon.png
similarity index 100%
rename from src/canonical/dex/front/0371--000--Bagon.png
rename to src/canonical/dex/front/0371-000-Bagon.png
diff --git a/src/canonical/dex/front/0372--000--Shelgon.png b/src/canonical/dex/front/0372-000-Shelgon.png
similarity index 100%
rename from src/canonical/dex/front/0372--000--Shelgon.png
rename to src/canonical/dex/front/0372-000-Shelgon.png
diff --git a/src/canonical/dex/front/0373--000--Salamence.png b/src/canonical/dex/front/0373-000-Salamence.png
similarity index 100%
rename from src/canonical/dex/front/0373--000--Salamence.png
rename to src/canonical/dex/front/0373-000-Salamence.png
diff --git a/src/canonical/dex/front/0373--420--Salamence--Mega.png b/src/canonical/dex/front/0373-420-Salamence-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0373--420--Salamence--Mega.png
rename to src/canonical/dex/front/0373-420-Salamence-Mega.png
diff --git a/src/canonical/dex/front/0374--000--Beldum.png b/src/canonical/dex/front/0374-000-Beldum.png
similarity index 100%
rename from src/canonical/dex/front/0374--000--Beldum.png
rename to src/canonical/dex/front/0374-000-Beldum.png
diff --git a/src/canonical/dex/front/0375--000--Metang.png b/src/canonical/dex/front/0375-000-Metang.png
similarity index 100%
rename from src/canonical/dex/front/0375--000--Metang.png
rename to src/canonical/dex/front/0375-000-Metang.png
diff --git a/src/canonical/dex/front/0376--000--Metagross.png b/src/canonical/dex/front/0376-000-Metagross.png
similarity index 100%
rename from src/canonical/dex/front/0376--000--Metagross.png
rename to src/canonical/dex/front/0376-000-Metagross.png
diff --git a/src/canonical/dex/front/0376--420--Metagross--Mega.png b/src/canonical/dex/front/0376-420-Metagross-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0376--420--Metagross--Mega.png
rename to src/canonical/dex/front/0376-420-Metagross-Mega.png
diff --git a/src/canonical/dex/front/0377--000--Regirock.png b/src/canonical/dex/front/0377-000-Regirock.png
similarity index 100%
rename from src/canonical/dex/front/0377--000--Regirock.png
rename to src/canonical/dex/front/0377-000-Regirock.png
diff --git a/src/canonical/dex/front/0378--000--Regice.png b/src/canonical/dex/front/0378-000-Regice.png
similarity index 100%
rename from src/canonical/dex/front/0378--000--Regice.png
rename to src/canonical/dex/front/0378-000-Regice.png
diff --git a/src/canonical/dex/front/0379--000--Registeel.png b/src/canonical/dex/front/0379-000-Registeel.png
similarity index 100%
rename from src/canonical/dex/front/0379--000--Registeel.png
rename to src/canonical/dex/front/0379-000-Registeel.png
diff --git a/src/canonical/dex/front/0380--000--Latias.png b/src/canonical/dex/front/0380-000-Latias.png
similarity index 100%
rename from src/canonical/dex/front/0380--000--Latias.png
rename to src/canonical/dex/front/0380-000-Latias.png
diff --git a/src/canonical/dex/front/0380--420--Latias--Mega.png b/src/canonical/dex/front/0380-420-Latias-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0380--420--Latias--Mega.png
rename to src/canonical/dex/front/0380-420-Latias-Mega.png
diff --git a/src/canonical/dex/front/0381--000--Latios.png b/src/canonical/dex/front/0381-000-Latios.png
similarity index 100%
rename from src/canonical/dex/front/0381--000--Latios.png
rename to src/canonical/dex/front/0381-000-Latios.png
diff --git a/src/canonical/dex/front/0381--420--Latios--Mega.png b/src/canonical/dex/front/0381-420-Latios-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0381--420--Latios--Mega.png
rename to src/canonical/dex/front/0381-420-Latios-Mega.png
diff --git a/src/canonical/dex/front/0382--000--Kyogre.png b/src/canonical/dex/front/0382-000-Kyogre.png
similarity index 100%
rename from src/canonical/dex/front/0382--000--Kyogre.png
rename to src/canonical/dex/front/0382-000-Kyogre.png
diff --git a/src/canonical/dex/front/0382--420--Kyogre--Primal.png b/src/canonical/dex/front/0382-420-Kyogre-Primal.png
similarity index 100%
rename from src/canonical/dex/front/0382--420--Kyogre--Primal.png
rename to src/canonical/dex/front/0382-420-Kyogre-Primal.png
diff --git a/src/canonical/dex/front/0383--000--Groudon.png b/src/canonical/dex/front/0383-000-Groudon.png
similarity index 100%
rename from src/canonical/dex/front/0383--000--Groudon.png
rename to src/canonical/dex/front/0383-000-Groudon.png
diff --git a/src/canonical/dex/front/0383--420--Groudon--Primal.png b/src/canonical/dex/front/0383-420-Groudon-Primal.png
similarity index 100%
rename from src/canonical/dex/front/0383--420--Groudon--Primal.png
rename to src/canonical/dex/front/0383-420-Groudon-Primal.png
diff --git a/src/canonical/dex/front/0384--000--Rayquaza.png b/src/canonical/dex/front/0384-000-Rayquaza.png
similarity index 100%
rename from src/canonical/dex/front/0384--000--Rayquaza.png
rename to src/canonical/dex/front/0384-000-Rayquaza.png
diff --git a/src/canonical/dex/front/0384--420--Rayquaza--Mega.png b/src/canonical/dex/front/0384-420-Rayquaza-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0384--420--Rayquaza--Mega.png
rename to src/canonical/dex/front/0384-420-Rayquaza-Mega.png
diff --git a/src/canonical/dex/front/0385--000--Jirachi.png b/src/canonical/dex/front/0385-000-Jirachi.png
similarity index 100%
rename from src/canonical/dex/front/0385--000--Jirachi.png
rename to src/canonical/dex/front/0385-000-Jirachi.png
diff --git a/src/canonical/dex/front/0386--000--Deoxys.png b/src/canonical/dex/front/0386-000-Deoxys.png
similarity index 100%
rename from src/canonical/dex/front/0386--000--Deoxys.png
rename to src/canonical/dex/front/0386-000-Deoxys.png
diff --git a/src/canonical/dex/front/0386--420--Deoxys--Attack.png b/src/canonical/dex/front/0386-420-Deoxys-Attack.png
similarity index 100%
rename from src/canonical/dex/front/0386--420--Deoxys--Attack.png
rename to src/canonical/dex/front/0386-420-Deoxys-Attack.png
diff --git a/src/canonical/dex/front/0386--420--Deoxys--Defense.png b/src/canonical/dex/front/0386-420-Deoxys-Defense.png
similarity index 100%
rename from src/canonical/dex/front/0386--420--Deoxys--Defense.png
rename to src/canonical/dex/front/0386-420-Deoxys-Defense.png
diff --git a/src/canonical/dex/front/0386--420--Deoxys--Speed.png b/src/canonical/dex/front/0386-420-Deoxys-Speed.png
similarity index 100%
rename from src/canonical/dex/front/0386--420--Deoxys--Speed.png
rename to src/canonical/dex/front/0386-420-Deoxys-Speed.png
diff --git a/src/canonical/dex/front/0387--000--Turtwig.png b/src/canonical/dex/front/0387-000-Turtwig.png
similarity index 100%
rename from src/canonical/dex/front/0387--000--Turtwig.png
rename to src/canonical/dex/front/0387-000-Turtwig.png
diff --git a/src/canonical/dex/front/0388--000--Grotle.png b/src/canonical/dex/front/0388-000-Grotle.png
similarity index 100%
rename from src/canonical/dex/front/0388--000--Grotle.png
rename to src/canonical/dex/front/0388-000-Grotle.png
diff --git a/src/canonical/dex/front/0389--000--Torterra.png b/src/canonical/dex/front/0389-000-Torterra.png
similarity index 100%
rename from src/canonical/dex/front/0389--000--Torterra.png
rename to src/canonical/dex/front/0389-000-Torterra.png
diff --git a/src/canonical/dex/front/0390--000--Chimchar.png b/src/canonical/dex/front/0390-000-Chimchar.png
similarity index 100%
rename from src/canonical/dex/front/0390--000--Chimchar.png
rename to src/canonical/dex/front/0390-000-Chimchar.png
diff --git a/src/canonical/dex/front/0391--000--Monferno.png b/src/canonical/dex/front/0391-000-Monferno.png
similarity index 100%
rename from src/canonical/dex/front/0391--000--Monferno.png
rename to src/canonical/dex/front/0391-000-Monferno.png
diff --git a/src/canonical/dex/front/0392--000--Infernape.png b/src/canonical/dex/front/0392-000-Infernape.png
similarity index 100%
rename from src/canonical/dex/front/0392--000--Infernape.png
rename to src/canonical/dex/front/0392-000-Infernape.png
diff --git a/src/canonical/dex/front/0393--000--Piplup.png b/src/canonical/dex/front/0393-000-Piplup.png
similarity index 100%
rename from src/canonical/dex/front/0393--000--Piplup.png
rename to src/canonical/dex/front/0393-000-Piplup.png
diff --git a/src/canonical/dex/front/0394--000--Prinplup.png b/src/canonical/dex/front/0394-000-Prinplup.png
similarity index 100%
rename from src/canonical/dex/front/0394--000--Prinplup.png
rename to src/canonical/dex/front/0394-000-Prinplup.png
diff --git a/src/canonical/dex/front/0395--000--Empoleon.png b/src/canonical/dex/front/0395-000-Empoleon.png
similarity index 100%
rename from src/canonical/dex/front/0395--000--Empoleon.png
rename to src/canonical/dex/front/0395-000-Empoleon.png
diff --git a/src/canonical/dex/front/0396--000--Starly.png b/src/canonical/dex/front/0396-000-Starly.png
similarity index 100%
rename from src/canonical/dex/front/0396--000--Starly.png
rename to src/canonical/dex/front/0396-000-Starly.png
diff --git a/src/canonical/dex/front/0397--000--Staravia.png b/src/canonical/dex/front/0397-000-Staravia.png
similarity index 100%
rename from src/canonical/dex/front/0397--000--Staravia.png
rename to src/canonical/dex/front/0397-000-Staravia.png
diff --git a/src/canonical/dex/front/0398--000--Staraptor.png b/src/canonical/dex/front/0398-000-Staraptor.png
similarity index 100%
rename from src/canonical/dex/front/0398--000--Staraptor.png
rename to src/canonical/dex/front/0398-000-Staraptor.png
diff --git a/src/canonical/dex/front/0399--000--Bidoof.png b/src/canonical/dex/front/0399-000-Bidoof.png
similarity index 100%
rename from src/canonical/dex/front/0399--000--Bidoof.png
rename to src/canonical/dex/front/0399-000-Bidoof.png
diff --git a/src/canonical/dex/front/0400--000--Bibarel.png b/src/canonical/dex/front/0400-000-Bibarel.png
similarity index 100%
rename from src/canonical/dex/front/0400--000--Bibarel.png
rename to src/canonical/dex/front/0400-000-Bibarel.png
diff --git a/src/canonical/dex/front/0401--000--Kricketot.png b/src/canonical/dex/front/0401-000-Kricketot.png
similarity index 100%
rename from src/canonical/dex/front/0401--000--Kricketot.png
rename to src/canonical/dex/front/0401-000-Kricketot.png
diff --git a/src/canonical/dex/front/0402--000--Kricketune.png b/src/canonical/dex/front/0402-000-Kricketune.png
similarity index 100%
rename from src/canonical/dex/front/0402--000--Kricketune.png
rename to src/canonical/dex/front/0402-000-Kricketune.png
diff --git a/src/canonical/dex/front/0403--000--Shinx.png b/src/canonical/dex/front/0403-000-Shinx.png
similarity index 100%
rename from src/canonical/dex/front/0403--000--Shinx.png
rename to src/canonical/dex/front/0403-000-Shinx.png
diff --git a/src/canonical/dex/front/0404--000--Luxio.png b/src/canonical/dex/front/0404-000-Luxio.png
similarity index 100%
rename from src/canonical/dex/front/0404--000--Luxio.png
rename to src/canonical/dex/front/0404-000-Luxio.png
diff --git a/src/canonical/dex/front/0405--000--Luxray.png b/src/canonical/dex/front/0405-000-Luxray.png
similarity index 100%
rename from src/canonical/dex/front/0405--000--Luxray.png
rename to src/canonical/dex/front/0405-000-Luxray.png
diff --git a/src/canonical/dex/front/0406--000--Budew.png b/src/canonical/dex/front/0406-000-Budew.png
similarity index 100%
rename from src/canonical/dex/front/0406--000--Budew.png
rename to src/canonical/dex/front/0406-000-Budew.png
diff --git a/src/canonical/dex/front/0407--000--Roserade.png b/src/canonical/dex/front/0407-000-Roserade.png
similarity index 100%
rename from src/canonical/dex/front/0407--000--Roserade.png
rename to src/canonical/dex/front/0407-000-Roserade.png
diff --git a/src/canonical/dex/front/0408--000--Cranidos.png b/src/canonical/dex/front/0408-000-Cranidos.png
similarity index 100%
rename from src/canonical/dex/front/0408--000--Cranidos.png
rename to src/canonical/dex/front/0408-000-Cranidos.png
diff --git a/src/canonical/dex/front/0409--000--Rampardos.png b/src/canonical/dex/front/0409-000-Rampardos.png
similarity index 100%
rename from src/canonical/dex/front/0409--000--Rampardos.png
rename to src/canonical/dex/front/0409-000-Rampardos.png
diff --git a/src/canonical/dex/front/0410--000--Shieldon.png b/src/canonical/dex/front/0410-000-Shieldon.png
similarity index 100%
rename from src/canonical/dex/front/0410--000--Shieldon.png
rename to src/canonical/dex/front/0410-000-Shieldon.png
diff --git a/src/canonical/dex/front/0411--000--Bastiodon.png b/src/canonical/dex/front/0411-000-Bastiodon.png
similarity index 100%
rename from src/canonical/dex/front/0411--000--Bastiodon.png
rename to src/canonical/dex/front/0411-000-Bastiodon.png
diff --git a/src/canonical/dex/front/0412--000--Burmy.png b/src/canonical/dex/front/0412-000-Burmy.png
similarity index 100%
rename from src/canonical/dex/front/0412--000--Burmy.png
rename to src/canonical/dex/front/0412-000-Burmy.png
diff --git a/src/canonical/dex/front/0413--000--Wormadam.png b/src/canonical/dex/front/0413-000-Wormadam.png
similarity index 100%
rename from src/canonical/dex/front/0413--000--Wormadam.png
rename to src/canonical/dex/front/0413-000-Wormadam.png
diff --git a/src/canonical/dex/front/0413--420--Wormadam--Sandy.png b/src/canonical/dex/front/0413-420-Wormadam-Sandy.png
similarity index 100%
rename from src/canonical/dex/front/0413--420--Wormadam--Sandy.png
rename to src/canonical/dex/front/0413-420-Wormadam-Sandy.png
diff --git a/src/canonical/dex/front/0413--420--Wormadam--Trash.png b/src/canonical/dex/front/0413-420-Wormadam-Trash.png
similarity index 100%
rename from src/canonical/dex/front/0413--420--Wormadam--Trash.png
rename to src/canonical/dex/front/0413-420-Wormadam-Trash.png
diff --git a/src/canonical/dex/front/0414--000--Mothim.png b/src/canonical/dex/front/0414-000-Mothim.png
similarity index 100%
rename from src/canonical/dex/front/0414--000--Mothim.png
rename to src/canonical/dex/front/0414-000-Mothim.png
diff --git a/src/canonical/dex/front/0415--000--Combee.png b/src/canonical/dex/front/0415-000-Combee.png
similarity index 100%
rename from src/canonical/dex/front/0415--000--Combee.png
rename to src/canonical/dex/front/0415-000-Combee.png
diff --git a/src/canonical/dex/front/0416--000--Vespiquen.png b/src/canonical/dex/front/0416-000-Vespiquen.png
similarity index 100%
rename from src/canonical/dex/front/0416--000--Vespiquen.png
rename to src/canonical/dex/front/0416-000-Vespiquen.png
diff --git a/src/canonical/dex/front/0417--000--Pachirisu.png b/src/canonical/dex/front/0417-000-Pachirisu.png
similarity index 100%
rename from src/canonical/dex/front/0417--000--Pachirisu.png
rename to src/canonical/dex/front/0417-000-Pachirisu.png
diff --git a/src/canonical/dex/front/0418--000--Buizel.png b/src/canonical/dex/front/0418-000-Buizel.png
similarity index 100%
rename from src/canonical/dex/front/0418--000--Buizel.png
rename to src/canonical/dex/front/0418-000-Buizel.png
diff --git a/src/canonical/dex/front/0419--000--Floatzel.png b/src/canonical/dex/front/0419-000-Floatzel.png
similarity index 100%
rename from src/canonical/dex/front/0419--000--Floatzel.png
rename to src/canonical/dex/front/0419-000-Floatzel.png
diff --git a/src/canonical/dex/front/0420--000--Cherubi.png b/src/canonical/dex/front/0420-000-Cherubi.png
similarity index 100%
rename from src/canonical/dex/front/0420--000--Cherubi.png
rename to src/canonical/dex/front/0420-000-Cherubi.png
diff --git a/src/canonical/dex/front/0421--000--Cherrim.png b/src/canonical/dex/front/0421-000-Cherrim.png
similarity index 100%
rename from src/canonical/dex/front/0421--000--Cherrim.png
rename to src/canonical/dex/front/0421-000-Cherrim.png
diff --git a/src/canonical/dex/front/0421--420--Cherrim--Sunshine.png b/src/canonical/dex/front/0421-420-Cherrim-Sunshine.png
similarity index 100%
rename from src/canonical/dex/front/0421--420--Cherrim--Sunshine.png
rename to src/canonical/dex/front/0421-420-Cherrim-Sunshine.png
diff --git a/src/canonical/dex/front/0422--000--Shellos.png b/src/canonical/dex/front/0422-000-Shellos.png
similarity index 100%
rename from src/canonical/dex/front/0422--000--Shellos.png
rename to src/canonical/dex/front/0422-000-Shellos.png
diff --git a/src/canonical/dex/front/0423--000--Gastrodon.png b/src/canonical/dex/front/0423-000-Gastrodon.png
similarity index 100%
rename from src/canonical/dex/front/0423--000--Gastrodon.png
rename to src/canonical/dex/front/0423-000-Gastrodon.png
diff --git a/src/canonical/dex/front/0424--000--Ambipom.png b/src/canonical/dex/front/0424-000-Ambipom.png
similarity index 100%
rename from src/canonical/dex/front/0424--000--Ambipom.png
rename to src/canonical/dex/front/0424-000-Ambipom.png
diff --git a/src/canonical/dex/front/0425--000--Drifloon.png b/src/canonical/dex/front/0425-000-Drifloon.png
similarity index 100%
rename from src/canonical/dex/front/0425--000--Drifloon.png
rename to src/canonical/dex/front/0425-000-Drifloon.png
diff --git a/src/canonical/dex/front/0426--000--Drifblim.png b/src/canonical/dex/front/0426-000-Drifblim.png
similarity index 100%
rename from src/canonical/dex/front/0426--000--Drifblim.png
rename to src/canonical/dex/front/0426-000-Drifblim.png
diff --git a/src/canonical/dex/front/0427--000--Buneary.png b/src/canonical/dex/front/0427-000-Buneary.png
similarity index 100%
rename from src/canonical/dex/front/0427--000--Buneary.png
rename to src/canonical/dex/front/0427-000-Buneary.png
diff --git a/src/canonical/dex/front/0428--000--Lopunny.png b/src/canonical/dex/front/0428-000-Lopunny.png
similarity index 100%
rename from src/canonical/dex/front/0428--000--Lopunny.png
rename to src/canonical/dex/front/0428-000-Lopunny.png
diff --git a/src/canonical/dex/front/0428--420--Lopunny--Mega.png b/src/canonical/dex/front/0428-420-Lopunny-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0428--420--Lopunny--Mega.png
rename to src/canonical/dex/front/0428-420-Lopunny-Mega.png
diff --git a/src/canonical/dex/front/0429--000--Mismagius.png b/src/canonical/dex/front/0429-000-Mismagius.png
similarity index 100%
rename from src/canonical/dex/front/0429--000--Mismagius.png
rename to src/canonical/dex/front/0429-000-Mismagius.png
diff --git a/src/canonical/dex/front/0430--000--Honchkrow.png b/src/canonical/dex/front/0430-000-Honchkrow.png
similarity index 100%
rename from src/canonical/dex/front/0430--000--Honchkrow.png
rename to src/canonical/dex/front/0430-000-Honchkrow.png
diff --git a/src/canonical/dex/front/0431--000--Glameow.png b/src/canonical/dex/front/0431-000-Glameow.png
similarity index 100%
rename from src/canonical/dex/front/0431--000--Glameow.png
rename to src/canonical/dex/front/0431-000-Glameow.png
diff --git a/src/canonical/dex/front/0432--000--Purugly.png b/src/canonical/dex/front/0432-000-Purugly.png
similarity index 100%
rename from src/canonical/dex/front/0432--000--Purugly.png
rename to src/canonical/dex/front/0432-000-Purugly.png
diff --git a/src/canonical/dex/front/0433--000--Chingling.png b/src/canonical/dex/front/0433-000-Chingling.png
similarity index 100%
rename from src/canonical/dex/front/0433--000--Chingling.png
rename to src/canonical/dex/front/0433-000-Chingling.png
diff --git a/src/canonical/dex/front/0434--000--Stunky.png b/src/canonical/dex/front/0434-000-Stunky.png
similarity index 100%
rename from src/canonical/dex/front/0434--000--Stunky.png
rename to src/canonical/dex/front/0434-000-Stunky.png
diff --git a/src/canonical/dex/front/0435--000--Skuntank.png b/src/canonical/dex/front/0435-000-Skuntank.png
similarity index 100%
rename from src/canonical/dex/front/0435--000--Skuntank.png
rename to src/canonical/dex/front/0435-000-Skuntank.png
diff --git a/src/canonical/dex/front/0436--000--Bronzor.png b/src/canonical/dex/front/0436-000-Bronzor.png
similarity index 100%
rename from src/canonical/dex/front/0436--000--Bronzor.png
rename to src/canonical/dex/front/0436-000-Bronzor.png
diff --git a/src/canonical/dex/front/0437--000--Bronzong.png b/src/canonical/dex/front/0437-000-Bronzong.png
similarity index 100%
rename from src/canonical/dex/front/0437--000--Bronzong.png
rename to src/canonical/dex/front/0437-000-Bronzong.png
diff --git a/src/canonical/dex/front/0438--000--Bonsly.png b/src/canonical/dex/front/0438-000-Bonsly.png
similarity index 100%
rename from src/canonical/dex/front/0438--000--Bonsly.png
rename to src/canonical/dex/front/0438-000-Bonsly.png
diff --git a/src/canonical/dex/front/0439--000--Mime_Jr..png b/src/canonical/dex/front/0439-000-Mime_Jr..png
similarity index 100%
rename from src/canonical/dex/front/0439--000--Mime_Jr..png
rename to src/canonical/dex/front/0439-000-Mime_Jr..png
diff --git a/src/canonical/dex/front/0440--000--Happiny.png b/src/canonical/dex/front/0440-000-Happiny.png
similarity index 100%
rename from src/canonical/dex/front/0440--000--Happiny.png
rename to src/canonical/dex/front/0440-000-Happiny.png
diff --git a/src/canonical/dex/front/0441--000--Chatot.png b/src/canonical/dex/front/0441-000-Chatot.png
similarity index 100%
rename from src/canonical/dex/front/0441--000--Chatot.png
rename to src/canonical/dex/front/0441-000-Chatot.png
diff --git a/src/canonical/dex/front/0442--000--Spiritomb.png b/src/canonical/dex/front/0442-000-Spiritomb.png
similarity index 100%
rename from src/canonical/dex/front/0442--000--Spiritomb.png
rename to src/canonical/dex/front/0442-000-Spiritomb.png
diff --git a/src/canonical/dex/front/0443--000--Gible.png b/src/canonical/dex/front/0443-000-Gible.png
similarity index 100%
rename from src/canonical/dex/front/0443--000--Gible.png
rename to src/canonical/dex/front/0443-000-Gible.png
diff --git a/src/canonical/dex/front/0444--000--Gabite.png b/src/canonical/dex/front/0444-000-Gabite.png
similarity index 100%
rename from src/canonical/dex/front/0444--000--Gabite.png
rename to src/canonical/dex/front/0444-000-Gabite.png
diff --git a/src/canonical/dex/front/0445--000--Garchomp.png b/src/canonical/dex/front/0445-000-Garchomp.png
similarity index 100%
rename from src/canonical/dex/front/0445--000--Garchomp.png
rename to src/canonical/dex/front/0445-000-Garchomp.png
diff --git a/src/canonical/dex/front/0445--420--Garchomp--Mega.png b/src/canonical/dex/front/0445-420-Garchomp-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0445--420--Garchomp--Mega.png
rename to src/canonical/dex/front/0445-420-Garchomp-Mega.png
diff --git a/src/canonical/dex/front/0446--000--Munchlax.png b/src/canonical/dex/front/0446-000-Munchlax.png
similarity index 100%
rename from src/canonical/dex/front/0446--000--Munchlax.png
rename to src/canonical/dex/front/0446-000-Munchlax.png
diff --git a/src/canonical/dex/front/0447--000--Riolu.png b/src/canonical/dex/front/0447-000-Riolu.png
similarity index 100%
rename from src/canonical/dex/front/0447--000--Riolu.png
rename to src/canonical/dex/front/0447-000-Riolu.png
diff --git a/src/canonical/dex/front/0448--000--Lucario.png b/src/canonical/dex/front/0448-000-Lucario.png
similarity index 100%
rename from src/canonical/dex/front/0448--000--Lucario.png
rename to src/canonical/dex/front/0448-000-Lucario.png
diff --git a/src/canonical/dex/front/0448--420--Lucario--Mega.png b/src/canonical/dex/front/0448-420-Lucario-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0448--420--Lucario--Mega.png
rename to src/canonical/dex/front/0448-420-Lucario-Mega.png
diff --git a/src/canonical/dex/front/0449--000--Hippopotas.png b/src/canonical/dex/front/0449-000-Hippopotas.png
similarity index 100%
rename from src/canonical/dex/front/0449--000--Hippopotas.png
rename to src/canonical/dex/front/0449-000-Hippopotas.png
diff --git a/src/canonical/dex/front/0450--000--Hippowdon.png b/src/canonical/dex/front/0450-000-Hippowdon.png
similarity index 100%
rename from src/canonical/dex/front/0450--000--Hippowdon.png
rename to src/canonical/dex/front/0450-000-Hippowdon.png
diff --git a/src/canonical/dex/front/0451--000--Skorupi.png b/src/canonical/dex/front/0451-000-Skorupi.png
similarity index 100%
rename from src/canonical/dex/front/0451--000--Skorupi.png
rename to src/canonical/dex/front/0451-000-Skorupi.png
diff --git a/src/canonical/dex/front/0452--000--Drapion.png b/src/canonical/dex/front/0452-000-Drapion.png
similarity index 100%
rename from src/canonical/dex/front/0452--000--Drapion.png
rename to src/canonical/dex/front/0452-000-Drapion.png
diff --git a/src/canonical/dex/front/0453--000--Croagunk.png b/src/canonical/dex/front/0453-000-Croagunk.png
similarity index 100%
rename from src/canonical/dex/front/0453--000--Croagunk.png
rename to src/canonical/dex/front/0453-000-Croagunk.png
diff --git a/src/canonical/dex/front/0454--000--Toxicroak.png b/src/canonical/dex/front/0454-000-Toxicroak.png
similarity index 100%
rename from src/canonical/dex/front/0454--000--Toxicroak.png
rename to src/canonical/dex/front/0454-000-Toxicroak.png
diff --git a/src/canonical/dex/front/0455--000--Carnivine.png b/src/canonical/dex/front/0455-000-Carnivine.png
similarity index 100%
rename from src/canonical/dex/front/0455--000--Carnivine.png
rename to src/canonical/dex/front/0455-000-Carnivine.png
diff --git a/src/canonical/dex/front/0456--000--Finneon.png b/src/canonical/dex/front/0456-000-Finneon.png
similarity index 100%
rename from src/canonical/dex/front/0456--000--Finneon.png
rename to src/canonical/dex/front/0456-000-Finneon.png
diff --git a/src/canonical/dex/front/0457--000--Lumineon.png b/src/canonical/dex/front/0457-000-Lumineon.png
similarity index 100%
rename from src/canonical/dex/front/0457--000--Lumineon.png
rename to src/canonical/dex/front/0457-000-Lumineon.png
diff --git a/src/canonical/dex/front/0458--000--Mantyke.png b/src/canonical/dex/front/0458-000-Mantyke.png
similarity index 100%
rename from src/canonical/dex/front/0458--000--Mantyke.png
rename to src/canonical/dex/front/0458-000-Mantyke.png
diff --git a/src/canonical/dex/front/0459--000--Snover.png b/src/canonical/dex/front/0459-000-Snover.png
similarity index 100%
rename from src/canonical/dex/front/0459--000--Snover.png
rename to src/canonical/dex/front/0459-000-Snover.png
diff --git a/src/canonical/dex/front/0460--000--Abomasnow.png b/src/canonical/dex/front/0460-000-Abomasnow.png
similarity index 100%
rename from src/canonical/dex/front/0460--000--Abomasnow.png
rename to src/canonical/dex/front/0460-000-Abomasnow.png
diff --git a/src/canonical/dex/front/0460--420--Abomasnow--Mega.png b/src/canonical/dex/front/0460-420-Abomasnow-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0460--420--Abomasnow--Mega.png
rename to src/canonical/dex/front/0460-420-Abomasnow-Mega.png
diff --git a/src/canonical/dex/front/0461--000--Weavile.png b/src/canonical/dex/front/0461-000-Weavile.png
similarity index 100%
rename from src/canonical/dex/front/0461--000--Weavile.png
rename to src/canonical/dex/front/0461-000-Weavile.png
diff --git a/src/canonical/dex/front/0462--000--Magnezone.png b/src/canonical/dex/front/0462-000-Magnezone.png
similarity index 100%
rename from src/canonical/dex/front/0462--000--Magnezone.png
rename to src/canonical/dex/front/0462-000-Magnezone.png
diff --git a/src/canonical/dex/front/0463--000--Lickilicky.png b/src/canonical/dex/front/0463-000-Lickilicky.png
similarity index 100%
rename from src/canonical/dex/front/0463--000--Lickilicky.png
rename to src/canonical/dex/front/0463-000-Lickilicky.png
diff --git a/src/canonical/dex/front/0464--000--Rhyperior.png b/src/canonical/dex/front/0464-000-Rhyperior.png
similarity index 100%
rename from src/canonical/dex/front/0464--000--Rhyperior.png
rename to src/canonical/dex/front/0464-000-Rhyperior.png
diff --git a/src/canonical/dex/front/0465--000--Tangrowth.png b/src/canonical/dex/front/0465-000-Tangrowth.png
similarity index 100%
rename from src/canonical/dex/front/0465--000--Tangrowth.png
rename to src/canonical/dex/front/0465-000-Tangrowth.png
diff --git a/src/canonical/dex/front/0466--000--Electivire.png b/src/canonical/dex/front/0466-000-Electivire.png
similarity index 100%
rename from src/canonical/dex/front/0466--000--Electivire.png
rename to src/canonical/dex/front/0466-000-Electivire.png
diff --git a/src/canonical/dex/front/0467--000--Magmortar.png b/src/canonical/dex/front/0467-000-Magmortar.png
similarity index 100%
rename from src/canonical/dex/front/0467--000--Magmortar.png
rename to src/canonical/dex/front/0467-000-Magmortar.png
diff --git a/src/canonical/dex/front/0468--000--Togekiss.png b/src/canonical/dex/front/0468-000-Togekiss.png
similarity index 100%
rename from src/canonical/dex/front/0468--000--Togekiss.png
rename to src/canonical/dex/front/0468-000-Togekiss.png
diff --git a/src/canonical/dex/front/0469--000--Yanmega.png b/src/canonical/dex/front/0469-000-Yanmega.png
similarity index 100%
rename from src/canonical/dex/front/0469--000--Yanmega.png
rename to src/canonical/dex/front/0469-000-Yanmega.png
diff --git a/src/canonical/dex/front/0470--000--Leafeon.png b/src/canonical/dex/front/0470-000-Leafeon.png
similarity index 100%
rename from src/canonical/dex/front/0470--000--Leafeon.png
rename to src/canonical/dex/front/0470-000-Leafeon.png
diff --git a/src/canonical/dex/front/0471--000--Glaceon.png b/src/canonical/dex/front/0471-000-Glaceon.png
similarity index 100%
rename from src/canonical/dex/front/0471--000--Glaceon.png
rename to src/canonical/dex/front/0471-000-Glaceon.png
diff --git a/src/canonical/dex/front/0472--000--Gliscor.png b/src/canonical/dex/front/0472-000-Gliscor.png
similarity index 100%
rename from src/canonical/dex/front/0472--000--Gliscor.png
rename to src/canonical/dex/front/0472-000-Gliscor.png
diff --git a/src/canonical/dex/front/0473--000--Mamoswine.png b/src/canonical/dex/front/0473-000-Mamoswine.png
similarity index 100%
rename from src/canonical/dex/front/0473--000--Mamoswine.png
rename to src/canonical/dex/front/0473-000-Mamoswine.png
diff --git a/src/canonical/dex/front/0474--000--Porygon-Z.png b/src/canonical/dex/front/0474-000-Porygon~Z.png
similarity index 100%
rename from src/canonical/dex/front/0474--000--Porygon-Z.png
rename to src/canonical/dex/front/0474-000-Porygon~Z.png
diff --git a/src/canonical/dex/front/0475--000--Gallade.png b/src/canonical/dex/front/0475-000-Gallade.png
similarity index 100%
rename from src/canonical/dex/front/0475--000--Gallade.png
rename to src/canonical/dex/front/0475-000-Gallade.png
diff --git a/src/canonical/dex/front/0475--420--Gallade--Mega.png b/src/canonical/dex/front/0475-420-Gallade-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0475--420--Gallade--Mega.png
rename to src/canonical/dex/front/0475-420-Gallade-Mega.png
diff --git a/src/canonical/dex/front/0476--000--Probopass.png b/src/canonical/dex/front/0476-000-Probopass.png
similarity index 100%
rename from src/canonical/dex/front/0476--000--Probopass.png
rename to src/canonical/dex/front/0476-000-Probopass.png
diff --git a/src/canonical/dex/front/0477--000--Dusknoir.png b/src/canonical/dex/front/0477-000-Dusknoir.png
similarity index 100%
rename from src/canonical/dex/front/0477--000--Dusknoir.png
rename to src/canonical/dex/front/0477-000-Dusknoir.png
diff --git a/src/canonical/dex/front/0478--000--Froslass.png b/src/canonical/dex/front/0478-000-Froslass.png
similarity index 100%
rename from src/canonical/dex/front/0478--000--Froslass.png
rename to src/canonical/dex/front/0478-000-Froslass.png
diff --git a/src/canonical/dex/front/0479--000--Rotom.png b/src/canonical/dex/front/0479-000-Rotom.png
similarity index 100%
rename from src/canonical/dex/front/0479--000--Rotom.png
rename to src/canonical/dex/front/0479-000-Rotom.png
diff --git a/src/canonical/dex/front/0479--420--Rotom--Fan.png b/src/canonical/dex/front/0479-420-Rotom-Fan.png
similarity index 100%
rename from src/canonical/dex/front/0479--420--Rotom--Fan.png
rename to src/canonical/dex/front/0479-420-Rotom-Fan.png
diff --git a/src/canonical/dex/front/0479--420--Rotom--Frost.png b/src/canonical/dex/front/0479-420-Rotom-Frost.png
similarity index 100%
rename from src/canonical/dex/front/0479--420--Rotom--Frost.png
rename to src/canonical/dex/front/0479-420-Rotom-Frost.png
diff --git a/src/canonical/dex/front/0479--420--Rotom--Heat.png b/src/canonical/dex/front/0479-420-Rotom-Heat.png
similarity index 100%
rename from src/canonical/dex/front/0479--420--Rotom--Heat.png
rename to src/canonical/dex/front/0479-420-Rotom-Heat.png
diff --git a/src/canonical/dex/front/0479--420--Rotom--Mow.png b/src/canonical/dex/front/0479-420-Rotom-Mow.png
similarity index 100%
rename from src/canonical/dex/front/0479--420--Rotom--Mow.png
rename to src/canonical/dex/front/0479-420-Rotom-Mow.png
diff --git a/src/canonical/dex/front/0479--420--Rotom--Wash.png b/src/canonical/dex/front/0479-420-Rotom-Wash.png
similarity index 100%
rename from src/canonical/dex/front/0479--420--Rotom--Wash.png
rename to src/canonical/dex/front/0479-420-Rotom-Wash.png
diff --git a/src/canonical/dex/front/0480--000--Uxie.png b/src/canonical/dex/front/0480-000-Uxie.png
similarity index 100%
rename from src/canonical/dex/front/0480--000--Uxie.png
rename to src/canonical/dex/front/0480-000-Uxie.png
diff --git a/src/canonical/dex/front/0481--000--Mesprit.png b/src/canonical/dex/front/0481-000-Mesprit.png
similarity index 100%
rename from src/canonical/dex/front/0481--000--Mesprit.png
rename to src/canonical/dex/front/0481-000-Mesprit.png
diff --git a/src/canonical/dex/front/0482--000--Azelf.png b/src/canonical/dex/front/0482-000-Azelf.png
similarity index 100%
rename from src/canonical/dex/front/0482--000--Azelf.png
rename to src/canonical/dex/front/0482-000-Azelf.png
diff --git a/src/canonical/dex/front/0483--000--Dialga.png b/src/canonical/dex/front/0483-000-Dialga.png
similarity index 100%
rename from src/canonical/dex/front/0483--000--Dialga.png
rename to src/canonical/dex/front/0483-000-Dialga.png
diff --git a/src/canonical/dex/front/0484--000--Palkia.png b/src/canonical/dex/front/0484-000-Palkia.png
similarity index 100%
rename from src/canonical/dex/front/0484--000--Palkia.png
rename to src/canonical/dex/front/0484-000-Palkia.png
diff --git a/src/canonical/dex/front/0485--000--Heatran.png b/src/canonical/dex/front/0485-000-Heatran.png
similarity index 100%
rename from src/canonical/dex/front/0485--000--Heatran.png
rename to src/canonical/dex/front/0485-000-Heatran.png
diff --git a/src/canonical/dex/front/0486--000--Regigigas.png b/src/canonical/dex/front/0486-000-Regigigas.png
similarity index 100%
rename from src/canonical/dex/front/0486--000--Regigigas.png
rename to src/canonical/dex/front/0486-000-Regigigas.png
diff --git a/src/canonical/dex/front/0487--000--Giratina.png b/src/canonical/dex/front/0487-000-Giratina.png
similarity index 100%
rename from src/canonical/dex/front/0487--000--Giratina.png
rename to src/canonical/dex/front/0487-000-Giratina.png
diff --git a/src/canonical/dex/front/0487--420--Giratina--Origin.png b/src/canonical/dex/front/0487-420-Giratina-Origin.png
similarity index 100%
rename from src/canonical/dex/front/0487--420--Giratina--Origin.png
rename to src/canonical/dex/front/0487-420-Giratina-Origin.png
diff --git a/src/canonical/dex/front/0488--000--Cresselia.png b/src/canonical/dex/front/0488-000-Cresselia.png
similarity index 100%
rename from src/canonical/dex/front/0488--000--Cresselia.png
rename to src/canonical/dex/front/0488-000-Cresselia.png
diff --git a/src/canonical/dex/front/0489--000--Phione.png b/src/canonical/dex/front/0489-000-Phione.png
similarity index 100%
rename from src/canonical/dex/front/0489--000--Phione.png
rename to src/canonical/dex/front/0489-000-Phione.png
diff --git a/src/canonical/dex/front/0490--000--Manaphy.png b/src/canonical/dex/front/0490-000-Manaphy.png
similarity index 100%
rename from src/canonical/dex/front/0490--000--Manaphy.png
rename to src/canonical/dex/front/0490-000-Manaphy.png
diff --git a/src/canonical/dex/front/0491--000--Darkrai.png b/src/canonical/dex/front/0491-000-Darkrai.png
similarity index 100%
rename from src/canonical/dex/front/0491--000--Darkrai.png
rename to src/canonical/dex/front/0491-000-Darkrai.png
diff --git a/src/canonical/dex/front/0492--000--Shaymin.png b/src/canonical/dex/front/0492-000-Shaymin.png
similarity index 100%
rename from src/canonical/dex/front/0492--000--Shaymin.png
rename to src/canonical/dex/front/0492-000-Shaymin.png
diff --git a/src/canonical/dex/front/0492--420--Shaymin--Sky.png b/src/canonical/dex/front/0492-420-Shaymin-Sky.png
similarity index 100%
rename from src/canonical/dex/front/0492--420--Shaymin--Sky.png
rename to src/canonical/dex/front/0492-420-Shaymin-Sky.png
diff --git a/src/canonical/dex/front/0493--000--Arceus.png b/src/canonical/dex/front/0493-000-Arceus.png
similarity index 100%
rename from src/canonical/dex/front/0493--000--Arceus.png
rename to src/canonical/dex/front/0493-000-Arceus.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Bug.png b/src/canonical/dex/front/0493-420-Arceus-Bug.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Bug.png
rename to src/canonical/dex/front/0493-420-Arceus-Bug.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Dark.png b/src/canonical/dex/front/0493-420-Arceus-Dark.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Dark.png
rename to src/canonical/dex/front/0493-420-Arceus-Dark.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Dragon.png b/src/canonical/dex/front/0493-420-Arceus-Dragon.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Dragon.png
rename to src/canonical/dex/front/0493-420-Arceus-Dragon.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Electric.png b/src/canonical/dex/front/0493-420-Arceus-Electric.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Electric.png
rename to src/canonical/dex/front/0493-420-Arceus-Electric.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Fairy.png b/src/canonical/dex/front/0493-420-Arceus-Fairy.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Fairy.png
rename to src/canonical/dex/front/0493-420-Arceus-Fairy.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Fighting.png b/src/canonical/dex/front/0493-420-Arceus-Fighting.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Fighting.png
rename to src/canonical/dex/front/0493-420-Arceus-Fighting.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Fire.png b/src/canonical/dex/front/0493-420-Arceus-Fire.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Fire.png
rename to src/canonical/dex/front/0493-420-Arceus-Fire.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Flying.png b/src/canonical/dex/front/0493-420-Arceus-Flying.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Flying.png
rename to src/canonical/dex/front/0493-420-Arceus-Flying.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Ghost.png b/src/canonical/dex/front/0493-420-Arceus-Ghost.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Ghost.png
rename to src/canonical/dex/front/0493-420-Arceus-Ghost.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Grass.png b/src/canonical/dex/front/0493-420-Arceus-Grass.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Grass.png
rename to src/canonical/dex/front/0493-420-Arceus-Grass.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Ground.png b/src/canonical/dex/front/0493-420-Arceus-Ground.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Ground.png
rename to src/canonical/dex/front/0493-420-Arceus-Ground.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Ice.png b/src/canonical/dex/front/0493-420-Arceus-Ice.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Ice.png
rename to src/canonical/dex/front/0493-420-Arceus-Ice.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Poison.png b/src/canonical/dex/front/0493-420-Arceus-Poison.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Poison.png
rename to src/canonical/dex/front/0493-420-Arceus-Poison.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Psychic.png b/src/canonical/dex/front/0493-420-Arceus-Psychic.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Psychic.png
rename to src/canonical/dex/front/0493-420-Arceus-Psychic.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Rock.png b/src/canonical/dex/front/0493-420-Arceus-Rock.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Rock.png
rename to src/canonical/dex/front/0493-420-Arceus-Rock.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Steel.png b/src/canonical/dex/front/0493-420-Arceus-Steel.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Steel.png
rename to src/canonical/dex/front/0493-420-Arceus-Steel.png
diff --git a/src/canonical/dex/front/0493--420--Arceus--Water.png b/src/canonical/dex/front/0493-420-Arceus-Water.png
similarity index 100%
rename from src/canonical/dex/front/0493--420--Arceus--Water.png
rename to src/canonical/dex/front/0493-420-Arceus-Water.png
diff --git a/src/canonical/dex/front/0494--000--Victini.png b/src/canonical/dex/front/0494-000-Victini.png
similarity index 100%
rename from src/canonical/dex/front/0494--000--Victini.png
rename to src/canonical/dex/front/0494-000-Victini.png
diff --git a/src/canonical/dex/front/0495--000--Snivy.png b/src/canonical/dex/front/0495-000-Snivy.png
similarity index 100%
rename from src/canonical/dex/front/0495--000--Snivy.png
rename to src/canonical/dex/front/0495-000-Snivy.png
diff --git a/src/canonical/dex/front/0496--000--Servine.png b/src/canonical/dex/front/0496-000-Servine.png
similarity index 100%
rename from src/canonical/dex/front/0496--000--Servine.png
rename to src/canonical/dex/front/0496-000-Servine.png
diff --git a/src/canonical/dex/front/0497--000--Serperior.png b/src/canonical/dex/front/0497-000-Serperior.png
similarity index 100%
rename from src/canonical/dex/front/0497--000--Serperior.png
rename to src/canonical/dex/front/0497-000-Serperior.png
diff --git a/src/canonical/dex/front/0498--000--Tepig.png b/src/canonical/dex/front/0498-000-Tepig.png
similarity index 100%
rename from src/canonical/dex/front/0498--000--Tepig.png
rename to src/canonical/dex/front/0498-000-Tepig.png
diff --git a/src/canonical/dex/front/0499--000--Pignite.png b/src/canonical/dex/front/0499-000-Pignite.png
similarity index 100%
rename from src/canonical/dex/front/0499--000--Pignite.png
rename to src/canonical/dex/front/0499-000-Pignite.png
diff --git a/src/canonical/dex/front/0500--000--Emboar.png b/src/canonical/dex/front/0500-000-Emboar.png
similarity index 100%
rename from src/canonical/dex/front/0500--000--Emboar.png
rename to src/canonical/dex/front/0500-000-Emboar.png
diff --git a/src/canonical/dex/front/0501--000--Oshawott.png b/src/canonical/dex/front/0501-000-Oshawott.png
similarity index 100%
rename from src/canonical/dex/front/0501--000--Oshawott.png
rename to src/canonical/dex/front/0501-000-Oshawott.png
diff --git a/src/canonical/dex/front/0502--000--Dewott.png b/src/canonical/dex/front/0502-000-Dewott.png
similarity index 100%
rename from src/canonical/dex/front/0502--000--Dewott.png
rename to src/canonical/dex/front/0502-000-Dewott.png
diff --git a/src/canonical/dex/front/0503--000--Samurott.png b/src/canonical/dex/front/0503-000-Samurott.png
similarity index 100%
rename from src/canonical/dex/front/0503--000--Samurott.png
rename to src/canonical/dex/front/0503-000-Samurott.png
diff --git a/src/canonical/dex/front/0504--000--Patrat.png b/src/canonical/dex/front/0504-000-Patrat.png
similarity index 100%
rename from src/canonical/dex/front/0504--000--Patrat.png
rename to src/canonical/dex/front/0504-000-Patrat.png
diff --git a/src/canonical/dex/front/0505--000--Watchog.png b/src/canonical/dex/front/0505-000-Watchog.png
similarity index 100%
rename from src/canonical/dex/front/0505--000--Watchog.png
rename to src/canonical/dex/front/0505-000-Watchog.png
diff --git a/src/canonical/dex/front/0506--000--Lillipup.png b/src/canonical/dex/front/0506-000-Lillipup.png
similarity index 100%
rename from src/canonical/dex/front/0506--000--Lillipup.png
rename to src/canonical/dex/front/0506-000-Lillipup.png
diff --git a/src/canonical/dex/front/0507--000--Herdier.png b/src/canonical/dex/front/0507-000-Herdier.png
similarity index 100%
rename from src/canonical/dex/front/0507--000--Herdier.png
rename to src/canonical/dex/front/0507-000-Herdier.png
diff --git a/src/canonical/dex/front/0508--000--Stoutland.png b/src/canonical/dex/front/0508-000-Stoutland.png
similarity index 100%
rename from src/canonical/dex/front/0508--000--Stoutland.png
rename to src/canonical/dex/front/0508-000-Stoutland.png
diff --git a/src/canonical/dex/front/0509--000--Purrloin.png b/src/canonical/dex/front/0509-000-Purrloin.png
similarity index 100%
rename from src/canonical/dex/front/0509--000--Purrloin.png
rename to src/canonical/dex/front/0509-000-Purrloin.png
diff --git a/src/canonical/dex/front/0510--000--Liepard.png b/src/canonical/dex/front/0510-000-Liepard.png
similarity index 100%
rename from src/canonical/dex/front/0510--000--Liepard.png
rename to src/canonical/dex/front/0510-000-Liepard.png
diff --git a/src/canonical/dex/front/0511--000--Pansage.png b/src/canonical/dex/front/0511-000-Pansage.png
similarity index 100%
rename from src/canonical/dex/front/0511--000--Pansage.png
rename to src/canonical/dex/front/0511-000-Pansage.png
diff --git a/src/canonical/dex/front/0512--000--Simisage.png b/src/canonical/dex/front/0512-000-Simisage.png
similarity index 100%
rename from src/canonical/dex/front/0512--000--Simisage.png
rename to src/canonical/dex/front/0512-000-Simisage.png
diff --git a/src/canonical/dex/front/0513--000--Pansear.png b/src/canonical/dex/front/0513-000-Pansear.png
similarity index 100%
rename from src/canonical/dex/front/0513--000--Pansear.png
rename to src/canonical/dex/front/0513-000-Pansear.png
diff --git a/src/canonical/dex/front/0514--000--Simisear.png b/src/canonical/dex/front/0514-000-Simisear.png
similarity index 100%
rename from src/canonical/dex/front/0514--000--Simisear.png
rename to src/canonical/dex/front/0514-000-Simisear.png
diff --git a/src/canonical/dex/front/0515--000--Panpour.png b/src/canonical/dex/front/0515-000-Panpour.png
similarity index 100%
rename from src/canonical/dex/front/0515--000--Panpour.png
rename to src/canonical/dex/front/0515-000-Panpour.png
diff --git a/src/canonical/dex/front/0516--000--Simipour.png b/src/canonical/dex/front/0516-000-Simipour.png
similarity index 100%
rename from src/canonical/dex/front/0516--000--Simipour.png
rename to src/canonical/dex/front/0516-000-Simipour.png
diff --git a/src/canonical/dex/front/0517--000--Munna.png b/src/canonical/dex/front/0517-000-Munna.png
similarity index 100%
rename from src/canonical/dex/front/0517--000--Munna.png
rename to src/canonical/dex/front/0517-000-Munna.png
diff --git a/src/canonical/dex/front/0518--000--Musharna.png b/src/canonical/dex/front/0518-000-Musharna.png
similarity index 100%
rename from src/canonical/dex/front/0518--000--Musharna.png
rename to src/canonical/dex/front/0518-000-Musharna.png
diff --git a/src/canonical/dex/front/0519--000--Pidove.png b/src/canonical/dex/front/0519-000-Pidove.png
similarity index 100%
rename from src/canonical/dex/front/0519--000--Pidove.png
rename to src/canonical/dex/front/0519-000-Pidove.png
diff --git a/src/canonical/dex/front/0520--000--Tranquill.png b/src/canonical/dex/front/0520-000-Tranquill.png
similarity index 100%
rename from src/canonical/dex/front/0520--000--Tranquill.png
rename to src/canonical/dex/front/0520-000-Tranquill.png
diff --git a/src/canonical/dex/front/0521--000--Unfezant.png b/src/canonical/dex/front/0521-000-Unfezant.png
similarity index 100%
rename from src/canonical/dex/front/0521--000--Unfezant.png
rename to src/canonical/dex/front/0521-000-Unfezant.png
diff --git a/src/canonical/dex/front/0522--000--Blitzle.png b/src/canonical/dex/front/0522-000-Blitzle.png
similarity index 100%
rename from src/canonical/dex/front/0522--000--Blitzle.png
rename to src/canonical/dex/front/0522-000-Blitzle.png
diff --git a/src/canonical/dex/front/0523--000--Zebstrika.png b/src/canonical/dex/front/0523-000-Zebstrika.png
similarity index 100%
rename from src/canonical/dex/front/0523--000--Zebstrika.png
rename to src/canonical/dex/front/0523-000-Zebstrika.png
diff --git a/src/canonical/dex/front/0524--000--Roggenrola.png b/src/canonical/dex/front/0524-000-Roggenrola.png
similarity index 100%
rename from src/canonical/dex/front/0524--000--Roggenrola.png
rename to src/canonical/dex/front/0524-000-Roggenrola.png
diff --git a/src/canonical/dex/front/0525--000--Boldore.png b/src/canonical/dex/front/0525-000-Boldore.png
similarity index 100%
rename from src/canonical/dex/front/0525--000--Boldore.png
rename to src/canonical/dex/front/0525-000-Boldore.png
diff --git a/src/canonical/dex/front/0526--000--Gigalith.png b/src/canonical/dex/front/0526-000-Gigalith.png
similarity index 100%
rename from src/canonical/dex/front/0526--000--Gigalith.png
rename to src/canonical/dex/front/0526-000-Gigalith.png
diff --git a/src/canonical/dex/front/0527--000--Woobat.png b/src/canonical/dex/front/0527-000-Woobat.png
similarity index 100%
rename from src/canonical/dex/front/0527--000--Woobat.png
rename to src/canonical/dex/front/0527-000-Woobat.png
diff --git a/src/canonical/dex/front/0528--000--Swoobat.png b/src/canonical/dex/front/0528-000-Swoobat.png
similarity index 100%
rename from src/canonical/dex/front/0528--000--Swoobat.png
rename to src/canonical/dex/front/0528-000-Swoobat.png
diff --git a/src/canonical/dex/front/0529--000--Drilbur.png b/src/canonical/dex/front/0529-000-Drilbur.png
similarity index 100%
rename from src/canonical/dex/front/0529--000--Drilbur.png
rename to src/canonical/dex/front/0529-000-Drilbur.png
diff --git a/src/canonical/dex/front/0530--000--Excadrill.png b/src/canonical/dex/front/0530-000-Excadrill.png
similarity index 100%
rename from src/canonical/dex/front/0530--000--Excadrill.png
rename to src/canonical/dex/front/0530-000-Excadrill.png
diff --git a/src/canonical/dex/front/0531--000--Audino.png b/src/canonical/dex/front/0531-000-Audino.png
similarity index 100%
rename from src/canonical/dex/front/0531--000--Audino.png
rename to src/canonical/dex/front/0531-000-Audino.png
diff --git a/src/canonical/dex/front/0531--420--Audino--Mega.png b/src/canonical/dex/front/0531-420-Audino-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0531--420--Audino--Mega.png
rename to src/canonical/dex/front/0531-420-Audino-Mega.png
diff --git a/src/canonical/dex/front/0532--000--Timburr.png b/src/canonical/dex/front/0532-000-Timburr.png
similarity index 100%
rename from src/canonical/dex/front/0532--000--Timburr.png
rename to src/canonical/dex/front/0532-000-Timburr.png
diff --git a/src/canonical/dex/front/0533--000--Gurdurr.png b/src/canonical/dex/front/0533-000-Gurdurr.png
similarity index 100%
rename from src/canonical/dex/front/0533--000--Gurdurr.png
rename to src/canonical/dex/front/0533-000-Gurdurr.png
diff --git a/src/canonical/dex/front/0534--000--Conkeldurr.png b/src/canonical/dex/front/0534-000-Conkeldurr.png
similarity index 100%
rename from src/canonical/dex/front/0534--000--Conkeldurr.png
rename to src/canonical/dex/front/0534-000-Conkeldurr.png
diff --git a/src/canonical/dex/front/0535--000--Tympole.png b/src/canonical/dex/front/0535-000-Tympole.png
similarity index 100%
rename from src/canonical/dex/front/0535--000--Tympole.png
rename to src/canonical/dex/front/0535-000-Tympole.png
diff --git a/src/canonical/dex/front/0536--000--Palpitoad.png b/src/canonical/dex/front/0536-000-Palpitoad.png
similarity index 100%
rename from src/canonical/dex/front/0536--000--Palpitoad.png
rename to src/canonical/dex/front/0536-000-Palpitoad.png
diff --git a/src/canonical/dex/front/0537--000--Seismitoad.png b/src/canonical/dex/front/0537-000-Seismitoad.png
similarity index 100%
rename from src/canonical/dex/front/0537--000--Seismitoad.png
rename to src/canonical/dex/front/0537-000-Seismitoad.png
diff --git a/src/canonical/dex/front/0538--000--Throh.png b/src/canonical/dex/front/0538-000-Throh.png
similarity index 100%
rename from src/canonical/dex/front/0538--000--Throh.png
rename to src/canonical/dex/front/0538-000-Throh.png
diff --git a/src/canonical/dex/front/0539--000--Sawk.png b/src/canonical/dex/front/0539-000-Sawk.png
similarity index 100%
rename from src/canonical/dex/front/0539--000--Sawk.png
rename to src/canonical/dex/front/0539-000-Sawk.png
diff --git a/src/canonical/dex/front/0540--000--Sewaddle.png b/src/canonical/dex/front/0540-000-Sewaddle.png
similarity index 100%
rename from src/canonical/dex/front/0540--000--Sewaddle.png
rename to src/canonical/dex/front/0540-000-Sewaddle.png
diff --git a/src/canonical/dex/front/0541--000--Swadloon.png b/src/canonical/dex/front/0541-000-Swadloon.png
similarity index 100%
rename from src/canonical/dex/front/0541--000--Swadloon.png
rename to src/canonical/dex/front/0541-000-Swadloon.png
diff --git a/src/canonical/dex/front/0542--000--Leavanny.png b/src/canonical/dex/front/0542-000-Leavanny.png
similarity index 100%
rename from src/canonical/dex/front/0542--000--Leavanny.png
rename to src/canonical/dex/front/0542-000-Leavanny.png
diff --git a/src/canonical/dex/front/0543--000--Venipede.png b/src/canonical/dex/front/0543-000-Venipede.png
similarity index 100%
rename from src/canonical/dex/front/0543--000--Venipede.png
rename to src/canonical/dex/front/0543-000-Venipede.png
diff --git a/src/canonical/dex/front/0544--000--Whirlipede.png b/src/canonical/dex/front/0544-000-Whirlipede.png
similarity index 100%
rename from src/canonical/dex/front/0544--000--Whirlipede.png
rename to src/canonical/dex/front/0544-000-Whirlipede.png
diff --git a/src/canonical/dex/front/0545--000--Scolipede.png b/src/canonical/dex/front/0545-000-Scolipede.png
similarity index 100%
rename from src/canonical/dex/front/0545--000--Scolipede.png
rename to src/canonical/dex/front/0545-000-Scolipede.png
diff --git a/src/canonical/dex/front/0546--000--Cottonee.png b/src/canonical/dex/front/0546-000-Cottonee.png
similarity index 100%
rename from src/canonical/dex/front/0546--000--Cottonee.png
rename to src/canonical/dex/front/0546-000-Cottonee.png
diff --git a/src/canonical/dex/front/0547--000--Whimsicott.png b/src/canonical/dex/front/0547-000-Whimsicott.png
similarity index 100%
rename from src/canonical/dex/front/0547--000--Whimsicott.png
rename to src/canonical/dex/front/0547-000-Whimsicott.png
diff --git a/src/canonical/dex/front/0548--000--Petilil.png b/src/canonical/dex/front/0548-000-Petilil.png
similarity index 100%
rename from src/canonical/dex/front/0548--000--Petilil.png
rename to src/canonical/dex/front/0548-000-Petilil.png
diff --git a/src/canonical/dex/front/0549--000--Lilligant.png b/src/canonical/dex/front/0549-000-Lilligant.png
similarity index 100%
rename from src/canonical/dex/front/0549--000--Lilligant.png
rename to src/canonical/dex/front/0549-000-Lilligant.png
diff --git a/src/canonical/dex/front/0550--000--Basculin.png b/src/canonical/dex/front/0550-000-Basculin.png
similarity index 100%
rename from src/canonical/dex/front/0550--000--Basculin.png
rename to src/canonical/dex/front/0550-000-Basculin.png
diff --git a/src/canonical/dex/front/0550--420--Basculin--Blue-Striped.png b/src/canonical/dex/front/0550-420-Basculin-Blue~Striped.png
similarity index 100%
rename from src/canonical/dex/front/0550--420--Basculin--Blue-Striped.png
rename to src/canonical/dex/front/0550-420-Basculin-Blue~Striped.png
diff --git a/src/canonical/dex/front/0551--000--Sandile.png b/src/canonical/dex/front/0551-000-Sandile.png
similarity index 100%
rename from src/canonical/dex/front/0551--000--Sandile.png
rename to src/canonical/dex/front/0551-000-Sandile.png
diff --git a/src/canonical/dex/front/0552--000--Krokorok.png b/src/canonical/dex/front/0552-000-Krokorok.png
similarity index 100%
rename from src/canonical/dex/front/0552--000--Krokorok.png
rename to src/canonical/dex/front/0552-000-Krokorok.png
diff --git a/src/canonical/dex/front/0553--000--Krookodile.png b/src/canonical/dex/front/0553-000-Krookodile.png
similarity index 100%
rename from src/canonical/dex/front/0553--000--Krookodile.png
rename to src/canonical/dex/front/0553-000-Krookodile.png
diff --git a/src/canonical/dex/front/0554--000--Darumaka.png b/src/canonical/dex/front/0554-000-Darumaka.png
similarity index 100%
rename from src/canonical/dex/front/0554--000--Darumaka.png
rename to src/canonical/dex/front/0554-000-Darumaka.png
diff --git a/src/canonical/dex/front/0555--000--Darmanitan.png b/src/canonical/dex/front/0555-000-Darmanitan.png
similarity index 100%
rename from src/canonical/dex/front/0555--000--Darmanitan.png
rename to src/canonical/dex/front/0555-000-Darmanitan.png
diff --git a/src/canonical/dex/front/0555--420--Darmanitan--Zen.png b/src/canonical/dex/front/0555-420-Darmanitan-Zen.png
similarity index 100%
rename from src/canonical/dex/front/0555--420--Darmanitan--Zen.png
rename to src/canonical/dex/front/0555-420-Darmanitan-Zen.png
diff --git a/src/canonical/dex/front/0556--000--Maractus.png b/src/canonical/dex/front/0556-000-Maractus.png
similarity index 100%
rename from src/canonical/dex/front/0556--000--Maractus.png
rename to src/canonical/dex/front/0556-000-Maractus.png
diff --git a/src/canonical/dex/front/0557--000--Dwebble.png b/src/canonical/dex/front/0557-000-Dwebble.png
similarity index 100%
rename from src/canonical/dex/front/0557--000--Dwebble.png
rename to src/canonical/dex/front/0557-000-Dwebble.png
diff --git a/src/canonical/dex/front/0558--000--Crustle.png b/src/canonical/dex/front/0558-000-Crustle.png
similarity index 100%
rename from src/canonical/dex/front/0558--000--Crustle.png
rename to src/canonical/dex/front/0558-000-Crustle.png
diff --git a/src/canonical/dex/front/0559--000--Scraggy.png b/src/canonical/dex/front/0559-000-Scraggy.png
similarity index 100%
rename from src/canonical/dex/front/0559--000--Scraggy.png
rename to src/canonical/dex/front/0559-000-Scraggy.png
diff --git a/src/canonical/dex/front/0560--000--Scrafty.png b/src/canonical/dex/front/0560-000-Scrafty.png
similarity index 100%
rename from src/canonical/dex/front/0560--000--Scrafty.png
rename to src/canonical/dex/front/0560-000-Scrafty.png
diff --git a/src/canonical/dex/front/0561--000--Sigilyph.png b/src/canonical/dex/front/0561-000-Sigilyph.png
similarity index 100%
rename from src/canonical/dex/front/0561--000--Sigilyph.png
rename to src/canonical/dex/front/0561-000-Sigilyph.png
diff --git a/src/canonical/dex/front/0562--000--Yamask.png b/src/canonical/dex/front/0562-000-Yamask.png
similarity index 100%
rename from src/canonical/dex/front/0562--000--Yamask.png
rename to src/canonical/dex/front/0562-000-Yamask.png
diff --git a/src/canonical/dex/front/0563--000--Cofagrigus.png b/src/canonical/dex/front/0563-000-Cofagrigus.png
similarity index 100%
rename from src/canonical/dex/front/0563--000--Cofagrigus.png
rename to src/canonical/dex/front/0563-000-Cofagrigus.png
diff --git a/src/canonical/dex/front/0564--000--Tirtouga.png b/src/canonical/dex/front/0564-000-Tirtouga.png
similarity index 100%
rename from src/canonical/dex/front/0564--000--Tirtouga.png
rename to src/canonical/dex/front/0564-000-Tirtouga.png
diff --git a/src/canonical/dex/front/0565--000--Carracosta.png b/src/canonical/dex/front/0565-000-Carracosta.png
similarity index 100%
rename from src/canonical/dex/front/0565--000--Carracosta.png
rename to src/canonical/dex/front/0565-000-Carracosta.png
diff --git a/src/canonical/dex/front/0566--000--Archen.png b/src/canonical/dex/front/0566-000-Archen.png
similarity index 100%
rename from src/canonical/dex/front/0566--000--Archen.png
rename to src/canonical/dex/front/0566-000-Archen.png
diff --git a/src/canonical/dex/front/0567--000--Archeops.png b/src/canonical/dex/front/0567-000-Archeops.png
similarity index 100%
rename from src/canonical/dex/front/0567--000--Archeops.png
rename to src/canonical/dex/front/0567-000-Archeops.png
diff --git a/src/canonical/dex/front/0568--000--Trubbish.png b/src/canonical/dex/front/0568-000-Trubbish.png
similarity index 100%
rename from src/canonical/dex/front/0568--000--Trubbish.png
rename to src/canonical/dex/front/0568-000-Trubbish.png
diff --git a/src/canonical/dex/front/0569--000--Garbodor.png b/src/canonical/dex/front/0569-000-Garbodor.png
similarity index 100%
rename from src/canonical/dex/front/0569--000--Garbodor.png
rename to src/canonical/dex/front/0569-000-Garbodor.png
diff --git a/src/canonical/dex/front/0570--000--Zorua.png b/src/canonical/dex/front/0570-000-Zorua.png
similarity index 100%
rename from src/canonical/dex/front/0570--000--Zorua.png
rename to src/canonical/dex/front/0570-000-Zorua.png
diff --git a/src/canonical/dex/front/0571--000--Zoroark.png b/src/canonical/dex/front/0571-000-Zoroark.png
similarity index 100%
rename from src/canonical/dex/front/0571--000--Zoroark.png
rename to src/canonical/dex/front/0571-000-Zoroark.png
diff --git a/src/canonical/dex/front/0572--000--Minccino.png b/src/canonical/dex/front/0572-000-Minccino.png
similarity index 100%
rename from src/canonical/dex/front/0572--000--Minccino.png
rename to src/canonical/dex/front/0572-000-Minccino.png
diff --git a/src/canonical/dex/front/0573--000--Cinccino.png b/src/canonical/dex/front/0573-000-Cinccino.png
similarity index 100%
rename from src/canonical/dex/front/0573--000--Cinccino.png
rename to src/canonical/dex/front/0573-000-Cinccino.png
diff --git a/src/canonical/dex/front/0574--000--Gothita.png b/src/canonical/dex/front/0574-000-Gothita.png
similarity index 100%
rename from src/canonical/dex/front/0574--000--Gothita.png
rename to src/canonical/dex/front/0574-000-Gothita.png
diff --git a/src/canonical/dex/front/0575--000--Gothorita.png b/src/canonical/dex/front/0575-000-Gothorita.png
similarity index 100%
rename from src/canonical/dex/front/0575--000--Gothorita.png
rename to src/canonical/dex/front/0575-000-Gothorita.png
diff --git a/src/canonical/dex/front/0576--000--Gothitelle.png b/src/canonical/dex/front/0576-000-Gothitelle.png
similarity index 100%
rename from src/canonical/dex/front/0576--000--Gothitelle.png
rename to src/canonical/dex/front/0576-000-Gothitelle.png
diff --git a/src/canonical/dex/front/0577--000--Solosis.png b/src/canonical/dex/front/0577-000-Solosis.png
similarity index 100%
rename from src/canonical/dex/front/0577--000--Solosis.png
rename to src/canonical/dex/front/0577-000-Solosis.png
diff --git a/src/canonical/dex/front/0578--000--Duosion.png b/src/canonical/dex/front/0578-000-Duosion.png
similarity index 100%
rename from src/canonical/dex/front/0578--000--Duosion.png
rename to src/canonical/dex/front/0578-000-Duosion.png
diff --git a/src/canonical/dex/front/0579--000--Reuniclus.png b/src/canonical/dex/front/0579-000-Reuniclus.png
similarity index 100%
rename from src/canonical/dex/front/0579--000--Reuniclus.png
rename to src/canonical/dex/front/0579-000-Reuniclus.png
diff --git a/src/canonical/dex/front/0580--000--Ducklett.png b/src/canonical/dex/front/0580-000-Ducklett.png
similarity index 100%
rename from src/canonical/dex/front/0580--000--Ducklett.png
rename to src/canonical/dex/front/0580-000-Ducklett.png
diff --git a/src/canonical/dex/front/0581--000--Swanna.png b/src/canonical/dex/front/0581-000-Swanna.png
similarity index 100%
rename from src/canonical/dex/front/0581--000--Swanna.png
rename to src/canonical/dex/front/0581-000-Swanna.png
diff --git a/src/canonical/dex/front/0582--000--Vanillite.png b/src/canonical/dex/front/0582-000-Vanillite.png
similarity index 100%
rename from src/canonical/dex/front/0582--000--Vanillite.png
rename to src/canonical/dex/front/0582-000-Vanillite.png
diff --git a/src/canonical/dex/front/0583--000--Vanillish.png b/src/canonical/dex/front/0583-000-Vanillish.png
similarity index 100%
rename from src/canonical/dex/front/0583--000--Vanillish.png
rename to src/canonical/dex/front/0583-000-Vanillish.png
diff --git a/src/canonical/dex/front/0584--000--Vanilluxe.png b/src/canonical/dex/front/0584-000-Vanilluxe.png
similarity index 100%
rename from src/canonical/dex/front/0584--000--Vanilluxe.png
rename to src/canonical/dex/front/0584-000-Vanilluxe.png
diff --git a/src/canonical/dex/front/0585--000--Deerling.png b/src/canonical/dex/front/0585-000-Deerling.png
similarity index 100%
rename from src/canonical/dex/front/0585--000--Deerling.png
rename to src/canonical/dex/front/0585-000-Deerling.png
diff --git a/src/canonical/dex/front/0586--000--Sawsbuck.png b/src/canonical/dex/front/0586-000-Sawsbuck.png
similarity index 100%
rename from src/canonical/dex/front/0586--000--Sawsbuck.png
rename to src/canonical/dex/front/0586-000-Sawsbuck.png
diff --git a/src/canonical/dex/front/0587--000--Emolga.png b/src/canonical/dex/front/0587-000-Emolga.png
similarity index 100%
rename from src/canonical/dex/front/0587--000--Emolga.png
rename to src/canonical/dex/front/0587-000-Emolga.png
diff --git a/src/canonical/dex/front/0588--000--Karrablast.png b/src/canonical/dex/front/0588-000-Karrablast.png
similarity index 100%
rename from src/canonical/dex/front/0588--000--Karrablast.png
rename to src/canonical/dex/front/0588-000-Karrablast.png
diff --git a/src/canonical/dex/front/0589--000--Escavalier.png b/src/canonical/dex/front/0589-000-Escavalier.png
similarity index 100%
rename from src/canonical/dex/front/0589--000--Escavalier.png
rename to src/canonical/dex/front/0589-000-Escavalier.png
diff --git a/src/canonical/dex/front/0590--000--Foongus.png b/src/canonical/dex/front/0590-000-Foongus.png
similarity index 100%
rename from src/canonical/dex/front/0590--000--Foongus.png
rename to src/canonical/dex/front/0590-000-Foongus.png
diff --git a/src/canonical/dex/front/0591--000--Amoonguss.png b/src/canonical/dex/front/0591-000-Amoonguss.png
similarity index 100%
rename from src/canonical/dex/front/0591--000--Amoonguss.png
rename to src/canonical/dex/front/0591-000-Amoonguss.png
diff --git a/src/canonical/dex/front/0592--000--Frillish.png b/src/canonical/dex/front/0592-000-Frillish.png
similarity index 100%
rename from src/canonical/dex/front/0592--000--Frillish.png
rename to src/canonical/dex/front/0592-000-Frillish.png
diff --git a/src/canonical/dex/front/0593--000--Jellicent.png b/src/canonical/dex/front/0593-000-Jellicent.png
similarity index 100%
rename from src/canonical/dex/front/0593--000--Jellicent.png
rename to src/canonical/dex/front/0593-000-Jellicent.png
diff --git a/src/canonical/dex/front/0594--000--Alomomola.png b/src/canonical/dex/front/0594-000-Alomomola.png
similarity index 100%
rename from src/canonical/dex/front/0594--000--Alomomola.png
rename to src/canonical/dex/front/0594-000-Alomomola.png
diff --git a/src/canonical/dex/front/0595--000--Joltik.png b/src/canonical/dex/front/0595-000-Joltik.png
similarity index 100%
rename from src/canonical/dex/front/0595--000--Joltik.png
rename to src/canonical/dex/front/0595-000-Joltik.png
diff --git a/src/canonical/dex/front/0596--000--Galvantula.png b/src/canonical/dex/front/0596-000-Galvantula.png
similarity index 100%
rename from src/canonical/dex/front/0596--000--Galvantula.png
rename to src/canonical/dex/front/0596-000-Galvantula.png
diff --git a/src/canonical/dex/front/0597--000--Ferroseed.png b/src/canonical/dex/front/0597-000-Ferroseed.png
similarity index 100%
rename from src/canonical/dex/front/0597--000--Ferroseed.png
rename to src/canonical/dex/front/0597-000-Ferroseed.png
diff --git a/src/canonical/dex/front/0598--000--Ferrothorn.png b/src/canonical/dex/front/0598-000-Ferrothorn.png
similarity index 100%
rename from src/canonical/dex/front/0598--000--Ferrothorn.png
rename to src/canonical/dex/front/0598-000-Ferrothorn.png
diff --git a/src/canonical/dex/front/0599--000--Klink.png b/src/canonical/dex/front/0599-000-Klink.png
similarity index 100%
rename from src/canonical/dex/front/0599--000--Klink.png
rename to src/canonical/dex/front/0599-000-Klink.png
diff --git a/src/canonical/dex/front/0600--000--Klang.png b/src/canonical/dex/front/0600-000-Klang.png
similarity index 100%
rename from src/canonical/dex/front/0600--000--Klang.png
rename to src/canonical/dex/front/0600-000-Klang.png
diff --git a/src/canonical/dex/front/0601--000--Klinklang.png b/src/canonical/dex/front/0601-000-Klinklang.png
similarity index 100%
rename from src/canonical/dex/front/0601--000--Klinklang.png
rename to src/canonical/dex/front/0601-000-Klinklang.png
diff --git a/src/canonical/dex/front/0602--000--Tynamo.png b/src/canonical/dex/front/0602-000-Tynamo.png
similarity index 100%
rename from src/canonical/dex/front/0602--000--Tynamo.png
rename to src/canonical/dex/front/0602-000-Tynamo.png
diff --git a/src/canonical/dex/front/0603--000--Eelektrik.png b/src/canonical/dex/front/0603-000-Eelektrik.png
similarity index 100%
rename from src/canonical/dex/front/0603--000--Eelektrik.png
rename to src/canonical/dex/front/0603-000-Eelektrik.png
diff --git a/src/canonical/dex/front/0604--000--Eelektross.png b/src/canonical/dex/front/0604-000-Eelektross.png
similarity index 100%
rename from src/canonical/dex/front/0604--000--Eelektross.png
rename to src/canonical/dex/front/0604-000-Eelektross.png
diff --git a/src/canonical/dex/front/0605--000--Elgyem.png b/src/canonical/dex/front/0605-000-Elgyem.png
similarity index 100%
rename from src/canonical/dex/front/0605--000--Elgyem.png
rename to src/canonical/dex/front/0605-000-Elgyem.png
diff --git a/src/canonical/dex/front/0606--000--Beheeyem.png b/src/canonical/dex/front/0606-000-Beheeyem.png
similarity index 100%
rename from src/canonical/dex/front/0606--000--Beheeyem.png
rename to src/canonical/dex/front/0606-000-Beheeyem.png
diff --git a/src/canonical/dex/front/0607--000--Litwick.png b/src/canonical/dex/front/0607-000-Litwick.png
similarity index 100%
rename from src/canonical/dex/front/0607--000--Litwick.png
rename to src/canonical/dex/front/0607-000-Litwick.png
diff --git a/src/canonical/dex/front/0608--000--Lampent.png b/src/canonical/dex/front/0608-000-Lampent.png
similarity index 100%
rename from src/canonical/dex/front/0608--000--Lampent.png
rename to src/canonical/dex/front/0608-000-Lampent.png
diff --git a/src/canonical/dex/front/0609--000--Chandelure.png b/src/canonical/dex/front/0609-000-Chandelure.png
similarity index 100%
rename from src/canonical/dex/front/0609--000--Chandelure.png
rename to src/canonical/dex/front/0609-000-Chandelure.png
diff --git a/src/canonical/dex/front/0610--000--Axew.png b/src/canonical/dex/front/0610-000-Axew.png
similarity index 100%
rename from src/canonical/dex/front/0610--000--Axew.png
rename to src/canonical/dex/front/0610-000-Axew.png
diff --git a/src/canonical/dex/front/0611--000--Fraxure.png b/src/canonical/dex/front/0611-000-Fraxure.png
similarity index 100%
rename from src/canonical/dex/front/0611--000--Fraxure.png
rename to src/canonical/dex/front/0611-000-Fraxure.png
diff --git a/src/canonical/dex/front/0612--000--Haxorus.png b/src/canonical/dex/front/0612-000-Haxorus.png
similarity index 100%
rename from src/canonical/dex/front/0612--000--Haxorus.png
rename to src/canonical/dex/front/0612-000-Haxorus.png
diff --git a/src/canonical/dex/front/0613--000--Cubchoo.png b/src/canonical/dex/front/0613-000-Cubchoo.png
similarity index 100%
rename from src/canonical/dex/front/0613--000--Cubchoo.png
rename to src/canonical/dex/front/0613-000-Cubchoo.png
diff --git a/src/canonical/dex/front/0614--000--Beartic.png b/src/canonical/dex/front/0614-000-Beartic.png
similarity index 100%
rename from src/canonical/dex/front/0614--000--Beartic.png
rename to src/canonical/dex/front/0614-000-Beartic.png
diff --git a/src/canonical/dex/front/0615--000--Cryogonal.png b/src/canonical/dex/front/0615-000-Cryogonal.png
similarity index 100%
rename from src/canonical/dex/front/0615--000--Cryogonal.png
rename to src/canonical/dex/front/0615-000-Cryogonal.png
diff --git a/src/canonical/dex/front/0616--000--Shelmet.png b/src/canonical/dex/front/0616-000-Shelmet.png
similarity index 100%
rename from src/canonical/dex/front/0616--000--Shelmet.png
rename to src/canonical/dex/front/0616-000-Shelmet.png
diff --git a/src/canonical/dex/front/0617--000--Accelgor.png b/src/canonical/dex/front/0617-000-Accelgor.png
similarity index 100%
rename from src/canonical/dex/front/0617--000--Accelgor.png
rename to src/canonical/dex/front/0617-000-Accelgor.png
diff --git a/src/canonical/dex/front/0618--000--Stunfisk.png b/src/canonical/dex/front/0618-000-Stunfisk.png
similarity index 100%
rename from src/canonical/dex/front/0618--000--Stunfisk.png
rename to src/canonical/dex/front/0618-000-Stunfisk.png
diff --git a/src/canonical/dex/front/0619--000--Mienfoo.png b/src/canonical/dex/front/0619-000-Mienfoo.png
similarity index 100%
rename from src/canonical/dex/front/0619--000--Mienfoo.png
rename to src/canonical/dex/front/0619-000-Mienfoo.png
diff --git a/src/canonical/dex/front/0620--000--Mienshao.png b/src/canonical/dex/front/0620-000-Mienshao.png
similarity index 100%
rename from src/canonical/dex/front/0620--000--Mienshao.png
rename to src/canonical/dex/front/0620-000-Mienshao.png
diff --git a/src/canonical/dex/front/0621--000--Druddigon.png b/src/canonical/dex/front/0621-000-Druddigon.png
similarity index 100%
rename from src/canonical/dex/front/0621--000--Druddigon.png
rename to src/canonical/dex/front/0621-000-Druddigon.png
diff --git a/src/canonical/dex/front/0622--000--Golett.png b/src/canonical/dex/front/0622-000-Golett.png
similarity index 100%
rename from src/canonical/dex/front/0622--000--Golett.png
rename to src/canonical/dex/front/0622-000-Golett.png
diff --git a/src/canonical/dex/front/0623--000--Golurk.png b/src/canonical/dex/front/0623-000-Golurk.png
similarity index 100%
rename from src/canonical/dex/front/0623--000--Golurk.png
rename to src/canonical/dex/front/0623-000-Golurk.png
diff --git a/src/canonical/dex/front/0624--000--Pawniard.png b/src/canonical/dex/front/0624-000-Pawniard.png
similarity index 100%
rename from src/canonical/dex/front/0624--000--Pawniard.png
rename to src/canonical/dex/front/0624-000-Pawniard.png
diff --git a/src/canonical/dex/front/0625--000--Bisharp.png b/src/canonical/dex/front/0625-000-Bisharp.png
similarity index 100%
rename from src/canonical/dex/front/0625--000--Bisharp.png
rename to src/canonical/dex/front/0625-000-Bisharp.png
diff --git a/src/canonical/dex/front/0626--000--Bouffalant.png b/src/canonical/dex/front/0626-000-Bouffalant.png
similarity index 100%
rename from src/canonical/dex/front/0626--000--Bouffalant.png
rename to src/canonical/dex/front/0626-000-Bouffalant.png
diff --git a/src/canonical/dex/front/0627--000--Rufflet.png b/src/canonical/dex/front/0627-000-Rufflet.png
similarity index 100%
rename from src/canonical/dex/front/0627--000--Rufflet.png
rename to src/canonical/dex/front/0627-000-Rufflet.png
diff --git a/src/canonical/dex/front/0628--000--Braviary.png b/src/canonical/dex/front/0628-000-Braviary.png
similarity index 100%
rename from src/canonical/dex/front/0628--000--Braviary.png
rename to src/canonical/dex/front/0628-000-Braviary.png
diff --git a/src/canonical/dex/front/0629--000--Vullaby.png b/src/canonical/dex/front/0629-000-Vullaby.png
similarity index 100%
rename from src/canonical/dex/front/0629--000--Vullaby.png
rename to src/canonical/dex/front/0629-000-Vullaby.png
diff --git a/src/canonical/dex/front/0630--000--Mandibuzz.png b/src/canonical/dex/front/0630-000-Mandibuzz.png
similarity index 100%
rename from src/canonical/dex/front/0630--000--Mandibuzz.png
rename to src/canonical/dex/front/0630-000-Mandibuzz.png
diff --git a/src/canonical/dex/front/0631--000--Heatmor.png b/src/canonical/dex/front/0631-000-Heatmor.png
similarity index 100%
rename from src/canonical/dex/front/0631--000--Heatmor.png
rename to src/canonical/dex/front/0631-000-Heatmor.png
diff --git a/src/canonical/dex/front/0632--000--Durant.png b/src/canonical/dex/front/0632-000-Durant.png
similarity index 100%
rename from src/canonical/dex/front/0632--000--Durant.png
rename to src/canonical/dex/front/0632-000-Durant.png
diff --git a/src/canonical/dex/front/0633--000--Deino.png b/src/canonical/dex/front/0633-000-Deino.png
similarity index 100%
rename from src/canonical/dex/front/0633--000--Deino.png
rename to src/canonical/dex/front/0633-000-Deino.png
diff --git a/src/canonical/dex/front/0634--000--Zweilous.png b/src/canonical/dex/front/0634-000-Zweilous.png
similarity index 100%
rename from src/canonical/dex/front/0634--000--Zweilous.png
rename to src/canonical/dex/front/0634-000-Zweilous.png
diff --git a/src/canonical/dex/front/0635--000--Hydreigon.png b/src/canonical/dex/front/0635-000-Hydreigon.png
similarity index 100%
rename from src/canonical/dex/front/0635--000--Hydreigon.png
rename to src/canonical/dex/front/0635-000-Hydreigon.png
diff --git a/src/canonical/dex/front/0636--000--Larvesta.png b/src/canonical/dex/front/0636-000-Larvesta.png
similarity index 100%
rename from src/canonical/dex/front/0636--000--Larvesta.png
rename to src/canonical/dex/front/0636-000-Larvesta.png
diff --git a/src/canonical/dex/front/0637--000--Volcarona.png b/src/canonical/dex/front/0637-000-Volcarona.png
similarity index 100%
rename from src/canonical/dex/front/0637--000--Volcarona.png
rename to src/canonical/dex/front/0637-000-Volcarona.png
diff --git a/src/canonical/dex/front/0638--000--Cobalion.png b/src/canonical/dex/front/0638-000-Cobalion.png
similarity index 100%
rename from src/canonical/dex/front/0638--000--Cobalion.png
rename to src/canonical/dex/front/0638-000-Cobalion.png
diff --git a/src/canonical/dex/front/0639--000--Terrakion.png b/src/canonical/dex/front/0639-000-Terrakion.png
similarity index 100%
rename from src/canonical/dex/front/0639--000--Terrakion.png
rename to src/canonical/dex/front/0639-000-Terrakion.png
diff --git a/src/canonical/dex/front/0640--000--Virizion.png b/src/canonical/dex/front/0640-000-Virizion.png
similarity index 100%
rename from src/canonical/dex/front/0640--000--Virizion.png
rename to src/canonical/dex/front/0640-000-Virizion.png
diff --git a/src/canonical/dex/front/0641--000--Tornadus.png b/src/canonical/dex/front/0641-000-Tornadus.png
similarity index 100%
rename from src/canonical/dex/front/0641--000--Tornadus.png
rename to src/canonical/dex/front/0641-000-Tornadus.png
diff --git a/src/canonical/dex/front/0641--420--Tornadus--Therian.png b/src/canonical/dex/front/0641-420-Tornadus-Therian.png
similarity index 100%
rename from src/canonical/dex/front/0641--420--Tornadus--Therian.png
rename to src/canonical/dex/front/0641-420-Tornadus-Therian.png
diff --git a/src/canonical/dex/front/0642--000--Thundurus.png b/src/canonical/dex/front/0642-000-Thundurus.png
similarity index 100%
rename from src/canonical/dex/front/0642--000--Thundurus.png
rename to src/canonical/dex/front/0642-000-Thundurus.png
diff --git a/src/canonical/dex/front/0642--420--Thundurus--Therian.png b/src/canonical/dex/front/0642-420-Thundurus-Therian.png
similarity index 100%
rename from src/canonical/dex/front/0642--420--Thundurus--Therian.png
rename to src/canonical/dex/front/0642-420-Thundurus-Therian.png
diff --git a/src/canonical/dex/front/0643--000--Reshiram.png b/src/canonical/dex/front/0643-000-Reshiram.png
similarity index 100%
rename from src/canonical/dex/front/0643--000--Reshiram.png
rename to src/canonical/dex/front/0643-000-Reshiram.png
diff --git a/src/canonical/dex/front/0644--000--Zekrom.png b/src/canonical/dex/front/0644-000-Zekrom.png
similarity index 100%
rename from src/canonical/dex/front/0644--000--Zekrom.png
rename to src/canonical/dex/front/0644-000-Zekrom.png
diff --git a/src/canonical/dex/front/0645--000--Landorus.png b/src/canonical/dex/front/0645-000-Landorus.png
similarity index 100%
rename from src/canonical/dex/front/0645--000--Landorus.png
rename to src/canonical/dex/front/0645-000-Landorus.png
diff --git a/src/canonical/dex/front/0645--420--Landorus--Therian.png b/src/canonical/dex/front/0645-420-Landorus-Therian.png
similarity index 100%
rename from src/canonical/dex/front/0645--420--Landorus--Therian.png
rename to src/canonical/dex/front/0645-420-Landorus-Therian.png
diff --git a/src/canonical/dex/front/0646--000--Kyurem.png b/src/canonical/dex/front/0646-000-Kyurem.png
similarity index 100%
rename from src/canonical/dex/front/0646--000--Kyurem.png
rename to src/canonical/dex/front/0646-000-Kyurem.png
diff --git a/src/canonical/dex/front/0646--420--Kyurem--Black.png b/src/canonical/dex/front/0646-420-Kyurem-Black.png
similarity index 100%
rename from src/canonical/dex/front/0646--420--Kyurem--Black.png
rename to src/canonical/dex/front/0646-420-Kyurem-Black.png
diff --git a/src/canonical/dex/front/0646--420--Kyurem--White.png b/src/canonical/dex/front/0646-420-Kyurem-White.png
similarity index 100%
rename from src/canonical/dex/front/0646--420--Kyurem--White.png
rename to src/canonical/dex/front/0646-420-Kyurem-White.png
diff --git a/src/canonical/dex/front/0647--000--Keldeo.png b/src/canonical/dex/front/0647-000-Keldeo.png
similarity index 100%
rename from src/canonical/dex/front/0647--000--Keldeo.png
rename to src/canonical/dex/front/0647-000-Keldeo.png
diff --git a/src/canonical/dex/front/0647--420--Keldeo--Resolute.png b/src/canonical/dex/front/0647-420-Keldeo-Resolute.png
similarity index 100%
rename from src/canonical/dex/front/0647--420--Keldeo--Resolute.png
rename to src/canonical/dex/front/0647-420-Keldeo-Resolute.png
diff --git a/src/canonical/dex/front/0648--000--Meloetta.png b/src/canonical/dex/front/0648-000-Meloetta.png
similarity index 100%
rename from src/canonical/dex/front/0648--000--Meloetta.png
rename to src/canonical/dex/front/0648-000-Meloetta.png
diff --git a/src/canonical/dex/front/0648--420--Meloetta--Pirouette.png b/src/canonical/dex/front/0648-420-Meloetta-Pirouette.png
similarity index 100%
rename from src/canonical/dex/front/0648--420--Meloetta--Pirouette.png
rename to src/canonical/dex/front/0648-420-Meloetta-Pirouette.png
diff --git a/src/canonical/dex/front/0649--000--Genesect.png b/src/canonical/dex/front/0649-000-Genesect.png
similarity index 100%
rename from src/canonical/dex/front/0649--000--Genesect.png
rename to src/canonical/dex/front/0649-000-Genesect.png
diff --git a/src/canonical/dex/front/0649--420--Genesect--Burn.png b/src/canonical/dex/front/0649-420-Genesect-Burn.png
similarity index 100%
rename from src/canonical/dex/front/0649--420--Genesect--Burn.png
rename to src/canonical/dex/front/0649-420-Genesect-Burn.png
diff --git a/src/canonical/dex/front/0649--420--Genesect--Chill.png b/src/canonical/dex/front/0649-420-Genesect-Chill.png
similarity index 100%
rename from src/canonical/dex/front/0649--420--Genesect--Chill.png
rename to src/canonical/dex/front/0649-420-Genesect-Chill.png
diff --git a/src/canonical/dex/front/0649--420--Genesect--Douse.png b/src/canonical/dex/front/0649-420-Genesect-Douse.png
similarity index 100%
rename from src/canonical/dex/front/0649--420--Genesect--Douse.png
rename to src/canonical/dex/front/0649-420-Genesect-Douse.png
diff --git a/src/canonical/dex/front/0649--420--Genesect--Shock.png b/src/canonical/dex/front/0649-420-Genesect-Shock.png
similarity index 100%
rename from src/canonical/dex/front/0649--420--Genesect--Shock.png
rename to src/canonical/dex/front/0649-420-Genesect-Shock.png
diff --git a/src/canonical/dex/front/0650--000--Chespin.png b/src/canonical/dex/front/0650-000-Chespin.png
similarity index 100%
rename from src/canonical/dex/front/0650--000--Chespin.png
rename to src/canonical/dex/front/0650-000-Chespin.png
diff --git a/src/canonical/dex/front/0651--000--Quilladin.png b/src/canonical/dex/front/0651-000-Quilladin.png
similarity index 100%
rename from src/canonical/dex/front/0651--000--Quilladin.png
rename to src/canonical/dex/front/0651-000-Quilladin.png
diff --git a/src/canonical/dex/front/0652--000--Chesnaught.png b/src/canonical/dex/front/0652-000-Chesnaught.png
similarity index 100%
rename from src/canonical/dex/front/0652--000--Chesnaught.png
rename to src/canonical/dex/front/0652-000-Chesnaught.png
diff --git a/src/canonical/dex/front/0653--000--Fennekin.png b/src/canonical/dex/front/0653-000-Fennekin.png
similarity index 100%
rename from src/canonical/dex/front/0653--000--Fennekin.png
rename to src/canonical/dex/front/0653-000-Fennekin.png
diff --git a/src/canonical/dex/front/0654--000--Braixen.png b/src/canonical/dex/front/0654-000-Braixen.png
similarity index 100%
rename from src/canonical/dex/front/0654--000--Braixen.png
rename to src/canonical/dex/front/0654-000-Braixen.png
diff --git a/src/canonical/dex/front/0655--000--Delphox.png b/src/canonical/dex/front/0655-000-Delphox.png
similarity index 100%
rename from src/canonical/dex/front/0655--000--Delphox.png
rename to src/canonical/dex/front/0655-000-Delphox.png
diff --git a/src/canonical/dex/front/0656--000--Froakie.png b/src/canonical/dex/front/0656-000-Froakie.png
similarity index 100%
rename from src/canonical/dex/front/0656--000--Froakie.png
rename to src/canonical/dex/front/0656-000-Froakie.png
diff --git a/src/canonical/dex/front/0657--000--Frogadier.png b/src/canonical/dex/front/0657-000-Frogadier.png
similarity index 100%
rename from src/canonical/dex/front/0657--000--Frogadier.png
rename to src/canonical/dex/front/0657-000-Frogadier.png
diff --git a/src/canonical/dex/front/0658--000--Greninja.png b/src/canonical/dex/front/0658-000-Greninja.png
similarity index 100%
rename from src/canonical/dex/front/0658--000--Greninja.png
rename to src/canonical/dex/front/0658-000-Greninja.png
diff --git a/src/canonical/dex/front/0658--420--Greninja--Ash.png b/src/canonical/dex/front/0658-420-Greninja-Ash.png
similarity index 100%
rename from src/canonical/dex/front/0658--420--Greninja--Ash.png
rename to src/canonical/dex/front/0658-420-Greninja-Ash.png
diff --git a/src/canonical/dex/front/0659--000--Bunnelby.png b/src/canonical/dex/front/0659-000-Bunnelby.png
similarity index 100%
rename from src/canonical/dex/front/0659--000--Bunnelby.png
rename to src/canonical/dex/front/0659-000-Bunnelby.png
diff --git a/src/canonical/dex/front/0660--000--Diggersby.png b/src/canonical/dex/front/0660-000-Diggersby.png
similarity index 100%
rename from src/canonical/dex/front/0660--000--Diggersby.png
rename to src/canonical/dex/front/0660-000-Diggersby.png
diff --git a/src/canonical/dex/front/0661--000--Fletchling.png b/src/canonical/dex/front/0661-000-Fletchling.png
similarity index 100%
rename from src/canonical/dex/front/0661--000--Fletchling.png
rename to src/canonical/dex/front/0661-000-Fletchling.png
diff --git a/src/canonical/dex/front/0662--000--Fletchinder.png b/src/canonical/dex/front/0662-000-Fletchinder.png
similarity index 100%
rename from src/canonical/dex/front/0662--000--Fletchinder.png
rename to src/canonical/dex/front/0662-000-Fletchinder.png
diff --git a/src/canonical/dex/front/0663--000--Talonflame.png b/src/canonical/dex/front/0663-000-Talonflame.png
similarity index 100%
rename from src/canonical/dex/front/0663--000--Talonflame.png
rename to src/canonical/dex/front/0663-000-Talonflame.png
diff --git a/src/canonical/dex/front/0664--000--Scatterbug.png b/src/canonical/dex/front/0664-000-Scatterbug.png
similarity index 100%
rename from src/canonical/dex/front/0664--000--Scatterbug.png
rename to src/canonical/dex/front/0664-000-Scatterbug.png
diff --git a/src/canonical/dex/front/0665--000--Spewpa.png b/src/canonical/dex/front/0665-000-Spewpa.png
similarity index 100%
rename from src/canonical/dex/front/0665--000--Spewpa.png
rename to src/canonical/dex/front/0665-000-Spewpa.png
diff --git a/src/canonical/dex/front/0666--000--Vivillon.png b/src/canonical/dex/front/0666-000-Vivillon.png
similarity index 100%
rename from src/canonical/dex/front/0666--000--Vivillon.png
rename to src/canonical/dex/front/0666-000-Vivillon.png
diff --git a/src/canonical/dex/front/0666--420--Vivillon--Fancy.png b/src/canonical/dex/front/0666-420-Vivillon-Fancy.png
similarity index 100%
rename from src/canonical/dex/front/0666--420--Vivillon--Fancy.png
rename to src/canonical/dex/front/0666-420-Vivillon-Fancy.png
diff --git a/src/canonical/dex/front/0666--420--Vivillon--Pokeball.png b/src/canonical/dex/front/0666-420-Vivillon-Pokeball.png
similarity index 100%
rename from src/canonical/dex/front/0666--420--Vivillon--Pokeball.png
rename to src/canonical/dex/front/0666-420-Vivillon-Pokeball.png
diff --git a/src/canonical/dex/front/0667--000--Litleo.png b/src/canonical/dex/front/0667-000-Litleo.png
similarity index 100%
rename from src/canonical/dex/front/0667--000--Litleo.png
rename to src/canonical/dex/front/0667-000-Litleo.png
diff --git a/src/canonical/dex/front/0668--000--Pyroar.png b/src/canonical/dex/front/0668-000-Pyroar.png
similarity index 100%
rename from src/canonical/dex/front/0668--000--Pyroar.png
rename to src/canonical/dex/front/0668-000-Pyroar.png
diff --git a/src/canonical/dex/front/0669--000--Flabe__0301be__0301.png b/src/canonical/dex/front/0669-000-Flabe__0301be__0301.png
similarity index 100%
rename from src/canonical/dex/front/0669--000--Flabe__0301be__0301.png
rename to src/canonical/dex/front/0669-000-Flabe__0301be__0301.png
diff --git a/src/canonical/dex/front/0670--000--Floette.png b/src/canonical/dex/front/0670-000-Floette.png
similarity index 100%
rename from src/canonical/dex/front/0670--000--Floette.png
rename to src/canonical/dex/front/0670-000-Floette.png
diff --git a/src/canonical/dex/front/0670--420--Floette--Eternal.png b/src/canonical/dex/front/0670-420-Floette-Eternal.png
similarity index 100%
rename from src/canonical/dex/front/0670--420--Floette--Eternal.png
rename to src/canonical/dex/front/0670-420-Floette-Eternal.png
diff --git a/src/canonical/dex/front/0671--000--Florges.png b/src/canonical/dex/front/0671-000-Florges.png
similarity index 100%
rename from src/canonical/dex/front/0671--000--Florges.png
rename to src/canonical/dex/front/0671-000-Florges.png
diff --git a/src/canonical/dex/front/0672--000--Skiddo.png b/src/canonical/dex/front/0672-000-Skiddo.png
similarity index 100%
rename from src/canonical/dex/front/0672--000--Skiddo.png
rename to src/canonical/dex/front/0672-000-Skiddo.png
diff --git a/src/canonical/dex/front/0673--000--Gogoat.png b/src/canonical/dex/front/0673-000-Gogoat.png
similarity index 100%
rename from src/canonical/dex/front/0673--000--Gogoat.png
rename to src/canonical/dex/front/0673-000-Gogoat.png
diff --git a/src/canonical/dex/front/0674--000--Pancham.png b/src/canonical/dex/front/0674-000-Pancham.png
similarity index 100%
rename from src/canonical/dex/front/0674--000--Pancham.png
rename to src/canonical/dex/front/0674-000-Pancham.png
diff --git a/src/canonical/dex/front/0675--000--Pangoro.png b/src/canonical/dex/front/0675-000-Pangoro.png
similarity index 100%
rename from src/canonical/dex/front/0675--000--Pangoro.png
rename to src/canonical/dex/front/0675-000-Pangoro.png
diff --git a/src/canonical/dex/front/0676--000--Furfrou.png b/src/canonical/dex/front/0676-000-Furfrou.png
similarity index 100%
rename from src/canonical/dex/front/0676--000--Furfrou.png
rename to src/canonical/dex/front/0676-000-Furfrou.png
diff --git a/src/canonical/dex/front/0677--000--Espurr.png b/src/canonical/dex/front/0677-000-Espurr.png
similarity index 100%
rename from src/canonical/dex/front/0677--000--Espurr.png
rename to src/canonical/dex/front/0677-000-Espurr.png
diff --git a/src/canonical/dex/front/0678--000--Meowstic.png b/src/canonical/dex/front/0678-000-Meowstic.png
similarity index 100%
rename from src/canonical/dex/front/0678--000--Meowstic.png
rename to src/canonical/dex/front/0678-000-Meowstic.png
diff --git a/src/canonical/dex/front/0678--420--Meowstic--F.png b/src/canonical/dex/front/0678-420-Meowstic-F.png
similarity index 100%
rename from src/canonical/dex/front/0678--420--Meowstic--F.png
rename to src/canonical/dex/front/0678-420-Meowstic-F.png
diff --git a/src/canonical/dex/front/0679--000--Honedge.png b/src/canonical/dex/front/0679-000-Honedge.png
similarity index 100%
rename from src/canonical/dex/front/0679--000--Honedge.png
rename to src/canonical/dex/front/0679-000-Honedge.png
diff --git a/src/canonical/dex/front/0680--000--Doublade.png b/src/canonical/dex/front/0680-000-Doublade.png
similarity index 100%
rename from src/canonical/dex/front/0680--000--Doublade.png
rename to src/canonical/dex/front/0680-000-Doublade.png
diff --git a/src/canonical/dex/front/0681--000--Aegislash.png b/src/canonical/dex/front/0681-000-Aegislash.png
similarity index 100%
rename from src/canonical/dex/front/0681--000--Aegislash.png
rename to src/canonical/dex/front/0681-000-Aegislash.png
diff --git a/src/canonical/dex/front/0681--420--Aegislash--Blade.png b/src/canonical/dex/front/0681-420-Aegislash-Blade.png
similarity index 100%
rename from src/canonical/dex/front/0681--420--Aegislash--Blade.png
rename to src/canonical/dex/front/0681-420-Aegislash-Blade.png
diff --git a/src/canonical/dex/front/0682--000--Spritzee.png b/src/canonical/dex/front/0682-000-Spritzee.png
similarity index 100%
rename from src/canonical/dex/front/0682--000--Spritzee.png
rename to src/canonical/dex/front/0682-000-Spritzee.png
diff --git a/src/canonical/dex/front/0683--000--Aromatisse.png b/src/canonical/dex/front/0683-000-Aromatisse.png
similarity index 100%
rename from src/canonical/dex/front/0683--000--Aromatisse.png
rename to src/canonical/dex/front/0683-000-Aromatisse.png
diff --git a/src/canonical/dex/front/0684--000--Swirlix.png b/src/canonical/dex/front/0684-000-Swirlix.png
similarity index 100%
rename from src/canonical/dex/front/0684--000--Swirlix.png
rename to src/canonical/dex/front/0684-000-Swirlix.png
diff --git a/src/canonical/dex/front/0685--000--Slurpuff.png b/src/canonical/dex/front/0685-000-Slurpuff.png
similarity index 100%
rename from src/canonical/dex/front/0685--000--Slurpuff.png
rename to src/canonical/dex/front/0685-000-Slurpuff.png
diff --git a/src/canonical/dex/front/0686--000--Inkay.png b/src/canonical/dex/front/0686-000-Inkay.png
similarity index 100%
rename from src/canonical/dex/front/0686--000--Inkay.png
rename to src/canonical/dex/front/0686-000-Inkay.png
diff --git a/src/canonical/dex/front/0687--000--Malamar.png b/src/canonical/dex/front/0687-000-Malamar.png
similarity index 100%
rename from src/canonical/dex/front/0687--000--Malamar.png
rename to src/canonical/dex/front/0687-000-Malamar.png
diff --git a/src/canonical/dex/front/0688--000--Binacle.png b/src/canonical/dex/front/0688-000-Binacle.png
similarity index 100%
rename from src/canonical/dex/front/0688--000--Binacle.png
rename to src/canonical/dex/front/0688-000-Binacle.png
diff --git a/src/canonical/dex/front/0689--000--Barbaracle.png b/src/canonical/dex/front/0689-000-Barbaracle.png
similarity index 100%
rename from src/canonical/dex/front/0689--000--Barbaracle.png
rename to src/canonical/dex/front/0689-000-Barbaracle.png
diff --git a/src/canonical/dex/front/0690--000--Skrelp.png b/src/canonical/dex/front/0690-000-Skrelp.png
similarity index 100%
rename from src/canonical/dex/front/0690--000--Skrelp.png
rename to src/canonical/dex/front/0690-000-Skrelp.png
diff --git a/src/canonical/dex/front/0691--000--Dragalge.png b/src/canonical/dex/front/0691-000-Dragalge.png
similarity index 100%
rename from src/canonical/dex/front/0691--000--Dragalge.png
rename to src/canonical/dex/front/0691-000-Dragalge.png
diff --git a/src/canonical/dex/front/0692--000--Clauncher.png b/src/canonical/dex/front/0692-000-Clauncher.png
similarity index 100%
rename from src/canonical/dex/front/0692--000--Clauncher.png
rename to src/canonical/dex/front/0692-000-Clauncher.png
diff --git a/src/canonical/dex/front/0693--000--Clawitzer.png b/src/canonical/dex/front/0693-000-Clawitzer.png
similarity index 100%
rename from src/canonical/dex/front/0693--000--Clawitzer.png
rename to src/canonical/dex/front/0693-000-Clawitzer.png
diff --git a/src/canonical/dex/front/0694--000--Helioptile.png b/src/canonical/dex/front/0694-000-Helioptile.png
similarity index 100%
rename from src/canonical/dex/front/0694--000--Helioptile.png
rename to src/canonical/dex/front/0694-000-Helioptile.png
diff --git a/src/canonical/dex/front/0695--000--Heliolisk.png b/src/canonical/dex/front/0695-000-Heliolisk.png
similarity index 100%
rename from src/canonical/dex/front/0695--000--Heliolisk.png
rename to src/canonical/dex/front/0695-000-Heliolisk.png
diff --git a/src/canonical/dex/front/0696--000--Tyrunt.png b/src/canonical/dex/front/0696-000-Tyrunt.png
similarity index 100%
rename from src/canonical/dex/front/0696--000--Tyrunt.png
rename to src/canonical/dex/front/0696-000-Tyrunt.png
diff --git a/src/canonical/dex/front/0697--000--Tyrantrum.png b/src/canonical/dex/front/0697-000-Tyrantrum.png
similarity index 100%
rename from src/canonical/dex/front/0697--000--Tyrantrum.png
rename to src/canonical/dex/front/0697-000-Tyrantrum.png
diff --git a/src/canonical/dex/front/0698--000--Amaura.png b/src/canonical/dex/front/0698-000-Amaura.png
similarity index 100%
rename from src/canonical/dex/front/0698--000--Amaura.png
rename to src/canonical/dex/front/0698-000-Amaura.png
diff --git a/src/canonical/dex/front/0699--000--Aurorus.png b/src/canonical/dex/front/0699-000-Aurorus.png
similarity index 100%
rename from src/canonical/dex/front/0699--000--Aurorus.png
rename to src/canonical/dex/front/0699-000-Aurorus.png
diff --git a/src/canonical/dex/front/0700--000--Sylveon.png b/src/canonical/dex/front/0700-000-Sylveon.png
similarity index 100%
rename from src/canonical/dex/front/0700--000--Sylveon.png
rename to src/canonical/dex/front/0700-000-Sylveon.png
diff --git a/src/canonical/dex/front/0701--000--Hawlucha.png b/src/canonical/dex/front/0701-000-Hawlucha.png
similarity index 100%
rename from src/canonical/dex/front/0701--000--Hawlucha.png
rename to src/canonical/dex/front/0701-000-Hawlucha.png
diff --git a/src/canonical/dex/front/0702--000--Dedenne.png b/src/canonical/dex/front/0702-000-Dedenne.png
similarity index 100%
rename from src/canonical/dex/front/0702--000--Dedenne.png
rename to src/canonical/dex/front/0702-000-Dedenne.png
diff --git a/src/canonical/dex/front/0703--000--Carbink.png b/src/canonical/dex/front/0703-000-Carbink.png
similarity index 100%
rename from src/canonical/dex/front/0703--000--Carbink.png
rename to src/canonical/dex/front/0703-000-Carbink.png
diff --git a/src/canonical/dex/front/0704--000--Goomy.png b/src/canonical/dex/front/0704-000-Goomy.png
similarity index 100%
rename from src/canonical/dex/front/0704--000--Goomy.png
rename to src/canonical/dex/front/0704-000-Goomy.png
diff --git a/src/canonical/dex/front/0705--000--Sliggoo.png b/src/canonical/dex/front/0705-000-Sliggoo.png
similarity index 100%
rename from src/canonical/dex/front/0705--000--Sliggoo.png
rename to src/canonical/dex/front/0705-000-Sliggoo.png
diff --git a/src/canonical/dex/front/0706--000--Goodra.png b/src/canonical/dex/front/0706-000-Goodra.png
similarity index 100%
rename from src/canonical/dex/front/0706--000--Goodra.png
rename to src/canonical/dex/front/0706-000-Goodra.png
diff --git a/src/canonical/dex/front/0707--000--Klefki.png b/src/canonical/dex/front/0707-000-Klefki.png
similarity index 100%
rename from src/canonical/dex/front/0707--000--Klefki.png
rename to src/canonical/dex/front/0707-000-Klefki.png
diff --git a/src/canonical/dex/front/0708--000--Phantump.png b/src/canonical/dex/front/0708-000-Phantump.png
similarity index 100%
rename from src/canonical/dex/front/0708--000--Phantump.png
rename to src/canonical/dex/front/0708-000-Phantump.png
diff --git a/src/canonical/dex/front/0709--000--Trevenant.png b/src/canonical/dex/front/0709-000-Trevenant.png
similarity index 100%
rename from src/canonical/dex/front/0709--000--Trevenant.png
rename to src/canonical/dex/front/0709-000-Trevenant.png
diff --git a/src/canonical/dex/front/0710--000--Pumpkaboo.png b/src/canonical/dex/front/0710-000-Pumpkaboo.png
similarity index 100%
rename from src/canonical/dex/front/0710--000--Pumpkaboo.png
rename to src/canonical/dex/front/0710-000-Pumpkaboo.png
diff --git a/src/canonical/dex/front/0710--420--Pumpkaboo--Large.png b/src/canonical/dex/front/0710-420-Pumpkaboo-Large.png
similarity index 100%
rename from src/canonical/dex/front/0710--420--Pumpkaboo--Large.png
rename to src/canonical/dex/front/0710-420-Pumpkaboo-Large.png
diff --git a/src/canonical/dex/front/0710--420--Pumpkaboo--Small.png b/src/canonical/dex/front/0710-420-Pumpkaboo-Small.png
similarity index 100%
rename from src/canonical/dex/front/0710--420--Pumpkaboo--Small.png
rename to src/canonical/dex/front/0710-420-Pumpkaboo-Small.png
diff --git a/src/canonical/dex/front/0710--420--Pumpkaboo--Super.png b/src/canonical/dex/front/0710-420-Pumpkaboo-Super.png
similarity index 100%
rename from src/canonical/dex/front/0710--420--Pumpkaboo--Super.png
rename to src/canonical/dex/front/0710-420-Pumpkaboo-Super.png
diff --git a/src/canonical/dex/front/0711--000--Gourgeist.png b/src/canonical/dex/front/0711-000-Gourgeist.png
similarity index 100%
rename from src/canonical/dex/front/0711--000--Gourgeist.png
rename to src/canonical/dex/front/0711-000-Gourgeist.png
diff --git a/src/canonical/dex/front/0711--420--Gourgeist--Large.png b/src/canonical/dex/front/0711-420-Gourgeist-Large.png
similarity index 100%
rename from src/canonical/dex/front/0711--420--Gourgeist--Large.png
rename to src/canonical/dex/front/0711-420-Gourgeist-Large.png
diff --git a/src/canonical/dex/front/0711--420--Gourgeist--Small.png b/src/canonical/dex/front/0711-420-Gourgeist-Small.png
similarity index 100%
rename from src/canonical/dex/front/0711--420--Gourgeist--Small.png
rename to src/canonical/dex/front/0711-420-Gourgeist-Small.png
diff --git a/src/canonical/dex/front/0711--420--Gourgeist--Super.png b/src/canonical/dex/front/0711-420-Gourgeist-Super.png
similarity index 100%
rename from src/canonical/dex/front/0711--420--Gourgeist--Super.png
rename to src/canonical/dex/front/0711-420-Gourgeist-Super.png
diff --git a/src/canonical/dex/front/0712--000--Bergmite.png b/src/canonical/dex/front/0712-000-Bergmite.png
similarity index 100%
rename from src/canonical/dex/front/0712--000--Bergmite.png
rename to src/canonical/dex/front/0712-000-Bergmite.png
diff --git a/src/canonical/dex/front/0713--000--Avalugg.png b/src/canonical/dex/front/0713-000-Avalugg.png
similarity index 100%
rename from src/canonical/dex/front/0713--000--Avalugg.png
rename to src/canonical/dex/front/0713-000-Avalugg.png
diff --git a/src/canonical/dex/front/0714--000--Noibat.png b/src/canonical/dex/front/0714-000-Noibat.png
similarity index 100%
rename from src/canonical/dex/front/0714--000--Noibat.png
rename to src/canonical/dex/front/0714-000-Noibat.png
diff --git a/src/canonical/dex/front/0715--000--Noivern.png b/src/canonical/dex/front/0715-000-Noivern.png
similarity index 100%
rename from src/canonical/dex/front/0715--000--Noivern.png
rename to src/canonical/dex/front/0715-000-Noivern.png
diff --git a/src/canonical/dex/front/0716--000--Xerneas.png b/src/canonical/dex/front/0716-000-Xerneas.png
similarity index 100%
rename from src/canonical/dex/front/0716--000--Xerneas.png
rename to src/canonical/dex/front/0716-000-Xerneas.png
diff --git a/src/canonical/dex/front/0717--000--Yveltal.png b/src/canonical/dex/front/0717-000-Yveltal.png
similarity index 100%
rename from src/canonical/dex/front/0717--000--Yveltal.png
rename to src/canonical/dex/front/0717-000-Yveltal.png
diff --git a/src/canonical/dex/front/0718--000--Zygarde.png b/src/canonical/dex/front/0718-000-Zygarde.png
similarity index 100%
rename from src/canonical/dex/front/0718--000--Zygarde.png
rename to src/canonical/dex/front/0718-000-Zygarde.png
diff --git a/src/canonical/dex/front/0718--420--Zygarde--10__0025.png b/src/canonical/dex/front/0718-420-Zygarde-10__0025.png
similarity index 100%
rename from src/canonical/dex/front/0718--420--Zygarde--10__0025.png
rename to src/canonical/dex/front/0718-420-Zygarde-10__0025.png
diff --git a/src/canonical/dex/front/0718--420--Zygarde--Complete.png b/src/canonical/dex/front/0718-420-Zygarde-Complete.png
similarity index 100%
rename from src/canonical/dex/front/0718--420--Zygarde--Complete.png
rename to src/canonical/dex/front/0718-420-Zygarde-Complete.png
diff --git a/src/canonical/dex/front/0719--000--Diancie.png b/src/canonical/dex/front/0719-000-Diancie.png
similarity index 100%
rename from src/canonical/dex/front/0719--000--Diancie.png
rename to src/canonical/dex/front/0719-000-Diancie.png
diff --git a/src/canonical/dex/front/0719--420--Diancie--Mega.png b/src/canonical/dex/front/0719-420-Diancie-Mega.png
similarity index 100%
rename from src/canonical/dex/front/0719--420--Diancie--Mega.png
rename to src/canonical/dex/front/0719-420-Diancie-Mega.png
diff --git a/src/canonical/dex/front/0720--000--Hoopa.png b/src/canonical/dex/front/0720-000-Hoopa.png
similarity index 100%
rename from src/canonical/dex/front/0720--000--Hoopa.png
rename to src/canonical/dex/front/0720-000-Hoopa.png
diff --git a/src/canonical/dex/front/0720--420--Hoopa--Unbound.png b/src/canonical/dex/front/0720-420-Hoopa-Unbound.png
similarity index 100%
rename from src/canonical/dex/front/0720--420--Hoopa--Unbound.png
rename to src/canonical/dex/front/0720-420-Hoopa-Unbound.png
diff --git a/src/canonical/dex/front/0721--000--Volcanion.png b/src/canonical/dex/front/0721-000-Volcanion.png
similarity index 100%
rename from src/canonical/dex/front/0721--000--Volcanion.png
rename to src/canonical/dex/front/0721-000-Volcanion.png
diff --git a/src/canonical/dex/front/0722--000--Rowlet.png b/src/canonical/dex/front/0722-000-Rowlet.png
similarity index 100%
rename from src/canonical/dex/front/0722--000--Rowlet.png
rename to src/canonical/dex/front/0722-000-Rowlet.png
diff --git a/src/canonical/dex/front/0723--000--Dartrix.png b/src/canonical/dex/front/0723-000-Dartrix.png
similarity index 100%
rename from src/canonical/dex/front/0723--000--Dartrix.png
rename to src/canonical/dex/front/0723-000-Dartrix.png
diff --git a/src/canonical/dex/front/0724--000--Decidueye.png b/src/canonical/dex/front/0724-000-Decidueye.png
similarity index 100%
rename from src/canonical/dex/front/0724--000--Decidueye.png
rename to src/canonical/dex/front/0724-000-Decidueye.png
diff --git a/src/canonical/dex/front/0725--000--Litten.png b/src/canonical/dex/front/0725-000-Litten.png
similarity index 100%
rename from src/canonical/dex/front/0725--000--Litten.png
rename to src/canonical/dex/front/0725-000-Litten.png
diff --git a/src/canonical/dex/front/0726--000--Torracat.png b/src/canonical/dex/front/0726-000-Torracat.png
similarity index 100%
rename from src/canonical/dex/front/0726--000--Torracat.png
rename to src/canonical/dex/front/0726-000-Torracat.png
diff --git a/src/canonical/dex/front/0727--000--Incineroar.png b/src/canonical/dex/front/0727-000-Incineroar.png
similarity index 100%
rename from src/canonical/dex/front/0727--000--Incineroar.png
rename to src/canonical/dex/front/0727-000-Incineroar.png
diff --git a/src/canonical/dex/front/0728--000--Popplio.png b/src/canonical/dex/front/0728-000-Popplio.png
similarity index 100%
rename from src/canonical/dex/front/0728--000--Popplio.png
rename to src/canonical/dex/front/0728-000-Popplio.png
diff --git a/src/canonical/dex/front/0729--000--Brionne.png b/src/canonical/dex/front/0729-000-Brionne.png
similarity index 100%
rename from src/canonical/dex/front/0729--000--Brionne.png
rename to src/canonical/dex/front/0729-000-Brionne.png
diff --git a/src/canonical/dex/front/0730--000--Primarina.png b/src/canonical/dex/front/0730-000-Primarina.png
similarity index 100%
rename from src/canonical/dex/front/0730--000--Primarina.png
rename to src/canonical/dex/front/0730-000-Primarina.png
diff --git a/src/canonical/dex/front/0731--000--Pikipek.png b/src/canonical/dex/front/0731-000-Pikipek.png
similarity index 100%
rename from src/canonical/dex/front/0731--000--Pikipek.png
rename to src/canonical/dex/front/0731-000-Pikipek.png
diff --git a/src/canonical/dex/front/0732--000--Trumbeak.png b/src/canonical/dex/front/0732-000-Trumbeak.png
similarity index 100%
rename from src/canonical/dex/front/0732--000--Trumbeak.png
rename to src/canonical/dex/front/0732-000-Trumbeak.png
diff --git a/src/canonical/dex/front/0733--000--Toucannon.png b/src/canonical/dex/front/0733-000-Toucannon.png
similarity index 100%
rename from src/canonical/dex/front/0733--000--Toucannon.png
rename to src/canonical/dex/front/0733-000-Toucannon.png
diff --git a/src/canonical/dex/front/0734--000--Yungoos.png b/src/canonical/dex/front/0734-000-Yungoos.png
similarity index 100%
rename from src/canonical/dex/front/0734--000--Yungoos.png
rename to src/canonical/dex/front/0734-000-Yungoos.png
diff --git a/src/canonical/dex/front/0735--000--Gumshoos.png b/src/canonical/dex/front/0735-000-Gumshoos.png
similarity index 100%
rename from src/canonical/dex/front/0735--000--Gumshoos.png
rename to src/canonical/dex/front/0735-000-Gumshoos.png
diff --git a/src/canonical/dex/front/0735--420--Gumshoos--Totem.png b/src/canonical/dex/front/0735-420-Gumshoos-Totem.png
similarity index 100%
rename from src/canonical/dex/front/0735--420--Gumshoos--Totem.png
rename to src/canonical/dex/front/0735-420-Gumshoos-Totem.png
diff --git a/src/canonical/dex/front/0736--000--Grubbin.png b/src/canonical/dex/front/0736-000-Grubbin.png
similarity index 100%
rename from src/canonical/dex/front/0736--000--Grubbin.png
rename to src/canonical/dex/front/0736-000-Grubbin.png
diff --git a/src/canonical/dex/front/0737--000--Charjabug.png b/src/canonical/dex/front/0737-000-Charjabug.png
similarity index 100%
rename from src/canonical/dex/front/0737--000--Charjabug.png
rename to src/canonical/dex/front/0737-000-Charjabug.png
diff --git a/src/canonical/dex/front/0738--000--Vikavolt.png b/src/canonical/dex/front/0738-000-Vikavolt.png
similarity index 100%
rename from src/canonical/dex/front/0738--000--Vikavolt.png
rename to src/canonical/dex/front/0738-000-Vikavolt.png
diff --git a/src/canonical/dex/front/0738--420--Vikavolt--Totem.png b/src/canonical/dex/front/0738-420-Vikavolt-Totem.png
similarity index 100%
rename from src/canonical/dex/front/0738--420--Vikavolt--Totem.png
rename to src/canonical/dex/front/0738-420-Vikavolt-Totem.png
diff --git a/src/canonical/dex/front/0739--000--Crabrawler.png b/src/canonical/dex/front/0739-000-Crabrawler.png
similarity index 100%
rename from src/canonical/dex/front/0739--000--Crabrawler.png
rename to src/canonical/dex/front/0739-000-Crabrawler.png
diff --git a/src/canonical/dex/front/0740--000--Crabominable.png b/src/canonical/dex/front/0740-000-Crabominable.png
similarity index 100%
rename from src/canonical/dex/front/0740--000--Crabominable.png
rename to src/canonical/dex/front/0740-000-Crabominable.png
diff --git a/src/canonical/dex/front/0741--000--Oricorio.png b/src/canonical/dex/front/0741-000-Oricorio.png
similarity index 100%
rename from src/canonical/dex/front/0741--000--Oricorio.png
rename to src/canonical/dex/front/0741-000-Oricorio.png
diff --git a/src/canonical/dex/front/0741--420--Oricorio--Pa__0027u.png b/src/canonical/dex/front/0741-420-Oricorio-Pa__0027u.png
similarity index 100%
rename from src/canonical/dex/front/0741--420--Oricorio--Pa__0027u.png
rename to src/canonical/dex/front/0741-420-Oricorio-Pa__0027u.png
diff --git a/src/canonical/dex/front/0741--420--Oricorio--Pom-Pom.png b/src/canonical/dex/front/0741-420-Oricorio-Pom~Pom.png
similarity index 100%
rename from src/canonical/dex/front/0741--420--Oricorio--Pom-Pom.png
rename to src/canonical/dex/front/0741-420-Oricorio-Pom~Pom.png
diff --git a/src/canonical/dex/front/0741--420--Oricorio--Sensu.png b/src/canonical/dex/front/0741-420-Oricorio-Sensu.png
similarity index 100%
rename from src/canonical/dex/front/0741--420--Oricorio--Sensu.png
rename to src/canonical/dex/front/0741-420-Oricorio-Sensu.png
diff --git a/src/canonical/dex/front/0742--000--Cutiefly.png b/src/canonical/dex/front/0742-000-Cutiefly.png
similarity index 100%
rename from src/canonical/dex/front/0742--000--Cutiefly.png
rename to src/canonical/dex/front/0742-000-Cutiefly.png
diff --git a/src/canonical/dex/front/0743--000--Ribombee.png b/src/canonical/dex/front/0743-000-Ribombee.png
similarity index 100%
rename from src/canonical/dex/front/0743--000--Ribombee.png
rename to src/canonical/dex/front/0743-000-Ribombee.png
diff --git a/src/canonical/dex/front/0744--000--Rockruff.png b/src/canonical/dex/front/0744-000-Rockruff.png
similarity index 100%
rename from src/canonical/dex/front/0744--000--Rockruff.png
rename to src/canonical/dex/front/0744-000-Rockruff.png
diff --git a/src/canonical/dex/front/0745--000--Lycanroc.png b/src/canonical/dex/front/0745-000-Lycanroc.png
similarity index 100%
rename from src/canonical/dex/front/0745--000--Lycanroc.png
rename to src/canonical/dex/front/0745-000-Lycanroc.png
diff --git a/src/canonical/dex/front/0745--420--Lycanroc--Dusk.png b/src/canonical/dex/front/0745-420-Lycanroc-Dusk.png
similarity index 100%
rename from src/canonical/dex/front/0745--420--Lycanroc--Dusk.png
rename to src/canonical/dex/front/0745-420-Lycanroc-Dusk.png
diff --git a/src/canonical/dex/front/0745--420--Lycanroc--Midnight.png b/src/canonical/dex/front/0745-420-Lycanroc-Midnight.png
similarity index 100%
rename from src/canonical/dex/front/0745--420--Lycanroc--Midnight.png
rename to src/canonical/dex/front/0745-420-Lycanroc-Midnight.png
diff --git a/src/canonical/dex/front/0746--000--Wishiwashi.png b/src/canonical/dex/front/0746-000-Wishiwashi.png
similarity index 100%
rename from src/canonical/dex/front/0746--000--Wishiwashi.png
rename to src/canonical/dex/front/0746-000-Wishiwashi.png
diff --git a/src/canonical/dex/front/0746--420--Wishiwashi--School.png b/src/canonical/dex/front/0746-420-Wishiwashi-School.png
similarity index 100%
rename from src/canonical/dex/front/0746--420--Wishiwashi--School.png
rename to src/canonical/dex/front/0746-420-Wishiwashi-School.png
diff --git a/src/canonical/dex/front/0747--000--Mareanie.png b/src/canonical/dex/front/0747-000-Mareanie.png
similarity index 100%
rename from src/canonical/dex/front/0747--000--Mareanie.png
rename to src/canonical/dex/front/0747-000-Mareanie.png
diff --git a/src/canonical/dex/front/0748--000--Toxapex.png b/src/canonical/dex/front/0748-000-Toxapex.png
similarity index 100%
rename from src/canonical/dex/front/0748--000--Toxapex.png
rename to src/canonical/dex/front/0748-000-Toxapex.png
diff --git a/src/canonical/dex/front/0749--000--Mudbray.png b/src/canonical/dex/front/0749-000-Mudbray.png
similarity index 100%
rename from src/canonical/dex/front/0749--000--Mudbray.png
rename to src/canonical/dex/front/0749-000-Mudbray.png
diff --git a/src/canonical/dex/front/0750--000--Mudsdale.png b/src/canonical/dex/front/0750-000-Mudsdale.png
similarity index 100%
rename from src/canonical/dex/front/0750--000--Mudsdale.png
rename to src/canonical/dex/front/0750-000-Mudsdale.png
diff --git a/src/canonical/dex/front/0751--000--Dewpider.png b/src/canonical/dex/front/0751-000-Dewpider.png
similarity index 100%
rename from src/canonical/dex/front/0751--000--Dewpider.png
rename to src/canonical/dex/front/0751-000-Dewpider.png
diff --git a/src/canonical/dex/front/0752--000--Araquanid.png b/src/canonical/dex/front/0752-000-Araquanid.png
similarity index 100%
rename from src/canonical/dex/front/0752--000--Araquanid.png
rename to src/canonical/dex/front/0752-000-Araquanid.png
diff --git a/src/canonical/dex/front/0753--000--Fomantis.png b/src/canonical/dex/front/0753-000-Fomantis.png
similarity index 100%
rename from src/canonical/dex/front/0753--000--Fomantis.png
rename to src/canonical/dex/front/0753-000-Fomantis.png
diff --git a/src/canonical/dex/front/0754--000--Lurantis.png b/src/canonical/dex/front/0754-000-Lurantis.png
similarity index 100%
rename from src/canonical/dex/front/0754--000--Lurantis.png
rename to src/canonical/dex/front/0754-000-Lurantis.png
diff --git a/src/canonical/dex/front/0755--000--Morelull.png b/src/canonical/dex/front/0755-000-Morelull.png
similarity index 100%
rename from src/canonical/dex/front/0755--000--Morelull.png
rename to src/canonical/dex/front/0755-000-Morelull.png
diff --git a/src/canonical/dex/front/0756--000--Shiinotic.png b/src/canonical/dex/front/0756-000-Shiinotic.png
similarity index 100%
rename from src/canonical/dex/front/0756--000--Shiinotic.png
rename to src/canonical/dex/front/0756-000-Shiinotic.png
diff --git a/src/canonical/dex/front/0757--000--Salandit.png b/src/canonical/dex/front/0757-000-Salandit.png
similarity index 100%
rename from src/canonical/dex/front/0757--000--Salandit.png
rename to src/canonical/dex/front/0757-000-Salandit.png
diff --git a/src/canonical/dex/front/0758--000--Salazzle.png b/src/canonical/dex/front/0758-000-Salazzle.png
similarity index 100%
rename from src/canonical/dex/front/0758--000--Salazzle.png
rename to src/canonical/dex/front/0758-000-Salazzle.png
diff --git a/src/canonical/dex/front/0759--000--Stufful.png b/src/canonical/dex/front/0759-000-Stufful.png
similarity index 100%
rename from src/canonical/dex/front/0759--000--Stufful.png
rename to src/canonical/dex/front/0759-000-Stufful.png
diff --git a/src/canonical/dex/front/0760--000--Bewear.png b/src/canonical/dex/front/0760-000-Bewear.png
similarity index 100%
rename from src/canonical/dex/front/0760--000--Bewear.png
rename to src/canonical/dex/front/0760-000-Bewear.png
diff --git a/src/canonical/dex/front/0761--000--Bounsweet.png b/src/canonical/dex/front/0761-000-Bounsweet.png
similarity index 100%
rename from src/canonical/dex/front/0761--000--Bounsweet.png
rename to src/canonical/dex/front/0761-000-Bounsweet.png
diff --git a/src/canonical/dex/front/0762--000--Steenee.png b/src/canonical/dex/front/0762-000-Steenee.png
similarity index 100%
rename from src/canonical/dex/front/0762--000--Steenee.png
rename to src/canonical/dex/front/0762-000-Steenee.png
diff --git a/src/canonical/dex/front/0763--000--Tsareena.png b/src/canonical/dex/front/0763-000-Tsareena.png
similarity index 100%
rename from src/canonical/dex/front/0763--000--Tsareena.png
rename to src/canonical/dex/front/0763-000-Tsareena.png
diff --git a/src/canonical/dex/front/0764--000--Comfey.png b/src/canonical/dex/front/0764-000-Comfey.png
similarity index 100%
rename from src/canonical/dex/front/0764--000--Comfey.png
rename to src/canonical/dex/front/0764-000-Comfey.png
diff --git a/src/canonical/dex/front/0765--000--Oranguru.png b/src/canonical/dex/front/0765-000-Oranguru.png
similarity index 100%
rename from src/canonical/dex/front/0765--000--Oranguru.png
rename to src/canonical/dex/front/0765-000-Oranguru.png
diff --git a/src/canonical/dex/front/0766--000--Passimian.png b/src/canonical/dex/front/0766-000-Passimian.png
similarity index 100%
rename from src/canonical/dex/front/0766--000--Passimian.png
rename to src/canonical/dex/front/0766-000-Passimian.png
diff --git a/src/canonical/dex/front/0767--000--Wimpod.png b/src/canonical/dex/front/0767-000-Wimpod.png
similarity index 100%
rename from src/canonical/dex/front/0767--000--Wimpod.png
rename to src/canonical/dex/front/0767-000-Wimpod.png
diff --git a/src/canonical/dex/front/0768--000--Golisopod.png b/src/canonical/dex/front/0768-000-Golisopod.png
similarity index 100%
rename from src/canonical/dex/front/0768--000--Golisopod.png
rename to src/canonical/dex/front/0768-000-Golisopod.png
diff --git a/src/canonical/dex/front/0769--000--Sandygast.png b/src/canonical/dex/front/0769-000-Sandygast.png
similarity index 100%
rename from src/canonical/dex/front/0769--000--Sandygast.png
rename to src/canonical/dex/front/0769-000-Sandygast.png
diff --git a/src/canonical/dex/front/0770--000--Palossand.png b/src/canonical/dex/front/0770-000-Palossand.png
similarity index 100%
rename from src/canonical/dex/front/0770--000--Palossand.png
rename to src/canonical/dex/front/0770-000-Palossand.png
diff --git a/src/canonical/dex/front/0771--000--Pyukumuku.png b/src/canonical/dex/front/0771-000-Pyukumuku.png
similarity index 100%
rename from src/canonical/dex/front/0771--000--Pyukumuku.png
rename to src/canonical/dex/front/0771-000-Pyukumuku.png
diff --git a/src/canonical/dex/front/0772--000--Type__003a_Null.png b/src/canonical/dex/front/0772-000-Type__003a_Null.png
similarity index 100%
rename from src/canonical/dex/front/0772--000--Type__003a_Null.png
rename to src/canonical/dex/front/0772-000-Type__003a_Null.png
diff --git a/src/canonical/dex/front/0773--000--Silvally.png b/src/canonical/dex/front/0773-000-Silvally.png
similarity index 100%
rename from src/canonical/dex/front/0773--000--Silvally.png
rename to src/canonical/dex/front/0773-000-Silvally.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Bug.png b/src/canonical/dex/front/0773-420-Silvally-Bug.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Bug.png
rename to src/canonical/dex/front/0773-420-Silvally-Bug.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Dark.png b/src/canonical/dex/front/0773-420-Silvally-Dark.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Dark.png
rename to src/canonical/dex/front/0773-420-Silvally-Dark.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Dragon.png b/src/canonical/dex/front/0773-420-Silvally-Dragon.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Dragon.png
rename to src/canonical/dex/front/0773-420-Silvally-Dragon.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Electric.png b/src/canonical/dex/front/0773-420-Silvally-Electric.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Electric.png
rename to src/canonical/dex/front/0773-420-Silvally-Electric.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Fairy.png b/src/canonical/dex/front/0773-420-Silvally-Fairy.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Fairy.png
rename to src/canonical/dex/front/0773-420-Silvally-Fairy.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Fighting.png b/src/canonical/dex/front/0773-420-Silvally-Fighting.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Fighting.png
rename to src/canonical/dex/front/0773-420-Silvally-Fighting.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Fire.png b/src/canonical/dex/front/0773-420-Silvally-Fire.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Fire.png
rename to src/canonical/dex/front/0773-420-Silvally-Fire.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Flying.png b/src/canonical/dex/front/0773-420-Silvally-Flying.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Flying.png
rename to src/canonical/dex/front/0773-420-Silvally-Flying.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Ghost.png b/src/canonical/dex/front/0773-420-Silvally-Ghost.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Ghost.png
rename to src/canonical/dex/front/0773-420-Silvally-Ghost.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Grass.png b/src/canonical/dex/front/0773-420-Silvally-Grass.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Grass.png
rename to src/canonical/dex/front/0773-420-Silvally-Grass.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Ground.png b/src/canonical/dex/front/0773-420-Silvally-Ground.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Ground.png
rename to src/canonical/dex/front/0773-420-Silvally-Ground.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Ice.png b/src/canonical/dex/front/0773-420-Silvally-Ice.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Ice.png
rename to src/canonical/dex/front/0773-420-Silvally-Ice.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Poison.png b/src/canonical/dex/front/0773-420-Silvally-Poison.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Poison.png
rename to src/canonical/dex/front/0773-420-Silvally-Poison.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Psychic.png b/src/canonical/dex/front/0773-420-Silvally-Psychic.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Psychic.png
rename to src/canonical/dex/front/0773-420-Silvally-Psychic.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Rock.png b/src/canonical/dex/front/0773-420-Silvally-Rock.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Rock.png
rename to src/canonical/dex/front/0773-420-Silvally-Rock.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Steel.png b/src/canonical/dex/front/0773-420-Silvally-Steel.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Steel.png
rename to src/canonical/dex/front/0773-420-Silvally-Steel.png
diff --git a/src/canonical/dex/front/0773--420--Silvally--Water.png b/src/canonical/dex/front/0773-420-Silvally-Water.png
similarity index 100%
rename from src/canonical/dex/front/0773--420--Silvally--Water.png
rename to src/canonical/dex/front/0773-420-Silvally-Water.png
diff --git a/src/canonical/dex/front/0774--000--Minior.png b/src/canonical/dex/front/0774-000-Minior.png
similarity index 100%
rename from src/canonical/dex/front/0774--000--Minior.png
rename to src/canonical/dex/front/0774-000-Minior.png
diff --git a/src/canonical/dex/front/0774--420--Minior--Meteor.png b/src/canonical/dex/front/0774-420-Minior-Meteor.png
similarity index 100%
rename from src/canonical/dex/front/0774--420--Minior--Meteor.png
rename to src/canonical/dex/front/0774-420-Minior-Meteor.png
diff --git a/src/canonical/dex/front/0775--000--Komala.png b/src/canonical/dex/front/0775-000-Komala.png
similarity index 100%
rename from src/canonical/dex/front/0775--000--Komala.png
rename to src/canonical/dex/front/0775-000-Komala.png
diff --git a/src/canonical/dex/front/0776--000--Turtonator.png b/src/canonical/dex/front/0776-000-Turtonator.png
similarity index 100%
rename from src/canonical/dex/front/0776--000--Turtonator.png
rename to src/canonical/dex/front/0776-000-Turtonator.png
diff --git a/src/canonical/dex/front/0777--000--Togedemaru.png b/src/canonical/dex/front/0777-000-Togedemaru.png
similarity index 100%
rename from src/canonical/dex/front/0777--000--Togedemaru.png
rename to src/canonical/dex/front/0777-000-Togedemaru.png
diff --git a/src/canonical/dex/front/0778--000--Mimikyu.png b/src/canonical/dex/front/0778-000-Mimikyu.png
similarity index 100%
rename from src/canonical/dex/front/0778--000--Mimikyu.png
rename to src/canonical/dex/front/0778-000-Mimikyu.png
diff --git a/src/canonical/dex/front/0778--420--Mimikyu--Busted.png b/src/canonical/dex/front/0778-420-Mimikyu-Busted.png
similarity index 100%
rename from src/canonical/dex/front/0778--420--Mimikyu--Busted.png
rename to src/canonical/dex/front/0778-420-Mimikyu-Busted.png
diff --git a/src/canonical/dex/front/0778--420--Mimikyu--Busted-Totem.png b/src/canonical/dex/front/0778-420-Mimikyu-Busted~Totem.png
similarity index 100%
rename from src/canonical/dex/front/0778--420--Mimikyu--Busted-Totem.png
rename to src/canonical/dex/front/0778-420-Mimikyu-Busted~Totem.png
diff --git a/src/canonical/dex/front/0778--420--Mimikyu--Totem.png b/src/canonical/dex/front/0778-420-Mimikyu-Totem.png
similarity index 100%
rename from src/canonical/dex/front/0778--420--Mimikyu--Totem.png
rename to src/canonical/dex/front/0778-420-Mimikyu-Totem.png
diff --git a/src/canonical/dex/front/0779--000--Bruxish.png b/src/canonical/dex/front/0779-000-Bruxish.png
similarity index 100%
rename from src/canonical/dex/front/0779--000--Bruxish.png
rename to src/canonical/dex/front/0779-000-Bruxish.png
diff --git a/src/canonical/dex/front/0780--000--Drampa.png b/src/canonical/dex/front/0780-000-Drampa.png
similarity index 100%
rename from src/canonical/dex/front/0780--000--Drampa.png
rename to src/canonical/dex/front/0780-000-Drampa.png
diff --git a/src/canonical/dex/front/0781--000--Dhelmise.png b/src/canonical/dex/front/0781-000-Dhelmise.png
similarity index 100%
rename from src/canonical/dex/front/0781--000--Dhelmise.png
rename to src/canonical/dex/front/0781-000-Dhelmise.png
diff --git a/src/canonical/dex/front/0782--000--Jangmo-o.png b/src/canonical/dex/front/0782-000-Jangmo~o.png
similarity index 100%
rename from src/canonical/dex/front/0782--000--Jangmo-o.png
rename to src/canonical/dex/front/0782-000-Jangmo~o.png
diff --git a/src/canonical/dex/front/0783--000--Hakamo-o.png b/src/canonical/dex/front/0783-000-Hakamo~o.png
similarity index 100%
rename from src/canonical/dex/front/0783--000--Hakamo-o.png
rename to src/canonical/dex/front/0783-000-Hakamo~o.png
diff --git a/src/canonical/dex/front/0784--000--Kommo-o.png b/src/canonical/dex/front/0784-000-Kommo~o.png
similarity index 100%
rename from src/canonical/dex/front/0784--000--Kommo-o.png
rename to src/canonical/dex/front/0784-000-Kommo~o.png
diff --git a/src/canonical/dex/front/0784--420--Kommo-o--Totem.png b/src/canonical/dex/front/0784-420-Kommo~o-Totem.png
similarity index 100%
rename from src/canonical/dex/front/0784--420--Kommo-o--Totem.png
rename to src/canonical/dex/front/0784-420-Kommo~o-Totem.png
diff --git a/src/canonical/dex/front/0785--000--Tapu_Koko.png b/src/canonical/dex/front/0785-000-Tapu_Koko.png
similarity index 100%
rename from src/canonical/dex/front/0785--000--Tapu_Koko.png
rename to src/canonical/dex/front/0785-000-Tapu_Koko.png
diff --git a/src/canonical/dex/front/0786--000--Tapu_Lele.png b/src/canonical/dex/front/0786-000-Tapu_Lele.png
similarity index 100%
rename from src/canonical/dex/front/0786--000--Tapu_Lele.png
rename to src/canonical/dex/front/0786-000-Tapu_Lele.png
diff --git a/src/canonical/dex/front/0787--000--Tapu_Bulu.png b/src/canonical/dex/front/0787-000-Tapu_Bulu.png
similarity index 100%
rename from src/canonical/dex/front/0787--000--Tapu_Bulu.png
rename to src/canonical/dex/front/0787-000-Tapu_Bulu.png
diff --git a/src/canonical/dex/front/0788--000--Tapu_Fini.png b/src/canonical/dex/front/0788-000-Tapu_Fini.png
similarity index 100%
rename from src/canonical/dex/front/0788--000--Tapu_Fini.png
rename to src/canonical/dex/front/0788-000-Tapu_Fini.png
diff --git a/src/canonical/dex/front/0789--000--Cosmog.png b/src/canonical/dex/front/0789-000-Cosmog.png
similarity index 100%
rename from src/canonical/dex/front/0789--000--Cosmog.png
rename to src/canonical/dex/front/0789-000-Cosmog.png
diff --git a/src/canonical/dex/front/0790--000--Cosmoem.png b/src/canonical/dex/front/0790-000-Cosmoem.png
similarity index 100%
rename from src/canonical/dex/front/0790--000--Cosmoem.png
rename to src/canonical/dex/front/0790-000-Cosmoem.png
diff --git a/src/canonical/dex/front/0791--000--Solgaleo.png b/src/canonical/dex/front/0791-000-Solgaleo.png
similarity index 100%
rename from src/canonical/dex/front/0791--000--Solgaleo.png
rename to src/canonical/dex/front/0791-000-Solgaleo.png
diff --git a/src/canonical/dex/front/0792--000--Lunala.png b/src/canonical/dex/front/0792-000-Lunala.png
similarity index 100%
rename from src/canonical/dex/front/0792--000--Lunala.png
rename to src/canonical/dex/front/0792-000-Lunala.png
diff --git a/src/canonical/dex/front/0793--000--Nihilego.png b/src/canonical/dex/front/0793-000-Nihilego.png
similarity index 100%
rename from src/canonical/dex/front/0793--000--Nihilego.png
rename to src/canonical/dex/front/0793-000-Nihilego.png
diff --git a/src/canonical/dex/front/0794--000--Buzzwole.png b/src/canonical/dex/front/0794-000-Buzzwole.png
similarity index 100%
rename from src/canonical/dex/front/0794--000--Buzzwole.png
rename to src/canonical/dex/front/0794-000-Buzzwole.png
diff --git a/src/canonical/dex/front/0795--000--Pheromosa.png b/src/canonical/dex/front/0795-000-Pheromosa.png
similarity index 100%
rename from src/canonical/dex/front/0795--000--Pheromosa.png
rename to src/canonical/dex/front/0795-000-Pheromosa.png
diff --git a/src/canonical/dex/front/0796--000--Xurkitree.png b/src/canonical/dex/front/0796-000-Xurkitree.png
similarity index 100%
rename from src/canonical/dex/front/0796--000--Xurkitree.png
rename to src/canonical/dex/front/0796-000-Xurkitree.png
diff --git a/src/canonical/dex/front/0797--000--Celesteela.png b/src/canonical/dex/front/0797-000-Celesteela.png
similarity index 100%
rename from src/canonical/dex/front/0797--000--Celesteela.png
rename to src/canonical/dex/front/0797-000-Celesteela.png
diff --git a/src/canonical/dex/front/0798--000--Kartana.png b/src/canonical/dex/front/0798-000-Kartana.png
similarity index 100%
rename from src/canonical/dex/front/0798--000--Kartana.png
rename to src/canonical/dex/front/0798-000-Kartana.png
diff --git a/src/canonical/dex/front/0799--000--Guzzlord.png b/src/canonical/dex/front/0799-000-Guzzlord.png
similarity index 100%
rename from src/canonical/dex/front/0799--000--Guzzlord.png
rename to src/canonical/dex/front/0799-000-Guzzlord.png
diff --git a/src/canonical/dex/front/0800--000--Necrozma.png b/src/canonical/dex/front/0800-000-Necrozma.png
similarity index 100%
rename from src/canonical/dex/front/0800--000--Necrozma.png
rename to src/canonical/dex/front/0800-000-Necrozma.png
diff --git a/src/canonical/dex/front/0800--420--Necrozma--Dawn-Wings.png b/src/canonical/dex/front/0800-420-Necrozma-Dawn~Wings.png
similarity index 100%
rename from src/canonical/dex/front/0800--420--Necrozma--Dawn-Wings.png
rename to src/canonical/dex/front/0800-420-Necrozma-Dawn~Wings.png
diff --git a/src/canonical/dex/front/0800--420--Necrozma--Dusk-Mane.png b/src/canonical/dex/front/0800-420-Necrozma-Dusk~Mane.png
similarity index 100%
rename from src/canonical/dex/front/0800--420--Necrozma--Dusk-Mane.png
rename to src/canonical/dex/front/0800-420-Necrozma-Dusk~Mane.png
diff --git a/src/canonical/dex/front/0800--420--Necrozma--Ultra.png b/src/canonical/dex/front/0800-420-Necrozma-Ultra.png
similarity index 100%
rename from src/canonical/dex/front/0800--420--Necrozma--Ultra.png
rename to src/canonical/dex/front/0800-420-Necrozma-Ultra.png
diff --git a/src/canonical/dex/front/0801--000--Magearna.png b/src/canonical/dex/front/0801-000-Magearna.png
similarity index 100%
rename from src/canonical/dex/front/0801--000--Magearna.png
rename to src/canonical/dex/front/0801-000-Magearna.png
diff --git a/src/canonical/dex/front/0802--000--Marshadow.png b/src/canonical/dex/front/0802-000-Marshadow.png
similarity index 100%
rename from src/canonical/dex/front/0802--000--Marshadow.png
rename to src/canonical/dex/front/0802-000-Marshadow.png
diff --git a/src/canonical/dex/front/0803--000--Poipole.png b/src/canonical/dex/front/0803-000-Poipole.png
similarity index 100%
rename from src/canonical/dex/front/0803--000--Poipole.png
rename to src/canonical/dex/front/0803-000-Poipole.png
diff --git a/src/canonical/dex/front/0804--000--Naganadel.png b/src/canonical/dex/front/0804-000-Naganadel.png
similarity index 100%
rename from src/canonical/dex/front/0804--000--Naganadel.png
rename to src/canonical/dex/front/0804-000-Naganadel.png
diff --git a/src/canonical/dex/front/0805--000--Stakataka.png b/src/canonical/dex/front/0805-000-Stakataka.png
similarity index 100%
rename from src/canonical/dex/front/0805--000--Stakataka.png
rename to src/canonical/dex/front/0805-000-Stakataka.png
diff --git a/src/canonical/dex/front/0806--000--Blacephalon.png b/src/canonical/dex/front/0806-000-Blacephalon.png
similarity index 100%
rename from src/canonical/dex/front/0806--000--Blacephalon.png
rename to src/canonical/dex/front/0806-000-Blacephalon.png
diff --git a/src/canonical/dex/front/0807--000--Zeraora.png b/src/canonical/dex/front/0807-000-Zeraora.png
similarity index 100%
rename from src/canonical/dex/front/0807--000--Zeraora.png
rename to src/canonical/dex/front/0807-000-Zeraora.png
diff --git a/src/canonical/dex/front/0808--000--Meltan.png b/src/canonical/dex/front/0808-000-Meltan.png
similarity index 100%
rename from src/canonical/dex/front/0808--000--Meltan.png
rename to src/canonical/dex/front/0808-000-Meltan.png
diff --git a/src/canonical/dex/front/0809--000--Melmetal.png b/src/canonical/dex/front/0809-000-Melmetal.png
similarity index 100%
rename from src/canonical/dex/front/0809--000--Melmetal.png
rename to src/canonical/dex/front/0809-000-Melmetal.png
diff --git a/src/canonical/minisprites/gen5/custom/0003--420--Venusaur--Mega.png b/src/canonical/minisprites/gen5/custom/0003-420-Venusaur-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0003--420--Venusaur--Mega.png
rename to src/canonical/minisprites/gen5/custom/0003-420-Venusaur-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0006--420--Charizard--Mega-X.png b/src/canonical/minisprites/gen5/custom/0006-420-Charizard-Mega~X.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0006--420--Charizard--Mega-X.png
rename to src/canonical/minisprites/gen5/custom/0006-420-Charizard-Mega~X.png
diff --git a/src/canonical/minisprites/gen5/custom/0006--420--Charizard--Mega-Y.png b/src/canonical/minisprites/gen5/custom/0006-420-Charizard-Mega~Y.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0006--420--Charizard--Mega-Y.png
rename to src/canonical/minisprites/gen5/custom/0006-420-Charizard-Mega~Y.png
diff --git a/src/canonical/minisprites/gen5/custom/0009--420--Blastoise--Mega.png b/src/canonical/minisprites/gen5/custom/0009-420-Blastoise-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0009--420--Blastoise--Mega.png
rename to src/canonical/minisprites/gen5/custom/0009-420-Blastoise-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0015--420--Beedrill--Mega.png b/src/canonical/minisprites/gen5/custom/0015-420-Beedrill-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0015--420--Beedrill--Mega.png
rename to src/canonical/minisprites/gen5/custom/0015-420-Beedrill-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0018--420--Pidgeot--Mega.png b/src/canonical/minisprites/gen5/custom/0018-420-Pidgeot-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0018--420--Pidgeot--Mega.png
rename to src/canonical/minisprites/gen5/custom/0018-420-Pidgeot-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0065--420--Alakazam--Mega.png b/src/canonical/minisprites/gen5/custom/0065-420-Alakazam-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0065--420--Alakazam--Mega.png
rename to src/canonical/minisprites/gen5/custom/0065-420-Alakazam-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0080--420--Slowbro--Mega.png b/src/canonical/minisprites/gen5/custom/0080-420-Slowbro-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0080--420--Slowbro--Mega.png
rename to src/canonical/minisprites/gen5/custom/0080-420-Slowbro-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0094--420--Gengar--Mega.png b/src/canonical/minisprites/gen5/custom/0094-420-Gengar-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0094--420--Gengar--Mega.png
rename to src/canonical/minisprites/gen5/custom/0094-420-Gengar-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0115--420--Kangaskhan--Mega.png b/src/canonical/minisprites/gen5/custom/0115-420-Kangaskhan-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0115--420--Kangaskhan--Mega.png
rename to src/canonical/minisprites/gen5/custom/0115-420-Kangaskhan-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0127--420--Pinsir--Mega.png b/src/canonical/minisprites/gen5/custom/0127-420-Pinsir-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0127--420--Pinsir--Mega.png
rename to src/canonical/minisprites/gen5/custom/0127-420-Pinsir-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0130--420--Gyarados--Mega.png b/src/canonical/minisprites/gen5/custom/0130-420-Gyarados-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0130--420--Gyarados--Mega.png
rename to src/canonical/minisprites/gen5/custom/0130-420-Gyarados-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0142--420--Aerodactyl--Mega.png b/src/canonical/minisprites/gen5/custom/0142-420-Aerodactyl-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0142--420--Aerodactyl--Mega.png
rename to src/canonical/minisprites/gen5/custom/0142-420-Aerodactyl-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0150--420--Mewtwo--Mega-X.png b/src/canonical/minisprites/gen5/custom/0150-420-Mewtwo-Mega~X.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0150--420--Mewtwo--Mega-X.png
rename to src/canonical/minisprites/gen5/custom/0150-420-Mewtwo-Mega~X.png
diff --git a/src/canonical/minisprites/gen5/custom/0150--420--Mewtwo--Mega-Y.png b/src/canonical/minisprites/gen5/custom/0150-420-Mewtwo-Mega~Y.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0150--420--Mewtwo--Mega-Y.png
rename to src/canonical/minisprites/gen5/custom/0150-420-Mewtwo-Mega~Y.png
diff --git a/src/canonical/minisprites/gen5/custom/0181--420--Ampharos--Mega.png b/src/canonical/minisprites/gen5/custom/0181-420-Ampharos-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0181--420--Ampharos--Mega.png
rename to src/canonical/minisprites/gen5/custom/0181-420-Ampharos-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0208--420--Steelix--Mega.png b/src/canonical/minisprites/gen5/custom/0208-420-Steelix-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0208--420--Steelix--Mega.png
rename to src/canonical/minisprites/gen5/custom/0208-420-Steelix-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0212--420--Scizor--Mega.png b/src/canonical/minisprites/gen5/custom/0212-420-Scizor-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0212--420--Scizor--Mega.png
rename to src/canonical/minisprites/gen5/custom/0212-420-Scizor-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0214--420--Heracross--Mega.png b/src/canonical/minisprites/gen5/custom/0214-420-Heracross-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0214--420--Heracross--Mega.png
rename to src/canonical/minisprites/gen5/custom/0214-420-Heracross-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0229--420--Houndoom--Mega.png b/src/canonical/minisprites/gen5/custom/0229-420-Houndoom-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0229--420--Houndoom--Mega.png
rename to src/canonical/minisprites/gen5/custom/0229-420-Houndoom-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0248--420--Tyranitar--Mega.png b/src/canonical/minisprites/gen5/custom/0248-420-Tyranitar-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0248--420--Tyranitar--Mega.png
rename to src/canonical/minisprites/gen5/custom/0248-420-Tyranitar-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0254--420--Sceptile--Mega.png b/src/canonical/minisprites/gen5/custom/0254-420-Sceptile-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0254--420--Sceptile--Mega.png
rename to src/canonical/minisprites/gen5/custom/0254-420-Sceptile-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0257--420--Blaziken--Mega.png b/src/canonical/minisprites/gen5/custom/0257-420-Blaziken-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0257--420--Blaziken--Mega.png
rename to src/canonical/minisprites/gen5/custom/0257-420-Blaziken-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0260--420--Swampert--Mega.png b/src/canonical/minisprites/gen5/custom/0260-420-Swampert-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0260--420--Swampert--Mega.png
rename to src/canonical/minisprites/gen5/custom/0260-420-Swampert-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0282--420--Gardevoir--Mega.png b/src/canonical/minisprites/gen5/custom/0282-420-Gardevoir-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0282--420--Gardevoir--Mega.png
rename to src/canonical/minisprites/gen5/custom/0282-420-Gardevoir-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0302--420--Sableye--Mega.png b/src/canonical/minisprites/gen5/custom/0302-420-Sableye-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0302--420--Sableye--Mega.png
rename to src/canonical/minisprites/gen5/custom/0302-420-Sableye-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0303--420--Mawile--Mega.png b/src/canonical/minisprites/gen5/custom/0303-420-Mawile-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0303--420--Mawile--Mega.png
rename to src/canonical/minisprites/gen5/custom/0303-420-Mawile-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0306--420--Aggron--Mega.png b/src/canonical/minisprites/gen5/custom/0306-420-Aggron-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0306--420--Aggron--Mega.png
rename to src/canonical/minisprites/gen5/custom/0306-420-Aggron-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0308--420--Medicham--Mega.png b/src/canonical/minisprites/gen5/custom/0308-420-Medicham-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0308--420--Medicham--Mega.png
rename to src/canonical/minisprites/gen5/custom/0308-420-Medicham-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0310--420--Manectric--Mega.png b/src/canonical/minisprites/gen5/custom/0310-420-Manectric-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0310--420--Manectric--Mega.png
rename to src/canonical/minisprites/gen5/custom/0310-420-Manectric-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0319--420--Sharpedo--Mega.png b/src/canonical/minisprites/gen5/custom/0319-420-Sharpedo-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0319--420--Sharpedo--Mega.png
rename to src/canonical/minisprites/gen5/custom/0319-420-Sharpedo-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0323--420--Camerupt--Mega.png b/src/canonical/minisprites/gen5/custom/0323-420-Camerupt-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0323--420--Camerupt--Mega.png
rename to src/canonical/minisprites/gen5/custom/0323-420-Camerupt-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0334--420--Altaria--Mega.png b/src/canonical/minisprites/gen5/custom/0334-420-Altaria-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0334--420--Altaria--Mega.png
rename to src/canonical/minisprites/gen5/custom/0334-420-Altaria-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0354--420--Banette--Mega.png b/src/canonical/minisprites/gen5/custom/0354-420-Banette-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0354--420--Banette--Mega.png
rename to src/canonical/minisprites/gen5/custom/0354-420-Banette-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0359--420--Absol--Mega.png b/src/canonical/minisprites/gen5/custom/0359-420-Absol-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0359--420--Absol--Mega.png
rename to src/canonical/minisprites/gen5/custom/0359-420-Absol-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0362--420--Glalie--Mega.png b/src/canonical/minisprites/gen5/custom/0362-420-Glalie-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0362--420--Glalie--Mega.png
rename to src/canonical/minisprites/gen5/custom/0362-420-Glalie-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0373--420--Salamence--Mega.png b/src/canonical/minisprites/gen5/custom/0373-420-Salamence-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0373--420--Salamence--Mega.png
rename to src/canonical/minisprites/gen5/custom/0373-420-Salamence-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0376--420--Metagross--Mega.png b/src/canonical/minisprites/gen5/custom/0376-420-Metagross-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0376--420--Metagross--Mega.png
rename to src/canonical/minisprites/gen5/custom/0376-420-Metagross-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0380--420--Latias--Mega.png b/src/canonical/minisprites/gen5/custom/0380-420-Latias-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0380--420--Latias--Mega.png
rename to src/canonical/minisprites/gen5/custom/0380-420-Latias-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0381--420--Latios--Mega.png b/src/canonical/minisprites/gen5/custom/0381-420-Latios-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0381--420--Latios--Mega.png
rename to src/canonical/minisprites/gen5/custom/0381-420-Latios-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0382--420--Kyogre--Primal.png b/src/canonical/minisprites/gen5/custom/0382-420-Kyogre-Primal.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0382--420--Kyogre--Primal.png
rename to src/canonical/minisprites/gen5/custom/0382-420-Kyogre-Primal.png
diff --git a/src/canonical/minisprites/gen5/custom/0383--420--Groudon--Primal.png b/src/canonical/minisprites/gen5/custom/0383-420-Groudon-Primal.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0383--420--Groudon--Primal.png
rename to src/canonical/minisprites/gen5/custom/0383-420-Groudon-Primal.png
diff --git a/src/canonical/minisprites/gen5/custom/0384--420--Rayquaza--Mega.png b/src/canonical/minisprites/gen5/custom/0384-420-Rayquaza-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0384--420--Rayquaza--Mega.png
rename to src/canonical/minisprites/gen5/custom/0384-420-Rayquaza-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0428--420--Lopunny--Mega.png b/src/canonical/minisprites/gen5/custom/0428-420-Lopunny-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0428--420--Lopunny--Mega.png
rename to src/canonical/minisprites/gen5/custom/0428-420-Lopunny-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0445--420--Garchomp--Mega.png b/src/canonical/minisprites/gen5/custom/0445-420-Garchomp-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0445--420--Garchomp--Mega.png
rename to src/canonical/minisprites/gen5/custom/0445-420-Garchomp-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0448--420--Lucario--Mega.png b/src/canonical/minisprites/gen5/custom/0448-420-Lucario-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0448--420--Lucario--Mega.png
rename to src/canonical/minisprites/gen5/custom/0448-420-Lucario-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0460--420--Abomasnow--Mega.png b/src/canonical/minisprites/gen5/custom/0460-420-Abomasnow-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0460--420--Abomasnow--Mega.png
rename to src/canonical/minisprites/gen5/custom/0460-420-Abomasnow-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0475--420--Gallade--Mega.png b/src/canonical/minisprites/gen5/custom/0475-420-Gallade-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0475--420--Gallade--Mega.png
rename to src/canonical/minisprites/gen5/custom/0475-420-Gallade-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0531--420--Audino--Mega.png b/src/canonical/minisprites/gen5/custom/0531-420-Audino-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0531--420--Audino--Mega.png
rename to src/canonical/minisprites/gen5/custom/0531-420-Audino-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0650--000--Chespin.png b/src/canonical/minisprites/gen5/custom/0650-000-Chespin.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0650--000--Chespin.png
rename to src/canonical/minisprites/gen5/custom/0650-000-Chespin.png
diff --git a/src/canonical/minisprites/gen5/custom/0651--000--Quilladin.png b/src/canonical/minisprites/gen5/custom/0651-000-Quilladin.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0651--000--Quilladin.png
rename to src/canonical/minisprites/gen5/custom/0651-000-Quilladin.png
diff --git a/src/canonical/minisprites/gen5/custom/0652--000--Chesnaught.png b/src/canonical/minisprites/gen5/custom/0652-000-Chesnaught.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0652--000--Chesnaught.png
rename to src/canonical/minisprites/gen5/custom/0652-000-Chesnaught.png
diff --git a/src/canonical/minisprites/gen5/custom/0653--000--Fennekin.png b/src/canonical/minisprites/gen5/custom/0653-000-Fennekin.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0653--000--Fennekin.png
rename to src/canonical/minisprites/gen5/custom/0653-000-Fennekin.png
diff --git a/src/canonical/minisprites/gen5/custom/0654--000--Braixen.png b/src/canonical/minisprites/gen5/custom/0654-000-Braixen.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0654--000--Braixen.png
rename to src/canonical/minisprites/gen5/custom/0654-000-Braixen.png
diff --git a/src/canonical/minisprites/gen5/custom/0655--000--Delphox.png b/src/canonical/minisprites/gen5/custom/0655-000-Delphox.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0655--000--Delphox.png
rename to src/canonical/minisprites/gen5/custom/0655-000-Delphox.png
diff --git a/src/canonical/minisprites/gen5/custom/0656--000--Froakie.png b/src/canonical/minisprites/gen5/custom/0656-000-Froakie.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0656--000--Froakie.png
rename to src/canonical/minisprites/gen5/custom/0656-000-Froakie.png
diff --git a/src/canonical/minisprites/gen5/custom/0657--000--Frogadier.png b/src/canonical/minisprites/gen5/custom/0657-000-Frogadier.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0657--000--Frogadier.png
rename to src/canonical/minisprites/gen5/custom/0657-000-Frogadier.png
diff --git a/src/canonical/minisprites/gen5/custom/0658--000--Greninja.png b/src/canonical/minisprites/gen5/custom/0658-000-Greninja.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0658--000--Greninja.png
rename to src/canonical/minisprites/gen5/custom/0658-000-Greninja.png
diff --git a/src/canonical/minisprites/gen5/custom/0659--000--Bunnelby.png b/src/canonical/minisprites/gen5/custom/0659-000-Bunnelby.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0659--000--Bunnelby.png
rename to src/canonical/minisprites/gen5/custom/0659-000-Bunnelby.png
diff --git a/src/canonical/minisprites/gen5/custom/0660--000--Diggersby.png b/src/canonical/minisprites/gen5/custom/0660-000-Diggersby.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0660--000--Diggersby.png
rename to src/canonical/minisprites/gen5/custom/0660-000-Diggersby.png
diff --git a/src/canonical/minisprites/gen5/custom/0661--000--Fletchling.png b/src/canonical/minisprites/gen5/custom/0661-000-Fletchling.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0661--000--Fletchling.png
rename to src/canonical/minisprites/gen5/custom/0661-000-Fletchling.png
diff --git a/src/canonical/minisprites/gen5/custom/0662--000--Fletchinder.png b/src/canonical/minisprites/gen5/custom/0662-000-Fletchinder.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0662--000--Fletchinder.png
rename to src/canonical/minisprites/gen5/custom/0662-000-Fletchinder.png
diff --git a/src/canonical/minisprites/gen5/custom/0663--000--Talonflame.png b/src/canonical/minisprites/gen5/custom/0663-000-Talonflame.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0663--000--Talonflame.png
rename to src/canonical/minisprites/gen5/custom/0663-000-Talonflame.png
diff --git a/src/canonical/minisprites/gen5/custom/0664--000--Scatterbug.png b/src/canonical/minisprites/gen5/custom/0664-000-Scatterbug.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0664--000--Scatterbug.png
rename to src/canonical/minisprites/gen5/custom/0664-000-Scatterbug.png
diff --git a/src/canonical/minisprites/gen5/custom/0665--000--Spewpa.png b/src/canonical/minisprites/gen5/custom/0665-000-Spewpa.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0665--000--Spewpa.png
rename to src/canonical/minisprites/gen5/custom/0665-000-Spewpa.png
diff --git a/src/canonical/minisprites/gen5/custom/0666--000--Vivillon.png b/src/canonical/minisprites/gen5/custom/0666-000-Vivillon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0666--000--Vivillon.png
rename to src/canonical/minisprites/gen5/custom/0666-000-Vivillon.png
diff --git a/src/canonical/minisprites/gen5/custom/0667--000--Litleo.png b/src/canonical/minisprites/gen5/custom/0667-000-Litleo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0667--000--Litleo.png
rename to src/canonical/minisprites/gen5/custom/0667-000-Litleo.png
diff --git a/src/canonical/minisprites/gen5/custom/0668--000--Pyroar.png b/src/canonical/minisprites/gen5/custom/0668-000-Pyroar.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0668--000--Pyroar.png
rename to src/canonical/minisprites/gen5/custom/0668-000-Pyroar.png
diff --git a/src/canonical/minisprites/gen5/custom/0669--000--Flabe__0301be__0301.png b/src/canonical/minisprites/gen5/custom/0669-000-Flabe__0301be__0301.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0669--000--Flabe__0301be__0301.png
rename to src/canonical/minisprites/gen5/custom/0669-000-Flabe__0301be__0301.png
diff --git a/src/canonical/minisprites/gen5/custom/0670--000--Floette.png b/src/canonical/minisprites/gen5/custom/0670-000-Floette.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0670--000--Floette.png
rename to src/canonical/minisprites/gen5/custom/0670-000-Floette.png
diff --git a/src/canonical/minisprites/gen5/custom/0670--420--Floette--Eternal.png b/src/canonical/minisprites/gen5/custom/0670-420-Floette-Eternal.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0670--420--Floette--Eternal.png
rename to src/canonical/minisprites/gen5/custom/0670-420-Floette-Eternal.png
diff --git a/src/canonical/minisprites/gen5/custom/0671--000--Florges.png b/src/canonical/minisprites/gen5/custom/0671-000-Florges.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0671--000--Florges.png
rename to src/canonical/minisprites/gen5/custom/0671-000-Florges.png
diff --git a/src/canonical/minisprites/gen5/custom/0672--000--Skiddo.png b/src/canonical/minisprites/gen5/custom/0672-000-Skiddo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0672--000--Skiddo.png
rename to src/canonical/minisprites/gen5/custom/0672-000-Skiddo.png
diff --git a/src/canonical/minisprites/gen5/custom/0673--000--Gogoat.png b/src/canonical/minisprites/gen5/custom/0673-000-Gogoat.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0673--000--Gogoat.png
rename to src/canonical/minisprites/gen5/custom/0673-000-Gogoat.png
diff --git a/src/canonical/minisprites/gen5/custom/0674--000--Pancham.png b/src/canonical/minisprites/gen5/custom/0674-000-Pancham.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0674--000--Pancham.png
rename to src/canonical/minisprites/gen5/custom/0674-000-Pancham.png
diff --git a/src/canonical/minisprites/gen5/custom/0675--000--Pangoro.png b/src/canonical/minisprites/gen5/custom/0675-000-Pangoro.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0675--000--Pangoro.png
rename to src/canonical/minisprites/gen5/custom/0675-000-Pangoro.png
diff --git a/src/canonical/minisprites/gen5/custom/0676--000--Furfrou.png b/src/canonical/minisprites/gen5/custom/0676-000-Furfrou.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0676--000--Furfrou.png
rename to src/canonical/minisprites/gen5/custom/0676-000-Furfrou.png
diff --git a/src/canonical/minisprites/gen5/custom/0677--000--Espurr.png b/src/canonical/minisprites/gen5/custom/0677-000-Espurr.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0677--000--Espurr.png
rename to src/canonical/minisprites/gen5/custom/0677-000-Espurr.png
diff --git a/src/canonical/minisprites/gen5/custom/0678--000--Meowstic.png b/src/canonical/minisprites/gen5/custom/0678-000-Meowstic.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0678--000--Meowstic.png
rename to src/canonical/minisprites/gen5/custom/0678-000-Meowstic.png
diff --git a/src/canonical/minisprites/gen5/custom/0678--420--Meowstic--F.png b/src/canonical/minisprites/gen5/custom/0678-420-Meowstic-F.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0678--420--Meowstic--F.png
rename to src/canonical/minisprites/gen5/custom/0678-420-Meowstic-F.png
diff --git a/src/canonical/minisprites/gen5/custom/0679--000--Honedge.png b/src/canonical/minisprites/gen5/custom/0679-000-Honedge.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0679--000--Honedge.png
rename to src/canonical/minisprites/gen5/custom/0679-000-Honedge.png
diff --git a/src/canonical/minisprites/gen5/custom/0680--000--Doublade.png b/src/canonical/minisprites/gen5/custom/0680-000-Doublade.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0680--000--Doublade.png
rename to src/canonical/minisprites/gen5/custom/0680-000-Doublade.png
diff --git a/src/canonical/minisprites/gen5/custom/0681--000--Aegislash.png b/src/canonical/minisprites/gen5/custom/0681-000-Aegislash.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0681--000--Aegislash.png
rename to src/canonical/minisprites/gen5/custom/0681-000-Aegislash.png
diff --git a/src/canonical/minisprites/gen5/custom/0682--000--Spritzee.png b/src/canonical/minisprites/gen5/custom/0682-000-Spritzee.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0682--000--Spritzee.png
rename to src/canonical/minisprites/gen5/custom/0682-000-Spritzee.png
diff --git a/src/canonical/minisprites/gen5/custom/0683--000--Aromatisse.png b/src/canonical/minisprites/gen5/custom/0683-000-Aromatisse.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0683--000--Aromatisse.png
rename to src/canonical/minisprites/gen5/custom/0683-000-Aromatisse.png
diff --git a/src/canonical/minisprites/gen5/custom/0684--000--Swirlix.png b/src/canonical/minisprites/gen5/custom/0684-000-Swirlix.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0684--000--Swirlix.png
rename to src/canonical/minisprites/gen5/custom/0684-000-Swirlix.png
diff --git a/src/canonical/minisprites/gen5/custom/0685--000--Slurpuff.png b/src/canonical/minisprites/gen5/custom/0685-000-Slurpuff.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0685--000--Slurpuff.png
rename to src/canonical/minisprites/gen5/custom/0685-000-Slurpuff.png
diff --git a/src/canonical/minisprites/gen5/custom/0686--000--Inkay.png b/src/canonical/minisprites/gen5/custom/0686-000-Inkay.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0686--000--Inkay.png
rename to src/canonical/minisprites/gen5/custom/0686-000-Inkay.png
diff --git a/src/canonical/minisprites/gen5/custom/0687--000--Malamar.png b/src/canonical/minisprites/gen5/custom/0687-000-Malamar.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0687--000--Malamar.png
rename to src/canonical/minisprites/gen5/custom/0687-000-Malamar.png
diff --git a/src/canonical/minisprites/gen5/custom/0688--000--Binacle.png b/src/canonical/minisprites/gen5/custom/0688-000-Binacle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0688--000--Binacle.png
rename to src/canonical/minisprites/gen5/custom/0688-000-Binacle.png
diff --git a/src/canonical/minisprites/gen5/custom/0689--000--Barbaracle.png b/src/canonical/minisprites/gen5/custom/0689-000-Barbaracle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0689--000--Barbaracle.png
rename to src/canonical/minisprites/gen5/custom/0689-000-Barbaracle.png
diff --git a/src/canonical/minisprites/gen5/custom/0690--000--Skrelp.png b/src/canonical/minisprites/gen5/custom/0690-000-Skrelp.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0690--000--Skrelp.png
rename to src/canonical/minisprites/gen5/custom/0690-000-Skrelp.png
diff --git a/src/canonical/minisprites/gen5/custom/0691--000--Dragalge.png b/src/canonical/minisprites/gen5/custom/0691-000-Dragalge.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0691--000--Dragalge.png
rename to src/canonical/minisprites/gen5/custom/0691-000-Dragalge.png
diff --git a/src/canonical/minisprites/gen5/custom/0692--000--Clauncher.png b/src/canonical/minisprites/gen5/custom/0692-000-Clauncher.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0692--000--Clauncher.png
rename to src/canonical/minisprites/gen5/custom/0692-000-Clauncher.png
diff --git a/src/canonical/minisprites/gen5/custom/0693--000--Clawitzer.png b/src/canonical/minisprites/gen5/custom/0693-000-Clawitzer.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0693--000--Clawitzer.png
rename to src/canonical/minisprites/gen5/custom/0693-000-Clawitzer.png
diff --git a/src/canonical/minisprites/gen5/custom/0694--000--Helioptile.png b/src/canonical/minisprites/gen5/custom/0694-000-Helioptile.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0694--000--Helioptile.png
rename to src/canonical/minisprites/gen5/custom/0694-000-Helioptile.png
diff --git a/src/canonical/minisprites/gen5/custom/0695--000--Heliolisk.png b/src/canonical/minisprites/gen5/custom/0695-000-Heliolisk.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0695--000--Heliolisk.png
rename to src/canonical/minisprites/gen5/custom/0695-000-Heliolisk.png
diff --git a/src/canonical/minisprites/gen5/custom/0696--000--Tyrunt.png b/src/canonical/minisprites/gen5/custom/0696-000-Tyrunt.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0696--000--Tyrunt.png
rename to src/canonical/minisprites/gen5/custom/0696-000-Tyrunt.png
diff --git a/src/canonical/minisprites/gen5/custom/0697--000--Tyrantrum.png b/src/canonical/minisprites/gen5/custom/0697-000-Tyrantrum.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0697--000--Tyrantrum.png
rename to src/canonical/minisprites/gen5/custom/0697-000-Tyrantrum.png
diff --git a/src/canonical/minisprites/gen5/custom/0698--000--Amaura.png b/src/canonical/minisprites/gen5/custom/0698-000-Amaura.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0698--000--Amaura.png
rename to src/canonical/minisprites/gen5/custom/0698-000-Amaura.png
diff --git a/src/canonical/minisprites/gen5/custom/0699--000--Aurorus.png b/src/canonical/minisprites/gen5/custom/0699-000-Aurorus.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0699--000--Aurorus.png
rename to src/canonical/minisprites/gen5/custom/0699-000-Aurorus.png
diff --git a/src/canonical/minisprites/gen5/custom/0700--000--Sylveon.png b/src/canonical/minisprites/gen5/custom/0700-000-Sylveon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0700--000--Sylveon.png
rename to src/canonical/minisprites/gen5/custom/0700-000-Sylveon.png
diff --git a/src/canonical/minisprites/gen5/custom/0701--000--Hawlucha.png b/src/canonical/minisprites/gen5/custom/0701-000-Hawlucha.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0701--000--Hawlucha.png
rename to src/canonical/minisprites/gen5/custom/0701-000-Hawlucha.png
diff --git a/src/canonical/minisprites/gen5/custom/0702--000--Dedenne.png b/src/canonical/minisprites/gen5/custom/0702-000-Dedenne.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0702--000--Dedenne.png
rename to src/canonical/minisprites/gen5/custom/0702-000-Dedenne.png
diff --git a/src/canonical/minisprites/gen5/custom/0703--000--Carbink.png b/src/canonical/minisprites/gen5/custom/0703-000-Carbink.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0703--000--Carbink.png
rename to src/canonical/minisprites/gen5/custom/0703-000-Carbink.png
diff --git a/src/canonical/minisprites/gen5/custom/0704--000--Goomy.png b/src/canonical/minisprites/gen5/custom/0704-000-Goomy.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0704--000--Goomy.png
rename to src/canonical/minisprites/gen5/custom/0704-000-Goomy.png
diff --git a/src/canonical/minisprites/gen5/custom/0705--000--Sliggoo.png b/src/canonical/minisprites/gen5/custom/0705-000-Sliggoo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0705--000--Sliggoo.png
rename to src/canonical/minisprites/gen5/custom/0705-000-Sliggoo.png
diff --git a/src/canonical/minisprites/gen5/custom/0706--000--Goodra.png b/src/canonical/minisprites/gen5/custom/0706-000-Goodra.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0706--000--Goodra.png
rename to src/canonical/minisprites/gen5/custom/0706-000-Goodra.png
diff --git a/src/canonical/minisprites/gen5/custom/0707--000--Klefki.png b/src/canonical/minisprites/gen5/custom/0707-000-Klefki.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0707--000--Klefki.png
rename to src/canonical/minisprites/gen5/custom/0707-000-Klefki.png
diff --git a/src/canonical/minisprites/gen5/custom/0708--000--Phantump.png b/src/canonical/minisprites/gen5/custom/0708-000-Phantump.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0708--000--Phantump.png
rename to src/canonical/minisprites/gen5/custom/0708-000-Phantump.png
diff --git a/src/canonical/minisprites/gen5/custom/0709--000--Trevenant.png b/src/canonical/minisprites/gen5/custom/0709-000-Trevenant.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0709--000--Trevenant.png
rename to src/canonical/minisprites/gen5/custom/0709-000-Trevenant.png
diff --git a/src/canonical/minisprites/gen5/custom/0710--000--Pumpkaboo.png b/src/canonical/minisprites/gen5/custom/0710-000-Pumpkaboo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0710--000--Pumpkaboo.png
rename to src/canonical/minisprites/gen5/custom/0710-000-Pumpkaboo.png
diff --git a/src/canonical/minisprites/gen5/custom/0711--000--Gourgeist.png b/src/canonical/minisprites/gen5/custom/0711-000-Gourgeist.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0711--000--Gourgeist.png
rename to src/canonical/minisprites/gen5/custom/0711-000-Gourgeist.png
diff --git a/src/canonical/minisprites/gen5/custom/0712--000--Bergmite.png b/src/canonical/minisprites/gen5/custom/0712-000-Bergmite.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0712--000--Bergmite.png
rename to src/canonical/minisprites/gen5/custom/0712-000-Bergmite.png
diff --git a/src/canonical/minisprites/gen5/custom/0713--000--Avalugg.png b/src/canonical/minisprites/gen5/custom/0713-000-Avalugg.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0713--000--Avalugg.png
rename to src/canonical/minisprites/gen5/custom/0713-000-Avalugg.png
diff --git a/src/canonical/minisprites/gen5/custom/0714--000--Noibat.png b/src/canonical/minisprites/gen5/custom/0714-000-Noibat.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0714--000--Noibat.png
rename to src/canonical/minisprites/gen5/custom/0714-000-Noibat.png
diff --git a/src/canonical/minisprites/gen5/custom/0715--000--Noivern.png b/src/canonical/minisprites/gen5/custom/0715-000-Noivern.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0715--000--Noivern.png
rename to src/canonical/minisprites/gen5/custom/0715-000-Noivern.png
diff --git a/src/canonical/minisprites/gen5/custom/0716--000--Xerneas.png b/src/canonical/minisprites/gen5/custom/0716-000-Xerneas.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0716--000--Xerneas.png
rename to src/canonical/minisprites/gen5/custom/0716-000-Xerneas.png
diff --git a/src/canonical/minisprites/gen5/custom/0717--000--Yveltal.png b/src/canonical/minisprites/gen5/custom/0717-000-Yveltal.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0717--000--Yveltal.png
rename to src/canonical/minisprites/gen5/custom/0717-000-Yveltal.png
diff --git a/src/canonical/minisprites/gen5/custom/0718--000--Zygarde.png b/src/canonical/minisprites/gen5/custom/0718-000-Zygarde.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0718--000--Zygarde.png
rename to src/canonical/minisprites/gen5/custom/0718-000-Zygarde.png
diff --git a/src/canonical/minisprites/gen5/custom/0719--000--Diancie.png b/src/canonical/minisprites/gen5/custom/0719-000-Diancie.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0719--000--Diancie.png
rename to src/canonical/minisprites/gen5/custom/0719-000-Diancie.png
diff --git a/src/canonical/minisprites/gen5/custom/0719--420--Diancie--Mega.png b/src/canonical/minisprites/gen5/custom/0719-420-Diancie-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0719--420--Diancie--Mega.png
rename to src/canonical/minisprites/gen5/custom/0719-420-Diancie-Mega.png
diff --git a/src/canonical/minisprites/gen5/custom/0720--000--Hoopa.png b/src/canonical/minisprites/gen5/custom/0720-000-Hoopa.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0720--000--Hoopa.png
rename to src/canonical/minisprites/gen5/custom/0720-000-Hoopa.png
diff --git a/src/canonical/minisprites/gen5/custom/0720--420--Hoopa--Unbound.png b/src/canonical/minisprites/gen5/custom/0720-420-Hoopa-Unbound.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0720--420--Hoopa--Unbound.png
rename to src/canonical/minisprites/gen5/custom/0720-420-Hoopa-Unbound.png
diff --git a/src/canonical/minisprites/gen5/custom/0721--000--Volcanion.png b/src/canonical/minisprites/gen5/custom/0721-000-Volcanion.png
similarity index 100%
rename from src/canonical/minisprites/gen5/custom/0721--000--Volcanion.png
rename to src/canonical/minisprites/gen5/custom/0721-000-Volcanion.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0001--000--Bulbasaur.png b/src/canonical/minisprites/gen5/pokemon/0001-000-Bulbasaur.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0001--000--Bulbasaur.png
rename to src/canonical/minisprites/gen5/pokemon/0001-000-Bulbasaur.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0002--000--Ivysaur.png b/src/canonical/minisprites/gen5/pokemon/0002-000-Ivysaur.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0002--000--Ivysaur.png
rename to src/canonical/minisprites/gen5/pokemon/0002-000-Ivysaur.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0003--000--Venusaur.png b/src/canonical/minisprites/gen5/pokemon/0003-000-Venusaur.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0003--000--Venusaur.png
rename to src/canonical/minisprites/gen5/pokemon/0003-000-Venusaur.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0004--000--Charmander.png b/src/canonical/minisprites/gen5/pokemon/0004-000-Charmander.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0004--000--Charmander.png
rename to src/canonical/minisprites/gen5/pokemon/0004-000-Charmander.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0005--000--Charmeleon.png b/src/canonical/minisprites/gen5/pokemon/0005-000-Charmeleon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0005--000--Charmeleon.png
rename to src/canonical/minisprites/gen5/pokemon/0005-000-Charmeleon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0006--000--Charizard.png b/src/canonical/minisprites/gen5/pokemon/0006-000-Charizard.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0006--000--Charizard.png
rename to src/canonical/minisprites/gen5/pokemon/0006-000-Charizard.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0007--000--Squirtle.png b/src/canonical/minisprites/gen5/pokemon/0007-000-Squirtle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0007--000--Squirtle.png
rename to src/canonical/minisprites/gen5/pokemon/0007-000-Squirtle.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0008--000--Wartortle.png b/src/canonical/minisprites/gen5/pokemon/0008-000-Wartortle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0008--000--Wartortle.png
rename to src/canonical/minisprites/gen5/pokemon/0008-000-Wartortle.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0009--000--Blastoise.png b/src/canonical/minisprites/gen5/pokemon/0009-000-Blastoise.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0009--000--Blastoise.png
rename to src/canonical/minisprites/gen5/pokemon/0009-000-Blastoise.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0010--000--Caterpie.png b/src/canonical/minisprites/gen5/pokemon/0010-000-Caterpie.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0010--000--Caterpie.png
rename to src/canonical/minisprites/gen5/pokemon/0010-000-Caterpie.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0011--000--Metapod.png b/src/canonical/minisprites/gen5/pokemon/0011-000-Metapod.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0011--000--Metapod.png
rename to src/canonical/minisprites/gen5/pokemon/0011-000-Metapod.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0012--000--Butterfree.png b/src/canonical/minisprites/gen5/pokemon/0012-000-Butterfree.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0012--000--Butterfree.png
rename to src/canonical/minisprites/gen5/pokemon/0012-000-Butterfree.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0013--000--Weedle.png b/src/canonical/minisprites/gen5/pokemon/0013-000-Weedle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0013--000--Weedle.png
rename to src/canonical/minisprites/gen5/pokemon/0013-000-Weedle.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0014--000--Kakuna.png b/src/canonical/minisprites/gen5/pokemon/0014-000-Kakuna.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0014--000--Kakuna.png
rename to src/canonical/minisprites/gen5/pokemon/0014-000-Kakuna.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0015--000--Beedrill.png b/src/canonical/minisprites/gen5/pokemon/0015-000-Beedrill.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0015--000--Beedrill.png
rename to src/canonical/minisprites/gen5/pokemon/0015-000-Beedrill.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0016--000--Pidgey.png b/src/canonical/minisprites/gen5/pokemon/0016-000-Pidgey.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0016--000--Pidgey.png
rename to src/canonical/minisprites/gen5/pokemon/0016-000-Pidgey.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0017--000--Pidgeotto.png b/src/canonical/minisprites/gen5/pokemon/0017-000-Pidgeotto.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0017--000--Pidgeotto.png
rename to src/canonical/minisprites/gen5/pokemon/0017-000-Pidgeotto.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0018--000--Pidgeot.png b/src/canonical/minisprites/gen5/pokemon/0018-000-Pidgeot.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0018--000--Pidgeot.png
rename to src/canonical/minisprites/gen5/pokemon/0018-000-Pidgeot.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0019--000--Rattata.png b/src/canonical/minisprites/gen5/pokemon/0019-000-Rattata.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0019--000--Rattata.png
rename to src/canonical/minisprites/gen5/pokemon/0019-000-Rattata.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0020--000--Raticate.png b/src/canonical/minisprites/gen5/pokemon/0020-000-Raticate.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0020--000--Raticate.png
rename to src/canonical/minisprites/gen5/pokemon/0020-000-Raticate.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0021--000--Spearow.png b/src/canonical/minisprites/gen5/pokemon/0021-000-Spearow.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0021--000--Spearow.png
rename to src/canonical/minisprites/gen5/pokemon/0021-000-Spearow.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0022--000--Fearow.png b/src/canonical/minisprites/gen5/pokemon/0022-000-Fearow.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0022--000--Fearow.png
rename to src/canonical/minisprites/gen5/pokemon/0022-000-Fearow.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0023--000--Ekans.png b/src/canonical/minisprites/gen5/pokemon/0023-000-Ekans.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0023--000--Ekans.png
rename to src/canonical/minisprites/gen5/pokemon/0023-000-Ekans.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0024--000--Arbok.png b/src/canonical/minisprites/gen5/pokemon/0024-000-Arbok.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0024--000--Arbok.png
rename to src/canonical/minisprites/gen5/pokemon/0024-000-Arbok.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0025--000--Pikachu.png b/src/canonical/minisprites/gen5/pokemon/0025-000-Pikachu.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0025--000--Pikachu.png
rename to src/canonical/minisprites/gen5/pokemon/0025-000-Pikachu.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0026--000--Raichu.png b/src/canonical/minisprites/gen5/pokemon/0026-000-Raichu.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0026--000--Raichu.png
rename to src/canonical/minisprites/gen5/pokemon/0026-000-Raichu.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0027--000--Sandshrew.png b/src/canonical/minisprites/gen5/pokemon/0027-000-Sandshrew.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0027--000--Sandshrew.png
rename to src/canonical/minisprites/gen5/pokemon/0027-000-Sandshrew.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0028--000--Sandslash.png b/src/canonical/minisprites/gen5/pokemon/0028-000-Sandslash.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0028--000--Sandslash.png
rename to src/canonical/minisprites/gen5/pokemon/0028-000-Sandslash.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0029--000--Nidoran-F.png b/src/canonical/minisprites/gen5/pokemon/0029-000-Nidoran~F.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0029--000--Nidoran-F.png
rename to src/canonical/minisprites/gen5/pokemon/0029-000-Nidoran~F.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0030--000--Nidorina.png b/src/canonical/minisprites/gen5/pokemon/0030-000-Nidorina.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0030--000--Nidorina.png
rename to src/canonical/minisprites/gen5/pokemon/0030-000-Nidorina.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0031--000--Nidoqueen.png b/src/canonical/minisprites/gen5/pokemon/0031-000-Nidoqueen.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0031--000--Nidoqueen.png
rename to src/canonical/minisprites/gen5/pokemon/0031-000-Nidoqueen.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0032--000--Nidoran-M.png b/src/canonical/minisprites/gen5/pokemon/0032-000-Nidoran~M.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0032--000--Nidoran-M.png
rename to src/canonical/minisprites/gen5/pokemon/0032-000-Nidoran~M.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0033--000--Nidorino.png b/src/canonical/minisprites/gen5/pokemon/0033-000-Nidorino.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0033--000--Nidorino.png
rename to src/canonical/minisprites/gen5/pokemon/0033-000-Nidorino.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0034--000--Nidoking.png b/src/canonical/minisprites/gen5/pokemon/0034-000-Nidoking.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0034--000--Nidoking.png
rename to src/canonical/minisprites/gen5/pokemon/0034-000-Nidoking.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0035--000--Clefairy.png b/src/canonical/minisprites/gen5/pokemon/0035-000-Clefairy.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0035--000--Clefairy.png
rename to src/canonical/minisprites/gen5/pokemon/0035-000-Clefairy.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0036--000--Clefable.png b/src/canonical/minisprites/gen5/pokemon/0036-000-Clefable.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0036--000--Clefable.png
rename to src/canonical/minisprites/gen5/pokemon/0036-000-Clefable.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0037--000--Vulpix.png b/src/canonical/minisprites/gen5/pokemon/0037-000-Vulpix.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0037--000--Vulpix.png
rename to src/canonical/minisprites/gen5/pokemon/0037-000-Vulpix.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0038--000--Ninetales.png b/src/canonical/minisprites/gen5/pokemon/0038-000-Ninetales.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0038--000--Ninetales.png
rename to src/canonical/minisprites/gen5/pokemon/0038-000-Ninetales.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0039--000--Jigglypuff.png b/src/canonical/minisprites/gen5/pokemon/0039-000-Jigglypuff.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0039--000--Jigglypuff.png
rename to src/canonical/minisprites/gen5/pokemon/0039-000-Jigglypuff.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0040--000--Wigglytuff.png b/src/canonical/minisprites/gen5/pokemon/0040-000-Wigglytuff.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0040--000--Wigglytuff.png
rename to src/canonical/minisprites/gen5/pokemon/0040-000-Wigglytuff.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0041--000--Zubat.png b/src/canonical/minisprites/gen5/pokemon/0041-000-Zubat.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0041--000--Zubat.png
rename to src/canonical/minisprites/gen5/pokemon/0041-000-Zubat.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0042--000--Golbat.png b/src/canonical/minisprites/gen5/pokemon/0042-000-Golbat.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0042--000--Golbat.png
rename to src/canonical/minisprites/gen5/pokemon/0042-000-Golbat.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0043--000--Oddish.png b/src/canonical/minisprites/gen5/pokemon/0043-000-Oddish.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0043--000--Oddish.png
rename to src/canonical/minisprites/gen5/pokemon/0043-000-Oddish.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0044--000--Gloom.png b/src/canonical/minisprites/gen5/pokemon/0044-000-Gloom.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0044--000--Gloom.png
rename to src/canonical/minisprites/gen5/pokemon/0044-000-Gloom.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0045--000--Vileplume.png b/src/canonical/minisprites/gen5/pokemon/0045-000-Vileplume.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0045--000--Vileplume.png
rename to src/canonical/minisprites/gen5/pokemon/0045-000-Vileplume.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0046--000--Paras.png b/src/canonical/minisprites/gen5/pokemon/0046-000-Paras.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0046--000--Paras.png
rename to src/canonical/minisprites/gen5/pokemon/0046-000-Paras.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0047--000--Parasect.png b/src/canonical/minisprites/gen5/pokemon/0047-000-Parasect.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0047--000--Parasect.png
rename to src/canonical/minisprites/gen5/pokemon/0047-000-Parasect.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0048--000--Venonat.png b/src/canonical/minisprites/gen5/pokemon/0048-000-Venonat.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0048--000--Venonat.png
rename to src/canonical/minisprites/gen5/pokemon/0048-000-Venonat.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0049--000--Venomoth.png b/src/canonical/minisprites/gen5/pokemon/0049-000-Venomoth.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0049--000--Venomoth.png
rename to src/canonical/minisprites/gen5/pokemon/0049-000-Venomoth.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0050--000--Diglett.png b/src/canonical/minisprites/gen5/pokemon/0050-000-Diglett.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0050--000--Diglett.png
rename to src/canonical/minisprites/gen5/pokemon/0050-000-Diglett.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0051--000--Dugtrio.png b/src/canonical/minisprites/gen5/pokemon/0051-000-Dugtrio.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0051--000--Dugtrio.png
rename to src/canonical/minisprites/gen5/pokemon/0051-000-Dugtrio.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0052--000--Meowth.png b/src/canonical/minisprites/gen5/pokemon/0052-000-Meowth.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0052--000--Meowth.png
rename to src/canonical/minisprites/gen5/pokemon/0052-000-Meowth.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0053--000--Persian.png b/src/canonical/minisprites/gen5/pokemon/0053-000-Persian.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0053--000--Persian.png
rename to src/canonical/minisprites/gen5/pokemon/0053-000-Persian.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0054--000--Psyduck.png b/src/canonical/minisprites/gen5/pokemon/0054-000-Psyduck.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0054--000--Psyduck.png
rename to src/canonical/minisprites/gen5/pokemon/0054-000-Psyduck.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0055--000--Golduck.png b/src/canonical/minisprites/gen5/pokemon/0055-000-Golduck.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0055--000--Golduck.png
rename to src/canonical/minisprites/gen5/pokemon/0055-000-Golduck.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0056--000--Mankey.png b/src/canonical/minisprites/gen5/pokemon/0056-000-Mankey.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0056--000--Mankey.png
rename to src/canonical/minisprites/gen5/pokemon/0056-000-Mankey.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0057--000--Primeape.png b/src/canonical/minisprites/gen5/pokemon/0057-000-Primeape.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0057--000--Primeape.png
rename to src/canonical/minisprites/gen5/pokemon/0057-000-Primeape.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0058--000--Growlithe.png b/src/canonical/minisprites/gen5/pokemon/0058-000-Growlithe.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0058--000--Growlithe.png
rename to src/canonical/minisprites/gen5/pokemon/0058-000-Growlithe.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0059--000--Arcanine.png b/src/canonical/minisprites/gen5/pokemon/0059-000-Arcanine.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0059--000--Arcanine.png
rename to src/canonical/minisprites/gen5/pokemon/0059-000-Arcanine.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0060--000--Poliwag.png b/src/canonical/minisprites/gen5/pokemon/0060-000-Poliwag.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0060--000--Poliwag.png
rename to src/canonical/minisprites/gen5/pokemon/0060-000-Poliwag.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0061--000--Poliwhirl.png b/src/canonical/minisprites/gen5/pokemon/0061-000-Poliwhirl.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0061--000--Poliwhirl.png
rename to src/canonical/minisprites/gen5/pokemon/0061-000-Poliwhirl.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0062--000--Poliwrath.png b/src/canonical/minisprites/gen5/pokemon/0062-000-Poliwrath.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0062--000--Poliwrath.png
rename to src/canonical/minisprites/gen5/pokemon/0062-000-Poliwrath.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0063--000--Abra.png b/src/canonical/minisprites/gen5/pokemon/0063-000-Abra.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0063--000--Abra.png
rename to src/canonical/minisprites/gen5/pokemon/0063-000-Abra.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0064--000--Kadabra.png b/src/canonical/minisprites/gen5/pokemon/0064-000-Kadabra.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0064--000--Kadabra.png
rename to src/canonical/minisprites/gen5/pokemon/0064-000-Kadabra.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0065--000--Alakazam.png b/src/canonical/minisprites/gen5/pokemon/0065-000-Alakazam.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0065--000--Alakazam.png
rename to src/canonical/minisprites/gen5/pokemon/0065-000-Alakazam.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0066--000--Machop.png b/src/canonical/minisprites/gen5/pokemon/0066-000-Machop.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0066--000--Machop.png
rename to src/canonical/minisprites/gen5/pokemon/0066-000-Machop.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0067--000--Machoke.png b/src/canonical/minisprites/gen5/pokemon/0067-000-Machoke.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0067--000--Machoke.png
rename to src/canonical/minisprites/gen5/pokemon/0067-000-Machoke.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0068--000--Machamp.png b/src/canonical/minisprites/gen5/pokemon/0068-000-Machamp.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0068--000--Machamp.png
rename to src/canonical/minisprites/gen5/pokemon/0068-000-Machamp.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0069--000--Bellsprout.png b/src/canonical/minisprites/gen5/pokemon/0069-000-Bellsprout.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0069--000--Bellsprout.png
rename to src/canonical/minisprites/gen5/pokemon/0069-000-Bellsprout.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0070--000--Weepinbell.png b/src/canonical/minisprites/gen5/pokemon/0070-000-Weepinbell.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0070--000--Weepinbell.png
rename to src/canonical/minisprites/gen5/pokemon/0070-000-Weepinbell.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0071--000--Victreebel.png b/src/canonical/minisprites/gen5/pokemon/0071-000-Victreebel.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0071--000--Victreebel.png
rename to src/canonical/minisprites/gen5/pokemon/0071-000-Victreebel.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0072--000--Tentacool.png b/src/canonical/minisprites/gen5/pokemon/0072-000-Tentacool.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0072--000--Tentacool.png
rename to src/canonical/minisprites/gen5/pokemon/0072-000-Tentacool.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0073--000--Tentacruel.png b/src/canonical/minisprites/gen5/pokemon/0073-000-Tentacruel.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0073--000--Tentacruel.png
rename to src/canonical/minisprites/gen5/pokemon/0073-000-Tentacruel.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0074--000--Geodude.png b/src/canonical/minisprites/gen5/pokemon/0074-000-Geodude.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0074--000--Geodude.png
rename to src/canonical/minisprites/gen5/pokemon/0074-000-Geodude.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0075--000--Graveler.png b/src/canonical/minisprites/gen5/pokemon/0075-000-Graveler.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0075--000--Graveler.png
rename to src/canonical/minisprites/gen5/pokemon/0075-000-Graveler.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0076--000--Golem.png b/src/canonical/minisprites/gen5/pokemon/0076-000-Golem.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0076--000--Golem.png
rename to src/canonical/minisprites/gen5/pokemon/0076-000-Golem.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0077--000--Ponyta.png b/src/canonical/minisprites/gen5/pokemon/0077-000-Ponyta.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0077--000--Ponyta.png
rename to src/canonical/minisprites/gen5/pokemon/0077-000-Ponyta.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0078--000--Rapidash.png b/src/canonical/minisprites/gen5/pokemon/0078-000-Rapidash.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0078--000--Rapidash.png
rename to src/canonical/minisprites/gen5/pokemon/0078-000-Rapidash.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0079--000--Slowpoke.png b/src/canonical/minisprites/gen5/pokemon/0079-000-Slowpoke.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0079--000--Slowpoke.png
rename to src/canonical/minisprites/gen5/pokemon/0079-000-Slowpoke.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0080--000--Slowbro.png b/src/canonical/minisprites/gen5/pokemon/0080-000-Slowbro.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0080--000--Slowbro.png
rename to src/canonical/minisprites/gen5/pokemon/0080-000-Slowbro.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0081--000--Magnemite.png b/src/canonical/minisprites/gen5/pokemon/0081-000-Magnemite.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0081--000--Magnemite.png
rename to src/canonical/minisprites/gen5/pokemon/0081-000-Magnemite.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0082--000--Magneton.png b/src/canonical/minisprites/gen5/pokemon/0082-000-Magneton.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0082--000--Magneton.png
rename to src/canonical/minisprites/gen5/pokemon/0082-000-Magneton.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0083--000--Farfetch__0027d.png b/src/canonical/minisprites/gen5/pokemon/0083-000-Farfetch__0027d.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0083--000--Farfetch__0027d.png
rename to src/canonical/minisprites/gen5/pokemon/0083-000-Farfetch__0027d.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0084--000--Doduo.png b/src/canonical/minisprites/gen5/pokemon/0084-000-Doduo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0084--000--Doduo.png
rename to src/canonical/minisprites/gen5/pokemon/0084-000-Doduo.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0085--000--Dodrio.png b/src/canonical/minisprites/gen5/pokemon/0085-000-Dodrio.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0085--000--Dodrio.png
rename to src/canonical/minisprites/gen5/pokemon/0085-000-Dodrio.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0086--000--Seel.png b/src/canonical/minisprites/gen5/pokemon/0086-000-Seel.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0086--000--Seel.png
rename to src/canonical/minisprites/gen5/pokemon/0086-000-Seel.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0087--000--Dewgong.png b/src/canonical/minisprites/gen5/pokemon/0087-000-Dewgong.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0087--000--Dewgong.png
rename to src/canonical/minisprites/gen5/pokemon/0087-000-Dewgong.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0088--000--Grimer.png b/src/canonical/minisprites/gen5/pokemon/0088-000-Grimer.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0088--000--Grimer.png
rename to src/canonical/minisprites/gen5/pokemon/0088-000-Grimer.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0089--000--Muk.png b/src/canonical/minisprites/gen5/pokemon/0089-000-Muk.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0089--000--Muk.png
rename to src/canonical/minisprites/gen5/pokemon/0089-000-Muk.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0090--000--Shellder.png b/src/canonical/minisprites/gen5/pokemon/0090-000-Shellder.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0090--000--Shellder.png
rename to src/canonical/minisprites/gen5/pokemon/0090-000-Shellder.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0091--000--Cloyster.png b/src/canonical/minisprites/gen5/pokemon/0091-000-Cloyster.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0091--000--Cloyster.png
rename to src/canonical/minisprites/gen5/pokemon/0091-000-Cloyster.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0092--000--Gastly.png b/src/canonical/minisprites/gen5/pokemon/0092-000-Gastly.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0092--000--Gastly.png
rename to src/canonical/minisprites/gen5/pokemon/0092-000-Gastly.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0093--000--Haunter.png b/src/canonical/minisprites/gen5/pokemon/0093-000-Haunter.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0093--000--Haunter.png
rename to src/canonical/minisprites/gen5/pokemon/0093-000-Haunter.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0094--000--Gengar.png b/src/canonical/minisprites/gen5/pokemon/0094-000-Gengar.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0094--000--Gengar.png
rename to src/canonical/minisprites/gen5/pokemon/0094-000-Gengar.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0095--000--Onix.png b/src/canonical/minisprites/gen5/pokemon/0095-000-Onix.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0095--000--Onix.png
rename to src/canonical/minisprites/gen5/pokemon/0095-000-Onix.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0096--000--Drowzee.png b/src/canonical/minisprites/gen5/pokemon/0096-000-Drowzee.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0096--000--Drowzee.png
rename to src/canonical/minisprites/gen5/pokemon/0096-000-Drowzee.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0097--000--Hypno.png b/src/canonical/minisprites/gen5/pokemon/0097-000-Hypno.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0097--000--Hypno.png
rename to src/canonical/minisprites/gen5/pokemon/0097-000-Hypno.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0098--000--Krabby.png b/src/canonical/minisprites/gen5/pokemon/0098-000-Krabby.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0098--000--Krabby.png
rename to src/canonical/minisprites/gen5/pokemon/0098-000-Krabby.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0099--000--Kingler.png b/src/canonical/minisprites/gen5/pokemon/0099-000-Kingler.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0099--000--Kingler.png
rename to src/canonical/minisprites/gen5/pokemon/0099-000-Kingler.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0100--000--Voltorb.png b/src/canonical/minisprites/gen5/pokemon/0100-000-Voltorb.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0100--000--Voltorb.png
rename to src/canonical/minisprites/gen5/pokemon/0100-000-Voltorb.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0101--000--Electrode.png b/src/canonical/minisprites/gen5/pokemon/0101-000-Electrode.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0101--000--Electrode.png
rename to src/canonical/minisprites/gen5/pokemon/0101-000-Electrode.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0102--000--Exeggcute.png b/src/canonical/minisprites/gen5/pokemon/0102-000-Exeggcute.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0102--000--Exeggcute.png
rename to src/canonical/minisprites/gen5/pokemon/0102-000-Exeggcute.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0103--000--Exeggutor.png b/src/canonical/minisprites/gen5/pokemon/0103-000-Exeggutor.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0103--000--Exeggutor.png
rename to src/canonical/minisprites/gen5/pokemon/0103-000-Exeggutor.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0104--000--Cubone.png b/src/canonical/minisprites/gen5/pokemon/0104-000-Cubone.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0104--000--Cubone.png
rename to src/canonical/minisprites/gen5/pokemon/0104-000-Cubone.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0105--000--Marowak.png b/src/canonical/minisprites/gen5/pokemon/0105-000-Marowak.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0105--000--Marowak.png
rename to src/canonical/minisprites/gen5/pokemon/0105-000-Marowak.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0106--000--Hitmonlee.png b/src/canonical/minisprites/gen5/pokemon/0106-000-Hitmonlee.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0106--000--Hitmonlee.png
rename to src/canonical/minisprites/gen5/pokemon/0106-000-Hitmonlee.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0107--000--Hitmonchan.png b/src/canonical/minisprites/gen5/pokemon/0107-000-Hitmonchan.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0107--000--Hitmonchan.png
rename to src/canonical/minisprites/gen5/pokemon/0107-000-Hitmonchan.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0108--000--Lickitung.png b/src/canonical/minisprites/gen5/pokemon/0108-000-Lickitung.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0108--000--Lickitung.png
rename to src/canonical/minisprites/gen5/pokemon/0108-000-Lickitung.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0109--000--Koffing.png b/src/canonical/minisprites/gen5/pokemon/0109-000-Koffing.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0109--000--Koffing.png
rename to src/canonical/minisprites/gen5/pokemon/0109-000-Koffing.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0110--000--Weezing.png b/src/canonical/minisprites/gen5/pokemon/0110-000-Weezing.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0110--000--Weezing.png
rename to src/canonical/minisprites/gen5/pokemon/0110-000-Weezing.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0111--000--Rhyhorn.png b/src/canonical/minisprites/gen5/pokemon/0111-000-Rhyhorn.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0111--000--Rhyhorn.png
rename to src/canonical/minisprites/gen5/pokemon/0111-000-Rhyhorn.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0112--000--Rhydon.png b/src/canonical/minisprites/gen5/pokemon/0112-000-Rhydon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0112--000--Rhydon.png
rename to src/canonical/minisprites/gen5/pokemon/0112-000-Rhydon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0113--000--Chansey.png b/src/canonical/minisprites/gen5/pokemon/0113-000-Chansey.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0113--000--Chansey.png
rename to src/canonical/minisprites/gen5/pokemon/0113-000-Chansey.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0114--000--Tangela.png b/src/canonical/minisprites/gen5/pokemon/0114-000-Tangela.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0114--000--Tangela.png
rename to src/canonical/minisprites/gen5/pokemon/0114-000-Tangela.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0115--000--Kangaskhan.png b/src/canonical/minisprites/gen5/pokemon/0115-000-Kangaskhan.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0115--000--Kangaskhan.png
rename to src/canonical/minisprites/gen5/pokemon/0115-000-Kangaskhan.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0116--000--Horsea.png b/src/canonical/minisprites/gen5/pokemon/0116-000-Horsea.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0116--000--Horsea.png
rename to src/canonical/minisprites/gen5/pokemon/0116-000-Horsea.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0117--000--Seadra.png b/src/canonical/minisprites/gen5/pokemon/0117-000-Seadra.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0117--000--Seadra.png
rename to src/canonical/minisprites/gen5/pokemon/0117-000-Seadra.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0118--000--Goldeen.png b/src/canonical/minisprites/gen5/pokemon/0118-000-Goldeen.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0118--000--Goldeen.png
rename to src/canonical/minisprites/gen5/pokemon/0118-000-Goldeen.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0119--000--Seaking.png b/src/canonical/minisprites/gen5/pokemon/0119-000-Seaking.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0119--000--Seaking.png
rename to src/canonical/minisprites/gen5/pokemon/0119-000-Seaking.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0120--000--Staryu.png b/src/canonical/minisprites/gen5/pokemon/0120-000-Staryu.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0120--000--Staryu.png
rename to src/canonical/minisprites/gen5/pokemon/0120-000-Staryu.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0121--000--Starmie.png b/src/canonical/minisprites/gen5/pokemon/0121-000-Starmie.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0121--000--Starmie.png
rename to src/canonical/minisprites/gen5/pokemon/0121-000-Starmie.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0122--000--Mr._Mime.png b/src/canonical/minisprites/gen5/pokemon/0122-000-Mr._Mime.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0122--000--Mr._Mime.png
rename to src/canonical/minisprites/gen5/pokemon/0122-000-Mr._Mime.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0123--000--Scyther.png b/src/canonical/minisprites/gen5/pokemon/0123-000-Scyther.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0123--000--Scyther.png
rename to src/canonical/minisprites/gen5/pokemon/0123-000-Scyther.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0124--000--Jynx.png b/src/canonical/minisprites/gen5/pokemon/0124-000-Jynx.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0124--000--Jynx.png
rename to src/canonical/minisprites/gen5/pokemon/0124-000-Jynx.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0125--000--Electabuzz.png b/src/canonical/minisprites/gen5/pokemon/0125-000-Electabuzz.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0125--000--Electabuzz.png
rename to src/canonical/minisprites/gen5/pokemon/0125-000-Electabuzz.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0126--000--Magmar.png b/src/canonical/minisprites/gen5/pokemon/0126-000-Magmar.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0126--000--Magmar.png
rename to src/canonical/minisprites/gen5/pokemon/0126-000-Magmar.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0127--000--Pinsir.png b/src/canonical/minisprites/gen5/pokemon/0127-000-Pinsir.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0127--000--Pinsir.png
rename to src/canonical/minisprites/gen5/pokemon/0127-000-Pinsir.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0128--000--Tauros.png b/src/canonical/minisprites/gen5/pokemon/0128-000-Tauros.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0128--000--Tauros.png
rename to src/canonical/minisprites/gen5/pokemon/0128-000-Tauros.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0129--000--Magikarp.png b/src/canonical/minisprites/gen5/pokemon/0129-000-Magikarp.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0129--000--Magikarp.png
rename to src/canonical/minisprites/gen5/pokemon/0129-000-Magikarp.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0130--000--Gyarados.png b/src/canonical/minisprites/gen5/pokemon/0130-000-Gyarados.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0130--000--Gyarados.png
rename to src/canonical/minisprites/gen5/pokemon/0130-000-Gyarados.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0131--000--Lapras.png b/src/canonical/minisprites/gen5/pokemon/0131-000-Lapras.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0131--000--Lapras.png
rename to src/canonical/minisprites/gen5/pokemon/0131-000-Lapras.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0132--000--Ditto.png b/src/canonical/minisprites/gen5/pokemon/0132-000-Ditto.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0132--000--Ditto.png
rename to src/canonical/minisprites/gen5/pokemon/0132-000-Ditto.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0133--000--Eevee.png b/src/canonical/minisprites/gen5/pokemon/0133-000-Eevee.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0133--000--Eevee.png
rename to src/canonical/minisprites/gen5/pokemon/0133-000-Eevee.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0134--000--Vaporeon.png b/src/canonical/minisprites/gen5/pokemon/0134-000-Vaporeon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0134--000--Vaporeon.png
rename to src/canonical/minisprites/gen5/pokemon/0134-000-Vaporeon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0135--000--Jolteon.png b/src/canonical/minisprites/gen5/pokemon/0135-000-Jolteon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0135--000--Jolteon.png
rename to src/canonical/minisprites/gen5/pokemon/0135-000-Jolteon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0136--000--Flareon.png b/src/canonical/minisprites/gen5/pokemon/0136-000-Flareon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0136--000--Flareon.png
rename to src/canonical/minisprites/gen5/pokemon/0136-000-Flareon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0137--000--Porygon.png b/src/canonical/minisprites/gen5/pokemon/0137-000-Porygon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0137--000--Porygon.png
rename to src/canonical/minisprites/gen5/pokemon/0137-000-Porygon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0138--000--Omanyte.png b/src/canonical/minisprites/gen5/pokemon/0138-000-Omanyte.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0138--000--Omanyte.png
rename to src/canonical/minisprites/gen5/pokemon/0138-000-Omanyte.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0139--000--Omastar.png b/src/canonical/minisprites/gen5/pokemon/0139-000-Omastar.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0139--000--Omastar.png
rename to src/canonical/minisprites/gen5/pokemon/0139-000-Omastar.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0140--000--Kabuto.png b/src/canonical/minisprites/gen5/pokemon/0140-000-Kabuto.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0140--000--Kabuto.png
rename to src/canonical/minisprites/gen5/pokemon/0140-000-Kabuto.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0141--000--Kabutops.png b/src/canonical/minisprites/gen5/pokemon/0141-000-Kabutops.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0141--000--Kabutops.png
rename to src/canonical/minisprites/gen5/pokemon/0141-000-Kabutops.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0142--000--Aerodactyl.png b/src/canonical/minisprites/gen5/pokemon/0142-000-Aerodactyl.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0142--000--Aerodactyl.png
rename to src/canonical/minisprites/gen5/pokemon/0142-000-Aerodactyl.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0143--000--Snorlax.png b/src/canonical/minisprites/gen5/pokemon/0143-000-Snorlax.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0143--000--Snorlax.png
rename to src/canonical/minisprites/gen5/pokemon/0143-000-Snorlax.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0144--000--Articuno.png b/src/canonical/minisprites/gen5/pokemon/0144-000-Articuno.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0144--000--Articuno.png
rename to src/canonical/minisprites/gen5/pokemon/0144-000-Articuno.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0145--000--Zapdos.png b/src/canonical/minisprites/gen5/pokemon/0145-000-Zapdos.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0145--000--Zapdos.png
rename to src/canonical/minisprites/gen5/pokemon/0145-000-Zapdos.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0146--000--Moltres.png b/src/canonical/minisprites/gen5/pokemon/0146-000-Moltres.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0146--000--Moltres.png
rename to src/canonical/minisprites/gen5/pokemon/0146-000-Moltres.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0147--000--Dratini.png b/src/canonical/minisprites/gen5/pokemon/0147-000-Dratini.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0147--000--Dratini.png
rename to src/canonical/minisprites/gen5/pokemon/0147-000-Dratini.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0148--000--Dragonair.png b/src/canonical/minisprites/gen5/pokemon/0148-000-Dragonair.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0148--000--Dragonair.png
rename to src/canonical/minisprites/gen5/pokemon/0148-000-Dragonair.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0149--000--Dragonite.png b/src/canonical/minisprites/gen5/pokemon/0149-000-Dragonite.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0149--000--Dragonite.png
rename to src/canonical/minisprites/gen5/pokemon/0149-000-Dragonite.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0150--000--Mewtwo.png b/src/canonical/minisprites/gen5/pokemon/0150-000-Mewtwo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0150--000--Mewtwo.png
rename to src/canonical/minisprites/gen5/pokemon/0150-000-Mewtwo.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0151--000--Mew.png b/src/canonical/minisprites/gen5/pokemon/0151-000-Mew.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0151--000--Mew.png
rename to src/canonical/minisprites/gen5/pokemon/0151-000-Mew.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0152--000--Chikorita.png b/src/canonical/minisprites/gen5/pokemon/0152-000-Chikorita.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0152--000--Chikorita.png
rename to src/canonical/minisprites/gen5/pokemon/0152-000-Chikorita.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0153--000--Bayleef.png b/src/canonical/minisprites/gen5/pokemon/0153-000-Bayleef.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0153--000--Bayleef.png
rename to src/canonical/minisprites/gen5/pokemon/0153-000-Bayleef.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0154--000--Meganium.png b/src/canonical/minisprites/gen5/pokemon/0154-000-Meganium.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0154--000--Meganium.png
rename to src/canonical/minisprites/gen5/pokemon/0154-000-Meganium.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0155--000--Cyndaquil.png b/src/canonical/minisprites/gen5/pokemon/0155-000-Cyndaquil.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0155--000--Cyndaquil.png
rename to src/canonical/minisprites/gen5/pokemon/0155-000-Cyndaquil.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0156--000--Quilava.png b/src/canonical/minisprites/gen5/pokemon/0156-000-Quilava.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0156--000--Quilava.png
rename to src/canonical/minisprites/gen5/pokemon/0156-000-Quilava.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0157--000--Typhlosion.png b/src/canonical/minisprites/gen5/pokemon/0157-000-Typhlosion.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0157--000--Typhlosion.png
rename to src/canonical/minisprites/gen5/pokemon/0157-000-Typhlosion.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0158--000--Totodile.png b/src/canonical/minisprites/gen5/pokemon/0158-000-Totodile.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0158--000--Totodile.png
rename to src/canonical/minisprites/gen5/pokemon/0158-000-Totodile.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0159--000--Croconaw.png b/src/canonical/minisprites/gen5/pokemon/0159-000-Croconaw.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0159--000--Croconaw.png
rename to src/canonical/minisprites/gen5/pokemon/0159-000-Croconaw.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0160--000--Feraligatr.png b/src/canonical/minisprites/gen5/pokemon/0160-000-Feraligatr.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0160--000--Feraligatr.png
rename to src/canonical/minisprites/gen5/pokemon/0160-000-Feraligatr.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0161--000--Sentret.png b/src/canonical/minisprites/gen5/pokemon/0161-000-Sentret.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0161--000--Sentret.png
rename to src/canonical/minisprites/gen5/pokemon/0161-000-Sentret.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0162--000--Furret.png b/src/canonical/minisprites/gen5/pokemon/0162-000-Furret.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0162--000--Furret.png
rename to src/canonical/minisprites/gen5/pokemon/0162-000-Furret.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0163--000--Hoothoot.png b/src/canonical/minisprites/gen5/pokemon/0163-000-Hoothoot.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0163--000--Hoothoot.png
rename to src/canonical/minisprites/gen5/pokemon/0163-000-Hoothoot.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0164--000--Noctowl.png b/src/canonical/minisprites/gen5/pokemon/0164-000-Noctowl.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0164--000--Noctowl.png
rename to src/canonical/minisprites/gen5/pokemon/0164-000-Noctowl.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0165--000--Ledyba.png b/src/canonical/minisprites/gen5/pokemon/0165-000-Ledyba.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0165--000--Ledyba.png
rename to src/canonical/minisprites/gen5/pokemon/0165-000-Ledyba.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0166--000--Ledian.png b/src/canonical/minisprites/gen5/pokemon/0166-000-Ledian.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0166--000--Ledian.png
rename to src/canonical/minisprites/gen5/pokemon/0166-000-Ledian.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0167--000--Spinarak.png b/src/canonical/minisprites/gen5/pokemon/0167-000-Spinarak.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0167--000--Spinarak.png
rename to src/canonical/minisprites/gen5/pokemon/0167-000-Spinarak.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0168--000--Ariados.png b/src/canonical/minisprites/gen5/pokemon/0168-000-Ariados.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0168--000--Ariados.png
rename to src/canonical/minisprites/gen5/pokemon/0168-000-Ariados.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0169--000--Crobat.png b/src/canonical/minisprites/gen5/pokemon/0169-000-Crobat.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0169--000--Crobat.png
rename to src/canonical/minisprites/gen5/pokemon/0169-000-Crobat.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0170--000--Chinchou.png b/src/canonical/minisprites/gen5/pokemon/0170-000-Chinchou.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0170--000--Chinchou.png
rename to src/canonical/minisprites/gen5/pokemon/0170-000-Chinchou.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0171--000--Lanturn.png b/src/canonical/minisprites/gen5/pokemon/0171-000-Lanturn.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0171--000--Lanturn.png
rename to src/canonical/minisprites/gen5/pokemon/0171-000-Lanturn.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0172--000--Pichu.png b/src/canonical/minisprites/gen5/pokemon/0172-000-Pichu.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0172--000--Pichu.png
rename to src/canonical/minisprites/gen5/pokemon/0172-000-Pichu.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0173--000--Cleffa.png b/src/canonical/minisprites/gen5/pokemon/0173-000-Cleffa.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0173--000--Cleffa.png
rename to src/canonical/minisprites/gen5/pokemon/0173-000-Cleffa.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0174--000--Igglybuff.png b/src/canonical/minisprites/gen5/pokemon/0174-000-Igglybuff.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0174--000--Igglybuff.png
rename to src/canonical/minisprites/gen5/pokemon/0174-000-Igglybuff.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0175--000--Togepi.png b/src/canonical/minisprites/gen5/pokemon/0175-000-Togepi.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0175--000--Togepi.png
rename to src/canonical/minisprites/gen5/pokemon/0175-000-Togepi.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0176--000--Togetic.png b/src/canonical/minisprites/gen5/pokemon/0176-000-Togetic.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0176--000--Togetic.png
rename to src/canonical/minisprites/gen5/pokemon/0176-000-Togetic.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0177--000--Natu.png b/src/canonical/minisprites/gen5/pokemon/0177-000-Natu.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0177--000--Natu.png
rename to src/canonical/minisprites/gen5/pokemon/0177-000-Natu.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0178--000--Xatu.png b/src/canonical/minisprites/gen5/pokemon/0178-000-Xatu.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0178--000--Xatu.png
rename to src/canonical/minisprites/gen5/pokemon/0178-000-Xatu.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0179--000--Mareep.png b/src/canonical/minisprites/gen5/pokemon/0179-000-Mareep.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0179--000--Mareep.png
rename to src/canonical/minisprites/gen5/pokemon/0179-000-Mareep.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0180--000--Flaaffy.png b/src/canonical/minisprites/gen5/pokemon/0180-000-Flaaffy.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0180--000--Flaaffy.png
rename to src/canonical/minisprites/gen5/pokemon/0180-000-Flaaffy.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0181--000--Ampharos.png b/src/canonical/minisprites/gen5/pokemon/0181-000-Ampharos.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0181--000--Ampharos.png
rename to src/canonical/minisprites/gen5/pokemon/0181-000-Ampharos.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0182--000--Bellossom.png b/src/canonical/minisprites/gen5/pokemon/0182-000-Bellossom.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0182--000--Bellossom.png
rename to src/canonical/minisprites/gen5/pokemon/0182-000-Bellossom.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0183--000--Marill.png b/src/canonical/minisprites/gen5/pokemon/0183-000-Marill.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0183--000--Marill.png
rename to src/canonical/minisprites/gen5/pokemon/0183-000-Marill.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0184--000--Azumarill.png b/src/canonical/minisprites/gen5/pokemon/0184-000-Azumarill.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0184--000--Azumarill.png
rename to src/canonical/minisprites/gen5/pokemon/0184-000-Azumarill.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0185--000--Sudowoodo.png b/src/canonical/minisprites/gen5/pokemon/0185-000-Sudowoodo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0185--000--Sudowoodo.png
rename to src/canonical/minisprites/gen5/pokemon/0185-000-Sudowoodo.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0186--000--Politoed.png b/src/canonical/minisprites/gen5/pokemon/0186-000-Politoed.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0186--000--Politoed.png
rename to src/canonical/minisprites/gen5/pokemon/0186-000-Politoed.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0187--000--Hoppip.png b/src/canonical/minisprites/gen5/pokemon/0187-000-Hoppip.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0187--000--Hoppip.png
rename to src/canonical/minisprites/gen5/pokemon/0187-000-Hoppip.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0188--000--Skiploom.png b/src/canonical/minisprites/gen5/pokemon/0188-000-Skiploom.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0188--000--Skiploom.png
rename to src/canonical/minisprites/gen5/pokemon/0188-000-Skiploom.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0189--000--Jumpluff.png b/src/canonical/minisprites/gen5/pokemon/0189-000-Jumpluff.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0189--000--Jumpluff.png
rename to src/canonical/minisprites/gen5/pokemon/0189-000-Jumpluff.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0190--000--Aipom.png b/src/canonical/minisprites/gen5/pokemon/0190-000-Aipom.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0190--000--Aipom.png
rename to src/canonical/minisprites/gen5/pokemon/0190-000-Aipom.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0191--000--Sunkern.png b/src/canonical/minisprites/gen5/pokemon/0191-000-Sunkern.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0191--000--Sunkern.png
rename to src/canonical/minisprites/gen5/pokemon/0191-000-Sunkern.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0192--000--Sunflora.png b/src/canonical/minisprites/gen5/pokemon/0192-000-Sunflora.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0192--000--Sunflora.png
rename to src/canonical/minisprites/gen5/pokemon/0192-000-Sunflora.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0193--000--Yanma.png b/src/canonical/minisprites/gen5/pokemon/0193-000-Yanma.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0193--000--Yanma.png
rename to src/canonical/minisprites/gen5/pokemon/0193-000-Yanma.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0194--000--Wooper.png b/src/canonical/minisprites/gen5/pokemon/0194-000-Wooper.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0194--000--Wooper.png
rename to src/canonical/minisprites/gen5/pokemon/0194-000-Wooper.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0195--000--Quagsire.png b/src/canonical/minisprites/gen5/pokemon/0195-000-Quagsire.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0195--000--Quagsire.png
rename to src/canonical/minisprites/gen5/pokemon/0195-000-Quagsire.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0196--000--Espeon.png b/src/canonical/minisprites/gen5/pokemon/0196-000-Espeon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0196--000--Espeon.png
rename to src/canonical/minisprites/gen5/pokemon/0196-000-Espeon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0197--000--Umbreon.png b/src/canonical/minisprites/gen5/pokemon/0197-000-Umbreon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0197--000--Umbreon.png
rename to src/canonical/minisprites/gen5/pokemon/0197-000-Umbreon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0198--000--Murkrow.png b/src/canonical/minisprites/gen5/pokemon/0198-000-Murkrow.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0198--000--Murkrow.png
rename to src/canonical/minisprites/gen5/pokemon/0198-000-Murkrow.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0199--000--Slowking.png b/src/canonical/minisprites/gen5/pokemon/0199-000-Slowking.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0199--000--Slowking.png
rename to src/canonical/minisprites/gen5/pokemon/0199-000-Slowking.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0200--000--Misdreavus.png b/src/canonical/minisprites/gen5/pokemon/0200-000-Misdreavus.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0200--000--Misdreavus.png
rename to src/canonical/minisprites/gen5/pokemon/0200-000-Misdreavus.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--000--Unown.png b/src/canonical/minisprites/gen5/pokemon/0201-000-Unown.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--000--Unown.png
rename to src/canonical/minisprites/gen5/pokemon/0201-000-Unown.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--B.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-B.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--B.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-B.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--C.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-C.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--C.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-C.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--D.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-D.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--D.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-D.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--E.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-E.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--E.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-E.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--Exclamation.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-Exclamation.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--Exclamation.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-Exclamation.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--F.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-F.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--F.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-F.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--G.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-G.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--G.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-G.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--H.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-H.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--H.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-H.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--I.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-I.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--I.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-I.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--J.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-J.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--J.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-J.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--K.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-K.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--K.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-K.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--L.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-L.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--L.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-L.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--M.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-M.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--M.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-M.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--N.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-N.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--N.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-N.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--O.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-O.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--O.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-O.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--P.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-P.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--P.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-P.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--Q.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-Q.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--Q.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-Q.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--Question.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-Question.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--Question.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-Question.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--R.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-R.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--R.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-R.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--S.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-S.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--S.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-S.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--T.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-T.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--T.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-T.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--U.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-U.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--U.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-U.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--V.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-V.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--V.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-V.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--W.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-W.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--W.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-W.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--X.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-X.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--X.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-X.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--Y.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-Y.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--Y.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-Y.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0201--420--Unown--Z.png b/src/canonical/minisprites/gen5/pokemon/0201-420-Unown-Z.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0201--420--Unown--Z.png
rename to src/canonical/minisprites/gen5/pokemon/0201-420-Unown-Z.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0202--000--Wobbuffet.png b/src/canonical/minisprites/gen5/pokemon/0202-000-Wobbuffet.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0202--000--Wobbuffet.png
rename to src/canonical/minisprites/gen5/pokemon/0202-000-Wobbuffet.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0203--000--Girafarig.png b/src/canonical/minisprites/gen5/pokemon/0203-000-Girafarig.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0203--000--Girafarig.png
rename to src/canonical/minisprites/gen5/pokemon/0203-000-Girafarig.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0204--000--Pineco.png b/src/canonical/minisprites/gen5/pokemon/0204-000-Pineco.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0204--000--Pineco.png
rename to src/canonical/minisprites/gen5/pokemon/0204-000-Pineco.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0205--000--Forretress.png b/src/canonical/minisprites/gen5/pokemon/0205-000-Forretress.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0205--000--Forretress.png
rename to src/canonical/minisprites/gen5/pokemon/0205-000-Forretress.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0206--000--Dunsparce.png b/src/canonical/minisprites/gen5/pokemon/0206-000-Dunsparce.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0206--000--Dunsparce.png
rename to src/canonical/minisprites/gen5/pokemon/0206-000-Dunsparce.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0207--000--Gligar.png b/src/canonical/minisprites/gen5/pokemon/0207-000-Gligar.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0207--000--Gligar.png
rename to src/canonical/minisprites/gen5/pokemon/0207-000-Gligar.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0208--000--Steelix.png b/src/canonical/minisprites/gen5/pokemon/0208-000-Steelix.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0208--000--Steelix.png
rename to src/canonical/minisprites/gen5/pokemon/0208-000-Steelix.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0209--000--Snubbull.png b/src/canonical/minisprites/gen5/pokemon/0209-000-Snubbull.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0209--000--Snubbull.png
rename to src/canonical/minisprites/gen5/pokemon/0209-000-Snubbull.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0210--000--Granbull.png b/src/canonical/minisprites/gen5/pokemon/0210-000-Granbull.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0210--000--Granbull.png
rename to src/canonical/minisprites/gen5/pokemon/0210-000-Granbull.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0211--000--Qwilfish.png b/src/canonical/minisprites/gen5/pokemon/0211-000-Qwilfish.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0211--000--Qwilfish.png
rename to src/canonical/minisprites/gen5/pokemon/0211-000-Qwilfish.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0212--000--Scizor.png b/src/canonical/minisprites/gen5/pokemon/0212-000-Scizor.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0212--000--Scizor.png
rename to src/canonical/minisprites/gen5/pokemon/0212-000-Scizor.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0213--000--Shuckle.png b/src/canonical/minisprites/gen5/pokemon/0213-000-Shuckle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0213--000--Shuckle.png
rename to src/canonical/minisprites/gen5/pokemon/0213-000-Shuckle.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0214--000--Heracross.png b/src/canonical/minisprites/gen5/pokemon/0214-000-Heracross.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0214--000--Heracross.png
rename to src/canonical/minisprites/gen5/pokemon/0214-000-Heracross.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0215--000--Sneasel.png b/src/canonical/minisprites/gen5/pokemon/0215-000-Sneasel.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0215--000--Sneasel.png
rename to src/canonical/minisprites/gen5/pokemon/0215-000-Sneasel.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0216--000--Teddiursa.png b/src/canonical/minisprites/gen5/pokemon/0216-000-Teddiursa.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0216--000--Teddiursa.png
rename to src/canonical/minisprites/gen5/pokemon/0216-000-Teddiursa.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0217--000--Ursaring.png b/src/canonical/minisprites/gen5/pokemon/0217-000-Ursaring.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0217--000--Ursaring.png
rename to src/canonical/minisprites/gen5/pokemon/0217-000-Ursaring.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0218--000--Slugma.png b/src/canonical/minisprites/gen5/pokemon/0218-000-Slugma.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0218--000--Slugma.png
rename to src/canonical/minisprites/gen5/pokemon/0218-000-Slugma.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0219--000--Magcargo.png b/src/canonical/minisprites/gen5/pokemon/0219-000-Magcargo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0219--000--Magcargo.png
rename to src/canonical/minisprites/gen5/pokemon/0219-000-Magcargo.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0220--000--Swinub.png b/src/canonical/minisprites/gen5/pokemon/0220-000-Swinub.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0220--000--Swinub.png
rename to src/canonical/minisprites/gen5/pokemon/0220-000-Swinub.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0221--000--Piloswine.png b/src/canonical/minisprites/gen5/pokemon/0221-000-Piloswine.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0221--000--Piloswine.png
rename to src/canonical/minisprites/gen5/pokemon/0221-000-Piloswine.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0222--000--Corsola.png b/src/canonical/minisprites/gen5/pokemon/0222-000-Corsola.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0222--000--Corsola.png
rename to src/canonical/minisprites/gen5/pokemon/0222-000-Corsola.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0223--000--Remoraid.png b/src/canonical/minisprites/gen5/pokemon/0223-000-Remoraid.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0223--000--Remoraid.png
rename to src/canonical/minisprites/gen5/pokemon/0223-000-Remoraid.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0224--000--Octillery.png b/src/canonical/minisprites/gen5/pokemon/0224-000-Octillery.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0224--000--Octillery.png
rename to src/canonical/minisprites/gen5/pokemon/0224-000-Octillery.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0225--000--Delibird.png b/src/canonical/minisprites/gen5/pokemon/0225-000-Delibird.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0225--000--Delibird.png
rename to src/canonical/minisprites/gen5/pokemon/0225-000-Delibird.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0226--000--Mantine.png b/src/canonical/minisprites/gen5/pokemon/0226-000-Mantine.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0226--000--Mantine.png
rename to src/canonical/minisprites/gen5/pokemon/0226-000-Mantine.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0227--000--Skarmory.png b/src/canonical/minisprites/gen5/pokemon/0227-000-Skarmory.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0227--000--Skarmory.png
rename to src/canonical/minisprites/gen5/pokemon/0227-000-Skarmory.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0228--000--Houndour.png b/src/canonical/minisprites/gen5/pokemon/0228-000-Houndour.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0228--000--Houndour.png
rename to src/canonical/minisprites/gen5/pokemon/0228-000-Houndour.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0229--000--Houndoom.png b/src/canonical/minisprites/gen5/pokemon/0229-000-Houndoom.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0229--000--Houndoom.png
rename to src/canonical/minisprites/gen5/pokemon/0229-000-Houndoom.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0230--000--Kingdra.png b/src/canonical/minisprites/gen5/pokemon/0230-000-Kingdra.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0230--000--Kingdra.png
rename to src/canonical/minisprites/gen5/pokemon/0230-000-Kingdra.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0231--000--Phanpy.png b/src/canonical/minisprites/gen5/pokemon/0231-000-Phanpy.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0231--000--Phanpy.png
rename to src/canonical/minisprites/gen5/pokemon/0231-000-Phanpy.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0232--000--Donphan.png b/src/canonical/minisprites/gen5/pokemon/0232-000-Donphan.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0232--000--Donphan.png
rename to src/canonical/minisprites/gen5/pokemon/0232-000-Donphan.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0233--000--Porygon2.png b/src/canonical/minisprites/gen5/pokemon/0233-000-Porygon2.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0233--000--Porygon2.png
rename to src/canonical/minisprites/gen5/pokemon/0233-000-Porygon2.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0234--000--Stantler.png b/src/canonical/minisprites/gen5/pokemon/0234-000-Stantler.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0234--000--Stantler.png
rename to src/canonical/minisprites/gen5/pokemon/0234-000-Stantler.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0235--000--Smeargle.png b/src/canonical/minisprites/gen5/pokemon/0235-000-Smeargle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0235--000--Smeargle.png
rename to src/canonical/minisprites/gen5/pokemon/0235-000-Smeargle.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0236--000--Tyrogue.png b/src/canonical/minisprites/gen5/pokemon/0236-000-Tyrogue.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0236--000--Tyrogue.png
rename to src/canonical/minisprites/gen5/pokemon/0236-000-Tyrogue.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0237--000--Hitmontop.png b/src/canonical/minisprites/gen5/pokemon/0237-000-Hitmontop.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0237--000--Hitmontop.png
rename to src/canonical/minisprites/gen5/pokemon/0237-000-Hitmontop.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0238--000--Smoochum.png b/src/canonical/minisprites/gen5/pokemon/0238-000-Smoochum.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0238--000--Smoochum.png
rename to src/canonical/minisprites/gen5/pokemon/0238-000-Smoochum.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0239--000--Elekid.png b/src/canonical/minisprites/gen5/pokemon/0239-000-Elekid.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0239--000--Elekid.png
rename to src/canonical/minisprites/gen5/pokemon/0239-000-Elekid.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0240--000--Magby.png b/src/canonical/minisprites/gen5/pokemon/0240-000-Magby.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0240--000--Magby.png
rename to src/canonical/minisprites/gen5/pokemon/0240-000-Magby.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0241--000--Miltank.png b/src/canonical/minisprites/gen5/pokemon/0241-000-Miltank.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0241--000--Miltank.png
rename to src/canonical/minisprites/gen5/pokemon/0241-000-Miltank.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0242--000--Blissey.png b/src/canonical/minisprites/gen5/pokemon/0242-000-Blissey.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0242--000--Blissey.png
rename to src/canonical/minisprites/gen5/pokemon/0242-000-Blissey.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0243--000--Raikou.png b/src/canonical/minisprites/gen5/pokemon/0243-000-Raikou.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0243--000--Raikou.png
rename to src/canonical/minisprites/gen5/pokemon/0243-000-Raikou.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0244--000--Entei.png b/src/canonical/minisprites/gen5/pokemon/0244-000-Entei.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0244--000--Entei.png
rename to src/canonical/minisprites/gen5/pokemon/0244-000-Entei.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0245--000--Suicune.png b/src/canonical/minisprites/gen5/pokemon/0245-000-Suicune.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0245--000--Suicune.png
rename to src/canonical/minisprites/gen5/pokemon/0245-000-Suicune.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0246--000--Larvitar.png b/src/canonical/minisprites/gen5/pokemon/0246-000-Larvitar.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0246--000--Larvitar.png
rename to src/canonical/minisprites/gen5/pokemon/0246-000-Larvitar.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0247--000--Pupitar.png b/src/canonical/minisprites/gen5/pokemon/0247-000-Pupitar.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0247--000--Pupitar.png
rename to src/canonical/minisprites/gen5/pokemon/0247-000-Pupitar.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0248--000--Tyranitar.png b/src/canonical/minisprites/gen5/pokemon/0248-000-Tyranitar.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0248--000--Tyranitar.png
rename to src/canonical/minisprites/gen5/pokemon/0248-000-Tyranitar.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0249--000--Lugia.png b/src/canonical/minisprites/gen5/pokemon/0249-000-Lugia.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0249--000--Lugia.png
rename to src/canonical/minisprites/gen5/pokemon/0249-000-Lugia.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0250--000--Ho-Oh.png b/src/canonical/minisprites/gen5/pokemon/0250-000-Ho~Oh.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0250--000--Ho-Oh.png
rename to src/canonical/minisprites/gen5/pokemon/0250-000-Ho~Oh.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0251--000--Celebi.png b/src/canonical/minisprites/gen5/pokemon/0251-000-Celebi.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0251--000--Celebi.png
rename to src/canonical/minisprites/gen5/pokemon/0251-000-Celebi.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0252--000--Treecko.png b/src/canonical/minisprites/gen5/pokemon/0252-000-Treecko.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0252--000--Treecko.png
rename to src/canonical/minisprites/gen5/pokemon/0252-000-Treecko.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0253--000--Grovyle.png b/src/canonical/minisprites/gen5/pokemon/0253-000-Grovyle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0253--000--Grovyle.png
rename to src/canonical/minisprites/gen5/pokemon/0253-000-Grovyle.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0254--000--Sceptile.png b/src/canonical/minisprites/gen5/pokemon/0254-000-Sceptile.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0254--000--Sceptile.png
rename to src/canonical/minisprites/gen5/pokemon/0254-000-Sceptile.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0255--000--Torchic.png b/src/canonical/minisprites/gen5/pokemon/0255-000-Torchic.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0255--000--Torchic.png
rename to src/canonical/minisprites/gen5/pokemon/0255-000-Torchic.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0256--000--Combusken.png b/src/canonical/minisprites/gen5/pokemon/0256-000-Combusken.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0256--000--Combusken.png
rename to src/canonical/minisprites/gen5/pokemon/0256-000-Combusken.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0257--000--Blaziken.png b/src/canonical/minisprites/gen5/pokemon/0257-000-Blaziken.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0257--000--Blaziken.png
rename to src/canonical/minisprites/gen5/pokemon/0257-000-Blaziken.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0258--000--Mudkip.png b/src/canonical/minisprites/gen5/pokemon/0258-000-Mudkip.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0258--000--Mudkip.png
rename to src/canonical/minisprites/gen5/pokemon/0258-000-Mudkip.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0259--000--Marshtomp.png b/src/canonical/minisprites/gen5/pokemon/0259-000-Marshtomp.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0259--000--Marshtomp.png
rename to src/canonical/minisprites/gen5/pokemon/0259-000-Marshtomp.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0260--000--Swampert.png b/src/canonical/minisprites/gen5/pokemon/0260-000-Swampert.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0260--000--Swampert.png
rename to src/canonical/minisprites/gen5/pokemon/0260-000-Swampert.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0261--000--Poochyena.png b/src/canonical/minisprites/gen5/pokemon/0261-000-Poochyena.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0261--000--Poochyena.png
rename to src/canonical/minisprites/gen5/pokemon/0261-000-Poochyena.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0262--000--Mightyena.png b/src/canonical/minisprites/gen5/pokemon/0262-000-Mightyena.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0262--000--Mightyena.png
rename to src/canonical/minisprites/gen5/pokemon/0262-000-Mightyena.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0263--000--Zigzagoon.png b/src/canonical/minisprites/gen5/pokemon/0263-000-Zigzagoon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0263--000--Zigzagoon.png
rename to src/canonical/minisprites/gen5/pokemon/0263-000-Zigzagoon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0264--000--Linoone.png b/src/canonical/minisprites/gen5/pokemon/0264-000-Linoone.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0264--000--Linoone.png
rename to src/canonical/minisprites/gen5/pokemon/0264-000-Linoone.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0265--000--Wurmple.png b/src/canonical/minisprites/gen5/pokemon/0265-000-Wurmple.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0265--000--Wurmple.png
rename to src/canonical/minisprites/gen5/pokemon/0265-000-Wurmple.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0266--000--Silcoon.png b/src/canonical/minisprites/gen5/pokemon/0266-000-Silcoon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0266--000--Silcoon.png
rename to src/canonical/minisprites/gen5/pokemon/0266-000-Silcoon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0267--000--Beautifly.png b/src/canonical/minisprites/gen5/pokemon/0267-000-Beautifly.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0267--000--Beautifly.png
rename to src/canonical/minisprites/gen5/pokemon/0267-000-Beautifly.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0268--000--Cascoon.png b/src/canonical/minisprites/gen5/pokemon/0268-000-Cascoon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0268--000--Cascoon.png
rename to src/canonical/minisprites/gen5/pokemon/0268-000-Cascoon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0269--000--Dustox.png b/src/canonical/minisprites/gen5/pokemon/0269-000-Dustox.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0269--000--Dustox.png
rename to src/canonical/minisprites/gen5/pokemon/0269-000-Dustox.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0270--000--Lotad.png b/src/canonical/minisprites/gen5/pokemon/0270-000-Lotad.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0270--000--Lotad.png
rename to src/canonical/minisprites/gen5/pokemon/0270-000-Lotad.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0271--000--Lombre.png b/src/canonical/minisprites/gen5/pokemon/0271-000-Lombre.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0271--000--Lombre.png
rename to src/canonical/minisprites/gen5/pokemon/0271-000-Lombre.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0272--000--Ludicolo.png b/src/canonical/minisprites/gen5/pokemon/0272-000-Ludicolo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0272--000--Ludicolo.png
rename to src/canonical/minisprites/gen5/pokemon/0272-000-Ludicolo.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0273--000--Seedot.png b/src/canonical/minisprites/gen5/pokemon/0273-000-Seedot.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0273--000--Seedot.png
rename to src/canonical/minisprites/gen5/pokemon/0273-000-Seedot.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0274--000--Nuzleaf.png b/src/canonical/minisprites/gen5/pokemon/0274-000-Nuzleaf.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0274--000--Nuzleaf.png
rename to src/canonical/minisprites/gen5/pokemon/0274-000-Nuzleaf.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0275--000--Shiftry.png b/src/canonical/minisprites/gen5/pokemon/0275-000-Shiftry.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0275--000--Shiftry.png
rename to src/canonical/minisprites/gen5/pokemon/0275-000-Shiftry.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0276--000--Taillow.png b/src/canonical/minisprites/gen5/pokemon/0276-000-Taillow.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0276--000--Taillow.png
rename to src/canonical/minisprites/gen5/pokemon/0276-000-Taillow.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0277--000--Swellow.png b/src/canonical/minisprites/gen5/pokemon/0277-000-Swellow.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0277--000--Swellow.png
rename to src/canonical/minisprites/gen5/pokemon/0277-000-Swellow.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0278--000--Wingull.png b/src/canonical/minisprites/gen5/pokemon/0278-000-Wingull.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0278--000--Wingull.png
rename to src/canonical/minisprites/gen5/pokemon/0278-000-Wingull.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0279--000--Pelipper.png b/src/canonical/minisprites/gen5/pokemon/0279-000-Pelipper.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0279--000--Pelipper.png
rename to src/canonical/minisprites/gen5/pokemon/0279-000-Pelipper.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0280--000--Ralts.png b/src/canonical/minisprites/gen5/pokemon/0280-000-Ralts.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0280--000--Ralts.png
rename to src/canonical/minisprites/gen5/pokemon/0280-000-Ralts.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0281--000--Kirlia.png b/src/canonical/minisprites/gen5/pokemon/0281-000-Kirlia.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0281--000--Kirlia.png
rename to src/canonical/minisprites/gen5/pokemon/0281-000-Kirlia.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0282--000--Gardevoir.png b/src/canonical/minisprites/gen5/pokemon/0282-000-Gardevoir.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0282--000--Gardevoir.png
rename to src/canonical/minisprites/gen5/pokemon/0282-000-Gardevoir.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0283--000--Surskit.png b/src/canonical/minisprites/gen5/pokemon/0283-000-Surskit.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0283--000--Surskit.png
rename to src/canonical/minisprites/gen5/pokemon/0283-000-Surskit.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0284--000--Masquerain.png b/src/canonical/minisprites/gen5/pokemon/0284-000-Masquerain.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0284--000--Masquerain.png
rename to src/canonical/minisprites/gen5/pokemon/0284-000-Masquerain.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0285--000--Shroomish.png b/src/canonical/minisprites/gen5/pokemon/0285-000-Shroomish.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0285--000--Shroomish.png
rename to src/canonical/minisprites/gen5/pokemon/0285-000-Shroomish.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0286--000--Breloom.png b/src/canonical/minisprites/gen5/pokemon/0286-000-Breloom.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0286--000--Breloom.png
rename to src/canonical/minisprites/gen5/pokemon/0286-000-Breloom.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0287--000--Slakoth.png b/src/canonical/minisprites/gen5/pokemon/0287-000-Slakoth.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0287--000--Slakoth.png
rename to src/canonical/minisprites/gen5/pokemon/0287-000-Slakoth.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0288--000--Vigoroth.png b/src/canonical/minisprites/gen5/pokemon/0288-000-Vigoroth.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0288--000--Vigoroth.png
rename to src/canonical/minisprites/gen5/pokemon/0288-000-Vigoroth.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0289--000--Slaking.png b/src/canonical/minisprites/gen5/pokemon/0289-000-Slaking.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0289--000--Slaking.png
rename to src/canonical/minisprites/gen5/pokemon/0289-000-Slaking.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0290--000--Nincada.png b/src/canonical/minisprites/gen5/pokemon/0290-000-Nincada.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0290--000--Nincada.png
rename to src/canonical/minisprites/gen5/pokemon/0290-000-Nincada.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0291--000--Ninjask.png b/src/canonical/minisprites/gen5/pokemon/0291-000-Ninjask.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0291--000--Ninjask.png
rename to src/canonical/minisprites/gen5/pokemon/0291-000-Ninjask.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0292--000--Shedinja.png b/src/canonical/minisprites/gen5/pokemon/0292-000-Shedinja.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0292--000--Shedinja.png
rename to src/canonical/minisprites/gen5/pokemon/0292-000-Shedinja.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0293--000--Whismur.png b/src/canonical/minisprites/gen5/pokemon/0293-000-Whismur.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0293--000--Whismur.png
rename to src/canonical/minisprites/gen5/pokemon/0293-000-Whismur.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0294--000--Loudred.png b/src/canonical/minisprites/gen5/pokemon/0294-000-Loudred.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0294--000--Loudred.png
rename to src/canonical/minisprites/gen5/pokemon/0294-000-Loudred.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0295--000--Exploud.png b/src/canonical/minisprites/gen5/pokemon/0295-000-Exploud.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0295--000--Exploud.png
rename to src/canonical/minisprites/gen5/pokemon/0295-000-Exploud.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0296--000--Makuhita.png b/src/canonical/minisprites/gen5/pokemon/0296-000-Makuhita.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0296--000--Makuhita.png
rename to src/canonical/minisprites/gen5/pokemon/0296-000-Makuhita.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0297--000--Hariyama.png b/src/canonical/minisprites/gen5/pokemon/0297-000-Hariyama.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0297--000--Hariyama.png
rename to src/canonical/minisprites/gen5/pokemon/0297-000-Hariyama.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0298--000--Azurill.png b/src/canonical/minisprites/gen5/pokemon/0298-000-Azurill.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0298--000--Azurill.png
rename to src/canonical/minisprites/gen5/pokemon/0298-000-Azurill.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0299--000--Nosepass.png b/src/canonical/minisprites/gen5/pokemon/0299-000-Nosepass.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0299--000--Nosepass.png
rename to src/canonical/minisprites/gen5/pokemon/0299-000-Nosepass.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0300--000--Skitty.png b/src/canonical/minisprites/gen5/pokemon/0300-000-Skitty.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0300--000--Skitty.png
rename to src/canonical/minisprites/gen5/pokemon/0300-000-Skitty.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0301--000--Delcatty.png b/src/canonical/minisprites/gen5/pokemon/0301-000-Delcatty.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0301--000--Delcatty.png
rename to src/canonical/minisprites/gen5/pokemon/0301-000-Delcatty.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0302--000--Sableye.png b/src/canonical/minisprites/gen5/pokemon/0302-000-Sableye.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0302--000--Sableye.png
rename to src/canonical/minisprites/gen5/pokemon/0302-000-Sableye.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0303--000--Mawile.png b/src/canonical/minisprites/gen5/pokemon/0303-000-Mawile.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0303--000--Mawile.png
rename to src/canonical/minisprites/gen5/pokemon/0303-000-Mawile.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0304--000--Aron.png b/src/canonical/minisprites/gen5/pokemon/0304-000-Aron.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0304--000--Aron.png
rename to src/canonical/minisprites/gen5/pokemon/0304-000-Aron.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0305--000--Lairon.png b/src/canonical/minisprites/gen5/pokemon/0305-000-Lairon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0305--000--Lairon.png
rename to src/canonical/minisprites/gen5/pokemon/0305-000-Lairon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0306--000--Aggron.png b/src/canonical/minisprites/gen5/pokemon/0306-000-Aggron.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0306--000--Aggron.png
rename to src/canonical/minisprites/gen5/pokemon/0306-000-Aggron.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0307--000--Meditite.png b/src/canonical/minisprites/gen5/pokemon/0307-000-Meditite.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0307--000--Meditite.png
rename to src/canonical/minisprites/gen5/pokemon/0307-000-Meditite.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0308--000--Medicham.png b/src/canonical/minisprites/gen5/pokemon/0308-000-Medicham.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0308--000--Medicham.png
rename to src/canonical/minisprites/gen5/pokemon/0308-000-Medicham.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0309--000--Electrike.png b/src/canonical/minisprites/gen5/pokemon/0309-000-Electrike.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0309--000--Electrike.png
rename to src/canonical/minisprites/gen5/pokemon/0309-000-Electrike.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0310--000--Manectric.png b/src/canonical/minisprites/gen5/pokemon/0310-000-Manectric.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0310--000--Manectric.png
rename to src/canonical/minisprites/gen5/pokemon/0310-000-Manectric.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0311--000--Plusle.png b/src/canonical/minisprites/gen5/pokemon/0311-000-Plusle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0311--000--Plusle.png
rename to src/canonical/minisprites/gen5/pokemon/0311-000-Plusle.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0312--000--Minun.png b/src/canonical/minisprites/gen5/pokemon/0312-000-Minun.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0312--000--Minun.png
rename to src/canonical/minisprites/gen5/pokemon/0312-000-Minun.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0313--000--Volbeat.png b/src/canonical/minisprites/gen5/pokemon/0313-000-Volbeat.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0313--000--Volbeat.png
rename to src/canonical/minisprites/gen5/pokemon/0313-000-Volbeat.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0314--000--Illumise.png b/src/canonical/minisprites/gen5/pokemon/0314-000-Illumise.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0314--000--Illumise.png
rename to src/canonical/minisprites/gen5/pokemon/0314-000-Illumise.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0315--000--Roselia.png b/src/canonical/minisprites/gen5/pokemon/0315-000-Roselia.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0315--000--Roselia.png
rename to src/canonical/minisprites/gen5/pokemon/0315-000-Roselia.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0316--000--Gulpin.png b/src/canonical/minisprites/gen5/pokemon/0316-000-Gulpin.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0316--000--Gulpin.png
rename to src/canonical/minisprites/gen5/pokemon/0316-000-Gulpin.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0317--000--Swalot.png b/src/canonical/minisprites/gen5/pokemon/0317-000-Swalot.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0317--000--Swalot.png
rename to src/canonical/minisprites/gen5/pokemon/0317-000-Swalot.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0318--000--Carvanha.png b/src/canonical/minisprites/gen5/pokemon/0318-000-Carvanha.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0318--000--Carvanha.png
rename to src/canonical/minisprites/gen5/pokemon/0318-000-Carvanha.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0319--000--Sharpedo.png b/src/canonical/minisprites/gen5/pokemon/0319-000-Sharpedo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0319--000--Sharpedo.png
rename to src/canonical/minisprites/gen5/pokemon/0319-000-Sharpedo.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0320--000--Wailmer.png b/src/canonical/minisprites/gen5/pokemon/0320-000-Wailmer.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0320--000--Wailmer.png
rename to src/canonical/minisprites/gen5/pokemon/0320-000-Wailmer.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0321--000--Wailord.png b/src/canonical/minisprites/gen5/pokemon/0321-000-Wailord.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0321--000--Wailord.png
rename to src/canonical/minisprites/gen5/pokemon/0321-000-Wailord.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0322--000--Numel.png b/src/canonical/minisprites/gen5/pokemon/0322-000-Numel.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0322--000--Numel.png
rename to src/canonical/minisprites/gen5/pokemon/0322-000-Numel.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0323--000--Camerupt.png b/src/canonical/minisprites/gen5/pokemon/0323-000-Camerupt.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0323--000--Camerupt.png
rename to src/canonical/minisprites/gen5/pokemon/0323-000-Camerupt.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0324--000--Torkoal.png b/src/canonical/minisprites/gen5/pokemon/0324-000-Torkoal.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0324--000--Torkoal.png
rename to src/canonical/minisprites/gen5/pokemon/0324-000-Torkoal.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0325--000--Spoink.png b/src/canonical/minisprites/gen5/pokemon/0325-000-Spoink.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0325--000--Spoink.png
rename to src/canonical/minisprites/gen5/pokemon/0325-000-Spoink.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0326--000--Grumpig.png b/src/canonical/minisprites/gen5/pokemon/0326-000-Grumpig.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0326--000--Grumpig.png
rename to src/canonical/minisprites/gen5/pokemon/0326-000-Grumpig.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0327--000--Spinda.png b/src/canonical/minisprites/gen5/pokemon/0327-000-Spinda.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0327--000--Spinda.png
rename to src/canonical/minisprites/gen5/pokemon/0327-000-Spinda.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0328--000--Trapinch.png b/src/canonical/minisprites/gen5/pokemon/0328-000-Trapinch.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0328--000--Trapinch.png
rename to src/canonical/minisprites/gen5/pokemon/0328-000-Trapinch.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0329--000--Vibrava.png b/src/canonical/minisprites/gen5/pokemon/0329-000-Vibrava.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0329--000--Vibrava.png
rename to src/canonical/minisprites/gen5/pokemon/0329-000-Vibrava.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0330--000--Flygon.png b/src/canonical/minisprites/gen5/pokemon/0330-000-Flygon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0330--000--Flygon.png
rename to src/canonical/minisprites/gen5/pokemon/0330-000-Flygon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0331--000--Cacnea.png b/src/canonical/minisprites/gen5/pokemon/0331-000-Cacnea.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0331--000--Cacnea.png
rename to src/canonical/minisprites/gen5/pokemon/0331-000-Cacnea.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0332--000--Cacturne.png b/src/canonical/minisprites/gen5/pokemon/0332-000-Cacturne.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0332--000--Cacturne.png
rename to src/canonical/minisprites/gen5/pokemon/0332-000-Cacturne.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0333--000--Swablu.png b/src/canonical/minisprites/gen5/pokemon/0333-000-Swablu.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0333--000--Swablu.png
rename to src/canonical/minisprites/gen5/pokemon/0333-000-Swablu.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0334--000--Altaria.png b/src/canonical/minisprites/gen5/pokemon/0334-000-Altaria.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0334--000--Altaria.png
rename to src/canonical/minisprites/gen5/pokemon/0334-000-Altaria.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0335--000--Zangoose.png b/src/canonical/minisprites/gen5/pokemon/0335-000-Zangoose.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0335--000--Zangoose.png
rename to src/canonical/minisprites/gen5/pokemon/0335-000-Zangoose.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0336--000--Seviper.png b/src/canonical/minisprites/gen5/pokemon/0336-000-Seviper.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0336--000--Seviper.png
rename to src/canonical/minisprites/gen5/pokemon/0336-000-Seviper.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0337--000--Lunatone.png b/src/canonical/minisprites/gen5/pokemon/0337-000-Lunatone.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0337--000--Lunatone.png
rename to src/canonical/minisprites/gen5/pokemon/0337-000-Lunatone.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0338--000--Solrock.png b/src/canonical/minisprites/gen5/pokemon/0338-000-Solrock.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0338--000--Solrock.png
rename to src/canonical/minisprites/gen5/pokemon/0338-000-Solrock.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0339--000--Barboach.png b/src/canonical/minisprites/gen5/pokemon/0339-000-Barboach.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0339--000--Barboach.png
rename to src/canonical/minisprites/gen5/pokemon/0339-000-Barboach.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0340--000--Whiscash.png b/src/canonical/minisprites/gen5/pokemon/0340-000-Whiscash.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0340--000--Whiscash.png
rename to src/canonical/minisprites/gen5/pokemon/0340-000-Whiscash.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0341--000--Corphish.png b/src/canonical/minisprites/gen5/pokemon/0341-000-Corphish.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0341--000--Corphish.png
rename to src/canonical/minisprites/gen5/pokemon/0341-000-Corphish.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0342--000--Crawdaunt.png b/src/canonical/minisprites/gen5/pokemon/0342-000-Crawdaunt.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0342--000--Crawdaunt.png
rename to src/canonical/minisprites/gen5/pokemon/0342-000-Crawdaunt.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0343--000--Baltoy.png b/src/canonical/minisprites/gen5/pokemon/0343-000-Baltoy.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0343--000--Baltoy.png
rename to src/canonical/minisprites/gen5/pokemon/0343-000-Baltoy.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0344--000--Claydol.png b/src/canonical/minisprites/gen5/pokemon/0344-000-Claydol.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0344--000--Claydol.png
rename to src/canonical/minisprites/gen5/pokemon/0344-000-Claydol.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0345--000--Lileep.png b/src/canonical/minisprites/gen5/pokemon/0345-000-Lileep.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0345--000--Lileep.png
rename to src/canonical/minisprites/gen5/pokemon/0345-000-Lileep.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0346--000--Cradily.png b/src/canonical/minisprites/gen5/pokemon/0346-000-Cradily.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0346--000--Cradily.png
rename to src/canonical/minisprites/gen5/pokemon/0346-000-Cradily.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0347--000--Anorith.png b/src/canonical/minisprites/gen5/pokemon/0347-000-Anorith.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0347--000--Anorith.png
rename to src/canonical/minisprites/gen5/pokemon/0347-000-Anorith.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0348--000--Armaldo.png b/src/canonical/minisprites/gen5/pokemon/0348-000-Armaldo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0348--000--Armaldo.png
rename to src/canonical/minisprites/gen5/pokemon/0348-000-Armaldo.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0349--000--Feebas.png b/src/canonical/minisprites/gen5/pokemon/0349-000-Feebas.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0349--000--Feebas.png
rename to src/canonical/minisprites/gen5/pokemon/0349-000-Feebas.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0350--000--Milotic.png b/src/canonical/minisprites/gen5/pokemon/0350-000-Milotic.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0350--000--Milotic.png
rename to src/canonical/minisprites/gen5/pokemon/0350-000-Milotic.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0351--000--Castform.png b/src/canonical/minisprites/gen5/pokemon/0351-000-Castform.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0351--000--Castform.png
rename to src/canonical/minisprites/gen5/pokemon/0351-000-Castform.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0351--420--Castform--Rainy.png b/src/canonical/minisprites/gen5/pokemon/0351-420-Castform-Rainy.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0351--420--Castform--Rainy.png
rename to src/canonical/minisprites/gen5/pokemon/0351-420-Castform-Rainy.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0351--420--Castform--Snowy.png b/src/canonical/minisprites/gen5/pokemon/0351-420-Castform-Snowy.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0351--420--Castform--Snowy.png
rename to src/canonical/minisprites/gen5/pokemon/0351-420-Castform-Snowy.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0351--420--Castform--Sunny.png b/src/canonical/minisprites/gen5/pokemon/0351-420-Castform-Sunny.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0351--420--Castform--Sunny.png
rename to src/canonical/minisprites/gen5/pokemon/0351-420-Castform-Sunny.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0352--000--Kecleon.png b/src/canonical/minisprites/gen5/pokemon/0352-000-Kecleon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0352--000--Kecleon.png
rename to src/canonical/minisprites/gen5/pokemon/0352-000-Kecleon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0353--000--Shuppet.png b/src/canonical/minisprites/gen5/pokemon/0353-000-Shuppet.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0353--000--Shuppet.png
rename to src/canonical/minisprites/gen5/pokemon/0353-000-Shuppet.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0354--000--Banette.png b/src/canonical/minisprites/gen5/pokemon/0354-000-Banette.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0354--000--Banette.png
rename to src/canonical/minisprites/gen5/pokemon/0354-000-Banette.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0355--000--Duskull.png b/src/canonical/minisprites/gen5/pokemon/0355-000-Duskull.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0355--000--Duskull.png
rename to src/canonical/minisprites/gen5/pokemon/0355-000-Duskull.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0356--000--Dusclops.png b/src/canonical/minisprites/gen5/pokemon/0356-000-Dusclops.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0356--000--Dusclops.png
rename to src/canonical/minisprites/gen5/pokemon/0356-000-Dusclops.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0357--000--Tropius.png b/src/canonical/minisprites/gen5/pokemon/0357-000-Tropius.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0357--000--Tropius.png
rename to src/canonical/minisprites/gen5/pokemon/0357-000-Tropius.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0358--000--Chimecho.png b/src/canonical/minisprites/gen5/pokemon/0358-000-Chimecho.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0358--000--Chimecho.png
rename to src/canonical/minisprites/gen5/pokemon/0358-000-Chimecho.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0359--000--Absol.png b/src/canonical/minisprites/gen5/pokemon/0359-000-Absol.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0359--000--Absol.png
rename to src/canonical/minisprites/gen5/pokemon/0359-000-Absol.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0360--000--Wynaut.png b/src/canonical/minisprites/gen5/pokemon/0360-000-Wynaut.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0360--000--Wynaut.png
rename to src/canonical/minisprites/gen5/pokemon/0360-000-Wynaut.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0361--000--Snorunt.png b/src/canonical/minisprites/gen5/pokemon/0361-000-Snorunt.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0361--000--Snorunt.png
rename to src/canonical/minisprites/gen5/pokemon/0361-000-Snorunt.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0362--000--Glalie.png b/src/canonical/minisprites/gen5/pokemon/0362-000-Glalie.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0362--000--Glalie.png
rename to src/canonical/minisprites/gen5/pokemon/0362-000-Glalie.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0363--000--Spheal.png b/src/canonical/minisprites/gen5/pokemon/0363-000-Spheal.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0363--000--Spheal.png
rename to src/canonical/minisprites/gen5/pokemon/0363-000-Spheal.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0364--000--Sealeo.png b/src/canonical/minisprites/gen5/pokemon/0364-000-Sealeo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0364--000--Sealeo.png
rename to src/canonical/minisprites/gen5/pokemon/0364-000-Sealeo.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0365--000--Walrein.png b/src/canonical/minisprites/gen5/pokemon/0365-000-Walrein.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0365--000--Walrein.png
rename to src/canonical/minisprites/gen5/pokemon/0365-000-Walrein.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0366--000--Clamperl.png b/src/canonical/minisprites/gen5/pokemon/0366-000-Clamperl.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0366--000--Clamperl.png
rename to src/canonical/minisprites/gen5/pokemon/0366-000-Clamperl.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0367--000--Huntail.png b/src/canonical/minisprites/gen5/pokemon/0367-000-Huntail.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0367--000--Huntail.png
rename to src/canonical/minisprites/gen5/pokemon/0367-000-Huntail.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0368--000--Gorebyss.png b/src/canonical/minisprites/gen5/pokemon/0368-000-Gorebyss.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0368--000--Gorebyss.png
rename to src/canonical/minisprites/gen5/pokemon/0368-000-Gorebyss.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0369--000--Relicanth.png b/src/canonical/minisprites/gen5/pokemon/0369-000-Relicanth.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0369--000--Relicanth.png
rename to src/canonical/minisprites/gen5/pokemon/0369-000-Relicanth.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0370--000--Luvdisc.png b/src/canonical/minisprites/gen5/pokemon/0370-000-Luvdisc.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0370--000--Luvdisc.png
rename to src/canonical/minisprites/gen5/pokemon/0370-000-Luvdisc.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0371--000--Bagon.png b/src/canonical/minisprites/gen5/pokemon/0371-000-Bagon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0371--000--Bagon.png
rename to src/canonical/minisprites/gen5/pokemon/0371-000-Bagon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0372--000--Shelgon.png b/src/canonical/minisprites/gen5/pokemon/0372-000-Shelgon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0372--000--Shelgon.png
rename to src/canonical/minisprites/gen5/pokemon/0372-000-Shelgon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0373--000--Salamence.png b/src/canonical/minisprites/gen5/pokemon/0373-000-Salamence.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0373--000--Salamence.png
rename to src/canonical/minisprites/gen5/pokemon/0373-000-Salamence.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0374--000--Beldum.png b/src/canonical/minisprites/gen5/pokemon/0374-000-Beldum.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0374--000--Beldum.png
rename to src/canonical/minisprites/gen5/pokemon/0374-000-Beldum.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0375--000--Metang.png b/src/canonical/minisprites/gen5/pokemon/0375-000-Metang.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0375--000--Metang.png
rename to src/canonical/minisprites/gen5/pokemon/0375-000-Metang.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0376--000--Metagross.png b/src/canonical/minisprites/gen5/pokemon/0376-000-Metagross.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0376--000--Metagross.png
rename to src/canonical/minisprites/gen5/pokemon/0376-000-Metagross.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0377--000--Regirock.png b/src/canonical/minisprites/gen5/pokemon/0377-000-Regirock.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0377--000--Regirock.png
rename to src/canonical/minisprites/gen5/pokemon/0377-000-Regirock.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0378--000--Regice.png b/src/canonical/minisprites/gen5/pokemon/0378-000-Regice.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0378--000--Regice.png
rename to src/canonical/minisprites/gen5/pokemon/0378-000-Regice.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0379--000--Registeel.png b/src/canonical/minisprites/gen5/pokemon/0379-000-Registeel.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0379--000--Registeel.png
rename to src/canonical/minisprites/gen5/pokemon/0379-000-Registeel.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0380--000--Latias.png b/src/canonical/minisprites/gen5/pokemon/0380-000-Latias.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0380--000--Latias.png
rename to src/canonical/minisprites/gen5/pokemon/0380-000-Latias.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0381--000--Latios.png b/src/canonical/minisprites/gen5/pokemon/0381-000-Latios.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0381--000--Latios.png
rename to src/canonical/minisprites/gen5/pokemon/0381-000-Latios.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0382--000--Kyogre.png b/src/canonical/minisprites/gen5/pokemon/0382-000-Kyogre.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0382--000--Kyogre.png
rename to src/canonical/minisprites/gen5/pokemon/0382-000-Kyogre.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0383--000--Groudon.png b/src/canonical/minisprites/gen5/pokemon/0383-000-Groudon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0383--000--Groudon.png
rename to src/canonical/minisprites/gen5/pokemon/0383-000-Groudon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0384--000--Rayquaza.png b/src/canonical/minisprites/gen5/pokemon/0384-000-Rayquaza.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0384--000--Rayquaza.png
rename to src/canonical/minisprites/gen5/pokemon/0384-000-Rayquaza.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0385--000--Jirachi.png b/src/canonical/minisprites/gen5/pokemon/0385-000-Jirachi.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0385--000--Jirachi.png
rename to src/canonical/minisprites/gen5/pokemon/0385-000-Jirachi.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0386--000--Deoxys.png b/src/canonical/minisprites/gen5/pokemon/0386-000-Deoxys.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0386--000--Deoxys.png
rename to src/canonical/minisprites/gen5/pokemon/0386-000-Deoxys.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0386--420--Deoxys--Attack.png b/src/canonical/minisprites/gen5/pokemon/0386-420-Deoxys-Attack.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0386--420--Deoxys--Attack.png
rename to src/canonical/minisprites/gen5/pokemon/0386-420-Deoxys-Attack.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0386--420--Deoxys--Defense.png b/src/canonical/minisprites/gen5/pokemon/0386-420-Deoxys-Defense.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0386--420--Deoxys--Defense.png
rename to src/canonical/minisprites/gen5/pokemon/0386-420-Deoxys-Defense.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0386--420--Deoxys--Speed.png b/src/canonical/minisprites/gen5/pokemon/0386-420-Deoxys-Speed.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0386--420--Deoxys--Speed.png
rename to src/canonical/minisprites/gen5/pokemon/0386-420-Deoxys-Speed.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0387--000--Turtwig.png b/src/canonical/minisprites/gen5/pokemon/0387-000-Turtwig.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0387--000--Turtwig.png
rename to src/canonical/minisprites/gen5/pokemon/0387-000-Turtwig.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0388--000--Grotle.png b/src/canonical/minisprites/gen5/pokemon/0388-000-Grotle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0388--000--Grotle.png
rename to src/canonical/minisprites/gen5/pokemon/0388-000-Grotle.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0389--000--Torterra.png b/src/canonical/minisprites/gen5/pokemon/0389-000-Torterra.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0389--000--Torterra.png
rename to src/canonical/minisprites/gen5/pokemon/0389-000-Torterra.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0390--000--Chimchar.png b/src/canonical/minisprites/gen5/pokemon/0390-000-Chimchar.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0390--000--Chimchar.png
rename to src/canonical/minisprites/gen5/pokemon/0390-000-Chimchar.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0391--000--Monferno.png b/src/canonical/minisprites/gen5/pokemon/0391-000-Monferno.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0391--000--Monferno.png
rename to src/canonical/minisprites/gen5/pokemon/0391-000-Monferno.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0392--000--Infernape.png b/src/canonical/minisprites/gen5/pokemon/0392-000-Infernape.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0392--000--Infernape.png
rename to src/canonical/minisprites/gen5/pokemon/0392-000-Infernape.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0393--000--Piplup.png b/src/canonical/minisprites/gen5/pokemon/0393-000-Piplup.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0393--000--Piplup.png
rename to src/canonical/minisprites/gen5/pokemon/0393-000-Piplup.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0394--000--Prinplup.png b/src/canonical/minisprites/gen5/pokemon/0394-000-Prinplup.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0394--000--Prinplup.png
rename to src/canonical/minisprites/gen5/pokemon/0394-000-Prinplup.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0395--000--Empoleon.png b/src/canonical/minisprites/gen5/pokemon/0395-000-Empoleon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0395--000--Empoleon.png
rename to src/canonical/minisprites/gen5/pokemon/0395-000-Empoleon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0396--000--Starly.png b/src/canonical/minisprites/gen5/pokemon/0396-000-Starly.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0396--000--Starly.png
rename to src/canonical/minisprites/gen5/pokemon/0396-000-Starly.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0397--000--Staravia.png b/src/canonical/minisprites/gen5/pokemon/0397-000-Staravia.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0397--000--Staravia.png
rename to src/canonical/minisprites/gen5/pokemon/0397-000-Staravia.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0398--000--Staraptor.png b/src/canonical/minisprites/gen5/pokemon/0398-000-Staraptor.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0398--000--Staraptor.png
rename to src/canonical/minisprites/gen5/pokemon/0398-000-Staraptor.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0399--000--Bidoof.png b/src/canonical/minisprites/gen5/pokemon/0399-000-Bidoof.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0399--000--Bidoof.png
rename to src/canonical/minisprites/gen5/pokemon/0399-000-Bidoof.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0400--000--Bibarel.png b/src/canonical/minisprites/gen5/pokemon/0400-000-Bibarel.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0400--000--Bibarel.png
rename to src/canonical/minisprites/gen5/pokemon/0400-000-Bibarel.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0401--000--Kricketot.png b/src/canonical/minisprites/gen5/pokemon/0401-000-Kricketot.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0401--000--Kricketot.png
rename to src/canonical/minisprites/gen5/pokemon/0401-000-Kricketot.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0402--000--Kricketune.png b/src/canonical/minisprites/gen5/pokemon/0402-000-Kricketune.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0402--000--Kricketune.png
rename to src/canonical/minisprites/gen5/pokemon/0402-000-Kricketune.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0403--000--Shinx.png b/src/canonical/minisprites/gen5/pokemon/0403-000-Shinx.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0403--000--Shinx.png
rename to src/canonical/minisprites/gen5/pokemon/0403-000-Shinx.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0404--000--Luxio.png b/src/canonical/minisprites/gen5/pokemon/0404-000-Luxio.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0404--000--Luxio.png
rename to src/canonical/minisprites/gen5/pokemon/0404-000-Luxio.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0405--000--Luxray.png b/src/canonical/minisprites/gen5/pokemon/0405-000-Luxray.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0405--000--Luxray.png
rename to src/canonical/minisprites/gen5/pokemon/0405-000-Luxray.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0406--000--Budew.png b/src/canonical/minisprites/gen5/pokemon/0406-000-Budew.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0406--000--Budew.png
rename to src/canonical/minisprites/gen5/pokemon/0406-000-Budew.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0407--000--Roserade.png b/src/canonical/minisprites/gen5/pokemon/0407-000-Roserade.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0407--000--Roserade.png
rename to src/canonical/minisprites/gen5/pokemon/0407-000-Roserade.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0408--000--Cranidos.png b/src/canonical/minisprites/gen5/pokemon/0408-000-Cranidos.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0408--000--Cranidos.png
rename to src/canonical/minisprites/gen5/pokemon/0408-000-Cranidos.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0409--000--Rampardos.png b/src/canonical/minisprites/gen5/pokemon/0409-000-Rampardos.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0409--000--Rampardos.png
rename to src/canonical/minisprites/gen5/pokemon/0409-000-Rampardos.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0410--000--Shieldon.png b/src/canonical/minisprites/gen5/pokemon/0410-000-Shieldon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0410--000--Shieldon.png
rename to src/canonical/minisprites/gen5/pokemon/0410-000-Shieldon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0411--000--Bastiodon.png b/src/canonical/minisprites/gen5/pokemon/0411-000-Bastiodon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0411--000--Bastiodon.png
rename to src/canonical/minisprites/gen5/pokemon/0411-000-Bastiodon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0412--000--Burmy.png b/src/canonical/minisprites/gen5/pokemon/0412-000-Burmy.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0412--000--Burmy.png
rename to src/canonical/minisprites/gen5/pokemon/0412-000-Burmy.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0412--420--Burmy--Sandy.png b/src/canonical/minisprites/gen5/pokemon/0412-420-Burmy-Sandy.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0412--420--Burmy--Sandy.png
rename to src/canonical/minisprites/gen5/pokemon/0412-420-Burmy-Sandy.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0412--420--Burmy--Trash.png b/src/canonical/minisprites/gen5/pokemon/0412-420-Burmy-Trash.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0412--420--Burmy--Trash.png
rename to src/canonical/minisprites/gen5/pokemon/0412-420-Burmy-Trash.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0413--000--Wormadam.png b/src/canonical/minisprites/gen5/pokemon/0413-000-Wormadam.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0413--000--Wormadam.png
rename to src/canonical/minisprites/gen5/pokemon/0413-000-Wormadam.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0413--420--Wormadam--Sandy.png b/src/canonical/minisprites/gen5/pokemon/0413-420-Wormadam-Sandy.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0413--420--Wormadam--Sandy.png
rename to src/canonical/minisprites/gen5/pokemon/0413-420-Wormadam-Sandy.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0413--420--Wormadam--Trash.png b/src/canonical/minisprites/gen5/pokemon/0413-420-Wormadam-Trash.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0413--420--Wormadam--Trash.png
rename to src/canonical/minisprites/gen5/pokemon/0413-420-Wormadam-Trash.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0414--000--Mothim.png b/src/canonical/minisprites/gen5/pokemon/0414-000-Mothim.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0414--000--Mothim.png
rename to src/canonical/minisprites/gen5/pokemon/0414-000-Mothim.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0415--000--Combee.png b/src/canonical/minisprites/gen5/pokemon/0415-000-Combee.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0415--000--Combee.png
rename to src/canonical/minisprites/gen5/pokemon/0415-000-Combee.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0416--000--Vespiquen.png b/src/canonical/minisprites/gen5/pokemon/0416-000-Vespiquen.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0416--000--Vespiquen.png
rename to src/canonical/minisprites/gen5/pokemon/0416-000-Vespiquen.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0417--000--Pachirisu.png b/src/canonical/minisprites/gen5/pokemon/0417-000-Pachirisu.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0417--000--Pachirisu.png
rename to src/canonical/minisprites/gen5/pokemon/0417-000-Pachirisu.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0418--000--Buizel.png b/src/canonical/minisprites/gen5/pokemon/0418-000-Buizel.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0418--000--Buizel.png
rename to src/canonical/minisprites/gen5/pokemon/0418-000-Buizel.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0419--000--Floatzel.png b/src/canonical/minisprites/gen5/pokemon/0419-000-Floatzel.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0419--000--Floatzel.png
rename to src/canonical/minisprites/gen5/pokemon/0419-000-Floatzel.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0420--000--Cherubi.png b/src/canonical/minisprites/gen5/pokemon/0420-000-Cherubi.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0420--000--Cherubi.png
rename to src/canonical/minisprites/gen5/pokemon/0420-000-Cherubi.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0421--000--Cherrim.png b/src/canonical/minisprites/gen5/pokemon/0421-000-Cherrim.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0421--000--Cherrim.png
rename to src/canonical/minisprites/gen5/pokemon/0421-000-Cherrim.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0421--420--Cherrim--Sunshine.png b/src/canonical/minisprites/gen5/pokemon/0421-420-Cherrim-Sunshine.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0421--420--Cherrim--Sunshine.png
rename to src/canonical/minisprites/gen5/pokemon/0421-420-Cherrim-Sunshine.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0422--000--Shellos.png b/src/canonical/minisprites/gen5/pokemon/0422-000-Shellos.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0422--000--Shellos.png
rename to src/canonical/minisprites/gen5/pokemon/0422-000-Shellos.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0422--420--Shellos--East.png b/src/canonical/minisprites/gen5/pokemon/0422-420-Shellos-East.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0422--420--Shellos--East.png
rename to src/canonical/minisprites/gen5/pokemon/0422-420-Shellos-East.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0423--000--Gastrodon.png b/src/canonical/minisprites/gen5/pokemon/0423-000-Gastrodon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0423--000--Gastrodon.png
rename to src/canonical/minisprites/gen5/pokemon/0423-000-Gastrodon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0423--420--Gastrodon--East.png b/src/canonical/minisprites/gen5/pokemon/0423-420-Gastrodon-East.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0423--420--Gastrodon--East.png
rename to src/canonical/minisprites/gen5/pokemon/0423-420-Gastrodon-East.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0424--000--Ambipom.png b/src/canonical/minisprites/gen5/pokemon/0424-000-Ambipom.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0424--000--Ambipom.png
rename to src/canonical/minisprites/gen5/pokemon/0424-000-Ambipom.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0425--000--Drifloon.png b/src/canonical/minisprites/gen5/pokemon/0425-000-Drifloon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0425--000--Drifloon.png
rename to src/canonical/minisprites/gen5/pokemon/0425-000-Drifloon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0426--000--Drifblim.png b/src/canonical/minisprites/gen5/pokemon/0426-000-Drifblim.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0426--000--Drifblim.png
rename to src/canonical/minisprites/gen5/pokemon/0426-000-Drifblim.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0427--000--Buneary.png b/src/canonical/minisprites/gen5/pokemon/0427-000-Buneary.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0427--000--Buneary.png
rename to src/canonical/minisprites/gen5/pokemon/0427-000-Buneary.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0428--000--Lopunny.png b/src/canonical/minisprites/gen5/pokemon/0428-000-Lopunny.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0428--000--Lopunny.png
rename to src/canonical/minisprites/gen5/pokemon/0428-000-Lopunny.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0429--000--Mismagius.png b/src/canonical/minisprites/gen5/pokemon/0429-000-Mismagius.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0429--000--Mismagius.png
rename to src/canonical/minisprites/gen5/pokemon/0429-000-Mismagius.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0430--000--Honchkrow.png b/src/canonical/minisprites/gen5/pokemon/0430-000-Honchkrow.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0430--000--Honchkrow.png
rename to src/canonical/minisprites/gen5/pokemon/0430-000-Honchkrow.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0431--000--Glameow.png b/src/canonical/minisprites/gen5/pokemon/0431-000-Glameow.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0431--000--Glameow.png
rename to src/canonical/minisprites/gen5/pokemon/0431-000-Glameow.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0432--000--Purugly.png b/src/canonical/minisprites/gen5/pokemon/0432-000-Purugly.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0432--000--Purugly.png
rename to src/canonical/minisprites/gen5/pokemon/0432-000-Purugly.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0433--000--Chingling.png b/src/canonical/minisprites/gen5/pokemon/0433-000-Chingling.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0433--000--Chingling.png
rename to src/canonical/minisprites/gen5/pokemon/0433-000-Chingling.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0434--000--Stunky.png b/src/canonical/minisprites/gen5/pokemon/0434-000-Stunky.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0434--000--Stunky.png
rename to src/canonical/minisprites/gen5/pokemon/0434-000-Stunky.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0435--000--Skuntank.png b/src/canonical/minisprites/gen5/pokemon/0435-000-Skuntank.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0435--000--Skuntank.png
rename to src/canonical/minisprites/gen5/pokemon/0435-000-Skuntank.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0436--000--Bronzor.png b/src/canonical/minisprites/gen5/pokemon/0436-000-Bronzor.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0436--000--Bronzor.png
rename to src/canonical/minisprites/gen5/pokemon/0436-000-Bronzor.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0437--000--Bronzong.png b/src/canonical/minisprites/gen5/pokemon/0437-000-Bronzong.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0437--000--Bronzong.png
rename to src/canonical/minisprites/gen5/pokemon/0437-000-Bronzong.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0438--000--Bonsly.png b/src/canonical/minisprites/gen5/pokemon/0438-000-Bonsly.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0438--000--Bonsly.png
rename to src/canonical/minisprites/gen5/pokemon/0438-000-Bonsly.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0439--000--Mime_Jr..png b/src/canonical/minisprites/gen5/pokemon/0439-000-Mime_Jr..png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0439--000--Mime_Jr..png
rename to src/canonical/minisprites/gen5/pokemon/0439-000-Mime_Jr..png
diff --git a/src/canonical/minisprites/gen5/pokemon/0440--000--Happiny.png b/src/canonical/minisprites/gen5/pokemon/0440-000-Happiny.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0440--000--Happiny.png
rename to src/canonical/minisprites/gen5/pokemon/0440-000-Happiny.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0441--000--Chatot.png b/src/canonical/minisprites/gen5/pokemon/0441-000-Chatot.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0441--000--Chatot.png
rename to src/canonical/minisprites/gen5/pokemon/0441-000-Chatot.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0442--000--Spiritomb.png b/src/canonical/minisprites/gen5/pokemon/0442-000-Spiritomb.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0442--000--Spiritomb.png
rename to src/canonical/minisprites/gen5/pokemon/0442-000-Spiritomb.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0443--000--Gible.png b/src/canonical/minisprites/gen5/pokemon/0443-000-Gible.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0443--000--Gible.png
rename to src/canonical/minisprites/gen5/pokemon/0443-000-Gible.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0444--000--Gabite.png b/src/canonical/minisprites/gen5/pokemon/0444-000-Gabite.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0444--000--Gabite.png
rename to src/canonical/minisprites/gen5/pokemon/0444-000-Gabite.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0445--000--Garchomp.png b/src/canonical/minisprites/gen5/pokemon/0445-000-Garchomp.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0445--000--Garchomp.png
rename to src/canonical/minisprites/gen5/pokemon/0445-000-Garchomp.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0446--000--Munchlax.png b/src/canonical/minisprites/gen5/pokemon/0446-000-Munchlax.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0446--000--Munchlax.png
rename to src/canonical/minisprites/gen5/pokemon/0446-000-Munchlax.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0447--000--Riolu.png b/src/canonical/minisprites/gen5/pokemon/0447-000-Riolu.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0447--000--Riolu.png
rename to src/canonical/minisprites/gen5/pokemon/0447-000-Riolu.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0448--000--Lucario.png b/src/canonical/minisprites/gen5/pokemon/0448-000-Lucario.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0448--000--Lucario.png
rename to src/canonical/minisprites/gen5/pokemon/0448-000-Lucario.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0449--000--Hippopotas.png b/src/canonical/minisprites/gen5/pokemon/0449-000-Hippopotas.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0449--000--Hippopotas.png
rename to src/canonical/minisprites/gen5/pokemon/0449-000-Hippopotas.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0450--000--Hippowdon.png b/src/canonical/minisprites/gen5/pokemon/0450-000-Hippowdon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0450--000--Hippowdon.png
rename to src/canonical/minisprites/gen5/pokemon/0450-000-Hippowdon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0451--000--Skorupi.png b/src/canonical/minisprites/gen5/pokemon/0451-000-Skorupi.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0451--000--Skorupi.png
rename to src/canonical/minisprites/gen5/pokemon/0451-000-Skorupi.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0452--000--Drapion.png b/src/canonical/minisprites/gen5/pokemon/0452-000-Drapion.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0452--000--Drapion.png
rename to src/canonical/minisprites/gen5/pokemon/0452-000-Drapion.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0453--000--Croagunk.png b/src/canonical/minisprites/gen5/pokemon/0453-000-Croagunk.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0453--000--Croagunk.png
rename to src/canonical/minisprites/gen5/pokemon/0453-000-Croagunk.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0454--000--Toxicroak.png b/src/canonical/minisprites/gen5/pokemon/0454-000-Toxicroak.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0454--000--Toxicroak.png
rename to src/canonical/minisprites/gen5/pokemon/0454-000-Toxicroak.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0455--000--Carnivine.png b/src/canonical/minisprites/gen5/pokemon/0455-000-Carnivine.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0455--000--Carnivine.png
rename to src/canonical/minisprites/gen5/pokemon/0455-000-Carnivine.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0456--000--Finneon.png b/src/canonical/minisprites/gen5/pokemon/0456-000-Finneon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0456--000--Finneon.png
rename to src/canonical/minisprites/gen5/pokemon/0456-000-Finneon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0457--000--Lumineon.png b/src/canonical/minisprites/gen5/pokemon/0457-000-Lumineon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0457--000--Lumineon.png
rename to src/canonical/minisprites/gen5/pokemon/0457-000-Lumineon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0458--000--Mantyke.png b/src/canonical/minisprites/gen5/pokemon/0458-000-Mantyke.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0458--000--Mantyke.png
rename to src/canonical/minisprites/gen5/pokemon/0458-000-Mantyke.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0459--000--Snover.png b/src/canonical/minisprites/gen5/pokemon/0459-000-Snover.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0459--000--Snover.png
rename to src/canonical/minisprites/gen5/pokemon/0459-000-Snover.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0460--000--Abomasnow.png b/src/canonical/minisprites/gen5/pokemon/0460-000-Abomasnow.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0460--000--Abomasnow.png
rename to src/canonical/minisprites/gen5/pokemon/0460-000-Abomasnow.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0461--000--Weavile.png b/src/canonical/minisprites/gen5/pokemon/0461-000-Weavile.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0461--000--Weavile.png
rename to src/canonical/minisprites/gen5/pokemon/0461-000-Weavile.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0462--000--Magnezone.png b/src/canonical/minisprites/gen5/pokemon/0462-000-Magnezone.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0462--000--Magnezone.png
rename to src/canonical/minisprites/gen5/pokemon/0462-000-Magnezone.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0463--000--Lickilicky.png b/src/canonical/minisprites/gen5/pokemon/0463-000-Lickilicky.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0463--000--Lickilicky.png
rename to src/canonical/minisprites/gen5/pokemon/0463-000-Lickilicky.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0464--000--Rhyperior.png b/src/canonical/minisprites/gen5/pokemon/0464-000-Rhyperior.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0464--000--Rhyperior.png
rename to src/canonical/minisprites/gen5/pokemon/0464-000-Rhyperior.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0465--000--Tangrowth.png b/src/canonical/minisprites/gen5/pokemon/0465-000-Tangrowth.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0465--000--Tangrowth.png
rename to src/canonical/minisprites/gen5/pokemon/0465-000-Tangrowth.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0466--000--Electivire.png b/src/canonical/minisprites/gen5/pokemon/0466-000-Electivire.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0466--000--Electivire.png
rename to src/canonical/minisprites/gen5/pokemon/0466-000-Electivire.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0467--000--Magmortar.png b/src/canonical/minisprites/gen5/pokemon/0467-000-Magmortar.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0467--000--Magmortar.png
rename to src/canonical/minisprites/gen5/pokemon/0467-000-Magmortar.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0468--000--Togekiss.png b/src/canonical/minisprites/gen5/pokemon/0468-000-Togekiss.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0468--000--Togekiss.png
rename to src/canonical/minisprites/gen5/pokemon/0468-000-Togekiss.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0469--000--Yanmega.png b/src/canonical/minisprites/gen5/pokemon/0469-000-Yanmega.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0469--000--Yanmega.png
rename to src/canonical/minisprites/gen5/pokemon/0469-000-Yanmega.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0470--000--Leafeon.png b/src/canonical/minisprites/gen5/pokemon/0470-000-Leafeon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0470--000--Leafeon.png
rename to src/canonical/minisprites/gen5/pokemon/0470-000-Leafeon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0471--000--Glaceon.png b/src/canonical/minisprites/gen5/pokemon/0471-000-Glaceon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0471--000--Glaceon.png
rename to src/canonical/minisprites/gen5/pokemon/0471-000-Glaceon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0472--000--Gliscor.png b/src/canonical/minisprites/gen5/pokemon/0472-000-Gliscor.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0472--000--Gliscor.png
rename to src/canonical/minisprites/gen5/pokemon/0472-000-Gliscor.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0473--000--Mamoswine.png b/src/canonical/minisprites/gen5/pokemon/0473-000-Mamoswine.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0473--000--Mamoswine.png
rename to src/canonical/minisprites/gen5/pokemon/0473-000-Mamoswine.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0474--000--Porygon-Z.png b/src/canonical/minisprites/gen5/pokemon/0474-000-Porygon~Z.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0474--000--Porygon-Z.png
rename to src/canonical/minisprites/gen5/pokemon/0474-000-Porygon~Z.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0475--000--Gallade.png b/src/canonical/minisprites/gen5/pokemon/0475-000-Gallade.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0475--000--Gallade.png
rename to src/canonical/minisprites/gen5/pokemon/0475-000-Gallade.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0476--000--Probopass.png b/src/canonical/minisprites/gen5/pokemon/0476-000-Probopass.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0476--000--Probopass.png
rename to src/canonical/minisprites/gen5/pokemon/0476-000-Probopass.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0477--000--Dusknoir.png b/src/canonical/minisprites/gen5/pokemon/0477-000-Dusknoir.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0477--000--Dusknoir.png
rename to src/canonical/minisprites/gen5/pokemon/0477-000-Dusknoir.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0478--000--Froslass.png b/src/canonical/minisprites/gen5/pokemon/0478-000-Froslass.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0478--000--Froslass.png
rename to src/canonical/minisprites/gen5/pokemon/0478-000-Froslass.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0479--000--Rotom.png b/src/canonical/minisprites/gen5/pokemon/0479-000-Rotom.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0479--000--Rotom.png
rename to src/canonical/minisprites/gen5/pokemon/0479-000-Rotom.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0479--420--Rotom--Fan.png b/src/canonical/minisprites/gen5/pokemon/0479-420-Rotom-Fan.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0479--420--Rotom--Fan.png
rename to src/canonical/minisprites/gen5/pokemon/0479-420-Rotom-Fan.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0479--420--Rotom--Frost.png b/src/canonical/minisprites/gen5/pokemon/0479-420-Rotom-Frost.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0479--420--Rotom--Frost.png
rename to src/canonical/minisprites/gen5/pokemon/0479-420-Rotom-Frost.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0479--420--Rotom--Heat.png b/src/canonical/minisprites/gen5/pokemon/0479-420-Rotom-Heat.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0479--420--Rotom--Heat.png
rename to src/canonical/minisprites/gen5/pokemon/0479-420-Rotom-Heat.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0479--420--Rotom--Mow.png b/src/canonical/minisprites/gen5/pokemon/0479-420-Rotom-Mow.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0479--420--Rotom--Mow.png
rename to src/canonical/minisprites/gen5/pokemon/0479-420-Rotom-Mow.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0479--420--Rotom--Wash.png b/src/canonical/minisprites/gen5/pokemon/0479-420-Rotom-Wash.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0479--420--Rotom--Wash.png
rename to src/canonical/minisprites/gen5/pokemon/0479-420-Rotom-Wash.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0480--000--Uxie.png b/src/canonical/minisprites/gen5/pokemon/0480-000-Uxie.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0480--000--Uxie.png
rename to src/canonical/minisprites/gen5/pokemon/0480-000-Uxie.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0481--000--Mesprit.png b/src/canonical/minisprites/gen5/pokemon/0481-000-Mesprit.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0481--000--Mesprit.png
rename to src/canonical/minisprites/gen5/pokemon/0481-000-Mesprit.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0482--000--Azelf.png b/src/canonical/minisprites/gen5/pokemon/0482-000-Azelf.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0482--000--Azelf.png
rename to src/canonical/minisprites/gen5/pokemon/0482-000-Azelf.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0483--000--Dialga.png b/src/canonical/minisprites/gen5/pokemon/0483-000-Dialga.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0483--000--Dialga.png
rename to src/canonical/minisprites/gen5/pokemon/0483-000-Dialga.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0484--000--Palkia.png b/src/canonical/minisprites/gen5/pokemon/0484-000-Palkia.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0484--000--Palkia.png
rename to src/canonical/minisprites/gen5/pokemon/0484-000-Palkia.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0485--000--Heatran.png b/src/canonical/minisprites/gen5/pokemon/0485-000-Heatran.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0485--000--Heatran.png
rename to src/canonical/minisprites/gen5/pokemon/0485-000-Heatran.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0486--000--Regigigas.png b/src/canonical/minisprites/gen5/pokemon/0486-000-Regigigas.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0486--000--Regigigas.png
rename to src/canonical/minisprites/gen5/pokemon/0486-000-Regigigas.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0487--000--Giratina.png b/src/canonical/minisprites/gen5/pokemon/0487-000-Giratina.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0487--000--Giratina.png
rename to src/canonical/minisprites/gen5/pokemon/0487-000-Giratina.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0487--420--Giratina--Origin.png b/src/canonical/minisprites/gen5/pokemon/0487-420-Giratina-Origin.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0487--420--Giratina--Origin.png
rename to src/canonical/minisprites/gen5/pokemon/0487-420-Giratina-Origin.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0488--000--Cresselia.png b/src/canonical/minisprites/gen5/pokemon/0488-000-Cresselia.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0488--000--Cresselia.png
rename to src/canonical/minisprites/gen5/pokemon/0488-000-Cresselia.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0489--000--Phione.png b/src/canonical/minisprites/gen5/pokemon/0489-000-Phione.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0489--000--Phione.png
rename to src/canonical/minisprites/gen5/pokemon/0489-000-Phione.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0490--000--Manaphy.png b/src/canonical/minisprites/gen5/pokemon/0490-000-Manaphy.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0490--000--Manaphy.png
rename to src/canonical/minisprites/gen5/pokemon/0490-000-Manaphy.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0491--000--Darkrai.png b/src/canonical/minisprites/gen5/pokemon/0491-000-Darkrai.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0491--000--Darkrai.png
rename to src/canonical/minisprites/gen5/pokemon/0491-000-Darkrai.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0492--000--Shaymin.png b/src/canonical/minisprites/gen5/pokemon/0492-000-Shaymin.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0492--000--Shaymin.png
rename to src/canonical/minisprites/gen5/pokemon/0492-000-Shaymin.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0492--420--Shaymin--Sky.png b/src/canonical/minisprites/gen5/pokemon/0492-420-Shaymin-Sky.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0492--420--Shaymin--Sky.png
rename to src/canonical/minisprites/gen5/pokemon/0492-420-Shaymin-Sky.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0493--000--Arceus.png b/src/canonical/minisprites/gen5/pokemon/0493-000-Arceus.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0493--000--Arceus.png
rename to src/canonical/minisprites/gen5/pokemon/0493-000-Arceus.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0494--000--Victini.png b/src/canonical/minisprites/gen5/pokemon/0494-000-Victini.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0494--000--Victini.png
rename to src/canonical/minisprites/gen5/pokemon/0494-000-Victini.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0495--000--Snivy.png b/src/canonical/minisprites/gen5/pokemon/0495-000-Snivy.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0495--000--Snivy.png
rename to src/canonical/minisprites/gen5/pokemon/0495-000-Snivy.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0496--000--Servine.png b/src/canonical/minisprites/gen5/pokemon/0496-000-Servine.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0496--000--Servine.png
rename to src/canonical/minisprites/gen5/pokemon/0496-000-Servine.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0497--000--Serperior.png b/src/canonical/minisprites/gen5/pokemon/0497-000-Serperior.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0497--000--Serperior.png
rename to src/canonical/minisprites/gen5/pokemon/0497-000-Serperior.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0498--000--Tepig.png b/src/canonical/minisprites/gen5/pokemon/0498-000-Tepig.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0498--000--Tepig.png
rename to src/canonical/minisprites/gen5/pokemon/0498-000-Tepig.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0499--000--Pignite.png b/src/canonical/minisprites/gen5/pokemon/0499-000-Pignite.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0499--000--Pignite.png
rename to src/canonical/minisprites/gen5/pokemon/0499-000-Pignite.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0500--000--Emboar.png b/src/canonical/minisprites/gen5/pokemon/0500-000-Emboar.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0500--000--Emboar.png
rename to src/canonical/minisprites/gen5/pokemon/0500-000-Emboar.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0501--000--Oshawott.png b/src/canonical/minisprites/gen5/pokemon/0501-000-Oshawott.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0501--000--Oshawott.png
rename to src/canonical/minisprites/gen5/pokemon/0501-000-Oshawott.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0502--000--Dewott.png b/src/canonical/minisprites/gen5/pokemon/0502-000-Dewott.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0502--000--Dewott.png
rename to src/canonical/minisprites/gen5/pokemon/0502-000-Dewott.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0503--000--Samurott.png b/src/canonical/minisprites/gen5/pokemon/0503-000-Samurott.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0503--000--Samurott.png
rename to src/canonical/minisprites/gen5/pokemon/0503-000-Samurott.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0504--000--Patrat.png b/src/canonical/minisprites/gen5/pokemon/0504-000-Patrat.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0504--000--Patrat.png
rename to src/canonical/minisprites/gen5/pokemon/0504-000-Patrat.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0505--000--Watchog.png b/src/canonical/minisprites/gen5/pokemon/0505-000-Watchog.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0505--000--Watchog.png
rename to src/canonical/minisprites/gen5/pokemon/0505-000-Watchog.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0506--000--Lillipup.png b/src/canonical/minisprites/gen5/pokemon/0506-000-Lillipup.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0506--000--Lillipup.png
rename to src/canonical/minisprites/gen5/pokemon/0506-000-Lillipup.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0507--000--Herdier.png b/src/canonical/minisprites/gen5/pokemon/0507-000-Herdier.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0507--000--Herdier.png
rename to src/canonical/minisprites/gen5/pokemon/0507-000-Herdier.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0508--000--Stoutland.png b/src/canonical/minisprites/gen5/pokemon/0508-000-Stoutland.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0508--000--Stoutland.png
rename to src/canonical/minisprites/gen5/pokemon/0508-000-Stoutland.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0509--000--Purrloin.png b/src/canonical/minisprites/gen5/pokemon/0509-000-Purrloin.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0509--000--Purrloin.png
rename to src/canonical/minisprites/gen5/pokemon/0509-000-Purrloin.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0510--000--Liepard.png b/src/canonical/minisprites/gen5/pokemon/0510-000-Liepard.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0510--000--Liepard.png
rename to src/canonical/minisprites/gen5/pokemon/0510-000-Liepard.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0511--000--Pansage.png b/src/canonical/minisprites/gen5/pokemon/0511-000-Pansage.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0511--000--Pansage.png
rename to src/canonical/minisprites/gen5/pokemon/0511-000-Pansage.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0512--000--Simisage.png b/src/canonical/minisprites/gen5/pokemon/0512-000-Simisage.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0512--000--Simisage.png
rename to src/canonical/minisprites/gen5/pokemon/0512-000-Simisage.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0513--000--Pansear.png b/src/canonical/minisprites/gen5/pokemon/0513-000-Pansear.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0513--000--Pansear.png
rename to src/canonical/minisprites/gen5/pokemon/0513-000-Pansear.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0514--000--Simisear.png b/src/canonical/minisprites/gen5/pokemon/0514-000-Simisear.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0514--000--Simisear.png
rename to src/canonical/minisprites/gen5/pokemon/0514-000-Simisear.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0515--000--Panpour.png b/src/canonical/minisprites/gen5/pokemon/0515-000-Panpour.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0515--000--Panpour.png
rename to src/canonical/minisprites/gen5/pokemon/0515-000-Panpour.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0516--000--Simipour.png b/src/canonical/minisprites/gen5/pokemon/0516-000-Simipour.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0516--000--Simipour.png
rename to src/canonical/minisprites/gen5/pokemon/0516-000-Simipour.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0517--000--Munna.png b/src/canonical/minisprites/gen5/pokemon/0517-000-Munna.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0517--000--Munna.png
rename to src/canonical/minisprites/gen5/pokemon/0517-000-Munna.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0518--000--Musharna.png b/src/canonical/minisprites/gen5/pokemon/0518-000-Musharna.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0518--000--Musharna.png
rename to src/canonical/minisprites/gen5/pokemon/0518-000-Musharna.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0519--000--Pidove.png b/src/canonical/minisprites/gen5/pokemon/0519-000-Pidove.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0519--000--Pidove.png
rename to src/canonical/minisprites/gen5/pokemon/0519-000-Pidove.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0520--000--Tranquill.png b/src/canonical/minisprites/gen5/pokemon/0520-000-Tranquill.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0520--000--Tranquill.png
rename to src/canonical/minisprites/gen5/pokemon/0520-000-Tranquill.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0521--000--Unfezant--Female.png b/src/canonical/minisprites/gen5/pokemon/0521-000-Unfezant-Female.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0521--000--Unfezant--Female.png
rename to src/canonical/minisprites/gen5/pokemon/0521-000-Unfezant-Female.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0521--000--Unfezant.png b/src/canonical/minisprites/gen5/pokemon/0521-000-Unfezant.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0521--000--Unfezant.png
rename to src/canonical/minisprites/gen5/pokemon/0521-000-Unfezant.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0522--000--Blitzle.png b/src/canonical/minisprites/gen5/pokemon/0522-000-Blitzle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0522--000--Blitzle.png
rename to src/canonical/minisprites/gen5/pokemon/0522-000-Blitzle.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0523--000--Zebstrika.png b/src/canonical/minisprites/gen5/pokemon/0523-000-Zebstrika.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0523--000--Zebstrika.png
rename to src/canonical/minisprites/gen5/pokemon/0523-000-Zebstrika.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0524--000--Roggenrola.png b/src/canonical/minisprites/gen5/pokemon/0524-000-Roggenrola.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0524--000--Roggenrola.png
rename to src/canonical/minisprites/gen5/pokemon/0524-000-Roggenrola.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0525--000--Boldore.png b/src/canonical/minisprites/gen5/pokemon/0525-000-Boldore.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0525--000--Boldore.png
rename to src/canonical/minisprites/gen5/pokemon/0525-000-Boldore.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0526--000--Gigalith.png b/src/canonical/minisprites/gen5/pokemon/0526-000-Gigalith.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0526--000--Gigalith.png
rename to src/canonical/minisprites/gen5/pokemon/0526-000-Gigalith.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0527--000--Woobat.png b/src/canonical/minisprites/gen5/pokemon/0527-000-Woobat.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0527--000--Woobat.png
rename to src/canonical/minisprites/gen5/pokemon/0527-000-Woobat.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0528--000--Swoobat.png b/src/canonical/minisprites/gen5/pokemon/0528-000-Swoobat.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0528--000--Swoobat.png
rename to src/canonical/minisprites/gen5/pokemon/0528-000-Swoobat.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0529--000--Drilbur.png b/src/canonical/minisprites/gen5/pokemon/0529-000-Drilbur.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0529--000--Drilbur.png
rename to src/canonical/minisprites/gen5/pokemon/0529-000-Drilbur.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0530--000--Excadrill.png b/src/canonical/minisprites/gen5/pokemon/0530-000-Excadrill.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0530--000--Excadrill.png
rename to src/canonical/minisprites/gen5/pokemon/0530-000-Excadrill.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0531--000--Audino.png b/src/canonical/minisprites/gen5/pokemon/0531-000-Audino.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0531--000--Audino.png
rename to src/canonical/minisprites/gen5/pokemon/0531-000-Audino.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0532--000--Timburr.png b/src/canonical/minisprites/gen5/pokemon/0532-000-Timburr.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0532--000--Timburr.png
rename to src/canonical/minisprites/gen5/pokemon/0532-000-Timburr.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0533--000--Gurdurr.png b/src/canonical/minisprites/gen5/pokemon/0533-000-Gurdurr.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0533--000--Gurdurr.png
rename to src/canonical/minisprites/gen5/pokemon/0533-000-Gurdurr.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0534--000--Conkeldurr.png b/src/canonical/minisprites/gen5/pokemon/0534-000-Conkeldurr.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0534--000--Conkeldurr.png
rename to src/canonical/minisprites/gen5/pokemon/0534-000-Conkeldurr.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0535--000--Tympole.png b/src/canonical/minisprites/gen5/pokemon/0535-000-Tympole.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0535--000--Tympole.png
rename to src/canonical/minisprites/gen5/pokemon/0535-000-Tympole.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0536--000--Palpitoad.png b/src/canonical/minisprites/gen5/pokemon/0536-000-Palpitoad.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0536--000--Palpitoad.png
rename to src/canonical/minisprites/gen5/pokemon/0536-000-Palpitoad.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0537--000--Seismitoad.png b/src/canonical/minisprites/gen5/pokemon/0537-000-Seismitoad.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0537--000--Seismitoad.png
rename to src/canonical/minisprites/gen5/pokemon/0537-000-Seismitoad.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0538--000--Throh.png b/src/canonical/minisprites/gen5/pokemon/0538-000-Throh.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0538--000--Throh.png
rename to src/canonical/minisprites/gen5/pokemon/0538-000-Throh.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0539--000--Sawk.png b/src/canonical/minisprites/gen5/pokemon/0539-000-Sawk.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0539--000--Sawk.png
rename to src/canonical/minisprites/gen5/pokemon/0539-000-Sawk.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0540--000--Sewaddle.png b/src/canonical/minisprites/gen5/pokemon/0540-000-Sewaddle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0540--000--Sewaddle.png
rename to src/canonical/minisprites/gen5/pokemon/0540-000-Sewaddle.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0541--000--Swadloon.png b/src/canonical/minisprites/gen5/pokemon/0541-000-Swadloon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0541--000--Swadloon.png
rename to src/canonical/minisprites/gen5/pokemon/0541-000-Swadloon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0542--000--Leavanny.png b/src/canonical/minisprites/gen5/pokemon/0542-000-Leavanny.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0542--000--Leavanny.png
rename to src/canonical/minisprites/gen5/pokemon/0542-000-Leavanny.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0543--000--Venipede.png b/src/canonical/minisprites/gen5/pokemon/0543-000-Venipede.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0543--000--Venipede.png
rename to src/canonical/minisprites/gen5/pokemon/0543-000-Venipede.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0544--000--Whirlipede.png b/src/canonical/minisprites/gen5/pokemon/0544-000-Whirlipede.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0544--000--Whirlipede.png
rename to src/canonical/minisprites/gen5/pokemon/0544-000-Whirlipede.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0545--000--Scolipede.png b/src/canonical/minisprites/gen5/pokemon/0545-000-Scolipede.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0545--000--Scolipede.png
rename to src/canonical/minisprites/gen5/pokemon/0545-000-Scolipede.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0546--000--Cottonee.png b/src/canonical/minisprites/gen5/pokemon/0546-000-Cottonee.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0546--000--Cottonee.png
rename to src/canonical/minisprites/gen5/pokemon/0546-000-Cottonee.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0547--000--Whimsicott.png b/src/canonical/minisprites/gen5/pokemon/0547-000-Whimsicott.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0547--000--Whimsicott.png
rename to src/canonical/minisprites/gen5/pokemon/0547-000-Whimsicott.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0548--000--Petilil.png b/src/canonical/minisprites/gen5/pokemon/0548-000-Petilil.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0548--000--Petilil.png
rename to src/canonical/minisprites/gen5/pokemon/0548-000-Petilil.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0549--000--Lilligant.png b/src/canonical/minisprites/gen5/pokemon/0549-000-Lilligant.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0549--000--Lilligant.png
rename to src/canonical/minisprites/gen5/pokemon/0549-000-Lilligant.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0550--000--Basculin.png b/src/canonical/minisprites/gen5/pokemon/0550-000-Basculin.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0550--000--Basculin.png
rename to src/canonical/minisprites/gen5/pokemon/0550-000-Basculin.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0550--420--Basculin--Blue-Striped.png b/src/canonical/minisprites/gen5/pokemon/0550-420-Basculin-Blue~Striped.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0550--420--Basculin--Blue-Striped.png
rename to src/canonical/minisprites/gen5/pokemon/0550-420-Basculin-Blue~Striped.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0551--000--Sandile.png b/src/canonical/minisprites/gen5/pokemon/0551-000-Sandile.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0551--000--Sandile.png
rename to src/canonical/minisprites/gen5/pokemon/0551-000-Sandile.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0552--000--Krokorok.png b/src/canonical/minisprites/gen5/pokemon/0552-000-Krokorok.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0552--000--Krokorok.png
rename to src/canonical/minisprites/gen5/pokemon/0552-000-Krokorok.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0553--000--Krookodile.png b/src/canonical/minisprites/gen5/pokemon/0553-000-Krookodile.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0553--000--Krookodile.png
rename to src/canonical/minisprites/gen5/pokemon/0553-000-Krookodile.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0554--000--Darumaka.png b/src/canonical/minisprites/gen5/pokemon/0554-000-Darumaka.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0554--000--Darumaka.png
rename to src/canonical/minisprites/gen5/pokemon/0554-000-Darumaka.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0555--000--Darmanitan.png b/src/canonical/minisprites/gen5/pokemon/0555-000-Darmanitan.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0555--000--Darmanitan.png
rename to src/canonical/minisprites/gen5/pokemon/0555-000-Darmanitan.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0555--420--Darmanitan--Zen.png b/src/canonical/minisprites/gen5/pokemon/0555-420-Darmanitan-Zen.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0555--420--Darmanitan--Zen.png
rename to src/canonical/minisprites/gen5/pokemon/0555-420-Darmanitan-Zen.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0556--000--Maractus.png b/src/canonical/minisprites/gen5/pokemon/0556-000-Maractus.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0556--000--Maractus.png
rename to src/canonical/minisprites/gen5/pokemon/0556-000-Maractus.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0557--000--Dwebble.png b/src/canonical/minisprites/gen5/pokemon/0557-000-Dwebble.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0557--000--Dwebble.png
rename to src/canonical/minisprites/gen5/pokemon/0557-000-Dwebble.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0558--000--Crustle.png b/src/canonical/minisprites/gen5/pokemon/0558-000-Crustle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0558--000--Crustle.png
rename to src/canonical/minisprites/gen5/pokemon/0558-000-Crustle.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0559--000--Scraggy.png b/src/canonical/minisprites/gen5/pokemon/0559-000-Scraggy.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0559--000--Scraggy.png
rename to src/canonical/minisprites/gen5/pokemon/0559-000-Scraggy.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0560--000--Scrafty.png b/src/canonical/minisprites/gen5/pokemon/0560-000-Scrafty.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0560--000--Scrafty.png
rename to src/canonical/minisprites/gen5/pokemon/0560-000-Scrafty.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0561--000--Sigilyph.png b/src/canonical/minisprites/gen5/pokemon/0561-000-Sigilyph.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0561--000--Sigilyph.png
rename to src/canonical/minisprites/gen5/pokemon/0561-000-Sigilyph.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0562--000--Yamask.png b/src/canonical/minisprites/gen5/pokemon/0562-000-Yamask.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0562--000--Yamask.png
rename to src/canonical/minisprites/gen5/pokemon/0562-000-Yamask.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0563--000--Cofagrigus.png b/src/canonical/minisprites/gen5/pokemon/0563-000-Cofagrigus.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0563--000--Cofagrigus.png
rename to src/canonical/minisprites/gen5/pokemon/0563-000-Cofagrigus.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0564--000--Tirtouga.png b/src/canonical/minisprites/gen5/pokemon/0564-000-Tirtouga.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0564--000--Tirtouga.png
rename to src/canonical/minisprites/gen5/pokemon/0564-000-Tirtouga.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0565--000--Carracosta.png b/src/canonical/minisprites/gen5/pokemon/0565-000-Carracosta.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0565--000--Carracosta.png
rename to src/canonical/minisprites/gen5/pokemon/0565-000-Carracosta.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0566--000--Archen.png b/src/canonical/minisprites/gen5/pokemon/0566-000-Archen.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0566--000--Archen.png
rename to src/canonical/minisprites/gen5/pokemon/0566-000-Archen.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0567--000--Archeops.png b/src/canonical/minisprites/gen5/pokemon/0567-000-Archeops.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0567--000--Archeops.png
rename to src/canonical/minisprites/gen5/pokemon/0567-000-Archeops.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0568--000--Trubbish.png b/src/canonical/minisprites/gen5/pokemon/0568-000-Trubbish.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0568--000--Trubbish.png
rename to src/canonical/minisprites/gen5/pokemon/0568-000-Trubbish.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0569--000--Garbodor.png b/src/canonical/minisprites/gen5/pokemon/0569-000-Garbodor.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0569--000--Garbodor.png
rename to src/canonical/minisprites/gen5/pokemon/0569-000-Garbodor.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0570--000--Zorua.png b/src/canonical/minisprites/gen5/pokemon/0570-000-Zorua.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0570--000--Zorua.png
rename to src/canonical/minisprites/gen5/pokemon/0570-000-Zorua.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0571--000--Zoroark.png b/src/canonical/minisprites/gen5/pokemon/0571-000-Zoroark.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0571--000--Zoroark.png
rename to src/canonical/minisprites/gen5/pokemon/0571-000-Zoroark.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0572--000--Minccino.png b/src/canonical/minisprites/gen5/pokemon/0572-000-Minccino.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0572--000--Minccino.png
rename to src/canonical/minisprites/gen5/pokemon/0572-000-Minccino.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0573--000--Cinccino.png b/src/canonical/minisprites/gen5/pokemon/0573-000-Cinccino.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0573--000--Cinccino.png
rename to src/canonical/minisprites/gen5/pokemon/0573-000-Cinccino.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0574--000--Gothita.png b/src/canonical/minisprites/gen5/pokemon/0574-000-Gothita.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0574--000--Gothita.png
rename to src/canonical/minisprites/gen5/pokemon/0574-000-Gothita.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0575--000--Gothorita.png b/src/canonical/minisprites/gen5/pokemon/0575-000-Gothorita.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0575--000--Gothorita.png
rename to src/canonical/minisprites/gen5/pokemon/0575-000-Gothorita.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0576--000--Gothitelle.png b/src/canonical/minisprites/gen5/pokemon/0576-000-Gothitelle.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0576--000--Gothitelle.png
rename to src/canonical/minisprites/gen5/pokemon/0576-000-Gothitelle.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0577--000--Solosis.png b/src/canonical/minisprites/gen5/pokemon/0577-000-Solosis.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0577--000--Solosis.png
rename to src/canonical/minisprites/gen5/pokemon/0577-000-Solosis.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0578--000--Duosion.png b/src/canonical/minisprites/gen5/pokemon/0578-000-Duosion.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0578--000--Duosion.png
rename to src/canonical/minisprites/gen5/pokemon/0578-000-Duosion.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0579--000--Reuniclus.png b/src/canonical/minisprites/gen5/pokemon/0579-000-Reuniclus.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0579--000--Reuniclus.png
rename to src/canonical/minisprites/gen5/pokemon/0579-000-Reuniclus.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0580--000--Ducklett.png b/src/canonical/minisprites/gen5/pokemon/0580-000-Ducklett.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0580--000--Ducklett.png
rename to src/canonical/minisprites/gen5/pokemon/0580-000-Ducklett.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0581--000--Swanna.png b/src/canonical/minisprites/gen5/pokemon/0581-000-Swanna.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0581--000--Swanna.png
rename to src/canonical/minisprites/gen5/pokemon/0581-000-Swanna.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0582--000--Vanillite.png b/src/canonical/minisprites/gen5/pokemon/0582-000-Vanillite.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0582--000--Vanillite.png
rename to src/canonical/minisprites/gen5/pokemon/0582-000-Vanillite.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0583--000--Vanillish.png b/src/canonical/minisprites/gen5/pokemon/0583-000-Vanillish.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0583--000--Vanillish.png
rename to src/canonical/minisprites/gen5/pokemon/0583-000-Vanillish.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0584--000--Vanilluxe.png b/src/canonical/minisprites/gen5/pokemon/0584-000-Vanilluxe.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0584--000--Vanilluxe.png
rename to src/canonical/minisprites/gen5/pokemon/0584-000-Vanilluxe.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0585--000--Deerling.png b/src/canonical/minisprites/gen5/pokemon/0585-000-Deerling.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0585--000--Deerling.png
rename to src/canonical/minisprites/gen5/pokemon/0585-000-Deerling.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0585--420--Deerling--Autumn.png b/src/canonical/minisprites/gen5/pokemon/0585-420-Deerling-Autumn.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0585--420--Deerling--Autumn.png
rename to src/canonical/minisprites/gen5/pokemon/0585-420-Deerling-Autumn.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0585--420--Deerling--Summer.png b/src/canonical/minisprites/gen5/pokemon/0585-420-Deerling-Summer.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0585--420--Deerling--Summer.png
rename to src/canonical/minisprites/gen5/pokemon/0585-420-Deerling-Summer.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0585--420--Deerling--Winter.png b/src/canonical/minisprites/gen5/pokemon/0585-420-Deerling-Winter.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0585--420--Deerling--Winter.png
rename to src/canonical/minisprites/gen5/pokemon/0585-420-Deerling-Winter.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0586--000--Sawsbuck.png b/src/canonical/minisprites/gen5/pokemon/0586-000-Sawsbuck.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0586--000--Sawsbuck.png
rename to src/canonical/minisprites/gen5/pokemon/0586-000-Sawsbuck.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0586--420--Sawsbuck--Autumn.png b/src/canonical/minisprites/gen5/pokemon/0586-420-Sawsbuck-Autumn.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0586--420--Sawsbuck--Autumn.png
rename to src/canonical/minisprites/gen5/pokemon/0586-420-Sawsbuck-Autumn.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0586--420--Sawsbuck--Summer.png b/src/canonical/minisprites/gen5/pokemon/0586-420-Sawsbuck-Summer.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0586--420--Sawsbuck--Summer.png
rename to src/canonical/minisprites/gen5/pokemon/0586-420-Sawsbuck-Summer.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0586--420--Sawsbuck--Winter.png b/src/canonical/minisprites/gen5/pokemon/0586-420-Sawsbuck-Winter.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0586--420--Sawsbuck--Winter.png
rename to src/canonical/minisprites/gen5/pokemon/0586-420-Sawsbuck-Winter.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0587--000--Emolga.png b/src/canonical/minisprites/gen5/pokemon/0587-000-Emolga.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0587--000--Emolga.png
rename to src/canonical/minisprites/gen5/pokemon/0587-000-Emolga.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0588--000--Karrablast.png b/src/canonical/minisprites/gen5/pokemon/0588-000-Karrablast.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0588--000--Karrablast.png
rename to src/canonical/minisprites/gen5/pokemon/0588-000-Karrablast.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0589--000--Escavalier.png b/src/canonical/minisprites/gen5/pokemon/0589-000-Escavalier.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0589--000--Escavalier.png
rename to src/canonical/minisprites/gen5/pokemon/0589-000-Escavalier.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0590--000--Foongus.png b/src/canonical/minisprites/gen5/pokemon/0590-000-Foongus.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0590--000--Foongus.png
rename to src/canonical/minisprites/gen5/pokemon/0590-000-Foongus.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0591--000--Amoonguss.png b/src/canonical/minisprites/gen5/pokemon/0591-000-Amoonguss.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0591--000--Amoonguss.png
rename to src/canonical/minisprites/gen5/pokemon/0591-000-Amoonguss.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0592--000--Frillish--Female.png b/src/canonical/minisprites/gen5/pokemon/0592-000-Frillish-Female.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0592--000--Frillish--Female.png
rename to src/canonical/minisprites/gen5/pokemon/0592-000-Frillish-Female.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0592--000--Frillish.png b/src/canonical/minisprites/gen5/pokemon/0592-000-Frillish.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0592--000--Frillish.png
rename to src/canonical/minisprites/gen5/pokemon/0592-000-Frillish.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0593--000--Jellicent--Female.png b/src/canonical/minisprites/gen5/pokemon/0593-000-Jellicent-Female.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0593--000--Jellicent--Female.png
rename to src/canonical/minisprites/gen5/pokemon/0593-000-Jellicent-Female.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0593--000--Jellicent.png b/src/canonical/minisprites/gen5/pokemon/0593-000-Jellicent.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0593--000--Jellicent.png
rename to src/canonical/minisprites/gen5/pokemon/0593-000-Jellicent.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0594--000--Alomomola.png b/src/canonical/minisprites/gen5/pokemon/0594-000-Alomomola.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0594--000--Alomomola.png
rename to src/canonical/minisprites/gen5/pokemon/0594-000-Alomomola.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0595--000--Joltik.png b/src/canonical/minisprites/gen5/pokemon/0595-000-Joltik.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0595--000--Joltik.png
rename to src/canonical/minisprites/gen5/pokemon/0595-000-Joltik.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0596--000--Galvantula.png b/src/canonical/minisprites/gen5/pokemon/0596-000-Galvantula.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0596--000--Galvantula.png
rename to src/canonical/minisprites/gen5/pokemon/0596-000-Galvantula.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0597--000--Ferroseed.png b/src/canonical/minisprites/gen5/pokemon/0597-000-Ferroseed.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0597--000--Ferroseed.png
rename to src/canonical/minisprites/gen5/pokemon/0597-000-Ferroseed.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0598--000--Ferrothorn.png b/src/canonical/minisprites/gen5/pokemon/0598-000-Ferrothorn.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0598--000--Ferrothorn.png
rename to src/canonical/minisprites/gen5/pokemon/0598-000-Ferrothorn.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0599--000--Klink.png b/src/canonical/minisprites/gen5/pokemon/0599-000-Klink.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0599--000--Klink.png
rename to src/canonical/minisprites/gen5/pokemon/0599-000-Klink.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0600--000--Klang.png b/src/canonical/minisprites/gen5/pokemon/0600-000-Klang.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0600--000--Klang.png
rename to src/canonical/minisprites/gen5/pokemon/0600-000-Klang.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0601--000--Klinklang.png b/src/canonical/minisprites/gen5/pokemon/0601-000-Klinklang.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0601--000--Klinklang.png
rename to src/canonical/minisprites/gen5/pokemon/0601-000-Klinklang.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0602--000--Tynamo.png b/src/canonical/minisprites/gen5/pokemon/0602-000-Tynamo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0602--000--Tynamo.png
rename to src/canonical/minisprites/gen5/pokemon/0602-000-Tynamo.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0603--000--Eelektrik.png b/src/canonical/minisprites/gen5/pokemon/0603-000-Eelektrik.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0603--000--Eelektrik.png
rename to src/canonical/minisprites/gen5/pokemon/0603-000-Eelektrik.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0604--000--Eelektross.png b/src/canonical/minisprites/gen5/pokemon/0604-000-Eelektross.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0604--000--Eelektross.png
rename to src/canonical/minisprites/gen5/pokemon/0604-000-Eelektross.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0605--000--Elgyem.png b/src/canonical/minisprites/gen5/pokemon/0605-000-Elgyem.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0605--000--Elgyem.png
rename to src/canonical/minisprites/gen5/pokemon/0605-000-Elgyem.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0606--000--Beheeyem.png b/src/canonical/minisprites/gen5/pokemon/0606-000-Beheeyem.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0606--000--Beheeyem.png
rename to src/canonical/minisprites/gen5/pokemon/0606-000-Beheeyem.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0607--000--Litwick.png b/src/canonical/minisprites/gen5/pokemon/0607-000-Litwick.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0607--000--Litwick.png
rename to src/canonical/minisprites/gen5/pokemon/0607-000-Litwick.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0608--000--Lampent.png b/src/canonical/minisprites/gen5/pokemon/0608-000-Lampent.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0608--000--Lampent.png
rename to src/canonical/minisprites/gen5/pokemon/0608-000-Lampent.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0609--000--Chandelure.png b/src/canonical/minisprites/gen5/pokemon/0609-000-Chandelure.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0609--000--Chandelure.png
rename to src/canonical/minisprites/gen5/pokemon/0609-000-Chandelure.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0610--000--Axew.png b/src/canonical/minisprites/gen5/pokemon/0610-000-Axew.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0610--000--Axew.png
rename to src/canonical/minisprites/gen5/pokemon/0610-000-Axew.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0611--000--Fraxure.png b/src/canonical/minisprites/gen5/pokemon/0611-000-Fraxure.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0611--000--Fraxure.png
rename to src/canonical/minisprites/gen5/pokemon/0611-000-Fraxure.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0612--000--Haxorus.png b/src/canonical/minisprites/gen5/pokemon/0612-000-Haxorus.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0612--000--Haxorus.png
rename to src/canonical/minisprites/gen5/pokemon/0612-000-Haxorus.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0613--000--Cubchoo.png b/src/canonical/minisprites/gen5/pokemon/0613-000-Cubchoo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0613--000--Cubchoo.png
rename to src/canonical/minisprites/gen5/pokemon/0613-000-Cubchoo.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0614--000--Beartic.png b/src/canonical/minisprites/gen5/pokemon/0614-000-Beartic.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0614--000--Beartic.png
rename to src/canonical/minisprites/gen5/pokemon/0614-000-Beartic.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0615--000--Cryogonal.png b/src/canonical/minisprites/gen5/pokemon/0615-000-Cryogonal.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0615--000--Cryogonal.png
rename to src/canonical/minisprites/gen5/pokemon/0615-000-Cryogonal.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0616--000--Shelmet.png b/src/canonical/minisprites/gen5/pokemon/0616-000-Shelmet.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0616--000--Shelmet.png
rename to src/canonical/minisprites/gen5/pokemon/0616-000-Shelmet.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0617--000--Accelgor.png b/src/canonical/minisprites/gen5/pokemon/0617-000-Accelgor.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0617--000--Accelgor.png
rename to src/canonical/minisprites/gen5/pokemon/0617-000-Accelgor.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0618--000--Stunfisk.png b/src/canonical/minisprites/gen5/pokemon/0618-000-Stunfisk.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0618--000--Stunfisk.png
rename to src/canonical/minisprites/gen5/pokemon/0618-000-Stunfisk.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0619--000--Mienfoo.png b/src/canonical/minisprites/gen5/pokemon/0619-000-Mienfoo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0619--000--Mienfoo.png
rename to src/canonical/minisprites/gen5/pokemon/0619-000-Mienfoo.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0620--000--Mienshao.png b/src/canonical/minisprites/gen5/pokemon/0620-000-Mienshao.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0620--000--Mienshao.png
rename to src/canonical/minisprites/gen5/pokemon/0620-000-Mienshao.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0621--000--Druddigon.png b/src/canonical/minisprites/gen5/pokemon/0621-000-Druddigon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0621--000--Druddigon.png
rename to src/canonical/minisprites/gen5/pokemon/0621-000-Druddigon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0622--000--Golett.png b/src/canonical/minisprites/gen5/pokemon/0622-000-Golett.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0622--000--Golett.png
rename to src/canonical/minisprites/gen5/pokemon/0622-000-Golett.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0623--000--Golurk.png b/src/canonical/minisprites/gen5/pokemon/0623-000-Golurk.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0623--000--Golurk.png
rename to src/canonical/minisprites/gen5/pokemon/0623-000-Golurk.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0624--000--Pawniard.png b/src/canonical/minisprites/gen5/pokemon/0624-000-Pawniard.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0624--000--Pawniard.png
rename to src/canonical/minisprites/gen5/pokemon/0624-000-Pawniard.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0625--000--Bisharp.png b/src/canonical/minisprites/gen5/pokemon/0625-000-Bisharp.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0625--000--Bisharp.png
rename to src/canonical/minisprites/gen5/pokemon/0625-000-Bisharp.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0626--000--Bouffalant.png b/src/canonical/minisprites/gen5/pokemon/0626-000-Bouffalant.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0626--000--Bouffalant.png
rename to src/canonical/minisprites/gen5/pokemon/0626-000-Bouffalant.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0627--000--Rufflet.png b/src/canonical/minisprites/gen5/pokemon/0627-000-Rufflet.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0627--000--Rufflet.png
rename to src/canonical/minisprites/gen5/pokemon/0627-000-Rufflet.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0628--000--Braviary.png b/src/canonical/minisprites/gen5/pokemon/0628-000-Braviary.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0628--000--Braviary.png
rename to src/canonical/minisprites/gen5/pokemon/0628-000-Braviary.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0629--000--Vullaby.png b/src/canonical/minisprites/gen5/pokemon/0629-000-Vullaby.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0629--000--Vullaby.png
rename to src/canonical/minisprites/gen5/pokemon/0629-000-Vullaby.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0630--000--Mandibuzz.png b/src/canonical/minisprites/gen5/pokemon/0630-000-Mandibuzz.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0630--000--Mandibuzz.png
rename to src/canonical/minisprites/gen5/pokemon/0630-000-Mandibuzz.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0631--000--Heatmor.png b/src/canonical/minisprites/gen5/pokemon/0631-000-Heatmor.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0631--000--Heatmor.png
rename to src/canonical/minisprites/gen5/pokemon/0631-000-Heatmor.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0632--000--Durant.png b/src/canonical/minisprites/gen5/pokemon/0632-000-Durant.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0632--000--Durant.png
rename to src/canonical/minisprites/gen5/pokemon/0632-000-Durant.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0633--000--Deino.png b/src/canonical/minisprites/gen5/pokemon/0633-000-Deino.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0633--000--Deino.png
rename to src/canonical/minisprites/gen5/pokemon/0633-000-Deino.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0634--000--Zweilous.png b/src/canonical/minisprites/gen5/pokemon/0634-000-Zweilous.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0634--000--Zweilous.png
rename to src/canonical/minisprites/gen5/pokemon/0634-000-Zweilous.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0635--000--Hydreigon.png b/src/canonical/minisprites/gen5/pokemon/0635-000-Hydreigon.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0635--000--Hydreigon.png
rename to src/canonical/minisprites/gen5/pokemon/0635-000-Hydreigon.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0636--000--Larvesta.png b/src/canonical/minisprites/gen5/pokemon/0636-000-Larvesta.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0636--000--Larvesta.png
rename to src/canonical/minisprites/gen5/pokemon/0636-000-Larvesta.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0637--000--Volcarona.png b/src/canonical/minisprites/gen5/pokemon/0637-000-Volcarona.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0637--000--Volcarona.png
rename to src/canonical/minisprites/gen5/pokemon/0637-000-Volcarona.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0638--000--Cobalion.png b/src/canonical/minisprites/gen5/pokemon/0638-000-Cobalion.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0638--000--Cobalion.png
rename to src/canonical/minisprites/gen5/pokemon/0638-000-Cobalion.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0639--000--Terrakion.png b/src/canonical/minisprites/gen5/pokemon/0639-000-Terrakion.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0639--000--Terrakion.png
rename to src/canonical/minisprites/gen5/pokemon/0639-000-Terrakion.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0640--000--Virizion.png b/src/canonical/minisprites/gen5/pokemon/0640-000-Virizion.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0640--000--Virizion.png
rename to src/canonical/minisprites/gen5/pokemon/0640-000-Virizion.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0641--000--Tornadus.png b/src/canonical/minisprites/gen5/pokemon/0641-000-Tornadus.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0641--000--Tornadus.png
rename to src/canonical/minisprites/gen5/pokemon/0641-000-Tornadus.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0641--420--Tornadus--Therian.png b/src/canonical/minisprites/gen5/pokemon/0641-420-Tornadus-Therian.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0641--420--Tornadus--Therian.png
rename to src/canonical/minisprites/gen5/pokemon/0641-420-Tornadus-Therian.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0642--000--Thundurus.png b/src/canonical/minisprites/gen5/pokemon/0642-000-Thundurus.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0642--000--Thundurus.png
rename to src/canonical/minisprites/gen5/pokemon/0642-000-Thundurus.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0642--420--Thundurus--Therian.png b/src/canonical/minisprites/gen5/pokemon/0642-420-Thundurus-Therian.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0642--420--Thundurus--Therian.png
rename to src/canonical/minisprites/gen5/pokemon/0642-420-Thundurus-Therian.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0643--000--Reshiram.png b/src/canonical/minisprites/gen5/pokemon/0643-000-Reshiram.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0643--000--Reshiram.png
rename to src/canonical/minisprites/gen5/pokemon/0643-000-Reshiram.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0644--000--Zekrom.png b/src/canonical/minisprites/gen5/pokemon/0644-000-Zekrom.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0644--000--Zekrom.png
rename to src/canonical/minisprites/gen5/pokemon/0644-000-Zekrom.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0645--000--Landorus.png b/src/canonical/minisprites/gen5/pokemon/0645-000-Landorus.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0645--000--Landorus.png
rename to src/canonical/minisprites/gen5/pokemon/0645-000-Landorus.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0645--420--Landorus--Therian.png b/src/canonical/minisprites/gen5/pokemon/0645-420-Landorus-Therian.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0645--420--Landorus--Therian.png
rename to src/canonical/minisprites/gen5/pokemon/0645-420-Landorus-Therian.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0646--000--Kyurem.png b/src/canonical/minisprites/gen5/pokemon/0646-000-Kyurem.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0646--000--Kyurem.png
rename to src/canonical/minisprites/gen5/pokemon/0646-000-Kyurem.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0646--420--Kyurem--Black.png b/src/canonical/minisprites/gen5/pokemon/0646-420-Kyurem-Black.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0646--420--Kyurem--Black.png
rename to src/canonical/minisprites/gen5/pokemon/0646-420-Kyurem-Black.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0646--420--Kyurem--White.png b/src/canonical/minisprites/gen5/pokemon/0646-420-Kyurem-White.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0646--420--Kyurem--White.png
rename to src/canonical/minisprites/gen5/pokemon/0646-420-Kyurem-White.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0647--000--Keldeo.png b/src/canonical/minisprites/gen5/pokemon/0647-000-Keldeo.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0647--000--Keldeo.png
rename to src/canonical/minisprites/gen5/pokemon/0647-000-Keldeo.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0647--420--Keldeo--Resolute.png b/src/canonical/minisprites/gen5/pokemon/0647-420-Keldeo-Resolute.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0647--420--Keldeo--Resolute.png
rename to src/canonical/minisprites/gen5/pokemon/0647-420-Keldeo-Resolute.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0648--000--Meloetta.png b/src/canonical/minisprites/gen5/pokemon/0648-000-Meloetta.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0648--000--Meloetta.png
rename to src/canonical/minisprites/gen5/pokemon/0648-000-Meloetta.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0648--420--Meloetta--Pirouette.png b/src/canonical/minisprites/gen5/pokemon/0648-420-Meloetta-Pirouette.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0648--420--Meloetta--Pirouette.png
rename to src/canonical/minisprites/gen5/pokemon/0648-420-Meloetta-Pirouette.png
diff --git a/src/canonical/minisprites/gen5/pokemon/0649--000--Genesect.png b/src/canonical/minisprites/gen5/pokemon/0649-000-Genesect.png
similarity index 100%
rename from src/canonical/minisprites/gen5/pokemon/0649--000--Genesect.png
rename to src/canonical/minisprites/gen5/pokemon/0649-000-Genesect.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Absol--Mega.png b/src/canonical/minisprites/gen6/asymmetrical/Absol-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Absol--Mega.png
rename to src/canonical/minisprites/gen6/asymmetrical/Absol-Mega.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Castform--Snowy.png b/src/canonical/minisprites/gen6/asymmetrical/Castform-Snowy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Castform--Snowy.png
rename to src/canonical/minisprites/gen6/asymmetrical/Castform-Snowy.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Dugtrio--Alola.png b/src/canonical/minisprites/gen6/asymmetrical/Dugtrio-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Dugtrio--Alola.png
rename to src/canonical/minisprites/gen6/asymmetrical/Dugtrio-Alola.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Furfrou--Debutante.png b/src/canonical/minisprites/gen6/asymmetrical/Furfrou-Debutante.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Furfrou--Debutante.png
rename to src/canonical/minisprites/gen6/asymmetrical/Furfrou-Debutante.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Greninja--Ash.png b/src/canonical/minisprites/gen6/asymmetrical/Greninja-Ash.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Greninja--Ash.png
rename to src/canonical/minisprites/gen6/asymmetrical/Greninja-Ash.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Keldeo--Resolute.png b/src/canonical/minisprites/gen6/asymmetrical/Keldeo-Resolute.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Keldeo--Resolute.png
rename to src/canonical/minisprites/gen6/asymmetrical/Keldeo-Resolute.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Kyurem--Black.png b/src/canonical/minisprites/gen6/asymmetrical/Kyurem-Black.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Kyurem--Black.png
rename to src/canonical/minisprites/gen6/asymmetrical/Kyurem-Black.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Kyurem--White.png b/src/canonical/minisprites/gen6/asymmetrical/Kyurem-White.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Kyurem--White.png
rename to src/canonical/minisprites/gen6/asymmetrical/Kyurem-White.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Minior--Blue.png b/src/canonical/minisprites/gen6/asymmetrical/Minior-Blue.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Minior--Blue.png
rename to src/canonical/minisprites/gen6/asymmetrical/Minior-Blue.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Minior--Green.png b/src/canonical/minisprites/gen6/asymmetrical/Minior-Green.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Minior--Green.png
rename to src/canonical/minisprites/gen6/asymmetrical/Minior-Green.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Minior--Indigo.png b/src/canonical/minisprites/gen6/asymmetrical/Minior-Indigo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Minior--Indigo.png
rename to src/canonical/minisprites/gen6/asymmetrical/Minior-Indigo.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Minior--Meteor.png b/src/canonical/minisprites/gen6/asymmetrical/Minior-Meteor.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Minior--Meteor.png
rename to src/canonical/minisprites/gen6/asymmetrical/Minior-Meteor.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Minior--Orange.png b/src/canonical/minisprites/gen6/asymmetrical/Minior-Orange.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Minior--Orange.png
rename to src/canonical/minisprites/gen6/asymmetrical/Minior-Orange.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Minior--Violet.png b/src/canonical/minisprites/gen6/asymmetrical/Minior-Violet.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Minior--Violet.png
rename to src/canonical/minisprites/gen6/asymmetrical/Minior-Violet.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Minior--Yellow.png b/src/canonical/minisprites/gen6/asymmetrical/Minior-Yellow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Minior--Yellow.png
rename to src/canonical/minisprites/gen6/asymmetrical/Minior-Yellow.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Muk--Alola.png b/src/canonical/minisprites/gen6/asymmetrical/Muk-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Muk--Alola.png
rename to src/canonical/minisprites/gen6/asymmetrical/Muk-Alola.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Necrozma--Dawn_Wings.png b/src/canonical/minisprites/gen6/asymmetrical/Necrozma-Dawn_Wings.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Necrozma--Dawn_Wings.png
rename to src/canonical/minisprites/gen6/asymmetrical/Necrozma-Dawn_Wings.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Necrozma--Dusk_Mane.png b/src/canonical/minisprites/gen6/asymmetrical/Necrozma-Dusk_Mane.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Necrozma--Dusk_Mane.png
rename to src/canonical/minisprites/gen6/asymmetrical/Necrozma-Dusk_Mane.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Necrozma--Ultra.png b/src/canonical/minisprites/gen6/asymmetrical/Necrozma-Ultra.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Necrozma--Ultra.png
rename to src/canonical/minisprites/gen6/asymmetrical/Necrozma-Ultra.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Pikachu--Belle.png b/src/canonical/minisprites/gen6/asymmetrical/Pikachu-Belle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Pikachu--Belle.png
rename to src/canonical/minisprites/gen6/asymmetrical/Pikachu-Belle.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Pikachu--Original.png b/src/canonical/minisprites/gen6/asymmetrical/Pikachu-Original.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Pikachu--Original.png
rename to src/canonical/minisprites/gen6/asymmetrical/Pikachu-Original.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Pikachu--Partner.png b/src/canonical/minisprites/gen6/asymmetrical/Pikachu-Partner.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Pikachu--Partner.png
rename to src/canonical/minisprites/gen6/asymmetrical/Pikachu-Partner.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Pikachu--Pop-Star.png b/src/canonical/minisprites/gen6/asymmetrical/Pikachu-Pop~Star.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Pikachu--Pop-Star.png
rename to src/canonical/minisprites/gen6/asymmetrical/Pikachu-Pop~Star.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Rotom--Wash.png b/src/canonical/minisprites/gen6/asymmetrical/Rotom-Wash.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Rotom--Wash.png
rename to src/canonical/minisprites/gen6/asymmetrical/Rotom-Wash.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Shaymin--Sky.png b/src/canonical/minisprites/gen6/asymmetrical/Shaymin-Sky.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Shaymin--Sky.png
rename to src/canonical/minisprites/gen6/asymmetrical/Shaymin-Sky.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--B.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-B.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--B.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-B.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--C.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-C.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--C.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-C.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--D.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-D.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--D.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-D.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--E.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-E.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--E.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-E.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--F.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-F.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--F.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-F.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--G.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-G.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--G.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-G.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--H.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-H.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--H.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-H.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--J.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-J.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--J.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-J.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--K.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-K.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--K.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-K.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--L.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-L.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--L.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-L.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--M.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-M.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--M.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-M.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--N.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-N.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--N.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-N.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--P.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-P.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--P.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-P.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--Q.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-Q.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--Q.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-Q.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--Question.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-Question.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--Question.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-Question.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--R.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-R.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--R.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-R.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--S.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-S.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--S.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-S.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--T.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-T.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--T.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-T.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--V.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-V.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--V.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-V.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Unown--Z.png b/src/canonical/minisprites/gen6/asymmetrical/Unown-Z.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Unown--Z.png
rename to src/canonical/minisprites/gen6/asymmetrical/Unown-Z.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Zygarde--10__0025.png b/src/canonical/minisprites/gen6/asymmetrical/Zygarde-10__0025.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Zygarde--10__0025.png
rename to src/canonical/minisprites/gen6/asymmetrical/Zygarde-10__0025.png
diff --git a/src/canonical/minisprites/gen6/asymmetrical/Zygarde--Complete.png b/src/canonical/minisprites/gen6/asymmetrical/Zygarde-Complete.png
similarity index 100%
rename from src/canonical/minisprites/gen6/asymmetrical/Zygarde--Complete.png
rename to src/canonical/minisprites/gen6/asymmetrical/Zygarde-Complete.png
diff --git a/src/canonical/minisprites/gen6/custom/0006--420--Charizard--Gmax.png b/src/canonical/minisprites/gen6/custom/0006-420-Charizard-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0006--420--Charizard--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0006-420-Charizard-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0012--420--Butterfree--Gmax.png b/src/canonical/minisprites/gen6/custom/0012-420-Butterfree-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0012--420--Butterfree--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0012-420-Butterfree-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0025--420--Pikachu--Gmax.png b/src/canonical/minisprites/gen6/custom/0025-420-Pikachu-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0025--420--Pikachu--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0025-420-Pikachu-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0052--420--Meowth--Galar.png b/src/canonical/minisprites/gen6/custom/0052-420-Meowth-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0052--420--Meowth--Galar.png
rename to src/canonical/minisprites/gen6/custom/0052-420-Meowth-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0052--420--Meowth--Gmax.png b/src/canonical/minisprites/gen6/custom/0052-420-Meowth-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0052--420--Meowth--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0052-420-Meowth-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0068--420--Machamp--Gmax.png b/src/canonical/minisprites/gen6/custom/0068-420-Machamp-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0068--420--Machamp--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0068-420-Machamp-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0077--420--Ponyta--Galar.png b/src/canonical/minisprites/gen6/custom/0077-420-Ponyta-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0077--420--Ponyta--Galar.png
rename to src/canonical/minisprites/gen6/custom/0077-420-Ponyta-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0078--420--Rapidash--Galar.png b/src/canonical/minisprites/gen6/custom/0078-420-Rapidash-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0078--420--Rapidash--Galar.png
rename to src/canonical/minisprites/gen6/custom/0078-420-Rapidash-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0079--420--Slowpoke--Galar.png b/src/canonical/minisprites/gen6/custom/0079-420-Slowpoke-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0079--420--Slowpoke--Galar.png
rename to src/canonical/minisprites/gen6/custom/0079-420-Slowpoke-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0083--420--Farfetch__0027d--Galar.png b/src/canonical/minisprites/gen6/custom/0083-420-Farfetch__0027d-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0083--420--Farfetch__0027d--Galar.png
rename to src/canonical/minisprites/gen6/custom/0083-420-Farfetch__0027d-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0094--420--Gengar--Gmax.png b/src/canonical/minisprites/gen6/custom/0094-420-Gengar-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0094--420--Gengar--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0094-420-Gengar-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0099--420--Kingler--Gmax.png b/src/canonical/minisprites/gen6/custom/0099-420-Kingler-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0099--420--Kingler--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0099-420-Kingler-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0110--420--Weezing--Galar.png b/src/canonical/minisprites/gen6/custom/0110-420-Weezing-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0110--420--Weezing--Galar.png
rename to src/canonical/minisprites/gen6/custom/0110-420-Weezing-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0122--420--Mr._Mime--Galar.png b/src/canonical/minisprites/gen6/custom/0122-420-Mr._Mime-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0122--420--Mr._Mime--Galar.png
rename to src/canonical/minisprites/gen6/custom/0122-420-Mr._Mime-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0131--420--Lapras--Gmax.png b/src/canonical/minisprites/gen6/custom/0131-420-Lapras-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0131--420--Lapras--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0131-420-Lapras-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0133--420--Eevee--Gmax.png b/src/canonical/minisprites/gen6/custom/0133-420-Eevee-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0133--420--Eevee--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0133-420-Eevee-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0143--420--Snorlax--Gmax.png b/src/canonical/minisprites/gen6/custom/0143-420-Snorlax-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0143--420--Snorlax--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0143-420-Snorlax-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0222--420--Corsola--Galar.png b/src/canonical/minisprites/gen6/custom/0222-420-Corsola-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0222--420--Corsola--Galar.png
rename to src/canonical/minisprites/gen6/custom/0222-420-Corsola-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0263--420--Zigzagoon--Galar.png b/src/canonical/minisprites/gen6/custom/0263-420-Zigzagoon-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0263--420--Zigzagoon--Galar.png
rename to src/canonical/minisprites/gen6/custom/0263-420-Zigzagoon-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0264--420--Linoone--Galar.png b/src/canonical/minisprites/gen6/custom/0264-420-Linoone-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0264--420--Linoone--Galar.png
rename to src/canonical/minisprites/gen6/custom/0264-420-Linoone-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0554--420--Darumaka--Galar.png b/src/canonical/minisprites/gen6/custom/0554-420-Darumaka-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0554--420--Darumaka--Galar.png
rename to src/canonical/minisprites/gen6/custom/0554-420-Darumaka-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0555--420--Darmanitan--Galar.png b/src/canonical/minisprites/gen6/custom/0555-420-Darmanitan-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0555--420--Darmanitan--Galar.png
rename to src/canonical/minisprites/gen6/custom/0555-420-Darmanitan-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0555--420--Darmanitan--Galar-Zen.png b/src/canonical/minisprites/gen6/custom/0555-420-Darmanitan-Galar~Zen.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0555--420--Darmanitan--Galar-Zen.png
rename to src/canonical/minisprites/gen6/custom/0555-420-Darmanitan-Galar~Zen.png
diff --git a/src/canonical/minisprites/gen6/custom/0562--420--Yamask--Galar.png b/src/canonical/minisprites/gen6/custom/0562-420-Yamask-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0562--420--Yamask--Galar.png
rename to src/canonical/minisprites/gen6/custom/0562-420-Yamask-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0569--420--Garbodor--Gmax.png b/src/canonical/minisprites/gen6/custom/0569-420-Garbodor-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0569--420--Garbodor--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0569-420-Garbodor-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0618--420--Stunfisk--Galar.png b/src/canonical/minisprites/gen6/custom/0618-420-Stunfisk-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0618--420--Stunfisk--Galar.png
rename to src/canonical/minisprites/gen6/custom/0618-420-Stunfisk-Galar.png
diff --git a/src/canonical/minisprites/gen6/custom/0809--000--Melmetal.png b/src/canonical/minisprites/gen6/custom/0809-000-Melmetal.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0809--000--Melmetal.png
rename to src/canonical/minisprites/gen6/custom/0809-000-Melmetal.png
diff --git a/src/canonical/minisprites/gen6/custom/0809--420--Melmetal--Gmax.png b/src/canonical/minisprites/gen6/custom/0809-420-Melmetal-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0809--420--Melmetal--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0809-420-Melmetal-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0810--000--Grookey.png b/src/canonical/minisprites/gen6/custom/0810-000-Grookey.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0810--000--Grookey.png
rename to src/canonical/minisprites/gen6/custom/0810-000-Grookey.png
diff --git a/src/canonical/minisprites/gen6/custom/0811--000--Thwackey.png b/src/canonical/minisprites/gen6/custom/0811-000-Thwackey.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0811--000--Thwackey.png
rename to src/canonical/minisprites/gen6/custom/0811-000-Thwackey.png
diff --git a/src/canonical/minisprites/gen6/custom/0812--000--Rillaboom.png b/src/canonical/minisprites/gen6/custom/0812-000-Rillaboom.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0812--000--Rillaboom.png
rename to src/canonical/minisprites/gen6/custom/0812-000-Rillaboom.png
diff --git a/src/canonical/minisprites/gen6/custom/0813--000--Scorbunny.png b/src/canonical/minisprites/gen6/custom/0813-000-Scorbunny.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0813--000--Scorbunny.png
rename to src/canonical/minisprites/gen6/custom/0813-000-Scorbunny.png
diff --git a/src/canonical/minisprites/gen6/custom/0814--000--Raboot.png b/src/canonical/minisprites/gen6/custom/0814-000-Raboot.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0814--000--Raboot.png
rename to src/canonical/minisprites/gen6/custom/0814-000-Raboot.png
diff --git a/src/canonical/minisprites/gen6/custom/0815--000--Cinderace.png b/src/canonical/minisprites/gen6/custom/0815-000-Cinderace.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0815--000--Cinderace.png
rename to src/canonical/minisprites/gen6/custom/0815-000-Cinderace.png
diff --git a/src/canonical/minisprites/gen6/custom/0816--000--Sobble.png b/src/canonical/minisprites/gen6/custom/0816-000-Sobble.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0816--000--Sobble.png
rename to src/canonical/minisprites/gen6/custom/0816-000-Sobble.png
diff --git a/src/canonical/minisprites/gen6/custom/0817--000--Drizzile.png b/src/canonical/minisprites/gen6/custom/0817-000-Drizzile.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0817--000--Drizzile.png
rename to src/canonical/minisprites/gen6/custom/0817-000-Drizzile.png
diff --git a/src/canonical/minisprites/gen6/custom/0818--000--Inteleon.png b/src/canonical/minisprites/gen6/custom/0818-000-Inteleon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0818--000--Inteleon.png
rename to src/canonical/minisprites/gen6/custom/0818-000-Inteleon.png
diff --git a/src/canonical/minisprites/gen6/custom/0819--000--Skwovet.png b/src/canonical/minisprites/gen6/custom/0819-000-Skwovet.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0819--000--Skwovet.png
rename to src/canonical/minisprites/gen6/custom/0819-000-Skwovet.png
diff --git a/src/canonical/minisprites/gen6/custom/0820--000--Greedent.png b/src/canonical/minisprites/gen6/custom/0820-000-Greedent.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0820--000--Greedent.png
rename to src/canonical/minisprites/gen6/custom/0820-000-Greedent.png
diff --git a/src/canonical/minisprites/gen6/custom/0821--000--Rookidee.png b/src/canonical/minisprites/gen6/custom/0821-000-Rookidee.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0821--000--Rookidee.png
rename to src/canonical/minisprites/gen6/custom/0821-000-Rookidee.png
diff --git a/src/canonical/minisprites/gen6/custom/0822--000--Corvisquire.png b/src/canonical/minisprites/gen6/custom/0822-000-Corvisquire.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0822--000--Corvisquire.png
rename to src/canonical/minisprites/gen6/custom/0822-000-Corvisquire.png
diff --git a/src/canonical/minisprites/gen6/custom/0823--000--Corviknight.png b/src/canonical/minisprites/gen6/custom/0823-000-Corviknight.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0823--000--Corviknight.png
rename to src/canonical/minisprites/gen6/custom/0823-000-Corviknight.png
diff --git a/src/canonical/minisprites/gen6/custom/0823--420--Corviknight--Gmax.png b/src/canonical/minisprites/gen6/custom/0823-420-Corviknight-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0823--420--Corviknight--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0823-420-Corviknight-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0824--000--Blipbug.png b/src/canonical/minisprites/gen6/custom/0824-000-Blipbug.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0824--000--Blipbug.png
rename to src/canonical/minisprites/gen6/custom/0824-000-Blipbug.png
diff --git a/src/canonical/minisprites/gen6/custom/0825--000--Dottler.png b/src/canonical/minisprites/gen6/custom/0825-000-Dottler.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0825--000--Dottler.png
rename to src/canonical/minisprites/gen6/custom/0825-000-Dottler.png
diff --git a/src/canonical/minisprites/gen6/custom/0826--000--Orbeetle.png b/src/canonical/minisprites/gen6/custom/0826-000-Orbeetle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0826--000--Orbeetle.png
rename to src/canonical/minisprites/gen6/custom/0826-000-Orbeetle.png
diff --git a/src/canonical/minisprites/gen6/custom/0826--420--Orbeetle--Gmax.png b/src/canonical/minisprites/gen6/custom/0826-420-Orbeetle-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0826--420--Orbeetle--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0826-420-Orbeetle-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0827--000--Nickit.png b/src/canonical/minisprites/gen6/custom/0827-000-Nickit.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0827--000--Nickit.png
rename to src/canonical/minisprites/gen6/custom/0827-000-Nickit.png
diff --git a/src/canonical/minisprites/gen6/custom/0828--000--Thievul.png b/src/canonical/minisprites/gen6/custom/0828-000-Thievul.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0828--000--Thievul.png
rename to src/canonical/minisprites/gen6/custom/0828-000-Thievul.png
diff --git a/src/canonical/minisprites/gen6/custom/0829--000--Gossifleur.png b/src/canonical/minisprites/gen6/custom/0829-000-Gossifleur.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0829--000--Gossifleur.png
rename to src/canonical/minisprites/gen6/custom/0829-000-Gossifleur.png
diff --git a/src/canonical/minisprites/gen6/custom/0830--000--Eldegoss.png b/src/canonical/minisprites/gen6/custom/0830-000-Eldegoss.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0830--000--Eldegoss.png
rename to src/canonical/minisprites/gen6/custom/0830-000-Eldegoss.png
diff --git a/src/canonical/minisprites/gen6/custom/0831--000--Wooloo.png b/src/canonical/minisprites/gen6/custom/0831-000-Wooloo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0831--000--Wooloo.png
rename to src/canonical/minisprites/gen6/custom/0831-000-Wooloo.png
diff --git a/src/canonical/minisprites/gen6/custom/0832--000--Dubwool.png b/src/canonical/minisprites/gen6/custom/0832-000-Dubwool.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0832--000--Dubwool.png
rename to src/canonical/minisprites/gen6/custom/0832-000-Dubwool.png
diff --git a/src/canonical/minisprites/gen6/custom/0833--000--Chewtle.png b/src/canonical/minisprites/gen6/custom/0833-000-Chewtle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0833--000--Chewtle.png
rename to src/canonical/minisprites/gen6/custom/0833-000-Chewtle.png
diff --git a/src/canonical/minisprites/gen6/custom/0834--000--Drednaw.png b/src/canonical/minisprites/gen6/custom/0834-000-Drednaw.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0834--000--Drednaw.png
rename to src/canonical/minisprites/gen6/custom/0834-000-Drednaw.png
diff --git a/src/canonical/minisprites/gen6/custom/0834--420--Drednaw--Gmax.png b/src/canonical/minisprites/gen6/custom/0834-420-Drednaw-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0834--420--Drednaw--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0834-420-Drednaw-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0835--000--Yamper.png b/src/canonical/minisprites/gen6/custom/0835-000-Yamper.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0835--000--Yamper.png
rename to src/canonical/minisprites/gen6/custom/0835-000-Yamper.png
diff --git a/src/canonical/minisprites/gen6/custom/0836--000--Boltund.png b/src/canonical/minisprites/gen6/custom/0836-000-Boltund.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0836--000--Boltund.png
rename to src/canonical/minisprites/gen6/custom/0836-000-Boltund.png
diff --git a/src/canonical/minisprites/gen6/custom/0838--000--Carkol.png b/src/canonical/minisprites/gen6/custom/0838-000-Carkol.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0838--000--Carkol.png
rename to src/canonical/minisprites/gen6/custom/0838-000-Carkol.png
diff --git a/src/canonical/minisprites/gen6/custom/0839--000--Coalossal.png b/src/canonical/minisprites/gen6/custom/0839-000-Coalossal.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0839--000--Coalossal.png
rename to src/canonical/minisprites/gen6/custom/0839-000-Coalossal.png
diff --git a/src/canonical/minisprites/gen6/custom/0839--420--Coalossal--Gmax.png b/src/canonical/minisprites/gen6/custom/0839-420-Coalossal-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0839--420--Coalossal--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0839-420-Coalossal-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0840--000--Applin.png b/src/canonical/minisprites/gen6/custom/0840-000-Applin.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0840--000--Applin.png
rename to src/canonical/minisprites/gen6/custom/0840-000-Applin.png
diff --git a/src/canonical/minisprites/gen6/custom/0841--000--Flapple.png b/src/canonical/minisprites/gen6/custom/0841-000-Flapple.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0841--000--Flapple.png
rename to src/canonical/minisprites/gen6/custom/0841-000-Flapple.png
diff --git a/src/canonical/minisprites/gen6/custom/0841--420--Flapple--Gmax.png b/src/canonical/minisprites/gen6/custom/0841-420-Flapple-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0841--420--Flapple--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0841-420-Flapple-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0842--000--Appletun.png b/src/canonical/minisprites/gen6/custom/0842-000-Appletun.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0842--000--Appletun.png
rename to src/canonical/minisprites/gen6/custom/0842-000-Appletun.png
diff --git a/src/canonical/minisprites/gen6/custom/0842--420--Appletun--Gmax.png b/src/canonical/minisprites/gen6/custom/0842-420-Appletun-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0842--420--Appletun--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0842-420-Appletun-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0843--000--Silicobra.png b/src/canonical/minisprites/gen6/custom/0843-000-Silicobra.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0843--000--Silicobra.png
rename to src/canonical/minisprites/gen6/custom/0843-000-Silicobra.png
diff --git a/src/canonical/minisprites/gen6/custom/0844--000--Sandaconda.png b/src/canonical/minisprites/gen6/custom/0844-000-Sandaconda.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0844--000--Sandaconda.png
rename to src/canonical/minisprites/gen6/custom/0844-000-Sandaconda.png
diff --git a/src/canonical/minisprites/gen6/custom/0844--420--Sandaconda--Gmax.png b/src/canonical/minisprites/gen6/custom/0844-420-Sandaconda-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0844--420--Sandaconda--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0844-420-Sandaconda-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0845--000--Cramorant.png b/src/canonical/minisprites/gen6/custom/0845-000-Cramorant.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0845--000--Cramorant.png
rename to src/canonical/minisprites/gen6/custom/0845-000-Cramorant.png
diff --git a/src/canonical/minisprites/gen6/custom/0845--420--Cramorant--Gorging.png b/src/canonical/minisprites/gen6/custom/0845-420-Cramorant-Gorging.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0845--420--Cramorant--Gorging.png
rename to src/canonical/minisprites/gen6/custom/0845-420-Cramorant-Gorging.png
diff --git a/src/canonical/minisprites/gen6/custom/0845--420--Cramorant--Gulping.png b/src/canonical/minisprites/gen6/custom/0845-420-Cramorant-Gulping.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0845--420--Cramorant--Gulping.png
rename to src/canonical/minisprites/gen6/custom/0845-420-Cramorant-Gulping.png
diff --git a/src/canonical/minisprites/gen6/custom/0846--000--Arrokuda.png b/src/canonical/minisprites/gen6/custom/0846-000-Arrokuda.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0846--000--Arrokuda.png
rename to src/canonical/minisprites/gen6/custom/0846-000-Arrokuda.png
diff --git a/src/canonical/minisprites/gen6/custom/0847--000--Barraskewda.png b/src/canonical/minisprites/gen6/custom/0847-000-Barraskewda.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0847--000--Barraskewda.png
rename to src/canonical/minisprites/gen6/custom/0847-000-Barraskewda.png
diff --git a/src/canonical/minisprites/gen6/custom/0848--000--Toxel.png b/src/canonical/minisprites/gen6/custom/0848-000-Toxel.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0848--000--Toxel.png
rename to src/canonical/minisprites/gen6/custom/0848-000-Toxel.png
diff --git a/src/canonical/minisprites/gen6/custom/0849--000--Toxtricity.png b/src/canonical/minisprites/gen6/custom/0849-000-Toxtricity.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0849--000--Toxtricity.png
rename to src/canonical/minisprites/gen6/custom/0849-000-Toxtricity.png
diff --git a/src/canonical/minisprites/gen6/custom/0849--420--Toxtricity--Gmax.png b/src/canonical/minisprites/gen6/custom/0849-420-Toxtricity-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0849--420--Toxtricity--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0849-420-Toxtricity-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0849--420--Toxtricity--Low-Key.png b/src/canonical/minisprites/gen6/custom/0849-420-Toxtricity-Low~Key.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0849--420--Toxtricity--Low-Key.png
rename to src/canonical/minisprites/gen6/custom/0849-420-Toxtricity-Low~Key.png
diff --git a/src/canonical/minisprites/gen6/custom/0850--000--Sizzlipede.png b/src/canonical/minisprites/gen6/custom/0850-000-Sizzlipede.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0850--000--Sizzlipede.png
rename to src/canonical/minisprites/gen6/custom/0850-000-Sizzlipede.png
diff --git a/src/canonical/minisprites/gen6/custom/0851--000--Centiskorch.png b/src/canonical/minisprites/gen6/custom/0851-000-Centiskorch.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0851--000--Centiskorch.png
rename to src/canonical/minisprites/gen6/custom/0851-000-Centiskorch.png
diff --git a/src/canonical/minisprites/gen6/custom/0851--420--Centiskorch--Gmax.png b/src/canonical/minisprites/gen6/custom/0851-420-Centiskorch-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0851--420--Centiskorch--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0851-420-Centiskorch-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0852--000--Clobbopus.png b/src/canonical/minisprites/gen6/custom/0852-000-Clobbopus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0852--000--Clobbopus.png
rename to src/canonical/minisprites/gen6/custom/0852-000-Clobbopus.png
diff --git a/src/canonical/minisprites/gen6/custom/0853--000--Grapploct.png b/src/canonical/minisprites/gen6/custom/0853-000-Grapploct.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0853--000--Grapploct.png
rename to src/canonical/minisprites/gen6/custom/0853-000-Grapploct.png
diff --git a/src/canonical/minisprites/gen6/custom/0854--000--Sinistea.png b/src/canonical/minisprites/gen6/custom/0854-000-Sinistea.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0854--000--Sinistea.png
rename to src/canonical/minisprites/gen6/custom/0854-000-Sinistea.png
diff --git a/src/canonical/minisprites/gen6/custom/0855--000--Polteageist.png b/src/canonical/minisprites/gen6/custom/0855-000-Polteageist.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0855--000--Polteageist.png
rename to src/canonical/minisprites/gen6/custom/0855-000-Polteageist.png
diff --git a/src/canonical/minisprites/gen6/custom/0856--000--Hatenna.png b/src/canonical/minisprites/gen6/custom/0856-000-Hatenna.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0856--000--Hatenna.png
rename to src/canonical/minisprites/gen6/custom/0856-000-Hatenna.png
diff --git a/src/canonical/minisprites/gen6/custom/0857--000--Hattrem.png b/src/canonical/minisprites/gen6/custom/0857-000-Hattrem.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0857--000--Hattrem.png
rename to src/canonical/minisprites/gen6/custom/0857-000-Hattrem.png
diff --git a/src/canonical/minisprites/gen6/custom/0858--000--Hatterene.png b/src/canonical/minisprites/gen6/custom/0858-000-Hatterene.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0858--000--Hatterene.png
rename to src/canonical/minisprites/gen6/custom/0858-000-Hatterene.png
diff --git a/src/canonical/minisprites/gen6/custom/0858--420--Hatterene--Gmax.png b/src/canonical/minisprites/gen6/custom/0858-420-Hatterene-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0858--420--Hatterene--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0858-420-Hatterene-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0859--000--Impidimp.png b/src/canonical/minisprites/gen6/custom/0859-000-Impidimp.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0859--000--Impidimp.png
rename to src/canonical/minisprites/gen6/custom/0859-000-Impidimp.png
diff --git a/src/canonical/minisprites/gen6/custom/0860--000--Morgrem.png b/src/canonical/minisprites/gen6/custom/0860-000-Morgrem.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0860--000--Morgrem.png
rename to src/canonical/minisprites/gen6/custom/0860-000-Morgrem.png
diff --git a/src/canonical/minisprites/gen6/custom/0861--000--Grimmsnarl.png b/src/canonical/minisprites/gen6/custom/0861-000-Grimmsnarl.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0861--000--Grimmsnarl.png
rename to src/canonical/minisprites/gen6/custom/0861-000-Grimmsnarl.png
diff --git a/src/canonical/minisprites/gen6/custom/0861--420--Grimmsnarl--Gmax.png b/src/canonical/minisprites/gen6/custom/0861-420-Grimmsnarl-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0861--420--Grimmsnarl--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0861-420-Grimmsnarl-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0862--000--Obstagoon.png b/src/canonical/minisprites/gen6/custom/0862-000-Obstagoon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0862--000--Obstagoon.png
rename to src/canonical/minisprites/gen6/custom/0862-000-Obstagoon.png
diff --git a/src/canonical/minisprites/gen6/custom/0863--000--Perrserker.png b/src/canonical/minisprites/gen6/custom/0863-000-Perrserker.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0863--000--Perrserker.png
rename to src/canonical/minisprites/gen6/custom/0863-000-Perrserker.png
diff --git a/src/canonical/minisprites/gen6/custom/0864--000--Cursola.png b/src/canonical/minisprites/gen6/custom/0864-000-Cursola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0864--000--Cursola.png
rename to src/canonical/minisprites/gen6/custom/0864-000-Cursola.png
diff --git a/src/canonical/minisprites/gen6/custom/0865--000--Sirfetch__0027d.png b/src/canonical/minisprites/gen6/custom/0865-000-Sirfetch__0027d.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0865--000--Sirfetch__0027d.png
rename to src/canonical/minisprites/gen6/custom/0865-000-Sirfetch__0027d.png
diff --git a/src/canonical/minisprites/gen6/custom/0866--000--Mr._Rime.png b/src/canonical/minisprites/gen6/custom/0866-000-Mr._Rime.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0866--000--Mr._Rime.png
rename to src/canonical/minisprites/gen6/custom/0866-000-Mr._Rime.png
diff --git a/src/canonical/minisprites/gen6/custom/0867--000--Runerigus.png b/src/canonical/minisprites/gen6/custom/0867-000-Runerigus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0867--000--Runerigus.png
rename to src/canonical/minisprites/gen6/custom/0867-000-Runerigus.png
diff --git a/src/canonical/minisprites/gen6/custom/0868--000--Milcery.png b/src/canonical/minisprites/gen6/custom/0868-000-Milcery.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0868--000--Milcery.png
rename to src/canonical/minisprites/gen6/custom/0868-000-Milcery.png
diff --git a/src/canonical/minisprites/gen6/custom/0869--000--Alcremie.png b/src/canonical/minisprites/gen6/custom/0869-000-Alcremie.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0869--000--Alcremie.png
rename to src/canonical/minisprites/gen6/custom/0869-000-Alcremie.png
diff --git a/src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Caramel_Swirl.png b/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Caramel_Swirl.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Caramel_Swirl.png
rename to src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Caramel_Swirl.png
diff --git a/src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Gmax.png b/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Lemon_Cream.png b/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Lemon_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Lemon_Cream.png
rename to src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Lemon_Cream.png
diff --git a/src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Matcha_Cream.png b/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Matcha_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Matcha_Cream.png
rename to src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Matcha_Cream.png
diff --git a/src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Mint_Cream.png b/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Mint_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Mint_Cream.png
rename to src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Mint_Cream.png
diff --git a/src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Rainbow_Swirl.png b/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Rainbow_Swirl.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Rainbow_Swirl.png
rename to src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Rainbow_Swirl.png
diff --git a/src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Ruby_Cream.png b/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Ruby_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Ruby_Cream.png
rename to src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Ruby_Cream.png
diff --git a/src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Ruby_Swirl.png b/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Ruby_Swirl.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Ruby_Swirl.png
rename to src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Ruby_Swirl.png
diff --git a/src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Salted_Cream.png b/src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Salted_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0869--420--Alcremie--Salted_Cream.png
rename to src/canonical/minisprites/gen6/custom/0869-420-Alcremie-Salted_Cream.png
diff --git a/src/canonical/minisprites/gen6/custom/0870--000--Falinks.png b/src/canonical/minisprites/gen6/custom/0870-000-Falinks.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0870--000--Falinks.png
rename to src/canonical/minisprites/gen6/custom/0870-000-Falinks.png
diff --git a/src/canonical/minisprites/gen6/custom/0871--000--Pincurchin.png b/src/canonical/minisprites/gen6/custom/0871-000-Pincurchin.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0871--000--Pincurchin.png
rename to src/canonical/minisprites/gen6/custom/0871-000-Pincurchin.png
diff --git a/src/canonical/minisprites/gen6/custom/0872--000--Snom.png b/src/canonical/minisprites/gen6/custom/0872-000-Snom.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0872--000--Snom.png
rename to src/canonical/minisprites/gen6/custom/0872-000-Snom.png
diff --git a/src/canonical/minisprites/gen6/custom/0873--000--Frosmoth.png b/src/canonical/minisprites/gen6/custom/0873-000-Frosmoth.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0873--000--Frosmoth.png
rename to src/canonical/minisprites/gen6/custom/0873-000-Frosmoth.png
diff --git a/src/canonical/minisprites/gen6/custom/0874--000--Stonjourner.png b/src/canonical/minisprites/gen6/custom/0874-000-Stonjourner.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0874--000--Stonjourner.png
rename to src/canonical/minisprites/gen6/custom/0874-000-Stonjourner.png
diff --git a/src/canonical/minisprites/gen6/custom/0875--000--Eiscue.png b/src/canonical/minisprites/gen6/custom/0875-000-Eiscue.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0875--000--Eiscue.png
rename to src/canonical/minisprites/gen6/custom/0875-000-Eiscue.png
diff --git a/src/canonical/minisprites/gen6/custom/0875--420--Eiscue--Noice.png b/src/canonical/minisprites/gen6/custom/0875-420-Eiscue-Noice.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0875--420--Eiscue--Noice.png
rename to src/canonical/minisprites/gen6/custom/0875-420-Eiscue-Noice.png
diff --git a/src/canonical/minisprites/gen6/custom/0876--000--Indeedee.png b/src/canonical/minisprites/gen6/custom/0876-000-Indeedee.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0876--000--Indeedee.png
rename to src/canonical/minisprites/gen6/custom/0876-000-Indeedee.png
diff --git a/src/canonical/minisprites/gen6/custom/0876--420--Indeedee--F.png b/src/canonical/minisprites/gen6/custom/0876-420-Indeedee-F.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0876--420--Indeedee--F.png
rename to src/canonical/minisprites/gen6/custom/0876-420-Indeedee-F.png
diff --git a/src/canonical/minisprites/gen6/custom/0877--000--Morpeko.png b/src/canonical/minisprites/gen6/custom/0877-000-Morpeko.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0877--000--Morpeko.png
rename to src/canonical/minisprites/gen6/custom/0877-000-Morpeko.png
diff --git a/src/canonical/minisprites/gen6/custom/0877--420--Morpeko--Hangry.png b/src/canonical/minisprites/gen6/custom/0877-420-Morpeko-Hangry.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0877--420--Morpeko--Hangry.png
rename to src/canonical/minisprites/gen6/custom/0877-420-Morpeko-Hangry.png
diff --git a/src/canonical/minisprites/gen6/custom/0878--000--Cufant.png b/src/canonical/minisprites/gen6/custom/0878-000-Cufant.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0878--000--Cufant.png
rename to src/canonical/minisprites/gen6/custom/0878-000-Cufant.png
diff --git a/src/canonical/minisprites/gen6/custom/0879--000--Copperajah.png b/src/canonical/minisprites/gen6/custom/0879-000-Copperajah.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0879--000--Copperajah.png
rename to src/canonical/minisprites/gen6/custom/0879-000-Copperajah.png
diff --git a/src/canonical/minisprites/gen6/custom/0879--420--Copperajah--Gmax.png b/src/canonical/minisprites/gen6/custom/0879-420-Copperajah-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0879--420--Copperajah--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0879-420-Copperajah-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0880--000--Dracozolt.png b/src/canonical/minisprites/gen6/custom/0880-000-Dracozolt.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0880--000--Dracozolt.png
rename to src/canonical/minisprites/gen6/custom/0880-000-Dracozolt.png
diff --git a/src/canonical/minisprites/gen6/custom/0881--000--Arctozolt.png b/src/canonical/minisprites/gen6/custom/0881-000-Arctozolt.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0881--000--Arctozolt.png
rename to src/canonical/minisprites/gen6/custom/0881-000-Arctozolt.png
diff --git a/src/canonical/minisprites/gen6/custom/0882--000--Dracovish.png b/src/canonical/minisprites/gen6/custom/0882-000-Dracovish.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0882--000--Dracovish.png
rename to src/canonical/minisprites/gen6/custom/0882-000-Dracovish.png
diff --git a/src/canonical/minisprites/gen6/custom/0883--000--Arctovish.png b/src/canonical/minisprites/gen6/custom/0883-000-Arctovish.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0883--000--Arctovish.png
rename to src/canonical/minisprites/gen6/custom/0883-000-Arctovish.png
diff --git a/src/canonical/minisprites/gen6/custom/0884--000--Duraludon.png b/src/canonical/minisprites/gen6/custom/0884-000-Duraludon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0884--000--Duraludon.png
rename to src/canonical/minisprites/gen6/custom/0884-000-Duraludon.png
diff --git a/src/canonical/minisprites/gen6/custom/0884--420--Duraludon--Gmax.png b/src/canonical/minisprites/gen6/custom/0884-420-Duraludon-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0884--420--Duraludon--Gmax.png
rename to src/canonical/minisprites/gen6/custom/0884-420-Duraludon-Gmax.png
diff --git a/src/canonical/minisprites/gen6/custom/0885--000--Dreepy.png b/src/canonical/minisprites/gen6/custom/0885-000-Dreepy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0885--000--Dreepy.png
rename to src/canonical/minisprites/gen6/custom/0885-000-Dreepy.png
diff --git a/src/canonical/minisprites/gen6/custom/0886--000--Drakloak.png b/src/canonical/minisprites/gen6/custom/0886-000-Drakloak.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0886--000--Drakloak.png
rename to src/canonical/minisprites/gen6/custom/0886-000-Drakloak.png
diff --git a/src/canonical/minisprites/gen6/custom/0887--000--Dragapult.png b/src/canonical/minisprites/gen6/custom/0887-000-Dragapult.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0887--000--Dragapult.png
rename to src/canonical/minisprites/gen6/custom/0887-000-Dragapult.png
diff --git a/src/canonical/minisprites/gen6/custom/0888--000--Zacian.png b/src/canonical/minisprites/gen6/custom/0888-000-Zacian.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0888--000--Zacian.png
rename to src/canonical/minisprites/gen6/custom/0888-000-Zacian.png
diff --git a/src/canonical/minisprites/gen6/custom/0888--420--Zacian--Crowned.png b/src/canonical/minisprites/gen6/custom/0888-420-Zacian-Crowned.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0888--420--Zacian--Crowned.png
rename to src/canonical/minisprites/gen6/custom/0888-420-Zacian-Crowned.png
diff --git a/src/canonical/minisprites/gen6/custom/0889--000--Zamazenta.png b/src/canonical/minisprites/gen6/custom/0889-000-Zamazenta.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0889--000--Zamazenta.png
rename to src/canonical/minisprites/gen6/custom/0889-000-Zamazenta.png
diff --git a/src/canonical/minisprites/gen6/custom/0889--420--Zamazenta--Crowned.png b/src/canonical/minisprites/gen6/custom/0889-420-Zamazenta-Crowned.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0889--420--Zamazenta--Crowned.png
rename to src/canonical/minisprites/gen6/custom/0889-420-Zamazenta-Crowned.png
diff --git a/src/canonical/minisprites/gen6/custom/0890--000--Eternatus.png b/src/canonical/minisprites/gen6/custom/0890-000-Eternatus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0890--000--Eternatus.png
rename to src/canonical/minisprites/gen6/custom/0890-000-Eternatus.png
diff --git a/src/canonical/minisprites/gen6/custom/0890--420--Eternatus--Eternamax.png b/src/canonical/minisprites/gen6/custom/0890-420-Eternatus-Eternamax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/0890--420--Eternatus--Eternamax.png
rename to src/canonical/minisprites/gen6/custom/0890-420-Eternatus-Eternamax.png
diff --git a/src/canonical/minisprites/gen6/misc/Xerneas--Neutral.png b/src/canonical/minisprites/gen6/misc/Xerneas-Neutral.png
similarity index 100%
rename from src/canonical/minisprites/gen6/misc/Xerneas--Neutral.png
rename to src/canonical/minisprites/gen6/misc/Xerneas-Neutral.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0001--000--Bulbasaur.png b/src/canonical/minisprites/gen6/pokemon/0001-000-Bulbasaur.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0001--000--Bulbasaur.png
rename to src/canonical/minisprites/gen6/pokemon/0001-000-Bulbasaur.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0002--000--Ivysaur.png b/src/canonical/minisprites/gen6/pokemon/0002-000-Ivysaur.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0002--000--Ivysaur.png
rename to src/canonical/minisprites/gen6/pokemon/0002-000-Ivysaur.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0003--000--Venusaur.png b/src/canonical/minisprites/gen6/pokemon/0003-000-Venusaur.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0003--000--Venusaur.png
rename to src/canonical/minisprites/gen6/pokemon/0003-000-Venusaur.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0003--420--Venusaur--Mega.png b/src/canonical/minisprites/gen6/pokemon/0003-420-Venusaur-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0003--420--Venusaur--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0003-420-Venusaur-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0004--000--Charmander.png b/src/canonical/minisprites/gen6/pokemon/0004-000-Charmander.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0004--000--Charmander.png
rename to src/canonical/minisprites/gen6/pokemon/0004-000-Charmander.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0005--000--Charmeleon.png b/src/canonical/minisprites/gen6/pokemon/0005-000-Charmeleon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0005--000--Charmeleon.png
rename to src/canonical/minisprites/gen6/pokemon/0005-000-Charmeleon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0006--000--Charizard.png b/src/canonical/minisprites/gen6/pokemon/0006-000-Charizard.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0006--000--Charizard.png
rename to src/canonical/minisprites/gen6/pokemon/0006-000-Charizard.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0006--420--Charizard--Mega-X.png b/src/canonical/minisprites/gen6/pokemon/0006-420-Charizard-Mega~X.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0006--420--Charizard--Mega-X.png
rename to src/canonical/minisprites/gen6/pokemon/0006-420-Charizard-Mega~X.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0006--420--Charizard--Mega-Y.png b/src/canonical/minisprites/gen6/pokemon/0006-420-Charizard-Mega~Y.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0006--420--Charizard--Mega-Y.png
rename to src/canonical/minisprites/gen6/pokemon/0006-420-Charizard-Mega~Y.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0007--000--Squirtle.png b/src/canonical/minisprites/gen6/pokemon/0007-000-Squirtle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0007--000--Squirtle.png
rename to src/canonical/minisprites/gen6/pokemon/0007-000-Squirtle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0008--000--Wartortle.png b/src/canonical/minisprites/gen6/pokemon/0008-000-Wartortle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0008--000--Wartortle.png
rename to src/canonical/minisprites/gen6/pokemon/0008-000-Wartortle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0009--000--Blastoise.png b/src/canonical/minisprites/gen6/pokemon/0009-000-Blastoise.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0009--000--Blastoise.png
rename to src/canonical/minisprites/gen6/pokemon/0009-000-Blastoise.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0009--420--Blastoise--Mega.png b/src/canonical/minisprites/gen6/pokemon/0009-420-Blastoise-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0009--420--Blastoise--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0009-420-Blastoise-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0010--000--Caterpie.png b/src/canonical/minisprites/gen6/pokemon/0010-000-Caterpie.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0010--000--Caterpie.png
rename to src/canonical/minisprites/gen6/pokemon/0010-000-Caterpie.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0011--000--Metapod.png b/src/canonical/minisprites/gen6/pokemon/0011-000-Metapod.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0011--000--Metapod.png
rename to src/canonical/minisprites/gen6/pokemon/0011-000-Metapod.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0012--000--Butterfree.png b/src/canonical/minisprites/gen6/pokemon/0012-000-Butterfree.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0012--000--Butterfree.png
rename to src/canonical/minisprites/gen6/pokemon/0012-000-Butterfree.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0013--000--Weedle.png b/src/canonical/minisprites/gen6/pokemon/0013-000-Weedle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0013--000--Weedle.png
rename to src/canonical/minisprites/gen6/pokemon/0013-000-Weedle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0014--000--Kakuna.png b/src/canonical/minisprites/gen6/pokemon/0014-000-Kakuna.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0014--000--Kakuna.png
rename to src/canonical/minisprites/gen6/pokemon/0014-000-Kakuna.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0015--000--Beedrill.png b/src/canonical/minisprites/gen6/pokemon/0015-000-Beedrill.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0015--000--Beedrill.png
rename to src/canonical/minisprites/gen6/pokemon/0015-000-Beedrill.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0015--420--Beedrill--Mega.png b/src/canonical/minisprites/gen6/pokemon/0015-420-Beedrill-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0015--420--Beedrill--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0015-420-Beedrill-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0016--000--Pidgey.png b/src/canonical/minisprites/gen6/pokemon/0016-000-Pidgey.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0016--000--Pidgey.png
rename to src/canonical/minisprites/gen6/pokemon/0016-000-Pidgey.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0017--000--Pidgeotto.png b/src/canonical/minisprites/gen6/pokemon/0017-000-Pidgeotto.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0017--000--Pidgeotto.png
rename to src/canonical/minisprites/gen6/pokemon/0017-000-Pidgeotto.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0018--000--Pidgeot.png b/src/canonical/minisprites/gen6/pokemon/0018-000-Pidgeot.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0018--000--Pidgeot.png
rename to src/canonical/minisprites/gen6/pokemon/0018-000-Pidgeot.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0018--420--Pidgeot--Mega.png b/src/canonical/minisprites/gen6/pokemon/0018-420-Pidgeot-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0018--420--Pidgeot--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0018-420-Pidgeot-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0019--000--Rattata.png b/src/canonical/minisprites/gen6/pokemon/0019-000-Rattata.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0019--000--Rattata.png
rename to src/canonical/minisprites/gen6/pokemon/0019-000-Rattata.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0019--420--Rattata--Alola.png b/src/canonical/minisprites/gen6/pokemon/0019-420-Rattata-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0019--420--Rattata--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0019-420-Rattata-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0020--000--Raticate.png b/src/canonical/minisprites/gen6/pokemon/0020-000-Raticate.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0020--000--Raticate.png
rename to src/canonical/minisprites/gen6/pokemon/0020-000-Raticate.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0020--420--Raticate--Alola.png b/src/canonical/minisprites/gen6/pokemon/0020-420-Raticate-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0020--420--Raticate--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0020-420-Raticate-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0021--000--Spearow.png b/src/canonical/minisprites/gen6/pokemon/0021-000-Spearow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0021--000--Spearow.png
rename to src/canonical/minisprites/gen6/pokemon/0021-000-Spearow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0022--000--Fearow.png b/src/canonical/minisprites/gen6/pokemon/0022-000-Fearow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0022--000--Fearow.png
rename to src/canonical/minisprites/gen6/pokemon/0022-000-Fearow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0023--000--Ekans.png b/src/canonical/minisprites/gen6/pokemon/0023-000-Ekans.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0023--000--Ekans.png
rename to src/canonical/minisprites/gen6/pokemon/0023-000-Ekans.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0024--000--Arbok.png b/src/canonical/minisprites/gen6/pokemon/0024-000-Arbok.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0024--000--Arbok.png
rename to src/canonical/minisprites/gen6/pokemon/0024-000-Arbok.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--000--Pikachu.png b/src/canonical/minisprites/gen6/pokemon/0025-000-Pikachu.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--000--Pikachu.png
rename to src/canonical/minisprites/gen6/pokemon/0025-000-Pikachu.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Alola.png b/src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Belle.png b/src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Belle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Belle.png
rename to src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Belle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Cosplay.png b/src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Cosplay.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Cosplay.png
rename to src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Cosplay.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Hoenn.png b/src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Hoenn.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Hoenn.png
rename to src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Hoenn.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Kalos.png b/src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Kalos.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Kalos.png
rename to src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Kalos.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Libre.png b/src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Libre.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Libre.png
rename to src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Libre.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Original.png b/src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Original.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Original.png
rename to src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Original.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Partner.png b/src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Partner.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Partner.png
rename to src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Partner.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--PhD.png b/src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-PhD.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--PhD.png
rename to src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-PhD.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Pop-Star.png b/src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Pop~Star.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Pop-Star.png
rename to src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Pop~Star.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Rock-Star.png b/src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Rock~Star.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Rock-Star.png
rename to src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Rock~Star.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Sinnoh.png b/src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Sinnoh.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Sinnoh.png
rename to src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Sinnoh.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Starter.png b/src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Starter.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Starter.png
rename to src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Starter.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Unova.png b/src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Unova.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0025--420--Pikachu--Unova.png
rename to src/canonical/minisprites/gen6/pokemon/0025-420-Pikachu-Unova.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0026--000--Raichu.png b/src/canonical/minisprites/gen6/pokemon/0026-000-Raichu.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0026--000--Raichu.png
rename to src/canonical/minisprites/gen6/pokemon/0026-000-Raichu.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0026--420--Raichu--Alola.png b/src/canonical/minisprites/gen6/pokemon/0026-420-Raichu-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0026--420--Raichu--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0026-420-Raichu-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0027--000--Sandshrew.png b/src/canonical/minisprites/gen6/pokemon/0027-000-Sandshrew.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0027--000--Sandshrew.png
rename to src/canonical/minisprites/gen6/pokemon/0027-000-Sandshrew.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0027--420--Sandshrew--Alola.png b/src/canonical/minisprites/gen6/pokemon/0027-420-Sandshrew-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0027--420--Sandshrew--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0027-420-Sandshrew-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0028--000--Sandslash.png b/src/canonical/minisprites/gen6/pokemon/0028-000-Sandslash.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0028--000--Sandslash.png
rename to src/canonical/minisprites/gen6/pokemon/0028-000-Sandslash.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0028--420--Sandslash--Alola.png b/src/canonical/minisprites/gen6/pokemon/0028-420-Sandslash-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0028--420--Sandslash--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0028-420-Sandslash-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0029--000--Nidoran-F.png b/src/canonical/minisprites/gen6/pokemon/0029-000-Nidoran~F.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0029--000--Nidoran-F.png
rename to src/canonical/minisprites/gen6/pokemon/0029-000-Nidoran~F.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0030--000--Nidorina.png b/src/canonical/minisprites/gen6/pokemon/0030-000-Nidorina.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0030--000--Nidorina.png
rename to src/canonical/minisprites/gen6/pokemon/0030-000-Nidorina.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0031--000--Nidoqueen.png b/src/canonical/minisprites/gen6/pokemon/0031-000-Nidoqueen.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0031--000--Nidoqueen.png
rename to src/canonical/minisprites/gen6/pokemon/0031-000-Nidoqueen.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0032--000--Nidoran-M.png b/src/canonical/minisprites/gen6/pokemon/0032-000-Nidoran~M.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0032--000--Nidoran-M.png
rename to src/canonical/minisprites/gen6/pokemon/0032-000-Nidoran~M.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0033--000--Nidorino.png b/src/canonical/minisprites/gen6/pokemon/0033-000-Nidorino.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0033--000--Nidorino.png
rename to src/canonical/minisprites/gen6/pokemon/0033-000-Nidorino.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0034--000--Nidoking.png b/src/canonical/minisprites/gen6/pokemon/0034-000-Nidoking.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0034--000--Nidoking.png
rename to src/canonical/minisprites/gen6/pokemon/0034-000-Nidoking.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0035--000--Clefairy.png b/src/canonical/minisprites/gen6/pokemon/0035-000-Clefairy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0035--000--Clefairy.png
rename to src/canonical/minisprites/gen6/pokemon/0035-000-Clefairy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0036--000--Clefable.png b/src/canonical/minisprites/gen6/pokemon/0036-000-Clefable.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0036--000--Clefable.png
rename to src/canonical/minisprites/gen6/pokemon/0036-000-Clefable.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0037--000--Vulpix.png b/src/canonical/minisprites/gen6/pokemon/0037-000-Vulpix.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0037--000--Vulpix.png
rename to src/canonical/minisprites/gen6/pokemon/0037-000-Vulpix.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0037--420--Vulpix--Alola.png b/src/canonical/minisprites/gen6/pokemon/0037-420-Vulpix-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0037--420--Vulpix--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0037-420-Vulpix-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0038--000--Ninetales.png b/src/canonical/minisprites/gen6/pokemon/0038-000-Ninetales.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0038--000--Ninetales.png
rename to src/canonical/minisprites/gen6/pokemon/0038-000-Ninetales.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0038--420--Ninetales--Alola.png b/src/canonical/minisprites/gen6/pokemon/0038-420-Ninetales-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0038--420--Ninetales--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0038-420-Ninetales-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0039--000--Jigglypuff.png b/src/canonical/minisprites/gen6/pokemon/0039-000-Jigglypuff.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0039--000--Jigglypuff.png
rename to src/canonical/minisprites/gen6/pokemon/0039-000-Jigglypuff.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0040--000--Wigglytuff.png b/src/canonical/minisprites/gen6/pokemon/0040-000-Wigglytuff.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0040--000--Wigglytuff.png
rename to src/canonical/minisprites/gen6/pokemon/0040-000-Wigglytuff.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0041--000--Zubat.png b/src/canonical/minisprites/gen6/pokemon/0041-000-Zubat.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0041--000--Zubat.png
rename to src/canonical/minisprites/gen6/pokemon/0041-000-Zubat.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0042--000--Golbat.png b/src/canonical/minisprites/gen6/pokemon/0042-000-Golbat.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0042--000--Golbat.png
rename to src/canonical/minisprites/gen6/pokemon/0042-000-Golbat.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0043--000--Oddish.png b/src/canonical/minisprites/gen6/pokemon/0043-000-Oddish.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0043--000--Oddish.png
rename to src/canonical/minisprites/gen6/pokemon/0043-000-Oddish.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0044--000--Gloom.png b/src/canonical/minisprites/gen6/pokemon/0044-000-Gloom.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0044--000--Gloom.png
rename to src/canonical/minisprites/gen6/pokemon/0044-000-Gloom.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0045--000--Vileplume.png b/src/canonical/minisprites/gen6/pokemon/0045-000-Vileplume.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0045--000--Vileplume.png
rename to src/canonical/minisprites/gen6/pokemon/0045-000-Vileplume.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0046--000--Paras.png b/src/canonical/minisprites/gen6/pokemon/0046-000-Paras.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0046--000--Paras.png
rename to src/canonical/minisprites/gen6/pokemon/0046-000-Paras.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0047--000--Parasect.png b/src/canonical/minisprites/gen6/pokemon/0047-000-Parasect.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0047--000--Parasect.png
rename to src/canonical/minisprites/gen6/pokemon/0047-000-Parasect.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0048--000--Venonat.png b/src/canonical/minisprites/gen6/pokemon/0048-000-Venonat.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0048--000--Venonat.png
rename to src/canonical/minisprites/gen6/pokemon/0048-000-Venonat.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0049--000--Venomoth.png b/src/canonical/minisprites/gen6/pokemon/0049-000-Venomoth.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0049--000--Venomoth.png
rename to src/canonical/minisprites/gen6/pokemon/0049-000-Venomoth.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0050--000--Diglett.png b/src/canonical/minisprites/gen6/pokemon/0050-000-Diglett.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0050--000--Diglett.png
rename to src/canonical/minisprites/gen6/pokemon/0050-000-Diglett.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0050--420--Diglett--Alola.png b/src/canonical/minisprites/gen6/pokemon/0050-420-Diglett-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0050--420--Diglett--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0050-420-Diglett-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0051--000--Dugtrio.png b/src/canonical/minisprites/gen6/pokemon/0051-000-Dugtrio.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0051--000--Dugtrio.png
rename to src/canonical/minisprites/gen6/pokemon/0051-000-Dugtrio.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0051--420--Dugtrio--Alola.png b/src/canonical/minisprites/gen6/pokemon/0051-420-Dugtrio-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0051--420--Dugtrio--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0051-420-Dugtrio-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0052--000--Meowth.png b/src/canonical/minisprites/gen6/pokemon/0052-000-Meowth.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0052--000--Meowth.png
rename to src/canonical/minisprites/gen6/pokemon/0052-000-Meowth.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0052--420--Meowth--Alola.png b/src/canonical/minisprites/gen6/pokemon/0052-420-Meowth-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0052--420--Meowth--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0052-420-Meowth-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0053--000--Persian.png b/src/canonical/minisprites/gen6/pokemon/0053-000-Persian.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0053--000--Persian.png
rename to src/canonical/minisprites/gen6/pokemon/0053-000-Persian.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0053--420--Persian--Alola.png b/src/canonical/minisprites/gen6/pokemon/0053-420-Persian-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0053--420--Persian--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0053-420-Persian-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0054--000--Psyduck.png b/src/canonical/minisprites/gen6/pokemon/0054-000-Psyduck.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0054--000--Psyduck.png
rename to src/canonical/minisprites/gen6/pokemon/0054-000-Psyduck.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0055--000--Golduck.png b/src/canonical/minisprites/gen6/pokemon/0055-000-Golduck.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0055--000--Golduck.png
rename to src/canonical/minisprites/gen6/pokemon/0055-000-Golduck.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0056--000--Mankey.png b/src/canonical/minisprites/gen6/pokemon/0056-000-Mankey.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0056--000--Mankey.png
rename to src/canonical/minisprites/gen6/pokemon/0056-000-Mankey.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0057--000--Primeape.png b/src/canonical/minisprites/gen6/pokemon/0057-000-Primeape.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0057--000--Primeape.png
rename to src/canonical/minisprites/gen6/pokemon/0057-000-Primeape.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0058--000--Growlithe.png b/src/canonical/minisprites/gen6/pokemon/0058-000-Growlithe.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0058--000--Growlithe.png
rename to src/canonical/minisprites/gen6/pokemon/0058-000-Growlithe.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0059--000--Arcanine.png b/src/canonical/minisprites/gen6/pokemon/0059-000-Arcanine.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0059--000--Arcanine.png
rename to src/canonical/minisprites/gen6/pokemon/0059-000-Arcanine.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0060--000--Poliwag.png b/src/canonical/minisprites/gen6/pokemon/0060-000-Poliwag.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0060--000--Poliwag.png
rename to src/canonical/minisprites/gen6/pokemon/0060-000-Poliwag.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0061--000--Poliwhirl.png b/src/canonical/minisprites/gen6/pokemon/0061-000-Poliwhirl.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0061--000--Poliwhirl.png
rename to src/canonical/minisprites/gen6/pokemon/0061-000-Poliwhirl.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0062--000--Poliwrath.png b/src/canonical/minisprites/gen6/pokemon/0062-000-Poliwrath.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0062--000--Poliwrath.png
rename to src/canonical/minisprites/gen6/pokemon/0062-000-Poliwrath.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0063--000--Abra.png b/src/canonical/minisprites/gen6/pokemon/0063-000-Abra.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0063--000--Abra.png
rename to src/canonical/minisprites/gen6/pokemon/0063-000-Abra.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0064--000--Kadabra.png b/src/canonical/minisprites/gen6/pokemon/0064-000-Kadabra.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0064--000--Kadabra.png
rename to src/canonical/minisprites/gen6/pokemon/0064-000-Kadabra.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0065--000--Alakazam.png b/src/canonical/minisprites/gen6/pokemon/0065-000-Alakazam.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0065--000--Alakazam.png
rename to src/canonical/minisprites/gen6/pokemon/0065-000-Alakazam.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0065--420--Alakazam--Mega.png b/src/canonical/minisprites/gen6/pokemon/0065-420-Alakazam-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0065--420--Alakazam--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0065-420-Alakazam-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0066--000--Machop.png b/src/canonical/minisprites/gen6/pokemon/0066-000-Machop.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0066--000--Machop.png
rename to src/canonical/minisprites/gen6/pokemon/0066-000-Machop.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0067--000--Machoke.png b/src/canonical/minisprites/gen6/pokemon/0067-000-Machoke.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0067--000--Machoke.png
rename to src/canonical/minisprites/gen6/pokemon/0067-000-Machoke.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0068--000--Machamp.png b/src/canonical/minisprites/gen6/pokemon/0068-000-Machamp.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0068--000--Machamp.png
rename to src/canonical/minisprites/gen6/pokemon/0068-000-Machamp.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0069--000--Bellsprout.png b/src/canonical/minisprites/gen6/pokemon/0069-000-Bellsprout.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0069--000--Bellsprout.png
rename to src/canonical/minisprites/gen6/pokemon/0069-000-Bellsprout.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0070--000--Weepinbell.png b/src/canonical/minisprites/gen6/pokemon/0070-000-Weepinbell.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0070--000--Weepinbell.png
rename to src/canonical/minisprites/gen6/pokemon/0070-000-Weepinbell.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0071--000--Victreebel.png b/src/canonical/minisprites/gen6/pokemon/0071-000-Victreebel.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0071--000--Victreebel.png
rename to src/canonical/minisprites/gen6/pokemon/0071-000-Victreebel.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0072--000--Tentacool.png b/src/canonical/minisprites/gen6/pokemon/0072-000-Tentacool.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0072--000--Tentacool.png
rename to src/canonical/minisprites/gen6/pokemon/0072-000-Tentacool.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0073--000--Tentacruel.png b/src/canonical/minisprites/gen6/pokemon/0073-000-Tentacruel.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0073--000--Tentacruel.png
rename to src/canonical/minisprites/gen6/pokemon/0073-000-Tentacruel.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0074--000--Geodude.png b/src/canonical/minisprites/gen6/pokemon/0074-000-Geodude.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0074--000--Geodude.png
rename to src/canonical/minisprites/gen6/pokemon/0074-000-Geodude.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0074--420--Geodude--Alola.png b/src/canonical/minisprites/gen6/pokemon/0074-420-Geodude-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0074--420--Geodude--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0074-420-Geodude-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0075--000--Graveler.png b/src/canonical/minisprites/gen6/pokemon/0075-000-Graveler.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0075--000--Graveler.png
rename to src/canonical/minisprites/gen6/pokemon/0075-000-Graveler.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0075--420--Graveler--Alola.png b/src/canonical/minisprites/gen6/pokemon/0075-420-Graveler-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0075--420--Graveler--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0075-420-Graveler-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0076--000--Golem.png b/src/canonical/minisprites/gen6/pokemon/0076-000-Golem.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0076--000--Golem.png
rename to src/canonical/minisprites/gen6/pokemon/0076-000-Golem.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0076--420--Golem--Alola.png b/src/canonical/minisprites/gen6/pokemon/0076-420-Golem-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0076--420--Golem--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0076-420-Golem-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0077--000--Ponyta.png b/src/canonical/minisprites/gen6/pokemon/0077-000-Ponyta.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0077--000--Ponyta.png
rename to src/canonical/minisprites/gen6/pokemon/0077-000-Ponyta.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0078--000--Rapidash.png b/src/canonical/minisprites/gen6/pokemon/0078-000-Rapidash.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0078--000--Rapidash.png
rename to src/canonical/minisprites/gen6/pokemon/0078-000-Rapidash.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0079--000--Slowpoke.png b/src/canonical/minisprites/gen6/pokemon/0079-000-Slowpoke.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0079--000--Slowpoke.png
rename to src/canonical/minisprites/gen6/pokemon/0079-000-Slowpoke.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0080--000--Slowbro.png b/src/canonical/minisprites/gen6/pokemon/0080-000-Slowbro.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0080--000--Slowbro.png
rename to src/canonical/minisprites/gen6/pokemon/0080-000-Slowbro.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0080--420--Slowbro--Mega.png b/src/canonical/minisprites/gen6/pokemon/0080-420-Slowbro-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0080--420--Slowbro--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0080-420-Slowbro-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0081--000--Magnemite.png b/src/canonical/minisprites/gen6/pokemon/0081-000-Magnemite.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0081--000--Magnemite.png
rename to src/canonical/minisprites/gen6/pokemon/0081-000-Magnemite.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0082--000--Magneton.png b/src/canonical/minisprites/gen6/pokemon/0082-000-Magneton.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0082--000--Magneton.png
rename to src/canonical/minisprites/gen6/pokemon/0082-000-Magneton.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0083--000--Farfetch__0027d.png b/src/canonical/minisprites/gen6/pokemon/0083-000-Farfetch__0027d.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0083--000--Farfetch__0027d.png
rename to src/canonical/minisprites/gen6/pokemon/0083-000-Farfetch__0027d.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0084--000--Doduo.png b/src/canonical/minisprites/gen6/pokemon/0084-000-Doduo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0084--000--Doduo.png
rename to src/canonical/minisprites/gen6/pokemon/0084-000-Doduo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0085--000--Dodrio.png b/src/canonical/minisprites/gen6/pokemon/0085-000-Dodrio.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0085--000--Dodrio.png
rename to src/canonical/minisprites/gen6/pokemon/0085-000-Dodrio.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0086--000--Seel.png b/src/canonical/minisprites/gen6/pokemon/0086-000-Seel.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0086--000--Seel.png
rename to src/canonical/minisprites/gen6/pokemon/0086-000-Seel.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0087--000--Dewgong.png b/src/canonical/minisprites/gen6/pokemon/0087-000-Dewgong.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0087--000--Dewgong.png
rename to src/canonical/minisprites/gen6/pokemon/0087-000-Dewgong.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0088--000--Grimer.png b/src/canonical/minisprites/gen6/pokemon/0088-000-Grimer.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0088--000--Grimer.png
rename to src/canonical/minisprites/gen6/pokemon/0088-000-Grimer.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0088--420--Grimer--Alola.png b/src/canonical/minisprites/gen6/pokemon/0088-420-Grimer-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0088--420--Grimer--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0088-420-Grimer-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0089--000--Muk.png b/src/canonical/minisprites/gen6/pokemon/0089-000-Muk.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0089--000--Muk.png
rename to src/canonical/minisprites/gen6/pokemon/0089-000-Muk.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0089--420--Muk--Alola.png b/src/canonical/minisprites/gen6/pokemon/0089-420-Muk-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0089--420--Muk--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0089-420-Muk-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0090--000--Shellder.png b/src/canonical/minisprites/gen6/pokemon/0090-000-Shellder.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0090--000--Shellder.png
rename to src/canonical/minisprites/gen6/pokemon/0090-000-Shellder.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0091--000--Cloyster.png b/src/canonical/minisprites/gen6/pokemon/0091-000-Cloyster.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0091--000--Cloyster.png
rename to src/canonical/minisprites/gen6/pokemon/0091-000-Cloyster.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0092--000--Gastly.png b/src/canonical/minisprites/gen6/pokemon/0092-000-Gastly.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0092--000--Gastly.png
rename to src/canonical/minisprites/gen6/pokemon/0092-000-Gastly.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0093--000--Haunter.png b/src/canonical/minisprites/gen6/pokemon/0093-000-Haunter.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0093--000--Haunter.png
rename to src/canonical/minisprites/gen6/pokemon/0093-000-Haunter.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0094--000--Gengar.png b/src/canonical/minisprites/gen6/pokemon/0094-000-Gengar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0094--000--Gengar.png
rename to src/canonical/minisprites/gen6/pokemon/0094-000-Gengar.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0094--420--Gengar--Mega.png b/src/canonical/minisprites/gen6/pokemon/0094-420-Gengar-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0094--420--Gengar--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0094-420-Gengar-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0095--000--Onix.png b/src/canonical/minisprites/gen6/pokemon/0095-000-Onix.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0095--000--Onix.png
rename to src/canonical/minisprites/gen6/pokemon/0095-000-Onix.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0096--000--Drowzee.png b/src/canonical/minisprites/gen6/pokemon/0096-000-Drowzee.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0096--000--Drowzee.png
rename to src/canonical/minisprites/gen6/pokemon/0096-000-Drowzee.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0097--000--Hypno.png b/src/canonical/minisprites/gen6/pokemon/0097-000-Hypno.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0097--000--Hypno.png
rename to src/canonical/minisprites/gen6/pokemon/0097-000-Hypno.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0098--000--Krabby.png b/src/canonical/minisprites/gen6/pokemon/0098-000-Krabby.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0098--000--Krabby.png
rename to src/canonical/minisprites/gen6/pokemon/0098-000-Krabby.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0099--000--Kingler.png b/src/canonical/minisprites/gen6/pokemon/0099-000-Kingler.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0099--000--Kingler.png
rename to src/canonical/minisprites/gen6/pokemon/0099-000-Kingler.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0100--000--Voltorb.png b/src/canonical/minisprites/gen6/pokemon/0100-000-Voltorb.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0100--000--Voltorb.png
rename to src/canonical/minisprites/gen6/pokemon/0100-000-Voltorb.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0101--000--Electrode.png b/src/canonical/minisprites/gen6/pokemon/0101-000-Electrode.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0101--000--Electrode.png
rename to src/canonical/minisprites/gen6/pokemon/0101-000-Electrode.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0102--000--Exeggcute.png b/src/canonical/minisprites/gen6/pokemon/0102-000-Exeggcute.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0102--000--Exeggcute.png
rename to src/canonical/minisprites/gen6/pokemon/0102-000-Exeggcute.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0103--000--Exeggutor.png b/src/canonical/minisprites/gen6/pokemon/0103-000-Exeggutor.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0103--000--Exeggutor.png
rename to src/canonical/minisprites/gen6/pokemon/0103-000-Exeggutor.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0103--420--Exeggutor--Alola.png b/src/canonical/minisprites/gen6/pokemon/0103-420-Exeggutor-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0103--420--Exeggutor--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0103-420-Exeggutor-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0104--000--Cubone.png b/src/canonical/minisprites/gen6/pokemon/0104-000-Cubone.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0104--000--Cubone.png
rename to src/canonical/minisprites/gen6/pokemon/0104-000-Cubone.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0105--000--Marowak.png b/src/canonical/minisprites/gen6/pokemon/0105-000-Marowak.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0105--000--Marowak.png
rename to src/canonical/minisprites/gen6/pokemon/0105-000-Marowak.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0105--420--Marowak--Alola.png b/src/canonical/minisprites/gen6/pokemon/0105-420-Marowak-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0105--420--Marowak--Alola.png
rename to src/canonical/minisprites/gen6/pokemon/0105-420-Marowak-Alola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0106--000--Hitmonlee.png b/src/canonical/minisprites/gen6/pokemon/0106-000-Hitmonlee.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0106--000--Hitmonlee.png
rename to src/canonical/minisprites/gen6/pokemon/0106-000-Hitmonlee.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0107--000--Hitmonchan.png b/src/canonical/minisprites/gen6/pokemon/0107-000-Hitmonchan.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0107--000--Hitmonchan.png
rename to src/canonical/minisprites/gen6/pokemon/0107-000-Hitmonchan.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0108--000--Lickitung.png b/src/canonical/minisprites/gen6/pokemon/0108-000-Lickitung.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0108--000--Lickitung.png
rename to src/canonical/minisprites/gen6/pokemon/0108-000-Lickitung.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0109--000--Koffing.png b/src/canonical/minisprites/gen6/pokemon/0109-000-Koffing.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0109--000--Koffing.png
rename to src/canonical/minisprites/gen6/pokemon/0109-000-Koffing.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0110--000--Weezing.png b/src/canonical/minisprites/gen6/pokemon/0110-000-Weezing.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0110--000--Weezing.png
rename to src/canonical/minisprites/gen6/pokemon/0110-000-Weezing.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0111--000--Rhyhorn.png b/src/canonical/minisprites/gen6/pokemon/0111-000-Rhyhorn.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0111--000--Rhyhorn.png
rename to src/canonical/minisprites/gen6/pokemon/0111-000-Rhyhorn.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0112--000--Rhydon.png b/src/canonical/minisprites/gen6/pokemon/0112-000-Rhydon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0112--000--Rhydon.png
rename to src/canonical/minisprites/gen6/pokemon/0112-000-Rhydon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0113--000--Chansey.png b/src/canonical/minisprites/gen6/pokemon/0113-000-Chansey.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0113--000--Chansey.png
rename to src/canonical/minisprites/gen6/pokemon/0113-000-Chansey.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0114--000--Tangela.png b/src/canonical/minisprites/gen6/pokemon/0114-000-Tangela.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0114--000--Tangela.png
rename to src/canonical/minisprites/gen6/pokemon/0114-000-Tangela.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0115--000--Kangaskhan.png b/src/canonical/minisprites/gen6/pokemon/0115-000-Kangaskhan.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0115--000--Kangaskhan.png
rename to src/canonical/minisprites/gen6/pokemon/0115-000-Kangaskhan.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0115--420--Kangaskhan--Mega.png b/src/canonical/minisprites/gen6/pokemon/0115-420-Kangaskhan-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0115--420--Kangaskhan--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0115-420-Kangaskhan-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0116--000--Horsea.png b/src/canonical/minisprites/gen6/pokemon/0116-000-Horsea.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0116--000--Horsea.png
rename to src/canonical/minisprites/gen6/pokemon/0116-000-Horsea.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0117--000--Seadra.png b/src/canonical/minisprites/gen6/pokemon/0117-000-Seadra.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0117--000--Seadra.png
rename to src/canonical/minisprites/gen6/pokemon/0117-000-Seadra.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0118--000--Goldeen.png b/src/canonical/minisprites/gen6/pokemon/0118-000-Goldeen.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0118--000--Goldeen.png
rename to src/canonical/minisprites/gen6/pokemon/0118-000-Goldeen.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0119--000--Seaking.png b/src/canonical/minisprites/gen6/pokemon/0119-000-Seaking.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0119--000--Seaking.png
rename to src/canonical/minisprites/gen6/pokemon/0119-000-Seaking.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0120--000--Staryu.png b/src/canonical/minisprites/gen6/pokemon/0120-000-Staryu.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0120--000--Staryu.png
rename to src/canonical/minisprites/gen6/pokemon/0120-000-Staryu.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0121--000--Starmie.png b/src/canonical/minisprites/gen6/pokemon/0121-000-Starmie.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0121--000--Starmie.png
rename to src/canonical/minisprites/gen6/pokemon/0121-000-Starmie.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0122--000--Mr._Mime.png b/src/canonical/minisprites/gen6/pokemon/0122-000-Mr._Mime.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0122--000--Mr._Mime.png
rename to src/canonical/minisprites/gen6/pokemon/0122-000-Mr._Mime.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0123--000--Scyther.png b/src/canonical/minisprites/gen6/pokemon/0123-000-Scyther.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0123--000--Scyther.png
rename to src/canonical/minisprites/gen6/pokemon/0123-000-Scyther.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0124--000--Jynx.png b/src/canonical/minisprites/gen6/pokemon/0124-000-Jynx.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0124--000--Jynx.png
rename to src/canonical/minisprites/gen6/pokemon/0124-000-Jynx.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0125--000--Electabuzz.png b/src/canonical/minisprites/gen6/pokemon/0125-000-Electabuzz.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0125--000--Electabuzz.png
rename to src/canonical/minisprites/gen6/pokemon/0125-000-Electabuzz.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0126--000--Magmar.png b/src/canonical/minisprites/gen6/pokemon/0126-000-Magmar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0126--000--Magmar.png
rename to src/canonical/minisprites/gen6/pokemon/0126-000-Magmar.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0127--000--Pinsir.png b/src/canonical/minisprites/gen6/pokemon/0127-000-Pinsir.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0127--000--Pinsir.png
rename to src/canonical/minisprites/gen6/pokemon/0127-000-Pinsir.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0127--420--Pinsir--Mega.png b/src/canonical/minisprites/gen6/pokemon/0127-420-Pinsir-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0127--420--Pinsir--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0127-420-Pinsir-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0128--000--Tauros.png b/src/canonical/minisprites/gen6/pokemon/0128-000-Tauros.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0128--000--Tauros.png
rename to src/canonical/minisprites/gen6/pokemon/0128-000-Tauros.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0129--000--Magikarp.png b/src/canonical/minisprites/gen6/pokemon/0129-000-Magikarp.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0129--000--Magikarp.png
rename to src/canonical/minisprites/gen6/pokemon/0129-000-Magikarp.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0130--000--Gyarados.png b/src/canonical/minisprites/gen6/pokemon/0130-000-Gyarados.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0130--000--Gyarados.png
rename to src/canonical/minisprites/gen6/pokemon/0130-000-Gyarados.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0130--420--Gyarados--Mega.png b/src/canonical/minisprites/gen6/pokemon/0130-420-Gyarados-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0130--420--Gyarados--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0130-420-Gyarados-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0131--000--Lapras.png b/src/canonical/minisprites/gen6/pokemon/0131-000-Lapras.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0131--000--Lapras.png
rename to src/canonical/minisprites/gen6/pokemon/0131-000-Lapras.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0132--000--Ditto.png b/src/canonical/minisprites/gen6/pokemon/0132-000-Ditto.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0132--000--Ditto.png
rename to src/canonical/minisprites/gen6/pokemon/0132-000-Ditto.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0133--000--Eevee.png b/src/canonical/minisprites/gen6/pokemon/0133-000-Eevee.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0133--000--Eevee.png
rename to src/canonical/minisprites/gen6/pokemon/0133-000-Eevee.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0133--420--Eevee--Starter.png b/src/canonical/minisprites/gen6/pokemon/0133-420-Eevee-Starter.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0133--420--Eevee--Starter.png
rename to src/canonical/minisprites/gen6/pokemon/0133-420-Eevee-Starter.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0134--000--Vaporeon.png b/src/canonical/minisprites/gen6/pokemon/0134-000-Vaporeon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0134--000--Vaporeon.png
rename to src/canonical/minisprites/gen6/pokemon/0134-000-Vaporeon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0135--000--Jolteon.png b/src/canonical/minisprites/gen6/pokemon/0135-000-Jolteon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0135--000--Jolteon.png
rename to src/canonical/minisprites/gen6/pokemon/0135-000-Jolteon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0136--000--Flareon.png b/src/canonical/minisprites/gen6/pokemon/0136-000-Flareon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0136--000--Flareon.png
rename to src/canonical/minisprites/gen6/pokemon/0136-000-Flareon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0137--000--Porygon.png b/src/canonical/minisprites/gen6/pokemon/0137-000-Porygon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0137--000--Porygon.png
rename to src/canonical/minisprites/gen6/pokemon/0137-000-Porygon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0138--000--Omanyte.png b/src/canonical/minisprites/gen6/pokemon/0138-000-Omanyte.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0138--000--Omanyte.png
rename to src/canonical/minisprites/gen6/pokemon/0138-000-Omanyte.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0139--000--Omastar.png b/src/canonical/minisprites/gen6/pokemon/0139-000-Omastar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0139--000--Omastar.png
rename to src/canonical/minisprites/gen6/pokemon/0139-000-Omastar.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0140--000--Kabuto.png b/src/canonical/minisprites/gen6/pokemon/0140-000-Kabuto.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0140--000--Kabuto.png
rename to src/canonical/minisprites/gen6/pokemon/0140-000-Kabuto.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0141--000--Kabutops.png b/src/canonical/minisprites/gen6/pokemon/0141-000-Kabutops.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0141--000--Kabutops.png
rename to src/canonical/minisprites/gen6/pokemon/0141-000-Kabutops.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0142--000--Aerodactyl.png b/src/canonical/minisprites/gen6/pokemon/0142-000-Aerodactyl.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0142--000--Aerodactyl.png
rename to src/canonical/minisprites/gen6/pokemon/0142-000-Aerodactyl.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0142--420--Aerodactyl--Mega.png b/src/canonical/minisprites/gen6/pokemon/0142-420-Aerodactyl-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0142--420--Aerodactyl--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0142-420-Aerodactyl-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0143--000--Snorlax.png b/src/canonical/minisprites/gen6/pokemon/0143-000-Snorlax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0143--000--Snorlax.png
rename to src/canonical/minisprites/gen6/pokemon/0143-000-Snorlax.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0144--000--Articuno.png b/src/canonical/minisprites/gen6/pokemon/0144-000-Articuno.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0144--000--Articuno.png
rename to src/canonical/minisprites/gen6/pokemon/0144-000-Articuno.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0145--000--Zapdos.png b/src/canonical/minisprites/gen6/pokemon/0145-000-Zapdos.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0145--000--Zapdos.png
rename to src/canonical/minisprites/gen6/pokemon/0145-000-Zapdos.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0146--000--Moltres.png b/src/canonical/minisprites/gen6/pokemon/0146-000-Moltres.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0146--000--Moltres.png
rename to src/canonical/minisprites/gen6/pokemon/0146-000-Moltres.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0147--000--Dratini.png b/src/canonical/minisprites/gen6/pokemon/0147-000-Dratini.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0147--000--Dratini.png
rename to src/canonical/minisprites/gen6/pokemon/0147-000-Dratini.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0148--000--Dragonair.png b/src/canonical/minisprites/gen6/pokemon/0148-000-Dragonair.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0148--000--Dragonair.png
rename to src/canonical/minisprites/gen6/pokemon/0148-000-Dragonair.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0149--000--Dragonite.png b/src/canonical/minisprites/gen6/pokemon/0149-000-Dragonite.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0149--000--Dragonite.png
rename to src/canonical/minisprites/gen6/pokemon/0149-000-Dragonite.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0150--000--Mewtwo.png b/src/canonical/minisprites/gen6/pokemon/0150-000-Mewtwo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0150--000--Mewtwo.png
rename to src/canonical/minisprites/gen6/pokemon/0150-000-Mewtwo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0150--420--Mewtwo--Mega-X.png b/src/canonical/minisprites/gen6/pokemon/0150-420-Mewtwo-Mega~X.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0150--420--Mewtwo--Mega-X.png
rename to src/canonical/minisprites/gen6/pokemon/0150-420-Mewtwo-Mega~X.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0150--420--Mewtwo--Mega-Y.png b/src/canonical/minisprites/gen6/pokemon/0150-420-Mewtwo-Mega~Y.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0150--420--Mewtwo--Mega-Y.png
rename to src/canonical/minisprites/gen6/pokemon/0150-420-Mewtwo-Mega~Y.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0151--000--Mew.png b/src/canonical/minisprites/gen6/pokemon/0151-000-Mew.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0151--000--Mew.png
rename to src/canonical/minisprites/gen6/pokemon/0151-000-Mew.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0152--000--Chikorita.png b/src/canonical/minisprites/gen6/pokemon/0152-000-Chikorita.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0152--000--Chikorita.png
rename to src/canonical/minisprites/gen6/pokemon/0152-000-Chikorita.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0153--000--Bayleef.png b/src/canonical/minisprites/gen6/pokemon/0153-000-Bayleef.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0153--000--Bayleef.png
rename to src/canonical/minisprites/gen6/pokemon/0153-000-Bayleef.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0154--000--Meganium.png b/src/canonical/minisprites/gen6/pokemon/0154-000-Meganium.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0154--000--Meganium.png
rename to src/canonical/minisprites/gen6/pokemon/0154-000-Meganium.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0155--000--Cyndaquil.png b/src/canonical/minisprites/gen6/pokemon/0155-000-Cyndaquil.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0155--000--Cyndaquil.png
rename to src/canonical/minisprites/gen6/pokemon/0155-000-Cyndaquil.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0156--000--Quilava.png b/src/canonical/minisprites/gen6/pokemon/0156-000-Quilava.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0156--000--Quilava.png
rename to src/canonical/minisprites/gen6/pokemon/0156-000-Quilava.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0157--000--Typhlosion.png b/src/canonical/minisprites/gen6/pokemon/0157-000-Typhlosion.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0157--000--Typhlosion.png
rename to src/canonical/minisprites/gen6/pokemon/0157-000-Typhlosion.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0158--000--Totodile.png b/src/canonical/minisprites/gen6/pokemon/0158-000-Totodile.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0158--000--Totodile.png
rename to src/canonical/minisprites/gen6/pokemon/0158-000-Totodile.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0159--000--Croconaw.png b/src/canonical/minisprites/gen6/pokemon/0159-000-Croconaw.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0159--000--Croconaw.png
rename to src/canonical/minisprites/gen6/pokemon/0159-000-Croconaw.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0160--000--Feraligatr.png b/src/canonical/minisprites/gen6/pokemon/0160-000-Feraligatr.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0160--000--Feraligatr.png
rename to src/canonical/minisprites/gen6/pokemon/0160-000-Feraligatr.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0161--000--Sentret.png b/src/canonical/minisprites/gen6/pokemon/0161-000-Sentret.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0161--000--Sentret.png
rename to src/canonical/minisprites/gen6/pokemon/0161-000-Sentret.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0162--000--Furret.png b/src/canonical/minisprites/gen6/pokemon/0162-000-Furret.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0162--000--Furret.png
rename to src/canonical/minisprites/gen6/pokemon/0162-000-Furret.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0163--000--Hoothoot.png b/src/canonical/minisprites/gen6/pokemon/0163-000-Hoothoot.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0163--000--Hoothoot.png
rename to src/canonical/minisprites/gen6/pokemon/0163-000-Hoothoot.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0164--000--Noctowl.png b/src/canonical/minisprites/gen6/pokemon/0164-000-Noctowl.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0164--000--Noctowl.png
rename to src/canonical/minisprites/gen6/pokemon/0164-000-Noctowl.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0165--000--Ledyba.png b/src/canonical/minisprites/gen6/pokemon/0165-000-Ledyba.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0165--000--Ledyba.png
rename to src/canonical/minisprites/gen6/pokemon/0165-000-Ledyba.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0166--000--Ledian.png b/src/canonical/minisprites/gen6/pokemon/0166-000-Ledian.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0166--000--Ledian.png
rename to src/canonical/minisprites/gen6/pokemon/0166-000-Ledian.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0167--000--Spinarak.png b/src/canonical/minisprites/gen6/pokemon/0167-000-Spinarak.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0167--000--Spinarak.png
rename to src/canonical/minisprites/gen6/pokemon/0167-000-Spinarak.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0168--000--Ariados.png b/src/canonical/minisprites/gen6/pokemon/0168-000-Ariados.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0168--000--Ariados.png
rename to src/canonical/minisprites/gen6/pokemon/0168-000-Ariados.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0169--000--Crobat.png b/src/canonical/minisprites/gen6/pokemon/0169-000-Crobat.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0169--000--Crobat.png
rename to src/canonical/minisprites/gen6/pokemon/0169-000-Crobat.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0170--000--Chinchou.png b/src/canonical/minisprites/gen6/pokemon/0170-000-Chinchou.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0170--000--Chinchou.png
rename to src/canonical/minisprites/gen6/pokemon/0170-000-Chinchou.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0171--000--Lanturn.png b/src/canonical/minisprites/gen6/pokemon/0171-000-Lanturn.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0171--000--Lanturn.png
rename to src/canonical/minisprites/gen6/pokemon/0171-000-Lanturn.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0172--000--Pichu.png b/src/canonical/minisprites/gen6/pokemon/0172-000-Pichu.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0172--000--Pichu.png
rename to src/canonical/minisprites/gen6/pokemon/0172-000-Pichu.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0173--000--Cleffa.png b/src/canonical/minisprites/gen6/pokemon/0173-000-Cleffa.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0173--000--Cleffa.png
rename to src/canonical/minisprites/gen6/pokemon/0173-000-Cleffa.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0174--000--Igglybuff.png b/src/canonical/minisprites/gen6/pokemon/0174-000-Igglybuff.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0174--000--Igglybuff.png
rename to src/canonical/minisprites/gen6/pokemon/0174-000-Igglybuff.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0175--000--Togepi.png b/src/canonical/minisprites/gen6/pokemon/0175-000-Togepi.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0175--000--Togepi.png
rename to src/canonical/minisprites/gen6/pokemon/0175-000-Togepi.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0176--000--Togetic.png b/src/canonical/minisprites/gen6/pokemon/0176-000-Togetic.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0176--000--Togetic.png
rename to src/canonical/minisprites/gen6/pokemon/0176-000-Togetic.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0177--000--Natu.png b/src/canonical/minisprites/gen6/pokemon/0177-000-Natu.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0177--000--Natu.png
rename to src/canonical/minisprites/gen6/pokemon/0177-000-Natu.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0178--000--Xatu.png b/src/canonical/minisprites/gen6/pokemon/0178-000-Xatu.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0178--000--Xatu.png
rename to src/canonical/minisprites/gen6/pokemon/0178-000-Xatu.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0179--000--Mareep.png b/src/canonical/minisprites/gen6/pokemon/0179-000-Mareep.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0179--000--Mareep.png
rename to src/canonical/minisprites/gen6/pokemon/0179-000-Mareep.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0180--000--Flaaffy.png b/src/canonical/minisprites/gen6/pokemon/0180-000-Flaaffy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0180--000--Flaaffy.png
rename to src/canonical/minisprites/gen6/pokemon/0180-000-Flaaffy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0181--000--Ampharos.png b/src/canonical/minisprites/gen6/pokemon/0181-000-Ampharos.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0181--000--Ampharos.png
rename to src/canonical/minisprites/gen6/pokemon/0181-000-Ampharos.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0181--420--Ampharos--Mega.png b/src/canonical/minisprites/gen6/pokemon/0181-420-Ampharos-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0181--420--Ampharos--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0181-420-Ampharos-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0182--000--Bellossom.png b/src/canonical/minisprites/gen6/pokemon/0182-000-Bellossom.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0182--000--Bellossom.png
rename to src/canonical/minisprites/gen6/pokemon/0182-000-Bellossom.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0183--000--Marill.png b/src/canonical/minisprites/gen6/pokemon/0183-000-Marill.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0183--000--Marill.png
rename to src/canonical/minisprites/gen6/pokemon/0183-000-Marill.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0184--000--Azumarill.png b/src/canonical/minisprites/gen6/pokemon/0184-000-Azumarill.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0184--000--Azumarill.png
rename to src/canonical/minisprites/gen6/pokemon/0184-000-Azumarill.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0185--000--Sudowoodo.png b/src/canonical/minisprites/gen6/pokemon/0185-000-Sudowoodo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0185--000--Sudowoodo.png
rename to src/canonical/minisprites/gen6/pokemon/0185-000-Sudowoodo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0186--000--Politoed.png b/src/canonical/minisprites/gen6/pokemon/0186-000-Politoed.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0186--000--Politoed.png
rename to src/canonical/minisprites/gen6/pokemon/0186-000-Politoed.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0187--000--Hoppip.png b/src/canonical/minisprites/gen6/pokemon/0187-000-Hoppip.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0187--000--Hoppip.png
rename to src/canonical/minisprites/gen6/pokemon/0187-000-Hoppip.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0188--000--Skiploom.png b/src/canonical/minisprites/gen6/pokemon/0188-000-Skiploom.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0188--000--Skiploom.png
rename to src/canonical/minisprites/gen6/pokemon/0188-000-Skiploom.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0189--000--Jumpluff.png b/src/canonical/minisprites/gen6/pokemon/0189-000-Jumpluff.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0189--000--Jumpluff.png
rename to src/canonical/minisprites/gen6/pokemon/0189-000-Jumpluff.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0190--000--Aipom.png b/src/canonical/minisprites/gen6/pokemon/0190-000-Aipom.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0190--000--Aipom.png
rename to src/canonical/minisprites/gen6/pokemon/0190-000-Aipom.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0191--000--Sunkern.png b/src/canonical/minisprites/gen6/pokemon/0191-000-Sunkern.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0191--000--Sunkern.png
rename to src/canonical/minisprites/gen6/pokemon/0191-000-Sunkern.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0192--000--Sunflora.png b/src/canonical/minisprites/gen6/pokemon/0192-000-Sunflora.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0192--000--Sunflora.png
rename to src/canonical/minisprites/gen6/pokemon/0192-000-Sunflora.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0193--000--Yanma.png b/src/canonical/minisprites/gen6/pokemon/0193-000-Yanma.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0193--000--Yanma.png
rename to src/canonical/minisprites/gen6/pokemon/0193-000-Yanma.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0194--000--Wooper.png b/src/canonical/minisprites/gen6/pokemon/0194-000-Wooper.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0194--000--Wooper.png
rename to src/canonical/minisprites/gen6/pokemon/0194-000-Wooper.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0195--000--Quagsire.png b/src/canonical/minisprites/gen6/pokemon/0195-000-Quagsire.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0195--000--Quagsire.png
rename to src/canonical/minisprites/gen6/pokemon/0195-000-Quagsire.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0196--000--Espeon.png b/src/canonical/minisprites/gen6/pokemon/0196-000-Espeon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0196--000--Espeon.png
rename to src/canonical/minisprites/gen6/pokemon/0196-000-Espeon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0197--000--Umbreon.png b/src/canonical/minisprites/gen6/pokemon/0197-000-Umbreon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0197--000--Umbreon.png
rename to src/canonical/minisprites/gen6/pokemon/0197-000-Umbreon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0198--000--Murkrow.png b/src/canonical/minisprites/gen6/pokemon/0198-000-Murkrow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0198--000--Murkrow.png
rename to src/canonical/minisprites/gen6/pokemon/0198-000-Murkrow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0199--000--Slowking.png b/src/canonical/minisprites/gen6/pokemon/0199-000-Slowking.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0199--000--Slowking.png
rename to src/canonical/minisprites/gen6/pokemon/0199-000-Slowking.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0200--000--Misdreavus.png b/src/canonical/minisprites/gen6/pokemon/0200-000-Misdreavus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0200--000--Misdreavus.png
rename to src/canonical/minisprites/gen6/pokemon/0200-000-Misdreavus.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--000--Unown.png b/src/canonical/minisprites/gen6/pokemon/0201-000-Unown.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--000--Unown.png
rename to src/canonical/minisprites/gen6/pokemon/0201-000-Unown.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--B.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-B.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--B.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-B.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--C.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-C.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--C.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-C.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--D.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-D.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--D.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-D.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--E.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-E.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--E.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-E.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--Exclamation.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-Exclamation.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--Exclamation.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-Exclamation.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--F.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-F.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--F.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-F.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--G.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-G.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--G.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-G.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--H.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-H.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--H.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-H.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--I.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-I.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--I.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-I.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--J.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-J.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--J.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-J.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--K.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-K.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--K.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-K.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--L.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-L.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--L.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-L.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--M.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-M.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--M.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-M.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--N.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-N.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--N.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-N.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--O.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-O.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--O.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-O.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--P.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-P.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--P.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-P.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--Q.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-Q.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--Q.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-Q.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--Question.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-Question.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--Question.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-Question.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--R.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-R.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--R.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-R.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--S.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-S.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--S.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-S.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--T.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-T.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--T.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-T.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--U.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-U.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--U.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-U.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--V.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-V.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--V.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-V.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--W.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-W.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--W.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-W.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--X.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-X.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--X.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-X.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--Y.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-Y.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--Y.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-Y.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0201--420--Unown--Z.png b/src/canonical/minisprites/gen6/pokemon/0201-420-Unown-Z.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0201--420--Unown--Z.png
rename to src/canonical/minisprites/gen6/pokemon/0201-420-Unown-Z.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0202--000--Wobbuffet.png b/src/canonical/minisprites/gen6/pokemon/0202-000-Wobbuffet.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0202--000--Wobbuffet.png
rename to src/canonical/minisprites/gen6/pokemon/0202-000-Wobbuffet.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0203--000--Girafarig.png b/src/canonical/minisprites/gen6/pokemon/0203-000-Girafarig.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0203--000--Girafarig.png
rename to src/canonical/minisprites/gen6/pokemon/0203-000-Girafarig.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0204--000--Pineco.png b/src/canonical/minisprites/gen6/pokemon/0204-000-Pineco.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0204--000--Pineco.png
rename to src/canonical/minisprites/gen6/pokemon/0204-000-Pineco.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0205--000--Forretress.png b/src/canonical/minisprites/gen6/pokemon/0205-000-Forretress.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0205--000--Forretress.png
rename to src/canonical/minisprites/gen6/pokemon/0205-000-Forretress.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0206--000--Dunsparce.png b/src/canonical/minisprites/gen6/pokemon/0206-000-Dunsparce.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0206--000--Dunsparce.png
rename to src/canonical/minisprites/gen6/pokemon/0206-000-Dunsparce.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0207--000--Gligar.png b/src/canonical/minisprites/gen6/pokemon/0207-000-Gligar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0207--000--Gligar.png
rename to src/canonical/minisprites/gen6/pokemon/0207-000-Gligar.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0208--000--Steelix.png b/src/canonical/minisprites/gen6/pokemon/0208-000-Steelix.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0208--000--Steelix.png
rename to src/canonical/minisprites/gen6/pokemon/0208-000-Steelix.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0208--420--Steelix--Mega.png b/src/canonical/minisprites/gen6/pokemon/0208-420-Steelix-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0208--420--Steelix--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0208-420-Steelix-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0209--000--Snubbull.png b/src/canonical/minisprites/gen6/pokemon/0209-000-Snubbull.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0209--000--Snubbull.png
rename to src/canonical/minisprites/gen6/pokemon/0209-000-Snubbull.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0210--000--Granbull.png b/src/canonical/minisprites/gen6/pokemon/0210-000-Granbull.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0210--000--Granbull.png
rename to src/canonical/minisprites/gen6/pokemon/0210-000-Granbull.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0211--000--Qwilfish.png b/src/canonical/minisprites/gen6/pokemon/0211-000-Qwilfish.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0211--000--Qwilfish.png
rename to src/canonical/minisprites/gen6/pokemon/0211-000-Qwilfish.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0212--000--Scizor.png b/src/canonical/minisprites/gen6/pokemon/0212-000-Scizor.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0212--000--Scizor.png
rename to src/canonical/minisprites/gen6/pokemon/0212-000-Scizor.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0212--420--Scizor--Mega.png b/src/canonical/minisprites/gen6/pokemon/0212-420-Scizor-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0212--420--Scizor--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0212-420-Scizor-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0213--000--Shuckle.png b/src/canonical/minisprites/gen6/pokemon/0213-000-Shuckle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0213--000--Shuckle.png
rename to src/canonical/minisprites/gen6/pokemon/0213-000-Shuckle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0214--000--Heracross.png b/src/canonical/minisprites/gen6/pokemon/0214-000-Heracross.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0214--000--Heracross.png
rename to src/canonical/minisprites/gen6/pokemon/0214-000-Heracross.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0214--420--Heracross--Mega.png b/src/canonical/minisprites/gen6/pokemon/0214-420-Heracross-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0214--420--Heracross--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0214-420-Heracross-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0215--000--Sneasel.png b/src/canonical/minisprites/gen6/pokemon/0215-000-Sneasel.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0215--000--Sneasel.png
rename to src/canonical/minisprites/gen6/pokemon/0215-000-Sneasel.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0216--000--Teddiursa.png b/src/canonical/minisprites/gen6/pokemon/0216-000-Teddiursa.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0216--000--Teddiursa.png
rename to src/canonical/minisprites/gen6/pokemon/0216-000-Teddiursa.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0217--000--Ursaring.png b/src/canonical/minisprites/gen6/pokemon/0217-000-Ursaring.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0217--000--Ursaring.png
rename to src/canonical/minisprites/gen6/pokemon/0217-000-Ursaring.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0218--000--Slugma.png b/src/canonical/minisprites/gen6/pokemon/0218-000-Slugma.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0218--000--Slugma.png
rename to src/canonical/minisprites/gen6/pokemon/0218-000-Slugma.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0219--000--Magcargo.png b/src/canonical/minisprites/gen6/pokemon/0219-000-Magcargo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0219--000--Magcargo.png
rename to src/canonical/minisprites/gen6/pokemon/0219-000-Magcargo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0220--000--Swinub.png b/src/canonical/minisprites/gen6/pokemon/0220-000-Swinub.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0220--000--Swinub.png
rename to src/canonical/minisprites/gen6/pokemon/0220-000-Swinub.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0221--000--Piloswine.png b/src/canonical/minisprites/gen6/pokemon/0221-000-Piloswine.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0221--000--Piloswine.png
rename to src/canonical/minisprites/gen6/pokemon/0221-000-Piloswine.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0222--000--Corsola.png b/src/canonical/minisprites/gen6/pokemon/0222-000-Corsola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0222--000--Corsola.png
rename to src/canonical/minisprites/gen6/pokemon/0222-000-Corsola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0223--000--Remoraid.png b/src/canonical/minisprites/gen6/pokemon/0223-000-Remoraid.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0223--000--Remoraid.png
rename to src/canonical/minisprites/gen6/pokemon/0223-000-Remoraid.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0224--000--Octillery.png b/src/canonical/minisprites/gen6/pokemon/0224-000-Octillery.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0224--000--Octillery.png
rename to src/canonical/minisprites/gen6/pokemon/0224-000-Octillery.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0225--000--Delibird.png b/src/canonical/minisprites/gen6/pokemon/0225-000-Delibird.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0225--000--Delibird.png
rename to src/canonical/minisprites/gen6/pokemon/0225-000-Delibird.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0226--000--Mantine.png b/src/canonical/minisprites/gen6/pokemon/0226-000-Mantine.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0226--000--Mantine.png
rename to src/canonical/minisprites/gen6/pokemon/0226-000-Mantine.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0227--000--Skarmory.png b/src/canonical/minisprites/gen6/pokemon/0227-000-Skarmory.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0227--000--Skarmory.png
rename to src/canonical/minisprites/gen6/pokemon/0227-000-Skarmory.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0228--000--Houndour.png b/src/canonical/minisprites/gen6/pokemon/0228-000-Houndour.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0228--000--Houndour.png
rename to src/canonical/minisprites/gen6/pokemon/0228-000-Houndour.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0229--000--Houndoom.png b/src/canonical/minisprites/gen6/pokemon/0229-000-Houndoom.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0229--000--Houndoom.png
rename to src/canonical/minisprites/gen6/pokemon/0229-000-Houndoom.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0229--420--Houndoom--Mega.png b/src/canonical/minisprites/gen6/pokemon/0229-420-Houndoom-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0229--420--Houndoom--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0229-420-Houndoom-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0230--000--Kingdra.png b/src/canonical/minisprites/gen6/pokemon/0230-000-Kingdra.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0230--000--Kingdra.png
rename to src/canonical/minisprites/gen6/pokemon/0230-000-Kingdra.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0231--000--Phanpy.png b/src/canonical/minisprites/gen6/pokemon/0231-000-Phanpy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0231--000--Phanpy.png
rename to src/canonical/minisprites/gen6/pokemon/0231-000-Phanpy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0232--000--Donphan.png b/src/canonical/minisprites/gen6/pokemon/0232-000-Donphan.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0232--000--Donphan.png
rename to src/canonical/minisprites/gen6/pokemon/0232-000-Donphan.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0233--000--Porygon2.png b/src/canonical/minisprites/gen6/pokemon/0233-000-Porygon2.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0233--000--Porygon2.png
rename to src/canonical/minisprites/gen6/pokemon/0233-000-Porygon2.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0234--000--Stantler.png b/src/canonical/minisprites/gen6/pokemon/0234-000-Stantler.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0234--000--Stantler.png
rename to src/canonical/minisprites/gen6/pokemon/0234-000-Stantler.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0235--000--Smeargle.png b/src/canonical/minisprites/gen6/pokemon/0235-000-Smeargle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0235--000--Smeargle.png
rename to src/canonical/minisprites/gen6/pokemon/0235-000-Smeargle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0236--000--Tyrogue.png b/src/canonical/minisprites/gen6/pokemon/0236-000-Tyrogue.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0236--000--Tyrogue.png
rename to src/canonical/minisprites/gen6/pokemon/0236-000-Tyrogue.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0237--000--Hitmontop.png b/src/canonical/minisprites/gen6/pokemon/0237-000-Hitmontop.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0237--000--Hitmontop.png
rename to src/canonical/minisprites/gen6/pokemon/0237-000-Hitmontop.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0238--000--Smoochum.png b/src/canonical/minisprites/gen6/pokemon/0238-000-Smoochum.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0238--000--Smoochum.png
rename to src/canonical/minisprites/gen6/pokemon/0238-000-Smoochum.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0239--000--Elekid.png b/src/canonical/minisprites/gen6/pokemon/0239-000-Elekid.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0239--000--Elekid.png
rename to src/canonical/minisprites/gen6/pokemon/0239-000-Elekid.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0240--000--Magby.png b/src/canonical/minisprites/gen6/pokemon/0240-000-Magby.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0240--000--Magby.png
rename to src/canonical/minisprites/gen6/pokemon/0240-000-Magby.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0241--000--Miltank.png b/src/canonical/minisprites/gen6/pokemon/0241-000-Miltank.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0241--000--Miltank.png
rename to src/canonical/minisprites/gen6/pokemon/0241-000-Miltank.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0242--000--Blissey.png b/src/canonical/minisprites/gen6/pokemon/0242-000-Blissey.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0242--000--Blissey.png
rename to src/canonical/minisprites/gen6/pokemon/0242-000-Blissey.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0243--000--Raikou.png b/src/canonical/minisprites/gen6/pokemon/0243-000-Raikou.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0243--000--Raikou.png
rename to src/canonical/minisprites/gen6/pokemon/0243-000-Raikou.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0244--000--Entei.png b/src/canonical/minisprites/gen6/pokemon/0244-000-Entei.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0244--000--Entei.png
rename to src/canonical/minisprites/gen6/pokemon/0244-000-Entei.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0245--000--Suicune.png b/src/canonical/minisprites/gen6/pokemon/0245-000-Suicune.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0245--000--Suicune.png
rename to src/canonical/minisprites/gen6/pokemon/0245-000-Suicune.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0246--000--Larvitar.png b/src/canonical/minisprites/gen6/pokemon/0246-000-Larvitar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0246--000--Larvitar.png
rename to src/canonical/minisprites/gen6/pokemon/0246-000-Larvitar.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0247--000--Pupitar.png b/src/canonical/minisprites/gen6/pokemon/0247-000-Pupitar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0247--000--Pupitar.png
rename to src/canonical/minisprites/gen6/pokemon/0247-000-Pupitar.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0248--000--Tyranitar.png b/src/canonical/minisprites/gen6/pokemon/0248-000-Tyranitar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0248--000--Tyranitar.png
rename to src/canonical/minisprites/gen6/pokemon/0248-000-Tyranitar.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0248--420--Tyranitar--Mega.png b/src/canonical/minisprites/gen6/pokemon/0248-420-Tyranitar-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0248--420--Tyranitar--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0248-420-Tyranitar-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0249--000--Lugia.png b/src/canonical/minisprites/gen6/pokemon/0249-000-Lugia.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0249--000--Lugia.png
rename to src/canonical/minisprites/gen6/pokemon/0249-000-Lugia.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0250--000--Ho-Oh.png b/src/canonical/minisprites/gen6/pokemon/0250-000-Ho~Oh.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0250--000--Ho-Oh.png
rename to src/canonical/minisprites/gen6/pokemon/0250-000-Ho~Oh.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0251--000--Celebi.png b/src/canonical/minisprites/gen6/pokemon/0251-000-Celebi.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0251--000--Celebi.png
rename to src/canonical/minisprites/gen6/pokemon/0251-000-Celebi.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0252--000--Treecko.png b/src/canonical/minisprites/gen6/pokemon/0252-000-Treecko.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0252--000--Treecko.png
rename to src/canonical/minisprites/gen6/pokemon/0252-000-Treecko.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0253--000--Grovyle.png b/src/canonical/minisprites/gen6/pokemon/0253-000-Grovyle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0253--000--Grovyle.png
rename to src/canonical/minisprites/gen6/pokemon/0253-000-Grovyle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0254--000--Sceptile.png b/src/canonical/minisprites/gen6/pokemon/0254-000-Sceptile.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0254--000--Sceptile.png
rename to src/canonical/minisprites/gen6/pokemon/0254-000-Sceptile.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0254--420--Sceptile--Mega.png b/src/canonical/minisprites/gen6/pokemon/0254-420-Sceptile-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0254--420--Sceptile--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0254-420-Sceptile-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0255--000--Torchic.png b/src/canonical/minisprites/gen6/pokemon/0255-000-Torchic.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0255--000--Torchic.png
rename to src/canonical/minisprites/gen6/pokemon/0255-000-Torchic.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0256--000--Combusken.png b/src/canonical/minisprites/gen6/pokemon/0256-000-Combusken.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0256--000--Combusken.png
rename to src/canonical/minisprites/gen6/pokemon/0256-000-Combusken.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0257--000--Blaziken.png b/src/canonical/minisprites/gen6/pokemon/0257-000-Blaziken.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0257--000--Blaziken.png
rename to src/canonical/minisprites/gen6/pokemon/0257-000-Blaziken.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0257--420--Blaziken--Mega.png b/src/canonical/minisprites/gen6/pokemon/0257-420-Blaziken-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0257--420--Blaziken--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0257-420-Blaziken-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0258--000--Mudkip.png b/src/canonical/minisprites/gen6/pokemon/0258-000-Mudkip.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0258--000--Mudkip.png
rename to src/canonical/minisprites/gen6/pokemon/0258-000-Mudkip.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0259--000--Marshtomp.png b/src/canonical/minisprites/gen6/pokemon/0259-000-Marshtomp.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0259--000--Marshtomp.png
rename to src/canonical/minisprites/gen6/pokemon/0259-000-Marshtomp.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0260--000--Swampert.png b/src/canonical/minisprites/gen6/pokemon/0260-000-Swampert.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0260--000--Swampert.png
rename to src/canonical/minisprites/gen6/pokemon/0260-000-Swampert.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0260--420--Swampert--Mega.png b/src/canonical/minisprites/gen6/pokemon/0260-420-Swampert-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0260--420--Swampert--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0260-420-Swampert-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0261--000--Poochyena.png b/src/canonical/minisprites/gen6/pokemon/0261-000-Poochyena.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0261--000--Poochyena.png
rename to src/canonical/minisprites/gen6/pokemon/0261-000-Poochyena.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0262--000--Mightyena.png b/src/canonical/minisprites/gen6/pokemon/0262-000-Mightyena.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0262--000--Mightyena.png
rename to src/canonical/minisprites/gen6/pokemon/0262-000-Mightyena.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0263--000--Zigzagoon.png b/src/canonical/minisprites/gen6/pokemon/0263-000-Zigzagoon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0263--000--Zigzagoon.png
rename to src/canonical/minisprites/gen6/pokemon/0263-000-Zigzagoon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0264--000--Linoone.png b/src/canonical/minisprites/gen6/pokemon/0264-000-Linoone.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0264--000--Linoone.png
rename to src/canonical/minisprites/gen6/pokemon/0264-000-Linoone.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0265--000--Wurmple.png b/src/canonical/minisprites/gen6/pokemon/0265-000-Wurmple.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0265--000--Wurmple.png
rename to src/canonical/minisprites/gen6/pokemon/0265-000-Wurmple.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0266--000--Silcoon.png b/src/canonical/minisprites/gen6/pokemon/0266-000-Silcoon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0266--000--Silcoon.png
rename to src/canonical/minisprites/gen6/pokemon/0266-000-Silcoon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0267--000--Beautifly.png b/src/canonical/minisprites/gen6/pokemon/0267-000-Beautifly.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0267--000--Beautifly.png
rename to src/canonical/minisprites/gen6/pokemon/0267-000-Beautifly.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0268--000--Cascoon.png b/src/canonical/minisprites/gen6/pokemon/0268-000-Cascoon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0268--000--Cascoon.png
rename to src/canonical/minisprites/gen6/pokemon/0268-000-Cascoon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0269--000--Dustox.png b/src/canonical/minisprites/gen6/pokemon/0269-000-Dustox.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0269--000--Dustox.png
rename to src/canonical/minisprites/gen6/pokemon/0269-000-Dustox.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0270--000--Lotad.png b/src/canonical/minisprites/gen6/pokemon/0270-000-Lotad.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0270--000--Lotad.png
rename to src/canonical/minisprites/gen6/pokemon/0270-000-Lotad.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0271--000--Lombre.png b/src/canonical/minisprites/gen6/pokemon/0271-000-Lombre.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0271--000--Lombre.png
rename to src/canonical/minisprites/gen6/pokemon/0271-000-Lombre.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0272--000--Ludicolo.png b/src/canonical/minisprites/gen6/pokemon/0272-000-Ludicolo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0272--000--Ludicolo.png
rename to src/canonical/minisprites/gen6/pokemon/0272-000-Ludicolo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0273--000--Seedot.png b/src/canonical/minisprites/gen6/pokemon/0273-000-Seedot.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0273--000--Seedot.png
rename to src/canonical/minisprites/gen6/pokemon/0273-000-Seedot.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0274--000--Nuzleaf.png b/src/canonical/minisprites/gen6/pokemon/0274-000-Nuzleaf.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0274--000--Nuzleaf.png
rename to src/canonical/minisprites/gen6/pokemon/0274-000-Nuzleaf.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0275--000--Shiftry.png b/src/canonical/minisprites/gen6/pokemon/0275-000-Shiftry.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0275--000--Shiftry.png
rename to src/canonical/minisprites/gen6/pokemon/0275-000-Shiftry.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0276--000--Taillow.png b/src/canonical/minisprites/gen6/pokemon/0276-000-Taillow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0276--000--Taillow.png
rename to src/canonical/minisprites/gen6/pokemon/0276-000-Taillow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0277--000--Swellow.png b/src/canonical/minisprites/gen6/pokemon/0277-000-Swellow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0277--000--Swellow.png
rename to src/canonical/minisprites/gen6/pokemon/0277-000-Swellow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0278--000--Wingull.png b/src/canonical/minisprites/gen6/pokemon/0278-000-Wingull.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0278--000--Wingull.png
rename to src/canonical/minisprites/gen6/pokemon/0278-000-Wingull.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0279--000--Pelipper.png b/src/canonical/minisprites/gen6/pokemon/0279-000-Pelipper.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0279--000--Pelipper.png
rename to src/canonical/minisprites/gen6/pokemon/0279-000-Pelipper.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0280--000--Ralts.png b/src/canonical/minisprites/gen6/pokemon/0280-000-Ralts.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0280--000--Ralts.png
rename to src/canonical/minisprites/gen6/pokemon/0280-000-Ralts.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0281--000--Kirlia.png b/src/canonical/minisprites/gen6/pokemon/0281-000-Kirlia.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0281--000--Kirlia.png
rename to src/canonical/minisprites/gen6/pokemon/0281-000-Kirlia.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0282--000--Gardevoir.png b/src/canonical/minisprites/gen6/pokemon/0282-000-Gardevoir.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0282--000--Gardevoir.png
rename to src/canonical/minisprites/gen6/pokemon/0282-000-Gardevoir.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0282--420--Gardevoir--Mega.png b/src/canonical/minisprites/gen6/pokemon/0282-420-Gardevoir-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0282--420--Gardevoir--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0282-420-Gardevoir-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0283--000--Surskit.png b/src/canonical/minisprites/gen6/pokemon/0283-000-Surskit.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0283--000--Surskit.png
rename to src/canonical/minisprites/gen6/pokemon/0283-000-Surskit.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0284--000--Masquerain.png b/src/canonical/minisprites/gen6/pokemon/0284-000-Masquerain.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0284--000--Masquerain.png
rename to src/canonical/minisprites/gen6/pokemon/0284-000-Masquerain.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0285--000--Shroomish.png b/src/canonical/minisprites/gen6/pokemon/0285-000-Shroomish.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0285--000--Shroomish.png
rename to src/canonical/minisprites/gen6/pokemon/0285-000-Shroomish.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0286--000--Breloom.png b/src/canonical/minisprites/gen6/pokemon/0286-000-Breloom.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0286--000--Breloom.png
rename to src/canonical/minisprites/gen6/pokemon/0286-000-Breloom.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0287--000--Slakoth.png b/src/canonical/minisprites/gen6/pokemon/0287-000-Slakoth.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0287--000--Slakoth.png
rename to src/canonical/minisprites/gen6/pokemon/0287-000-Slakoth.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0288--000--Vigoroth.png b/src/canonical/minisprites/gen6/pokemon/0288-000-Vigoroth.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0288--000--Vigoroth.png
rename to src/canonical/minisprites/gen6/pokemon/0288-000-Vigoroth.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0289--000--Slaking.png b/src/canonical/minisprites/gen6/pokemon/0289-000-Slaking.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0289--000--Slaking.png
rename to src/canonical/minisprites/gen6/pokemon/0289-000-Slaking.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0290--000--Nincada.png b/src/canonical/minisprites/gen6/pokemon/0290-000-Nincada.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0290--000--Nincada.png
rename to src/canonical/minisprites/gen6/pokemon/0290-000-Nincada.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0291--000--Ninjask.png b/src/canonical/minisprites/gen6/pokemon/0291-000-Ninjask.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0291--000--Ninjask.png
rename to src/canonical/minisprites/gen6/pokemon/0291-000-Ninjask.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0292--000--Shedinja.png b/src/canonical/minisprites/gen6/pokemon/0292-000-Shedinja.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0292--000--Shedinja.png
rename to src/canonical/minisprites/gen6/pokemon/0292-000-Shedinja.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0293--000--Whismur.png b/src/canonical/minisprites/gen6/pokemon/0293-000-Whismur.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0293--000--Whismur.png
rename to src/canonical/minisprites/gen6/pokemon/0293-000-Whismur.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0294--000--Loudred.png b/src/canonical/minisprites/gen6/pokemon/0294-000-Loudred.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0294--000--Loudred.png
rename to src/canonical/minisprites/gen6/pokemon/0294-000-Loudred.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0295--000--Exploud.png b/src/canonical/minisprites/gen6/pokemon/0295-000-Exploud.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0295--000--Exploud.png
rename to src/canonical/minisprites/gen6/pokemon/0295-000-Exploud.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0296--000--Makuhita.png b/src/canonical/minisprites/gen6/pokemon/0296-000-Makuhita.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0296--000--Makuhita.png
rename to src/canonical/minisprites/gen6/pokemon/0296-000-Makuhita.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0297--000--Hariyama.png b/src/canonical/minisprites/gen6/pokemon/0297-000-Hariyama.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0297--000--Hariyama.png
rename to src/canonical/minisprites/gen6/pokemon/0297-000-Hariyama.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0298--000--Azurill.png b/src/canonical/minisprites/gen6/pokemon/0298-000-Azurill.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0298--000--Azurill.png
rename to src/canonical/minisprites/gen6/pokemon/0298-000-Azurill.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0299--000--Nosepass.png b/src/canonical/minisprites/gen6/pokemon/0299-000-Nosepass.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0299--000--Nosepass.png
rename to src/canonical/minisprites/gen6/pokemon/0299-000-Nosepass.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0300--000--Skitty.png b/src/canonical/minisprites/gen6/pokemon/0300-000-Skitty.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0300--000--Skitty.png
rename to src/canonical/minisprites/gen6/pokemon/0300-000-Skitty.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0301--000--Delcatty.png b/src/canonical/minisprites/gen6/pokemon/0301-000-Delcatty.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0301--000--Delcatty.png
rename to src/canonical/minisprites/gen6/pokemon/0301-000-Delcatty.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0302--000--Sableye.png b/src/canonical/minisprites/gen6/pokemon/0302-000-Sableye.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0302--000--Sableye.png
rename to src/canonical/minisprites/gen6/pokemon/0302-000-Sableye.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0302--420--Sableye--Mega.png b/src/canonical/minisprites/gen6/pokemon/0302-420-Sableye-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0302--420--Sableye--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0302-420-Sableye-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0303--000--Mawile.png b/src/canonical/minisprites/gen6/pokemon/0303-000-Mawile.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0303--000--Mawile.png
rename to src/canonical/minisprites/gen6/pokemon/0303-000-Mawile.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0303--420--Mawile--Mega.png b/src/canonical/minisprites/gen6/pokemon/0303-420-Mawile-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0303--420--Mawile--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0303-420-Mawile-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0304--000--Aron.png b/src/canonical/minisprites/gen6/pokemon/0304-000-Aron.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0304--000--Aron.png
rename to src/canonical/minisprites/gen6/pokemon/0304-000-Aron.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0305--000--Lairon.png b/src/canonical/minisprites/gen6/pokemon/0305-000-Lairon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0305--000--Lairon.png
rename to src/canonical/minisprites/gen6/pokemon/0305-000-Lairon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0306--000--Aggron.png b/src/canonical/minisprites/gen6/pokemon/0306-000-Aggron.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0306--000--Aggron.png
rename to src/canonical/minisprites/gen6/pokemon/0306-000-Aggron.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0306--420--Aggron--Mega.png b/src/canonical/minisprites/gen6/pokemon/0306-420-Aggron-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0306--420--Aggron--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0306-420-Aggron-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0307--000--Meditite.png b/src/canonical/minisprites/gen6/pokemon/0307-000-Meditite.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0307--000--Meditite.png
rename to src/canonical/minisprites/gen6/pokemon/0307-000-Meditite.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0308--000--Medicham.png b/src/canonical/minisprites/gen6/pokemon/0308-000-Medicham.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0308--000--Medicham.png
rename to src/canonical/minisprites/gen6/pokemon/0308-000-Medicham.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0308--420--Medicham--Mega.png b/src/canonical/minisprites/gen6/pokemon/0308-420-Medicham-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0308--420--Medicham--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0308-420-Medicham-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0309--000--Electrike.png b/src/canonical/minisprites/gen6/pokemon/0309-000-Electrike.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0309--000--Electrike.png
rename to src/canonical/minisprites/gen6/pokemon/0309-000-Electrike.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0310--000--Manectric.png b/src/canonical/minisprites/gen6/pokemon/0310-000-Manectric.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0310--000--Manectric.png
rename to src/canonical/minisprites/gen6/pokemon/0310-000-Manectric.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0310--420--Manectric--Mega.png b/src/canonical/minisprites/gen6/pokemon/0310-420-Manectric-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0310--420--Manectric--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0310-420-Manectric-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0311--000--Plusle.png b/src/canonical/minisprites/gen6/pokemon/0311-000-Plusle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0311--000--Plusle.png
rename to src/canonical/minisprites/gen6/pokemon/0311-000-Plusle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0312--000--Minun.png b/src/canonical/minisprites/gen6/pokemon/0312-000-Minun.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0312--000--Minun.png
rename to src/canonical/minisprites/gen6/pokemon/0312-000-Minun.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0313--000--Volbeat.png b/src/canonical/minisprites/gen6/pokemon/0313-000-Volbeat.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0313--000--Volbeat.png
rename to src/canonical/minisprites/gen6/pokemon/0313-000-Volbeat.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0314--000--Illumise.png b/src/canonical/minisprites/gen6/pokemon/0314-000-Illumise.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0314--000--Illumise.png
rename to src/canonical/minisprites/gen6/pokemon/0314-000-Illumise.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0315--000--Roselia.png b/src/canonical/minisprites/gen6/pokemon/0315-000-Roselia.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0315--000--Roselia.png
rename to src/canonical/minisprites/gen6/pokemon/0315-000-Roselia.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0316--000--Gulpin.png b/src/canonical/minisprites/gen6/pokemon/0316-000-Gulpin.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0316--000--Gulpin.png
rename to src/canonical/minisprites/gen6/pokemon/0316-000-Gulpin.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0317--000--Swalot.png b/src/canonical/minisprites/gen6/pokemon/0317-000-Swalot.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0317--000--Swalot.png
rename to src/canonical/minisprites/gen6/pokemon/0317-000-Swalot.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0318--000--Carvanha.png b/src/canonical/minisprites/gen6/pokemon/0318-000-Carvanha.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0318--000--Carvanha.png
rename to src/canonical/minisprites/gen6/pokemon/0318-000-Carvanha.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0319--000--Sharpedo.png b/src/canonical/minisprites/gen6/pokemon/0319-000-Sharpedo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0319--000--Sharpedo.png
rename to src/canonical/minisprites/gen6/pokemon/0319-000-Sharpedo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0319--420--Sharpedo--Mega.png b/src/canonical/minisprites/gen6/pokemon/0319-420-Sharpedo-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0319--420--Sharpedo--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0319-420-Sharpedo-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0320--000--Wailmer.png b/src/canonical/minisprites/gen6/pokemon/0320-000-Wailmer.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0320--000--Wailmer.png
rename to src/canonical/minisprites/gen6/pokemon/0320-000-Wailmer.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0321--000--Wailord.png b/src/canonical/minisprites/gen6/pokemon/0321-000-Wailord.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0321--000--Wailord.png
rename to src/canonical/minisprites/gen6/pokemon/0321-000-Wailord.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0322--000--Numel.png b/src/canonical/minisprites/gen6/pokemon/0322-000-Numel.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0322--000--Numel.png
rename to src/canonical/minisprites/gen6/pokemon/0322-000-Numel.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0323--000--Camerupt.png b/src/canonical/minisprites/gen6/pokemon/0323-000-Camerupt.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0323--000--Camerupt.png
rename to src/canonical/minisprites/gen6/pokemon/0323-000-Camerupt.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0323--420--Camerupt--Mega.png b/src/canonical/minisprites/gen6/pokemon/0323-420-Camerupt-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0323--420--Camerupt--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0323-420-Camerupt-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0324--000--Torkoal.png b/src/canonical/minisprites/gen6/pokemon/0324-000-Torkoal.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0324--000--Torkoal.png
rename to src/canonical/minisprites/gen6/pokemon/0324-000-Torkoal.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0325--000--Spoink.png b/src/canonical/minisprites/gen6/pokemon/0325-000-Spoink.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0325--000--Spoink.png
rename to src/canonical/minisprites/gen6/pokemon/0325-000-Spoink.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0326--000--Grumpig.png b/src/canonical/minisprites/gen6/pokemon/0326-000-Grumpig.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0326--000--Grumpig.png
rename to src/canonical/minisprites/gen6/pokemon/0326-000-Grumpig.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0327--000--Spinda.png b/src/canonical/minisprites/gen6/pokemon/0327-000-Spinda.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0327--000--Spinda.png
rename to src/canonical/minisprites/gen6/pokemon/0327-000-Spinda.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0328--000--Trapinch.png b/src/canonical/minisprites/gen6/pokemon/0328-000-Trapinch.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0328--000--Trapinch.png
rename to src/canonical/minisprites/gen6/pokemon/0328-000-Trapinch.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0329--000--Vibrava.png b/src/canonical/minisprites/gen6/pokemon/0329-000-Vibrava.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0329--000--Vibrava.png
rename to src/canonical/minisprites/gen6/pokemon/0329-000-Vibrava.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0330--000--Flygon.png b/src/canonical/minisprites/gen6/pokemon/0330-000-Flygon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0330--000--Flygon.png
rename to src/canonical/minisprites/gen6/pokemon/0330-000-Flygon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0331--000--Cacnea.png b/src/canonical/minisprites/gen6/pokemon/0331-000-Cacnea.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0331--000--Cacnea.png
rename to src/canonical/minisprites/gen6/pokemon/0331-000-Cacnea.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0332--000--Cacturne.png b/src/canonical/minisprites/gen6/pokemon/0332-000-Cacturne.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0332--000--Cacturne.png
rename to src/canonical/minisprites/gen6/pokemon/0332-000-Cacturne.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0333--000--Swablu.png b/src/canonical/minisprites/gen6/pokemon/0333-000-Swablu.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0333--000--Swablu.png
rename to src/canonical/minisprites/gen6/pokemon/0333-000-Swablu.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0334--000--Altaria.png b/src/canonical/minisprites/gen6/pokemon/0334-000-Altaria.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0334--000--Altaria.png
rename to src/canonical/minisprites/gen6/pokemon/0334-000-Altaria.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0334--420--Altaria--Mega.png b/src/canonical/minisprites/gen6/pokemon/0334-420-Altaria-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0334--420--Altaria--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0334-420-Altaria-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0335--000--Zangoose.png b/src/canonical/minisprites/gen6/pokemon/0335-000-Zangoose.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0335--000--Zangoose.png
rename to src/canonical/minisprites/gen6/pokemon/0335-000-Zangoose.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0336--000--Seviper.png b/src/canonical/minisprites/gen6/pokemon/0336-000-Seviper.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0336--000--Seviper.png
rename to src/canonical/minisprites/gen6/pokemon/0336-000-Seviper.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0337--000--Lunatone.png b/src/canonical/minisprites/gen6/pokemon/0337-000-Lunatone.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0337--000--Lunatone.png
rename to src/canonical/minisprites/gen6/pokemon/0337-000-Lunatone.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0338--000--Solrock.png b/src/canonical/minisprites/gen6/pokemon/0338-000-Solrock.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0338--000--Solrock.png
rename to src/canonical/minisprites/gen6/pokemon/0338-000-Solrock.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0339--000--Barboach.png b/src/canonical/minisprites/gen6/pokemon/0339-000-Barboach.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0339--000--Barboach.png
rename to src/canonical/minisprites/gen6/pokemon/0339-000-Barboach.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0340--000--Whiscash.png b/src/canonical/minisprites/gen6/pokemon/0340-000-Whiscash.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0340--000--Whiscash.png
rename to src/canonical/minisprites/gen6/pokemon/0340-000-Whiscash.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0341--000--Corphish.png b/src/canonical/minisprites/gen6/pokemon/0341-000-Corphish.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0341--000--Corphish.png
rename to src/canonical/minisprites/gen6/pokemon/0341-000-Corphish.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0342--000--Crawdaunt.png b/src/canonical/minisprites/gen6/pokemon/0342-000-Crawdaunt.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0342--000--Crawdaunt.png
rename to src/canonical/minisprites/gen6/pokemon/0342-000-Crawdaunt.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0343--000--Baltoy.png b/src/canonical/minisprites/gen6/pokemon/0343-000-Baltoy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0343--000--Baltoy.png
rename to src/canonical/minisprites/gen6/pokemon/0343-000-Baltoy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0344--000--Claydol.png b/src/canonical/minisprites/gen6/pokemon/0344-000-Claydol.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0344--000--Claydol.png
rename to src/canonical/minisprites/gen6/pokemon/0344-000-Claydol.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0345--000--Lileep.png b/src/canonical/minisprites/gen6/pokemon/0345-000-Lileep.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0345--000--Lileep.png
rename to src/canonical/minisprites/gen6/pokemon/0345-000-Lileep.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0346--000--Cradily.png b/src/canonical/minisprites/gen6/pokemon/0346-000-Cradily.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0346--000--Cradily.png
rename to src/canonical/minisprites/gen6/pokemon/0346-000-Cradily.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0347--000--Anorith.png b/src/canonical/minisprites/gen6/pokemon/0347-000-Anorith.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0347--000--Anorith.png
rename to src/canonical/minisprites/gen6/pokemon/0347-000-Anorith.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0348--000--Armaldo.png b/src/canonical/minisprites/gen6/pokemon/0348-000-Armaldo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0348--000--Armaldo.png
rename to src/canonical/minisprites/gen6/pokemon/0348-000-Armaldo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0349--000--Feebas.png b/src/canonical/minisprites/gen6/pokemon/0349-000-Feebas.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0349--000--Feebas.png
rename to src/canonical/minisprites/gen6/pokemon/0349-000-Feebas.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0350--000--Milotic.png b/src/canonical/minisprites/gen6/pokemon/0350-000-Milotic.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0350--000--Milotic.png
rename to src/canonical/minisprites/gen6/pokemon/0350-000-Milotic.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0351--000--Castform.png b/src/canonical/minisprites/gen6/pokemon/0351-000-Castform.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0351--000--Castform.png
rename to src/canonical/minisprites/gen6/pokemon/0351-000-Castform.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0351--420--Castform--Rainy.png b/src/canonical/minisprites/gen6/pokemon/0351-420-Castform-Rainy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0351--420--Castform--Rainy.png
rename to src/canonical/minisprites/gen6/pokemon/0351-420-Castform-Rainy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0351--420--Castform--Snowy.png b/src/canonical/minisprites/gen6/pokemon/0351-420-Castform-Snowy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0351--420--Castform--Snowy.png
rename to src/canonical/minisprites/gen6/pokemon/0351-420-Castform-Snowy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0351--420--Castform--Sunny.png b/src/canonical/minisprites/gen6/pokemon/0351-420-Castform-Sunny.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0351--420--Castform--Sunny.png
rename to src/canonical/minisprites/gen6/pokemon/0351-420-Castform-Sunny.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0352--000--Kecleon.png b/src/canonical/minisprites/gen6/pokemon/0352-000-Kecleon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0352--000--Kecleon.png
rename to src/canonical/minisprites/gen6/pokemon/0352-000-Kecleon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0353--000--Shuppet.png b/src/canonical/minisprites/gen6/pokemon/0353-000-Shuppet.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0353--000--Shuppet.png
rename to src/canonical/minisprites/gen6/pokemon/0353-000-Shuppet.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0354--000--Banette.png b/src/canonical/minisprites/gen6/pokemon/0354-000-Banette.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0354--000--Banette.png
rename to src/canonical/minisprites/gen6/pokemon/0354-000-Banette.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0354--420--Banette--Mega.png b/src/canonical/minisprites/gen6/pokemon/0354-420-Banette-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0354--420--Banette--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0354-420-Banette-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0355--000--Duskull.png b/src/canonical/minisprites/gen6/pokemon/0355-000-Duskull.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0355--000--Duskull.png
rename to src/canonical/minisprites/gen6/pokemon/0355-000-Duskull.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0356--000--Dusclops.png b/src/canonical/minisprites/gen6/pokemon/0356-000-Dusclops.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0356--000--Dusclops.png
rename to src/canonical/minisprites/gen6/pokemon/0356-000-Dusclops.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0357--000--Tropius.png b/src/canonical/minisprites/gen6/pokemon/0357-000-Tropius.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0357--000--Tropius.png
rename to src/canonical/minisprites/gen6/pokemon/0357-000-Tropius.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0358--000--Chimecho.png b/src/canonical/minisprites/gen6/pokemon/0358-000-Chimecho.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0358--000--Chimecho.png
rename to src/canonical/minisprites/gen6/pokemon/0358-000-Chimecho.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0359--000--Absol.png b/src/canonical/minisprites/gen6/pokemon/0359-000-Absol.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0359--000--Absol.png
rename to src/canonical/minisprites/gen6/pokemon/0359-000-Absol.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0359--420--Absol--Mega.png b/src/canonical/minisprites/gen6/pokemon/0359-420-Absol-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0359--420--Absol--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0359-420-Absol-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0360--000--Wynaut.png b/src/canonical/minisprites/gen6/pokemon/0360-000-Wynaut.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0360--000--Wynaut.png
rename to src/canonical/minisprites/gen6/pokemon/0360-000-Wynaut.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0361--000--Snorunt.png b/src/canonical/minisprites/gen6/pokemon/0361-000-Snorunt.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0361--000--Snorunt.png
rename to src/canonical/minisprites/gen6/pokemon/0361-000-Snorunt.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0362--000--Glalie.png b/src/canonical/minisprites/gen6/pokemon/0362-000-Glalie.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0362--000--Glalie.png
rename to src/canonical/minisprites/gen6/pokemon/0362-000-Glalie.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0362--420--Glalie--Mega.png b/src/canonical/minisprites/gen6/pokemon/0362-420-Glalie-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0362--420--Glalie--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0362-420-Glalie-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0363--000--Spheal.png b/src/canonical/minisprites/gen6/pokemon/0363-000-Spheal.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0363--000--Spheal.png
rename to src/canonical/minisprites/gen6/pokemon/0363-000-Spheal.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0364--000--Sealeo.png b/src/canonical/minisprites/gen6/pokemon/0364-000-Sealeo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0364--000--Sealeo.png
rename to src/canonical/minisprites/gen6/pokemon/0364-000-Sealeo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0365--000--Walrein.png b/src/canonical/minisprites/gen6/pokemon/0365-000-Walrein.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0365--000--Walrein.png
rename to src/canonical/minisprites/gen6/pokemon/0365-000-Walrein.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0366--000--Clamperl.png b/src/canonical/minisprites/gen6/pokemon/0366-000-Clamperl.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0366--000--Clamperl.png
rename to src/canonical/minisprites/gen6/pokemon/0366-000-Clamperl.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0367--000--Huntail.png b/src/canonical/minisprites/gen6/pokemon/0367-000-Huntail.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0367--000--Huntail.png
rename to src/canonical/minisprites/gen6/pokemon/0367-000-Huntail.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0368--000--Gorebyss.png b/src/canonical/minisprites/gen6/pokemon/0368-000-Gorebyss.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0368--000--Gorebyss.png
rename to src/canonical/minisprites/gen6/pokemon/0368-000-Gorebyss.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0369--000--Relicanth.png b/src/canonical/minisprites/gen6/pokemon/0369-000-Relicanth.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0369--000--Relicanth.png
rename to src/canonical/minisprites/gen6/pokemon/0369-000-Relicanth.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0370--000--Luvdisc.png b/src/canonical/minisprites/gen6/pokemon/0370-000-Luvdisc.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0370--000--Luvdisc.png
rename to src/canonical/minisprites/gen6/pokemon/0370-000-Luvdisc.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0371--000--Bagon.png b/src/canonical/minisprites/gen6/pokemon/0371-000-Bagon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0371--000--Bagon.png
rename to src/canonical/minisprites/gen6/pokemon/0371-000-Bagon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0372--000--Shelgon.png b/src/canonical/minisprites/gen6/pokemon/0372-000-Shelgon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0372--000--Shelgon.png
rename to src/canonical/minisprites/gen6/pokemon/0372-000-Shelgon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0373--000--Salamence.png b/src/canonical/minisprites/gen6/pokemon/0373-000-Salamence.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0373--000--Salamence.png
rename to src/canonical/minisprites/gen6/pokemon/0373-000-Salamence.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0373--420--Salamence--Mega.png b/src/canonical/minisprites/gen6/pokemon/0373-420-Salamence-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0373--420--Salamence--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0373-420-Salamence-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0374--000--Beldum.png b/src/canonical/minisprites/gen6/pokemon/0374-000-Beldum.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0374--000--Beldum.png
rename to src/canonical/minisprites/gen6/pokemon/0374-000-Beldum.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0375--000--Metang.png b/src/canonical/minisprites/gen6/pokemon/0375-000-Metang.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0375--000--Metang.png
rename to src/canonical/minisprites/gen6/pokemon/0375-000-Metang.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0376--000--Metagross.png b/src/canonical/minisprites/gen6/pokemon/0376-000-Metagross.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0376--000--Metagross.png
rename to src/canonical/minisprites/gen6/pokemon/0376-000-Metagross.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0376--420--Metagross--Mega.png b/src/canonical/minisprites/gen6/pokemon/0376-420-Metagross-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0376--420--Metagross--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0376-420-Metagross-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0377--000--Regirock.png b/src/canonical/minisprites/gen6/pokemon/0377-000-Regirock.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0377--000--Regirock.png
rename to src/canonical/minisprites/gen6/pokemon/0377-000-Regirock.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0378--000--Regice.png b/src/canonical/minisprites/gen6/pokemon/0378-000-Regice.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0378--000--Regice.png
rename to src/canonical/minisprites/gen6/pokemon/0378-000-Regice.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0379--000--Registeel.png b/src/canonical/minisprites/gen6/pokemon/0379-000-Registeel.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0379--000--Registeel.png
rename to src/canonical/minisprites/gen6/pokemon/0379-000-Registeel.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0380--000--Latias.png b/src/canonical/minisprites/gen6/pokemon/0380-000-Latias.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0380--000--Latias.png
rename to src/canonical/minisprites/gen6/pokemon/0380-000-Latias.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0380--420--Latias--Mega.png b/src/canonical/minisprites/gen6/pokemon/0380-420-Latias-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0380--420--Latias--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0380-420-Latias-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0381--000--Latios.png b/src/canonical/minisprites/gen6/pokemon/0381-000-Latios.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0381--000--Latios.png
rename to src/canonical/minisprites/gen6/pokemon/0381-000-Latios.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0381--420--Latios--Mega.png b/src/canonical/minisprites/gen6/pokemon/0381-420-Latios-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0381--420--Latios--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0381-420-Latios-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0382--000--Kyogre.png b/src/canonical/minisprites/gen6/pokemon/0382-000-Kyogre.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0382--000--Kyogre.png
rename to src/canonical/minisprites/gen6/pokemon/0382-000-Kyogre.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0382--420--Kyogre--Primal.png b/src/canonical/minisprites/gen6/pokemon/0382-420-Kyogre-Primal.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0382--420--Kyogre--Primal.png
rename to src/canonical/minisprites/gen6/pokemon/0382-420-Kyogre-Primal.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0383--000--Groudon.png b/src/canonical/minisprites/gen6/pokemon/0383-000-Groudon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0383--000--Groudon.png
rename to src/canonical/minisprites/gen6/pokemon/0383-000-Groudon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0383--420--Groudon--Primal.png b/src/canonical/minisprites/gen6/pokemon/0383-420-Groudon-Primal.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0383--420--Groudon--Primal.png
rename to src/canonical/minisprites/gen6/pokemon/0383-420-Groudon-Primal.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0384--000--Rayquaza.png b/src/canonical/minisprites/gen6/pokemon/0384-000-Rayquaza.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0384--000--Rayquaza.png
rename to src/canonical/minisprites/gen6/pokemon/0384-000-Rayquaza.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0384--420--Rayquaza--Mega.png b/src/canonical/minisprites/gen6/pokemon/0384-420-Rayquaza-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0384--420--Rayquaza--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0384-420-Rayquaza-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0385--000--Jirachi.png b/src/canonical/minisprites/gen6/pokemon/0385-000-Jirachi.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0385--000--Jirachi.png
rename to src/canonical/minisprites/gen6/pokemon/0385-000-Jirachi.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0386--000--Deoxys.png b/src/canonical/minisprites/gen6/pokemon/0386-000-Deoxys.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0386--000--Deoxys.png
rename to src/canonical/minisprites/gen6/pokemon/0386-000-Deoxys.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0386--420--Deoxys--Attack.png b/src/canonical/minisprites/gen6/pokemon/0386-420-Deoxys-Attack.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0386--420--Deoxys--Attack.png
rename to src/canonical/minisprites/gen6/pokemon/0386-420-Deoxys-Attack.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0386--420--Deoxys--Defense.png b/src/canonical/minisprites/gen6/pokemon/0386-420-Deoxys-Defense.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0386--420--Deoxys--Defense.png
rename to src/canonical/minisprites/gen6/pokemon/0386-420-Deoxys-Defense.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0386--420--Deoxys--Speed.png b/src/canonical/minisprites/gen6/pokemon/0386-420-Deoxys-Speed.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0386--420--Deoxys--Speed.png
rename to src/canonical/minisprites/gen6/pokemon/0386-420-Deoxys-Speed.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0387--000--Turtwig.png b/src/canonical/minisprites/gen6/pokemon/0387-000-Turtwig.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0387--000--Turtwig.png
rename to src/canonical/minisprites/gen6/pokemon/0387-000-Turtwig.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0388--000--Grotle.png b/src/canonical/minisprites/gen6/pokemon/0388-000-Grotle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0388--000--Grotle.png
rename to src/canonical/minisprites/gen6/pokemon/0388-000-Grotle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0389--000--Torterra.png b/src/canonical/minisprites/gen6/pokemon/0389-000-Torterra.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0389--000--Torterra.png
rename to src/canonical/minisprites/gen6/pokemon/0389-000-Torterra.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0390--000--Chimchar.png b/src/canonical/minisprites/gen6/pokemon/0390-000-Chimchar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0390--000--Chimchar.png
rename to src/canonical/minisprites/gen6/pokemon/0390-000-Chimchar.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0391--000--Monferno.png b/src/canonical/minisprites/gen6/pokemon/0391-000-Monferno.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0391--000--Monferno.png
rename to src/canonical/minisprites/gen6/pokemon/0391-000-Monferno.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0392--000--Infernape.png b/src/canonical/minisprites/gen6/pokemon/0392-000-Infernape.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0392--000--Infernape.png
rename to src/canonical/minisprites/gen6/pokemon/0392-000-Infernape.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0393--000--Piplup.png b/src/canonical/minisprites/gen6/pokemon/0393-000-Piplup.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0393--000--Piplup.png
rename to src/canonical/minisprites/gen6/pokemon/0393-000-Piplup.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0394--000--Prinplup.png b/src/canonical/minisprites/gen6/pokemon/0394-000-Prinplup.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0394--000--Prinplup.png
rename to src/canonical/minisprites/gen6/pokemon/0394-000-Prinplup.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0395--000--Empoleon.png b/src/canonical/minisprites/gen6/pokemon/0395-000-Empoleon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0395--000--Empoleon.png
rename to src/canonical/minisprites/gen6/pokemon/0395-000-Empoleon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0396--000--Starly.png b/src/canonical/minisprites/gen6/pokemon/0396-000-Starly.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0396--000--Starly.png
rename to src/canonical/minisprites/gen6/pokemon/0396-000-Starly.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0397--000--Staravia.png b/src/canonical/minisprites/gen6/pokemon/0397-000-Staravia.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0397--000--Staravia.png
rename to src/canonical/minisprites/gen6/pokemon/0397-000-Staravia.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0398--000--Staraptor.png b/src/canonical/minisprites/gen6/pokemon/0398-000-Staraptor.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0398--000--Staraptor.png
rename to src/canonical/minisprites/gen6/pokemon/0398-000-Staraptor.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0399--000--Bidoof.png b/src/canonical/minisprites/gen6/pokemon/0399-000-Bidoof.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0399--000--Bidoof.png
rename to src/canonical/minisprites/gen6/pokemon/0399-000-Bidoof.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0400--000--Bibarel.png b/src/canonical/minisprites/gen6/pokemon/0400-000-Bibarel.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0400--000--Bibarel.png
rename to src/canonical/minisprites/gen6/pokemon/0400-000-Bibarel.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0401--000--Kricketot.png b/src/canonical/minisprites/gen6/pokemon/0401-000-Kricketot.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0401--000--Kricketot.png
rename to src/canonical/minisprites/gen6/pokemon/0401-000-Kricketot.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0402--000--Kricketune.png b/src/canonical/minisprites/gen6/pokemon/0402-000-Kricketune.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0402--000--Kricketune.png
rename to src/canonical/minisprites/gen6/pokemon/0402-000-Kricketune.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0403--000--Shinx.png b/src/canonical/minisprites/gen6/pokemon/0403-000-Shinx.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0403--000--Shinx.png
rename to src/canonical/minisprites/gen6/pokemon/0403-000-Shinx.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0404--000--Luxio.png b/src/canonical/minisprites/gen6/pokemon/0404-000-Luxio.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0404--000--Luxio.png
rename to src/canonical/minisprites/gen6/pokemon/0404-000-Luxio.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0405--000--Luxray.png b/src/canonical/minisprites/gen6/pokemon/0405-000-Luxray.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0405--000--Luxray.png
rename to src/canonical/minisprites/gen6/pokemon/0405-000-Luxray.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0406--000--Budew.png b/src/canonical/minisprites/gen6/pokemon/0406-000-Budew.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0406--000--Budew.png
rename to src/canonical/minisprites/gen6/pokemon/0406-000-Budew.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0407--000--Roserade.png b/src/canonical/minisprites/gen6/pokemon/0407-000-Roserade.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0407--000--Roserade.png
rename to src/canonical/minisprites/gen6/pokemon/0407-000-Roserade.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0408--000--Cranidos.png b/src/canonical/minisprites/gen6/pokemon/0408-000-Cranidos.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0408--000--Cranidos.png
rename to src/canonical/minisprites/gen6/pokemon/0408-000-Cranidos.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0409--000--Rampardos.png b/src/canonical/minisprites/gen6/pokemon/0409-000-Rampardos.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0409--000--Rampardos.png
rename to src/canonical/minisprites/gen6/pokemon/0409-000-Rampardos.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0410--000--Shieldon.png b/src/canonical/minisprites/gen6/pokemon/0410-000-Shieldon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0410--000--Shieldon.png
rename to src/canonical/minisprites/gen6/pokemon/0410-000-Shieldon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0411--000--Bastiodon.png b/src/canonical/minisprites/gen6/pokemon/0411-000-Bastiodon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0411--000--Bastiodon.png
rename to src/canonical/minisprites/gen6/pokemon/0411-000-Bastiodon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0412--000--Burmy.png b/src/canonical/minisprites/gen6/pokemon/0412-000-Burmy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0412--000--Burmy.png
rename to src/canonical/minisprites/gen6/pokemon/0412-000-Burmy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0412--420--Burmy--Sandy.png b/src/canonical/minisprites/gen6/pokemon/0412-420-Burmy-Sandy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0412--420--Burmy--Sandy.png
rename to src/canonical/minisprites/gen6/pokemon/0412-420-Burmy-Sandy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0412--420--Burmy--Trash.png b/src/canonical/minisprites/gen6/pokemon/0412-420-Burmy-Trash.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0412--420--Burmy--Trash.png
rename to src/canonical/minisprites/gen6/pokemon/0412-420-Burmy-Trash.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0413--000--Wormadam.png b/src/canonical/minisprites/gen6/pokemon/0413-000-Wormadam.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0413--000--Wormadam.png
rename to src/canonical/minisprites/gen6/pokemon/0413-000-Wormadam.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0413--420--Wormadam--Sandy.png b/src/canonical/minisprites/gen6/pokemon/0413-420-Wormadam-Sandy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0413--420--Wormadam--Sandy.png
rename to src/canonical/minisprites/gen6/pokemon/0413-420-Wormadam-Sandy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0413--420--Wormadam--Trash.png b/src/canonical/minisprites/gen6/pokemon/0413-420-Wormadam-Trash.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0413--420--Wormadam--Trash.png
rename to src/canonical/minisprites/gen6/pokemon/0413-420-Wormadam-Trash.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0414--000--Mothim.png b/src/canonical/minisprites/gen6/pokemon/0414-000-Mothim.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0414--000--Mothim.png
rename to src/canonical/minisprites/gen6/pokemon/0414-000-Mothim.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0415--000--Combee.png b/src/canonical/minisprites/gen6/pokemon/0415-000-Combee.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0415--000--Combee.png
rename to src/canonical/minisprites/gen6/pokemon/0415-000-Combee.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0416--000--Vespiquen.png b/src/canonical/minisprites/gen6/pokemon/0416-000-Vespiquen.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0416--000--Vespiquen.png
rename to src/canonical/minisprites/gen6/pokemon/0416-000-Vespiquen.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0417--000--Pachirisu.png b/src/canonical/minisprites/gen6/pokemon/0417-000-Pachirisu.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0417--000--Pachirisu.png
rename to src/canonical/minisprites/gen6/pokemon/0417-000-Pachirisu.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0418--000--Buizel.png b/src/canonical/minisprites/gen6/pokemon/0418-000-Buizel.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0418--000--Buizel.png
rename to src/canonical/minisprites/gen6/pokemon/0418-000-Buizel.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0419--000--Floatzel.png b/src/canonical/minisprites/gen6/pokemon/0419-000-Floatzel.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0419--000--Floatzel.png
rename to src/canonical/minisprites/gen6/pokemon/0419-000-Floatzel.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0420--000--Cherubi.png b/src/canonical/minisprites/gen6/pokemon/0420-000-Cherubi.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0420--000--Cherubi.png
rename to src/canonical/minisprites/gen6/pokemon/0420-000-Cherubi.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0421--000--Cherrim.png b/src/canonical/minisprites/gen6/pokemon/0421-000-Cherrim.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0421--000--Cherrim.png
rename to src/canonical/minisprites/gen6/pokemon/0421-000-Cherrim.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0421--420--Cherrim--Sunshine.png b/src/canonical/minisprites/gen6/pokemon/0421-420-Cherrim-Sunshine.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0421--420--Cherrim--Sunshine.png
rename to src/canonical/minisprites/gen6/pokemon/0421-420-Cherrim-Sunshine.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0422--000--Shellos.png b/src/canonical/minisprites/gen6/pokemon/0422-000-Shellos.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0422--000--Shellos.png
rename to src/canonical/minisprites/gen6/pokemon/0422-000-Shellos.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0422--420--Shellos--East.png b/src/canonical/minisprites/gen6/pokemon/0422-420-Shellos-East.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0422--420--Shellos--East.png
rename to src/canonical/minisprites/gen6/pokemon/0422-420-Shellos-East.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0423--000--Gastrodon.png b/src/canonical/minisprites/gen6/pokemon/0423-000-Gastrodon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0423--000--Gastrodon.png
rename to src/canonical/minisprites/gen6/pokemon/0423-000-Gastrodon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0423--420--Gastrodon--East.png b/src/canonical/minisprites/gen6/pokemon/0423-420-Gastrodon-East.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0423--420--Gastrodon--East.png
rename to src/canonical/minisprites/gen6/pokemon/0423-420-Gastrodon-East.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0424--000--Ambipom.png b/src/canonical/minisprites/gen6/pokemon/0424-000-Ambipom.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0424--000--Ambipom.png
rename to src/canonical/minisprites/gen6/pokemon/0424-000-Ambipom.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0425--000--Drifloon.png b/src/canonical/minisprites/gen6/pokemon/0425-000-Drifloon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0425--000--Drifloon.png
rename to src/canonical/minisprites/gen6/pokemon/0425-000-Drifloon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0426--000--Drifblim.png b/src/canonical/minisprites/gen6/pokemon/0426-000-Drifblim.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0426--000--Drifblim.png
rename to src/canonical/minisprites/gen6/pokemon/0426-000-Drifblim.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0427--000--Buneary.png b/src/canonical/minisprites/gen6/pokemon/0427-000-Buneary.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0427--000--Buneary.png
rename to src/canonical/minisprites/gen6/pokemon/0427-000-Buneary.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0428--000--Lopunny.png b/src/canonical/minisprites/gen6/pokemon/0428-000-Lopunny.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0428--000--Lopunny.png
rename to src/canonical/minisprites/gen6/pokemon/0428-000-Lopunny.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0428--420--Lopunny--Mega.png b/src/canonical/minisprites/gen6/pokemon/0428-420-Lopunny-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0428--420--Lopunny--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0428-420-Lopunny-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0429--000--Mismagius.png b/src/canonical/minisprites/gen6/pokemon/0429-000-Mismagius.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0429--000--Mismagius.png
rename to src/canonical/minisprites/gen6/pokemon/0429-000-Mismagius.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0430--000--Honchkrow.png b/src/canonical/minisprites/gen6/pokemon/0430-000-Honchkrow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0430--000--Honchkrow.png
rename to src/canonical/minisprites/gen6/pokemon/0430-000-Honchkrow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0431--000--Glameow.png b/src/canonical/minisprites/gen6/pokemon/0431-000-Glameow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0431--000--Glameow.png
rename to src/canonical/minisprites/gen6/pokemon/0431-000-Glameow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0432--000--Purugly.png b/src/canonical/minisprites/gen6/pokemon/0432-000-Purugly.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0432--000--Purugly.png
rename to src/canonical/minisprites/gen6/pokemon/0432-000-Purugly.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0433--000--Chingling.png b/src/canonical/minisprites/gen6/pokemon/0433-000-Chingling.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0433--000--Chingling.png
rename to src/canonical/minisprites/gen6/pokemon/0433-000-Chingling.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0434--000--Stunky.png b/src/canonical/minisprites/gen6/pokemon/0434-000-Stunky.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0434--000--Stunky.png
rename to src/canonical/minisprites/gen6/pokemon/0434-000-Stunky.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0435--000--Skuntank.png b/src/canonical/minisprites/gen6/pokemon/0435-000-Skuntank.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0435--000--Skuntank.png
rename to src/canonical/minisprites/gen6/pokemon/0435-000-Skuntank.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0436--000--Bronzor.png b/src/canonical/minisprites/gen6/pokemon/0436-000-Bronzor.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0436--000--Bronzor.png
rename to src/canonical/minisprites/gen6/pokemon/0436-000-Bronzor.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0437--000--Bronzong.png b/src/canonical/minisprites/gen6/pokemon/0437-000-Bronzong.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0437--000--Bronzong.png
rename to src/canonical/minisprites/gen6/pokemon/0437-000-Bronzong.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0438--000--Bonsly.png b/src/canonical/minisprites/gen6/pokemon/0438-000-Bonsly.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0438--000--Bonsly.png
rename to src/canonical/minisprites/gen6/pokemon/0438-000-Bonsly.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0439--000--Mime_Jr..png b/src/canonical/minisprites/gen6/pokemon/0439-000-Mime_Jr..png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0439--000--Mime_Jr..png
rename to src/canonical/minisprites/gen6/pokemon/0439-000-Mime_Jr..png
diff --git a/src/canonical/minisprites/gen6/pokemon/0440--000--Happiny.png b/src/canonical/minisprites/gen6/pokemon/0440-000-Happiny.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0440--000--Happiny.png
rename to src/canonical/minisprites/gen6/pokemon/0440-000-Happiny.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0441--000--Chatot.png b/src/canonical/minisprites/gen6/pokemon/0441-000-Chatot.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0441--000--Chatot.png
rename to src/canonical/minisprites/gen6/pokemon/0441-000-Chatot.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0442--000--Spiritomb.png b/src/canonical/minisprites/gen6/pokemon/0442-000-Spiritomb.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0442--000--Spiritomb.png
rename to src/canonical/minisprites/gen6/pokemon/0442-000-Spiritomb.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0443--000--Gible.png b/src/canonical/minisprites/gen6/pokemon/0443-000-Gible.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0443--000--Gible.png
rename to src/canonical/minisprites/gen6/pokemon/0443-000-Gible.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0444--000--Gabite.png b/src/canonical/minisprites/gen6/pokemon/0444-000-Gabite.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0444--000--Gabite.png
rename to src/canonical/minisprites/gen6/pokemon/0444-000-Gabite.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0445--000--Garchomp.png b/src/canonical/minisprites/gen6/pokemon/0445-000-Garchomp.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0445--000--Garchomp.png
rename to src/canonical/minisprites/gen6/pokemon/0445-000-Garchomp.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0445--420--Garchomp--Mega.png b/src/canonical/minisprites/gen6/pokemon/0445-420-Garchomp-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0445--420--Garchomp--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0445-420-Garchomp-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0446--000--Munchlax.png b/src/canonical/minisprites/gen6/pokemon/0446-000-Munchlax.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0446--000--Munchlax.png
rename to src/canonical/minisprites/gen6/pokemon/0446-000-Munchlax.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0447--000--Riolu.png b/src/canonical/minisprites/gen6/pokemon/0447-000-Riolu.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0447--000--Riolu.png
rename to src/canonical/minisprites/gen6/pokemon/0447-000-Riolu.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0448--000--Lucario.png b/src/canonical/minisprites/gen6/pokemon/0448-000-Lucario.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0448--000--Lucario.png
rename to src/canonical/minisprites/gen6/pokemon/0448-000-Lucario.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0448--420--Lucario--Mega.png b/src/canonical/minisprites/gen6/pokemon/0448-420-Lucario-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0448--420--Lucario--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0448-420-Lucario-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0449--000--Hippopotas.png b/src/canonical/minisprites/gen6/pokemon/0449-000-Hippopotas.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0449--000--Hippopotas.png
rename to src/canonical/minisprites/gen6/pokemon/0449-000-Hippopotas.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0450--000--Hippowdon.png b/src/canonical/minisprites/gen6/pokemon/0450-000-Hippowdon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0450--000--Hippowdon.png
rename to src/canonical/minisprites/gen6/pokemon/0450-000-Hippowdon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0451--000--Skorupi.png b/src/canonical/minisprites/gen6/pokemon/0451-000-Skorupi.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0451--000--Skorupi.png
rename to src/canonical/minisprites/gen6/pokemon/0451-000-Skorupi.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0452--000--Drapion.png b/src/canonical/minisprites/gen6/pokemon/0452-000-Drapion.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0452--000--Drapion.png
rename to src/canonical/minisprites/gen6/pokemon/0452-000-Drapion.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0453--000--Croagunk.png b/src/canonical/minisprites/gen6/pokemon/0453-000-Croagunk.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0453--000--Croagunk.png
rename to src/canonical/minisprites/gen6/pokemon/0453-000-Croagunk.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0454--000--Toxicroak.png b/src/canonical/minisprites/gen6/pokemon/0454-000-Toxicroak.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0454--000--Toxicroak.png
rename to src/canonical/minisprites/gen6/pokemon/0454-000-Toxicroak.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0455--000--Carnivine.png b/src/canonical/minisprites/gen6/pokemon/0455-000-Carnivine.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0455--000--Carnivine.png
rename to src/canonical/minisprites/gen6/pokemon/0455-000-Carnivine.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0456--000--Finneon.png b/src/canonical/minisprites/gen6/pokemon/0456-000-Finneon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0456--000--Finneon.png
rename to src/canonical/minisprites/gen6/pokemon/0456-000-Finneon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0457--000--Lumineon.png b/src/canonical/minisprites/gen6/pokemon/0457-000-Lumineon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0457--000--Lumineon.png
rename to src/canonical/minisprites/gen6/pokemon/0457-000-Lumineon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0458--000--Mantyke.png b/src/canonical/minisprites/gen6/pokemon/0458-000-Mantyke.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0458--000--Mantyke.png
rename to src/canonical/minisprites/gen6/pokemon/0458-000-Mantyke.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0459--000--Snover.png b/src/canonical/minisprites/gen6/pokemon/0459-000-Snover.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0459--000--Snover.png
rename to src/canonical/minisprites/gen6/pokemon/0459-000-Snover.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0460--000--Abomasnow.png b/src/canonical/minisprites/gen6/pokemon/0460-000-Abomasnow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0460--000--Abomasnow.png
rename to src/canonical/minisprites/gen6/pokemon/0460-000-Abomasnow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0460--420--Abomasnow--Mega.png b/src/canonical/minisprites/gen6/pokemon/0460-420-Abomasnow-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0460--420--Abomasnow--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0460-420-Abomasnow-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0461--000--Weavile.png b/src/canonical/minisprites/gen6/pokemon/0461-000-Weavile.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0461--000--Weavile.png
rename to src/canonical/minisprites/gen6/pokemon/0461-000-Weavile.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0462--000--Magnezone.png b/src/canonical/minisprites/gen6/pokemon/0462-000-Magnezone.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0462--000--Magnezone.png
rename to src/canonical/minisprites/gen6/pokemon/0462-000-Magnezone.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0463--000--Lickilicky.png b/src/canonical/minisprites/gen6/pokemon/0463-000-Lickilicky.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0463--000--Lickilicky.png
rename to src/canonical/minisprites/gen6/pokemon/0463-000-Lickilicky.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0464--000--Rhyperior.png b/src/canonical/minisprites/gen6/pokemon/0464-000-Rhyperior.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0464--000--Rhyperior.png
rename to src/canonical/minisprites/gen6/pokemon/0464-000-Rhyperior.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0465--000--Tangrowth.png b/src/canonical/minisprites/gen6/pokemon/0465-000-Tangrowth.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0465--000--Tangrowth.png
rename to src/canonical/minisprites/gen6/pokemon/0465-000-Tangrowth.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0466--000--Electivire.png b/src/canonical/minisprites/gen6/pokemon/0466-000-Electivire.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0466--000--Electivire.png
rename to src/canonical/minisprites/gen6/pokemon/0466-000-Electivire.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0467--000--Magmortar.png b/src/canonical/minisprites/gen6/pokemon/0467-000-Magmortar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0467--000--Magmortar.png
rename to src/canonical/minisprites/gen6/pokemon/0467-000-Magmortar.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0468--000--Togekiss.png b/src/canonical/minisprites/gen6/pokemon/0468-000-Togekiss.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0468--000--Togekiss.png
rename to src/canonical/minisprites/gen6/pokemon/0468-000-Togekiss.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0469--000--Yanmega.png b/src/canonical/minisprites/gen6/pokemon/0469-000-Yanmega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0469--000--Yanmega.png
rename to src/canonical/minisprites/gen6/pokemon/0469-000-Yanmega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0470--000--Leafeon.png b/src/canonical/minisprites/gen6/pokemon/0470-000-Leafeon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0470--000--Leafeon.png
rename to src/canonical/minisprites/gen6/pokemon/0470-000-Leafeon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0471--000--Glaceon.png b/src/canonical/minisprites/gen6/pokemon/0471-000-Glaceon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0471--000--Glaceon.png
rename to src/canonical/minisprites/gen6/pokemon/0471-000-Glaceon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0472--000--Gliscor.png b/src/canonical/minisprites/gen6/pokemon/0472-000-Gliscor.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0472--000--Gliscor.png
rename to src/canonical/minisprites/gen6/pokemon/0472-000-Gliscor.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0473--000--Mamoswine.png b/src/canonical/minisprites/gen6/pokemon/0473-000-Mamoswine.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0473--000--Mamoswine.png
rename to src/canonical/minisprites/gen6/pokemon/0473-000-Mamoswine.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0474--000--Porygon-Z.png b/src/canonical/minisprites/gen6/pokemon/0474-000-Porygon~Z.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0474--000--Porygon-Z.png
rename to src/canonical/minisprites/gen6/pokemon/0474-000-Porygon~Z.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0475--000--Gallade.png b/src/canonical/minisprites/gen6/pokemon/0475-000-Gallade.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0475--000--Gallade.png
rename to src/canonical/minisprites/gen6/pokemon/0475-000-Gallade.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0475--420--Gallade--Mega.png b/src/canonical/minisprites/gen6/pokemon/0475-420-Gallade-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0475--420--Gallade--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0475-420-Gallade-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0476--000--Probopass.png b/src/canonical/minisprites/gen6/pokemon/0476-000-Probopass.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0476--000--Probopass.png
rename to src/canonical/minisprites/gen6/pokemon/0476-000-Probopass.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0477--000--Dusknoir.png b/src/canonical/minisprites/gen6/pokemon/0477-000-Dusknoir.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0477--000--Dusknoir.png
rename to src/canonical/minisprites/gen6/pokemon/0477-000-Dusknoir.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0478--000--Froslass.png b/src/canonical/minisprites/gen6/pokemon/0478-000-Froslass.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0478--000--Froslass.png
rename to src/canonical/minisprites/gen6/pokemon/0478-000-Froslass.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0479--000--Rotom.png b/src/canonical/minisprites/gen6/pokemon/0479-000-Rotom.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0479--000--Rotom.png
rename to src/canonical/minisprites/gen6/pokemon/0479-000-Rotom.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0479--420--Rotom--Fan.png b/src/canonical/minisprites/gen6/pokemon/0479-420-Rotom-Fan.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0479--420--Rotom--Fan.png
rename to src/canonical/minisprites/gen6/pokemon/0479-420-Rotom-Fan.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0479--420--Rotom--Frost.png b/src/canonical/minisprites/gen6/pokemon/0479-420-Rotom-Frost.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0479--420--Rotom--Frost.png
rename to src/canonical/minisprites/gen6/pokemon/0479-420-Rotom-Frost.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0479--420--Rotom--Heat.png b/src/canonical/minisprites/gen6/pokemon/0479-420-Rotom-Heat.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0479--420--Rotom--Heat.png
rename to src/canonical/minisprites/gen6/pokemon/0479-420-Rotom-Heat.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0479--420--Rotom--Mow.png b/src/canonical/minisprites/gen6/pokemon/0479-420-Rotom-Mow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0479--420--Rotom--Mow.png
rename to src/canonical/minisprites/gen6/pokemon/0479-420-Rotom-Mow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0479--420--Rotom--Wash.png b/src/canonical/minisprites/gen6/pokemon/0479-420-Rotom-Wash.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0479--420--Rotom--Wash.png
rename to src/canonical/minisprites/gen6/pokemon/0479-420-Rotom-Wash.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0480--000--Uxie.png b/src/canonical/minisprites/gen6/pokemon/0480-000-Uxie.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0480--000--Uxie.png
rename to src/canonical/minisprites/gen6/pokemon/0480-000-Uxie.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0481--000--Mesprit.png b/src/canonical/minisprites/gen6/pokemon/0481-000-Mesprit.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0481--000--Mesprit.png
rename to src/canonical/minisprites/gen6/pokemon/0481-000-Mesprit.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0482--000--Azelf.png b/src/canonical/minisprites/gen6/pokemon/0482-000-Azelf.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0482--000--Azelf.png
rename to src/canonical/minisprites/gen6/pokemon/0482-000-Azelf.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0483--000--Dialga.png b/src/canonical/minisprites/gen6/pokemon/0483-000-Dialga.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0483--000--Dialga.png
rename to src/canonical/minisprites/gen6/pokemon/0483-000-Dialga.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0484--000--Palkia.png b/src/canonical/minisprites/gen6/pokemon/0484-000-Palkia.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0484--000--Palkia.png
rename to src/canonical/minisprites/gen6/pokemon/0484-000-Palkia.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0485--000--Heatran.png b/src/canonical/minisprites/gen6/pokemon/0485-000-Heatran.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0485--000--Heatran.png
rename to src/canonical/minisprites/gen6/pokemon/0485-000-Heatran.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0486--000--Regigigas.png b/src/canonical/minisprites/gen6/pokemon/0486-000-Regigigas.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0486--000--Regigigas.png
rename to src/canonical/minisprites/gen6/pokemon/0486-000-Regigigas.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0487--000--Giratina.png b/src/canonical/minisprites/gen6/pokemon/0487-000-Giratina.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0487--000--Giratina.png
rename to src/canonical/minisprites/gen6/pokemon/0487-000-Giratina.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0487--420--Giratina--Origin.png b/src/canonical/minisprites/gen6/pokemon/0487-420-Giratina-Origin.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0487--420--Giratina--Origin.png
rename to src/canonical/minisprites/gen6/pokemon/0487-420-Giratina-Origin.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0488--000--Cresselia.png b/src/canonical/minisprites/gen6/pokemon/0488-000-Cresselia.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0488--000--Cresselia.png
rename to src/canonical/minisprites/gen6/pokemon/0488-000-Cresselia.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0489--000--Phione.png b/src/canonical/minisprites/gen6/pokemon/0489-000-Phione.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0489--000--Phione.png
rename to src/canonical/minisprites/gen6/pokemon/0489-000-Phione.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0490--000--Manaphy.png b/src/canonical/minisprites/gen6/pokemon/0490-000-Manaphy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0490--000--Manaphy.png
rename to src/canonical/minisprites/gen6/pokemon/0490-000-Manaphy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0491--000--Darkrai.png b/src/canonical/minisprites/gen6/pokemon/0491-000-Darkrai.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0491--000--Darkrai.png
rename to src/canonical/minisprites/gen6/pokemon/0491-000-Darkrai.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0492--000--Shaymin.png b/src/canonical/minisprites/gen6/pokemon/0492-000-Shaymin.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0492--000--Shaymin.png
rename to src/canonical/minisprites/gen6/pokemon/0492-000-Shaymin.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0492--420--Shaymin--Sky.png b/src/canonical/minisprites/gen6/pokemon/0492-420-Shaymin-Sky.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0492--420--Shaymin--Sky.png
rename to src/canonical/minisprites/gen6/pokemon/0492-420-Shaymin-Sky.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0493--000--Arceus.png b/src/canonical/minisprites/gen6/pokemon/0493-000-Arceus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0493--000--Arceus.png
rename to src/canonical/minisprites/gen6/pokemon/0493-000-Arceus.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0494--000--Victini.png b/src/canonical/minisprites/gen6/pokemon/0494-000-Victini.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0494--000--Victini.png
rename to src/canonical/minisprites/gen6/pokemon/0494-000-Victini.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0495--000--Snivy.png b/src/canonical/minisprites/gen6/pokemon/0495-000-Snivy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0495--000--Snivy.png
rename to src/canonical/minisprites/gen6/pokemon/0495-000-Snivy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0496--000--Servine.png b/src/canonical/minisprites/gen6/pokemon/0496-000-Servine.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0496--000--Servine.png
rename to src/canonical/minisprites/gen6/pokemon/0496-000-Servine.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0497--000--Serperior.png b/src/canonical/minisprites/gen6/pokemon/0497-000-Serperior.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0497--000--Serperior.png
rename to src/canonical/minisprites/gen6/pokemon/0497-000-Serperior.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0498--000--Tepig.png b/src/canonical/minisprites/gen6/pokemon/0498-000-Tepig.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0498--000--Tepig.png
rename to src/canonical/minisprites/gen6/pokemon/0498-000-Tepig.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0499--000--Pignite.png b/src/canonical/minisprites/gen6/pokemon/0499-000-Pignite.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0499--000--Pignite.png
rename to src/canonical/minisprites/gen6/pokemon/0499-000-Pignite.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0500--000--Emboar.png b/src/canonical/minisprites/gen6/pokemon/0500-000-Emboar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0500--000--Emboar.png
rename to src/canonical/minisprites/gen6/pokemon/0500-000-Emboar.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0501--000--Oshawott.png b/src/canonical/minisprites/gen6/pokemon/0501-000-Oshawott.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0501--000--Oshawott.png
rename to src/canonical/minisprites/gen6/pokemon/0501-000-Oshawott.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0502--000--Dewott.png b/src/canonical/minisprites/gen6/pokemon/0502-000-Dewott.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0502--000--Dewott.png
rename to src/canonical/minisprites/gen6/pokemon/0502-000-Dewott.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0503--000--Samurott.png b/src/canonical/minisprites/gen6/pokemon/0503-000-Samurott.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0503--000--Samurott.png
rename to src/canonical/minisprites/gen6/pokemon/0503-000-Samurott.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0504--000--Patrat.png b/src/canonical/minisprites/gen6/pokemon/0504-000-Patrat.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0504--000--Patrat.png
rename to src/canonical/minisprites/gen6/pokemon/0504-000-Patrat.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0505--000--Watchog.png b/src/canonical/minisprites/gen6/pokemon/0505-000-Watchog.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0505--000--Watchog.png
rename to src/canonical/minisprites/gen6/pokemon/0505-000-Watchog.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0506--000--Lillipup.png b/src/canonical/minisprites/gen6/pokemon/0506-000-Lillipup.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0506--000--Lillipup.png
rename to src/canonical/minisprites/gen6/pokemon/0506-000-Lillipup.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0507--000--Herdier.png b/src/canonical/minisprites/gen6/pokemon/0507-000-Herdier.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0507--000--Herdier.png
rename to src/canonical/minisprites/gen6/pokemon/0507-000-Herdier.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0508--000--Stoutland.png b/src/canonical/minisprites/gen6/pokemon/0508-000-Stoutland.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0508--000--Stoutland.png
rename to src/canonical/minisprites/gen6/pokemon/0508-000-Stoutland.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0509--000--Purrloin.png b/src/canonical/minisprites/gen6/pokemon/0509-000-Purrloin.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0509--000--Purrloin.png
rename to src/canonical/minisprites/gen6/pokemon/0509-000-Purrloin.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0510--000--Liepard.png b/src/canonical/minisprites/gen6/pokemon/0510-000-Liepard.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0510--000--Liepard.png
rename to src/canonical/minisprites/gen6/pokemon/0510-000-Liepard.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0511--000--Pansage.png b/src/canonical/minisprites/gen6/pokemon/0511-000-Pansage.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0511--000--Pansage.png
rename to src/canonical/minisprites/gen6/pokemon/0511-000-Pansage.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0512--000--Simisage.png b/src/canonical/minisprites/gen6/pokemon/0512-000-Simisage.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0512--000--Simisage.png
rename to src/canonical/minisprites/gen6/pokemon/0512-000-Simisage.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0513--000--Pansear.png b/src/canonical/minisprites/gen6/pokemon/0513-000-Pansear.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0513--000--Pansear.png
rename to src/canonical/minisprites/gen6/pokemon/0513-000-Pansear.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0514--000--Simisear.png b/src/canonical/minisprites/gen6/pokemon/0514-000-Simisear.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0514--000--Simisear.png
rename to src/canonical/minisprites/gen6/pokemon/0514-000-Simisear.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0515--000--Panpour.png b/src/canonical/minisprites/gen6/pokemon/0515-000-Panpour.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0515--000--Panpour.png
rename to src/canonical/minisprites/gen6/pokemon/0515-000-Panpour.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0516--000--Simipour.png b/src/canonical/minisprites/gen6/pokemon/0516-000-Simipour.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0516--000--Simipour.png
rename to src/canonical/minisprites/gen6/pokemon/0516-000-Simipour.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0517--000--Munna.png b/src/canonical/minisprites/gen6/pokemon/0517-000-Munna.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0517--000--Munna.png
rename to src/canonical/minisprites/gen6/pokemon/0517-000-Munna.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0518--000--Musharna.png b/src/canonical/minisprites/gen6/pokemon/0518-000-Musharna.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0518--000--Musharna.png
rename to src/canonical/minisprites/gen6/pokemon/0518-000-Musharna.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0519--000--Pidove.png b/src/canonical/minisprites/gen6/pokemon/0519-000-Pidove.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0519--000--Pidove.png
rename to src/canonical/minisprites/gen6/pokemon/0519-000-Pidove.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0520--000--Tranquill.png b/src/canonical/minisprites/gen6/pokemon/0520-000-Tranquill.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0520--000--Tranquill.png
rename to src/canonical/minisprites/gen6/pokemon/0520-000-Tranquill.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0521--000--Unfezant--Female.png b/src/canonical/minisprites/gen6/pokemon/0521-000-Unfezant-Female.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0521--000--Unfezant--Female.png
rename to src/canonical/minisprites/gen6/pokemon/0521-000-Unfezant-Female.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0521--000--Unfezant.png b/src/canonical/minisprites/gen6/pokemon/0521-000-Unfezant.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0521--000--Unfezant.png
rename to src/canonical/minisprites/gen6/pokemon/0521-000-Unfezant.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0522--000--Blitzle.png b/src/canonical/minisprites/gen6/pokemon/0522-000-Blitzle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0522--000--Blitzle.png
rename to src/canonical/minisprites/gen6/pokemon/0522-000-Blitzle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0523--000--Zebstrika.png b/src/canonical/minisprites/gen6/pokemon/0523-000-Zebstrika.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0523--000--Zebstrika.png
rename to src/canonical/minisprites/gen6/pokemon/0523-000-Zebstrika.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0524--000--Roggenrola.png b/src/canonical/minisprites/gen6/pokemon/0524-000-Roggenrola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0524--000--Roggenrola.png
rename to src/canonical/minisprites/gen6/pokemon/0524-000-Roggenrola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0525--000--Boldore.png b/src/canonical/minisprites/gen6/pokemon/0525-000-Boldore.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0525--000--Boldore.png
rename to src/canonical/minisprites/gen6/pokemon/0525-000-Boldore.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0526--000--Gigalith.png b/src/canonical/minisprites/gen6/pokemon/0526-000-Gigalith.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0526--000--Gigalith.png
rename to src/canonical/minisprites/gen6/pokemon/0526-000-Gigalith.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0527--000--Woobat.png b/src/canonical/minisprites/gen6/pokemon/0527-000-Woobat.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0527--000--Woobat.png
rename to src/canonical/minisprites/gen6/pokemon/0527-000-Woobat.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0528--000--Swoobat.png b/src/canonical/minisprites/gen6/pokemon/0528-000-Swoobat.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0528--000--Swoobat.png
rename to src/canonical/minisprites/gen6/pokemon/0528-000-Swoobat.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0529--000--Drilbur.png b/src/canonical/minisprites/gen6/pokemon/0529-000-Drilbur.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0529--000--Drilbur.png
rename to src/canonical/minisprites/gen6/pokemon/0529-000-Drilbur.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0530--000--Excadrill.png b/src/canonical/minisprites/gen6/pokemon/0530-000-Excadrill.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0530--000--Excadrill.png
rename to src/canonical/minisprites/gen6/pokemon/0530-000-Excadrill.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0531--000--Audino.png b/src/canonical/minisprites/gen6/pokemon/0531-000-Audino.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0531--000--Audino.png
rename to src/canonical/minisprites/gen6/pokemon/0531-000-Audino.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0531--420--Audino--Mega.png b/src/canonical/minisprites/gen6/pokemon/0531-420-Audino-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0531--420--Audino--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0531-420-Audino-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0532--000--Timburr.png b/src/canonical/minisprites/gen6/pokemon/0532-000-Timburr.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0532--000--Timburr.png
rename to src/canonical/minisprites/gen6/pokemon/0532-000-Timburr.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0533--000--Gurdurr.png b/src/canonical/minisprites/gen6/pokemon/0533-000-Gurdurr.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0533--000--Gurdurr.png
rename to src/canonical/minisprites/gen6/pokemon/0533-000-Gurdurr.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0534--000--Conkeldurr.png b/src/canonical/minisprites/gen6/pokemon/0534-000-Conkeldurr.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0534--000--Conkeldurr.png
rename to src/canonical/minisprites/gen6/pokemon/0534-000-Conkeldurr.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0535--000--Tympole.png b/src/canonical/minisprites/gen6/pokemon/0535-000-Tympole.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0535--000--Tympole.png
rename to src/canonical/minisprites/gen6/pokemon/0535-000-Tympole.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0536--000--Palpitoad.png b/src/canonical/minisprites/gen6/pokemon/0536-000-Palpitoad.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0536--000--Palpitoad.png
rename to src/canonical/minisprites/gen6/pokemon/0536-000-Palpitoad.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0537--000--Seismitoad.png b/src/canonical/minisprites/gen6/pokemon/0537-000-Seismitoad.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0537--000--Seismitoad.png
rename to src/canonical/minisprites/gen6/pokemon/0537-000-Seismitoad.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0538--000--Throh.png b/src/canonical/minisprites/gen6/pokemon/0538-000-Throh.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0538--000--Throh.png
rename to src/canonical/minisprites/gen6/pokemon/0538-000-Throh.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0539--000--Sawk.png b/src/canonical/minisprites/gen6/pokemon/0539-000-Sawk.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0539--000--Sawk.png
rename to src/canonical/minisprites/gen6/pokemon/0539-000-Sawk.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0540--000--Sewaddle.png b/src/canonical/minisprites/gen6/pokemon/0540-000-Sewaddle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0540--000--Sewaddle.png
rename to src/canonical/minisprites/gen6/pokemon/0540-000-Sewaddle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0541--000--Swadloon.png b/src/canonical/minisprites/gen6/pokemon/0541-000-Swadloon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0541--000--Swadloon.png
rename to src/canonical/minisprites/gen6/pokemon/0541-000-Swadloon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0542--000--Leavanny.png b/src/canonical/minisprites/gen6/pokemon/0542-000-Leavanny.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0542--000--Leavanny.png
rename to src/canonical/minisprites/gen6/pokemon/0542-000-Leavanny.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0543--000--Venipede.png b/src/canonical/minisprites/gen6/pokemon/0543-000-Venipede.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0543--000--Venipede.png
rename to src/canonical/minisprites/gen6/pokemon/0543-000-Venipede.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0544--000--Whirlipede.png b/src/canonical/minisprites/gen6/pokemon/0544-000-Whirlipede.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0544--000--Whirlipede.png
rename to src/canonical/minisprites/gen6/pokemon/0544-000-Whirlipede.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0545--000--Scolipede.png b/src/canonical/minisprites/gen6/pokemon/0545-000-Scolipede.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0545--000--Scolipede.png
rename to src/canonical/minisprites/gen6/pokemon/0545-000-Scolipede.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0546--000--Cottonee.png b/src/canonical/minisprites/gen6/pokemon/0546-000-Cottonee.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0546--000--Cottonee.png
rename to src/canonical/minisprites/gen6/pokemon/0546-000-Cottonee.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0547--000--Whimsicott.png b/src/canonical/minisprites/gen6/pokemon/0547-000-Whimsicott.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0547--000--Whimsicott.png
rename to src/canonical/minisprites/gen6/pokemon/0547-000-Whimsicott.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0548--000--Petilil.png b/src/canonical/minisprites/gen6/pokemon/0548-000-Petilil.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0548--000--Petilil.png
rename to src/canonical/minisprites/gen6/pokemon/0548-000-Petilil.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0549--000--Lilligant.png b/src/canonical/minisprites/gen6/pokemon/0549-000-Lilligant.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0549--000--Lilligant.png
rename to src/canonical/minisprites/gen6/pokemon/0549-000-Lilligant.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0550--000--Basculin.png b/src/canonical/minisprites/gen6/pokemon/0550-000-Basculin.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0550--000--Basculin.png
rename to src/canonical/minisprites/gen6/pokemon/0550-000-Basculin.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0550--420--Basculin--Blue-Striped.png b/src/canonical/minisprites/gen6/pokemon/0550-420-Basculin-Blue~Striped.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0550--420--Basculin--Blue-Striped.png
rename to src/canonical/minisprites/gen6/pokemon/0550-420-Basculin-Blue~Striped.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0551--000--Sandile.png b/src/canonical/minisprites/gen6/pokemon/0551-000-Sandile.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0551--000--Sandile.png
rename to src/canonical/minisprites/gen6/pokemon/0551-000-Sandile.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0552--000--Krokorok.png b/src/canonical/minisprites/gen6/pokemon/0552-000-Krokorok.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0552--000--Krokorok.png
rename to src/canonical/minisprites/gen6/pokemon/0552-000-Krokorok.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0553--000--Krookodile.png b/src/canonical/minisprites/gen6/pokemon/0553-000-Krookodile.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0553--000--Krookodile.png
rename to src/canonical/minisprites/gen6/pokemon/0553-000-Krookodile.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0554--000--Darumaka.png b/src/canonical/minisprites/gen6/pokemon/0554-000-Darumaka.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0554--000--Darumaka.png
rename to src/canonical/minisprites/gen6/pokemon/0554-000-Darumaka.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0555--000--Darmanitan.png b/src/canonical/minisprites/gen6/pokemon/0555-000-Darmanitan.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0555--000--Darmanitan.png
rename to src/canonical/minisprites/gen6/pokemon/0555-000-Darmanitan.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0555--420--Darmanitan--Zen.png b/src/canonical/minisprites/gen6/pokemon/0555-420-Darmanitan-Zen.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0555--420--Darmanitan--Zen.png
rename to src/canonical/minisprites/gen6/pokemon/0555-420-Darmanitan-Zen.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0556--000--Maractus.png b/src/canonical/minisprites/gen6/pokemon/0556-000-Maractus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0556--000--Maractus.png
rename to src/canonical/minisprites/gen6/pokemon/0556-000-Maractus.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0557--000--Dwebble.png b/src/canonical/minisprites/gen6/pokemon/0557-000-Dwebble.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0557--000--Dwebble.png
rename to src/canonical/minisprites/gen6/pokemon/0557-000-Dwebble.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0558--000--Crustle.png b/src/canonical/minisprites/gen6/pokemon/0558-000-Crustle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0558--000--Crustle.png
rename to src/canonical/minisprites/gen6/pokemon/0558-000-Crustle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0559--000--Scraggy.png b/src/canonical/minisprites/gen6/pokemon/0559-000-Scraggy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0559--000--Scraggy.png
rename to src/canonical/minisprites/gen6/pokemon/0559-000-Scraggy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0560--000--Scrafty.png b/src/canonical/minisprites/gen6/pokemon/0560-000-Scrafty.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0560--000--Scrafty.png
rename to src/canonical/minisprites/gen6/pokemon/0560-000-Scrafty.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0561--000--Sigilyph.png b/src/canonical/minisprites/gen6/pokemon/0561-000-Sigilyph.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0561--000--Sigilyph.png
rename to src/canonical/minisprites/gen6/pokemon/0561-000-Sigilyph.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0562--000--Yamask.png b/src/canonical/minisprites/gen6/pokemon/0562-000-Yamask.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0562--000--Yamask.png
rename to src/canonical/minisprites/gen6/pokemon/0562-000-Yamask.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0563--000--Cofagrigus.png b/src/canonical/minisprites/gen6/pokemon/0563-000-Cofagrigus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0563--000--Cofagrigus.png
rename to src/canonical/minisprites/gen6/pokemon/0563-000-Cofagrigus.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0564--000--Tirtouga.png b/src/canonical/minisprites/gen6/pokemon/0564-000-Tirtouga.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0564--000--Tirtouga.png
rename to src/canonical/minisprites/gen6/pokemon/0564-000-Tirtouga.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0565--000--Carracosta.png b/src/canonical/minisprites/gen6/pokemon/0565-000-Carracosta.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0565--000--Carracosta.png
rename to src/canonical/minisprites/gen6/pokemon/0565-000-Carracosta.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0566--000--Archen.png b/src/canonical/minisprites/gen6/pokemon/0566-000-Archen.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0566--000--Archen.png
rename to src/canonical/minisprites/gen6/pokemon/0566-000-Archen.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0567--000--Archeops.png b/src/canonical/minisprites/gen6/pokemon/0567-000-Archeops.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0567--000--Archeops.png
rename to src/canonical/minisprites/gen6/pokemon/0567-000-Archeops.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0568--000--Trubbish.png b/src/canonical/minisprites/gen6/pokemon/0568-000-Trubbish.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0568--000--Trubbish.png
rename to src/canonical/minisprites/gen6/pokemon/0568-000-Trubbish.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0569--000--Garbodor.png b/src/canonical/minisprites/gen6/pokemon/0569-000-Garbodor.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0569--000--Garbodor.png
rename to src/canonical/minisprites/gen6/pokemon/0569-000-Garbodor.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0570--000--Zorua.png b/src/canonical/minisprites/gen6/pokemon/0570-000-Zorua.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0570--000--Zorua.png
rename to src/canonical/minisprites/gen6/pokemon/0570-000-Zorua.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0571--000--Zoroark.png b/src/canonical/minisprites/gen6/pokemon/0571-000-Zoroark.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0571--000--Zoroark.png
rename to src/canonical/minisprites/gen6/pokemon/0571-000-Zoroark.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0572--000--Minccino.png b/src/canonical/minisprites/gen6/pokemon/0572-000-Minccino.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0572--000--Minccino.png
rename to src/canonical/minisprites/gen6/pokemon/0572-000-Minccino.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0573--000--Cinccino.png b/src/canonical/minisprites/gen6/pokemon/0573-000-Cinccino.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0573--000--Cinccino.png
rename to src/canonical/minisprites/gen6/pokemon/0573-000-Cinccino.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0574--000--Gothita.png b/src/canonical/minisprites/gen6/pokemon/0574-000-Gothita.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0574--000--Gothita.png
rename to src/canonical/minisprites/gen6/pokemon/0574-000-Gothita.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0575--000--Gothorita.png b/src/canonical/minisprites/gen6/pokemon/0575-000-Gothorita.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0575--000--Gothorita.png
rename to src/canonical/minisprites/gen6/pokemon/0575-000-Gothorita.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0576--000--Gothitelle.png b/src/canonical/minisprites/gen6/pokemon/0576-000-Gothitelle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0576--000--Gothitelle.png
rename to src/canonical/minisprites/gen6/pokemon/0576-000-Gothitelle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0577--000--Solosis.png b/src/canonical/minisprites/gen6/pokemon/0577-000-Solosis.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0577--000--Solosis.png
rename to src/canonical/minisprites/gen6/pokemon/0577-000-Solosis.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0578--000--Duosion.png b/src/canonical/minisprites/gen6/pokemon/0578-000-Duosion.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0578--000--Duosion.png
rename to src/canonical/minisprites/gen6/pokemon/0578-000-Duosion.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0579--000--Reuniclus.png b/src/canonical/minisprites/gen6/pokemon/0579-000-Reuniclus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0579--000--Reuniclus.png
rename to src/canonical/minisprites/gen6/pokemon/0579-000-Reuniclus.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0580--000--Ducklett.png b/src/canonical/minisprites/gen6/pokemon/0580-000-Ducklett.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0580--000--Ducklett.png
rename to src/canonical/minisprites/gen6/pokemon/0580-000-Ducklett.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0581--000--Swanna.png b/src/canonical/minisprites/gen6/pokemon/0581-000-Swanna.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0581--000--Swanna.png
rename to src/canonical/minisprites/gen6/pokemon/0581-000-Swanna.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0582--000--Vanillite.png b/src/canonical/minisprites/gen6/pokemon/0582-000-Vanillite.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0582--000--Vanillite.png
rename to src/canonical/minisprites/gen6/pokemon/0582-000-Vanillite.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0583--000--Vanillish.png b/src/canonical/minisprites/gen6/pokemon/0583-000-Vanillish.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0583--000--Vanillish.png
rename to src/canonical/minisprites/gen6/pokemon/0583-000-Vanillish.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0584--000--Vanilluxe.png b/src/canonical/minisprites/gen6/pokemon/0584-000-Vanilluxe.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0584--000--Vanilluxe.png
rename to src/canonical/minisprites/gen6/pokemon/0584-000-Vanilluxe.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0585--000--Deerling.png b/src/canonical/minisprites/gen6/pokemon/0585-000-Deerling.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0585--000--Deerling.png
rename to src/canonical/minisprites/gen6/pokemon/0585-000-Deerling.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0585--420--Deerling--Autumn.png b/src/canonical/minisprites/gen6/pokemon/0585-420-Deerling-Autumn.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0585--420--Deerling--Autumn.png
rename to src/canonical/minisprites/gen6/pokemon/0585-420-Deerling-Autumn.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0585--420--Deerling--Summer.png b/src/canonical/minisprites/gen6/pokemon/0585-420-Deerling-Summer.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0585--420--Deerling--Summer.png
rename to src/canonical/minisprites/gen6/pokemon/0585-420-Deerling-Summer.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0585--420--Deerling--Winter.png b/src/canonical/minisprites/gen6/pokemon/0585-420-Deerling-Winter.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0585--420--Deerling--Winter.png
rename to src/canonical/minisprites/gen6/pokemon/0585-420-Deerling-Winter.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0586--000--Sawsbuck.png b/src/canonical/minisprites/gen6/pokemon/0586-000-Sawsbuck.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0586--000--Sawsbuck.png
rename to src/canonical/minisprites/gen6/pokemon/0586-000-Sawsbuck.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0586--420--Sawsbuck--Autumn.png b/src/canonical/minisprites/gen6/pokemon/0586-420-Sawsbuck-Autumn.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0586--420--Sawsbuck--Autumn.png
rename to src/canonical/minisprites/gen6/pokemon/0586-420-Sawsbuck-Autumn.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0586--420--Sawsbuck--Summer.png b/src/canonical/minisprites/gen6/pokemon/0586-420-Sawsbuck-Summer.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0586--420--Sawsbuck--Summer.png
rename to src/canonical/minisprites/gen6/pokemon/0586-420-Sawsbuck-Summer.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0586--420--Sawsbuck--Winter.png b/src/canonical/minisprites/gen6/pokemon/0586-420-Sawsbuck-Winter.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0586--420--Sawsbuck--Winter.png
rename to src/canonical/minisprites/gen6/pokemon/0586-420-Sawsbuck-Winter.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0587--000--Emolga.png b/src/canonical/minisprites/gen6/pokemon/0587-000-Emolga.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0587--000--Emolga.png
rename to src/canonical/minisprites/gen6/pokemon/0587-000-Emolga.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0588--000--Karrablast.png b/src/canonical/minisprites/gen6/pokemon/0588-000-Karrablast.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0588--000--Karrablast.png
rename to src/canonical/minisprites/gen6/pokemon/0588-000-Karrablast.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0589--000--Escavalier.png b/src/canonical/minisprites/gen6/pokemon/0589-000-Escavalier.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0589--000--Escavalier.png
rename to src/canonical/minisprites/gen6/pokemon/0589-000-Escavalier.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0590--000--Foongus.png b/src/canonical/minisprites/gen6/pokemon/0590-000-Foongus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0590--000--Foongus.png
rename to src/canonical/minisprites/gen6/pokemon/0590-000-Foongus.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0591--000--Amoonguss.png b/src/canonical/minisprites/gen6/pokemon/0591-000-Amoonguss.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0591--000--Amoonguss.png
rename to src/canonical/minisprites/gen6/pokemon/0591-000-Amoonguss.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0592--000--Frillish--Female.png b/src/canonical/minisprites/gen6/pokemon/0592-000-Frillish-Female.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0592--000--Frillish--Female.png
rename to src/canonical/minisprites/gen6/pokemon/0592-000-Frillish-Female.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0592--000--Frillish.png b/src/canonical/minisprites/gen6/pokemon/0592-000-Frillish.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0592--000--Frillish.png
rename to src/canonical/minisprites/gen6/pokemon/0592-000-Frillish.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0593--000--Jellicent--Female.png b/src/canonical/minisprites/gen6/pokemon/0593-000-Jellicent-Female.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0593--000--Jellicent--Female.png
rename to src/canonical/minisprites/gen6/pokemon/0593-000-Jellicent-Female.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0593--000--Jellicent.png b/src/canonical/minisprites/gen6/pokemon/0593-000-Jellicent.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0593--000--Jellicent.png
rename to src/canonical/minisprites/gen6/pokemon/0593-000-Jellicent.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0594--000--Alomomola.png b/src/canonical/minisprites/gen6/pokemon/0594-000-Alomomola.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0594--000--Alomomola.png
rename to src/canonical/minisprites/gen6/pokemon/0594-000-Alomomola.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0595--000--Joltik.png b/src/canonical/minisprites/gen6/pokemon/0595-000-Joltik.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0595--000--Joltik.png
rename to src/canonical/minisprites/gen6/pokemon/0595-000-Joltik.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0596--000--Galvantula.png b/src/canonical/minisprites/gen6/pokemon/0596-000-Galvantula.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0596--000--Galvantula.png
rename to src/canonical/minisprites/gen6/pokemon/0596-000-Galvantula.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0597--000--Ferroseed.png b/src/canonical/minisprites/gen6/pokemon/0597-000-Ferroseed.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0597--000--Ferroseed.png
rename to src/canonical/minisprites/gen6/pokemon/0597-000-Ferroseed.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0598--000--Ferrothorn.png b/src/canonical/minisprites/gen6/pokemon/0598-000-Ferrothorn.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0598--000--Ferrothorn.png
rename to src/canonical/minisprites/gen6/pokemon/0598-000-Ferrothorn.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0599--000--Klink.png b/src/canonical/minisprites/gen6/pokemon/0599-000-Klink.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0599--000--Klink.png
rename to src/canonical/minisprites/gen6/pokemon/0599-000-Klink.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0600--000--Klang.png b/src/canonical/minisprites/gen6/pokemon/0600-000-Klang.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0600--000--Klang.png
rename to src/canonical/minisprites/gen6/pokemon/0600-000-Klang.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0601--000--Klinklang.png b/src/canonical/minisprites/gen6/pokemon/0601-000-Klinklang.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0601--000--Klinklang.png
rename to src/canonical/minisprites/gen6/pokemon/0601-000-Klinklang.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0602--000--Tynamo.png b/src/canonical/minisprites/gen6/pokemon/0602-000-Tynamo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0602--000--Tynamo.png
rename to src/canonical/minisprites/gen6/pokemon/0602-000-Tynamo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0603--000--Eelektrik.png b/src/canonical/minisprites/gen6/pokemon/0603-000-Eelektrik.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0603--000--Eelektrik.png
rename to src/canonical/minisprites/gen6/pokemon/0603-000-Eelektrik.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0604--000--Eelektross.png b/src/canonical/minisprites/gen6/pokemon/0604-000-Eelektross.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0604--000--Eelektross.png
rename to src/canonical/minisprites/gen6/pokemon/0604-000-Eelektross.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0605--000--Elgyem.png b/src/canonical/minisprites/gen6/pokemon/0605-000-Elgyem.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0605--000--Elgyem.png
rename to src/canonical/minisprites/gen6/pokemon/0605-000-Elgyem.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0606--000--Beheeyem.png b/src/canonical/minisprites/gen6/pokemon/0606-000-Beheeyem.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0606--000--Beheeyem.png
rename to src/canonical/minisprites/gen6/pokemon/0606-000-Beheeyem.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0607--000--Litwick.png b/src/canonical/minisprites/gen6/pokemon/0607-000-Litwick.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0607--000--Litwick.png
rename to src/canonical/minisprites/gen6/pokemon/0607-000-Litwick.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0608--000--Lampent.png b/src/canonical/minisprites/gen6/pokemon/0608-000-Lampent.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0608--000--Lampent.png
rename to src/canonical/minisprites/gen6/pokemon/0608-000-Lampent.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0609--000--Chandelure.png b/src/canonical/minisprites/gen6/pokemon/0609-000-Chandelure.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0609--000--Chandelure.png
rename to src/canonical/minisprites/gen6/pokemon/0609-000-Chandelure.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0610--000--Axew.png b/src/canonical/minisprites/gen6/pokemon/0610-000-Axew.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0610--000--Axew.png
rename to src/canonical/minisprites/gen6/pokemon/0610-000-Axew.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0611--000--Fraxure.png b/src/canonical/minisprites/gen6/pokemon/0611-000-Fraxure.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0611--000--Fraxure.png
rename to src/canonical/minisprites/gen6/pokemon/0611-000-Fraxure.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0612--000--Haxorus.png b/src/canonical/minisprites/gen6/pokemon/0612-000-Haxorus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0612--000--Haxorus.png
rename to src/canonical/minisprites/gen6/pokemon/0612-000-Haxorus.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0613--000--Cubchoo.png b/src/canonical/minisprites/gen6/pokemon/0613-000-Cubchoo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0613--000--Cubchoo.png
rename to src/canonical/minisprites/gen6/pokemon/0613-000-Cubchoo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0614--000--Beartic.png b/src/canonical/minisprites/gen6/pokemon/0614-000-Beartic.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0614--000--Beartic.png
rename to src/canonical/minisprites/gen6/pokemon/0614-000-Beartic.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0615--000--Cryogonal.png b/src/canonical/minisprites/gen6/pokemon/0615-000-Cryogonal.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0615--000--Cryogonal.png
rename to src/canonical/minisprites/gen6/pokemon/0615-000-Cryogonal.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0616--000--Shelmet.png b/src/canonical/minisprites/gen6/pokemon/0616-000-Shelmet.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0616--000--Shelmet.png
rename to src/canonical/minisprites/gen6/pokemon/0616-000-Shelmet.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0617--000--Accelgor.png b/src/canonical/minisprites/gen6/pokemon/0617-000-Accelgor.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0617--000--Accelgor.png
rename to src/canonical/minisprites/gen6/pokemon/0617-000-Accelgor.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0618--000--Stunfisk.png b/src/canonical/minisprites/gen6/pokemon/0618-000-Stunfisk.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0618--000--Stunfisk.png
rename to src/canonical/minisprites/gen6/pokemon/0618-000-Stunfisk.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0619--000--Mienfoo.png b/src/canonical/minisprites/gen6/pokemon/0619-000-Mienfoo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0619--000--Mienfoo.png
rename to src/canonical/minisprites/gen6/pokemon/0619-000-Mienfoo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0620--000--Mienshao.png b/src/canonical/minisprites/gen6/pokemon/0620-000-Mienshao.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0620--000--Mienshao.png
rename to src/canonical/minisprites/gen6/pokemon/0620-000-Mienshao.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0621--000--Druddigon.png b/src/canonical/minisprites/gen6/pokemon/0621-000-Druddigon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0621--000--Druddigon.png
rename to src/canonical/minisprites/gen6/pokemon/0621-000-Druddigon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0622--000--Golett.png b/src/canonical/minisprites/gen6/pokemon/0622-000-Golett.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0622--000--Golett.png
rename to src/canonical/minisprites/gen6/pokemon/0622-000-Golett.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0623--000--Golurk.png b/src/canonical/minisprites/gen6/pokemon/0623-000-Golurk.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0623--000--Golurk.png
rename to src/canonical/minisprites/gen6/pokemon/0623-000-Golurk.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0624--000--Pawniard.png b/src/canonical/minisprites/gen6/pokemon/0624-000-Pawniard.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0624--000--Pawniard.png
rename to src/canonical/minisprites/gen6/pokemon/0624-000-Pawniard.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0625--000--Bisharp.png b/src/canonical/minisprites/gen6/pokemon/0625-000-Bisharp.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0625--000--Bisharp.png
rename to src/canonical/minisprites/gen6/pokemon/0625-000-Bisharp.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0626--000--Bouffalant.png b/src/canonical/minisprites/gen6/pokemon/0626-000-Bouffalant.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0626--000--Bouffalant.png
rename to src/canonical/minisprites/gen6/pokemon/0626-000-Bouffalant.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0627--000--Rufflet.png b/src/canonical/minisprites/gen6/pokemon/0627-000-Rufflet.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0627--000--Rufflet.png
rename to src/canonical/minisprites/gen6/pokemon/0627-000-Rufflet.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0628--000--Braviary.png b/src/canonical/minisprites/gen6/pokemon/0628-000-Braviary.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0628--000--Braviary.png
rename to src/canonical/minisprites/gen6/pokemon/0628-000-Braviary.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0629--000--Vullaby.png b/src/canonical/minisprites/gen6/pokemon/0629-000-Vullaby.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0629--000--Vullaby.png
rename to src/canonical/minisprites/gen6/pokemon/0629-000-Vullaby.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0630--000--Mandibuzz.png b/src/canonical/minisprites/gen6/pokemon/0630-000-Mandibuzz.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0630--000--Mandibuzz.png
rename to src/canonical/minisprites/gen6/pokemon/0630-000-Mandibuzz.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0631--000--Heatmor.png b/src/canonical/minisprites/gen6/pokemon/0631-000-Heatmor.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0631--000--Heatmor.png
rename to src/canonical/minisprites/gen6/pokemon/0631-000-Heatmor.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0632--000--Durant.png b/src/canonical/minisprites/gen6/pokemon/0632-000-Durant.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0632--000--Durant.png
rename to src/canonical/minisprites/gen6/pokemon/0632-000-Durant.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0633--000--Deino.png b/src/canonical/minisprites/gen6/pokemon/0633-000-Deino.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0633--000--Deino.png
rename to src/canonical/minisprites/gen6/pokemon/0633-000-Deino.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0634--000--Zweilous.png b/src/canonical/minisprites/gen6/pokemon/0634-000-Zweilous.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0634--000--Zweilous.png
rename to src/canonical/minisprites/gen6/pokemon/0634-000-Zweilous.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0635--000--Hydreigon.png b/src/canonical/minisprites/gen6/pokemon/0635-000-Hydreigon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0635--000--Hydreigon.png
rename to src/canonical/minisprites/gen6/pokemon/0635-000-Hydreigon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0636--000--Larvesta.png b/src/canonical/minisprites/gen6/pokemon/0636-000-Larvesta.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0636--000--Larvesta.png
rename to src/canonical/minisprites/gen6/pokemon/0636-000-Larvesta.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0637--000--Volcarona.png b/src/canonical/minisprites/gen6/pokemon/0637-000-Volcarona.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0637--000--Volcarona.png
rename to src/canonical/minisprites/gen6/pokemon/0637-000-Volcarona.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0638--000--Cobalion.png b/src/canonical/minisprites/gen6/pokemon/0638-000-Cobalion.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0638--000--Cobalion.png
rename to src/canonical/minisprites/gen6/pokemon/0638-000-Cobalion.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0639--000--Terrakion.png b/src/canonical/minisprites/gen6/pokemon/0639-000-Terrakion.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0639--000--Terrakion.png
rename to src/canonical/minisprites/gen6/pokemon/0639-000-Terrakion.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0640--000--Virizion.png b/src/canonical/minisprites/gen6/pokemon/0640-000-Virizion.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0640--000--Virizion.png
rename to src/canonical/minisprites/gen6/pokemon/0640-000-Virizion.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0641--000--Tornadus.png b/src/canonical/minisprites/gen6/pokemon/0641-000-Tornadus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0641--000--Tornadus.png
rename to src/canonical/minisprites/gen6/pokemon/0641-000-Tornadus.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0641--420--Tornadus--Therian.png b/src/canonical/minisprites/gen6/pokemon/0641-420-Tornadus-Therian.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0641--420--Tornadus--Therian.png
rename to src/canonical/minisprites/gen6/pokemon/0641-420-Tornadus-Therian.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0642--000--Thundurus.png b/src/canonical/minisprites/gen6/pokemon/0642-000-Thundurus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0642--000--Thundurus.png
rename to src/canonical/minisprites/gen6/pokemon/0642-000-Thundurus.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0642--420--Thundurus--Therian.png b/src/canonical/minisprites/gen6/pokemon/0642-420-Thundurus-Therian.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0642--420--Thundurus--Therian.png
rename to src/canonical/minisprites/gen6/pokemon/0642-420-Thundurus-Therian.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0643--000--Reshiram.png b/src/canonical/minisprites/gen6/pokemon/0643-000-Reshiram.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0643--000--Reshiram.png
rename to src/canonical/minisprites/gen6/pokemon/0643-000-Reshiram.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0644--000--Zekrom.png b/src/canonical/minisprites/gen6/pokemon/0644-000-Zekrom.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0644--000--Zekrom.png
rename to src/canonical/minisprites/gen6/pokemon/0644-000-Zekrom.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0645--000--Landorus.png b/src/canonical/minisprites/gen6/pokemon/0645-000-Landorus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0645--000--Landorus.png
rename to src/canonical/minisprites/gen6/pokemon/0645-000-Landorus.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0645--420--Landorus--Therian.png b/src/canonical/minisprites/gen6/pokemon/0645-420-Landorus-Therian.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0645--420--Landorus--Therian.png
rename to src/canonical/minisprites/gen6/pokemon/0645-420-Landorus-Therian.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0646--000--Kyurem.png b/src/canonical/minisprites/gen6/pokemon/0646-000-Kyurem.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0646--000--Kyurem.png
rename to src/canonical/minisprites/gen6/pokemon/0646-000-Kyurem.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0646--420--Kyurem--Black.png b/src/canonical/minisprites/gen6/pokemon/0646-420-Kyurem-Black.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0646--420--Kyurem--Black.png
rename to src/canonical/minisprites/gen6/pokemon/0646-420-Kyurem-Black.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0646--420--Kyurem--White.png b/src/canonical/minisprites/gen6/pokemon/0646-420-Kyurem-White.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0646--420--Kyurem--White.png
rename to src/canonical/minisprites/gen6/pokemon/0646-420-Kyurem-White.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0647--000--Keldeo.png b/src/canonical/minisprites/gen6/pokemon/0647-000-Keldeo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0647--000--Keldeo.png
rename to src/canonical/minisprites/gen6/pokemon/0647-000-Keldeo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0647--420--Keldeo--Resolute.png b/src/canonical/minisprites/gen6/pokemon/0647-420-Keldeo-Resolute.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0647--420--Keldeo--Resolute.png
rename to src/canonical/minisprites/gen6/pokemon/0647-420-Keldeo-Resolute.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0648--000--Meloetta.png b/src/canonical/minisprites/gen6/pokemon/0648-000-Meloetta.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0648--000--Meloetta.png
rename to src/canonical/minisprites/gen6/pokemon/0648-000-Meloetta.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0648--420--Meloetta--Pirouette.png b/src/canonical/minisprites/gen6/pokemon/0648-420-Meloetta-Pirouette.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0648--420--Meloetta--Pirouette.png
rename to src/canonical/minisprites/gen6/pokemon/0648-420-Meloetta-Pirouette.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0649--000--Genesect.png b/src/canonical/minisprites/gen6/pokemon/0649-000-Genesect.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0649--000--Genesect.png
rename to src/canonical/minisprites/gen6/pokemon/0649-000-Genesect.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0650--000--Chespin.png b/src/canonical/minisprites/gen6/pokemon/0650-000-Chespin.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0650--000--Chespin.png
rename to src/canonical/minisprites/gen6/pokemon/0650-000-Chespin.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0651--000--Quilladin.png b/src/canonical/minisprites/gen6/pokemon/0651-000-Quilladin.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0651--000--Quilladin.png
rename to src/canonical/minisprites/gen6/pokemon/0651-000-Quilladin.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0652--000--Chesnaught.png b/src/canonical/minisprites/gen6/pokemon/0652-000-Chesnaught.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0652--000--Chesnaught.png
rename to src/canonical/minisprites/gen6/pokemon/0652-000-Chesnaught.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0653--000--Fennekin.png b/src/canonical/minisprites/gen6/pokemon/0653-000-Fennekin.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0653--000--Fennekin.png
rename to src/canonical/minisprites/gen6/pokemon/0653-000-Fennekin.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0654--000--Braixen.png b/src/canonical/minisprites/gen6/pokemon/0654-000-Braixen.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0654--000--Braixen.png
rename to src/canonical/minisprites/gen6/pokemon/0654-000-Braixen.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0655--000--Delphox.png b/src/canonical/minisprites/gen6/pokemon/0655-000-Delphox.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0655--000--Delphox.png
rename to src/canonical/minisprites/gen6/pokemon/0655-000-Delphox.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0656--000--Froakie.png b/src/canonical/minisprites/gen6/pokemon/0656-000-Froakie.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0656--000--Froakie.png
rename to src/canonical/minisprites/gen6/pokemon/0656-000-Froakie.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0657--000--Frogadier.png b/src/canonical/minisprites/gen6/pokemon/0657-000-Frogadier.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0657--000--Frogadier.png
rename to src/canonical/minisprites/gen6/pokemon/0657-000-Frogadier.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0658--000--Greninja.png b/src/canonical/minisprites/gen6/pokemon/0658-000-Greninja.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0658--000--Greninja.png
rename to src/canonical/minisprites/gen6/pokemon/0658-000-Greninja.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0658--420--Greninja--Ash.png b/src/canonical/minisprites/gen6/pokemon/0658-420-Greninja-Ash.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0658--420--Greninja--Ash.png
rename to src/canonical/minisprites/gen6/pokemon/0658-420-Greninja-Ash.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0659--000--Bunnelby.png b/src/canonical/minisprites/gen6/pokemon/0659-000-Bunnelby.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0659--000--Bunnelby.png
rename to src/canonical/minisprites/gen6/pokemon/0659-000-Bunnelby.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0660--000--Diggersby.png b/src/canonical/minisprites/gen6/pokemon/0660-000-Diggersby.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0660--000--Diggersby.png
rename to src/canonical/minisprites/gen6/pokemon/0660-000-Diggersby.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0661--000--Fletchling.png b/src/canonical/minisprites/gen6/pokemon/0661-000-Fletchling.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0661--000--Fletchling.png
rename to src/canonical/minisprites/gen6/pokemon/0661-000-Fletchling.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0662--000--Fletchinder.png b/src/canonical/minisprites/gen6/pokemon/0662-000-Fletchinder.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0662--000--Fletchinder.png
rename to src/canonical/minisprites/gen6/pokemon/0662-000-Fletchinder.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0663--000--Talonflame.png b/src/canonical/minisprites/gen6/pokemon/0663-000-Talonflame.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0663--000--Talonflame.png
rename to src/canonical/minisprites/gen6/pokemon/0663-000-Talonflame.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0664--000--Scatterbug.png b/src/canonical/minisprites/gen6/pokemon/0664-000-Scatterbug.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0664--000--Scatterbug.png
rename to src/canonical/minisprites/gen6/pokemon/0664-000-Scatterbug.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0665--000--Spewpa.png b/src/canonical/minisprites/gen6/pokemon/0665-000-Spewpa.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0665--000--Spewpa.png
rename to src/canonical/minisprites/gen6/pokemon/0665-000-Spewpa.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--000--Vivillon.png b/src/canonical/minisprites/gen6/pokemon/0666-000-Vivillon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--000--Vivillon.png
rename to src/canonical/minisprites/gen6/pokemon/0666-000-Vivillon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Archipelago.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Archipelago.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Archipelago.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Archipelago.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Continental.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Continental.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Continental.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Continental.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Elegant.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Elegant.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Elegant.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Elegant.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Fancy.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Fancy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Fancy.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Fancy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Garden.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Garden.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Garden.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Garden.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--High_Plains.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-High_Plains.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--High_Plains.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-High_Plains.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Icy_Snow.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Icy_Snow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Icy_Snow.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Icy_Snow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Jungle.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Jungle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Jungle.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Jungle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Marine.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Marine.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Marine.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Marine.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Modern.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Modern.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Modern.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Modern.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Monsoon.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Monsoon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Monsoon.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Monsoon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Ocean.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Ocean.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Ocean.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Ocean.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Pokeball.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Pokeball.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Pokeball.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Pokeball.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Polar.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Polar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Polar.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Polar.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--River.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-River.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--River.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-River.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Sandstorm.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Sandstorm.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Sandstorm.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Sandstorm.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Savanna.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Savanna.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Savanna.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Savanna.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Sun.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Sun.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Sun.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Sun.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Tundra.png b/src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Tundra.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0666--420--Vivillon--Tundra.png
rename to src/canonical/minisprites/gen6/pokemon/0666-420-Vivillon-Tundra.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0667--000--Litleo.png b/src/canonical/minisprites/gen6/pokemon/0667-000-Litleo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0667--000--Litleo.png
rename to src/canonical/minisprites/gen6/pokemon/0667-000-Litleo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0668--000--Pyroar--Female.png b/src/canonical/minisprites/gen6/pokemon/0668-000-Pyroar-Female.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0668--000--Pyroar--Female.png
rename to src/canonical/minisprites/gen6/pokemon/0668-000-Pyroar-Female.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0668--000--Pyroar.png b/src/canonical/minisprites/gen6/pokemon/0668-000-Pyroar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0668--000--Pyroar.png
rename to src/canonical/minisprites/gen6/pokemon/0668-000-Pyroar.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0669--000--Flabe__0301be__0301.png b/src/canonical/minisprites/gen6/pokemon/0669-000-Flabe__0301be__0301.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0669--000--Flabe__0301be__0301.png
rename to src/canonical/minisprites/gen6/pokemon/0669-000-Flabe__0301be__0301.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0669--420--Flabe__0301be__0301--Blue.png b/src/canonical/minisprites/gen6/pokemon/0669-420-Flabe__0301be__0301-Blue.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0669--420--Flabe__0301be__0301--Blue.png
rename to src/canonical/minisprites/gen6/pokemon/0669-420-Flabe__0301be__0301-Blue.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0669--420--Flabe__0301be__0301--Orange.png b/src/canonical/minisprites/gen6/pokemon/0669-420-Flabe__0301be__0301-Orange.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0669--420--Flabe__0301be__0301--Orange.png
rename to src/canonical/minisprites/gen6/pokemon/0669-420-Flabe__0301be__0301-Orange.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0669--420--Flabe__0301be__0301--White.png b/src/canonical/minisprites/gen6/pokemon/0669-420-Flabe__0301be__0301-White.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0669--420--Flabe__0301be__0301--White.png
rename to src/canonical/minisprites/gen6/pokemon/0669-420-Flabe__0301be__0301-White.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0669--420--Flabe__0301be__0301--Yellow.png b/src/canonical/minisprites/gen6/pokemon/0669-420-Flabe__0301be__0301-Yellow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0669--420--Flabe__0301be__0301--Yellow.png
rename to src/canonical/minisprites/gen6/pokemon/0669-420-Flabe__0301be__0301-Yellow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0670--000--Floette.png b/src/canonical/minisprites/gen6/pokemon/0670-000-Floette.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0670--000--Floette.png
rename to src/canonical/minisprites/gen6/pokemon/0670-000-Floette.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0670--420--Floette--Blue.png b/src/canonical/minisprites/gen6/pokemon/0670-420-Floette-Blue.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0670--420--Floette--Blue.png
rename to src/canonical/minisprites/gen6/pokemon/0670-420-Floette-Blue.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0670--420--Floette--Eternal.png b/src/canonical/minisprites/gen6/pokemon/0670-420-Floette-Eternal.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0670--420--Floette--Eternal.png
rename to src/canonical/minisprites/gen6/pokemon/0670-420-Floette-Eternal.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0670--420--Floette--Orange.png b/src/canonical/minisprites/gen6/pokemon/0670-420-Floette-Orange.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0670--420--Floette--Orange.png
rename to src/canonical/minisprites/gen6/pokemon/0670-420-Floette-Orange.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0670--420--Floette--White.png b/src/canonical/minisprites/gen6/pokemon/0670-420-Floette-White.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0670--420--Floette--White.png
rename to src/canonical/minisprites/gen6/pokemon/0670-420-Floette-White.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0670--420--Floette--Yellow.png b/src/canonical/minisprites/gen6/pokemon/0670-420-Floette-Yellow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0670--420--Floette--Yellow.png
rename to src/canonical/minisprites/gen6/pokemon/0670-420-Floette-Yellow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0671--000--Florges.png b/src/canonical/minisprites/gen6/pokemon/0671-000-Florges.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0671--000--Florges.png
rename to src/canonical/minisprites/gen6/pokemon/0671-000-Florges.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0671--420--Florges--Blue.png b/src/canonical/minisprites/gen6/pokemon/0671-420-Florges-Blue.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0671--420--Florges--Blue.png
rename to src/canonical/minisprites/gen6/pokemon/0671-420-Florges-Blue.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0671--420--Florges--Orange.png b/src/canonical/minisprites/gen6/pokemon/0671-420-Florges-Orange.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0671--420--Florges--Orange.png
rename to src/canonical/minisprites/gen6/pokemon/0671-420-Florges-Orange.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0671--420--Florges--White.png b/src/canonical/minisprites/gen6/pokemon/0671-420-Florges-White.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0671--420--Florges--White.png
rename to src/canonical/minisprites/gen6/pokemon/0671-420-Florges-White.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0671--420--Florges--Yellow.png b/src/canonical/minisprites/gen6/pokemon/0671-420-Florges-Yellow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0671--420--Florges--Yellow.png
rename to src/canonical/minisprites/gen6/pokemon/0671-420-Florges-Yellow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0672--000--Skiddo.png b/src/canonical/minisprites/gen6/pokemon/0672-000-Skiddo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0672--000--Skiddo.png
rename to src/canonical/minisprites/gen6/pokemon/0672-000-Skiddo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0673--000--Gogoat.png b/src/canonical/minisprites/gen6/pokemon/0673-000-Gogoat.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0673--000--Gogoat.png
rename to src/canonical/minisprites/gen6/pokemon/0673-000-Gogoat.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0674--000--Pancham.png b/src/canonical/minisprites/gen6/pokemon/0674-000-Pancham.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0674--000--Pancham.png
rename to src/canonical/minisprites/gen6/pokemon/0674-000-Pancham.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0675--000--Pangoro.png b/src/canonical/minisprites/gen6/pokemon/0675-000-Pangoro.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0675--000--Pangoro.png
rename to src/canonical/minisprites/gen6/pokemon/0675-000-Pangoro.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0676--000--Furfrou.png b/src/canonical/minisprites/gen6/pokemon/0676-000-Furfrou.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0676--000--Furfrou.png
rename to src/canonical/minisprites/gen6/pokemon/0676-000-Furfrou.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Dandy.png b/src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Dandy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Dandy.png
rename to src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Dandy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Debutante.png b/src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Debutante.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Debutante.png
rename to src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Debutante.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Diamond.png b/src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Diamond.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Diamond.png
rename to src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Diamond.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Heart.png b/src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Heart.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Heart.png
rename to src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Heart.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Kabuki.png b/src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Kabuki.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Kabuki.png
rename to src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Kabuki.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--La_Reine.png b/src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-La_Reine.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--La_Reine.png
rename to src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-La_Reine.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Matron.png b/src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Matron.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Matron.png
rename to src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Matron.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Pharaoh.png b/src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Pharaoh.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Pharaoh.png
rename to src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Pharaoh.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Star.png b/src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Star.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0676--420--Furfrou--Star.png
rename to src/canonical/minisprites/gen6/pokemon/0676-420-Furfrou-Star.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0677--000--Espurr.png b/src/canonical/minisprites/gen6/pokemon/0677-000-Espurr.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0677--000--Espurr.png
rename to src/canonical/minisprites/gen6/pokemon/0677-000-Espurr.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0678--000--Meowstic.png b/src/canonical/minisprites/gen6/pokemon/0678-000-Meowstic.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0678--000--Meowstic.png
rename to src/canonical/minisprites/gen6/pokemon/0678-000-Meowstic.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0678--420--Meowstic--F.png b/src/canonical/minisprites/gen6/pokemon/0678-420-Meowstic-F.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0678--420--Meowstic--F.png
rename to src/canonical/minisprites/gen6/pokemon/0678-420-Meowstic-F.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0679--000--Honedge.png b/src/canonical/minisprites/gen6/pokemon/0679-000-Honedge.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0679--000--Honedge.png
rename to src/canonical/minisprites/gen6/pokemon/0679-000-Honedge.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0680--000--Doublade.png b/src/canonical/minisprites/gen6/pokemon/0680-000-Doublade.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0680--000--Doublade.png
rename to src/canonical/minisprites/gen6/pokemon/0680-000-Doublade.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0681--000--Aegislash.png b/src/canonical/minisprites/gen6/pokemon/0681-000-Aegislash.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0681--000--Aegislash.png
rename to src/canonical/minisprites/gen6/pokemon/0681-000-Aegislash.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0681--420--Aegislash--Blade.png b/src/canonical/minisprites/gen6/pokemon/0681-420-Aegislash-Blade.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0681--420--Aegislash--Blade.png
rename to src/canonical/minisprites/gen6/pokemon/0681-420-Aegislash-Blade.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0682--000--Spritzee.png b/src/canonical/minisprites/gen6/pokemon/0682-000-Spritzee.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0682--000--Spritzee.png
rename to src/canonical/minisprites/gen6/pokemon/0682-000-Spritzee.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0683--000--Aromatisse.png b/src/canonical/minisprites/gen6/pokemon/0683-000-Aromatisse.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0683--000--Aromatisse.png
rename to src/canonical/minisprites/gen6/pokemon/0683-000-Aromatisse.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0684--000--Swirlix.png b/src/canonical/minisprites/gen6/pokemon/0684-000-Swirlix.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0684--000--Swirlix.png
rename to src/canonical/minisprites/gen6/pokemon/0684-000-Swirlix.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0685--000--Slurpuff.png b/src/canonical/minisprites/gen6/pokemon/0685-000-Slurpuff.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0685--000--Slurpuff.png
rename to src/canonical/minisprites/gen6/pokemon/0685-000-Slurpuff.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0686--000--Inkay.png b/src/canonical/minisprites/gen6/pokemon/0686-000-Inkay.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0686--000--Inkay.png
rename to src/canonical/minisprites/gen6/pokemon/0686-000-Inkay.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0687--000--Malamar.png b/src/canonical/minisprites/gen6/pokemon/0687-000-Malamar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0687--000--Malamar.png
rename to src/canonical/minisprites/gen6/pokemon/0687-000-Malamar.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0688--000--Binacle.png b/src/canonical/minisprites/gen6/pokemon/0688-000-Binacle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0688--000--Binacle.png
rename to src/canonical/minisprites/gen6/pokemon/0688-000-Binacle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0689--000--Barbaracle.png b/src/canonical/minisprites/gen6/pokemon/0689-000-Barbaracle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0689--000--Barbaracle.png
rename to src/canonical/minisprites/gen6/pokemon/0689-000-Barbaracle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0690--000--Skrelp.png b/src/canonical/minisprites/gen6/pokemon/0690-000-Skrelp.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0690--000--Skrelp.png
rename to src/canonical/minisprites/gen6/pokemon/0690-000-Skrelp.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0691--000--Dragalge.png b/src/canonical/minisprites/gen6/pokemon/0691-000-Dragalge.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0691--000--Dragalge.png
rename to src/canonical/minisprites/gen6/pokemon/0691-000-Dragalge.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0692--000--Clauncher.png b/src/canonical/minisprites/gen6/pokemon/0692-000-Clauncher.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0692--000--Clauncher.png
rename to src/canonical/minisprites/gen6/pokemon/0692-000-Clauncher.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0693--000--Clawitzer.png b/src/canonical/minisprites/gen6/pokemon/0693-000-Clawitzer.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0693--000--Clawitzer.png
rename to src/canonical/minisprites/gen6/pokemon/0693-000-Clawitzer.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0694--000--Helioptile.png b/src/canonical/minisprites/gen6/pokemon/0694-000-Helioptile.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0694--000--Helioptile.png
rename to src/canonical/minisprites/gen6/pokemon/0694-000-Helioptile.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0695--000--Heliolisk.png b/src/canonical/minisprites/gen6/pokemon/0695-000-Heliolisk.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0695--000--Heliolisk.png
rename to src/canonical/minisprites/gen6/pokemon/0695-000-Heliolisk.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0696--000--Tyrunt.png b/src/canonical/minisprites/gen6/pokemon/0696-000-Tyrunt.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0696--000--Tyrunt.png
rename to src/canonical/minisprites/gen6/pokemon/0696-000-Tyrunt.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0697--000--Tyrantrum.png b/src/canonical/minisprites/gen6/pokemon/0697-000-Tyrantrum.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0697--000--Tyrantrum.png
rename to src/canonical/minisprites/gen6/pokemon/0697-000-Tyrantrum.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0698--000--Amaura.png b/src/canonical/minisprites/gen6/pokemon/0698-000-Amaura.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0698--000--Amaura.png
rename to src/canonical/minisprites/gen6/pokemon/0698-000-Amaura.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0699--000--Aurorus.png b/src/canonical/minisprites/gen6/pokemon/0699-000-Aurorus.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0699--000--Aurorus.png
rename to src/canonical/minisprites/gen6/pokemon/0699-000-Aurorus.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0700--000--Sylveon.png b/src/canonical/minisprites/gen6/pokemon/0700-000-Sylveon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0700--000--Sylveon.png
rename to src/canonical/minisprites/gen6/pokemon/0700-000-Sylveon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0701--000--Hawlucha.png b/src/canonical/minisprites/gen6/pokemon/0701-000-Hawlucha.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0701--000--Hawlucha.png
rename to src/canonical/minisprites/gen6/pokemon/0701-000-Hawlucha.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0702--000--Dedenne.png b/src/canonical/minisprites/gen6/pokemon/0702-000-Dedenne.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0702--000--Dedenne.png
rename to src/canonical/minisprites/gen6/pokemon/0702-000-Dedenne.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0703--000--Carbink.png b/src/canonical/minisprites/gen6/pokemon/0703-000-Carbink.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0703--000--Carbink.png
rename to src/canonical/minisprites/gen6/pokemon/0703-000-Carbink.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0704--000--Goomy.png b/src/canonical/minisprites/gen6/pokemon/0704-000-Goomy.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0704--000--Goomy.png
rename to src/canonical/minisprites/gen6/pokemon/0704-000-Goomy.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0705--000--Sliggoo.png b/src/canonical/minisprites/gen6/pokemon/0705-000-Sliggoo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0705--000--Sliggoo.png
rename to src/canonical/minisprites/gen6/pokemon/0705-000-Sliggoo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0706--000--Goodra.png b/src/canonical/minisprites/gen6/pokemon/0706-000-Goodra.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0706--000--Goodra.png
rename to src/canonical/minisprites/gen6/pokemon/0706-000-Goodra.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0707--000--Klefki.png b/src/canonical/minisprites/gen6/pokemon/0707-000-Klefki.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0707--000--Klefki.png
rename to src/canonical/minisprites/gen6/pokemon/0707-000-Klefki.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0708--000--Phantump.png b/src/canonical/minisprites/gen6/pokemon/0708-000-Phantump.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0708--000--Phantump.png
rename to src/canonical/minisprites/gen6/pokemon/0708-000-Phantump.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0709--000--Trevenant.png b/src/canonical/minisprites/gen6/pokemon/0709-000-Trevenant.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0709--000--Trevenant.png
rename to src/canonical/minisprites/gen6/pokemon/0709-000-Trevenant.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0710--000--Pumpkaboo.png b/src/canonical/minisprites/gen6/pokemon/0710-000-Pumpkaboo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0710--000--Pumpkaboo.png
rename to src/canonical/minisprites/gen6/pokemon/0710-000-Pumpkaboo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0711--000--Gourgeist.png b/src/canonical/minisprites/gen6/pokemon/0711-000-Gourgeist.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0711--000--Gourgeist.png
rename to src/canonical/minisprites/gen6/pokemon/0711-000-Gourgeist.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0712--000--Bergmite.png b/src/canonical/minisprites/gen6/pokemon/0712-000-Bergmite.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0712--000--Bergmite.png
rename to src/canonical/minisprites/gen6/pokemon/0712-000-Bergmite.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0713--000--Avalugg.png b/src/canonical/minisprites/gen6/pokemon/0713-000-Avalugg.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0713--000--Avalugg.png
rename to src/canonical/minisprites/gen6/pokemon/0713-000-Avalugg.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0714--000--Noibat.png b/src/canonical/minisprites/gen6/pokemon/0714-000-Noibat.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0714--000--Noibat.png
rename to src/canonical/minisprites/gen6/pokemon/0714-000-Noibat.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0715--000--Noivern.png b/src/canonical/minisprites/gen6/pokemon/0715-000-Noivern.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0715--000--Noivern.png
rename to src/canonical/minisprites/gen6/pokemon/0715-000-Noivern.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0716--000--Xerneas.png b/src/canonical/minisprites/gen6/pokemon/0716-000-Xerneas.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0716--000--Xerneas.png
rename to src/canonical/minisprites/gen6/pokemon/0716-000-Xerneas.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0717--000--Yveltal.png b/src/canonical/minisprites/gen6/pokemon/0717-000-Yveltal.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0717--000--Yveltal.png
rename to src/canonical/minisprites/gen6/pokemon/0717-000-Yveltal.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0718--000--Zygarde.png b/src/canonical/minisprites/gen6/pokemon/0718-000-Zygarde.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0718--000--Zygarde.png
rename to src/canonical/minisprites/gen6/pokemon/0718-000-Zygarde.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0718--420--Zygarde--10__0025.png b/src/canonical/minisprites/gen6/pokemon/0718-420-Zygarde-10__0025.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0718--420--Zygarde--10__0025.png
rename to src/canonical/minisprites/gen6/pokemon/0718-420-Zygarde-10__0025.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0718--420--Zygarde--Complete.png b/src/canonical/minisprites/gen6/pokemon/0718-420-Zygarde-Complete.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0718--420--Zygarde--Complete.png
rename to src/canonical/minisprites/gen6/pokemon/0718-420-Zygarde-Complete.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0719--000--Diancie.png b/src/canonical/minisprites/gen6/pokemon/0719-000-Diancie.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0719--000--Diancie.png
rename to src/canonical/minisprites/gen6/pokemon/0719-000-Diancie.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0719--420--Diancie--Mega.png b/src/canonical/minisprites/gen6/pokemon/0719-420-Diancie-Mega.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0719--420--Diancie--Mega.png
rename to src/canonical/minisprites/gen6/pokemon/0719-420-Diancie-Mega.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0720--000--Hoopa.png b/src/canonical/minisprites/gen6/pokemon/0720-000-Hoopa.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0720--000--Hoopa.png
rename to src/canonical/minisprites/gen6/pokemon/0720-000-Hoopa.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0720--420--Hoopa--Unbound.png b/src/canonical/minisprites/gen6/pokemon/0720-420-Hoopa-Unbound.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0720--420--Hoopa--Unbound.png
rename to src/canonical/minisprites/gen6/pokemon/0720-420-Hoopa-Unbound.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0721--000--Volcanion.png b/src/canonical/minisprites/gen6/pokemon/0721-000-Volcanion.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0721--000--Volcanion.png
rename to src/canonical/minisprites/gen6/pokemon/0721-000-Volcanion.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0722--000--Rowlet.png b/src/canonical/minisprites/gen6/pokemon/0722-000-Rowlet.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0722--000--Rowlet.png
rename to src/canonical/minisprites/gen6/pokemon/0722-000-Rowlet.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0723--000--Dartrix.png b/src/canonical/minisprites/gen6/pokemon/0723-000-Dartrix.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0723--000--Dartrix.png
rename to src/canonical/minisprites/gen6/pokemon/0723-000-Dartrix.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0724--000--Decidueye.png b/src/canonical/minisprites/gen6/pokemon/0724-000-Decidueye.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0724--000--Decidueye.png
rename to src/canonical/minisprites/gen6/pokemon/0724-000-Decidueye.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0725--000--Litten.png b/src/canonical/minisprites/gen6/pokemon/0725-000-Litten.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0725--000--Litten.png
rename to src/canonical/minisprites/gen6/pokemon/0725-000-Litten.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0726--000--Torracat.png b/src/canonical/minisprites/gen6/pokemon/0726-000-Torracat.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0726--000--Torracat.png
rename to src/canonical/minisprites/gen6/pokemon/0726-000-Torracat.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0727--000--Incineroar.png b/src/canonical/minisprites/gen6/pokemon/0727-000-Incineroar.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0727--000--Incineroar.png
rename to src/canonical/minisprites/gen6/pokemon/0727-000-Incineroar.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0728--000--Popplio.png b/src/canonical/minisprites/gen6/pokemon/0728-000-Popplio.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0728--000--Popplio.png
rename to src/canonical/minisprites/gen6/pokemon/0728-000-Popplio.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0729--000--Brionne.png b/src/canonical/minisprites/gen6/pokemon/0729-000-Brionne.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0729--000--Brionne.png
rename to src/canonical/minisprites/gen6/pokemon/0729-000-Brionne.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0730--000--Primarina.png b/src/canonical/minisprites/gen6/pokemon/0730-000-Primarina.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0730--000--Primarina.png
rename to src/canonical/minisprites/gen6/pokemon/0730-000-Primarina.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0731--000--Pikipek.png b/src/canonical/minisprites/gen6/pokemon/0731-000-Pikipek.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0731--000--Pikipek.png
rename to src/canonical/minisprites/gen6/pokemon/0731-000-Pikipek.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0732--000--Trumbeak.png b/src/canonical/minisprites/gen6/pokemon/0732-000-Trumbeak.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0732--000--Trumbeak.png
rename to src/canonical/minisprites/gen6/pokemon/0732-000-Trumbeak.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0733--000--Toucannon.png b/src/canonical/minisprites/gen6/pokemon/0733-000-Toucannon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0733--000--Toucannon.png
rename to src/canonical/minisprites/gen6/pokemon/0733-000-Toucannon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0734--000--Yungoos.png b/src/canonical/minisprites/gen6/pokemon/0734-000-Yungoos.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0734--000--Yungoos.png
rename to src/canonical/minisprites/gen6/pokemon/0734-000-Yungoos.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0735--000--Gumshoos.png b/src/canonical/minisprites/gen6/pokemon/0735-000-Gumshoos.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0735--000--Gumshoos.png
rename to src/canonical/minisprites/gen6/pokemon/0735-000-Gumshoos.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0736--000--Grubbin.png b/src/canonical/minisprites/gen6/pokemon/0736-000-Grubbin.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0736--000--Grubbin.png
rename to src/canonical/minisprites/gen6/pokemon/0736-000-Grubbin.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0737--000--Charjabug.png b/src/canonical/minisprites/gen6/pokemon/0737-000-Charjabug.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0737--000--Charjabug.png
rename to src/canonical/minisprites/gen6/pokemon/0737-000-Charjabug.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0738--000--Vikavolt.png b/src/canonical/minisprites/gen6/pokemon/0738-000-Vikavolt.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0738--000--Vikavolt.png
rename to src/canonical/minisprites/gen6/pokemon/0738-000-Vikavolt.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0739--000--Crabrawler.png b/src/canonical/minisprites/gen6/pokemon/0739-000-Crabrawler.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0739--000--Crabrawler.png
rename to src/canonical/minisprites/gen6/pokemon/0739-000-Crabrawler.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0740--000--Crabominable.png b/src/canonical/minisprites/gen6/pokemon/0740-000-Crabominable.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0740--000--Crabominable.png
rename to src/canonical/minisprites/gen6/pokemon/0740-000-Crabominable.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0741--000--Oricorio.png b/src/canonical/minisprites/gen6/pokemon/0741-000-Oricorio.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0741--000--Oricorio.png
rename to src/canonical/minisprites/gen6/pokemon/0741-000-Oricorio.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0741--420--Oricorio--Pa__0027u.png b/src/canonical/minisprites/gen6/pokemon/0741-420-Oricorio-Pa__0027u.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0741--420--Oricorio--Pa__0027u.png
rename to src/canonical/minisprites/gen6/pokemon/0741-420-Oricorio-Pa__0027u.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0741--420--Oricorio--Pom-Pom.png b/src/canonical/minisprites/gen6/pokemon/0741-420-Oricorio-Pom~Pom.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0741--420--Oricorio--Pom-Pom.png
rename to src/canonical/minisprites/gen6/pokemon/0741-420-Oricorio-Pom~Pom.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0741--420--Oricorio--Sensu.png b/src/canonical/minisprites/gen6/pokemon/0741-420-Oricorio-Sensu.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0741--420--Oricorio--Sensu.png
rename to src/canonical/minisprites/gen6/pokemon/0741-420-Oricorio-Sensu.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0742--000--Cutiefly.png b/src/canonical/minisprites/gen6/pokemon/0742-000-Cutiefly.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0742--000--Cutiefly.png
rename to src/canonical/minisprites/gen6/pokemon/0742-000-Cutiefly.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0743--000--Ribombee.png b/src/canonical/minisprites/gen6/pokemon/0743-000-Ribombee.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0743--000--Ribombee.png
rename to src/canonical/minisprites/gen6/pokemon/0743-000-Ribombee.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0744--000--Rockruff.png b/src/canonical/minisprites/gen6/pokemon/0744-000-Rockruff.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0744--000--Rockruff.png
rename to src/canonical/minisprites/gen6/pokemon/0744-000-Rockruff.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0745--000--Lycanroc.png b/src/canonical/minisprites/gen6/pokemon/0745-000-Lycanroc.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0745--000--Lycanroc.png
rename to src/canonical/minisprites/gen6/pokemon/0745-000-Lycanroc.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0745--420--Lycanroc--Dusk.png b/src/canonical/minisprites/gen6/pokemon/0745-420-Lycanroc-Dusk.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0745--420--Lycanroc--Dusk.png
rename to src/canonical/minisprites/gen6/pokemon/0745-420-Lycanroc-Dusk.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0745--420--Lycanroc--Midnight.png b/src/canonical/minisprites/gen6/pokemon/0745-420-Lycanroc-Midnight.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0745--420--Lycanroc--Midnight.png
rename to src/canonical/minisprites/gen6/pokemon/0745-420-Lycanroc-Midnight.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0746--000--Wishiwashi.png b/src/canonical/minisprites/gen6/pokemon/0746-000-Wishiwashi.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0746--000--Wishiwashi.png
rename to src/canonical/minisprites/gen6/pokemon/0746-000-Wishiwashi.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0746--420--Wishiwashi--School.png b/src/canonical/minisprites/gen6/pokemon/0746-420-Wishiwashi-School.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0746--420--Wishiwashi--School.png
rename to src/canonical/minisprites/gen6/pokemon/0746-420-Wishiwashi-School.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0747--000--Mareanie.png b/src/canonical/minisprites/gen6/pokemon/0747-000-Mareanie.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0747--000--Mareanie.png
rename to src/canonical/minisprites/gen6/pokemon/0747-000-Mareanie.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0748--000--Toxapex.png b/src/canonical/minisprites/gen6/pokemon/0748-000-Toxapex.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0748--000--Toxapex.png
rename to src/canonical/minisprites/gen6/pokemon/0748-000-Toxapex.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0749--000--Mudbray.png b/src/canonical/minisprites/gen6/pokemon/0749-000-Mudbray.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0749--000--Mudbray.png
rename to src/canonical/minisprites/gen6/pokemon/0749-000-Mudbray.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0750--000--Mudsdale.png b/src/canonical/minisprites/gen6/pokemon/0750-000-Mudsdale.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0750--000--Mudsdale.png
rename to src/canonical/minisprites/gen6/pokemon/0750-000-Mudsdale.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0751--000--Dewpider.png b/src/canonical/minisprites/gen6/pokemon/0751-000-Dewpider.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0751--000--Dewpider.png
rename to src/canonical/minisprites/gen6/pokemon/0751-000-Dewpider.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0752--000--Araquanid.png b/src/canonical/minisprites/gen6/pokemon/0752-000-Araquanid.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0752--000--Araquanid.png
rename to src/canonical/minisprites/gen6/pokemon/0752-000-Araquanid.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0753--000--Fomantis.png b/src/canonical/minisprites/gen6/pokemon/0753-000-Fomantis.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0753--000--Fomantis.png
rename to src/canonical/minisprites/gen6/pokemon/0753-000-Fomantis.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0754--000--Lurantis.png b/src/canonical/minisprites/gen6/pokemon/0754-000-Lurantis.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0754--000--Lurantis.png
rename to src/canonical/minisprites/gen6/pokemon/0754-000-Lurantis.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0755--000--Morelull.png b/src/canonical/minisprites/gen6/pokemon/0755-000-Morelull.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0755--000--Morelull.png
rename to src/canonical/minisprites/gen6/pokemon/0755-000-Morelull.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0756--000--Shiinotic.png b/src/canonical/minisprites/gen6/pokemon/0756-000-Shiinotic.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0756--000--Shiinotic.png
rename to src/canonical/minisprites/gen6/pokemon/0756-000-Shiinotic.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0757--000--Salandit.png b/src/canonical/minisprites/gen6/pokemon/0757-000-Salandit.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0757--000--Salandit.png
rename to src/canonical/minisprites/gen6/pokemon/0757-000-Salandit.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0758--000--Salazzle.png b/src/canonical/minisprites/gen6/pokemon/0758-000-Salazzle.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0758--000--Salazzle.png
rename to src/canonical/minisprites/gen6/pokemon/0758-000-Salazzle.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0759--000--Stufful.png b/src/canonical/minisprites/gen6/pokemon/0759-000-Stufful.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0759--000--Stufful.png
rename to src/canonical/minisprites/gen6/pokemon/0759-000-Stufful.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0760--000--Bewear.png b/src/canonical/minisprites/gen6/pokemon/0760-000-Bewear.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0760--000--Bewear.png
rename to src/canonical/minisprites/gen6/pokemon/0760-000-Bewear.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0761--000--Bounsweet.png b/src/canonical/minisprites/gen6/pokemon/0761-000-Bounsweet.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0761--000--Bounsweet.png
rename to src/canonical/minisprites/gen6/pokemon/0761-000-Bounsweet.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0762--000--Steenee.png b/src/canonical/minisprites/gen6/pokemon/0762-000-Steenee.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0762--000--Steenee.png
rename to src/canonical/minisprites/gen6/pokemon/0762-000-Steenee.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0763--000--Tsareena.png b/src/canonical/minisprites/gen6/pokemon/0763-000-Tsareena.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0763--000--Tsareena.png
rename to src/canonical/minisprites/gen6/pokemon/0763-000-Tsareena.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0764--000--Comfey.png b/src/canonical/minisprites/gen6/pokemon/0764-000-Comfey.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0764--000--Comfey.png
rename to src/canonical/minisprites/gen6/pokemon/0764-000-Comfey.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0765--000--Oranguru.png b/src/canonical/minisprites/gen6/pokemon/0765-000-Oranguru.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0765--000--Oranguru.png
rename to src/canonical/minisprites/gen6/pokemon/0765-000-Oranguru.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0766--000--Passimian.png b/src/canonical/minisprites/gen6/pokemon/0766-000-Passimian.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0766--000--Passimian.png
rename to src/canonical/minisprites/gen6/pokemon/0766-000-Passimian.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0767--000--Wimpod.png b/src/canonical/minisprites/gen6/pokemon/0767-000-Wimpod.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0767--000--Wimpod.png
rename to src/canonical/minisprites/gen6/pokemon/0767-000-Wimpod.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0768--000--Golisopod.png b/src/canonical/minisprites/gen6/pokemon/0768-000-Golisopod.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0768--000--Golisopod.png
rename to src/canonical/minisprites/gen6/pokemon/0768-000-Golisopod.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0769--000--Sandygast.png b/src/canonical/minisprites/gen6/pokemon/0769-000-Sandygast.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0769--000--Sandygast.png
rename to src/canonical/minisprites/gen6/pokemon/0769-000-Sandygast.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0770--000--Palossand.png b/src/canonical/minisprites/gen6/pokemon/0770-000-Palossand.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0770--000--Palossand.png
rename to src/canonical/minisprites/gen6/pokemon/0770-000-Palossand.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0771--000--Pyukumuku.png b/src/canonical/minisprites/gen6/pokemon/0771-000-Pyukumuku.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0771--000--Pyukumuku.png
rename to src/canonical/minisprites/gen6/pokemon/0771-000-Pyukumuku.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0772--000--Type__003a_Null.png b/src/canonical/minisprites/gen6/pokemon/0772-000-Type__003a_Null.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0772--000--Type__003a_Null.png
rename to src/canonical/minisprites/gen6/pokemon/0772-000-Type__003a_Null.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0773--000--Silvally.png b/src/canonical/minisprites/gen6/pokemon/0773-000-Silvally.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0773--000--Silvally.png
rename to src/canonical/minisprites/gen6/pokemon/0773-000-Silvally.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0774--000--Minior.png b/src/canonical/minisprites/gen6/pokemon/0774-000-Minior.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0774--000--Minior.png
rename to src/canonical/minisprites/gen6/pokemon/0774-000-Minior.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0774--420--Minior--Blue.png b/src/canonical/minisprites/gen6/pokemon/0774-420-Minior-Blue.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0774--420--Minior--Blue.png
rename to src/canonical/minisprites/gen6/pokemon/0774-420-Minior-Blue.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0774--420--Minior--Green.png b/src/canonical/minisprites/gen6/pokemon/0774-420-Minior-Green.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0774--420--Minior--Green.png
rename to src/canonical/minisprites/gen6/pokemon/0774-420-Minior-Green.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0774--420--Minior--Inidgo.png b/src/canonical/minisprites/gen6/pokemon/0774-420-Minior-Inidgo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0774--420--Minior--Inidgo.png
rename to src/canonical/minisprites/gen6/pokemon/0774-420-Minior-Inidgo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0774--420--Minior--Meteor.png b/src/canonical/minisprites/gen6/pokemon/0774-420-Minior-Meteor.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0774--420--Minior--Meteor.png
rename to src/canonical/minisprites/gen6/pokemon/0774-420-Minior-Meteor.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0774--420--Minior--Orange.png b/src/canonical/minisprites/gen6/pokemon/0774-420-Minior-Orange.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0774--420--Minior--Orange.png
rename to src/canonical/minisprites/gen6/pokemon/0774-420-Minior-Orange.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0774--420--Minior--Violet.png b/src/canonical/minisprites/gen6/pokemon/0774-420-Minior-Violet.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0774--420--Minior--Violet.png
rename to src/canonical/minisprites/gen6/pokemon/0774-420-Minior-Violet.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0774--420--Minior--Yellow.png b/src/canonical/minisprites/gen6/pokemon/0774-420-Minior-Yellow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0774--420--Minior--Yellow.png
rename to src/canonical/minisprites/gen6/pokemon/0774-420-Minior-Yellow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0775--000--Komala.png b/src/canonical/minisprites/gen6/pokemon/0775-000-Komala.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0775--000--Komala.png
rename to src/canonical/minisprites/gen6/pokemon/0775-000-Komala.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0776--000--Turtonator.png b/src/canonical/minisprites/gen6/pokemon/0776-000-Turtonator.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0776--000--Turtonator.png
rename to src/canonical/minisprites/gen6/pokemon/0776-000-Turtonator.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0777--000--Togedemaru.png b/src/canonical/minisprites/gen6/pokemon/0777-000-Togedemaru.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0777--000--Togedemaru.png
rename to src/canonical/minisprites/gen6/pokemon/0777-000-Togedemaru.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0778--000--Mimikyu.png b/src/canonical/minisprites/gen6/pokemon/0778-000-Mimikyu.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0778--000--Mimikyu.png
rename to src/canonical/minisprites/gen6/pokemon/0778-000-Mimikyu.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0779--000--Bruxish.png b/src/canonical/minisprites/gen6/pokemon/0779-000-Bruxish.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0779--000--Bruxish.png
rename to src/canonical/minisprites/gen6/pokemon/0779-000-Bruxish.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0780--000--Drampa.png b/src/canonical/minisprites/gen6/pokemon/0780-000-Drampa.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0780--000--Drampa.png
rename to src/canonical/minisprites/gen6/pokemon/0780-000-Drampa.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0781--000--Dhelmise.png b/src/canonical/minisprites/gen6/pokemon/0781-000-Dhelmise.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0781--000--Dhelmise.png
rename to src/canonical/minisprites/gen6/pokemon/0781-000-Dhelmise.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0782--000--Jangmo-o.png b/src/canonical/minisprites/gen6/pokemon/0782-000-Jangmo~o.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0782--000--Jangmo-o.png
rename to src/canonical/minisprites/gen6/pokemon/0782-000-Jangmo~o.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0783--000--Hakamo-o.png b/src/canonical/minisprites/gen6/pokemon/0783-000-Hakamo~o.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0783--000--Hakamo-o.png
rename to src/canonical/minisprites/gen6/pokemon/0783-000-Hakamo~o.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0784--000--Kommo-o.png b/src/canonical/minisprites/gen6/pokemon/0784-000-Kommo~o.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0784--000--Kommo-o.png
rename to src/canonical/minisprites/gen6/pokemon/0784-000-Kommo~o.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0785--000--Tapu_Koko.png b/src/canonical/minisprites/gen6/pokemon/0785-000-Tapu_Koko.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0785--000--Tapu_Koko.png
rename to src/canonical/minisprites/gen6/pokemon/0785-000-Tapu_Koko.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0786--000--Tapu_Lele.png b/src/canonical/minisprites/gen6/pokemon/0786-000-Tapu_Lele.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0786--000--Tapu_Lele.png
rename to src/canonical/minisprites/gen6/pokemon/0786-000-Tapu_Lele.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0787--000--Tapu_Bulu.png b/src/canonical/minisprites/gen6/pokemon/0787-000-Tapu_Bulu.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0787--000--Tapu_Bulu.png
rename to src/canonical/minisprites/gen6/pokemon/0787-000-Tapu_Bulu.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0788--000--Tapu_Fini.png b/src/canonical/minisprites/gen6/pokemon/0788-000-Tapu_Fini.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0788--000--Tapu_Fini.png
rename to src/canonical/minisprites/gen6/pokemon/0788-000-Tapu_Fini.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0789--000--Cosmog.png b/src/canonical/minisprites/gen6/pokemon/0789-000-Cosmog.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0789--000--Cosmog.png
rename to src/canonical/minisprites/gen6/pokemon/0789-000-Cosmog.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0790--000--Cosmoem.png b/src/canonical/minisprites/gen6/pokemon/0790-000-Cosmoem.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0790--000--Cosmoem.png
rename to src/canonical/minisprites/gen6/pokemon/0790-000-Cosmoem.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0791--000--Solgaleo.png b/src/canonical/minisprites/gen6/pokemon/0791-000-Solgaleo.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0791--000--Solgaleo.png
rename to src/canonical/minisprites/gen6/pokemon/0791-000-Solgaleo.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0792--000--Lunala.png b/src/canonical/minisprites/gen6/pokemon/0792-000-Lunala.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0792--000--Lunala.png
rename to src/canonical/minisprites/gen6/pokemon/0792-000-Lunala.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0793--000--Nihilego.png b/src/canonical/minisprites/gen6/pokemon/0793-000-Nihilego.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0793--000--Nihilego.png
rename to src/canonical/minisprites/gen6/pokemon/0793-000-Nihilego.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0794--000--Buzzwole.png b/src/canonical/minisprites/gen6/pokemon/0794-000-Buzzwole.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0794--000--Buzzwole.png
rename to src/canonical/minisprites/gen6/pokemon/0794-000-Buzzwole.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0795--000--Pheromosa.png b/src/canonical/minisprites/gen6/pokemon/0795-000-Pheromosa.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0795--000--Pheromosa.png
rename to src/canonical/minisprites/gen6/pokemon/0795-000-Pheromosa.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0796--000--Xurkitree.png b/src/canonical/minisprites/gen6/pokemon/0796-000-Xurkitree.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0796--000--Xurkitree.png
rename to src/canonical/minisprites/gen6/pokemon/0796-000-Xurkitree.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0797--000--Celesteela.png b/src/canonical/minisprites/gen6/pokemon/0797-000-Celesteela.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0797--000--Celesteela.png
rename to src/canonical/minisprites/gen6/pokemon/0797-000-Celesteela.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0798--000--Kartana.png b/src/canonical/minisprites/gen6/pokemon/0798-000-Kartana.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0798--000--Kartana.png
rename to src/canonical/minisprites/gen6/pokemon/0798-000-Kartana.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0799--000--Guzzlord.png b/src/canonical/minisprites/gen6/pokemon/0799-000-Guzzlord.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0799--000--Guzzlord.png
rename to src/canonical/minisprites/gen6/pokemon/0799-000-Guzzlord.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0800--000--Necrozma.png b/src/canonical/minisprites/gen6/pokemon/0800-000-Necrozma.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0800--000--Necrozma.png
rename to src/canonical/minisprites/gen6/pokemon/0800-000-Necrozma.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0800--420--Necrozma--Dawn_Wings.png b/src/canonical/minisprites/gen6/pokemon/0800-420-Necrozma-Dawn_Wings.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0800--420--Necrozma--Dawn_Wings.png
rename to src/canonical/minisprites/gen6/pokemon/0800-420-Necrozma-Dawn_Wings.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0800--420--Necrozma--Dusk_Mane.png b/src/canonical/minisprites/gen6/pokemon/0800-420-Necrozma-Dusk_Mane.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0800--420--Necrozma--Dusk_Mane.png
rename to src/canonical/minisprites/gen6/pokemon/0800-420-Necrozma-Dusk_Mane.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0800--420--Necrozma--Ultra.png b/src/canonical/minisprites/gen6/pokemon/0800-420-Necrozma-Ultra.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0800--420--Necrozma--Ultra.png
rename to src/canonical/minisprites/gen6/pokemon/0800-420-Necrozma-Ultra.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0801--000--Magearna.png b/src/canonical/minisprites/gen6/pokemon/0801-000-Magearna.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0801--000--Magearna.png
rename to src/canonical/minisprites/gen6/pokemon/0801-000-Magearna.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0801--420--Magearna--Original.png b/src/canonical/minisprites/gen6/pokemon/0801-420-Magearna-Original.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0801--420--Magearna--Original.png
rename to src/canonical/minisprites/gen6/pokemon/0801-420-Magearna-Original.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0802--000--Marshadow.png b/src/canonical/minisprites/gen6/pokemon/0802-000-Marshadow.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0802--000--Marshadow.png
rename to src/canonical/minisprites/gen6/pokemon/0802-000-Marshadow.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0803--000--Poipole.png b/src/canonical/minisprites/gen6/pokemon/0803-000-Poipole.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0803--000--Poipole.png
rename to src/canonical/minisprites/gen6/pokemon/0803-000-Poipole.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0804--000--Naganadel.png b/src/canonical/minisprites/gen6/pokemon/0804-000-Naganadel.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0804--000--Naganadel.png
rename to src/canonical/minisprites/gen6/pokemon/0804-000-Naganadel.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0805--000--Stakataka.png b/src/canonical/minisprites/gen6/pokemon/0805-000-Stakataka.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0805--000--Stakataka.png
rename to src/canonical/minisprites/gen6/pokemon/0805-000-Stakataka.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0806--000--Blacephalon.png b/src/canonical/minisprites/gen6/pokemon/0806-000-Blacephalon.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0806--000--Blacephalon.png
rename to src/canonical/minisprites/gen6/pokemon/0806-000-Blacephalon.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0807--000--Zeraora.png b/src/canonical/minisprites/gen6/pokemon/0807-000-Zeraora.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0807--000--Zeraora.png
rename to src/canonical/minisprites/gen6/pokemon/0807-000-Zeraora.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0808--000--Meltan.png b/src/canonical/minisprites/gen6/pokemon/0808-000-Meltan.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0808--000--Meltan.png
rename to src/canonical/minisprites/gen6/pokemon/0808-000-Meltan.png
diff --git a/src/canonical/minisprites/gen6/pokemon/0837--000--Rolycoly.png b/src/canonical/minisprites/gen6/pokemon/0837-000-Rolycoly.png
similarity index 100%
rename from src/canonical/minisprites/gen6/pokemon/0837--000--Rolycoly.png
rename to src/canonical/minisprites/gen6/pokemon/0837-000-Rolycoly.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0001--000--Bulbasaur.png b/src/canonical/minisprites/gen8/pokemon/0001-000-Bulbasaur.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0001--000--Bulbasaur.png
rename to src/canonical/minisprites/gen8/pokemon/0001-000-Bulbasaur.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0002--000--Ivysaur.png b/src/canonical/minisprites/gen8/pokemon/0002-000-Ivysaur.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0002--000--Ivysaur.png
rename to src/canonical/minisprites/gen8/pokemon/0002-000-Ivysaur.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0003--000--Venusaur.png b/src/canonical/minisprites/gen8/pokemon/0003-000-Venusaur.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0003--000--Venusaur.png
rename to src/canonical/minisprites/gen8/pokemon/0003-000-Venusaur.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0004--000--Charmander.png b/src/canonical/minisprites/gen8/pokemon/0004-000-Charmander.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0004--000--Charmander.png
rename to src/canonical/minisprites/gen8/pokemon/0004-000-Charmander.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0005--000--Charmeleon.png b/src/canonical/minisprites/gen8/pokemon/0005-000-Charmeleon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0005--000--Charmeleon.png
rename to src/canonical/minisprites/gen8/pokemon/0005-000-Charmeleon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0006--000--Charizard.png b/src/canonical/minisprites/gen8/pokemon/0006-000-Charizard.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0006--000--Charizard.png
rename to src/canonical/minisprites/gen8/pokemon/0006-000-Charizard.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0006--420--Charizard--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0006-420-Charizard-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0006--420--Charizard--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0006-420-Charizard-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0007--000--Squirtle.png b/src/canonical/minisprites/gen8/pokemon/0007-000-Squirtle.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0007--000--Squirtle.png
rename to src/canonical/minisprites/gen8/pokemon/0007-000-Squirtle.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0008--000--Wartortle.png b/src/canonical/minisprites/gen8/pokemon/0008-000-Wartortle.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0008--000--Wartortle.png
rename to src/canonical/minisprites/gen8/pokemon/0008-000-Wartortle.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0009--000--Blastoise.png b/src/canonical/minisprites/gen8/pokemon/0009-000-Blastoise.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0009--000--Blastoise.png
rename to src/canonical/minisprites/gen8/pokemon/0009-000-Blastoise.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0010--000--Caterpie.png b/src/canonical/minisprites/gen8/pokemon/0010-000-Caterpie.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0010--000--Caterpie.png
rename to src/canonical/minisprites/gen8/pokemon/0010-000-Caterpie.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0011--000--Metapod.png b/src/canonical/minisprites/gen8/pokemon/0011-000-Metapod.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0011--000--Metapod.png
rename to src/canonical/minisprites/gen8/pokemon/0011-000-Metapod.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0012--000--Butterfree.png b/src/canonical/minisprites/gen8/pokemon/0012-000-Butterfree.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0012--000--Butterfree.png
rename to src/canonical/minisprites/gen8/pokemon/0012-000-Butterfree.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0012--420--Butterfree--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0012-420-Butterfree-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0012--420--Butterfree--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0012-420-Butterfree-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0025--000--Pikachu.png b/src/canonical/minisprites/gen8/pokemon/0025-000-Pikachu.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0025--000--Pikachu.png
rename to src/canonical/minisprites/gen8/pokemon/0025-000-Pikachu.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Alola.png b/src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Alola.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Alola.png
rename to src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Alola.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Hoenn.png b/src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Hoenn.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Hoenn.png
rename to src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Hoenn.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Kalos.png b/src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Kalos.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Kalos.png
rename to src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Kalos.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Original.png b/src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Original.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Original.png
rename to src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Original.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Partner.png b/src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Partner.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Partner.png
rename to src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Partner.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Sinnoh.png b/src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Sinnoh.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Sinnoh.png
rename to src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Sinnoh.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Unova.png b/src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Unova.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0025--420--Pikachu--Unova.png
rename to src/canonical/minisprites/gen8/pokemon/0025-420-Pikachu-Unova.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0026--000--Raichu.png b/src/canonical/minisprites/gen8/pokemon/0026-000-Raichu.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0026--000--Raichu.png
rename to src/canonical/minisprites/gen8/pokemon/0026-000-Raichu.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0035--000--Clefairy.png b/src/canonical/minisprites/gen8/pokemon/0035-000-Clefairy.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0035--000--Clefairy.png
rename to src/canonical/minisprites/gen8/pokemon/0035-000-Clefairy.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0036--000--Clefable.png b/src/canonical/minisprites/gen8/pokemon/0036-000-Clefable.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0036--000--Clefable.png
rename to src/canonical/minisprites/gen8/pokemon/0036-000-Clefable.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0037--000--Vulpix.png b/src/canonical/minisprites/gen8/pokemon/0037-000-Vulpix.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0037--000--Vulpix.png
rename to src/canonical/minisprites/gen8/pokemon/0037-000-Vulpix.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0038--000--Ninetales.png b/src/canonical/minisprites/gen8/pokemon/0038-000-Ninetales.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0038--000--Ninetales.png
rename to src/canonical/minisprites/gen8/pokemon/0038-000-Ninetales.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0043--000--Oddish.png b/src/canonical/minisprites/gen8/pokemon/0043-000-Oddish.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0043--000--Oddish.png
rename to src/canonical/minisprites/gen8/pokemon/0043-000-Oddish.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0044--000--Gloom.png b/src/canonical/minisprites/gen8/pokemon/0044-000-Gloom.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0044--000--Gloom.png
rename to src/canonical/minisprites/gen8/pokemon/0044-000-Gloom.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0045--000--Vileplume.png b/src/canonical/minisprites/gen8/pokemon/0045-000-Vileplume.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0045--000--Vileplume.png
rename to src/canonical/minisprites/gen8/pokemon/0045-000-Vileplume.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0050--000--Diglett.png b/src/canonical/minisprites/gen8/pokemon/0050-000-Diglett.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0050--000--Diglett.png
rename to src/canonical/minisprites/gen8/pokemon/0050-000-Diglett.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0051--000--Dugtrio.png b/src/canonical/minisprites/gen8/pokemon/0051-000-Dugtrio.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0051--000--Dugtrio.png
rename to src/canonical/minisprites/gen8/pokemon/0051-000-Dugtrio.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0052--000--Meowth.png b/src/canonical/minisprites/gen8/pokemon/0052-000-Meowth.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0052--000--Meowth.png
rename to src/canonical/minisprites/gen8/pokemon/0052-000-Meowth.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0052--420--Meowth--Galar.png b/src/canonical/minisprites/gen8/pokemon/0052-420-Meowth-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0052--420--Meowth--Galar.png
rename to src/canonical/minisprites/gen8/pokemon/0052-420-Meowth-Galar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0052--420--Meowth--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0052-420-Meowth-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0052--420--Meowth--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0052-420-Meowth-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0053--000--Persian.png b/src/canonical/minisprites/gen8/pokemon/0053-000-Persian.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0053--000--Persian.png
rename to src/canonical/minisprites/gen8/pokemon/0053-000-Persian.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0058--000--Growlithe.png b/src/canonical/minisprites/gen8/pokemon/0058-000-Growlithe.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0058--000--Growlithe.png
rename to src/canonical/minisprites/gen8/pokemon/0058-000-Growlithe.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0059--000--Arcanine.png b/src/canonical/minisprites/gen8/pokemon/0059-000-Arcanine.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0059--000--Arcanine.png
rename to src/canonical/minisprites/gen8/pokemon/0059-000-Arcanine.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0066--000--Machop.png b/src/canonical/minisprites/gen8/pokemon/0066-000-Machop.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0066--000--Machop.png
rename to src/canonical/minisprites/gen8/pokemon/0066-000-Machop.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0067--000--Machoke.png b/src/canonical/minisprites/gen8/pokemon/0067-000-Machoke.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0067--000--Machoke.png
rename to src/canonical/minisprites/gen8/pokemon/0067-000-Machoke.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0068--000--Machamp.png b/src/canonical/minisprites/gen8/pokemon/0068-000-Machamp.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0068--000--Machamp.png
rename to src/canonical/minisprites/gen8/pokemon/0068-000-Machamp.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0068--420--Machamp--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0068-420-Machamp-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0068--420--Machamp--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0068-420-Machamp-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0077--000--Ponyta.png b/src/canonical/minisprites/gen8/pokemon/0077-000-Ponyta.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0077--000--Ponyta.png
rename to src/canonical/minisprites/gen8/pokemon/0077-000-Ponyta.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0077--420--Ponyta--Galar.png b/src/canonical/minisprites/gen8/pokemon/0077-420-Ponyta-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0077--420--Ponyta--Galar.png
rename to src/canonical/minisprites/gen8/pokemon/0077-420-Ponyta-Galar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0078--000--Rapidash.png b/src/canonical/minisprites/gen8/pokemon/0078-000-Rapidash.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0078--000--Rapidash.png
rename to src/canonical/minisprites/gen8/pokemon/0078-000-Rapidash.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0078--420--Rapidash--Galar.png b/src/canonical/minisprites/gen8/pokemon/0078-420-Rapidash-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0078--420--Rapidash--Galar.png
rename to src/canonical/minisprites/gen8/pokemon/0078-420-Rapidash-Galar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0079--420--Slowpoke--Galar.png b/src/canonical/minisprites/gen8/pokemon/0079-420-Slowpoke-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0079--420--Slowpoke--Galar.png
rename to src/canonical/minisprites/gen8/pokemon/0079-420-Slowpoke-Galar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0083--000--Farfetch__0027d.png b/src/canonical/minisprites/gen8/pokemon/0083-000-Farfetch__0027d.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0083--000--Farfetch__0027d.png
rename to src/canonical/minisprites/gen8/pokemon/0083-000-Farfetch__0027d.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0083--420--Farfetch__0027d--Galar.png b/src/canonical/minisprites/gen8/pokemon/0083-420-Farfetch__0027d-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0083--420--Farfetch__0027d--Galar.png
rename to src/canonical/minisprites/gen8/pokemon/0083-420-Farfetch__0027d-Galar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0090--000--Shellder.png b/src/canonical/minisprites/gen8/pokemon/0090-000-Shellder.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0090--000--Shellder.png
rename to src/canonical/minisprites/gen8/pokemon/0090-000-Shellder.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0091--000--Cloyster.png b/src/canonical/minisprites/gen8/pokemon/0091-000-Cloyster.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0091--000--Cloyster.png
rename to src/canonical/minisprites/gen8/pokemon/0091-000-Cloyster.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0092--000--Gastly.png b/src/canonical/minisprites/gen8/pokemon/0092-000-Gastly.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0092--000--Gastly.png
rename to src/canonical/minisprites/gen8/pokemon/0092-000-Gastly.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0093--000--Haunter.png b/src/canonical/minisprites/gen8/pokemon/0093-000-Haunter.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0093--000--Haunter.png
rename to src/canonical/minisprites/gen8/pokemon/0093-000-Haunter.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0094--000--Gengar.png b/src/canonical/minisprites/gen8/pokemon/0094-000-Gengar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0094--000--Gengar.png
rename to src/canonical/minisprites/gen8/pokemon/0094-000-Gengar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0094--420--Gengar--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0094-420-Gengar-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0094--420--Gengar--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0094-420-Gengar-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0095--000--Onix.png b/src/canonical/minisprites/gen8/pokemon/0095-000-Onix.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0095--000--Onix.png
rename to src/canonical/minisprites/gen8/pokemon/0095-000-Onix.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0098--000--Krabby.png b/src/canonical/minisprites/gen8/pokemon/0098-000-Krabby.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0098--000--Krabby.png
rename to src/canonical/minisprites/gen8/pokemon/0098-000-Krabby.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0099--000--Kingler.png b/src/canonical/minisprites/gen8/pokemon/0099-000-Kingler.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0099--000--Kingler.png
rename to src/canonical/minisprites/gen8/pokemon/0099-000-Kingler.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0099--420--Kingler--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0099-420-Kingler-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0099--420--Kingler--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0099-420-Kingler-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0106--000--Hitmonlee.png b/src/canonical/minisprites/gen8/pokemon/0106-000-Hitmonlee.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0106--000--Hitmonlee.png
rename to src/canonical/minisprites/gen8/pokemon/0106-000-Hitmonlee.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0107--000--Hitmonchan.png b/src/canonical/minisprites/gen8/pokemon/0107-000-Hitmonchan.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0107--000--Hitmonchan.png
rename to src/canonical/minisprites/gen8/pokemon/0107-000-Hitmonchan.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0109--000--Koffing.png b/src/canonical/minisprites/gen8/pokemon/0109-000-Koffing.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0109--000--Koffing.png
rename to src/canonical/minisprites/gen8/pokemon/0109-000-Koffing.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0110--000--Weezing.png b/src/canonical/minisprites/gen8/pokemon/0110-000-Weezing.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0110--000--Weezing.png
rename to src/canonical/minisprites/gen8/pokemon/0110-000-Weezing.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0110--420--Weezing--Galar.png b/src/canonical/minisprites/gen8/pokemon/0110-420-Weezing-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0110--420--Weezing--Galar.png
rename to src/canonical/minisprites/gen8/pokemon/0110-420-Weezing-Galar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0111--000--Rhyhorn.png b/src/canonical/minisprites/gen8/pokemon/0111-000-Rhyhorn.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0111--000--Rhyhorn.png
rename to src/canonical/minisprites/gen8/pokemon/0111-000-Rhyhorn.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0112--000--Rhydon.png b/src/canonical/minisprites/gen8/pokemon/0112-000-Rhydon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0112--000--Rhydon.png
rename to src/canonical/minisprites/gen8/pokemon/0112-000-Rhydon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0118--000--Goldeen.png b/src/canonical/minisprites/gen8/pokemon/0118-000-Goldeen.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0118--000--Goldeen.png
rename to src/canonical/minisprites/gen8/pokemon/0118-000-Goldeen.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0119--000--Seaking.png b/src/canonical/minisprites/gen8/pokemon/0119-000-Seaking.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0119--000--Seaking.png
rename to src/canonical/minisprites/gen8/pokemon/0119-000-Seaking.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0122--000--Mr._Mime.png b/src/canonical/minisprites/gen8/pokemon/0122-000-Mr._Mime.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0122--000--Mr._Mime.png
rename to src/canonical/minisprites/gen8/pokemon/0122-000-Mr._Mime.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0122--420--Mr._Mime--Galar.png b/src/canonical/minisprites/gen8/pokemon/0122-420-Mr._Mime-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0122--420--Mr._Mime--Galar.png
rename to src/canonical/minisprites/gen8/pokemon/0122-420-Mr._Mime-Galar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0129--000--Magikarp.png b/src/canonical/minisprites/gen8/pokemon/0129-000-Magikarp.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0129--000--Magikarp.png
rename to src/canonical/minisprites/gen8/pokemon/0129-000-Magikarp.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0130--000--Gyarados.png b/src/canonical/minisprites/gen8/pokemon/0130-000-Gyarados.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0130--000--Gyarados.png
rename to src/canonical/minisprites/gen8/pokemon/0130-000-Gyarados.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0131--000--Lapras.png b/src/canonical/minisprites/gen8/pokemon/0131-000-Lapras.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0131--000--Lapras.png
rename to src/canonical/minisprites/gen8/pokemon/0131-000-Lapras.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0131--420--Lapras--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0131-420-Lapras-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0131--420--Lapras--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0131-420-Lapras-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0132--000--Ditto.png b/src/canonical/minisprites/gen8/pokemon/0132-000-Ditto.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0132--000--Ditto.png
rename to src/canonical/minisprites/gen8/pokemon/0132-000-Ditto.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0133--000--Eevee.png b/src/canonical/minisprites/gen8/pokemon/0133-000-Eevee.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0133--000--Eevee.png
rename to src/canonical/minisprites/gen8/pokemon/0133-000-Eevee.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0133--420--Eevee--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0133-420-Eevee-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0133--420--Eevee--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0133-420-Eevee-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0134--000--Vaporeon.png b/src/canonical/minisprites/gen8/pokemon/0134-000-Vaporeon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0134--000--Vaporeon.png
rename to src/canonical/minisprites/gen8/pokemon/0134-000-Vaporeon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0135--000--Jolteon.png b/src/canonical/minisprites/gen8/pokemon/0135-000-Jolteon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0135--000--Jolteon.png
rename to src/canonical/minisprites/gen8/pokemon/0135-000-Jolteon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0136--000--Flareon.png b/src/canonical/minisprites/gen8/pokemon/0136-000-Flareon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0136--000--Flareon.png
rename to src/canonical/minisprites/gen8/pokemon/0136-000-Flareon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0143--000--Snorlax.png b/src/canonical/minisprites/gen8/pokemon/0143-000-Snorlax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0143--000--Snorlax.png
rename to src/canonical/minisprites/gen8/pokemon/0143-000-Snorlax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0143--420--Snorlax--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0143-420-Snorlax-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0143--420--Snorlax--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0143-420-Snorlax-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0150--000--Mewtwo.png b/src/canonical/minisprites/gen8/pokemon/0150-000-Mewtwo.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0150--000--Mewtwo.png
rename to src/canonical/minisprites/gen8/pokemon/0150-000-Mewtwo.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0151--000--Mew.png b/src/canonical/minisprites/gen8/pokemon/0151-000-Mew.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0151--000--Mew.png
rename to src/canonical/minisprites/gen8/pokemon/0151-000-Mew.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0163--000--Hoothoot.png b/src/canonical/minisprites/gen8/pokemon/0163-000-Hoothoot.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0163--000--Hoothoot.png
rename to src/canonical/minisprites/gen8/pokemon/0163-000-Hoothoot.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0164--000--Noctowl.png b/src/canonical/minisprites/gen8/pokemon/0164-000-Noctowl.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0164--000--Noctowl.png
rename to src/canonical/minisprites/gen8/pokemon/0164-000-Noctowl.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0170--000--Chinchou.png b/src/canonical/minisprites/gen8/pokemon/0170-000-Chinchou.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0170--000--Chinchou.png
rename to src/canonical/minisprites/gen8/pokemon/0170-000-Chinchou.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0171--000--Lanturn.png b/src/canonical/minisprites/gen8/pokemon/0171-000-Lanturn.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0171--000--Lanturn.png
rename to src/canonical/minisprites/gen8/pokemon/0171-000-Lanturn.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0172--000--Pichu.png b/src/canonical/minisprites/gen8/pokemon/0172-000-Pichu.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0172--000--Pichu.png
rename to src/canonical/minisprites/gen8/pokemon/0172-000-Pichu.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0173--000--Cleffa.png b/src/canonical/minisprites/gen8/pokemon/0173-000-Cleffa.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0173--000--Cleffa.png
rename to src/canonical/minisprites/gen8/pokemon/0173-000-Cleffa.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0175--000--Togepi.png b/src/canonical/minisprites/gen8/pokemon/0175-000-Togepi.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0175--000--Togepi.png
rename to src/canonical/minisprites/gen8/pokemon/0175-000-Togepi.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0176--000--Togetic.png b/src/canonical/minisprites/gen8/pokemon/0176-000-Togetic.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0176--000--Togetic.png
rename to src/canonical/minisprites/gen8/pokemon/0176-000-Togetic.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0177--000--Natu.png b/src/canonical/minisprites/gen8/pokemon/0177-000-Natu.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0177--000--Natu.png
rename to src/canonical/minisprites/gen8/pokemon/0177-000-Natu.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0178--000--Xatu.png b/src/canonical/minisprites/gen8/pokemon/0178-000-Xatu.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0178--000--Xatu.png
rename to src/canonical/minisprites/gen8/pokemon/0178-000-Xatu.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0182--000--Bellossom.png b/src/canonical/minisprites/gen8/pokemon/0182-000-Bellossom.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0182--000--Bellossom.png
rename to src/canonical/minisprites/gen8/pokemon/0182-000-Bellossom.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0185--000--Sudowoodo.png b/src/canonical/minisprites/gen8/pokemon/0185-000-Sudowoodo.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0185--000--Sudowoodo.png
rename to src/canonical/minisprites/gen8/pokemon/0185-000-Sudowoodo.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0197--000--Umbreon.png b/src/canonical/minisprites/gen8/pokemon/0197-000-Umbreon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0197--000--Umbreon.png
rename to src/canonical/minisprites/gen8/pokemon/0197-000-Umbreon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0208--000--Steelix.png b/src/canonical/minisprites/gen8/pokemon/0208-000-Steelix.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0208--000--Steelix.png
rename to src/canonical/minisprites/gen8/pokemon/0208-000-Steelix.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0215--000--Sneasel.png b/src/canonical/minisprites/gen8/pokemon/0215-000-Sneasel.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0215--000--Sneasel.png
rename to src/canonical/minisprites/gen8/pokemon/0215-000-Sneasel.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0221--000--Piloswine.png b/src/canonical/minisprites/gen8/pokemon/0221-000-Piloswine.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0221--000--Piloswine.png
rename to src/canonical/minisprites/gen8/pokemon/0221-000-Piloswine.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0222--000--Corsola.png b/src/canonical/minisprites/gen8/pokemon/0222-000-Corsola.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0222--000--Corsola.png
rename to src/canonical/minisprites/gen8/pokemon/0222-000-Corsola.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0223--000--Remoraid.png b/src/canonical/minisprites/gen8/pokemon/0223-000-Remoraid.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0223--000--Remoraid.png
rename to src/canonical/minisprites/gen8/pokemon/0223-000-Remoraid.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0236--000--Tyrogue.png b/src/canonical/minisprites/gen8/pokemon/0236-000-Tyrogue.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0236--000--Tyrogue.png
rename to src/canonical/minisprites/gen8/pokemon/0236-000-Tyrogue.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0246--000--Larvitar.png b/src/canonical/minisprites/gen8/pokemon/0246-000-Larvitar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0246--000--Larvitar.png
rename to src/canonical/minisprites/gen8/pokemon/0246-000-Larvitar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0247--000--Pupitar.png b/src/canonical/minisprites/gen8/pokemon/0247-000-Pupitar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0247--000--Pupitar.png
rename to src/canonical/minisprites/gen8/pokemon/0247-000-Pupitar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0248--000--Tyranitar.png b/src/canonical/minisprites/gen8/pokemon/0248-000-Tyranitar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0248--000--Tyranitar.png
rename to src/canonical/minisprites/gen8/pokemon/0248-000-Tyranitar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0251--000--Celebi.png b/src/canonical/minisprites/gen8/pokemon/0251-000-Celebi.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0251--000--Celebi.png
rename to src/canonical/minisprites/gen8/pokemon/0251-000-Celebi.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0263--000--Zigzagoon.png b/src/canonical/minisprites/gen8/pokemon/0263-000-Zigzagoon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0263--000--Zigzagoon.png
rename to src/canonical/minisprites/gen8/pokemon/0263-000-Zigzagoon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0263--420--Zigzagoon--Galar.png b/src/canonical/minisprites/gen8/pokemon/0263-420-Zigzagoon-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0263--420--Zigzagoon--Galar.png
rename to src/canonical/minisprites/gen8/pokemon/0263-420-Zigzagoon-Galar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0264--000--Linoone.png b/src/canonical/minisprites/gen8/pokemon/0264-000-Linoone.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0264--000--Linoone.png
rename to src/canonical/minisprites/gen8/pokemon/0264-000-Linoone.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0264--420--Linoone--Galar.png b/src/canonical/minisprites/gen8/pokemon/0264-420-Linoone-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0264--420--Linoone--Galar.png
rename to src/canonical/minisprites/gen8/pokemon/0264-420-Linoone-Galar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0270--000--Lotad.png b/src/canonical/minisprites/gen8/pokemon/0270-000-Lotad.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0270--000--Lotad.png
rename to src/canonical/minisprites/gen8/pokemon/0270-000-Lotad.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0271--000--Lombre.png b/src/canonical/minisprites/gen8/pokemon/0271-000-Lombre.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0271--000--Lombre.png
rename to src/canonical/minisprites/gen8/pokemon/0271-000-Lombre.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0272--000--Ludicolo.png b/src/canonical/minisprites/gen8/pokemon/0272-000-Ludicolo.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0272--000--Ludicolo.png
rename to src/canonical/minisprites/gen8/pokemon/0272-000-Ludicolo.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0273--000--Seedot.png b/src/canonical/minisprites/gen8/pokemon/0273-000-Seedot.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0273--000--Seedot.png
rename to src/canonical/minisprites/gen8/pokemon/0273-000-Seedot.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0274--000--Nuzleaf.png b/src/canonical/minisprites/gen8/pokemon/0274-000-Nuzleaf.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0274--000--Nuzleaf.png
rename to src/canonical/minisprites/gen8/pokemon/0274-000-Nuzleaf.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0275--000--Shiftry.png b/src/canonical/minisprites/gen8/pokemon/0275-000-Shiftry.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0275--000--Shiftry.png
rename to src/canonical/minisprites/gen8/pokemon/0275-000-Shiftry.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0278--000--Wingull.png b/src/canonical/minisprites/gen8/pokemon/0278-000-Wingull.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0278--000--Wingull.png
rename to src/canonical/minisprites/gen8/pokemon/0278-000-Wingull.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0279--000--Pelipper.png b/src/canonical/minisprites/gen8/pokemon/0279-000-Pelipper.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0279--000--Pelipper.png
rename to src/canonical/minisprites/gen8/pokemon/0279-000-Pelipper.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0280--000--Ralts.png b/src/canonical/minisprites/gen8/pokemon/0280-000-Ralts.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0280--000--Ralts.png
rename to src/canonical/minisprites/gen8/pokemon/0280-000-Ralts.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0281--000--Kirlia.png b/src/canonical/minisprites/gen8/pokemon/0281-000-Kirlia.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0281--000--Kirlia.png
rename to src/canonical/minisprites/gen8/pokemon/0281-000-Kirlia.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0282--000--Gardevoir.png b/src/canonical/minisprites/gen8/pokemon/0282-000-Gardevoir.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0282--000--Gardevoir.png
rename to src/canonical/minisprites/gen8/pokemon/0282-000-Gardevoir.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0290--000--Nincada.png b/src/canonical/minisprites/gen8/pokemon/0290-000-Nincada.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0290--000--Nincada.png
rename to src/canonical/minisprites/gen8/pokemon/0290-000-Nincada.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0291--000--Ninjask.png b/src/canonical/minisprites/gen8/pokemon/0291-000-Ninjask.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0291--000--Ninjask.png
rename to src/canonical/minisprites/gen8/pokemon/0291-000-Ninjask.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0292--000--Shedinja.png b/src/canonical/minisprites/gen8/pokemon/0292-000-Shedinja.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0292--000--Shedinja.png
rename to src/canonical/minisprites/gen8/pokemon/0292-000-Shedinja.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0302--000--Sableye.png b/src/canonical/minisprites/gen8/pokemon/0302-000-Sableye.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0302--000--Sableye.png
rename to src/canonical/minisprites/gen8/pokemon/0302-000-Sableye.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0303--000--Mawile.png b/src/canonical/minisprites/gen8/pokemon/0303-000-Mawile.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0303--000--Mawile.png
rename to src/canonical/minisprites/gen8/pokemon/0303-000-Mawile.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0309--000--Electrike.png b/src/canonical/minisprites/gen8/pokemon/0309-000-Electrike.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0309--000--Electrike.png
rename to src/canonical/minisprites/gen8/pokemon/0309-000-Electrike.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0310--000--Manectric.png b/src/canonical/minisprites/gen8/pokemon/0310-000-Manectric.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0310--000--Manectric.png
rename to src/canonical/minisprites/gen8/pokemon/0310-000-Manectric.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0315--000--Roselia.png b/src/canonical/minisprites/gen8/pokemon/0315-000-Roselia.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0315--000--Roselia.png
rename to src/canonical/minisprites/gen8/pokemon/0315-000-Roselia.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0320--000--Wailmer.png b/src/canonical/minisprites/gen8/pokemon/0320-000-Wailmer.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0320--000--Wailmer.png
rename to src/canonical/minisprites/gen8/pokemon/0320-000-Wailmer.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0321--000--Wailord.png b/src/canonical/minisprites/gen8/pokemon/0321-000-Wailord.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0321--000--Wailord.png
rename to src/canonical/minisprites/gen8/pokemon/0321-000-Wailord.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0324--000--Torkoal.png b/src/canonical/minisprites/gen8/pokemon/0324-000-Torkoal.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0324--000--Torkoal.png
rename to src/canonical/minisprites/gen8/pokemon/0324-000-Torkoal.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0328--000--Trapinch.png b/src/canonical/minisprites/gen8/pokemon/0328-000-Trapinch.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0328--000--Trapinch.png
rename to src/canonical/minisprites/gen8/pokemon/0328-000-Trapinch.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0329--000--Vibrava.png b/src/canonical/minisprites/gen8/pokemon/0329-000-Vibrava.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0329--000--Vibrava.png
rename to src/canonical/minisprites/gen8/pokemon/0329-000-Vibrava.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0330--000--Flygon.png b/src/canonical/minisprites/gen8/pokemon/0330-000-Flygon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0330--000--Flygon.png
rename to src/canonical/minisprites/gen8/pokemon/0330-000-Flygon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0337--000--Lunatone.png b/src/canonical/minisprites/gen8/pokemon/0337-000-Lunatone.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0337--000--Lunatone.png
rename to src/canonical/minisprites/gen8/pokemon/0337-000-Lunatone.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0338--000--Solrock.png b/src/canonical/minisprites/gen8/pokemon/0338-000-Solrock.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0338--000--Solrock.png
rename to src/canonical/minisprites/gen8/pokemon/0338-000-Solrock.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0339--000--Barboach.png b/src/canonical/minisprites/gen8/pokemon/0339-000-Barboach.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0339--000--Barboach.png
rename to src/canonical/minisprites/gen8/pokemon/0339-000-Barboach.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0340--000--Whiscash.png b/src/canonical/minisprites/gen8/pokemon/0340-000-Whiscash.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0340--000--Whiscash.png
rename to src/canonical/minisprites/gen8/pokemon/0340-000-Whiscash.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0341--000--Corphish.png b/src/canonical/minisprites/gen8/pokemon/0341-000-Corphish.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0341--000--Corphish.png
rename to src/canonical/minisprites/gen8/pokemon/0341-000-Corphish.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0342--000--Crawdaunt.png b/src/canonical/minisprites/gen8/pokemon/0342-000-Crawdaunt.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0342--000--Crawdaunt.png
rename to src/canonical/minisprites/gen8/pokemon/0342-000-Crawdaunt.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0343--000--Baltoy.png b/src/canonical/minisprites/gen8/pokemon/0343-000-Baltoy.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0343--000--Baltoy.png
rename to src/canonical/minisprites/gen8/pokemon/0343-000-Baltoy.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0344--000--Claydol.png b/src/canonical/minisprites/gen8/pokemon/0344-000-Claydol.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0344--000--Claydol.png
rename to src/canonical/minisprites/gen8/pokemon/0344-000-Claydol.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0349--000--Feebas.png b/src/canonical/minisprites/gen8/pokemon/0349-000-Feebas.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0349--000--Feebas.png
rename to src/canonical/minisprites/gen8/pokemon/0349-000-Feebas.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0350--000--Milotic.png b/src/canonical/minisprites/gen8/pokemon/0350-000-Milotic.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0350--000--Milotic.png
rename to src/canonical/minisprites/gen8/pokemon/0350-000-Milotic.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0355--000--Duskull.png b/src/canonical/minisprites/gen8/pokemon/0355-000-Duskull.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0355--000--Duskull.png
rename to src/canonical/minisprites/gen8/pokemon/0355-000-Duskull.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0356--000--Dusclops.png b/src/canonical/minisprites/gen8/pokemon/0356-000-Dusclops.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0356--000--Dusclops.png
rename to src/canonical/minisprites/gen8/pokemon/0356-000-Dusclops.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0360--000--Wynaut.png b/src/canonical/minisprites/gen8/pokemon/0360-000-Wynaut.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0360--000--Wynaut.png
rename to src/canonical/minisprites/gen8/pokemon/0360-000-Wynaut.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0361--000--Snorunt.png b/src/canonical/minisprites/gen8/pokemon/0361-000-Snorunt.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0361--000--Snorunt.png
rename to src/canonical/minisprites/gen8/pokemon/0361-000-Snorunt.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0362--000--Glalie.png b/src/canonical/minisprites/gen8/pokemon/0362-000-Glalie.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0362--000--Glalie.png
rename to src/canonical/minisprites/gen8/pokemon/0362-000-Glalie.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0385--000--Jirachi.png b/src/canonical/minisprites/gen8/pokemon/0385-000-Jirachi.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0385--000--Jirachi.png
rename to src/canonical/minisprites/gen8/pokemon/0385-000-Jirachi.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0406--000--Budew.png b/src/canonical/minisprites/gen8/pokemon/0406-000-Budew.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0406--000--Budew.png
rename to src/canonical/minisprites/gen8/pokemon/0406-000-Budew.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0407--000--Roserade.png b/src/canonical/minisprites/gen8/pokemon/0407-000-Roserade.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0407--000--Roserade.png
rename to src/canonical/minisprites/gen8/pokemon/0407-000-Roserade.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0415--000--Combee.png b/src/canonical/minisprites/gen8/pokemon/0415-000-Combee.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0415--000--Combee.png
rename to src/canonical/minisprites/gen8/pokemon/0415-000-Combee.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0416--000--Vespiquen.png b/src/canonical/minisprites/gen8/pokemon/0416-000-Vespiquen.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0416--000--Vespiquen.png
rename to src/canonical/minisprites/gen8/pokemon/0416-000-Vespiquen.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0420--000--Cherubi.png b/src/canonical/minisprites/gen8/pokemon/0420-000-Cherubi.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0420--000--Cherubi.png
rename to src/canonical/minisprites/gen8/pokemon/0420-000-Cherubi.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0421--000--Cherrim.png b/src/canonical/minisprites/gen8/pokemon/0421-000-Cherrim.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0421--000--Cherrim.png
rename to src/canonical/minisprites/gen8/pokemon/0421-000-Cherrim.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0421--420--Cherrim--Sunshine.png b/src/canonical/minisprites/gen8/pokemon/0421-420-Cherrim-Sunshine.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0421--420--Cherrim--Sunshine.png
rename to src/canonical/minisprites/gen8/pokemon/0421-420-Cherrim-Sunshine.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0422--000--Shellos.png b/src/canonical/minisprites/gen8/pokemon/0422-000-Shellos.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0422--000--Shellos.png
rename to src/canonical/minisprites/gen8/pokemon/0422-000-Shellos.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0422--420--Shellos--East.png b/src/canonical/minisprites/gen8/pokemon/0422-420-Shellos-East.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0422--420--Shellos--East.png
rename to src/canonical/minisprites/gen8/pokemon/0422-420-Shellos-East.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0423--000--Gastrodon.png b/src/canonical/minisprites/gen8/pokemon/0423-000-Gastrodon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0423--000--Gastrodon.png
rename to src/canonical/minisprites/gen8/pokemon/0423-000-Gastrodon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0423--420--Gastrodon--East.png b/src/canonical/minisprites/gen8/pokemon/0423-420-Gastrodon-East.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0423--420--Gastrodon--East.png
rename to src/canonical/minisprites/gen8/pokemon/0423-420-Gastrodon-East.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0425--000--Drifloon.png b/src/canonical/minisprites/gen8/pokemon/0425-000-Drifloon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0425--000--Drifloon.png
rename to src/canonical/minisprites/gen8/pokemon/0425-000-Drifloon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0426--000--Drifblim.png b/src/canonical/minisprites/gen8/pokemon/0426-000-Drifblim.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0426--000--Drifblim.png
rename to src/canonical/minisprites/gen8/pokemon/0426-000-Drifblim.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0434--000--Stunky.png b/src/canonical/minisprites/gen8/pokemon/0434-000-Stunky.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0434--000--Stunky.png
rename to src/canonical/minisprites/gen8/pokemon/0434-000-Stunky.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0435--000--Skuntank.png b/src/canonical/minisprites/gen8/pokemon/0435-000-Skuntank.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0435--000--Skuntank.png
rename to src/canonical/minisprites/gen8/pokemon/0435-000-Skuntank.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0436--000--Bronzor.png b/src/canonical/minisprites/gen8/pokemon/0436-000-Bronzor.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0436--000--Bronzor.png
rename to src/canonical/minisprites/gen8/pokemon/0436-000-Bronzor.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0437--000--Bronzong.png b/src/canonical/minisprites/gen8/pokemon/0437-000-Bronzong.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0437--000--Bronzong.png
rename to src/canonical/minisprites/gen8/pokemon/0437-000-Bronzong.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0438--000--Bonsly.png b/src/canonical/minisprites/gen8/pokemon/0438-000-Bonsly.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0438--000--Bonsly.png
rename to src/canonical/minisprites/gen8/pokemon/0438-000-Bonsly.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0439--000--Mime_Jr..png b/src/canonical/minisprites/gen8/pokemon/0439-000-Mime_Jr..png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0439--000--Mime_Jr..png
rename to src/canonical/minisprites/gen8/pokemon/0439-000-Mime_Jr..png
diff --git a/src/canonical/minisprites/gen8/pokemon/0446--000--Munchlax.png b/src/canonical/minisprites/gen8/pokemon/0446-000-Munchlax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0446--000--Munchlax.png
rename to src/canonical/minisprites/gen8/pokemon/0446-000-Munchlax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0447--000--Riolu.png b/src/canonical/minisprites/gen8/pokemon/0447-000-Riolu.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0447--000--Riolu.png
rename to src/canonical/minisprites/gen8/pokemon/0447-000-Riolu.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0448--000--Lucario.png b/src/canonical/minisprites/gen8/pokemon/0448-000-Lucario.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0448--000--Lucario.png
rename to src/canonical/minisprites/gen8/pokemon/0448-000-Lucario.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0449--000--Hippopotas.png b/src/canonical/minisprites/gen8/pokemon/0449-000-Hippopotas.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0449--000--Hippopotas.png
rename to src/canonical/minisprites/gen8/pokemon/0449-000-Hippopotas.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0450--000--Hippowdon.png b/src/canonical/minisprites/gen8/pokemon/0450-000-Hippowdon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0450--000--Hippowdon.png
rename to src/canonical/minisprites/gen8/pokemon/0450-000-Hippowdon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0451--000--Skorupi.png b/src/canonical/minisprites/gen8/pokemon/0451-000-Skorupi.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0451--000--Skorupi.png
rename to src/canonical/minisprites/gen8/pokemon/0451-000-Skorupi.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0452--000--Drapion.png b/src/canonical/minisprites/gen8/pokemon/0452-000-Drapion.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0452--000--Drapion.png
rename to src/canonical/minisprites/gen8/pokemon/0452-000-Drapion.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0453--000--Croagunk.png b/src/canonical/minisprites/gen8/pokemon/0453-000-Croagunk.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0453--000--Croagunk.png
rename to src/canonical/minisprites/gen8/pokemon/0453-000-Croagunk.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0454--000--Toxicroak.png b/src/canonical/minisprites/gen8/pokemon/0454-000-Toxicroak.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0454--000--Toxicroak.png
rename to src/canonical/minisprites/gen8/pokemon/0454-000-Toxicroak.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0458--000--Mantyke.png b/src/canonical/minisprites/gen8/pokemon/0458-000-Mantyke.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0458--000--Mantyke.png
rename to src/canonical/minisprites/gen8/pokemon/0458-000-Mantyke.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0459--000--Snover.png b/src/canonical/minisprites/gen8/pokemon/0459-000-Snover.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0459--000--Snover.png
rename to src/canonical/minisprites/gen8/pokemon/0459-000-Snover.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0460--000--Abomasnow.png b/src/canonical/minisprites/gen8/pokemon/0460-000-Abomasnow.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0460--000--Abomasnow.png
rename to src/canonical/minisprites/gen8/pokemon/0460-000-Abomasnow.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0461--000--Weavile.png b/src/canonical/minisprites/gen8/pokemon/0461-000-Weavile.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0461--000--Weavile.png
rename to src/canonical/minisprites/gen8/pokemon/0461-000-Weavile.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0464--000--Rhyperior.png b/src/canonical/minisprites/gen8/pokemon/0464-000-Rhyperior.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0464--000--Rhyperior.png
rename to src/canonical/minisprites/gen8/pokemon/0464-000-Rhyperior.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0468--000--Togekiss.png b/src/canonical/minisprites/gen8/pokemon/0468-000-Togekiss.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0468--000--Togekiss.png
rename to src/canonical/minisprites/gen8/pokemon/0468-000-Togekiss.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0470--000--Leafeon.png b/src/canonical/minisprites/gen8/pokemon/0470-000-Leafeon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0470--000--Leafeon.png
rename to src/canonical/minisprites/gen8/pokemon/0470-000-Leafeon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0471--000--Glaceon.png b/src/canonical/minisprites/gen8/pokemon/0471-000-Glaceon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0471--000--Glaceon.png
rename to src/canonical/minisprites/gen8/pokemon/0471-000-Glaceon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0473--000--Mamoswine.png b/src/canonical/minisprites/gen8/pokemon/0473-000-Mamoswine.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0473--000--Mamoswine.png
rename to src/canonical/minisprites/gen8/pokemon/0473-000-Mamoswine.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0475--000--Gallade.png b/src/canonical/minisprites/gen8/pokemon/0475-000-Gallade.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0475--000--Gallade.png
rename to src/canonical/minisprites/gen8/pokemon/0475-000-Gallade.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0477--000--Dusknoir.png b/src/canonical/minisprites/gen8/pokemon/0477-000-Dusknoir.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0477--000--Dusknoir.png
rename to src/canonical/minisprites/gen8/pokemon/0477-000-Dusknoir.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0478--000--Froslass.png b/src/canonical/minisprites/gen8/pokemon/0478-000-Froslass.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0478--000--Froslass.png
rename to src/canonical/minisprites/gen8/pokemon/0478-000-Froslass.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0479--000--Rotom.png b/src/canonical/minisprites/gen8/pokemon/0479-000-Rotom.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0479--000--Rotom.png
rename to src/canonical/minisprites/gen8/pokemon/0479-000-Rotom.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0479--420--Rotom--Fan.png b/src/canonical/minisprites/gen8/pokemon/0479-420-Rotom-Fan.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0479--420--Rotom--Fan.png
rename to src/canonical/minisprites/gen8/pokemon/0479-420-Rotom-Fan.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0479--420--Rotom--Frost.png b/src/canonical/minisprites/gen8/pokemon/0479-420-Rotom-Frost.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0479--420--Rotom--Frost.png
rename to src/canonical/minisprites/gen8/pokemon/0479-420-Rotom-Frost.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0479--420--Rotom--Heat.png b/src/canonical/minisprites/gen8/pokemon/0479-420-Rotom-Heat.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0479--420--Rotom--Heat.png
rename to src/canonical/minisprites/gen8/pokemon/0479-420-Rotom-Heat.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0479--420--Rotom--Mow.png b/src/canonical/minisprites/gen8/pokemon/0479-420-Rotom-Mow.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0479--420--Rotom--Mow.png
rename to src/canonical/minisprites/gen8/pokemon/0479-420-Rotom-Mow.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0479--420--Rotom--Wash.png b/src/canonical/minisprites/gen8/pokemon/0479-420-Rotom-Wash.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0479--420--Rotom--Wash.png
rename to src/canonical/minisprites/gen8/pokemon/0479-420-Rotom-Wash.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0509--000--Purrloin.png b/src/canonical/minisprites/gen8/pokemon/0509-000-Purrloin.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0509--000--Purrloin.png
rename to src/canonical/minisprites/gen8/pokemon/0509-000-Purrloin.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0510--000--Liepard.png b/src/canonical/minisprites/gen8/pokemon/0510-000-Liepard.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0510--000--Liepard.png
rename to src/canonical/minisprites/gen8/pokemon/0510-000-Liepard.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0517--000--Munna.png b/src/canonical/minisprites/gen8/pokemon/0517-000-Munna.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0517--000--Munna.png
rename to src/canonical/minisprites/gen8/pokemon/0517-000-Munna.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0518--000--Musharna.png b/src/canonical/minisprites/gen8/pokemon/0518-000-Musharna.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0518--000--Musharna.png
rename to src/canonical/minisprites/gen8/pokemon/0518-000-Musharna.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0519--000--Pidove.png b/src/canonical/minisprites/gen8/pokemon/0519-000-Pidove.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0519--000--Pidove.png
rename to src/canonical/minisprites/gen8/pokemon/0519-000-Pidove.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0520--000--Tranquill.png b/src/canonical/minisprites/gen8/pokemon/0520-000-Tranquill.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0520--000--Tranquill.png
rename to src/canonical/minisprites/gen8/pokemon/0520-000-Tranquill.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0521--000--Unfezant--Female.png b/src/canonical/minisprites/gen8/pokemon/0521-000-Unfezant-Female.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0521--000--Unfezant--Female.png
rename to src/canonical/minisprites/gen8/pokemon/0521-000-Unfezant-Female.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0521--000--Unfezant.png b/src/canonical/minisprites/gen8/pokemon/0521-000-Unfezant.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0521--000--Unfezant.png
rename to src/canonical/minisprites/gen8/pokemon/0521-000-Unfezant.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0524--000--Roggenrola.png b/src/canonical/minisprites/gen8/pokemon/0524-000-Roggenrola.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0524--000--Roggenrola.png
rename to src/canonical/minisprites/gen8/pokemon/0524-000-Roggenrola.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0525--000--Boldore.png b/src/canonical/minisprites/gen8/pokemon/0525-000-Boldore.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0525--000--Boldore.png
rename to src/canonical/minisprites/gen8/pokemon/0525-000-Boldore.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0526--000--Gigalith.png b/src/canonical/minisprites/gen8/pokemon/0526-000-Gigalith.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0526--000--Gigalith.png
rename to src/canonical/minisprites/gen8/pokemon/0526-000-Gigalith.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0527--000--Woobat.png b/src/canonical/minisprites/gen8/pokemon/0527-000-Woobat.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0527--000--Woobat.png
rename to src/canonical/minisprites/gen8/pokemon/0527-000-Woobat.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0528--000--Swoobat.png b/src/canonical/minisprites/gen8/pokemon/0528-000-Swoobat.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0528--000--Swoobat.png
rename to src/canonical/minisprites/gen8/pokemon/0528-000-Swoobat.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0529--000--Drilbur.png b/src/canonical/minisprites/gen8/pokemon/0529-000-Drilbur.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0529--000--Drilbur.png
rename to src/canonical/minisprites/gen8/pokemon/0529-000-Drilbur.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0530--000--Excadrill.png b/src/canonical/minisprites/gen8/pokemon/0530-000-Excadrill.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0530--000--Excadrill.png
rename to src/canonical/minisprites/gen8/pokemon/0530-000-Excadrill.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0532--000--Timburr.png b/src/canonical/minisprites/gen8/pokemon/0532-000-Timburr.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0532--000--Timburr.png
rename to src/canonical/minisprites/gen8/pokemon/0532-000-Timburr.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0533--000--Gurdurr.png b/src/canonical/minisprites/gen8/pokemon/0533-000-Gurdurr.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0533--000--Gurdurr.png
rename to src/canonical/minisprites/gen8/pokemon/0533-000-Gurdurr.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0534--000--Conkeldurr.png b/src/canonical/minisprites/gen8/pokemon/0534-000-Conkeldurr.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0534--000--Conkeldurr.png
rename to src/canonical/minisprites/gen8/pokemon/0534-000-Conkeldurr.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0535--000--Tympole.png b/src/canonical/minisprites/gen8/pokemon/0535-000-Tympole.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0535--000--Tympole.png
rename to src/canonical/minisprites/gen8/pokemon/0535-000-Tympole.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0536--000--Palpitoad.png b/src/canonical/minisprites/gen8/pokemon/0536-000-Palpitoad.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0536--000--Palpitoad.png
rename to src/canonical/minisprites/gen8/pokemon/0536-000-Palpitoad.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0537--000--Seismitoad.png b/src/canonical/minisprites/gen8/pokemon/0537-000-Seismitoad.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0537--000--Seismitoad.png
rename to src/canonical/minisprites/gen8/pokemon/0537-000-Seismitoad.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0538--000--Throh.png b/src/canonical/minisprites/gen8/pokemon/0538-000-Throh.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0538--000--Throh.png
rename to src/canonical/minisprites/gen8/pokemon/0538-000-Throh.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0539--000--Sawk.png b/src/canonical/minisprites/gen8/pokemon/0539-000-Sawk.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0539--000--Sawk.png
rename to src/canonical/minisprites/gen8/pokemon/0539-000-Sawk.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0546--000--Cottonee.png b/src/canonical/minisprites/gen8/pokemon/0546-000-Cottonee.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0546--000--Cottonee.png
rename to src/canonical/minisprites/gen8/pokemon/0546-000-Cottonee.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0547--000--Whimsicott.png b/src/canonical/minisprites/gen8/pokemon/0547-000-Whimsicott.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0547--000--Whimsicott.png
rename to src/canonical/minisprites/gen8/pokemon/0547-000-Whimsicott.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0550--000--Basculin.png b/src/canonical/minisprites/gen8/pokemon/0550-000-Basculin.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0550--000--Basculin.png
rename to src/canonical/minisprites/gen8/pokemon/0550-000-Basculin.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0550--420--Basculin--Blue-Striped.png b/src/canonical/minisprites/gen8/pokemon/0550-420-Basculin-Blue~Striped.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0550--420--Basculin--Blue-Striped.png
rename to src/canonical/minisprites/gen8/pokemon/0550-420-Basculin-Blue~Striped.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0554--000--Darumaka.png b/src/canonical/minisprites/gen8/pokemon/0554-000-Darumaka.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0554--000--Darumaka.png
rename to src/canonical/minisprites/gen8/pokemon/0554-000-Darumaka.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0554--420--Darumaka--Galar.png b/src/canonical/minisprites/gen8/pokemon/0554-420-Darumaka-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0554--420--Darumaka--Galar.png
rename to src/canonical/minisprites/gen8/pokemon/0554-420-Darumaka-Galar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0555--000--Darmanitan.png b/src/canonical/minisprites/gen8/pokemon/0555-000-Darmanitan.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0555--000--Darmanitan.png
rename to src/canonical/minisprites/gen8/pokemon/0555-000-Darmanitan.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0555--420--Darmanitan--Galar.png b/src/canonical/minisprites/gen8/pokemon/0555-420-Darmanitan-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0555--420--Darmanitan--Galar.png
rename to src/canonical/minisprites/gen8/pokemon/0555-420-Darmanitan-Galar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0555--420--Darmanitan--Galar-Zen.png b/src/canonical/minisprites/gen8/pokemon/0555-420-Darmanitan-Galar~Zen.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0555--420--Darmanitan--Galar-Zen.png
rename to src/canonical/minisprites/gen8/pokemon/0555-420-Darmanitan-Galar~Zen.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0555--420--Darmanitan--Zen.png b/src/canonical/minisprites/gen8/pokemon/0555-420-Darmanitan-Zen.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0555--420--Darmanitan--Zen.png
rename to src/canonical/minisprites/gen8/pokemon/0555-420-Darmanitan-Zen.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0556--000--Maractus.png b/src/canonical/minisprites/gen8/pokemon/0556-000-Maractus.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0556--000--Maractus.png
rename to src/canonical/minisprites/gen8/pokemon/0556-000-Maractus.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0557--000--Dwebble.png b/src/canonical/minisprites/gen8/pokemon/0557-000-Dwebble.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0557--000--Dwebble.png
rename to src/canonical/minisprites/gen8/pokemon/0557-000-Dwebble.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0558--000--Crustle.png b/src/canonical/minisprites/gen8/pokemon/0558-000-Crustle.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0558--000--Crustle.png
rename to src/canonical/minisprites/gen8/pokemon/0558-000-Crustle.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0559--000--Scraggy.png b/src/canonical/minisprites/gen8/pokemon/0559-000-Scraggy.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0559--000--Scraggy.png
rename to src/canonical/minisprites/gen8/pokemon/0559-000-Scraggy.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0560--000--Scrafty.png b/src/canonical/minisprites/gen8/pokemon/0560-000-Scrafty.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0560--000--Scrafty.png
rename to src/canonical/minisprites/gen8/pokemon/0560-000-Scrafty.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0561--000--Sigilyph.png b/src/canonical/minisprites/gen8/pokemon/0561-000-Sigilyph.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0561--000--Sigilyph.png
rename to src/canonical/minisprites/gen8/pokemon/0561-000-Sigilyph.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0562--000--Yamask.png b/src/canonical/minisprites/gen8/pokemon/0562-000-Yamask.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0562--000--Yamask.png
rename to src/canonical/minisprites/gen8/pokemon/0562-000-Yamask.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0562--420--Yamask--Galar.png b/src/canonical/minisprites/gen8/pokemon/0562-420-Yamask-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0562--420--Yamask--Galar.png
rename to src/canonical/minisprites/gen8/pokemon/0562-420-Yamask-Galar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0563--000--Cofagrigus.png b/src/canonical/minisprites/gen8/pokemon/0563-000-Cofagrigus.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0563--000--Cofagrigus.png
rename to src/canonical/minisprites/gen8/pokemon/0563-000-Cofagrigus.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0568--000--Trubbish.png b/src/canonical/minisprites/gen8/pokemon/0568-000-Trubbish.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0568--000--Trubbish.png
rename to src/canonical/minisprites/gen8/pokemon/0568-000-Trubbish.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0569--000--Garbodor.png b/src/canonical/minisprites/gen8/pokemon/0569-000-Garbodor.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0569--000--Garbodor.png
rename to src/canonical/minisprites/gen8/pokemon/0569-000-Garbodor.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0569--420--Garbodor--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0569-420-Garbodor-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0569--420--Garbodor--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0569-420-Garbodor-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0572--000--Minccino.png b/src/canonical/minisprites/gen8/pokemon/0572-000-Minccino.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0572--000--Minccino.png
rename to src/canonical/minisprites/gen8/pokemon/0572-000-Minccino.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0573--000--Cinccino.png b/src/canonical/minisprites/gen8/pokemon/0573-000-Cinccino.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0573--000--Cinccino.png
rename to src/canonical/minisprites/gen8/pokemon/0573-000-Cinccino.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0574--000--Gothita.png b/src/canonical/minisprites/gen8/pokemon/0574-000-Gothita.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0574--000--Gothita.png
rename to src/canonical/minisprites/gen8/pokemon/0574-000-Gothita.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0575--000--Gothorita.png b/src/canonical/minisprites/gen8/pokemon/0575-000-Gothorita.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0575--000--Gothorita.png
rename to src/canonical/minisprites/gen8/pokemon/0575-000-Gothorita.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0576--000--Gothitelle.png b/src/canonical/minisprites/gen8/pokemon/0576-000-Gothitelle.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0576--000--Gothitelle.png
rename to src/canonical/minisprites/gen8/pokemon/0576-000-Gothitelle.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0577--000--Solosis.png b/src/canonical/minisprites/gen8/pokemon/0577-000-Solosis.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0577--000--Solosis.png
rename to src/canonical/minisprites/gen8/pokemon/0577-000-Solosis.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0578--000--Duosion.png b/src/canonical/minisprites/gen8/pokemon/0578-000-Duosion.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0578--000--Duosion.png
rename to src/canonical/minisprites/gen8/pokemon/0578-000-Duosion.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0579--000--Reuniclus.png b/src/canonical/minisprites/gen8/pokemon/0579-000-Reuniclus.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0579--000--Reuniclus.png
rename to src/canonical/minisprites/gen8/pokemon/0579-000-Reuniclus.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0582--000--Vanillite.png b/src/canonical/minisprites/gen8/pokemon/0582-000-Vanillite.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0582--000--Vanillite.png
rename to src/canonical/minisprites/gen8/pokemon/0582-000-Vanillite.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0583--000--Vanillish.png b/src/canonical/minisprites/gen8/pokemon/0583-000-Vanillish.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0583--000--Vanillish.png
rename to src/canonical/minisprites/gen8/pokemon/0583-000-Vanillish.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0584--000--Vanilluxe.png b/src/canonical/minisprites/gen8/pokemon/0584-000-Vanilluxe.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0584--000--Vanilluxe.png
rename to src/canonical/minisprites/gen8/pokemon/0584-000-Vanilluxe.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0588--000--Karrablast.png b/src/canonical/minisprites/gen8/pokemon/0588-000-Karrablast.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0588--000--Karrablast.png
rename to src/canonical/minisprites/gen8/pokemon/0588-000-Karrablast.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0589--000--Escavalier.png b/src/canonical/minisprites/gen8/pokemon/0589-000-Escavalier.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0589--000--Escavalier.png
rename to src/canonical/minisprites/gen8/pokemon/0589-000-Escavalier.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0592--000--Frillish--Female.png b/src/canonical/minisprites/gen8/pokemon/0592-000-Frillish-Female.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0592--000--Frillish--Female.png
rename to src/canonical/minisprites/gen8/pokemon/0592-000-Frillish-Female.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0592--000--Frillish.png b/src/canonical/minisprites/gen8/pokemon/0592-000-Frillish.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0592--000--Frillish.png
rename to src/canonical/minisprites/gen8/pokemon/0592-000-Frillish.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0593--000--Jellicent--Female.png b/src/canonical/minisprites/gen8/pokemon/0593-000-Jellicent-Female.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0593--000--Jellicent--Female.png
rename to src/canonical/minisprites/gen8/pokemon/0593-000-Jellicent-Female.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0593--000--Jellicent.png b/src/canonical/minisprites/gen8/pokemon/0593-000-Jellicent.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0593--000--Jellicent.png
rename to src/canonical/minisprites/gen8/pokemon/0593-000-Jellicent.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0595--000--Joltik.png b/src/canonical/minisprites/gen8/pokemon/0595-000-Joltik.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0595--000--Joltik.png
rename to src/canonical/minisprites/gen8/pokemon/0595-000-Joltik.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0596--000--Galvantula.png b/src/canonical/minisprites/gen8/pokemon/0596-000-Galvantula.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0596--000--Galvantula.png
rename to src/canonical/minisprites/gen8/pokemon/0596-000-Galvantula.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0597--000--Ferroseed.png b/src/canonical/minisprites/gen8/pokemon/0597-000-Ferroseed.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0597--000--Ferroseed.png
rename to src/canonical/minisprites/gen8/pokemon/0597-000-Ferroseed.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0598--000--Ferrothorn.png b/src/canonical/minisprites/gen8/pokemon/0598-000-Ferrothorn.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0598--000--Ferrothorn.png
rename to src/canonical/minisprites/gen8/pokemon/0598-000-Ferrothorn.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0599--000--Klink.png b/src/canonical/minisprites/gen8/pokemon/0599-000-Klink.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0599--000--Klink.png
rename to src/canonical/minisprites/gen8/pokemon/0599-000-Klink.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0600--000--Klang.png b/src/canonical/minisprites/gen8/pokemon/0600-000-Klang.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0600--000--Klang.png
rename to src/canonical/minisprites/gen8/pokemon/0600-000-Klang.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0601--000--Klinklang.png b/src/canonical/minisprites/gen8/pokemon/0601-000-Klinklang.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0601--000--Klinklang.png
rename to src/canonical/minisprites/gen8/pokemon/0601-000-Klinklang.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0605--000--Elgyem.png b/src/canonical/minisprites/gen8/pokemon/0605-000-Elgyem.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0605--000--Elgyem.png
rename to src/canonical/minisprites/gen8/pokemon/0605-000-Elgyem.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0606--000--Beheeyem.png b/src/canonical/minisprites/gen8/pokemon/0606-000-Beheeyem.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0606--000--Beheeyem.png
rename to src/canonical/minisprites/gen8/pokemon/0606-000-Beheeyem.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0607--000--Litwick.png b/src/canonical/minisprites/gen8/pokemon/0607-000-Litwick.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0607--000--Litwick.png
rename to src/canonical/minisprites/gen8/pokemon/0607-000-Litwick.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0608--000--Lampent.png b/src/canonical/minisprites/gen8/pokemon/0608-000-Lampent.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0608--000--Lampent.png
rename to src/canonical/minisprites/gen8/pokemon/0608-000-Lampent.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0609--000--Chandelure.png b/src/canonical/minisprites/gen8/pokemon/0609-000-Chandelure.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0609--000--Chandelure.png
rename to src/canonical/minisprites/gen8/pokemon/0609-000-Chandelure.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0610--000--Axew.png b/src/canonical/minisprites/gen8/pokemon/0610-000-Axew.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0610--000--Axew.png
rename to src/canonical/minisprites/gen8/pokemon/0610-000-Axew.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0611--000--Fraxure.png b/src/canonical/minisprites/gen8/pokemon/0611-000-Fraxure.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0611--000--Fraxure.png
rename to src/canonical/minisprites/gen8/pokemon/0611-000-Fraxure.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0612--000--Haxorus.png b/src/canonical/minisprites/gen8/pokemon/0612-000-Haxorus.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0612--000--Haxorus.png
rename to src/canonical/minisprites/gen8/pokemon/0612-000-Haxorus.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0613--000--Cubchoo.png b/src/canonical/minisprites/gen8/pokemon/0613-000-Cubchoo.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0613--000--Cubchoo.png
rename to src/canonical/minisprites/gen8/pokemon/0613-000-Cubchoo.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0614--000--Beartic.png b/src/canonical/minisprites/gen8/pokemon/0614-000-Beartic.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0614--000--Beartic.png
rename to src/canonical/minisprites/gen8/pokemon/0614-000-Beartic.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0616--000--Shelmet.png b/src/canonical/minisprites/gen8/pokemon/0616-000-Shelmet.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0616--000--Shelmet.png
rename to src/canonical/minisprites/gen8/pokemon/0616-000-Shelmet.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0617--000--Accelgor.png b/src/canonical/minisprites/gen8/pokemon/0617-000-Accelgor.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0617--000--Accelgor.png
rename to src/canonical/minisprites/gen8/pokemon/0617-000-Accelgor.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0618--000--Stunfisk.png b/src/canonical/minisprites/gen8/pokemon/0618-000-Stunfisk.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0618--000--Stunfisk.png
rename to src/canonical/minisprites/gen8/pokemon/0618-000-Stunfisk.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0618--420--Stunfisk--Galar.png b/src/canonical/minisprites/gen8/pokemon/0618-420-Stunfisk-Galar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0618--420--Stunfisk--Galar.png
rename to src/canonical/minisprites/gen8/pokemon/0618-420-Stunfisk-Galar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0622--000--Golett.png b/src/canonical/minisprites/gen8/pokemon/0622-000-Golett.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0622--000--Golett.png
rename to src/canonical/minisprites/gen8/pokemon/0622-000-Golett.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0623--000--Golurk.png b/src/canonical/minisprites/gen8/pokemon/0623-000-Golurk.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0623--000--Golurk.png
rename to src/canonical/minisprites/gen8/pokemon/0623-000-Golurk.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0624--000--Pawniard.png b/src/canonical/minisprites/gen8/pokemon/0624-000-Pawniard.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0624--000--Pawniard.png
rename to src/canonical/minisprites/gen8/pokemon/0624-000-Pawniard.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0625--000--Bisharp.png b/src/canonical/minisprites/gen8/pokemon/0625-000-Bisharp.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0625--000--Bisharp.png
rename to src/canonical/minisprites/gen8/pokemon/0625-000-Bisharp.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0627--000--Rufflet.png b/src/canonical/minisprites/gen8/pokemon/0627-000-Rufflet.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0627--000--Rufflet.png
rename to src/canonical/minisprites/gen8/pokemon/0627-000-Rufflet.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0628--000--Braviary.png b/src/canonical/minisprites/gen8/pokemon/0628-000-Braviary.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0628--000--Braviary.png
rename to src/canonical/minisprites/gen8/pokemon/0628-000-Braviary.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0629--000--Vullaby.png b/src/canonical/minisprites/gen8/pokemon/0629-000-Vullaby.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0629--000--Vullaby.png
rename to src/canonical/minisprites/gen8/pokemon/0629-000-Vullaby.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0630--000--Mandibuzz.png b/src/canonical/minisprites/gen8/pokemon/0630-000-Mandibuzz.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0630--000--Mandibuzz.png
rename to src/canonical/minisprites/gen8/pokemon/0630-000-Mandibuzz.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0631--000--Heatmor.png b/src/canonical/minisprites/gen8/pokemon/0631-000-Heatmor.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0631--000--Heatmor.png
rename to src/canonical/minisprites/gen8/pokemon/0631-000-Heatmor.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0632--000--Durant.png b/src/canonical/minisprites/gen8/pokemon/0632-000-Durant.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0632--000--Durant.png
rename to src/canonical/minisprites/gen8/pokemon/0632-000-Durant.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0633--000--Deino.png b/src/canonical/minisprites/gen8/pokemon/0633-000-Deino.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0633--000--Deino.png
rename to src/canonical/minisprites/gen8/pokemon/0633-000-Deino.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0634--000--Zweilous.png b/src/canonical/minisprites/gen8/pokemon/0634-000-Zweilous.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0634--000--Zweilous.png
rename to src/canonical/minisprites/gen8/pokemon/0634-000-Zweilous.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0635--000--Hydreigon.png b/src/canonical/minisprites/gen8/pokemon/0635-000-Hydreigon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0635--000--Hydreigon.png
rename to src/canonical/minisprites/gen8/pokemon/0635-000-Hydreigon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0638--000--Cobalion.png b/src/canonical/minisprites/gen8/pokemon/0638-000-Cobalion.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0638--000--Cobalion.png
rename to src/canonical/minisprites/gen8/pokemon/0638-000-Cobalion.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0639--000--Terrakion.png b/src/canonical/minisprites/gen8/pokemon/0639-000-Terrakion.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0639--000--Terrakion.png
rename to src/canonical/minisprites/gen8/pokemon/0639-000-Terrakion.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0640--000--Virizion.png b/src/canonical/minisprites/gen8/pokemon/0640-000-Virizion.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0640--000--Virizion.png
rename to src/canonical/minisprites/gen8/pokemon/0640-000-Virizion.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0643--000--Reshiram.png b/src/canonical/minisprites/gen8/pokemon/0643-000-Reshiram.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0643--000--Reshiram.png
rename to src/canonical/minisprites/gen8/pokemon/0643-000-Reshiram.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0644--000--Zekrom.png b/src/canonical/minisprites/gen8/pokemon/0644-000-Zekrom.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0644--000--Zekrom.png
rename to src/canonical/minisprites/gen8/pokemon/0644-000-Zekrom.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0646--000--Kyurem.png b/src/canonical/minisprites/gen8/pokemon/0646-000-Kyurem.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0646--000--Kyurem.png
rename to src/canonical/minisprites/gen8/pokemon/0646-000-Kyurem.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0646--420--Kyurem--Black.png b/src/canonical/minisprites/gen8/pokemon/0646-420-Kyurem-Black.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0646--420--Kyurem--Black.png
rename to src/canonical/minisprites/gen8/pokemon/0646-420-Kyurem-Black.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0646--420--Kyurem--White.png b/src/canonical/minisprites/gen8/pokemon/0646-420-Kyurem-White.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0646--420--Kyurem--White.png
rename to src/canonical/minisprites/gen8/pokemon/0646-420-Kyurem-White.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0647--000--Keldeo.png b/src/canonical/minisprites/gen8/pokemon/0647-000-Keldeo.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0647--000--Keldeo.png
rename to src/canonical/minisprites/gen8/pokemon/0647-000-Keldeo.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0647--420--Keldeo--Resolute.png b/src/canonical/minisprites/gen8/pokemon/0647-420-Keldeo-Resolute.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0647--420--Keldeo--Resolute.png
rename to src/canonical/minisprites/gen8/pokemon/0647-420-Keldeo-Resolute.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0659--000--Bunnelby.png b/src/canonical/minisprites/gen8/pokemon/0659-000-Bunnelby.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0659--000--Bunnelby.png
rename to src/canonical/minisprites/gen8/pokemon/0659-000-Bunnelby.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0660--000--Diggersby.png b/src/canonical/minisprites/gen8/pokemon/0660-000-Diggersby.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0660--000--Diggersby.png
rename to src/canonical/minisprites/gen8/pokemon/0660-000-Diggersby.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0674--000--Pancham.png b/src/canonical/minisprites/gen8/pokemon/0674-000-Pancham.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0674--000--Pancham.png
rename to src/canonical/minisprites/gen8/pokemon/0674-000-Pancham.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0675--000--Pangoro.png b/src/canonical/minisprites/gen8/pokemon/0675-000-Pangoro.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0675--000--Pangoro.png
rename to src/canonical/minisprites/gen8/pokemon/0675-000-Pangoro.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0677--000--Espurr.png b/src/canonical/minisprites/gen8/pokemon/0677-000-Espurr.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0677--000--Espurr.png
rename to src/canonical/minisprites/gen8/pokemon/0677-000-Espurr.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0678--000--Meowstic.png b/src/canonical/minisprites/gen8/pokemon/0678-000-Meowstic.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0678--000--Meowstic.png
rename to src/canonical/minisprites/gen8/pokemon/0678-000-Meowstic.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0678--420--Meowstic--F.png b/src/canonical/minisprites/gen8/pokemon/0678-420-Meowstic-F.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0678--420--Meowstic--F.png
rename to src/canonical/minisprites/gen8/pokemon/0678-420-Meowstic-F.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0679--000--Honedge.png b/src/canonical/minisprites/gen8/pokemon/0679-000-Honedge.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0679--000--Honedge.png
rename to src/canonical/minisprites/gen8/pokemon/0679-000-Honedge.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0680--000--Doublade.png b/src/canonical/minisprites/gen8/pokemon/0680-000-Doublade.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0680--000--Doublade.png
rename to src/canonical/minisprites/gen8/pokemon/0680-000-Doublade.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0681--000--Aegislash.png b/src/canonical/minisprites/gen8/pokemon/0681-000-Aegislash.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0681--000--Aegislash.png
rename to src/canonical/minisprites/gen8/pokemon/0681-000-Aegislash.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0681--420--Aegislash--Blade.png b/src/canonical/minisprites/gen8/pokemon/0681-420-Aegislash-Blade.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0681--420--Aegislash--Blade.png
rename to src/canonical/minisprites/gen8/pokemon/0681-420-Aegislash-Blade.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0682--000--Spritzee.png b/src/canonical/minisprites/gen8/pokemon/0682-000-Spritzee.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0682--000--Spritzee.png
rename to src/canonical/minisprites/gen8/pokemon/0682-000-Spritzee.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0683--000--Aromatisse.png b/src/canonical/minisprites/gen8/pokemon/0683-000-Aromatisse.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0683--000--Aromatisse.png
rename to src/canonical/minisprites/gen8/pokemon/0683-000-Aromatisse.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0684--000--Swirlix.png b/src/canonical/minisprites/gen8/pokemon/0684-000-Swirlix.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0684--000--Swirlix.png
rename to src/canonical/minisprites/gen8/pokemon/0684-000-Swirlix.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0685--000--Slurpuff.png b/src/canonical/minisprites/gen8/pokemon/0685-000-Slurpuff.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0685--000--Slurpuff.png
rename to src/canonical/minisprites/gen8/pokemon/0685-000-Slurpuff.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0686--000--Inkay.png b/src/canonical/minisprites/gen8/pokemon/0686-000-Inkay.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0686--000--Inkay.png
rename to src/canonical/minisprites/gen8/pokemon/0686-000-Inkay.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0687--000--Malamar.png b/src/canonical/minisprites/gen8/pokemon/0687-000-Malamar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0687--000--Malamar.png
rename to src/canonical/minisprites/gen8/pokemon/0687-000-Malamar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0688--000--Binacle.png b/src/canonical/minisprites/gen8/pokemon/0688-000-Binacle.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0688--000--Binacle.png
rename to src/canonical/minisprites/gen8/pokemon/0688-000-Binacle.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0689--000--Barbaracle.png b/src/canonical/minisprites/gen8/pokemon/0689-000-Barbaracle.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0689--000--Barbaracle.png
rename to src/canonical/minisprites/gen8/pokemon/0689-000-Barbaracle.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0694--000--Helioptile.png b/src/canonical/minisprites/gen8/pokemon/0694-000-Helioptile.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0694--000--Helioptile.png
rename to src/canonical/minisprites/gen8/pokemon/0694-000-Helioptile.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0695--000--Heliolisk.png b/src/canonical/minisprites/gen8/pokemon/0695-000-Heliolisk.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0695--000--Heliolisk.png
rename to src/canonical/minisprites/gen8/pokemon/0695-000-Heliolisk.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0700--000--Sylveon.png b/src/canonical/minisprites/gen8/pokemon/0700-000-Sylveon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0700--000--Sylveon.png
rename to src/canonical/minisprites/gen8/pokemon/0700-000-Sylveon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0701--000--Hawlucha.png b/src/canonical/minisprites/gen8/pokemon/0701-000-Hawlucha.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0701--000--Hawlucha.png
rename to src/canonical/minisprites/gen8/pokemon/0701-000-Hawlucha.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0704--000--Goomy.png b/src/canonical/minisprites/gen8/pokemon/0704-000-Goomy.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0704--000--Goomy.png
rename to src/canonical/minisprites/gen8/pokemon/0704-000-Goomy.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0705--000--Sliggoo.png b/src/canonical/minisprites/gen8/pokemon/0705-000-Sliggoo.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0705--000--Sliggoo.png
rename to src/canonical/minisprites/gen8/pokemon/0705-000-Sliggoo.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0706--000--Goodra.png b/src/canonical/minisprites/gen8/pokemon/0706-000-Goodra.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0706--000--Goodra.png
rename to src/canonical/minisprites/gen8/pokemon/0706-000-Goodra.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0708--000--Phantump.png b/src/canonical/minisprites/gen8/pokemon/0708-000-Phantump.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0708--000--Phantump.png
rename to src/canonical/minisprites/gen8/pokemon/0708-000-Phantump.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0709--000--Trevenant.png b/src/canonical/minisprites/gen8/pokemon/0709-000-Trevenant.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0709--000--Trevenant.png
rename to src/canonical/minisprites/gen8/pokemon/0709-000-Trevenant.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0710--000--Pumpkaboo.png b/src/canonical/minisprites/gen8/pokemon/0710-000-Pumpkaboo.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0710--000--Pumpkaboo.png
rename to src/canonical/minisprites/gen8/pokemon/0710-000-Pumpkaboo.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0711--000--Gourgeist.png b/src/canonical/minisprites/gen8/pokemon/0711-000-Gourgeist.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0711--000--Gourgeist.png
rename to src/canonical/minisprites/gen8/pokemon/0711-000-Gourgeist.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0712--000--Bergmite.png b/src/canonical/minisprites/gen8/pokemon/0712-000-Bergmite.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0712--000--Bergmite.png
rename to src/canonical/minisprites/gen8/pokemon/0712-000-Bergmite.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0713--000--Avalugg.png b/src/canonical/minisprites/gen8/pokemon/0713-000-Avalugg.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0713--000--Avalugg.png
rename to src/canonical/minisprites/gen8/pokemon/0713-000-Avalugg.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0714--000--Noibat.png b/src/canonical/minisprites/gen8/pokemon/0714-000-Noibat.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0714--000--Noibat.png
rename to src/canonical/minisprites/gen8/pokemon/0714-000-Noibat.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0715--000--Noivern.png b/src/canonical/minisprites/gen8/pokemon/0715-000-Noivern.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0715--000--Noivern.png
rename to src/canonical/minisprites/gen8/pokemon/0715-000-Noivern.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0722--000--Rowlet.png b/src/canonical/minisprites/gen8/pokemon/0722-000-Rowlet.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0722--000--Rowlet.png
rename to src/canonical/minisprites/gen8/pokemon/0722-000-Rowlet.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0723--000--Dartrix.png b/src/canonical/minisprites/gen8/pokemon/0723-000-Dartrix.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0723--000--Dartrix.png
rename to src/canonical/minisprites/gen8/pokemon/0723-000-Dartrix.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0724--000--Decidueye.png b/src/canonical/minisprites/gen8/pokemon/0724-000-Decidueye.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0724--000--Decidueye.png
rename to src/canonical/minisprites/gen8/pokemon/0724-000-Decidueye.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0725--000--Litten.png b/src/canonical/minisprites/gen8/pokemon/0725-000-Litten.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0725--000--Litten.png
rename to src/canonical/minisprites/gen8/pokemon/0725-000-Litten.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0726--000--Torracat.png b/src/canonical/minisprites/gen8/pokemon/0726-000-Torracat.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0726--000--Torracat.png
rename to src/canonical/minisprites/gen8/pokemon/0726-000-Torracat.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0727--000--Incineroar.png b/src/canonical/minisprites/gen8/pokemon/0727-000-Incineroar.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0727--000--Incineroar.png
rename to src/canonical/minisprites/gen8/pokemon/0727-000-Incineroar.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0728--000--Popplio.png b/src/canonical/minisprites/gen8/pokemon/0728-000-Popplio.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0728--000--Popplio.png
rename to src/canonical/minisprites/gen8/pokemon/0728-000-Popplio.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0729--000--Brionne.png b/src/canonical/minisprites/gen8/pokemon/0729-000-Brionne.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0729--000--Brionne.png
rename to src/canonical/minisprites/gen8/pokemon/0729-000-Brionne.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0730--000--Primarina.png b/src/canonical/minisprites/gen8/pokemon/0730-000-Primarina.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0730--000--Primarina.png
rename to src/canonical/minisprites/gen8/pokemon/0730-000-Primarina.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0736--000--Grubbin.png b/src/canonical/minisprites/gen8/pokemon/0736-000-Grubbin.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0736--000--Grubbin.png
rename to src/canonical/minisprites/gen8/pokemon/0736-000-Grubbin.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0737--000--Charjabug.png b/src/canonical/minisprites/gen8/pokemon/0737-000-Charjabug.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0737--000--Charjabug.png
rename to src/canonical/minisprites/gen8/pokemon/0737-000-Charjabug.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0738--000--Vikavolt.png b/src/canonical/minisprites/gen8/pokemon/0738-000-Vikavolt.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0738--000--Vikavolt.png
rename to src/canonical/minisprites/gen8/pokemon/0738-000-Vikavolt.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0742--000--Cutiefly.png b/src/canonical/minisprites/gen8/pokemon/0742-000-Cutiefly.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0742--000--Cutiefly.png
rename to src/canonical/minisprites/gen8/pokemon/0742-000-Cutiefly.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0743--000--Ribombee.png b/src/canonical/minisprites/gen8/pokemon/0743-000-Ribombee.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0743--000--Ribombee.png
rename to src/canonical/minisprites/gen8/pokemon/0743-000-Ribombee.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0746--000--Wishiwashi.png b/src/canonical/minisprites/gen8/pokemon/0746-000-Wishiwashi.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0746--000--Wishiwashi.png
rename to src/canonical/minisprites/gen8/pokemon/0746-000-Wishiwashi.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0746--420--Wishiwashi--School.png b/src/canonical/minisprites/gen8/pokemon/0746-420-Wishiwashi-School.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0746--420--Wishiwashi--School.png
rename to src/canonical/minisprites/gen8/pokemon/0746-420-Wishiwashi-School.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0747--000--Mareanie.png b/src/canonical/minisprites/gen8/pokemon/0747-000-Mareanie.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0747--000--Mareanie.png
rename to src/canonical/minisprites/gen8/pokemon/0747-000-Mareanie.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0748--000--Toxapex.png b/src/canonical/minisprites/gen8/pokemon/0748-000-Toxapex.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0748--000--Toxapex.png
rename to src/canonical/minisprites/gen8/pokemon/0748-000-Toxapex.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0749--000--Mudbray.png b/src/canonical/minisprites/gen8/pokemon/0749-000-Mudbray.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0749--000--Mudbray.png
rename to src/canonical/minisprites/gen8/pokemon/0749-000-Mudbray.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0750--000--Mudsdale.png b/src/canonical/minisprites/gen8/pokemon/0750-000-Mudsdale.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0750--000--Mudsdale.png
rename to src/canonical/minisprites/gen8/pokemon/0750-000-Mudsdale.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0751--000--Dewpider.png b/src/canonical/minisprites/gen8/pokemon/0751-000-Dewpider.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0751--000--Dewpider.png
rename to src/canonical/minisprites/gen8/pokemon/0751-000-Dewpider.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0752--000--Araquanid.png b/src/canonical/minisprites/gen8/pokemon/0752-000-Araquanid.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0752--000--Araquanid.png
rename to src/canonical/minisprites/gen8/pokemon/0752-000-Araquanid.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0755--000--Morelull.png b/src/canonical/minisprites/gen8/pokemon/0755-000-Morelull.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0755--000--Morelull.png
rename to src/canonical/minisprites/gen8/pokemon/0755-000-Morelull.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0756--000--Shiinotic.png b/src/canonical/minisprites/gen8/pokemon/0756-000-Shiinotic.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0756--000--Shiinotic.png
rename to src/canonical/minisprites/gen8/pokemon/0756-000-Shiinotic.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0757--000--Salandit.png b/src/canonical/minisprites/gen8/pokemon/0757-000-Salandit.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0757--000--Salandit.png
rename to src/canonical/minisprites/gen8/pokemon/0757-000-Salandit.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0758--000--Salazzle.png b/src/canonical/minisprites/gen8/pokemon/0758-000-Salazzle.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0758--000--Salazzle.png
rename to src/canonical/minisprites/gen8/pokemon/0758-000-Salazzle.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0759--000--Stufful.png b/src/canonical/minisprites/gen8/pokemon/0759-000-Stufful.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0759--000--Stufful.png
rename to src/canonical/minisprites/gen8/pokemon/0759-000-Stufful.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0760--000--Bewear.png b/src/canonical/minisprites/gen8/pokemon/0760-000-Bewear.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0760--000--Bewear.png
rename to src/canonical/minisprites/gen8/pokemon/0760-000-Bewear.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0761--000--Bounsweet.png b/src/canonical/minisprites/gen8/pokemon/0761-000-Bounsweet.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0761--000--Bounsweet.png
rename to src/canonical/minisprites/gen8/pokemon/0761-000-Bounsweet.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0762--000--Steenee.png b/src/canonical/minisprites/gen8/pokemon/0762-000-Steenee.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0762--000--Steenee.png
rename to src/canonical/minisprites/gen8/pokemon/0762-000-Steenee.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0763--000--Tsareena.png b/src/canonical/minisprites/gen8/pokemon/0763-000-Tsareena.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0763--000--Tsareena.png
rename to src/canonical/minisprites/gen8/pokemon/0763-000-Tsareena.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0765--000--Oranguru.png b/src/canonical/minisprites/gen8/pokemon/0765-000-Oranguru.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0765--000--Oranguru.png
rename to src/canonical/minisprites/gen8/pokemon/0765-000-Oranguru.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0766--000--Passimian.png b/src/canonical/minisprites/gen8/pokemon/0766-000-Passimian.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0766--000--Passimian.png
rename to src/canonical/minisprites/gen8/pokemon/0766-000-Passimian.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0767--000--Wimpod.png b/src/canonical/minisprites/gen8/pokemon/0767-000-Wimpod.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0767--000--Wimpod.png
rename to src/canonical/minisprites/gen8/pokemon/0767-000-Wimpod.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0768--000--Golisopod.png b/src/canonical/minisprites/gen8/pokemon/0768-000-Golisopod.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0768--000--Golisopod.png
rename to src/canonical/minisprites/gen8/pokemon/0768-000-Golisopod.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0771--000--Pyukumuku.png b/src/canonical/minisprites/gen8/pokemon/0771-000-Pyukumuku.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0771--000--Pyukumuku.png
rename to src/canonical/minisprites/gen8/pokemon/0771-000-Pyukumuku.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0772--000--Type__003a_Null.png b/src/canonical/minisprites/gen8/pokemon/0772-000-Type__003a_Null.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0772--000--Type__003a_Null.png
rename to src/canonical/minisprites/gen8/pokemon/0772-000-Type__003a_Null.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0773--000--Silvally.png b/src/canonical/minisprites/gen8/pokemon/0773-000-Silvally.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0773--000--Silvally.png
rename to src/canonical/minisprites/gen8/pokemon/0773-000-Silvally.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0776--000--Turtonator.png b/src/canonical/minisprites/gen8/pokemon/0776-000-Turtonator.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0776--000--Turtonator.png
rename to src/canonical/minisprites/gen8/pokemon/0776-000-Turtonator.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0777--000--Togedemaru.png b/src/canonical/minisprites/gen8/pokemon/0777-000-Togedemaru.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0777--000--Togedemaru.png
rename to src/canonical/minisprites/gen8/pokemon/0777-000-Togedemaru.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0778--000--Mimikyu.png b/src/canonical/minisprites/gen8/pokemon/0778-000-Mimikyu.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0778--000--Mimikyu.png
rename to src/canonical/minisprites/gen8/pokemon/0778-000-Mimikyu.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0780--000--Drampa.png b/src/canonical/minisprites/gen8/pokemon/0780-000-Drampa.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0780--000--Drampa.png
rename to src/canonical/minisprites/gen8/pokemon/0780-000-Drampa.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0781--000--Dhelmise.png b/src/canonical/minisprites/gen8/pokemon/0781-000-Dhelmise.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0781--000--Dhelmise.png
rename to src/canonical/minisprites/gen8/pokemon/0781-000-Dhelmise.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0782--000--Jangmo-o.png b/src/canonical/minisprites/gen8/pokemon/0782-000-Jangmo~o.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0782--000--Jangmo-o.png
rename to src/canonical/minisprites/gen8/pokemon/0782-000-Jangmo~o.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0783--000--Hakamo-o.png b/src/canonical/minisprites/gen8/pokemon/0783-000-Hakamo~o.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0783--000--Hakamo-o.png
rename to src/canonical/minisprites/gen8/pokemon/0783-000-Hakamo~o.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0784--000--Kommo-o.png b/src/canonical/minisprites/gen8/pokemon/0784-000-Kommo~o.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0784--000--Kommo-o.png
rename to src/canonical/minisprites/gen8/pokemon/0784-000-Kommo~o.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0789--000--Cosmog.png b/src/canonical/minisprites/gen8/pokemon/0789-000-Cosmog.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0789--000--Cosmog.png
rename to src/canonical/minisprites/gen8/pokemon/0789-000-Cosmog.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0790--000--Cosmoem.png b/src/canonical/minisprites/gen8/pokemon/0790-000-Cosmoem.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0790--000--Cosmoem.png
rename to src/canonical/minisprites/gen8/pokemon/0790-000-Cosmoem.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0791--000--Solgaleo.png b/src/canonical/minisprites/gen8/pokemon/0791-000-Solgaleo.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0791--000--Solgaleo.png
rename to src/canonical/minisprites/gen8/pokemon/0791-000-Solgaleo.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0792--000--Lunala.png b/src/canonical/minisprites/gen8/pokemon/0792-000-Lunala.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0792--000--Lunala.png
rename to src/canonical/minisprites/gen8/pokemon/0792-000-Lunala.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0800--000--Necrozma.png b/src/canonical/minisprites/gen8/pokemon/0800-000-Necrozma.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0800--000--Necrozma.png
rename to src/canonical/minisprites/gen8/pokemon/0800-000-Necrozma.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0800--420--Necrozma--Dawn_Wings.png b/src/canonical/minisprites/gen8/pokemon/0800-420-Necrozma-Dawn_Wings.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0800--420--Necrozma--Dawn_Wings.png
rename to src/canonical/minisprites/gen8/pokemon/0800-420-Necrozma-Dawn_Wings.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0800--420--Necrozma--Dusk_Mane.png b/src/canonical/minisprites/gen8/pokemon/0800-420-Necrozma-Dusk_Mane.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0800--420--Necrozma--Dusk_Mane.png
rename to src/canonical/minisprites/gen8/pokemon/0800-420-Necrozma-Dusk_Mane.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0802--000--Marshadow.png b/src/canonical/minisprites/gen8/pokemon/0802-000-Marshadow.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0802--000--Marshadow.png
rename to src/canonical/minisprites/gen8/pokemon/0802-000-Marshadow.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0807--000--Zeraora.png b/src/canonical/minisprites/gen8/pokemon/0807-000-Zeraora.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0807--000--Zeraora.png
rename to src/canonical/minisprites/gen8/pokemon/0807-000-Zeraora.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0808--000--Meltan.png b/src/canonical/minisprites/gen8/pokemon/0808-000-Meltan.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0808--000--Meltan.png
rename to src/canonical/minisprites/gen8/pokemon/0808-000-Meltan.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0809--000--Melmetal.png b/src/canonical/minisprites/gen8/pokemon/0809-000-Melmetal.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0809--000--Melmetal.png
rename to src/canonical/minisprites/gen8/pokemon/0809-000-Melmetal.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0809--420--Melmetal--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0809-420-Melmetal-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0809--420--Melmetal--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0809-420-Melmetal-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0810--000--Grookey.png b/src/canonical/minisprites/gen8/pokemon/0810-000-Grookey.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0810--000--Grookey.png
rename to src/canonical/minisprites/gen8/pokemon/0810-000-Grookey.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0811--000--Thwackey.png b/src/canonical/minisprites/gen8/pokemon/0811-000-Thwackey.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0811--000--Thwackey.png
rename to src/canonical/minisprites/gen8/pokemon/0811-000-Thwackey.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0812--000--Rillaboom.png b/src/canonical/minisprites/gen8/pokemon/0812-000-Rillaboom.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0812--000--Rillaboom.png
rename to src/canonical/minisprites/gen8/pokemon/0812-000-Rillaboom.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0813--000--Scorbunny.png b/src/canonical/minisprites/gen8/pokemon/0813-000-Scorbunny.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0813--000--Scorbunny.png
rename to src/canonical/minisprites/gen8/pokemon/0813-000-Scorbunny.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0814--000--Raboot.png b/src/canonical/minisprites/gen8/pokemon/0814-000-Raboot.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0814--000--Raboot.png
rename to src/canonical/minisprites/gen8/pokemon/0814-000-Raboot.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0815--000--Cinderace.png b/src/canonical/minisprites/gen8/pokemon/0815-000-Cinderace.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0815--000--Cinderace.png
rename to src/canonical/minisprites/gen8/pokemon/0815-000-Cinderace.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0816--000--Sobble.png b/src/canonical/minisprites/gen8/pokemon/0816-000-Sobble.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0816--000--Sobble.png
rename to src/canonical/minisprites/gen8/pokemon/0816-000-Sobble.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0817--000--Drizzile.png b/src/canonical/minisprites/gen8/pokemon/0817-000-Drizzile.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0817--000--Drizzile.png
rename to src/canonical/minisprites/gen8/pokemon/0817-000-Drizzile.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0818--000--Inteleon.png b/src/canonical/minisprites/gen8/pokemon/0818-000-Inteleon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0818--000--Inteleon.png
rename to src/canonical/minisprites/gen8/pokemon/0818-000-Inteleon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0819--000--Skwovet.png b/src/canonical/minisprites/gen8/pokemon/0819-000-Skwovet.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0819--000--Skwovet.png
rename to src/canonical/minisprites/gen8/pokemon/0819-000-Skwovet.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0820--000--Greedent.png b/src/canonical/minisprites/gen8/pokemon/0820-000-Greedent.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0820--000--Greedent.png
rename to src/canonical/minisprites/gen8/pokemon/0820-000-Greedent.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0821--000--Rookidee.png b/src/canonical/minisprites/gen8/pokemon/0821-000-Rookidee.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0821--000--Rookidee.png
rename to src/canonical/minisprites/gen8/pokemon/0821-000-Rookidee.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0822--000--Corvisquire.png b/src/canonical/minisprites/gen8/pokemon/0822-000-Corvisquire.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0822--000--Corvisquire.png
rename to src/canonical/minisprites/gen8/pokemon/0822-000-Corvisquire.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0823--000--Corviknight.png b/src/canonical/minisprites/gen8/pokemon/0823-000-Corviknight.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0823--000--Corviknight.png
rename to src/canonical/minisprites/gen8/pokemon/0823-000-Corviknight.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0823--420--Corviknight--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0823-420-Corviknight-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0823--420--Corviknight--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0823-420-Corviknight-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0824--000--Blipbug.png b/src/canonical/minisprites/gen8/pokemon/0824-000-Blipbug.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0824--000--Blipbug.png
rename to src/canonical/minisprites/gen8/pokemon/0824-000-Blipbug.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0825--000--Dottler.png b/src/canonical/minisprites/gen8/pokemon/0825-000-Dottler.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0825--000--Dottler.png
rename to src/canonical/minisprites/gen8/pokemon/0825-000-Dottler.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0826--000--Orbeetle.png b/src/canonical/minisprites/gen8/pokemon/0826-000-Orbeetle.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0826--000--Orbeetle.png
rename to src/canonical/minisprites/gen8/pokemon/0826-000-Orbeetle.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0826--420--Orbeetle--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0826-420-Orbeetle-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0826--420--Orbeetle--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0826-420-Orbeetle-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0827--000--Nickit.png b/src/canonical/minisprites/gen8/pokemon/0827-000-Nickit.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0827--000--Nickit.png
rename to src/canonical/minisprites/gen8/pokemon/0827-000-Nickit.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0828--000--Thievul.png b/src/canonical/minisprites/gen8/pokemon/0828-000-Thievul.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0828--000--Thievul.png
rename to src/canonical/minisprites/gen8/pokemon/0828-000-Thievul.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0829--000--Gossifleur.png b/src/canonical/minisprites/gen8/pokemon/0829-000-Gossifleur.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0829--000--Gossifleur.png
rename to src/canonical/minisprites/gen8/pokemon/0829-000-Gossifleur.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0830--000--Eldegoss.png b/src/canonical/minisprites/gen8/pokemon/0830-000-Eldegoss.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0830--000--Eldegoss.png
rename to src/canonical/minisprites/gen8/pokemon/0830-000-Eldegoss.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0831--000--Wooloo.png b/src/canonical/minisprites/gen8/pokemon/0831-000-Wooloo.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0831--000--Wooloo.png
rename to src/canonical/minisprites/gen8/pokemon/0831-000-Wooloo.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0832--000--Dubwool.png b/src/canonical/minisprites/gen8/pokemon/0832-000-Dubwool.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0832--000--Dubwool.png
rename to src/canonical/minisprites/gen8/pokemon/0832-000-Dubwool.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0833--000--Chewtle.png b/src/canonical/minisprites/gen8/pokemon/0833-000-Chewtle.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0833--000--Chewtle.png
rename to src/canonical/minisprites/gen8/pokemon/0833-000-Chewtle.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0834--000--Drednaw.png b/src/canonical/minisprites/gen8/pokemon/0834-000-Drednaw.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0834--000--Drednaw.png
rename to src/canonical/minisprites/gen8/pokemon/0834-000-Drednaw.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0834--420--Drednaw--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0834-420-Drednaw-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0834--420--Drednaw--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0834-420-Drednaw-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0835--000--Yamper.png b/src/canonical/minisprites/gen8/pokemon/0835-000-Yamper.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0835--000--Yamper.png
rename to src/canonical/minisprites/gen8/pokemon/0835-000-Yamper.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0836--000--Boltund.png b/src/canonical/minisprites/gen8/pokemon/0836-000-Boltund.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0836--000--Boltund.png
rename to src/canonical/minisprites/gen8/pokemon/0836-000-Boltund.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0837--000--Rolycoly.png b/src/canonical/minisprites/gen8/pokemon/0837-000-Rolycoly.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0837--000--Rolycoly.png
rename to src/canonical/minisprites/gen8/pokemon/0837-000-Rolycoly.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0838--000--Carkol.png b/src/canonical/minisprites/gen8/pokemon/0838-000-Carkol.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0838--000--Carkol.png
rename to src/canonical/minisprites/gen8/pokemon/0838-000-Carkol.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0839--000--Coalossal.png b/src/canonical/minisprites/gen8/pokemon/0839-000-Coalossal.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0839--000--Coalossal.png
rename to src/canonical/minisprites/gen8/pokemon/0839-000-Coalossal.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0839--420--Coalossal--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0839-420-Coalossal-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0839--420--Coalossal--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0839-420-Coalossal-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0840--000--Applin.png b/src/canonical/minisprites/gen8/pokemon/0840-000-Applin.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0840--000--Applin.png
rename to src/canonical/minisprites/gen8/pokemon/0840-000-Applin.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0841--000--Flapple.png b/src/canonical/minisprites/gen8/pokemon/0841-000-Flapple.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0841--000--Flapple.png
rename to src/canonical/minisprites/gen8/pokemon/0841-000-Flapple.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0841--420--Flapple--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0841-420-Flapple-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0841--420--Flapple--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0841-420-Flapple-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0842--000--Appletun.png b/src/canonical/minisprites/gen8/pokemon/0842-000-Appletun.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0842--000--Appletun.png
rename to src/canonical/minisprites/gen8/pokemon/0842-000-Appletun.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0842--420--Appletun--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0842-420-Appletun-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0842--420--Appletun--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0842-420-Appletun-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0843--000--Silicobra.png b/src/canonical/minisprites/gen8/pokemon/0843-000-Silicobra.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0843--000--Silicobra.png
rename to src/canonical/minisprites/gen8/pokemon/0843-000-Silicobra.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0844--000--Sandaconda.png b/src/canonical/minisprites/gen8/pokemon/0844-000-Sandaconda.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0844--000--Sandaconda.png
rename to src/canonical/minisprites/gen8/pokemon/0844-000-Sandaconda.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0844--420--Sandaconda--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0844-420-Sandaconda-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0844--420--Sandaconda--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0844-420-Sandaconda-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0845--000--Cramorant.png b/src/canonical/minisprites/gen8/pokemon/0845-000-Cramorant.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0845--000--Cramorant.png
rename to src/canonical/minisprites/gen8/pokemon/0845-000-Cramorant.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0845--420--Cramorant--Gorging.png b/src/canonical/minisprites/gen8/pokemon/0845-420-Cramorant-Gorging.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0845--420--Cramorant--Gorging.png
rename to src/canonical/minisprites/gen8/pokemon/0845-420-Cramorant-Gorging.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0845--420--Cramorant--Gulping.png b/src/canonical/minisprites/gen8/pokemon/0845-420-Cramorant-Gulping.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0845--420--Cramorant--Gulping.png
rename to src/canonical/minisprites/gen8/pokemon/0845-420-Cramorant-Gulping.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0846--000--Arrokuda.png b/src/canonical/minisprites/gen8/pokemon/0846-000-Arrokuda.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0846--000--Arrokuda.png
rename to src/canonical/minisprites/gen8/pokemon/0846-000-Arrokuda.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0847--000--Barraskewda.png b/src/canonical/minisprites/gen8/pokemon/0847-000-Barraskewda.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0847--000--Barraskewda.png
rename to src/canonical/minisprites/gen8/pokemon/0847-000-Barraskewda.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0848--000--Toxel.png b/src/canonical/minisprites/gen8/pokemon/0848-000-Toxel.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0848--000--Toxel.png
rename to src/canonical/minisprites/gen8/pokemon/0848-000-Toxel.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0849--000--Toxtricity.png b/src/canonical/minisprites/gen8/pokemon/0849-000-Toxtricity.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0849--000--Toxtricity.png
rename to src/canonical/minisprites/gen8/pokemon/0849-000-Toxtricity.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0849--420--Toxtricity--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0849-420-Toxtricity-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0849--420--Toxtricity--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0849-420-Toxtricity-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0849--420--Toxtricity--Low-Key.png b/src/canonical/minisprites/gen8/pokemon/0849-420-Toxtricity-Low~Key.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0849--420--Toxtricity--Low-Key.png
rename to src/canonical/minisprites/gen8/pokemon/0849-420-Toxtricity-Low~Key.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0850--000--Sizzlipede.png b/src/canonical/minisprites/gen8/pokemon/0850-000-Sizzlipede.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0850--000--Sizzlipede.png
rename to src/canonical/minisprites/gen8/pokemon/0850-000-Sizzlipede.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0851--000--Centiskorch.png b/src/canonical/minisprites/gen8/pokemon/0851-000-Centiskorch.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0851--000--Centiskorch.png
rename to src/canonical/minisprites/gen8/pokemon/0851-000-Centiskorch.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0851--420--Centiskorch--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0851-420-Centiskorch-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0851--420--Centiskorch--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0851-420-Centiskorch-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0852--000--Clobbopus.png b/src/canonical/minisprites/gen8/pokemon/0852-000-Clobbopus.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0852--000--Clobbopus.png
rename to src/canonical/minisprites/gen8/pokemon/0852-000-Clobbopus.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0853--000--Grapploct.png b/src/canonical/minisprites/gen8/pokemon/0853-000-Grapploct.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0853--000--Grapploct.png
rename to src/canonical/minisprites/gen8/pokemon/0853-000-Grapploct.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0854--000--Sinistea.png b/src/canonical/minisprites/gen8/pokemon/0854-000-Sinistea.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0854--000--Sinistea.png
rename to src/canonical/minisprites/gen8/pokemon/0854-000-Sinistea.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0855--000--Polteageist.png b/src/canonical/minisprites/gen8/pokemon/0855-000-Polteageist.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0855--000--Polteageist.png
rename to src/canonical/minisprites/gen8/pokemon/0855-000-Polteageist.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0856--000--Hatenna.png b/src/canonical/minisprites/gen8/pokemon/0856-000-Hatenna.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0856--000--Hatenna.png
rename to src/canonical/minisprites/gen8/pokemon/0856-000-Hatenna.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0857--000--Hattrem.png b/src/canonical/minisprites/gen8/pokemon/0857-000-Hattrem.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0857--000--Hattrem.png
rename to src/canonical/minisprites/gen8/pokemon/0857-000-Hattrem.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0858--000--Hatterene.png b/src/canonical/minisprites/gen8/pokemon/0858-000-Hatterene.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0858--000--Hatterene.png
rename to src/canonical/minisprites/gen8/pokemon/0858-000-Hatterene.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0858--420--Hatterene--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0858-420-Hatterene-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0858--420--Hatterene--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0858-420-Hatterene-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0859--000--Impidimp.png b/src/canonical/minisprites/gen8/pokemon/0859-000-Impidimp.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0859--000--Impidimp.png
rename to src/canonical/minisprites/gen8/pokemon/0859-000-Impidimp.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0860--000--Morgrem.png b/src/canonical/minisprites/gen8/pokemon/0860-000-Morgrem.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0860--000--Morgrem.png
rename to src/canonical/minisprites/gen8/pokemon/0860-000-Morgrem.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0861--000--Grimmsnarl.png b/src/canonical/minisprites/gen8/pokemon/0861-000-Grimmsnarl.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0861--000--Grimmsnarl.png
rename to src/canonical/minisprites/gen8/pokemon/0861-000-Grimmsnarl.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0861--420--Grimmsnarl--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0861-420-Grimmsnarl-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0861--420--Grimmsnarl--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0861-420-Grimmsnarl-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0862--000--Obstagoon.png b/src/canonical/minisprites/gen8/pokemon/0862-000-Obstagoon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0862--000--Obstagoon.png
rename to src/canonical/minisprites/gen8/pokemon/0862-000-Obstagoon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0863--000--Perrserker.png b/src/canonical/minisprites/gen8/pokemon/0863-000-Perrserker.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0863--000--Perrserker.png
rename to src/canonical/minisprites/gen8/pokemon/0863-000-Perrserker.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0864--000--Cursola.png b/src/canonical/minisprites/gen8/pokemon/0864-000-Cursola.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0864--000--Cursola.png
rename to src/canonical/minisprites/gen8/pokemon/0864-000-Cursola.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0865--000--Sirfetch__0027d.png b/src/canonical/minisprites/gen8/pokemon/0865-000-Sirfetch__0027d.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0865--000--Sirfetch__0027d.png
rename to src/canonical/minisprites/gen8/pokemon/0865-000-Sirfetch__0027d.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0866--000--Mr._Rime.png b/src/canonical/minisprites/gen8/pokemon/0866-000-Mr._Rime.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0866--000--Mr._Rime.png
rename to src/canonical/minisprites/gen8/pokemon/0866-000-Mr._Rime.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0867--000--Runerigus.png b/src/canonical/minisprites/gen8/pokemon/0867-000-Runerigus.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0867--000--Runerigus.png
rename to src/canonical/minisprites/gen8/pokemon/0867-000-Runerigus.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0868--000--Milcery.png b/src/canonical/minisprites/gen8/pokemon/0868-000-Milcery.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0868--000--Milcery.png
rename to src/canonical/minisprites/gen8/pokemon/0868-000-Milcery.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0869--000--Alcremie.png b/src/canonical/minisprites/gen8/pokemon/0869-000-Alcremie.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0869--000--Alcremie.png
rename to src/canonical/minisprites/gen8/pokemon/0869-000-Alcremie.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Caramel_Swirl.png b/src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Caramel_Swirl.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Caramel_Swirl.png
rename to src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Caramel_Swirl.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Lemon_Cream.png b/src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Lemon_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Lemon_Cream.png
rename to src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Lemon_Cream.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Matcha_Cream.png b/src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Matcha_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Matcha_Cream.png
rename to src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Matcha_Cream.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Mint_Cream.png b/src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Mint_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Mint_Cream.png
rename to src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Mint_Cream.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Rainbow_Swirl.png b/src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Rainbow_Swirl.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Rainbow_Swirl.png
rename to src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Rainbow_Swirl.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Ruby_Cream.png b/src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Ruby_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Ruby_Cream.png
rename to src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Ruby_Cream.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Ruby_Swirl.png b/src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Ruby_Swirl.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Ruby_Swirl.png
rename to src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Ruby_Swirl.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Salted_Cream.png b/src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Salted_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0869--420--Alcremie--Salted_Cream.png
rename to src/canonical/minisprites/gen8/pokemon/0869-420-Alcremie-Salted_Cream.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0870--000--Falinks.png b/src/canonical/minisprites/gen8/pokemon/0870-000-Falinks.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0870--000--Falinks.png
rename to src/canonical/minisprites/gen8/pokemon/0870-000-Falinks.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0871--000--Pincurchin.png b/src/canonical/minisprites/gen8/pokemon/0871-000-Pincurchin.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0871--000--Pincurchin.png
rename to src/canonical/minisprites/gen8/pokemon/0871-000-Pincurchin.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0872--000--Snom.png b/src/canonical/minisprites/gen8/pokemon/0872-000-Snom.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0872--000--Snom.png
rename to src/canonical/minisprites/gen8/pokemon/0872-000-Snom.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0873--000--Frosmoth.png b/src/canonical/minisprites/gen8/pokemon/0873-000-Frosmoth.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0873--000--Frosmoth.png
rename to src/canonical/minisprites/gen8/pokemon/0873-000-Frosmoth.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0874--000--Stonjourner.png b/src/canonical/minisprites/gen8/pokemon/0874-000-Stonjourner.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0874--000--Stonjourner.png
rename to src/canonical/minisprites/gen8/pokemon/0874-000-Stonjourner.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0875--000--Eiscue.png b/src/canonical/minisprites/gen8/pokemon/0875-000-Eiscue.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0875--000--Eiscue.png
rename to src/canonical/minisprites/gen8/pokemon/0875-000-Eiscue.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0875--420--Eiscue--Noice.png b/src/canonical/minisprites/gen8/pokemon/0875-420-Eiscue-Noice.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0875--420--Eiscue--Noice.png
rename to src/canonical/minisprites/gen8/pokemon/0875-420-Eiscue-Noice.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0876--000--Indeedee.png b/src/canonical/minisprites/gen8/pokemon/0876-000-Indeedee.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0876--000--Indeedee.png
rename to src/canonical/minisprites/gen8/pokemon/0876-000-Indeedee.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0876--420--Indeedee--F.png b/src/canonical/minisprites/gen8/pokemon/0876-420-Indeedee-F.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0876--420--Indeedee--F.png
rename to src/canonical/minisprites/gen8/pokemon/0876-420-Indeedee-F.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0877--000--Morpeko.png b/src/canonical/minisprites/gen8/pokemon/0877-000-Morpeko.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0877--000--Morpeko.png
rename to src/canonical/minisprites/gen8/pokemon/0877-000-Morpeko.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0877--420--Morpeko--Hangry.png b/src/canonical/minisprites/gen8/pokemon/0877-420-Morpeko-Hangry.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0877--420--Morpeko--Hangry.png
rename to src/canonical/minisprites/gen8/pokemon/0877-420-Morpeko-Hangry.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0878--000--Cufant.png b/src/canonical/minisprites/gen8/pokemon/0878-000-Cufant.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0878--000--Cufant.png
rename to src/canonical/minisprites/gen8/pokemon/0878-000-Cufant.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0879--000--Copperajah.png b/src/canonical/minisprites/gen8/pokemon/0879-000-Copperajah.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0879--000--Copperajah.png
rename to src/canonical/minisprites/gen8/pokemon/0879-000-Copperajah.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0879--420--Copperajah--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0879-420-Copperajah-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0879--420--Copperajah--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0879-420-Copperajah-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0880--000--Dracozolt.png b/src/canonical/minisprites/gen8/pokemon/0880-000-Dracozolt.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0880--000--Dracozolt.png
rename to src/canonical/minisprites/gen8/pokemon/0880-000-Dracozolt.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0881--000--Arctozolt.png b/src/canonical/minisprites/gen8/pokemon/0881-000-Arctozolt.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0881--000--Arctozolt.png
rename to src/canonical/minisprites/gen8/pokemon/0881-000-Arctozolt.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0882--000--Dracovish.png b/src/canonical/minisprites/gen8/pokemon/0882-000-Dracovish.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0882--000--Dracovish.png
rename to src/canonical/minisprites/gen8/pokemon/0882-000-Dracovish.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0883--000--Arctovish.png b/src/canonical/minisprites/gen8/pokemon/0883-000-Arctovish.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0883--000--Arctovish.png
rename to src/canonical/minisprites/gen8/pokemon/0883-000-Arctovish.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0884--000--Duraludon.png b/src/canonical/minisprites/gen8/pokemon/0884-000-Duraludon.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0884--000--Duraludon.png
rename to src/canonical/minisprites/gen8/pokemon/0884-000-Duraludon.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0884--420--Duraludon--Gmax.png b/src/canonical/minisprites/gen8/pokemon/0884-420-Duraludon-Gmax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0884--420--Duraludon--Gmax.png
rename to src/canonical/minisprites/gen8/pokemon/0884-420-Duraludon-Gmax.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0885--000--Dreepy.png b/src/canonical/minisprites/gen8/pokemon/0885-000-Dreepy.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0885--000--Dreepy.png
rename to src/canonical/minisprites/gen8/pokemon/0885-000-Dreepy.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0886--000--Drakloak.png b/src/canonical/minisprites/gen8/pokemon/0886-000-Drakloak.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0886--000--Drakloak.png
rename to src/canonical/minisprites/gen8/pokemon/0886-000-Drakloak.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0887--000--Dragapult.png b/src/canonical/minisprites/gen8/pokemon/0887-000-Dragapult.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0887--000--Dragapult.png
rename to src/canonical/minisprites/gen8/pokemon/0887-000-Dragapult.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0888--000--Zacian.png b/src/canonical/minisprites/gen8/pokemon/0888-000-Zacian.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0888--000--Zacian.png
rename to src/canonical/minisprites/gen8/pokemon/0888-000-Zacian.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0888--420--Zacian--Crowned.png b/src/canonical/minisprites/gen8/pokemon/0888-420-Zacian-Crowned.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0888--420--Zacian--Crowned.png
rename to src/canonical/minisprites/gen8/pokemon/0888-420-Zacian-Crowned.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0889--000--Zamazenta.png b/src/canonical/minisprites/gen8/pokemon/0889-000-Zamazenta.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0889--000--Zamazenta.png
rename to src/canonical/minisprites/gen8/pokemon/0889-000-Zamazenta.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0889--420--Zamazenta--Crowned.png b/src/canonical/minisprites/gen8/pokemon/0889-420-Zamazenta-Crowned.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0889--420--Zamazenta--Crowned.png
rename to src/canonical/minisprites/gen8/pokemon/0889-420-Zamazenta-Crowned.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0890--000--Eternatus.png b/src/canonical/minisprites/gen8/pokemon/0890-000-Eternatus.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0890--000--Eternatus.png
rename to src/canonical/minisprites/gen8/pokemon/0890-000-Eternatus.png
diff --git a/src/canonical/minisprites/gen8/pokemon/0890--420--Eternatus--Eternamax.png b/src/canonical/minisprites/gen8/pokemon/0890-420-Eternatus-Eternamax.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/0890--420--Eternatus--Eternamax.png
rename to src/canonical/minisprites/gen8/pokemon/0890-420-Eternatus-Eternamax.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0001--000--Bulbasaur.png b/src/canonical/minisprites/lgpe/pokemon/0001-000-Bulbasaur.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0001--000--Bulbasaur.png
rename to src/canonical/minisprites/lgpe/pokemon/0001-000-Bulbasaur.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0002--000--Ivysaur.png b/src/canonical/minisprites/lgpe/pokemon/0002-000-Ivysaur.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0002--000--Ivysaur.png
rename to src/canonical/minisprites/lgpe/pokemon/0002-000-Ivysaur.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0003--000--Venusaur.png b/src/canonical/minisprites/lgpe/pokemon/0003-000-Venusaur.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0003--000--Venusaur.png
rename to src/canonical/minisprites/lgpe/pokemon/0003-000-Venusaur.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0003--420--Venusaur--Mega.png b/src/canonical/minisprites/lgpe/pokemon/0003-420-Venusaur-Mega.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0003--420--Venusaur--Mega.png
rename to src/canonical/minisprites/lgpe/pokemon/0003-420-Venusaur-Mega.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0004--000--Charmander.png b/src/canonical/minisprites/lgpe/pokemon/0004-000-Charmander.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0004--000--Charmander.png
rename to src/canonical/minisprites/lgpe/pokemon/0004-000-Charmander.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0005--000--Charmeleon.png b/src/canonical/minisprites/lgpe/pokemon/0005-000-Charmeleon.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0005--000--Charmeleon.png
rename to src/canonical/minisprites/lgpe/pokemon/0005-000-Charmeleon.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0006--000--Charizard.png b/src/canonical/minisprites/lgpe/pokemon/0006-000-Charizard.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0006--000--Charizard.png
rename to src/canonical/minisprites/lgpe/pokemon/0006-000-Charizard.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0006--420--Charizard--Mega-X.png b/src/canonical/minisprites/lgpe/pokemon/0006-420-Charizard-Mega~X.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0006--420--Charizard--Mega-X.png
rename to src/canonical/minisprites/lgpe/pokemon/0006-420-Charizard-Mega~X.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0007--000--Squirtle.png b/src/canonical/minisprites/lgpe/pokemon/0007-000-Squirtle.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0007--000--Squirtle.png
rename to src/canonical/minisprites/lgpe/pokemon/0007-000-Squirtle.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0008--000--Wartortle.png b/src/canonical/minisprites/lgpe/pokemon/0008-000-Wartortle.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0008--000--Wartortle.png
rename to src/canonical/minisprites/lgpe/pokemon/0008-000-Wartortle.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0009--000--Blastoise.png b/src/canonical/minisprites/lgpe/pokemon/0009-000-Blastoise.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0009--000--Blastoise.png
rename to src/canonical/minisprites/lgpe/pokemon/0009-000-Blastoise.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0009--420--Blastoise--Mega.png b/src/canonical/minisprites/lgpe/pokemon/0009-420-Blastoise-Mega.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0009--420--Blastoise--Mega.png
rename to src/canonical/minisprites/lgpe/pokemon/0009-420-Blastoise-Mega.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0010--000--Caterpie.png b/src/canonical/minisprites/lgpe/pokemon/0010-000-Caterpie.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0010--000--Caterpie.png
rename to src/canonical/minisprites/lgpe/pokemon/0010-000-Caterpie.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0011--000--Metapod.png b/src/canonical/minisprites/lgpe/pokemon/0011-000-Metapod.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0011--000--Metapod.png
rename to src/canonical/minisprites/lgpe/pokemon/0011-000-Metapod.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0012--000--Butterfree.png b/src/canonical/minisprites/lgpe/pokemon/0012-000-Butterfree.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0012--000--Butterfree.png
rename to src/canonical/minisprites/lgpe/pokemon/0012-000-Butterfree.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0013--000--Weedle.png b/src/canonical/minisprites/lgpe/pokemon/0013-000-Weedle.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0013--000--Weedle.png
rename to src/canonical/minisprites/lgpe/pokemon/0013-000-Weedle.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0014--000--Kakuna.png b/src/canonical/minisprites/lgpe/pokemon/0014-000-Kakuna.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0014--000--Kakuna.png
rename to src/canonical/minisprites/lgpe/pokemon/0014-000-Kakuna.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0015--000--Beedrill.png b/src/canonical/minisprites/lgpe/pokemon/0015-000-Beedrill.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0015--000--Beedrill.png
rename to src/canonical/minisprites/lgpe/pokemon/0015-000-Beedrill.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0015--420--Beedrill--Mega.png b/src/canonical/minisprites/lgpe/pokemon/0015-420-Beedrill-Mega.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0015--420--Beedrill--Mega.png
rename to src/canonical/minisprites/lgpe/pokemon/0015-420-Beedrill-Mega.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0016--000--Pidgey.png b/src/canonical/minisprites/lgpe/pokemon/0016-000-Pidgey.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0016--000--Pidgey.png
rename to src/canonical/minisprites/lgpe/pokemon/0016-000-Pidgey.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0017--000--Pidgeotto.png b/src/canonical/minisprites/lgpe/pokemon/0017-000-Pidgeotto.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0017--000--Pidgeotto.png
rename to src/canonical/minisprites/lgpe/pokemon/0017-000-Pidgeotto.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0018--000--Pidgeot.png b/src/canonical/minisprites/lgpe/pokemon/0018-000-Pidgeot.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0018--000--Pidgeot.png
rename to src/canonical/minisprites/lgpe/pokemon/0018-000-Pidgeot.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0018--420--Pidgeot--Mega.png b/src/canonical/minisprites/lgpe/pokemon/0018-420-Pidgeot-Mega.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0018--420--Pidgeot--Mega.png
rename to src/canonical/minisprites/lgpe/pokemon/0018-420-Pidgeot-Mega.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0019--000--Rattata.png b/src/canonical/minisprites/lgpe/pokemon/0019-000-Rattata.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0019--000--Rattata.png
rename to src/canonical/minisprites/lgpe/pokemon/0019-000-Rattata.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0019--420--Rattata--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0019-420-Rattata-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0019--420--Rattata--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0019-420-Rattata-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0020--000--Raticate.png b/src/canonical/minisprites/lgpe/pokemon/0020-000-Raticate.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0020--000--Raticate.png
rename to src/canonical/minisprites/lgpe/pokemon/0020-000-Raticate.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0020--420--Raticate--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0020-420-Raticate-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0020--420--Raticate--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0020-420-Raticate-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0021--000--Spearow.png b/src/canonical/minisprites/lgpe/pokemon/0021-000-Spearow.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0021--000--Spearow.png
rename to src/canonical/minisprites/lgpe/pokemon/0021-000-Spearow.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0022--000--Fearow.png b/src/canonical/minisprites/lgpe/pokemon/0022-000-Fearow.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0022--000--Fearow.png
rename to src/canonical/minisprites/lgpe/pokemon/0022-000-Fearow.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0023--000--Ekans.png b/src/canonical/minisprites/lgpe/pokemon/0023-000-Ekans.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0023--000--Ekans.png
rename to src/canonical/minisprites/lgpe/pokemon/0023-000-Ekans.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0024--000--Arbok.png b/src/canonical/minisprites/lgpe/pokemon/0024-000-Arbok.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0024--000--Arbok.png
rename to src/canonical/minisprites/lgpe/pokemon/0024-000-Arbok.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0025--000--Pikachu.png b/src/canonical/minisprites/lgpe/pokemon/0025-000-Pikachu.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0025--000--Pikachu.png
rename to src/canonical/minisprites/lgpe/pokemon/0025-000-Pikachu.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0025--420--Pikachu--Starter.png b/src/canonical/minisprites/lgpe/pokemon/0025-420-Pikachu-Starter.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0025--420--Pikachu--Starter.png
rename to src/canonical/minisprites/lgpe/pokemon/0025-420-Pikachu-Starter.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0026--000--Raichu.png b/src/canonical/minisprites/lgpe/pokemon/0026-000-Raichu.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0026--000--Raichu.png
rename to src/canonical/minisprites/lgpe/pokemon/0026-000-Raichu.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0026--420--Raichu--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0026-420-Raichu-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0026--420--Raichu--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0026-420-Raichu-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0027--000--Sandshrew.png b/src/canonical/minisprites/lgpe/pokemon/0027-000-Sandshrew.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0027--000--Sandshrew.png
rename to src/canonical/minisprites/lgpe/pokemon/0027-000-Sandshrew.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0027--420--Sandshrew--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0027-420-Sandshrew-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0027--420--Sandshrew--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0027-420-Sandshrew-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0028--000--Sandslash.png b/src/canonical/minisprites/lgpe/pokemon/0028-000-Sandslash.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0028--000--Sandslash.png
rename to src/canonical/minisprites/lgpe/pokemon/0028-000-Sandslash.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0028--420--Sandslash--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0028-420-Sandslash-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0028--420--Sandslash--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0028-420-Sandslash-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0029--000--Nidoran-F.png b/src/canonical/minisprites/lgpe/pokemon/0029-000-Nidoran~F.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0029--000--Nidoran-F.png
rename to src/canonical/minisprites/lgpe/pokemon/0029-000-Nidoran~F.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0030--000--Nidorina.png b/src/canonical/minisprites/lgpe/pokemon/0030-000-Nidorina.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0030--000--Nidorina.png
rename to src/canonical/minisprites/lgpe/pokemon/0030-000-Nidorina.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0031--000--Nidoqueen.png b/src/canonical/minisprites/lgpe/pokemon/0031-000-Nidoqueen.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0031--000--Nidoqueen.png
rename to src/canonical/minisprites/lgpe/pokemon/0031-000-Nidoqueen.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0032--000--Nidoran-M.png b/src/canonical/minisprites/lgpe/pokemon/0032-000-Nidoran~M.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0032--000--Nidoran-M.png
rename to src/canonical/minisprites/lgpe/pokemon/0032-000-Nidoran~M.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0033--000--Nidorino.png b/src/canonical/minisprites/lgpe/pokemon/0033-000-Nidorino.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0033--000--Nidorino.png
rename to src/canonical/minisprites/lgpe/pokemon/0033-000-Nidorino.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0034--000--Nidoking.png b/src/canonical/minisprites/lgpe/pokemon/0034-000-Nidoking.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0034--000--Nidoking.png
rename to src/canonical/minisprites/lgpe/pokemon/0034-000-Nidoking.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0035--000--Clefairy.png b/src/canonical/minisprites/lgpe/pokemon/0035-000-Clefairy.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0035--000--Clefairy.png
rename to src/canonical/minisprites/lgpe/pokemon/0035-000-Clefairy.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0036--000--Clefable.png b/src/canonical/minisprites/lgpe/pokemon/0036-000-Clefable.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0036--000--Clefable.png
rename to src/canonical/minisprites/lgpe/pokemon/0036-000-Clefable.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0037--000--Vulpix.png b/src/canonical/minisprites/lgpe/pokemon/0037-000-Vulpix.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0037--000--Vulpix.png
rename to src/canonical/minisprites/lgpe/pokemon/0037-000-Vulpix.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0037--420--Vulpix--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0037-420-Vulpix-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0037--420--Vulpix--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0037-420-Vulpix-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0038--000--Ninetales.png b/src/canonical/minisprites/lgpe/pokemon/0038-000-Ninetales.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0038--000--Ninetales.png
rename to src/canonical/minisprites/lgpe/pokemon/0038-000-Ninetales.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0038--420--Ninetales--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0038-420-Ninetales-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0038--420--Ninetales--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0038-420-Ninetales-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0039--000--Jigglypuff.png b/src/canonical/minisprites/lgpe/pokemon/0039-000-Jigglypuff.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0039--000--Jigglypuff.png
rename to src/canonical/minisprites/lgpe/pokemon/0039-000-Jigglypuff.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0040--000--Wigglytuff.png b/src/canonical/minisprites/lgpe/pokemon/0040-000-Wigglytuff.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0040--000--Wigglytuff.png
rename to src/canonical/minisprites/lgpe/pokemon/0040-000-Wigglytuff.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0041--000--Zubat.png b/src/canonical/minisprites/lgpe/pokemon/0041-000-Zubat.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0041--000--Zubat.png
rename to src/canonical/minisprites/lgpe/pokemon/0041-000-Zubat.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0042--000--Golbat.png b/src/canonical/minisprites/lgpe/pokemon/0042-000-Golbat.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0042--000--Golbat.png
rename to src/canonical/minisprites/lgpe/pokemon/0042-000-Golbat.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0043--000--Oddish.png b/src/canonical/minisprites/lgpe/pokemon/0043-000-Oddish.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0043--000--Oddish.png
rename to src/canonical/minisprites/lgpe/pokemon/0043-000-Oddish.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0044--000--Gloom.png b/src/canonical/minisprites/lgpe/pokemon/0044-000-Gloom.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0044--000--Gloom.png
rename to src/canonical/minisprites/lgpe/pokemon/0044-000-Gloom.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0045--000--Vileplume.png b/src/canonical/minisprites/lgpe/pokemon/0045-000-Vileplume.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0045--000--Vileplume.png
rename to src/canonical/minisprites/lgpe/pokemon/0045-000-Vileplume.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0046--000--Paras.png b/src/canonical/minisprites/lgpe/pokemon/0046-000-Paras.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0046--000--Paras.png
rename to src/canonical/minisprites/lgpe/pokemon/0046-000-Paras.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0047--000--Parasect.png b/src/canonical/minisprites/lgpe/pokemon/0047-000-Parasect.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0047--000--Parasect.png
rename to src/canonical/minisprites/lgpe/pokemon/0047-000-Parasect.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0048--000--Venonat.png b/src/canonical/minisprites/lgpe/pokemon/0048-000-Venonat.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0048--000--Venonat.png
rename to src/canonical/minisprites/lgpe/pokemon/0048-000-Venonat.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0049--000--Venomoth.png b/src/canonical/minisprites/lgpe/pokemon/0049-000-Venomoth.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0049--000--Venomoth.png
rename to src/canonical/minisprites/lgpe/pokemon/0049-000-Venomoth.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0050--000--Diglett.png b/src/canonical/minisprites/lgpe/pokemon/0050-000-Diglett.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0050--000--Diglett.png
rename to src/canonical/minisprites/lgpe/pokemon/0050-000-Diglett.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0050--420--Diglett--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0050-420-Diglett-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0050--420--Diglett--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0050-420-Diglett-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0051--000--Dugtrio.png b/src/canonical/minisprites/lgpe/pokemon/0051-000-Dugtrio.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0051--000--Dugtrio.png
rename to src/canonical/minisprites/lgpe/pokemon/0051-000-Dugtrio.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0051--420--Dugtrio--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0051-420-Dugtrio-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0051--420--Dugtrio--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0051-420-Dugtrio-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0052--000--Meowth.png b/src/canonical/minisprites/lgpe/pokemon/0052-000-Meowth.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0052--000--Meowth.png
rename to src/canonical/minisprites/lgpe/pokemon/0052-000-Meowth.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0052--420--Meowth--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0052-420-Meowth-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0052--420--Meowth--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0052-420-Meowth-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0053--000--Persian.png b/src/canonical/minisprites/lgpe/pokemon/0053-000-Persian.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0053--000--Persian.png
rename to src/canonical/minisprites/lgpe/pokemon/0053-000-Persian.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0053--420--Persian--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0053-420-Persian-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0053--420--Persian--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0053-420-Persian-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0054--000--Psyduck.png b/src/canonical/minisprites/lgpe/pokemon/0054-000-Psyduck.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0054--000--Psyduck.png
rename to src/canonical/minisprites/lgpe/pokemon/0054-000-Psyduck.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0055--000--Golduck.png b/src/canonical/minisprites/lgpe/pokemon/0055-000-Golduck.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0055--000--Golduck.png
rename to src/canonical/minisprites/lgpe/pokemon/0055-000-Golduck.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0056--000--Mankey.png b/src/canonical/minisprites/lgpe/pokemon/0056-000-Mankey.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0056--000--Mankey.png
rename to src/canonical/minisprites/lgpe/pokemon/0056-000-Mankey.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0057--000--Primeape.png b/src/canonical/minisprites/lgpe/pokemon/0057-000-Primeape.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0057--000--Primeape.png
rename to src/canonical/minisprites/lgpe/pokemon/0057-000-Primeape.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0058--000--Growlithe.png b/src/canonical/minisprites/lgpe/pokemon/0058-000-Growlithe.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0058--000--Growlithe.png
rename to src/canonical/minisprites/lgpe/pokemon/0058-000-Growlithe.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0059--000--Arcanine.png b/src/canonical/minisprites/lgpe/pokemon/0059-000-Arcanine.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0059--000--Arcanine.png
rename to src/canonical/minisprites/lgpe/pokemon/0059-000-Arcanine.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0060--000--Poliwag.png b/src/canonical/minisprites/lgpe/pokemon/0060-000-Poliwag.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0060--000--Poliwag.png
rename to src/canonical/minisprites/lgpe/pokemon/0060-000-Poliwag.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0061--000--Poliwhirl.png b/src/canonical/minisprites/lgpe/pokemon/0061-000-Poliwhirl.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0061--000--Poliwhirl.png
rename to src/canonical/minisprites/lgpe/pokemon/0061-000-Poliwhirl.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0062--000--Poliwrath.png b/src/canonical/minisprites/lgpe/pokemon/0062-000-Poliwrath.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0062--000--Poliwrath.png
rename to src/canonical/minisprites/lgpe/pokemon/0062-000-Poliwrath.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0063--000--Abra.png b/src/canonical/minisprites/lgpe/pokemon/0063-000-Abra.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0063--000--Abra.png
rename to src/canonical/minisprites/lgpe/pokemon/0063-000-Abra.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0064--000--Kadabra.png b/src/canonical/minisprites/lgpe/pokemon/0064-000-Kadabra.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0064--000--Kadabra.png
rename to src/canonical/minisprites/lgpe/pokemon/0064-000-Kadabra.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0065--000--Alakazam.png b/src/canonical/minisprites/lgpe/pokemon/0065-000-Alakazam.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0065--000--Alakazam.png
rename to src/canonical/minisprites/lgpe/pokemon/0065-000-Alakazam.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0065--420--Alakazam--Mega.png b/src/canonical/minisprites/lgpe/pokemon/0065-420-Alakazam-Mega.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0065--420--Alakazam--Mega.png
rename to src/canonical/minisprites/lgpe/pokemon/0065-420-Alakazam-Mega.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0066--000--Machop.png b/src/canonical/minisprites/lgpe/pokemon/0066-000-Machop.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0066--000--Machop.png
rename to src/canonical/minisprites/lgpe/pokemon/0066-000-Machop.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0067--000--Machoke.png b/src/canonical/minisprites/lgpe/pokemon/0067-000-Machoke.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0067--000--Machoke.png
rename to src/canonical/minisprites/lgpe/pokemon/0067-000-Machoke.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0068--000--Machamp.png b/src/canonical/minisprites/lgpe/pokemon/0068-000-Machamp.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0068--000--Machamp.png
rename to src/canonical/minisprites/lgpe/pokemon/0068-000-Machamp.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0069--000--Bellsprout.png b/src/canonical/minisprites/lgpe/pokemon/0069-000-Bellsprout.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0069--000--Bellsprout.png
rename to src/canonical/minisprites/lgpe/pokemon/0069-000-Bellsprout.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0070--000--Weepinbell.png b/src/canonical/minisprites/lgpe/pokemon/0070-000-Weepinbell.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0070--000--Weepinbell.png
rename to src/canonical/minisprites/lgpe/pokemon/0070-000-Weepinbell.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0071--000--Victreebel.png b/src/canonical/minisprites/lgpe/pokemon/0071-000-Victreebel.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0071--000--Victreebel.png
rename to src/canonical/minisprites/lgpe/pokemon/0071-000-Victreebel.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0072--000--Tentacool.png b/src/canonical/minisprites/lgpe/pokemon/0072-000-Tentacool.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0072--000--Tentacool.png
rename to src/canonical/minisprites/lgpe/pokemon/0072-000-Tentacool.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0073--000--Tentacruel.png b/src/canonical/minisprites/lgpe/pokemon/0073-000-Tentacruel.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0073--000--Tentacruel.png
rename to src/canonical/minisprites/lgpe/pokemon/0073-000-Tentacruel.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0074--000--Geodude.png b/src/canonical/minisprites/lgpe/pokemon/0074-000-Geodude.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0074--000--Geodude.png
rename to src/canonical/minisprites/lgpe/pokemon/0074-000-Geodude.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0074--420--Geodude--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0074-420-Geodude-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0074--420--Geodude--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0074-420-Geodude-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0075--000--Graveler.png b/src/canonical/minisprites/lgpe/pokemon/0075-000-Graveler.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0075--000--Graveler.png
rename to src/canonical/minisprites/lgpe/pokemon/0075-000-Graveler.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0075--420--Graveler--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0075-420-Graveler-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0075--420--Graveler--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0075-420-Graveler-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0076--000--Golem.png b/src/canonical/minisprites/lgpe/pokemon/0076-000-Golem.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0076--000--Golem.png
rename to src/canonical/minisprites/lgpe/pokemon/0076-000-Golem.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0076--420--Golem--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0076-420-Golem-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0076--420--Golem--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0076-420-Golem-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0077--000--Ponyta.png b/src/canonical/minisprites/lgpe/pokemon/0077-000-Ponyta.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0077--000--Ponyta.png
rename to src/canonical/minisprites/lgpe/pokemon/0077-000-Ponyta.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0078--000--Rapidash.png b/src/canonical/minisprites/lgpe/pokemon/0078-000-Rapidash.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0078--000--Rapidash.png
rename to src/canonical/minisprites/lgpe/pokemon/0078-000-Rapidash.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0079--000--Slowpoke.png b/src/canonical/minisprites/lgpe/pokemon/0079-000-Slowpoke.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0079--000--Slowpoke.png
rename to src/canonical/minisprites/lgpe/pokemon/0079-000-Slowpoke.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0080--000--Slowbro.png b/src/canonical/minisprites/lgpe/pokemon/0080-000-Slowbro.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0080--000--Slowbro.png
rename to src/canonical/minisprites/lgpe/pokemon/0080-000-Slowbro.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0080--420--Slowbro--Mega.png b/src/canonical/minisprites/lgpe/pokemon/0080-420-Slowbro-Mega.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0080--420--Slowbro--Mega.png
rename to src/canonical/minisprites/lgpe/pokemon/0080-420-Slowbro-Mega.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0081--000--Magnemite.png b/src/canonical/minisprites/lgpe/pokemon/0081-000-Magnemite.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0081--000--Magnemite.png
rename to src/canonical/minisprites/lgpe/pokemon/0081-000-Magnemite.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0082--000--Magneton.png b/src/canonical/minisprites/lgpe/pokemon/0082-000-Magneton.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0082--000--Magneton.png
rename to src/canonical/minisprites/lgpe/pokemon/0082-000-Magneton.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0083--000--Farfetch__0027d.png b/src/canonical/minisprites/lgpe/pokemon/0083-000-Farfetch__0027d.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0083--000--Farfetch__0027d.png
rename to src/canonical/minisprites/lgpe/pokemon/0083-000-Farfetch__0027d.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0084--000--Doduo.png b/src/canonical/minisprites/lgpe/pokemon/0084-000-Doduo.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0084--000--Doduo.png
rename to src/canonical/minisprites/lgpe/pokemon/0084-000-Doduo.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0085--000--Dodrio.png b/src/canonical/minisprites/lgpe/pokemon/0085-000-Dodrio.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0085--000--Dodrio.png
rename to src/canonical/minisprites/lgpe/pokemon/0085-000-Dodrio.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0086--000--Seel.png b/src/canonical/minisprites/lgpe/pokemon/0086-000-Seel.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0086--000--Seel.png
rename to src/canonical/minisprites/lgpe/pokemon/0086-000-Seel.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0087--000--Dewgong.png b/src/canonical/minisprites/lgpe/pokemon/0087-000-Dewgong.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0087--000--Dewgong.png
rename to src/canonical/minisprites/lgpe/pokemon/0087-000-Dewgong.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0088--000--Grimer.png b/src/canonical/minisprites/lgpe/pokemon/0088-000-Grimer.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0088--000--Grimer.png
rename to src/canonical/minisprites/lgpe/pokemon/0088-000-Grimer.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0088--420--Grimer--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0088-420-Grimer-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0088--420--Grimer--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0088-420-Grimer-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0089--000--Muk.png b/src/canonical/minisprites/lgpe/pokemon/0089-000-Muk.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0089--000--Muk.png
rename to src/canonical/minisprites/lgpe/pokemon/0089-000-Muk.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0089--420--Muk--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0089-420-Muk-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0089--420--Muk--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0089-420-Muk-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0090--000--Shellder.png b/src/canonical/minisprites/lgpe/pokemon/0090-000-Shellder.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0090--000--Shellder.png
rename to src/canonical/minisprites/lgpe/pokemon/0090-000-Shellder.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0091--000--Cloyster.png b/src/canonical/minisprites/lgpe/pokemon/0091-000-Cloyster.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0091--000--Cloyster.png
rename to src/canonical/minisprites/lgpe/pokemon/0091-000-Cloyster.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0092--000--Gastly.png b/src/canonical/minisprites/lgpe/pokemon/0092-000-Gastly.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0092--000--Gastly.png
rename to src/canonical/minisprites/lgpe/pokemon/0092-000-Gastly.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0093--000--Haunter.png b/src/canonical/minisprites/lgpe/pokemon/0093-000-Haunter.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0093--000--Haunter.png
rename to src/canonical/minisprites/lgpe/pokemon/0093-000-Haunter.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0094--000--Gengar.png b/src/canonical/minisprites/lgpe/pokemon/0094-000-Gengar.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0094--000--Gengar.png
rename to src/canonical/minisprites/lgpe/pokemon/0094-000-Gengar.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0094--420--Gengar--Mega.png b/src/canonical/minisprites/lgpe/pokemon/0094-420-Gengar-Mega.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0094--420--Gengar--Mega.png
rename to src/canonical/minisprites/lgpe/pokemon/0094-420-Gengar-Mega.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0095--000--Onix.png b/src/canonical/minisprites/lgpe/pokemon/0095-000-Onix.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0095--000--Onix.png
rename to src/canonical/minisprites/lgpe/pokemon/0095-000-Onix.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0096--000--Drowzee.png b/src/canonical/minisprites/lgpe/pokemon/0096-000-Drowzee.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0096--000--Drowzee.png
rename to src/canonical/minisprites/lgpe/pokemon/0096-000-Drowzee.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0097--000--Hypno.png b/src/canonical/minisprites/lgpe/pokemon/0097-000-Hypno.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0097--000--Hypno.png
rename to src/canonical/minisprites/lgpe/pokemon/0097-000-Hypno.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0098--000--Krabby.png b/src/canonical/minisprites/lgpe/pokemon/0098-000-Krabby.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0098--000--Krabby.png
rename to src/canonical/minisprites/lgpe/pokemon/0098-000-Krabby.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0099--000--Kingler.png b/src/canonical/minisprites/lgpe/pokemon/0099-000-Kingler.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0099--000--Kingler.png
rename to src/canonical/minisprites/lgpe/pokemon/0099-000-Kingler.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0100--000--Voltorb.png b/src/canonical/minisprites/lgpe/pokemon/0100-000-Voltorb.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0100--000--Voltorb.png
rename to src/canonical/minisprites/lgpe/pokemon/0100-000-Voltorb.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0101--000--Electrode.png b/src/canonical/minisprites/lgpe/pokemon/0101-000-Electrode.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0101--000--Electrode.png
rename to src/canonical/minisprites/lgpe/pokemon/0101-000-Electrode.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0102--000--Exeggcute.png b/src/canonical/minisprites/lgpe/pokemon/0102-000-Exeggcute.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0102--000--Exeggcute.png
rename to src/canonical/minisprites/lgpe/pokemon/0102-000-Exeggcute.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0103--000--Exeggutor.png b/src/canonical/minisprites/lgpe/pokemon/0103-000-Exeggutor.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0103--000--Exeggutor.png
rename to src/canonical/minisprites/lgpe/pokemon/0103-000-Exeggutor.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0103--420--Exeggutor--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0103-420-Exeggutor-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0103--420--Exeggutor--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0103-420-Exeggutor-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0104--000--Cubone.png b/src/canonical/minisprites/lgpe/pokemon/0104-000-Cubone.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0104--000--Cubone.png
rename to src/canonical/minisprites/lgpe/pokemon/0104-000-Cubone.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0105--000--Marowak.png b/src/canonical/minisprites/lgpe/pokemon/0105-000-Marowak.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0105--000--Marowak.png
rename to src/canonical/minisprites/lgpe/pokemon/0105-000-Marowak.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0105--420--Marowak--Alola.png b/src/canonical/minisprites/lgpe/pokemon/0105-420-Marowak-Alola.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0105--420--Marowak--Alola.png
rename to src/canonical/minisprites/lgpe/pokemon/0105-420-Marowak-Alola.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0106--000--Hitmonlee.png b/src/canonical/minisprites/lgpe/pokemon/0106-000-Hitmonlee.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0106--000--Hitmonlee.png
rename to src/canonical/minisprites/lgpe/pokemon/0106-000-Hitmonlee.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0107--000--Hitmonchan.png b/src/canonical/minisprites/lgpe/pokemon/0107-000-Hitmonchan.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0107--000--Hitmonchan.png
rename to src/canonical/minisprites/lgpe/pokemon/0107-000-Hitmonchan.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0108--000--Lickitung.png b/src/canonical/minisprites/lgpe/pokemon/0108-000-Lickitung.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0108--000--Lickitung.png
rename to src/canonical/minisprites/lgpe/pokemon/0108-000-Lickitung.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0109--000--Koffing.png b/src/canonical/minisprites/lgpe/pokemon/0109-000-Koffing.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0109--000--Koffing.png
rename to src/canonical/minisprites/lgpe/pokemon/0109-000-Koffing.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0110--000--Weezing.png b/src/canonical/minisprites/lgpe/pokemon/0110-000-Weezing.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0110--000--Weezing.png
rename to src/canonical/minisprites/lgpe/pokemon/0110-000-Weezing.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0111--000--Rhyhorn.png b/src/canonical/minisprites/lgpe/pokemon/0111-000-Rhyhorn.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0111--000--Rhyhorn.png
rename to src/canonical/minisprites/lgpe/pokemon/0111-000-Rhyhorn.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0112--000--Rhydon.png b/src/canonical/minisprites/lgpe/pokemon/0112-000-Rhydon.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0112--000--Rhydon.png
rename to src/canonical/minisprites/lgpe/pokemon/0112-000-Rhydon.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0113--000--Chansey.png b/src/canonical/minisprites/lgpe/pokemon/0113-000-Chansey.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0113--000--Chansey.png
rename to src/canonical/minisprites/lgpe/pokemon/0113-000-Chansey.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0114--000--Tangela.png b/src/canonical/minisprites/lgpe/pokemon/0114-000-Tangela.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0114--000--Tangela.png
rename to src/canonical/minisprites/lgpe/pokemon/0114-000-Tangela.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0115--000--Kangaskhan.png b/src/canonical/minisprites/lgpe/pokemon/0115-000-Kangaskhan.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0115--000--Kangaskhan.png
rename to src/canonical/minisprites/lgpe/pokemon/0115-000-Kangaskhan.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0115--420--Kangaskhan--Mega.png b/src/canonical/minisprites/lgpe/pokemon/0115-420-Kangaskhan-Mega.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0115--420--Kangaskhan--Mega.png
rename to src/canonical/minisprites/lgpe/pokemon/0115-420-Kangaskhan-Mega.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0116--000--Horsea.png b/src/canonical/minisprites/lgpe/pokemon/0116-000-Horsea.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0116--000--Horsea.png
rename to src/canonical/minisprites/lgpe/pokemon/0116-000-Horsea.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0117--000--Seadra.png b/src/canonical/minisprites/lgpe/pokemon/0117-000-Seadra.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0117--000--Seadra.png
rename to src/canonical/minisprites/lgpe/pokemon/0117-000-Seadra.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0118--000--Goldeen.png b/src/canonical/minisprites/lgpe/pokemon/0118-000-Goldeen.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0118--000--Goldeen.png
rename to src/canonical/minisprites/lgpe/pokemon/0118-000-Goldeen.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0119--000--Seaking.png b/src/canonical/minisprites/lgpe/pokemon/0119-000-Seaking.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0119--000--Seaking.png
rename to src/canonical/minisprites/lgpe/pokemon/0119-000-Seaking.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0120--000--Staryu.png b/src/canonical/minisprites/lgpe/pokemon/0120-000-Staryu.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0120--000--Staryu.png
rename to src/canonical/minisprites/lgpe/pokemon/0120-000-Staryu.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0121--000--Starmie.png b/src/canonical/minisprites/lgpe/pokemon/0121-000-Starmie.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0121--000--Starmie.png
rename to src/canonical/minisprites/lgpe/pokemon/0121-000-Starmie.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0122--000--Mr._Mime.png b/src/canonical/minisprites/lgpe/pokemon/0122-000-Mr._Mime.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0122--000--Mr._Mime.png
rename to src/canonical/minisprites/lgpe/pokemon/0122-000-Mr._Mime.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0123--000--Scyther.png b/src/canonical/minisprites/lgpe/pokemon/0123-000-Scyther.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0123--000--Scyther.png
rename to src/canonical/minisprites/lgpe/pokemon/0123-000-Scyther.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0124--000--Jynx.png b/src/canonical/minisprites/lgpe/pokemon/0124-000-Jynx.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0124--000--Jynx.png
rename to src/canonical/minisprites/lgpe/pokemon/0124-000-Jynx.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0125--000--Electabuzz.png b/src/canonical/minisprites/lgpe/pokemon/0125-000-Electabuzz.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0125--000--Electabuzz.png
rename to src/canonical/minisprites/lgpe/pokemon/0125-000-Electabuzz.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0126--000--Magmar.png b/src/canonical/minisprites/lgpe/pokemon/0126-000-Magmar.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0126--000--Magmar.png
rename to src/canonical/minisprites/lgpe/pokemon/0126-000-Magmar.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0127--000--Pinsir.png b/src/canonical/minisprites/lgpe/pokemon/0127-000-Pinsir.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0127--000--Pinsir.png
rename to src/canonical/minisprites/lgpe/pokemon/0127-000-Pinsir.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0127--420--Pinsir--Mega.png b/src/canonical/minisprites/lgpe/pokemon/0127-420-Pinsir-Mega.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0127--420--Pinsir--Mega.png
rename to src/canonical/minisprites/lgpe/pokemon/0127-420-Pinsir-Mega.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0128--000--Tauros.png b/src/canonical/minisprites/lgpe/pokemon/0128-000-Tauros.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0128--000--Tauros.png
rename to src/canonical/minisprites/lgpe/pokemon/0128-000-Tauros.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0129--000--Magikarp.png b/src/canonical/minisprites/lgpe/pokemon/0129-000-Magikarp.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0129--000--Magikarp.png
rename to src/canonical/minisprites/lgpe/pokemon/0129-000-Magikarp.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0130--000--Gyarados.png b/src/canonical/minisprites/lgpe/pokemon/0130-000-Gyarados.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0130--000--Gyarados.png
rename to src/canonical/minisprites/lgpe/pokemon/0130-000-Gyarados.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0130--420--Gyarados--Mega.png b/src/canonical/minisprites/lgpe/pokemon/0130-420-Gyarados-Mega.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0130--420--Gyarados--Mega.png
rename to src/canonical/minisprites/lgpe/pokemon/0130-420-Gyarados-Mega.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0131--000--Lapras.png b/src/canonical/minisprites/lgpe/pokemon/0131-000-Lapras.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0131--000--Lapras.png
rename to src/canonical/minisprites/lgpe/pokemon/0131-000-Lapras.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0132--000--Ditto.png b/src/canonical/minisprites/lgpe/pokemon/0132-000-Ditto.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0132--000--Ditto.png
rename to src/canonical/minisprites/lgpe/pokemon/0132-000-Ditto.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0133--000--Eevee.png b/src/canonical/minisprites/lgpe/pokemon/0133-000-Eevee.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0133--000--Eevee.png
rename to src/canonical/minisprites/lgpe/pokemon/0133-000-Eevee.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0133--420--Eevee--Starter.png b/src/canonical/minisprites/lgpe/pokemon/0133-420-Eevee-Starter.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0133--420--Eevee--Starter.png
rename to src/canonical/minisprites/lgpe/pokemon/0133-420-Eevee-Starter.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0134--000--Vaporeon.png b/src/canonical/minisprites/lgpe/pokemon/0134-000-Vaporeon.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0134--000--Vaporeon.png
rename to src/canonical/minisprites/lgpe/pokemon/0134-000-Vaporeon.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0135--000--Jolteon.png b/src/canonical/minisprites/lgpe/pokemon/0135-000-Jolteon.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0135--000--Jolteon.png
rename to src/canonical/minisprites/lgpe/pokemon/0135-000-Jolteon.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0136--000--Flareon.png b/src/canonical/minisprites/lgpe/pokemon/0136-000-Flareon.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0136--000--Flareon.png
rename to src/canonical/minisprites/lgpe/pokemon/0136-000-Flareon.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0137--000--Porygon.png b/src/canonical/minisprites/lgpe/pokemon/0137-000-Porygon.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0137--000--Porygon.png
rename to src/canonical/minisprites/lgpe/pokemon/0137-000-Porygon.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0138--000--Omanyte.png b/src/canonical/minisprites/lgpe/pokemon/0138-000-Omanyte.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0138--000--Omanyte.png
rename to src/canonical/minisprites/lgpe/pokemon/0138-000-Omanyte.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0139--000--Omastar.png b/src/canonical/minisprites/lgpe/pokemon/0139-000-Omastar.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0139--000--Omastar.png
rename to src/canonical/minisprites/lgpe/pokemon/0139-000-Omastar.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0140--000--Kabuto.png b/src/canonical/minisprites/lgpe/pokemon/0140-000-Kabuto.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0140--000--Kabuto.png
rename to src/canonical/minisprites/lgpe/pokemon/0140-000-Kabuto.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0141--000--Kabutops.png b/src/canonical/minisprites/lgpe/pokemon/0141-000-Kabutops.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0141--000--Kabutops.png
rename to src/canonical/minisprites/lgpe/pokemon/0141-000-Kabutops.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0142--000--Aerodactyl.png b/src/canonical/minisprites/lgpe/pokemon/0142-000-Aerodactyl.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0142--000--Aerodactyl.png
rename to src/canonical/minisprites/lgpe/pokemon/0142-000-Aerodactyl.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0142--420--Aerodactyl--Mega.png b/src/canonical/minisprites/lgpe/pokemon/0142-420-Aerodactyl-Mega.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0142--420--Aerodactyl--Mega.png
rename to src/canonical/minisprites/lgpe/pokemon/0142-420-Aerodactyl-Mega.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0143--000--Snorlax.png b/src/canonical/minisprites/lgpe/pokemon/0143-000-Snorlax.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0143--000--Snorlax.png
rename to src/canonical/minisprites/lgpe/pokemon/0143-000-Snorlax.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0144--000--Articuno.png b/src/canonical/minisprites/lgpe/pokemon/0144-000-Articuno.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0144--000--Articuno.png
rename to src/canonical/minisprites/lgpe/pokemon/0144-000-Articuno.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0145--000--Zapdos.png b/src/canonical/minisprites/lgpe/pokemon/0145-000-Zapdos.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0145--000--Zapdos.png
rename to src/canonical/minisprites/lgpe/pokemon/0145-000-Zapdos.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0146--000--Moltres.png b/src/canonical/minisprites/lgpe/pokemon/0146-000-Moltres.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0146--000--Moltres.png
rename to src/canonical/minisprites/lgpe/pokemon/0146-000-Moltres.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0147--000--Dratini.png b/src/canonical/minisprites/lgpe/pokemon/0147-000-Dratini.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0147--000--Dratini.png
rename to src/canonical/minisprites/lgpe/pokemon/0147-000-Dratini.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0148--000--Dragonair.png b/src/canonical/minisprites/lgpe/pokemon/0148-000-Dragonair.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0148--000--Dragonair.png
rename to src/canonical/minisprites/lgpe/pokemon/0148-000-Dragonair.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0149--000--Dragonite.png b/src/canonical/minisprites/lgpe/pokemon/0149-000-Dragonite.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0149--000--Dragonite.png
rename to src/canonical/minisprites/lgpe/pokemon/0149-000-Dragonite.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0150--000--Mewtwo.png b/src/canonical/minisprites/lgpe/pokemon/0150-000-Mewtwo.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0150--000--Mewtwo.png
rename to src/canonical/minisprites/lgpe/pokemon/0150-000-Mewtwo.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0150--420--Mewtwo--Mega-X.png b/src/canonical/minisprites/lgpe/pokemon/0150-420-Mewtwo-Mega~X.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0150--420--Mewtwo--Mega-X.png
rename to src/canonical/minisprites/lgpe/pokemon/0150-420-Mewtwo-Mega~X.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0151--000--Mew.png b/src/canonical/minisprites/lgpe/pokemon/0151-000-Mew.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0151--000--Mew.png
rename to src/canonical/minisprites/lgpe/pokemon/0151-000-Mew.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0808--000--Meltan.png b/src/canonical/minisprites/lgpe/pokemon/0808-000-Meltan.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0808--000--Meltan.png
rename to src/canonical/minisprites/lgpe/pokemon/0808-000-Meltan.png
diff --git a/src/canonical/minisprites/lgpe/pokemon/0809--000--Melmetal.png b/src/canonical/minisprites/lgpe/pokemon/0809-000-Melmetal.png
similarity index 100%
rename from src/canonical/minisprites/lgpe/pokemon/0809--000--Melmetal.png
rename to src/canonical/minisprites/lgpe/pokemon/0809-000-Melmetal.png
diff --git a/src/canonical/models/back-cosmetic/0003--000--Venusaur--Female.gif b/src/canonical/models/back-cosmetic/0003-000-Venusaur-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0003--000--Venusaur--Female.gif
rename to src/canonical/models/back-cosmetic/0003-000-Venusaur-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0012--000--Butterfree--Female.gif b/src/canonical/models/back-cosmetic/0012-000-Butterfree-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0012--000--Butterfree--Female.gif
rename to src/canonical/models/back-cosmetic/0012-000-Butterfree-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0019--000--Rattata--Female.gif b/src/canonical/models/back-cosmetic/0019-000-Rattata-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0019--000--Rattata--Female.gif
rename to src/canonical/models/back-cosmetic/0019-000-Rattata-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0025--000--Pikachu--Female.gif b/src/canonical/models/back-cosmetic/0025-000-Pikachu-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0025--000--Pikachu--Female.gif
rename to src/canonical/models/back-cosmetic/0025-000-Pikachu-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0026--000--Raichu--Female.gif b/src/canonical/models/back-cosmetic/0026-000-Raichu-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0026--000--Raichu--Female.gif
rename to src/canonical/models/back-cosmetic/0026-000-Raichu-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0041--000--Kerfluffle--Female.gif b/src/canonical/models/back-cosmetic/0041-000-Kerfluffle-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0041--000--Kerfluffle--Female.gif
rename to src/canonical/models/back-cosmetic/0041-000-Kerfluffle-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0044--000--Gloom--Female.gif b/src/canonical/models/back-cosmetic/0044-000-Gloom-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0044--000--Gloom--Female.gif
rename to src/canonical/models/back-cosmetic/0044-000-Gloom-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0045--000--Vileplume--Female.gif b/src/canonical/models/back-cosmetic/0045-000-Vileplume-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0045--000--Vileplume--Female.gif
rename to src/canonical/models/back-cosmetic/0045-000-Vileplume-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0064--000--Kadabra--Female.gif b/src/canonical/models/back-cosmetic/0064-000-Kadabra-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0064--000--Kadabra--Female.gif
rename to src/canonical/models/back-cosmetic/0064-000-Kadabra-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0065--000--Alakazam--Female.gif b/src/canonical/models/back-cosmetic/0065-000-Alakazam-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0065--000--Alakazam--Female.gif
rename to src/canonical/models/back-cosmetic/0065-000-Alakazam-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0084--000--Doduo--Female.gif b/src/canonical/models/back-cosmetic/0084-000-Doduo-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0084--000--Doduo--Female.gif
rename to src/canonical/models/back-cosmetic/0084-000-Doduo-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0085--000--Dodrio--Female.gif b/src/canonical/models/back-cosmetic/0085-000-Dodrio-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0085--000--Dodrio--Female.gif
rename to src/canonical/models/back-cosmetic/0085-000-Dodrio-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0097--000--Hypno--Female.gif b/src/canonical/models/back-cosmetic/0097-000-Hypno-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0097--000--Hypno--Female.gif
rename to src/canonical/models/back-cosmetic/0097-000-Hypno-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0111--000--Rhyhorn--Female.gif b/src/canonical/models/back-cosmetic/0111-000-Rhyhorn-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0111--000--Rhyhorn--Female.gif
rename to src/canonical/models/back-cosmetic/0111-000-Rhyhorn-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0118--000--Goldeen--Female.gif b/src/canonical/models/back-cosmetic/0118-000-Goldeen-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0118--000--Goldeen--Female.gif
rename to src/canonical/models/back-cosmetic/0118-000-Goldeen-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0119--000--Seaking--Female.gif b/src/canonical/models/back-cosmetic/0119-000-Seaking-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0119--000--Seaking--Female.gif
rename to src/canonical/models/back-cosmetic/0119-000-Seaking-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0130--000--Gyarados--Female.gif b/src/canonical/models/back-cosmetic/0130-000-Gyarados-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0130--000--Gyarados--Female.gif
rename to src/canonical/models/back-cosmetic/0130-000-Gyarados-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0154--000--Meganium--Female.gif b/src/canonical/models/back-cosmetic/0154-000-Meganium-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0154--000--Meganium--Female.gif
rename to src/canonical/models/back-cosmetic/0154-000-Meganium-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0165--000--Ledyba--Female.gif b/src/canonical/models/back-cosmetic/0165-000-Ledyba-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0165--000--Ledyba--Female.gif
rename to src/canonical/models/back-cosmetic/0165-000-Ledyba-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0166--000--Ledian--Female.gif b/src/canonical/models/back-cosmetic/0166-000-Ledian-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0166--000--Ledian--Female.gif
rename to src/canonical/models/back-cosmetic/0166-000-Ledian-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0178--000--Xatu--Female.gif b/src/canonical/models/back-cosmetic/0178-000-Xatu-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0178--000--Xatu--Female.gif
rename to src/canonical/models/back-cosmetic/0178-000-Xatu-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0185--000--Sudowoodo--Female.gif b/src/canonical/models/back-cosmetic/0185-000-Sudowoodo-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0185--000--Sudowoodo--Female.gif
rename to src/canonical/models/back-cosmetic/0185-000-Sudowoodo-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0190--000--Aipom--Female.gif b/src/canonical/models/back-cosmetic/0190-000-Aipom-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0190--000--Aipom--Female.gif
rename to src/canonical/models/back-cosmetic/0190-000-Aipom-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0194--000--Wooper--Female.gif b/src/canonical/models/back-cosmetic/0194-000-Wooper-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0194--000--Wooper--Female.gif
rename to src/canonical/models/back-cosmetic/0194-000-Wooper-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0195--000--Quagsire--Female.gif b/src/canonical/models/back-cosmetic/0195-000-Quagsire-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0195--000--Quagsire--Female.gif
rename to src/canonical/models/back-cosmetic/0195-000-Quagsire-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--A.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-A.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--A.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-A.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--B.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-B.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--B.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-B.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--C.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-C.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--C.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-C.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--D.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-D.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--D.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-D.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--E.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-E.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--E.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-E.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--Exclamation.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-Exclamation.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--Exclamation.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-Exclamation.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--F.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-F.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--F.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-F.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--G.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-G.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--G.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-G.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--H.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-H.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--H.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-H.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--I.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-I.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--I.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-I.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--J.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-J.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--J.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-J.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--K.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-K.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--K.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-K.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--L.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-L.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--L.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-L.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--M.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-M.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--M.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-M.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--N.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-N.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--N.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-N.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--O.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-O.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--O.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-O.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--P.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-P.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--P.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-P.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--Q.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-Q.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--Q.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-Q.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--Question.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-Question.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--Question.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-Question.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--R.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-R.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--R.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-R.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--S.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-S.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--S.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-S.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--T.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-T.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--T.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-T.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--U.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-U.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--U.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-U.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--V.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-V.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--V.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-V.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--W.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-W.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--W.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-W.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--X.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-X.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--X.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-X.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--Y.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-Y.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--Y.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-Y.gif
diff --git a/src/canonical/models/back-cosmetic/0201--420--Unown--Z.gif b/src/canonical/models/back-cosmetic/0201-420-Unown-Z.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0201--420--Unown--Z.gif
rename to src/canonical/models/back-cosmetic/0201-420-Unown-Z.gif
diff --git a/src/canonical/models/back-cosmetic/0207--000--Gligar--Female.gif b/src/canonical/models/back-cosmetic/0207-000-Gligar-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0207--000--Gligar--Female.gif
rename to src/canonical/models/back-cosmetic/0207-000-Gligar-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0214--000--Heracross--Female.gif b/src/canonical/models/back-cosmetic/0214-000-Heracross-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0214--000--Heracross--Female.gif
rename to src/canonical/models/back-cosmetic/0214-000-Heracross-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0215--000--Sneasel--Female.gif b/src/canonical/models/back-cosmetic/0215-000-Sneasel-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0215--000--Sneasel--Female.gif
rename to src/canonical/models/back-cosmetic/0215-000-Sneasel-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0217--000--Ursaring--Female.gif b/src/canonical/models/back-cosmetic/0217-000-Ursaring-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0217--000--Ursaring--Female.gif
rename to src/canonical/models/back-cosmetic/0217-000-Ursaring-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0221--000--Piloswine--Female.gif b/src/canonical/models/back-cosmetic/0221-000-Piloswine-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0221--000--Piloswine--Female.gif
rename to src/canonical/models/back-cosmetic/0221-000-Piloswine-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0224--000--Octillery--Female.gif b/src/canonical/models/back-cosmetic/0224-000-Octillery-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0224--000--Octillery--Female.gif
rename to src/canonical/models/back-cosmetic/0224-000-Octillery-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0229--000--Houndoom--Female.gif b/src/canonical/models/back-cosmetic/0229-000-Houndoom-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0229--000--Houndoom--Female.gif
rename to src/canonical/models/back-cosmetic/0229-000-Houndoom-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0232--000--Donphan--Female.gif b/src/canonical/models/back-cosmetic/0232-000-Donphan-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0232--000--Donphan--Female.gif
rename to src/canonical/models/back-cosmetic/0232-000-Donphan-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0256--000--Combusken--Female.gif b/src/canonical/models/back-cosmetic/0256-000-Combusken-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0256--000--Combusken--Female.gif
rename to src/canonical/models/back-cosmetic/0256-000-Combusken-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0257--000--Blaziken--Female.gif b/src/canonical/models/back-cosmetic/0257-000-Blaziken-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0257--000--Blaziken--Female.gif
rename to src/canonical/models/back-cosmetic/0257-000-Blaziken-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0267--000--Beautifly--Female.gif b/src/canonical/models/back-cosmetic/0267-000-Beautifly-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0267--000--Beautifly--Female.gif
rename to src/canonical/models/back-cosmetic/0267-000-Beautifly-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0269--000--Dustox--Female.gif b/src/canonical/models/back-cosmetic/0269-000-Dustox-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0269--000--Dustox--Female.gif
rename to src/canonical/models/back-cosmetic/0269-000-Dustox-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0272--000--Ludicolo--Female.gif b/src/canonical/models/back-cosmetic/0272-000-Ludicolo-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0272--000--Ludicolo--Female.gif
rename to src/canonical/models/back-cosmetic/0272-000-Ludicolo-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0274--000--Nuzleaf--Female.gif b/src/canonical/models/back-cosmetic/0274-000-Nuzleaf-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0274--000--Nuzleaf--Female.gif
rename to src/canonical/models/back-cosmetic/0274-000-Nuzleaf-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0275--000--Shiftry--Female.gif b/src/canonical/models/back-cosmetic/0275-000-Shiftry-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0275--000--Shiftry--Female.gif
rename to src/canonical/models/back-cosmetic/0275-000-Shiftry-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0307--000--Meditite--Female.gif b/src/canonical/models/back-cosmetic/0307-000-Meditite-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0307--000--Meditite--Female.gif
rename to src/canonical/models/back-cosmetic/0307-000-Meditite-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0308--000--Medicham--Female.gif b/src/canonical/models/back-cosmetic/0308-000-Medicham-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0308--000--Medicham--Female.gif
rename to src/canonical/models/back-cosmetic/0308-000-Medicham-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0315--000--Roselia--Female.gif b/src/canonical/models/back-cosmetic/0315-000-Roselia-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0315--000--Roselia--Female.gif
rename to src/canonical/models/back-cosmetic/0315-000-Roselia-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0316--000--Gulpin--Female.gif b/src/canonical/models/back-cosmetic/0316-000-Gulpin-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0316--000--Gulpin--Female.gif
rename to src/canonical/models/back-cosmetic/0316-000-Gulpin-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0317--000--Swalot--Female.gif b/src/canonical/models/back-cosmetic/0317-000-Swalot-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0317--000--Swalot--Female.gif
rename to src/canonical/models/back-cosmetic/0317-000-Swalot-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0322--000--Numel--Female.gif b/src/canonical/models/back-cosmetic/0322-000-Numel-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0322--000--Numel--Female.gif
rename to src/canonical/models/back-cosmetic/0322-000-Numel-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0323--000--Camerupt--Female.gif b/src/canonical/models/back-cosmetic/0323-000-Camerupt-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0323--000--Camerupt--Female.gif
rename to src/canonical/models/back-cosmetic/0323-000-Camerupt-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0350--000--Milotic--Female.gif b/src/canonical/models/back-cosmetic/0350-000-Milotic-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0350--000--Milotic--Female.gif
rename to src/canonical/models/back-cosmetic/0350-000-Milotic-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0369--000--Relicanth--Female.gif b/src/canonical/models/back-cosmetic/0369-000-Relicanth-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0369--000--Relicanth--Female.gif
rename to src/canonical/models/back-cosmetic/0369-000-Relicanth-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0399--000--Bidoof--Female.gif b/src/canonical/models/back-cosmetic/0399-000-Bidoof-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0399--000--Bidoof--Female.gif
rename to src/canonical/models/back-cosmetic/0399-000-Bidoof-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0403--000--Shinx--Female.gif b/src/canonical/models/back-cosmetic/0403-000-Shinx-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0403--000--Shinx--Female.gif
rename to src/canonical/models/back-cosmetic/0403-000-Shinx-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0404--000--Luxio--Female.gif b/src/canonical/models/back-cosmetic/0404-000-Luxio-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0404--000--Luxio--Female.gif
rename to src/canonical/models/back-cosmetic/0404-000-Luxio-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0405--000--Luxray--Female.gif b/src/canonical/models/back-cosmetic/0405-000-Luxray-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0405--000--Luxray--Female.gif
rename to src/canonical/models/back-cosmetic/0405-000-Luxray-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0407--000--Roserade--Female.gif b/src/canonical/models/back-cosmetic/0407-000-Roserade-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0407--000--Roserade--Female.gif
rename to src/canonical/models/back-cosmetic/0407-000-Roserade-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0412--420--Burmy--Sandy.gif b/src/canonical/models/back-cosmetic/0412-420-Burmy-Sandy.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0412--420--Burmy--Sandy.gif
rename to src/canonical/models/back-cosmetic/0412-420-Burmy-Sandy.gif
diff --git a/src/canonical/models/back-cosmetic/0412--420--Burmy--Trash.gif b/src/canonical/models/back-cosmetic/0412-420-Burmy-Trash.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0412--420--Burmy--Trash.gif
rename to src/canonical/models/back-cosmetic/0412-420-Burmy-Trash.gif
diff --git a/src/canonical/models/back-cosmetic/0418--000--Buizel--Female.gif b/src/canonical/models/back-cosmetic/0418-000-Buizel-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0418--000--Buizel--Female.gif
rename to src/canonical/models/back-cosmetic/0418-000-Buizel-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0419--000--Floatzel--Female.gif b/src/canonical/models/back-cosmetic/0419-000-Floatzel-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0419--000--Floatzel--Female.gif
rename to src/canonical/models/back-cosmetic/0419-000-Floatzel-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0422--420--Shellos--East.gif b/src/canonical/models/back-cosmetic/0422-420-Shellos-East.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0422--420--Shellos--East.gif
rename to src/canonical/models/back-cosmetic/0422-420-Shellos-East.gif
diff --git a/src/canonical/models/back-cosmetic/0423--420--Gastrodon--East.gif b/src/canonical/models/back-cosmetic/0423-420-Gastrodon-East.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0423--420--Gastrodon--East.gif
rename to src/canonical/models/back-cosmetic/0423-420-Gastrodon-East.gif
diff --git a/src/canonical/models/back-cosmetic/0424--000--Ambipom--Female.gif b/src/canonical/models/back-cosmetic/0424-000-Ambipom-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0424--000--Ambipom--Female.gif
rename to src/canonical/models/back-cosmetic/0424-000-Ambipom-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0443--000--Gible--Female.gif b/src/canonical/models/back-cosmetic/0443-000-Gible-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0443--000--Gible--Female.gif
rename to src/canonical/models/back-cosmetic/0443-000-Gible-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0444--000--Gabite--Female.gif b/src/canonical/models/back-cosmetic/0444-000-Gabite-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0444--000--Gabite--Female.gif
rename to src/canonical/models/back-cosmetic/0444-000-Gabite-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0445--000--Garchomp--Female.gif b/src/canonical/models/back-cosmetic/0445-000-Garchomp-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0445--000--Garchomp--Female.gif
rename to src/canonical/models/back-cosmetic/0445-000-Garchomp-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0449--000--Hippopotas--Female.gif b/src/canonical/models/back-cosmetic/0449-000-Hippopotas-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0449--000--Hippopotas--Female.gif
rename to src/canonical/models/back-cosmetic/0449-000-Hippopotas-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0450--000--Hippowdon--Female.gif b/src/canonical/models/back-cosmetic/0450-000-Hippowdon-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0450--000--Hippowdon--Female.gif
rename to src/canonical/models/back-cosmetic/0450-000-Hippowdon-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0454--000--Toxicroak--Female.gif b/src/canonical/models/back-cosmetic/0454-000-Toxicroak-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0454--000--Toxicroak--Female.gif
rename to src/canonical/models/back-cosmetic/0454-000-Toxicroak-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0456--000--Finneon--Female.gif b/src/canonical/models/back-cosmetic/0456-000-Finneon-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0456--000--Finneon--Female.gif
rename to src/canonical/models/back-cosmetic/0456-000-Finneon-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0457--000--Lumineon--Female.gif b/src/canonical/models/back-cosmetic/0457-000-Lumineon-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0457--000--Lumineon--Female.gif
rename to src/canonical/models/back-cosmetic/0457-000-Lumineon-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0459--000--Snover--Female.gif b/src/canonical/models/back-cosmetic/0459-000-Snover-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0459--000--Snover--Female.gif
rename to src/canonical/models/back-cosmetic/0459-000-Snover-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0461--000--Weavile--Female.gif b/src/canonical/models/back-cosmetic/0461-000-Weavile-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0461--000--Weavile--Female.gif
rename to src/canonical/models/back-cosmetic/0461-000-Weavile-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0464--000--Rhyperior--Female.gif b/src/canonical/models/back-cosmetic/0464-000-Rhyperior-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0464--000--Rhyperior--Female.gif
rename to src/canonical/models/back-cosmetic/0464-000-Rhyperior-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0473--000--Mamoswine--Female.gif b/src/canonical/models/back-cosmetic/0473-000-Mamoswine-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0473--000--Mamoswine--Female.gif
rename to src/canonical/models/back-cosmetic/0473-000-Mamoswine-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0479--000--Rotom--Female.gif b/src/canonical/models/back-cosmetic/0479-000-Rotom-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0479--000--Rotom--Female.gif
rename to src/canonical/models/back-cosmetic/0479-000-Rotom-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0521--000--Unfezant--Female.gif b/src/canonical/models/back-cosmetic/0521-000-Unfezant-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0521--000--Unfezant--Female.gif
rename to src/canonical/models/back-cosmetic/0521-000-Unfezant-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0585--420--Deerling--Autumn.gif b/src/canonical/models/back-cosmetic/0585-420-Deerling-Autumn.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0585--420--Deerling--Autumn.gif
rename to src/canonical/models/back-cosmetic/0585-420-Deerling-Autumn.gif
diff --git a/src/canonical/models/back-cosmetic/0585--420--Deerling--Summer.gif b/src/canonical/models/back-cosmetic/0585-420-Deerling-Summer.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0585--420--Deerling--Summer.gif
rename to src/canonical/models/back-cosmetic/0585-420-Deerling-Summer.gif
diff --git a/src/canonical/models/back-cosmetic/0585--420--Deerling--Winter.gif b/src/canonical/models/back-cosmetic/0585-420-Deerling-Winter.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0585--420--Deerling--Winter.gif
rename to src/canonical/models/back-cosmetic/0585-420-Deerling-Winter.gif
diff --git a/src/canonical/models/back-cosmetic/0586--420--Sawsbuck--Autumn.gif b/src/canonical/models/back-cosmetic/0586-420-Sawsbuck-Autumn.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0586--420--Sawsbuck--Autumn.gif
rename to src/canonical/models/back-cosmetic/0586-420-Sawsbuck-Autumn.gif
diff --git a/src/canonical/models/back-cosmetic/0586--420--Sawsbuck--Summer.gif b/src/canonical/models/back-cosmetic/0586-420-Sawsbuck-Summer.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0586--420--Sawsbuck--Summer.gif
rename to src/canonical/models/back-cosmetic/0586-420-Sawsbuck-Summer.gif
diff --git a/src/canonical/models/back-cosmetic/0586--420--Sawsbuck--Winter.gif b/src/canonical/models/back-cosmetic/0586-420-Sawsbuck-Winter.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0586--420--Sawsbuck--Winter.gif
rename to src/canonical/models/back-cosmetic/0586-420-Sawsbuck-Winter.gif
diff --git a/src/canonical/models/back-cosmetic/0592--000--Frillish--Female.gif b/src/canonical/models/back-cosmetic/0592-000-Frillish-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0592--000--Frillish--Female.gif
rename to src/canonical/models/back-cosmetic/0592-000-Frillish-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0593--000--Jellicent--Female.gif b/src/canonical/models/back-cosmetic/0593-000-Jellicent-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0593--000--Jellicent--Female.gif
rename to src/canonical/models/back-cosmetic/0593-000-Jellicent-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Archipelago.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Archipelago.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Archipelago.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Archipelago.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Continental.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Continental.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Continental.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Continental.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Elegant.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Elegant.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Elegant.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Elegant.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Garden.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Garden.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Garden.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Garden.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--High_Plains.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-High_Plains.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--High_Plains.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-High_Plains.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Icy_Snow.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Icy_Snow.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Icy_Snow.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Icy_Snow.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Jungle.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Jungle.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Jungle.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Jungle.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Marine.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Marine.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Marine.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Marine.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Modern.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Modern.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Modern.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Modern.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Monsoon.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Monsoon.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Monsoon.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Monsoon.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Ocean.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Ocean.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Ocean.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Ocean.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Polar.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Polar.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Polar.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Polar.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--River.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-River.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--River.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-River.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Sandstorm.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Sandstorm.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Sandstorm.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Sandstorm.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Savanna.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Savanna.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Savanna.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Savanna.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Sun.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Sun.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Sun.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Sun.gif
diff --git a/src/canonical/models/back-cosmetic/0666--420--Vivillon--Tundra.gif b/src/canonical/models/back-cosmetic/0666-420-Vivillon-Tundra.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0666--420--Vivillon--Tundra.gif
rename to src/canonical/models/back-cosmetic/0666-420-Vivillon-Tundra.gif
diff --git a/src/canonical/models/back-cosmetic/0668--000--Pyroar--Female.gif b/src/canonical/models/back-cosmetic/0668-000-Pyroar-Female.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0668--000--Pyroar--Female.gif
rename to src/canonical/models/back-cosmetic/0668-000-Pyroar-Female.gif
diff --git a/src/canonical/models/back-cosmetic/0669--420--Flabe__0301be__0301--Blue.gif b/src/canonical/models/back-cosmetic/0669-420-Flabe__0301be__0301-Blue.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0669--420--Flabe__0301be__0301--Blue.gif
rename to src/canonical/models/back-cosmetic/0669-420-Flabe__0301be__0301-Blue.gif
diff --git a/src/canonical/models/back-cosmetic/0669--420--Flabe__0301be__0301--Orange.gif b/src/canonical/models/back-cosmetic/0669-420-Flabe__0301be__0301-Orange.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0669--420--Flabe__0301be__0301--Orange.gif
rename to src/canonical/models/back-cosmetic/0669-420-Flabe__0301be__0301-Orange.gif
diff --git a/src/canonical/models/back-cosmetic/0669--420--Flabe__0301be__0301--White.gif b/src/canonical/models/back-cosmetic/0669-420-Flabe__0301be__0301-White.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0669--420--Flabe__0301be__0301--White.gif
rename to src/canonical/models/back-cosmetic/0669-420-Flabe__0301be__0301-White.gif
diff --git a/src/canonical/models/back-cosmetic/0669--420--Flabe__0301be__0301--Yellow.gif b/src/canonical/models/back-cosmetic/0669-420-Flabe__0301be__0301-Yellow.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0669--420--Flabe__0301be__0301--Yellow.gif
rename to src/canonical/models/back-cosmetic/0669-420-Flabe__0301be__0301-Yellow.gif
diff --git a/src/canonical/models/back-cosmetic/0670--420--Floette--Blue.gif b/src/canonical/models/back-cosmetic/0670-420-Floette-Blue.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0670--420--Floette--Blue.gif
rename to src/canonical/models/back-cosmetic/0670-420-Floette-Blue.gif
diff --git a/src/canonical/models/back-cosmetic/0670--420--Floette--Orange.gif b/src/canonical/models/back-cosmetic/0670-420-Floette-Orange.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0670--420--Floette--Orange.gif
rename to src/canonical/models/back-cosmetic/0670-420-Floette-Orange.gif
diff --git a/src/canonical/models/back-cosmetic/0670--420--Floette--White.gif b/src/canonical/models/back-cosmetic/0670-420-Floette-White.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0670--420--Floette--White.gif
rename to src/canonical/models/back-cosmetic/0670-420-Floette-White.gif
diff --git a/src/canonical/models/back-cosmetic/0670--420--Floette--Yellow.gif b/src/canonical/models/back-cosmetic/0670-420-Floette-Yellow.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0670--420--Floette--Yellow.gif
rename to src/canonical/models/back-cosmetic/0670-420-Floette-Yellow.gif
diff --git a/src/canonical/models/back-cosmetic/0671--420--Florges--Blue.gif b/src/canonical/models/back-cosmetic/0671-420-Florges-Blue.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0671--420--Florges--Blue.gif
rename to src/canonical/models/back-cosmetic/0671-420-Florges-Blue.gif
diff --git a/src/canonical/models/back-cosmetic/0671--420--Florges--Orange.gif b/src/canonical/models/back-cosmetic/0671-420-Florges-Orange.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0671--420--Florges--Orange.gif
rename to src/canonical/models/back-cosmetic/0671-420-Florges-Orange.gif
diff --git a/src/canonical/models/back-cosmetic/0671--420--Florges--White.gif b/src/canonical/models/back-cosmetic/0671-420-Florges-White.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0671--420--Florges--White.gif
rename to src/canonical/models/back-cosmetic/0671-420-Florges-White.gif
diff --git a/src/canonical/models/back-cosmetic/0671--420--Florges--Yellow.gif b/src/canonical/models/back-cosmetic/0671-420-Florges-Yellow.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0671--420--Florges--Yellow.gif
rename to src/canonical/models/back-cosmetic/0671-420-Florges-Yellow.gif
diff --git a/src/canonical/models/back-cosmetic/0676--420--Furfrou--Dandy.gif b/src/canonical/models/back-cosmetic/0676-420-Furfrou-Dandy.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0676--420--Furfrou--Dandy.gif
rename to src/canonical/models/back-cosmetic/0676-420-Furfrou-Dandy.gif
diff --git a/src/canonical/models/back-cosmetic/0676--420--Furfrou--Debutante.gif b/src/canonical/models/back-cosmetic/0676-420-Furfrou-Debutante.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0676--420--Furfrou--Debutante.gif
rename to src/canonical/models/back-cosmetic/0676-420-Furfrou-Debutante.gif
diff --git a/src/canonical/models/back-cosmetic/0676--420--Furfrou--Diamond.gif b/src/canonical/models/back-cosmetic/0676-420-Furfrou-Diamond.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0676--420--Furfrou--Diamond.gif
rename to src/canonical/models/back-cosmetic/0676-420-Furfrou-Diamond.gif
diff --git a/src/canonical/models/back-cosmetic/0676--420--Furfrou--Heart.gif b/src/canonical/models/back-cosmetic/0676-420-Furfrou-Heart.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0676--420--Furfrou--Heart.gif
rename to src/canonical/models/back-cosmetic/0676-420-Furfrou-Heart.gif
diff --git a/src/canonical/models/back-cosmetic/0676--420--Furfrou--Kabuki.gif b/src/canonical/models/back-cosmetic/0676-420-Furfrou-Kabuki.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0676--420--Furfrou--Kabuki.gif
rename to src/canonical/models/back-cosmetic/0676-420-Furfrou-Kabuki.gif
diff --git a/src/canonical/models/back-cosmetic/0676--420--Furfrou--La_Reine.gif b/src/canonical/models/back-cosmetic/0676-420-Furfrou-La_Reine.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0676--420--Furfrou--La_Reine.gif
rename to src/canonical/models/back-cosmetic/0676-420-Furfrou-La_Reine.gif
diff --git a/src/canonical/models/back-cosmetic/0676--420--Furfrou--Matron.gif b/src/canonical/models/back-cosmetic/0676-420-Furfrou-Matron.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0676--420--Furfrou--Matron.gif
rename to src/canonical/models/back-cosmetic/0676-420-Furfrou-Matron.gif
diff --git a/src/canonical/models/back-cosmetic/0676--420--Furfrou--Pharaoh.gif b/src/canonical/models/back-cosmetic/0676-420-Furfrou-Pharaoh.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0676--420--Furfrou--Pharaoh.gif
rename to src/canonical/models/back-cosmetic/0676-420-Furfrou-Pharaoh.gif
diff --git a/src/canonical/models/back-cosmetic/0676--420--Furfrou--Star.gif b/src/canonical/models/back-cosmetic/0676-420-Furfrou-Star.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0676--420--Furfrou--Star.gif
rename to src/canonical/models/back-cosmetic/0676-420-Furfrou-Star.gif
diff --git a/src/canonical/models/back-cosmetic/0774--420--Minior--Blue.gif b/src/canonical/models/back-cosmetic/0774-420-Minior-Blue.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0774--420--Minior--Blue.gif
rename to src/canonical/models/back-cosmetic/0774-420-Minior-Blue.gif
diff --git a/src/canonical/models/back-cosmetic/0774--420--Minior--Green.gif b/src/canonical/models/back-cosmetic/0774-420-Minior-Green.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0774--420--Minior--Green.gif
rename to src/canonical/models/back-cosmetic/0774-420-Minior-Green.gif
diff --git a/src/canonical/models/back-cosmetic/0774--420--Minior--Indigo.gif b/src/canonical/models/back-cosmetic/0774-420-Minior-Indigo.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0774--420--Minior--Indigo.gif
rename to src/canonical/models/back-cosmetic/0774-420-Minior-Indigo.gif
diff --git a/src/canonical/models/back-cosmetic/0774--420--Minior--Meteor.gif b/src/canonical/models/back-cosmetic/0774-420-Minior-Meteor.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0774--420--Minior--Meteor.gif
rename to src/canonical/models/back-cosmetic/0774-420-Minior-Meteor.gif
diff --git a/src/canonical/models/back-cosmetic/0774--420--Minior--Orange.gif b/src/canonical/models/back-cosmetic/0774-420-Minior-Orange.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0774--420--Minior--Orange.gif
rename to src/canonical/models/back-cosmetic/0774-420-Minior-Orange.gif
diff --git a/src/canonical/models/back-cosmetic/0774--420--Minior--Violet.gif b/src/canonical/models/back-cosmetic/0774-420-Minior-Violet.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0774--420--Minior--Violet.gif
rename to src/canonical/models/back-cosmetic/0774-420-Minior-Violet.gif
diff --git a/src/canonical/models/back-cosmetic/0774--420--Minior--Yellow.gif b/src/canonical/models/back-cosmetic/0774-420-Minior-Yellow.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0774--420--Minior--Yellow.gif
rename to src/canonical/models/back-cosmetic/0774-420-Minior-Yellow.gif
diff --git a/src/canonical/models/back-cosmetic/0801--420--Magearna--Original.gif b/src/canonical/models/back-cosmetic/0801-420-Magearna-Original.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0801--420--Magearna--Original.gif
rename to src/canonical/models/back-cosmetic/0801-420-Magearna-Original.gif
diff --git a/src/canonical/models/back-cosmetic/0869--420--Alcremie--Caramel_Swirl.gif b/src/canonical/models/back-cosmetic/0869-420-Alcremie-Caramel_Swirl.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0869--420--Alcremie--Caramel_Swirl.gif
rename to src/canonical/models/back-cosmetic/0869-420-Alcremie-Caramel_Swirl.gif
diff --git a/src/canonical/models/back-cosmetic/0869--420--Alcremie--Lemon_Cream.gif b/src/canonical/models/back-cosmetic/0869-420-Alcremie-Lemon_Cream.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0869--420--Alcremie--Lemon_Cream.gif
rename to src/canonical/models/back-cosmetic/0869-420-Alcremie-Lemon_Cream.gif
diff --git a/src/canonical/models/back-cosmetic/0869--420--Alcremie--Matcha_Cream.gif b/src/canonical/models/back-cosmetic/0869-420-Alcremie-Matcha_Cream.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0869--420--Alcremie--Matcha_Cream.gif
rename to src/canonical/models/back-cosmetic/0869-420-Alcremie-Matcha_Cream.gif
diff --git a/src/canonical/models/back-cosmetic/0869--420--Alcremie--Mint_Cream.gif b/src/canonical/models/back-cosmetic/0869-420-Alcremie-Mint_Cream.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0869--420--Alcremie--Mint_Cream.gif
rename to src/canonical/models/back-cosmetic/0869-420-Alcremie-Mint_Cream.gif
diff --git a/src/canonical/models/back-cosmetic/0869--420--Alcremie--Rainbow_Swirl.gif b/src/canonical/models/back-cosmetic/0869-420-Alcremie-Rainbow_Swirl.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0869--420--Alcremie--Rainbow_Swirl.gif
rename to src/canonical/models/back-cosmetic/0869-420-Alcremie-Rainbow_Swirl.gif
diff --git a/src/canonical/models/back-cosmetic/0869--420--Alcremie--Ruby_Cream.gif b/src/canonical/models/back-cosmetic/0869-420-Alcremie-Ruby_Cream.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0869--420--Alcremie--Ruby_Cream.gif
rename to src/canonical/models/back-cosmetic/0869-420-Alcremie-Ruby_Cream.gif
diff --git a/src/canonical/models/back-cosmetic/0869--420--Alcremie--Ruby_Swirl.gif b/src/canonical/models/back-cosmetic/0869-420-Alcremie-Ruby_Swirl.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0869--420--Alcremie--Ruby_Swirl.gif
rename to src/canonical/models/back-cosmetic/0869-420-Alcremie-Ruby_Swirl.gif
diff --git a/src/canonical/models/back-cosmetic/0869--420--Alcremie--Salted_Cream.gif b/src/canonical/models/back-cosmetic/0869-420-Alcremie-Salted_Cream.gif
similarity index 100%
rename from src/canonical/models/back-cosmetic/0869--420--Alcremie--Salted_Cream.gif
rename to src/canonical/models/back-cosmetic/0869-420-Alcremie-Salted_Cream.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0003--000--Venusaur--Female.gif b/src/canonical/models/back-shiny-cosmetic/0003-000-Venusaur-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0003--000--Venusaur--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0003-000-Venusaur-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0012--000--Butterfree--Female.gif b/src/canonical/models/back-shiny-cosmetic/0012-000-Butterfree-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0012--000--Butterfree--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0012-000-Butterfree-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0019--000--Rattata--Female.gif b/src/canonical/models/back-shiny-cosmetic/0019-000-Rattata-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0019--000--Rattata--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0019-000-Rattata-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0020--000--Raticate--Female.gif b/src/canonical/models/back-shiny-cosmetic/0020-000-Raticate-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0020--000--Raticate--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0020-000-Raticate-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0025--000--Pikachu--Female.gif b/src/canonical/models/back-shiny-cosmetic/0025-000-Pikachu-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0025--000--Pikachu--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0025-000-Pikachu-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0026--000--Raichu--Female.gif b/src/canonical/models/back-shiny-cosmetic/0026-000-Raichu-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0026--000--Raichu--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0026-000-Raichu-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0041--000--Kerfluffle--Female.gif b/src/canonical/models/back-shiny-cosmetic/0041-000-Kerfluffle-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0041--000--Kerfluffle--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0041-000-Kerfluffle-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0044--000--Gloom--Female.gif b/src/canonical/models/back-shiny-cosmetic/0044-000-Gloom-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0044--000--Gloom--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0044-000-Gloom-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0045--000--Vileplume--Female.gif b/src/canonical/models/back-shiny-cosmetic/0045-000-Vileplume-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0045--000--Vileplume--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0045-000-Vileplume-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0064--000--Kadabra--Female.gif b/src/canonical/models/back-shiny-cosmetic/0064-000-Kadabra-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0064--000--Kadabra--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0064-000-Kadabra-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0065--000--Alakazam--Female.gif b/src/canonical/models/back-shiny-cosmetic/0065-000-Alakazam-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0065--000--Alakazam--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0065-000-Alakazam-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0084--000--Doduo--Female.gif b/src/canonical/models/back-shiny-cosmetic/0084-000-Doduo-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0084--000--Doduo--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0084-000-Doduo-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0085--000--Dodrio--Female.gif b/src/canonical/models/back-shiny-cosmetic/0085-000-Dodrio-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0085--000--Dodrio--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0085-000-Dodrio-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0097--000--Hypno--Female.gif b/src/canonical/models/back-shiny-cosmetic/0097-000-Hypno-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0097--000--Hypno--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0097-000-Hypno-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0111--000--Rhyhorn--Female.gif b/src/canonical/models/back-shiny-cosmetic/0111-000-Rhyhorn-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0111--000--Rhyhorn--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0111-000-Rhyhorn-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0118--000--Goldeen--Female.gif b/src/canonical/models/back-shiny-cosmetic/0118-000-Goldeen-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0118--000--Goldeen--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0118-000-Goldeen-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0119--000--Seaking--Female.gif b/src/canonical/models/back-shiny-cosmetic/0119-000-Seaking-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0119--000--Seaking--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0119-000-Seaking-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0123--000--Scyther--Female.gif b/src/canonical/models/back-shiny-cosmetic/0123-000-Scyther-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0123--000--Scyther--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0123-000-Scyther-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0130--000--Gyarados--Female.gif b/src/canonical/models/back-shiny-cosmetic/0130-000-Gyarados-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0130--000--Gyarados--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0130-000-Gyarados-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0154--000--Meganium--Female.gif b/src/canonical/models/back-shiny-cosmetic/0154-000-Meganium-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0154--000--Meganium--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0154-000-Meganium-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0165--000--Ledyba--Female.gif b/src/canonical/models/back-shiny-cosmetic/0165-000-Ledyba-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0165--000--Ledyba--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0165-000-Ledyba-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0166--000--Ledian--Female.gif b/src/canonical/models/back-shiny-cosmetic/0166-000-Ledian-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0166--000--Ledian--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0166-000-Ledian-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0178--000--Xatu--Female.gif b/src/canonical/models/back-shiny-cosmetic/0178-000-Xatu-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0178--000--Xatu--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0178-000-Xatu-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0185--000--Sudowoodo--Female.gif b/src/canonical/models/back-shiny-cosmetic/0185-000-Sudowoodo-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0185--000--Sudowoodo--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0185-000-Sudowoodo-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0186--000--Politoed--Female.gif b/src/canonical/models/back-shiny-cosmetic/0186-000-Politoed-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0186--000--Politoed--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0186-000-Politoed-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0190--000--Aipom--Female.gif b/src/canonical/models/back-shiny-cosmetic/0190-000-Aipom-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0190--000--Aipom--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0190-000-Aipom-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0194--000--Wooper--Female.gif b/src/canonical/models/back-shiny-cosmetic/0194-000-Wooper-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0194--000--Wooper--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0194-000-Wooper-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0195--000--Quagsire--Female.gif b/src/canonical/models/back-shiny-cosmetic/0195-000-Quagsire-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0195--000--Quagsire--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0195-000-Quagsire-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--A.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-A.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--A.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-A.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--B.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-B.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--B.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-B.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--C.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-C.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--C.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-C.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--D.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-D.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--D.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-D.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--E.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-E.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--E.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-E.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--Exclamation.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-Exclamation.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--Exclamation.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-Exclamation.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--F.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-F.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--F.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-F.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--G.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-G.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--G.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-G.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--H.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-H.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--H.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-H.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--I.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-I.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--I.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-I.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--J.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-J.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--J.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-J.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--K.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-K.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--K.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-K.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--L.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-L.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--L.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-L.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--M.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-M.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--M.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-M.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--N.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-N.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--N.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-N.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--O.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-O.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--O.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-O.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--Q.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-Q.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--Q.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-Q.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--Question.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-Question.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--Question.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-Question.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--R.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-R.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--R.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-R.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--S.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-S.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--S.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-S.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--T.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-T.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--T.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-T.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--U.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-U.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--U.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-U.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--V.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-V.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--V.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-V.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--W.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-W.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--W.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-W.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--X.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-X.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--X.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-X.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--Y.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-Y.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--Y.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-Y.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0201--420--Unown--Z.gif b/src/canonical/models/back-shiny-cosmetic/0201-420-Unown-Z.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0201--420--Unown--Z.gif
rename to src/canonical/models/back-shiny-cosmetic/0201-420-Unown-Z.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0207--000--Gligar--Female.gif b/src/canonical/models/back-shiny-cosmetic/0207-000-Gligar-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0207--000--Gligar--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0207-000-Gligar-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0214--000--Heracross--Female.gif b/src/canonical/models/back-shiny-cosmetic/0214-000-Heracross-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0214--000--Heracross--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0214-000-Heracross-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0215--000--Sneasel--Female.gif b/src/canonical/models/back-shiny-cosmetic/0215-000-Sneasel-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0215--000--Sneasel--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0215-000-Sneasel-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0217--000--Ursaring--Female.gif b/src/canonical/models/back-shiny-cosmetic/0217-000-Ursaring-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0217--000--Ursaring--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0217-000-Ursaring-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0221--000--Piloswine--Female.gif b/src/canonical/models/back-shiny-cosmetic/0221-000-Piloswine-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0221--000--Piloswine--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0221-000-Piloswine-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0224--000--Octillery--Female.gif b/src/canonical/models/back-shiny-cosmetic/0224-000-Octillery-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0224--000--Octillery--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0224-000-Octillery-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0229--000--Houndoom--Female.gif b/src/canonical/models/back-shiny-cosmetic/0229-000-Houndoom-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0229--000--Houndoom--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0229-000-Houndoom-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0232--000--Donphan--Female.gif b/src/canonical/models/back-shiny-cosmetic/0232-000-Donphan-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0232--000--Donphan--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0232-000-Donphan-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0256--000--Combusken--Female.gif b/src/canonical/models/back-shiny-cosmetic/0256-000-Combusken-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0256--000--Combusken--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0256-000-Combusken-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0257--000--Blaziken--Female.gif b/src/canonical/models/back-shiny-cosmetic/0257-000-Blaziken-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0257--000--Blaziken--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0257-000-Blaziken-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0267--000--Beautifly--Female.gif b/src/canonical/models/back-shiny-cosmetic/0267-000-Beautifly-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0267--000--Beautifly--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0267-000-Beautifly-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0269--000--Dustox--Female.gif b/src/canonical/models/back-shiny-cosmetic/0269-000-Dustox-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0269--000--Dustox--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0269-000-Dustox-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0272--000--Ludicolo--Female.gif b/src/canonical/models/back-shiny-cosmetic/0272-000-Ludicolo-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0272--000--Ludicolo--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0272-000-Ludicolo-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0274--000--Nuzleaf--Female.gif b/src/canonical/models/back-shiny-cosmetic/0274-000-Nuzleaf-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0274--000--Nuzleaf--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0274-000-Nuzleaf-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0275--000--Shiftry--Female.gif b/src/canonical/models/back-shiny-cosmetic/0275-000-Shiftry-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0275--000--Shiftry--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0275-000-Shiftry-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0307--000--Meditite--Female.gif b/src/canonical/models/back-shiny-cosmetic/0307-000-Meditite-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0307--000--Meditite--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0307-000-Meditite-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0308--000--Medicham--Female.gif b/src/canonical/models/back-shiny-cosmetic/0308-000-Medicham-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0308--000--Medicham--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0308-000-Medicham-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0315--000--Roselia--Female.gif b/src/canonical/models/back-shiny-cosmetic/0315-000-Roselia-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0315--000--Roselia--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0315-000-Roselia-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0316--000--Gulpin--Female.gif b/src/canonical/models/back-shiny-cosmetic/0316-000-Gulpin-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0316--000--Gulpin--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0316-000-Gulpin-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0317--000--Swalot--Female.gif b/src/canonical/models/back-shiny-cosmetic/0317-000-Swalot-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0317--000--Swalot--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0317-000-Swalot-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0322--000--Numel--Female.gif b/src/canonical/models/back-shiny-cosmetic/0322-000-Numel-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0322--000--Numel--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0322-000-Numel-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0323--000--Camerupt--Female.gif b/src/canonical/models/back-shiny-cosmetic/0323-000-Camerupt-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0323--000--Camerupt--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0323-000-Camerupt-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0350--000--Milotic--Female.gif b/src/canonical/models/back-shiny-cosmetic/0350-000-Milotic-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0350--000--Milotic--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0350-000-Milotic-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0369--000--Relicanth--Female.gif b/src/canonical/models/back-shiny-cosmetic/0369-000-Relicanth-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0369--000--Relicanth--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0369-000-Relicanth-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0399--000--Bidoof--Female.gif b/src/canonical/models/back-shiny-cosmetic/0399-000-Bidoof-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0399--000--Bidoof--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0399-000-Bidoof-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0403--000--Shinx--Female.gif b/src/canonical/models/back-shiny-cosmetic/0403-000-Shinx-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0403--000--Shinx--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0403-000-Shinx-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0404--000--Luxio--Female.gif b/src/canonical/models/back-shiny-cosmetic/0404-000-Luxio-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0404--000--Luxio--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0404-000-Luxio-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0405--000--Luxray--Female.gif b/src/canonical/models/back-shiny-cosmetic/0405-000-Luxray-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0405--000--Luxray--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0405-000-Luxray-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0407--000--Roserade--Female.gif b/src/canonical/models/back-shiny-cosmetic/0407-000-Roserade-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0407--000--Roserade--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0407-000-Roserade-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0412--420--Burmy--Sandy.gif b/src/canonical/models/back-shiny-cosmetic/0412-420-Burmy-Sandy.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0412--420--Burmy--Sandy.gif
rename to src/canonical/models/back-shiny-cosmetic/0412-420-Burmy-Sandy.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0412--420--Burmy--Trash.gif b/src/canonical/models/back-shiny-cosmetic/0412-420-Burmy-Trash.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0412--420--Burmy--Trash.gif
rename to src/canonical/models/back-shiny-cosmetic/0412-420-Burmy-Trash.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0419--000--Floatzel--Female.gif b/src/canonical/models/back-shiny-cosmetic/0419-000-Floatzel-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0419--000--Floatzel--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0419-000-Floatzel-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0422--420--Shellos--East.gif b/src/canonical/models/back-shiny-cosmetic/0422-420-Shellos-East.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0422--420--Shellos--East.gif
rename to src/canonical/models/back-shiny-cosmetic/0422-420-Shellos-East.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0423--420--Gastrodon--East.gif b/src/canonical/models/back-shiny-cosmetic/0423-420-Gastrodon-East.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0423--420--Gastrodon--East.gif
rename to src/canonical/models/back-shiny-cosmetic/0423-420-Gastrodon-East.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0424--000--Ambipom--Female.gif b/src/canonical/models/back-shiny-cosmetic/0424-000-Ambipom-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0424--000--Ambipom--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0424-000-Ambipom-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0443--000--Gible--Female.gif b/src/canonical/models/back-shiny-cosmetic/0443-000-Gible-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0443--000--Gible--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0443-000-Gible-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0444--000--Gabite--Female.gif b/src/canonical/models/back-shiny-cosmetic/0444-000-Gabite-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0444--000--Gabite--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0444-000-Gabite-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0445--000--Garchomp--Female.gif b/src/canonical/models/back-shiny-cosmetic/0445-000-Garchomp-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0445--000--Garchomp--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0445-000-Garchomp-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0449--000--Hippopotas--Female.gif b/src/canonical/models/back-shiny-cosmetic/0449-000-Hippopotas-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0449--000--Hippopotas--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0449-000-Hippopotas-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0450--000--Hippowdon--Female.gif b/src/canonical/models/back-shiny-cosmetic/0450-000-Hippowdon-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0450--000--Hippowdon--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0450-000-Hippowdon-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0454--000--Toxicroak--Female.gif b/src/canonical/models/back-shiny-cosmetic/0454-000-Toxicroak-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0454--000--Toxicroak--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0454-000-Toxicroak-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0456--000--Finneon--Female.gif b/src/canonical/models/back-shiny-cosmetic/0456-000-Finneon-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0456--000--Finneon--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0456-000-Finneon-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0457--000--Lumineon--Female.gif b/src/canonical/models/back-shiny-cosmetic/0457-000-Lumineon-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0457--000--Lumineon--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0457-000-Lumineon-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0461--000--Weavile--Female.gif b/src/canonical/models/back-shiny-cosmetic/0461-000-Weavile-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0461--000--Weavile--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0461-000-Weavile-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0464--000--Rhyperior--Female.gif b/src/canonical/models/back-shiny-cosmetic/0464-000-Rhyperior-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0464--000--Rhyperior--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0464-000-Rhyperior-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0465--000--Tangrowth--Female.gif b/src/canonical/models/back-shiny-cosmetic/0465-000-Tangrowth-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0465--000--Tangrowth--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0465-000-Tangrowth-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0473--000--Mamoswine--Female.gif b/src/canonical/models/back-shiny-cosmetic/0473-000-Mamoswine-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0473--000--Mamoswine--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0473-000-Mamoswine-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0521--000--Unfezant--Female.gif b/src/canonical/models/back-shiny-cosmetic/0521-000-Unfezant-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0521--000--Unfezant--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0521-000-Unfezant-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0550--420--Basculin--Blue.gif b/src/canonical/models/back-shiny-cosmetic/0550-420-Basculin-Blue.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0550--420--Basculin--Blue.gif
rename to src/canonical/models/back-shiny-cosmetic/0550-420-Basculin-Blue.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0585--420--Deerling--Autumn.gif b/src/canonical/models/back-shiny-cosmetic/0585-420-Deerling-Autumn.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0585--420--Deerling--Autumn.gif
rename to src/canonical/models/back-shiny-cosmetic/0585-420-Deerling-Autumn.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0585--420--Deerling--Summer.gif b/src/canonical/models/back-shiny-cosmetic/0585-420-Deerling-Summer.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0585--420--Deerling--Summer.gif
rename to src/canonical/models/back-shiny-cosmetic/0585-420-Deerling-Summer.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0585--420--Deerling--Winter.gif b/src/canonical/models/back-shiny-cosmetic/0585-420-Deerling-Winter.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0585--420--Deerling--Winter.gif
rename to src/canonical/models/back-shiny-cosmetic/0585-420-Deerling-Winter.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0586--420--Sawsbuck--Autumn.gif b/src/canonical/models/back-shiny-cosmetic/0586-420-Sawsbuck-Autumn.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0586--420--Sawsbuck--Autumn.gif
rename to src/canonical/models/back-shiny-cosmetic/0586-420-Sawsbuck-Autumn.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0586--420--Sawsbuck--Summer.gif b/src/canonical/models/back-shiny-cosmetic/0586-420-Sawsbuck-Summer.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0586--420--Sawsbuck--Summer.gif
rename to src/canonical/models/back-shiny-cosmetic/0586-420-Sawsbuck-Summer.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0586--420--Sawsbuck--Winter.gif b/src/canonical/models/back-shiny-cosmetic/0586-420-Sawsbuck-Winter.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0586--420--Sawsbuck--Winter.gif
rename to src/canonical/models/back-shiny-cosmetic/0586-420-Sawsbuck-Winter.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0592--000--Frillish--Female.gif b/src/canonical/models/back-shiny-cosmetic/0592-000-Frillish-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0592--000--Frillish--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0592-000-Frillish-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0593--000--Jellicent--Female.gif b/src/canonical/models/back-shiny-cosmetic/0593-000-Jellicent-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0593--000--Jellicent--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0593-000-Jellicent-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Archipelago.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Archipelago.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Archipelago.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Archipelago.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Continental.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Continental.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Continental.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Continental.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Elegant.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Elegant.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Elegant.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Elegant.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Garden.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Garden.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Garden.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Garden.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--High_Plains.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-High_Plains.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--High_Plains.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-High_Plains.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Icy_Snow.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Icy_Snow.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Icy_Snow.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Icy_Snow.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Jungle.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Jungle.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Jungle.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Jungle.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Marine.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Marine.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Marine.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Marine.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Modern.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Modern.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Modern.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Modern.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Monsoon.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Monsoon.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Monsoon.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Monsoon.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Ocean.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Ocean.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Ocean.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Ocean.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Polar.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Polar.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Polar.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Polar.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--River.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-River.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--River.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-River.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Sandstorm.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Sandstorm.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Sandstorm.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Sandstorm.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Savanna.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Savanna.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Savanna.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Savanna.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Sun.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Sun.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Sun.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Sun.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Tundra.gif b/src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Tundra.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0666--420--Vivillon--Tundra.gif
rename to src/canonical/models/back-shiny-cosmetic/0666-420-Vivillon-Tundra.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0668--000--Pyroar--Female.gif b/src/canonical/models/back-shiny-cosmetic/0668-000-Pyroar-Female.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0668--000--Pyroar--Female.gif
rename to src/canonical/models/back-shiny-cosmetic/0668-000-Pyroar-Female.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0669--420--Flabe__0301be__0301--Blue.gif b/src/canonical/models/back-shiny-cosmetic/0669-420-Flabe__0301be__0301-Blue.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0669--420--Flabe__0301be__0301--Blue.gif
rename to src/canonical/models/back-shiny-cosmetic/0669-420-Flabe__0301be__0301-Blue.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0669--420--Flabe__0301be__0301--Orange.gif b/src/canonical/models/back-shiny-cosmetic/0669-420-Flabe__0301be__0301-Orange.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0669--420--Flabe__0301be__0301--Orange.gif
rename to src/canonical/models/back-shiny-cosmetic/0669-420-Flabe__0301be__0301-Orange.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0669--420--Flabe__0301be__0301--White.gif b/src/canonical/models/back-shiny-cosmetic/0669-420-Flabe__0301be__0301-White.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0669--420--Flabe__0301be__0301--White.gif
rename to src/canonical/models/back-shiny-cosmetic/0669-420-Flabe__0301be__0301-White.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0669--420--Flabe__0301be__0301--Yellow.gif b/src/canonical/models/back-shiny-cosmetic/0669-420-Flabe__0301be__0301-Yellow.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0669--420--Flabe__0301be__0301--Yellow.gif
rename to src/canonical/models/back-shiny-cosmetic/0669-420-Flabe__0301be__0301-Yellow.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0670--420--Floette--Blue.gif b/src/canonical/models/back-shiny-cosmetic/0670-420-Floette-Blue.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0670--420--Floette--Blue.gif
rename to src/canonical/models/back-shiny-cosmetic/0670-420-Floette-Blue.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0670--420--Floette--Orange.gif b/src/canonical/models/back-shiny-cosmetic/0670-420-Floette-Orange.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0670--420--Floette--Orange.gif
rename to src/canonical/models/back-shiny-cosmetic/0670-420-Floette-Orange.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0670--420--Floette--White.gif b/src/canonical/models/back-shiny-cosmetic/0670-420-Floette-White.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0670--420--Floette--White.gif
rename to src/canonical/models/back-shiny-cosmetic/0670-420-Floette-White.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0670--420--Floette--Yellow.gif b/src/canonical/models/back-shiny-cosmetic/0670-420-Floette-Yellow.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0670--420--Floette--Yellow.gif
rename to src/canonical/models/back-shiny-cosmetic/0670-420-Floette-Yellow.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0671--420--Florges--Blue.gif b/src/canonical/models/back-shiny-cosmetic/0671-420-Florges-Blue.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0671--420--Florges--Blue.gif
rename to src/canonical/models/back-shiny-cosmetic/0671-420-Florges-Blue.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0671--420--Florges--Orange.gif b/src/canonical/models/back-shiny-cosmetic/0671-420-Florges-Orange.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0671--420--Florges--Orange.gif
rename to src/canonical/models/back-shiny-cosmetic/0671-420-Florges-Orange.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0671--420--Florges--White.gif b/src/canonical/models/back-shiny-cosmetic/0671-420-Florges-White.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0671--420--Florges--White.gif
rename to src/canonical/models/back-shiny-cosmetic/0671-420-Florges-White.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0671--420--Florges--Yellow.gif b/src/canonical/models/back-shiny-cosmetic/0671-420-Florges-Yellow.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0671--420--Florges--Yellow.gif
rename to src/canonical/models/back-shiny-cosmetic/0671-420-Florges-Yellow.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Dandy.gif b/src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Dandy.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Dandy.gif
rename to src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Dandy.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Debutante.gif b/src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Debutante.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Debutante.gif
rename to src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Debutante.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Diamond.gif b/src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Diamond.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Diamond.gif
rename to src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Diamond.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Heart.gif b/src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Heart.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Heart.gif
rename to src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Heart.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Kabuki.gif b/src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Kabuki.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Kabuki.gif
rename to src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Kabuki.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--La_Reine.gif b/src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-La_Reine.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--La_Reine.gif
rename to src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-La_Reine.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Matron.gif b/src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Matron.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Matron.gif
rename to src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Matron.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Pharaoh.gif b/src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Pharaoh.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Pharaoh.gif
rename to src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Pharaoh.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Star.gif b/src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Star.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0676--420--Furfrou--Star.gif
rename to src/canonical/models/back-shiny-cosmetic/0676-420-Furfrou-Star.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0774--420--Minior--Blue.gif b/src/canonical/models/back-shiny-cosmetic/0774-420-Minior-Blue.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0774--420--Minior--Blue.gif
rename to src/canonical/models/back-shiny-cosmetic/0774-420-Minior-Blue.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0774--420--Minior--Green.gif b/src/canonical/models/back-shiny-cosmetic/0774-420-Minior-Green.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0774--420--Minior--Green.gif
rename to src/canonical/models/back-shiny-cosmetic/0774-420-Minior-Green.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0774--420--Minior--Indigo.gif b/src/canonical/models/back-shiny-cosmetic/0774-420-Minior-Indigo.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0774--420--Minior--Indigo.gif
rename to src/canonical/models/back-shiny-cosmetic/0774-420-Minior-Indigo.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0774--420--Minior--Meteor.gif b/src/canonical/models/back-shiny-cosmetic/0774-420-Minior-Meteor.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0774--420--Minior--Meteor.gif
rename to src/canonical/models/back-shiny-cosmetic/0774-420-Minior-Meteor.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0774--420--Minior--Orange.gif b/src/canonical/models/back-shiny-cosmetic/0774-420-Minior-Orange.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0774--420--Minior--Orange.gif
rename to src/canonical/models/back-shiny-cosmetic/0774-420-Minior-Orange.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0774--420--Minior--Violet.gif b/src/canonical/models/back-shiny-cosmetic/0774-420-Minior-Violet.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0774--420--Minior--Violet.gif
rename to src/canonical/models/back-shiny-cosmetic/0774-420-Minior-Violet.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0774--420--Minior--Yellow.gif b/src/canonical/models/back-shiny-cosmetic/0774-420-Minior-Yellow.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0774--420--Minior--Yellow.gif
rename to src/canonical/models/back-shiny-cosmetic/0774-420-Minior-Yellow.gif
diff --git a/src/canonical/models/back-shiny-cosmetic/0801--420--Magearna--Original.gif b/src/canonical/models/back-shiny-cosmetic/0801-420-Magearna-Original.gif
similarity index 100%
rename from src/canonical/models/back-shiny-cosmetic/0801--420--Magearna--Original.gif
rename to src/canonical/models/back-shiny-cosmetic/0801-420-Magearna-Original.gif
diff --git a/src/canonical/models/back-shiny/0001--000--Bulbasaur.gif b/src/canonical/models/back-shiny/0001-000-Bulbasaur.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0001--000--Bulbasaur.gif
rename to src/canonical/models/back-shiny/0001-000-Bulbasaur.gif
diff --git a/src/canonical/models/back-shiny/0002--000--Ivysaur.gif b/src/canonical/models/back-shiny/0002-000-Ivysaur.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0002--000--Ivysaur.gif
rename to src/canonical/models/back-shiny/0002-000-Ivysaur.gif
diff --git a/src/canonical/models/back-shiny/0003--000--Venusaur.gif b/src/canonical/models/back-shiny/0003-000-Venusaur.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0003--000--Venusaur.gif
rename to src/canonical/models/back-shiny/0003-000-Venusaur.gif
diff --git a/src/canonical/models/back-shiny/0003--420--Venusaur--Mega.gif b/src/canonical/models/back-shiny/0003-420-Venusaur-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0003--420--Venusaur--Mega.gif
rename to src/canonical/models/back-shiny/0003-420-Venusaur-Mega.gif
diff --git a/src/canonical/models/back-shiny/0004--000--Charmander.gif b/src/canonical/models/back-shiny/0004-000-Charmander.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0004--000--Charmander.gif
rename to src/canonical/models/back-shiny/0004-000-Charmander.gif
diff --git a/src/canonical/models/back-shiny/0005--000--Charmeleon.gif b/src/canonical/models/back-shiny/0005-000-Charmeleon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0005--000--Charmeleon.gif
rename to src/canonical/models/back-shiny/0005-000-Charmeleon.gif
diff --git a/src/canonical/models/back-shiny/0006--000--Charizard.gif b/src/canonical/models/back-shiny/0006-000-Charizard.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0006--000--Charizard.gif
rename to src/canonical/models/back-shiny/0006-000-Charizard.gif
diff --git a/src/canonical/models/back-shiny/0006--420--Charizard--Gmax.gif b/src/canonical/models/back-shiny/0006-420-Charizard-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0006--420--Charizard--Gmax.gif
rename to src/canonical/models/back-shiny/0006-420-Charizard-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0006--420--Charizard--Mega-X.gif b/src/canonical/models/back-shiny/0006-420-Charizard-Mega~X.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0006--420--Charizard--Mega-X.gif
rename to src/canonical/models/back-shiny/0006-420-Charizard-Mega~X.gif
diff --git a/src/canonical/models/back-shiny/0006--420--Charizard--Mega-Y.gif b/src/canonical/models/back-shiny/0006-420-Charizard-Mega~Y.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0006--420--Charizard--Mega-Y.gif
rename to src/canonical/models/back-shiny/0006-420-Charizard-Mega~Y.gif
diff --git a/src/canonical/models/back-shiny/0007--000--Squirtle.gif b/src/canonical/models/back-shiny/0007-000-Squirtle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0007--000--Squirtle.gif
rename to src/canonical/models/back-shiny/0007-000-Squirtle.gif
diff --git a/src/canonical/models/back-shiny/0008--000--Wartortle.gif b/src/canonical/models/back-shiny/0008-000-Wartortle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0008--000--Wartortle.gif
rename to src/canonical/models/back-shiny/0008-000-Wartortle.gif
diff --git a/src/canonical/models/back-shiny/0009--000--Blastoise.gif b/src/canonical/models/back-shiny/0009-000-Blastoise.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0009--000--Blastoise.gif
rename to src/canonical/models/back-shiny/0009-000-Blastoise.gif
diff --git a/src/canonical/models/back-shiny/0009--420--Blastoise--Mega.gif b/src/canonical/models/back-shiny/0009-420-Blastoise-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0009--420--Blastoise--Mega.gif
rename to src/canonical/models/back-shiny/0009-420-Blastoise-Mega.gif
diff --git a/src/canonical/models/back-shiny/0010--000--Caterpie.gif b/src/canonical/models/back-shiny/0010-000-Caterpie.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0010--000--Caterpie.gif
rename to src/canonical/models/back-shiny/0010-000-Caterpie.gif
diff --git a/src/canonical/models/back-shiny/0011--000--Metapod.gif b/src/canonical/models/back-shiny/0011-000-Metapod.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0011--000--Metapod.gif
rename to src/canonical/models/back-shiny/0011-000-Metapod.gif
diff --git a/src/canonical/models/back-shiny/0012--000--Butterfree.gif b/src/canonical/models/back-shiny/0012-000-Butterfree.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0012--000--Butterfree.gif
rename to src/canonical/models/back-shiny/0012-000-Butterfree.gif
diff --git a/src/canonical/models/back-shiny/0012--420--Butterfree--Gmax.gif b/src/canonical/models/back-shiny/0012-420-Butterfree-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0012--420--Butterfree--Gmax.gif
rename to src/canonical/models/back-shiny/0012-420-Butterfree-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0013--000--Weedle.gif b/src/canonical/models/back-shiny/0013-000-Weedle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0013--000--Weedle.gif
rename to src/canonical/models/back-shiny/0013-000-Weedle.gif
diff --git a/src/canonical/models/back-shiny/0014--000--Kakuna.gif b/src/canonical/models/back-shiny/0014-000-Kakuna.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0014--000--Kakuna.gif
rename to src/canonical/models/back-shiny/0014-000-Kakuna.gif
diff --git a/src/canonical/models/back-shiny/0015--000--Beedrill.gif b/src/canonical/models/back-shiny/0015-000-Beedrill.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0015--000--Beedrill.gif
rename to src/canonical/models/back-shiny/0015-000-Beedrill.gif
diff --git a/src/canonical/models/back-shiny/0015--420--Beedrill--Mega.gif b/src/canonical/models/back-shiny/0015-420-Beedrill-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0015--420--Beedrill--Mega.gif
rename to src/canonical/models/back-shiny/0015-420-Beedrill-Mega.gif
diff --git a/src/canonical/models/back-shiny/0016--000--Pidgey.gif b/src/canonical/models/back-shiny/0016-000-Pidgey.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0016--000--Pidgey.gif
rename to src/canonical/models/back-shiny/0016-000-Pidgey.gif
diff --git a/src/canonical/models/back-shiny/0017--000--Pidgeotto.gif b/src/canonical/models/back-shiny/0017-000-Pidgeotto.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0017--000--Pidgeotto.gif
rename to src/canonical/models/back-shiny/0017-000-Pidgeotto.gif
diff --git a/src/canonical/models/back-shiny/0018--000--Pidgeot.gif b/src/canonical/models/back-shiny/0018-000-Pidgeot.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0018--000--Pidgeot.gif
rename to src/canonical/models/back-shiny/0018-000-Pidgeot.gif
diff --git a/src/canonical/models/back-shiny/0018--420--Pidgeot--Mega.gif b/src/canonical/models/back-shiny/0018-420-Pidgeot-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0018--420--Pidgeot--Mega.gif
rename to src/canonical/models/back-shiny/0018-420-Pidgeot-Mega.gif
diff --git a/src/canonical/models/back-shiny/0019--000--Rattata.gif b/src/canonical/models/back-shiny/0019-000-Rattata.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0019--000--Rattata.gif
rename to src/canonical/models/back-shiny/0019-000-Rattata.gif
diff --git a/src/canonical/models/back-shiny/0019--420--Rattata--Alola.gif b/src/canonical/models/back-shiny/0019-420-Rattata-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0019--420--Rattata--Alola.gif
rename to src/canonical/models/back-shiny/0019-420-Rattata-Alola.gif
diff --git a/src/canonical/models/back-shiny/0020--000--Raticate.gif b/src/canonical/models/back-shiny/0020-000-Raticate.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0020--000--Raticate.gif
rename to src/canonical/models/back-shiny/0020-000-Raticate.gif
diff --git a/src/canonical/models/back-shiny/0020--420--Raticate--Alola.gif b/src/canonical/models/back-shiny/0020-420-Raticate-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0020--420--Raticate--Alola.gif
rename to src/canonical/models/back-shiny/0020-420-Raticate-Alola.gif
diff --git a/src/canonical/models/back-shiny/0020--420--Raticate--Alola-Totem.gif b/src/canonical/models/back-shiny/0020-420-Raticate-Alola~Totem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0020--420--Raticate--Alola-Totem.gif
rename to src/canonical/models/back-shiny/0020-420-Raticate-Alola~Totem.gif
diff --git a/src/canonical/models/back-shiny/0021--000--Spearow.gif b/src/canonical/models/back-shiny/0021-000-Spearow.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0021--000--Spearow.gif
rename to src/canonical/models/back-shiny/0021-000-Spearow.gif
diff --git a/src/canonical/models/back-shiny/0022--000--Fearow.gif b/src/canonical/models/back-shiny/0022-000-Fearow.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0022--000--Fearow.gif
rename to src/canonical/models/back-shiny/0022-000-Fearow.gif
diff --git a/src/canonical/models/back-shiny/0023--000--Ekans.gif b/src/canonical/models/back-shiny/0023-000-Ekans.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0023--000--Ekans.gif
rename to src/canonical/models/back-shiny/0023-000-Ekans.gif
diff --git a/src/canonical/models/back-shiny/0024--000--Arbok.gif b/src/canonical/models/back-shiny/0024-000-Arbok.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0024--000--Arbok.gif
rename to src/canonical/models/back-shiny/0024-000-Arbok.gif
diff --git a/src/canonical/models/back-shiny/0025--420--Pikachu--Alola.gif b/src/canonical/models/back-shiny/0025--420--Pikachu--Alola.gif
deleted file mode 120000
index 2136df94..00000000
--- a/src/canonical/models/back-shiny/0025--420--Pikachu--Alola.gif
+++ /dev/null
@@ -1 +0,0 @@
-../back/0025--420--Pikachu--Alola.gif
\ No newline at end of file
diff --git a/src/canonical/models/back-shiny/0025--420--Pikachu--Hoenn.gif b/src/canonical/models/back-shiny/0025--420--Pikachu--Hoenn.gif
deleted file mode 120000
index 91050922..00000000
--- a/src/canonical/models/back-shiny/0025--420--Pikachu--Hoenn.gif
+++ /dev/null
@@ -1 +0,0 @@
-../back/0025--420--Pikachu--Hoenn.gif
\ No newline at end of file
diff --git a/src/canonical/models/back-shiny/0025--420--Pikachu--Kalos.gif b/src/canonical/models/back-shiny/0025--420--Pikachu--Kalos.gif
deleted file mode 120000
index c2d2601c..00000000
--- a/src/canonical/models/back-shiny/0025--420--Pikachu--Kalos.gif
+++ /dev/null
@@ -1 +0,0 @@
-../back/0025--420--Pikachu--Kalos.gif
\ No newline at end of file
diff --git a/src/canonical/models/back-shiny/0025--420--Pikachu--Sinnoh.gif b/src/canonical/models/back-shiny/0025--420--Pikachu--Sinnoh.gif
deleted file mode 120000
index b6218a27..00000000
--- a/src/canonical/models/back-shiny/0025--420--Pikachu--Sinnoh.gif
+++ /dev/null
@@ -1 +0,0 @@
-../back/0025--420--Pikachu--Sinnoh.gif
\ No newline at end of file
diff --git a/src/canonical/models/back-shiny/0025--420--Pikachu--Unova.gif b/src/canonical/models/back-shiny/0025--420--Pikachu--Unova.gif
deleted file mode 120000
index b5c2e345..00000000
--- a/src/canonical/models/back-shiny/0025--420--Pikachu--Unova.gif
+++ /dev/null
@@ -1 +0,0 @@
-../back/0025--420--Pikachu--Unova.gif
\ No newline at end of file
diff --git a/src/canonical/models/back-shiny/0025--000--Pikachu.gif b/src/canonical/models/back-shiny/0025-000-Pikachu.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0025--000--Pikachu.gif
rename to src/canonical/models/back-shiny/0025-000-Pikachu.gif
diff --git a/src/canonical/models/back-shiny/0025-420-Pikachu-Alola.gif b/src/canonical/models/back-shiny/0025-420-Pikachu-Alola.gif
new file mode 120000
index 00000000..96acf09e
--- /dev/null
+++ b/src/canonical/models/back-shiny/0025-420-Pikachu-Alola.gif
@@ -0,0 +1 @@
+../back/0025-420-Pikachu-Alola.gif
\ No newline at end of file
diff --git a/src/canonical/models/back-shiny/0025--420--Pikachu--Belle.gif b/src/canonical/models/back-shiny/0025-420-Pikachu-Belle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0025--420--Pikachu--Belle.gif
rename to src/canonical/models/back-shiny/0025-420-Pikachu-Belle.gif
diff --git a/src/canonical/models/back-shiny/0025--420--Pikachu--Cosplay.gif b/src/canonical/models/back-shiny/0025-420-Pikachu-Cosplay.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0025--420--Pikachu--Cosplay.gif
rename to src/canonical/models/back-shiny/0025-420-Pikachu-Cosplay.gif
diff --git a/src/canonical/models/back-shiny/0025--420--Pikachu--Gmax.gif b/src/canonical/models/back-shiny/0025-420-Pikachu-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0025--420--Pikachu--Gmax.gif
rename to src/canonical/models/back-shiny/0025-420-Pikachu-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0025-420-Pikachu-Hoenn.gif b/src/canonical/models/back-shiny/0025-420-Pikachu-Hoenn.gif
new file mode 120000
index 00000000..269c3629
--- /dev/null
+++ b/src/canonical/models/back-shiny/0025-420-Pikachu-Hoenn.gif
@@ -0,0 +1 @@
+../back/0025-420-Pikachu-Hoenn.gif
\ No newline at end of file
diff --git a/src/canonical/models/back-shiny/0025-420-Pikachu-Kalos.gif b/src/canonical/models/back-shiny/0025-420-Pikachu-Kalos.gif
new file mode 120000
index 00000000..a23a2f82
--- /dev/null
+++ b/src/canonical/models/back-shiny/0025-420-Pikachu-Kalos.gif
@@ -0,0 +1 @@
+../back/0025-420-Pikachu-Kalos.gif
\ No newline at end of file
diff --git a/src/canonical/models/back-shiny/0025--420--Pikachu--Partner.gif b/src/canonical/models/back-shiny/0025-420-Pikachu-Partner.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0025--420--Pikachu--Partner.gif
rename to src/canonical/models/back-shiny/0025-420-Pikachu-Partner.gif
diff --git a/src/canonical/models/back-shiny/0025--420--Pikachu--PhD.gif b/src/canonical/models/back-shiny/0025-420-Pikachu-PhD.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0025--420--Pikachu--PhD.gif
rename to src/canonical/models/back-shiny/0025-420-Pikachu-PhD.gif
diff --git a/src/canonical/models/back-shiny/0025--420--Pikachu--Pop-Star.gif b/src/canonical/models/back-shiny/0025-420-Pikachu-Pop~Star.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0025--420--Pikachu--Pop-Star.gif
rename to src/canonical/models/back-shiny/0025-420-Pikachu-Pop~Star.gif
diff --git a/src/canonical/models/back-shiny/0025--420--Pikachu--Rock-Star.gif b/src/canonical/models/back-shiny/0025-420-Pikachu-Rock~Star.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0025--420--Pikachu--Rock-Star.gif
rename to src/canonical/models/back-shiny/0025-420-Pikachu-Rock~Star.gif
diff --git a/src/canonical/models/back-shiny/0025-420-Pikachu-Sinnoh.gif b/src/canonical/models/back-shiny/0025-420-Pikachu-Sinnoh.gif
new file mode 120000
index 00000000..ad81fe80
--- /dev/null
+++ b/src/canonical/models/back-shiny/0025-420-Pikachu-Sinnoh.gif
@@ -0,0 +1 @@
+../back/0025-420-Pikachu-Sinnoh.gif
\ No newline at end of file
diff --git a/src/canonical/models/back-shiny/0025-420-Pikachu-Unova.gif b/src/canonical/models/back-shiny/0025-420-Pikachu-Unova.gif
new file mode 120000
index 00000000..915b9bdb
--- /dev/null
+++ b/src/canonical/models/back-shiny/0025-420-Pikachu-Unova.gif
@@ -0,0 +1 @@
+../back/0025-420-Pikachu-Unova.gif
\ No newline at end of file
diff --git a/src/canonical/models/back-shiny/0026--000--Raichu.gif b/src/canonical/models/back-shiny/0026-000-Raichu.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0026--000--Raichu.gif
rename to src/canonical/models/back-shiny/0026-000-Raichu.gif
diff --git a/src/canonical/models/back-shiny/0026--420--Raichu--Alola.gif b/src/canonical/models/back-shiny/0026-420-Raichu-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0026--420--Raichu--Alola.gif
rename to src/canonical/models/back-shiny/0026-420-Raichu-Alola.gif
diff --git a/src/canonical/models/back-shiny/0027--000--Sandshrew.gif b/src/canonical/models/back-shiny/0027-000-Sandshrew.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0027--000--Sandshrew.gif
rename to src/canonical/models/back-shiny/0027-000-Sandshrew.gif
diff --git a/src/canonical/models/back-shiny/0027--420--Sandshrew--Alola.gif b/src/canonical/models/back-shiny/0027-420-Sandshrew-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0027--420--Sandshrew--Alola.gif
rename to src/canonical/models/back-shiny/0027-420-Sandshrew-Alola.gif
diff --git a/src/canonical/models/back-shiny/0028--000--Sandslash.gif b/src/canonical/models/back-shiny/0028-000-Sandslash.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0028--000--Sandslash.gif
rename to src/canonical/models/back-shiny/0028-000-Sandslash.gif
diff --git a/src/canonical/models/back-shiny/0028--420--Sandslash--Alola.gif b/src/canonical/models/back-shiny/0028-420-Sandslash-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0028--420--Sandslash--Alola.gif
rename to src/canonical/models/back-shiny/0028-420-Sandslash-Alola.gif
diff --git a/src/canonical/models/back-shiny/0029--000--Nidoran-F.gif b/src/canonical/models/back-shiny/0029-000-Nidoran~F.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0029--000--Nidoran-F.gif
rename to src/canonical/models/back-shiny/0029-000-Nidoran~F.gif
diff --git a/src/canonical/models/back-shiny/0030--000--Nidorina.gif b/src/canonical/models/back-shiny/0030-000-Nidorina.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0030--000--Nidorina.gif
rename to src/canonical/models/back-shiny/0030-000-Nidorina.gif
diff --git a/src/canonical/models/back-shiny/0031--000--Nidoqueen.gif b/src/canonical/models/back-shiny/0031-000-Nidoqueen.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0031--000--Nidoqueen.gif
rename to src/canonical/models/back-shiny/0031-000-Nidoqueen.gif
diff --git a/src/canonical/models/back-shiny/0032--000--Nidoran-M.gif b/src/canonical/models/back-shiny/0032-000-Nidoran~M.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0032--000--Nidoran-M.gif
rename to src/canonical/models/back-shiny/0032-000-Nidoran~M.gif
diff --git a/src/canonical/models/back-shiny/0033--000--Nidorino.gif b/src/canonical/models/back-shiny/0033-000-Nidorino.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0033--000--Nidorino.gif
rename to src/canonical/models/back-shiny/0033-000-Nidorino.gif
diff --git a/src/canonical/models/back-shiny/0034--000--Nidoking.gif b/src/canonical/models/back-shiny/0034-000-Nidoking.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0034--000--Nidoking.gif
rename to src/canonical/models/back-shiny/0034-000-Nidoking.gif
diff --git a/src/canonical/models/back-shiny/0035--000--Clefairy.gif b/src/canonical/models/back-shiny/0035-000-Clefairy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0035--000--Clefairy.gif
rename to src/canonical/models/back-shiny/0035-000-Clefairy.gif
diff --git a/src/canonical/models/back-shiny/0036--000--Clefable.gif b/src/canonical/models/back-shiny/0036-000-Clefable.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0036--000--Clefable.gif
rename to src/canonical/models/back-shiny/0036-000-Clefable.gif
diff --git a/src/canonical/models/back-shiny/0037--000--Vulpix.gif b/src/canonical/models/back-shiny/0037-000-Vulpix.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0037--000--Vulpix.gif
rename to src/canonical/models/back-shiny/0037-000-Vulpix.gif
diff --git a/src/canonical/models/back-shiny/0037--420--Vulpix--Alola.gif b/src/canonical/models/back-shiny/0037-420-Vulpix-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0037--420--Vulpix--Alola.gif
rename to src/canonical/models/back-shiny/0037-420-Vulpix-Alola.gif
diff --git a/src/canonical/models/back-shiny/0038--000--Ninetales.gif b/src/canonical/models/back-shiny/0038-000-Ninetales.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0038--000--Ninetales.gif
rename to src/canonical/models/back-shiny/0038-000-Ninetales.gif
diff --git a/src/canonical/models/back-shiny/0038--420--Ninetales--Alola.gif b/src/canonical/models/back-shiny/0038-420-Ninetales-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0038--420--Ninetales--Alola.gif
rename to src/canonical/models/back-shiny/0038-420-Ninetales-Alola.gif
diff --git a/src/canonical/models/back-shiny/0039--000--Jigglypuff.gif b/src/canonical/models/back-shiny/0039-000-Jigglypuff.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0039--000--Jigglypuff.gif
rename to src/canonical/models/back-shiny/0039-000-Jigglypuff.gif
diff --git a/src/canonical/models/back-shiny/0040--000--Wigglytuff.gif b/src/canonical/models/back-shiny/0040-000-Wigglytuff.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0040--000--Wigglytuff.gif
rename to src/canonical/models/back-shiny/0040-000-Wigglytuff.gif
diff --git a/src/canonical/models/back-shiny/0041--000--Zubat.gif b/src/canonical/models/back-shiny/0041-000-Zubat.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0041--000--Zubat.gif
rename to src/canonical/models/back-shiny/0041-000-Zubat.gif
diff --git a/src/canonical/models/back-shiny/0042--000--Golbat.gif b/src/canonical/models/back-shiny/0042-000-Golbat.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0042--000--Golbat.gif
rename to src/canonical/models/back-shiny/0042-000-Golbat.gif
diff --git a/src/canonical/models/back-shiny/0043--000--Oddish.gif b/src/canonical/models/back-shiny/0043-000-Oddish.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0043--000--Oddish.gif
rename to src/canonical/models/back-shiny/0043-000-Oddish.gif
diff --git a/src/canonical/models/back-shiny/0044--000--Gloom.gif b/src/canonical/models/back-shiny/0044-000-Gloom.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0044--000--Gloom.gif
rename to src/canonical/models/back-shiny/0044-000-Gloom.gif
diff --git a/src/canonical/models/back-shiny/0045--000--Vileplume.gif b/src/canonical/models/back-shiny/0045-000-Vileplume.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0045--000--Vileplume.gif
rename to src/canonical/models/back-shiny/0045-000-Vileplume.gif
diff --git a/src/canonical/models/back-shiny/0046--000--Paras.gif b/src/canonical/models/back-shiny/0046-000-Paras.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0046--000--Paras.gif
rename to src/canonical/models/back-shiny/0046-000-Paras.gif
diff --git a/src/canonical/models/back-shiny/0047--000--Parasect.gif b/src/canonical/models/back-shiny/0047-000-Parasect.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0047--000--Parasect.gif
rename to src/canonical/models/back-shiny/0047-000-Parasect.gif
diff --git a/src/canonical/models/back-shiny/0048--000--Venonat.gif b/src/canonical/models/back-shiny/0048-000-Venonat.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0048--000--Venonat.gif
rename to src/canonical/models/back-shiny/0048-000-Venonat.gif
diff --git a/src/canonical/models/back-shiny/0049--000--Venomoth.gif b/src/canonical/models/back-shiny/0049-000-Venomoth.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0049--000--Venomoth.gif
rename to src/canonical/models/back-shiny/0049-000-Venomoth.gif
diff --git a/src/canonical/models/back-shiny/0050--000--Diglett.gif b/src/canonical/models/back-shiny/0050-000-Diglett.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0050--000--Diglett.gif
rename to src/canonical/models/back-shiny/0050-000-Diglett.gif
diff --git a/src/canonical/models/back-shiny/0050--420--Diglett--Alola.gif b/src/canonical/models/back-shiny/0050-420-Diglett-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0050--420--Diglett--Alola.gif
rename to src/canonical/models/back-shiny/0050-420-Diglett-Alola.gif
diff --git a/src/canonical/models/back-shiny/0051--000--Dugtrio.gif b/src/canonical/models/back-shiny/0051-000-Dugtrio.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0051--000--Dugtrio.gif
rename to src/canonical/models/back-shiny/0051-000-Dugtrio.gif
diff --git a/src/canonical/models/back-shiny/0051--420--Dugtrio--Alola.gif b/src/canonical/models/back-shiny/0051-420-Dugtrio-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0051--420--Dugtrio--Alola.gif
rename to src/canonical/models/back-shiny/0051-420-Dugtrio-Alola.gif
diff --git a/src/canonical/models/back-shiny/0052--000--Meowth.gif b/src/canonical/models/back-shiny/0052-000-Meowth.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0052--000--Meowth.gif
rename to src/canonical/models/back-shiny/0052-000-Meowth.gif
diff --git a/src/canonical/models/back-shiny/0052--420--Meowth--Alola.gif b/src/canonical/models/back-shiny/0052-420-Meowth-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0052--420--Meowth--Alola.gif
rename to src/canonical/models/back-shiny/0052-420-Meowth-Alola.gif
diff --git a/src/canonical/models/back-shiny/0052--420--Meowth--Galar.gif b/src/canonical/models/back-shiny/0052-420-Meowth-Galar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0052--420--Meowth--Galar.gif
rename to src/canonical/models/back-shiny/0052-420-Meowth-Galar.gif
diff --git a/src/canonical/models/back-shiny/0052--420--Meowth--Gmax.gif b/src/canonical/models/back-shiny/0052-420-Meowth-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0052--420--Meowth--Gmax.gif
rename to src/canonical/models/back-shiny/0052-420-Meowth-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0053--000--Persian.gif b/src/canonical/models/back-shiny/0053-000-Persian.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0053--000--Persian.gif
rename to src/canonical/models/back-shiny/0053-000-Persian.gif
diff --git a/src/canonical/models/back-shiny/0053--420--Persian--Alola.gif b/src/canonical/models/back-shiny/0053-420-Persian-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0053--420--Persian--Alola.gif
rename to src/canonical/models/back-shiny/0053-420-Persian-Alola.gif
diff --git a/src/canonical/models/back-shiny/0054--000--Psyduck.gif b/src/canonical/models/back-shiny/0054-000-Psyduck.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0054--000--Psyduck.gif
rename to src/canonical/models/back-shiny/0054-000-Psyduck.gif
diff --git a/src/canonical/models/back-shiny/0055--000--Golduck.gif b/src/canonical/models/back-shiny/0055-000-Golduck.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0055--000--Golduck.gif
rename to src/canonical/models/back-shiny/0055-000-Golduck.gif
diff --git a/src/canonical/models/back-shiny/0056--000--Mankey.gif b/src/canonical/models/back-shiny/0056-000-Mankey.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0056--000--Mankey.gif
rename to src/canonical/models/back-shiny/0056-000-Mankey.gif
diff --git a/src/canonical/models/back-shiny/0057--000--Primeape.gif b/src/canonical/models/back-shiny/0057-000-Primeape.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0057--000--Primeape.gif
rename to src/canonical/models/back-shiny/0057-000-Primeape.gif
diff --git a/src/canonical/models/back-shiny/0058--000--Growlithe.gif b/src/canonical/models/back-shiny/0058-000-Growlithe.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0058--000--Growlithe.gif
rename to src/canonical/models/back-shiny/0058-000-Growlithe.gif
diff --git a/src/canonical/models/back-shiny/0059--000--Arcanine.gif b/src/canonical/models/back-shiny/0059-000-Arcanine.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0059--000--Arcanine.gif
rename to src/canonical/models/back-shiny/0059-000-Arcanine.gif
diff --git a/src/canonical/models/back-shiny/0060--000--Poliwag.gif b/src/canonical/models/back-shiny/0060-000-Poliwag.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0060--000--Poliwag.gif
rename to src/canonical/models/back-shiny/0060-000-Poliwag.gif
diff --git a/src/canonical/models/back-shiny/0061--000--Poliwhirl.gif b/src/canonical/models/back-shiny/0061-000-Poliwhirl.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0061--000--Poliwhirl.gif
rename to src/canonical/models/back-shiny/0061-000-Poliwhirl.gif
diff --git a/src/canonical/models/back-shiny/0062--000--Poliwrath.gif b/src/canonical/models/back-shiny/0062-000-Poliwrath.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0062--000--Poliwrath.gif
rename to src/canonical/models/back-shiny/0062-000-Poliwrath.gif
diff --git a/src/canonical/models/back-shiny/0063--000--Abra.gif b/src/canonical/models/back-shiny/0063-000-Abra.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0063--000--Abra.gif
rename to src/canonical/models/back-shiny/0063-000-Abra.gif
diff --git a/src/canonical/models/back-shiny/0064--000--Kadabra.gif b/src/canonical/models/back-shiny/0064-000-Kadabra.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0064--000--Kadabra.gif
rename to src/canonical/models/back-shiny/0064-000-Kadabra.gif
diff --git a/src/canonical/models/back-shiny/0065--000--Alakazam.gif b/src/canonical/models/back-shiny/0065-000-Alakazam.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0065--000--Alakazam.gif
rename to src/canonical/models/back-shiny/0065-000-Alakazam.gif
diff --git a/src/canonical/models/back-shiny/0065--420--Alakazam--Mega.gif b/src/canonical/models/back-shiny/0065-420-Alakazam-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0065--420--Alakazam--Mega.gif
rename to src/canonical/models/back-shiny/0065-420-Alakazam-Mega.gif
diff --git a/src/canonical/models/back-shiny/0066--000--Machop.gif b/src/canonical/models/back-shiny/0066-000-Machop.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0066--000--Machop.gif
rename to src/canonical/models/back-shiny/0066-000-Machop.gif
diff --git a/src/canonical/models/back-shiny/0067--000--Machoke.gif b/src/canonical/models/back-shiny/0067-000-Machoke.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0067--000--Machoke.gif
rename to src/canonical/models/back-shiny/0067-000-Machoke.gif
diff --git a/src/canonical/models/back-shiny/0068--000--Machamp.gif b/src/canonical/models/back-shiny/0068-000-Machamp.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0068--000--Machamp.gif
rename to src/canonical/models/back-shiny/0068-000-Machamp.gif
diff --git a/src/canonical/models/back-shiny/0068--420--Machamp--Gmax.gif b/src/canonical/models/back-shiny/0068-420-Machamp-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0068--420--Machamp--Gmax.gif
rename to src/canonical/models/back-shiny/0068-420-Machamp-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0069--000--Bellsprout.gif b/src/canonical/models/back-shiny/0069-000-Bellsprout.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0069--000--Bellsprout.gif
rename to src/canonical/models/back-shiny/0069-000-Bellsprout.gif
diff --git a/src/canonical/models/back-shiny/0070--000--Weepinbell.gif b/src/canonical/models/back-shiny/0070-000-Weepinbell.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0070--000--Weepinbell.gif
rename to src/canonical/models/back-shiny/0070-000-Weepinbell.gif
diff --git a/src/canonical/models/back-shiny/0071--000--Victreebel.gif b/src/canonical/models/back-shiny/0071-000-Victreebel.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0071--000--Victreebel.gif
rename to src/canonical/models/back-shiny/0071-000-Victreebel.gif
diff --git a/src/canonical/models/back-shiny/0072--000--Tentacool.gif b/src/canonical/models/back-shiny/0072-000-Tentacool.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0072--000--Tentacool.gif
rename to src/canonical/models/back-shiny/0072-000-Tentacool.gif
diff --git a/src/canonical/models/back-shiny/0073--000--Tentacruel.gif b/src/canonical/models/back-shiny/0073-000-Tentacruel.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0073--000--Tentacruel.gif
rename to src/canonical/models/back-shiny/0073-000-Tentacruel.gif
diff --git a/src/canonical/models/back-shiny/0074--000--Geodude.gif b/src/canonical/models/back-shiny/0074-000-Geodude.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0074--000--Geodude.gif
rename to src/canonical/models/back-shiny/0074-000-Geodude.gif
diff --git a/src/canonical/models/back-shiny/0074--420--Geodude--Alola.gif b/src/canonical/models/back-shiny/0074-420-Geodude-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0074--420--Geodude--Alola.gif
rename to src/canonical/models/back-shiny/0074-420-Geodude-Alola.gif
diff --git a/src/canonical/models/back-shiny/0075--000--Graveler.gif b/src/canonical/models/back-shiny/0075-000-Graveler.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0075--000--Graveler.gif
rename to src/canonical/models/back-shiny/0075-000-Graveler.gif
diff --git a/src/canonical/models/back-shiny/0075--420--Graveler--Alola.gif b/src/canonical/models/back-shiny/0075-420-Graveler-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0075--420--Graveler--Alola.gif
rename to src/canonical/models/back-shiny/0075-420-Graveler-Alola.gif
diff --git a/src/canonical/models/back-shiny/0076--000--Golem.gif b/src/canonical/models/back-shiny/0076-000-Golem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0076--000--Golem.gif
rename to src/canonical/models/back-shiny/0076-000-Golem.gif
diff --git a/src/canonical/models/back-shiny/0076--420--Golem--Alola.gif b/src/canonical/models/back-shiny/0076-420-Golem-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0076--420--Golem--Alola.gif
rename to src/canonical/models/back-shiny/0076-420-Golem-Alola.gif
diff --git a/src/canonical/models/back-shiny/0077--000--Ponyta.gif b/src/canonical/models/back-shiny/0077-000-Ponyta.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0077--000--Ponyta.gif
rename to src/canonical/models/back-shiny/0077-000-Ponyta.gif
diff --git a/src/canonical/models/back-shiny/0077--420--Ponyta--Galar.gif b/src/canonical/models/back-shiny/0077-420-Ponyta-Galar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0077--420--Ponyta--Galar.gif
rename to src/canonical/models/back-shiny/0077-420-Ponyta-Galar.gif
diff --git a/src/canonical/models/back-shiny/0078--000--Rapidash.gif b/src/canonical/models/back-shiny/0078-000-Rapidash.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0078--000--Rapidash.gif
rename to src/canonical/models/back-shiny/0078-000-Rapidash.gif
diff --git a/src/canonical/models/back-shiny/0078--420--Rapidash--Galar.gif b/src/canonical/models/back-shiny/0078-420-Rapidash-Galar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0078--420--Rapidash--Galar.gif
rename to src/canonical/models/back-shiny/0078-420-Rapidash-Galar.gif
diff --git a/src/canonical/models/back-shiny/0079--000--Slowpoke.gif b/src/canonical/models/back-shiny/0079-000-Slowpoke.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0079--000--Slowpoke.gif
rename to src/canonical/models/back-shiny/0079-000-Slowpoke.gif
diff --git a/src/canonical/models/back-shiny/0079--420--Slowpoke--Galar.gif b/src/canonical/models/back-shiny/0079-420-Slowpoke-Galar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0079--420--Slowpoke--Galar.gif
rename to src/canonical/models/back-shiny/0079-420-Slowpoke-Galar.gif
diff --git a/src/canonical/models/back-shiny/0080--000--Slowbro.gif b/src/canonical/models/back-shiny/0080-000-Slowbro.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0080--000--Slowbro.gif
rename to src/canonical/models/back-shiny/0080-000-Slowbro.gif
diff --git a/src/canonical/models/back-shiny/0080--420--Slowbro--Mega.gif b/src/canonical/models/back-shiny/0080-420-Slowbro-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0080--420--Slowbro--Mega.gif
rename to src/canonical/models/back-shiny/0080-420-Slowbro-Mega.gif
diff --git a/src/canonical/models/back-shiny/0081--000--Magnemite.gif b/src/canonical/models/back-shiny/0081-000-Magnemite.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0081--000--Magnemite.gif
rename to src/canonical/models/back-shiny/0081-000-Magnemite.gif
diff --git a/src/canonical/models/back-shiny/0082--000--Magneton.gif b/src/canonical/models/back-shiny/0082-000-Magneton.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0082--000--Magneton.gif
rename to src/canonical/models/back-shiny/0082-000-Magneton.gif
diff --git a/src/canonical/models/back-shiny/0083--000--Farfetch__0027d.gif b/src/canonical/models/back-shiny/0083-000-Farfetch__0027d.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0083--000--Farfetch__0027d.gif
rename to src/canonical/models/back-shiny/0083-000-Farfetch__0027d.gif
diff --git a/src/canonical/models/back-shiny/0083--420--Farfetch__0027d--Galar.gif b/src/canonical/models/back-shiny/0083-420-Farfetch__0027d-Galar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0083--420--Farfetch__0027d--Galar.gif
rename to src/canonical/models/back-shiny/0083-420-Farfetch__0027d-Galar.gif
diff --git a/src/canonical/models/back-shiny/0084--000--Doduo.gif b/src/canonical/models/back-shiny/0084-000-Doduo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0084--000--Doduo.gif
rename to src/canonical/models/back-shiny/0084-000-Doduo.gif
diff --git a/src/canonical/models/back-shiny/0085--000--Dodrio.gif b/src/canonical/models/back-shiny/0085-000-Dodrio.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0085--000--Dodrio.gif
rename to src/canonical/models/back-shiny/0085-000-Dodrio.gif
diff --git a/src/canonical/models/back-shiny/0086--000--Seel.gif b/src/canonical/models/back-shiny/0086-000-Seel.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0086--000--Seel.gif
rename to src/canonical/models/back-shiny/0086-000-Seel.gif
diff --git a/src/canonical/models/back-shiny/0087--000--Dewgong.gif b/src/canonical/models/back-shiny/0087-000-Dewgong.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0087--000--Dewgong.gif
rename to src/canonical/models/back-shiny/0087-000-Dewgong.gif
diff --git a/src/canonical/models/back-shiny/0088--000--Grimer.gif b/src/canonical/models/back-shiny/0088-000-Grimer.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0088--000--Grimer.gif
rename to src/canonical/models/back-shiny/0088-000-Grimer.gif
diff --git a/src/canonical/models/back-shiny/0088--420--Grimer--Alola.gif b/src/canonical/models/back-shiny/0088-420-Grimer-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0088--420--Grimer--Alola.gif
rename to src/canonical/models/back-shiny/0088-420-Grimer-Alola.gif
diff --git a/src/canonical/models/back-shiny/0089--000--Muk.gif b/src/canonical/models/back-shiny/0089-000-Muk.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0089--000--Muk.gif
rename to src/canonical/models/back-shiny/0089-000-Muk.gif
diff --git a/src/canonical/models/back-shiny/0089--420--Muk--Alola.gif b/src/canonical/models/back-shiny/0089-420-Muk-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0089--420--Muk--Alola.gif
rename to src/canonical/models/back-shiny/0089-420-Muk-Alola.gif
diff --git a/src/canonical/models/back-shiny/0090--000--Shellder.gif b/src/canonical/models/back-shiny/0090-000-Shellder.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0090--000--Shellder.gif
rename to src/canonical/models/back-shiny/0090-000-Shellder.gif
diff --git a/src/canonical/models/back-shiny/0091--000--Cloyster.gif b/src/canonical/models/back-shiny/0091-000-Cloyster.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0091--000--Cloyster.gif
rename to src/canonical/models/back-shiny/0091-000-Cloyster.gif
diff --git a/src/canonical/models/back-shiny/0092--000--Gastly.gif b/src/canonical/models/back-shiny/0092-000-Gastly.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0092--000--Gastly.gif
rename to src/canonical/models/back-shiny/0092-000-Gastly.gif
diff --git a/src/canonical/models/back-shiny/0093--000--Haunter.gif b/src/canonical/models/back-shiny/0093-000-Haunter.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0093--000--Haunter.gif
rename to src/canonical/models/back-shiny/0093-000-Haunter.gif
diff --git a/src/canonical/models/back-shiny/0094--000--Gengar.gif b/src/canonical/models/back-shiny/0094-000-Gengar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0094--000--Gengar.gif
rename to src/canonical/models/back-shiny/0094-000-Gengar.gif
diff --git a/src/canonical/models/back-shiny/0094--420--Gengar--Gmax.gif b/src/canonical/models/back-shiny/0094-420-Gengar-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0094--420--Gengar--Gmax.gif
rename to src/canonical/models/back-shiny/0094-420-Gengar-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0094--420--Gengar--Mega.gif b/src/canonical/models/back-shiny/0094-420-Gengar-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0094--420--Gengar--Mega.gif
rename to src/canonical/models/back-shiny/0094-420-Gengar-Mega.gif
diff --git a/src/canonical/models/back-shiny/0095--000--Onix.gif b/src/canonical/models/back-shiny/0095-000-Onix.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0095--000--Onix.gif
rename to src/canonical/models/back-shiny/0095-000-Onix.gif
diff --git a/src/canonical/models/back-shiny/0096--000--Drowzee.gif b/src/canonical/models/back-shiny/0096-000-Drowzee.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0096--000--Drowzee.gif
rename to src/canonical/models/back-shiny/0096-000-Drowzee.gif
diff --git a/src/canonical/models/back-shiny/0097--000--Hypno.gif b/src/canonical/models/back-shiny/0097-000-Hypno.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0097--000--Hypno.gif
rename to src/canonical/models/back-shiny/0097-000-Hypno.gif
diff --git a/src/canonical/models/back-shiny/0098--000--Krabby.gif b/src/canonical/models/back-shiny/0098-000-Krabby.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0098--000--Krabby.gif
rename to src/canonical/models/back-shiny/0098-000-Krabby.gif
diff --git a/src/canonical/models/back-shiny/0099--000--Kingler.gif b/src/canonical/models/back-shiny/0099-000-Kingler.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0099--000--Kingler.gif
rename to src/canonical/models/back-shiny/0099-000-Kingler.gif
diff --git a/src/canonical/models/back-shiny/0099--420--Kingler--Gmax.gif b/src/canonical/models/back-shiny/0099-420-Kingler-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0099--420--Kingler--Gmax.gif
rename to src/canonical/models/back-shiny/0099-420-Kingler-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0100--000--Voltorb.gif b/src/canonical/models/back-shiny/0100-000-Voltorb.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0100--000--Voltorb.gif
rename to src/canonical/models/back-shiny/0100-000-Voltorb.gif
diff --git a/src/canonical/models/back-shiny/0101--000--Electrode.gif b/src/canonical/models/back-shiny/0101-000-Electrode.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0101--000--Electrode.gif
rename to src/canonical/models/back-shiny/0101-000-Electrode.gif
diff --git a/src/canonical/models/back-shiny/0102--000--Exeggcute.gif b/src/canonical/models/back-shiny/0102-000-Exeggcute.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0102--000--Exeggcute.gif
rename to src/canonical/models/back-shiny/0102-000-Exeggcute.gif
diff --git a/src/canonical/models/back-shiny/0103--000--Exeggutor.gif b/src/canonical/models/back-shiny/0103-000-Exeggutor.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0103--000--Exeggutor.gif
rename to src/canonical/models/back-shiny/0103-000-Exeggutor.gif
diff --git a/src/canonical/models/back-shiny/0103--420--Exeggutor--Alola.gif b/src/canonical/models/back-shiny/0103-420-Exeggutor-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0103--420--Exeggutor--Alola.gif
rename to src/canonical/models/back-shiny/0103-420-Exeggutor-Alola.gif
diff --git a/src/canonical/models/back-shiny/0104--000--Cubone.gif b/src/canonical/models/back-shiny/0104-000-Cubone.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0104--000--Cubone.gif
rename to src/canonical/models/back-shiny/0104-000-Cubone.gif
diff --git a/src/canonical/models/back-shiny/0105--000--Marowak.gif b/src/canonical/models/back-shiny/0105-000-Marowak.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0105--000--Marowak.gif
rename to src/canonical/models/back-shiny/0105-000-Marowak.gif
diff --git a/src/canonical/models/back-shiny/0105--420--Marowak--Alola.gif b/src/canonical/models/back-shiny/0105-420-Marowak-Alola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0105--420--Marowak--Alola.gif
rename to src/canonical/models/back-shiny/0105-420-Marowak-Alola.gif
diff --git a/src/canonical/models/back-shiny/0105--420--Marowak--Alola-Totem.gif b/src/canonical/models/back-shiny/0105-420-Marowak-Alola~Totem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0105--420--Marowak--Alola-Totem.gif
rename to src/canonical/models/back-shiny/0105-420-Marowak-Alola~Totem.gif
diff --git a/src/canonical/models/back-shiny/0106--000--Hitmonlee.gif b/src/canonical/models/back-shiny/0106-000-Hitmonlee.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0106--000--Hitmonlee.gif
rename to src/canonical/models/back-shiny/0106-000-Hitmonlee.gif
diff --git a/src/canonical/models/back-shiny/0107--000--Hitmonchan.gif b/src/canonical/models/back-shiny/0107-000-Hitmonchan.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0107--000--Hitmonchan.gif
rename to src/canonical/models/back-shiny/0107-000-Hitmonchan.gif
diff --git a/src/canonical/models/back-shiny/0108--000--Lickitung.gif b/src/canonical/models/back-shiny/0108-000-Lickitung.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0108--000--Lickitung.gif
rename to src/canonical/models/back-shiny/0108-000-Lickitung.gif
diff --git a/src/canonical/models/back-shiny/0109--000--Koffing.gif b/src/canonical/models/back-shiny/0109-000-Koffing.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0109--000--Koffing.gif
rename to src/canonical/models/back-shiny/0109-000-Koffing.gif
diff --git a/src/canonical/models/back-shiny/0110--000--Weezing.gif b/src/canonical/models/back-shiny/0110-000-Weezing.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0110--000--Weezing.gif
rename to src/canonical/models/back-shiny/0110-000-Weezing.gif
diff --git a/src/canonical/models/back-shiny/0110--420--Weezing--Galar.gif b/src/canonical/models/back-shiny/0110-420-Weezing-Galar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0110--420--Weezing--Galar.gif
rename to src/canonical/models/back-shiny/0110-420-Weezing-Galar.gif
diff --git a/src/canonical/models/back-shiny/0111--000--Rhyhorn.gif b/src/canonical/models/back-shiny/0111-000-Rhyhorn.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0111--000--Rhyhorn.gif
rename to src/canonical/models/back-shiny/0111-000-Rhyhorn.gif
diff --git a/src/canonical/models/back-shiny/0112--000--Rhydon.gif b/src/canonical/models/back-shiny/0112-000-Rhydon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0112--000--Rhydon.gif
rename to src/canonical/models/back-shiny/0112-000-Rhydon.gif
diff --git a/src/canonical/models/back-shiny/0113--000--Chansey.gif b/src/canonical/models/back-shiny/0113-000-Chansey.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0113--000--Chansey.gif
rename to src/canonical/models/back-shiny/0113-000-Chansey.gif
diff --git a/src/canonical/models/back-shiny/0114--000--Tangela.gif b/src/canonical/models/back-shiny/0114-000-Tangela.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0114--000--Tangela.gif
rename to src/canonical/models/back-shiny/0114-000-Tangela.gif
diff --git a/src/canonical/models/back-shiny/0115--000--Kangaskhan.gif b/src/canonical/models/back-shiny/0115-000-Kangaskhan.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0115--000--Kangaskhan.gif
rename to src/canonical/models/back-shiny/0115-000-Kangaskhan.gif
diff --git a/src/canonical/models/back-shiny/0115--420--Kangaskhan--Mega.gif b/src/canonical/models/back-shiny/0115-420-Kangaskhan-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0115--420--Kangaskhan--Mega.gif
rename to src/canonical/models/back-shiny/0115-420-Kangaskhan-Mega.gif
diff --git a/src/canonical/models/back-shiny/0116--000--Horsea.gif b/src/canonical/models/back-shiny/0116-000-Horsea.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0116--000--Horsea.gif
rename to src/canonical/models/back-shiny/0116-000-Horsea.gif
diff --git a/src/canonical/models/back-shiny/0117--000--Seadra.gif b/src/canonical/models/back-shiny/0117-000-Seadra.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0117--000--Seadra.gif
rename to src/canonical/models/back-shiny/0117-000-Seadra.gif
diff --git a/src/canonical/models/back-shiny/0118--000--Goldeen.gif b/src/canonical/models/back-shiny/0118-000-Goldeen.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0118--000--Goldeen.gif
rename to src/canonical/models/back-shiny/0118-000-Goldeen.gif
diff --git a/src/canonical/models/back-shiny/0119--000--Seaking.gif b/src/canonical/models/back-shiny/0119-000-Seaking.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0119--000--Seaking.gif
rename to src/canonical/models/back-shiny/0119-000-Seaking.gif
diff --git a/src/canonical/models/back-shiny/0120--000--Staryu.gif b/src/canonical/models/back-shiny/0120-000-Staryu.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0120--000--Staryu.gif
rename to src/canonical/models/back-shiny/0120-000-Staryu.gif
diff --git a/src/canonical/models/back-shiny/0121--000--Starmie.gif b/src/canonical/models/back-shiny/0121-000-Starmie.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0121--000--Starmie.gif
rename to src/canonical/models/back-shiny/0121-000-Starmie.gif
diff --git a/src/canonical/models/back-shiny/0122--000--Mr._Mime.gif b/src/canonical/models/back-shiny/0122-000-Mr._Mime.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0122--000--Mr._Mime.gif
rename to src/canonical/models/back-shiny/0122-000-Mr._Mime.gif
diff --git a/src/canonical/models/back-shiny/0122--420--Mr._Mime--Galar.gif b/src/canonical/models/back-shiny/0122-420-Mr._Mime-Galar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0122--420--Mr._Mime--Galar.gif
rename to src/canonical/models/back-shiny/0122-420-Mr._Mime-Galar.gif
diff --git a/src/canonical/models/back-shiny/0123--000--Scyther.gif b/src/canonical/models/back-shiny/0123-000-Scyther.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0123--000--Scyther.gif
rename to src/canonical/models/back-shiny/0123-000-Scyther.gif
diff --git a/src/canonical/models/back-shiny/0124--000--Jynx.gif b/src/canonical/models/back-shiny/0124-000-Jynx.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0124--000--Jynx.gif
rename to src/canonical/models/back-shiny/0124-000-Jynx.gif
diff --git a/src/canonical/models/back-shiny/0125--000--Electabuzz.gif b/src/canonical/models/back-shiny/0125-000-Electabuzz.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0125--000--Electabuzz.gif
rename to src/canonical/models/back-shiny/0125-000-Electabuzz.gif
diff --git a/src/canonical/models/back-shiny/0126--000--Magmar.gif b/src/canonical/models/back-shiny/0126-000-Magmar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0126--000--Magmar.gif
rename to src/canonical/models/back-shiny/0126-000-Magmar.gif
diff --git a/src/canonical/models/back-shiny/0127--000--Pinsir.gif b/src/canonical/models/back-shiny/0127-000-Pinsir.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0127--000--Pinsir.gif
rename to src/canonical/models/back-shiny/0127-000-Pinsir.gif
diff --git a/src/canonical/models/back-shiny/0127--420--Pinsir--Mega.gif b/src/canonical/models/back-shiny/0127-420-Pinsir-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0127--420--Pinsir--Mega.gif
rename to src/canonical/models/back-shiny/0127-420-Pinsir-Mega.gif
diff --git a/src/canonical/models/back-shiny/0128--000--Tauros.gif b/src/canonical/models/back-shiny/0128-000-Tauros.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0128--000--Tauros.gif
rename to src/canonical/models/back-shiny/0128-000-Tauros.gif
diff --git a/src/canonical/models/back-shiny/0129--000--Magikarp.gif b/src/canonical/models/back-shiny/0129-000-Magikarp.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0129--000--Magikarp.gif
rename to src/canonical/models/back-shiny/0129-000-Magikarp.gif
diff --git a/src/canonical/models/back-shiny/0130--000--Gyarados.gif b/src/canonical/models/back-shiny/0130-000-Gyarados.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0130--000--Gyarados.gif
rename to src/canonical/models/back-shiny/0130-000-Gyarados.gif
diff --git a/src/canonical/models/back-shiny/0130--420--Gyarados--Mega.gif b/src/canonical/models/back-shiny/0130-420-Gyarados-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0130--420--Gyarados--Mega.gif
rename to src/canonical/models/back-shiny/0130-420-Gyarados-Mega.gif
diff --git a/src/canonical/models/back-shiny/0131--000--Lapras.gif b/src/canonical/models/back-shiny/0131-000-Lapras.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0131--000--Lapras.gif
rename to src/canonical/models/back-shiny/0131-000-Lapras.gif
diff --git a/src/canonical/models/back-shiny/0131--420--Lapras--Gmax.gif b/src/canonical/models/back-shiny/0131-420-Lapras-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0131--420--Lapras--Gmax.gif
rename to src/canonical/models/back-shiny/0131-420-Lapras-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0132--000--Ditto.gif b/src/canonical/models/back-shiny/0132-000-Ditto.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0132--000--Ditto.gif
rename to src/canonical/models/back-shiny/0132-000-Ditto.gif
diff --git a/src/canonical/models/back-shiny/0133--000--Eevee.gif b/src/canonical/models/back-shiny/0133-000-Eevee.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0133--000--Eevee.gif
rename to src/canonical/models/back-shiny/0133-000-Eevee.gif
diff --git a/src/canonical/models/back-shiny/0133--420--Eevee--Gmax.gif b/src/canonical/models/back-shiny/0133-420-Eevee-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0133--420--Eevee--Gmax.gif
rename to src/canonical/models/back-shiny/0133-420-Eevee-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0134--000--Vaporeon.gif b/src/canonical/models/back-shiny/0134-000-Vaporeon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0134--000--Vaporeon.gif
rename to src/canonical/models/back-shiny/0134-000-Vaporeon.gif
diff --git a/src/canonical/models/back-shiny/0135--000--Jolteon.gif b/src/canonical/models/back-shiny/0135-000-Jolteon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0135--000--Jolteon.gif
rename to src/canonical/models/back-shiny/0135-000-Jolteon.gif
diff --git a/src/canonical/models/back-shiny/0136--000--Flareon.gif b/src/canonical/models/back-shiny/0136-000-Flareon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0136--000--Flareon.gif
rename to src/canonical/models/back-shiny/0136-000-Flareon.gif
diff --git a/src/canonical/models/back-shiny/0137--000--Porygon.gif b/src/canonical/models/back-shiny/0137-000-Porygon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0137--000--Porygon.gif
rename to src/canonical/models/back-shiny/0137-000-Porygon.gif
diff --git a/src/canonical/models/back-shiny/0138--000--Omanyte.gif b/src/canonical/models/back-shiny/0138-000-Omanyte.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0138--000--Omanyte.gif
rename to src/canonical/models/back-shiny/0138-000-Omanyte.gif
diff --git a/src/canonical/models/back-shiny/0139--000--Omastar.gif b/src/canonical/models/back-shiny/0139-000-Omastar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0139--000--Omastar.gif
rename to src/canonical/models/back-shiny/0139-000-Omastar.gif
diff --git a/src/canonical/models/back-shiny/0140--000--Kabuto.gif b/src/canonical/models/back-shiny/0140-000-Kabuto.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0140--000--Kabuto.gif
rename to src/canonical/models/back-shiny/0140-000-Kabuto.gif
diff --git a/src/canonical/models/back-shiny/0141--000--Kabutops.gif b/src/canonical/models/back-shiny/0141-000-Kabutops.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0141--000--Kabutops.gif
rename to src/canonical/models/back-shiny/0141-000-Kabutops.gif
diff --git a/src/canonical/models/back-shiny/0142--000--Aerodactyl.gif b/src/canonical/models/back-shiny/0142-000-Aerodactyl.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0142--000--Aerodactyl.gif
rename to src/canonical/models/back-shiny/0142-000-Aerodactyl.gif
diff --git a/src/canonical/models/back-shiny/0142--420--Aerodactyl--Mega.gif b/src/canonical/models/back-shiny/0142-420-Aerodactyl-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0142--420--Aerodactyl--Mega.gif
rename to src/canonical/models/back-shiny/0142-420-Aerodactyl-Mega.gif
diff --git a/src/canonical/models/back-shiny/0143--000--Snorlax.gif b/src/canonical/models/back-shiny/0143-000-Snorlax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0143--000--Snorlax.gif
rename to src/canonical/models/back-shiny/0143-000-Snorlax.gif
diff --git a/src/canonical/models/back-shiny/0143--420--Snorlax--Gmax.gif b/src/canonical/models/back-shiny/0143-420-Snorlax-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0143--420--Snorlax--Gmax.gif
rename to src/canonical/models/back-shiny/0143-420-Snorlax-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0144--000--Articuno.gif b/src/canonical/models/back-shiny/0144-000-Articuno.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0144--000--Articuno.gif
rename to src/canonical/models/back-shiny/0144-000-Articuno.gif
diff --git a/src/canonical/models/back-shiny/0145--000--Zapdos.gif b/src/canonical/models/back-shiny/0145-000-Zapdos.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0145--000--Zapdos.gif
rename to src/canonical/models/back-shiny/0145-000-Zapdos.gif
diff --git a/src/canonical/models/back-shiny/0146--000--Moltres.gif b/src/canonical/models/back-shiny/0146-000-Moltres.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0146--000--Moltres.gif
rename to src/canonical/models/back-shiny/0146-000-Moltres.gif
diff --git a/src/canonical/models/back-shiny/0147--000--Dratini.gif b/src/canonical/models/back-shiny/0147-000-Dratini.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0147--000--Dratini.gif
rename to src/canonical/models/back-shiny/0147-000-Dratini.gif
diff --git a/src/canonical/models/back-shiny/0148--000--Dragonair.gif b/src/canonical/models/back-shiny/0148-000-Dragonair.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0148--000--Dragonair.gif
rename to src/canonical/models/back-shiny/0148-000-Dragonair.gif
diff --git a/src/canonical/models/back-shiny/0149--000--Dragonite.gif b/src/canonical/models/back-shiny/0149-000-Dragonite.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0149--000--Dragonite.gif
rename to src/canonical/models/back-shiny/0149-000-Dragonite.gif
diff --git a/src/canonical/models/back-shiny/0150--000--Mewtwo.gif b/src/canonical/models/back-shiny/0150-000-Mewtwo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0150--000--Mewtwo.gif
rename to src/canonical/models/back-shiny/0150-000-Mewtwo.gif
diff --git a/src/canonical/models/back-shiny/0150--420--Mewtwo--Mega-X.gif b/src/canonical/models/back-shiny/0150-420-Mewtwo-Mega~X.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0150--420--Mewtwo--Mega-X.gif
rename to src/canonical/models/back-shiny/0150-420-Mewtwo-Mega~X.gif
diff --git a/src/canonical/models/back-shiny/0150--420--Mewtwo--Mega-Y.gif b/src/canonical/models/back-shiny/0150-420-Mewtwo-Mega~Y.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0150--420--Mewtwo--Mega-Y.gif
rename to src/canonical/models/back-shiny/0150-420-Mewtwo-Mega~Y.gif
diff --git a/src/canonical/models/back-shiny/0151--000--Mew.gif b/src/canonical/models/back-shiny/0151-000-Mew.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0151--000--Mew.gif
rename to src/canonical/models/back-shiny/0151-000-Mew.gif
diff --git a/src/canonical/models/back-shiny/0152--000--Chikorita.gif b/src/canonical/models/back-shiny/0152-000-Chikorita.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0152--000--Chikorita.gif
rename to src/canonical/models/back-shiny/0152-000-Chikorita.gif
diff --git a/src/canonical/models/back-shiny/0153--000--Bayleef.gif b/src/canonical/models/back-shiny/0153-000-Bayleef.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0153--000--Bayleef.gif
rename to src/canonical/models/back-shiny/0153-000-Bayleef.gif
diff --git a/src/canonical/models/back-shiny/0154--000--Meganium.gif b/src/canonical/models/back-shiny/0154-000-Meganium.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0154--000--Meganium.gif
rename to src/canonical/models/back-shiny/0154-000-Meganium.gif
diff --git a/src/canonical/models/back-shiny/0155--000--Cyndaquil.gif b/src/canonical/models/back-shiny/0155-000-Cyndaquil.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0155--000--Cyndaquil.gif
rename to src/canonical/models/back-shiny/0155-000-Cyndaquil.gif
diff --git a/src/canonical/models/back-shiny/0156--000--Quilava.gif b/src/canonical/models/back-shiny/0156-000-Quilava.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0156--000--Quilava.gif
rename to src/canonical/models/back-shiny/0156-000-Quilava.gif
diff --git a/src/canonical/models/back-shiny/0157--000--Typhlosion.gif b/src/canonical/models/back-shiny/0157-000-Typhlosion.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0157--000--Typhlosion.gif
rename to src/canonical/models/back-shiny/0157-000-Typhlosion.gif
diff --git a/src/canonical/models/back-shiny/0158--000--Totodile.gif b/src/canonical/models/back-shiny/0158-000-Totodile.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0158--000--Totodile.gif
rename to src/canonical/models/back-shiny/0158-000-Totodile.gif
diff --git a/src/canonical/models/back-shiny/0159--000--Croconaw.gif b/src/canonical/models/back-shiny/0159-000-Croconaw.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0159--000--Croconaw.gif
rename to src/canonical/models/back-shiny/0159-000-Croconaw.gif
diff --git a/src/canonical/models/back-shiny/0160--000--Feraligatr.gif b/src/canonical/models/back-shiny/0160-000-Feraligatr.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0160--000--Feraligatr.gif
rename to src/canonical/models/back-shiny/0160-000-Feraligatr.gif
diff --git a/src/canonical/models/back-shiny/0161--000--Sentret.gif b/src/canonical/models/back-shiny/0161-000-Sentret.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0161--000--Sentret.gif
rename to src/canonical/models/back-shiny/0161-000-Sentret.gif
diff --git a/src/canonical/models/back-shiny/0162--000--Furret.gif b/src/canonical/models/back-shiny/0162-000-Furret.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0162--000--Furret.gif
rename to src/canonical/models/back-shiny/0162-000-Furret.gif
diff --git a/src/canonical/models/back-shiny/0163--000--Hoothoot.gif b/src/canonical/models/back-shiny/0163-000-Hoothoot.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0163--000--Hoothoot.gif
rename to src/canonical/models/back-shiny/0163-000-Hoothoot.gif
diff --git a/src/canonical/models/back-shiny/0164--000--Noctowl.gif b/src/canonical/models/back-shiny/0164-000-Noctowl.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0164--000--Noctowl.gif
rename to src/canonical/models/back-shiny/0164-000-Noctowl.gif
diff --git a/src/canonical/models/back-shiny/0165--000--Ledyba.gif b/src/canonical/models/back-shiny/0165-000-Ledyba.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0165--000--Ledyba.gif
rename to src/canonical/models/back-shiny/0165-000-Ledyba.gif
diff --git a/src/canonical/models/back-shiny/0166--000--Ledian.gif b/src/canonical/models/back-shiny/0166-000-Ledian.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0166--000--Ledian.gif
rename to src/canonical/models/back-shiny/0166-000-Ledian.gif
diff --git a/src/canonical/models/back-shiny/0167--000--Spinarak.gif b/src/canonical/models/back-shiny/0167-000-Spinarak.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0167--000--Spinarak.gif
rename to src/canonical/models/back-shiny/0167-000-Spinarak.gif
diff --git a/src/canonical/models/back-shiny/0168--000--Ariados.gif b/src/canonical/models/back-shiny/0168-000-Ariados.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0168--000--Ariados.gif
rename to src/canonical/models/back-shiny/0168-000-Ariados.gif
diff --git a/src/canonical/models/back-shiny/0169--000--Crobat.gif b/src/canonical/models/back-shiny/0169-000-Crobat.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0169--000--Crobat.gif
rename to src/canonical/models/back-shiny/0169-000-Crobat.gif
diff --git a/src/canonical/models/back-shiny/0170--000--Chinchou.gif b/src/canonical/models/back-shiny/0170-000-Chinchou.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0170--000--Chinchou.gif
rename to src/canonical/models/back-shiny/0170-000-Chinchou.gif
diff --git a/src/canonical/models/back-shiny/0171--000--Lanturn.gif b/src/canonical/models/back-shiny/0171-000-Lanturn.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0171--000--Lanturn.gif
rename to src/canonical/models/back-shiny/0171-000-Lanturn.gif
diff --git a/src/canonical/models/back-shiny/0172--000--Pichu.gif b/src/canonical/models/back-shiny/0172-000-Pichu.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0172--000--Pichu.gif
rename to src/canonical/models/back-shiny/0172-000-Pichu.gif
diff --git a/src/canonical/models/back-shiny/0173--000--Cleffa.gif b/src/canonical/models/back-shiny/0173-000-Cleffa.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0173--000--Cleffa.gif
rename to src/canonical/models/back-shiny/0173-000-Cleffa.gif
diff --git a/src/canonical/models/back-shiny/0174--000--Igglybuff.gif b/src/canonical/models/back-shiny/0174-000-Igglybuff.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0174--000--Igglybuff.gif
rename to src/canonical/models/back-shiny/0174-000-Igglybuff.gif
diff --git a/src/canonical/models/back-shiny/0175--000--Togepi.gif b/src/canonical/models/back-shiny/0175-000-Togepi.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0175--000--Togepi.gif
rename to src/canonical/models/back-shiny/0175-000-Togepi.gif
diff --git a/src/canonical/models/back-shiny/0176--000--Togetic.gif b/src/canonical/models/back-shiny/0176-000-Togetic.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0176--000--Togetic.gif
rename to src/canonical/models/back-shiny/0176-000-Togetic.gif
diff --git a/src/canonical/models/back-shiny/0177--000--Natu.gif b/src/canonical/models/back-shiny/0177-000-Natu.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0177--000--Natu.gif
rename to src/canonical/models/back-shiny/0177-000-Natu.gif
diff --git a/src/canonical/models/back-shiny/0178--000--Xatu.gif b/src/canonical/models/back-shiny/0178-000-Xatu.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0178--000--Xatu.gif
rename to src/canonical/models/back-shiny/0178-000-Xatu.gif
diff --git a/src/canonical/models/back-shiny/0179--000--Mareep.gif b/src/canonical/models/back-shiny/0179-000-Mareep.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0179--000--Mareep.gif
rename to src/canonical/models/back-shiny/0179-000-Mareep.gif
diff --git a/src/canonical/models/back-shiny/0180--000--Flaaffy.gif b/src/canonical/models/back-shiny/0180-000-Flaaffy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0180--000--Flaaffy.gif
rename to src/canonical/models/back-shiny/0180-000-Flaaffy.gif
diff --git a/src/canonical/models/back-shiny/0181--000--Ampharos.gif b/src/canonical/models/back-shiny/0181-000-Ampharos.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0181--000--Ampharos.gif
rename to src/canonical/models/back-shiny/0181-000-Ampharos.gif
diff --git a/src/canonical/models/back-shiny/0181--420--Ampharos--Mega.gif b/src/canonical/models/back-shiny/0181-420-Ampharos-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0181--420--Ampharos--Mega.gif
rename to src/canonical/models/back-shiny/0181-420-Ampharos-Mega.gif
diff --git a/src/canonical/models/back-shiny/0182--000--Bellossom.gif b/src/canonical/models/back-shiny/0182-000-Bellossom.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0182--000--Bellossom.gif
rename to src/canonical/models/back-shiny/0182-000-Bellossom.gif
diff --git a/src/canonical/models/back-shiny/0183--000--Marill.gif b/src/canonical/models/back-shiny/0183-000-Marill.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0183--000--Marill.gif
rename to src/canonical/models/back-shiny/0183-000-Marill.gif
diff --git a/src/canonical/models/back-shiny/0184--000--Azumarill.gif b/src/canonical/models/back-shiny/0184-000-Azumarill.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0184--000--Azumarill.gif
rename to src/canonical/models/back-shiny/0184-000-Azumarill.gif
diff --git a/src/canonical/models/back-shiny/0185--000--Sudowoodo.gif b/src/canonical/models/back-shiny/0185-000-Sudowoodo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0185--000--Sudowoodo.gif
rename to src/canonical/models/back-shiny/0185-000-Sudowoodo.gif
diff --git a/src/canonical/models/back-shiny/0186--000--Politoed.gif b/src/canonical/models/back-shiny/0186-000-Politoed.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0186--000--Politoed.gif
rename to src/canonical/models/back-shiny/0186-000-Politoed.gif
diff --git a/src/canonical/models/back-shiny/0187--000--Hoppip.gif b/src/canonical/models/back-shiny/0187-000-Hoppip.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0187--000--Hoppip.gif
rename to src/canonical/models/back-shiny/0187-000-Hoppip.gif
diff --git a/src/canonical/models/back-shiny/0188--000--Skiploom.gif b/src/canonical/models/back-shiny/0188-000-Skiploom.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0188--000--Skiploom.gif
rename to src/canonical/models/back-shiny/0188-000-Skiploom.gif
diff --git a/src/canonical/models/back-shiny/0189--000--Jumpluff.gif b/src/canonical/models/back-shiny/0189-000-Jumpluff.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0189--000--Jumpluff.gif
rename to src/canonical/models/back-shiny/0189-000-Jumpluff.gif
diff --git a/src/canonical/models/back-shiny/0190--000--Aipom.gif b/src/canonical/models/back-shiny/0190-000-Aipom.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0190--000--Aipom.gif
rename to src/canonical/models/back-shiny/0190-000-Aipom.gif
diff --git a/src/canonical/models/back-shiny/0191--000--Sunkern.gif b/src/canonical/models/back-shiny/0191-000-Sunkern.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0191--000--Sunkern.gif
rename to src/canonical/models/back-shiny/0191-000-Sunkern.gif
diff --git a/src/canonical/models/back-shiny/0192--000--Sunflora.gif b/src/canonical/models/back-shiny/0192-000-Sunflora.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0192--000--Sunflora.gif
rename to src/canonical/models/back-shiny/0192-000-Sunflora.gif
diff --git a/src/canonical/models/back-shiny/0193--000--Yanma.gif b/src/canonical/models/back-shiny/0193-000-Yanma.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0193--000--Yanma.gif
rename to src/canonical/models/back-shiny/0193-000-Yanma.gif
diff --git a/src/canonical/models/back-shiny/0194--000--Wooper.gif b/src/canonical/models/back-shiny/0194-000-Wooper.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0194--000--Wooper.gif
rename to src/canonical/models/back-shiny/0194-000-Wooper.gif
diff --git a/src/canonical/models/back-shiny/0195--000--Quagsire.gif b/src/canonical/models/back-shiny/0195-000-Quagsire.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0195--000--Quagsire.gif
rename to src/canonical/models/back-shiny/0195-000-Quagsire.gif
diff --git a/src/canonical/models/back-shiny/0196--000--Espeon.gif b/src/canonical/models/back-shiny/0196-000-Espeon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0196--000--Espeon.gif
rename to src/canonical/models/back-shiny/0196-000-Espeon.gif
diff --git a/src/canonical/models/back-shiny/0197--000--Umbreon.gif b/src/canonical/models/back-shiny/0197-000-Umbreon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0197--000--Umbreon.gif
rename to src/canonical/models/back-shiny/0197-000-Umbreon.gif
diff --git a/src/canonical/models/back-shiny/0198--000--Murkrow.gif b/src/canonical/models/back-shiny/0198-000-Murkrow.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0198--000--Murkrow.gif
rename to src/canonical/models/back-shiny/0198-000-Murkrow.gif
diff --git a/src/canonical/models/back-shiny/0199--000--Slowking.gif b/src/canonical/models/back-shiny/0199-000-Slowking.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0199--000--Slowking.gif
rename to src/canonical/models/back-shiny/0199-000-Slowking.gif
diff --git a/src/canonical/models/back-shiny/0200--000--Misdreavus.gif b/src/canonical/models/back-shiny/0200-000-Misdreavus.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0200--000--Misdreavus.gif
rename to src/canonical/models/back-shiny/0200-000-Misdreavus.gif
diff --git a/src/canonical/models/back-shiny/0201--000--Unown.gif b/src/canonical/models/back-shiny/0201--000--Unown.gif
deleted file mode 120000
index 494dea71..00000000
--- a/src/canonical/models/back-shiny/0201--000--Unown.gif
+++ /dev/null
@@ -1 +0,0 @@
-../back-shiny-cosmetic/0201--420--Unown--A.gif
\ No newline at end of file
diff --git a/src/canonical/models/back-shiny/0201-000-Unown.gif b/src/canonical/models/back-shiny/0201-000-Unown.gif
new file mode 120000
index 00000000..f8943eb5
--- /dev/null
+++ b/src/canonical/models/back-shiny/0201-000-Unown.gif
@@ -0,0 +1 @@
+../back-shiny-cosmetic/0201-420-Unown-A.gif
\ No newline at end of file
diff --git a/src/canonical/models/back-shiny/0202--000--Wobbuffet.gif b/src/canonical/models/back-shiny/0202-000-Wobbuffet.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0202--000--Wobbuffet.gif
rename to src/canonical/models/back-shiny/0202-000-Wobbuffet.gif
diff --git a/src/canonical/models/back-shiny/0203--000--Girafarig.gif b/src/canonical/models/back-shiny/0203-000-Girafarig.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0203--000--Girafarig.gif
rename to src/canonical/models/back-shiny/0203-000-Girafarig.gif
diff --git a/src/canonical/models/back-shiny/0204--000--Pineco.gif b/src/canonical/models/back-shiny/0204-000-Pineco.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0204--000--Pineco.gif
rename to src/canonical/models/back-shiny/0204-000-Pineco.gif
diff --git a/src/canonical/models/back-shiny/0205--000--Forretress.gif b/src/canonical/models/back-shiny/0205-000-Forretress.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0205--000--Forretress.gif
rename to src/canonical/models/back-shiny/0205-000-Forretress.gif
diff --git a/src/canonical/models/back-shiny/0206--000--Dunsparce.gif b/src/canonical/models/back-shiny/0206-000-Dunsparce.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0206--000--Dunsparce.gif
rename to src/canonical/models/back-shiny/0206-000-Dunsparce.gif
diff --git a/src/canonical/models/back-shiny/0207--000--Gligar.gif b/src/canonical/models/back-shiny/0207-000-Gligar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0207--000--Gligar.gif
rename to src/canonical/models/back-shiny/0207-000-Gligar.gif
diff --git a/src/canonical/models/back-shiny/0208--000--Steelix.gif b/src/canonical/models/back-shiny/0208-000-Steelix.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0208--000--Steelix.gif
rename to src/canonical/models/back-shiny/0208-000-Steelix.gif
diff --git a/src/canonical/models/back-shiny/0208--420--Steelix--Mega.gif b/src/canonical/models/back-shiny/0208-420-Steelix-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0208--420--Steelix--Mega.gif
rename to src/canonical/models/back-shiny/0208-420-Steelix-Mega.gif
diff --git a/src/canonical/models/back-shiny/0209--000--Snubbull.gif b/src/canonical/models/back-shiny/0209-000-Snubbull.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0209--000--Snubbull.gif
rename to src/canonical/models/back-shiny/0209-000-Snubbull.gif
diff --git a/src/canonical/models/back-shiny/0210--000--Granbull.gif b/src/canonical/models/back-shiny/0210-000-Granbull.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0210--000--Granbull.gif
rename to src/canonical/models/back-shiny/0210-000-Granbull.gif
diff --git a/src/canonical/models/back-shiny/0211--000--Qwilfish.gif b/src/canonical/models/back-shiny/0211-000-Qwilfish.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0211--000--Qwilfish.gif
rename to src/canonical/models/back-shiny/0211-000-Qwilfish.gif
diff --git a/src/canonical/models/back-shiny/0212--000--Scizor.gif b/src/canonical/models/back-shiny/0212-000-Scizor.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0212--000--Scizor.gif
rename to src/canonical/models/back-shiny/0212-000-Scizor.gif
diff --git a/src/canonical/models/back-shiny/0212--420--Scizor--Mega.gif b/src/canonical/models/back-shiny/0212-420-Scizor-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0212--420--Scizor--Mega.gif
rename to src/canonical/models/back-shiny/0212-420-Scizor-Mega.gif
diff --git a/src/canonical/models/back-shiny/0213--000--Shuckle.gif b/src/canonical/models/back-shiny/0213-000-Shuckle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0213--000--Shuckle.gif
rename to src/canonical/models/back-shiny/0213-000-Shuckle.gif
diff --git a/src/canonical/models/back-shiny/0214--000--Heracross.gif b/src/canonical/models/back-shiny/0214-000-Heracross.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0214--000--Heracross.gif
rename to src/canonical/models/back-shiny/0214-000-Heracross.gif
diff --git a/src/canonical/models/back-shiny/0214--420--Heracross--Mega.gif b/src/canonical/models/back-shiny/0214-420-Heracross-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0214--420--Heracross--Mega.gif
rename to src/canonical/models/back-shiny/0214-420-Heracross-Mega.gif
diff --git a/src/canonical/models/back-shiny/0215--000--Sneasel.gif b/src/canonical/models/back-shiny/0215-000-Sneasel.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0215--000--Sneasel.gif
rename to src/canonical/models/back-shiny/0215-000-Sneasel.gif
diff --git a/src/canonical/models/back-shiny/0216--000--Teddiursa.gif b/src/canonical/models/back-shiny/0216-000-Teddiursa.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0216--000--Teddiursa.gif
rename to src/canonical/models/back-shiny/0216-000-Teddiursa.gif
diff --git a/src/canonical/models/back-shiny/0217--000--Ursaring.gif b/src/canonical/models/back-shiny/0217-000-Ursaring.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0217--000--Ursaring.gif
rename to src/canonical/models/back-shiny/0217-000-Ursaring.gif
diff --git a/src/canonical/models/back-shiny/0218--000--Slugma.gif b/src/canonical/models/back-shiny/0218-000-Slugma.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0218--000--Slugma.gif
rename to src/canonical/models/back-shiny/0218-000-Slugma.gif
diff --git a/src/canonical/models/back-shiny/0219--000--Magcargo.gif b/src/canonical/models/back-shiny/0219-000-Magcargo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0219--000--Magcargo.gif
rename to src/canonical/models/back-shiny/0219-000-Magcargo.gif
diff --git a/src/canonical/models/back-shiny/0220--000--Swinub.gif b/src/canonical/models/back-shiny/0220-000-Swinub.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0220--000--Swinub.gif
rename to src/canonical/models/back-shiny/0220-000-Swinub.gif
diff --git a/src/canonical/models/back-shiny/0221--000--Piloswine.gif b/src/canonical/models/back-shiny/0221-000-Piloswine.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0221--000--Piloswine.gif
rename to src/canonical/models/back-shiny/0221-000-Piloswine.gif
diff --git a/src/canonical/models/back-shiny/0222--000--Corsola.gif b/src/canonical/models/back-shiny/0222-000-Corsola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0222--000--Corsola.gif
rename to src/canonical/models/back-shiny/0222-000-Corsola.gif
diff --git a/src/canonical/models/back-shiny/0222--420--Corsola--Galar.gif b/src/canonical/models/back-shiny/0222-420-Corsola-Galar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0222--420--Corsola--Galar.gif
rename to src/canonical/models/back-shiny/0222-420-Corsola-Galar.gif
diff --git a/src/canonical/models/back-shiny/0223--000--Remoraid.gif b/src/canonical/models/back-shiny/0223-000-Remoraid.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0223--000--Remoraid.gif
rename to src/canonical/models/back-shiny/0223-000-Remoraid.gif
diff --git a/src/canonical/models/back-shiny/0224--000--Octillery.gif b/src/canonical/models/back-shiny/0224-000-Octillery.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0224--000--Octillery.gif
rename to src/canonical/models/back-shiny/0224-000-Octillery.gif
diff --git a/src/canonical/models/back-shiny/0225--000--Delibird.gif b/src/canonical/models/back-shiny/0225-000-Delibird.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0225--000--Delibird.gif
rename to src/canonical/models/back-shiny/0225-000-Delibird.gif
diff --git a/src/canonical/models/back-shiny/0226--000--Mantine.gif b/src/canonical/models/back-shiny/0226-000-Mantine.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0226--000--Mantine.gif
rename to src/canonical/models/back-shiny/0226-000-Mantine.gif
diff --git a/src/canonical/models/back-shiny/0227--000--Skarmory.gif b/src/canonical/models/back-shiny/0227-000-Skarmory.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0227--000--Skarmory.gif
rename to src/canonical/models/back-shiny/0227-000-Skarmory.gif
diff --git a/src/canonical/models/back-shiny/0228--000--Houndour.gif b/src/canonical/models/back-shiny/0228-000-Houndour.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0228--000--Houndour.gif
rename to src/canonical/models/back-shiny/0228-000-Houndour.gif
diff --git a/src/canonical/models/back-shiny/0229--000--Houndoom.gif b/src/canonical/models/back-shiny/0229-000-Houndoom.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0229--000--Houndoom.gif
rename to src/canonical/models/back-shiny/0229-000-Houndoom.gif
diff --git a/src/canonical/models/back-shiny/0229--420--Houndoom--Mega.gif b/src/canonical/models/back-shiny/0229-420-Houndoom-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0229--420--Houndoom--Mega.gif
rename to src/canonical/models/back-shiny/0229-420-Houndoom-Mega.gif
diff --git a/src/canonical/models/back-shiny/0230--000--Kingdra.gif b/src/canonical/models/back-shiny/0230-000-Kingdra.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0230--000--Kingdra.gif
rename to src/canonical/models/back-shiny/0230-000-Kingdra.gif
diff --git a/src/canonical/models/back-shiny/0231--000--Phanpy.gif b/src/canonical/models/back-shiny/0231-000-Phanpy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0231--000--Phanpy.gif
rename to src/canonical/models/back-shiny/0231-000-Phanpy.gif
diff --git a/src/canonical/models/back-shiny/0232--000--Donphan.gif b/src/canonical/models/back-shiny/0232-000-Donphan.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0232--000--Donphan.gif
rename to src/canonical/models/back-shiny/0232-000-Donphan.gif
diff --git a/src/canonical/models/back-shiny/0233--000--Porygon2.gif b/src/canonical/models/back-shiny/0233-000-Porygon2.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0233--000--Porygon2.gif
rename to src/canonical/models/back-shiny/0233-000-Porygon2.gif
diff --git a/src/canonical/models/back-shiny/0234--000--Stantler.gif b/src/canonical/models/back-shiny/0234-000-Stantler.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0234--000--Stantler.gif
rename to src/canonical/models/back-shiny/0234-000-Stantler.gif
diff --git a/src/canonical/models/back-shiny/0235--000--Smeargle.gif b/src/canonical/models/back-shiny/0235-000-Smeargle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0235--000--Smeargle.gif
rename to src/canonical/models/back-shiny/0235-000-Smeargle.gif
diff --git a/src/canonical/models/back-shiny/0236--000--Tyrogue.gif b/src/canonical/models/back-shiny/0236-000-Tyrogue.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0236--000--Tyrogue.gif
rename to src/canonical/models/back-shiny/0236-000-Tyrogue.gif
diff --git a/src/canonical/models/back-shiny/0237--000--Hitmontop.gif b/src/canonical/models/back-shiny/0237-000-Hitmontop.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0237--000--Hitmontop.gif
rename to src/canonical/models/back-shiny/0237-000-Hitmontop.gif
diff --git a/src/canonical/models/back-shiny/0238--000--Smoochum.gif b/src/canonical/models/back-shiny/0238-000-Smoochum.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0238--000--Smoochum.gif
rename to src/canonical/models/back-shiny/0238-000-Smoochum.gif
diff --git a/src/canonical/models/back-shiny/0239--000--Elekid.gif b/src/canonical/models/back-shiny/0239-000-Elekid.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0239--000--Elekid.gif
rename to src/canonical/models/back-shiny/0239-000-Elekid.gif
diff --git a/src/canonical/models/back-shiny/0240--000--Magby.gif b/src/canonical/models/back-shiny/0240-000-Magby.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0240--000--Magby.gif
rename to src/canonical/models/back-shiny/0240-000-Magby.gif
diff --git a/src/canonical/models/back-shiny/0241--000--Miltank.gif b/src/canonical/models/back-shiny/0241-000-Miltank.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0241--000--Miltank.gif
rename to src/canonical/models/back-shiny/0241-000-Miltank.gif
diff --git a/src/canonical/models/back-shiny/0242--000--Blissey.gif b/src/canonical/models/back-shiny/0242-000-Blissey.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0242--000--Blissey.gif
rename to src/canonical/models/back-shiny/0242-000-Blissey.gif
diff --git a/src/canonical/models/back-shiny/0243--000--Raikou.gif b/src/canonical/models/back-shiny/0243-000-Raikou.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0243--000--Raikou.gif
rename to src/canonical/models/back-shiny/0243-000-Raikou.gif
diff --git a/src/canonical/models/back-shiny/0244--000--Entei.gif b/src/canonical/models/back-shiny/0244-000-Entei.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0244--000--Entei.gif
rename to src/canonical/models/back-shiny/0244-000-Entei.gif
diff --git a/src/canonical/models/back-shiny/0245--000--Suicune.gif b/src/canonical/models/back-shiny/0245-000-Suicune.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0245--000--Suicune.gif
rename to src/canonical/models/back-shiny/0245-000-Suicune.gif
diff --git a/src/canonical/models/back-shiny/0246--000--Larvitar.gif b/src/canonical/models/back-shiny/0246-000-Larvitar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0246--000--Larvitar.gif
rename to src/canonical/models/back-shiny/0246-000-Larvitar.gif
diff --git a/src/canonical/models/back-shiny/0247--000--Pupitar.gif b/src/canonical/models/back-shiny/0247-000-Pupitar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0247--000--Pupitar.gif
rename to src/canonical/models/back-shiny/0247-000-Pupitar.gif
diff --git a/src/canonical/models/back-shiny/0248--000--Tyranitar.gif b/src/canonical/models/back-shiny/0248-000-Tyranitar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0248--000--Tyranitar.gif
rename to src/canonical/models/back-shiny/0248-000-Tyranitar.gif
diff --git a/src/canonical/models/back-shiny/0248--420--Tyranitar--Mega.gif b/src/canonical/models/back-shiny/0248-420-Tyranitar-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0248--420--Tyranitar--Mega.gif
rename to src/canonical/models/back-shiny/0248-420-Tyranitar-Mega.gif
diff --git a/src/canonical/models/back-shiny/0249--000--Lugia.gif b/src/canonical/models/back-shiny/0249-000-Lugia.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0249--000--Lugia.gif
rename to src/canonical/models/back-shiny/0249-000-Lugia.gif
diff --git a/src/canonical/models/back-shiny/0250--000--Ho-Oh.gif b/src/canonical/models/back-shiny/0250-000-Ho~Oh.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0250--000--Ho-Oh.gif
rename to src/canonical/models/back-shiny/0250-000-Ho~Oh.gif
diff --git a/src/canonical/models/back-shiny/0251--000--Celebi.gif b/src/canonical/models/back-shiny/0251-000-Celebi.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0251--000--Celebi.gif
rename to src/canonical/models/back-shiny/0251-000-Celebi.gif
diff --git a/src/canonical/models/back-shiny/0252--000--Treecko.gif b/src/canonical/models/back-shiny/0252-000-Treecko.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0252--000--Treecko.gif
rename to src/canonical/models/back-shiny/0252-000-Treecko.gif
diff --git a/src/canonical/models/back-shiny/0253--000--Grovyle.gif b/src/canonical/models/back-shiny/0253-000-Grovyle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0253--000--Grovyle.gif
rename to src/canonical/models/back-shiny/0253-000-Grovyle.gif
diff --git a/src/canonical/models/back-shiny/0254--000--Sceptile.gif b/src/canonical/models/back-shiny/0254-000-Sceptile.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0254--000--Sceptile.gif
rename to src/canonical/models/back-shiny/0254-000-Sceptile.gif
diff --git a/src/canonical/models/back-shiny/0254--420--Sceptile--Mega.gif b/src/canonical/models/back-shiny/0254-420-Sceptile-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0254--420--Sceptile--Mega.gif
rename to src/canonical/models/back-shiny/0254-420-Sceptile-Mega.gif
diff --git a/src/canonical/models/back-shiny/0255--000--Torchic.gif b/src/canonical/models/back-shiny/0255-000-Torchic.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0255--000--Torchic.gif
rename to src/canonical/models/back-shiny/0255-000-Torchic.gif
diff --git a/src/canonical/models/back-shiny/0256--000--Combusken.gif b/src/canonical/models/back-shiny/0256-000-Combusken.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0256--000--Combusken.gif
rename to src/canonical/models/back-shiny/0256-000-Combusken.gif
diff --git a/src/canonical/models/back-shiny/0257--000--Blaziken.gif b/src/canonical/models/back-shiny/0257-000-Blaziken.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0257--000--Blaziken.gif
rename to src/canonical/models/back-shiny/0257-000-Blaziken.gif
diff --git a/src/canonical/models/back-shiny/0257--420--Blaziken--Mega.gif b/src/canonical/models/back-shiny/0257-420-Blaziken-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0257--420--Blaziken--Mega.gif
rename to src/canonical/models/back-shiny/0257-420-Blaziken-Mega.gif
diff --git a/src/canonical/models/back-shiny/0258--000--Mudkip.gif b/src/canonical/models/back-shiny/0258-000-Mudkip.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0258--000--Mudkip.gif
rename to src/canonical/models/back-shiny/0258-000-Mudkip.gif
diff --git a/src/canonical/models/back-shiny/0259--000--Marshtomp.gif b/src/canonical/models/back-shiny/0259-000-Marshtomp.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0259--000--Marshtomp.gif
rename to src/canonical/models/back-shiny/0259-000-Marshtomp.gif
diff --git a/src/canonical/models/back-shiny/0260--000--Swampert.gif b/src/canonical/models/back-shiny/0260-000-Swampert.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0260--000--Swampert.gif
rename to src/canonical/models/back-shiny/0260-000-Swampert.gif
diff --git a/src/canonical/models/back-shiny/0260--420--Swampert--Mega.gif b/src/canonical/models/back-shiny/0260-420-Swampert-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0260--420--Swampert--Mega.gif
rename to src/canonical/models/back-shiny/0260-420-Swampert-Mega.gif
diff --git a/src/canonical/models/back-shiny/0261--000--Poochyena.gif b/src/canonical/models/back-shiny/0261-000-Poochyena.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0261--000--Poochyena.gif
rename to src/canonical/models/back-shiny/0261-000-Poochyena.gif
diff --git a/src/canonical/models/back-shiny/0262--000--Mightyena.gif b/src/canonical/models/back-shiny/0262-000-Mightyena.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0262--000--Mightyena.gif
rename to src/canonical/models/back-shiny/0262-000-Mightyena.gif
diff --git a/src/canonical/models/back-shiny/0263--000--Zigzagoon.gif b/src/canonical/models/back-shiny/0263-000-Zigzagoon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0263--000--Zigzagoon.gif
rename to src/canonical/models/back-shiny/0263-000-Zigzagoon.gif
diff --git a/src/canonical/models/back-shiny/0263--420--Zigzagoon--Galar.gif b/src/canonical/models/back-shiny/0263-420-Zigzagoon-Galar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0263--420--Zigzagoon--Galar.gif
rename to src/canonical/models/back-shiny/0263-420-Zigzagoon-Galar.gif
diff --git a/src/canonical/models/back-shiny/0264--000--Linoone.gif b/src/canonical/models/back-shiny/0264-000-Linoone.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0264--000--Linoone.gif
rename to src/canonical/models/back-shiny/0264-000-Linoone.gif
diff --git a/src/canonical/models/back-shiny/0264--420--Linoone--Galar.gif b/src/canonical/models/back-shiny/0264-420-Linoone-Galar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0264--420--Linoone--Galar.gif
rename to src/canonical/models/back-shiny/0264-420-Linoone-Galar.gif
diff --git a/src/canonical/models/back-shiny/0265--000--Wurmple.gif b/src/canonical/models/back-shiny/0265-000-Wurmple.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0265--000--Wurmple.gif
rename to src/canonical/models/back-shiny/0265-000-Wurmple.gif
diff --git a/src/canonical/models/back-shiny/0266--000--Silcoon.gif b/src/canonical/models/back-shiny/0266-000-Silcoon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0266--000--Silcoon.gif
rename to src/canonical/models/back-shiny/0266-000-Silcoon.gif
diff --git a/src/canonical/models/back-shiny/0267--000--Beautifly.gif b/src/canonical/models/back-shiny/0267-000-Beautifly.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0267--000--Beautifly.gif
rename to src/canonical/models/back-shiny/0267-000-Beautifly.gif
diff --git a/src/canonical/models/back-shiny/0268--000--Cascoon.gif b/src/canonical/models/back-shiny/0268-000-Cascoon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0268--000--Cascoon.gif
rename to src/canonical/models/back-shiny/0268-000-Cascoon.gif
diff --git a/src/canonical/models/back-shiny/0269--000--Dustox.gif b/src/canonical/models/back-shiny/0269-000-Dustox.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0269--000--Dustox.gif
rename to src/canonical/models/back-shiny/0269-000-Dustox.gif
diff --git a/src/canonical/models/back-shiny/0270--000--Lotad.gif b/src/canonical/models/back-shiny/0270-000-Lotad.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0270--000--Lotad.gif
rename to src/canonical/models/back-shiny/0270-000-Lotad.gif
diff --git a/src/canonical/models/back-shiny/0271--000--Lombre.gif b/src/canonical/models/back-shiny/0271-000-Lombre.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0271--000--Lombre.gif
rename to src/canonical/models/back-shiny/0271-000-Lombre.gif
diff --git a/src/canonical/models/back-shiny/0272--000--Ludicolo.gif b/src/canonical/models/back-shiny/0272-000-Ludicolo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0272--000--Ludicolo.gif
rename to src/canonical/models/back-shiny/0272-000-Ludicolo.gif
diff --git a/src/canonical/models/back-shiny/0273--000--Seedot.gif b/src/canonical/models/back-shiny/0273-000-Seedot.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0273--000--Seedot.gif
rename to src/canonical/models/back-shiny/0273-000-Seedot.gif
diff --git a/src/canonical/models/back-shiny/0274--000--Nuzleaf.gif b/src/canonical/models/back-shiny/0274-000-Nuzleaf.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0274--000--Nuzleaf.gif
rename to src/canonical/models/back-shiny/0274-000-Nuzleaf.gif
diff --git a/src/canonical/models/back-shiny/0275--000--Shiftry.gif b/src/canonical/models/back-shiny/0275-000-Shiftry.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0275--000--Shiftry.gif
rename to src/canonical/models/back-shiny/0275-000-Shiftry.gif
diff --git a/src/canonical/models/back-shiny/0276--000--Taillow.gif b/src/canonical/models/back-shiny/0276-000-Taillow.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0276--000--Taillow.gif
rename to src/canonical/models/back-shiny/0276-000-Taillow.gif
diff --git a/src/canonical/models/back-shiny/0277--000--Swellow.gif b/src/canonical/models/back-shiny/0277-000-Swellow.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0277--000--Swellow.gif
rename to src/canonical/models/back-shiny/0277-000-Swellow.gif
diff --git a/src/canonical/models/back-shiny/0278--000--Wingull.gif b/src/canonical/models/back-shiny/0278-000-Wingull.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0278--000--Wingull.gif
rename to src/canonical/models/back-shiny/0278-000-Wingull.gif
diff --git a/src/canonical/models/back-shiny/0279--000--Pelipper.gif b/src/canonical/models/back-shiny/0279-000-Pelipper.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0279--000--Pelipper.gif
rename to src/canonical/models/back-shiny/0279-000-Pelipper.gif
diff --git a/src/canonical/models/back-shiny/0280--000--Ralts.gif b/src/canonical/models/back-shiny/0280-000-Ralts.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0280--000--Ralts.gif
rename to src/canonical/models/back-shiny/0280-000-Ralts.gif
diff --git a/src/canonical/models/back-shiny/0281--000--Kirlia.gif b/src/canonical/models/back-shiny/0281-000-Kirlia.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0281--000--Kirlia.gif
rename to src/canonical/models/back-shiny/0281-000-Kirlia.gif
diff --git a/src/canonical/models/back-shiny/0282--000--Gardevoir.gif b/src/canonical/models/back-shiny/0282-000-Gardevoir.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0282--000--Gardevoir.gif
rename to src/canonical/models/back-shiny/0282-000-Gardevoir.gif
diff --git a/src/canonical/models/back-shiny/0282--420--Gardevoir--Mega.gif b/src/canonical/models/back-shiny/0282-420-Gardevoir-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0282--420--Gardevoir--Mega.gif
rename to src/canonical/models/back-shiny/0282-420-Gardevoir-Mega.gif
diff --git a/src/canonical/models/back-shiny/0283--000--Surskit.gif b/src/canonical/models/back-shiny/0283-000-Surskit.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0283--000--Surskit.gif
rename to src/canonical/models/back-shiny/0283-000-Surskit.gif
diff --git a/src/canonical/models/back-shiny/0284--000--Masquerain.gif b/src/canonical/models/back-shiny/0284-000-Masquerain.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0284--000--Masquerain.gif
rename to src/canonical/models/back-shiny/0284-000-Masquerain.gif
diff --git a/src/canonical/models/back-shiny/0285--000--Shroomish.gif b/src/canonical/models/back-shiny/0285-000-Shroomish.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0285--000--Shroomish.gif
rename to src/canonical/models/back-shiny/0285-000-Shroomish.gif
diff --git a/src/canonical/models/back-shiny/0286--000--Breloom.gif b/src/canonical/models/back-shiny/0286-000-Breloom.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0286--000--Breloom.gif
rename to src/canonical/models/back-shiny/0286-000-Breloom.gif
diff --git a/src/canonical/models/back-shiny/0287--000--Slakoth.gif b/src/canonical/models/back-shiny/0287-000-Slakoth.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0287--000--Slakoth.gif
rename to src/canonical/models/back-shiny/0287-000-Slakoth.gif
diff --git a/src/canonical/models/back-shiny/0288--000--Vigoroth.gif b/src/canonical/models/back-shiny/0288-000-Vigoroth.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0288--000--Vigoroth.gif
rename to src/canonical/models/back-shiny/0288-000-Vigoroth.gif
diff --git a/src/canonical/models/back-shiny/0289--000--Slaking.gif b/src/canonical/models/back-shiny/0289-000-Slaking.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0289--000--Slaking.gif
rename to src/canonical/models/back-shiny/0289-000-Slaking.gif
diff --git a/src/canonical/models/back-shiny/0290--000--Nincada.gif b/src/canonical/models/back-shiny/0290-000-Nincada.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0290--000--Nincada.gif
rename to src/canonical/models/back-shiny/0290-000-Nincada.gif
diff --git a/src/canonical/models/back-shiny/0291--000--Ninjask.gif b/src/canonical/models/back-shiny/0291-000-Ninjask.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0291--000--Ninjask.gif
rename to src/canonical/models/back-shiny/0291-000-Ninjask.gif
diff --git a/src/canonical/models/back-shiny/0292--000--Shedinja.gif b/src/canonical/models/back-shiny/0292-000-Shedinja.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0292--000--Shedinja.gif
rename to src/canonical/models/back-shiny/0292-000-Shedinja.gif
diff --git a/src/canonical/models/back-shiny/0293--000--Whismur.gif b/src/canonical/models/back-shiny/0293-000-Whismur.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0293--000--Whismur.gif
rename to src/canonical/models/back-shiny/0293-000-Whismur.gif
diff --git a/src/canonical/models/back-shiny/0294--000--Loudred.gif b/src/canonical/models/back-shiny/0294-000-Loudred.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0294--000--Loudred.gif
rename to src/canonical/models/back-shiny/0294-000-Loudred.gif
diff --git a/src/canonical/models/back-shiny/0295--000--Exploud.gif b/src/canonical/models/back-shiny/0295-000-Exploud.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0295--000--Exploud.gif
rename to src/canonical/models/back-shiny/0295-000-Exploud.gif
diff --git a/src/canonical/models/back-shiny/0296--000--Makuhita.gif b/src/canonical/models/back-shiny/0296-000-Makuhita.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0296--000--Makuhita.gif
rename to src/canonical/models/back-shiny/0296-000-Makuhita.gif
diff --git a/src/canonical/models/back-shiny/0297--000--Hariyama.gif b/src/canonical/models/back-shiny/0297-000-Hariyama.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0297--000--Hariyama.gif
rename to src/canonical/models/back-shiny/0297-000-Hariyama.gif
diff --git a/src/canonical/models/back-shiny/0298--000--Azurill.gif b/src/canonical/models/back-shiny/0298-000-Azurill.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0298--000--Azurill.gif
rename to src/canonical/models/back-shiny/0298-000-Azurill.gif
diff --git a/src/canonical/models/back-shiny/0299--000--Nosepass.gif b/src/canonical/models/back-shiny/0299-000-Nosepass.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0299--000--Nosepass.gif
rename to src/canonical/models/back-shiny/0299-000-Nosepass.gif
diff --git a/src/canonical/models/back-shiny/0300--000--Skitty.gif b/src/canonical/models/back-shiny/0300-000-Skitty.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0300--000--Skitty.gif
rename to src/canonical/models/back-shiny/0300-000-Skitty.gif
diff --git a/src/canonical/models/back-shiny/0301--000--Delcatty.gif b/src/canonical/models/back-shiny/0301-000-Delcatty.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0301--000--Delcatty.gif
rename to src/canonical/models/back-shiny/0301-000-Delcatty.gif
diff --git a/src/canonical/models/back-shiny/0302--000--Sableye.gif b/src/canonical/models/back-shiny/0302-000-Sableye.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0302--000--Sableye.gif
rename to src/canonical/models/back-shiny/0302-000-Sableye.gif
diff --git a/src/canonical/models/back-shiny/0302--420--Sableye--Mega.gif b/src/canonical/models/back-shiny/0302-420-Sableye-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0302--420--Sableye--Mega.gif
rename to src/canonical/models/back-shiny/0302-420-Sableye-Mega.gif
diff --git a/src/canonical/models/back-shiny/0303--000--Mawile.gif b/src/canonical/models/back-shiny/0303-000-Mawile.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0303--000--Mawile.gif
rename to src/canonical/models/back-shiny/0303-000-Mawile.gif
diff --git a/src/canonical/models/back-shiny/0303--420--Mawile--Mega.gif b/src/canonical/models/back-shiny/0303-420-Mawile-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0303--420--Mawile--Mega.gif
rename to src/canonical/models/back-shiny/0303-420-Mawile-Mega.gif
diff --git a/src/canonical/models/back-shiny/0304--000--Aron.gif b/src/canonical/models/back-shiny/0304-000-Aron.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0304--000--Aron.gif
rename to src/canonical/models/back-shiny/0304-000-Aron.gif
diff --git a/src/canonical/models/back-shiny/0305--000--Lairon.gif b/src/canonical/models/back-shiny/0305-000-Lairon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0305--000--Lairon.gif
rename to src/canonical/models/back-shiny/0305-000-Lairon.gif
diff --git a/src/canonical/models/back-shiny/0306--000--Aggron.gif b/src/canonical/models/back-shiny/0306-000-Aggron.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0306--000--Aggron.gif
rename to src/canonical/models/back-shiny/0306-000-Aggron.gif
diff --git a/src/canonical/models/back-shiny/0306--420--Aggron--Mega.gif b/src/canonical/models/back-shiny/0306-420-Aggron-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0306--420--Aggron--Mega.gif
rename to src/canonical/models/back-shiny/0306-420-Aggron-Mega.gif
diff --git a/src/canonical/models/back-shiny/0307--000--Meditite.gif b/src/canonical/models/back-shiny/0307-000-Meditite.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0307--000--Meditite.gif
rename to src/canonical/models/back-shiny/0307-000-Meditite.gif
diff --git a/src/canonical/models/back-shiny/0308--000--Medicham.gif b/src/canonical/models/back-shiny/0308-000-Medicham.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0308--000--Medicham.gif
rename to src/canonical/models/back-shiny/0308-000-Medicham.gif
diff --git a/src/canonical/models/back-shiny/0308--420--Medicham--Mega.gif b/src/canonical/models/back-shiny/0308-420-Medicham-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0308--420--Medicham--Mega.gif
rename to src/canonical/models/back-shiny/0308-420-Medicham-Mega.gif
diff --git a/src/canonical/models/back-shiny/0309--000--Electrike.gif b/src/canonical/models/back-shiny/0309-000-Electrike.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0309--000--Electrike.gif
rename to src/canonical/models/back-shiny/0309-000-Electrike.gif
diff --git a/src/canonical/models/back-shiny/0310--000--Manectric.gif b/src/canonical/models/back-shiny/0310-000-Manectric.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0310--000--Manectric.gif
rename to src/canonical/models/back-shiny/0310-000-Manectric.gif
diff --git a/src/canonical/models/back-shiny/0310--420--Manectric--Mega.gif b/src/canonical/models/back-shiny/0310-420-Manectric-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0310--420--Manectric--Mega.gif
rename to src/canonical/models/back-shiny/0310-420-Manectric-Mega.gif
diff --git a/src/canonical/models/back-shiny/0311--000--Plusle.gif b/src/canonical/models/back-shiny/0311-000-Plusle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0311--000--Plusle.gif
rename to src/canonical/models/back-shiny/0311-000-Plusle.gif
diff --git a/src/canonical/models/back-shiny/0312--000--Minun.gif b/src/canonical/models/back-shiny/0312-000-Minun.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0312--000--Minun.gif
rename to src/canonical/models/back-shiny/0312-000-Minun.gif
diff --git a/src/canonical/models/back-shiny/0313--000--Volbeat.gif b/src/canonical/models/back-shiny/0313-000-Volbeat.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0313--000--Volbeat.gif
rename to src/canonical/models/back-shiny/0313-000-Volbeat.gif
diff --git a/src/canonical/models/back-shiny/0314--000--Illumise.gif b/src/canonical/models/back-shiny/0314-000-Illumise.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0314--000--Illumise.gif
rename to src/canonical/models/back-shiny/0314-000-Illumise.gif
diff --git a/src/canonical/models/back-shiny/0315--000--Roselia.gif b/src/canonical/models/back-shiny/0315-000-Roselia.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0315--000--Roselia.gif
rename to src/canonical/models/back-shiny/0315-000-Roselia.gif
diff --git a/src/canonical/models/back-shiny/0316--000--Gulpin.gif b/src/canonical/models/back-shiny/0316-000-Gulpin.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0316--000--Gulpin.gif
rename to src/canonical/models/back-shiny/0316-000-Gulpin.gif
diff --git a/src/canonical/models/back-shiny/0317--000--Swalot.gif b/src/canonical/models/back-shiny/0317-000-Swalot.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0317--000--Swalot.gif
rename to src/canonical/models/back-shiny/0317-000-Swalot.gif
diff --git a/src/canonical/models/back-shiny/0318--000--Carvanha.gif b/src/canonical/models/back-shiny/0318-000-Carvanha.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0318--000--Carvanha.gif
rename to src/canonical/models/back-shiny/0318-000-Carvanha.gif
diff --git a/src/canonical/models/back-shiny/0319--000--Sharpedo.gif b/src/canonical/models/back-shiny/0319-000-Sharpedo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0319--000--Sharpedo.gif
rename to src/canonical/models/back-shiny/0319-000-Sharpedo.gif
diff --git a/src/canonical/models/back-shiny/0319--420--Sharpedo--Mega.gif b/src/canonical/models/back-shiny/0319-420-Sharpedo-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0319--420--Sharpedo--Mega.gif
rename to src/canonical/models/back-shiny/0319-420-Sharpedo-Mega.gif
diff --git a/src/canonical/models/back-shiny/0320--000--Wailmer.gif b/src/canonical/models/back-shiny/0320-000-Wailmer.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0320--000--Wailmer.gif
rename to src/canonical/models/back-shiny/0320-000-Wailmer.gif
diff --git a/src/canonical/models/back-shiny/0321--000--Wailord.gif b/src/canonical/models/back-shiny/0321-000-Wailord.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0321--000--Wailord.gif
rename to src/canonical/models/back-shiny/0321-000-Wailord.gif
diff --git a/src/canonical/models/back-shiny/0322--000--Numel.gif b/src/canonical/models/back-shiny/0322-000-Numel.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0322--000--Numel.gif
rename to src/canonical/models/back-shiny/0322-000-Numel.gif
diff --git a/src/canonical/models/back-shiny/0323--000--Camerupt.gif b/src/canonical/models/back-shiny/0323-000-Camerupt.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0323--000--Camerupt.gif
rename to src/canonical/models/back-shiny/0323-000-Camerupt.gif
diff --git a/src/canonical/models/back-shiny/0323--420--Camerupt--Mega.gif b/src/canonical/models/back-shiny/0323-420-Camerupt-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0323--420--Camerupt--Mega.gif
rename to src/canonical/models/back-shiny/0323-420-Camerupt-Mega.gif
diff --git a/src/canonical/models/back-shiny/0324--000--Torkoal.gif b/src/canonical/models/back-shiny/0324-000-Torkoal.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0324--000--Torkoal.gif
rename to src/canonical/models/back-shiny/0324-000-Torkoal.gif
diff --git a/src/canonical/models/back-shiny/0325--000--Spoink.gif b/src/canonical/models/back-shiny/0325-000-Spoink.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0325--000--Spoink.gif
rename to src/canonical/models/back-shiny/0325-000-Spoink.gif
diff --git a/src/canonical/models/back-shiny/0326--000--Grumpig.gif b/src/canonical/models/back-shiny/0326-000-Grumpig.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0326--000--Grumpig.gif
rename to src/canonical/models/back-shiny/0326-000-Grumpig.gif
diff --git a/src/canonical/models/back-shiny/0327--000--Spinda.gif b/src/canonical/models/back-shiny/0327-000-Spinda.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0327--000--Spinda.gif
rename to src/canonical/models/back-shiny/0327-000-Spinda.gif
diff --git a/src/canonical/models/back-shiny/0328--000--Trapinch.gif b/src/canonical/models/back-shiny/0328-000-Trapinch.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0328--000--Trapinch.gif
rename to src/canonical/models/back-shiny/0328-000-Trapinch.gif
diff --git a/src/canonical/models/back-shiny/0329--000--Vibrava.gif b/src/canonical/models/back-shiny/0329-000-Vibrava.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0329--000--Vibrava.gif
rename to src/canonical/models/back-shiny/0329-000-Vibrava.gif
diff --git a/src/canonical/models/back-shiny/0330--000--Flygon.gif b/src/canonical/models/back-shiny/0330-000-Flygon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0330--000--Flygon.gif
rename to src/canonical/models/back-shiny/0330-000-Flygon.gif
diff --git a/src/canonical/models/back-shiny/0331--000--Cacnea.gif b/src/canonical/models/back-shiny/0331-000-Cacnea.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0331--000--Cacnea.gif
rename to src/canonical/models/back-shiny/0331-000-Cacnea.gif
diff --git a/src/canonical/models/back-shiny/0332--000--Cacturne.gif b/src/canonical/models/back-shiny/0332-000-Cacturne.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0332--000--Cacturne.gif
rename to src/canonical/models/back-shiny/0332-000-Cacturne.gif
diff --git a/src/canonical/models/back-shiny/0333--000--Swablu.gif b/src/canonical/models/back-shiny/0333-000-Swablu.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0333--000--Swablu.gif
rename to src/canonical/models/back-shiny/0333-000-Swablu.gif
diff --git a/src/canonical/models/back-shiny/0334--000--Altaria.gif b/src/canonical/models/back-shiny/0334-000-Altaria.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0334--000--Altaria.gif
rename to src/canonical/models/back-shiny/0334-000-Altaria.gif
diff --git a/src/canonical/models/back-shiny/0334--420--Altaria--Mega.gif b/src/canonical/models/back-shiny/0334-420-Altaria-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0334--420--Altaria--Mega.gif
rename to src/canonical/models/back-shiny/0334-420-Altaria-Mega.gif
diff --git a/src/canonical/models/back-shiny/0335--000--Zangoose.gif b/src/canonical/models/back-shiny/0335-000-Zangoose.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0335--000--Zangoose.gif
rename to src/canonical/models/back-shiny/0335-000-Zangoose.gif
diff --git a/src/canonical/models/back-shiny/0336--000--Seviper.gif b/src/canonical/models/back-shiny/0336-000-Seviper.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0336--000--Seviper.gif
rename to src/canonical/models/back-shiny/0336-000-Seviper.gif
diff --git a/src/canonical/models/back-shiny/0337--000--Lunatone.gif b/src/canonical/models/back-shiny/0337-000-Lunatone.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0337--000--Lunatone.gif
rename to src/canonical/models/back-shiny/0337-000-Lunatone.gif
diff --git a/src/canonical/models/back-shiny/0338--000--Solrock.gif b/src/canonical/models/back-shiny/0338-000-Solrock.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0338--000--Solrock.gif
rename to src/canonical/models/back-shiny/0338-000-Solrock.gif
diff --git a/src/canonical/models/back-shiny/0339--000--Barboach.gif b/src/canonical/models/back-shiny/0339-000-Barboach.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0339--000--Barboach.gif
rename to src/canonical/models/back-shiny/0339-000-Barboach.gif
diff --git a/src/canonical/models/back-shiny/0340--000--Whiscash.gif b/src/canonical/models/back-shiny/0340-000-Whiscash.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0340--000--Whiscash.gif
rename to src/canonical/models/back-shiny/0340-000-Whiscash.gif
diff --git a/src/canonical/models/back-shiny/0341--000--Corphish.gif b/src/canonical/models/back-shiny/0341-000-Corphish.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0341--000--Corphish.gif
rename to src/canonical/models/back-shiny/0341-000-Corphish.gif
diff --git a/src/canonical/models/back-shiny/0342--000--Crawdaunt.gif b/src/canonical/models/back-shiny/0342-000-Crawdaunt.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0342--000--Crawdaunt.gif
rename to src/canonical/models/back-shiny/0342-000-Crawdaunt.gif
diff --git a/src/canonical/models/back-shiny/0343--000--Baltoy.gif b/src/canonical/models/back-shiny/0343-000-Baltoy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0343--000--Baltoy.gif
rename to src/canonical/models/back-shiny/0343-000-Baltoy.gif
diff --git a/src/canonical/models/back-shiny/0344--000--Claydol.gif b/src/canonical/models/back-shiny/0344-000-Claydol.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0344--000--Claydol.gif
rename to src/canonical/models/back-shiny/0344-000-Claydol.gif
diff --git a/src/canonical/models/back-shiny/0345--000--Lileep.gif b/src/canonical/models/back-shiny/0345-000-Lileep.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0345--000--Lileep.gif
rename to src/canonical/models/back-shiny/0345-000-Lileep.gif
diff --git a/src/canonical/models/back-shiny/0346--000--Cradily.gif b/src/canonical/models/back-shiny/0346-000-Cradily.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0346--000--Cradily.gif
rename to src/canonical/models/back-shiny/0346-000-Cradily.gif
diff --git a/src/canonical/models/back-shiny/0347--000--Anorith.gif b/src/canonical/models/back-shiny/0347-000-Anorith.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0347--000--Anorith.gif
rename to src/canonical/models/back-shiny/0347-000-Anorith.gif
diff --git a/src/canonical/models/back-shiny/0348--000--Armaldo.gif b/src/canonical/models/back-shiny/0348-000-Armaldo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0348--000--Armaldo.gif
rename to src/canonical/models/back-shiny/0348-000-Armaldo.gif
diff --git a/src/canonical/models/back-shiny/0349--000--Feebas.gif b/src/canonical/models/back-shiny/0349-000-Feebas.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0349--000--Feebas.gif
rename to src/canonical/models/back-shiny/0349-000-Feebas.gif
diff --git a/src/canonical/models/back-shiny/0350--000--Milotic.gif b/src/canonical/models/back-shiny/0350-000-Milotic.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0350--000--Milotic.gif
rename to src/canonical/models/back-shiny/0350-000-Milotic.gif
diff --git a/src/canonical/models/back-shiny/0351--000--Castform.gif b/src/canonical/models/back-shiny/0351-000-Castform.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0351--000--Castform.gif
rename to src/canonical/models/back-shiny/0351-000-Castform.gif
diff --git a/src/canonical/models/back-shiny/0351--420--Castform--Rainy.gif b/src/canonical/models/back-shiny/0351-420-Castform-Rainy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0351--420--Castform--Rainy.gif
rename to src/canonical/models/back-shiny/0351-420-Castform-Rainy.gif
diff --git a/src/canonical/models/back-shiny/0351--420--Castform--Snowy.gif b/src/canonical/models/back-shiny/0351-420-Castform-Snowy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0351--420--Castform--Snowy.gif
rename to src/canonical/models/back-shiny/0351-420-Castform-Snowy.gif
diff --git a/src/canonical/models/back-shiny/0351--420--Castform--Sunny.gif b/src/canonical/models/back-shiny/0351-420-Castform-Sunny.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0351--420--Castform--Sunny.gif
rename to src/canonical/models/back-shiny/0351-420-Castform-Sunny.gif
diff --git a/src/canonical/models/back-shiny/0352--000--Kecleon.gif b/src/canonical/models/back-shiny/0352-000-Kecleon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0352--000--Kecleon.gif
rename to src/canonical/models/back-shiny/0352-000-Kecleon.gif
diff --git a/src/canonical/models/back-shiny/0353--000--Shuppet.gif b/src/canonical/models/back-shiny/0353-000-Shuppet.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0353--000--Shuppet.gif
rename to src/canonical/models/back-shiny/0353-000-Shuppet.gif
diff --git a/src/canonical/models/back-shiny/0354--000--Banette.gif b/src/canonical/models/back-shiny/0354-000-Banette.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0354--000--Banette.gif
rename to src/canonical/models/back-shiny/0354-000-Banette.gif
diff --git a/src/canonical/models/back-shiny/0354--420--Banette--Mega.gif b/src/canonical/models/back-shiny/0354-420-Banette-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0354--420--Banette--Mega.gif
rename to src/canonical/models/back-shiny/0354-420-Banette-Mega.gif
diff --git a/src/canonical/models/back-shiny/0355--000--Duskull.gif b/src/canonical/models/back-shiny/0355-000-Duskull.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0355--000--Duskull.gif
rename to src/canonical/models/back-shiny/0355-000-Duskull.gif
diff --git a/src/canonical/models/back-shiny/0356--000--Dusclops.gif b/src/canonical/models/back-shiny/0356-000-Dusclops.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0356--000--Dusclops.gif
rename to src/canonical/models/back-shiny/0356-000-Dusclops.gif
diff --git a/src/canonical/models/back-shiny/0357--000--Tropius.gif b/src/canonical/models/back-shiny/0357-000-Tropius.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0357--000--Tropius.gif
rename to src/canonical/models/back-shiny/0357-000-Tropius.gif
diff --git a/src/canonical/models/back-shiny/0358--000--Chimecho.gif b/src/canonical/models/back-shiny/0358-000-Chimecho.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0358--000--Chimecho.gif
rename to src/canonical/models/back-shiny/0358-000-Chimecho.gif
diff --git a/src/canonical/models/back-shiny/0359--000--Absol.gif b/src/canonical/models/back-shiny/0359-000-Absol.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0359--000--Absol.gif
rename to src/canonical/models/back-shiny/0359-000-Absol.gif
diff --git a/src/canonical/models/back-shiny/0359--420--Absol--Mega.gif b/src/canonical/models/back-shiny/0359-420-Absol-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0359--420--Absol--Mega.gif
rename to src/canonical/models/back-shiny/0359-420-Absol-Mega.gif
diff --git a/src/canonical/models/back-shiny/0360--000--Wynaut.gif b/src/canonical/models/back-shiny/0360-000-Wynaut.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0360--000--Wynaut.gif
rename to src/canonical/models/back-shiny/0360-000-Wynaut.gif
diff --git a/src/canonical/models/back-shiny/0361--000--Snorunt.gif b/src/canonical/models/back-shiny/0361-000-Snorunt.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0361--000--Snorunt.gif
rename to src/canonical/models/back-shiny/0361-000-Snorunt.gif
diff --git a/src/canonical/models/back-shiny/0362--000--Glalie.gif b/src/canonical/models/back-shiny/0362-000-Glalie.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0362--000--Glalie.gif
rename to src/canonical/models/back-shiny/0362-000-Glalie.gif
diff --git a/src/canonical/models/back-shiny/0362--420--Glalie--Mega.gif b/src/canonical/models/back-shiny/0362-420-Glalie-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0362--420--Glalie--Mega.gif
rename to src/canonical/models/back-shiny/0362-420-Glalie-Mega.gif
diff --git a/src/canonical/models/back-shiny/0363--000--Spheal.gif b/src/canonical/models/back-shiny/0363-000-Spheal.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0363--000--Spheal.gif
rename to src/canonical/models/back-shiny/0363-000-Spheal.gif
diff --git a/src/canonical/models/back-shiny/0364--000--Sealeo.gif b/src/canonical/models/back-shiny/0364-000-Sealeo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0364--000--Sealeo.gif
rename to src/canonical/models/back-shiny/0364-000-Sealeo.gif
diff --git a/src/canonical/models/back-shiny/0365--000--Walrein.gif b/src/canonical/models/back-shiny/0365-000-Walrein.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0365--000--Walrein.gif
rename to src/canonical/models/back-shiny/0365-000-Walrein.gif
diff --git a/src/canonical/models/back-shiny/0366--000--Clamperl.gif b/src/canonical/models/back-shiny/0366-000-Clamperl.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0366--000--Clamperl.gif
rename to src/canonical/models/back-shiny/0366-000-Clamperl.gif
diff --git a/src/canonical/models/back-shiny/0367--000--Huntail.gif b/src/canonical/models/back-shiny/0367-000-Huntail.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0367--000--Huntail.gif
rename to src/canonical/models/back-shiny/0367-000-Huntail.gif
diff --git a/src/canonical/models/back-shiny/0368--000--Gorebyss.gif b/src/canonical/models/back-shiny/0368-000-Gorebyss.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0368--000--Gorebyss.gif
rename to src/canonical/models/back-shiny/0368-000-Gorebyss.gif
diff --git a/src/canonical/models/back-shiny/0369--000--Relicanth.gif b/src/canonical/models/back-shiny/0369-000-Relicanth.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0369--000--Relicanth.gif
rename to src/canonical/models/back-shiny/0369-000-Relicanth.gif
diff --git a/src/canonical/models/back-shiny/0370--000--Luvdisc.gif b/src/canonical/models/back-shiny/0370-000-Luvdisc.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0370--000--Luvdisc.gif
rename to src/canonical/models/back-shiny/0370-000-Luvdisc.gif
diff --git a/src/canonical/models/back-shiny/0371--000--Bagon.gif b/src/canonical/models/back-shiny/0371-000-Bagon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0371--000--Bagon.gif
rename to src/canonical/models/back-shiny/0371-000-Bagon.gif
diff --git a/src/canonical/models/back-shiny/0372--000--Shelgon.gif b/src/canonical/models/back-shiny/0372-000-Shelgon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0372--000--Shelgon.gif
rename to src/canonical/models/back-shiny/0372-000-Shelgon.gif
diff --git a/src/canonical/models/back-shiny/0373--000--Salamence.gif b/src/canonical/models/back-shiny/0373-000-Salamence.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0373--000--Salamence.gif
rename to src/canonical/models/back-shiny/0373-000-Salamence.gif
diff --git a/src/canonical/models/back-shiny/0373--420--Salamence--Mega.gif b/src/canonical/models/back-shiny/0373-420-Salamence-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0373--420--Salamence--Mega.gif
rename to src/canonical/models/back-shiny/0373-420-Salamence-Mega.gif
diff --git a/src/canonical/models/back-shiny/0374--000--Beldum.gif b/src/canonical/models/back-shiny/0374-000-Beldum.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0374--000--Beldum.gif
rename to src/canonical/models/back-shiny/0374-000-Beldum.gif
diff --git a/src/canonical/models/back-shiny/0375--000--Metang.gif b/src/canonical/models/back-shiny/0375-000-Metang.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0375--000--Metang.gif
rename to src/canonical/models/back-shiny/0375-000-Metang.gif
diff --git a/src/canonical/models/back-shiny/0376--000--Metagross.gif b/src/canonical/models/back-shiny/0376-000-Metagross.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0376--000--Metagross.gif
rename to src/canonical/models/back-shiny/0376-000-Metagross.gif
diff --git a/src/canonical/models/back-shiny/0376--420--Metagross--Mega.gif b/src/canonical/models/back-shiny/0376-420-Metagross-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0376--420--Metagross--Mega.gif
rename to src/canonical/models/back-shiny/0376-420-Metagross-Mega.gif
diff --git a/src/canonical/models/back-shiny/0377--000--Regirock.gif b/src/canonical/models/back-shiny/0377-000-Regirock.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0377--000--Regirock.gif
rename to src/canonical/models/back-shiny/0377-000-Regirock.gif
diff --git a/src/canonical/models/back-shiny/0378--000--Regice.gif b/src/canonical/models/back-shiny/0378-000-Regice.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0378--000--Regice.gif
rename to src/canonical/models/back-shiny/0378-000-Regice.gif
diff --git a/src/canonical/models/back-shiny/0379--000--Registeel.gif b/src/canonical/models/back-shiny/0379-000-Registeel.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0379--000--Registeel.gif
rename to src/canonical/models/back-shiny/0379-000-Registeel.gif
diff --git a/src/canonical/models/back-shiny/0380--000--Latias.gif b/src/canonical/models/back-shiny/0380-000-Latias.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0380--000--Latias.gif
rename to src/canonical/models/back-shiny/0380-000-Latias.gif
diff --git a/src/canonical/models/back-shiny/0380--420--Latias--Mega.gif b/src/canonical/models/back-shiny/0380-420-Latias-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0380--420--Latias--Mega.gif
rename to src/canonical/models/back-shiny/0380-420-Latias-Mega.gif
diff --git a/src/canonical/models/back-shiny/0381--000--Latios.gif b/src/canonical/models/back-shiny/0381-000-Latios.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0381--000--Latios.gif
rename to src/canonical/models/back-shiny/0381-000-Latios.gif
diff --git a/src/canonical/models/back-shiny/0381--420--Latios--Mega.gif b/src/canonical/models/back-shiny/0381-420-Latios-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0381--420--Latios--Mega.gif
rename to src/canonical/models/back-shiny/0381-420-Latios-Mega.gif
diff --git a/src/canonical/models/back-shiny/0382--000--Kyogre.gif b/src/canonical/models/back-shiny/0382-000-Kyogre.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0382--000--Kyogre.gif
rename to src/canonical/models/back-shiny/0382-000-Kyogre.gif
diff --git a/src/canonical/models/back-shiny/0382--420--Kyogre--Primal.gif b/src/canonical/models/back-shiny/0382-420-Kyogre-Primal.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0382--420--Kyogre--Primal.gif
rename to src/canonical/models/back-shiny/0382-420-Kyogre-Primal.gif
diff --git a/src/canonical/models/back-shiny/0383--000--Groudon.gif b/src/canonical/models/back-shiny/0383-000-Groudon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0383--000--Groudon.gif
rename to src/canonical/models/back-shiny/0383-000-Groudon.gif
diff --git a/src/canonical/models/back-shiny/0383--420--Groudon--Primal.gif b/src/canonical/models/back-shiny/0383-420-Groudon-Primal.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0383--420--Groudon--Primal.gif
rename to src/canonical/models/back-shiny/0383-420-Groudon-Primal.gif
diff --git a/src/canonical/models/back-shiny/0384--000--Rayquaza.gif b/src/canonical/models/back-shiny/0384-000-Rayquaza.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0384--000--Rayquaza.gif
rename to src/canonical/models/back-shiny/0384-000-Rayquaza.gif
diff --git a/src/canonical/models/back-shiny/0384--420--Rayquaza--Mega.gif b/src/canonical/models/back-shiny/0384-420-Rayquaza-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0384--420--Rayquaza--Mega.gif
rename to src/canonical/models/back-shiny/0384-420-Rayquaza-Mega.gif
diff --git a/src/canonical/models/back-shiny/0385--000--Jirachi.gif b/src/canonical/models/back-shiny/0385-000-Jirachi.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0385--000--Jirachi.gif
rename to src/canonical/models/back-shiny/0385-000-Jirachi.gif
diff --git a/src/canonical/models/back-shiny/0386--000--Deoxys.gif b/src/canonical/models/back-shiny/0386-000-Deoxys.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0386--000--Deoxys.gif
rename to src/canonical/models/back-shiny/0386-000-Deoxys.gif
diff --git a/src/canonical/models/back-shiny/0386--420--Deoxys--Attack.gif b/src/canonical/models/back-shiny/0386-420-Deoxys-Attack.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0386--420--Deoxys--Attack.gif
rename to src/canonical/models/back-shiny/0386-420-Deoxys-Attack.gif
diff --git a/src/canonical/models/back-shiny/0386--420--Deoxys--Defense.gif b/src/canonical/models/back-shiny/0386-420-Deoxys-Defense.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0386--420--Deoxys--Defense.gif
rename to src/canonical/models/back-shiny/0386-420-Deoxys-Defense.gif
diff --git a/src/canonical/models/back-shiny/0386--420--Deoxys--Speed.gif b/src/canonical/models/back-shiny/0386-420-Deoxys-Speed.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0386--420--Deoxys--Speed.gif
rename to src/canonical/models/back-shiny/0386-420-Deoxys-Speed.gif
diff --git a/src/canonical/models/back-shiny/0387--000--Turtwig.gif b/src/canonical/models/back-shiny/0387-000-Turtwig.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0387--000--Turtwig.gif
rename to src/canonical/models/back-shiny/0387-000-Turtwig.gif
diff --git a/src/canonical/models/back-shiny/0388--000--Grotle.gif b/src/canonical/models/back-shiny/0388-000-Grotle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0388--000--Grotle.gif
rename to src/canonical/models/back-shiny/0388-000-Grotle.gif
diff --git a/src/canonical/models/back-shiny/0389--000--Torterra.gif b/src/canonical/models/back-shiny/0389-000-Torterra.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0389--000--Torterra.gif
rename to src/canonical/models/back-shiny/0389-000-Torterra.gif
diff --git a/src/canonical/models/back-shiny/0390--000--Chimchar.gif b/src/canonical/models/back-shiny/0390-000-Chimchar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0390--000--Chimchar.gif
rename to src/canonical/models/back-shiny/0390-000-Chimchar.gif
diff --git a/src/canonical/models/back-shiny/0391--000--Monferno.gif b/src/canonical/models/back-shiny/0391-000-Monferno.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0391--000--Monferno.gif
rename to src/canonical/models/back-shiny/0391-000-Monferno.gif
diff --git a/src/canonical/models/back-shiny/0392--000--Infernape.gif b/src/canonical/models/back-shiny/0392-000-Infernape.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0392--000--Infernape.gif
rename to src/canonical/models/back-shiny/0392-000-Infernape.gif
diff --git a/src/canonical/models/back-shiny/0393--000--Piplup.gif b/src/canonical/models/back-shiny/0393-000-Piplup.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0393--000--Piplup.gif
rename to src/canonical/models/back-shiny/0393-000-Piplup.gif
diff --git a/src/canonical/models/back-shiny/0394--000--Prinplup.gif b/src/canonical/models/back-shiny/0394-000-Prinplup.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0394--000--Prinplup.gif
rename to src/canonical/models/back-shiny/0394-000-Prinplup.gif
diff --git a/src/canonical/models/back-shiny/0395--000--Empoleon.gif b/src/canonical/models/back-shiny/0395-000-Empoleon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0395--000--Empoleon.gif
rename to src/canonical/models/back-shiny/0395-000-Empoleon.gif
diff --git a/src/canonical/models/back-shiny/0396--000--Starly.gif b/src/canonical/models/back-shiny/0396-000-Starly.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0396--000--Starly.gif
rename to src/canonical/models/back-shiny/0396-000-Starly.gif
diff --git a/src/canonical/models/back-shiny/0397--000--Staravia.gif b/src/canonical/models/back-shiny/0397-000-Staravia.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0397--000--Staravia.gif
rename to src/canonical/models/back-shiny/0397-000-Staravia.gif
diff --git a/src/canonical/models/back-shiny/0398--000--Staraptor.gif b/src/canonical/models/back-shiny/0398-000-Staraptor.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0398--000--Staraptor.gif
rename to src/canonical/models/back-shiny/0398-000-Staraptor.gif
diff --git a/src/canonical/models/back-shiny/0399--000--Bidoof.gif b/src/canonical/models/back-shiny/0399-000-Bidoof.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0399--000--Bidoof.gif
rename to src/canonical/models/back-shiny/0399-000-Bidoof.gif
diff --git a/src/canonical/models/back-shiny/0400--000--Bibarel.gif b/src/canonical/models/back-shiny/0400-000-Bibarel.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0400--000--Bibarel.gif
rename to src/canonical/models/back-shiny/0400-000-Bibarel.gif
diff --git a/src/canonical/models/back-shiny/0401--000--Kricketot.gif b/src/canonical/models/back-shiny/0401-000-Kricketot.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0401--000--Kricketot.gif
rename to src/canonical/models/back-shiny/0401-000-Kricketot.gif
diff --git a/src/canonical/models/back-shiny/0402--000--Kricketune.gif b/src/canonical/models/back-shiny/0402-000-Kricketune.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0402--000--Kricketune.gif
rename to src/canonical/models/back-shiny/0402-000-Kricketune.gif
diff --git a/src/canonical/models/back-shiny/0403--000--Shinx.gif b/src/canonical/models/back-shiny/0403-000-Shinx.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0403--000--Shinx.gif
rename to src/canonical/models/back-shiny/0403-000-Shinx.gif
diff --git a/src/canonical/models/back-shiny/0404--000--Luxio.gif b/src/canonical/models/back-shiny/0404-000-Luxio.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0404--000--Luxio.gif
rename to src/canonical/models/back-shiny/0404-000-Luxio.gif
diff --git a/src/canonical/models/back-shiny/0405--000--Luxray.gif b/src/canonical/models/back-shiny/0405-000-Luxray.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0405--000--Luxray.gif
rename to src/canonical/models/back-shiny/0405-000-Luxray.gif
diff --git a/src/canonical/models/back-shiny/0406--000--Budew.gif b/src/canonical/models/back-shiny/0406-000-Budew.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0406--000--Budew.gif
rename to src/canonical/models/back-shiny/0406-000-Budew.gif
diff --git a/src/canonical/models/back-shiny/0407--000--Roserade.gif b/src/canonical/models/back-shiny/0407-000-Roserade.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0407--000--Roserade.gif
rename to src/canonical/models/back-shiny/0407-000-Roserade.gif
diff --git a/src/canonical/models/back-shiny/0408--000--Cranidos.gif b/src/canonical/models/back-shiny/0408-000-Cranidos.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0408--000--Cranidos.gif
rename to src/canonical/models/back-shiny/0408-000-Cranidos.gif
diff --git a/src/canonical/models/back-shiny/0409--000--Rampardos.gif b/src/canonical/models/back-shiny/0409-000-Rampardos.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0409--000--Rampardos.gif
rename to src/canonical/models/back-shiny/0409-000-Rampardos.gif
diff --git a/src/canonical/models/back-shiny/0410--000--Shieldon.gif b/src/canonical/models/back-shiny/0410-000-Shieldon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0410--000--Shieldon.gif
rename to src/canonical/models/back-shiny/0410-000-Shieldon.gif
diff --git a/src/canonical/models/back-shiny/0411--000--Bastiodon.gif b/src/canonical/models/back-shiny/0411-000-Bastiodon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0411--000--Bastiodon.gif
rename to src/canonical/models/back-shiny/0411-000-Bastiodon.gif
diff --git a/src/canonical/models/back-shiny/0412--000--Burmy.gif b/src/canonical/models/back-shiny/0412-000-Burmy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0412--000--Burmy.gif
rename to src/canonical/models/back-shiny/0412-000-Burmy.gif
diff --git a/src/canonical/models/back-shiny/0413--000--Wormadam.gif b/src/canonical/models/back-shiny/0413-000-Wormadam.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0413--000--Wormadam.gif
rename to src/canonical/models/back-shiny/0413-000-Wormadam.gif
diff --git a/src/canonical/models/back-shiny/0413--420--Wormadam--Sandy.gif b/src/canonical/models/back-shiny/0413-420-Wormadam-Sandy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0413--420--Wormadam--Sandy.gif
rename to src/canonical/models/back-shiny/0413-420-Wormadam-Sandy.gif
diff --git a/src/canonical/models/back-shiny/0413--420--Wormadam--Trash.gif b/src/canonical/models/back-shiny/0413-420-Wormadam-Trash.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0413--420--Wormadam--Trash.gif
rename to src/canonical/models/back-shiny/0413-420-Wormadam-Trash.gif
diff --git a/src/canonical/models/back-shiny/0414--000--Mothim.gif b/src/canonical/models/back-shiny/0414-000-Mothim.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0414--000--Mothim.gif
rename to src/canonical/models/back-shiny/0414-000-Mothim.gif
diff --git a/src/canonical/models/back-shiny/0415--000--Combee.gif b/src/canonical/models/back-shiny/0415-000-Combee.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0415--000--Combee.gif
rename to src/canonical/models/back-shiny/0415-000-Combee.gif
diff --git a/src/canonical/models/back-shiny/0416--000--Vespiquen.gif b/src/canonical/models/back-shiny/0416-000-Vespiquen.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0416--000--Vespiquen.gif
rename to src/canonical/models/back-shiny/0416-000-Vespiquen.gif
diff --git a/src/canonical/models/back-shiny/0417--000--Pachirisu.gif b/src/canonical/models/back-shiny/0417-000-Pachirisu.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0417--000--Pachirisu.gif
rename to src/canonical/models/back-shiny/0417-000-Pachirisu.gif
diff --git a/src/canonical/models/back-shiny/0418--000--Buizel.gif b/src/canonical/models/back-shiny/0418-000-Buizel.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0418--000--Buizel.gif
rename to src/canonical/models/back-shiny/0418-000-Buizel.gif
diff --git a/src/canonical/models/back-shiny/0419--000--Floatzel.gif b/src/canonical/models/back-shiny/0419-000-Floatzel.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0419--000--Floatzel.gif
rename to src/canonical/models/back-shiny/0419-000-Floatzel.gif
diff --git a/src/canonical/models/back-shiny/0420--000--Cherubi.gif b/src/canonical/models/back-shiny/0420-000-Cherubi.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0420--000--Cherubi.gif
rename to src/canonical/models/back-shiny/0420-000-Cherubi.gif
diff --git a/src/canonical/models/back-shiny/0421--000--Cherrim.gif b/src/canonical/models/back-shiny/0421-000-Cherrim.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0421--000--Cherrim.gif
rename to src/canonical/models/back-shiny/0421-000-Cherrim.gif
diff --git a/src/canonical/models/back-shiny/0421--420--Cherrim--Sunshine.gif b/src/canonical/models/back-shiny/0421-420-Cherrim-Sunshine.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0421--420--Cherrim--Sunshine.gif
rename to src/canonical/models/back-shiny/0421-420-Cherrim-Sunshine.gif
diff --git a/src/canonical/models/back-shiny/0422--000--Shellos.gif b/src/canonical/models/back-shiny/0422-000-Shellos.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0422--000--Shellos.gif
rename to src/canonical/models/back-shiny/0422-000-Shellos.gif
diff --git a/src/canonical/models/back-shiny/0423--000--Gastrodon.gif b/src/canonical/models/back-shiny/0423-000-Gastrodon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0423--000--Gastrodon.gif
rename to src/canonical/models/back-shiny/0423-000-Gastrodon.gif
diff --git a/src/canonical/models/back-shiny/0424--000--Ambipom.gif b/src/canonical/models/back-shiny/0424-000-Ambipom.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0424--000--Ambipom.gif
rename to src/canonical/models/back-shiny/0424-000-Ambipom.gif
diff --git a/src/canonical/models/back-shiny/0425--000--Drifloon.gif b/src/canonical/models/back-shiny/0425-000-Drifloon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0425--000--Drifloon.gif
rename to src/canonical/models/back-shiny/0425-000-Drifloon.gif
diff --git a/src/canonical/models/back-shiny/0426--000--Drifblim.gif b/src/canonical/models/back-shiny/0426-000-Drifblim.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0426--000--Drifblim.gif
rename to src/canonical/models/back-shiny/0426-000-Drifblim.gif
diff --git a/src/canonical/models/back-shiny/0427--000--Buneary.gif b/src/canonical/models/back-shiny/0427-000-Buneary.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0427--000--Buneary.gif
rename to src/canonical/models/back-shiny/0427-000-Buneary.gif
diff --git a/src/canonical/models/back-shiny/0428--000--Lopunny.gif b/src/canonical/models/back-shiny/0428-000-Lopunny.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0428--000--Lopunny.gif
rename to src/canonical/models/back-shiny/0428-000-Lopunny.gif
diff --git a/src/canonical/models/back-shiny/0428--420--Lopunny--Mega.gif b/src/canonical/models/back-shiny/0428-420-Lopunny-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0428--420--Lopunny--Mega.gif
rename to src/canonical/models/back-shiny/0428-420-Lopunny-Mega.gif
diff --git a/src/canonical/models/back-shiny/0429--000--Mismagius.gif b/src/canonical/models/back-shiny/0429-000-Mismagius.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0429--000--Mismagius.gif
rename to src/canonical/models/back-shiny/0429-000-Mismagius.gif
diff --git a/src/canonical/models/back-shiny/0430--000--Honchkrow.gif b/src/canonical/models/back-shiny/0430-000-Honchkrow.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0430--000--Honchkrow.gif
rename to src/canonical/models/back-shiny/0430-000-Honchkrow.gif
diff --git a/src/canonical/models/back-shiny/0431--000--Glameow.gif b/src/canonical/models/back-shiny/0431-000-Glameow.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0431--000--Glameow.gif
rename to src/canonical/models/back-shiny/0431-000-Glameow.gif
diff --git a/src/canonical/models/back-shiny/0432--000--Purugly.gif b/src/canonical/models/back-shiny/0432-000-Purugly.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0432--000--Purugly.gif
rename to src/canonical/models/back-shiny/0432-000-Purugly.gif
diff --git a/src/canonical/models/back-shiny/0433--000--Chingling.gif b/src/canonical/models/back-shiny/0433-000-Chingling.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0433--000--Chingling.gif
rename to src/canonical/models/back-shiny/0433-000-Chingling.gif
diff --git a/src/canonical/models/back-shiny/0434--000--Stunky.gif b/src/canonical/models/back-shiny/0434-000-Stunky.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0434--000--Stunky.gif
rename to src/canonical/models/back-shiny/0434-000-Stunky.gif
diff --git a/src/canonical/models/back-shiny/0435--000--Skuntank.gif b/src/canonical/models/back-shiny/0435-000-Skuntank.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0435--000--Skuntank.gif
rename to src/canonical/models/back-shiny/0435-000-Skuntank.gif
diff --git a/src/canonical/models/back-shiny/0436--000--Bronzor.gif b/src/canonical/models/back-shiny/0436-000-Bronzor.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0436--000--Bronzor.gif
rename to src/canonical/models/back-shiny/0436-000-Bronzor.gif
diff --git a/src/canonical/models/back-shiny/0437--000--Bronzong.gif b/src/canonical/models/back-shiny/0437-000-Bronzong.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0437--000--Bronzong.gif
rename to src/canonical/models/back-shiny/0437-000-Bronzong.gif
diff --git a/src/canonical/models/back-shiny/0438--000--Bonsly.gif b/src/canonical/models/back-shiny/0438-000-Bonsly.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0438--000--Bonsly.gif
rename to src/canonical/models/back-shiny/0438-000-Bonsly.gif
diff --git a/src/canonical/models/back-shiny/0439--000--Mime_Jr..gif b/src/canonical/models/back-shiny/0439-000-Mime_Jr..gif
similarity index 100%
rename from src/canonical/models/back-shiny/0439--000--Mime_Jr..gif
rename to src/canonical/models/back-shiny/0439-000-Mime_Jr..gif
diff --git a/src/canonical/models/back-shiny/0440--000--Happiny.gif b/src/canonical/models/back-shiny/0440-000-Happiny.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0440--000--Happiny.gif
rename to src/canonical/models/back-shiny/0440-000-Happiny.gif
diff --git a/src/canonical/models/back-shiny/0441--000--Chatot.gif b/src/canonical/models/back-shiny/0441-000-Chatot.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0441--000--Chatot.gif
rename to src/canonical/models/back-shiny/0441-000-Chatot.gif
diff --git a/src/canonical/models/back-shiny/0442--000--Spiritomb.gif b/src/canonical/models/back-shiny/0442-000-Spiritomb.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0442--000--Spiritomb.gif
rename to src/canonical/models/back-shiny/0442-000-Spiritomb.gif
diff --git a/src/canonical/models/back-shiny/0443--000--Gible.gif b/src/canonical/models/back-shiny/0443-000-Gible.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0443--000--Gible.gif
rename to src/canonical/models/back-shiny/0443-000-Gible.gif
diff --git a/src/canonical/models/back-shiny/0444--000--Gabite.gif b/src/canonical/models/back-shiny/0444-000-Gabite.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0444--000--Gabite.gif
rename to src/canonical/models/back-shiny/0444-000-Gabite.gif
diff --git a/src/canonical/models/back-shiny/0445--000--Garchomp.gif b/src/canonical/models/back-shiny/0445-000-Garchomp.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0445--000--Garchomp.gif
rename to src/canonical/models/back-shiny/0445-000-Garchomp.gif
diff --git a/src/canonical/models/back-shiny/0445--420--Garchomp--Mega.gif b/src/canonical/models/back-shiny/0445-420-Garchomp-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0445--420--Garchomp--Mega.gif
rename to src/canonical/models/back-shiny/0445-420-Garchomp-Mega.gif
diff --git a/src/canonical/models/back-shiny/0446--000--Munchlax.gif b/src/canonical/models/back-shiny/0446-000-Munchlax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0446--000--Munchlax.gif
rename to src/canonical/models/back-shiny/0446-000-Munchlax.gif
diff --git a/src/canonical/models/back-shiny/0447--000--Riolu.gif b/src/canonical/models/back-shiny/0447-000-Riolu.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0447--000--Riolu.gif
rename to src/canonical/models/back-shiny/0447-000-Riolu.gif
diff --git a/src/canonical/models/back-shiny/0448--000--Lucario.gif b/src/canonical/models/back-shiny/0448-000-Lucario.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0448--000--Lucario.gif
rename to src/canonical/models/back-shiny/0448-000-Lucario.gif
diff --git a/src/canonical/models/back-shiny/0448--420--Lucario--Mega.gif b/src/canonical/models/back-shiny/0448-420-Lucario-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0448--420--Lucario--Mega.gif
rename to src/canonical/models/back-shiny/0448-420-Lucario-Mega.gif
diff --git a/src/canonical/models/back-shiny/0449--000--Hippopotas.gif b/src/canonical/models/back-shiny/0449-000-Hippopotas.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0449--000--Hippopotas.gif
rename to src/canonical/models/back-shiny/0449-000-Hippopotas.gif
diff --git a/src/canonical/models/back-shiny/0450--000--Hippowdon.gif b/src/canonical/models/back-shiny/0450-000-Hippowdon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0450--000--Hippowdon.gif
rename to src/canonical/models/back-shiny/0450-000-Hippowdon.gif
diff --git a/src/canonical/models/back-shiny/0451--000--Skorupi.gif b/src/canonical/models/back-shiny/0451-000-Skorupi.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0451--000--Skorupi.gif
rename to src/canonical/models/back-shiny/0451-000-Skorupi.gif
diff --git a/src/canonical/models/back-shiny/0452--000--Drapion.gif b/src/canonical/models/back-shiny/0452-000-Drapion.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0452--000--Drapion.gif
rename to src/canonical/models/back-shiny/0452-000-Drapion.gif
diff --git a/src/canonical/models/back-shiny/0453--000--Croagunk.gif b/src/canonical/models/back-shiny/0453-000-Croagunk.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0453--000--Croagunk.gif
rename to src/canonical/models/back-shiny/0453-000-Croagunk.gif
diff --git a/src/canonical/models/back-shiny/0454--000--Toxicroak.gif b/src/canonical/models/back-shiny/0454-000-Toxicroak.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0454--000--Toxicroak.gif
rename to src/canonical/models/back-shiny/0454-000-Toxicroak.gif
diff --git a/src/canonical/models/back-shiny/0455--000--Carnivine.gif b/src/canonical/models/back-shiny/0455-000-Carnivine.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0455--000--Carnivine.gif
rename to src/canonical/models/back-shiny/0455-000-Carnivine.gif
diff --git a/src/canonical/models/back-shiny/0456--000--Finneon.gif b/src/canonical/models/back-shiny/0456-000-Finneon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0456--000--Finneon.gif
rename to src/canonical/models/back-shiny/0456-000-Finneon.gif
diff --git a/src/canonical/models/back-shiny/0457--000--Lumineon.gif b/src/canonical/models/back-shiny/0457-000-Lumineon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0457--000--Lumineon.gif
rename to src/canonical/models/back-shiny/0457-000-Lumineon.gif
diff --git a/src/canonical/models/back-shiny/0458--000--Mantyke.gif b/src/canonical/models/back-shiny/0458-000-Mantyke.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0458--000--Mantyke.gif
rename to src/canonical/models/back-shiny/0458-000-Mantyke.gif
diff --git a/src/canonical/models/back-shiny/0459--000--Snover.gif b/src/canonical/models/back-shiny/0459-000-Snover.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0459--000--Snover.gif
rename to src/canonical/models/back-shiny/0459-000-Snover.gif
diff --git a/src/canonical/models/back-shiny/0460--000--Abomasnow.gif b/src/canonical/models/back-shiny/0460-000-Abomasnow.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0460--000--Abomasnow.gif
rename to src/canonical/models/back-shiny/0460-000-Abomasnow.gif
diff --git a/src/canonical/models/back-shiny/0460--420--Abomasnow--Mega.gif b/src/canonical/models/back-shiny/0460-420-Abomasnow-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0460--420--Abomasnow--Mega.gif
rename to src/canonical/models/back-shiny/0460-420-Abomasnow-Mega.gif
diff --git a/src/canonical/models/back-shiny/0461--000--Weavile.gif b/src/canonical/models/back-shiny/0461-000-Weavile.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0461--000--Weavile.gif
rename to src/canonical/models/back-shiny/0461-000-Weavile.gif
diff --git a/src/canonical/models/back-shiny/0462--000--Magnezone.gif b/src/canonical/models/back-shiny/0462-000-Magnezone.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0462--000--Magnezone.gif
rename to src/canonical/models/back-shiny/0462-000-Magnezone.gif
diff --git a/src/canonical/models/back-shiny/0463--000--Lickilicky.gif b/src/canonical/models/back-shiny/0463-000-Lickilicky.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0463--000--Lickilicky.gif
rename to src/canonical/models/back-shiny/0463-000-Lickilicky.gif
diff --git a/src/canonical/models/back-shiny/0464--000--Rhyperior.gif b/src/canonical/models/back-shiny/0464-000-Rhyperior.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0464--000--Rhyperior.gif
rename to src/canonical/models/back-shiny/0464-000-Rhyperior.gif
diff --git a/src/canonical/models/back-shiny/0465--000--Tangrowth.gif b/src/canonical/models/back-shiny/0465-000-Tangrowth.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0465--000--Tangrowth.gif
rename to src/canonical/models/back-shiny/0465-000-Tangrowth.gif
diff --git a/src/canonical/models/back-shiny/0466--000--Electivire.gif b/src/canonical/models/back-shiny/0466-000-Electivire.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0466--000--Electivire.gif
rename to src/canonical/models/back-shiny/0466-000-Electivire.gif
diff --git a/src/canonical/models/back-shiny/0467--000--Magmortar.gif b/src/canonical/models/back-shiny/0467-000-Magmortar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0467--000--Magmortar.gif
rename to src/canonical/models/back-shiny/0467-000-Magmortar.gif
diff --git a/src/canonical/models/back-shiny/0468--000--Togekiss.gif b/src/canonical/models/back-shiny/0468-000-Togekiss.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0468--000--Togekiss.gif
rename to src/canonical/models/back-shiny/0468-000-Togekiss.gif
diff --git a/src/canonical/models/back-shiny/0469--000--Yanmega.gif b/src/canonical/models/back-shiny/0469-000-Yanmega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0469--000--Yanmega.gif
rename to src/canonical/models/back-shiny/0469-000-Yanmega.gif
diff --git a/src/canonical/models/back-shiny/0470--000--Leafeon.gif b/src/canonical/models/back-shiny/0470-000-Leafeon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0470--000--Leafeon.gif
rename to src/canonical/models/back-shiny/0470-000-Leafeon.gif
diff --git a/src/canonical/models/back-shiny/0471--000--Glaceon.gif b/src/canonical/models/back-shiny/0471-000-Glaceon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0471--000--Glaceon.gif
rename to src/canonical/models/back-shiny/0471-000-Glaceon.gif
diff --git a/src/canonical/models/back-shiny/0472--000--Gliscor.gif b/src/canonical/models/back-shiny/0472-000-Gliscor.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0472--000--Gliscor.gif
rename to src/canonical/models/back-shiny/0472-000-Gliscor.gif
diff --git a/src/canonical/models/back-shiny/0473--000--Mamoswine.gif b/src/canonical/models/back-shiny/0473-000-Mamoswine.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0473--000--Mamoswine.gif
rename to src/canonical/models/back-shiny/0473-000-Mamoswine.gif
diff --git a/src/canonical/models/back-shiny/0474--000--Porygon-Z.gif b/src/canonical/models/back-shiny/0474-000-Porygon~Z.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0474--000--Porygon-Z.gif
rename to src/canonical/models/back-shiny/0474-000-Porygon~Z.gif
diff --git a/src/canonical/models/back-shiny/0475--000--Gallade.gif b/src/canonical/models/back-shiny/0475-000-Gallade.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0475--000--Gallade.gif
rename to src/canonical/models/back-shiny/0475-000-Gallade.gif
diff --git a/src/canonical/models/back-shiny/0475--420--Gallade--Mega.gif b/src/canonical/models/back-shiny/0475-420-Gallade-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0475--420--Gallade--Mega.gif
rename to src/canonical/models/back-shiny/0475-420-Gallade-Mega.gif
diff --git a/src/canonical/models/back-shiny/0476--000--Probopass.gif b/src/canonical/models/back-shiny/0476-000-Probopass.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0476--000--Probopass.gif
rename to src/canonical/models/back-shiny/0476-000-Probopass.gif
diff --git a/src/canonical/models/back-shiny/0477--000--Dusknoir.gif b/src/canonical/models/back-shiny/0477-000-Dusknoir.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0477--000--Dusknoir.gif
rename to src/canonical/models/back-shiny/0477-000-Dusknoir.gif
diff --git a/src/canonical/models/back-shiny/0478--000--Froslass.gif b/src/canonical/models/back-shiny/0478-000-Froslass.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0478--000--Froslass.gif
rename to src/canonical/models/back-shiny/0478-000-Froslass.gif
diff --git a/src/canonical/models/back-shiny/0479--000--Rotom.gif b/src/canonical/models/back-shiny/0479-000-Rotom.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0479--000--Rotom.gif
rename to src/canonical/models/back-shiny/0479-000-Rotom.gif
diff --git a/src/canonical/models/back-shiny/0479--420--Rotom--Fan.gif b/src/canonical/models/back-shiny/0479-420-Rotom-Fan.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0479--420--Rotom--Fan.gif
rename to src/canonical/models/back-shiny/0479-420-Rotom-Fan.gif
diff --git a/src/canonical/models/back-shiny/0479--420--Rotom--Frost.gif b/src/canonical/models/back-shiny/0479-420-Rotom-Frost.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0479--420--Rotom--Frost.gif
rename to src/canonical/models/back-shiny/0479-420-Rotom-Frost.gif
diff --git a/src/canonical/models/back-shiny/0479--420--Rotom--Heat.gif b/src/canonical/models/back-shiny/0479-420-Rotom-Heat.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0479--420--Rotom--Heat.gif
rename to src/canonical/models/back-shiny/0479-420-Rotom-Heat.gif
diff --git a/src/canonical/models/back-shiny/0479--420--Rotom--Mow.gif b/src/canonical/models/back-shiny/0479-420-Rotom-Mow.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0479--420--Rotom--Mow.gif
rename to src/canonical/models/back-shiny/0479-420-Rotom-Mow.gif
diff --git a/src/canonical/models/back-shiny/0479--420--Rotom--Wash.gif b/src/canonical/models/back-shiny/0479-420-Rotom-Wash.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0479--420--Rotom--Wash.gif
rename to src/canonical/models/back-shiny/0479-420-Rotom-Wash.gif
diff --git a/src/canonical/models/back-shiny/0480--000--Uxie.gif b/src/canonical/models/back-shiny/0480-000-Uxie.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0480--000--Uxie.gif
rename to src/canonical/models/back-shiny/0480-000-Uxie.gif
diff --git a/src/canonical/models/back-shiny/0481--000--Mesprit.gif b/src/canonical/models/back-shiny/0481-000-Mesprit.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0481--000--Mesprit.gif
rename to src/canonical/models/back-shiny/0481-000-Mesprit.gif
diff --git a/src/canonical/models/back-shiny/0482--000--Azelf.gif b/src/canonical/models/back-shiny/0482-000-Azelf.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0482--000--Azelf.gif
rename to src/canonical/models/back-shiny/0482-000-Azelf.gif
diff --git a/src/canonical/models/back-shiny/0483--000--Dialga.gif b/src/canonical/models/back-shiny/0483-000-Dialga.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0483--000--Dialga.gif
rename to src/canonical/models/back-shiny/0483-000-Dialga.gif
diff --git a/src/canonical/models/back-shiny/0484--000--Palkia.gif b/src/canonical/models/back-shiny/0484-000-Palkia.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0484--000--Palkia.gif
rename to src/canonical/models/back-shiny/0484-000-Palkia.gif
diff --git a/src/canonical/models/back-shiny/0485--000--Heatran.gif b/src/canonical/models/back-shiny/0485-000-Heatran.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0485--000--Heatran.gif
rename to src/canonical/models/back-shiny/0485-000-Heatran.gif
diff --git a/src/canonical/models/back-shiny/0486--000--Regigigas.gif b/src/canonical/models/back-shiny/0486-000-Regigigas.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0486--000--Regigigas.gif
rename to src/canonical/models/back-shiny/0486-000-Regigigas.gif
diff --git a/src/canonical/models/back-shiny/0487--000--Giratina.gif b/src/canonical/models/back-shiny/0487-000-Giratina.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0487--000--Giratina.gif
rename to src/canonical/models/back-shiny/0487-000-Giratina.gif
diff --git a/src/canonical/models/back-shiny/0487--420--Giratina--Origin.gif b/src/canonical/models/back-shiny/0487-420-Giratina-Origin.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0487--420--Giratina--Origin.gif
rename to src/canonical/models/back-shiny/0487-420-Giratina-Origin.gif
diff --git a/src/canonical/models/back-shiny/0488--000--Cresselia.gif b/src/canonical/models/back-shiny/0488-000-Cresselia.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0488--000--Cresselia.gif
rename to src/canonical/models/back-shiny/0488-000-Cresselia.gif
diff --git a/src/canonical/models/back-shiny/0489--000--Phione.gif b/src/canonical/models/back-shiny/0489-000-Phione.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0489--000--Phione.gif
rename to src/canonical/models/back-shiny/0489-000-Phione.gif
diff --git a/src/canonical/models/back-shiny/0490--000--Manaphy.gif b/src/canonical/models/back-shiny/0490-000-Manaphy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0490--000--Manaphy.gif
rename to src/canonical/models/back-shiny/0490-000-Manaphy.gif
diff --git a/src/canonical/models/back-shiny/0491--000--Darkrai.gif b/src/canonical/models/back-shiny/0491-000-Darkrai.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0491--000--Darkrai.gif
rename to src/canonical/models/back-shiny/0491-000-Darkrai.gif
diff --git a/src/canonical/models/back-shiny/0492--000--Shaymin.gif b/src/canonical/models/back-shiny/0492-000-Shaymin.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0492--000--Shaymin.gif
rename to src/canonical/models/back-shiny/0492-000-Shaymin.gif
diff --git a/src/canonical/models/back-shiny/0492--420--Shaymin--Sky.gif b/src/canonical/models/back-shiny/0492-420-Shaymin-Sky.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0492--420--Shaymin--Sky.gif
rename to src/canonical/models/back-shiny/0492-420-Shaymin-Sky.gif
diff --git a/src/canonical/models/back-shiny/0493--000--Arceus.gif b/src/canonical/models/back-shiny/0493-000-Arceus.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--000--Arceus.gif
rename to src/canonical/models/back-shiny/0493-000-Arceus.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Bug.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Bug.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Bug.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Bug.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Dark.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Dark.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Dark.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Dark.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Dragon.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Dragon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Dragon.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Dragon.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Electric.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Electric.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Electric.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Electric.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Fairy.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Fairy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Fairy.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Fairy.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Fighting.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Fighting.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Fighting.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Fighting.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Fire.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Fire.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Fire.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Fire.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Flying.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Flying.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Flying.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Flying.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Ghost.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Ghost.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Ghost.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Ghost.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Grass.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Grass.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Grass.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Grass.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Ground.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Ground.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Ground.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Ground.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Ice.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Ice.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Ice.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Ice.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Poison.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Poison.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Poison.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Poison.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Psychic.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Psychic.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Psychic.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Psychic.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Rock.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Rock.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Rock.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Rock.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Steel.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Steel.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Steel.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Steel.gif
diff --git a/src/canonical/models/back-shiny/0493--420--Arceus--Water.gif b/src/canonical/models/back-shiny/0493-420-Arceus-Water.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0493--420--Arceus--Water.gif
rename to src/canonical/models/back-shiny/0493-420-Arceus-Water.gif
diff --git a/src/canonical/models/back-shiny/0494--000--Victini.gif b/src/canonical/models/back-shiny/0494-000-Victini.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0494--000--Victini.gif
rename to src/canonical/models/back-shiny/0494-000-Victini.gif
diff --git a/src/canonical/models/back-shiny/0495--000--Snivy.gif b/src/canonical/models/back-shiny/0495-000-Snivy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0495--000--Snivy.gif
rename to src/canonical/models/back-shiny/0495-000-Snivy.gif
diff --git a/src/canonical/models/back-shiny/0496--000--Servine.gif b/src/canonical/models/back-shiny/0496-000-Servine.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0496--000--Servine.gif
rename to src/canonical/models/back-shiny/0496-000-Servine.gif
diff --git a/src/canonical/models/back-shiny/0497--000--Serperior.gif b/src/canonical/models/back-shiny/0497-000-Serperior.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0497--000--Serperior.gif
rename to src/canonical/models/back-shiny/0497-000-Serperior.gif
diff --git a/src/canonical/models/back-shiny/0498--000--Tepig.gif b/src/canonical/models/back-shiny/0498-000-Tepig.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0498--000--Tepig.gif
rename to src/canonical/models/back-shiny/0498-000-Tepig.gif
diff --git a/src/canonical/models/back-shiny/0499--000--Pignite.gif b/src/canonical/models/back-shiny/0499-000-Pignite.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0499--000--Pignite.gif
rename to src/canonical/models/back-shiny/0499-000-Pignite.gif
diff --git a/src/canonical/models/back-shiny/0500--000--Emboar.gif b/src/canonical/models/back-shiny/0500-000-Emboar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0500--000--Emboar.gif
rename to src/canonical/models/back-shiny/0500-000-Emboar.gif
diff --git a/src/canonical/models/back-shiny/0501--000--Oshawott.gif b/src/canonical/models/back-shiny/0501-000-Oshawott.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0501--000--Oshawott.gif
rename to src/canonical/models/back-shiny/0501-000-Oshawott.gif
diff --git a/src/canonical/models/back-shiny/0502--000--Dewott.gif b/src/canonical/models/back-shiny/0502-000-Dewott.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0502--000--Dewott.gif
rename to src/canonical/models/back-shiny/0502-000-Dewott.gif
diff --git a/src/canonical/models/back-shiny/0503--000--Samurott.gif b/src/canonical/models/back-shiny/0503-000-Samurott.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0503--000--Samurott.gif
rename to src/canonical/models/back-shiny/0503-000-Samurott.gif
diff --git a/src/canonical/models/back-shiny/0504--000--Patrat.gif b/src/canonical/models/back-shiny/0504-000-Patrat.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0504--000--Patrat.gif
rename to src/canonical/models/back-shiny/0504-000-Patrat.gif
diff --git a/src/canonical/models/back-shiny/0505--000--Watchog.gif b/src/canonical/models/back-shiny/0505-000-Watchog.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0505--000--Watchog.gif
rename to src/canonical/models/back-shiny/0505-000-Watchog.gif
diff --git a/src/canonical/models/back-shiny/0506--000--Lillipup.gif b/src/canonical/models/back-shiny/0506-000-Lillipup.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0506--000--Lillipup.gif
rename to src/canonical/models/back-shiny/0506-000-Lillipup.gif
diff --git a/src/canonical/models/back-shiny/0507--000--Herdier.gif b/src/canonical/models/back-shiny/0507-000-Herdier.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0507--000--Herdier.gif
rename to src/canonical/models/back-shiny/0507-000-Herdier.gif
diff --git a/src/canonical/models/back-shiny/0508--000--Stoutland.gif b/src/canonical/models/back-shiny/0508-000-Stoutland.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0508--000--Stoutland.gif
rename to src/canonical/models/back-shiny/0508-000-Stoutland.gif
diff --git a/src/canonical/models/back-shiny/0509--000--Purrloin.gif b/src/canonical/models/back-shiny/0509-000-Purrloin.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0509--000--Purrloin.gif
rename to src/canonical/models/back-shiny/0509-000-Purrloin.gif
diff --git a/src/canonical/models/back-shiny/0510--000--Liepard.gif b/src/canonical/models/back-shiny/0510-000-Liepard.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0510--000--Liepard.gif
rename to src/canonical/models/back-shiny/0510-000-Liepard.gif
diff --git a/src/canonical/models/back-shiny/0511--000--Pansage.gif b/src/canonical/models/back-shiny/0511-000-Pansage.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0511--000--Pansage.gif
rename to src/canonical/models/back-shiny/0511-000-Pansage.gif
diff --git a/src/canonical/models/back-shiny/0512--000--Simisage.gif b/src/canonical/models/back-shiny/0512-000-Simisage.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0512--000--Simisage.gif
rename to src/canonical/models/back-shiny/0512-000-Simisage.gif
diff --git a/src/canonical/models/back-shiny/0513--000--Pansear.gif b/src/canonical/models/back-shiny/0513-000-Pansear.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0513--000--Pansear.gif
rename to src/canonical/models/back-shiny/0513-000-Pansear.gif
diff --git a/src/canonical/models/back-shiny/0514--000--Simisear.gif b/src/canonical/models/back-shiny/0514-000-Simisear.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0514--000--Simisear.gif
rename to src/canonical/models/back-shiny/0514-000-Simisear.gif
diff --git a/src/canonical/models/back-shiny/0515--000--Panpour.gif b/src/canonical/models/back-shiny/0515-000-Panpour.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0515--000--Panpour.gif
rename to src/canonical/models/back-shiny/0515-000-Panpour.gif
diff --git a/src/canonical/models/back-shiny/0516--000--Simipour.gif b/src/canonical/models/back-shiny/0516-000-Simipour.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0516--000--Simipour.gif
rename to src/canonical/models/back-shiny/0516-000-Simipour.gif
diff --git a/src/canonical/models/back-shiny/0517--000--Munna.gif b/src/canonical/models/back-shiny/0517-000-Munna.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0517--000--Munna.gif
rename to src/canonical/models/back-shiny/0517-000-Munna.gif
diff --git a/src/canonical/models/back-shiny/0518--000--Musharna.gif b/src/canonical/models/back-shiny/0518-000-Musharna.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0518--000--Musharna.gif
rename to src/canonical/models/back-shiny/0518-000-Musharna.gif
diff --git a/src/canonical/models/back-shiny/0519--000--Pidove.gif b/src/canonical/models/back-shiny/0519-000-Pidove.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0519--000--Pidove.gif
rename to src/canonical/models/back-shiny/0519-000-Pidove.gif
diff --git a/src/canonical/models/back-shiny/0520--000--Tranquill.gif b/src/canonical/models/back-shiny/0520-000-Tranquill.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0520--000--Tranquill.gif
rename to src/canonical/models/back-shiny/0520-000-Tranquill.gif
diff --git a/src/canonical/models/back-shiny/0521--000--Unfezant.gif b/src/canonical/models/back-shiny/0521-000-Unfezant.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0521--000--Unfezant.gif
rename to src/canonical/models/back-shiny/0521-000-Unfezant.gif
diff --git a/src/canonical/models/back-shiny/0522--000--Blitzle.gif b/src/canonical/models/back-shiny/0522-000-Blitzle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0522--000--Blitzle.gif
rename to src/canonical/models/back-shiny/0522-000-Blitzle.gif
diff --git a/src/canonical/models/back-shiny/0523--000--Zebstrika.gif b/src/canonical/models/back-shiny/0523-000-Zebstrika.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0523--000--Zebstrika.gif
rename to src/canonical/models/back-shiny/0523-000-Zebstrika.gif
diff --git a/src/canonical/models/back-shiny/0524--000--Roggenrola.gif b/src/canonical/models/back-shiny/0524-000-Roggenrola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0524--000--Roggenrola.gif
rename to src/canonical/models/back-shiny/0524-000-Roggenrola.gif
diff --git a/src/canonical/models/back-shiny/0525--000--Boldore.gif b/src/canonical/models/back-shiny/0525-000-Boldore.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0525--000--Boldore.gif
rename to src/canonical/models/back-shiny/0525-000-Boldore.gif
diff --git a/src/canonical/models/back-shiny/0526--000--Gigalith.gif b/src/canonical/models/back-shiny/0526-000-Gigalith.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0526--000--Gigalith.gif
rename to src/canonical/models/back-shiny/0526-000-Gigalith.gif
diff --git a/src/canonical/models/back-shiny/0527--000--Woobat.gif b/src/canonical/models/back-shiny/0527-000-Woobat.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0527--000--Woobat.gif
rename to src/canonical/models/back-shiny/0527-000-Woobat.gif
diff --git a/src/canonical/models/back-shiny/0528--000--Swoobat.gif b/src/canonical/models/back-shiny/0528-000-Swoobat.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0528--000--Swoobat.gif
rename to src/canonical/models/back-shiny/0528-000-Swoobat.gif
diff --git a/src/canonical/models/back-shiny/0529--000--Drilbur.gif b/src/canonical/models/back-shiny/0529-000-Drilbur.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0529--000--Drilbur.gif
rename to src/canonical/models/back-shiny/0529-000-Drilbur.gif
diff --git a/src/canonical/models/back-shiny/0530--000--Excadrill.gif b/src/canonical/models/back-shiny/0530-000-Excadrill.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0530--000--Excadrill.gif
rename to src/canonical/models/back-shiny/0530-000-Excadrill.gif
diff --git a/src/canonical/models/back-shiny/0531--000--Audino.gif b/src/canonical/models/back-shiny/0531-000-Audino.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0531--000--Audino.gif
rename to src/canonical/models/back-shiny/0531-000-Audino.gif
diff --git a/src/canonical/models/back-shiny/0531--420--Audino--Mega.gif b/src/canonical/models/back-shiny/0531-420-Audino-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0531--420--Audino--Mega.gif
rename to src/canonical/models/back-shiny/0531-420-Audino-Mega.gif
diff --git a/src/canonical/models/back-shiny/0532--000--Timburr.gif b/src/canonical/models/back-shiny/0532-000-Timburr.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0532--000--Timburr.gif
rename to src/canonical/models/back-shiny/0532-000-Timburr.gif
diff --git a/src/canonical/models/back-shiny/0533--000--Gurdurr.gif b/src/canonical/models/back-shiny/0533-000-Gurdurr.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0533--000--Gurdurr.gif
rename to src/canonical/models/back-shiny/0533-000-Gurdurr.gif
diff --git a/src/canonical/models/back-shiny/0534--000--Conkeldurr.gif b/src/canonical/models/back-shiny/0534-000-Conkeldurr.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0534--000--Conkeldurr.gif
rename to src/canonical/models/back-shiny/0534-000-Conkeldurr.gif
diff --git a/src/canonical/models/back-shiny/0535--000--Tympole.gif b/src/canonical/models/back-shiny/0535-000-Tympole.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0535--000--Tympole.gif
rename to src/canonical/models/back-shiny/0535-000-Tympole.gif
diff --git a/src/canonical/models/back-shiny/0536--000--Palpitoad.gif b/src/canonical/models/back-shiny/0536-000-Palpitoad.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0536--000--Palpitoad.gif
rename to src/canonical/models/back-shiny/0536-000-Palpitoad.gif
diff --git a/src/canonical/models/back-shiny/0537--000--Seismitoad.gif b/src/canonical/models/back-shiny/0537-000-Seismitoad.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0537--000--Seismitoad.gif
rename to src/canonical/models/back-shiny/0537-000-Seismitoad.gif
diff --git a/src/canonical/models/back-shiny/0538--000--Throh.gif b/src/canonical/models/back-shiny/0538-000-Throh.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0538--000--Throh.gif
rename to src/canonical/models/back-shiny/0538-000-Throh.gif
diff --git a/src/canonical/models/back-shiny/0539--000--Sawk.gif b/src/canonical/models/back-shiny/0539-000-Sawk.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0539--000--Sawk.gif
rename to src/canonical/models/back-shiny/0539-000-Sawk.gif
diff --git a/src/canonical/models/back-shiny/0540--000--Sewaddle.gif b/src/canonical/models/back-shiny/0540-000-Sewaddle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0540--000--Sewaddle.gif
rename to src/canonical/models/back-shiny/0540-000-Sewaddle.gif
diff --git a/src/canonical/models/back-shiny/0541--000--Swadloon.gif b/src/canonical/models/back-shiny/0541-000-Swadloon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0541--000--Swadloon.gif
rename to src/canonical/models/back-shiny/0541-000-Swadloon.gif
diff --git a/src/canonical/models/back-shiny/0542--000--Leavanny.gif b/src/canonical/models/back-shiny/0542-000-Leavanny.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0542--000--Leavanny.gif
rename to src/canonical/models/back-shiny/0542-000-Leavanny.gif
diff --git a/src/canonical/models/back-shiny/0543--000--Venipede.gif b/src/canonical/models/back-shiny/0543-000-Venipede.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0543--000--Venipede.gif
rename to src/canonical/models/back-shiny/0543-000-Venipede.gif
diff --git a/src/canonical/models/back-shiny/0544--000--Whirlipede.gif b/src/canonical/models/back-shiny/0544-000-Whirlipede.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0544--000--Whirlipede.gif
rename to src/canonical/models/back-shiny/0544-000-Whirlipede.gif
diff --git a/src/canonical/models/back-shiny/0545--000--Scolipede.gif b/src/canonical/models/back-shiny/0545-000-Scolipede.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0545--000--Scolipede.gif
rename to src/canonical/models/back-shiny/0545-000-Scolipede.gif
diff --git a/src/canonical/models/back-shiny/0546--000--Cottonee.gif b/src/canonical/models/back-shiny/0546-000-Cottonee.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0546--000--Cottonee.gif
rename to src/canonical/models/back-shiny/0546-000-Cottonee.gif
diff --git a/src/canonical/models/back-shiny/0547--000--Whimsicott.gif b/src/canonical/models/back-shiny/0547-000-Whimsicott.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0547--000--Whimsicott.gif
rename to src/canonical/models/back-shiny/0547-000-Whimsicott.gif
diff --git a/src/canonical/models/back-shiny/0548--000--Petilil.gif b/src/canonical/models/back-shiny/0548-000-Petilil.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0548--000--Petilil.gif
rename to src/canonical/models/back-shiny/0548-000-Petilil.gif
diff --git a/src/canonical/models/back-shiny/0549--000--Lilligant.gif b/src/canonical/models/back-shiny/0549-000-Lilligant.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0549--000--Lilligant.gif
rename to src/canonical/models/back-shiny/0549-000-Lilligant.gif
diff --git a/src/canonical/models/back-shiny/0550--000--Basculin.gif b/src/canonical/models/back-shiny/0550-000-Basculin.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0550--000--Basculin.gif
rename to src/canonical/models/back-shiny/0550-000-Basculin.gif
diff --git a/src/canonical/models/back-shiny/0550--420--Basculin--Blue-Striped.gif b/src/canonical/models/back-shiny/0550-420-Basculin-Blue~Striped.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0550--420--Basculin--Blue-Striped.gif
rename to src/canonical/models/back-shiny/0550-420-Basculin-Blue~Striped.gif
diff --git a/src/canonical/models/back-shiny/0551--000--Sandile.gif b/src/canonical/models/back-shiny/0551-000-Sandile.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0551--000--Sandile.gif
rename to src/canonical/models/back-shiny/0551-000-Sandile.gif
diff --git a/src/canonical/models/back-shiny/0552--000--Krokorok.gif b/src/canonical/models/back-shiny/0552-000-Krokorok.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0552--000--Krokorok.gif
rename to src/canonical/models/back-shiny/0552-000-Krokorok.gif
diff --git a/src/canonical/models/back-shiny/0553--000--Krookodile.gif b/src/canonical/models/back-shiny/0553-000-Krookodile.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0553--000--Krookodile.gif
rename to src/canonical/models/back-shiny/0553-000-Krookodile.gif
diff --git a/src/canonical/models/back-shiny/0554--000--Darumaka.gif b/src/canonical/models/back-shiny/0554-000-Darumaka.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0554--000--Darumaka.gif
rename to src/canonical/models/back-shiny/0554-000-Darumaka.gif
diff --git a/src/canonical/models/back-shiny/0554--420--Darumaka--Galar.gif b/src/canonical/models/back-shiny/0554-420-Darumaka-Galar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0554--420--Darumaka--Galar.gif
rename to src/canonical/models/back-shiny/0554-420-Darumaka-Galar.gif
diff --git a/src/canonical/models/back-shiny/0555--000--Darmanitan.gif b/src/canonical/models/back-shiny/0555-000-Darmanitan.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0555--000--Darmanitan.gif
rename to src/canonical/models/back-shiny/0555-000-Darmanitan.gif
diff --git a/src/canonical/models/back-shiny/0555--420--Darmanitan--Galar.gif b/src/canonical/models/back-shiny/0555-420-Darmanitan-Galar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0555--420--Darmanitan--Galar.gif
rename to src/canonical/models/back-shiny/0555-420-Darmanitan-Galar.gif
diff --git a/src/canonical/models/back-shiny/0555--420--Darmanitan--Galar-Zen.gif b/src/canonical/models/back-shiny/0555-420-Darmanitan-Galar~Zen.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0555--420--Darmanitan--Galar-Zen.gif
rename to src/canonical/models/back-shiny/0555-420-Darmanitan-Galar~Zen.gif
diff --git a/src/canonical/models/back-shiny/0555--420--Darmanitan--Zen.gif b/src/canonical/models/back-shiny/0555-420-Darmanitan-Zen.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0555--420--Darmanitan--Zen.gif
rename to src/canonical/models/back-shiny/0555-420-Darmanitan-Zen.gif
diff --git a/src/canonical/models/back-shiny/0556--000--Maractus.gif b/src/canonical/models/back-shiny/0556-000-Maractus.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0556--000--Maractus.gif
rename to src/canonical/models/back-shiny/0556-000-Maractus.gif
diff --git a/src/canonical/models/back-shiny/0557--000--Dwebble.gif b/src/canonical/models/back-shiny/0557-000-Dwebble.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0557--000--Dwebble.gif
rename to src/canonical/models/back-shiny/0557-000-Dwebble.gif
diff --git a/src/canonical/models/back-shiny/0558--000--Crustle.gif b/src/canonical/models/back-shiny/0558-000-Crustle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0558--000--Crustle.gif
rename to src/canonical/models/back-shiny/0558-000-Crustle.gif
diff --git a/src/canonical/models/back-shiny/0559--000--Scraggy.gif b/src/canonical/models/back-shiny/0559-000-Scraggy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0559--000--Scraggy.gif
rename to src/canonical/models/back-shiny/0559-000-Scraggy.gif
diff --git a/src/canonical/models/back-shiny/0560--000--Scrafty.gif b/src/canonical/models/back-shiny/0560-000-Scrafty.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0560--000--Scrafty.gif
rename to src/canonical/models/back-shiny/0560-000-Scrafty.gif
diff --git a/src/canonical/models/back-shiny/0561--000--Sigilyph.gif b/src/canonical/models/back-shiny/0561-000-Sigilyph.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0561--000--Sigilyph.gif
rename to src/canonical/models/back-shiny/0561-000-Sigilyph.gif
diff --git a/src/canonical/models/back-shiny/0562--000--Yamask.gif b/src/canonical/models/back-shiny/0562-000-Yamask.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0562--000--Yamask.gif
rename to src/canonical/models/back-shiny/0562-000-Yamask.gif
diff --git a/src/canonical/models/back-shiny/0562--420--Yamask--Galar.gif b/src/canonical/models/back-shiny/0562-420-Yamask-Galar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0562--420--Yamask--Galar.gif
rename to src/canonical/models/back-shiny/0562-420-Yamask-Galar.gif
diff --git a/src/canonical/models/back-shiny/0563--000--Cofagrigus.gif b/src/canonical/models/back-shiny/0563-000-Cofagrigus.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0563--000--Cofagrigus.gif
rename to src/canonical/models/back-shiny/0563-000-Cofagrigus.gif
diff --git a/src/canonical/models/back-shiny/0564--000--Tirtouga.gif b/src/canonical/models/back-shiny/0564-000-Tirtouga.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0564--000--Tirtouga.gif
rename to src/canonical/models/back-shiny/0564-000-Tirtouga.gif
diff --git a/src/canonical/models/back-shiny/0565--000--Carracosta.gif b/src/canonical/models/back-shiny/0565-000-Carracosta.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0565--000--Carracosta.gif
rename to src/canonical/models/back-shiny/0565-000-Carracosta.gif
diff --git a/src/canonical/models/back-shiny/0566--000--Archen.gif b/src/canonical/models/back-shiny/0566-000-Archen.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0566--000--Archen.gif
rename to src/canonical/models/back-shiny/0566-000-Archen.gif
diff --git a/src/canonical/models/back-shiny/0567--000--Archeops.gif b/src/canonical/models/back-shiny/0567-000-Archeops.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0567--000--Archeops.gif
rename to src/canonical/models/back-shiny/0567-000-Archeops.gif
diff --git a/src/canonical/models/back-shiny/0568--000--Trubbish.gif b/src/canonical/models/back-shiny/0568-000-Trubbish.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0568--000--Trubbish.gif
rename to src/canonical/models/back-shiny/0568-000-Trubbish.gif
diff --git a/src/canonical/models/back-shiny/0569--000--Garbodor.gif b/src/canonical/models/back-shiny/0569-000-Garbodor.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0569--000--Garbodor.gif
rename to src/canonical/models/back-shiny/0569-000-Garbodor.gif
diff --git a/src/canonical/models/back-shiny/0569--420--Garbodor--Gmax.gif b/src/canonical/models/back-shiny/0569-420-Garbodor-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0569--420--Garbodor--Gmax.gif
rename to src/canonical/models/back-shiny/0569-420-Garbodor-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0570--000--Zorua.gif b/src/canonical/models/back-shiny/0570-000-Zorua.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0570--000--Zorua.gif
rename to src/canonical/models/back-shiny/0570-000-Zorua.gif
diff --git a/src/canonical/models/back-shiny/0571--000--Zoroark.gif b/src/canonical/models/back-shiny/0571-000-Zoroark.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0571--000--Zoroark.gif
rename to src/canonical/models/back-shiny/0571-000-Zoroark.gif
diff --git a/src/canonical/models/back-shiny/0572--000--Minccino.gif b/src/canonical/models/back-shiny/0572-000-Minccino.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0572--000--Minccino.gif
rename to src/canonical/models/back-shiny/0572-000-Minccino.gif
diff --git a/src/canonical/models/back-shiny/0573--000--Cinccino.gif b/src/canonical/models/back-shiny/0573-000-Cinccino.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0573--000--Cinccino.gif
rename to src/canonical/models/back-shiny/0573-000-Cinccino.gif
diff --git a/src/canonical/models/back-shiny/0574--000--Gothita.gif b/src/canonical/models/back-shiny/0574-000-Gothita.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0574--000--Gothita.gif
rename to src/canonical/models/back-shiny/0574-000-Gothita.gif
diff --git a/src/canonical/models/back-shiny/0575--000--Gothorita.gif b/src/canonical/models/back-shiny/0575-000-Gothorita.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0575--000--Gothorita.gif
rename to src/canonical/models/back-shiny/0575-000-Gothorita.gif
diff --git a/src/canonical/models/back-shiny/0576--000--Gothitelle.gif b/src/canonical/models/back-shiny/0576-000-Gothitelle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0576--000--Gothitelle.gif
rename to src/canonical/models/back-shiny/0576-000-Gothitelle.gif
diff --git a/src/canonical/models/back-shiny/0577--000--Solosis.gif b/src/canonical/models/back-shiny/0577-000-Solosis.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0577--000--Solosis.gif
rename to src/canonical/models/back-shiny/0577-000-Solosis.gif
diff --git a/src/canonical/models/back-shiny/0578--000--Duosion.gif b/src/canonical/models/back-shiny/0578-000-Duosion.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0578--000--Duosion.gif
rename to src/canonical/models/back-shiny/0578-000-Duosion.gif
diff --git a/src/canonical/models/back-shiny/0579--000--Reuniclus.gif b/src/canonical/models/back-shiny/0579-000-Reuniclus.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0579--000--Reuniclus.gif
rename to src/canonical/models/back-shiny/0579-000-Reuniclus.gif
diff --git a/src/canonical/models/back-shiny/0580--000--Ducklett.gif b/src/canonical/models/back-shiny/0580-000-Ducklett.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0580--000--Ducklett.gif
rename to src/canonical/models/back-shiny/0580-000-Ducklett.gif
diff --git a/src/canonical/models/back-shiny/0581--000--Swanna.gif b/src/canonical/models/back-shiny/0581-000-Swanna.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0581--000--Swanna.gif
rename to src/canonical/models/back-shiny/0581-000-Swanna.gif
diff --git a/src/canonical/models/back-shiny/0582--000--Vanillite.gif b/src/canonical/models/back-shiny/0582-000-Vanillite.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0582--000--Vanillite.gif
rename to src/canonical/models/back-shiny/0582-000-Vanillite.gif
diff --git a/src/canonical/models/back-shiny/0583--000--Vanillish.gif b/src/canonical/models/back-shiny/0583-000-Vanillish.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0583--000--Vanillish.gif
rename to src/canonical/models/back-shiny/0583-000-Vanillish.gif
diff --git a/src/canonical/models/back-shiny/0584--000--Vanilluxe.gif b/src/canonical/models/back-shiny/0584-000-Vanilluxe.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0584--000--Vanilluxe.gif
rename to src/canonical/models/back-shiny/0584-000-Vanilluxe.gif
diff --git a/src/canonical/models/back-shiny/0585--000--Deerling.gif b/src/canonical/models/back-shiny/0585-000-Deerling.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0585--000--Deerling.gif
rename to src/canonical/models/back-shiny/0585-000-Deerling.gif
diff --git a/src/canonical/models/back-shiny/0586--000--Sawsbuck.gif b/src/canonical/models/back-shiny/0586-000-Sawsbuck.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0586--000--Sawsbuck.gif
rename to src/canonical/models/back-shiny/0586-000-Sawsbuck.gif
diff --git a/src/canonical/models/back-shiny/0587--000--Emolga.gif b/src/canonical/models/back-shiny/0587-000-Emolga.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0587--000--Emolga.gif
rename to src/canonical/models/back-shiny/0587-000-Emolga.gif
diff --git a/src/canonical/models/back-shiny/0588--000--Karrablast.gif b/src/canonical/models/back-shiny/0588-000-Karrablast.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0588--000--Karrablast.gif
rename to src/canonical/models/back-shiny/0588-000-Karrablast.gif
diff --git a/src/canonical/models/back-shiny/0589--000--Escavalier.gif b/src/canonical/models/back-shiny/0589-000-Escavalier.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0589--000--Escavalier.gif
rename to src/canonical/models/back-shiny/0589-000-Escavalier.gif
diff --git a/src/canonical/models/back-shiny/0590--000--Foongus.gif b/src/canonical/models/back-shiny/0590-000-Foongus.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0590--000--Foongus.gif
rename to src/canonical/models/back-shiny/0590-000-Foongus.gif
diff --git a/src/canonical/models/back-shiny/0591--000--Amoonguss.gif b/src/canonical/models/back-shiny/0591-000-Amoonguss.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0591--000--Amoonguss.gif
rename to src/canonical/models/back-shiny/0591-000-Amoonguss.gif
diff --git a/src/canonical/models/back-shiny/0592--000--Frillish.gif b/src/canonical/models/back-shiny/0592-000-Frillish.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0592--000--Frillish.gif
rename to src/canonical/models/back-shiny/0592-000-Frillish.gif
diff --git a/src/canonical/models/back-shiny/0593--000--Jellicent.gif b/src/canonical/models/back-shiny/0593-000-Jellicent.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0593--000--Jellicent.gif
rename to src/canonical/models/back-shiny/0593-000-Jellicent.gif
diff --git a/src/canonical/models/back-shiny/0594--000--Alomomola.gif b/src/canonical/models/back-shiny/0594-000-Alomomola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0594--000--Alomomola.gif
rename to src/canonical/models/back-shiny/0594-000-Alomomola.gif
diff --git a/src/canonical/models/back-shiny/0595--000--Joltik.gif b/src/canonical/models/back-shiny/0595-000-Joltik.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0595--000--Joltik.gif
rename to src/canonical/models/back-shiny/0595-000-Joltik.gif
diff --git a/src/canonical/models/back-shiny/0596--000--Galvantula.gif b/src/canonical/models/back-shiny/0596-000-Galvantula.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0596--000--Galvantula.gif
rename to src/canonical/models/back-shiny/0596-000-Galvantula.gif
diff --git a/src/canonical/models/back-shiny/0597--000--Ferroseed.gif b/src/canonical/models/back-shiny/0597-000-Ferroseed.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0597--000--Ferroseed.gif
rename to src/canonical/models/back-shiny/0597-000-Ferroseed.gif
diff --git a/src/canonical/models/back-shiny/0598--000--Ferrothorn.gif b/src/canonical/models/back-shiny/0598-000-Ferrothorn.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0598--000--Ferrothorn.gif
rename to src/canonical/models/back-shiny/0598-000-Ferrothorn.gif
diff --git a/src/canonical/models/back-shiny/0599--000--Klink.gif b/src/canonical/models/back-shiny/0599-000-Klink.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0599--000--Klink.gif
rename to src/canonical/models/back-shiny/0599-000-Klink.gif
diff --git a/src/canonical/models/back-shiny/0600--000--Klang.gif b/src/canonical/models/back-shiny/0600-000-Klang.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0600--000--Klang.gif
rename to src/canonical/models/back-shiny/0600-000-Klang.gif
diff --git a/src/canonical/models/back-shiny/0601--000--Klinklang.gif b/src/canonical/models/back-shiny/0601-000-Klinklang.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0601--000--Klinklang.gif
rename to src/canonical/models/back-shiny/0601-000-Klinklang.gif
diff --git a/src/canonical/models/back-shiny/0602--000--Tynamo.gif b/src/canonical/models/back-shiny/0602-000-Tynamo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0602--000--Tynamo.gif
rename to src/canonical/models/back-shiny/0602-000-Tynamo.gif
diff --git a/src/canonical/models/back-shiny/0603--000--Eelektrik.gif b/src/canonical/models/back-shiny/0603-000-Eelektrik.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0603--000--Eelektrik.gif
rename to src/canonical/models/back-shiny/0603-000-Eelektrik.gif
diff --git a/src/canonical/models/back-shiny/0604--000--Eelektross.gif b/src/canonical/models/back-shiny/0604-000-Eelektross.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0604--000--Eelektross.gif
rename to src/canonical/models/back-shiny/0604-000-Eelektross.gif
diff --git a/src/canonical/models/back-shiny/0605--000--Elgyem.gif b/src/canonical/models/back-shiny/0605-000-Elgyem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0605--000--Elgyem.gif
rename to src/canonical/models/back-shiny/0605-000-Elgyem.gif
diff --git a/src/canonical/models/back-shiny/0606--000--Beheeyem.gif b/src/canonical/models/back-shiny/0606-000-Beheeyem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0606--000--Beheeyem.gif
rename to src/canonical/models/back-shiny/0606-000-Beheeyem.gif
diff --git a/src/canonical/models/back-shiny/0607--000--Litwick.gif b/src/canonical/models/back-shiny/0607-000-Litwick.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0607--000--Litwick.gif
rename to src/canonical/models/back-shiny/0607-000-Litwick.gif
diff --git a/src/canonical/models/back-shiny/0608--000--Lampent.gif b/src/canonical/models/back-shiny/0608-000-Lampent.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0608--000--Lampent.gif
rename to src/canonical/models/back-shiny/0608-000-Lampent.gif
diff --git a/src/canonical/models/back-shiny/0609--000--Chandelure.gif b/src/canonical/models/back-shiny/0609-000-Chandelure.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0609--000--Chandelure.gif
rename to src/canonical/models/back-shiny/0609-000-Chandelure.gif
diff --git a/src/canonical/models/back-shiny/0610--000--Axew.gif b/src/canonical/models/back-shiny/0610-000-Axew.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0610--000--Axew.gif
rename to src/canonical/models/back-shiny/0610-000-Axew.gif
diff --git a/src/canonical/models/back-shiny/0611--000--Fraxure.gif b/src/canonical/models/back-shiny/0611-000-Fraxure.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0611--000--Fraxure.gif
rename to src/canonical/models/back-shiny/0611-000-Fraxure.gif
diff --git a/src/canonical/models/back-shiny/0612--000--Haxorus.gif b/src/canonical/models/back-shiny/0612-000-Haxorus.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0612--000--Haxorus.gif
rename to src/canonical/models/back-shiny/0612-000-Haxorus.gif
diff --git a/src/canonical/models/back-shiny/0613--000--Cubchoo.gif b/src/canonical/models/back-shiny/0613-000-Cubchoo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0613--000--Cubchoo.gif
rename to src/canonical/models/back-shiny/0613-000-Cubchoo.gif
diff --git a/src/canonical/models/back-shiny/0614--000--Beartic.gif b/src/canonical/models/back-shiny/0614-000-Beartic.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0614--000--Beartic.gif
rename to src/canonical/models/back-shiny/0614-000-Beartic.gif
diff --git a/src/canonical/models/back-shiny/0615--000--Cryogonal.gif b/src/canonical/models/back-shiny/0615-000-Cryogonal.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0615--000--Cryogonal.gif
rename to src/canonical/models/back-shiny/0615-000-Cryogonal.gif
diff --git a/src/canonical/models/back-shiny/0616--000--Shelmet.gif b/src/canonical/models/back-shiny/0616-000-Shelmet.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0616--000--Shelmet.gif
rename to src/canonical/models/back-shiny/0616-000-Shelmet.gif
diff --git a/src/canonical/models/back-shiny/0617--000--Accelgor.gif b/src/canonical/models/back-shiny/0617-000-Accelgor.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0617--000--Accelgor.gif
rename to src/canonical/models/back-shiny/0617-000-Accelgor.gif
diff --git a/src/canonical/models/back-shiny/0618--000--Stunfisk.gif b/src/canonical/models/back-shiny/0618-000-Stunfisk.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0618--000--Stunfisk.gif
rename to src/canonical/models/back-shiny/0618-000-Stunfisk.gif
diff --git a/src/canonical/models/back-shiny/0618--420--Stunfisk--Galar.gif b/src/canonical/models/back-shiny/0618-420-Stunfisk-Galar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0618--420--Stunfisk--Galar.gif
rename to src/canonical/models/back-shiny/0618-420-Stunfisk-Galar.gif
diff --git a/src/canonical/models/back-shiny/0619--000--Mienfoo.gif b/src/canonical/models/back-shiny/0619-000-Mienfoo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0619--000--Mienfoo.gif
rename to src/canonical/models/back-shiny/0619-000-Mienfoo.gif
diff --git a/src/canonical/models/back-shiny/0620--000--Mienshao.gif b/src/canonical/models/back-shiny/0620-000-Mienshao.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0620--000--Mienshao.gif
rename to src/canonical/models/back-shiny/0620-000-Mienshao.gif
diff --git a/src/canonical/models/back-shiny/0621--000--Druddigon.gif b/src/canonical/models/back-shiny/0621-000-Druddigon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0621--000--Druddigon.gif
rename to src/canonical/models/back-shiny/0621-000-Druddigon.gif
diff --git a/src/canonical/models/back-shiny/0622--000--Golett.gif b/src/canonical/models/back-shiny/0622-000-Golett.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0622--000--Golett.gif
rename to src/canonical/models/back-shiny/0622-000-Golett.gif
diff --git a/src/canonical/models/back-shiny/0623--000--Golurk.gif b/src/canonical/models/back-shiny/0623-000-Golurk.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0623--000--Golurk.gif
rename to src/canonical/models/back-shiny/0623-000-Golurk.gif
diff --git a/src/canonical/models/back-shiny/0624--000--Pawniard.gif b/src/canonical/models/back-shiny/0624-000-Pawniard.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0624--000--Pawniard.gif
rename to src/canonical/models/back-shiny/0624-000-Pawniard.gif
diff --git a/src/canonical/models/back-shiny/0625--000--Bisharp.gif b/src/canonical/models/back-shiny/0625-000-Bisharp.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0625--000--Bisharp.gif
rename to src/canonical/models/back-shiny/0625-000-Bisharp.gif
diff --git a/src/canonical/models/back-shiny/0626--000--Bouffalant.gif b/src/canonical/models/back-shiny/0626-000-Bouffalant.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0626--000--Bouffalant.gif
rename to src/canonical/models/back-shiny/0626-000-Bouffalant.gif
diff --git a/src/canonical/models/back-shiny/0627--000--Rufflet.gif b/src/canonical/models/back-shiny/0627-000-Rufflet.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0627--000--Rufflet.gif
rename to src/canonical/models/back-shiny/0627-000-Rufflet.gif
diff --git a/src/canonical/models/back-shiny/0628--000--Braviary.gif b/src/canonical/models/back-shiny/0628-000-Braviary.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0628--000--Braviary.gif
rename to src/canonical/models/back-shiny/0628-000-Braviary.gif
diff --git a/src/canonical/models/back-shiny/0629--000--Vullaby.gif b/src/canonical/models/back-shiny/0629-000-Vullaby.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0629--000--Vullaby.gif
rename to src/canonical/models/back-shiny/0629-000-Vullaby.gif
diff --git a/src/canonical/models/back-shiny/0630--000--Mandibuzz.gif b/src/canonical/models/back-shiny/0630-000-Mandibuzz.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0630--000--Mandibuzz.gif
rename to src/canonical/models/back-shiny/0630-000-Mandibuzz.gif
diff --git a/src/canonical/models/back-shiny/0631--000--Heatmor.gif b/src/canonical/models/back-shiny/0631-000-Heatmor.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0631--000--Heatmor.gif
rename to src/canonical/models/back-shiny/0631-000-Heatmor.gif
diff --git a/src/canonical/models/back-shiny/0632--000--Durant.gif b/src/canonical/models/back-shiny/0632-000-Durant.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0632--000--Durant.gif
rename to src/canonical/models/back-shiny/0632-000-Durant.gif
diff --git a/src/canonical/models/back-shiny/0633--000--Deino.gif b/src/canonical/models/back-shiny/0633-000-Deino.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0633--000--Deino.gif
rename to src/canonical/models/back-shiny/0633-000-Deino.gif
diff --git a/src/canonical/models/back-shiny/0634--000--Zweilous.gif b/src/canonical/models/back-shiny/0634-000-Zweilous.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0634--000--Zweilous.gif
rename to src/canonical/models/back-shiny/0634-000-Zweilous.gif
diff --git a/src/canonical/models/back-shiny/0635--000--Hydreigon.gif b/src/canonical/models/back-shiny/0635-000-Hydreigon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0635--000--Hydreigon.gif
rename to src/canonical/models/back-shiny/0635-000-Hydreigon.gif
diff --git a/src/canonical/models/back-shiny/0636--000--Larvesta.gif b/src/canonical/models/back-shiny/0636-000-Larvesta.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0636--000--Larvesta.gif
rename to src/canonical/models/back-shiny/0636-000-Larvesta.gif
diff --git a/src/canonical/models/back-shiny/0637--000--Volcarona.gif b/src/canonical/models/back-shiny/0637-000-Volcarona.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0637--000--Volcarona.gif
rename to src/canonical/models/back-shiny/0637-000-Volcarona.gif
diff --git a/src/canonical/models/back-shiny/0638--000--Cobalion.gif b/src/canonical/models/back-shiny/0638-000-Cobalion.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0638--000--Cobalion.gif
rename to src/canonical/models/back-shiny/0638-000-Cobalion.gif
diff --git a/src/canonical/models/back-shiny/0639--000--Terrakion.gif b/src/canonical/models/back-shiny/0639-000-Terrakion.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0639--000--Terrakion.gif
rename to src/canonical/models/back-shiny/0639-000-Terrakion.gif
diff --git a/src/canonical/models/back-shiny/0640--000--Virizion.gif b/src/canonical/models/back-shiny/0640-000-Virizion.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0640--000--Virizion.gif
rename to src/canonical/models/back-shiny/0640-000-Virizion.gif
diff --git a/src/canonical/models/back-shiny/0641--000--Tornadus.gif b/src/canonical/models/back-shiny/0641-000-Tornadus.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0641--000--Tornadus.gif
rename to src/canonical/models/back-shiny/0641-000-Tornadus.gif
diff --git a/src/canonical/models/back-shiny/0641--420--Tornadus--Therian.gif b/src/canonical/models/back-shiny/0641-420-Tornadus-Therian.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0641--420--Tornadus--Therian.gif
rename to src/canonical/models/back-shiny/0641-420-Tornadus-Therian.gif
diff --git a/src/canonical/models/back-shiny/0642--000--Thundurus.gif b/src/canonical/models/back-shiny/0642-000-Thundurus.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0642--000--Thundurus.gif
rename to src/canonical/models/back-shiny/0642-000-Thundurus.gif
diff --git a/src/canonical/models/back-shiny/0642--420--Thundurus--Therian.gif b/src/canonical/models/back-shiny/0642-420-Thundurus-Therian.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0642--420--Thundurus--Therian.gif
rename to src/canonical/models/back-shiny/0642-420-Thundurus-Therian.gif
diff --git a/src/canonical/models/back-shiny/0643--000--Reshiram.gif b/src/canonical/models/back-shiny/0643-000-Reshiram.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0643--000--Reshiram.gif
rename to src/canonical/models/back-shiny/0643-000-Reshiram.gif
diff --git a/src/canonical/models/back-shiny/0644--000--Zekrom.gif b/src/canonical/models/back-shiny/0644-000-Zekrom.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0644--000--Zekrom.gif
rename to src/canonical/models/back-shiny/0644-000-Zekrom.gif
diff --git a/src/canonical/models/back-shiny/0645--000--Landorus.gif b/src/canonical/models/back-shiny/0645-000-Landorus.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0645--000--Landorus.gif
rename to src/canonical/models/back-shiny/0645-000-Landorus.gif
diff --git a/src/canonical/models/back-shiny/0645--420--Landorus--Therian.gif b/src/canonical/models/back-shiny/0645-420-Landorus-Therian.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0645--420--Landorus--Therian.gif
rename to src/canonical/models/back-shiny/0645-420-Landorus-Therian.gif
diff --git a/src/canonical/models/back-shiny/0646--000--Kyurem.gif b/src/canonical/models/back-shiny/0646-000-Kyurem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0646--000--Kyurem.gif
rename to src/canonical/models/back-shiny/0646-000-Kyurem.gif
diff --git a/src/canonical/models/back-shiny/0646--420--Kyurem--Black.gif b/src/canonical/models/back-shiny/0646-420-Kyurem-Black.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0646--420--Kyurem--Black.gif
rename to src/canonical/models/back-shiny/0646-420-Kyurem-Black.gif
diff --git a/src/canonical/models/back-shiny/0646--420--Kyurem--White.gif b/src/canonical/models/back-shiny/0646-420-Kyurem-White.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0646--420--Kyurem--White.gif
rename to src/canonical/models/back-shiny/0646-420-Kyurem-White.gif
diff --git a/src/canonical/models/back-shiny/0647--000--Keldeo.gif b/src/canonical/models/back-shiny/0647-000-Keldeo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0647--000--Keldeo.gif
rename to src/canonical/models/back-shiny/0647-000-Keldeo.gif
diff --git a/src/canonical/models/back-shiny/0647--420--Keldeo--Resolute.gif b/src/canonical/models/back-shiny/0647-420-Keldeo-Resolute.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0647--420--Keldeo--Resolute.gif
rename to src/canonical/models/back-shiny/0647-420-Keldeo-Resolute.gif
diff --git a/src/canonical/models/back-shiny/0648--000--Meloetta.gif b/src/canonical/models/back-shiny/0648-000-Meloetta.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0648--000--Meloetta.gif
rename to src/canonical/models/back-shiny/0648-000-Meloetta.gif
diff --git a/src/canonical/models/back-shiny/0648--420--Meloetta--Pirouette.gif b/src/canonical/models/back-shiny/0648-420-Meloetta-Pirouette.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0648--420--Meloetta--Pirouette.gif
rename to src/canonical/models/back-shiny/0648-420-Meloetta-Pirouette.gif
diff --git a/src/canonical/models/back-shiny/0649--000--Genesect.gif b/src/canonical/models/back-shiny/0649-000-Genesect.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0649--000--Genesect.gif
rename to src/canonical/models/back-shiny/0649-000-Genesect.gif
diff --git a/src/canonical/models/back-shiny/0649--420--Genesect--Burn.gif b/src/canonical/models/back-shiny/0649-420-Genesect-Burn.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0649--420--Genesect--Burn.gif
rename to src/canonical/models/back-shiny/0649-420-Genesect-Burn.gif
diff --git a/src/canonical/models/back-shiny/0649--420--Genesect--Chill.gif b/src/canonical/models/back-shiny/0649-420-Genesect-Chill.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0649--420--Genesect--Chill.gif
rename to src/canonical/models/back-shiny/0649-420-Genesect-Chill.gif
diff --git a/src/canonical/models/back-shiny/0649--420--Genesect--Douse.gif b/src/canonical/models/back-shiny/0649-420-Genesect-Douse.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0649--420--Genesect--Douse.gif
rename to src/canonical/models/back-shiny/0649-420-Genesect-Douse.gif
diff --git a/src/canonical/models/back-shiny/0649--420--Genesect--Shock.gif b/src/canonical/models/back-shiny/0649-420-Genesect-Shock.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0649--420--Genesect--Shock.gif
rename to src/canonical/models/back-shiny/0649-420-Genesect-Shock.gif
diff --git a/src/canonical/models/back-shiny/0650--000--Chespin.gif b/src/canonical/models/back-shiny/0650-000-Chespin.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0650--000--Chespin.gif
rename to src/canonical/models/back-shiny/0650-000-Chespin.gif
diff --git a/src/canonical/models/back-shiny/0651--000--Quilladin.gif b/src/canonical/models/back-shiny/0651-000-Quilladin.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0651--000--Quilladin.gif
rename to src/canonical/models/back-shiny/0651-000-Quilladin.gif
diff --git a/src/canonical/models/back-shiny/0652--000--Chesnaught.gif b/src/canonical/models/back-shiny/0652-000-Chesnaught.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0652--000--Chesnaught.gif
rename to src/canonical/models/back-shiny/0652-000-Chesnaught.gif
diff --git a/src/canonical/models/back-shiny/0653--000--Fennekin.gif b/src/canonical/models/back-shiny/0653-000-Fennekin.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0653--000--Fennekin.gif
rename to src/canonical/models/back-shiny/0653-000-Fennekin.gif
diff --git a/src/canonical/models/back-shiny/0654--000--Braixen.gif b/src/canonical/models/back-shiny/0654-000-Braixen.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0654--000--Braixen.gif
rename to src/canonical/models/back-shiny/0654-000-Braixen.gif
diff --git a/src/canonical/models/back-shiny/0655--000--Delphox.gif b/src/canonical/models/back-shiny/0655-000-Delphox.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0655--000--Delphox.gif
rename to src/canonical/models/back-shiny/0655-000-Delphox.gif
diff --git a/src/canonical/models/back-shiny/0656--000--Froakie.gif b/src/canonical/models/back-shiny/0656-000-Froakie.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0656--000--Froakie.gif
rename to src/canonical/models/back-shiny/0656-000-Froakie.gif
diff --git a/src/canonical/models/back-shiny/0657--000--Frogadier.gif b/src/canonical/models/back-shiny/0657-000-Frogadier.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0657--000--Frogadier.gif
rename to src/canonical/models/back-shiny/0657-000-Frogadier.gif
diff --git a/src/canonical/models/back-shiny/0658--000--Greninja.gif b/src/canonical/models/back-shiny/0658-000-Greninja.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0658--000--Greninja.gif
rename to src/canonical/models/back-shiny/0658-000-Greninja.gif
diff --git a/src/canonical/models/back-shiny/0658--420--Greninja--Ash.gif b/src/canonical/models/back-shiny/0658-420-Greninja-Ash.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0658--420--Greninja--Ash.gif
rename to src/canonical/models/back-shiny/0658-420-Greninja-Ash.gif
diff --git a/src/canonical/models/back-shiny/0659--000--Bunnelby.gif b/src/canonical/models/back-shiny/0659-000-Bunnelby.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0659--000--Bunnelby.gif
rename to src/canonical/models/back-shiny/0659-000-Bunnelby.gif
diff --git a/src/canonical/models/back-shiny/0660--000--Diggersby.gif b/src/canonical/models/back-shiny/0660-000-Diggersby.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0660--000--Diggersby.gif
rename to src/canonical/models/back-shiny/0660-000-Diggersby.gif
diff --git a/src/canonical/models/back-shiny/0661--000--Fletchling.gif b/src/canonical/models/back-shiny/0661-000-Fletchling.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0661--000--Fletchling.gif
rename to src/canonical/models/back-shiny/0661-000-Fletchling.gif
diff --git a/src/canonical/models/back-shiny/0662--000--Fletchinder.gif b/src/canonical/models/back-shiny/0662-000-Fletchinder.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0662--000--Fletchinder.gif
rename to src/canonical/models/back-shiny/0662-000-Fletchinder.gif
diff --git a/src/canonical/models/back-shiny/0663--000--Talonflame.gif b/src/canonical/models/back-shiny/0663-000-Talonflame.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0663--000--Talonflame.gif
rename to src/canonical/models/back-shiny/0663-000-Talonflame.gif
diff --git a/src/canonical/models/back-shiny/0664--000--Scatterbug.gif b/src/canonical/models/back-shiny/0664-000-Scatterbug.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0664--000--Scatterbug.gif
rename to src/canonical/models/back-shiny/0664-000-Scatterbug.gif
diff --git a/src/canonical/models/back-shiny/0665--000--Spewpa.gif b/src/canonical/models/back-shiny/0665-000-Spewpa.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0665--000--Spewpa.gif
rename to src/canonical/models/back-shiny/0665-000-Spewpa.gif
diff --git a/src/canonical/models/back-shiny/0666--000--Vivillon.gif b/src/canonical/models/back-shiny/0666-000-Vivillon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0666--000--Vivillon.gif
rename to src/canonical/models/back-shiny/0666-000-Vivillon.gif
diff --git a/src/canonical/models/back-shiny/0666--420--Vivillon--Fancy.gif b/src/canonical/models/back-shiny/0666-420-Vivillon-Fancy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0666--420--Vivillon--Fancy.gif
rename to src/canonical/models/back-shiny/0666-420-Vivillon-Fancy.gif
diff --git a/src/canonical/models/back-shiny/0666--420--Vivillon--Pokeball.gif b/src/canonical/models/back-shiny/0666-420-Vivillon-Pokeball.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0666--420--Vivillon--Pokeball.gif
rename to src/canonical/models/back-shiny/0666-420-Vivillon-Pokeball.gif
diff --git a/src/canonical/models/back-shiny/0667--000--Litleo.gif b/src/canonical/models/back-shiny/0667-000-Litleo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0667--000--Litleo.gif
rename to src/canonical/models/back-shiny/0667-000-Litleo.gif
diff --git a/src/canonical/models/back-shiny/0668--000--Pyroar.gif b/src/canonical/models/back-shiny/0668-000-Pyroar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0668--000--Pyroar.gif
rename to src/canonical/models/back-shiny/0668-000-Pyroar.gif
diff --git a/src/canonical/models/back-shiny/0669--000--Flabe__0301be__0301.gif b/src/canonical/models/back-shiny/0669-000-Flabe__0301be__0301.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0669--000--Flabe__0301be__0301.gif
rename to src/canonical/models/back-shiny/0669-000-Flabe__0301be__0301.gif
diff --git a/src/canonical/models/back-shiny/0670--000--Floette.gif b/src/canonical/models/back-shiny/0670-000-Floette.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0670--000--Floette.gif
rename to src/canonical/models/back-shiny/0670-000-Floette.gif
diff --git a/src/canonical/models/back-shiny/0670--420--Floette--Eternal.gif b/src/canonical/models/back-shiny/0670-420-Floette-Eternal.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0670--420--Floette--Eternal.gif
rename to src/canonical/models/back-shiny/0670-420-Floette-Eternal.gif
diff --git a/src/canonical/models/back-shiny/0671--000--Florges.gif b/src/canonical/models/back-shiny/0671-000-Florges.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0671--000--Florges.gif
rename to src/canonical/models/back-shiny/0671-000-Florges.gif
diff --git a/src/canonical/models/back-shiny/0672--000--Skiddo.gif b/src/canonical/models/back-shiny/0672-000-Skiddo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0672--000--Skiddo.gif
rename to src/canonical/models/back-shiny/0672-000-Skiddo.gif
diff --git a/src/canonical/models/back-shiny/0673--000--Gogoat.gif b/src/canonical/models/back-shiny/0673-000-Gogoat.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0673--000--Gogoat.gif
rename to src/canonical/models/back-shiny/0673-000-Gogoat.gif
diff --git a/src/canonical/models/back-shiny/0674--000--Pancham.gif b/src/canonical/models/back-shiny/0674-000-Pancham.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0674--000--Pancham.gif
rename to src/canonical/models/back-shiny/0674-000-Pancham.gif
diff --git a/src/canonical/models/back-shiny/0675--000--Pangoro.gif b/src/canonical/models/back-shiny/0675-000-Pangoro.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0675--000--Pangoro.gif
rename to src/canonical/models/back-shiny/0675-000-Pangoro.gif
diff --git a/src/canonical/models/back-shiny/0676--000--Furfrou.gif b/src/canonical/models/back-shiny/0676-000-Furfrou.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0676--000--Furfrou.gif
rename to src/canonical/models/back-shiny/0676-000-Furfrou.gif
diff --git a/src/canonical/models/back-shiny/0677--000--Espurr.gif b/src/canonical/models/back-shiny/0677-000-Espurr.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0677--000--Espurr.gif
rename to src/canonical/models/back-shiny/0677-000-Espurr.gif
diff --git a/src/canonical/models/back-shiny/0678--000--Meowstic.gif b/src/canonical/models/back-shiny/0678-000-Meowstic.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0678--000--Meowstic.gif
rename to src/canonical/models/back-shiny/0678-000-Meowstic.gif
diff --git a/src/canonical/models/back-shiny/0678--420--Meowstic--F.gif b/src/canonical/models/back-shiny/0678-420-Meowstic-F.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0678--420--Meowstic--F.gif
rename to src/canonical/models/back-shiny/0678-420-Meowstic-F.gif
diff --git a/src/canonical/models/back-shiny/0679--000--Honedge.gif b/src/canonical/models/back-shiny/0679-000-Honedge.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0679--000--Honedge.gif
rename to src/canonical/models/back-shiny/0679-000-Honedge.gif
diff --git a/src/canonical/models/back-shiny/0680--000--Doublade.gif b/src/canonical/models/back-shiny/0680-000-Doublade.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0680--000--Doublade.gif
rename to src/canonical/models/back-shiny/0680-000-Doublade.gif
diff --git a/src/canonical/models/back-shiny/0681--000--Aegislash.gif b/src/canonical/models/back-shiny/0681-000-Aegislash.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0681--000--Aegislash.gif
rename to src/canonical/models/back-shiny/0681-000-Aegislash.gif
diff --git a/src/canonical/models/back-shiny/0681--420--Aegislash--Blade.gif b/src/canonical/models/back-shiny/0681-420-Aegislash-Blade.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0681--420--Aegislash--Blade.gif
rename to src/canonical/models/back-shiny/0681-420-Aegislash-Blade.gif
diff --git a/src/canonical/models/back-shiny/0682--000--Spritzee.gif b/src/canonical/models/back-shiny/0682-000-Spritzee.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0682--000--Spritzee.gif
rename to src/canonical/models/back-shiny/0682-000-Spritzee.gif
diff --git a/src/canonical/models/back-shiny/0683--000--Aromatisse.gif b/src/canonical/models/back-shiny/0683-000-Aromatisse.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0683--000--Aromatisse.gif
rename to src/canonical/models/back-shiny/0683-000-Aromatisse.gif
diff --git a/src/canonical/models/back-shiny/0684--000--Swirlix.gif b/src/canonical/models/back-shiny/0684-000-Swirlix.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0684--000--Swirlix.gif
rename to src/canonical/models/back-shiny/0684-000-Swirlix.gif
diff --git a/src/canonical/models/back-shiny/0685--000--Slurpuff.gif b/src/canonical/models/back-shiny/0685-000-Slurpuff.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0685--000--Slurpuff.gif
rename to src/canonical/models/back-shiny/0685-000-Slurpuff.gif
diff --git a/src/canonical/models/back-shiny/0686--000--Inkay.gif b/src/canonical/models/back-shiny/0686-000-Inkay.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0686--000--Inkay.gif
rename to src/canonical/models/back-shiny/0686-000-Inkay.gif
diff --git a/src/canonical/models/back-shiny/0687--000--Malamar.gif b/src/canonical/models/back-shiny/0687-000-Malamar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0687--000--Malamar.gif
rename to src/canonical/models/back-shiny/0687-000-Malamar.gif
diff --git a/src/canonical/models/back-shiny/0688--000--Binacle.gif b/src/canonical/models/back-shiny/0688-000-Binacle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0688--000--Binacle.gif
rename to src/canonical/models/back-shiny/0688-000-Binacle.gif
diff --git a/src/canonical/models/back-shiny/0689--000--Barbaracle.gif b/src/canonical/models/back-shiny/0689-000-Barbaracle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0689--000--Barbaracle.gif
rename to src/canonical/models/back-shiny/0689-000-Barbaracle.gif
diff --git a/src/canonical/models/back-shiny/0690--000--Skrelp.gif b/src/canonical/models/back-shiny/0690-000-Skrelp.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0690--000--Skrelp.gif
rename to src/canonical/models/back-shiny/0690-000-Skrelp.gif
diff --git a/src/canonical/models/back-shiny/0691--000--Dragalge.gif b/src/canonical/models/back-shiny/0691-000-Dragalge.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0691--000--Dragalge.gif
rename to src/canonical/models/back-shiny/0691-000-Dragalge.gif
diff --git a/src/canonical/models/back-shiny/0692--000--Clauncher.gif b/src/canonical/models/back-shiny/0692-000-Clauncher.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0692--000--Clauncher.gif
rename to src/canonical/models/back-shiny/0692-000-Clauncher.gif
diff --git a/src/canonical/models/back-shiny/0693--000--Clawitzer.gif b/src/canonical/models/back-shiny/0693-000-Clawitzer.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0693--000--Clawitzer.gif
rename to src/canonical/models/back-shiny/0693-000-Clawitzer.gif
diff --git a/src/canonical/models/back-shiny/0694--000--Helioptile.gif b/src/canonical/models/back-shiny/0694-000-Helioptile.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0694--000--Helioptile.gif
rename to src/canonical/models/back-shiny/0694-000-Helioptile.gif
diff --git a/src/canonical/models/back-shiny/0695--000--Heliolisk.gif b/src/canonical/models/back-shiny/0695-000-Heliolisk.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0695--000--Heliolisk.gif
rename to src/canonical/models/back-shiny/0695-000-Heliolisk.gif
diff --git a/src/canonical/models/back-shiny/0696--000--Tyrunt.gif b/src/canonical/models/back-shiny/0696-000-Tyrunt.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0696--000--Tyrunt.gif
rename to src/canonical/models/back-shiny/0696-000-Tyrunt.gif
diff --git a/src/canonical/models/back-shiny/0697--000--Tyrantrum.gif b/src/canonical/models/back-shiny/0697-000-Tyrantrum.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0697--000--Tyrantrum.gif
rename to src/canonical/models/back-shiny/0697-000-Tyrantrum.gif
diff --git a/src/canonical/models/back-shiny/0698--000--Amaura.gif b/src/canonical/models/back-shiny/0698-000-Amaura.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0698--000--Amaura.gif
rename to src/canonical/models/back-shiny/0698-000-Amaura.gif
diff --git a/src/canonical/models/back-shiny/0699--000--Aurorus.gif b/src/canonical/models/back-shiny/0699-000-Aurorus.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0699--000--Aurorus.gif
rename to src/canonical/models/back-shiny/0699-000-Aurorus.gif
diff --git a/src/canonical/models/back-shiny/0700--000--Sylveon.gif b/src/canonical/models/back-shiny/0700-000-Sylveon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0700--000--Sylveon.gif
rename to src/canonical/models/back-shiny/0700-000-Sylveon.gif
diff --git a/src/canonical/models/back-shiny/0701--000--Hawlucha.gif b/src/canonical/models/back-shiny/0701-000-Hawlucha.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0701--000--Hawlucha.gif
rename to src/canonical/models/back-shiny/0701-000-Hawlucha.gif
diff --git a/src/canonical/models/back-shiny/0702--000--Dedenne.gif b/src/canonical/models/back-shiny/0702-000-Dedenne.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0702--000--Dedenne.gif
rename to src/canonical/models/back-shiny/0702-000-Dedenne.gif
diff --git a/src/canonical/models/back-shiny/0703--000--Carbink.gif b/src/canonical/models/back-shiny/0703-000-Carbink.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0703--000--Carbink.gif
rename to src/canonical/models/back-shiny/0703-000-Carbink.gif
diff --git a/src/canonical/models/back-shiny/0704--000--Goomy.gif b/src/canonical/models/back-shiny/0704-000-Goomy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0704--000--Goomy.gif
rename to src/canonical/models/back-shiny/0704-000-Goomy.gif
diff --git a/src/canonical/models/back-shiny/0705--000--Sliggoo.gif b/src/canonical/models/back-shiny/0705-000-Sliggoo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0705--000--Sliggoo.gif
rename to src/canonical/models/back-shiny/0705-000-Sliggoo.gif
diff --git a/src/canonical/models/back-shiny/0706--000--Goodra.gif b/src/canonical/models/back-shiny/0706-000-Goodra.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0706--000--Goodra.gif
rename to src/canonical/models/back-shiny/0706-000-Goodra.gif
diff --git a/src/canonical/models/back-shiny/0707--000--Klefki.gif b/src/canonical/models/back-shiny/0707-000-Klefki.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0707--000--Klefki.gif
rename to src/canonical/models/back-shiny/0707-000-Klefki.gif
diff --git a/src/canonical/models/back-shiny/0708--000--Phantump.gif b/src/canonical/models/back-shiny/0708-000-Phantump.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0708--000--Phantump.gif
rename to src/canonical/models/back-shiny/0708-000-Phantump.gif
diff --git a/src/canonical/models/back-shiny/0709--000--Trevenant.gif b/src/canonical/models/back-shiny/0709-000-Trevenant.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0709--000--Trevenant.gif
rename to src/canonical/models/back-shiny/0709-000-Trevenant.gif
diff --git a/src/canonical/models/back-shiny/0710--000--Pumpkaboo.gif b/src/canonical/models/back-shiny/0710-000-Pumpkaboo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0710--000--Pumpkaboo.gif
rename to src/canonical/models/back-shiny/0710-000-Pumpkaboo.gif
diff --git a/src/canonical/models/back-shiny/0710--420--Pumpkaboo--Large.gif b/src/canonical/models/back-shiny/0710-420-Pumpkaboo-Large.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0710--420--Pumpkaboo--Large.gif
rename to src/canonical/models/back-shiny/0710-420-Pumpkaboo-Large.gif
diff --git a/src/canonical/models/back-shiny/0710--420--Pumpkaboo--Small.gif b/src/canonical/models/back-shiny/0710-420-Pumpkaboo-Small.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0710--420--Pumpkaboo--Small.gif
rename to src/canonical/models/back-shiny/0710-420-Pumpkaboo-Small.gif
diff --git a/src/canonical/models/back-shiny/0710--420--Pumpkaboo--Super.gif b/src/canonical/models/back-shiny/0710-420-Pumpkaboo-Super.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0710--420--Pumpkaboo--Super.gif
rename to src/canonical/models/back-shiny/0710-420-Pumpkaboo-Super.gif
diff --git a/src/canonical/models/back-shiny/0711--000--Gourgeist.gif b/src/canonical/models/back-shiny/0711-000-Gourgeist.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0711--000--Gourgeist.gif
rename to src/canonical/models/back-shiny/0711-000-Gourgeist.gif
diff --git a/src/canonical/models/back-shiny/0711--420--Gourgeist--Large.gif b/src/canonical/models/back-shiny/0711-420-Gourgeist-Large.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0711--420--Gourgeist--Large.gif
rename to src/canonical/models/back-shiny/0711-420-Gourgeist-Large.gif
diff --git a/src/canonical/models/back-shiny/0711--420--Gourgeist--Small.gif b/src/canonical/models/back-shiny/0711-420-Gourgeist-Small.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0711--420--Gourgeist--Small.gif
rename to src/canonical/models/back-shiny/0711-420-Gourgeist-Small.gif
diff --git a/src/canonical/models/back-shiny/0711--420--Gourgeist--Super.gif b/src/canonical/models/back-shiny/0711-420-Gourgeist-Super.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0711--420--Gourgeist--Super.gif
rename to src/canonical/models/back-shiny/0711-420-Gourgeist-Super.gif
diff --git a/src/canonical/models/back-shiny/0712--000--Bergmite.gif b/src/canonical/models/back-shiny/0712-000-Bergmite.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0712--000--Bergmite.gif
rename to src/canonical/models/back-shiny/0712-000-Bergmite.gif
diff --git a/src/canonical/models/back-shiny/0713--000--Avalugg.gif b/src/canonical/models/back-shiny/0713-000-Avalugg.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0713--000--Avalugg.gif
rename to src/canonical/models/back-shiny/0713-000-Avalugg.gif
diff --git a/src/canonical/models/back-shiny/0714--000--Noibat.gif b/src/canonical/models/back-shiny/0714-000-Noibat.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0714--000--Noibat.gif
rename to src/canonical/models/back-shiny/0714-000-Noibat.gif
diff --git a/src/canonical/models/back-shiny/0715--000--Noivern.gif b/src/canonical/models/back-shiny/0715-000-Noivern.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0715--000--Noivern.gif
rename to src/canonical/models/back-shiny/0715-000-Noivern.gif
diff --git a/src/canonical/models/back-shiny/0716--000--Xerneas.gif b/src/canonical/models/back-shiny/0716-000-Xerneas.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0716--000--Xerneas.gif
rename to src/canonical/models/back-shiny/0716-000-Xerneas.gif
diff --git a/src/canonical/models/back-shiny/0717--000--Yveltal.gif b/src/canonical/models/back-shiny/0717-000-Yveltal.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0717--000--Yveltal.gif
rename to src/canonical/models/back-shiny/0717-000-Yveltal.gif
diff --git a/src/canonical/models/back-shiny/0718--000--Zygarde.gif b/src/canonical/models/back-shiny/0718-000-Zygarde.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0718--000--Zygarde.gif
rename to src/canonical/models/back-shiny/0718-000-Zygarde.gif
diff --git a/src/canonical/models/back-shiny/0718--420--Zygarde--10__0025.gif b/src/canonical/models/back-shiny/0718-420-Zygarde-10__0025.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0718--420--Zygarde--10__0025.gif
rename to src/canonical/models/back-shiny/0718-420-Zygarde-10__0025.gif
diff --git a/src/canonical/models/back-shiny/0718--420--Zygarde--Complete.gif b/src/canonical/models/back-shiny/0718-420-Zygarde-Complete.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0718--420--Zygarde--Complete.gif
rename to src/canonical/models/back-shiny/0718-420-Zygarde-Complete.gif
diff --git a/src/canonical/models/back-shiny/0719--000--Diancie.gif b/src/canonical/models/back-shiny/0719-000-Diancie.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0719--000--Diancie.gif
rename to src/canonical/models/back-shiny/0719-000-Diancie.gif
diff --git a/src/canonical/models/back-shiny/0719--420--Diancie--Mega.gif b/src/canonical/models/back-shiny/0719-420-Diancie-Mega.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0719--420--Diancie--Mega.gif
rename to src/canonical/models/back-shiny/0719-420-Diancie-Mega.gif
diff --git a/src/canonical/models/back-shiny/0720--000--Hoopa.gif b/src/canonical/models/back-shiny/0720-000-Hoopa.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0720--000--Hoopa.gif
rename to src/canonical/models/back-shiny/0720-000-Hoopa.gif
diff --git a/src/canonical/models/back-shiny/0720--420--Hoopa--Unbound.gif b/src/canonical/models/back-shiny/0720-420-Hoopa-Unbound.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0720--420--Hoopa--Unbound.gif
rename to src/canonical/models/back-shiny/0720-420-Hoopa-Unbound.gif
diff --git a/src/canonical/models/back-shiny/0721--000--Volcanion.gif b/src/canonical/models/back-shiny/0721-000-Volcanion.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0721--000--Volcanion.gif
rename to src/canonical/models/back-shiny/0721-000-Volcanion.gif
diff --git a/src/canonical/models/back-shiny/0722--000--Rowlet.gif b/src/canonical/models/back-shiny/0722-000-Rowlet.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0722--000--Rowlet.gif
rename to src/canonical/models/back-shiny/0722-000-Rowlet.gif
diff --git a/src/canonical/models/back-shiny/0723--000--Dartrix.gif b/src/canonical/models/back-shiny/0723-000-Dartrix.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0723--000--Dartrix.gif
rename to src/canonical/models/back-shiny/0723-000-Dartrix.gif
diff --git a/src/canonical/models/back-shiny/0724--000--Decidueye.gif b/src/canonical/models/back-shiny/0724-000-Decidueye.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0724--000--Decidueye.gif
rename to src/canonical/models/back-shiny/0724-000-Decidueye.gif
diff --git a/src/canonical/models/back-shiny/0725--000--Litten.gif b/src/canonical/models/back-shiny/0725-000-Litten.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0725--000--Litten.gif
rename to src/canonical/models/back-shiny/0725-000-Litten.gif
diff --git a/src/canonical/models/back-shiny/0726--000--Torracat.gif b/src/canonical/models/back-shiny/0726-000-Torracat.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0726--000--Torracat.gif
rename to src/canonical/models/back-shiny/0726-000-Torracat.gif
diff --git a/src/canonical/models/back-shiny/0727--000--Incineroar.gif b/src/canonical/models/back-shiny/0727-000-Incineroar.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0727--000--Incineroar.gif
rename to src/canonical/models/back-shiny/0727-000-Incineroar.gif
diff --git a/src/canonical/models/back-shiny/0728--000--Popplio.gif b/src/canonical/models/back-shiny/0728-000-Popplio.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0728--000--Popplio.gif
rename to src/canonical/models/back-shiny/0728-000-Popplio.gif
diff --git a/src/canonical/models/back-shiny/0729--000--Brionne.gif b/src/canonical/models/back-shiny/0729-000-Brionne.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0729--000--Brionne.gif
rename to src/canonical/models/back-shiny/0729-000-Brionne.gif
diff --git a/src/canonical/models/back-shiny/0730--000--Primarina.gif b/src/canonical/models/back-shiny/0730-000-Primarina.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0730--000--Primarina.gif
rename to src/canonical/models/back-shiny/0730-000-Primarina.gif
diff --git a/src/canonical/models/back-shiny/0731--000--Pikipek.gif b/src/canonical/models/back-shiny/0731-000-Pikipek.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0731--000--Pikipek.gif
rename to src/canonical/models/back-shiny/0731-000-Pikipek.gif
diff --git a/src/canonical/models/back-shiny/0732--000--Trumbeak.gif b/src/canonical/models/back-shiny/0732-000-Trumbeak.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0732--000--Trumbeak.gif
rename to src/canonical/models/back-shiny/0732-000-Trumbeak.gif
diff --git a/src/canonical/models/back-shiny/0733--000--Toucannon.gif b/src/canonical/models/back-shiny/0733-000-Toucannon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0733--000--Toucannon.gif
rename to src/canonical/models/back-shiny/0733-000-Toucannon.gif
diff --git a/src/canonical/models/back-shiny/0734--000--Yungoos.gif b/src/canonical/models/back-shiny/0734-000-Yungoos.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0734--000--Yungoos.gif
rename to src/canonical/models/back-shiny/0734-000-Yungoos.gif
diff --git a/src/canonical/models/back-shiny/0735--000--Gumshoos.gif b/src/canonical/models/back-shiny/0735-000-Gumshoos.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0735--000--Gumshoos.gif
rename to src/canonical/models/back-shiny/0735-000-Gumshoos.gif
diff --git a/src/canonical/models/back-shiny/0735--420--Gumshoos--Totem.gif b/src/canonical/models/back-shiny/0735-420-Gumshoos-Totem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0735--420--Gumshoos--Totem.gif
rename to src/canonical/models/back-shiny/0735-420-Gumshoos-Totem.gif
diff --git a/src/canonical/models/back-shiny/0736--000--Grubbin.gif b/src/canonical/models/back-shiny/0736-000-Grubbin.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0736--000--Grubbin.gif
rename to src/canonical/models/back-shiny/0736-000-Grubbin.gif
diff --git a/src/canonical/models/back-shiny/0737--000--Charjabug.gif b/src/canonical/models/back-shiny/0737-000-Charjabug.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0737--000--Charjabug.gif
rename to src/canonical/models/back-shiny/0737-000-Charjabug.gif
diff --git a/src/canonical/models/back-shiny/0738--000--Vikavolt.gif b/src/canonical/models/back-shiny/0738-000-Vikavolt.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0738--000--Vikavolt.gif
rename to src/canonical/models/back-shiny/0738-000-Vikavolt.gif
diff --git a/src/canonical/models/back-shiny/0738--420--Vikavolt--Totem.gif b/src/canonical/models/back-shiny/0738-420-Vikavolt-Totem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0738--420--Vikavolt--Totem.gif
rename to src/canonical/models/back-shiny/0738-420-Vikavolt-Totem.gif
diff --git a/src/canonical/models/back-shiny/0739--000--Crabrawler.gif b/src/canonical/models/back-shiny/0739-000-Crabrawler.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0739--000--Crabrawler.gif
rename to src/canonical/models/back-shiny/0739-000-Crabrawler.gif
diff --git a/src/canonical/models/back-shiny/0740--000--Crabominable.gif b/src/canonical/models/back-shiny/0740-000-Crabominable.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0740--000--Crabominable.gif
rename to src/canonical/models/back-shiny/0740-000-Crabominable.gif
diff --git a/src/canonical/models/back-shiny/0741--000--Oricorio.gif b/src/canonical/models/back-shiny/0741-000-Oricorio.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0741--000--Oricorio.gif
rename to src/canonical/models/back-shiny/0741-000-Oricorio.gif
diff --git a/src/canonical/models/back-shiny/0741--420--Oricorio--Pa__0027u.gif b/src/canonical/models/back-shiny/0741-420-Oricorio-Pa__0027u.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0741--420--Oricorio--Pa__0027u.gif
rename to src/canonical/models/back-shiny/0741-420-Oricorio-Pa__0027u.gif
diff --git a/src/canonical/models/back-shiny/0741--420--Oricorio--Pom-Pom.gif b/src/canonical/models/back-shiny/0741-420-Oricorio-Pom~Pom.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0741--420--Oricorio--Pom-Pom.gif
rename to src/canonical/models/back-shiny/0741-420-Oricorio-Pom~Pom.gif
diff --git a/src/canonical/models/back-shiny/0741--420--Oricorio--Sensu.gif b/src/canonical/models/back-shiny/0741-420-Oricorio-Sensu.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0741--420--Oricorio--Sensu.gif
rename to src/canonical/models/back-shiny/0741-420-Oricorio-Sensu.gif
diff --git a/src/canonical/models/back-shiny/0742--000--Cutiefly.gif b/src/canonical/models/back-shiny/0742-000-Cutiefly.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0742--000--Cutiefly.gif
rename to src/canonical/models/back-shiny/0742-000-Cutiefly.gif
diff --git a/src/canonical/models/back-shiny/0743--000--Ribombee.gif b/src/canonical/models/back-shiny/0743-000-Ribombee.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0743--000--Ribombee.gif
rename to src/canonical/models/back-shiny/0743-000-Ribombee.gif
diff --git a/src/canonical/models/back-shiny/0743--420--Ribombee--Totem.gif b/src/canonical/models/back-shiny/0743-420-Ribombee-Totem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0743--420--Ribombee--Totem.gif
rename to src/canonical/models/back-shiny/0743-420-Ribombee-Totem.gif
diff --git a/src/canonical/models/back-shiny/0744--000--Rockruff.gif b/src/canonical/models/back-shiny/0744-000-Rockruff.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0744--000--Rockruff.gif
rename to src/canonical/models/back-shiny/0744-000-Rockruff.gif
diff --git a/src/canonical/models/back-shiny/0745--000--Lycanroc.gif b/src/canonical/models/back-shiny/0745-000-Lycanroc.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0745--000--Lycanroc.gif
rename to src/canonical/models/back-shiny/0745-000-Lycanroc.gif
diff --git a/src/canonical/models/back-shiny/0745--420--Lycanroc--Dusk.gif b/src/canonical/models/back-shiny/0745-420-Lycanroc-Dusk.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0745--420--Lycanroc--Dusk.gif
rename to src/canonical/models/back-shiny/0745-420-Lycanroc-Dusk.gif
diff --git a/src/canonical/models/back-shiny/0745--420--Lycanroc--Midnight.gif b/src/canonical/models/back-shiny/0745-420-Lycanroc-Midnight.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0745--420--Lycanroc--Midnight.gif
rename to src/canonical/models/back-shiny/0745-420-Lycanroc-Midnight.gif
diff --git a/src/canonical/models/back-shiny/0746--000--Wishiwashi.gif b/src/canonical/models/back-shiny/0746-000-Wishiwashi.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0746--000--Wishiwashi.gif
rename to src/canonical/models/back-shiny/0746-000-Wishiwashi.gif
diff --git a/src/canonical/models/back-shiny/0746--420--Wishiwashi--School.gif b/src/canonical/models/back-shiny/0746-420-Wishiwashi-School.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0746--420--Wishiwashi--School.gif
rename to src/canonical/models/back-shiny/0746-420-Wishiwashi-School.gif
diff --git a/src/canonical/models/back-shiny/0747--000--Mareanie.gif b/src/canonical/models/back-shiny/0747-000-Mareanie.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0747--000--Mareanie.gif
rename to src/canonical/models/back-shiny/0747-000-Mareanie.gif
diff --git a/src/canonical/models/back-shiny/0748--000--Toxapex.gif b/src/canonical/models/back-shiny/0748-000-Toxapex.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0748--000--Toxapex.gif
rename to src/canonical/models/back-shiny/0748-000-Toxapex.gif
diff --git a/src/canonical/models/back-shiny/0749--000--Mudbray.gif b/src/canonical/models/back-shiny/0749-000-Mudbray.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0749--000--Mudbray.gif
rename to src/canonical/models/back-shiny/0749-000-Mudbray.gif
diff --git a/src/canonical/models/back-shiny/0750--000--Mudsdale.gif b/src/canonical/models/back-shiny/0750-000-Mudsdale.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0750--000--Mudsdale.gif
rename to src/canonical/models/back-shiny/0750-000-Mudsdale.gif
diff --git a/src/canonical/models/back-shiny/0751--000--Dewpider.gif b/src/canonical/models/back-shiny/0751-000-Dewpider.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0751--000--Dewpider.gif
rename to src/canonical/models/back-shiny/0751-000-Dewpider.gif
diff --git a/src/canonical/models/back-shiny/0752--000--Araquanid.gif b/src/canonical/models/back-shiny/0752-000-Araquanid.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0752--000--Araquanid.gif
rename to src/canonical/models/back-shiny/0752-000-Araquanid.gif
diff --git a/src/canonical/models/back-shiny/0752--420--Araquanid--Totem.gif b/src/canonical/models/back-shiny/0752-420-Araquanid-Totem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0752--420--Araquanid--Totem.gif
rename to src/canonical/models/back-shiny/0752-420-Araquanid-Totem.gif
diff --git a/src/canonical/models/back-shiny/0753--000--Fomantis.gif b/src/canonical/models/back-shiny/0753-000-Fomantis.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0753--000--Fomantis.gif
rename to src/canonical/models/back-shiny/0753-000-Fomantis.gif
diff --git a/src/canonical/models/back-shiny/0754--000--Lurantis.gif b/src/canonical/models/back-shiny/0754-000-Lurantis.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0754--000--Lurantis.gif
rename to src/canonical/models/back-shiny/0754-000-Lurantis.gif
diff --git a/src/canonical/models/back-shiny/0754--420--Lurantis--Totem.gif b/src/canonical/models/back-shiny/0754-420-Lurantis-Totem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0754--420--Lurantis--Totem.gif
rename to src/canonical/models/back-shiny/0754-420-Lurantis-Totem.gif
diff --git a/src/canonical/models/back-shiny/0755--000--Morelull.gif b/src/canonical/models/back-shiny/0755-000-Morelull.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0755--000--Morelull.gif
rename to src/canonical/models/back-shiny/0755-000-Morelull.gif
diff --git a/src/canonical/models/back-shiny/0756--000--Shiinotic.gif b/src/canonical/models/back-shiny/0756-000-Shiinotic.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0756--000--Shiinotic.gif
rename to src/canonical/models/back-shiny/0756-000-Shiinotic.gif
diff --git a/src/canonical/models/back-shiny/0757--000--Salandit.gif b/src/canonical/models/back-shiny/0757-000-Salandit.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0757--000--Salandit.gif
rename to src/canonical/models/back-shiny/0757-000-Salandit.gif
diff --git a/src/canonical/models/back-shiny/0758--000--Salazzle.gif b/src/canonical/models/back-shiny/0758-000-Salazzle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0758--000--Salazzle.gif
rename to src/canonical/models/back-shiny/0758-000-Salazzle.gif
diff --git a/src/canonical/models/back-shiny/0758--420--Salazzle--Totem.gif b/src/canonical/models/back-shiny/0758-420-Salazzle-Totem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0758--420--Salazzle--Totem.gif
rename to src/canonical/models/back-shiny/0758-420-Salazzle-Totem.gif
diff --git a/src/canonical/models/back-shiny/0759--000--Stufful.gif b/src/canonical/models/back-shiny/0759-000-Stufful.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0759--000--Stufful.gif
rename to src/canonical/models/back-shiny/0759-000-Stufful.gif
diff --git a/src/canonical/models/back-shiny/0760--000--Bewear.gif b/src/canonical/models/back-shiny/0760-000-Bewear.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0760--000--Bewear.gif
rename to src/canonical/models/back-shiny/0760-000-Bewear.gif
diff --git a/src/canonical/models/back-shiny/0761--000--Bounsweet.gif b/src/canonical/models/back-shiny/0761-000-Bounsweet.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0761--000--Bounsweet.gif
rename to src/canonical/models/back-shiny/0761-000-Bounsweet.gif
diff --git a/src/canonical/models/back-shiny/0762--000--Steenee.gif b/src/canonical/models/back-shiny/0762-000-Steenee.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0762--000--Steenee.gif
rename to src/canonical/models/back-shiny/0762-000-Steenee.gif
diff --git a/src/canonical/models/back-shiny/0763--000--Tsareena.gif b/src/canonical/models/back-shiny/0763-000-Tsareena.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0763--000--Tsareena.gif
rename to src/canonical/models/back-shiny/0763-000-Tsareena.gif
diff --git a/src/canonical/models/back-shiny/0764--000--Comfey.gif b/src/canonical/models/back-shiny/0764-000-Comfey.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0764--000--Comfey.gif
rename to src/canonical/models/back-shiny/0764-000-Comfey.gif
diff --git a/src/canonical/models/back-shiny/0765--000--Oranguru.gif b/src/canonical/models/back-shiny/0765-000-Oranguru.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0765--000--Oranguru.gif
rename to src/canonical/models/back-shiny/0765-000-Oranguru.gif
diff --git a/src/canonical/models/back-shiny/0766--000--Passimian.gif b/src/canonical/models/back-shiny/0766-000-Passimian.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0766--000--Passimian.gif
rename to src/canonical/models/back-shiny/0766-000-Passimian.gif
diff --git a/src/canonical/models/back-shiny/0767--000--Wimpod.gif b/src/canonical/models/back-shiny/0767-000-Wimpod.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0767--000--Wimpod.gif
rename to src/canonical/models/back-shiny/0767-000-Wimpod.gif
diff --git a/src/canonical/models/back-shiny/0768--000--Golisopod.gif b/src/canonical/models/back-shiny/0768-000-Golisopod.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0768--000--Golisopod.gif
rename to src/canonical/models/back-shiny/0768-000-Golisopod.gif
diff --git a/src/canonical/models/back-shiny/0769--000--Sandygast.gif b/src/canonical/models/back-shiny/0769-000-Sandygast.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0769--000--Sandygast.gif
rename to src/canonical/models/back-shiny/0769-000-Sandygast.gif
diff --git a/src/canonical/models/back-shiny/0770--000--Palossand.gif b/src/canonical/models/back-shiny/0770-000-Palossand.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0770--000--Palossand.gif
rename to src/canonical/models/back-shiny/0770-000-Palossand.gif
diff --git a/src/canonical/models/back-shiny/0771--000--Pyukumuku.gif b/src/canonical/models/back-shiny/0771-000-Pyukumuku.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0771--000--Pyukumuku.gif
rename to src/canonical/models/back-shiny/0771-000-Pyukumuku.gif
diff --git a/src/canonical/models/back-shiny/0772--000--Type__003a_Null.gif b/src/canonical/models/back-shiny/0772-000-Type__003a_Null.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0772--000--Type__003a_Null.gif
rename to src/canonical/models/back-shiny/0772-000-Type__003a_Null.gif
diff --git a/src/canonical/models/back-shiny/0773--000--Silvally.gif b/src/canonical/models/back-shiny/0773-000-Silvally.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--000--Silvally.gif
rename to src/canonical/models/back-shiny/0773-000-Silvally.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Bug.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Bug.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Bug.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Bug.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Dark.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Dark.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Dark.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Dark.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Dragon.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Dragon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Dragon.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Dragon.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Electric.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Electric.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Electric.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Electric.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Fairy.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Fairy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Fairy.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Fairy.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Fighting.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Fighting.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Fighting.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Fighting.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Fire.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Fire.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Fire.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Fire.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Flying.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Flying.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Flying.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Flying.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Ghost.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Ghost.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Ghost.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Ghost.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Grass.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Grass.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Grass.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Grass.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Ground.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Ground.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Ground.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Ground.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Ice.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Ice.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Ice.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Ice.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Poison.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Poison.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Poison.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Poison.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Psychic.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Psychic.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Psychic.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Psychic.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Rock.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Rock.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Rock.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Rock.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Steel.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Steel.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Steel.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Steel.gif
diff --git a/src/canonical/models/back-shiny/0773--420--Silvally--Water.gif b/src/canonical/models/back-shiny/0773-420-Silvally-Water.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0773--420--Silvally--Water.gif
rename to src/canonical/models/back-shiny/0773-420-Silvally-Water.gif
diff --git a/src/canonical/models/back-shiny/0774--000--Minior.gif b/src/canonical/models/back-shiny/0774-000-Minior.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0774--000--Minior.gif
rename to src/canonical/models/back-shiny/0774-000-Minior.gif
diff --git a/src/canonical/models/back-shiny/0775--000--Komala.gif b/src/canonical/models/back-shiny/0775-000-Komala.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0775--000--Komala.gif
rename to src/canonical/models/back-shiny/0775-000-Komala.gif
diff --git a/src/canonical/models/back-shiny/0776--000--Turtonator.gif b/src/canonical/models/back-shiny/0776-000-Turtonator.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0776--000--Turtonator.gif
rename to src/canonical/models/back-shiny/0776-000-Turtonator.gif
diff --git a/src/canonical/models/back-shiny/0777--000--Togedemaru.gif b/src/canonical/models/back-shiny/0777-000-Togedemaru.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0777--000--Togedemaru.gif
rename to src/canonical/models/back-shiny/0777-000-Togedemaru.gif
diff --git a/src/canonical/models/back-shiny/0777--420--Togedemaru--Totem.gif b/src/canonical/models/back-shiny/0777-420-Togedemaru-Totem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0777--420--Togedemaru--Totem.gif
rename to src/canonical/models/back-shiny/0777-420-Togedemaru-Totem.gif
diff --git a/src/canonical/models/back-shiny/0778--000--Mimikyu.gif b/src/canonical/models/back-shiny/0778-000-Mimikyu.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0778--000--Mimikyu.gif
rename to src/canonical/models/back-shiny/0778-000-Mimikyu.gif
diff --git a/src/canonical/models/back-shiny/0778--420--Mimikyu--Busted.gif b/src/canonical/models/back-shiny/0778-420-Mimikyu-Busted.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0778--420--Mimikyu--Busted.gif
rename to src/canonical/models/back-shiny/0778-420-Mimikyu-Busted.gif
diff --git a/src/canonical/models/back-shiny/0778--420--Mimikyu--Busted-Totem.gif b/src/canonical/models/back-shiny/0778-420-Mimikyu-Busted~Totem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0778--420--Mimikyu--Busted-Totem.gif
rename to src/canonical/models/back-shiny/0778-420-Mimikyu-Busted~Totem.gif
diff --git a/src/canonical/models/back-shiny/0778--420--Mimikyu--Totem.gif b/src/canonical/models/back-shiny/0778-420-Mimikyu-Totem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0778--420--Mimikyu--Totem.gif
rename to src/canonical/models/back-shiny/0778-420-Mimikyu-Totem.gif
diff --git a/src/canonical/models/back-shiny/0779--000--Bruxish.gif b/src/canonical/models/back-shiny/0779-000-Bruxish.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0779--000--Bruxish.gif
rename to src/canonical/models/back-shiny/0779-000-Bruxish.gif
diff --git a/src/canonical/models/back-shiny/0780--000--Drampa.gif b/src/canonical/models/back-shiny/0780-000-Drampa.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0780--000--Drampa.gif
rename to src/canonical/models/back-shiny/0780-000-Drampa.gif
diff --git a/src/canonical/models/back-shiny/0781--000--Dhelmise.gif b/src/canonical/models/back-shiny/0781-000-Dhelmise.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0781--000--Dhelmise.gif
rename to src/canonical/models/back-shiny/0781-000-Dhelmise.gif
diff --git a/src/canonical/models/back-shiny/0782--000--Jangmo-o.gif b/src/canonical/models/back-shiny/0782-000-Jangmo~o.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0782--000--Jangmo-o.gif
rename to src/canonical/models/back-shiny/0782-000-Jangmo~o.gif
diff --git a/src/canonical/models/back-shiny/0783--000--Hakamo-o.gif b/src/canonical/models/back-shiny/0783-000-Hakamo~o.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0783--000--Hakamo-o.gif
rename to src/canonical/models/back-shiny/0783-000-Hakamo~o.gif
diff --git a/src/canonical/models/back-shiny/0784--000--Kommo-o.gif b/src/canonical/models/back-shiny/0784-000-Kommo~o.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0784--000--Kommo-o.gif
rename to src/canonical/models/back-shiny/0784-000-Kommo~o.gif
diff --git a/src/canonical/models/back-shiny/0784--420--Kommo-o--Totem.gif b/src/canonical/models/back-shiny/0784-420-Kommo~o-Totem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0784--420--Kommo-o--Totem.gif
rename to src/canonical/models/back-shiny/0784-420-Kommo~o-Totem.gif
diff --git a/src/canonical/models/back-shiny/0785--000--Tapu_Koko.gif b/src/canonical/models/back-shiny/0785-000-Tapu_Koko.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0785--000--Tapu_Koko.gif
rename to src/canonical/models/back-shiny/0785-000-Tapu_Koko.gif
diff --git a/src/canonical/models/back-shiny/0786--000--Tapu_Lele.gif b/src/canonical/models/back-shiny/0786-000-Tapu_Lele.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0786--000--Tapu_Lele.gif
rename to src/canonical/models/back-shiny/0786-000-Tapu_Lele.gif
diff --git a/src/canonical/models/back-shiny/0787--000--Tapu_Bulu.gif b/src/canonical/models/back-shiny/0787-000-Tapu_Bulu.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0787--000--Tapu_Bulu.gif
rename to src/canonical/models/back-shiny/0787-000-Tapu_Bulu.gif
diff --git a/src/canonical/models/back-shiny/0788--000--Tapu_Fini.gif b/src/canonical/models/back-shiny/0788-000-Tapu_Fini.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0788--000--Tapu_Fini.gif
rename to src/canonical/models/back-shiny/0788-000-Tapu_Fini.gif
diff --git a/src/canonical/models/back-shiny/0789--000--Cosmog.gif b/src/canonical/models/back-shiny/0789-000-Cosmog.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0789--000--Cosmog.gif
rename to src/canonical/models/back-shiny/0789-000-Cosmog.gif
diff --git a/src/canonical/models/back-shiny/0790--000--Cosmoem.gif b/src/canonical/models/back-shiny/0790-000-Cosmoem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0790--000--Cosmoem.gif
rename to src/canonical/models/back-shiny/0790-000-Cosmoem.gif
diff --git a/src/canonical/models/back-shiny/0791--000--Solgaleo.gif b/src/canonical/models/back-shiny/0791-000-Solgaleo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0791--000--Solgaleo.gif
rename to src/canonical/models/back-shiny/0791-000-Solgaleo.gif
diff --git a/src/canonical/models/back-shiny/0792--000--Lunala.gif b/src/canonical/models/back-shiny/0792-000-Lunala.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0792--000--Lunala.gif
rename to src/canonical/models/back-shiny/0792-000-Lunala.gif
diff --git a/src/canonical/models/back-shiny/0793--000--Nihilego.gif b/src/canonical/models/back-shiny/0793-000-Nihilego.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0793--000--Nihilego.gif
rename to src/canonical/models/back-shiny/0793-000-Nihilego.gif
diff --git a/src/canonical/models/back-shiny/0794--000--Buzzwole.gif b/src/canonical/models/back-shiny/0794-000-Buzzwole.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0794--000--Buzzwole.gif
rename to src/canonical/models/back-shiny/0794-000-Buzzwole.gif
diff --git a/src/canonical/models/back-shiny/0795--000--Pheromosa.gif b/src/canonical/models/back-shiny/0795-000-Pheromosa.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0795--000--Pheromosa.gif
rename to src/canonical/models/back-shiny/0795-000-Pheromosa.gif
diff --git a/src/canonical/models/back-shiny/0796--000--Xurkitree.gif b/src/canonical/models/back-shiny/0796-000-Xurkitree.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0796--000--Xurkitree.gif
rename to src/canonical/models/back-shiny/0796-000-Xurkitree.gif
diff --git a/src/canonical/models/back-shiny/0797--000--Celesteela.gif b/src/canonical/models/back-shiny/0797-000-Celesteela.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0797--000--Celesteela.gif
rename to src/canonical/models/back-shiny/0797-000-Celesteela.gif
diff --git a/src/canonical/models/back-shiny/0798--000--Kartana.gif b/src/canonical/models/back-shiny/0798-000-Kartana.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0798--000--Kartana.gif
rename to src/canonical/models/back-shiny/0798-000-Kartana.gif
diff --git a/src/canonical/models/back-shiny/0799--000--Guzzlord.gif b/src/canonical/models/back-shiny/0799-000-Guzzlord.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0799--000--Guzzlord.gif
rename to src/canonical/models/back-shiny/0799-000-Guzzlord.gif
diff --git a/src/canonical/models/back-shiny/0800--000--Necrozma.gif b/src/canonical/models/back-shiny/0800-000-Necrozma.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0800--000--Necrozma.gif
rename to src/canonical/models/back-shiny/0800-000-Necrozma.gif
diff --git a/src/canonical/models/back-shiny/0800--420--Necrozma--Dawn_Wings.gif b/src/canonical/models/back-shiny/0800-420-Necrozma-Dawn_Wings.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0800--420--Necrozma--Dawn_Wings.gif
rename to src/canonical/models/back-shiny/0800-420-Necrozma-Dawn_Wings.gif
diff --git a/src/canonical/models/back-shiny/0800--420--Necrozma--Dusk_Mane.gif b/src/canonical/models/back-shiny/0800-420-Necrozma-Dusk_Mane.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0800--420--Necrozma--Dusk_Mane.gif
rename to src/canonical/models/back-shiny/0800-420-Necrozma-Dusk_Mane.gif
diff --git a/src/canonical/models/back-shiny/0800--420--Necrozma--Ultra.gif b/src/canonical/models/back-shiny/0800-420-Necrozma-Ultra.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0800--420--Necrozma--Ultra.gif
rename to src/canonical/models/back-shiny/0800-420-Necrozma-Ultra.gif
diff --git a/src/canonical/models/back-shiny/0801--000--Magearna.gif b/src/canonical/models/back-shiny/0801-000-Magearna.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0801--000--Magearna.gif
rename to src/canonical/models/back-shiny/0801-000-Magearna.gif
diff --git a/src/canonical/models/back-shiny/0802--000--Marshadow.gif b/src/canonical/models/back-shiny/0802-000-Marshadow.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0802--000--Marshadow.gif
rename to src/canonical/models/back-shiny/0802-000-Marshadow.gif
diff --git a/src/canonical/models/back-shiny/0803--000--Poipole.gif b/src/canonical/models/back-shiny/0803-000-Poipole.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0803--000--Poipole.gif
rename to src/canonical/models/back-shiny/0803-000-Poipole.gif
diff --git a/src/canonical/models/back-shiny/0804--000--Naganadel.gif b/src/canonical/models/back-shiny/0804-000-Naganadel.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0804--000--Naganadel.gif
rename to src/canonical/models/back-shiny/0804-000-Naganadel.gif
diff --git a/src/canonical/models/back-shiny/0805--000--Stakataka.gif b/src/canonical/models/back-shiny/0805-000-Stakataka.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0805--000--Stakataka.gif
rename to src/canonical/models/back-shiny/0805-000-Stakataka.gif
diff --git a/src/canonical/models/back-shiny/0806--000--Blacephalon.gif b/src/canonical/models/back-shiny/0806-000-Blacephalon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0806--000--Blacephalon.gif
rename to src/canonical/models/back-shiny/0806-000-Blacephalon.gif
diff --git a/src/canonical/models/back-shiny/0807--000--Zeraora.gif b/src/canonical/models/back-shiny/0807-000-Zeraora.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0807--000--Zeraora.gif
rename to src/canonical/models/back-shiny/0807-000-Zeraora.gif
diff --git a/src/canonical/models/back-shiny/0808--000--Meltan.gif b/src/canonical/models/back-shiny/0808-000-Meltan.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0808--000--Meltan.gif
rename to src/canonical/models/back-shiny/0808-000-Meltan.gif
diff --git a/src/canonical/models/back-shiny/0809--000--Melmetal.gif b/src/canonical/models/back-shiny/0809-000-Melmetal.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0809--000--Melmetal.gif
rename to src/canonical/models/back-shiny/0809-000-Melmetal.gif
diff --git a/src/canonical/models/back-shiny/0809--420--Melmetal--Gmax.gif b/src/canonical/models/back-shiny/0809-420-Melmetal-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0809--420--Melmetal--Gmax.gif
rename to src/canonical/models/back-shiny/0809-420-Melmetal-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0810--000--Grookey.gif b/src/canonical/models/back-shiny/0810-000-Grookey.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0810--000--Grookey.gif
rename to src/canonical/models/back-shiny/0810-000-Grookey.gif
diff --git a/src/canonical/models/back-shiny/0811--000--Thwackey.gif b/src/canonical/models/back-shiny/0811-000-Thwackey.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0811--000--Thwackey.gif
rename to src/canonical/models/back-shiny/0811-000-Thwackey.gif
diff --git a/src/canonical/models/back-shiny/0812--000--Rillaboom.gif b/src/canonical/models/back-shiny/0812-000-Rillaboom.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0812--000--Rillaboom.gif
rename to src/canonical/models/back-shiny/0812-000-Rillaboom.gif
diff --git a/src/canonical/models/back-shiny/0813--000--Scorbunny.gif b/src/canonical/models/back-shiny/0813-000-Scorbunny.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0813--000--Scorbunny.gif
rename to src/canonical/models/back-shiny/0813-000-Scorbunny.gif
diff --git a/src/canonical/models/back-shiny/0814--000--Raboot.gif b/src/canonical/models/back-shiny/0814-000-Raboot.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0814--000--Raboot.gif
rename to src/canonical/models/back-shiny/0814-000-Raboot.gif
diff --git a/src/canonical/models/back-shiny/0815--000--Cinderace.gif b/src/canonical/models/back-shiny/0815-000-Cinderace.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0815--000--Cinderace.gif
rename to src/canonical/models/back-shiny/0815-000-Cinderace.gif
diff --git a/src/canonical/models/back-shiny/0816--000--Sobble.gif b/src/canonical/models/back-shiny/0816-000-Sobble.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0816--000--Sobble.gif
rename to src/canonical/models/back-shiny/0816-000-Sobble.gif
diff --git a/src/canonical/models/back-shiny/0817--000--Drizzile.gif b/src/canonical/models/back-shiny/0817-000-Drizzile.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0817--000--Drizzile.gif
rename to src/canonical/models/back-shiny/0817-000-Drizzile.gif
diff --git a/src/canonical/models/back-shiny/0818--000--Inteleon.gif b/src/canonical/models/back-shiny/0818-000-Inteleon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0818--000--Inteleon.gif
rename to src/canonical/models/back-shiny/0818-000-Inteleon.gif
diff --git a/src/canonical/models/back-shiny/0819--000--Skwovet.gif b/src/canonical/models/back-shiny/0819-000-Skwovet.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0819--000--Skwovet.gif
rename to src/canonical/models/back-shiny/0819-000-Skwovet.gif
diff --git a/src/canonical/models/back-shiny/0820--000--Greedent.gif b/src/canonical/models/back-shiny/0820-000-Greedent.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0820--000--Greedent.gif
rename to src/canonical/models/back-shiny/0820-000-Greedent.gif
diff --git a/src/canonical/models/back-shiny/0821--000--Rookidee.gif b/src/canonical/models/back-shiny/0821-000-Rookidee.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0821--000--Rookidee.gif
rename to src/canonical/models/back-shiny/0821-000-Rookidee.gif
diff --git a/src/canonical/models/back-shiny/0822--000--Corvisquire.gif b/src/canonical/models/back-shiny/0822-000-Corvisquire.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0822--000--Corvisquire.gif
rename to src/canonical/models/back-shiny/0822-000-Corvisquire.gif
diff --git a/src/canonical/models/back-shiny/0823--000--Corviknight.gif b/src/canonical/models/back-shiny/0823-000-Corviknight.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0823--000--Corviknight.gif
rename to src/canonical/models/back-shiny/0823-000-Corviknight.gif
diff --git a/src/canonical/models/back-shiny/0823--420--Corviknight--Gmax.gif b/src/canonical/models/back-shiny/0823-420-Corviknight-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0823--420--Corviknight--Gmax.gif
rename to src/canonical/models/back-shiny/0823-420-Corviknight-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0824--000--Blipbug.gif b/src/canonical/models/back-shiny/0824-000-Blipbug.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0824--000--Blipbug.gif
rename to src/canonical/models/back-shiny/0824-000-Blipbug.gif
diff --git a/src/canonical/models/back-shiny/0825--000--Dottler.gif b/src/canonical/models/back-shiny/0825-000-Dottler.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0825--000--Dottler.gif
rename to src/canonical/models/back-shiny/0825-000-Dottler.gif
diff --git a/src/canonical/models/back-shiny/0826--000--Orbeetle.gif b/src/canonical/models/back-shiny/0826-000-Orbeetle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0826--000--Orbeetle.gif
rename to src/canonical/models/back-shiny/0826-000-Orbeetle.gif
diff --git a/src/canonical/models/back-shiny/0826--420--Orbeetle--Gmax.gif b/src/canonical/models/back-shiny/0826-420-Orbeetle-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0826--420--Orbeetle--Gmax.gif
rename to src/canonical/models/back-shiny/0826-420-Orbeetle-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0827--000--Nickit.gif b/src/canonical/models/back-shiny/0827-000-Nickit.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0827--000--Nickit.gif
rename to src/canonical/models/back-shiny/0827-000-Nickit.gif
diff --git a/src/canonical/models/back-shiny/0828--000--Thievul.gif b/src/canonical/models/back-shiny/0828-000-Thievul.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0828--000--Thievul.gif
rename to src/canonical/models/back-shiny/0828-000-Thievul.gif
diff --git a/src/canonical/models/back-shiny/0829--000--Gossifleur.gif b/src/canonical/models/back-shiny/0829-000-Gossifleur.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0829--000--Gossifleur.gif
rename to src/canonical/models/back-shiny/0829-000-Gossifleur.gif
diff --git a/src/canonical/models/back-shiny/0830--000--Eldegoss.gif b/src/canonical/models/back-shiny/0830-000-Eldegoss.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0830--000--Eldegoss.gif
rename to src/canonical/models/back-shiny/0830-000-Eldegoss.gif
diff --git a/src/canonical/models/back-shiny/0831--000--Wooloo.gif b/src/canonical/models/back-shiny/0831-000-Wooloo.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0831--000--Wooloo.gif
rename to src/canonical/models/back-shiny/0831-000-Wooloo.gif
diff --git a/src/canonical/models/back-shiny/0832--000--Dubwool.gif b/src/canonical/models/back-shiny/0832-000-Dubwool.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0832--000--Dubwool.gif
rename to src/canonical/models/back-shiny/0832-000-Dubwool.gif
diff --git a/src/canonical/models/back-shiny/0833--000--Chewtle.gif b/src/canonical/models/back-shiny/0833-000-Chewtle.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0833--000--Chewtle.gif
rename to src/canonical/models/back-shiny/0833-000-Chewtle.gif
diff --git a/src/canonical/models/back-shiny/0834--000--Drednaw.gif b/src/canonical/models/back-shiny/0834-000-Drednaw.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0834--000--Drednaw.gif
rename to src/canonical/models/back-shiny/0834-000-Drednaw.gif
diff --git a/src/canonical/models/back-shiny/0834--420--Drednaw--Gmax.gif b/src/canonical/models/back-shiny/0834-420-Drednaw-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0834--420--Drednaw--Gmax.gif
rename to src/canonical/models/back-shiny/0834-420-Drednaw-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0835--000--Yamper.gif b/src/canonical/models/back-shiny/0835-000-Yamper.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0835--000--Yamper.gif
rename to src/canonical/models/back-shiny/0835-000-Yamper.gif
diff --git a/src/canonical/models/back-shiny/0836--000--Boltund.gif b/src/canonical/models/back-shiny/0836-000-Boltund.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0836--000--Boltund.gif
rename to src/canonical/models/back-shiny/0836-000-Boltund.gif
diff --git a/src/canonical/models/back-shiny/0837--000--Rolycoly.gif b/src/canonical/models/back-shiny/0837-000-Rolycoly.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0837--000--Rolycoly.gif
rename to src/canonical/models/back-shiny/0837-000-Rolycoly.gif
diff --git a/src/canonical/models/back-shiny/0838--000--Carkol.gif b/src/canonical/models/back-shiny/0838-000-Carkol.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0838--000--Carkol.gif
rename to src/canonical/models/back-shiny/0838-000-Carkol.gif
diff --git a/src/canonical/models/back-shiny/0839--000--Coalossal.gif b/src/canonical/models/back-shiny/0839-000-Coalossal.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0839--000--Coalossal.gif
rename to src/canonical/models/back-shiny/0839-000-Coalossal.gif
diff --git a/src/canonical/models/back-shiny/0839--420--Coalossal--Gmax.gif b/src/canonical/models/back-shiny/0839-420-Coalossal-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0839--420--Coalossal--Gmax.gif
rename to src/canonical/models/back-shiny/0839-420-Coalossal-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0840--000--Applin.gif b/src/canonical/models/back-shiny/0840-000-Applin.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0840--000--Applin.gif
rename to src/canonical/models/back-shiny/0840-000-Applin.gif
diff --git a/src/canonical/models/back-shiny/0841--000--Flapple.gif b/src/canonical/models/back-shiny/0841-000-Flapple.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0841--000--Flapple.gif
rename to src/canonical/models/back-shiny/0841-000-Flapple.gif
diff --git a/src/canonical/models/back-shiny/0841--420--Flapple--Gmax.gif b/src/canonical/models/back-shiny/0841-420-Flapple-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0841--420--Flapple--Gmax.gif
rename to src/canonical/models/back-shiny/0841-420-Flapple-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0842--000--Appletun.gif b/src/canonical/models/back-shiny/0842-000-Appletun.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0842--000--Appletun.gif
rename to src/canonical/models/back-shiny/0842-000-Appletun.gif
diff --git a/src/canonical/models/back-shiny/0842--420--Appletun--Gmax.gif b/src/canonical/models/back-shiny/0842-420-Appletun-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0842--420--Appletun--Gmax.gif
rename to src/canonical/models/back-shiny/0842-420-Appletun-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0843--000--Silicobra.gif b/src/canonical/models/back-shiny/0843-000-Silicobra.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0843--000--Silicobra.gif
rename to src/canonical/models/back-shiny/0843-000-Silicobra.gif
diff --git a/src/canonical/models/back-shiny/0844--000--Sandaconda.gif b/src/canonical/models/back-shiny/0844-000-Sandaconda.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0844--000--Sandaconda.gif
rename to src/canonical/models/back-shiny/0844-000-Sandaconda.gif
diff --git a/src/canonical/models/back-shiny/0844--420--Sandaconda--Gmax.gif b/src/canonical/models/back-shiny/0844-420-Sandaconda-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0844--420--Sandaconda--Gmax.gif
rename to src/canonical/models/back-shiny/0844-420-Sandaconda-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0845--000--Cramorant.gif b/src/canonical/models/back-shiny/0845-000-Cramorant.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0845--000--Cramorant.gif
rename to src/canonical/models/back-shiny/0845-000-Cramorant.gif
diff --git a/src/canonical/models/back-shiny/0845--420--Cramorant--Gorging.gif b/src/canonical/models/back-shiny/0845-420-Cramorant-Gorging.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0845--420--Cramorant--Gorging.gif
rename to src/canonical/models/back-shiny/0845-420-Cramorant-Gorging.gif
diff --git a/src/canonical/models/back-shiny/0845--420--Cramorant--Gulping.gif b/src/canonical/models/back-shiny/0845-420-Cramorant-Gulping.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0845--420--Cramorant--Gulping.gif
rename to src/canonical/models/back-shiny/0845-420-Cramorant-Gulping.gif
diff --git a/src/canonical/models/back-shiny/0846--000--Arrokuda.gif b/src/canonical/models/back-shiny/0846-000-Arrokuda.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0846--000--Arrokuda.gif
rename to src/canonical/models/back-shiny/0846-000-Arrokuda.gif
diff --git a/src/canonical/models/back-shiny/0847--000--Barraskewda.gif b/src/canonical/models/back-shiny/0847-000-Barraskewda.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0847--000--Barraskewda.gif
rename to src/canonical/models/back-shiny/0847-000-Barraskewda.gif
diff --git a/src/canonical/models/back-shiny/0848--000--Toxel.gif b/src/canonical/models/back-shiny/0848-000-Toxel.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0848--000--Toxel.gif
rename to src/canonical/models/back-shiny/0848-000-Toxel.gif
diff --git a/src/canonical/models/back-shiny/0849--000--Toxtricity.gif b/src/canonical/models/back-shiny/0849-000-Toxtricity.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0849--000--Toxtricity.gif
rename to src/canonical/models/back-shiny/0849-000-Toxtricity.gif
diff --git a/src/canonical/models/back-shiny/0849--420--Toxtricity--Gmax.gif b/src/canonical/models/back-shiny/0849-420-Toxtricity-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0849--420--Toxtricity--Gmax.gif
rename to src/canonical/models/back-shiny/0849-420-Toxtricity-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0849--420--Toxtricity--Low-Key.gif b/src/canonical/models/back-shiny/0849-420-Toxtricity-Low~Key.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0849--420--Toxtricity--Low-Key.gif
rename to src/canonical/models/back-shiny/0849-420-Toxtricity-Low~Key.gif
diff --git a/src/canonical/models/back-shiny/0850--000--Sizzlipede.gif b/src/canonical/models/back-shiny/0850-000-Sizzlipede.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0850--000--Sizzlipede.gif
rename to src/canonical/models/back-shiny/0850-000-Sizzlipede.gif
diff --git a/src/canonical/models/back-shiny/0851--000--Centiskorch.gif b/src/canonical/models/back-shiny/0851-000-Centiskorch.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0851--000--Centiskorch.gif
rename to src/canonical/models/back-shiny/0851-000-Centiskorch.gif
diff --git a/src/canonical/models/back-shiny/0851--420--Centiskorch--Gmax.gif b/src/canonical/models/back-shiny/0851-420-Centiskorch-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0851--420--Centiskorch--Gmax.gif
rename to src/canonical/models/back-shiny/0851-420-Centiskorch-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0852--000--Clobbopus.gif b/src/canonical/models/back-shiny/0852-000-Clobbopus.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0852--000--Clobbopus.gif
rename to src/canonical/models/back-shiny/0852-000-Clobbopus.gif
diff --git a/src/canonical/models/back-shiny/0853--000--Grapploct.gif b/src/canonical/models/back-shiny/0853-000-Grapploct.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0853--000--Grapploct.gif
rename to src/canonical/models/back-shiny/0853-000-Grapploct.gif
diff --git a/src/canonical/models/back-shiny/0854--000--Sinistea.gif b/src/canonical/models/back-shiny/0854-000-Sinistea.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0854--000--Sinistea.gif
rename to src/canonical/models/back-shiny/0854-000-Sinistea.gif
diff --git a/src/canonical/models/back-shiny/0854--420--Sinistea--Antique.gif b/src/canonical/models/back-shiny/0854-420-Sinistea-Antique.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0854--420--Sinistea--Antique.gif
rename to src/canonical/models/back-shiny/0854-420-Sinistea-Antique.gif
diff --git a/src/canonical/models/back-shiny/0855--000--Polteageist.gif b/src/canonical/models/back-shiny/0855-000-Polteageist.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0855--000--Polteageist.gif
rename to src/canonical/models/back-shiny/0855-000-Polteageist.gif
diff --git a/src/canonical/models/back-shiny/0855--420--Polteageist--Antique.gif b/src/canonical/models/back-shiny/0855-420-Polteageist-Antique.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0855--420--Polteageist--Antique.gif
rename to src/canonical/models/back-shiny/0855-420-Polteageist-Antique.gif
diff --git a/src/canonical/models/back-shiny/0856--000--Hatenna.gif b/src/canonical/models/back-shiny/0856-000-Hatenna.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0856--000--Hatenna.gif
rename to src/canonical/models/back-shiny/0856-000-Hatenna.gif
diff --git a/src/canonical/models/back-shiny/0857--000--Hattrem.gif b/src/canonical/models/back-shiny/0857-000-Hattrem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0857--000--Hattrem.gif
rename to src/canonical/models/back-shiny/0857-000-Hattrem.gif
diff --git a/src/canonical/models/back-shiny/0858--000--Hatterene.gif b/src/canonical/models/back-shiny/0858-000-Hatterene.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0858--000--Hatterene.gif
rename to src/canonical/models/back-shiny/0858-000-Hatterene.gif
diff --git a/src/canonical/models/back-shiny/0858--420--Hatterene--Gmax.gif b/src/canonical/models/back-shiny/0858-420-Hatterene-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0858--420--Hatterene--Gmax.gif
rename to src/canonical/models/back-shiny/0858-420-Hatterene-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0859--000--Impidimp.gif b/src/canonical/models/back-shiny/0859-000-Impidimp.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0859--000--Impidimp.gif
rename to src/canonical/models/back-shiny/0859-000-Impidimp.gif
diff --git a/src/canonical/models/back-shiny/0860--000--Morgrem.gif b/src/canonical/models/back-shiny/0860-000-Morgrem.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0860--000--Morgrem.gif
rename to src/canonical/models/back-shiny/0860-000-Morgrem.gif
diff --git a/src/canonical/models/back-shiny/0861--000--Grimmsnarl.gif b/src/canonical/models/back-shiny/0861-000-Grimmsnarl.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0861--000--Grimmsnarl.gif
rename to src/canonical/models/back-shiny/0861-000-Grimmsnarl.gif
diff --git a/src/canonical/models/back-shiny/0861--420--Grimmsnarl--Gmax.gif b/src/canonical/models/back-shiny/0861-420-Grimmsnarl-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0861--420--Grimmsnarl--Gmax.gif
rename to src/canonical/models/back-shiny/0861-420-Grimmsnarl-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0862--000--Obstagoon.gif b/src/canonical/models/back-shiny/0862-000-Obstagoon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0862--000--Obstagoon.gif
rename to src/canonical/models/back-shiny/0862-000-Obstagoon.gif
diff --git a/src/canonical/models/back-shiny/0863--000--Perrserker.gif b/src/canonical/models/back-shiny/0863-000-Perrserker.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0863--000--Perrserker.gif
rename to src/canonical/models/back-shiny/0863-000-Perrserker.gif
diff --git a/src/canonical/models/back-shiny/0864--000--Cursola.gif b/src/canonical/models/back-shiny/0864-000-Cursola.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0864--000--Cursola.gif
rename to src/canonical/models/back-shiny/0864-000-Cursola.gif
diff --git a/src/canonical/models/back-shiny/0865--000--Sirfetch__0027d.gif b/src/canonical/models/back-shiny/0865-000-Sirfetch__0027d.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0865--000--Sirfetch__0027d.gif
rename to src/canonical/models/back-shiny/0865-000-Sirfetch__0027d.gif
diff --git a/src/canonical/models/back-shiny/0866--000--Mr._Rime.gif b/src/canonical/models/back-shiny/0866-000-Mr._Rime.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0866--000--Mr._Rime.gif
rename to src/canonical/models/back-shiny/0866-000-Mr._Rime.gif
diff --git a/src/canonical/models/back-shiny/0867--000--Runerigus.gif b/src/canonical/models/back-shiny/0867-000-Runerigus.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0867--000--Runerigus.gif
rename to src/canonical/models/back-shiny/0867-000-Runerigus.gif
diff --git a/src/canonical/models/back-shiny/0868--000--Milcery.gif b/src/canonical/models/back-shiny/0868-000-Milcery.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0868--000--Milcery.gif
rename to src/canonical/models/back-shiny/0868-000-Milcery.gif
diff --git a/src/canonical/models/back-shiny/0869--000--Alcremie.gif b/src/canonical/models/back-shiny/0869-000-Alcremie.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0869--000--Alcremie.gif
rename to src/canonical/models/back-shiny/0869-000-Alcremie.gif
diff --git a/src/canonical/models/back-shiny/0869--420--Alcremie--Gmax.gif b/src/canonical/models/back-shiny/0869-420-Alcremie-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0869--420--Alcremie--Gmax.gif
rename to src/canonical/models/back-shiny/0869-420-Alcremie-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0870--000--Falinks.gif b/src/canonical/models/back-shiny/0870-000-Falinks.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0870--000--Falinks.gif
rename to src/canonical/models/back-shiny/0870-000-Falinks.gif
diff --git a/src/canonical/models/back-shiny/0871--000--Pincurchin.gif b/src/canonical/models/back-shiny/0871-000-Pincurchin.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0871--000--Pincurchin.gif
rename to src/canonical/models/back-shiny/0871-000-Pincurchin.gif
diff --git a/src/canonical/models/back-shiny/0872--000--Snom.gif b/src/canonical/models/back-shiny/0872-000-Snom.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0872--000--Snom.gif
rename to src/canonical/models/back-shiny/0872-000-Snom.gif
diff --git a/src/canonical/models/back-shiny/0873--000--Frosmoth.gif b/src/canonical/models/back-shiny/0873-000-Frosmoth.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0873--000--Frosmoth.gif
rename to src/canonical/models/back-shiny/0873-000-Frosmoth.gif
diff --git a/src/canonical/models/back-shiny/0874--000--Stonjourner.gif b/src/canonical/models/back-shiny/0874-000-Stonjourner.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0874--000--Stonjourner.gif
rename to src/canonical/models/back-shiny/0874-000-Stonjourner.gif
diff --git a/src/canonical/models/back-shiny/0875--000--Eiscue.gif b/src/canonical/models/back-shiny/0875-000-Eiscue.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0875--000--Eiscue.gif
rename to src/canonical/models/back-shiny/0875-000-Eiscue.gif
diff --git a/src/canonical/models/back-shiny/0875--420--Eiscue--Noice.gif b/src/canonical/models/back-shiny/0875-420-Eiscue-Noice.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0875--420--Eiscue--Noice.gif
rename to src/canonical/models/back-shiny/0875-420-Eiscue-Noice.gif
diff --git a/src/canonical/models/back-shiny/0876--000--Indeedee.gif b/src/canonical/models/back-shiny/0876-000-Indeedee.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0876--000--Indeedee.gif
rename to src/canonical/models/back-shiny/0876-000-Indeedee.gif
diff --git a/src/canonical/models/back-shiny/0876--420--Indeedee--F.gif b/src/canonical/models/back-shiny/0876-420-Indeedee-F.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0876--420--Indeedee--F.gif
rename to src/canonical/models/back-shiny/0876-420-Indeedee-F.gif
diff --git a/src/canonical/models/back-shiny/0877--000--Morpeko.gif b/src/canonical/models/back-shiny/0877-000-Morpeko.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0877--000--Morpeko.gif
rename to src/canonical/models/back-shiny/0877-000-Morpeko.gif
diff --git a/src/canonical/models/back-shiny/0877--420--Morpeko--Hangry.gif b/src/canonical/models/back-shiny/0877-420-Morpeko-Hangry.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0877--420--Morpeko--Hangry.gif
rename to src/canonical/models/back-shiny/0877-420-Morpeko-Hangry.gif
diff --git a/src/canonical/models/back-shiny/0878--000--Cufant.gif b/src/canonical/models/back-shiny/0878-000-Cufant.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0878--000--Cufant.gif
rename to src/canonical/models/back-shiny/0878-000-Cufant.gif
diff --git a/src/canonical/models/back-shiny/0879--000--Copperajah.gif b/src/canonical/models/back-shiny/0879-000-Copperajah.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0879--000--Copperajah.gif
rename to src/canonical/models/back-shiny/0879-000-Copperajah.gif
diff --git a/src/canonical/models/back-shiny/0879--420--Copperajah--Gmax.gif b/src/canonical/models/back-shiny/0879-420-Copperajah-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0879--420--Copperajah--Gmax.gif
rename to src/canonical/models/back-shiny/0879-420-Copperajah-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0880--000--Dracozolt.gif b/src/canonical/models/back-shiny/0880-000-Dracozolt.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0880--000--Dracozolt.gif
rename to src/canonical/models/back-shiny/0880-000-Dracozolt.gif
diff --git a/src/canonical/models/back-shiny/0881--000--Arctozolt.gif b/src/canonical/models/back-shiny/0881-000-Arctozolt.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0881--000--Arctozolt.gif
rename to src/canonical/models/back-shiny/0881-000-Arctozolt.gif
diff --git a/src/canonical/models/back-shiny/0882--000--Dracovish.gif b/src/canonical/models/back-shiny/0882-000-Dracovish.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0882--000--Dracovish.gif
rename to src/canonical/models/back-shiny/0882-000-Dracovish.gif
diff --git a/src/canonical/models/back-shiny/0883--000--Arctovish.gif b/src/canonical/models/back-shiny/0883-000-Arctovish.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0883--000--Arctovish.gif
rename to src/canonical/models/back-shiny/0883-000-Arctovish.gif
diff --git a/src/canonical/models/back-shiny/0884--000--Duraludon.gif b/src/canonical/models/back-shiny/0884-000-Duraludon.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0884--000--Duraludon.gif
rename to src/canonical/models/back-shiny/0884-000-Duraludon.gif
diff --git a/src/canonical/models/back-shiny/0884--420--Duraludon--Gmax.gif b/src/canonical/models/back-shiny/0884-420-Duraludon-Gmax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0884--420--Duraludon--Gmax.gif
rename to src/canonical/models/back-shiny/0884-420-Duraludon-Gmax.gif
diff --git a/src/canonical/models/back-shiny/0885--000--Dreepy.gif b/src/canonical/models/back-shiny/0885-000-Dreepy.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0885--000--Dreepy.gif
rename to src/canonical/models/back-shiny/0885-000-Dreepy.gif
diff --git a/src/canonical/models/back-shiny/0886--000--Drakloak.gif b/src/canonical/models/back-shiny/0886-000-Drakloak.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0886--000--Drakloak.gif
rename to src/canonical/models/back-shiny/0886-000-Drakloak.gif
diff --git a/src/canonical/models/back-shiny/0887--000--Dragapult.gif b/src/canonical/models/back-shiny/0887-000-Dragapult.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0887--000--Dragapult.gif
rename to src/canonical/models/back-shiny/0887-000-Dragapult.gif
diff --git a/src/canonical/models/back-shiny/0888--000--Zacian.gif b/src/canonical/models/back-shiny/0888-000-Zacian.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0888--000--Zacian.gif
rename to src/canonical/models/back-shiny/0888-000-Zacian.gif
diff --git a/src/canonical/models/back-shiny/0888--420--Zacian--Crowned.gif b/src/canonical/models/back-shiny/0888-420-Zacian-Crowned.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0888--420--Zacian--Crowned.gif
rename to src/canonical/models/back-shiny/0888-420-Zacian-Crowned.gif
diff --git a/src/canonical/models/back-shiny/0889--000--Zamazenta.gif b/src/canonical/models/back-shiny/0889-000-Zamazenta.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0889--000--Zamazenta.gif
rename to src/canonical/models/back-shiny/0889-000-Zamazenta.gif
diff --git a/src/canonical/models/back-shiny/0889--420--Zamazenta--Crowned.gif b/src/canonical/models/back-shiny/0889-420-Zamazenta-Crowned.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0889--420--Zamazenta--Crowned.gif
rename to src/canonical/models/back-shiny/0889-420-Zamazenta-Crowned.gif
diff --git a/src/canonical/models/back-shiny/0890--000--Eternatus.gif b/src/canonical/models/back-shiny/0890-000-Eternatus.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0890--000--Eternatus.gif
rename to src/canonical/models/back-shiny/0890-000-Eternatus.gif
diff --git a/src/canonical/models/back-shiny/0890--420--Eternatus--Eternamax.gif b/src/canonical/models/back-shiny/0890-420-Eternatus-Eternamax.gif
similarity index 100%
rename from src/canonical/models/back-shiny/0890--420--Eternatus--Eternamax.gif
rename to src/canonical/models/back-shiny/0890-420-Eternatus-Eternamax.gif
diff --git a/src/canonical/models/back/0001--000--Bulbasaur.gif b/src/canonical/models/back/0001-000-Bulbasaur.gif
similarity index 100%
rename from src/canonical/models/back/0001--000--Bulbasaur.gif
rename to src/canonical/models/back/0001-000-Bulbasaur.gif
diff --git a/src/canonical/models/back/0002--000--Ivysaur.gif b/src/canonical/models/back/0002-000-Ivysaur.gif
similarity index 100%
rename from src/canonical/models/back/0002--000--Ivysaur.gif
rename to src/canonical/models/back/0002-000-Ivysaur.gif
diff --git a/src/canonical/models/back/0003--000--Venusaur.gif b/src/canonical/models/back/0003-000-Venusaur.gif
similarity index 100%
rename from src/canonical/models/back/0003--000--Venusaur.gif
rename to src/canonical/models/back/0003-000-Venusaur.gif
diff --git a/src/canonical/models/back/0003--420--Venusaur--Mega.gif b/src/canonical/models/back/0003-420-Venusaur-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0003--420--Venusaur--Mega.gif
rename to src/canonical/models/back/0003-420-Venusaur-Mega.gif
diff --git a/src/canonical/models/back/0004--000--Charmander.gif b/src/canonical/models/back/0004-000-Charmander.gif
similarity index 100%
rename from src/canonical/models/back/0004--000--Charmander.gif
rename to src/canonical/models/back/0004-000-Charmander.gif
diff --git a/src/canonical/models/back/0005--000--Charmeleon.gif b/src/canonical/models/back/0005-000-Charmeleon.gif
similarity index 100%
rename from src/canonical/models/back/0005--000--Charmeleon.gif
rename to src/canonical/models/back/0005-000-Charmeleon.gif
diff --git a/src/canonical/models/back/0006--000--Charizard.gif b/src/canonical/models/back/0006-000-Charizard.gif
similarity index 100%
rename from src/canonical/models/back/0006--000--Charizard.gif
rename to src/canonical/models/back/0006-000-Charizard.gif
diff --git a/src/canonical/models/back/0006--420--Charizard--Gmax.gif b/src/canonical/models/back/0006-420-Charizard-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0006--420--Charizard--Gmax.gif
rename to src/canonical/models/back/0006-420-Charizard-Gmax.gif
diff --git a/src/canonical/models/back/0006--420--Charizard--Mega-X.gif b/src/canonical/models/back/0006-420-Charizard-Mega~X.gif
similarity index 100%
rename from src/canonical/models/back/0006--420--Charizard--Mega-X.gif
rename to src/canonical/models/back/0006-420-Charizard-Mega~X.gif
diff --git a/src/canonical/models/back/0006--420--Charizard--Mega-Y.gif b/src/canonical/models/back/0006-420-Charizard-Mega~Y.gif
similarity index 100%
rename from src/canonical/models/back/0006--420--Charizard--Mega-Y.gif
rename to src/canonical/models/back/0006-420-Charizard-Mega~Y.gif
diff --git a/src/canonical/models/back/0007--000--Squirtle.gif b/src/canonical/models/back/0007-000-Squirtle.gif
similarity index 100%
rename from src/canonical/models/back/0007--000--Squirtle.gif
rename to src/canonical/models/back/0007-000-Squirtle.gif
diff --git a/src/canonical/models/back/0008--000--Wartortle.gif b/src/canonical/models/back/0008-000-Wartortle.gif
similarity index 100%
rename from src/canonical/models/back/0008--000--Wartortle.gif
rename to src/canonical/models/back/0008-000-Wartortle.gif
diff --git a/src/canonical/models/back/0009--000--Blastoise.gif b/src/canonical/models/back/0009-000-Blastoise.gif
similarity index 100%
rename from src/canonical/models/back/0009--000--Blastoise.gif
rename to src/canonical/models/back/0009-000-Blastoise.gif
diff --git a/src/canonical/models/back/0009--420--Blastoise--Mega.gif b/src/canonical/models/back/0009-420-Blastoise-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0009--420--Blastoise--Mega.gif
rename to src/canonical/models/back/0009-420-Blastoise-Mega.gif
diff --git a/src/canonical/models/back/0010--000--Caterpie.gif b/src/canonical/models/back/0010-000-Caterpie.gif
similarity index 100%
rename from src/canonical/models/back/0010--000--Caterpie.gif
rename to src/canonical/models/back/0010-000-Caterpie.gif
diff --git a/src/canonical/models/back/0011--000--Metapod.gif b/src/canonical/models/back/0011-000-Metapod.gif
similarity index 100%
rename from src/canonical/models/back/0011--000--Metapod.gif
rename to src/canonical/models/back/0011-000-Metapod.gif
diff --git a/src/canonical/models/back/0012--000--Butterfree.gif b/src/canonical/models/back/0012-000-Butterfree.gif
similarity index 100%
rename from src/canonical/models/back/0012--000--Butterfree.gif
rename to src/canonical/models/back/0012-000-Butterfree.gif
diff --git a/src/canonical/models/back/0012--420--Butterfree--Gmax.gif b/src/canonical/models/back/0012-420-Butterfree-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0012--420--Butterfree--Gmax.gif
rename to src/canonical/models/back/0012-420-Butterfree-Gmax.gif
diff --git a/src/canonical/models/back/0013--000--Weedle.gif b/src/canonical/models/back/0013-000-Weedle.gif
similarity index 100%
rename from src/canonical/models/back/0013--000--Weedle.gif
rename to src/canonical/models/back/0013-000-Weedle.gif
diff --git a/src/canonical/models/back/0014--000--Kakuna.gif b/src/canonical/models/back/0014-000-Kakuna.gif
similarity index 100%
rename from src/canonical/models/back/0014--000--Kakuna.gif
rename to src/canonical/models/back/0014-000-Kakuna.gif
diff --git a/src/canonical/models/back/0015--000--Beedrill.gif b/src/canonical/models/back/0015-000-Beedrill.gif
similarity index 100%
rename from src/canonical/models/back/0015--000--Beedrill.gif
rename to src/canonical/models/back/0015-000-Beedrill.gif
diff --git a/src/canonical/models/back/0015--420--Beedrill--Mega.gif b/src/canonical/models/back/0015-420-Beedrill-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0015--420--Beedrill--Mega.gif
rename to src/canonical/models/back/0015-420-Beedrill-Mega.gif
diff --git a/src/canonical/models/back/0016--000--Pidgey.gif b/src/canonical/models/back/0016-000-Pidgey.gif
similarity index 100%
rename from src/canonical/models/back/0016--000--Pidgey.gif
rename to src/canonical/models/back/0016-000-Pidgey.gif
diff --git a/src/canonical/models/back/0017--000--Pidgeotto.gif b/src/canonical/models/back/0017-000-Pidgeotto.gif
similarity index 100%
rename from src/canonical/models/back/0017--000--Pidgeotto.gif
rename to src/canonical/models/back/0017-000-Pidgeotto.gif
diff --git a/src/canonical/models/back/0018--000--Pidgeot.gif b/src/canonical/models/back/0018-000-Pidgeot.gif
similarity index 100%
rename from src/canonical/models/back/0018--000--Pidgeot.gif
rename to src/canonical/models/back/0018-000-Pidgeot.gif
diff --git a/src/canonical/models/back/0018--420--Pidgeot--Mega.gif b/src/canonical/models/back/0018-420-Pidgeot-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0018--420--Pidgeot--Mega.gif
rename to src/canonical/models/back/0018-420-Pidgeot-Mega.gif
diff --git a/src/canonical/models/back/0019--000--Rattata.gif b/src/canonical/models/back/0019-000-Rattata.gif
similarity index 100%
rename from src/canonical/models/back/0019--000--Rattata.gif
rename to src/canonical/models/back/0019-000-Rattata.gif
diff --git a/src/canonical/models/back/0019--420--Rattata--Alola.gif b/src/canonical/models/back/0019-420-Rattata-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0019--420--Rattata--Alola.gif
rename to src/canonical/models/back/0019-420-Rattata-Alola.gif
diff --git a/src/canonical/models/back/0020--000--Raticate.gif b/src/canonical/models/back/0020-000-Raticate.gif
similarity index 100%
rename from src/canonical/models/back/0020--000--Raticate.gif
rename to src/canonical/models/back/0020-000-Raticate.gif
diff --git a/src/canonical/models/back/0020--420--Raticate--Alola.gif b/src/canonical/models/back/0020-420-Raticate-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0020--420--Raticate--Alola.gif
rename to src/canonical/models/back/0020-420-Raticate-Alola.gif
diff --git a/src/canonical/models/back/0020--420--Raticate--Alola-Totem.gif b/src/canonical/models/back/0020-420-Raticate-Alola~Totem.gif
similarity index 100%
rename from src/canonical/models/back/0020--420--Raticate--Alola-Totem.gif
rename to src/canonical/models/back/0020-420-Raticate-Alola~Totem.gif
diff --git a/src/canonical/models/back/0021--000--Spearow.gif b/src/canonical/models/back/0021-000-Spearow.gif
similarity index 100%
rename from src/canonical/models/back/0021--000--Spearow.gif
rename to src/canonical/models/back/0021-000-Spearow.gif
diff --git a/src/canonical/models/back/0022--000--Fearow.gif b/src/canonical/models/back/0022-000-Fearow.gif
similarity index 100%
rename from src/canonical/models/back/0022--000--Fearow.gif
rename to src/canonical/models/back/0022-000-Fearow.gif
diff --git a/src/canonical/models/back/0023--000--Ekans.gif b/src/canonical/models/back/0023-000-Ekans.gif
similarity index 100%
rename from src/canonical/models/back/0023--000--Ekans.gif
rename to src/canonical/models/back/0023-000-Ekans.gif
diff --git a/src/canonical/models/back/0024--000--Arbok.gif b/src/canonical/models/back/0024-000-Arbok.gif
similarity index 100%
rename from src/canonical/models/back/0024--000--Arbok.gif
rename to src/canonical/models/back/0024-000-Arbok.gif
diff --git a/src/canonical/models/back/0025--000--Pikachu.gif b/src/canonical/models/back/0025-000-Pikachu.gif
similarity index 100%
rename from src/canonical/models/back/0025--000--Pikachu.gif
rename to src/canonical/models/back/0025-000-Pikachu.gif
diff --git a/src/canonical/models/back/0025--420--Pikachu--Alola.gif b/src/canonical/models/back/0025-420-Pikachu-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0025--420--Pikachu--Alola.gif
rename to src/canonical/models/back/0025-420-Pikachu-Alola.gif
diff --git a/src/canonical/models/back/0025--420--Pikachu--Belle.gif b/src/canonical/models/back/0025-420-Pikachu-Belle.gif
similarity index 100%
rename from src/canonical/models/back/0025--420--Pikachu--Belle.gif
rename to src/canonical/models/back/0025-420-Pikachu-Belle.gif
diff --git a/src/canonical/models/back/0025--420--Pikachu--Cosplay.gif b/src/canonical/models/back/0025-420-Pikachu-Cosplay.gif
similarity index 100%
rename from src/canonical/models/back/0025--420--Pikachu--Cosplay.gif
rename to src/canonical/models/back/0025-420-Pikachu-Cosplay.gif
diff --git a/src/canonical/models/back/0025--420--Pikachu--Gmax.gif b/src/canonical/models/back/0025-420-Pikachu-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0025--420--Pikachu--Gmax.gif
rename to src/canonical/models/back/0025-420-Pikachu-Gmax.gif
diff --git a/src/canonical/models/back/0025--420--Pikachu--Hoenn.gif b/src/canonical/models/back/0025-420-Pikachu-Hoenn.gif
similarity index 100%
rename from src/canonical/models/back/0025--420--Pikachu--Hoenn.gif
rename to src/canonical/models/back/0025-420-Pikachu-Hoenn.gif
diff --git a/src/canonical/models/back/0025--420--Pikachu--Kalos.gif b/src/canonical/models/back/0025-420-Pikachu-Kalos.gif
similarity index 100%
rename from src/canonical/models/back/0025--420--Pikachu--Kalos.gif
rename to src/canonical/models/back/0025-420-Pikachu-Kalos.gif
diff --git a/src/canonical/models/back/0025--420--Pikachu--Partner.gif b/src/canonical/models/back/0025-420-Pikachu-Partner.gif
similarity index 100%
rename from src/canonical/models/back/0025--420--Pikachu--Partner.gif
rename to src/canonical/models/back/0025-420-Pikachu-Partner.gif
diff --git a/src/canonical/models/back/0025--420--Pikachu--PhD.gif b/src/canonical/models/back/0025-420-Pikachu-PhD.gif
similarity index 100%
rename from src/canonical/models/back/0025--420--Pikachu--PhD.gif
rename to src/canonical/models/back/0025-420-Pikachu-PhD.gif
diff --git a/src/canonical/models/back/0025--420--Pikachu--Pop-Star.gif b/src/canonical/models/back/0025-420-Pikachu-Pop~Star.gif
similarity index 100%
rename from src/canonical/models/back/0025--420--Pikachu--Pop-Star.gif
rename to src/canonical/models/back/0025-420-Pikachu-Pop~Star.gif
diff --git a/src/canonical/models/back/0025--420--Pikachu--Rock-Star.gif b/src/canonical/models/back/0025-420-Pikachu-Rock~Star.gif
similarity index 100%
rename from src/canonical/models/back/0025--420--Pikachu--Rock-Star.gif
rename to src/canonical/models/back/0025-420-Pikachu-Rock~Star.gif
diff --git a/src/canonical/models/back/0025--420--Pikachu--Sinnoh.gif b/src/canonical/models/back/0025-420-Pikachu-Sinnoh.gif
similarity index 100%
rename from src/canonical/models/back/0025--420--Pikachu--Sinnoh.gif
rename to src/canonical/models/back/0025-420-Pikachu-Sinnoh.gif
diff --git a/src/canonical/models/back/0025--420--Pikachu--Starter.gif b/src/canonical/models/back/0025-420-Pikachu-Starter.gif
similarity index 100%
rename from src/canonical/models/back/0025--420--Pikachu--Starter.gif
rename to src/canonical/models/back/0025-420-Pikachu-Starter.gif
diff --git a/src/canonical/models/back/0025--420--Pikachu--Unova.gif b/src/canonical/models/back/0025-420-Pikachu-Unova.gif
similarity index 100%
rename from src/canonical/models/back/0025--420--Pikachu--Unova.gif
rename to src/canonical/models/back/0025-420-Pikachu-Unova.gif
diff --git a/src/canonical/models/back/0026--000--Raichu.gif b/src/canonical/models/back/0026-000-Raichu.gif
similarity index 100%
rename from src/canonical/models/back/0026--000--Raichu.gif
rename to src/canonical/models/back/0026-000-Raichu.gif
diff --git a/src/canonical/models/back/0026--420--Raichu--Alola.gif b/src/canonical/models/back/0026-420-Raichu-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0026--420--Raichu--Alola.gif
rename to src/canonical/models/back/0026-420-Raichu-Alola.gif
diff --git a/src/canonical/models/back/0027--000--Sandshrew.gif b/src/canonical/models/back/0027-000-Sandshrew.gif
similarity index 100%
rename from src/canonical/models/back/0027--000--Sandshrew.gif
rename to src/canonical/models/back/0027-000-Sandshrew.gif
diff --git a/src/canonical/models/back/0027--420--Sandshrew--Alola.gif b/src/canonical/models/back/0027-420-Sandshrew-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0027--420--Sandshrew--Alola.gif
rename to src/canonical/models/back/0027-420-Sandshrew-Alola.gif
diff --git a/src/canonical/models/back/0028--000--Sandslash.gif b/src/canonical/models/back/0028-000-Sandslash.gif
similarity index 100%
rename from src/canonical/models/back/0028--000--Sandslash.gif
rename to src/canonical/models/back/0028-000-Sandslash.gif
diff --git a/src/canonical/models/back/0028--420--Sandslash--Alola.gif b/src/canonical/models/back/0028-420-Sandslash-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0028--420--Sandslash--Alola.gif
rename to src/canonical/models/back/0028-420-Sandslash-Alola.gif
diff --git a/src/canonical/models/back/0029--000--Nidoran-F.gif b/src/canonical/models/back/0029-000-Nidoran~F.gif
similarity index 100%
rename from src/canonical/models/back/0029--000--Nidoran-F.gif
rename to src/canonical/models/back/0029-000-Nidoran~F.gif
diff --git a/src/canonical/models/back/0030--000--Nidorina.gif b/src/canonical/models/back/0030-000-Nidorina.gif
similarity index 100%
rename from src/canonical/models/back/0030--000--Nidorina.gif
rename to src/canonical/models/back/0030-000-Nidorina.gif
diff --git a/src/canonical/models/back/0031--000--Nidoqueen.gif b/src/canonical/models/back/0031-000-Nidoqueen.gif
similarity index 100%
rename from src/canonical/models/back/0031--000--Nidoqueen.gif
rename to src/canonical/models/back/0031-000-Nidoqueen.gif
diff --git a/src/canonical/models/back/0032--000--Nidoran-M.gif b/src/canonical/models/back/0032-000-Nidoran~M.gif
similarity index 100%
rename from src/canonical/models/back/0032--000--Nidoran-M.gif
rename to src/canonical/models/back/0032-000-Nidoran~M.gif
diff --git a/src/canonical/models/back/0033--000--Nidorino.gif b/src/canonical/models/back/0033-000-Nidorino.gif
similarity index 100%
rename from src/canonical/models/back/0033--000--Nidorino.gif
rename to src/canonical/models/back/0033-000-Nidorino.gif
diff --git a/src/canonical/models/back/0034--000--Nidoking.gif b/src/canonical/models/back/0034-000-Nidoking.gif
similarity index 100%
rename from src/canonical/models/back/0034--000--Nidoking.gif
rename to src/canonical/models/back/0034-000-Nidoking.gif
diff --git a/src/canonical/models/back/0035--000--Clefairy.gif b/src/canonical/models/back/0035-000-Clefairy.gif
similarity index 100%
rename from src/canonical/models/back/0035--000--Clefairy.gif
rename to src/canonical/models/back/0035-000-Clefairy.gif
diff --git a/src/canonical/models/back/0036--000--Clefable.gif b/src/canonical/models/back/0036-000-Clefable.gif
similarity index 100%
rename from src/canonical/models/back/0036--000--Clefable.gif
rename to src/canonical/models/back/0036-000-Clefable.gif
diff --git a/src/canonical/models/back/0037--000--Vulpix.gif b/src/canonical/models/back/0037-000-Vulpix.gif
similarity index 100%
rename from src/canonical/models/back/0037--000--Vulpix.gif
rename to src/canonical/models/back/0037-000-Vulpix.gif
diff --git a/src/canonical/models/back/0037--420--Vulpix--Alola.gif b/src/canonical/models/back/0037-420-Vulpix-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0037--420--Vulpix--Alola.gif
rename to src/canonical/models/back/0037-420-Vulpix-Alola.gif
diff --git a/src/canonical/models/back/0038--000--Ninetales.gif b/src/canonical/models/back/0038-000-Ninetales.gif
similarity index 100%
rename from src/canonical/models/back/0038--000--Ninetales.gif
rename to src/canonical/models/back/0038-000-Ninetales.gif
diff --git a/src/canonical/models/back/0038--420--Ninetales--Alola.gif b/src/canonical/models/back/0038-420-Ninetales-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0038--420--Ninetales--Alola.gif
rename to src/canonical/models/back/0038-420-Ninetales-Alola.gif
diff --git a/src/canonical/models/back/0039--000--Jigglypuff.gif b/src/canonical/models/back/0039-000-Jigglypuff.gif
similarity index 100%
rename from src/canonical/models/back/0039--000--Jigglypuff.gif
rename to src/canonical/models/back/0039-000-Jigglypuff.gif
diff --git a/src/canonical/models/back/0040--000--Wigglytuff.gif b/src/canonical/models/back/0040-000-Wigglytuff.gif
similarity index 100%
rename from src/canonical/models/back/0040--000--Wigglytuff.gif
rename to src/canonical/models/back/0040-000-Wigglytuff.gif
diff --git a/src/canonical/models/back/0041--000--Zubat.gif b/src/canonical/models/back/0041-000-Zubat.gif
similarity index 100%
rename from src/canonical/models/back/0041--000--Zubat.gif
rename to src/canonical/models/back/0041-000-Zubat.gif
diff --git a/src/canonical/models/back/0042--000--Golbat.gif b/src/canonical/models/back/0042-000-Golbat.gif
similarity index 100%
rename from src/canonical/models/back/0042--000--Golbat.gif
rename to src/canonical/models/back/0042-000-Golbat.gif
diff --git a/src/canonical/models/back/0043--000--Oddish.gif b/src/canonical/models/back/0043-000-Oddish.gif
similarity index 100%
rename from src/canonical/models/back/0043--000--Oddish.gif
rename to src/canonical/models/back/0043-000-Oddish.gif
diff --git a/src/canonical/models/back/0044--000--Gloom.gif b/src/canonical/models/back/0044-000-Gloom.gif
similarity index 100%
rename from src/canonical/models/back/0044--000--Gloom.gif
rename to src/canonical/models/back/0044-000-Gloom.gif
diff --git a/src/canonical/models/back/0045--000--Vileplume.gif b/src/canonical/models/back/0045-000-Vileplume.gif
similarity index 100%
rename from src/canonical/models/back/0045--000--Vileplume.gif
rename to src/canonical/models/back/0045-000-Vileplume.gif
diff --git a/src/canonical/models/back/0046--000--Paras.gif b/src/canonical/models/back/0046-000-Paras.gif
similarity index 100%
rename from src/canonical/models/back/0046--000--Paras.gif
rename to src/canonical/models/back/0046-000-Paras.gif
diff --git a/src/canonical/models/back/0047--000--Parasect.gif b/src/canonical/models/back/0047-000-Parasect.gif
similarity index 100%
rename from src/canonical/models/back/0047--000--Parasect.gif
rename to src/canonical/models/back/0047-000-Parasect.gif
diff --git a/src/canonical/models/back/0048--000--Venonat.gif b/src/canonical/models/back/0048-000-Venonat.gif
similarity index 100%
rename from src/canonical/models/back/0048--000--Venonat.gif
rename to src/canonical/models/back/0048-000-Venonat.gif
diff --git a/src/canonical/models/back/0049--000--Venomoth.gif b/src/canonical/models/back/0049-000-Venomoth.gif
similarity index 100%
rename from src/canonical/models/back/0049--000--Venomoth.gif
rename to src/canonical/models/back/0049-000-Venomoth.gif
diff --git a/src/canonical/models/back/0050--000--Diglett.gif b/src/canonical/models/back/0050-000-Diglett.gif
similarity index 100%
rename from src/canonical/models/back/0050--000--Diglett.gif
rename to src/canonical/models/back/0050-000-Diglett.gif
diff --git a/src/canonical/models/back/0050--420--Diglett--Alola.gif b/src/canonical/models/back/0050-420-Diglett-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0050--420--Diglett--Alola.gif
rename to src/canonical/models/back/0050-420-Diglett-Alola.gif
diff --git a/src/canonical/models/back/0051--000--Dugtrio.gif b/src/canonical/models/back/0051-000-Dugtrio.gif
similarity index 100%
rename from src/canonical/models/back/0051--000--Dugtrio.gif
rename to src/canonical/models/back/0051-000-Dugtrio.gif
diff --git a/src/canonical/models/back/0051--420--Dugtrio--Alola.gif b/src/canonical/models/back/0051-420-Dugtrio-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0051--420--Dugtrio--Alola.gif
rename to src/canonical/models/back/0051-420-Dugtrio-Alola.gif
diff --git a/src/canonical/models/back/0052--000--Meowth.gif b/src/canonical/models/back/0052-000-Meowth.gif
similarity index 100%
rename from src/canonical/models/back/0052--000--Meowth.gif
rename to src/canonical/models/back/0052-000-Meowth.gif
diff --git a/src/canonical/models/back/0052--420--Meowth--Alola.gif b/src/canonical/models/back/0052-420-Meowth-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0052--420--Meowth--Alola.gif
rename to src/canonical/models/back/0052-420-Meowth-Alola.gif
diff --git a/src/canonical/models/back/0052--420--Meowth--Galar.gif b/src/canonical/models/back/0052-420-Meowth-Galar.gif
similarity index 100%
rename from src/canonical/models/back/0052--420--Meowth--Galar.gif
rename to src/canonical/models/back/0052-420-Meowth-Galar.gif
diff --git a/src/canonical/models/back/0052--420--Meowth--Gmax.gif b/src/canonical/models/back/0052-420-Meowth-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0052--420--Meowth--Gmax.gif
rename to src/canonical/models/back/0052-420-Meowth-Gmax.gif
diff --git a/src/canonical/models/back/0053--000--Persian.gif b/src/canonical/models/back/0053-000-Persian.gif
similarity index 100%
rename from src/canonical/models/back/0053--000--Persian.gif
rename to src/canonical/models/back/0053-000-Persian.gif
diff --git a/src/canonical/models/back/0053--420--Persian--Alola.gif b/src/canonical/models/back/0053-420-Persian-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0053--420--Persian--Alola.gif
rename to src/canonical/models/back/0053-420-Persian-Alola.gif
diff --git a/src/canonical/models/back/0054--000--Psyduck.gif b/src/canonical/models/back/0054-000-Psyduck.gif
similarity index 100%
rename from src/canonical/models/back/0054--000--Psyduck.gif
rename to src/canonical/models/back/0054-000-Psyduck.gif
diff --git a/src/canonical/models/back/0055--000--Golduck.gif b/src/canonical/models/back/0055-000-Golduck.gif
similarity index 100%
rename from src/canonical/models/back/0055--000--Golduck.gif
rename to src/canonical/models/back/0055-000-Golduck.gif
diff --git a/src/canonical/models/back/0056--000--Mankey.gif b/src/canonical/models/back/0056-000-Mankey.gif
similarity index 100%
rename from src/canonical/models/back/0056--000--Mankey.gif
rename to src/canonical/models/back/0056-000-Mankey.gif
diff --git a/src/canonical/models/back/0057--000--Primeape.gif b/src/canonical/models/back/0057-000-Primeape.gif
similarity index 100%
rename from src/canonical/models/back/0057--000--Primeape.gif
rename to src/canonical/models/back/0057-000-Primeape.gif
diff --git a/src/canonical/models/back/0058--000--Growlithe.gif b/src/canonical/models/back/0058-000-Growlithe.gif
similarity index 100%
rename from src/canonical/models/back/0058--000--Growlithe.gif
rename to src/canonical/models/back/0058-000-Growlithe.gif
diff --git a/src/canonical/models/back/0059--000--Arcanine.gif b/src/canonical/models/back/0059-000-Arcanine.gif
similarity index 100%
rename from src/canonical/models/back/0059--000--Arcanine.gif
rename to src/canonical/models/back/0059-000-Arcanine.gif
diff --git a/src/canonical/models/back/0060--000--Poliwag.gif b/src/canonical/models/back/0060-000-Poliwag.gif
similarity index 100%
rename from src/canonical/models/back/0060--000--Poliwag.gif
rename to src/canonical/models/back/0060-000-Poliwag.gif
diff --git a/src/canonical/models/back/0061--000--Poliwhirl.gif b/src/canonical/models/back/0061-000-Poliwhirl.gif
similarity index 100%
rename from src/canonical/models/back/0061--000--Poliwhirl.gif
rename to src/canonical/models/back/0061-000-Poliwhirl.gif
diff --git a/src/canonical/models/back/0062--000--Poliwrath.gif b/src/canonical/models/back/0062-000-Poliwrath.gif
similarity index 100%
rename from src/canonical/models/back/0062--000--Poliwrath.gif
rename to src/canonical/models/back/0062-000-Poliwrath.gif
diff --git a/src/canonical/models/back/0063--000--Abra.gif b/src/canonical/models/back/0063-000-Abra.gif
similarity index 100%
rename from src/canonical/models/back/0063--000--Abra.gif
rename to src/canonical/models/back/0063-000-Abra.gif
diff --git a/src/canonical/models/back/0064--000--Kadabra.gif b/src/canonical/models/back/0064-000-Kadabra.gif
similarity index 100%
rename from src/canonical/models/back/0064--000--Kadabra.gif
rename to src/canonical/models/back/0064-000-Kadabra.gif
diff --git a/src/canonical/models/back/0065--000--Alakazam.gif b/src/canonical/models/back/0065-000-Alakazam.gif
similarity index 100%
rename from src/canonical/models/back/0065--000--Alakazam.gif
rename to src/canonical/models/back/0065-000-Alakazam.gif
diff --git a/src/canonical/models/back/0065--420--Alakazam--Mega.gif b/src/canonical/models/back/0065-420-Alakazam-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0065--420--Alakazam--Mega.gif
rename to src/canonical/models/back/0065-420-Alakazam-Mega.gif
diff --git a/src/canonical/models/back/0066--000--Machop.gif b/src/canonical/models/back/0066-000-Machop.gif
similarity index 100%
rename from src/canonical/models/back/0066--000--Machop.gif
rename to src/canonical/models/back/0066-000-Machop.gif
diff --git a/src/canonical/models/back/0067--000--Machoke.gif b/src/canonical/models/back/0067-000-Machoke.gif
similarity index 100%
rename from src/canonical/models/back/0067--000--Machoke.gif
rename to src/canonical/models/back/0067-000-Machoke.gif
diff --git a/src/canonical/models/back/0068--000--Machamp.gif b/src/canonical/models/back/0068-000-Machamp.gif
similarity index 100%
rename from src/canonical/models/back/0068--000--Machamp.gif
rename to src/canonical/models/back/0068-000-Machamp.gif
diff --git a/src/canonical/models/back/0068--420--Machamp--Gmax.gif b/src/canonical/models/back/0068-420-Machamp-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0068--420--Machamp--Gmax.gif
rename to src/canonical/models/back/0068-420-Machamp-Gmax.gif
diff --git a/src/canonical/models/back/0069--000--Bellsprout.gif b/src/canonical/models/back/0069-000-Bellsprout.gif
similarity index 100%
rename from src/canonical/models/back/0069--000--Bellsprout.gif
rename to src/canonical/models/back/0069-000-Bellsprout.gif
diff --git a/src/canonical/models/back/0070--000--Weepinbell.gif b/src/canonical/models/back/0070-000-Weepinbell.gif
similarity index 100%
rename from src/canonical/models/back/0070--000--Weepinbell.gif
rename to src/canonical/models/back/0070-000-Weepinbell.gif
diff --git a/src/canonical/models/back/0071--000--Victreebel.gif b/src/canonical/models/back/0071-000-Victreebel.gif
similarity index 100%
rename from src/canonical/models/back/0071--000--Victreebel.gif
rename to src/canonical/models/back/0071-000-Victreebel.gif
diff --git a/src/canonical/models/back/0072--000--Tentacool.gif b/src/canonical/models/back/0072-000-Tentacool.gif
similarity index 100%
rename from src/canonical/models/back/0072--000--Tentacool.gif
rename to src/canonical/models/back/0072-000-Tentacool.gif
diff --git a/src/canonical/models/back/0073--000--Tentacruel.gif b/src/canonical/models/back/0073-000-Tentacruel.gif
similarity index 100%
rename from src/canonical/models/back/0073--000--Tentacruel.gif
rename to src/canonical/models/back/0073-000-Tentacruel.gif
diff --git a/src/canonical/models/back/0074--000--Geodude.gif b/src/canonical/models/back/0074-000-Geodude.gif
similarity index 100%
rename from src/canonical/models/back/0074--000--Geodude.gif
rename to src/canonical/models/back/0074-000-Geodude.gif
diff --git a/src/canonical/models/back/0074--420--Geodude--Alola.gif b/src/canonical/models/back/0074-420-Geodude-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0074--420--Geodude--Alola.gif
rename to src/canonical/models/back/0074-420-Geodude-Alola.gif
diff --git a/src/canonical/models/back/0075--000--Graveler.gif b/src/canonical/models/back/0075-000-Graveler.gif
similarity index 100%
rename from src/canonical/models/back/0075--000--Graveler.gif
rename to src/canonical/models/back/0075-000-Graveler.gif
diff --git a/src/canonical/models/back/0075--420--Graveler--Alola.gif b/src/canonical/models/back/0075-420-Graveler-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0075--420--Graveler--Alola.gif
rename to src/canonical/models/back/0075-420-Graveler-Alola.gif
diff --git a/src/canonical/models/back/0076--000--Golem.gif b/src/canonical/models/back/0076-000-Golem.gif
similarity index 100%
rename from src/canonical/models/back/0076--000--Golem.gif
rename to src/canonical/models/back/0076-000-Golem.gif
diff --git a/src/canonical/models/back/0076--420--Golem--Alola.gif b/src/canonical/models/back/0076-420-Golem-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0076--420--Golem--Alola.gif
rename to src/canonical/models/back/0076-420-Golem-Alola.gif
diff --git a/src/canonical/models/back/0077--000--Ponyta.gif b/src/canonical/models/back/0077-000-Ponyta.gif
similarity index 100%
rename from src/canonical/models/back/0077--000--Ponyta.gif
rename to src/canonical/models/back/0077-000-Ponyta.gif
diff --git a/src/canonical/models/back/0077--420--Ponyta--Galar.gif b/src/canonical/models/back/0077-420-Ponyta-Galar.gif
similarity index 100%
rename from src/canonical/models/back/0077--420--Ponyta--Galar.gif
rename to src/canonical/models/back/0077-420-Ponyta-Galar.gif
diff --git a/src/canonical/models/back/0078--000--Rapidash.gif b/src/canonical/models/back/0078-000-Rapidash.gif
similarity index 100%
rename from src/canonical/models/back/0078--000--Rapidash.gif
rename to src/canonical/models/back/0078-000-Rapidash.gif
diff --git a/src/canonical/models/back/0078--420--Rapidash--Galar.gif b/src/canonical/models/back/0078-420-Rapidash-Galar.gif
similarity index 100%
rename from src/canonical/models/back/0078--420--Rapidash--Galar.gif
rename to src/canonical/models/back/0078-420-Rapidash-Galar.gif
diff --git a/src/canonical/models/back/0079--000--Slowpoke.gif b/src/canonical/models/back/0079-000-Slowpoke.gif
similarity index 100%
rename from src/canonical/models/back/0079--000--Slowpoke.gif
rename to src/canonical/models/back/0079-000-Slowpoke.gif
diff --git a/src/canonical/models/back/0079--420--Slowpoke--Galar.gif b/src/canonical/models/back/0079-420-Slowpoke-Galar.gif
similarity index 100%
rename from src/canonical/models/back/0079--420--Slowpoke--Galar.gif
rename to src/canonical/models/back/0079-420-Slowpoke-Galar.gif
diff --git a/src/canonical/models/back/0080--000--Slowbro.gif b/src/canonical/models/back/0080-000-Slowbro.gif
similarity index 100%
rename from src/canonical/models/back/0080--000--Slowbro.gif
rename to src/canonical/models/back/0080-000-Slowbro.gif
diff --git a/src/canonical/models/back/0080--420--Slowbro--Mega.gif b/src/canonical/models/back/0080-420-Slowbro-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0080--420--Slowbro--Mega.gif
rename to src/canonical/models/back/0080-420-Slowbro-Mega.gif
diff --git a/src/canonical/models/back/0081--000--Magnemite.gif b/src/canonical/models/back/0081-000-Magnemite.gif
similarity index 100%
rename from src/canonical/models/back/0081--000--Magnemite.gif
rename to src/canonical/models/back/0081-000-Magnemite.gif
diff --git a/src/canonical/models/back/0082--000--Magneton.gif b/src/canonical/models/back/0082-000-Magneton.gif
similarity index 100%
rename from src/canonical/models/back/0082--000--Magneton.gif
rename to src/canonical/models/back/0082-000-Magneton.gif
diff --git a/src/canonical/models/back/0083--000--Farfetch__0027d.gif b/src/canonical/models/back/0083-000-Farfetch__0027d.gif
similarity index 100%
rename from src/canonical/models/back/0083--000--Farfetch__0027d.gif
rename to src/canonical/models/back/0083-000-Farfetch__0027d.gif
diff --git a/src/canonical/models/back/0083--420--Farfetch__0027d--Galar.gif b/src/canonical/models/back/0083-420-Farfetch__0027d-Galar.gif
similarity index 100%
rename from src/canonical/models/back/0083--420--Farfetch__0027d--Galar.gif
rename to src/canonical/models/back/0083-420-Farfetch__0027d-Galar.gif
diff --git a/src/canonical/models/back/0084--000--Doduo.gif b/src/canonical/models/back/0084-000-Doduo.gif
similarity index 100%
rename from src/canonical/models/back/0084--000--Doduo.gif
rename to src/canonical/models/back/0084-000-Doduo.gif
diff --git a/src/canonical/models/back/0085--000--Dodrio.gif b/src/canonical/models/back/0085-000-Dodrio.gif
similarity index 100%
rename from src/canonical/models/back/0085--000--Dodrio.gif
rename to src/canonical/models/back/0085-000-Dodrio.gif
diff --git a/src/canonical/models/back/0086--000--Seel.gif b/src/canonical/models/back/0086-000-Seel.gif
similarity index 100%
rename from src/canonical/models/back/0086--000--Seel.gif
rename to src/canonical/models/back/0086-000-Seel.gif
diff --git a/src/canonical/models/back/0087--000--Dewgong.gif b/src/canonical/models/back/0087-000-Dewgong.gif
similarity index 100%
rename from src/canonical/models/back/0087--000--Dewgong.gif
rename to src/canonical/models/back/0087-000-Dewgong.gif
diff --git a/src/canonical/models/back/0088--000--Grimer.gif b/src/canonical/models/back/0088-000-Grimer.gif
similarity index 100%
rename from src/canonical/models/back/0088--000--Grimer.gif
rename to src/canonical/models/back/0088-000-Grimer.gif
diff --git a/src/canonical/models/back/0088--420--Grimer--Alola.gif b/src/canonical/models/back/0088-420-Grimer-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0088--420--Grimer--Alola.gif
rename to src/canonical/models/back/0088-420-Grimer-Alola.gif
diff --git a/src/canonical/models/back/0089--000--Muk.gif b/src/canonical/models/back/0089-000-Muk.gif
similarity index 100%
rename from src/canonical/models/back/0089--000--Muk.gif
rename to src/canonical/models/back/0089-000-Muk.gif
diff --git a/src/canonical/models/back/0089--420--Muk--Alola.gif b/src/canonical/models/back/0089-420-Muk-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0089--420--Muk--Alola.gif
rename to src/canonical/models/back/0089-420-Muk-Alola.gif
diff --git a/src/canonical/models/back/0090--000--Shellder.gif b/src/canonical/models/back/0090-000-Shellder.gif
similarity index 100%
rename from src/canonical/models/back/0090--000--Shellder.gif
rename to src/canonical/models/back/0090-000-Shellder.gif
diff --git a/src/canonical/models/back/0091--000--Cloyster.gif b/src/canonical/models/back/0091-000-Cloyster.gif
similarity index 100%
rename from src/canonical/models/back/0091--000--Cloyster.gif
rename to src/canonical/models/back/0091-000-Cloyster.gif
diff --git a/src/canonical/models/back/0092--000--Gastly.gif b/src/canonical/models/back/0092-000-Gastly.gif
similarity index 100%
rename from src/canonical/models/back/0092--000--Gastly.gif
rename to src/canonical/models/back/0092-000-Gastly.gif
diff --git a/src/canonical/models/back/0093--000--Haunter.gif b/src/canonical/models/back/0093-000-Haunter.gif
similarity index 100%
rename from src/canonical/models/back/0093--000--Haunter.gif
rename to src/canonical/models/back/0093-000-Haunter.gif
diff --git a/src/canonical/models/back/0094--000--Gengar.gif b/src/canonical/models/back/0094-000-Gengar.gif
similarity index 100%
rename from src/canonical/models/back/0094--000--Gengar.gif
rename to src/canonical/models/back/0094-000-Gengar.gif
diff --git a/src/canonical/models/back/0094--420--Gengar--Gmax.gif b/src/canonical/models/back/0094-420-Gengar-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0094--420--Gengar--Gmax.gif
rename to src/canonical/models/back/0094-420-Gengar-Gmax.gif
diff --git a/src/canonical/models/back/0094--420--Gengar--Mega.gif b/src/canonical/models/back/0094-420-Gengar-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0094--420--Gengar--Mega.gif
rename to src/canonical/models/back/0094-420-Gengar-Mega.gif
diff --git a/src/canonical/models/back/0095--000--Onix.gif b/src/canonical/models/back/0095-000-Onix.gif
similarity index 100%
rename from src/canonical/models/back/0095--000--Onix.gif
rename to src/canonical/models/back/0095-000-Onix.gif
diff --git a/src/canonical/models/back/0096--000--Drowzee.gif b/src/canonical/models/back/0096-000-Drowzee.gif
similarity index 100%
rename from src/canonical/models/back/0096--000--Drowzee.gif
rename to src/canonical/models/back/0096-000-Drowzee.gif
diff --git a/src/canonical/models/back/0097--000--Hypno.gif b/src/canonical/models/back/0097-000-Hypno.gif
similarity index 100%
rename from src/canonical/models/back/0097--000--Hypno.gif
rename to src/canonical/models/back/0097-000-Hypno.gif
diff --git a/src/canonical/models/back/0098--000--Krabby.gif b/src/canonical/models/back/0098-000-Krabby.gif
similarity index 100%
rename from src/canonical/models/back/0098--000--Krabby.gif
rename to src/canonical/models/back/0098-000-Krabby.gif
diff --git a/src/canonical/models/back/0099--000--Kingler.gif b/src/canonical/models/back/0099-000-Kingler.gif
similarity index 100%
rename from src/canonical/models/back/0099--000--Kingler.gif
rename to src/canonical/models/back/0099-000-Kingler.gif
diff --git a/src/canonical/models/back/0099--420--Kingler--Gmax.gif b/src/canonical/models/back/0099-420-Kingler-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0099--420--Kingler--Gmax.gif
rename to src/canonical/models/back/0099-420-Kingler-Gmax.gif
diff --git a/src/canonical/models/back/0100--000--Voltorb.gif b/src/canonical/models/back/0100-000-Voltorb.gif
similarity index 100%
rename from src/canonical/models/back/0100--000--Voltorb.gif
rename to src/canonical/models/back/0100-000-Voltorb.gif
diff --git a/src/canonical/models/back/0101--000--Electrode.gif b/src/canonical/models/back/0101-000-Electrode.gif
similarity index 100%
rename from src/canonical/models/back/0101--000--Electrode.gif
rename to src/canonical/models/back/0101-000-Electrode.gif
diff --git a/src/canonical/models/back/0102--000--Exeggcute.gif b/src/canonical/models/back/0102-000-Exeggcute.gif
similarity index 100%
rename from src/canonical/models/back/0102--000--Exeggcute.gif
rename to src/canonical/models/back/0102-000-Exeggcute.gif
diff --git a/src/canonical/models/back/0103--000--Exeggutor.gif b/src/canonical/models/back/0103-000-Exeggutor.gif
similarity index 100%
rename from src/canonical/models/back/0103--000--Exeggutor.gif
rename to src/canonical/models/back/0103-000-Exeggutor.gif
diff --git a/src/canonical/models/back/0103--420--Exeggutor--Alola.gif b/src/canonical/models/back/0103-420-Exeggutor-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0103--420--Exeggutor--Alola.gif
rename to src/canonical/models/back/0103-420-Exeggutor-Alola.gif
diff --git a/src/canonical/models/back/0104--000--Cubone.gif b/src/canonical/models/back/0104-000-Cubone.gif
similarity index 100%
rename from src/canonical/models/back/0104--000--Cubone.gif
rename to src/canonical/models/back/0104-000-Cubone.gif
diff --git a/src/canonical/models/back/0105--000--Marowak.gif b/src/canonical/models/back/0105-000-Marowak.gif
similarity index 100%
rename from src/canonical/models/back/0105--000--Marowak.gif
rename to src/canonical/models/back/0105-000-Marowak.gif
diff --git a/src/canonical/models/back/0105--420--Marowak--Alola.gif b/src/canonical/models/back/0105-420-Marowak-Alola.gif
similarity index 100%
rename from src/canonical/models/back/0105--420--Marowak--Alola.gif
rename to src/canonical/models/back/0105-420-Marowak-Alola.gif
diff --git a/src/canonical/models/back/0105--420--Marowak--Alola-Totem.gif b/src/canonical/models/back/0105-420-Marowak-Alola~Totem.gif
similarity index 100%
rename from src/canonical/models/back/0105--420--Marowak--Alola-Totem.gif
rename to src/canonical/models/back/0105-420-Marowak-Alola~Totem.gif
diff --git a/src/canonical/models/back/0106--000--Hitmonlee.gif b/src/canonical/models/back/0106-000-Hitmonlee.gif
similarity index 100%
rename from src/canonical/models/back/0106--000--Hitmonlee.gif
rename to src/canonical/models/back/0106-000-Hitmonlee.gif
diff --git a/src/canonical/models/back/0107--000--Hitmonchan.gif b/src/canonical/models/back/0107-000-Hitmonchan.gif
similarity index 100%
rename from src/canonical/models/back/0107--000--Hitmonchan.gif
rename to src/canonical/models/back/0107-000-Hitmonchan.gif
diff --git a/src/canonical/models/back/0108--000--Lickitung.gif b/src/canonical/models/back/0108-000-Lickitung.gif
similarity index 100%
rename from src/canonical/models/back/0108--000--Lickitung.gif
rename to src/canonical/models/back/0108-000-Lickitung.gif
diff --git a/src/canonical/models/back/0109--000--Koffing.gif b/src/canonical/models/back/0109-000-Koffing.gif
similarity index 100%
rename from src/canonical/models/back/0109--000--Koffing.gif
rename to src/canonical/models/back/0109-000-Koffing.gif
diff --git a/src/canonical/models/back/0110--000--Weezing.gif b/src/canonical/models/back/0110-000-Weezing.gif
similarity index 100%
rename from src/canonical/models/back/0110--000--Weezing.gif
rename to src/canonical/models/back/0110-000-Weezing.gif
diff --git a/src/canonical/models/back/0110--420--Weezing--Galar.gif b/src/canonical/models/back/0110-420-Weezing-Galar.gif
similarity index 100%
rename from src/canonical/models/back/0110--420--Weezing--Galar.gif
rename to src/canonical/models/back/0110-420-Weezing-Galar.gif
diff --git a/src/canonical/models/back/0111--000--Rhyhorn.gif b/src/canonical/models/back/0111-000-Rhyhorn.gif
similarity index 100%
rename from src/canonical/models/back/0111--000--Rhyhorn.gif
rename to src/canonical/models/back/0111-000-Rhyhorn.gif
diff --git a/src/canonical/models/back/0112--000--Rhydon.gif b/src/canonical/models/back/0112-000-Rhydon.gif
similarity index 100%
rename from src/canonical/models/back/0112--000--Rhydon.gif
rename to src/canonical/models/back/0112-000-Rhydon.gif
diff --git a/src/canonical/models/back/0113--000--Chansey.gif b/src/canonical/models/back/0113-000-Chansey.gif
similarity index 100%
rename from src/canonical/models/back/0113--000--Chansey.gif
rename to src/canonical/models/back/0113-000-Chansey.gif
diff --git a/src/canonical/models/back/0114--000--Tangela.gif b/src/canonical/models/back/0114-000-Tangela.gif
similarity index 100%
rename from src/canonical/models/back/0114--000--Tangela.gif
rename to src/canonical/models/back/0114-000-Tangela.gif
diff --git a/src/canonical/models/back/0115--000--Kangaskhan.gif b/src/canonical/models/back/0115-000-Kangaskhan.gif
similarity index 100%
rename from src/canonical/models/back/0115--000--Kangaskhan.gif
rename to src/canonical/models/back/0115-000-Kangaskhan.gif
diff --git a/src/canonical/models/back/0115--420--Kangaskhan--Mega.gif b/src/canonical/models/back/0115-420-Kangaskhan-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0115--420--Kangaskhan--Mega.gif
rename to src/canonical/models/back/0115-420-Kangaskhan-Mega.gif
diff --git a/src/canonical/models/back/0116--000--Horsea.gif b/src/canonical/models/back/0116-000-Horsea.gif
similarity index 100%
rename from src/canonical/models/back/0116--000--Horsea.gif
rename to src/canonical/models/back/0116-000-Horsea.gif
diff --git a/src/canonical/models/back/0117--000--Seadra.gif b/src/canonical/models/back/0117-000-Seadra.gif
similarity index 100%
rename from src/canonical/models/back/0117--000--Seadra.gif
rename to src/canonical/models/back/0117-000-Seadra.gif
diff --git a/src/canonical/models/back/0118--000--Goldeen.gif b/src/canonical/models/back/0118-000-Goldeen.gif
similarity index 100%
rename from src/canonical/models/back/0118--000--Goldeen.gif
rename to src/canonical/models/back/0118-000-Goldeen.gif
diff --git a/src/canonical/models/back/0119--000--Seaking.gif b/src/canonical/models/back/0119-000-Seaking.gif
similarity index 100%
rename from src/canonical/models/back/0119--000--Seaking.gif
rename to src/canonical/models/back/0119-000-Seaking.gif
diff --git a/src/canonical/models/back/0120--000--Staryu.gif b/src/canonical/models/back/0120-000-Staryu.gif
similarity index 100%
rename from src/canonical/models/back/0120--000--Staryu.gif
rename to src/canonical/models/back/0120-000-Staryu.gif
diff --git a/src/canonical/models/back/0121--000--Starmie.gif b/src/canonical/models/back/0121-000-Starmie.gif
similarity index 100%
rename from src/canonical/models/back/0121--000--Starmie.gif
rename to src/canonical/models/back/0121-000-Starmie.gif
diff --git a/src/canonical/models/back/0122--000--Mr._Mime.gif b/src/canonical/models/back/0122-000-Mr._Mime.gif
similarity index 100%
rename from src/canonical/models/back/0122--000--Mr._Mime.gif
rename to src/canonical/models/back/0122-000-Mr._Mime.gif
diff --git a/src/canonical/models/back/0122--420--Mr._Mime--Galar.gif b/src/canonical/models/back/0122-420-Mr._Mime-Galar.gif
similarity index 100%
rename from src/canonical/models/back/0122--420--Mr._Mime--Galar.gif
rename to src/canonical/models/back/0122-420-Mr._Mime-Galar.gif
diff --git a/src/canonical/models/back/0123--000--Scyther.gif b/src/canonical/models/back/0123-000-Scyther.gif
similarity index 100%
rename from src/canonical/models/back/0123--000--Scyther.gif
rename to src/canonical/models/back/0123-000-Scyther.gif
diff --git a/src/canonical/models/back/0124--000--Jynx.gif b/src/canonical/models/back/0124-000-Jynx.gif
similarity index 100%
rename from src/canonical/models/back/0124--000--Jynx.gif
rename to src/canonical/models/back/0124-000-Jynx.gif
diff --git a/src/canonical/models/back/0125--000--Electabuzz.gif b/src/canonical/models/back/0125-000-Electabuzz.gif
similarity index 100%
rename from src/canonical/models/back/0125--000--Electabuzz.gif
rename to src/canonical/models/back/0125-000-Electabuzz.gif
diff --git a/src/canonical/models/back/0126--000--Magmar.gif b/src/canonical/models/back/0126-000-Magmar.gif
similarity index 100%
rename from src/canonical/models/back/0126--000--Magmar.gif
rename to src/canonical/models/back/0126-000-Magmar.gif
diff --git a/src/canonical/models/back/0127--000--Pinsir.gif b/src/canonical/models/back/0127-000-Pinsir.gif
similarity index 100%
rename from src/canonical/models/back/0127--000--Pinsir.gif
rename to src/canonical/models/back/0127-000-Pinsir.gif
diff --git a/src/canonical/models/back/0127--420--Pinsir--Mega.gif b/src/canonical/models/back/0127-420-Pinsir-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0127--420--Pinsir--Mega.gif
rename to src/canonical/models/back/0127-420-Pinsir-Mega.gif
diff --git a/src/canonical/models/back/0128--000--Tauros.gif b/src/canonical/models/back/0128-000-Tauros.gif
similarity index 100%
rename from src/canonical/models/back/0128--000--Tauros.gif
rename to src/canonical/models/back/0128-000-Tauros.gif
diff --git a/src/canonical/models/back/0129--000--Magikarp.gif b/src/canonical/models/back/0129-000-Magikarp.gif
similarity index 100%
rename from src/canonical/models/back/0129--000--Magikarp.gif
rename to src/canonical/models/back/0129-000-Magikarp.gif
diff --git a/src/canonical/models/back/0130--000--Gyarados.gif b/src/canonical/models/back/0130-000-Gyarados.gif
similarity index 100%
rename from src/canonical/models/back/0130--000--Gyarados.gif
rename to src/canonical/models/back/0130-000-Gyarados.gif
diff --git a/src/canonical/models/back/0130--420--Gyarados--Mega.gif b/src/canonical/models/back/0130-420-Gyarados-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0130--420--Gyarados--Mega.gif
rename to src/canonical/models/back/0130-420-Gyarados-Mega.gif
diff --git a/src/canonical/models/back/0131--000--Lapras.gif b/src/canonical/models/back/0131-000-Lapras.gif
similarity index 100%
rename from src/canonical/models/back/0131--000--Lapras.gif
rename to src/canonical/models/back/0131-000-Lapras.gif
diff --git a/src/canonical/models/back/0131--420--Lapras--Gmax.gif b/src/canonical/models/back/0131-420-Lapras-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0131--420--Lapras--Gmax.gif
rename to src/canonical/models/back/0131-420-Lapras-Gmax.gif
diff --git a/src/canonical/models/back/0132--000--Ditto.gif b/src/canonical/models/back/0132-000-Ditto.gif
similarity index 100%
rename from src/canonical/models/back/0132--000--Ditto.gif
rename to src/canonical/models/back/0132-000-Ditto.gif
diff --git a/src/canonical/models/back/0133--000--Eevee.gif b/src/canonical/models/back/0133-000-Eevee.gif
similarity index 100%
rename from src/canonical/models/back/0133--000--Eevee.gif
rename to src/canonical/models/back/0133-000-Eevee.gif
diff --git a/src/canonical/models/back/0133--420--Eevee--Gmax.gif b/src/canonical/models/back/0133-420-Eevee-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0133--420--Eevee--Gmax.gif
rename to src/canonical/models/back/0133-420-Eevee-Gmax.gif
diff --git a/src/canonical/models/back/0133--420--Eevee--Starter.gif b/src/canonical/models/back/0133-420-Eevee-Starter.gif
similarity index 100%
rename from src/canonical/models/back/0133--420--Eevee--Starter.gif
rename to src/canonical/models/back/0133-420-Eevee-Starter.gif
diff --git a/src/canonical/models/back/0134--000--Vaporeon.gif b/src/canonical/models/back/0134-000-Vaporeon.gif
similarity index 100%
rename from src/canonical/models/back/0134--000--Vaporeon.gif
rename to src/canonical/models/back/0134-000-Vaporeon.gif
diff --git a/src/canonical/models/back/0135--000--Jolteon.gif b/src/canonical/models/back/0135-000-Jolteon.gif
similarity index 100%
rename from src/canonical/models/back/0135--000--Jolteon.gif
rename to src/canonical/models/back/0135-000-Jolteon.gif
diff --git a/src/canonical/models/back/0136--000--Flareon.gif b/src/canonical/models/back/0136-000-Flareon.gif
similarity index 100%
rename from src/canonical/models/back/0136--000--Flareon.gif
rename to src/canonical/models/back/0136-000-Flareon.gif
diff --git a/src/canonical/models/back/0137--000--Porygon.gif b/src/canonical/models/back/0137-000-Porygon.gif
similarity index 100%
rename from src/canonical/models/back/0137--000--Porygon.gif
rename to src/canonical/models/back/0137-000-Porygon.gif
diff --git a/src/canonical/models/back/0138--000--Omanyte.gif b/src/canonical/models/back/0138-000-Omanyte.gif
similarity index 100%
rename from src/canonical/models/back/0138--000--Omanyte.gif
rename to src/canonical/models/back/0138-000-Omanyte.gif
diff --git a/src/canonical/models/back/0139--000--Omastar.gif b/src/canonical/models/back/0139-000-Omastar.gif
similarity index 100%
rename from src/canonical/models/back/0139--000--Omastar.gif
rename to src/canonical/models/back/0139-000-Omastar.gif
diff --git a/src/canonical/models/back/0140--000--Kabuto.gif b/src/canonical/models/back/0140-000-Kabuto.gif
similarity index 100%
rename from src/canonical/models/back/0140--000--Kabuto.gif
rename to src/canonical/models/back/0140-000-Kabuto.gif
diff --git a/src/canonical/models/back/0141--000--Kabutops.gif b/src/canonical/models/back/0141-000-Kabutops.gif
similarity index 100%
rename from src/canonical/models/back/0141--000--Kabutops.gif
rename to src/canonical/models/back/0141-000-Kabutops.gif
diff --git a/src/canonical/models/back/0142--000--Aerodactyl.gif b/src/canonical/models/back/0142-000-Aerodactyl.gif
similarity index 100%
rename from src/canonical/models/back/0142--000--Aerodactyl.gif
rename to src/canonical/models/back/0142-000-Aerodactyl.gif
diff --git a/src/canonical/models/back/0142--420--Aerodactyl--Mega.gif b/src/canonical/models/back/0142-420-Aerodactyl-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0142--420--Aerodactyl--Mega.gif
rename to src/canonical/models/back/0142-420-Aerodactyl-Mega.gif
diff --git a/src/canonical/models/back/0143--000--Snorlax.gif b/src/canonical/models/back/0143-000-Snorlax.gif
similarity index 100%
rename from src/canonical/models/back/0143--000--Snorlax.gif
rename to src/canonical/models/back/0143-000-Snorlax.gif
diff --git a/src/canonical/models/back/0143--420--Snorlax--Gmax.gif b/src/canonical/models/back/0143-420-Snorlax-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0143--420--Snorlax--Gmax.gif
rename to src/canonical/models/back/0143-420-Snorlax-Gmax.gif
diff --git a/src/canonical/models/back/0144--000--Articuno.gif b/src/canonical/models/back/0144-000-Articuno.gif
similarity index 100%
rename from src/canonical/models/back/0144--000--Articuno.gif
rename to src/canonical/models/back/0144-000-Articuno.gif
diff --git a/src/canonical/models/back/0145--000--Zapdos.gif b/src/canonical/models/back/0145-000-Zapdos.gif
similarity index 100%
rename from src/canonical/models/back/0145--000--Zapdos.gif
rename to src/canonical/models/back/0145-000-Zapdos.gif
diff --git a/src/canonical/models/back/0146--000--Moltres.gif b/src/canonical/models/back/0146-000-Moltres.gif
similarity index 100%
rename from src/canonical/models/back/0146--000--Moltres.gif
rename to src/canonical/models/back/0146-000-Moltres.gif
diff --git a/src/canonical/models/back/0147--000--Dratini.gif b/src/canonical/models/back/0147-000-Dratini.gif
similarity index 100%
rename from src/canonical/models/back/0147--000--Dratini.gif
rename to src/canonical/models/back/0147-000-Dratini.gif
diff --git a/src/canonical/models/back/0148--000--Dragonair.gif b/src/canonical/models/back/0148-000-Dragonair.gif
similarity index 100%
rename from src/canonical/models/back/0148--000--Dragonair.gif
rename to src/canonical/models/back/0148-000-Dragonair.gif
diff --git a/src/canonical/models/back/0149--000--Dragonite.gif b/src/canonical/models/back/0149-000-Dragonite.gif
similarity index 100%
rename from src/canonical/models/back/0149--000--Dragonite.gif
rename to src/canonical/models/back/0149-000-Dragonite.gif
diff --git a/src/canonical/models/back/0150--000--Mewtwo.gif b/src/canonical/models/back/0150-000-Mewtwo.gif
similarity index 100%
rename from src/canonical/models/back/0150--000--Mewtwo.gif
rename to src/canonical/models/back/0150-000-Mewtwo.gif
diff --git a/src/canonical/models/back/0150--420--Mewtwo--Mega-X.gif b/src/canonical/models/back/0150-420-Mewtwo-Mega~X.gif
similarity index 100%
rename from src/canonical/models/back/0150--420--Mewtwo--Mega-X.gif
rename to src/canonical/models/back/0150-420-Mewtwo-Mega~X.gif
diff --git a/src/canonical/models/back/0150--420--Mewtwo--Mega-Y.gif b/src/canonical/models/back/0150-420-Mewtwo-Mega~Y.gif
similarity index 100%
rename from src/canonical/models/back/0150--420--Mewtwo--Mega-Y.gif
rename to src/canonical/models/back/0150-420-Mewtwo-Mega~Y.gif
diff --git a/src/canonical/models/back/0151--000--Mew.gif b/src/canonical/models/back/0151-000-Mew.gif
similarity index 100%
rename from src/canonical/models/back/0151--000--Mew.gif
rename to src/canonical/models/back/0151-000-Mew.gif
diff --git a/src/canonical/models/back/0152--000--Chikorita.gif b/src/canonical/models/back/0152-000-Chikorita.gif
similarity index 100%
rename from src/canonical/models/back/0152--000--Chikorita.gif
rename to src/canonical/models/back/0152-000-Chikorita.gif
diff --git a/src/canonical/models/back/0153--000--Bayleef.gif b/src/canonical/models/back/0153-000-Bayleef.gif
similarity index 100%
rename from src/canonical/models/back/0153--000--Bayleef.gif
rename to src/canonical/models/back/0153-000-Bayleef.gif
diff --git a/src/canonical/models/back/0154--000--Meganium.gif b/src/canonical/models/back/0154-000-Meganium.gif
similarity index 100%
rename from src/canonical/models/back/0154--000--Meganium.gif
rename to src/canonical/models/back/0154-000-Meganium.gif
diff --git a/src/canonical/models/back/0155--000--Cyndaquil.gif b/src/canonical/models/back/0155-000-Cyndaquil.gif
similarity index 100%
rename from src/canonical/models/back/0155--000--Cyndaquil.gif
rename to src/canonical/models/back/0155-000-Cyndaquil.gif
diff --git a/src/canonical/models/back/0156--000--Quilava.gif b/src/canonical/models/back/0156-000-Quilava.gif
similarity index 100%
rename from src/canonical/models/back/0156--000--Quilava.gif
rename to src/canonical/models/back/0156-000-Quilava.gif
diff --git a/src/canonical/models/back/0157--000--Typhlosion.gif b/src/canonical/models/back/0157-000-Typhlosion.gif
similarity index 100%
rename from src/canonical/models/back/0157--000--Typhlosion.gif
rename to src/canonical/models/back/0157-000-Typhlosion.gif
diff --git a/src/canonical/models/back/0158--000--Totodile.gif b/src/canonical/models/back/0158-000-Totodile.gif
similarity index 100%
rename from src/canonical/models/back/0158--000--Totodile.gif
rename to src/canonical/models/back/0158-000-Totodile.gif
diff --git a/src/canonical/models/back/0159--000--Croconaw.gif b/src/canonical/models/back/0159-000-Croconaw.gif
similarity index 100%
rename from src/canonical/models/back/0159--000--Croconaw.gif
rename to src/canonical/models/back/0159-000-Croconaw.gif
diff --git a/src/canonical/models/back/0160--000--Feraligatr.gif b/src/canonical/models/back/0160-000-Feraligatr.gif
similarity index 100%
rename from src/canonical/models/back/0160--000--Feraligatr.gif
rename to src/canonical/models/back/0160-000-Feraligatr.gif
diff --git a/src/canonical/models/back/0161--000--Sentret.gif b/src/canonical/models/back/0161-000-Sentret.gif
similarity index 100%
rename from src/canonical/models/back/0161--000--Sentret.gif
rename to src/canonical/models/back/0161-000-Sentret.gif
diff --git a/src/canonical/models/back/0162--000--Furret.gif b/src/canonical/models/back/0162-000-Furret.gif
similarity index 100%
rename from src/canonical/models/back/0162--000--Furret.gif
rename to src/canonical/models/back/0162-000-Furret.gif
diff --git a/src/canonical/models/back/0163--000--Hoothoot.gif b/src/canonical/models/back/0163-000-Hoothoot.gif
similarity index 100%
rename from src/canonical/models/back/0163--000--Hoothoot.gif
rename to src/canonical/models/back/0163-000-Hoothoot.gif
diff --git a/src/canonical/models/back/0164--000--Noctowl.gif b/src/canonical/models/back/0164-000-Noctowl.gif
similarity index 100%
rename from src/canonical/models/back/0164--000--Noctowl.gif
rename to src/canonical/models/back/0164-000-Noctowl.gif
diff --git a/src/canonical/models/back/0165--000--Ledyba.gif b/src/canonical/models/back/0165-000-Ledyba.gif
similarity index 100%
rename from src/canonical/models/back/0165--000--Ledyba.gif
rename to src/canonical/models/back/0165-000-Ledyba.gif
diff --git a/src/canonical/models/back/0166--000--Ledian.gif b/src/canonical/models/back/0166-000-Ledian.gif
similarity index 100%
rename from src/canonical/models/back/0166--000--Ledian.gif
rename to src/canonical/models/back/0166-000-Ledian.gif
diff --git a/src/canonical/models/back/0167--000--Spinarak.gif b/src/canonical/models/back/0167-000-Spinarak.gif
similarity index 100%
rename from src/canonical/models/back/0167--000--Spinarak.gif
rename to src/canonical/models/back/0167-000-Spinarak.gif
diff --git a/src/canonical/models/back/0168--000--Ariados.gif b/src/canonical/models/back/0168-000-Ariados.gif
similarity index 100%
rename from src/canonical/models/back/0168--000--Ariados.gif
rename to src/canonical/models/back/0168-000-Ariados.gif
diff --git a/src/canonical/models/back/0169--000--Crobat.gif b/src/canonical/models/back/0169-000-Crobat.gif
similarity index 100%
rename from src/canonical/models/back/0169--000--Crobat.gif
rename to src/canonical/models/back/0169-000-Crobat.gif
diff --git a/src/canonical/models/back/0170--000--Chinchou.gif b/src/canonical/models/back/0170-000-Chinchou.gif
similarity index 100%
rename from src/canonical/models/back/0170--000--Chinchou.gif
rename to src/canonical/models/back/0170-000-Chinchou.gif
diff --git a/src/canonical/models/back/0171--000--Lanturn.gif b/src/canonical/models/back/0171-000-Lanturn.gif
similarity index 100%
rename from src/canonical/models/back/0171--000--Lanturn.gif
rename to src/canonical/models/back/0171-000-Lanturn.gif
diff --git a/src/canonical/models/back/0172--000--Pichu.gif b/src/canonical/models/back/0172-000-Pichu.gif
similarity index 100%
rename from src/canonical/models/back/0172--000--Pichu.gif
rename to src/canonical/models/back/0172-000-Pichu.gif
diff --git a/src/canonical/models/back/0173--000--Cleffa.gif b/src/canonical/models/back/0173-000-Cleffa.gif
similarity index 100%
rename from src/canonical/models/back/0173--000--Cleffa.gif
rename to src/canonical/models/back/0173-000-Cleffa.gif
diff --git a/src/canonical/models/back/0174--000--Igglybuff.gif b/src/canonical/models/back/0174-000-Igglybuff.gif
similarity index 100%
rename from src/canonical/models/back/0174--000--Igglybuff.gif
rename to src/canonical/models/back/0174-000-Igglybuff.gif
diff --git a/src/canonical/models/back/0175--000--Togepi.gif b/src/canonical/models/back/0175-000-Togepi.gif
similarity index 100%
rename from src/canonical/models/back/0175--000--Togepi.gif
rename to src/canonical/models/back/0175-000-Togepi.gif
diff --git a/src/canonical/models/back/0176--000--Togetic.gif b/src/canonical/models/back/0176-000-Togetic.gif
similarity index 100%
rename from src/canonical/models/back/0176--000--Togetic.gif
rename to src/canonical/models/back/0176-000-Togetic.gif
diff --git a/src/canonical/models/back/0177--000--Natu.gif b/src/canonical/models/back/0177-000-Natu.gif
similarity index 100%
rename from src/canonical/models/back/0177--000--Natu.gif
rename to src/canonical/models/back/0177-000-Natu.gif
diff --git a/src/canonical/models/back/0178--000--Xatu.gif b/src/canonical/models/back/0178-000-Xatu.gif
similarity index 100%
rename from src/canonical/models/back/0178--000--Xatu.gif
rename to src/canonical/models/back/0178-000-Xatu.gif
diff --git a/src/canonical/models/back/0179--000--Mareep.gif b/src/canonical/models/back/0179-000-Mareep.gif
similarity index 100%
rename from src/canonical/models/back/0179--000--Mareep.gif
rename to src/canonical/models/back/0179-000-Mareep.gif
diff --git a/src/canonical/models/back/0180--000--Flaaffy.gif b/src/canonical/models/back/0180-000-Flaaffy.gif
similarity index 100%
rename from src/canonical/models/back/0180--000--Flaaffy.gif
rename to src/canonical/models/back/0180-000-Flaaffy.gif
diff --git a/src/canonical/models/back/0181--000--Ampharos.gif b/src/canonical/models/back/0181-000-Ampharos.gif
similarity index 100%
rename from src/canonical/models/back/0181--000--Ampharos.gif
rename to src/canonical/models/back/0181-000-Ampharos.gif
diff --git a/src/canonical/models/back/0181--420--Ampharos--Mega.gif b/src/canonical/models/back/0181-420-Ampharos-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0181--420--Ampharos--Mega.gif
rename to src/canonical/models/back/0181-420-Ampharos-Mega.gif
diff --git a/src/canonical/models/back/0182--000--Bellossom.gif b/src/canonical/models/back/0182-000-Bellossom.gif
similarity index 100%
rename from src/canonical/models/back/0182--000--Bellossom.gif
rename to src/canonical/models/back/0182-000-Bellossom.gif
diff --git a/src/canonical/models/back/0183--000--Marill.gif b/src/canonical/models/back/0183-000-Marill.gif
similarity index 100%
rename from src/canonical/models/back/0183--000--Marill.gif
rename to src/canonical/models/back/0183-000-Marill.gif
diff --git a/src/canonical/models/back/0184--000--Azumarill.gif b/src/canonical/models/back/0184-000-Azumarill.gif
similarity index 100%
rename from src/canonical/models/back/0184--000--Azumarill.gif
rename to src/canonical/models/back/0184-000-Azumarill.gif
diff --git a/src/canonical/models/back/0185--000--Sudowoodo.gif b/src/canonical/models/back/0185-000-Sudowoodo.gif
similarity index 100%
rename from src/canonical/models/back/0185--000--Sudowoodo.gif
rename to src/canonical/models/back/0185-000-Sudowoodo.gif
diff --git a/src/canonical/models/back/0186--000--Politoed.gif b/src/canonical/models/back/0186-000-Politoed.gif
similarity index 100%
rename from src/canonical/models/back/0186--000--Politoed.gif
rename to src/canonical/models/back/0186-000-Politoed.gif
diff --git a/src/canonical/models/back/0187--000--Hoppip.gif b/src/canonical/models/back/0187-000-Hoppip.gif
similarity index 100%
rename from src/canonical/models/back/0187--000--Hoppip.gif
rename to src/canonical/models/back/0187-000-Hoppip.gif
diff --git a/src/canonical/models/back/0188--000--Skiploom.gif b/src/canonical/models/back/0188-000-Skiploom.gif
similarity index 100%
rename from src/canonical/models/back/0188--000--Skiploom.gif
rename to src/canonical/models/back/0188-000-Skiploom.gif
diff --git a/src/canonical/models/back/0189--000--Jumpluff.gif b/src/canonical/models/back/0189-000-Jumpluff.gif
similarity index 100%
rename from src/canonical/models/back/0189--000--Jumpluff.gif
rename to src/canonical/models/back/0189-000-Jumpluff.gif
diff --git a/src/canonical/models/back/0190--000--Aipom.gif b/src/canonical/models/back/0190-000-Aipom.gif
similarity index 100%
rename from src/canonical/models/back/0190--000--Aipom.gif
rename to src/canonical/models/back/0190-000-Aipom.gif
diff --git a/src/canonical/models/back/0191--000--Sunkern.gif b/src/canonical/models/back/0191-000-Sunkern.gif
similarity index 100%
rename from src/canonical/models/back/0191--000--Sunkern.gif
rename to src/canonical/models/back/0191-000-Sunkern.gif
diff --git a/src/canonical/models/back/0192--000--Sunflora.gif b/src/canonical/models/back/0192-000-Sunflora.gif
similarity index 100%
rename from src/canonical/models/back/0192--000--Sunflora.gif
rename to src/canonical/models/back/0192-000-Sunflora.gif
diff --git a/src/canonical/models/back/0193--000--Yanma.gif b/src/canonical/models/back/0193-000-Yanma.gif
similarity index 100%
rename from src/canonical/models/back/0193--000--Yanma.gif
rename to src/canonical/models/back/0193-000-Yanma.gif
diff --git a/src/canonical/models/back/0194--000--Wooper.gif b/src/canonical/models/back/0194-000-Wooper.gif
similarity index 100%
rename from src/canonical/models/back/0194--000--Wooper.gif
rename to src/canonical/models/back/0194-000-Wooper.gif
diff --git a/src/canonical/models/back/0195--000--Quagsire.gif b/src/canonical/models/back/0195-000-Quagsire.gif
similarity index 100%
rename from src/canonical/models/back/0195--000--Quagsire.gif
rename to src/canonical/models/back/0195-000-Quagsire.gif
diff --git a/src/canonical/models/back/0196--000--Espeon.gif b/src/canonical/models/back/0196-000-Espeon.gif
similarity index 100%
rename from src/canonical/models/back/0196--000--Espeon.gif
rename to src/canonical/models/back/0196-000-Espeon.gif
diff --git a/src/canonical/models/back/0197--000--Umbreon.gif b/src/canonical/models/back/0197-000-Umbreon.gif
similarity index 100%
rename from src/canonical/models/back/0197--000--Umbreon.gif
rename to src/canonical/models/back/0197-000-Umbreon.gif
diff --git a/src/canonical/models/back/0198--000--Murkrow.gif b/src/canonical/models/back/0198-000-Murkrow.gif
similarity index 100%
rename from src/canonical/models/back/0198--000--Murkrow.gif
rename to src/canonical/models/back/0198-000-Murkrow.gif
diff --git a/src/canonical/models/back/0199--000--Slowking.gif b/src/canonical/models/back/0199-000-Slowking.gif
similarity index 100%
rename from src/canonical/models/back/0199--000--Slowking.gif
rename to src/canonical/models/back/0199-000-Slowking.gif
diff --git a/src/canonical/models/back/0200--000--Misdreavus.gif b/src/canonical/models/back/0200-000-Misdreavus.gif
similarity index 100%
rename from src/canonical/models/back/0200--000--Misdreavus.gif
rename to src/canonical/models/back/0200-000-Misdreavus.gif
diff --git a/src/canonical/models/back/0201--000--Unown.gif b/src/canonical/models/back/0201--000--Unown.gif
deleted file mode 120000
index 1694620a..00000000
--- a/src/canonical/models/back/0201--000--Unown.gif
+++ /dev/null
@@ -1 +0,0 @@
-../back-cosmetic/0201--420--Unown--A.gif
\ No newline at end of file
diff --git a/src/canonical/models/back/0201-000-Unown.gif b/src/canonical/models/back/0201-000-Unown.gif
new file mode 120000
index 00000000..23ad589f
--- /dev/null
+++ b/src/canonical/models/back/0201-000-Unown.gif
@@ -0,0 +1 @@
+../back-cosmetic/0201-420-Unown-A.gif
\ No newline at end of file
diff --git a/src/canonical/models/back/0202--000--Wobbuffet.gif b/src/canonical/models/back/0202-000-Wobbuffet.gif
similarity index 100%
rename from src/canonical/models/back/0202--000--Wobbuffet.gif
rename to src/canonical/models/back/0202-000-Wobbuffet.gif
diff --git a/src/canonical/models/back/0203--000--Girafarig.gif b/src/canonical/models/back/0203-000-Girafarig.gif
similarity index 100%
rename from src/canonical/models/back/0203--000--Girafarig.gif
rename to src/canonical/models/back/0203-000-Girafarig.gif
diff --git a/src/canonical/models/back/0204--000--Pineco.gif b/src/canonical/models/back/0204-000-Pineco.gif
similarity index 100%
rename from src/canonical/models/back/0204--000--Pineco.gif
rename to src/canonical/models/back/0204-000-Pineco.gif
diff --git a/src/canonical/models/back/0205--000--Forretress.gif b/src/canonical/models/back/0205-000-Forretress.gif
similarity index 100%
rename from src/canonical/models/back/0205--000--Forretress.gif
rename to src/canonical/models/back/0205-000-Forretress.gif
diff --git a/src/canonical/models/back/0206--000--Dunsparce.gif b/src/canonical/models/back/0206-000-Dunsparce.gif
similarity index 100%
rename from src/canonical/models/back/0206--000--Dunsparce.gif
rename to src/canonical/models/back/0206-000-Dunsparce.gif
diff --git a/src/canonical/models/back/0207--000--Gligar.gif b/src/canonical/models/back/0207-000-Gligar.gif
similarity index 100%
rename from src/canonical/models/back/0207--000--Gligar.gif
rename to src/canonical/models/back/0207-000-Gligar.gif
diff --git a/src/canonical/models/back/0208--000--Steelix.gif b/src/canonical/models/back/0208-000-Steelix.gif
similarity index 100%
rename from src/canonical/models/back/0208--000--Steelix.gif
rename to src/canonical/models/back/0208-000-Steelix.gif
diff --git a/src/canonical/models/back/0208--420--Steelix--Mega.gif b/src/canonical/models/back/0208-420-Steelix-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0208--420--Steelix--Mega.gif
rename to src/canonical/models/back/0208-420-Steelix-Mega.gif
diff --git a/src/canonical/models/back/0209--000--Snubbull.gif b/src/canonical/models/back/0209-000-Snubbull.gif
similarity index 100%
rename from src/canonical/models/back/0209--000--Snubbull.gif
rename to src/canonical/models/back/0209-000-Snubbull.gif
diff --git a/src/canonical/models/back/0210--000--Granbull.gif b/src/canonical/models/back/0210-000-Granbull.gif
similarity index 100%
rename from src/canonical/models/back/0210--000--Granbull.gif
rename to src/canonical/models/back/0210-000-Granbull.gif
diff --git a/src/canonical/models/back/0211--000--Qwilfish.gif b/src/canonical/models/back/0211-000-Qwilfish.gif
similarity index 100%
rename from src/canonical/models/back/0211--000--Qwilfish.gif
rename to src/canonical/models/back/0211-000-Qwilfish.gif
diff --git a/src/canonical/models/back/0212--000--Scizor.gif b/src/canonical/models/back/0212-000-Scizor.gif
similarity index 100%
rename from src/canonical/models/back/0212--000--Scizor.gif
rename to src/canonical/models/back/0212-000-Scizor.gif
diff --git a/src/canonical/models/back/0212--420--Scizor--Mega.gif b/src/canonical/models/back/0212-420-Scizor-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0212--420--Scizor--Mega.gif
rename to src/canonical/models/back/0212-420-Scizor-Mega.gif
diff --git a/src/canonical/models/back/0213--000--Shuckle.gif b/src/canonical/models/back/0213-000-Shuckle.gif
similarity index 100%
rename from src/canonical/models/back/0213--000--Shuckle.gif
rename to src/canonical/models/back/0213-000-Shuckle.gif
diff --git a/src/canonical/models/back/0214--000--Heracross.gif b/src/canonical/models/back/0214-000-Heracross.gif
similarity index 100%
rename from src/canonical/models/back/0214--000--Heracross.gif
rename to src/canonical/models/back/0214-000-Heracross.gif
diff --git a/src/canonical/models/back/0214--420--Heracross--Mega.gif b/src/canonical/models/back/0214-420-Heracross-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0214--420--Heracross--Mega.gif
rename to src/canonical/models/back/0214-420-Heracross-Mega.gif
diff --git a/src/canonical/models/back/0215--000--Sneasel.gif b/src/canonical/models/back/0215-000-Sneasel.gif
similarity index 100%
rename from src/canonical/models/back/0215--000--Sneasel.gif
rename to src/canonical/models/back/0215-000-Sneasel.gif
diff --git a/src/canonical/models/back/0216--000--Teddiursa.gif b/src/canonical/models/back/0216-000-Teddiursa.gif
similarity index 100%
rename from src/canonical/models/back/0216--000--Teddiursa.gif
rename to src/canonical/models/back/0216-000-Teddiursa.gif
diff --git a/src/canonical/models/back/0217--000--Ursaring.gif b/src/canonical/models/back/0217-000-Ursaring.gif
similarity index 100%
rename from src/canonical/models/back/0217--000--Ursaring.gif
rename to src/canonical/models/back/0217-000-Ursaring.gif
diff --git a/src/canonical/models/back/0218--000--Slugma.gif b/src/canonical/models/back/0218-000-Slugma.gif
similarity index 100%
rename from src/canonical/models/back/0218--000--Slugma.gif
rename to src/canonical/models/back/0218-000-Slugma.gif
diff --git a/src/canonical/models/back/0219--000--Magcargo.gif b/src/canonical/models/back/0219-000-Magcargo.gif
similarity index 100%
rename from src/canonical/models/back/0219--000--Magcargo.gif
rename to src/canonical/models/back/0219-000-Magcargo.gif
diff --git a/src/canonical/models/back/0220--000--Swinub.gif b/src/canonical/models/back/0220-000-Swinub.gif
similarity index 100%
rename from src/canonical/models/back/0220--000--Swinub.gif
rename to src/canonical/models/back/0220-000-Swinub.gif
diff --git a/src/canonical/models/back/0221--000--Piloswine.gif b/src/canonical/models/back/0221-000-Piloswine.gif
similarity index 100%
rename from src/canonical/models/back/0221--000--Piloswine.gif
rename to src/canonical/models/back/0221-000-Piloswine.gif
diff --git a/src/canonical/models/back/0222--000--Corsola.gif b/src/canonical/models/back/0222-000-Corsola.gif
similarity index 100%
rename from src/canonical/models/back/0222--000--Corsola.gif
rename to src/canonical/models/back/0222-000-Corsola.gif
diff --git a/src/canonical/models/back/0222--420--Corsola--Galar.gif b/src/canonical/models/back/0222-420-Corsola-Galar.gif
similarity index 100%
rename from src/canonical/models/back/0222--420--Corsola--Galar.gif
rename to src/canonical/models/back/0222-420-Corsola-Galar.gif
diff --git a/src/canonical/models/back/0223--000--Remoraid.gif b/src/canonical/models/back/0223-000-Remoraid.gif
similarity index 100%
rename from src/canonical/models/back/0223--000--Remoraid.gif
rename to src/canonical/models/back/0223-000-Remoraid.gif
diff --git a/src/canonical/models/back/0224--000--Octillery.gif b/src/canonical/models/back/0224-000-Octillery.gif
similarity index 100%
rename from src/canonical/models/back/0224--000--Octillery.gif
rename to src/canonical/models/back/0224-000-Octillery.gif
diff --git a/src/canonical/models/back/0225--000--Delibird.gif b/src/canonical/models/back/0225-000-Delibird.gif
similarity index 100%
rename from src/canonical/models/back/0225--000--Delibird.gif
rename to src/canonical/models/back/0225-000-Delibird.gif
diff --git a/src/canonical/models/back/0226--000--Mantine.gif b/src/canonical/models/back/0226-000-Mantine.gif
similarity index 100%
rename from src/canonical/models/back/0226--000--Mantine.gif
rename to src/canonical/models/back/0226-000-Mantine.gif
diff --git a/src/canonical/models/back/0227--000--Skarmory.gif b/src/canonical/models/back/0227-000-Skarmory.gif
similarity index 100%
rename from src/canonical/models/back/0227--000--Skarmory.gif
rename to src/canonical/models/back/0227-000-Skarmory.gif
diff --git a/src/canonical/models/back/0228--000--Houndour.gif b/src/canonical/models/back/0228-000-Houndour.gif
similarity index 100%
rename from src/canonical/models/back/0228--000--Houndour.gif
rename to src/canonical/models/back/0228-000-Houndour.gif
diff --git a/src/canonical/models/back/0229--000--Houndoom.gif b/src/canonical/models/back/0229-000-Houndoom.gif
similarity index 100%
rename from src/canonical/models/back/0229--000--Houndoom.gif
rename to src/canonical/models/back/0229-000-Houndoom.gif
diff --git a/src/canonical/models/back/0229--420--Houndoom--Mega.gif b/src/canonical/models/back/0229-420-Houndoom-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0229--420--Houndoom--Mega.gif
rename to src/canonical/models/back/0229-420-Houndoom-Mega.gif
diff --git a/src/canonical/models/back/0230--000--Kingdra.gif b/src/canonical/models/back/0230-000-Kingdra.gif
similarity index 100%
rename from src/canonical/models/back/0230--000--Kingdra.gif
rename to src/canonical/models/back/0230-000-Kingdra.gif
diff --git a/src/canonical/models/back/0231--000--Phanpy.gif b/src/canonical/models/back/0231-000-Phanpy.gif
similarity index 100%
rename from src/canonical/models/back/0231--000--Phanpy.gif
rename to src/canonical/models/back/0231-000-Phanpy.gif
diff --git a/src/canonical/models/back/0232--000--Donphan.gif b/src/canonical/models/back/0232-000-Donphan.gif
similarity index 100%
rename from src/canonical/models/back/0232--000--Donphan.gif
rename to src/canonical/models/back/0232-000-Donphan.gif
diff --git a/src/canonical/models/back/0233--000--Porygon2.gif b/src/canonical/models/back/0233-000-Porygon2.gif
similarity index 100%
rename from src/canonical/models/back/0233--000--Porygon2.gif
rename to src/canonical/models/back/0233-000-Porygon2.gif
diff --git a/src/canonical/models/back/0234--000--Stantler.gif b/src/canonical/models/back/0234-000-Stantler.gif
similarity index 100%
rename from src/canonical/models/back/0234--000--Stantler.gif
rename to src/canonical/models/back/0234-000-Stantler.gif
diff --git a/src/canonical/models/back/0235--000--Smeargle.gif b/src/canonical/models/back/0235-000-Smeargle.gif
similarity index 100%
rename from src/canonical/models/back/0235--000--Smeargle.gif
rename to src/canonical/models/back/0235-000-Smeargle.gif
diff --git a/src/canonical/models/back/0236--000--Tyrogue.gif b/src/canonical/models/back/0236-000-Tyrogue.gif
similarity index 100%
rename from src/canonical/models/back/0236--000--Tyrogue.gif
rename to src/canonical/models/back/0236-000-Tyrogue.gif
diff --git a/src/canonical/models/back/0237--000--Hitmontop.gif b/src/canonical/models/back/0237-000-Hitmontop.gif
similarity index 100%
rename from src/canonical/models/back/0237--000--Hitmontop.gif
rename to src/canonical/models/back/0237-000-Hitmontop.gif
diff --git a/src/canonical/models/back/0238--000--Smoochum.gif b/src/canonical/models/back/0238-000-Smoochum.gif
similarity index 100%
rename from src/canonical/models/back/0238--000--Smoochum.gif
rename to src/canonical/models/back/0238-000-Smoochum.gif
diff --git a/src/canonical/models/back/0239--000--Elekid.gif b/src/canonical/models/back/0239-000-Elekid.gif
similarity index 100%
rename from src/canonical/models/back/0239--000--Elekid.gif
rename to src/canonical/models/back/0239-000-Elekid.gif
diff --git a/src/canonical/models/back/0240--000--Magby.gif b/src/canonical/models/back/0240-000-Magby.gif
similarity index 100%
rename from src/canonical/models/back/0240--000--Magby.gif
rename to src/canonical/models/back/0240-000-Magby.gif
diff --git a/src/canonical/models/back/0241--000--Miltank.gif b/src/canonical/models/back/0241-000-Miltank.gif
similarity index 100%
rename from src/canonical/models/back/0241--000--Miltank.gif
rename to src/canonical/models/back/0241-000-Miltank.gif
diff --git a/src/canonical/models/back/0242--000--Blissey.gif b/src/canonical/models/back/0242-000-Blissey.gif
similarity index 100%
rename from src/canonical/models/back/0242--000--Blissey.gif
rename to src/canonical/models/back/0242-000-Blissey.gif
diff --git a/src/canonical/models/back/0243--000--Raikou.gif b/src/canonical/models/back/0243-000-Raikou.gif
similarity index 100%
rename from src/canonical/models/back/0243--000--Raikou.gif
rename to src/canonical/models/back/0243-000-Raikou.gif
diff --git a/src/canonical/models/back/0244--000--Entei.gif b/src/canonical/models/back/0244-000-Entei.gif
similarity index 100%
rename from src/canonical/models/back/0244--000--Entei.gif
rename to src/canonical/models/back/0244-000-Entei.gif
diff --git a/src/canonical/models/back/0245--000--Suicune.gif b/src/canonical/models/back/0245-000-Suicune.gif
similarity index 100%
rename from src/canonical/models/back/0245--000--Suicune.gif
rename to src/canonical/models/back/0245-000-Suicune.gif
diff --git a/src/canonical/models/back/0246--000--Larvitar.gif b/src/canonical/models/back/0246-000-Larvitar.gif
similarity index 100%
rename from src/canonical/models/back/0246--000--Larvitar.gif
rename to src/canonical/models/back/0246-000-Larvitar.gif
diff --git a/src/canonical/models/back/0247--000--Pupitar.gif b/src/canonical/models/back/0247-000-Pupitar.gif
similarity index 100%
rename from src/canonical/models/back/0247--000--Pupitar.gif
rename to src/canonical/models/back/0247-000-Pupitar.gif
diff --git a/src/canonical/models/back/0248--000--Tyranitar.gif b/src/canonical/models/back/0248-000-Tyranitar.gif
similarity index 100%
rename from src/canonical/models/back/0248--000--Tyranitar.gif
rename to src/canonical/models/back/0248-000-Tyranitar.gif
diff --git a/src/canonical/models/back/0248--420--Tyranitar--Mega.gif b/src/canonical/models/back/0248-420-Tyranitar-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0248--420--Tyranitar--Mega.gif
rename to src/canonical/models/back/0248-420-Tyranitar-Mega.gif
diff --git a/src/canonical/models/back/0249--000--Lugia.gif b/src/canonical/models/back/0249-000-Lugia.gif
similarity index 100%
rename from src/canonical/models/back/0249--000--Lugia.gif
rename to src/canonical/models/back/0249-000-Lugia.gif
diff --git a/src/canonical/models/back/0250--000--Ho-Oh.gif b/src/canonical/models/back/0250-000-Ho~Oh.gif
similarity index 100%
rename from src/canonical/models/back/0250--000--Ho-Oh.gif
rename to src/canonical/models/back/0250-000-Ho~Oh.gif
diff --git a/src/canonical/models/back/0251--000--Celebi.gif b/src/canonical/models/back/0251-000-Celebi.gif
similarity index 100%
rename from src/canonical/models/back/0251--000--Celebi.gif
rename to src/canonical/models/back/0251-000-Celebi.gif
diff --git a/src/canonical/models/back/0252--000--Treecko.gif b/src/canonical/models/back/0252-000-Treecko.gif
similarity index 100%
rename from src/canonical/models/back/0252--000--Treecko.gif
rename to src/canonical/models/back/0252-000-Treecko.gif
diff --git a/src/canonical/models/back/0253--000--Grovyle.gif b/src/canonical/models/back/0253-000-Grovyle.gif
similarity index 100%
rename from src/canonical/models/back/0253--000--Grovyle.gif
rename to src/canonical/models/back/0253-000-Grovyle.gif
diff --git a/src/canonical/models/back/0254--000--Sceptile.gif b/src/canonical/models/back/0254-000-Sceptile.gif
similarity index 100%
rename from src/canonical/models/back/0254--000--Sceptile.gif
rename to src/canonical/models/back/0254-000-Sceptile.gif
diff --git a/src/canonical/models/back/0254--420--Sceptile--Mega.gif b/src/canonical/models/back/0254-420-Sceptile-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0254--420--Sceptile--Mega.gif
rename to src/canonical/models/back/0254-420-Sceptile-Mega.gif
diff --git a/src/canonical/models/back/0255--000--Torchic.gif b/src/canonical/models/back/0255-000-Torchic.gif
similarity index 100%
rename from src/canonical/models/back/0255--000--Torchic.gif
rename to src/canonical/models/back/0255-000-Torchic.gif
diff --git a/src/canonical/models/back/0256--000--Combusken.gif b/src/canonical/models/back/0256-000-Combusken.gif
similarity index 100%
rename from src/canonical/models/back/0256--000--Combusken.gif
rename to src/canonical/models/back/0256-000-Combusken.gif
diff --git a/src/canonical/models/back/0257--000--Blaziken.gif b/src/canonical/models/back/0257-000-Blaziken.gif
similarity index 100%
rename from src/canonical/models/back/0257--000--Blaziken.gif
rename to src/canonical/models/back/0257-000-Blaziken.gif
diff --git a/src/canonical/models/back/0257--420--Blaziken--Mega.gif b/src/canonical/models/back/0257-420-Blaziken-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0257--420--Blaziken--Mega.gif
rename to src/canonical/models/back/0257-420-Blaziken-Mega.gif
diff --git a/src/canonical/models/back/0258--000--Mudkip.gif b/src/canonical/models/back/0258-000-Mudkip.gif
similarity index 100%
rename from src/canonical/models/back/0258--000--Mudkip.gif
rename to src/canonical/models/back/0258-000-Mudkip.gif
diff --git a/src/canonical/models/back/0259--000--Marshtomp.gif b/src/canonical/models/back/0259-000-Marshtomp.gif
similarity index 100%
rename from src/canonical/models/back/0259--000--Marshtomp.gif
rename to src/canonical/models/back/0259-000-Marshtomp.gif
diff --git a/src/canonical/models/back/0260--000--Swampert.gif b/src/canonical/models/back/0260-000-Swampert.gif
similarity index 100%
rename from src/canonical/models/back/0260--000--Swampert.gif
rename to src/canonical/models/back/0260-000-Swampert.gif
diff --git a/src/canonical/models/back/0260--420--Swampert--Mega.gif b/src/canonical/models/back/0260-420-Swampert-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0260--420--Swampert--Mega.gif
rename to src/canonical/models/back/0260-420-Swampert-Mega.gif
diff --git a/src/canonical/models/back/0261--000--Poochyena.gif b/src/canonical/models/back/0261-000-Poochyena.gif
similarity index 100%
rename from src/canonical/models/back/0261--000--Poochyena.gif
rename to src/canonical/models/back/0261-000-Poochyena.gif
diff --git a/src/canonical/models/back/0262--000--Mightyena.gif b/src/canonical/models/back/0262-000-Mightyena.gif
similarity index 100%
rename from src/canonical/models/back/0262--000--Mightyena.gif
rename to src/canonical/models/back/0262-000-Mightyena.gif
diff --git a/src/canonical/models/back/0263--000--Zigzagoon.gif b/src/canonical/models/back/0263-000-Zigzagoon.gif
similarity index 100%
rename from src/canonical/models/back/0263--000--Zigzagoon.gif
rename to src/canonical/models/back/0263-000-Zigzagoon.gif
diff --git a/src/canonical/models/back/0263--420--Zigzagoon--Galar.gif b/src/canonical/models/back/0263-420-Zigzagoon-Galar.gif
similarity index 100%
rename from src/canonical/models/back/0263--420--Zigzagoon--Galar.gif
rename to src/canonical/models/back/0263-420-Zigzagoon-Galar.gif
diff --git a/src/canonical/models/back/0264--000--Linoone.gif b/src/canonical/models/back/0264-000-Linoone.gif
similarity index 100%
rename from src/canonical/models/back/0264--000--Linoone.gif
rename to src/canonical/models/back/0264-000-Linoone.gif
diff --git a/src/canonical/models/back/0264--420--Linoone--Galar.gif b/src/canonical/models/back/0264-420-Linoone-Galar.gif
similarity index 100%
rename from src/canonical/models/back/0264--420--Linoone--Galar.gif
rename to src/canonical/models/back/0264-420-Linoone-Galar.gif
diff --git a/src/canonical/models/back/0265--000--Wurmple.gif b/src/canonical/models/back/0265-000-Wurmple.gif
similarity index 100%
rename from src/canonical/models/back/0265--000--Wurmple.gif
rename to src/canonical/models/back/0265-000-Wurmple.gif
diff --git a/src/canonical/models/back/0266--000--Silcoon.gif b/src/canonical/models/back/0266-000-Silcoon.gif
similarity index 100%
rename from src/canonical/models/back/0266--000--Silcoon.gif
rename to src/canonical/models/back/0266-000-Silcoon.gif
diff --git a/src/canonical/models/back/0267--000--Beautifly.gif b/src/canonical/models/back/0267-000-Beautifly.gif
similarity index 100%
rename from src/canonical/models/back/0267--000--Beautifly.gif
rename to src/canonical/models/back/0267-000-Beautifly.gif
diff --git a/src/canonical/models/back/0268--000--Cascoon.gif b/src/canonical/models/back/0268-000-Cascoon.gif
similarity index 100%
rename from src/canonical/models/back/0268--000--Cascoon.gif
rename to src/canonical/models/back/0268-000-Cascoon.gif
diff --git a/src/canonical/models/back/0269--000--Dustox.gif b/src/canonical/models/back/0269-000-Dustox.gif
similarity index 100%
rename from src/canonical/models/back/0269--000--Dustox.gif
rename to src/canonical/models/back/0269-000-Dustox.gif
diff --git a/src/canonical/models/back/0270--000--Lotad.gif b/src/canonical/models/back/0270-000-Lotad.gif
similarity index 100%
rename from src/canonical/models/back/0270--000--Lotad.gif
rename to src/canonical/models/back/0270-000-Lotad.gif
diff --git a/src/canonical/models/back/0271--000--Lombre.gif b/src/canonical/models/back/0271-000-Lombre.gif
similarity index 100%
rename from src/canonical/models/back/0271--000--Lombre.gif
rename to src/canonical/models/back/0271-000-Lombre.gif
diff --git a/src/canonical/models/back/0272--000--Ludicolo.gif b/src/canonical/models/back/0272-000-Ludicolo.gif
similarity index 100%
rename from src/canonical/models/back/0272--000--Ludicolo.gif
rename to src/canonical/models/back/0272-000-Ludicolo.gif
diff --git a/src/canonical/models/back/0273--000--Seedot.gif b/src/canonical/models/back/0273-000-Seedot.gif
similarity index 100%
rename from src/canonical/models/back/0273--000--Seedot.gif
rename to src/canonical/models/back/0273-000-Seedot.gif
diff --git a/src/canonical/models/back/0274--000--Nuzleaf.gif b/src/canonical/models/back/0274-000-Nuzleaf.gif
similarity index 100%
rename from src/canonical/models/back/0274--000--Nuzleaf.gif
rename to src/canonical/models/back/0274-000-Nuzleaf.gif
diff --git a/src/canonical/models/back/0275--000--Shiftry.gif b/src/canonical/models/back/0275-000-Shiftry.gif
similarity index 100%
rename from src/canonical/models/back/0275--000--Shiftry.gif
rename to src/canonical/models/back/0275-000-Shiftry.gif
diff --git a/src/canonical/models/back/0276--000--Taillow.gif b/src/canonical/models/back/0276-000-Taillow.gif
similarity index 100%
rename from src/canonical/models/back/0276--000--Taillow.gif
rename to src/canonical/models/back/0276-000-Taillow.gif
diff --git a/src/canonical/models/back/0277--000--Swellow.gif b/src/canonical/models/back/0277-000-Swellow.gif
similarity index 100%
rename from src/canonical/models/back/0277--000--Swellow.gif
rename to src/canonical/models/back/0277-000-Swellow.gif
diff --git a/src/canonical/models/back/0278--000--Wingull.gif b/src/canonical/models/back/0278-000-Wingull.gif
similarity index 100%
rename from src/canonical/models/back/0278--000--Wingull.gif
rename to src/canonical/models/back/0278-000-Wingull.gif
diff --git a/src/canonical/models/back/0279--000--Pelipper.gif b/src/canonical/models/back/0279-000-Pelipper.gif
similarity index 100%
rename from src/canonical/models/back/0279--000--Pelipper.gif
rename to src/canonical/models/back/0279-000-Pelipper.gif
diff --git a/src/canonical/models/back/0280--000--Ralts.gif b/src/canonical/models/back/0280-000-Ralts.gif
similarity index 100%
rename from src/canonical/models/back/0280--000--Ralts.gif
rename to src/canonical/models/back/0280-000-Ralts.gif
diff --git a/src/canonical/models/back/0281--000--Kirlia.gif b/src/canonical/models/back/0281-000-Kirlia.gif
similarity index 100%
rename from src/canonical/models/back/0281--000--Kirlia.gif
rename to src/canonical/models/back/0281-000-Kirlia.gif
diff --git a/src/canonical/models/back/0282--000--Gardevoir.gif b/src/canonical/models/back/0282-000-Gardevoir.gif
similarity index 100%
rename from src/canonical/models/back/0282--000--Gardevoir.gif
rename to src/canonical/models/back/0282-000-Gardevoir.gif
diff --git a/src/canonical/models/back/0282--420--Gardevoir--Mega.gif b/src/canonical/models/back/0282-420-Gardevoir-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0282--420--Gardevoir--Mega.gif
rename to src/canonical/models/back/0282-420-Gardevoir-Mega.gif
diff --git a/src/canonical/models/back/0283--000--Surskit.gif b/src/canonical/models/back/0283-000-Surskit.gif
similarity index 100%
rename from src/canonical/models/back/0283--000--Surskit.gif
rename to src/canonical/models/back/0283-000-Surskit.gif
diff --git a/src/canonical/models/back/0284--000--Masquerain.gif b/src/canonical/models/back/0284-000-Masquerain.gif
similarity index 100%
rename from src/canonical/models/back/0284--000--Masquerain.gif
rename to src/canonical/models/back/0284-000-Masquerain.gif
diff --git a/src/canonical/models/back/0285--000--Shroomish.gif b/src/canonical/models/back/0285-000-Shroomish.gif
similarity index 100%
rename from src/canonical/models/back/0285--000--Shroomish.gif
rename to src/canonical/models/back/0285-000-Shroomish.gif
diff --git a/src/canonical/models/back/0286--000--Breloom.gif b/src/canonical/models/back/0286-000-Breloom.gif
similarity index 100%
rename from src/canonical/models/back/0286--000--Breloom.gif
rename to src/canonical/models/back/0286-000-Breloom.gif
diff --git a/src/canonical/models/back/0287--000--Slakoth.gif b/src/canonical/models/back/0287-000-Slakoth.gif
similarity index 100%
rename from src/canonical/models/back/0287--000--Slakoth.gif
rename to src/canonical/models/back/0287-000-Slakoth.gif
diff --git a/src/canonical/models/back/0288--000--Vigoroth.gif b/src/canonical/models/back/0288-000-Vigoroth.gif
similarity index 100%
rename from src/canonical/models/back/0288--000--Vigoroth.gif
rename to src/canonical/models/back/0288-000-Vigoroth.gif
diff --git a/src/canonical/models/back/0289--000--Slaking.gif b/src/canonical/models/back/0289-000-Slaking.gif
similarity index 100%
rename from src/canonical/models/back/0289--000--Slaking.gif
rename to src/canonical/models/back/0289-000-Slaking.gif
diff --git a/src/canonical/models/back/0290--000--Nincada.gif b/src/canonical/models/back/0290-000-Nincada.gif
similarity index 100%
rename from src/canonical/models/back/0290--000--Nincada.gif
rename to src/canonical/models/back/0290-000-Nincada.gif
diff --git a/src/canonical/models/back/0291--000--Ninjask.gif b/src/canonical/models/back/0291-000-Ninjask.gif
similarity index 100%
rename from src/canonical/models/back/0291--000--Ninjask.gif
rename to src/canonical/models/back/0291-000-Ninjask.gif
diff --git a/src/canonical/models/back/0292--000--Shedinja.gif b/src/canonical/models/back/0292-000-Shedinja.gif
similarity index 100%
rename from src/canonical/models/back/0292--000--Shedinja.gif
rename to src/canonical/models/back/0292-000-Shedinja.gif
diff --git a/src/canonical/models/back/0293--000--Whismur.gif b/src/canonical/models/back/0293-000-Whismur.gif
similarity index 100%
rename from src/canonical/models/back/0293--000--Whismur.gif
rename to src/canonical/models/back/0293-000-Whismur.gif
diff --git a/src/canonical/models/back/0294--000--Loudred.gif b/src/canonical/models/back/0294-000-Loudred.gif
similarity index 100%
rename from src/canonical/models/back/0294--000--Loudred.gif
rename to src/canonical/models/back/0294-000-Loudred.gif
diff --git a/src/canonical/models/back/0295--000--Exploud.gif b/src/canonical/models/back/0295-000-Exploud.gif
similarity index 100%
rename from src/canonical/models/back/0295--000--Exploud.gif
rename to src/canonical/models/back/0295-000-Exploud.gif
diff --git a/src/canonical/models/back/0296--000--Makuhita.gif b/src/canonical/models/back/0296-000-Makuhita.gif
similarity index 100%
rename from src/canonical/models/back/0296--000--Makuhita.gif
rename to src/canonical/models/back/0296-000-Makuhita.gif
diff --git a/src/canonical/models/back/0297--000--Hariyama.gif b/src/canonical/models/back/0297-000-Hariyama.gif
similarity index 100%
rename from src/canonical/models/back/0297--000--Hariyama.gif
rename to src/canonical/models/back/0297-000-Hariyama.gif
diff --git a/src/canonical/models/back/0298--000--Azurill.gif b/src/canonical/models/back/0298-000-Azurill.gif
similarity index 100%
rename from src/canonical/models/back/0298--000--Azurill.gif
rename to src/canonical/models/back/0298-000-Azurill.gif
diff --git a/src/canonical/models/back/0299--000--Nosepass.gif b/src/canonical/models/back/0299-000-Nosepass.gif
similarity index 100%
rename from src/canonical/models/back/0299--000--Nosepass.gif
rename to src/canonical/models/back/0299-000-Nosepass.gif
diff --git a/src/canonical/models/back/0300--000--Skitty.gif b/src/canonical/models/back/0300-000-Skitty.gif
similarity index 100%
rename from src/canonical/models/back/0300--000--Skitty.gif
rename to src/canonical/models/back/0300-000-Skitty.gif
diff --git a/src/canonical/models/back/0301--000--Delcatty.gif b/src/canonical/models/back/0301-000-Delcatty.gif
similarity index 100%
rename from src/canonical/models/back/0301--000--Delcatty.gif
rename to src/canonical/models/back/0301-000-Delcatty.gif
diff --git a/src/canonical/models/back/0302--000--Sableye.gif b/src/canonical/models/back/0302-000-Sableye.gif
similarity index 100%
rename from src/canonical/models/back/0302--000--Sableye.gif
rename to src/canonical/models/back/0302-000-Sableye.gif
diff --git a/src/canonical/models/back/0302--420--Sableye--Mega.gif b/src/canonical/models/back/0302-420-Sableye-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0302--420--Sableye--Mega.gif
rename to src/canonical/models/back/0302-420-Sableye-Mega.gif
diff --git a/src/canonical/models/back/0303--000--Mawile.gif b/src/canonical/models/back/0303-000-Mawile.gif
similarity index 100%
rename from src/canonical/models/back/0303--000--Mawile.gif
rename to src/canonical/models/back/0303-000-Mawile.gif
diff --git a/src/canonical/models/back/0303--420--Mawile--Mega.gif b/src/canonical/models/back/0303-420-Mawile-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0303--420--Mawile--Mega.gif
rename to src/canonical/models/back/0303-420-Mawile-Mega.gif
diff --git a/src/canonical/models/back/0304--000--Aron.gif b/src/canonical/models/back/0304-000-Aron.gif
similarity index 100%
rename from src/canonical/models/back/0304--000--Aron.gif
rename to src/canonical/models/back/0304-000-Aron.gif
diff --git a/src/canonical/models/back/0305--000--Lairon.gif b/src/canonical/models/back/0305-000-Lairon.gif
similarity index 100%
rename from src/canonical/models/back/0305--000--Lairon.gif
rename to src/canonical/models/back/0305-000-Lairon.gif
diff --git a/src/canonical/models/back/0306--000--Aggron.gif b/src/canonical/models/back/0306-000-Aggron.gif
similarity index 100%
rename from src/canonical/models/back/0306--000--Aggron.gif
rename to src/canonical/models/back/0306-000-Aggron.gif
diff --git a/src/canonical/models/back/0306--420--Aggron--Mega.gif b/src/canonical/models/back/0306-420-Aggron-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0306--420--Aggron--Mega.gif
rename to src/canonical/models/back/0306-420-Aggron-Mega.gif
diff --git a/src/canonical/models/back/0307--000--Meditite.gif b/src/canonical/models/back/0307-000-Meditite.gif
similarity index 100%
rename from src/canonical/models/back/0307--000--Meditite.gif
rename to src/canonical/models/back/0307-000-Meditite.gif
diff --git a/src/canonical/models/back/0308--000--Medicham.gif b/src/canonical/models/back/0308-000-Medicham.gif
similarity index 100%
rename from src/canonical/models/back/0308--000--Medicham.gif
rename to src/canonical/models/back/0308-000-Medicham.gif
diff --git a/src/canonical/models/back/0308--420--Medicham--Mega.gif b/src/canonical/models/back/0308-420-Medicham-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0308--420--Medicham--Mega.gif
rename to src/canonical/models/back/0308-420-Medicham-Mega.gif
diff --git a/src/canonical/models/back/0309--000--Electrike.gif b/src/canonical/models/back/0309-000-Electrike.gif
similarity index 100%
rename from src/canonical/models/back/0309--000--Electrike.gif
rename to src/canonical/models/back/0309-000-Electrike.gif
diff --git a/src/canonical/models/back/0310--000--Manectric.gif b/src/canonical/models/back/0310-000-Manectric.gif
similarity index 100%
rename from src/canonical/models/back/0310--000--Manectric.gif
rename to src/canonical/models/back/0310-000-Manectric.gif
diff --git a/src/canonical/models/back/0310--420--Manectric--Mega.gif b/src/canonical/models/back/0310-420-Manectric-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0310--420--Manectric--Mega.gif
rename to src/canonical/models/back/0310-420-Manectric-Mega.gif
diff --git a/src/canonical/models/back/0311--000--Plusle.gif b/src/canonical/models/back/0311-000-Plusle.gif
similarity index 100%
rename from src/canonical/models/back/0311--000--Plusle.gif
rename to src/canonical/models/back/0311-000-Plusle.gif
diff --git a/src/canonical/models/back/0312--000--Minun.gif b/src/canonical/models/back/0312-000-Minun.gif
similarity index 100%
rename from src/canonical/models/back/0312--000--Minun.gif
rename to src/canonical/models/back/0312-000-Minun.gif
diff --git a/src/canonical/models/back/0313--000--Volbeat.gif b/src/canonical/models/back/0313-000-Volbeat.gif
similarity index 100%
rename from src/canonical/models/back/0313--000--Volbeat.gif
rename to src/canonical/models/back/0313-000-Volbeat.gif
diff --git a/src/canonical/models/back/0314--000--Illumise.gif b/src/canonical/models/back/0314-000-Illumise.gif
similarity index 100%
rename from src/canonical/models/back/0314--000--Illumise.gif
rename to src/canonical/models/back/0314-000-Illumise.gif
diff --git a/src/canonical/models/back/0315--000--Roselia.gif b/src/canonical/models/back/0315-000-Roselia.gif
similarity index 100%
rename from src/canonical/models/back/0315--000--Roselia.gif
rename to src/canonical/models/back/0315-000-Roselia.gif
diff --git a/src/canonical/models/back/0316--000--Gulpin.gif b/src/canonical/models/back/0316-000-Gulpin.gif
similarity index 100%
rename from src/canonical/models/back/0316--000--Gulpin.gif
rename to src/canonical/models/back/0316-000-Gulpin.gif
diff --git a/src/canonical/models/back/0317--000--Swalot.gif b/src/canonical/models/back/0317-000-Swalot.gif
similarity index 100%
rename from src/canonical/models/back/0317--000--Swalot.gif
rename to src/canonical/models/back/0317-000-Swalot.gif
diff --git a/src/canonical/models/back/0318--000--Carvanha.gif b/src/canonical/models/back/0318-000-Carvanha.gif
similarity index 100%
rename from src/canonical/models/back/0318--000--Carvanha.gif
rename to src/canonical/models/back/0318-000-Carvanha.gif
diff --git a/src/canonical/models/back/0319--000--Sharpedo.gif b/src/canonical/models/back/0319-000-Sharpedo.gif
similarity index 100%
rename from src/canonical/models/back/0319--000--Sharpedo.gif
rename to src/canonical/models/back/0319-000-Sharpedo.gif
diff --git a/src/canonical/models/back/0319--420--Sharpedo--Mega.gif b/src/canonical/models/back/0319-420-Sharpedo-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0319--420--Sharpedo--Mega.gif
rename to src/canonical/models/back/0319-420-Sharpedo-Mega.gif
diff --git a/src/canonical/models/back/0320--000--Wailmer.gif b/src/canonical/models/back/0320-000-Wailmer.gif
similarity index 100%
rename from src/canonical/models/back/0320--000--Wailmer.gif
rename to src/canonical/models/back/0320-000-Wailmer.gif
diff --git a/src/canonical/models/back/0321--000--Wailord.gif b/src/canonical/models/back/0321-000-Wailord.gif
similarity index 100%
rename from src/canonical/models/back/0321--000--Wailord.gif
rename to src/canonical/models/back/0321-000-Wailord.gif
diff --git a/src/canonical/models/back/0322--000--Numel.gif b/src/canonical/models/back/0322-000-Numel.gif
similarity index 100%
rename from src/canonical/models/back/0322--000--Numel.gif
rename to src/canonical/models/back/0322-000-Numel.gif
diff --git a/src/canonical/models/back/0323--000--Camerupt.gif b/src/canonical/models/back/0323-000-Camerupt.gif
similarity index 100%
rename from src/canonical/models/back/0323--000--Camerupt.gif
rename to src/canonical/models/back/0323-000-Camerupt.gif
diff --git a/src/canonical/models/back/0323--420--Camerupt--Mega.gif b/src/canonical/models/back/0323-420-Camerupt-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0323--420--Camerupt--Mega.gif
rename to src/canonical/models/back/0323-420-Camerupt-Mega.gif
diff --git a/src/canonical/models/back/0324--000--Torkoal.gif b/src/canonical/models/back/0324-000-Torkoal.gif
similarity index 100%
rename from src/canonical/models/back/0324--000--Torkoal.gif
rename to src/canonical/models/back/0324-000-Torkoal.gif
diff --git a/src/canonical/models/back/0325--000--Spoink.gif b/src/canonical/models/back/0325-000-Spoink.gif
similarity index 100%
rename from src/canonical/models/back/0325--000--Spoink.gif
rename to src/canonical/models/back/0325-000-Spoink.gif
diff --git a/src/canonical/models/back/0326--000--Grumpig.gif b/src/canonical/models/back/0326-000-Grumpig.gif
similarity index 100%
rename from src/canonical/models/back/0326--000--Grumpig.gif
rename to src/canonical/models/back/0326-000-Grumpig.gif
diff --git a/src/canonical/models/back/0327--000--Spinda.gif b/src/canonical/models/back/0327-000-Spinda.gif
similarity index 100%
rename from src/canonical/models/back/0327--000--Spinda.gif
rename to src/canonical/models/back/0327-000-Spinda.gif
diff --git a/src/canonical/models/back/0328--000--Trapinch.gif b/src/canonical/models/back/0328-000-Trapinch.gif
similarity index 100%
rename from src/canonical/models/back/0328--000--Trapinch.gif
rename to src/canonical/models/back/0328-000-Trapinch.gif
diff --git a/src/canonical/models/back/0329--000--Vibrava.gif b/src/canonical/models/back/0329-000-Vibrava.gif
similarity index 100%
rename from src/canonical/models/back/0329--000--Vibrava.gif
rename to src/canonical/models/back/0329-000-Vibrava.gif
diff --git a/src/canonical/models/back/0330--000--Flygon.gif b/src/canonical/models/back/0330-000-Flygon.gif
similarity index 100%
rename from src/canonical/models/back/0330--000--Flygon.gif
rename to src/canonical/models/back/0330-000-Flygon.gif
diff --git a/src/canonical/models/back/0331--000--Cacnea.gif b/src/canonical/models/back/0331-000-Cacnea.gif
similarity index 100%
rename from src/canonical/models/back/0331--000--Cacnea.gif
rename to src/canonical/models/back/0331-000-Cacnea.gif
diff --git a/src/canonical/models/back/0332--000--Cacturne.gif b/src/canonical/models/back/0332-000-Cacturne.gif
similarity index 100%
rename from src/canonical/models/back/0332--000--Cacturne.gif
rename to src/canonical/models/back/0332-000-Cacturne.gif
diff --git a/src/canonical/models/back/0333--000--Swablu.gif b/src/canonical/models/back/0333-000-Swablu.gif
similarity index 100%
rename from src/canonical/models/back/0333--000--Swablu.gif
rename to src/canonical/models/back/0333-000-Swablu.gif
diff --git a/src/canonical/models/back/0334--000--Altaria.gif b/src/canonical/models/back/0334-000-Altaria.gif
similarity index 100%
rename from src/canonical/models/back/0334--000--Altaria.gif
rename to src/canonical/models/back/0334-000-Altaria.gif
diff --git a/src/canonical/models/back/0334--420--Altaria--Mega.gif b/src/canonical/models/back/0334-420-Altaria-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0334--420--Altaria--Mega.gif
rename to src/canonical/models/back/0334-420-Altaria-Mega.gif
diff --git a/src/canonical/models/back/0335--000--Zangoose.gif b/src/canonical/models/back/0335-000-Zangoose.gif
similarity index 100%
rename from src/canonical/models/back/0335--000--Zangoose.gif
rename to src/canonical/models/back/0335-000-Zangoose.gif
diff --git a/src/canonical/models/back/0336--000--Seviper.gif b/src/canonical/models/back/0336-000-Seviper.gif
similarity index 100%
rename from src/canonical/models/back/0336--000--Seviper.gif
rename to src/canonical/models/back/0336-000-Seviper.gif
diff --git a/src/canonical/models/back/0337--000--Lunatone.gif b/src/canonical/models/back/0337-000-Lunatone.gif
similarity index 100%
rename from src/canonical/models/back/0337--000--Lunatone.gif
rename to src/canonical/models/back/0337-000-Lunatone.gif
diff --git a/src/canonical/models/back/0338--000--Solrock.gif b/src/canonical/models/back/0338-000-Solrock.gif
similarity index 100%
rename from src/canonical/models/back/0338--000--Solrock.gif
rename to src/canonical/models/back/0338-000-Solrock.gif
diff --git a/src/canonical/models/back/0339--000--Barboach.gif b/src/canonical/models/back/0339-000-Barboach.gif
similarity index 100%
rename from src/canonical/models/back/0339--000--Barboach.gif
rename to src/canonical/models/back/0339-000-Barboach.gif
diff --git a/src/canonical/models/back/0340--000--Whiscash.gif b/src/canonical/models/back/0340-000-Whiscash.gif
similarity index 100%
rename from src/canonical/models/back/0340--000--Whiscash.gif
rename to src/canonical/models/back/0340-000-Whiscash.gif
diff --git a/src/canonical/models/back/0341--000--Corphish.gif b/src/canonical/models/back/0341-000-Corphish.gif
similarity index 100%
rename from src/canonical/models/back/0341--000--Corphish.gif
rename to src/canonical/models/back/0341-000-Corphish.gif
diff --git a/src/canonical/models/back/0342--000--Crawdaunt.gif b/src/canonical/models/back/0342-000-Crawdaunt.gif
similarity index 100%
rename from src/canonical/models/back/0342--000--Crawdaunt.gif
rename to src/canonical/models/back/0342-000-Crawdaunt.gif
diff --git a/src/canonical/models/back/0343--000--Baltoy.gif b/src/canonical/models/back/0343-000-Baltoy.gif
similarity index 100%
rename from src/canonical/models/back/0343--000--Baltoy.gif
rename to src/canonical/models/back/0343-000-Baltoy.gif
diff --git a/src/canonical/models/back/0344--000--Claydol.gif b/src/canonical/models/back/0344-000-Claydol.gif
similarity index 100%
rename from src/canonical/models/back/0344--000--Claydol.gif
rename to src/canonical/models/back/0344-000-Claydol.gif
diff --git a/src/canonical/models/back/0345--000--Lileep.gif b/src/canonical/models/back/0345-000-Lileep.gif
similarity index 100%
rename from src/canonical/models/back/0345--000--Lileep.gif
rename to src/canonical/models/back/0345-000-Lileep.gif
diff --git a/src/canonical/models/back/0346--000--Cradily.gif b/src/canonical/models/back/0346-000-Cradily.gif
similarity index 100%
rename from src/canonical/models/back/0346--000--Cradily.gif
rename to src/canonical/models/back/0346-000-Cradily.gif
diff --git a/src/canonical/models/back/0347--000--Anorith.gif b/src/canonical/models/back/0347-000-Anorith.gif
similarity index 100%
rename from src/canonical/models/back/0347--000--Anorith.gif
rename to src/canonical/models/back/0347-000-Anorith.gif
diff --git a/src/canonical/models/back/0348--000--Armaldo.gif b/src/canonical/models/back/0348-000-Armaldo.gif
similarity index 100%
rename from src/canonical/models/back/0348--000--Armaldo.gif
rename to src/canonical/models/back/0348-000-Armaldo.gif
diff --git a/src/canonical/models/back/0349--000--Feebas.gif b/src/canonical/models/back/0349-000-Feebas.gif
similarity index 100%
rename from src/canonical/models/back/0349--000--Feebas.gif
rename to src/canonical/models/back/0349-000-Feebas.gif
diff --git a/src/canonical/models/back/0350--000--Milotic.gif b/src/canonical/models/back/0350-000-Milotic.gif
similarity index 100%
rename from src/canonical/models/back/0350--000--Milotic.gif
rename to src/canonical/models/back/0350-000-Milotic.gif
diff --git a/src/canonical/models/back/0351--000--Castform.gif b/src/canonical/models/back/0351-000-Castform.gif
similarity index 100%
rename from src/canonical/models/back/0351--000--Castform.gif
rename to src/canonical/models/back/0351-000-Castform.gif
diff --git a/src/canonical/models/back/0351--420--Castform--Rainy.gif b/src/canonical/models/back/0351-420-Castform-Rainy.gif
similarity index 100%
rename from src/canonical/models/back/0351--420--Castform--Rainy.gif
rename to src/canonical/models/back/0351-420-Castform-Rainy.gif
diff --git a/src/canonical/models/back/0351--420--Castform--Snowy.gif b/src/canonical/models/back/0351-420-Castform-Snowy.gif
similarity index 100%
rename from src/canonical/models/back/0351--420--Castform--Snowy.gif
rename to src/canonical/models/back/0351-420-Castform-Snowy.gif
diff --git a/src/canonical/models/back/0351--420--Castform--Sunny.gif b/src/canonical/models/back/0351-420-Castform-Sunny.gif
similarity index 100%
rename from src/canonical/models/back/0351--420--Castform--Sunny.gif
rename to src/canonical/models/back/0351-420-Castform-Sunny.gif
diff --git a/src/canonical/models/back/0352--000--Kecleon.gif b/src/canonical/models/back/0352-000-Kecleon.gif
similarity index 100%
rename from src/canonical/models/back/0352--000--Kecleon.gif
rename to src/canonical/models/back/0352-000-Kecleon.gif
diff --git a/src/canonical/models/back/0353--000--Shuppet.gif b/src/canonical/models/back/0353-000-Shuppet.gif
similarity index 100%
rename from src/canonical/models/back/0353--000--Shuppet.gif
rename to src/canonical/models/back/0353-000-Shuppet.gif
diff --git a/src/canonical/models/back/0354--000--Banette.gif b/src/canonical/models/back/0354-000-Banette.gif
similarity index 100%
rename from src/canonical/models/back/0354--000--Banette.gif
rename to src/canonical/models/back/0354-000-Banette.gif
diff --git a/src/canonical/models/back/0354--420--Banette--Mega.gif b/src/canonical/models/back/0354-420-Banette-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0354--420--Banette--Mega.gif
rename to src/canonical/models/back/0354-420-Banette-Mega.gif
diff --git a/src/canonical/models/back/0355--000--Duskull.gif b/src/canonical/models/back/0355-000-Duskull.gif
similarity index 100%
rename from src/canonical/models/back/0355--000--Duskull.gif
rename to src/canonical/models/back/0355-000-Duskull.gif
diff --git a/src/canonical/models/back/0356--000--Dusclops.gif b/src/canonical/models/back/0356-000-Dusclops.gif
similarity index 100%
rename from src/canonical/models/back/0356--000--Dusclops.gif
rename to src/canonical/models/back/0356-000-Dusclops.gif
diff --git a/src/canonical/models/back/0357--000--Tropius.gif b/src/canonical/models/back/0357-000-Tropius.gif
similarity index 100%
rename from src/canonical/models/back/0357--000--Tropius.gif
rename to src/canonical/models/back/0357-000-Tropius.gif
diff --git a/src/canonical/models/back/0358--000--Chimecho.gif b/src/canonical/models/back/0358-000-Chimecho.gif
similarity index 100%
rename from src/canonical/models/back/0358--000--Chimecho.gif
rename to src/canonical/models/back/0358-000-Chimecho.gif
diff --git a/src/canonical/models/back/0359--000--Absol.gif b/src/canonical/models/back/0359-000-Absol.gif
similarity index 100%
rename from src/canonical/models/back/0359--000--Absol.gif
rename to src/canonical/models/back/0359-000-Absol.gif
diff --git a/src/canonical/models/back/0359--420--Absol--Mega.gif b/src/canonical/models/back/0359-420-Absol-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0359--420--Absol--Mega.gif
rename to src/canonical/models/back/0359-420-Absol-Mega.gif
diff --git a/src/canonical/models/back/0360--000--Wynaut.gif b/src/canonical/models/back/0360-000-Wynaut.gif
similarity index 100%
rename from src/canonical/models/back/0360--000--Wynaut.gif
rename to src/canonical/models/back/0360-000-Wynaut.gif
diff --git a/src/canonical/models/back/0361--000--Snorunt.gif b/src/canonical/models/back/0361-000-Snorunt.gif
similarity index 100%
rename from src/canonical/models/back/0361--000--Snorunt.gif
rename to src/canonical/models/back/0361-000-Snorunt.gif
diff --git a/src/canonical/models/back/0362--000--Glalie.gif b/src/canonical/models/back/0362-000-Glalie.gif
similarity index 100%
rename from src/canonical/models/back/0362--000--Glalie.gif
rename to src/canonical/models/back/0362-000-Glalie.gif
diff --git a/src/canonical/models/back/0362--420--Glalie--Mega.gif b/src/canonical/models/back/0362-420-Glalie-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0362--420--Glalie--Mega.gif
rename to src/canonical/models/back/0362-420-Glalie-Mega.gif
diff --git a/src/canonical/models/back/0363--000--Spheal.gif b/src/canonical/models/back/0363-000-Spheal.gif
similarity index 100%
rename from src/canonical/models/back/0363--000--Spheal.gif
rename to src/canonical/models/back/0363-000-Spheal.gif
diff --git a/src/canonical/models/back/0364--000--Sealeo.gif b/src/canonical/models/back/0364-000-Sealeo.gif
similarity index 100%
rename from src/canonical/models/back/0364--000--Sealeo.gif
rename to src/canonical/models/back/0364-000-Sealeo.gif
diff --git a/src/canonical/models/back/0365--000--Walrein.gif b/src/canonical/models/back/0365-000-Walrein.gif
similarity index 100%
rename from src/canonical/models/back/0365--000--Walrein.gif
rename to src/canonical/models/back/0365-000-Walrein.gif
diff --git a/src/canonical/models/back/0366--000--Clamperl.gif b/src/canonical/models/back/0366-000-Clamperl.gif
similarity index 100%
rename from src/canonical/models/back/0366--000--Clamperl.gif
rename to src/canonical/models/back/0366-000-Clamperl.gif
diff --git a/src/canonical/models/back/0367--000--Huntail.gif b/src/canonical/models/back/0367-000-Huntail.gif
similarity index 100%
rename from src/canonical/models/back/0367--000--Huntail.gif
rename to src/canonical/models/back/0367-000-Huntail.gif
diff --git a/src/canonical/models/back/0368--000--Gorebyss.gif b/src/canonical/models/back/0368-000-Gorebyss.gif
similarity index 100%
rename from src/canonical/models/back/0368--000--Gorebyss.gif
rename to src/canonical/models/back/0368-000-Gorebyss.gif
diff --git a/src/canonical/models/back/0369--000--Relicanth.gif b/src/canonical/models/back/0369-000-Relicanth.gif
similarity index 100%
rename from src/canonical/models/back/0369--000--Relicanth.gif
rename to src/canonical/models/back/0369-000-Relicanth.gif
diff --git a/src/canonical/models/back/0370--000--Luvdisc.gif b/src/canonical/models/back/0370-000-Luvdisc.gif
similarity index 100%
rename from src/canonical/models/back/0370--000--Luvdisc.gif
rename to src/canonical/models/back/0370-000-Luvdisc.gif
diff --git a/src/canonical/models/back/0371--000--Bagon.gif b/src/canonical/models/back/0371-000-Bagon.gif
similarity index 100%
rename from src/canonical/models/back/0371--000--Bagon.gif
rename to src/canonical/models/back/0371-000-Bagon.gif
diff --git a/src/canonical/models/back/0372--000--Shelgon.gif b/src/canonical/models/back/0372-000-Shelgon.gif
similarity index 100%
rename from src/canonical/models/back/0372--000--Shelgon.gif
rename to src/canonical/models/back/0372-000-Shelgon.gif
diff --git a/src/canonical/models/back/0373--000--Salamence.gif b/src/canonical/models/back/0373-000-Salamence.gif
similarity index 100%
rename from src/canonical/models/back/0373--000--Salamence.gif
rename to src/canonical/models/back/0373-000-Salamence.gif
diff --git a/src/canonical/models/back/0373--420--Salamence--Mega.gif b/src/canonical/models/back/0373-420-Salamence-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0373--420--Salamence--Mega.gif
rename to src/canonical/models/back/0373-420-Salamence-Mega.gif
diff --git a/src/canonical/models/back/0374--000--Beldum.gif b/src/canonical/models/back/0374-000-Beldum.gif
similarity index 100%
rename from src/canonical/models/back/0374--000--Beldum.gif
rename to src/canonical/models/back/0374-000-Beldum.gif
diff --git a/src/canonical/models/back/0375--000--Metang.gif b/src/canonical/models/back/0375-000-Metang.gif
similarity index 100%
rename from src/canonical/models/back/0375--000--Metang.gif
rename to src/canonical/models/back/0375-000-Metang.gif
diff --git a/src/canonical/models/back/0376--000--Metagross.gif b/src/canonical/models/back/0376-000-Metagross.gif
similarity index 100%
rename from src/canonical/models/back/0376--000--Metagross.gif
rename to src/canonical/models/back/0376-000-Metagross.gif
diff --git a/src/canonical/models/back/0376--420--Metagross--Mega.gif b/src/canonical/models/back/0376-420-Metagross-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0376--420--Metagross--Mega.gif
rename to src/canonical/models/back/0376-420-Metagross-Mega.gif
diff --git a/src/canonical/models/back/0377--000--Regirock.gif b/src/canonical/models/back/0377-000-Regirock.gif
similarity index 100%
rename from src/canonical/models/back/0377--000--Regirock.gif
rename to src/canonical/models/back/0377-000-Regirock.gif
diff --git a/src/canonical/models/back/0378--000--Regice.gif b/src/canonical/models/back/0378-000-Regice.gif
similarity index 100%
rename from src/canonical/models/back/0378--000--Regice.gif
rename to src/canonical/models/back/0378-000-Regice.gif
diff --git a/src/canonical/models/back/0379--000--Registeel.gif b/src/canonical/models/back/0379-000-Registeel.gif
similarity index 100%
rename from src/canonical/models/back/0379--000--Registeel.gif
rename to src/canonical/models/back/0379-000-Registeel.gif
diff --git a/src/canonical/models/back/0380--000--Latias.gif b/src/canonical/models/back/0380-000-Latias.gif
similarity index 100%
rename from src/canonical/models/back/0380--000--Latias.gif
rename to src/canonical/models/back/0380-000-Latias.gif
diff --git a/src/canonical/models/back/0380--420--Latias--Mega.gif b/src/canonical/models/back/0380-420-Latias-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0380--420--Latias--Mega.gif
rename to src/canonical/models/back/0380-420-Latias-Mega.gif
diff --git a/src/canonical/models/back/0381--000--Latios.gif b/src/canonical/models/back/0381-000-Latios.gif
similarity index 100%
rename from src/canonical/models/back/0381--000--Latios.gif
rename to src/canonical/models/back/0381-000-Latios.gif
diff --git a/src/canonical/models/back/0381--420--Latios--Mega.gif b/src/canonical/models/back/0381-420-Latios-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0381--420--Latios--Mega.gif
rename to src/canonical/models/back/0381-420-Latios-Mega.gif
diff --git a/src/canonical/models/back/0382--000--Kyogre.gif b/src/canonical/models/back/0382-000-Kyogre.gif
similarity index 100%
rename from src/canonical/models/back/0382--000--Kyogre.gif
rename to src/canonical/models/back/0382-000-Kyogre.gif
diff --git a/src/canonical/models/back/0382--420--Kyogre--Primal.gif b/src/canonical/models/back/0382-420-Kyogre-Primal.gif
similarity index 100%
rename from src/canonical/models/back/0382--420--Kyogre--Primal.gif
rename to src/canonical/models/back/0382-420-Kyogre-Primal.gif
diff --git a/src/canonical/models/back/0383--000--Groudon.gif b/src/canonical/models/back/0383-000-Groudon.gif
similarity index 100%
rename from src/canonical/models/back/0383--000--Groudon.gif
rename to src/canonical/models/back/0383-000-Groudon.gif
diff --git a/src/canonical/models/back/0383--420--Groudon--Primal.gif b/src/canonical/models/back/0383-420-Groudon-Primal.gif
similarity index 100%
rename from src/canonical/models/back/0383--420--Groudon--Primal.gif
rename to src/canonical/models/back/0383-420-Groudon-Primal.gif
diff --git a/src/canonical/models/back/0384--000--Rayquaza.gif b/src/canonical/models/back/0384-000-Rayquaza.gif
similarity index 100%
rename from src/canonical/models/back/0384--000--Rayquaza.gif
rename to src/canonical/models/back/0384-000-Rayquaza.gif
diff --git a/src/canonical/models/back/0384--420--Rayquaza--Mega.gif b/src/canonical/models/back/0384-420-Rayquaza-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0384--420--Rayquaza--Mega.gif
rename to src/canonical/models/back/0384-420-Rayquaza-Mega.gif
diff --git a/src/canonical/models/back/0385--000--Jirachi.gif b/src/canonical/models/back/0385-000-Jirachi.gif
similarity index 100%
rename from src/canonical/models/back/0385--000--Jirachi.gif
rename to src/canonical/models/back/0385-000-Jirachi.gif
diff --git a/src/canonical/models/back/0386--000--Deoxys.gif b/src/canonical/models/back/0386-000-Deoxys.gif
similarity index 100%
rename from src/canonical/models/back/0386--000--Deoxys.gif
rename to src/canonical/models/back/0386-000-Deoxys.gif
diff --git a/src/canonical/models/back/0386--420--Deoxys--Attack.gif b/src/canonical/models/back/0386-420-Deoxys-Attack.gif
similarity index 100%
rename from src/canonical/models/back/0386--420--Deoxys--Attack.gif
rename to src/canonical/models/back/0386-420-Deoxys-Attack.gif
diff --git a/src/canonical/models/back/0386--420--Deoxys--Defense.gif b/src/canonical/models/back/0386-420-Deoxys-Defense.gif
similarity index 100%
rename from src/canonical/models/back/0386--420--Deoxys--Defense.gif
rename to src/canonical/models/back/0386-420-Deoxys-Defense.gif
diff --git a/src/canonical/models/back/0386--420--Deoxys--Speed.gif b/src/canonical/models/back/0386-420-Deoxys-Speed.gif
similarity index 100%
rename from src/canonical/models/back/0386--420--Deoxys--Speed.gif
rename to src/canonical/models/back/0386-420-Deoxys-Speed.gif
diff --git a/src/canonical/models/back/0387--000--Turtwig.gif b/src/canonical/models/back/0387-000-Turtwig.gif
similarity index 100%
rename from src/canonical/models/back/0387--000--Turtwig.gif
rename to src/canonical/models/back/0387-000-Turtwig.gif
diff --git a/src/canonical/models/back/0388--000--Grotle.gif b/src/canonical/models/back/0388-000-Grotle.gif
similarity index 100%
rename from src/canonical/models/back/0388--000--Grotle.gif
rename to src/canonical/models/back/0388-000-Grotle.gif
diff --git a/src/canonical/models/back/0389--000--Torterra.gif b/src/canonical/models/back/0389-000-Torterra.gif
similarity index 100%
rename from src/canonical/models/back/0389--000--Torterra.gif
rename to src/canonical/models/back/0389-000-Torterra.gif
diff --git a/src/canonical/models/back/0390--000--Chimchar.gif b/src/canonical/models/back/0390-000-Chimchar.gif
similarity index 100%
rename from src/canonical/models/back/0390--000--Chimchar.gif
rename to src/canonical/models/back/0390-000-Chimchar.gif
diff --git a/src/canonical/models/back/0391--000--Monferno.gif b/src/canonical/models/back/0391-000-Monferno.gif
similarity index 100%
rename from src/canonical/models/back/0391--000--Monferno.gif
rename to src/canonical/models/back/0391-000-Monferno.gif
diff --git a/src/canonical/models/back/0392--000--Infernape.gif b/src/canonical/models/back/0392-000-Infernape.gif
similarity index 100%
rename from src/canonical/models/back/0392--000--Infernape.gif
rename to src/canonical/models/back/0392-000-Infernape.gif
diff --git a/src/canonical/models/back/0393--000--Piplup.gif b/src/canonical/models/back/0393-000-Piplup.gif
similarity index 100%
rename from src/canonical/models/back/0393--000--Piplup.gif
rename to src/canonical/models/back/0393-000-Piplup.gif
diff --git a/src/canonical/models/back/0394--000--Prinplup.gif b/src/canonical/models/back/0394-000-Prinplup.gif
similarity index 100%
rename from src/canonical/models/back/0394--000--Prinplup.gif
rename to src/canonical/models/back/0394-000-Prinplup.gif
diff --git a/src/canonical/models/back/0395--000--Empoleon.gif b/src/canonical/models/back/0395-000-Empoleon.gif
similarity index 100%
rename from src/canonical/models/back/0395--000--Empoleon.gif
rename to src/canonical/models/back/0395-000-Empoleon.gif
diff --git a/src/canonical/models/back/0396--000--Starly.gif b/src/canonical/models/back/0396-000-Starly.gif
similarity index 100%
rename from src/canonical/models/back/0396--000--Starly.gif
rename to src/canonical/models/back/0396-000-Starly.gif
diff --git a/src/canonical/models/back/0397--000--Staravia.gif b/src/canonical/models/back/0397-000-Staravia.gif
similarity index 100%
rename from src/canonical/models/back/0397--000--Staravia.gif
rename to src/canonical/models/back/0397-000-Staravia.gif
diff --git a/src/canonical/models/back/0398--000--Staraptor.gif b/src/canonical/models/back/0398-000-Staraptor.gif
similarity index 100%
rename from src/canonical/models/back/0398--000--Staraptor.gif
rename to src/canonical/models/back/0398-000-Staraptor.gif
diff --git a/src/canonical/models/back/0399--000--Bidoof.gif b/src/canonical/models/back/0399-000-Bidoof.gif
similarity index 100%
rename from src/canonical/models/back/0399--000--Bidoof.gif
rename to src/canonical/models/back/0399-000-Bidoof.gif
diff --git a/src/canonical/models/back/0400--000--Bibarel.gif b/src/canonical/models/back/0400-000-Bibarel.gif
similarity index 100%
rename from src/canonical/models/back/0400--000--Bibarel.gif
rename to src/canonical/models/back/0400-000-Bibarel.gif
diff --git a/src/canonical/models/back/0401--000--Kricketot.gif b/src/canonical/models/back/0401-000-Kricketot.gif
similarity index 100%
rename from src/canonical/models/back/0401--000--Kricketot.gif
rename to src/canonical/models/back/0401-000-Kricketot.gif
diff --git a/src/canonical/models/back/0402--000--Kricketune.gif b/src/canonical/models/back/0402-000-Kricketune.gif
similarity index 100%
rename from src/canonical/models/back/0402--000--Kricketune.gif
rename to src/canonical/models/back/0402-000-Kricketune.gif
diff --git a/src/canonical/models/back/0403--000--Shinx.gif b/src/canonical/models/back/0403-000-Shinx.gif
similarity index 100%
rename from src/canonical/models/back/0403--000--Shinx.gif
rename to src/canonical/models/back/0403-000-Shinx.gif
diff --git a/src/canonical/models/back/0404--000--Luxio.gif b/src/canonical/models/back/0404-000-Luxio.gif
similarity index 100%
rename from src/canonical/models/back/0404--000--Luxio.gif
rename to src/canonical/models/back/0404-000-Luxio.gif
diff --git a/src/canonical/models/back/0405--000--Luxray.gif b/src/canonical/models/back/0405-000-Luxray.gif
similarity index 100%
rename from src/canonical/models/back/0405--000--Luxray.gif
rename to src/canonical/models/back/0405-000-Luxray.gif
diff --git a/src/canonical/models/back/0406--000--Budew.gif b/src/canonical/models/back/0406-000-Budew.gif
similarity index 100%
rename from src/canonical/models/back/0406--000--Budew.gif
rename to src/canonical/models/back/0406-000-Budew.gif
diff --git a/src/canonical/models/back/0407--000--Roserade.gif b/src/canonical/models/back/0407-000-Roserade.gif
similarity index 100%
rename from src/canonical/models/back/0407--000--Roserade.gif
rename to src/canonical/models/back/0407-000-Roserade.gif
diff --git a/src/canonical/models/back/0408--000--Cranidos.gif b/src/canonical/models/back/0408-000-Cranidos.gif
similarity index 100%
rename from src/canonical/models/back/0408--000--Cranidos.gif
rename to src/canonical/models/back/0408-000-Cranidos.gif
diff --git a/src/canonical/models/back/0409--000--Rampardos.gif b/src/canonical/models/back/0409-000-Rampardos.gif
similarity index 100%
rename from src/canonical/models/back/0409--000--Rampardos.gif
rename to src/canonical/models/back/0409-000-Rampardos.gif
diff --git a/src/canonical/models/back/0410--000--Shieldon.gif b/src/canonical/models/back/0410-000-Shieldon.gif
similarity index 100%
rename from src/canonical/models/back/0410--000--Shieldon.gif
rename to src/canonical/models/back/0410-000-Shieldon.gif
diff --git a/src/canonical/models/back/0411--000--Bastiodon.gif b/src/canonical/models/back/0411-000-Bastiodon.gif
similarity index 100%
rename from src/canonical/models/back/0411--000--Bastiodon.gif
rename to src/canonical/models/back/0411-000-Bastiodon.gif
diff --git a/src/canonical/models/back/0412--000--Burmy.gif b/src/canonical/models/back/0412-000-Burmy.gif
similarity index 100%
rename from src/canonical/models/back/0412--000--Burmy.gif
rename to src/canonical/models/back/0412-000-Burmy.gif
diff --git a/src/canonical/models/back/0413--000--Wormadam.gif b/src/canonical/models/back/0413-000-Wormadam.gif
similarity index 100%
rename from src/canonical/models/back/0413--000--Wormadam.gif
rename to src/canonical/models/back/0413-000-Wormadam.gif
diff --git a/src/canonical/models/back/0413--420--Wormadam--Sandy.gif b/src/canonical/models/back/0413-420-Wormadam-Sandy.gif
similarity index 100%
rename from src/canonical/models/back/0413--420--Wormadam--Sandy.gif
rename to src/canonical/models/back/0413-420-Wormadam-Sandy.gif
diff --git a/src/canonical/models/back/0413--420--Wormadam--Trash.gif b/src/canonical/models/back/0413-420-Wormadam-Trash.gif
similarity index 100%
rename from src/canonical/models/back/0413--420--Wormadam--Trash.gif
rename to src/canonical/models/back/0413-420-Wormadam-Trash.gif
diff --git a/src/canonical/models/back/0414--000--Mothim.gif b/src/canonical/models/back/0414-000-Mothim.gif
similarity index 100%
rename from src/canonical/models/back/0414--000--Mothim.gif
rename to src/canonical/models/back/0414-000-Mothim.gif
diff --git a/src/canonical/models/back/0415--000--Combee.gif b/src/canonical/models/back/0415-000-Combee.gif
similarity index 100%
rename from src/canonical/models/back/0415--000--Combee.gif
rename to src/canonical/models/back/0415-000-Combee.gif
diff --git a/src/canonical/models/back/0416--000--Vespiquen.gif b/src/canonical/models/back/0416-000-Vespiquen.gif
similarity index 100%
rename from src/canonical/models/back/0416--000--Vespiquen.gif
rename to src/canonical/models/back/0416-000-Vespiquen.gif
diff --git a/src/canonical/models/back/0417--000--Pachirisu.gif b/src/canonical/models/back/0417-000-Pachirisu.gif
similarity index 100%
rename from src/canonical/models/back/0417--000--Pachirisu.gif
rename to src/canonical/models/back/0417-000-Pachirisu.gif
diff --git a/src/canonical/models/back/0418--000--Buizel.gif b/src/canonical/models/back/0418-000-Buizel.gif
similarity index 100%
rename from src/canonical/models/back/0418--000--Buizel.gif
rename to src/canonical/models/back/0418-000-Buizel.gif
diff --git a/src/canonical/models/back/0419--000--Floatzel.gif b/src/canonical/models/back/0419-000-Floatzel.gif
similarity index 100%
rename from src/canonical/models/back/0419--000--Floatzel.gif
rename to src/canonical/models/back/0419-000-Floatzel.gif
diff --git a/src/canonical/models/back/0420--000--Cherubi.gif b/src/canonical/models/back/0420-000-Cherubi.gif
similarity index 100%
rename from src/canonical/models/back/0420--000--Cherubi.gif
rename to src/canonical/models/back/0420-000-Cherubi.gif
diff --git a/src/canonical/models/back/0421--000--Cherrim.gif b/src/canonical/models/back/0421-000-Cherrim.gif
similarity index 100%
rename from src/canonical/models/back/0421--000--Cherrim.gif
rename to src/canonical/models/back/0421-000-Cherrim.gif
diff --git a/src/canonical/models/back/0421--420--Cherrim--Sunshine.gif b/src/canonical/models/back/0421-420-Cherrim-Sunshine.gif
similarity index 100%
rename from src/canonical/models/back/0421--420--Cherrim--Sunshine.gif
rename to src/canonical/models/back/0421-420-Cherrim-Sunshine.gif
diff --git a/src/canonical/models/back/0422--000--Shellos.gif b/src/canonical/models/back/0422-000-Shellos.gif
similarity index 100%
rename from src/canonical/models/back/0422--000--Shellos.gif
rename to src/canonical/models/back/0422-000-Shellos.gif
diff --git a/src/canonical/models/back/0423--000--Gastrodon.gif b/src/canonical/models/back/0423-000-Gastrodon.gif
similarity index 100%
rename from src/canonical/models/back/0423--000--Gastrodon.gif
rename to src/canonical/models/back/0423-000-Gastrodon.gif
diff --git a/src/canonical/models/back/0424--000--Ambipom.gif b/src/canonical/models/back/0424-000-Ambipom.gif
similarity index 100%
rename from src/canonical/models/back/0424--000--Ambipom.gif
rename to src/canonical/models/back/0424-000-Ambipom.gif
diff --git a/src/canonical/models/back/0425--000--Drifloon.gif b/src/canonical/models/back/0425-000-Drifloon.gif
similarity index 100%
rename from src/canonical/models/back/0425--000--Drifloon.gif
rename to src/canonical/models/back/0425-000-Drifloon.gif
diff --git a/src/canonical/models/back/0426--000--Drifblim.gif b/src/canonical/models/back/0426-000-Drifblim.gif
similarity index 100%
rename from src/canonical/models/back/0426--000--Drifblim.gif
rename to src/canonical/models/back/0426-000-Drifblim.gif
diff --git a/src/canonical/models/back/0427--000--Buneary.gif b/src/canonical/models/back/0427-000-Buneary.gif
similarity index 100%
rename from src/canonical/models/back/0427--000--Buneary.gif
rename to src/canonical/models/back/0427-000-Buneary.gif
diff --git a/src/canonical/models/back/0428--000--Lopunny.gif b/src/canonical/models/back/0428-000-Lopunny.gif
similarity index 100%
rename from src/canonical/models/back/0428--000--Lopunny.gif
rename to src/canonical/models/back/0428-000-Lopunny.gif
diff --git a/src/canonical/models/back/0428--420--Lopunny--Mega.gif b/src/canonical/models/back/0428-420-Lopunny-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0428--420--Lopunny--Mega.gif
rename to src/canonical/models/back/0428-420-Lopunny-Mega.gif
diff --git a/src/canonical/models/back/0429--000--Mismagius.gif b/src/canonical/models/back/0429-000-Mismagius.gif
similarity index 100%
rename from src/canonical/models/back/0429--000--Mismagius.gif
rename to src/canonical/models/back/0429-000-Mismagius.gif
diff --git a/src/canonical/models/back/0430--000--Honchkrow.gif b/src/canonical/models/back/0430-000-Honchkrow.gif
similarity index 100%
rename from src/canonical/models/back/0430--000--Honchkrow.gif
rename to src/canonical/models/back/0430-000-Honchkrow.gif
diff --git a/src/canonical/models/back/0431--000--Glameow.gif b/src/canonical/models/back/0431-000-Glameow.gif
similarity index 100%
rename from src/canonical/models/back/0431--000--Glameow.gif
rename to src/canonical/models/back/0431-000-Glameow.gif
diff --git a/src/canonical/models/back/0432--000--Purugly.gif b/src/canonical/models/back/0432-000-Purugly.gif
similarity index 100%
rename from src/canonical/models/back/0432--000--Purugly.gif
rename to src/canonical/models/back/0432-000-Purugly.gif
diff --git a/src/canonical/models/back/0433--000--Chingling.gif b/src/canonical/models/back/0433-000-Chingling.gif
similarity index 100%
rename from src/canonical/models/back/0433--000--Chingling.gif
rename to src/canonical/models/back/0433-000-Chingling.gif
diff --git a/src/canonical/models/back/0434--000--Stunky.gif b/src/canonical/models/back/0434-000-Stunky.gif
similarity index 100%
rename from src/canonical/models/back/0434--000--Stunky.gif
rename to src/canonical/models/back/0434-000-Stunky.gif
diff --git a/src/canonical/models/back/0435--000--Skuntank.gif b/src/canonical/models/back/0435-000-Skuntank.gif
similarity index 100%
rename from src/canonical/models/back/0435--000--Skuntank.gif
rename to src/canonical/models/back/0435-000-Skuntank.gif
diff --git a/src/canonical/models/back/0436--000--Bronzor.gif b/src/canonical/models/back/0436-000-Bronzor.gif
similarity index 100%
rename from src/canonical/models/back/0436--000--Bronzor.gif
rename to src/canonical/models/back/0436-000-Bronzor.gif
diff --git a/src/canonical/models/back/0437--000--Bronzong.gif b/src/canonical/models/back/0437-000-Bronzong.gif
similarity index 100%
rename from src/canonical/models/back/0437--000--Bronzong.gif
rename to src/canonical/models/back/0437-000-Bronzong.gif
diff --git a/src/canonical/models/back/0438--000--Bonsly.gif b/src/canonical/models/back/0438-000-Bonsly.gif
similarity index 100%
rename from src/canonical/models/back/0438--000--Bonsly.gif
rename to src/canonical/models/back/0438-000-Bonsly.gif
diff --git a/src/canonical/models/back/0439--000--Mime_Jr..gif b/src/canonical/models/back/0439-000-Mime_Jr..gif
similarity index 100%
rename from src/canonical/models/back/0439--000--Mime_Jr..gif
rename to src/canonical/models/back/0439-000-Mime_Jr..gif
diff --git a/src/canonical/models/back/0440--000--Happiny.gif b/src/canonical/models/back/0440-000-Happiny.gif
similarity index 100%
rename from src/canonical/models/back/0440--000--Happiny.gif
rename to src/canonical/models/back/0440-000-Happiny.gif
diff --git a/src/canonical/models/back/0441--000--Chatot.gif b/src/canonical/models/back/0441-000-Chatot.gif
similarity index 100%
rename from src/canonical/models/back/0441--000--Chatot.gif
rename to src/canonical/models/back/0441-000-Chatot.gif
diff --git a/src/canonical/models/back/0442--000--Spiritomb.gif b/src/canonical/models/back/0442-000-Spiritomb.gif
similarity index 100%
rename from src/canonical/models/back/0442--000--Spiritomb.gif
rename to src/canonical/models/back/0442-000-Spiritomb.gif
diff --git a/src/canonical/models/back/0443--000--Gible.gif b/src/canonical/models/back/0443-000-Gible.gif
similarity index 100%
rename from src/canonical/models/back/0443--000--Gible.gif
rename to src/canonical/models/back/0443-000-Gible.gif
diff --git a/src/canonical/models/back/0444--000--Gabite.gif b/src/canonical/models/back/0444-000-Gabite.gif
similarity index 100%
rename from src/canonical/models/back/0444--000--Gabite.gif
rename to src/canonical/models/back/0444-000-Gabite.gif
diff --git a/src/canonical/models/back/0445--000--Garchomp.gif b/src/canonical/models/back/0445-000-Garchomp.gif
similarity index 100%
rename from src/canonical/models/back/0445--000--Garchomp.gif
rename to src/canonical/models/back/0445-000-Garchomp.gif
diff --git a/src/canonical/models/back/0445--420--Garchomp--Mega.gif b/src/canonical/models/back/0445-420-Garchomp-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0445--420--Garchomp--Mega.gif
rename to src/canonical/models/back/0445-420-Garchomp-Mega.gif
diff --git a/src/canonical/models/back/0446--000--Munchlax.gif b/src/canonical/models/back/0446-000-Munchlax.gif
similarity index 100%
rename from src/canonical/models/back/0446--000--Munchlax.gif
rename to src/canonical/models/back/0446-000-Munchlax.gif
diff --git a/src/canonical/models/back/0447--000--Riolu.gif b/src/canonical/models/back/0447-000-Riolu.gif
similarity index 100%
rename from src/canonical/models/back/0447--000--Riolu.gif
rename to src/canonical/models/back/0447-000-Riolu.gif
diff --git a/src/canonical/models/back/0448--000--Lucario.gif b/src/canonical/models/back/0448-000-Lucario.gif
similarity index 100%
rename from src/canonical/models/back/0448--000--Lucario.gif
rename to src/canonical/models/back/0448-000-Lucario.gif
diff --git a/src/canonical/models/back/0448--420--Lucario--Mega.gif b/src/canonical/models/back/0448-420-Lucario-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0448--420--Lucario--Mega.gif
rename to src/canonical/models/back/0448-420-Lucario-Mega.gif
diff --git a/src/canonical/models/back/0449--000--Hippopotas.gif b/src/canonical/models/back/0449-000-Hippopotas.gif
similarity index 100%
rename from src/canonical/models/back/0449--000--Hippopotas.gif
rename to src/canonical/models/back/0449-000-Hippopotas.gif
diff --git a/src/canonical/models/back/0450--000--Hippowdon.gif b/src/canonical/models/back/0450-000-Hippowdon.gif
similarity index 100%
rename from src/canonical/models/back/0450--000--Hippowdon.gif
rename to src/canonical/models/back/0450-000-Hippowdon.gif
diff --git a/src/canonical/models/back/0451--000--Skorupi.gif b/src/canonical/models/back/0451-000-Skorupi.gif
similarity index 100%
rename from src/canonical/models/back/0451--000--Skorupi.gif
rename to src/canonical/models/back/0451-000-Skorupi.gif
diff --git a/src/canonical/models/back/0452--000--Drapion.gif b/src/canonical/models/back/0452-000-Drapion.gif
similarity index 100%
rename from src/canonical/models/back/0452--000--Drapion.gif
rename to src/canonical/models/back/0452-000-Drapion.gif
diff --git a/src/canonical/models/back/0453--000--Croagunk.gif b/src/canonical/models/back/0453-000-Croagunk.gif
similarity index 100%
rename from src/canonical/models/back/0453--000--Croagunk.gif
rename to src/canonical/models/back/0453-000-Croagunk.gif
diff --git a/src/canonical/models/back/0454--000--Toxicroak.gif b/src/canonical/models/back/0454-000-Toxicroak.gif
similarity index 100%
rename from src/canonical/models/back/0454--000--Toxicroak.gif
rename to src/canonical/models/back/0454-000-Toxicroak.gif
diff --git a/src/canonical/models/back/0455--000--Carnivine.gif b/src/canonical/models/back/0455-000-Carnivine.gif
similarity index 100%
rename from src/canonical/models/back/0455--000--Carnivine.gif
rename to src/canonical/models/back/0455-000-Carnivine.gif
diff --git a/src/canonical/models/back/0456--000--Finneon.gif b/src/canonical/models/back/0456-000-Finneon.gif
similarity index 100%
rename from src/canonical/models/back/0456--000--Finneon.gif
rename to src/canonical/models/back/0456-000-Finneon.gif
diff --git a/src/canonical/models/back/0457--000--Lumineon.gif b/src/canonical/models/back/0457-000-Lumineon.gif
similarity index 100%
rename from src/canonical/models/back/0457--000--Lumineon.gif
rename to src/canonical/models/back/0457-000-Lumineon.gif
diff --git a/src/canonical/models/back/0458--000--Mantyke.gif b/src/canonical/models/back/0458-000-Mantyke.gif
similarity index 100%
rename from src/canonical/models/back/0458--000--Mantyke.gif
rename to src/canonical/models/back/0458-000-Mantyke.gif
diff --git a/src/canonical/models/back/0459--000--Snover.gif b/src/canonical/models/back/0459-000-Snover.gif
similarity index 100%
rename from src/canonical/models/back/0459--000--Snover.gif
rename to src/canonical/models/back/0459-000-Snover.gif
diff --git a/src/canonical/models/back/0460--000--Abomasnow.gif b/src/canonical/models/back/0460-000-Abomasnow.gif
similarity index 100%
rename from src/canonical/models/back/0460--000--Abomasnow.gif
rename to src/canonical/models/back/0460-000-Abomasnow.gif
diff --git a/src/canonical/models/back/0460--420--Abomasnow--Mega.gif b/src/canonical/models/back/0460-420-Abomasnow-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0460--420--Abomasnow--Mega.gif
rename to src/canonical/models/back/0460-420-Abomasnow-Mega.gif
diff --git a/src/canonical/models/back/0461--000--Weavile.gif b/src/canonical/models/back/0461-000-Weavile.gif
similarity index 100%
rename from src/canonical/models/back/0461--000--Weavile.gif
rename to src/canonical/models/back/0461-000-Weavile.gif
diff --git a/src/canonical/models/back/0462--000--Magnezone.gif b/src/canonical/models/back/0462-000-Magnezone.gif
similarity index 100%
rename from src/canonical/models/back/0462--000--Magnezone.gif
rename to src/canonical/models/back/0462-000-Magnezone.gif
diff --git a/src/canonical/models/back/0463--000--Lickilicky.gif b/src/canonical/models/back/0463-000-Lickilicky.gif
similarity index 100%
rename from src/canonical/models/back/0463--000--Lickilicky.gif
rename to src/canonical/models/back/0463-000-Lickilicky.gif
diff --git a/src/canonical/models/back/0464--000--Rhyperior.gif b/src/canonical/models/back/0464-000-Rhyperior.gif
similarity index 100%
rename from src/canonical/models/back/0464--000--Rhyperior.gif
rename to src/canonical/models/back/0464-000-Rhyperior.gif
diff --git a/src/canonical/models/back/0465--000--Tangrowth.gif b/src/canonical/models/back/0465-000-Tangrowth.gif
similarity index 100%
rename from src/canonical/models/back/0465--000--Tangrowth.gif
rename to src/canonical/models/back/0465-000-Tangrowth.gif
diff --git a/src/canonical/models/back/0466--000--Electivire.gif b/src/canonical/models/back/0466-000-Electivire.gif
similarity index 100%
rename from src/canonical/models/back/0466--000--Electivire.gif
rename to src/canonical/models/back/0466-000-Electivire.gif
diff --git a/src/canonical/models/back/0467--000--Magmortar.gif b/src/canonical/models/back/0467-000-Magmortar.gif
similarity index 100%
rename from src/canonical/models/back/0467--000--Magmortar.gif
rename to src/canonical/models/back/0467-000-Magmortar.gif
diff --git a/src/canonical/models/back/0468--000--Togekiss.gif b/src/canonical/models/back/0468-000-Togekiss.gif
similarity index 100%
rename from src/canonical/models/back/0468--000--Togekiss.gif
rename to src/canonical/models/back/0468-000-Togekiss.gif
diff --git a/src/canonical/models/back/0469--000--Yanmega.gif b/src/canonical/models/back/0469-000-Yanmega.gif
similarity index 100%
rename from src/canonical/models/back/0469--000--Yanmega.gif
rename to src/canonical/models/back/0469-000-Yanmega.gif
diff --git a/src/canonical/models/back/0470--000--Leafeon.gif b/src/canonical/models/back/0470-000-Leafeon.gif
similarity index 100%
rename from src/canonical/models/back/0470--000--Leafeon.gif
rename to src/canonical/models/back/0470-000-Leafeon.gif
diff --git a/src/canonical/models/back/0471--000--Glaceon.gif b/src/canonical/models/back/0471-000-Glaceon.gif
similarity index 100%
rename from src/canonical/models/back/0471--000--Glaceon.gif
rename to src/canonical/models/back/0471-000-Glaceon.gif
diff --git a/src/canonical/models/back/0472--000--Gliscor.gif b/src/canonical/models/back/0472-000-Gliscor.gif
similarity index 100%
rename from src/canonical/models/back/0472--000--Gliscor.gif
rename to src/canonical/models/back/0472-000-Gliscor.gif
diff --git a/src/canonical/models/back/0473--000--Mamoswine.gif b/src/canonical/models/back/0473-000-Mamoswine.gif
similarity index 100%
rename from src/canonical/models/back/0473--000--Mamoswine.gif
rename to src/canonical/models/back/0473-000-Mamoswine.gif
diff --git a/src/canonical/models/back/0474--000--Porygon-Z.gif b/src/canonical/models/back/0474-000-Porygon~Z.gif
similarity index 100%
rename from src/canonical/models/back/0474--000--Porygon-Z.gif
rename to src/canonical/models/back/0474-000-Porygon~Z.gif
diff --git a/src/canonical/models/back/0475--000--Gallade.gif b/src/canonical/models/back/0475-000-Gallade.gif
similarity index 100%
rename from src/canonical/models/back/0475--000--Gallade.gif
rename to src/canonical/models/back/0475-000-Gallade.gif
diff --git a/src/canonical/models/back/0475--420--Gallade--Mega.gif b/src/canonical/models/back/0475-420-Gallade-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0475--420--Gallade--Mega.gif
rename to src/canonical/models/back/0475-420-Gallade-Mega.gif
diff --git a/src/canonical/models/back/0476--000--Probopass.gif b/src/canonical/models/back/0476-000-Probopass.gif
similarity index 100%
rename from src/canonical/models/back/0476--000--Probopass.gif
rename to src/canonical/models/back/0476-000-Probopass.gif
diff --git a/src/canonical/models/back/0477--000--Dusknoir.gif b/src/canonical/models/back/0477-000-Dusknoir.gif
similarity index 100%
rename from src/canonical/models/back/0477--000--Dusknoir.gif
rename to src/canonical/models/back/0477-000-Dusknoir.gif
diff --git a/src/canonical/models/back/0478--000--Froslass.gif b/src/canonical/models/back/0478-000-Froslass.gif
similarity index 100%
rename from src/canonical/models/back/0478--000--Froslass.gif
rename to src/canonical/models/back/0478-000-Froslass.gif
diff --git a/src/canonical/models/back/0479--000--Rotom.gif b/src/canonical/models/back/0479-000-Rotom.gif
similarity index 100%
rename from src/canonical/models/back/0479--000--Rotom.gif
rename to src/canonical/models/back/0479-000-Rotom.gif
diff --git a/src/canonical/models/back/0479--420--Rotom--Fan.gif b/src/canonical/models/back/0479-420-Rotom-Fan.gif
similarity index 100%
rename from src/canonical/models/back/0479--420--Rotom--Fan.gif
rename to src/canonical/models/back/0479-420-Rotom-Fan.gif
diff --git a/src/canonical/models/back/0479--420--Rotom--Frost.gif b/src/canonical/models/back/0479-420-Rotom-Frost.gif
similarity index 100%
rename from src/canonical/models/back/0479--420--Rotom--Frost.gif
rename to src/canonical/models/back/0479-420-Rotom-Frost.gif
diff --git a/src/canonical/models/back/0479--420--Rotom--Heat.gif b/src/canonical/models/back/0479-420-Rotom-Heat.gif
similarity index 100%
rename from src/canonical/models/back/0479--420--Rotom--Heat.gif
rename to src/canonical/models/back/0479-420-Rotom-Heat.gif
diff --git a/src/canonical/models/back/0479--420--Rotom--Mow.gif b/src/canonical/models/back/0479-420-Rotom-Mow.gif
similarity index 100%
rename from src/canonical/models/back/0479--420--Rotom--Mow.gif
rename to src/canonical/models/back/0479-420-Rotom-Mow.gif
diff --git a/src/canonical/models/back/0479--420--Rotom--Wash.gif b/src/canonical/models/back/0479-420-Rotom-Wash.gif
similarity index 100%
rename from src/canonical/models/back/0479--420--Rotom--Wash.gif
rename to src/canonical/models/back/0479-420-Rotom-Wash.gif
diff --git a/src/canonical/models/back/0480--000--Uxie.gif b/src/canonical/models/back/0480-000-Uxie.gif
similarity index 100%
rename from src/canonical/models/back/0480--000--Uxie.gif
rename to src/canonical/models/back/0480-000-Uxie.gif
diff --git a/src/canonical/models/back/0481--000--Mesprit.gif b/src/canonical/models/back/0481-000-Mesprit.gif
similarity index 100%
rename from src/canonical/models/back/0481--000--Mesprit.gif
rename to src/canonical/models/back/0481-000-Mesprit.gif
diff --git a/src/canonical/models/back/0482--000--Azelf.gif b/src/canonical/models/back/0482-000-Azelf.gif
similarity index 100%
rename from src/canonical/models/back/0482--000--Azelf.gif
rename to src/canonical/models/back/0482-000-Azelf.gif
diff --git a/src/canonical/models/back/0483--000--Dialga.gif b/src/canonical/models/back/0483-000-Dialga.gif
similarity index 100%
rename from src/canonical/models/back/0483--000--Dialga.gif
rename to src/canonical/models/back/0483-000-Dialga.gif
diff --git a/src/canonical/models/back/0484--000--Palkia.gif b/src/canonical/models/back/0484-000-Palkia.gif
similarity index 100%
rename from src/canonical/models/back/0484--000--Palkia.gif
rename to src/canonical/models/back/0484-000-Palkia.gif
diff --git a/src/canonical/models/back/0485--000--Heatran.gif b/src/canonical/models/back/0485-000-Heatran.gif
similarity index 100%
rename from src/canonical/models/back/0485--000--Heatran.gif
rename to src/canonical/models/back/0485-000-Heatran.gif
diff --git a/src/canonical/models/back/0486--000--Regigigas.gif b/src/canonical/models/back/0486-000-Regigigas.gif
similarity index 100%
rename from src/canonical/models/back/0486--000--Regigigas.gif
rename to src/canonical/models/back/0486-000-Regigigas.gif
diff --git a/src/canonical/models/back/0487--000--Giratina.gif b/src/canonical/models/back/0487-000-Giratina.gif
similarity index 100%
rename from src/canonical/models/back/0487--000--Giratina.gif
rename to src/canonical/models/back/0487-000-Giratina.gif
diff --git a/src/canonical/models/back/0487--420--Giratina--Origin.gif b/src/canonical/models/back/0487-420-Giratina-Origin.gif
similarity index 100%
rename from src/canonical/models/back/0487--420--Giratina--Origin.gif
rename to src/canonical/models/back/0487-420-Giratina-Origin.gif
diff --git a/src/canonical/models/back/0488--000--Cresselia.gif b/src/canonical/models/back/0488-000-Cresselia.gif
similarity index 100%
rename from src/canonical/models/back/0488--000--Cresselia.gif
rename to src/canonical/models/back/0488-000-Cresselia.gif
diff --git a/src/canonical/models/back/0489--000--Phione.gif b/src/canonical/models/back/0489-000-Phione.gif
similarity index 100%
rename from src/canonical/models/back/0489--000--Phione.gif
rename to src/canonical/models/back/0489-000-Phione.gif
diff --git a/src/canonical/models/back/0490--000--Manaphy.gif b/src/canonical/models/back/0490-000-Manaphy.gif
similarity index 100%
rename from src/canonical/models/back/0490--000--Manaphy.gif
rename to src/canonical/models/back/0490-000-Manaphy.gif
diff --git a/src/canonical/models/back/0491--000--Darkrai.gif b/src/canonical/models/back/0491-000-Darkrai.gif
similarity index 100%
rename from src/canonical/models/back/0491--000--Darkrai.gif
rename to src/canonical/models/back/0491-000-Darkrai.gif
diff --git a/src/canonical/models/back/0492--000--Shaymin.gif b/src/canonical/models/back/0492-000-Shaymin.gif
similarity index 100%
rename from src/canonical/models/back/0492--000--Shaymin.gif
rename to src/canonical/models/back/0492-000-Shaymin.gif
diff --git a/src/canonical/models/back/0492--420--Shaymin--Sky.gif b/src/canonical/models/back/0492-420-Shaymin-Sky.gif
similarity index 100%
rename from src/canonical/models/back/0492--420--Shaymin--Sky.gif
rename to src/canonical/models/back/0492-420-Shaymin-Sky.gif
diff --git a/src/canonical/models/back/0493--000--Arceus.gif b/src/canonical/models/back/0493-000-Arceus.gif
similarity index 100%
rename from src/canonical/models/back/0493--000--Arceus.gif
rename to src/canonical/models/back/0493-000-Arceus.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Bug.gif b/src/canonical/models/back/0493-420-Arceus-Bug.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Bug.gif
rename to src/canonical/models/back/0493-420-Arceus-Bug.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Dark.gif b/src/canonical/models/back/0493-420-Arceus-Dark.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Dark.gif
rename to src/canonical/models/back/0493-420-Arceus-Dark.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Dragon.gif b/src/canonical/models/back/0493-420-Arceus-Dragon.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Dragon.gif
rename to src/canonical/models/back/0493-420-Arceus-Dragon.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Electric.gif b/src/canonical/models/back/0493-420-Arceus-Electric.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Electric.gif
rename to src/canonical/models/back/0493-420-Arceus-Electric.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Fairy.gif b/src/canonical/models/back/0493-420-Arceus-Fairy.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Fairy.gif
rename to src/canonical/models/back/0493-420-Arceus-Fairy.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Fighting.gif b/src/canonical/models/back/0493-420-Arceus-Fighting.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Fighting.gif
rename to src/canonical/models/back/0493-420-Arceus-Fighting.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Fire.gif b/src/canonical/models/back/0493-420-Arceus-Fire.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Fire.gif
rename to src/canonical/models/back/0493-420-Arceus-Fire.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Flying.gif b/src/canonical/models/back/0493-420-Arceus-Flying.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Flying.gif
rename to src/canonical/models/back/0493-420-Arceus-Flying.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Ghost.gif b/src/canonical/models/back/0493-420-Arceus-Ghost.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Ghost.gif
rename to src/canonical/models/back/0493-420-Arceus-Ghost.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Grass.gif b/src/canonical/models/back/0493-420-Arceus-Grass.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Grass.gif
rename to src/canonical/models/back/0493-420-Arceus-Grass.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Ground.gif b/src/canonical/models/back/0493-420-Arceus-Ground.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Ground.gif
rename to src/canonical/models/back/0493-420-Arceus-Ground.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Ice.gif b/src/canonical/models/back/0493-420-Arceus-Ice.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Ice.gif
rename to src/canonical/models/back/0493-420-Arceus-Ice.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Poison.gif b/src/canonical/models/back/0493-420-Arceus-Poison.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Poison.gif
rename to src/canonical/models/back/0493-420-Arceus-Poison.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Psychic.gif b/src/canonical/models/back/0493-420-Arceus-Psychic.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Psychic.gif
rename to src/canonical/models/back/0493-420-Arceus-Psychic.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Rock.gif b/src/canonical/models/back/0493-420-Arceus-Rock.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Rock.gif
rename to src/canonical/models/back/0493-420-Arceus-Rock.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Steel.gif b/src/canonical/models/back/0493-420-Arceus-Steel.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Steel.gif
rename to src/canonical/models/back/0493-420-Arceus-Steel.gif
diff --git a/src/canonical/models/back/0493--420--Arceus--Water.gif b/src/canonical/models/back/0493-420-Arceus-Water.gif
similarity index 100%
rename from src/canonical/models/back/0493--420--Arceus--Water.gif
rename to src/canonical/models/back/0493-420-Arceus-Water.gif
diff --git a/src/canonical/models/back/0494--000--Victini.gif b/src/canonical/models/back/0494-000-Victini.gif
similarity index 100%
rename from src/canonical/models/back/0494--000--Victini.gif
rename to src/canonical/models/back/0494-000-Victini.gif
diff --git a/src/canonical/models/back/0495--000--Snivy.gif b/src/canonical/models/back/0495-000-Snivy.gif
similarity index 100%
rename from src/canonical/models/back/0495--000--Snivy.gif
rename to src/canonical/models/back/0495-000-Snivy.gif
diff --git a/src/canonical/models/back/0496--000--Servine.gif b/src/canonical/models/back/0496-000-Servine.gif
similarity index 100%
rename from src/canonical/models/back/0496--000--Servine.gif
rename to src/canonical/models/back/0496-000-Servine.gif
diff --git a/src/canonical/models/back/0497--000--Serperior.gif b/src/canonical/models/back/0497-000-Serperior.gif
similarity index 100%
rename from src/canonical/models/back/0497--000--Serperior.gif
rename to src/canonical/models/back/0497-000-Serperior.gif
diff --git a/src/canonical/models/back/0498--000--Tepig.gif b/src/canonical/models/back/0498-000-Tepig.gif
similarity index 100%
rename from src/canonical/models/back/0498--000--Tepig.gif
rename to src/canonical/models/back/0498-000-Tepig.gif
diff --git a/src/canonical/models/back/0499--000--Pignite.gif b/src/canonical/models/back/0499-000-Pignite.gif
similarity index 100%
rename from src/canonical/models/back/0499--000--Pignite.gif
rename to src/canonical/models/back/0499-000-Pignite.gif
diff --git a/src/canonical/models/back/0500--000--Emboar.gif b/src/canonical/models/back/0500-000-Emboar.gif
similarity index 100%
rename from src/canonical/models/back/0500--000--Emboar.gif
rename to src/canonical/models/back/0500-000-Emboar.gif
diff --git a/src/canonical/models/back/0501--000--Oshawott.gif b/src/canonical/models/back/0501-000-Oshawott.gif
similarity index 100%
rename from src/canonical/models/back/0501--000--Oshawott.gif
rename to src/canonical/models/back/0501-000-Oshawott.gif
diff --git a/src/canonical/models/back/0502--000--Dewott.gif b/src/canonical/models/back/0502-000-Dewott.gif
similarity index 100%
rename from src/canonical/models/back/0502--000--Dewott.gif
rename to src/canonical/models/back/0502-000-Dewott.gif
diff --git a/src/canonical/models/back/0503--000--Samurott.gif b/src/canonical/models/back/0503-000-Samurott.gif
similarity index 100%
rename from src/canonical/models/back/0503--000--Samurott.gif
rename to src/canonical/models/back/0503-000-Samurott.gif
diff --git a/src/canonical/models/back/0504--000--Patrat.gif b/src/canonical/models/back/0504-000-Patrat.gif
similarity index 100%
rename from src/canonical/models/back/0504--000--Patrat.gif
rename to src/canonical/models/back/0504-000-Patrat.gif
diff --git a/src/canonical/models/back/0505--000--Watchog.gif b/src/canonical/models/back/0505-000-Watchog.gif
similarity index 100%
rename from src/canonical/models/back/0505--000--Watchog.gif
rename to src/canonical/models/back/0505-000-Watchog.gif
diff --git a/src/canonical/models/back/0506--000--Lillipup.gif b/src/canonical/models/back/0506-000-Lillipup.gif
similarity index 100%
rename from src/canonical/models/back/0506--000--Lillipup.gif
rename to src/canonical/models/back/0506-000-Lillipup.gif
diff --git a/src/canonical/models/back/0507--000--Herdier.gif b/src/canonical/models/back/0507-000-Herdier.gif
similarity index 100%
rename from src/canonical/models/back/0507--000--Herdier.gif
rename to src/canonical/models/back/0507-000-Herdier.gif
diff --git a/src/canonical/models/back/0508--000--Stoutland.gif b/src/canonical/models/back/0508-000-Stoutland.gif
similarity index 100%
rename from src/canonical/models/back/0508--000--Stoutland.gif
rename to src/canonical/models/back/0508-000-Stoutland.gif
diff --git a/src/canonical/models/back/0509--000--Purrloin.gif b/src/canonical/models/back/0509-000-Purrloin.gif
similarity index 100%
rename from src/canonical/models/back/0509--000--Purrloin.gif
rename to src/canonical/models/back/0509-000-Purrloin.gif
diff --git a/src/canonical/models/back/0510--000--Liepard.gif b/src/canonical/models/back/0510-000-Liepard.gif
similarity index 100%
rename from src/canonical/models/back/0510--000--Liepard.gif
rename to src/canonical/models/back/0510-000-Liepard.gif
diff --git a/src/canonical/models/back/0511--000--Pansage.gif b/src/canonical/models/back/0511-000-Pansage.gif
similarity index 100%
rename from src/canonical/models/back/0511--000--Pansage.gif
rename to src/canonical/models/back/0511-000-Pansage.gif
diff --git a/src/canonical/models/back/0512--000--Simisage.gif b/src/canonical/models/back/0512-000-Simisage.gif
similarity index 100%
rename from src/canonical/models/back/0512--000--Simisage.gif
rename to src/canonical/models/back/0512-000-Simisage.gif
diff --git a/src/canonical/models/back/0513--000--Pansear.gif b/src/canonical/models/back/0513-000-Pansear.gif
similarity index 100%
rename from src/canonical/models/back/0513--000--Pansear.gif
rename to src/canonical/models/back/0513-000-Pansear.gif
diff --git a/src/canonical/models/back/0514--000--Simisear.gif b/src/canonical/models/back/0514-000-Simisear.gif
similarity index 100%
rename from src/canonical/models/back/0514--000--Simisear.gif
rename to src/canonical/models/back/0514-000-Simisear.gif
diff --git a/src/canonical/models/back/0515--000--Panpour.gif b/src/canonical/models/back/0515-000-Panpour.gif
similarity index 100%
rename from src/canonical/models/back/0515--000--Panpour.gif
rename to src/canonical/models/back/0515-000-Panpour.gif
diff --git a/src/canonical/models/back/0516--000--Simipour.gif b/src/canonical/models/back/0516-000-Simipour.gif
similarity index 100%
rename from src/canonical/models/back/0516--000--Simipour.gif
rename to src/canonical/models/back/0516-000-Simipour.gif
diff --git a/src/canonical/models/back/0517--000--Munna.gif b/src/canonical/models/back/0517-000-Munna.gif
similarity index 100%
rename from src/canonical/models/back/0517--000--Munna.gif
rename to src/canonical/models/back/0517-000-Munna.gif
diff --git a/src/canonical/models/back/0518--000--Musharna.gif b/src/canonical/models/back/0518-000-Musharna.gif
similarity index 100%
rename from src/canonical/models/back/0518--000--Musharna.gif
rename to src/canonical/models/back/0518-000-Musharna.gif
diff --git a/src/canonical/models/back/0519--000--Pidove.gif b/src/canonical/models/back/0519-000-Pidove.gif
similarity index 100%
rename from src/canonical/models/back/0519--000--Pidove.gif
rename to src/canonical/models/back/0519-000-Pidove.gif
diff --git a/src/canonical/models/back/0520--000--Tranquill.gif b/src/canonical/models/back/0520-000-Tranquill.gif
similarity index 100%
rename from src/canonical/models/back/0520--000--Tranquill.gif
rename to src/canonical/models/back/0520-000-Tranquill.gif
diff --git a/src/canonical/models/back/0521--000--Unfezant.gif b/src/canonical/models/back/0521-000-Unfezant.gif
similarity index 100%
rename from src/canonical/models/back/0521--000--Unfezant.gif
rename to src/canonical/models/back/0521-000-Unfezant.gif
diff --git a/src/canonical/models/back/0522--000--Blitzle.gif b/src/canonical/models/back/0522-000-Blitzle.gif
similarity index 100%
rename from src/canonical/models/back/0522--000--Blitzle.gif
rename to src/canonical/models/back/0522-000-Blitzle.gif
diff --git a/src/canonical/models/back/0523--000--Zebstrika.gif b/src/canonical/models/back/0523-000-Zebstrika.gif
similarity index 100%
rename from src/canonical/models/back/0523--000--Zebstrika.gif
rename to src/canonical/models/back/0523-000-Zebstrika.gif
diff --git a/src/canonical/models/back/0524--000--Roggenrola.gif b/src/canonical/models/back/0524-000-Roggenrola.gif
similarity index 100%
rename from src/canonical/models/back/0524--000--Roggenrola.gif
rename to src/canonical/models/back/0524-000-Roggenrola.gif
diff --git a/src/canonical/models/back/0525--000--Boldore.gif b/src/canonical/models/back/0525-000-Boldore.gif
similarity index 100%
rename from src/canonical/models/back/0525--000--Boldore.gif
rename to src/canonical/models/back/0525-000-Boldore.gif
diff --git a/src/canonical/models/back/0526--000--Gigalith.gif b/src/canonical/models/back/0526-000-Gigalith.gif
similarity index 100%
rename from src/canonical/models/back/0526--000--Gigalith.gif
rename to src/canonical/models/back/0526-000-Gigalith.gif
diff --git a/src/canonical/models/back/0527--000--Woobat.gif b/src/canonical/models/back/0527-000-Woobat.gif
similarity index 100%
rename from src/canonical/models/back/0527--000--Woobat.gif
rename to src/canonical/models/back/0527-000-Woobat.gif
diff --git a/src/canonical/models/back/0528--000--Swoobat.gif b/src/canonical/models/back/0528-000-Swoobat.gif
similarity index 100%
rename from src/canonical/models/back/0528--000--Swoobat.gif
rename to src/canonical/models/back/0528-000-Swoobat.gif
diff --git a/src/canonical/models/back/0529--000--Drilbur.gif b/src/canonical/models/back/0529-000-Drilbur.gif
similarity index 100%
rename from src/canonical/models/back/0529--000--Drilbur.gif
rename to src/canonical/models/back/0529-000-Drilbur.gif
diff --git a/src/canonical/models/back/0530--000--Excadrill.gif b/src/canonical/models/back/0530-000-Excadrill.gif
similarity index 100%
rename from src/canonical/models/back/0530--000--Excadrill.gif
rename to src/canonical/models/back/0530-000-Excadrill.gif
diff --git a/src/canonical/models/back/0531--000--Audino.gif b/src/canonical/models/back/0531-000-Audino.gif
similarity index 100%
rename from src/canonical/models/back/0531--000--Audino.gif
rename to src/canonical/models/back/0531-000-Audino.gif
diff --git a/src/canonical/models/back/0531--420--Audino--Mega.gif b/src/canonical/models/back/0531-420-Audino-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0531--420--Audino--Mega.gif
rename to src/canonical/models/back/0531-420-Audino-Mega.gif
diff --git a/src/canonical/models/back/0532--000--Timburr.gif b/src/canonical/models/back/0532-000-Timburr.gif
similarity index 100%
rename from src/canonical/models/back/0532--000--Timburr.gif
rename to src/canonical/models/back/0532-000-Timburr.gif
diff --git a/src/canonical/models/back/0533--000--Gurdurr.gif b/src/canonical/models/back/0533-000-Gurdurr.gif
similarity index 100%
rename from src/canonical/models/back/0533--000--Gurdurr.gif
rename to src/canonical/models/back/0533-000-Gurdurr.gif
diff --git a/src/canonical/models/back/0534--000--Conkeldurr.gif b/src/canonical/models/back/0534-000-Conkeldurr.gif
similarity index 100%
rename from src/canonical/models/back/0534--000--Conkeldurr.gif
rename to src/canonical/models/back/0534-000-Conkeldurr.gif
diff --git a/src/canonical/models/back/0535--000--Tympole.gif b/src/canonical/models/back/0535-000-Tympole.gif
similarity index 100%
rename from src/canonical/models/back/0535--000--Tympole.gif
rename to src/canonical/models/back/0535-000-Tympole.gif
diff --git a/src/canonical/models/back/0536--000--Palpitoad.gif b/src/canonical/models/back/0536-000-Palpitoad.gif
similarity index 100%
rename from src/canonical/models/back/0536--000--Palpitoad.gif
rename to src/canonical/models/back/0536-000-Palpitoad.gif
diff --git a/src/canonical/models/back/0537--000--Seismitoad.gif b/src/canonical/models/back/0537-000-Seismitoad.gif
similarity index 100%
rename from src/canonical/models/back/0537--000--Seismitoad.gif
rename to src/canonical/models/back/0537-000-Seismitoad.gif
diff --git a/src/canonical/models/back/0538--000--Throh.gif b/src/canonical/models/back/0538-000-Throh.gif
similarity index 100%
rename from src/canonical/models/back/0538--000--Throh.gif
rename to src/canonical/models/back/0538-000-Throh.gif
diff --git a/src/canonical/models/back/0539--000--Sawk.gif b/src/canonical/models/back/0539-000-Sawk.gif
similarity index 100%
rename from src/canonical/models/back/0539--000--Sawk.gif
rename to src/canonical/models/back/0539-000-Sawk.gif
diff --git a/src/canonical/models/back/0540--000--Sewaddle.gif b/src/canonical/models/back/0540-000-Sewaddle.gif
similarity index 100%
rename from src/canonical/models/back/0540--000--Sewaddle.gif
rename to src/canonical/models/back/0540-000-Sewaddle.gif
diff --git a/src/canonical/models/back/0541--000--Swadloon.gif b/src/canonical/models/back/0541-000-Swadloon.gif
similarity index 100%
rename from src/canonical/models/back/0541--000--Swadloon.gif
rename to src/canonical/models/back/0541-000-Swadloon.gif
diff --git a/src/canonical/models/back/0542--000--Leavanny.gif b/src/canonical/models/back/0542-000-Leavanny.gif
similarity index 100%
rename from src/canonical/models/back/0542--000--Leavanny.gif
rename to src/canonical/models/back/0542-000-Leavanny.gif
diff --git a/src/canonical/models/back/0543--000--Venipede.gif b/src/canonical/models/back/0543-000-Venipede.gif
similarity index 100%
rename from src/canonical/models/back/0543--000--Venipede.gif
rename to src/canonical/models/back/0543-000-Venipede.gif
diff --git a/src/canonical/models/back/0544--000--Whirlipede.gif b/src/canonical/models/back/0544-000-Whirlipede.gif
similarity index 100%
rename from src/canonical/models/back/0544--000--Whirlipede.gif
rename to src/canonical/models/back/0544-000-Whirlipede.gif
diff --git a/src/canonical/models/back/0545--000--Scolipede.gif b/src/canonical/models/back/0545-000-Scolipede.gif
similarity index 100%
rename from src/canonical/models/back/0545--000--Scolipede.gif
rename to src/canonical/models/back/0545-000-Scolipede.gif
diff --git a/src/canonical/models/back/0546--000--Cottonee.gif b/src/canonical/models/back/0546-000-Cottonee.gif
similarity index 100%
rename from src/canonical/models/back/0546--000--Cottonee.gif
rename to src/canonical/models/back/0546-000-Cottonee.gif
diff --git a/src/canonical/models/back/0547--000--Whimsicott.gif b/src/canonical/models/back/0547-000-Whimsicott.gif
similarity index 100%
rename from src/canonical/models/back/0547--000--Whimsicott.gif
rename to src/canonical/models/back/0547-000-Whimsicott.gif
diff --git a/src/canonical/models/back/0548--000--Petilil.gif b/src/canonical/models/back/0548-000-Petilil.gif
similarity index 100%
rename from src/canonical/models/back/0548--000--Petilil.gif
rename to src/canonical/models/back/0548-000-Petilil.gif
diff --git a/src/canonical/models/back/0549--000--Lilligant.gif b/src/canonical/models/back/0549-000-Lilligant.gif
similarity index 100%
rename from src/canonical/models/back/0549--000--Lilligant.gif
rename to src/canonical/models/back/0549-000-Lilligant.gif
diff --git a/src/canonical/models/back/0550--000--Basculin.gif b/src/canonical/models/back/0550-000-Basculin.gif
similarity index 100%
rename from src/canonical/models/back/0550--000--Basculin.gif
rename to src/canonical/models/back/0550-000-Basculin.gif
diff --git a/src/canonical/models/back/0550--420--Basculin--Blue-Striped.gif b/src/canonical/models/back/0550-420-Basculin-Blue~Striped.gif
similarity index 100%
rename from src/canonical/models/back/0550--420--Basculin--Blue-Striped.gif
rename to src/canonical/models/back/0550-420-Basculin-Blue~Striped.gif
diff --git a/src/canonical/models/back/0551--000--Sandile.gif b/src/canonical/models/back/0551-000-Sandile.gif
similarity index 100%
rename from src/canonical/models/back/0551--000--Sandile.gif
rename to src/canonical/models/back/0551-000-Sandile.gif
diff --git a/src/canonical/models/back/0552--000--Krokorok.gif b/src/canonical/models/back/0552-000-Krokorok.gif
similarity index 100%
rename from src/canonical/models/back/0552--000--Krokorok.gif
rename to src/canonical/models/back/0552-000-Krokorok.gif
diff --git a/src/canonical/models/back/0553--000--Krookodile.gif b/src/canonical/models/back/0553-000-Krookodile.gif
similarity index 100%
rename from src/canonical/models/back/0553--000--Krookodile.gif
rename to src/canonical/models/back/0553-000-Krookodile.gif
diff --git a/src/canonical/models/back/0554--000--Darumaka.gif b/src/canonical/models/back/0554-000-Darumaka.gif
similarity index 100%
rename from src/canonical/models/back/0554--000--Darumaka.gif
rename to src/canonical/models/back/0554-000-Darumaka.gif
diff --git a/src/canonical/models/back/0554--420--Darumaka--Galar.gif b/src/canonical/models/back/0554-420-Darumaka-Galar.gif
similarity index 100%
rename from src/canonical/models/back/0554--420--Darumaka--Galar.gif
rename to src/canonical/models/back/0554-420-Darumaka-Galar.gif
diff --git a/src/canonical/models/back/0555--000--Darmanitan.gif b/src/canonical/models/back/0555-000-Darmanitan.gif
similarity index 100%
rename from src/canonical/models/back/0555--000--Darmanitan.gif
rename to src/canonical/models/back/0555-000-Darmanitan.gif
diff --git a/src/canonical/models/back/0555--420--Darmanitan--Galar.gif b/src/canonical/models/back/0555-420-Darmanitan-Galar.gif
similarity index 100%
rename from src/canonical/models/back/0555--420--Darmanitan--Galar.gif
rename to src/canonical/models/back/0555-420-Darmanitan-Galar.gif
diff --git a/src/canonical/models/back/0555--420--Darmanitan--Galar-Zen.gif b/src/canonical/models/back/0555-420-Darmanitan-Galar~Zen.gif
similarity index 100%
rename from src/canonical/models/back/0555--420--Darmanitan--Galar-Zen.gif
rename to src/canonical/models/back/0555-420-Darmanitan-Galar~Zen.gif
diff --git a/src/canonical/models/back/0555--420--Darmanitan--Zen.gif b/src/canonical/models/back/0555-420-Darmanitan-Zen.gif
similarity index 100%
rename from src/canonical/models/back/0555--420--Darmanitan--Zen.gif
rename to src/canonical/models/back/0555-420-Darmanitan-Zen.gif
diff --git a/src/canonical/models/back/0556--000--Maractus.gif b/src/canonical/models/back/0556-000-Maractus.gif
similarity index 100%
rename from src/canonical/models/back/0556--000--Maractus.gif
rename to src/canonical/models/back/0556-000-Maractus.gif
diff --git a/src/canonical/models/back/0557--000--Dwebble.gif b/src/canonical/models/back/0557-000-Dwebble.gif
similarity index 100%
rename from src/canonical/models/back/0557--000--Dwebble.gif
rename to src/canonical/models/back/0557-000-Dwebble.gif
diff --git a/src/canonical/models/back/0558--000--Crustle.gif b/src/canonical/models/back/0558-000-Crustle.gif
similarity index 100%
rename from src/canonical/models/back/0558--000--Crustle.gif
rename to src/canonical/models/back/0558-000-Crustle.gif
diff --git a/src/canonical/models/back/0559--000--Scraggy.gif b/src/canonical/models/back/0559-000-Scraggy.gif
similarity index 100%
rename from src/canonical/models/back/0559--000--Scraggy.gif
rename to src/canonical/models/back/0559-000-Scraggy.gif
diff --git a/src/canonical/models/back/0560--000--Scrafty.gif b/src/canonical/models/back/0560-000-Scrafty.gif
similarity index 100%
rename from src/canonical/models/back/0560--000--Scrafty.gif
rename to src/canonical/models/back/0560-000-Scrafty.gif
diff --git a/src/canonical/models/back/0561--000--Sigilyph.gif b/src/canonical/models/back/0561-000-Sigilyph.gif
similarity index 100%
rename from src/canonical/models/back/0561--000--Sigilyph.gif
rename to src/canonical/models/back/0561-000-Sigilyph.gif
diff --git a/src/canonical/models/back/0562--000--Yamask.gif b/src/canonical/models/back/0562-000-Yamask.gif
similarity index 100%
rename from src/canonical/models/back/0562--000--Yamask.gif
rename to src/canonical/models/back/0562-000-Yamask.gif
diff --git a/src/canonical/models/back/0562--420--Yamask--Galar.gif b/src/canonical/models/back/0562-420-Yamask-Galar.gif
similarity index 100%
rename from src/canonical/models/back/0562--420--Yamask--Galar.gif
rename to src/canonical/models/back/0562-420-Yamask-Galar.gif
diff --git a/src/canonical/models/back/0563--000--Cofagrigus.gif b/src/canonical/models/back/0563-000-Cofagrigus.gif
similarity index 100%
rename from src/canonical/models/back/0563--000--Cofagrigus.gif
rename to src/canonical/models/back/0563-000-Cofagrigus.gif
diff --git a/src/canonical/models/back/0564--000--Tirtouga.gif b/src/canonical/models/back/0564-000-Tirtouga.gif
similarity index 100%
rename from src/canonical/models/back/0564--000--Tirtouga.gif
rename to src/canonical/models/back/0564-000-Tirtouga.gif
diff --git a/src/canonical/models/back/0565--000--Carracosta.gif b/src/canonical/models/back/0565-000-Carracosta.gif
similarity index 100%
rename from src/canonical/models/back/0565--000--Carracosta.gif
rename to src/canonical/models/back/0565-000-Carracosta.gif
diff --git a/src/canonical/models/back/0566--000--Archen.gif b/src/canonical/models/back/0566-000-Archen.gif
similarity index 100%
rename from src/canonical/models/back/0566--000--Archen.gif
rename to src/canonical/models/back/0566-000-Archen.gif
diff --git a/src/canonical/models/back/0567--000--Archeops.gif b/src/canonical/models/back/0567-000-Archeops.gif
similarity index 100%
rename from src/canonical/models/back/0567--000--Archeops.gif
rename to src/canonical/models/back/0567-000-Archeops.gif
diff --git a/src/canonical/models/back/0568--000--Trubbish.gif b/src/canonical/models/back/0568-000-Trubbish.gif
similarity index 100%
rename from src/canonical/models/back/0568--000--Trubbish.gif
rename to src/canonical/models/back/0568-000-Trubbish.gif
diff --git a/src/canonical/models/back/0569--000--Garbodor.gif b/src/canonical/models/back/0569-000-Garbodor.gif
similarity index 100%
rename from src/canonical/models/back/0569--000--Garbodor.gif
rename to src/canonical/models/back/0569-000-Garbodor.gif
diff --git a/src/canonical/models/back/0569--420--Garbodor--Gmax.gif b/src/canonical/models/back/0569-420-Garbodor-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0569--420--Garbodor--Gmax.gif
rename to src/canonical/models/back/0569-420-Garbodor-Gmax.gif
diff --git a/src/canonical/models/back/0570--000--Zorua.gif b/src/canonical/models/back/0570-000-Zorua.gif
similarity index 100%
rename from src/canonical/models/back/0570--000--Zorua.gif
rename to src/canonical/models/back/0570-000-Zorua.gif
diff --git a/src/canonical/models/back/0571--000--Zoroark.gif b/src/canonical/models/back/0571-000-Zoroark.gif
similarity index 100%
rename from src/canonical/models/back/0571--000--Zoroark.gif
rename to src/canonical/models/back/0571-000-Zoroark.gif
diff --git a/src/canonical/models/back/0572--000--Minccino.gif b/src/canonical/models/back/0572-000-Minccino.gif
similarity index 100%
rename from src/canonical/models/back/0572--000--Minccino.gif
rename to src/canonical/models/back/0572-000-Minccino.gif
diff --git a/src/canonical/models/back/0573--000--Cinccino.gif b/src/canonical/models/back/0573-000-Cinccino.gif
similarity index 100%
rename from src/canonical/models/back/0573--000--Cinccino.gif
rename to src/canonical/models/back/0573-000-Cinccino.gif
diff --git a/src/canonical/models/back/0574--000--Gothita.gif b/src/canonical/models/back/0574-000-Gothita.gif
similarity index 100%
rename from src/canonical/models/back/0574--000--Gothita.gif
rename to src/canonical/models/back/0574-000-Gothita.gif
diff --git a/src/canonical/models/back/0575--000--Gothorita.gif b/src/canonical/models/back/0575-000-Gothorita.gif
similarity index 100%
rename from src/canonical/models/back/0575--000--Gothorita.gif
rename to src/canonical/models/back/0575-000-Gothorita.gif
diff --git a/src/canonical/models/back/0576--000--Gothitelle.gif b/src/canonical/models/back/0576-000-Gothitelle.gif
similarity index 100%
rename from src/canonical/models/back/0576--000--Gothitelle.gif
rename to src/canonical/models/back/0576-000-Gothitelle.gif
diff --git a/src/canonical/models/back/0577--000--Solosis.gif b/src/canonical/models/back/0577-000-Solosis.gif
similarity index 100%
rename from src/canonical/models/back/0577--000--Solosis.gif
rename to src/canonical/models/back/0577-000-Solosis.gif
diff --git a/src/canonical/models/back/0578--000--Duosion.gif b/src/canonical/models/back/0578-000-Duosion.gif
similarity index 100%
rename from src/canonical/models/back/0578--000--Duosion.gif
rename to src/canonical/models/back/0578-000-Duosion.gif
diff --git a/src/canonical/models/back/0579--000--Reuniclus.gif b/src/canonical/models/back/0579-000-Reuniclus.gif
similarity index 100%
rename from src/canonical/models/back/0579--000--Reuniclus.gif
rename to src/canonical/models/back/0579-000-Reuniclus.gif
diff --git a/src/canonical/models/back/0580--000--Ducklett.gif b/src/canonical/models/back/0580-000-Ducklett.gif
similarity index 100%
rename from src/canonical/models/back/0580--000--Ducklett.gif
rename to src/canonical/models/back/0580-000-Ducklett.gif
diff --git a/src/canonical/models/back/0581--000--Swanna.gif b/src/canonical/models/back/0581-000-Swanna.gif
similarity index 100%
rename from src/canonical/models/back/0581--000--Swanna.gif
rename to src/canonical/models/back/0581-000-Swanna.gif
diff --git a/src/canonical/models/back/0582--000--Vanillite.gif b/src/canonical/models/back/0582-000-Vanillite.gif
similarity index 100%
rename from src/canonical/models/back/0582--000--Vanillite.gif
rename to src/canonical/models/back/0582-000-Vanillite.gif
diff --git a/src/canonical/models/back/0583--000--Vanillish.gif b/src/canonical/models/back/0583-000-Vanillish.gif
similarity index 100%
rename from src/canonical/models/back/0583--000--Vanillish.gif
rename to src/canonical/models/back/0583-000-Vanillish.gif
diff --git a/src/canonical/models/back/0584--000--Vanilluxe.gif b/src/canonical/models/back/0584-000-Vanilluxe.gif
similarity index 100%
rename from src/canonical/models/back/0584--000--Vanilluxe.gif
rename to src/canonical/models/back/0584-000-Vanilluxe.gif
diff --git a/src/canonical/models/back/0585--000--Deerling.gif b/src/canonical/models/back/0585-000-Deerling.gif
similarity index 100%
rename from src/canonical/models/back/0585--000--Deerling.gif
rename to src/canonical/models/back/0585-000-Deerling.gif
diff --git a/src/canonical/models/back/0586--000--Sawsbuck.gif b/src/canonical/models/back/0586-000-Sawsbuck.gif
similarity index 100%
rename from src/canonical/models/back/0586--000--Sawsbuck.gif
rename to src/canonical/models/back/0586-000-Sawsbuck.gif
diff --git a/src/canonical/models/back/0587--000--Emolga.gif b/src/canonical/models/back/0587-000-Emolga.gif
similarity index 100%
rename from src/canonical/models/back/0587--000--Emolga.gif
rename to src/canonical/models/back/0587-000-Emolga.gif
diff --git a/src/canonical/models/back/0588--000--Karrablast.gif b/src/canonical/models/back/0588-000-Karrablast.gif
similarity index 100%
rename from src/canonical/models/back/0588--000--Karrablast.gif
rename to src/canonical/models/back/0588-000-Karrablast.gif
diff --git a/src/canonical/models/back/0589--000--Escavalier.gif b/src/canonical/models/back/0589-000-Escavalier.gif
similarity index 100%
rename from src/canonical/models/back/0589--000--Escavalier.gif
rename to src/canonical/models/back/0589-000-Escavalier.gif
diff --git a/src/canonical/models/back/0590--000--Foongus.gif b/src/canonical/models/back/0590-000-Foongus.gif
similarity index 100%
rename from src/canonical/models/back/0590--000--Foongus.gif
rename to src/canonical/models/back/0590-000-Foongus.gif
diff --git a/src/canonical/models/back/0591--000--Amoonguss.gif b/src/canonical/models/back/0591-000-Amoonguss.gif
similarity index 100%
rename from src/canonical/models/back/0591--000--Amoonguss.gif
rename to src/canonical/models/back/0591-000-Amoonguss.gif
diff --git a/src/canonical/models/back/0592--000--Frillish.gif b/src/canonical/models/back/0592-000-Frillish.gif
similarity index 100%
rename from src/canonical/models/back/0592--000--Frillish.gif
rename to src/canonical/models/back/0592-000-Frillish.gif
diff --git a/src/canonical/models/back/0593--000--Jellicent.gif b/src/canonical/models/back/0593-000-Jellicent.gif
similarity index 100%
rename from src/canonical/models/back/0593--000--Jellicent.gif
rename to src/canonical/models/back/0593-000-Jellicent.gif
diff --git a/src/canonical/models/back/0594--000--Alomomola.gif b/src/canonical/models/back/0594-000-Alomomola.gif
similarity index 100%
rename from src/canonical/models/back/0594--000--Alomomola.gif
rename to src/canonical/models/back/0594-000-Alomomola.gif
diff --git a/src/canonical/models/back/0595--000--Joltik.gif b/src/canonical/models/back/0595-000-Joltik.gif
similarity index 100%
rename from src/canonical/models/back/0595--000--Joltik.gif
rename to src/canonical/models/back/0595-000-Joltik.gif
diff --git a/src/canonical/models/back/0596--000--Galvantula.gif b/src/canonical/models/back/0596-000-Galvantula.gif
similarity index 100%
rename from src/canonical/models/back/0596--000--Galvantula.gif
rename to src/canonical/models/back/0596-000-Galvantula.gif
diff --git a/src/canonical/models/back/0597--000--Ferroseed.gif b/src/canonical/models/back/0597-000-Ferroseed.gif
similarity index 100%
rename from src/canonical/models/back/0597--000--Ferroseed.gif
rename to src/canonical/models/back/0597-000-Ferroseed.gif
diff --git a/src/canonical/models/back/0598--000--Ferrothorn.gif b/src/canonical/models/back/0598-000-Ferrothorn.gif
similarity index 100%
rename from src/canonical/models/back/0598--000--Ferrothorn.gif
rename to src/canonical/models/back/0598-000-Ferrothorn.gif
diff --git a/src/canonical/models/back/0599--000--Klink.gif b/src/canonical/models/back/0599-000-Klink.gif
similarity index 100%
rename from src/canonical/models/back/0599--000--Klink.gif
rename to src/canonical/models/back/0599-000-Klink.gif
diff --git a/src/canonical/models/back/0600--000--Klang.gif b/src/canonical/models/back/0600-000-Klang.gif
similarity index 100%
rename from src/canonical/models/back/0600--000--Klang.gif
rename to src/canonical/models/back/0600-000-Klang.gif
diff --git a/src/canonical/models/back/0601--000--Klinklang.gif b/src/canonical/models/back/0601-000-Klinklang.gif
similarity index 100%
rename from src/canonical/models/back/0601--000--Klinklang.gif
rename to src/canonical/models/back/0601-000-Klinklang.gif
diff --git a/src/canonical/models/back/0602--000--Tynamo.gif b/src/canonical/models/back/0602-000-Tynamo.gif
similarity index 100%
rename from src/canonical/models/back/0602--000--Tynamo.gif
rename to src/canonical/models/back/0602-000-Tynamo.gif
diff --git a/src/canonical/models/back/0603--000--Eelektrik.gif b/src/canonical/models/back/0603-000-Eelektrik.gif
similarity index 100%
rename from src/canonical/models/back/0603--000--Eelektrik.gif
rename to src/canonical/models/back/0603-000-Eelektrik.gif
diff --git a/src/canonical/models/back/0604--000--Eelektross.gif b/src/canonical/models/back/0604-000-Eelektross.gif
similarity index 100%
rename from src/canonical/models/back/0604--000--Eelektross.gif
rename to src/canonical/models/back/0604-000-Eelektross.gif
diff --git a/src/canonical/models/back/0605--000--Elgyem.gif b/src/canonical/models/back/0605-000-Elgyem.gif
similarity index 100%
rename from src/canonical/models/back/0605--000--Elgyem.gif
rename to src/canonical/models/back/0605-000-Elgyem.gif
diff --git a/src/canonical/models/back/0606--000--Beheeyem.gif b/src/canonical/models/back/0606-000-Beheeyem.gif
similarity index 100%
rename from src/canonical/models/back/0606--000--Beheeyem.gif
rename to src/canonical/models/back/0606-000-Beheeyem.gif
diff --git a/src/canonical/models/back/0607--000--Litwick.gif b/src/canonical/models/back/0607-000-Litwick.gif
similarity index 100%
rename from src/canonical/models/back/0607--000--Litwick.gif
rename to src/canonical/models/back/0607-000-Litwick.gif
diff --git a/src/canonical/models/back/0608--000--Lampent.gif b/src/canonical/models/back/0608-000-Lampent.gif
similarity index 100%
rename from src/canonical/models/back/0608--000--Lampent.gif
rename to src/canonical/models/back/0608-000-Lampent.gif
diff --git a/src/canonical/models/back/0609--000--Chandelure.gif b/src/canonical/models/back/0609-000-Chandelure.gif
similarity index 100%
rename from src/canonical/models/back/0609--000--Chandelure.gif
rename to src/canonical/models/back/0609-000-Chandelure.gif
diff --git a/src/canonical/models/back/0610--000--Axew.gif b/src/canonical/models/back/0610-000-Axew.gif
similarity index 100%
rename from src/canonical/models/back/0610--000--Axew.gif
rename to src/canonical/models/back/0610-000-Axew.gif
diff --git a/src/canonical/models/back/0611--000--Fraxure.gif b/src/canonical/models/back/0611-000-Fraxure.gif
similarity index 100%
rename from src/canonical/models/back/0611--000--Fraxure.gif
rename to src/canonical/models/back/0611-000-Fraxure.gif
diff --git a/src/canonical/models/back/0612--000--Haxorus.gif b/src/canonical/models/back/0612-000-Haxorus.gif
similarity index 100%
rename from src/canonical/models/back/0612--000--Haxorus.gif
rename to src/canonical/models/back/0612-000-Haxorus.gif
diff --git a/src/canonical/models/back/0613--000--Cubchoo.gif b/src/canonical/models/back/0613-000-Cubchoo.gif
similarity index 100%
rename from src/canonical/models/back/0613--000--Cubchoo.gif
rename to src/canonical/models/back/0613-000-Cubchoo.gif
diff --git a/src/canonical/models/back/0614--000--Beartic.gif b/src/canonical/models/back/0614-000-Beartic.gif
similarity index 100%
rename from src/canonical/models/back/0614--000--Beartic.gif
rename to src/canonical/models/back/0614-000-Beartic.gif
diff --git a/src/canonical/models/back/0615--000--Cryogonal.gif b/src/canonical/models/back/0615-000-Cryogonal.gif
similarity index 100%
rename from src/canonical/models/back/0615--000--Cryogonal.gif
rename to src/canonical/models/back/0615-000-Cryogonal.gif
diff --git a/src/canonical/models/back/0616--000--Shelmet.gif b/src/canonical/models/back/0616-000-Shelmet.gif
similarity index 100%
rename from src/canonical/models/back/0616--000--Shelmet.gif
rename to src/canonical/models/back/0616-000-Shelmet.gif
diff --git a/src/canonical/models/back/0617--000--Accelgor.gif b/src/canonical/models/back/0617-000-Accelgor.gif
similarity index 100%
rename from src/canonical/models/back/0617--000--Accelgor.gif
rename to src/canonical/models/back/0617-000-Accelgor.gif
diff --git a/src/canonical/models/back/0618--000--Stunfisk.gif b/src/canonical/models/back/0618-000-Stunfisk.gif
similarity index 100%
rename from src/canonical/models/back/0618--000--Stunfisk.gif
rename to src/canonical/models/back/0618-000-Stunfisk.gif
diff --git a/src/canonical/models/back/0618--420--Stunfisk--Galar.gif b/src/canonical/models/back/0618-420-Stunfisk-Galar.gif
similarity index 100%
rename from src/canonical/models/back/0618--420--Stunfisk--Galar.gif
rename to src/canonical/models/back/0618-420-Stunfisk-Galar.gif
diff --git a/src/canonical/models/back/0619--000--Mienfoo.gif b/src/canonical/models/back/0619-000-Mienfoo.gif
similarity index 100%
rename from src/canonical/models/back/0619--000--Mienfoo.gif
rename to src/canonical/models/back/0619-000-Mienfoo.gif
diff --git a/src/canonical/models/back/0620--000--Mienshao.gif b/src/canonical/models/back/0620-000-Mienshao.gif
similarity index 100%
rename from src/canonical/models/back/0620--000--Mienshao.gif
rename to src/canonical/models/back/0620-000-Mienshao.gif
diff --git a/src/canonical/models/back/0621--000--Druddigon.gif b/src/canonical/models/back/0621-000-Druddigon.gif
similarity index 100%
rename from src/canonical/models/back/0621--000--Druddigon.gif
rename to src/canonical/models/back/0621-000-Druddigon.gif
diff --git a/src/canonical/models/back/0622--000--Golett.gif b/src/canonical/models/back/0622-000-Golett.gif
similarity index 100%
rename from src/canonical/models/back/0622--000--Golett.gif
rename to src/canonical/models/back/0622-000-Golett.gif
diff --git a/src/canonical/models/back/0623--000--Golurk.gif b/src/canonical/models/back/0623-000-Golurk.gif
similarity index 100%
rename from src/canonical/models/back/0623--000--Golurk.gif
rename to src/canonical/models/back/0623-000-Golurk.gif
diff --git a/src/canonical/models/back/0624--000--Pawniard.gif b/src/canonical/models/back/0624-000-Pawniard.gif
similarity index 100%
rename from src/canonical/models/back/0624--000--Pawniard.gif
rename to src/canonical/models/back/0624-000-Pawniard.gif
diff --git a/src/canonical/models/back/0625--000--Bisharp.gif b/src/canonical/models/back/0625-000-Bisharp.gif
similarity index 100%
rename from src/canonical/models/back/0625--000--Bisharp.gif
rename to src/canonical/models/back/0625-000-Bisharp.gif
diff --git a/src/canonical/models/back/0626--000--Bouffalant.gif b/src/canonical/models/back/0626-000-Bouffalant.gif
similarity index 100%
rename from src/canonical/models/back/0626--000--Bouffalant.gif
rename to src/canonical/models/back/0626-000-Bouffalant.gif
diff --git a/src/canonical/models/back/0627--000--Rufflet.gif b/src/canonical/models/back/0627-000-Rufflet.gif
similarity index 100%
rename from src/canonical/models/back/0627--000--Rufflet.gif
rename to src/canonical/models/back/0627-000-Rufflet.gif
diff --git a/src/canonical/models/back/0628--000--Braviary.gif b/src/canonical/models/back/0628-000-Braviary.gif
similarity index 100%
rename from src/canonical/models/back/0628--000--Braviary.gif
rename to src/canonical/models/back/0628-000-Braviary.gif
diff --git a/src/canonical/models/back/0629--000--Vullaby.gif b/src/canonical/models/back/0629-000-Vullaby.gif
similarity index 100%
rename from src/canonical/models/back/0629--000--Vullaby.gif
rename to src/canonical/models/back/0629-000-Vullaby.gif
diff --git a/src/canonical/models/back/0630--000--Mandibuzz.gif b/src/canonical/models/back/0630-000-Mandibuzz.gif
similarity index 100%
rename from src/canonical/models/back/0630--000--Mandibuzz.gif
rename to src/canonical/models/back/0630-000-Mandibuzz.gif
diff --git a/src/canonical/models/back/0631--000--Heatmor.gif b/src/canonical/models/back/0631-000-Heatmor.gif
similarity index 100%
rename from src/canonical/models/back/0631--000--Heatmor.gif
rename to src/canonical/models/back/0631-000-Heatmor.gif
diff --git a/src/canonical/models/back/0632--000--Durant.gif b/src/canonical/models/back/0632-000-Durant.gif
similarity index 100%
rename from src/canonical/models/back/0632--000--Durant.gif
rename to src/canonical/models/back/0632-000-Durant.gif
diff --git a/src/canonical/models/back/0633--000--Deino.gif b/src/canonical/models/back/0633-000-Deino.gif
similarity index 100%
rename from src/canonical/models/back/0633--000--Deino.gif
rename to src/canonical/models/back/0633-000-Deino.gif
diff --git a/src/canonical/models/back/0634--000--Zweilous.gif b/src/canonical/models/back/0634-000-Zweilous.gif
similarity index 100%
rename from src/canonical/models/back/0634--000--Zweilous.gif
rename to src/canonical/models/back/0634-000-Zweilous.gif
diff --git a/src/canonical/models/back/0635--000--Hydreigon.gif b/src/canonical/models/back/0635-000-Hydreigon.gif
similarity index 100%
rename from src/canonical/models/back/0635--000--Hydreigon.gif
rename to src/canonical/models/back/0635-000-Hydreigon.gif
diff --git a/src/canonical/models/back/0636--000--Larvesta.gif b/src/canonical/models/back/0636-000-Larvesta.gif
similarity index 100%
rename from src/canonical/models/back/0636--000--Larvesta.gif
rename to src/canonical/models/back/0636-000-Larvesta.gif
diff --git a/src/canonical/models/back/0637--000--Volcarona.gif b/src/canonical/models/back/0637-000-Volcarona.gif
similarity index 100%
rename from src/canonical/models/back/0637--000--Volcarona.gif
rename to src/canonical/models/back/0637-000-Volcarona.gif
diff --git a/src/canonical/models/back/0638--000--Cobalion.gif b/src/canonical/models/back/0638-000-Cobalion.gif
similarity index 100%
rename from src/canonical/models/back/0638--000--Cobalion.gif
rename to src/canonical/models/back/0638-000-Cobalion.gif
diff --git a/src/canonical/models/back/0639--000--Terrakion.gif b/src/canonical/models/back/0639-000-Terrakion.gif
similarity index 100%
rename from src/canonical/models/back/0639--000--Terrakion.gif
rename to src/canonical/models/back/0639-000-Terrakion.gif
diff --git a/src/canonical/models/back/0640--000--Virizion.gif b/src/canonical/models/back/0640-000-Virizion.gif
similarity index 100%
rename from src/canonical/models/back/0640--000--Virizion.gif
rename to src/canonical/models/back/0640-000-Virizion.gif
diff --git a/src/canonical/models/back/0641--000--Tornadus.gif b/src/canonical/models/back/0641-000-Tornadus.gif
similarity index 100%
rename from src/canonical/models/back/0641--000--Tornadus.gif
rename to src/canonical/models/back/0641-000-Tornadus.gif
diff --git a/src/canonical/models/back/0641--420--Tornadus--Therian.gif b/src/canonical/models/back/0641-420-Tornadus-Therian.gif
similarity index 100%
rename from src/canonical/models/back/0641--420--Tornadus--Therian.gif
rename to src/canonical/models/back/0641-420-Tornadus-Therian.gif
diff --git a/src/canonical/models/back/0642--000--Thundurus.gif b/src/canonical/models/back/0642-000-Thundurus.gif
similarity index 100%
rename from src/canonical/models/back/0642--000--Thundurus.gif
rename to src/canonical/models/back/0642-000-Thundurus.gif
diff --git a/src/canonical/models/back/0642--420--Thundurus--Therian.gif b/src/canonical/models/back/0642-420-Thundurus-Therian.gif
similarity index 100%
rename from src/canonical/models/back/0642--420--Thundurus--Therian.gif
rename to src/canonical/models/back/0642-420-Thundurus-Therian.gif
diff --git a/src/canonical/models/back/0643--000--Reshiram.gif b/src/canonical/models/back/0643-000-Reshiram.gif
similarity index 100%
rename from src/canonical/models/back/0643--000--Reshiram.gif
rename to src/canonical/models/back/0643-000-Reshiram.gif
diff --git a/src/canonical/models/back/0644--000--Zekrom.gif b/src/canonical/models/back/0644-000-Zekrom.gif
similarity index 100%
rename from src/canonical/models/back/0644--000--Zekrom.gif
rename to src/canonical/models/back/0644-000-Zekrom.gif
diff --git a/src/canonical/models/back/0645--000--Landorus.gif b/src/canonical/models/back/0645-000-Landorus.gif
similarity index 100%
rename from src/canonical/models/back/0645--000--Landorus.gif
rename to src/canonical/models/back/0645-000-Landorus.gif
diff --git a/src/canonical/models/back/0645--420--Landorus--Therian.gif b/src/canonical/models/back/0645-420-Landorus-Therian.gif
similarity index 100%
rename from src/canonical/models/back/0645--420--Landorus--Therian.gif
rename to src/canonical/models/back/0645-420-Landorus-Therian.gif
diff --git a/src/canonical/models/back/0646--000--Kyurem.gif b/src/canonical/models/back/0646-000-Kyurem.gif
similarity index 100%
rename from src/canonical/models/back/0646--000--Kyurem.gif
rename to src/canonical/models/back/0646-000-Kyurem.gif
diff --git a/src/canonical/models/back/0646--420--Kyurem--Black.gif b/src/canonical/models/back/0646-420-Kyurem-Black.gif
similarity index 100%
rename from src/canonical/models/back/0646--420--Kyurem--Black.gif
rename to src/canonical/models/back/0646-420-Kyurem-Black.gif
diff --git a/src/canonical/models/back/0646--420--Kyurem--White.gif b/src/canonical/models/back/0646-420-Kyurem-White.gif
similarity index 100%
rename from src/canonical/models/back/0646--420--Kyurem--White.gif
rename to src/canonical/models/back/0646-420-Kyurem-White.gif
diff --git a/src/canonical/models/back/0647--000--Keldeo.gif b/src/canonical/models/back/0647-000-Keldeo.gif
similarity index 100%
rename from src/canonical/models/back/0647--000--Keldeo.gif
rename to src/canonical/models/back/0647-000-Keldeo.gif
diff --git a/src/canonical/models/back/0647--420--Keldeo--Resolute.gif b/src/canonical/models/back/0647-420-Keldeo-Resolute.gif
similarity index 100%
rename from src/canonical/models/back/0647--420--Keldeo--Resolute.gif
rename to src/canonical/models/back/0647-420-Keldeo-Resolute.gif
diff --git a/src/canonical/models/back/0648--000--Meloetta.gif b/src/canonical/models/back/0648-000-Meloetta.gif
similarity index 100%
rename from src/canonical/models/back/0648--000--Meloetta.gif
rename to src/canonical/models/back/0648-000-Meloetta.gif
diff --git a/src/canonical/models/back/0648--420--Meloetta--Pirouette.gif b/src/canonical/models/back/0648-420-Meloetta-Pirouette.gif
similarity index 100%
rename from src/canonical/models/back/0648--420--Meloetta--Pirouette.gif
rename to src/canonical/models/back/0648-420-Meloetta-Pirouette.gif
diff --git a/src/canonical/models/back/0649--000--Genesect.gif b/src/canonical/models/back/0649-000-Genesect.gif
similarity index 100%
rename from src/canonical/models/back/0649--000--Genesect.gif
rename to src/canonical/models/back/0649-000-Genesect.gif
diff --git a/src/canonical/models/back/0649--420--Genesect--Burn.gif b/src/canonical/models/back/0649-420-Genesect-Burn.gif
similarity index 100%
rename from src/canonical/models/back/0649--420--Genesect--Burn.gif
rename to src/canonical/models/back/0649-420-Genesect-Burn.gif
diff --git a/src/canonical/models/back/0649--420--Genesect--Chill.gif b/src/canonical/models/back/0649-420-Genesect-Chill.gif
similarity index 100%
rename from src/canonical/models/back/0649--420--Genesect--Chill.gif
rename to src/canonical/models/back/0649-420-Genesect-Chill.gif
diff --git a/src/canonical/models/back/0649--420--Genesect--Douse.gif b/src/canonical/models/back/0649-420-Genesect-Douse.gif
similarity index 100%
rename from src/canonical/models/back/0649--420--Genesect--Douse.gif
rename to src/canonical/models/back/0649-420-Genesect-Douse.gif
diff --git a/src/canonical/models/back/0649--420--Genesect--Shock.gif b/src/canonical/models/back/0649-420-Genesect-Shock.gif
similarity index 100%
rename from src/canonical/models/back/0649--420--Genesect--Shock.gif
rename to src/canonical/models/back/0649-420-Genesect-Shock.gif
diff --git a/src/canonical/models/back/0650--000--Chespin.gif b/src/canonical/models/back/0650-000-Chespin.gif
similarity index 100%
rename from src/canonical/models/back/0650--000--Chespin.gif
rename to src/canonical/models/back/0650-000-Chespin.gif
diff --git a/src/canonical/models/back/0651--000--Quilladin.gif b/src/canonical/models/back/0651-000-Quilladin.gif
similarity index 100%
rename from src/canonical/models/back/0651--000--Quilladin.gif
rename to src/canonical/models/back/0651-000-Quilladin.gif
diff --git a/src/canonical/models/back/0652--000--Chesnaught.gif b/src/canonical/models/back/0652-000-Chesnaught.gif
similarity index 100%
rename from src/canonical/models/back/0652--000--Chesnaught.gif
rename to src/canonical/models/back/0652-000-Chesnaught.gif
diff --git a/src/canonical/models/back/0653--000--Fennekin.gif b/src/canonical/models/back/0653-000-Fennekin.gif
similarity index 100%
rename from src/canonical/models/back/0653--000--Fennekin.gif
rename to src/canonical/models/back/0653-000-Fennekin.gif
diff --git a/src/canonical/models/back/0654--000--Braixen.gif b/src/canonical/models/back/0654-000-Braixen.gif
similarity index 100%
rename from src/canonical/models/back/0654--000--Braixen.gif
rename to src/canonical/models/back/0654-000-Braixen.gif
diff --git a/src/canonical/models/back/0655--000--Delphox.gif b/src/canonical/models/back/0655-000-Delphox.gif
similarity index 100%
rename from src/canonical/models/back/0655--000--Delphox.gif
rename to src/canonical/models/back/0655-000-Delphox.gif
diff --git a/src/canonical/models/back/0656--000--Froakie.gif b/src/canonical/models/back/0656-000-Froakie.gif
similarity index 100%
rename from src/canonical/models/back/0656--000--Froakie.gif
rename to src/canonical/models/back/0656-000-Froakie.gif
diff --git a/src/canonical/models/back/0657--000--Frogadier.gif b/src/canonical/models/back/0657-000-Frogadier.gif
similarity index 100%
rename from src/canonical/models/back/0657--000--Frogadier.gif
rename to src/canonical/models/back/0657-000-Frogadier.gif
diff --git a/src/canonical/models/back/0658--000--Greninja.gif b/src/canonical/models/back/0658-000-Greninja.gif
similarity index 100%
rename from src/canonical/models/back/0658--000--Greninja.gif
rename to src/canonical/models/back/0658-000-Greninja.gif
diff --git a/src/canonical/models/back/0658--420--Greninja--Ash.gif b/src/canonical/models/back/0658-420-Greninja-Ash.gif
similarity index 100%
rename from src/canonical/models/back/0658--420--Greninja--Ash.gif
rename to src/canonical/models/back/0658-420-Greninja-Ash.gif
diff --git a/src/canonical/models/back/0659--000--Bunnelby.gif b/src/canonical/models/back/0659-000-Bunnelby.gif
similarity index 100%
rename from src/canonical/models/back/0659--000--Bunnelby.gif
rename to src/canonical/models/back/0659-000-Bunnelby.gif
diff --git a/src/canonical/models/back/0660--000--Diggersby.gif b/src/canonical/models/back/0660-000-Diggersby.gif
similarity index 100%
rename from src/canonical/models/back/0660--000--Diggersby.gif
rename to src/canonical/models/back/0660-000-Diggersby.gif
diff --git a/src/canonical/models/back/0661--000--Fletchling.gif b/src/canonical/models/back/0661-000-Fletchling.gif
similarity index 100%
rename from src/canonical/models/back/0661--000--Fletchling.gif
rename to src/canonical/models/back/0661-000-Fletchling.gif
diff --git a/src/canonical/models/back/0662--000--Fletchinder.gif b/src/canonical/models/back/0662-000-Fletchinder.gif
similarity index 100%
rename from src/canonical/models/back/0662--000--Fletchinder.gif
rename to src/canonical/models/back/0662-000-Fletchinder.gif
diff --git a/src/canonical/models/back/0663--000--Talonflame.gif b/src/canonical/models/back/0663-000-Talonflame.gif
similarity index 100%
rename from src/canonical/models/back/0663--000--Talonflame.gif
rename to src/canonical/models/back/0663-000-Talonflame.gif
diff --git a/src/canonical/models/back/0664--000--Scatterbug.gif b/src/canonical/models/back/0664-000-Scatterbug.gif
similarity index 100%
rename from src/canonical/models/back/0664--000--Scatterbug.gif
rename to src/canonical/models/back/0664-000-Scatterbug.gif
diff --git a/src/canonical/models/back/0665--000--Spewpa.gif b/src/canonical/models/back/0665-000-Spewpa.gif
similarity index 100%
rename from src/canonical/models/back/0665--000--Spewpa.gif
rename to src/canonical/models/back/0665-000-Spewpa.gif
diff --git a/src/canonical/models/back/0666--000--Vivillon.gif b/src/canonical/models/back/0666-000-Vivillon.gif
similarity index 100%
rename from src/canonical/models/back/0666--000--Vivillon.gif
rename to src/canonical/models/back/0666-000-Vivillon.gif
diff --git a/src/canonical/models/back/0666--420--Vivillon--Fancy.gif b/src/canonical/models/back/0666-420-Vivillon-Fancy.gif
similarity index 100%
rename from src/canonical/models/back/0666--420--Vivillon--Fancy.gif
rename to src/canonical/models/back/0666-420-Vivillon-Fancy.gif
diff --git a/src/canonical/models/back/0666--420--Vivillon--Pokeball.gif b/src/canonical/models/back/0666-420-Vivillon-Pokeball.gif
similarity index 100%
rename from src/canonical/models/back/0666--420--Vivillon--Pokeball.gif
rename to src/canonical/models/back/0666-420-Vivillon-Pokeball.gif
diff --git a/src/canonical/models/back/0667--000--Litleo.gif b/src/canonical/models/back/0667-000-Litleo.gif
similarity index 100%
rename from src/canonical/models/back/0667--000--Litleo.gif
rename to src/canonical/models/back/0667-000-Litleo.gif
diff --git a/src/canonical/models/back/0668--000--Pyroar.gif b/src/canonical/models/back/0668-000-Pyroar.gif
similarity index 100%
rename from src/canonical/models/back/0668--000--Pyroar.gif
rename to src/canonical/models/back/0668-000-Pyroar.gif
diff --git a/src/canonical/models/back/0669--000--Flabe__0301be__0301.gif b/src/canonical/models/back/0669-000-Flabe__0301be__0301.gif
similarity index 100%
rename from src/canonical/models/back/0669--000--Flabe__0301be__0301.gif
rename to src/canonical/models/back/0669-000-Flabe__0301be__0301.gif
diff --git a/src/canonical/models/back/0670--000--Floette.gif b/src/canonical/models/back/0670-000-Floette.gif
similarity index 100%
rename from src/canonical/models/back/0670--000--Floette.gif
rename to src/canonical/models/back/0670-000-Floette.gif
diff --git a/src/canonical/models/back/0670--420--Floette--Eternal.gif b/src/canonical/models/back/0670-420-Floette-Eternal.gif
similarity index 100%
rename from src/canonical/models/back/0670--420--Floette--Eternal.gif
rename to src/canonical/models/back/0670-420-Floette-Eternal.gif
diff --git a/src/canonical/models/back/0671--000--Florges.gif b/src/canonical/models/back/0671-000-Florges.gif
similarity index 100%
rename from src/canonical/models/back/0671--000--Florges.gif
rename to src/canonical/models/back/0671-000-Florges.gif
diff --git a/src/canonical/models/back/0672--000--Skiddo.gif b/src/canonical/models/back/0672-000-Skiddo.gif
similarity index 100%
rename from src/canonical/models/back/0672--000--Skiddo.gif
rename to src/canonical/models/back/0672-000-Skiddo.gif
diff --git a/src/canonical/models/back/0673--000--Gogoat.gif b/src/canonical/models/back/0673-000-Gogoat.gif
similarity index 100%
rename from src/canonical/models/back/0673--000--Gogoat.gif
rename to src/canonical/models/back/0673-000-Gogoat.gif
diff --git a/src/canonical/models/back/0674--000--Pancham.gif b/src/canonical/models/back/0674-000-Pancham.gif
similarity index 100%
rename from src/canonical/models/back/0674--000--Pancham.gif
rename to src/canonical/models/back/0674-000-Pancham.gif
diff --git a/src/canonical/models/back/0675--000--Pangoro.gif b/src/canonical/models/back/0675-000-Pangoro.gif
similarity index 100%
rename from src/canonical/models/back/0675--000--Pangoro.gif
rename to src/canonical/models/back/0675-000-Pangoro.gif
diff --git a/src/canonical/models/back/0676--000--Furfrou.gif b/src/canonical/models/back/0676-000-Furfrou.gif
similarity index 100%
rename from src/canonical/models/back/0676--000--Furfrou.gif
rename to src/canonical/models/back/0676-000-Furfrou.gif
diff --git a/src/canonical/models/back/0677--000--Espurr.gif b/src/canonical/models/back/0677-000-Espurr.gif
similarity index 100%
rename from src/canonical/models/back/0677--000--Espurr.gif
rename to src/canonical/models/back/0677-000-Espurr.gif
diff --git a/src/canonical/models/back/0678--000--Meowstic.gif b/src/canonical/models/back/0678-000-Meowstic.gif
similarity index 100%
rename from src/canonical/models/back/0678--000--Meowstic.gif
rename to src/canonical/models/back/0678-000-Meowstic.gif
diff --git a/src/canonical/models/back/0678--420--Meowstic--F.gif b/src/canonical/models/back/0678-420-Meowstic-F.gif
similarity index 100%
rename from src/canonical/models/back/0678--420--Meowstic--F.gif
rename to src/canonical/models/back/0678-420-Meowstic-F.gif
diff --git a/src/canonical/models/back/0679--000--Honedge.gif b/src/canonical/models/back/0679-000-Honedge.gif
similarity index 100%
rename from src/canonical/models/back/0679--000--Honedge.gif
rename to src/canonical/models/back/0679-000-Honedge.gif
diff --git a/src/canonical/models/back/0680--000--Doublade.gif b/src/canonical/models/back/0680-000-Doublade.gif
similarity index 100%
rename from src/canonical/models/back/0680--000--Doublade.gif
rename to src/canonical/models/back/0680-000-Doublade.gif
diff --git a/src/canonical/models/back/0681--000--Aegislash.gif b/src/canonical/models/back/0681-000-Aegislash.gif
similarity index 100%
rename from src/canonical/models/back/0681--000--Aegislash.gif
rename to src/canonical/models/back/0681-000-Aegislash.gif
diff --git a/src/canonical/models/back/0681--420--Aegislash--Blade.gif b/src/canonical/models/back/0681-420-Aegislash-Blade.gif
similarity index 100%
rename from src/canonical/models/back/0681--420--Aegislash--Blade.gif
rename to src/canonical/models/back/0681-420-Aegislash-Blade.gif
diff --git a/src/canonical/models/back/0682--000--Spritzee.gif b/src/canonical/models/back/0682-000-Spritzee.gif
similarity index 100%
rename from src/canonical/models/back/0682--000--Spritzee.gif
rename to src/canonical/models/back/0682-000-Spritzee.gif
diff --git a/src/canonical/models/back/0683--000--Aromatisse.gif b/src/canonical/models/back/0683-000-Aromatisse.gif
similarity index 100%
rename from src/canonical/models/back/0683--000--Aromatisse.gif
rename to src/canonical/models/back/0683-000-Aromatisse.gif
diff --git a/src/canonical/models/back/0684--000--Swirlix.gif b/src/canonical/models/back/0684-000-Swirlix.gif
similarity index 100%
rename from src/canonical/models/back/0684--000--Swirlix.gif
rename to src/canonical/models/back/0684-000-Swirlix.gif
diff --git a/src/canonical/models/back/0685--000--Slurpuff.gif b/src/canonical/models/back/0685-000-Slurpuff.gif
similarity index 100%
rename from src/canonical/models/back/0685--000--Slurpuff.gif
rename to src/canonical/models/back/0685-000-Slurpuff.gif
diff --git a/src/canonical/models/back/0686--000--Inkay.gif b/src/canonical/models/back/0686-000-Inkay.gif
similarity index 100%
rename from src/canonical/models/back/0686--000--Inkay.gif
rename to src/canonical/models/back/0686-000-Inkay.gif
diff --git a/src/canonical/models/back/0687--000--Malamar.gif b/src/canonical/models/back/0687-000-Malamar.gif
similarity index 100%
rename from src/canonical/models/back/0687--000--Malamar.gif
rename to src/canonical/models/back/0687-000-Malamar.gif
diff --git a/src/canonical/models/back/0688--000--Binacle.gif b/src/canonical/models/back/0688-000-Binacle.gif
similarity index 100%
rename from src/canonical/models/back/0688--000--Binacle.gif
rename to src/canonical/models/back/0688-000-Binacle.gif
diff --git a/src/canonical/models/back/0689--000--Barbaracle.gif b/src/canonical/models/back/0689-000-Barbaracle.gif
similarity index 100%
rename from src/canonical/models/back/0689--000--Barbaracle.gif
rename to src/canonical/models/back/0689-000-Barbaracle.gif
diff --git a/src/canonical/models/back/0690--000--Skrelp.gif b/src/canonical/models/back/0690-000-Skrelp.gif
similarity index 100%
rename from src/canonical/models/back/0690--000--Skrelp.gif
rename to src/canonical/models/back/0690-000-Skrelp.gif
diff --git a/src/canonical/models/back/0691--000--Dragalge.gif b/src/canonical/models/back/0691-000-Dragalge.gif
similarity index 100%
rename from src/canonical/models/back/0691--000--Dragalge.gif
rename to src/canonical/models/back/0691-000-Dragalge.gif
diff --git a/src/canonical/models/back/0692--000--Clauncher.gif b/src/canonical/models/back/0692-000-Clauncher.gif
similarity index 100%
rename from src/canonical/models/back/0692--000--Clauncher.gif
rename to src/canonical/models/back/0692-000-Clauncher.gif
diff --git a/src/canonical/models/back/0693--000--Clawitzer.gif b/src/canonical/models/back/0693-000-Clawitzer.gif
similarity index 100%
rename from src/canonical/models/back/0693--000--Clawitzer.gif
rename to src/canonical/models/back/0693-000-Clawitzer.gif
diff --git a/src/canonical/models/back/0694--000--Helioptile.gif b/src/canonical/models/back/0694-000-Helioptile.gif
similarity index 100%
rename from src/canonical/models/back/0694--000--Helioptile.gif
rename to src/canonical/models/back/0694-000-Helioptile.gif
diff --git a/src/canonical/models/back/0695--000--Heliolisk.gif b/src/canonical/models/back/0695-000-Heliolisk.gif
similarity index 100%
rename from src/canonical/models/back/0695--000--Heliolisk.gif
rename to src/canonical/models/back/0695-000-Heliolisk.gif
diff --git a/src/canonical/models/back/0696--000--Tyrunt.gif b/src/canonical/models/back/0696-000-Tyrunt.gif
similarity index 100%
rename from src/canonical/models/back/0696--000--Tyrunt.gif
rename to src/canonical/models/back/0696-000-Tyrunt.gif
diff --git a/src/canonical/models/back/0697--000--Tyrantrum.gif b/src/canonical/models/back/0697-000-Tyrantrum.gif
similarity index 100%
rename from src/canonical/models/back/0697--000--Tyrantrum.gif
rename to src/canonical/models/back/0697-000-Tyrantrum.gif
diff --git a/src/canonical/models/back/0698--000--Amaura.gif b/src/canonical/models/back/0698-000-Amaura.gif
similarity index 100%
rename from src/canonical/models/back/0698--000--Amaura.gif
rename to src/canonical/models/back/0698-000-Amaura.gif
diff --git a/src/canonical/models/back/0699--000--Aurorus.gif b/src/canonical/models/back/0699-000-Aurorus.gif
similarity index 100%
rename from src/canonical/models/back/0699--000--Aurorus.gif
rename to src/canonical/models/back/0699-000-Aurorus.gif
diff --git a/src/canonical/models/back/0700--000--Sylveon.gif b/src/canonical/models/back/0700-000-Sylveon.gif
similarity index 100%
rename from src/canonical/models/back/0700--000--Sylveon.gif
rename to src/canonical/models/back/0700-000-Sylveon.gif
diff --git a/src/canonical/models/back/0701--000--Hawlucha.gif b/src/canonical/models/back/0701-000-Hawlucha.gif
similarity index 100%
rename from src/canonical/models/back/0701--000--Hawlucha.gif
rename to src/canonical/models/back/0701-000-Hawlucha.gif
diff --git a/src/canonical/models/back/0702--000--Dedenne.gif b/src/canonical/models/back/0702-000-Dedenne.gif
similarity index 100%
rename from src/canonical/models/back/0702--000--Dedenne.gif
rename to src/canonical/models/back/0702-000-Dedenne.gif
diff --git a/src/canonical/models/back/0703--000--Carbink.gif b/src/canonical/models/back/0703-000-Carbink.gif
similarity index 100%
rename from src/canonical/models/back/0703--000--Carbink.gif
rename to src/canonical/models/back/0703-000-Carbink.gif
diff --git a/src/canonical/models/back/0704--000--Goomy.gif b/src/canonical/models/back/0704-000-Goomy.gif
similarity index 100%
rename from src/canonical/models/back/0704--000--Goomy.gif
rename to src/canonical/models/back/0704-000-Goomy.gif
diff --git a/src/canonical/models/back/0705--000--Sliggoo.gif b/src/canonical/models/back/0705-000-Sliggoo.gif
similarity index 100%
rename from src/canonical/models/back/0705--000--Sliggoo.gif
rename to src/canonical/models/back/0705-000-Sliggoo.gif
diff --git a/src/canonical/models/back/0706--000--Goodra.gif b/src/canonical/models/back/0706-000-Goodra.gif
similarity index 100%
rename from src/canonical/models/back/0706--000--Goodra.gif
rename to src/canonical/models/back/0706-000-Goodra.gif
diff --git a/src/canonical/models/back/0707--000--Klefki.gif b/src/canonical/models/back/0707-000-Klefki.gif
similarity index 100%
rename from src/canonical/models/back/0707--000--Klefki.gif
rename to src/canonical/models/back/0707-000-Klefki.gif
diff --git a/src/canonical/models/back/0708--000--Phantump.gif b/src/canonical/models/back/0708-000-Phantump.gif
similarity index 100%
rename from src/canonical/models/back/0708--000--Phantump.gif
rename to src/canonical/models/back/0708-000-Phantump.gif
diff --git a/src/canonical/models/back/0709--000--Trevenant.gif b/src/canonical/models/back/0709-000-Trevenant.gif
similarity index 100%
rename from src/canonical/models/back/0709--000--Trevenant.gif
rename to src/canonical/models/back/0709-000-Trevenant.gif
diff --git a/src/canonical/models/back/0710--000--Pumpkaboo.gif b/src/canonical/models/back/0710-000-Pumpkaboo.gif
similarity index 100%
rename from src/canonical/models/back/0710--000--Pumpkaboo.gif
rename to src/canonical/models/back/0710-000-Pumpkaboo.gif
diff --git a/src/canonical/models/back/0710--420--Pumpkaboo--Large.gif b/src/canonical/models/back/0710-420-Pumpkaboo-Large.gif
similarity index 100%
rename from src/canonical/models/back/0710--420--Pumpkaboo--Large.gif
rename to src/canonical/models/back/0710-420-Pumpkaboo-Large.gif
diff --git a/src/canonical/models/back/0710--420--Pumpkaboo--Small.gif b/src/canonical/models/back/0710-420-Pumpkaboo-Small.gif
similarity index 100%
rename from src/canonical/models/back/0710--420--Pumpkaboo--Small.gif
rename to src/canonical/models/back/0710-420-Pumpkaboo-Small.gif
diff --git a/src/canonical/models/back/0710--420--Pumpkaboo--Super.gif b/src/canonical/models/back/0710-420-Pumpkaboo-Super.gif
similarity index 100%
rename from src/canonical/models/back/0710--420--Pumpkaboo--Super.gif
rename to src/canonical/models/back/0710-420-Pumpkaboo-Super.gif
diff --git a/src/canonical/models/back/0711--000--Gourgeist.gif b/src/canonical/models/back/0711-000-Gourgeist.gif
similarity index 100%
rename from src/canonical/models/back/0711--000--Gourgeist.gif
rename to src/canonical/models/back/0711-000-Gourgeist.gif
diff --git a/src/canonical/models/back/0711--420--Gourgeist--Large.gif b/src/canonical/models/back/0711-420-Gourgeist-Large.gif
similarity index 100%
rename from src/canonical/models/back/0711--420--Gourgeist--Large.gif
rename to src/canonical/models/back/0711-420-Gourgeist-Large.gif
diff --git a/src/canonical/models/back/0711--420--Gourgeist--Small.gif b/src/canonical/models/back/0711-420-Gourgeist-Small.gif
similarity index 100%
rename from src/canonical/models/back/0711--420--Gourgeist--Small.gif
rename to src/canonical/models/back/0711-420-Gourgeist-Small.gif
diff --git a/src/canonical/models/back/0711--420--Gourgeist--Super.gif b/src/canonical/models/back/0711-420-Gourgeist-Super.gif
similarity index 100%
rename from src/canonical/models/back/0711--420--Gourgeist--Super.gif
rename to src/canonical/models/back/0711-420-Gourgeist-Super.gif
diff --git a/src/canonical/models/back/0712--000--Bergmite.gif b/src/canonical/models/back/0712-000-Bergmite.gif
similarity index 100%
rename from src/canonical/models/back/0712--000--Bergmite.gif
rename to src/canonical/models/back/0712-000-Bergmite.gif
diff --git a/src/canonical/models/back/0713--000--Avalugg.gif b/src/canonical/models/back/0713-000-Avalugg.gif
similarity index 100%
rename from src/canonical/models/back/0713--000--Avalugg.gif
rename to src/canonical/models/back/0713-000-Avalugg.gif
diff --git a/src/canonical/models/back/0714--000--Noibat.gif b/src/canonical/models/back/0714-000-Noibat.gif
similarity index 100%
rename from src/canonical/models/back/0714--000--Noibat.gif
rename to src/canonical/models/back/0714-000-Noibat.gif
diff --git a/src/canonical/models/back/0715--000--Noivern.gif b/src/canonical/models/back/0715-000-Noivern.gif
similarity index 100%
rename from src/canonical/models/back/0715--000--Noivern.gif
rename to src/canonical/models/back/0715-000-Noivern.gif
diff --git a/src/canonical/models/back/0716--000--Xerneas.gif b/src/canonical/models/back/0716-000-Xerneas.gif
similarity index 100%
rename from src/canonical/models/back/0716--000--Xerneas.gif
rename to src/canonical/models/back/0716-000-Xerneas.gif
diff --git a/src/canonical/models/back/0717--000--Yveltal.gif b/src/canonical/models/back/0717-000-Yveltal.gif
similarity index 100%
rename from src/canonical/models/back/0717--000--Yveltal.gif
rename to src/canonical/models/back/0717-000-Yveltal.gif
diff --git a/src/canonical/models/back/0718--000--Zygarde.gif b/src/canonical/models/back/0718-000-Zygarde.gif
similarity index 100%
rename from src/canonical/models/back/0718--000--Zygarde.gif
rename to src/canonical/models/back/0718-000-Zygarde.gif
diff --git a/src/canonical/models/back/0718--420--Zygarde--10__0025.gif b/src/canonical/models/back/0718-420-Zygarde-10__0025.gif
similarity index 100%
rename from src/canonical/models/back/0718--420--Zygarde--10__0025.gif
rename to src/canonical/models/back/0718-420-Zygarde-10__0025.gif
diff --git a/src/canonical/models/back/0718--420--Zygarde--Complete.gif b/src/canonical/models/back/0718-420-Zygarde-Complete.gif
similarity index 100%
rename from src/canonical/models/back/0718--420--Zygarde--Complete.gif
rename to src/canonical/models/back/0718-420-Zygarde-Complete.gif
diff --git a/src/canonical/models/back/0719--000--Diancie.gif b/src/canonical/models/back/0719-000-Diancie.gif
similarity index 100%
rename from src/canonical/models/back/0719--000--Diancie.gif
rename to src/canonical/models/back/0719-000-Diancie.gif
diff --git a/src/canonical/models/back/0719--420--Diancie--Mega.gif b/src/canonical/models/back/0719-420-Diancie-Mega.gif
similarity index 100%
rename from src/canonical/models/back/0719--420--Diancie--Mega.gif
rename to src/canonical/models/back/0719-420-Diancie-Mega.gif
diff --git a/src/canonical/models/back/0720--000--Hoopa.gif b/src/canonical/models/back/0720-000-Hoopa.gif
similarity index 100%
rename from src/canonical/models/back/0720--000--Hoopa.gif
rename to src/canonical/models/back/0720-000-Hoopa.gif
diff --git a/src/canonical/models/back/0720--420--Hoopa--Unbound.gif b/src/canonical/models/back/0720-420-Hoopa-Unbound.gif
similarity index 100%
rename from src/canonical/models/back/0720--420--Hoopa--Unbound.gif
rename to src/canonical/models/back/0720-420-Hoopa-Unbound.gif
diff --git a/src/canonical/models/back/0721--000--Volcanion.gif b/src/canonical/models/back/0721-000-Volcanion.gif
similarity index 100%
rename from src/canonical/models/back/0721--000--Volcanion.gif
rename to src/canonical/models/back/0721-000-Volcanion.gif
diff --git a/src/canonical/models/back/0722--000--Rowlet.gif b/src/canonical/models/back/0722-000-Rowlet.gif
similarity index 100%
rename from src/canonical/models/back/0722--000--Rowlet.gif
rename to src/canonical/models/back/0722-000-Rowlet.gif
diff --git a/src/canonical/models/back/0723--000--Dartrix.gif b/src/canonical/models/back/0723-000-Dartrix.gif
similarity index 100%
rename from src/canonical/models/back/0723--000--Dartrix.gif
rename to src/canonical/models/back/0723-000-Dartrix.gif
diff --git a/src/canonical/models/back/0724--000--Decidueye.gif b/src/canonical/models/back/0724-000-Decidueye.gif
similarity index 100%
rename from src/canonical/models/back/0724--000--Decidueye.gif
rename to src/canonical/models/back/0724-000-Decidueye.gif
diff --git a/src/canonical/models/back/0725--000--Litten.gif b/src/canonical/models/back/0725-000-Litten.gif
similarity index 100%
rename from src/canonical/models/back/0725--000--Litten.gif
rename to src/canonical/models/back/0725-000-Litten.gif
diff --git a/src/canonical/models/back/0726--000--Torracat.gif b/src/canonical/models/back/0726-000-Torracat.gif
similarity index 100%
rename from src/canonical/models/back/0726--000--Torracat.gif
rename to src/canonical/models/back/0726-000-Torracat.gif
diff --git a/src/canonical/models/back/0727--000--Incineroar.gif b/src/canonical/models/back/0727-000-Incineroar.gif
similarity index 100%
rename from src/canonical/models/back/0727--000--Incineroar.gif
rename to src/canonical/models/back/0727-000-Incineroar.gif
diff --git a/src/canonical/models/back/0728--000--Popplio.gif b/src/canonical/models/back/0728-000-Popplio.gif
similarity index 100%
rename from src/canonical/models/back/0728--000--Popplio.gif
rename to src/canonical/models/back/0728-000-Popplio.gif
diff --git a/src/canonical/models/back/0729--000--Brionne.gif b/src/canonical/models/back/0729-000-Brionne.gif
similarity index 100%
rename from src/canonical/models/back/0729--000--Brionne.gif
rename to src/canonical/models/back/0729-000-Brionne.gif
diff --git a/src/canonical/models/back/0730--000--Primarina.gif b/src/canonical/models/back/0730-000-Primarina.gif
similarity index 100%
rename from src/canonical/models/back/0730--000--Primarina.gif
rename to src/canonical/models/back/0730-000-Primarina.gif
diff --git a/src/canonical/models/back/0731--000--Pikipek.gif b/src/canonical/models/back/0731-000-Pikipek.gif
similarity index 100%
rename from src/canonical/models/back/0731--000--Pikipek.gif
rename to src/canonical/models/back/0731-000-Pikipek.gif
diff --git a/src/canonical/models/back/0732--000--Trumbeak.gif b/src/canonical/models/back/0732-000-Trumbeak.gif
similarity index 100%
rename from src/canonical/models/back/0732--000--Trumbeak.gif
rename to src/canonical/models/back/0732-000-Trumbeak.gif
diff --git a/src/canonical/models/back/0733--000--Toucannon.gif b/src/canonical/models/back/0733-000-Toucannon.gif
similarity index 100%
rename from src/canonical/models/back/0733--000--Toucannon.gif
rename to src/canonical/models/back/0733-000-Toucannon.gif
diff --git a/src/canonical/models/back/0734--000--Yungoos.gif b/src/canonical/models/back/0734-000-Yungoos.gif
similarity index 100%
rename from src/canonical/models/back/0734--000--Yungoos.gif
rename to src/canonical/models/back/0734-000-Yungoos.gif
diff --git a/src/canonical/models/back/0735--000--Gumshoos.gif b/src/canonical/models/back/0735-000-Gumshoos.gif
similarity index 100%
rename from src/canonical/models/back/0735--000--Gumshoos.gif
rename to src/canonical/models/back/0735-000-Gumshoos.gif
diff --git a/src/canonical/models/back/0735--420--Gumshoos--Totem.gif b/src/canonical/models/back/0735-420-Gumshoos-Totem.gif
similarity index 100%
rename from src/canonical/models/back/0735--420--Gumshoos--Totem.gif
rename to src/canonical/models/back/0735-420-Gumshoos-Totem.gif
diff --git a/src/canonical/models/back/0736--000--Grubbin.gif b/src/canonical/models/back/0736-000-Grubbin.gif
similarity index 100%
rename from src/canonical/models/back/0736--000--Grubbin.gif
rename to src/canonical/models/back/0736-000-Grubbin.gif
diff --git a/src/canonical/models/back/0737--000--Charjabug.gif b/src/canonical/models/back/0737-000-Charjabug.gif
similarity index 100%
rename from src/canonical/models/back/0737--000--Charjabug.gif
rename to src/canonical/models/back/0737-000-Charjabug.gif
diff --git a/src/canonical/models/back/0738--000--Vikavolt.gif b/src/canonical/models/back/0738-000-Vikavolt.gif
similarity index 100%
rename from src/canonical/models/back/0738--000--Vikavolt.gif
rename to src/canonical/models/back/0738-000-Vikavolt.gif
diff --git a/src/canonical/models/back/0738--420--Vikavolt--Totem.gif b/src/canonical/models/back/0738-420-Vikavolt-Totem.gif
similarity index 100%
rename from src/canonical/models/back/0738--420--Vikavolt--Totem.gif
rename to src/canonical/models/back/0738-420-Vikavolt-Totem.gif
diff --git a/src/canonical/models/back/0739--000--Crabrawler.gif b/src/canonical/models/back/0739-000-Crabrawler.gif
similarity index 100%
rename from src/canonical/models/back/0739--000--Crabrawler.gif
rename to src/canonical/models/back/0739-000-Crabrawler.gif
diff --git a/src/canonical/models/back/0740--000--Crabominable.gif b/src/canonical/models/back/0740-000-Crabominable.gif
similarity index 100%
rename from src/canonical/models/back/0740--000--Crabominable.gif
rename to src/canonical/models/back/0740-000-Crabominable.gif
diff --git a/src/canonical/models/back/0741--000--Oricorio.gif b/src/canonical/models/back/0741-000-Oricorio.gif
similarity index 100%
rename from src/canonical/models/back/0741--000--Oricorio.gif
rename to src/canonical/models/back/0741-000-Oricorio.gif
diff --git a/src/canonical/models/back/0741--420--Oricorio--Pa__0027u.gif b/src/canonical/models/back/0741-420-Oricorio-Pa__0027u.gif
similarity index 100%
rename from src/canonical/models/back/0741--420--Oricorio--Pa__0027u.gif
rename to src/canonical/models/back/0741-420-Oricorio-Pa__0027u.gif
diff --git a/src/canonical/models/back/0741--420--Oricorio--Pom-Pom.gif b/src/canonical/models/back/0741-420-Oricorio-Pom~Pom.gif
similarity index 100%
rename from src/canonical/models/back/0741--420--Oricorio--Pom-Pom.gif
rename to src/canonical/models/back/0741-420-Oricorio-Pom~Pom.gif
diff --git a/src/canonical/models/back/0741--420--Oricorio--Sensu.gif b/src/canonical/models/back/0741-420-Oricorio-Sensu.gif
similarity index 100%
rename from src/canonical/models/back/0741--420--Oricorio--Sensu.gif
rename to src/canonical/models/back/0741-420-Oricorio-Sensu.gif
diff --git a/src/canonical/models/back/0742--000--Cutiefly.gif b/src/canonical/models/back/0742-000-Cutiefly.gif
similarity index 100%
rename from src/canonical/models/back/0742--000--Cutiefly.gif
rename to src/canonical/models/back/0742-000-Cutiefly.gif
diff --git a/src/canonical/models/back/0743--000--Ribombee.gif b/src/canonical/models/back/0743-000-Ribombee.gif
similarity index 100%
rename from src/canonical/models/back/0743--000--Ribombee.gif
rename to src/canonical/models/back/0743-000-Ribombee.gif
diff --git a/src/canonical/models/back/0743--420--Ribombee--Totem.gif b/src/canonical/models/back/0743-420-Ribombee-Totem.gif
similarity index 100%
rename from src/canonical/models/back/0743--420--Ribombee--Totem.gif
rename to src/canonical/models/back/0743-420-Ribombee-Totem.gif
diff --git a/src/canonical/models/back/0744--000--Rockruff.gif b/src/canonical/models/back/0744-000-Rockruff.gif
similarity index 100%
rename from src/canonical/models/back/0744--000--Rockruff.gif
rename to src/canonical/models/back/0744-000-Rockruff.gif
diff --git a/src/canonical/models/back/0745--000--Lycanroc.gif b/src/canonical/models/back/0745-000-Lycanroc.gif
similarity index 100%
rename from src/canonical/models/back/0745--000--Lycanroc.gif
rename to src/canonical/models/back/0745-000-Lycanroc.gif
diff --git a/src/canonical/models/back/0745--420--Lycanroc--Dusk.gif b/src/canonical/models/back/0745-420-Lycanroc-Dusk.gif
similarity index 100%
rename from src/canonical/models/back/0745--420--Lycanroc--Dusk.gif
rename to src/canonical/models/back/0745-420-Lycanroc-Dusk.gif
diff --git a/src/canonical/models/back/0745--420--Lycanroc--Midnight.gif b/src/canonical/models/back/0745-420-Lycanroc-Midnight.gif
similarity index 100%
rename from src/canonical/models/back/0745--420--Lycanroc--Midnight.gif
rename to src/canonical/models/back/0745-420-Lycanroc-Midnight.gif
diff --git a/src/canonical/models/back/0746--000--Wishiwashi.gif b/src/canonical/models/back/0746-000-Wishiwashi.gif
similarity index 100%
rename from src/canonical/models/back/0746--000--Wishiwashi.gif
rename to src/canonical/models/back/0746-000-Wishiwashi.gif
diff --git a/src/canonical/models/back/0746--420--Wishiwashi--School.gif b/src/canonical/models/back/0746-420-Wishiwashi-School.gif
similarity index 100%
rename from src/canonical/models/back/0746--420--Wishiwashi--School.gif
rename to src/canonical/models/back/0746-420-Wishiwashi-School.gif
diff --git a/src/canonical/models/back/0747--000--Mareanie.gif b/src/canonical/models/back/0747-000-Mareanie.gif
similarity index 100%
rename from src/canonical/models/back/0747--000--Mareanie.gif
rename to src/canonical/models/back/0747-000-Mareanie.gif
diff --git a/src/canonical/models/back/0748--000--Toxapex.gif b/src/canonical/models/back/0748-000-Toxapex.gif
similarity index 100%
rename from src/canonical/models/back/0748--000--Toxapex.gif
rename to src/canonical/models/back/0748-000-Toxapex.gif
diff --git a/src/canonical/models/back/0749--000--Mudbray.gif b/src/canonical/models/back/0749-000-Mudbray.gif
similarity index 100%
rename from src/canonical/models/back/0749--000--Mudbray.gif
rename to src/canonical/models/back/0749-000-Mudbray.gif
diff --git a/src/canonical/models/back/0750--000--Mudsdale.gif b/src/canonical/models/back/0750-000-Mudsdale.gif
similarity index 100%
rename from src/canonical/models/back/0750--000--Mudsdale.gif
rename to src/canonical/models/back/0750-000-Mudsdale.gif
diff --git a/src/canonical/models/back/0751--000--Dewpider.gif b/src/canonical/models/back/0751-000-Dewpider.gif
similarity index 100%
rename from src/canonical/models/back/0751--000--Dewpider.gif
rename to src/canonical/models/back/0751-000-Dewpider.gif
diff --git a/src/canonical/models/back/0752--000--Araquanid.gif b/src/canonical/models/back/0752-000-Araquanid.gif
similarity index 100%
rename from src/canonical/models/back/0752--000--Araquanid.gif
rename to src/canonical/models/back/0752-000-Araquanid.gif
diff --git a/src/canonical/models/back/0752--420--Araquanid--Totem.gif b/src/canonical/models/back/0752-420-Araquanid-Totem.gif
similarity index 100%
rename from src/canonical/models/back/0752--420--Araquanid--Totem.gif
rename to src/canonical/models/back/0752-420-Araquanid-Totem.gif
diff --git a/src/canonical/models/back/0753--000--Fomantis.gif b/src/canonical/models/back/0753-000-Fomantis.gif
similarity index 100%
rename from src/canonical/models/back/0753--000--Fomantis.gif
rename to src/canonical/models/back/0753-000-Fomantis.gif
diff --git a/src/canonical/models/back/0754--000--Lurantis.gif b/src/canonical/models/back/0754-000-Lurantis.gif
similarity index 100%
rename from src/canonical/models/back/0754--000--Lurantis.gif
rename to src/canonical/models/back/0754-000-Lurantis.gif
diff --git a/src/canonical/models/back/0754--420--Lurantis--Totem.gif b/src/canonical/models/back/0754-420-Lurantis-Totem.gif
similarity index 100%
rename from src/canonical/models/back/0754--420--Lurantis--Totem.gif
rename to src/canonical/models/back/0754-420-Lurantis-Totem.gif
diff --git a/src/canonical/models/back/0755--000--Morelull.gif b/src/canonical/models/back/0755-000-Morelull.gif
similarity index 100%
rename from src/canonical/models/back/0755--000--Morelull.gif
rename to src/canonical/models/back/0755-000-Morelull.gif
diff --git a/src/canonical/models/back/0756--000--Shiinotic.gif b/src/canonical/models/back/0756-000-Shiinotic.gif
similarity index 100%
rename from src/canonical/models/back/0756--000--Shiinotic.gif
rename to src/canonical/models/back/0756-000-Shiinotic.gif
diff --git a/src/canonical/models/back/0757--000--Salandit.gif b/src/canonical/models/back/0757-000-Salandit.gif
similarity index 100%
rename from src/canonical/models/back/0757--000--Salandit.gif
rename to src/canonical/models/back/0757-000-Salandit.gif
diff --git a/src/canonical/models/back/0758--000--Salazzle.gif b/src/canonical/models/back/0758-000-Salazzle.gif
similarity index 100%
rename from src/canonical/models/back/0758--000--Salazzle.gif
rename to src/canonical/models/back/0758-000-Salazzle.gif
diff --git a/src/canonical/models/back/0758--420--Salazzle--Totem.gif b/src/canonical/models/back/0758-420-Salazzle-Totem.gif
similarity index 100%
rename from src/canonical/models/back/0758--420--Salazzle--Totem.gif
rename to src/canonical/models/back/0758-420-Salazzle-Totem.gif
diff --git a/src/canonical/models/back/0759--000--Stufful.gif b/src/canonical/models/back/0759-000-Stufful.gif
similarity index 100%
rename from src/canonical/models/back/0759--000--Stufful.gif
rename to src/canonical/models/back/0759-000-Stufful.gif
diff --git a/src/canonical/models/back/0760--000--Bewear.gif b/src/canonical/models/back/0760-000-Bewear.gif
similarity index 100%
rename from src/canonical/models/back/0760--000--Bewear.gif
rename to src/canonical/models/back/0760-000-Bewear.gif
diff --git a/src/canonical/models/back/0761--000--Bounsweet.gif b/src/canonical/models/back/0761-000-Bounsweet.gif
similarity index 100%
rename from src/canonical/models/back/0761--000--Bounsweet.gif
rename to src/canonical/models/back/0761-000-Bounsweet.gif
diff --git a/src/canonical/models/back/0762--000--Steenee.gif b/src/canonical/models/back/0762-000-Steenee.gif
similarity index 100%
rename from src/canonical/models/back/0762--000--Steenee.gif
rename to src/canonical/models/back/0762-000-Steenee.gif
diff --git a/src/canonical/models/back/0763--000--Tsareena.gif b/src/canonical/models/back/0763-000-Tsareena.gif
similarity index 100%
rename from src/canonical/models/back/0763--000--Tsareena.gif
rename to src/canonical/models/back/0763-000-Tsareena.gif
diff --git a/src/canonical/models/back/0764--000--Comfey.gif b/src/canonical/models/back/0764-000-Comfey.gif
similarity index 100%
rename from src/canonical/models/back/0764--000--Comfey.gif
rename to src/canonical/models/back/0764-000-Comfey.gif
diff --git a/src/canonical/models/back/0765--000--Oranguru.gif b/src/canonical/models/back/0765-000-Oranguru.gif
similarity index 100%
rename from src/canonical/models/back/0765--000--Oranguru.gif
rename to src/canonical/models/back/0765-000-Oranguru.gif
diff --git a/src/canonical/models/back/0766--000--Passimian.gif b/src/canonical/models/back/0766-000-Passimian.gif
similarity index 100%
rename from src/canonical/models/back/0766--000--Passimian.gif
rename to src/canonical/models/back/0766-000-Passimian.gif
diff --git a/src/canonical/models/back/0767--000--Wimpod.gif b/src/canonical/models/back/0767-000-Wimpod.gif
similarity index 100%
rename from src/canonical/models/back/0767--000--Wimpod.gif
rename to src/canonical/models/back/0767-000-Wimpod.gif
diff --git a/src/canonical/models/back/0768--000--Golisopod.gif b/src/canonical/models/back/0768-000-Golisopod.gif
similarity index 100%
rename from src/canonical/models/back/0768--000--Golisopod.gif
rename to src/canonical/models/back/0768-000-Golisopod.gif
diff --git a/src/canonical/models/back/0769--000--Sandygast.gif b/src/canonical/models/back/0769-000-Sandygast.gif
similarity index 100%
rename from src/canonical/models/back/0769--000--Sandygast.gif
rename to src/canonical/models/back/0769-000-Sandygast.gif
diff --git a/src/canonical/models/back/0770--000--Palossand.gif b/src/canonical/models/back/0770-000-Palossand.gif
similarity index 100%
rename from src/canonical/models/back/0770--000--Palossand.gif
rename to src/canonical/models/back/0770-000-Palossand.gif
diff --git a/src/canonical/models/back/0771--000--Pyukumuku.gif b/src/canonical/models/back/0771-000-Pyukumuku.gif
similarity index 100%
rename from src/canonical/models/back/0771--000--Pyukumuku.gif
rename to src/canonical/models/back/0771-000-Pyukumuku.gif
diff --git a/src/canonical/models/back/0772--000--Type__003a_Null.gif b/src/canonical/models/back/0772-000-Type__003a_Null.gif
similarity index 100%
rename from src/canonical/models/back/0772--000--Type__003a_Null.gif
rename to src/canonical/models/back/0772-000-Type__003a_Null.gif
diff --git a/src/canonical/models/back/0773--000--Silvally.gif b/src/canonical/models/back/0773-000-Silvally.gif
similarity index 100%
rename from src/canonical/models/back/0773--000--Silvally.gif
rename to src/canonical/models/back/0773-000-Silvally.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Bug.gif b/src/canonical/models/back/0773-420-Silvally-Bug.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Bug.gif
rename to src/canonical/models/back/0773-420-Silvally-Bug.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Dark.gif b/src/canonical/models/back/0773-420-Silvally-Dark.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Dark.gif
rename to src/canonical/models/back/0773-420-Silvally-Dark.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Dragon.gif b/src/canonical/models/back/0773-420-Silvally-Dragon.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Dragon.gif
rename to src/canonical/models/back/0773-420-Silvally-Dragon.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Electric.gif b/src/canonical/models/back/0773-420-Silvally-Electric.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Electric.gif
rename to src/canonical/models/back/0773-420-Silvally-Electric.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Fairy.gif b/src/canonical/models/back/0773-420-Silvally-Fairy.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Fairy.gif
rename to src/canonical/models/back/0773-420-Silvally-Fairy.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Fighting.gif b/src/canonical/models/back/0773-420-Silvally-Fighting.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Fighting.gif
rename to src/canonical/models/back/0773-420-Silvally-Fighting.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Fire.gif b/src/canonical/models/back/0773-420-Silvally-Fire.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Fire.gif
rename to src/canonical/models/back/0773-420-Silvally-Fire.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Flying.gif b/src/canonical/models/back/0773-420-Silvally-Flying.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Flying.gif
rename to src/canonical/models/back/0773-420-Silvally-Flying.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Ghost.gif b/src/canonical/models/back/0773-420-Silvally-Ghost.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Ghost.gif
rename to src/canonical/models/back/0773-420-Silvally-Ghost.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Grass.gif b/src/canonical/models/back/0773-420-Silvally-Grass.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Grass.gif
rename to src/canonical/models/back/0773-420-Silvally-Grass.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Ground.gif b/src/canonical/models/back/0773-420-Silvally-Ground.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Ground.gif
rename to src/canonical/models/back/0773-420-Silvally-Ground.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Ice.gif b/src/canonical/models/back/0773-420-Silvally-Ice.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Ice.gif
rename to src/canonical/models/back/0773-420-Silvally-Ice.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Poison.gif b/src/canonical/models/back/0773-420-Silvally-Poison.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Poison.gif
rename to src/canonical/models/back/0773-420-Silvally-Poison.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Psychic.gif b/src/canonical/models/back/0773-420-Silvally-Psychic.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Psychic.gif
rename to src/canonical/models/back/0773-420-Silvally-Psychic.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Rock.gif b/src/canonical/models/back/0773-420-Silvally-Rock.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Rock.gif
rename to src/canonical/models/back/0773-420-Silvally-Rock.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Steel.gif b/src/canonical/models/back/0773-420-Silvally-Steel.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Steel.gif
rename to src/canonical/models/back/0773-420-Silvally-Steel.gif
diff --git a/src/canonical/models/back/0773--420--Silvally--Water.gif b/src/canonical/models/back/0773-420-Silvally-Water.gif
similarity index 100%
rename from src/canonical/models/back/0773--420--Silvally--Water.gif
rename to src/canonical/models/back/0773-420-Silvally-Water.gif
diff --git a/src/canonical/models/back/0774--000--Minior.gif b/src/canonical/models/back/0774-000-Minior.gif
similarity index 100%
rename from src/canonical/models/back/0774--000--Minior.gif
rename to src/canonical/models/back/0774-000-Minior.gif
diff --git a/src/canonical/models/back/0775--000--Komala.gif b/src/canonical/models/back/0775-000-Komala.gif
similarity index 100%
rename from src/canonical/models/back/0775--000--Komala.gif
rename to src/canonical/models/back/0775-000-Komala.gif
diff --git a/src/canonical/models/back/0776--000--Turtonator.gif b/src/canonical/models/back/0776-000-Turtonator.gif
similarity index 100%
rename from src/canonical/models/back/0776--000--Turtonator.gif
rename to src/canonical/models/back/0776-000-Turtonator.gif
diff --git a/src/canonical/models/back/0777--000--Togedemaru.gif b/src/canonical/models/back/0777-000-Togedemaru.gif
similarity index 100%
rename from src/canonical/models/back/0777--000--Togedemaru.gif
rename to src/canonical/models/back/0777-000-Togedemaru.gif
diff --git a/src/canonical/models/back/0777--420--Togedemaru--Totem.gif b/src/canonical/models/back/0777-420-Togedemaru-Totem.gif
similarity index 100%
rename from src/canonical/models/back/0777--420--Togedemaru--Totem.gif
rename to src/canonical/models/back/0777-420-Togedemaru-Totem.gif
diff --git a/src/canonical/models/back/0778--000--Mimikyu.gif b/src/canonical/models/back/0778-000-Mimikyu.gif
similarity index 100%
rename from src/canonical/models/back/0778--000--Mimikyu.gif
rename to src/canonical/models/back/0778-000-Mimikyu.gif
diff --git a/src/canonical/models/back/0778--420--Mimikyu--Busted.gif b/src/canonical/models/back/0778-420-Mimikyu-Busted.gif
similarity index 100%
rename from src/canonical/models/back/0778--420--Mimikyu--Busted.gif
rename to src/canonical/models/back/0778-420-Mimikyu-Busted.gif
diff --git a/src/canonical/models/back/0778--420--Mimikyu--Busted-Totem.gif b/src/canonical/models/back/0778-420-Mimikyu-Busted~Totem.gif
similarity index 100%
rename from src/canonical/models/back/0778--420--Mimikyu--Busted-Totem.gif
rename to src/canonical/models/back/0778-420-Mimikyu-Busted~Totem.gif
diff --git a/src/canonical/models/back/0778--420--Mimikyu--Totem.gif b/src/canonical/models/back/0778-420-Mimikyu-Totem.gif
similarity index 100%
rename from src/canonical/models/back/0778--420--Mimikyu--Totem.gif
rename to src/canonical/models/back/0778-420-Mimikyu-Totem.gif
diff --git a/src/canonical/models/back/0779--000--Bruxish.gif b/src/canonical/models/back/0779-000-Bruxish.gif
similarity index 100%
rename from src/canonical/models/back/0779--000--Bruxish.gif
rename to src/canonical/models/back/0779-000-Bruxish.gif
diff --git a/src/canonical/models/back/0780--000--Drampa.gif b/src/canonical/models/back/0780-000-Drampa.gif
similarity index 100%
rename from src/canonical/models/back/0780--000--Drampa.gif
rename to src/canonical/models/back/0780-000-Drampa.gif
diff --git a/src/canonical/models/back/0781--000--Dhelmise.gif b/src/canonical/models/back/0781-000-Dhelmise.gif
similarity index 100%
rename from src/canonical/models/back/0781--000--Dhelmise.gif
rename to src/canonical/models/back/0781-000-Dhelmise.gif
diff --git a/src/canonical/models/back/0782--000--Jangmo-o.gif b/src/canonical/models/back/0782-000-Jangmo~o.gif
similarity index 100%
rename from src/canonical/models/back/0782--000--Jangmo-o.gif
rename to src/canonical/models/back/0782-000-Jangmo~o.gif
diff --git a/src/canonical/models/back/0783--000--Hakamo-o.gif b/src/canonical/models/back/0783-000-Hakamo~o.gif
similarity index 100%
rename from src/canonical/models/back/0783--000--Hakamo-o.gif
rename to src/canonical/models/back/0783-000-Hakamo~o.gif
diff --git a/src/canonical/models/back/0784--000--Kommo-o.gif b/src/canonical/models/back/0784-000-Kommo~o.gif
similarity index 100%
rename from src/canonical/models/back/0784--000--Kommo-o.gif
rename to src/canonical/models/back/0784-000-Kommo~o.gif
diff --git a/src/canonical/models/back/0784--420--Kommo-o--Totem.gif b/src/canonical/models/back/0784-420-Kommo~o-Totem.gif
similarity index 100%
rename from src/canonical/models/back/0784--420--Kommo-o--Totem.gif
rename to src/canonical/models/back/0784-420-Kommo~o-Totem.gif
diff --git a/src/canonical/models/back/0785--000--Tapu_Koko.gif b/src/canonical/models/back/0785-000-Tapu_Koko.gif
similarity index 100%
rename from src/canonical/models/back/0785--000--Tapu_Koko.gif
rename to src/canonical/models/back/0785-000-Tapu_Koko.gif
diff --git a/src/canonical/models/back/0786--000--Tapu_Lele.gif b/src/canonical/models/back/0786-000-Tapu_Lele.gif
similarity index 100%
rename from src/canonical/models/back/0786--000--Tapu_Lele.gif
rename to src/canonical/models/back/0786-000-Tapu_Lele.gif
diff --git a/src/canonical/models/back/0787--000--Tapu_Bulu.gif b/src/canonical/models/back/0787-000-Tapu_Bulu.gif
similarity index 100%
rename from src/canonical/models/back/0787--000--Tapu_Bulu.gif
rename to src/canonical/models/back/0787-000-Tapu_Bulu.gif
diff --git a/src/canonical/models/back/0788--000--Tapu_Fini.gif b/src/canonical/models/back/0788-000-Tapu_Fini.gif
similarity index 100%
rename from src/canonical/models/back/0788--000--Tapu_Fini.gif
rename to src/canonical/models/back/0788-000-Tapu_Fini.gif
diff --git a/src/canonical/models/back/0789--000--Cosmog.gif b/src/canonical/models/back/0789-000-Cosmog.gif
similarity index 100%
rename from src/canonical/models/back/0789--000--Cosmog.gif
rename to src/canonical/models/back/0789-000-Cosmog.gif
diff --git a/src/canonical/models/back/0790--000--Cosmoem.gif b/src/canonical/models/back/0790-000-Cosmoem.gif
similarity index 100%
rename from src/canonical/models/back/0790--000--Cosmoem.gif
rename to src/canonical/models/back/0790-000-Cosmoem.gif
diff --git a/src/canonical/models/back/0791--000--Solgaleo.gif b/src/canonical/models/back/0791-000-Solgaleo.gif
similarity index 100%
rename from src/canonical/models/back/0791--000--Solgaleo.gif
rename to src/canonical/models/back/0791-000-Solgaleo.gif
diff --git a/src/canonical/models/back/0792--000--Lunala.gif b/src/canonical/models/back/0792-000-Lunala.gif
similarity index 100%
rename from src/canonical/models/back/0792--000--Lunala.gif
rename to src/canonical/models/back/0792-000-Lunala.gif
diff --git a/src/canonical/models/back/0793--000--Nihilego.gif b/src/canonical/models/back/0793-000-Nihilego.gif
similarity index 100%
rename from src/canonical/models/back/0793--000--Nihilego.gif
rename to src/canonical/models/back/0793-000-Nihilego.gif
diff --git a/src/canonical/models/back/0794--000--Buzzwole.gif b/src/canonical/models/back/0794-000-Buzzwole.gif
similarity index 100%
rename from src/canonical/models/back/0794--000--Buzzwole.gif
rename to src/canonical/models/back/0794-000-Buzzwole.gif
diff --git a/src/canonical/models/back/0795--000--Pheromosa.gif b/src/canonical/models/back/0795-000-Pheromosa.gif
similarity index 100%
rename from src/canonical/models/back/0795--000--Pheromosa.gif
rename to src/canonical/models/back/0795-000-Pheromosa.gif
diff --git a/src/canonical/models/back/0796--000--Xurkitree.gif b/src/canonical/models/back/0796-000-Xurkitree.gif
similarity index 100%
rename from src/canonical/models/back/0796--000--Xurkitree.gif
rename to src/canonical/models/back/0796-000-Xurkitree.gif
diff --git a/src/canonical/models/back/0797--000--Celesteela.gif b/src/canonical/models/back/0797-000-Celesteela.gif
similarity index 100%
rename from src/canonical/models/back/0797--000--Celesteela.gif
rename to src/canonical/models/back/0797-000-Celesteela.gif
diff --git a/src/canonical/models/back/0798--000--Kartana.gif b/src/canonical/models/back/0798-000-Kartana.gif
similarity index 100%
rename from src/canonical/models/back/0798--000--Kartana.gif
rename to src/canonical/models/back/0798-000-Kartana.gif
diff --git a/src/canonical/models/back/0799--000--Guzzlord.gif b/src/canonical/models/back/0799-000-Guzzlord.gif
similarity index 100%
rename from src/canonical/models/back/0799--000--Guzzlord.gif
rename to src/canonical/models/back/0799-000-Guzzlord.gif
diff --git a/src/canonical/models/back/0800--000--Necrozma.gif b/src/canonical/models/back/0800-000-Necrozma.gif
similarity index 100%
rename from src/canonical/models/back/0800--000--Necrozma.gif
rename to src/canonical/models/back/0800-000-Necrozma.gif
diff --git a/src/canonical/models/back/0800--420--Necrozma--Dawn_Wings.gif b/src/canonical/models/back/0800-420-Necrozma-Dawn_Wings.gif
similarity index 100%
rename from src/canonical/models/back/0800--420--Necrozma--Dawn_Wings.gif
rename to src/canonical/models/back/0800-420-Necrozma-Dawn_Wings.gif
diff --git a/src/canonical/models/back/0800--420--Necrozma--Dusk_Mane.gif b/src/canonical/models/back/0800-420-Necrozma-Dusk_Mane.gif
similarity index 100%
rename from src/canonical/models/back/0800--420--Necrozma--Dusk_Mane.gif
rename to src/canonical/models/back/0800-420-Necrozma-Dusk_Mane.gif
diff --git a/src/canonical/models/back/0800--420--Necrozma--Ultra.gif b/src/canonical/models/back/0800-420-Necrozma-Ultra.gif
similarity index 100%
rename from src/canonical/models/back/0800--420--Necrozma--Ultra.gif
rename to src/canonical/models/back/0800-420-Necrozma-Ultra.gif
diff --git a/src/canonical/models/back/0801--000--Magearna.gif b/src/canonical/models/back/0801-000-Magearna.gif
similarity index 100%
rename from src/canonical/models/back/0801--000--Magearna.gif
rename to src/canonical/models/back/0801-000-Magearna.gif
diff --git a/src/canonical/models/back/0802--000--Marshadow.gif b/src/canonical/models/back/0802-000-Marshadow.gif
similarity index 100%
rename from src/canonical/models/back/0802--000--Marshadow.gif
rename to src/canonical/models/back/0802-000-Marshadow.gif
diff --git a/src/canonical/models/back/0803--000--Poipole.gif b/src/canonical/models/back/0803-000-Poipole.gif
similarity index 100%
rename from src/canonical/models/back/0803--000--Poipole.gif
rename to src/canonical/models/back/0803-000-Poipole.gif
diff --git a/src/canonical/models/back/0804--000--Naganadel.gif b/src/canonical/models/back/0804-000-Naganadel.gif
similarity index 100%
rename from src/canonical/models/back/0804--000--Naganadel.gif
rename to src/canonical/models/back/0804-000-Naganadel.gif
diff --git a/src/canonical/models/back/0805--000--Stakataka.gif b/src/canonical/models/back/0805-000-Stakataka.gif
similarity index 100%
rename from src/canonical/models/back/0805--000--Stakataka.gif
rename to src/canonical/models/back/0805-000-Stakataka.gif
diff --git a/src/canonical/models/back/0806--000--Blacephalon.gif b/src/canonical/models/back/0806-000-Blacephalon.gif
similarity index 100%
rename from src/canonical/models/back/0806--000--Blacephalon.gif
rename to src/canonical/models/back/0806-000-Blacephalon.gif
diff --git a/src/canonical/models/back/0807--000--Zeraora.gif b/src/canonical/models/back/0807-000-Zeraora.gif
similarity index 100%
rename from src/canonical/models/back/0807--000--Zeraora.gif
rename to src/canonical/models/back/0807-000-Zeraora.gif
diff --git a/src/canonical/models/back/0808--000--Meltan.gif b/src/canonical/models/back/0808-000-Meltan.gif
similarity index 100%
rename from src/canonical/models/back/0808--000--Meltan.gif
rename to src/canonical/models/back/0808-000-Meltan.gif
diff --git a/src/canonical/models/back/0809--000--Melmetal.gif b/src/canonical/models/back/0809-000-Melmetal.gif
similarity index 100%
rename from src/canonical/models/back/0809--000--Melmetal.gif
rename to src/canonical/models/back/0809-000-Melmetal.gif
diff --git a/src/canonical/models/back/0809--420--Melmetal--Gmax.gif b/src/canonical/models/back/0809-420-Melmetal-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0809--420--Melmetal--Gmax.gif
rename to src/canonical/models/back/0809-420-Melmetal-Gmax.gif
diff --git a/src/canonical/models/back/0810--000--Grookey.gif b/src/canonical/models/back/0810-000-Grookey.gif
similarity index 100%
rename from src/canonical/models/back/0810--000--Grookey.gif
rename to src/canonical/models/back/0810-000-Grookey.gif
diff --git a/src/canonical/models/back/0811--000--Thwackey.gif b/src/canonical/models/back/0811-000-Thwackey.gif
similarity index 100%
rename from src/canonical/models/back/0811--000--Thwackey.gif
rename to src/canonical/models/back/0811-000-Thwackey.gif
diff --git a/src/canonical/models/back/0812--000--Rillaboom.gif b/src/canonical/models/back/0812-000-Rillaboom.gif
similarity index 100%
rename from src/canonical/models/back/0812--000--Rillaboom.gif
rename to src/canonical/models/back/0812-000-Rillaboom.gif
diff --git a/src/canonical/models/back/0813--000--Scorbunny.gif b/src/canonical/models/back/0813-000-Scorbunny.gif
similarity index 100%
rename from src/canonical/models/back/0813--000--Scorbunny.gif
rename to src/canonical/models/back/0813-000-Scorbunny.gif
diff --git a/src/canonical/models/back/0814--000--Raboot.gif b/src/canonical/models/back/0814-000-Raboot.gif
similarity index 100%
rename from src/canonical/models/back/0814--000--Raboot.gif
rename to src/canonical/models/back/0814-000-Raboot.gif
diff --git a/src/canonical/models/back/0815--000--Cinderace.gif b/src/canonical/models/back/0815-000-Cinderace.gif
similarity index 100%
rename from src/canonical/models/back/0815--000--Cinderace.gif
rename to src/canonical/models/back/0815-000-Cinderace.gif
diff --git a/src/canonical/models/back/0816--000--Sobble.gif b/src/canonical/models/back/0816-000-Sobble.gif
similarity index 100%
rename from src/canonical/models/back/0816--000--Sobble.gif
rename to src/canonical/models/back/0816-000-Sobble.gif
diff --git a/src/canonical/models/back/0817--000--Drizzile.gif b/src/canonical/models/back/0817-000-Drizzile.gif
similarity index 100%
rename from src/canonical/models/back/0817--000--Drizzile.gif
rename to src/canonical/models/back/0817-000-Drizzile.gif
diff --git a/src/canonical/models/back/0818--000--Inteleon.gif b/src/canonical/models/back/0818-000-Inteleon.gif
similarity index 100%
rename from src/canonical/models/back/0818--000--Inteleon.gif
rename to src/canonical/models/back/0818-000-Inteleon.gif
diff --git a/src/canonical/models/back/0819--000--Skwovet.gif b/src/canonical/models/back/0819-000-Skwovet.gif
similarity index 100%
rename from src/canonical/models/back/0819--000--Skwovet.gif
rename to src/canonical/models/back/0819-000-Skwovet.gif
diff --git a/src/canonical/models/back/0820--000--Greedent.gif b/src/canonical/models/back/0820-000-Greedent.gif
similarity index 100%
rename from src/canonical/models/back/0820--000--Greedent.gif
rename to src/canonical/models/back/0820-000-Greedent.gif
diff --git a/src/canonical/models/back/0821--000--Rookidee.gif b/src/canonical/models/back/0821-000-Rookidee.gif
similarity index 100%
rename from src/canonical/models/back/0821--000--Rookidee.gif
rename to src/canonical/models/back/0821-000-Rookidee.gif
diff --git a/src/canonical/models/back/0822--000--Corvisquire.gif b/src/canonical/models/back/0822-000-Corvisquire.gif
similarity index 100%
rename from src/canonical/models/back/0822--000--Corvisquire.gif
rename to src/canonical/models/back/0822-000-Corvisquire.gif
diff --git a/src/canonical/models/back/0823--000--Corviknight.gif b/src/canonical/models/back/0823-000-Corviknight.gif
similarity index 100%
rename from src/canonical/models/back/0823--000--Corviknight.gif
rename to src/canonical/models/back/0823-000-Corviknight.gif
diff --git a/src/canonical/models/back/0823--420--Corviknight--Gmax.gif b/src/canonical/models/back/0823-420-Corviknight-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0823--420--Corviknight--Gmax.gif
rename to src/canonical/models/back/0823-420-Corviknight-Gmax.gif
diff --git a/src/canonical/models/back/0824--000--Blipbug.gif b/src/canonical/models/back/0824-000-Blipbug.gif
similarity index 100%
rename from src/canonical/models/back/0824--000--Blipbug.gif
rename to src/canonical/models/back/0824-000-Blipbug.gif
diff --git a/src/canonical/models/back/0825--000--Dottler.gif b/src/canonical/models/back/0825-000-Dottler.gif
similarity index 100%
rename from src/canonical/models/back/0825--000--Dottler.gif
rename to src/canonical/models/back/0825-000-Dottler.gif
diff --git a/src/canonical/models/back/0826--000--Orbeetle.gif b/src/canonical/models/back/0826-000-Orbeetle.gif
similarity index 100%
rename from src/canonical/models/back/0826--000--Orbeetle.gif
rename to src/canonical/models/back/0826-000-Orbeetle.gif
diff --git a/src/canonical/models/back/0826--420--Orbeetle--Gmax.gif b/src/canonical/models/back/0826-420-Orbeetle-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0826--420--Orbeetle--Gmax.gif
rename to src/canonical/models/back/0826-420-Orbeetle-Gmax.gif
diff --git a/src/canonical/models/back/0827--000--Nickit.gif b/src/canonical/models/back/0827-000-Nickit.gif
similarity index 100%
rename from src/canonical/models/back/0827--000--Nickit.gif
rename to src/canonical/models/back/0827-000-Nickit.gif
diff --git a/src/canonical/models/back/0828--000--Thievul.gif b/src/canonical/models/back/0828-000-Thievul.gif
similarity index 100%
rename from src/canonical/models/back/0828--000--Thievul.gif
rename to src/canonical/models/back/0828-000-Thievul.gif
diff --git a/src/canonical/models/back/0829--000--Gossifleur.gif b/src/canonical/models/back/0829-000-Gossifleur.gif
similarity index 100%
rename from src/canonical/models/back/0829--000--Gossifleur.gif
rename to src/canonical/models/back/0829-000-Gossifleur.gif
diff --git a/src/canonical/models/back/0830--000--Eldegoss.gif b/src/canonical/models/back/0830-000-Eldegoss.gif
similarity index 100%
rename from src/canonical/models/back/0830--000--Eldegoss.gif
rename to src/canonical/models/back/0830-000-Eldegoss.gif
diff --git a/src/canonical/models/back/0831--000--Wooloo.gif b/src/canonical/models/back/0831-000-Wooloo.gif
similarity index 100%
rename from src/canonical/models/back/0831--000--Wooloo.gif
rename to src/canonical/models/back/0831-000-Wooloo.gif
diff --git a/src/canonical/models/back/0832--000--Dubwool.gif b/src/canonical/models/back/0832-000-Dubwool.gif
similarity index 100%
rename from src/canonical/models/back/0832--000--Dubwool.gif
rename to src/canonical/models/back/0832-000-Dubwool.gif
diff --git a/src/canonical/models/back/0833--000--Chewtle.gif b/src/canonical/models/back/0833-000-Chewtle.gif
similarity index 100%
rename from src/canonical/models/back/0833--000--Chewtle.gif
rename to src/canonical/models/back/0833-000-Chewtle.gif
diff --git a/src/canonical/models/back/0834--000--Drednaw.gif b/src/canonical/models/back/0834-000-Drednaw.gif
similarity index 100%
rename from src/canonical/models/back/0834--000--Drednaw.gif
rename to src/canonical/models/back/0834-000-Drednaw.gif
diff --git a/src/canonical/models/back/0834--420--Drednaw--Gmax.gif b/src/canonical/models/back/0834-420-Drednaw-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0834--420--Drednaw--Gmax.gif
rename to src/canonical/models/back/0834-420-Drednaw-Gmax.gif
diff --git a/src/canonical/models/back/0835--000--Yamper.gif b/src/canonical/models/back/0835-000-Yamper.gif
similarity index 100%
rename from src/canonical/models/back/0835--000--Yamper.gif
rename to src/canonical/models/back/0835-000-Yamper.gif
diff --git a/src/canonical/models/back/0836--000--Boltund.gif b/src/canonical/models/back/0836-000-Boltund.gif
similarity index 100%
rename from src/canonical/models/back/0836--000--Boltund.gif
rename to src/canonical/models/back/0836-000-Boltund.gif
diff --git a/src/canonical/models/back/0837--000--Rolycoly.gif b/src/canonical/models/back/0837-000-Rolycoly.gif
similarity index 100%
rename from src/canonical/models/back/0837--000--Rolycoly.gif
rename to src/canonical/models/back/0837-000-Rolycoly.gif
diff --git a/src/canonical/models/back/0838--000--Carkol.gif b/src/canonical/models/back/0838-000-Carkol.gif
similarity index 100%
rename from src/canonical/models/back/0838--000--Carkol.gif
rename to src/canonical/models/back/0838-000-Carkol.gif
diff --git a/src/canonical/models/back/0839--000--Coalossal.gif b/src/canonical/models/back/0839-000-Coalossal.gif
similarity index 100%
rename from src/canonical/models/back/0839--000--Coalossal.gif
rename to src/canonical/models/back/0839-000-Coalossal.gif
diff --git a/src/canonical/models/back/0839--420--Coalossal--Gmax.gif b/src/canonical/models/back/0839-420-Coalossal-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0839--420--Coalossal--Gmax.gif
rename to src/canonical/models/back/0839-420-Coalossal-Gmax.gif
diff --git a/src/canonical/models/back/0840--000--Applin.gif b/src/canonical/models/back/0840-000-Applin.gif
similarity index 100%
rename from src/canonical/models/back/0840--000--Applin.gif
rename to src/canonical/models/back/0840-000-Applin.gif
diff --git a/src/canonical/models/back/0841--000--Flapple.gif b/src/canonical/models/back/0841-000-Flapple.gif
similarity index 100%
rename from src/canonical/models/back/0841--000--Flapple.gif
rename to src/canonical/models/back/0841-000-Flapple.gif
diff --git a/src/canonical/models/back/0841--420--Flapple--Gmax.gif b/src/canonical/models/back/0841-420-Flapple-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0841--420--Flapple--Gmax.gif
rename to src/canonical/models/back/0841-420-Flapple-Gmax.gif
diff --git a/src/canonical/models/back/0842--000--Appletun.gif b/src/canonical/models/back/0842-000-Appletun.gif
similarity index 100%
rename from src/canonical/models/back/0842--000--Appletun.gif
rename to src/canonical/models/back/0842-000-Appletun.gif
diff --git a/src/canonical/models/back/0842--420--Appletun--Gmax.gif b/src/canonical/models/back/0842-420-Appletun-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0842--420--Appletun--Gmax.gif
rename to src/canonical/models/back/0842-420-Appletun-Gmax.gif
diff --git a/src/canonical/models/back/0843--000--Silicobra.gif b/src/canonical/models/back/0843-000-Silicobra.gif
similarity index 100%
rename from src/canonical/models/back/0843--000--Silicobra.gif
rename to src/canonical/models/back/0843-000-Silicobra.gif
diff --git a/src/canonical/models/back/0844--000--Sandaconda.gif b/src/canonical/models/back/0844-000-Sandaconda.gif
similarity index 100%
rename from src/canonical/models/back/0844--000--Sandaconda.gif
rename to src/canonical/models/back/0844-000-Sandaconda.gif
diff --git a/src/canonical/models/back/0844--420--Sandaconda--Gmax.gif b/src/canonical/models/back/0844-420-Sandaconda-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0844--420--Sandaconda--Gmax.gif
rename to src/canonical/models/back/0844-420-Sandaconda-Gmax.gif
diff --git a/src/canonical/models/back/0845--000--Cramorant.gif b/src/canonical/models/back/0845-000-Cramorant.gif
similarity index 100%
rename from src/canonical/models/back/0845--000--Cramorant.gif
rename to src/canonical/models/back/0845-000-Cramorant.gif
diff --git a/src/canonical/models/back/0845--420--Cramorant--Gorging.gif b/src/canonical/models/back/0845-420-Cramorant-Gorging.gif
similarity index 100%
rename from src/canonical/models/back/0845--420--Cramorant--Gorging.gif
rename to src/canonical/models/back/0845-420-Cramorant-Gorging.gif
diff --git a/src/canonical/models/back/0845--420--Cramorant--Gulping.gif b/src/canonical/models/back/0845-420-Cramorant-Gulping.gif
similarity index 100%
rename from src/canonical/models/back/0845--420--Cramorant--Gulping.gif
rename to src/canonical/models/back/0845-420-Cramorant-Gulping.gif
diff --git a/src/canonical/models/back/0846--000--Arrokuda.gif b/src/canonical/models/back/0846-000-Arrokuda.gif
similarity index 100%
rename from src/canonical/models/back/0846--000--Arrokuda.gif
rename to src/canonical/models/back/0846-000-Arrokuda.gif
diff --git a/src/canonical/models/back/0847--000--Barraskewda.gif b/src/canonical/models/back/0847-000-Barraskewda.gif
similarity index 100%
rename from src/canonical/models/back/0847--000--Barraskewda.gif
rename to src/canonical/models/back/0847-000-Barraskewda.gif
diff --git a/src/canonical/models/back/0848--000--Toxel.gif b/src/canonical/models/back/0848-000-Toxel.gif
similarity index 100%
rename from src/canonical/models/back/0848--000--Toxel.gif
rename to src/canonical/models/back/0848-000-Toxel.gif
diff --git a/src/canonical/models/back/0849--000--Toxtricity.gif b/src/canonical/models/back/0849-000-Toxtricity.gif
similarity index 100%
rename from src/canonical/models/back/0849--000--Toxtricity.gif
rename to src/canonical/models/back/0849-000-Toxtricity.gif
diff --git a/src/canonical/models/back/0849--420--Toxtricity--Gmax.gif b/src/canonical/models/back/0849-420-Toxtricity-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0849--420--Toxtricity--Gmax.gif
rename to src/canonical/models/back/0849-420-Toxtricity-Gmax.gif
diff --git a/src/canonical/models/back/0849--420--Toxtricity--Low-Key.gif b/src/canonical/models/back/0849-420-Toxtricity-Low~Key.gif
similarity index 100%
rename from src/canonical/models/back/0849--420--Toxtricity--Low-Key.gif
rename to src/canonical/models/back/0849-420-Toxtricity-Low~Key.gif
diff --git a/src/canonical/models/back/0850--000--Sizzlipede.gif b/src/canonical/models/back/0850-000-Sizzlipede.gif
similarity index 100%
rename from src/canonical/models/back/0850--000--Sizzlipede.gif
rename to src/canonical/models/back/0850-000-Sizzlipede.gif
diff --git a/src/canonical/models/back/0851--000--Centiskorch.gif b/src/canonical/models/back/0851-000-Centiskorch.gif
similarity index 100%
rename from src/canonical/models/back/0851--000--Centiskorch.gif
rename to src/canonical/models/back/0851-000-Centiskorch.gif
diff --git a/src/canonical/models/back/0851--420--Centiskorch--Gmax.gif b/src/canonical/models/back/0851-420-Centiskorch-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0851--420--Centiskorch--Gmax.gif
rename to src/canonical/models/back/0851-420-Centiskorch-Gmax.gif
diff --git a/src/canonical/models/back/0852--000--Clobbopus.gif b/src/canonical/models/back/0852-000-Clobbopus.gif
similarity index 100%
rename from src/canonical/models/back/0852--000--Clobbopus.gif
rename to src/canonical/models/back/0852-000-Clobbopus.gif
diff --git a/src/canonical/models/back/0853--000--Grapploct.gif b/src/canonical/models/back/0853-000-Grapploct.gif
similarity index 100%
rename from src/canonical/models/back/0853--000--Grapploct.gif
rename to src/canonical/models/back/0853-000-Grapploct.gif
diff --git a/src/canonical/models/back/0854--000--Sinistea.gif b/src/canonical/models/back/0854-000-Sinistea.gif
similarity index 100%
rename from src/canonical/models/back/0854--000--Sinistea.gif
rename to src/canonical/models/back/0854-000-Sinistea.gif
diff --git a/src/canonical/models/back/0854--420--Sinistea--Antique.gif b/src/canonical/models/back/0854-420-Sinistea-Antique.gif
similarity index 100%
rename from src/canonical/models/back/0854--420--Sinistea--Antique.gif
rename to src/canonical/models/back/0854-420-Sinistea-Antique.gif
diff --git a/src/canonical/models/back/0855--000--Polteageist.gif b/src/canonical/models/back/0855-000-Polteageist.gif
similarity index 100%
rename from src/canonical/models/back/0855--000--Polteageist.gif
rename to src/canonical/models/back/0855-000-Polteageist.gif
diff --git a/src/canonical/models/back/0855--420--Polteageist--Antique.gif b/src/canonical/models/back/0855-420-Polteageist-Antique.gif
similarity index 100%
rename from src/canonical/models/back/0855--420--Polteageist--Antique.gif
rename to src/canonical/models/back/0855-420-Polteageist-Antique.gif
diff --git a/src/canonical/models/back/0856--000--Hatenna.gif b/src/canonical/models/back/0856-000-Hatenna.gif
similarity index 100%
rename from src/canonical/models/back/0856--000--Hatenna.gif
rename to src/canonical/models/back/0856-000-Hatenna.gif
diff --git a/src/canonical/models/back/0857--000--Hattrem.gif b/src/canonical/models/back/0857-000-Hattrem.gif
similarity index 100%
rename from src/canonical/models/back/0857--000--Hattrem.gif
rename to src/canonical/models/back/0857-000-Hattrem.gif
diff --git a/src/canonical/models/back/0858--000--Hatterene.gif b/src/canonical/models/back/0858-000-Hatterene.gif
similarity index 100%
rename from src/canonical/models/back/0858--000--Hatterene.gif
rename to src/canonical/models/back/0858-000-Hatterene.gif
diff --git a/src/canonical/models/back/0858--420--Hatterene--Gmax.gif b/src/canonical/models/back/0858-420-Hatterene-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0858--420--Hatterene--Gmax.gif
rename to src/canonical/models/back/0858-420-Hatterene-Gmax.gif
diff --git a/src/canonical/models/back/0859--000--Impidimp.gif b/src/canonical/models/back/0859-000-Impidimp.gif
similarity index 100%
rename from src/canonical/models/back/0859--000--Impidimp.gif
rename to src/canonical/models/back/0859-000-Impidimp.gif
diff --git a/src/canonical/models/back/0860--000--Morgrem.gif b/src/canonical/models/back/0860-000-Morgrem.gif
similarity index 100%
rename from src/canonical/models/back/0860--000--Morgrem.gif
rename to src/canonical/models/back/0860-000-Morgrem.gif
diff --git a/src/canonical/models/back/0861--000--Grimmsnarl.gif b/src/canonical/models/back/0861-000-Grimmsnarl.gif
similarity index 100%
rename from src/canonical/models/back/0861--000--Grimmsnarl.gif
rename to src/canonical/models/back/0861-000-Grimmsnarl.gif
diff --git a/src/canonical/models/back/0861--420--Grimmsnarl--Gmax.gif b/src/canonical/models/back/0861-420-Grimmsnarl-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0861--420--Grimmsnarl--Gmax.gif
rename to src/canonical/models/back/0861-420-Grimmsnarl-Gmax.gif
diff --git a/src/canonical/models/back/0862--000--Obstagoon.gif b/src/canonical/models/back/0862-000-Obstagoon.gif
similarity index 100%
rename from src/canonical/models/back/0862--000--Obstagoon.gif
rename to src/canonical/models/back/0862-000-Obstagoon.gif
diff --git a/src/canonical/models/back/0863--000--Perrserker.gif b/src/canonical/models/back/0863-000-Perrserker.gif
similarity index 100%
rename from src/canonical/models/back/0863--000--Perrserker.gif
rename to src/canonical/models/back/0863-000-Perrserker.gif
diff --git a/src/canonical/models/back/0864--000--Cursola.gif b/src/canonical/models/back/0864-000-Cursola.gif
similarity index 100%
rename from src/canonical/models/back/0864--000--Cursola.gif
rename to src/canonical/models/back/0864-000-Cursola.gif
diff --git a/src/canonical/models/back/0865--000--Sirfetch__0027d.gif b/src/canonical/models/back/0865-000-Sirfetch__0027d.gif
similarity index 100%
rename from src/canonical/models/back/0865--000--Sirfetch__0027d.gif
rename to src/canonical/models/back/0865-000-Sirfetch__0027d.gif
diff --git a/src/canonical/models/back/0866--000--Mr._Rime.gif b/src/canonical/models/back/0866-000-Mr._Rime.gif
similarity index 100%
rename from src/canonical/models/back/0866--000--Mr._Rime.gif
rename to src/canonical/models/back/0866-000-Mr._Rime.gif
diff --git a/src/canonical/models/back/0867--000--Runerigus.gif b/src/canonical/models/back/0867-000-Runerigus.gif
similarity index 100%
rename from src/canonical/models/back/0867--000--Runerigus.gif
rename to src/canonical/models/back/0867-000-Runerigus.gif
diff --git a/src/canonical/models/back/0868--000--Milcery.gif b/src/canonical/models/back/0868-000-Milcery.gif
similarity index 100%
rename from src/canonical/models/back/0868--000--Milcery.gif
rename to src/canonical/models/back/0868-000-Milcery.gif
diff --git a/src/canonical/models/back/0869--000--Alcremie.gif b/src/canonical/models/back/0869-000-Alcremie.gif
similarity index 100%
rename from src/canonical/models/back/0869--000--Alcremie.gif
rename to src/canonical/models/back/0869-000-Alcremie.gif
diff --git a/src/canonical/models/back/0869--420--Alcremie--Gmax.gif b/src/canonical/models/back/0869-420-Alcremie-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0869--420--Alcremie--Gmax.gif
rename to src/canonical/models/back/0869-420-Alcremie-Gmax.gif
diff --git a/src/canonical/models/back/0870--000--Falinks.gif b/src/canonical/models/back/0870-000-Falinks.gif
similarity index 100%
rename from src/canonical/models/back/0870--000--Falinks.gif
rename to src/canonical/models/back/0870-000-Falinks.gif
diff --git a/src/canonical/models/back/0871--000--Pincurchin.gif b/src/canonical/models/back/0871-000-Pincurchin.gif
similarity index 100%
rename from src/canonical/models/back/0871--000--Pincurchin.gif
rename to src/canonical/models/back/0871-000-Pincurchin.gif
diff --git a/src/canonical/models/back/0872--000--Snom.gif b/src/canonical/models/back/0872-000-Snom.gif
similarity index 100%
rename from src/canonical/models/back/0872--000--Snom.gif
rename to src/canonical/models/back/0872-000-Snom.gif
diff --git a/src/canonical/models/back/0873--000--Frosmoth.gif b/src/canonical/models/back/0873-000-Frosmoth.gif
similarity index 100%
rename from src/canonical/models/back/0873--000--Frosmoth.gif
rename to src/canonical/models/back/0873-000-Frosmoth.gif
diff --git a/src/canonical/models/back/0874--000--Stonjourner.gif b/src/canonical/models/back/0874-000-Stonjourner.gif
similarity index 100%
rename from src/canonical/models/back/0874--000--Stonjourner.gif
rename to src/canonical/models/back/0874-000-Stonjourner.gif
diff --git a/src/canonical/models/back/0875--000--Eiscue.gif b/src/canonical/models/back/0875-000-Eiscue.gif
similarity index 100%
rename from src/canonical/models/back/0875--000--Eiscue.gif
rename to src/canonical/models/back/0875-000-Eiscue.gif
diff --git a/src/canonical/models/back/0875--420--Eiscue--Noice.gif b/src/canonical/models/back/0875-420-Eiscue-Noice.gif
similarity index 100%
rename from src/canonical/models/back/0875--420--Eiscue--Noice.gif
rename to src/canonical/models/back/0875-420-Eiscue-Noice.gif
diff --git a/src/canonical/models/back/0876--000--Indeedee.gif b/src/canonical/models/back/0876-000-Indeedee.gif
similarity index 100%
rename from src/canonical/models/back/0876--000--Indeedee.gif
rename to src/canonical/models/back/0876-000-Indeedee.gif
diff --git a/src/canonical/models/back/0876--420--Indeedee--F.gif b/src/canonical/models/back/0876-420-Indeedee-F.gif
similarity index 100%
rename from src/canonical/models/back/0876--420--Indeedee--F.gif
rename to src/canonical/models/back/0876-420-Indeedee-F.gif
diff --git a/src/canonical/models/back/0877--000--Morpeko.gif b/src/canonical/models/back/0877-000-Morpeko.gif
similarity index 100%
rename from src/canonical/models/back/0877--000--Morpeko.gif
rename to src/canonical/models/back/0877-000-Morpeko.gif
diff --git a/src/canonical/models/back/0877--420--Morpeko--Hangry.gif b/src/canonical/models/back/0877-420-Morpeko-Hangry.gif
similarity index 100%
rename from src/canonical/models/back/0877--420--Morpeko--Hangry.gif
rename to src/canonical/models/back/0877-420-Morpeko-Hangry.gif
diff --git a/src/canonical/models/back/0878--000--Cufant.gif b/src/canonical/models/back/0878-000-Cufant.gif
similarity index 100%
rename from src/canonical/models/back/0878--000--Cufant.gif
rename to src/canonical/models/back/0878-000-Cufant.gif
diff --git a/src/canonical/models/back/0879--000--Copperajah.gif b/src/canonical/models/back/0879-000-Copperajah.gif
similarity index 100%
rename from src/canonical/models/back/0879--000--Copperajah.gif
rename to src/canonical/models/back/0879-000-Copperajah.gif
diff --git a/src/canonical/models/back/0879--420--Copperajah--Gmax.gif b/src/canonical/models/back/0879-420-Copperajah-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0879--420--Copperajah--Gmax.gif
rename to src/canonical/models/back/0879-420-Copperajah-Gmax.gif
diff --git a/src/canonical/models/back/0880--000--Dracozolt.gif b/src/canonical/models/back/0880-000-Dracozolt.gif
similarity index 100%
rename from src/canonical/models/back/0880--000--Dracozolt.gif
rename to src/canonical/models/back/0880-000-Dracozolt.gif
diff --git a/src/canonical/models/back/0881--000--Arctozolt.gif b/src/canonical/models/back/0881-000-Arctozolt.gif
similarity index 100%
rename from src/canonical/models/back/0881--000--Arctozolt.gif
rename to src/canonical/models/back/0881-000-Arctozolt.gif
diff --git a/src/canonical/models/back/0882--000--Dracovish.gif b/src/canonical/models/back/0882-000-Dracovish.gif
similarity index 100%
rename from src/canonical/models/back/0882--000--Dracovish.gif
rename to src/canonical/models/back/0882-000-Dracovish.gif
diff --git a/src/canonical/models/back/0883--000--Arctovish.gif b/src/canonical/models/back/0883-000-Arctovish.gif
similarity index 100%
rename from src/canonical/models/back/0883--000--Arctovish.gif
rename to src/canonical/models/back/0883-000-Arctovish.gif
diff --git a/src/canonical/models/back/0884--000--Duraludon.gif b/src/canonical/models/back/0884-000-Duraludon.gif
similarity index 100%
rename from src/canonical/models/back/0884--000--Duraludon.gif
rename to src/canonical/models/back/0884-000-Duraludon.gif
diff --git a/src/canonical/models/back/0884--420--Duraludon--Gmax.gif b/src/canonical/models/back/0884-420-Duraludon-Gmax.gif
similarity index 100%
rename from src/canonical/models/back/0884--420--Duraludon--Gmax.gif
rename to src/canonical/models/back/0884-420-Duraludon-Gmax.gif
diff --git a/src/canonical/models/back/0885--000--Dreepy.gif b/src/canonical/models/back/0885-000-Dreepy.gif
similarity index 100%
rename from src/canonical/models/back/0885--000--Dreepy.gif
rename to src/canonical/models/back/0885-000-Dreepy.gif
diff --git a/src/canonical/models/back/0886--000--Drakloak.gif b/src/canonical/models/back/0886-000-Drakloak.gif
similarity index 100%
rename from src/canonical/models/back/0886--000--Drakloak.gif
rename to src/canonical/models/back/0886-000-Drakloak.gif
diff --git a/src/canonical/models/back/0887--000--Dragapult.gif b/src/canonical/models/back/0887-000-Dragapult.gif
similarity index 100%
rename from src/canonical/models/back/0887--000--Dragapult.gif
rename to src/canonical/models/back/0887-000-Dragapult.gif
diff --git a/src/canonical/models/back/0888--000--Zacian.gif b/src/canonical/models/back/0888-000-Zacian.gif
similarity index 100%
rename from src/canonical/models/back/0888--000--Zacian.gif
rename to src/canonical/models/back/0888-000-Zacian.gif
diff --git a/src/canonical/models/back/0888--420--Zacian--Crowned.gif b/src/canonical/models/back/0888-420-Zacian-Crowned.gif
similarity index 100%
rename from src/canonical/models/back/0888--420--Zacian--Crowned.gif
rename to src/canonical/models/back/0888-420-Zacian-Crowned.gif
diff --git a/src/canonical/models/back/0889--000--Zamazenta.gif b/src/canonical/models/back/0889-000-Zamazenta.gif
similarity index 100%
rename from src/canonical/models/back/0889--000--Zamazenta.gif
rename to src/canonical/models/back/0889-000-Zamazenta.gif
diff --git a/src/canonical/models/back/0889--420--Zamazenta--Crowned.gif b/src/canonical/models/back/0889-420-Zamazenta-Crowned.gif
similarity index 100%
rename from src/canonical/models/back/0889--420--Zamazenta--Crowned.gif
rename to src/canonical/models/back/0889-420-Zamazenta-Crowned.gif
diff --git a/src/canonical/models/back/0890--000--Eternatus.gif b/src/canonical/models/back/0890-000-Eternatus.gif
similarity index 100%
rename from src/canonical/models/back/0890--000--Eternatus.gif
rename to src/canonical/models/back/0890-000-Eternatus.gif
diff --git a/src/canonical/models/back/0890--420--Eternatus--Eternamax.gif b/src/canonical/models/back/0890-420-Eternatus-Eternamax.gif
similarity index 100%
rename from src/canonical/models/back/0890--420--Eternatus--Eternamax.gif
rename to src/canonical/models/back/0890-420-Eternatus-Eternamax.gif
diff --git a/src/canonical/models/front-cosmetic/0019--000--Rattata--Female.gif b/src/canonical/models/front-cosmetic/0019-000-Rattata-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0019--000--Rattata--Female.gif
rename to src/canonical/models/front-cosmetic/0019-000-Rattata-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0020--000--Raticate--Female.gif b/src/canonical/models/front-cosmetic/0020-000-Raticate-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0020--000--Raticate--Female.gif
rename to src/canonical/models/front-cosmetic/0020-000-Raticate-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0025--000--Pikachu--Female.gif b/src/canonical/models/front-cosmetic/0025-000-Pikachu-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0025--000--Pikachu--Female.gif
rename to src/canonical/models/front-cosmetic/0025-000-Pikachu-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0041--000--Kerfluffle--Female.gif b/src/canonical/models/front-cosmetic/0041-000-Kerfluffle-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0041--000--Kerfluffle--Female.gif
rename to src/canonical/models/front-cosmetic/0041-000-Kerfluffle-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0041--000--Zubat--Female.gif b/src/canonical/models/front-cosmetic/0041-000-Zubat-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0041--000--Zubat--Female.gif
rename to src/canonical/models/front-cosmetic/0041-000-Zubat-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0042--000--Golbat--Female.gif b/src/canonical/models/front-cosmetic/0042-000-Golbat-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0042--000--Golbat--Female.gif
rename to src/canonical/models/front-cosmetic/0042-000-Golbat-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0112--000--Rhydon--Female.gif b/src/canonical/models/front-cosmetic/0112-000-Rhydon-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0112--000--Rhydon--Female.gif
rename to src/canonical/models/front-cosmetic/0112-000-Rhydon-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0123--000--Scyther--Female.gif b/src/canonical/models/front-cosmetic/0123-000-Scyther-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0123--000--Scyther--Female.gif
rename to src/canonical/models/front-cosmetic/0123-000-Scyther-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0129--000--Magikarp--Female.gif b/src/canonical/models/front-cosmetic/0129-000-Magikarp-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0129--000--Magikarp--Female.gif
rename to src/canonical/models/front-cosmetic/0129-000-Magikarp-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0154--000--Meganium--Female.gif b/src/canonical/models/front-cosmetic/0154-000-Meganium-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0154--000--Meganium--Female.gif
rename to src/canonical/models/front-cosmetic/0154-000-Meganium-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0165--000--Ledyba--Female.gif b/src/canonical/models/front-cosmetic/0165-000-Ledyba-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0165--000--Ledyba--Female.gif
rename to src/canonical/models/front-cosmetic/0165-000-Ledyba-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0166--000--Ledian--Female.gif b/src/canonical/models/front-cosmetic/0166-000-Ledian-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0166--000--Ledian--Female.gif
rename to src/canonical/models/front-cosmetic/0166-000-Ledian-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0178--000--Xatu--Female.gif b/src/canonical/models/front-cosmetic/0178-000-Xatu-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0178--000--Xatu--Female.gif
rename to src/canonical/models/front-cosmetic/0178-000-Xatu-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0185--000--Sudowoodo--Female.gif b/src/canonical/models/front-cosmetic/0185-000-Sudowoodo-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0185--000--Sudowoodo--Female.gif
rename to src/canonical/models/front-cosmetic/0185-000-Sudowoodo-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0186--000--Politoed--Female.gif b/src/canonical/models/front-cosmetic/0186-000-Politoed-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0186--000--Politoed--Female.gif
rename to src/canonical/models/front-cosmetic/0186-000-Politoed-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0190--000--Aipom--Female.gif b/src/canonical/models/front-cosmetic/0190-000-Aipom-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0190--000--Aipom--Female.gif
rename to src/canonical/models/front-cosmetic/0190-000-Aipom-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0194--000--Wooper--Female.gif b/src/canonical/models/front-cosmetic/0194-000-Wooper-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0194--000--Wooper--Female.gif
rename to src/canonical/models/front-cosmetic/0194-000-Wooper-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0195--000--Quagsire--Female.gif b/src/canonical/models/front-cosmetic/0195-000-Quagsire-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0195--000--Quagsire--Female.gif
rename to src/canonical/models/front-cosmetic/0195-000-Quagsire-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0198--000--Murkrow--Female.gif b/src/canonical/models/front-cosmetic/0198-000-Murkrow-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0198--000--Murkrow--Female.gif
rename to src/canonical/models/front-cosmetic/0198-000-Murkrow-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--A.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-A.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--A.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-A.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--B.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-B.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--B.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-B.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--C.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-C.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--C.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-C.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--D.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-D.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--D.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-D.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--E.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-E.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--E.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-E.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--Exclamation.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-Exclamation.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--Exclamation.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-Exclamation.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--F.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-F.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--F.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-F.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--G.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-G.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--G.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-G.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--H.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-H.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--H.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-H.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--I.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-I.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--I.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-I.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--J.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-J.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--J.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-J.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--K.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-K.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--K.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-K.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--L.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-L.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--L.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-L.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--M.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-M.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--M.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-M.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--N.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-N.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--N.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-N.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--O.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-O.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--O.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-O.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--P.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-P.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--P.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-P.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--Q.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-Q.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--Q.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-Q.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--Question.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-Question.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--Question.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-Question.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--R.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-R.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--R.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-R.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--S.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-S.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--S.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-S.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--T.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-T.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--T.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-T.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--U.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-U.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--U.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-U.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--V.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-V.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--V.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-V.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--W.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-W.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--W.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-W.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--X.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-X.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--X.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-X.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--Y.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-Y.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--Y.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-Y.gif
diff --git a/src/canonical/models/front-cosmetic/0201--420--Unown--Z.gif b/src/canonical/models/front-cosmetic/0201-420-Unown-Z.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0201--420--Unown--Z.gif
rename to src/canonical/models/front-cosmetic/0201-420-Unown-Z.gif
diff --git a/src/canonical/models/front-cosmetic/0202--000--Wobbuffet--Female.gif b/src/canonical/models/front-cosmetic/0202-000-Wobbuffet-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0202--000--Wobbuffet--Female.gif
rename to src/canonical/models/front-cosmetic/0202-000-Wobbuffet-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0203--000--Girafarig--Female.gif b/src/canonical/models/front-cosmetic/0203-000-Girafarig-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0203--000--Girafarig--Female.gif
rename to src/canonical/models/front-cosmetic/0203-000-Girafarig-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0207--000--Gligar--Female.gif b/src/canonical/models/front-cosmetic/0207-000-Gligar-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0207--000--Gligar--Female.gif
rename to src/canonical/models/front-cosmetic/0207-000-Gligar-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0208--000--Steelix--Female.gif b/src/canonical/models/front-cosmetic/0208-000-Steelix-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0208--000--Steelix--Female.gif
rename to src/canonical/models/front-cosmetic/0208-000-Steelix-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0212--000--Scizor--Female.gif b/src/canonical/models/front-cosmetic/0212-000-Scizor-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0212--000--Scizor--Female.gif
rename to src/canonical/models/front-cosmetic/0212-000-Scizor-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0214--000--Heracross--Female.gif b/src/canonical/models/front-cosmetic/0214-000-Heracross-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0214--000--Heracross--Female.gif
rename to src/canonical/models/front-cosmetic/0214-000-Heracross-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0215--000--Sneasel--Female.gif b/src/canonical/models/front-cosmetic/0215-000-Sneasel-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0215--000--Sneasel--Female.gif
rename to src/canonical/models/front-cosmetic/0215-000-Sneasel-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0217--000--Ursaring--Female.gif b/src/canonical/models/front-cosmetic/0217-000-Ursaring-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0217--000--Ursaring--Female.gif
rename to src/canonical/models/front-cosmetic/0217-000-Ursaring-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0221--000--Piloswine--Female.gif b/src/canonical/models/front-cosmetic/0221-000-Piloswine-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0221--000--Piloswine--Female.gif
rename to src/canonical/models/front-cosmetic/0221-000-Piloswine-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0224--000--Octillery--Female.gif b/src/canonical/models/front-cosmetic/0224-000-Octillery-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0224--000--Octillery--Female.gif
rename to src/canonical/models/front-cosmetic/0224-000-Octillery-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0229--000--Houndoom--Female.gif b/src/canonical/models/front-cosmetic/0229-000-Houndoom-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0229--000--Houndoom--Female.gif
rename to src/canonical/models/front-cosmetic/0229-000-Houndoom-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0232--000--Donphan--Female.gif b/src/canonical/models/front-cosmetic/0232-000-Donphan-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0232--000--Donphan--Female.gif
rename to src/canonical/models/front-cosmetic/0232-000-Donphan-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0255--000--Torchic--Female.gif b/src/canonical/models/front-cosmetic/0255-000-Torchic-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0255--000--Torchic--Female.gif
rename to src/canonical/models/front-cosmetic/0255-000-Torchic-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0256--000--Combusken--Female.gif b/src/canonical/models/front-cosmetic/0256-000-Combusken-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0256--000--Combusken--Female.gif
rename to src/canonical/models/front-cosmetic/0256-000-Combusken-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0257--000--Blaziken--Female.gif b/src/canonical/models/front-cosmetic/0257-000-Blaziken-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0257--000--Blaziken--Female.gif
rename to src/canonical/models/front-cosmetic/0257-000-Blaziken-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0267--000--Beautifly--Female.gif b/src/canonical/models/front-cosmetic/0267-000-Beautifly-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0267--000--Beautifly--Female.gif
rename to src/canonical/models/front-cosmetic/0267-000-Beautifly-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0269--000--Dustox--Female.gif b/src/canonical/models/front-cosmetic/0269-000-Dustox-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0269--000--Dustox--Female.gif
rename to src/canonical/models/front-cosmetic/0269-000-Dustox-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0272--000--Ludicolo--Female.gif b/src/canonical/models/front-cosmetic/0272-000-Ludicolo-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0272--000--Ludicolo--Female.gif
rename to src/canonical/models/front-cosmetic/0272-000-Ludicolo-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0274--000--Nuzleaf--Female.gif b/src/canonical/models/front-cosmetic/0274-000-Nuzleaf-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0274--000--Nuzleaf--Female.gif
rename to src/canonical/models/front-cosmetic/0274-000-Nuzleaf-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0275--000--Shiftry--Female.gif b/src/canonical/models/front-cosmetic/0275-000-Shiftry-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0275--000--Shiftry--Female.gif
rename to src/canonical/models/front-cosmetic/0275-000-Shiftry-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0307--000--Meditite--Female.gif b/src/canonical/models/front-cosmetic/0307-000-Meditite-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0307--000--Meditite--Female.gif
rename to src/canonical/models/front-cosmetic/0307-000-Meditite-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0308--000--Medicham--Female.gif b/src/canonical/models/front-cosmetic/0308-000-Medicham-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0308--000--Medicham--Female.gif
rename to src/canonical/models/front-cosmetic/0308-000-Medicham-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0315--000--Roselia--Female.gif b/src/canonical/models/front-cosmetic/0315-000-Roselia-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0315--000--Roselia--Female.gif
rename to src/canonical/models/front-cosmetic/0315-000-Roselia-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0316--000--Gulpin--Female.gif b/src/canonical/models/front-cosmetic/0316-000-Gulpin-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0316--000--Gulpin--Female.gif
rename to src/canonical/models/front-cosmetic/0316-000-Gulpin-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0317--000--Swalot--Female.gif b/src/canonical/models/front-cosmetic/0317-000-Swalot-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0317--000--Swalot--Female.gif
rename to src/canonical/models/front-cosmetic/0317-000-Swalot-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0322--000--Numel--Female.gif b/src/canonical/models/front-cosmetic/0322-000-Numel-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0322--000--Numel--Female.gif
rename to src/canonical/models/front-cosmetic/0322-000-Numel-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0323--000--Camerupt--Female.gif b/src/canonical/models/front-cosmetic/0323-000-Camerupt-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0323--000--Camerupt--Female.gif
rename to src/canonical/models/front-cosmetic/0323-000-Camerupt-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0332--000--Cacturne--Female.gif b/src/canonical/models/front-cosmetic/0332-000-Cacturne-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0332--000--Cacturne--Female.gif
rename to src/canonical/models/front-cosmetic/0332-000-Cacturne-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0350--000--Milotic--Female.gif b/src/canonical/models/front-cosmetic/0350-000-Milotic-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0350--000--Milotic--Female.gif
rename to src/canonical/models/front-cosmetic/0350-000-Milotic-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0369--000--Relicanth--Female.gif b/src/canonical/models/front-cosmetic/0369-000-Relicanth-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0369--000--Relicanth--Female.gif
rename to src/canonical/models/front-cosmetic/0369-000-Relicanth-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0396--000--Starly--Female.gif b/src/canonical/models/front-cosmetic/0396-000-Starly-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0396--000--Starly--Female.gif
rename to src/canonical/models/front-cosmetic/0396-000-Starly-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0397--000--Staravia--Female.gif b/src/canonical/models/front-cosmetic/0397-000-Staravia-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0397--000--Staravia--Female.gif
rename to src/canonical/models/front-cosmetic/0397-000-Staravia-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0398--000--Staraptor--Female.gif b/src/canonical/models/front-cosmetic/0398-000-Staraptor-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0398--000--Staraptor--Female.gif
rename to src/canonical/models/front-cosmetic/0398-000-Staraptor-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0399--000--Bidoof--Female.gif b/src/canonical/models/front-cosmetic/0399-000-Bidoof-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0399--000--Bidoof--Female.gif
rename to src/canonical/models/front-cosmetic/0399-000-Bidoof-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0400--000--Bibarel--Female.gif b/src/canonical/models/front-cosmetic/0400-000-Bibarel-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0400--000--Bibarel--Female.gif
rename to src/canonical/models/front-cosmetic/0400-000-Bibarel-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0401--000--Kricketot--Female.gif b/src/canonical/models/front-cosmetic/0401-000-Kricketot-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0401--000--Kricketot--Female.gif
rename to src/canonical/models/front-cosmetic/0401-000-Kricketot-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0402--000--Kricketune--Female.gif b/src/canonical/models/front-cosmetic/0402-000-Kricketune-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0402--000--Kricketune--Female.gif
rename to src/canonical/models/front-cosmetic/0402-000-Kricketune-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0403--000--Shinx--Female.gif b/src/canonical/models/front-cosmetic/0403-000-Shinx-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0403--000--Shinx--Female.gif
rename to src/canonical/models/front-cosmetic/0403-000-Shinx-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0404--000--Luxio--Female.gif b/src/canonical/models/front-cosmetic/0404-000-Luxio-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0404--000--Luxio--Female.gif
rename to src/canonical/models/front-cosmetic/0404-000-Luxio-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0405--000--Luxray--Female.gif b/src/canonical/models/front-cosmetic/0405-000-Luxray-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0405--000--Luxray--Female.gif
rename to src/canonical/models/front-cosmetic/0405-000-Luxray-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0407--000--Roserade--Female.gif b/src/canonical/models/front-cosmetic/0407-000-Roserade-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0407--000--Roserade--Female.gif
rename to src/canonical/models/front-cosmetic/0407-000-Roserade-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0412--420--Burmy--Sandy.gif b/src/canonical/models/front-cosmetic/0412-420-Burmy-Sandy.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0412--420--Burmy--Sandy.gif
rename to src/canonical/models/front-cosmetic/0412-420-Burmy-Sandy.gif
diff --git a/src/canonical/models/front-cosmetic/0412--420--Burmy--Trash.gif b/src/canonical/models/front-cosmetic/0412-420-Burmy-Trash.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0412--420--Burmy--Trash.gif
rename to src/canonical/models/front-cosmetic/0412-420-Burmy-Trash.gif
diff --git a/src/canonical/models/front-cosmetic/0415--000--Combee--Female.gif b/src/canonical/models/front-cosmetic/0415-000-Combee-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0415--000--Combee--Female.gif
rename to src/canonical/models/front-cosmetic/0415-000-Combee-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0417--000--Pachirisu--Female.gif b/src/canonical/models/front-cosmetic/0417-000-Pachirisu-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0417--000--Pachirisu--Female.gif
rename to src/canonical/models/front-cosmetic/0417-000-Pachirisu-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0418--000--Buizel--Female.gif b/src/canonical/models/front-cosmetic/0418-000-Buizel-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0418--000--Buizel--Female.gif
rename to src/canonical/models/front-cosmetic/0418-000-Buizel-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0419--000--Floatzel--Female.gif b/src/canonical/models/front-cosmetic/0419-000-Floatzel-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0419--000--Floatzel--Female.gif
rename to src/canonical/models/front-cosmetic/0419-000-Floatzel-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0422--420--Shellos--East.gif b/src/canonical/models/front-cosmetic/0422-420-Shellos-East.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0422--420--Shellos--East.gif
rename to src/canonical/models/front-cosmetic/0422-420-Shellos-East.gif
diff --git a/src/canonical/models/front-cosmetic/0423--420--Gastrodon--East.gif b/src/canonical/models/front-cosmetic/0423-420-Gastrodon-East.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0423--420--Gastrodon--East.gif
rename to src/canonical/models/front-cosmetic/0423-420-Gastrodon-East.gif
diff --git a/src/canonical/models/front-cosmetic/0424--000--Ambipom--Female.gif b/src/canonical/models/front-cosmetic/0424-000-Ambipom-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0424--000--Ambipom--Female.gif
rename to src/canonical/models/front-cosmetic/0424-000-Ambipom-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0443--000--Gible--Female.gif b/src/canonical/models/front-cosmetic/0443-000-Gible-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0443--000--Gible--Female.gif
rename to src/canonical/models/front-cosmetic/0443-000-Gible-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0444--000--Gabite--Female.gif b/src/canonical/models/front-cosmetic/0444-000-Gabite-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0444--000--Gabite--Female.gif
rename to src/canonical/models/front-cosmetic/0444-000-Gabite-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0445--000--Garchomp--Female.gif b/src/canonical/models/front-cosmetic/0445-000-Garchomp-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0445--000--Garchomp--Female.gif
rename to src/canonical/models/front-cosmetic/0445-000-Garchomp-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0449--000--Hippopotas--Female.gif b/src/canonical/models/front-cosmetic/0449-000-Hippopotas-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0449--000--Hippopotas--Female.gif
rename to src/canonical/models/front-cosmetic/0449-000-Hippopotas-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0450--000--Hippowdon--Female.gif b/src/canonical/models/front-cosmetic/0450-000-Hippowdon-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0450--000--Hippowdon--Female.gif
rename to src/canonical/models/front-cosmetic/0450-000-Hippowdon-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0453--000--Croagunk--Female.gif b/src/canonical/models/front-cosmetic/0453-000-Croagunk-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0453--000--Croagunk--Female.gif
rename to src/canonical/models/front-cosmetic/0453-000-Croagunk-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0454--000--Toxicroak--Female.gif b/src/canonical/models/front-cosmetic/0454-000-Toxicroak-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0454--000--Toxicroak--Female.gif
rename to src/canonical/models/front-cosmetic/0454-000-Toxicroak-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0456--000--Finneon--Female.gif b/src/canonical/models/front-cosmetic/0456-000-Finneon-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0456--000--Finneon--Female.gif
rename to src/canonical/models/front-cosmetic/0456-000-Finneon-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0457--000--Lumineon--Female.gif b/src/canonical/models/front-cosmetic/0457-000-Lumineon-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0457--000--Lumineon--Female.gif
rename to src/canonical/models/front-cosmetic/0457-000-Lumineon-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0459--000--Snover--Female.gif b/src/canonical/models/front-cosmetic/0459-000-Snover-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0459--000--Snover--Female.gif
rename to src/canonical/models/front-cosmetic/0459-000-Snover-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0460--000--Abomasnow--Female.gif b/src/canonical/models/front-cosmetic/0460-000-Abomasnow-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0460--000--Abomasnow--Female.gif
rename to src/canonical/models/front-cosmetic/0460-000-Abomasnow-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0461--000--Weavile--Female.gif b/src/canonical/models/front-cosmetic/0461-000-Weavile-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0461--000--Weavile--Female.gif
rename to src/canonical/models/front-cosmetic/0461-000-Weavile-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0464--000--Rhyperior--Female.gif b/src/canonical/models/front-cosmetic/0464-000-Rhyperior-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0464--000--Rhyperior--Female.gif
rename to src/canonical/models/front-cosmetic/0464-000-Rhyperior-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0465--000--Tangrowth--Female.gif b/src/canonical/models/front-cosmetic/0465-000-Tangrowth-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0465--000--Tangrowth--Female.gif
rename to src/canonical/models/front-cosmetic/0465-000-Tangrowth-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0473--000--Mamoswine--Female.gif b/src/canonical/models/front-cosmetic/0473-000-Mamoswine-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0473--000--Mamoswine--Female.gif
rename to src/canonical/models/front-cosmetic/0473-000-Mamoswine-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0479--000--Rotom--Female.gif b/src/canonical/models/front-cosmetic/0479-000-Rotom-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0479--000--Rotom--Female.gif
rename to src/canonical/models/front-cosmetic/0479-000-Rotom-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0521--000--Unfezant--Female.gif b/src/canonical/models/front-cosmetic/0521-000-Unfezant-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0521--000--Unfezant--Female.gif
rename to src/canonical/models/front-cosmetic/0521-000-Unfezant-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0585--420--Deerling--Autumn.gif b/src/canonical/models/front-cosmetic/0585-420-Deerling-Autumn.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0585--420--Deerling--Autumn.gif
rename to src/canonical/models/front-cosmetic/0585-420-Deerling-Autumn.gif
diff --git a/src/canonical/models/front-cosmetic/0585--420--Deerling--Summer.gif b/src/canonical/models/front-cosmetic/0585-420-Deerling-Summer.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0585--420--Deerling--Summer.gif
rename to src/canonical/models/front-cosmetic/0585-420-Deerling-Summer.gif
diff --git a/src/canonical/models/front-cosmetic/0585--420--Deerling--Winter.gif b/src/canonical/models/front-cosmetic/0585-420-Deerling-Winter.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0585--420--Deerling--Winter.gif
rename to src/canonical/models/front-cosmetic/0585-420-Deerling-Winter.gif
diff --git a/src/canonical/models/front-cosmetic/0586--420--Sawsbuck--Autumn.gif b/src/canonical/models/front-cosmetic/0586-420-Sawsbuck-Autumn.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0586--420--Sawsbuck--Autumn.gif
rename to src/canonical/models/front-cosmetic/0586-420-Sawsbuck-Autumn.gif
diff --git a/src/canonical/models/front-cosmetic/0586--420--Sawsbuck--Summer.gif b/src/canonical/models/front-cosmetic/0586-420-Sawsbuck-Summer.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0586--420--Sawsbuck--Summer.gif
rename to src/canonical/models/front-cosmetic/0586-420-Sawsbuck-Summer.gif
diff --git a/src/canonical/models/front-cosmetic/0586--420--Sawsbuck--Winter.gif b/src/canonical/models/front-cosmetic/0586-420-Sawsbuck-Winter.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0586--420--Sawsbuck--Winter.gif
rename to src/canonical/models/front-cosmetic/0586-420-Sawsbuck-Winter.gif
diff --git a/src/canonical/models/front-cosmetic/0592--000--Frillish--Female.gif b/src/canonical/models/front-cosmetic/0592-000-Frillish-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0592--000--Frillish--Female.gif
rename to src/canonical/models/front-cosmetic/0592-000-Frillish-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0593--000--Jellicent--Female.gif b/src/canonical/models/front-cosmetic/0593-000-Jellicent-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0593--000--Jellicent--Female.gif
rename to src/canonical/models/front-cosmetic/0593-000-Jellicent-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Archipelago.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Archipelago.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Archipelago.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Archipelago.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Continental.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Continental.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Continental.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Continental.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Elegant.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Elegant.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Elegant.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Elegant.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Garden.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Garden.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Garden.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Garden.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--High_Plains.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-High_Plains.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--High_Plains.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-High_Plains.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Icy_Snow.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Icy_Snow.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Icy_Snow.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Icy_Snow.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Jungle.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Jungle.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Jungle.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Jungle.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Marine.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Marine.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Marine.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Marine.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Modern.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Modern.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Modern.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Modern.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Monsoon.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Monsoon.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Monsoon.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Monsoon.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Ocean.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Ocean.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Ocean.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Ocean.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Polar.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Polar.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Polar.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Polar.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--River.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-River.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--River.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-River.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Sandstorm.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Sandstorm.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Sandstorm.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Sandstorm.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Savanna.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Savanna.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Savanna.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Savanna.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Sun.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Sun.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Sun.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Sun.gif
diff --git a/src/canonical/models/front-cosmetic/0666--420--Vivillon--Tundra.gif b/src/canonical/models/front-cosmetic/0666-420-Vivillon-Tundra.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0666--420--Vivillon--Tundra.gif
rename to src/canonical/models/front-cosmetic/0666-420-Vivillon-Tundra.gif
diff --git a/src/canonical/models/front-cosmetic/0668--000--Pyroar--Female.gif b/src/canonical/models/front-cosmetic/0668-000-Pyroar-Female.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0668--000--Pyroar--Female.gif
rename to src/canonical/models/front-cosmetic/0668-000-Pyroar-Female.gif
diff --git a/src/canonical/models/front-cosmetic/0669--420--Flabe__0301be__0301--Blue.gif b/src/canonical/models/front-cosmetic/0669-420-Flabe__0301be__0301-Blue.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0669--420--Flabe__0301be__0301--Blue.gif
rename to src/canonical/models/front-cosmetic/0669-420-Flabe__0301be__0301-Blue.gif
diff --git a/src/canonical/models/front-cosmetic/0669--420--Flabe__0301be__0301--Orange.gif b/src/canonical/models/front-cosmetic/0669-420-Flabe__0301be__0301-Orange.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0669--420--Flabe__0301be__0301--Orange.gif
rename to src/canonical/models/front-cosmetic/0669-420-Flabe__0301be__0301-Orange.gif
diff --git a/src/canonical/models/front-cosmetic/0669--420--Flabe__0301be__0301--White.gif b/src/canonical/models/front-cosmetic/0669-420-Flabe__0301be__0301-White.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0669--420--Flabe__0301be__0301--White.gif
rename to src/canonical/models/front-cosmetic/0669-420-Flabe__0301be__0301-White.gif
diff --git a/src/canonical/models/front-cosmetic/0669--420--Flabe__0301be__0301--Yellow.gif b/src/canonical/models/front-cosmetic/0669-420-Flabe__0301be__0301-Yellow.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0669--420--Flabe__0301be__0301--Yellow.gif
rename to src/canonical/models/front-cosmetic/0669-420-Flabe__0301be__0301-Yellow.gif
diff --git a/src/canonical/models/front-cosmetic/0670--420--Floette--Blue.gif b/src/canonical/models/front-cosmetic/0670-420-Floette-Blue.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0670--420--Floette--Blue.gif
rename to src/canonical/models/front-cosmetic/0670-420-Floette-Blue.gif
diff --git a/src/canonical/models/front-cosmetic/0670--420--Floette--Orange.gif b/src/canonical/models/front-cosmetic/0670-420-Floette-Orange.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0670--420--Floette--Orange.gif
rename to src/canonical/models/front-cosmetic/0670-420-Floette-Orange.gif
diff --git a/src/canonical/models/front-cosmetic/0670--420--Floette--White.gif b/src/canonical/models/front-cosmetic/0670-420-Floette-White.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0670--420--Floette--White.gif
rename to src/canonical/models/front-cosmetic/0670-420-Floette-White.gif
diff --git a/src/canonical/models/front-cosmetic/0670--420--Floette--Yellow.gif b/src/canonical/models/front-cosmetic/0670-420-Floette-Yellow.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0670--420--Floette--Yellow.gif
rename to src/canonical/models/front-cosmetic/0670-420-Floette-Yellow.gif
diff --git a/src/canonical/models/front-cosmetic/0671--420--Florges--Blue.gif b/src/canonical/models/front-cosmetic/0671-420-Florges-Blue.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0671--420--Florges--Blue.gif
rename to src/canonical/models/front-cosmetic/0671-420-Florges-Blue.gif
diff --git a/src/canonical/models/front-cosmetic/0671--420--Florges--Orange.gif b/src/canonical/models/front-cosmetic/0671-420-Florges-Orange.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0671--420--Florges--Orange.gif
rename to src/canonical/models/front-cosmetic/0671-420-Florges-Orange.gif
diff --git a/src/canonical/models/front-cosmetic/0671--420--Florges--White.gif b/src/canonical/models/front-cosmetic/0671-420-Florges-White.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0671--420--Florges--White.gif
rename to src/canonical/models/front-cosmetic/0671-420-Florges-White.gif
diff --git a/src/canonical/models/front-cosmetic/0671--420--Florges--Yellow.gif b/src/canonical/models/front-cosmetic/0671-420-Florges-Yellow.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0671--420--Florges--Yellow.gif
rename to src/canonical/models/front-cosmetic/0671-420-Florges-Yellow.gif
diff --git a/src/canonical/models/front-cosmetic/0676--420--Furfrou--Dandy.gif b/src/canonical/models/front-cosmetic/0676-420-Furfrou-Dandy.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0676--420--Furfrou--Dandy.gif
rename to src/canonical/models/front-cosmetic/0676-420-Furfrou-Dandy.gif
diff --git a/src/canonical/models/front-cosmetic/0676--420--Furfrou--Debutante.gif b/src/canonical/models/front-cosmetic/0676-420-Furfrou-Debutante.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0676--420--Furfrou--Debutante.gif
rename to src/canonical/models/front-cosmetic/0676-420-Furfrou-Debutante.gif
diff --git a/src/canonical/models/front-cosmetic/0676--420--Furfrou--Diamond.gif b/src/canonical/models/front-cosmetic/0676-420-Furfrou-Diamond.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0676--420--Furfrou--Diamond.gif
rename to src/canonical/models/front-cosmetic/0676-420-Furfrou-Diamond.gif
diff --git a/src/canonical/models/front-cosmetic/0676--420--Furfrou--Heart.gif b/src/canonical/models/front-cosmetic/0676-420-Furfrou-Heart.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0676--420--Furfrou--Heart.gif
rename to src/canonical/models/front-cosmetic/0676-420-Furfrou-Heart.gif
diff --git a/src/canonical/models/front-cosmetic/0676--420--Furfrou--Kabuki.gif b/src/canonical/models/front-cosmetic/0676-420-Furfrou-Kabuki.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0676--420--Furfrou--Kabuki.gif
rename to src/canonical/models/front-cosmetic/0676-420-Furfrou-Kabuki.gif
diff --git a/src/canonical/models/front-cosmetic/0676--420--Furfrou--La_Reine.gif b/src/canonical/models/front-cosmetic/0676-420-Furfrou-La_Reine.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0676--420--Furfrou--La_Reine.gif
rename to src/canonical/models/front-cosmetic/0676-420-Furfrou-La_Reine.gif
diff --git a/src/canonical/models/front-cosmetic/0676--420--Furfrou--Matron.gif b/src/canonical/models/front-cosmetic/0676-420-Furfrou-Matron.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0676--420--Furfrou--Matron.gif
rename to src/canonical/models/front-cosmetic/0676-420-Furfrou-Matron.gif
diff --git a/src/canonical/models/front-cosmetic/0676--420--Furfrou--Pharaoh.gif b/src/canonical/models/front-cosmetic/0676-420-Furfrou-Pharaoh.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0676--420--Furfrou--Pharaoh.gif
rename to src/canonical/models/front-cosmetic/0676-420-Furfrou-Pharaoh.gif
diff --git a/src/canonical/models/front-cosmetic/0676--420--Furfrou--Star.gif b/src/canonical/models/front-cosmetic/0676-420-Furfrou-Star.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0676--420--Furfrou--Star.gif
rename to src/canonical/models/front-cosmetic/0676-420-Furfrou-Star.gif
diff --git a/src/canonical/models/front-cosmetic/0774--420--Minior--Blue.gif b/src/canonical/models/front-cosmetic/0774-420-Minior-Blue.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0774--420--Minior--Blue.gif
rename to src/canonical/models/front-cosmetic/0774-420-Minior-Blue.gif
diff --git a/src/canonical/models/front-cosmetic/0774--420--Minior--Green.gif b/src/canonical/models/front-cosmetic/0774-420-Minior-Green.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0774--420--Minior--Green.gif
rename to src/canonical/models/front-cosmetic/0774-420-Minior-Green.gif
diff --git a/src/canonical/models/front-cosmetic/0774--420--Minior--Indigo.gif b/src/canonical/models/front-cosmetic/0774-420-Minior-Indigo.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0774--420--Minior--Indigo.gif
rename to src/canonical/models/front-cosmetic/0774-420-Minior-Indigo.gif
diff --git a/src/canonical/models/front-cosmetic/0774--420--Minior--Meteor.gif b/src/canonical/models/front-cosmetic/0774-420-Minior-Meteor.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0774--420--Minior--Meteor.gif
rename to src/canonical/models/front-cosmetic/0774-420-Minior-Meteor.gif
diff --git a/src/canonical/models/front-cosmetic/0774--420--Minior--Orange.gif b/src/canonical/models/front-cosmetic/0774-420-Minior-Orange.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0774--420--Minior--Orange.gif
rename to src/canonical/models/front-cosmetic/0774-420-Minior-Orange.gif
diff --git a/src/canonical/models/front-cosmetic/0774--420--Minior--Violet.gif b/src/canonical/models/front-cosmetic/0774-420-Minior-Violet.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0774--420--Minior--Violet.gif
rename to src/canonical/models/front-cosmetic/0774-420-Minior-Violet.gif
diff --git a/src/canonical/models/front-cosmetic/0774--420--Minior--Yellow.gif b/src/canonical/models/front-cosmetic/0774-420-Minior-Yellow.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0774--420--Minior--Yellow.gif
rename to src/canonical/models/front-cosmetic/0774-420-Minior-Yellow.gif
diff --git a/src/canonical/models/front-cosmetic/0801--420--Magearna--Original.gif b/src/canonical/models/front-cosmetic/0801-420-Magearna-Original.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0801--420--Magearna--Original.gif
rename to src/canonical/models/front-cosmetic/0801-420-Magearna-Original.gif
diff --git a/src/canonical/models/front-cosmetic/0869--420--Alcremie--Caramel_Swirl.gif b/src/canonical/models/front-cosmetic/0869-420-Alcremie-Caramel_Swirl.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0869--420--Alcremie--Caramel_Swirl.gif
rename to src/canonical/models/front-cosmetic/0869-420-Alcremie-Caramel_Swirl.gif
diff --git a/src/canonical/models/front-cosmetic/0869--420--Alcremie--Lemon_Cream.gif b/src/canonical/models/front-cosmetic/0869-420-Alcremie-Lemon_Cream.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0869--420--Alcremie--Lemon_Cream.gif
rename to src/canonical/models/front-cosmetic/0869-420-Alcremie-Lemon_Cream.gif
diff --git a/src/canonical/models/front-cosmetic/0869--420--Alcremie--Matcha_Cream.gif b/src/canonical/models/front-cosmetic/0869-420-Alcremie-Matcha_Cream.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0869--420--Alcremie--Matcha_Cream.gif
rename to src/canonical/models/front-cosmetic/0869-420-Alcremie-Matcha_Cream.gif
diff --git a/src/canonical/models/front-cosmetic/0869--420--Alcremie--Mint_Cream.gif b/src/canonical/models/front-cosmetic/0869-420-Alcremie-Mint_Cream.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0869--420--Alcremie--Mint_Cream.gif
rename to src/canonical/models/front-cosmetic/0869-420-Alcremie-Mint_Cream.gif
diff --git a/src/canonical/models/front-cosmetic/0869--420--Alcremie--Rainbow_Swirl.gif b/src/canonical/models/front-cosmetic/0869-420-Alcremie-Rainbow_Swirl.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0869--420--Alcremie--Rainbow_Swirl.gif
rename to src/canonical/models/front-cosmetic/0869-420-Alcremie-Rainbow_Swirl.gif
diff --git a/src/canonical/models/front-cosmetic/0869--420--Alcremie--Ruby_Cream.gif b/src/canonical/models/front-cosmetic/0869-420-Alcremie-Ruby_Cream.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0869--420--Alcremie--Ruby_Cream.gif
rename to src/canonical/models/front-cosmetic/0869-420-Alcremie-Ruby_Cream.gif
diff --git a/src/canonical/models/front-cosmetic/0869--420--Alcremie--Ruby_Swirl.gif b/src/canonical/models/front-cosmetic/0869-420-Alcremie-Ruby_Swirl.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0869--420--Alcremie--Ruby_Swirl.gif
rename to src/canonical/models/front-cosmetic/0869-420-Alcremie-Ruby_Swirl.gif
diff --git a/src/canonical/models/front-cosmetic/0869--420--Alcremie--Salted_Cream.gif b/src/canonical/models/front-cosmetic/0869-420-Alcremie-Salted_Cream.gif
similarity index 100%
rename from src/canonical/models/front-cosmetic/0869--420--Alcremie--Salted_Cream.gif
rename to src/canonical/models/front-cosmetic/0869-420-Alcremie-Salted_Cream.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0019--000--Rattata--Female.gif b/src/canonical/models/front-shiny-cosmetic/0019-000-Rattata-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0019--000--Rattata--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0019-000-Rattata-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0020--000--Raticate--Female.gif b/src/canonical/models/front-shiny-cosmetic/0020-000-Raticate-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0020--000--Raticate--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0020-000-Raticate-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0025--000--Pikachu--Female.gif b/src/canonical/models/front-shiny-cosmetic/0025-000-Pikachu-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0025--000--Pikachu--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0025-000-Pikachu-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0041--000--Kerfluffle--Female.gif b/src/canonical/models/front-shiny-cosmetic/0041-000-Kerfluffle-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0041--000--Kerfluffle--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0041-000-Kerfluffle-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0041--000--Zubat--Female.gif b/src/canonical/models/front-shiny-cosmetic/0041-000-Zubat-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0041--000--Zubat--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0041-000-Zubat-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0042--000--Golbat--Female.gif b/src/canonical/models/front-shiny-cosmetic/0042-000-Golbat-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0042--000--Golbat--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0042-000-Golbat-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0112--000--Rhydon--Female.gif b/src/canonical/models/front-shiny-cosmetic/0112-000-Rhydon-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0112--000--Rhydon--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0112-000-Rhydon-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0123--000--Scyther--Female.gif b/src/canonical/models/front-shiny-cosmetic/0123-000-Scyther-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0123--000--Scyther--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0123-000-Scyther-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0129--000--Magikarp--Female.gif b/src/canonical/models/front-shiny-cosmetic/0129-000-Magikarp-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0129--000--Magikarp--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0129-000-Magikarp-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0154--000--Meganium--Female.gif b/src/canonical/models/front-shiny-cosmetic/0154-000-Meganium-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0154--000--Meganium--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0154-000-Meganium-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0165--000--Ledyba--Female.gif b/src/canonical/models/front-shiny-cosmetic/0165-000-Ledyba-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0165--000--Ledyba--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0165-000-Ledyba-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0166--000--Ledian--Female.gif b/src/canonical/models/front-shiny-cosmetic/0166-000-Ledian-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0166--000--Ledian--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0166-000-Ledian-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0178--000--Xatu--Female.gif b/src/canonical/models/front-shiny-cosmetic/0178-000-Xatu-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0178--000--Xatu--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0178-000-Xatu-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0185--000--Sudowoodo--Female.gif b/src/canonical/models/front-shiny-cosmetic/0185-000-Sudowoodo-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0185--000--Sudowoodo--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0185-000-Sudowoodo-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0186--000--Politoed--Female.gif b/src/canonical/models/front-shiny-cosmetic/0186-000-Politoed-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0186--000--Politoed--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0186-000-Politoed-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0190--000--Aipom--Female.gif b/src/canonical/models/front-shiny-cosmetic/0190-000-Aipom-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0190--000--Aipom--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0190-000-Aipom-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0194--000--Wooper--Female.gif b/src/canonical/models/front-shiny-cosmetic/0194-000-Wooper-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0194--000--Wooper--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0194-000-Wooper-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0195--000--Quagsire--Female.gif b/src/canonical/models/front-shiny-cosmetic/0195-000-Quagsire-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0195--000--Quagsire--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0195-000-Quagsire-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0198--000--Murkrow--Female.gif b/src/canonical/models/front-shiny-cosmetic/0198-000-Murkrow-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0198--000--Murkrow--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0198-000-Murkrow-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--A.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-A.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--A.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-A.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--B.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-B.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--B.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-B.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--C.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-C.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--C.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-C.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--D.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-D.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--D.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-D.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--E.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-E.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--E.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-E.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--Exclamation.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-Exclamation.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--Exclamation.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-Exclamation.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--F.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-F.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--F.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-F.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--G.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-G.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--G.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-G.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--H.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-H.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--H.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-H.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--I.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-I.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--I.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-I.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--J.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-J.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--J.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-J.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--K.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-K.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--K.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-K.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--L.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-L.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--L.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-L.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--M.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-M.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--M.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-M.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--N.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-N.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--N.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-N.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--O.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-O.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--O.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-O.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--P.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-P.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--P.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-P.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--Q.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-Q.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--Q.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-Q.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--Question.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-Question.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--Question.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-Question.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--R.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-R.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--R.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-R.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--S.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-S.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--S.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-S.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--T.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-T.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--T.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-T.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--U.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-U.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--U.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-U.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--V.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-V.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--V.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-V.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--W.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-W.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--W.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-W.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--X.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-X.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--X.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-X.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--Y.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-Y.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--Y.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-Y.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0201--420--Unown--Z.gif b/src/canonical/models/front-shiny-cosmetic/0201-420-Unown-Z.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0201--420--Unown--Z.gif
rename to src/canonical/models/front-shiny-cosmetic/0201-420-Unown-Z.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0202--000--Wobbuffet--Female.gif b/src/canonical/models/front-shiny-cosmetic/0202-000-Wobbuffet-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0202--000--Wobbuffet--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0202-000-Wobbuffet-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0203--000--Girafarig--Female.gif b/src/canonical/models/front-shiny-cosmetic/0203-000-Girafarig-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0203--000--Girafarig--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0203-000-Girafarig-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0207--000--Gligar--Female.gif b/src/canonical/models/front-shiny-cosmetic/0207-000-Gligar-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0207--000--Gligar--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0207-000-Gligar-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0208--000--Steelix--Female.gif b/src/canonical/models/front-shiny-cosmetic/0208-000-Steelix-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0208--000--Steelix--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0208-000-Steelix-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0212--000--Scizor--Female.gif b/src/canonical/models/front-shiny-cosmetic/0212-000-Scizor-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0212--000--Scizor--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0212-000-Scizor-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0214--000--Heracross--Female.gif b/src/canonical/models/front-shiny-cosmetic/0214-000-Heracross-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0214--000--Heracross--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0214-000-Heracross-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0215--000--Sneasel--Female.gif b/src/canonical/models/front-shiny-cosmetic/0215-000-Sneasel-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0215--000--Sneasel--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0215-000-Sneasel-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0217--000--Ursaring--Female.gif b/src/canonical/models/front-shiny-cosmetic/0217-000-Ursaring-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0217--000--Ursaring--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0217-000-Ursaring-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0221--000--Piloswine--Female.gif b/src/canonical/models/front-shiny-cosmetic/0221-000-Piloswine-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0221--000--Piloswine--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0221-000-Piloswine-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0224--000--Octillery--Female.gif b/src/canonical/models/front-shiny-cosmetic/0224-000-Octillery-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0224--000--Octillery--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0224-000-Octillery-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0229--000--Houndoom--Female.gif b/src/canonical/models/front-shiny-cosmetic/0229-000-Houndoom-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0229--000--Houndoom--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0229-000-Houndoom-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0232--000--Donphan--Female.gif b/src/canonical/models/front-shiny-cosmetic/0232-000-Donphan-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0232--000--Donphan--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0232-000-Donphan-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0255--000--Torchic--Female.gif b/src/canonical/models/front-shiny-cosmetic/0255-000-Torchic-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0255--000--Torchic--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0255-000-Torchic-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0256--000--Combusken--Female.gif b/src/canonical/models/front-shiny-cosmetic/0256-000-Combusken-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0256--000--Combusken--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0256-000-Combusken-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0257--000--Blaziken--Female.gif b/src/canonical/models/front-shiny-cosmetic/0257-000-Blaziken-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0257--000--Blaziken--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0257-000-Blaziken-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0267--000--Beautifly--Female.gif b/src/canonical/models/front-shiny-cosmetic/0267-000-Beautifly-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0267--000--Beautifly--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0267-000-Beautifly-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0269--000--Dustox--Female.gif b/src/canonical/models/front-shiny-cosmetic/0269-000-Dustox-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0269--000--Dustox--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0269-000-Dustox-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0272--000--Ludicolo--Female.gif b/src/canonical/models/front-shiny-cosmetic/0272-000-Ludicolo-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0272--000--Ludicolo--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0272-000-Ludicolo-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0274--000--Nuzleaf--Female.gif b/src/canonical/models/front-shiny-cosmetic/0274-000-Nuzleaf-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0274--000--Nuzleaf--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0274-000-Nuzleaf-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0275--000--Shiftry--Female.gif b/src/canonical/models/front-shiny-cosmetic/0275-000-Shiftry-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0275--000--Shiftry--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0275-000-Shiftry-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0307--000--Meditite--Female.gif b/src/canonical/models/front-shiny-cosmetic/0307-000-Meditite-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0307--000--Meditite--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0307-000-Meditite-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0308--000--Medicham--Female.gif b/src/canonical/models/front-shiny-cosmetic/0308-000-Medicham-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0308--000--Medicham--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0308-000-Medicham-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0315--000--Roselia--Female.gif b/src/canonical/models/front-shiny-cosmetic/0315-000-Roselia-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0315--000--Roselia--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0315-000-Roselia-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0316--000--Gulpin--Female.gif b/src/canonical/models/front-shiny-cosmetic/0316-000-Gulpin-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0316--000--Gulpin--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0316-000-Gulpin-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0317--000--Swalot--Female.gif b/src/canonical/models/front-shiny-cosmetic/0317-000-Swalot-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0317--000--Swalot--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0317-000-Swalot-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0322--000--Numel--Female.gif b/src/canonical/models/front-shiny-cosmetic/0322-000-Numel-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0322--000--Numel--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0322-000-Numel-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0323--000--Camerupt--Female.gif b/src/canonical/models/front-shiny-cosmetic/0323-000-Camerupt-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0323--000--Camerupt--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0323-000-Camerupt-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0332--000--Cacturne--Female.gif b/src/canonical/models/front-shiny-cosmetic/0332-000-Cacturne-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0332--000--Cacturne--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0332-000-Cacturne-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0350--000--Milotic--Female.gif b/src/canonical/models/front-shiny-cosmetic/0350-000-Milotic-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0350--000--Milotic--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0350-000-Milotic-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0369--000--Relicanth--Female.gif b/src/canonical/models/front-shiny-cosmetic/0369-000-Relicanth-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0369--000--Relicanth--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0369-000-Relicanth-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0396--000--Starly--Female.gif b/src/canonical/models/front-shiny-cosmetic/0396-000-Starly-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0396--000--Starly--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0396-000-Starly-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0397--000--Staravia--Female.gif b/src/canonical/models/front-shiny-cosmetic/0397-000-Staravia-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0397--000--Staravia--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0397-000-Staravia-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0398--000--Staraptor--Female.gif b/src/canonical/models/front-shiny-cosmetic/0398-000-Staraptor-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0398--000--Staraptor--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0398-000-Staraptor-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0399--000--Bidoof--Female.gif b/src/canonical/models/front-shiny-cosmetic/0399-000-Bidoof-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0399--000--Bidoof--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0399-000-Bidoof-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0400--000--Bibarel--Female.gif b/src/canonical/models/front-shiny-cosmetic/0400-000-Bibarel-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0400--000--Bibarel--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0400-000-Bibarel-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0401--000--Kricketot--Female.gif b/src/canonical/models/front-shiny-cosmetic/0401-000-Kricketot-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0401--000--Kricketot--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0401-000-Kricketot-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0402--000--Kricketune--Female.gif b/src/canonical/models/front-shiny-cosmetic/0402-000-Kricketune-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0402--000--Kricketune--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0402-000-Kricketune-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0403--000--Shinx--Female.gif b/src/canonical/models/front-shiny-cosmetic/0403-000-Shinx-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0403--000--Shinx--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0403-000-Shinx-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0404--000--Luxio--Female.gif b/src/canonical/models/front-shiny-cosmetic/0404-000-Luxio-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0404--000--Luxio--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0404-000-Luxio-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0405--000--Luxray--Female.gif b/src/canonical/models/front-shiny-cosmetic/0405-000-Luxray-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0405--000--Luxray--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0405-000-Luxray-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0407--000--Roserade--Female.gif b/src/canonical/models/front-shiny-cosmetic/0407-000-Roserade-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0407--000--Roserade--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0407-000-Roserade-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0412--420--Burmy--Sandy.gif b/src/canonical/models/front-shiny-cosmetic/0412-420-Burmy-Sandy.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0412--420--Burmy--Sandy.gif
rename to src/canonical/models/front-shiny-cosmetic/0412-420-Burmy-Sandy.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0412--420--Burmy--Trash.gif b/src/canonical/models/front-shiny-cosmetic/0412-420-Burmy-Trash.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0412--420--Burmy--Trash.gif
rename to src/canonical/models/front-shiny-cosmetic/0412-420-Burmy-Trash.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0415--000--Combee--Female.gif b/src/canonical/models/front-shiny-cosmetic/0415-000-Combee-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0415--000--Combee--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0415-000-Combee-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0417--000--Pachirisu--Female.gif b/src/canonical/models/front-shiny-cosmetic/0417-000-Pachirisu-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0417--000--Pachirisu--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0417-000-Pachirisu-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0418--000--Buizel--Female.gif b/src/canonical/models/front-shiny-cosmetic/0418-000-Buizel-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0418--000--Buizel--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0418-000-Buizel-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0419--000--Floatzel--Female.gif b/src/canonical/models/front-shiny-cosmetic/0419-000-Floatzel-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0419--000--Floatzel--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0419-000-Floatzel-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0422--420--Shellos--East.gif b/src/canonical/models/front-shiny-cosmetic/0422-420-Shellos-East.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0422--420--Shellos--East.gif
rename to src/canonical/models/front-shiny-cosmetic/0422-420-Shellos-East.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0423--420--Gastrodon--East.gif b/src/canonical/models/front-shiny-cosmetic/0423-420-Gastrodon-East.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0423--420--Gastrodon--East.gif
rename to src/canonical/models/front-shiny-cosmetic/0423-420-Gastrodon-East.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0424--000--Ambipom--Female.gif b/src/canonical/models/front-shiny-cosmetic/0424-000-Ambipom-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0424--000--Ambipom--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0424-000-Ambipom-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0443--000--Gible--Female.gif b/src/canonical/models/front-shiny-cosmetic/0443-000-Gible-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0443--000--Gible--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0443-000-Gible-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0444--000--Gabite--Female.gif b/src/canonical/models/front-shiny-cosmetic/0444-000-Gabite-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0444--000--Gabite--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0444-000-Gabite-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0445--000--Garchomp--Female.gif b/src/canonical/models/front-shiny-cosmetic/0445-000-Garchomp-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0445--000--Garchomp--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0445-000-Garchomp-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0449--000--Hippopotas--Female.gif b/src/canonical/models/front-shiny-cosmetic/0449-000-Hippopotas-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0449--000--Hippopotas--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0449-000-Hippopotas-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0450--000--Hippowdon--Female.gif b/src/canonical/models/front-shiny-cosmetic/0450-000-Hippowdon-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0450--000--Hippowdon--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0450-000-Hippowdon-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0453--000--Croagunk--Female.gif b/src/canonical/models/front-shiny-cosmetic/0453-000-Croagunk-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0453--000--Croagunk--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0453-000-Croagunk-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0454--000--Toxicroak--Female.gif b/src/canonical/models/front-shiny-cosmetic/0454-000-Toxicroak-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0454--000--Toxicroak--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0454-000-Toxicroak-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0456--000--Finneon--Female.gif b/src/canonical/models/front-shiny-cosmetic/0456-000-Finneon-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0456--000--Finneon--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0456-000-Finneon-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0457--000--Lumineon--Female.gif b/src/canonical/models/front-shiny-cosmetic/0457-000-Lumineon-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0457--000--Lumineon--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0457-000-Lumineon-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0459--000--Snover--Female.gif b/src/canonical/models/front-shiny-cosmetic/0459-000-Snover-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0459--000--Snover--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0459-000-Snover-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0460--000--Abomasnow--Female.gif b/src/canonical/models/front-shiny-cosmetic/0460-000-Abomasnow-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0460--000--Abomasnow--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0460-000-Abomasnow-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0461--000--Weavile--Female.gif b/src/canonical/models/front-shiny-cosmetic/0461-000-Weavile-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0461--000--Weavile--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0461-000-Weavile-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0464--000--Rhyperior--Female.gif b/src/canonical/models/front-shiny-cosmetic/0464-000-Rhyperior-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0464--000--Rhyperior--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0464-000-Rhyperior-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0465--000--Tangrowth--Female.gif b/src/canonical/models/front-shiny-cosmetic/0465-000-Tangrowth-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0465--000--Tangrowth--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0465-000-Tangrowth-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0473--000--Mamoswine--Female.gif b/src/canonical/models/front-shiny-cosmetic/0473-000-Mamoswine-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0473--000--Mamoswine--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0473-000-Mamoswine-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0521--000--Unfezant--Female.gif b/src/canonical/models/front-shiny-cosmetic/0521-000-Unfezant-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0521--000--Unfezant--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0521-000-Unfezant-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0550--420--Basculin--Blue.gif b/src/canonical/models/front-shiny-cosmetic/0550-420-Basculin-Blue.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0550--420--Basculin--Blue.gif
rename to src/canonical/models/front-shiny-cosmetic/0550-420-Basculin-Blue.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0585--420--Deerling--Autumn.gif b/src/canonical/models/front-shiny-cosmetic/0585-420-Deerling-Autumn.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0585--420--Deerling--Autumn.gif
rename to src/canonical/models/front-shiny-cosmetic/0585-420-Deerling-Autumn.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0585--420--Deerling--Summer.gif b/src/canonical/models/front-shiny-cosmetic/0585-420-Deerling-Summer.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0585--420--Deerling--Summer.gif
rename to src/canonical/models/front-shiny-cosmetic/0585-420-Deerling-Summer.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0585--420--Deerling--Winter.gif b/src/canonical/models/front-shiny-cosmetic/0585-420-Deerling-Winter.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0585--420--Deerling--Winter.gif
rename to src/canonical/models/front-shiny-cosmetic/0585-420-Deerling-Winter.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0586--420--Sawsbuck--Autumn.gif b/src/canonical/models/front-shiny-cosmetic/0586-420-Sawsbuck-Autumn.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0586--420--Sawsbuck--Autumn.gif
rename to src/canonical/models/front-shiny-cosmetic/0586-420-Sawsbuck-Autumn.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0586--420--Sawsbuck--Summer.gif b/src/canonical/models/front-shiny-cosmetic/0586-420-Sawsbuck-Summer.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0586--420--Sawsbuck--Summer.gif
rename to src/canonical/models/front-shiny-cosmetic/0586-420-Sawsbuck-Summer.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0586--420--Sawsbuck--Winter.gif b/src/canonical/models/front-shiny-cosmetic/0586-420-Sawsbuck-Winter.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0586--420--Sawsbuck--Winter.gif
rename to src/canonical/models/front-shiny-cosmetic/0586-420-Sawsbuck-Winter.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0592--000--Frillish--Female.gif b/src/canonical/models/front-shiny-cosmetic/0592-000-Frillish-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0592--000--Frillish--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0592-000-Frillish-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0593--000--Jellicent--Female.gif b/src/canonical/models/front-shiny-cosmetic/0593-000-Jellicent-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0593--000--Jellicent--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0593-000-Jellicent-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Archipelago.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Archipelago.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Archipelago.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Archipelago.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Continental.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Continental.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Continental.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Continental.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Elegant.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Elegant.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Elegant.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Elegant.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Garden.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Garden.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Garden.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Garden.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--High_Plains.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-High_Plains.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--High_Plains.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-High_Plains.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Icy_Snow.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Icy_Snow.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Icy_Snow.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Icy_Snow.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Jungle.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Jungle.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Jungle.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Jungle.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Marine.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Marine.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Marine.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Marine.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Modern.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Modern.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Modern.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Modern.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Monsoon.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Monsoon.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Monsoon.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Monsoon.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Ocean.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Ocean.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Ocean.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Ocean.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Polar.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Polar.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Polar.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Polar.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--River.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-River.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--River.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-River.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Sandstorm.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Sandstorm.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Sandstorm.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Sandstorm.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Savanna.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Savanna.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Savanna.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Savanna.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Sun.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Sun.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Sun.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Sun.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Tundra.gif b/src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Tundra.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0666--420--Vivillon--Tundra.gif
rename to src/canonical/models/front-shiny-cosmetic/0666-420-Vivillon-Tundra.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0668--000--Pyroar--Female.gif b/src/canonical/models/front-shiny-cosmetic/0668-000-Pyroar-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0668--000--Pyroar--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0668-000-Pyroar-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--Blue.gif b/src/canonical/models/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-Blue.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--Blue.gif
rename to src/canonical/models/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-Blue.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--Orange.gif b/src/canonical/models/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-Orange.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--Orange.gif
rename to src/canonical/models/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-Orange.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--White.gif b/src/canonical/models/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-White.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--White.gif
rename to src/canonical/models/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-White.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--Yellow.gif b/src/canonical/models/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-Yellow.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0669--420--Flabe__0301be__0301--Yellow.gif
rename to src/canonical/models/front-shiny-cosmetic/0669-420-Flabe__0301be__0301-Yellow.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0670--420--Floette--Blue.gif b/src/canonical/models/front-shiny-cosmetic/0670-420-Floette-Blue.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0670--420--Floette--Blue.gif
rename to src/canonical/models/front-shiny-cosmetic/0670-420-Floette-Blue.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0670--420--Floette--Orange.gif b/src/canonical/models/front-shiny-cosmetic/0670-420-Floette-Orange.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0670--420--Floette--Orange.gif
rename to src/canonical/models/front-shiny-cosmetic/0670-420-Floette-Orange.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0670--420--Floette--White.gif b/src/canonical/models/front-shiny-cosmetic/0670-420-Floette-White.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0670--420--Floette--White.gif
rename to src/canonical/models/front-shiny-cosmetic/0670-420-Floette-White.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0670--420--Floette--Yellow.gif b/src/canonical/models/front-shiny-cosmetic/0670-420-Floette-Yellow.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0670--420--Floette--Yellow.gif
rename to src/canonical/models/front-shiny-cosmetic/0670-420-Floette-Yellow.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0671--420--Florges--Blue.gif b/src/canonical/models/front-shiny-cosmetic/0671-420-Florges-Blue.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0671--420--Florges--Blue.gif
rename to src/canonical/models/front-shiny-cosmetic/0671-420-Florges-Blue.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0671--420--Florges--Orange.gif b/src/canonical/models/front-shiny-cosmetic/0671-420-Florges-Orange.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0671--420--Florges--Orange.gif
rename to src/canonical/models/front-shiny-cosmetic/0671-420-Florges-Orange.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0671--420--Florges--White.gif b/src/canonical/models/front-shiny-cosmetic/0671-420-Florges-White.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0671--420--Florges--White.gif
rename to src/canonical/models/front-shiny-cosmetic/0671-420-Florges-White.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0671--420--Florges--Yellow.gif b/src/canonical/models/front-shiny-cosmetic/0671-420-Florges-Yellow.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0671--420--Florges--Yellow.gif
rename to src/canonical/models/front-shiny-cosmetic/0671-420-Florges-Yellow.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Dandy.gif b/src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Dandy.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Dandy.gif
rename to src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Dandy.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Debutante.gif b/src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Debutante.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Debutante.gif
rename to src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Debutante.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Diamond.gif b/src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Diamond.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Diamond.gif
rename to src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Diamond.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Heart.gif b/src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Heart.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Heart.gif
rename to src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Heart.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Kabuki.gif b/src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Kabuki.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Kabuki.gif
rename to src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Kabuki.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--La_Reine.gif b/src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-La_Reine.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--La_Reine.gif
rename to src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-La_Reine.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Matron.gif b/src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Matron.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Matron.gif
rename to src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Matron.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Pharaoh.gif b/src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Pharaoh.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Pharaoh.gif
rename to src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Pharaoh.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Star.gif b/src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Star.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0676--420--Furfrou--Star.gif
rename to src/canonical/models/front-shiny-cosmetic/0676-420-Furfrou-Star.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0758--000--Salazzle--Female.gif b/src/canonical/models/front-shiny-cosmetic/0758-000-Salazzle-Female.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0758--000--Salazzle--Female.gif
rename to src/canonical/models/front-shiny-cosmetic/0758-000-Salazzle-Female.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0774--420--Minior--Blue.gif b/src/canonical/models/front-shiny-cosmetic/0774-420-Minior-Blue.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0774--420--Minior--Blue.gif
rename to src/canonical/models/front-shiny-cosmetic/0774-420-Minior-Blue.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0774--420--Minior--Green.gif b/src/canonical/models/front-shiny-cosmetic/0774-420-Minior-Green.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0774--420--Minior--Green.gif
rename to src/canonical/models/front-shiny-cosmetic/0774-420-Minior-Green.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0774--420--Minior--Indigo.gif b/src/canonical/models/front-shiny-cosmetic/0774-420-Minior-Indigo.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0774--420--Minior--Indigo.gif
rename to src/canonical/models/front-shiny-cosmetic/0774-420-Minior-Indigo.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0774--420--Minior--Meteor.gif b/src/canonical/models/front-shiny-cosmetic/0774-420-Minior-Meteor.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0774--420--Minior--Meteor.gif
rename to src/canonical/models/front-shiny-cosmetic/0774-420-Minior-Meteor.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0774--420--Minior--Orange.gif b/src/canonical/models/front-shiny-cosmetic/0774-420-Minior-Orange.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0774--420--Minior--Orange.gif
rename to src/canonical/models/front-shiny-cosmetic/0774-420-Minior-Orange.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0774--420--Minior--Violet.gif b/src/canonical/models/front-shiny-cosmetic/0774-420-Minior-Violet.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0774--420--Minior--Violet.gif
rename to src/canonical/models/front-shiny-cosmetic/0774-420-Minior-Violet.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0774--420--Minior--Yellow.gif b/src/canonical/models/front-shiny-cosmetic/0774-420-Minior-Yellow.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0774--420--Minior--Yellow.gif
rename to src/canonical/models/front-shiny-cosmetic/0774-420-Minior-Yellow.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0801--420--Magearna--Original.gif b/src/canonical/models/front-shiny-cosmetic/0801-420-Magearna-Original.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0801--420--Magearna--Original.gif
rename to src/canonical/models/front-shiny-cosmetic/0801-420-Magearna-Original.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Caramel_Swirl.gif b/src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Caramel_Swirl.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Caramel_Swirl.gif
rename to src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Caramel_Swirl.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Lemon_Cream.gif b/src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Lemon_Cream.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Lemon_Cream.gif
rename to src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Lemon_Cream.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Matcha_Cream.gif b/src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Matcha_Cream.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Matcha_Cream.gif
rename to src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Matcha_Cream.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Mint_Cream.gif b/src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Mint_Cream.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Mint_Cream.gif
rename to src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Mint_Cream.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Rainbow_Swirl.gif b/src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Rainbow_Swirl.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Rainbow_Swirl.gif
rename to src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Rainbow_Swirl.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Ruby_Cream.gif b/src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Ruby_Cream.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Ruby_Cream.gif
rename to src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Ruby_Cream.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Ruby_Swirl.gif b/src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Ruby_Swirl.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Ruby_Swirl.gif
rename to src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Ruby_Swirl.gif
diff --git a/src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Salted_Cream.gif b/src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Salted_Cream.gif
similarity index 100%
rename from src/canonical/models/front-shiny-cosmetic/0869--420--Alcremie--Salted_Cream.gif
rename to src/canonical/models/front-shiny-cosmetic/0869-420-Alcremie-Salted_Cream.gif
diff --git a/src/canonical/models/front-shiny/0001--000--Bulbasaur.gif b/src/canonical/models/front-shiny/0001-000-Bulbasaur.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0001--000--Bulbasaur.gif
rename to src/canonical/models/front-shiny/0001-000-Bulbasaur.gif
diff --git a/src/canonical/models/front-shiny/0002--000--Ivysaur.gif b/src/canonical/models/front-shiny/0002-000-Ivysaur.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0002--000--Ivysaur.gif
rename to src/canonical/models/front-shiny/0002-000-Ivysaur.gif
diff --git a/src/canonical/models/front-shiny/0003--000--Venusaur.gif b/src/canonical/models/front-shiny/0003-000-Venusaur.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0003--000--Venusaur.gif
rename to src/canonical/models/front-shiny/0003-000-Venusaur.gif
diff --git a/src/canonical/models/front-shiny/0003--420--Venusaur--Mega.gif b/src/canonical/models/front-shiny/0003-420-Venusaur-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0003--420--Venusaur--Mega.gif
rename to src/canonical/models/front-shiny/0003-420-Venusaur-Mega.gif
diff --git a/src/canonical/models/front-shiny/0004--000--Charmander.gif b/src/canonical/models/front-shiny/0004-000-Charmander.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0004--000--Charmander.gif
rename to src/canonical/models/front-shiny/0004-000-Charmander.gif
diff --git a/src/canonical/models/front-shiny/0005--000--Charmeleon.gif b/src/canonical/models/front-shiny/0005-000-Charmeleon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0005--000--Charmeleon.gif
rename to src/canonical/models/front-shiny/0005-000-Charmeleon.gif
diff --git a/src/canonical/models/front-shiny/0006--000--Charizard.gif b/src/canonical/models/front-shiny/0006-000-Charizard.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0006--000--Charizard.gif
rename to src/canonical/models/front-shiny/0006-000-Charizard.gif
diff --git a/src/canonical/models/front-shiny/0006--420--Charizard--Gmax.gif b/src/canonical/models/front-shiny/0006-420-Charizard-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0006--420--Charizard--Gmax.gif
rename to src/canonical/models/front-shiny/0006-420-Charizard-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0006--420--Charizard--Mega-X.gif b/src/canonical/models/front-shiny/0006-420-Charizard-Mega~X.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0006--420--Charizard--Mega-X.gif
rename to src/canonical/models/front-shiny/0006-420-Charizard-Mega~X.gif
diff --git a/src/canonical/models/front-shiny/0006--420--Charizard--Mega-Y.gif b/src/canonical/models/front-shiny/0006-420-Charizard-Mega~Y.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0006--420--Charizard--Mega-Y.gif
rename to src/canonical/models/front-shiny/0006-420-Charizard-Mega~Y.gif
diff --git a/src/canonical/models/front-shiny/0007--000--Squirtle.gif b/src/canonical/models/front-shiny/0007-000-Squirtle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0007--000--Squirtle.gif
rename to src/canonical/models/front-shiny/0007-000-Squirtle.gif
diff --git a/src/canonical/models/front-shiny/0008--000--Wartortle.gif b/src/canonical/models/front-shiny/0008-000-Wartortle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0008--000--Wartortle.gif
rename to src/canonical/models/front-shiny/0008-000-Wartortle.gif
diff --git a/src/canonical/models/front-shiny/0009--000--Blastoise.gif b/src/canonical/models/front-shiny/0009-000-Blastoise.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0009--000--Blastoise.gif
rename to src/canonical/models/front-shiny/0009-000-Blastoise.gif
diff --git a/src/canonical/models/front-shiny/0009--420--Blastoise--Mega.gif b/src/canonical/models/front-shiny/0009-420-Blastoise-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0009--420--Blastoise--Mega.gif
rename to src/canonical/models/front-shiny/0009-420-Blastoise-Mega.gif
diff --git a/src/canonical/models/front-shiny/0010--000--Caterpie.gif b/src/canonical/models/front-shiny/0010-000-Caterpie.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0010--000--Caterpie.gif
rename to src/canonical/models/front-shiny/0010-000-Caterpie.gif
diff --git a/src/canonical/models/front-shiny/0011--000--Metapod.gif b/src/canonical/models/front-shiny/0011-000-Metapod.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0011--000--Metapod.gif
rename to src/canonical/models/front-shiny/0011-000-Metapod.gif
diff --git a/src/canonical/models/front-shiny/0012--000--Butterfree.gif b/src/canonical/models/front-shiny/0012-000-Butterfree.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0012--000--Butterfree.gif
rename to src/canonical/models/front-shiny/0012-000-Butterfree.gif
diff --git a/src/canonical/models/front-shiny/0012--420--Butterfree--Gmax.gif b/src/canonical/models/front-shiny/0012-420-Butterfree-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0012--420--Butterfree--Gmax.gif
rename to src/canonical/models/front-shiny/0012-420-Butterfree-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0013--000--Weedle.gif b/src/canonical/models/front-shiny/0013-000-Weedle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0013--000--Weedle.gif
rename to src/canonical/models/front-shiny/0013-000-Weedle.gif
diff --git a/src/canonical/models/front-shiny/0014--000--Kakuna.gif b/src/canonical/models/front-shiny/0014-000-Kakuna.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0014--000--Kakuna.gif
rename to src/canonical/models/front-shiny/0014-000-Kakuna.gif
diff --git a/src/canonical/models/front-shiny/0015--000--Beedrill.gif b/src/canonical/models/front-shiny/0015-000-Beedrill.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0015--000--Beedrill.gif
rename to src/canonical/models/front-shiny/0015-000-Beedrill.gif
diff --git a/src/canonical/models/front-shiny/0015--420--Beedrill--Mega.gif b/src/canonical/models/front-shiny/0015-420-Beedrill-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0015--420--Beedrill--Mega.gif
rename to src/canonical/models/front-shiny/0015-420-Beedrill-Mega.gif
diff --git a/src/canonical/models/front-shiny/0016--000--Pidgey.gif b/src/canonical/models/front-shiny/0016-000-Pidgey.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0016--000--Pidgey.gif
rename to src/canonical/models/front-shiny/0016-000-Pidgey.gif
diff --git a/src/canonical/models/front-shiny/0017--000--Pidgeotto.gif b/src/canonical/models/front-shiny/0017-000-Pidgeotto.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0017--000--Pidgeotto.gif
rename to src/canonical/models/front-shiny/0017-000-Pidgeotto.gif
diff --git a/src/canonical/models/front-shiny/0018--000--Pidgeot.gif b/src/canonical/models/front-shiny/0018-000-Pidgeot.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0018--000--Pidgeot.gif
rename to src/canonical/models/front-shiny/0018-000-Pidgeot.gif
diff --git a/src/canonical/models/front-shiny/0018--420--Pidgeot--Mega.gif b/src/canonical/models/front-shiny/0018-420-Pidgeot-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0018--420--Pidgeot--Mega.gif
rename to src/canonical/models/front-shiny/0018-420-Pidgeot-Mega.gif
diff --git a/src/canonical/models/front-shiny/0019--000--Rattata.gif b/src/canonical/models/front-shiny/0019-000-Rattata.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0019--000--Rattata.gif
rename to src/canonical/models/front-shiny/0019-000-Rattata.gif
diff --git a/src/canonical/models/front-shiny/0019--420--Rattata--Alola.gif b/src/canonical/models/front-shiny/0019-420-Rattata-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0019--420--Rattata--Alola.gif
rename to src/canonical/models/front-shiny/0019-420-Rattata-Alola.gif
diff --git a/src/canonical/models/front-shiny/0020--000--Raticate.gif b/src/canonical/models/front-shiny/0020-000-Raticate.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0020--000--Raticate.gif
rename to src/canonical/models/front-shiny/0020-000-Raticate.gif
diff --git a/src/canonical/models/front-shiny/0020--420--Raticate--Alola.gif b/src/canonical/models/front-shiny/0020-420-Raticate-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0020--420--Raticate--Alola.gif
rename to src/canonical/models/front-shiny/0020-420-Raticate-Alola.gif
diff --git a/src/canonical/models/front-shiny/0020--420--Raticate--Alola-Totem.gif b/src/canonical/models/front-shiny/0020-420-Raticate-Alola~Totem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0020--420--Raticate--Alola-Totem.gif
rename to src/canonical/models/front-shiny/0020-420-Raticate-Alola~Totem.gif
diff --git a/src/canonical/models/front-shiny/0021--000--Spearow.gif b/src/canonical/models/front-shiny/0021-000-Spearow.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0021--000--Spearow.gif
rename to src/canonical/models/front-shiny/0021-000-Spearow.gif
diff --git a/src/canonical/models/front-shiny/0022--000--Fearow.gif b/src/canonical/models/front-shiny/0022-000-Fearow.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0022--000--Fearow.gif
rename to src/canonical/models/front-shiny/0022-000-Fearow.gif
diff --git a/src/canonical/models/front-shiny/0023--000--Ekans.gif b/src/canonical/models/front-shiny/0023-000-Ekans.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0023--000--Ekans.gif
rename to src/canonical/models/front-shiny/0023-000-Ekans.gif
diff --git a/src/canonical/models/front-shiny/0024--000--Arbok.gif b/src/canonical/models/front-shiny/0024-000-Arbok.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0024--000--Arbok.gif
rename to src/canonical/models/front-shiny/0024-000-Arbok.gif
diff --git a/src/canonical/models/front-shiny/0025--420--Pikachu--Alola.gif b/src/canonical/models/front-shiny/0025--420--Pikachu--Alola.gif
deleted file mode 120000
index 3904d082..00000000
--- a/src/canonical/models/front-shiny/0025--420--Pikachu--Alola.gif
+++ /dev/null
@@ -1 +0,0 @@
-../front/0025--420--Pikachu--Alola.gif
\ No newline at end of file
diff --git a/src/canonical/models/front-shiny/0025--420--Pikachu--Hoenn.gif b/src/canonical/models/front-shiny/0025--420--Pikachu--Hoenn.gif
deleted file mode 120000
index 0c9453de..00000000
--- a/src/canonical/models/front-shiny/0025--420--Pikachu--Hoenn.gif
+++ /dev/null
@@ -1 +0,0 @@
-../front/0025--420--Pikachu--Hoenn.gif
\ No newline at end of file
diff --git a/src/canonical/models/front-shiny/0025--420--Pikachu--Kalos.gif b/src/canonical/models/front-shiny/0025--420--Pikachu--Kalos.gif
deleted file mode 120000
index d035e1ac..00000000
--- a/src/canonical/models/front-shiny/0025--420--Pikachu--Kalos.gif
+++ /dev/null
@@ -1 +0,0 @@
-../front/0025--420--Pikachu--Kalos.gif
\ No newline at end of file
diff --git a/src/canonical/models/front-shiny/0025--420--Pikachu--Sinnoh.gif b/src/canonical/models/front-shiny/0025--420--Pikachu--Sinnoh.gif
deleted file mode 120000
index ab7227d2..00000000
--- a/src/canonical/models/front-shiny/0025--420--Pikachu--Sinnoh.gif
+++ /dev/null
@@ -1 +0,0 @@
-../front/0025--420--Pikachu--Sinnoh.gif
\ No newline at end of file
diff --git a/src/canonical/models/front-shiny/0025--420--Pikachu--Unova.gif b/src/canonical/models/front-shiny/0025--420--Pikachu--Unova.gif
deleted file mode 120000
index 98cc9adb..00000000
--- a/src/canonical/models/front-shiny/0025--420--Pikachu--Unova.gif
+++ /dev/null
@@ -1 +0,0 @@
-../front/0025--420--Pikachu--Unova.gif
\ No newline at end of file
diff --git a/src/canonical/models/front-shiny/0025--000--Pikachu.gif b/src/canonical/models/front-shiny/0025-000-Pikachu.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0025--000--Pikachu.gif
rename to src/canonical/models/front-shiny/0025-000-Pikachu.gif
diff --git a/src/canonical/models/front-shiny/0025-420-Pikachu-Alola.gif b/src/canonical/models/front-shiny/0025-420-Pikachu-Alola.gif
new file mode 120000
index 00000000..ec916dc7
--- /dev/null
+++ b/src/canonical/models/front-shiny/0025-420-Pikachu-Alola.gif
@@ -0,0 +1 @@
+../front/0025-420-Pikachu-Alola.gif
\ No newline at end of file
diff --git a/src/canonical/models/front-shiny/0025--420--Pikachu--Belle.gif b/src/canonical/models/front-shiny/0025-420-Pikachu-Belle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0025--420--Pikachu--Belle.gif
rename to src/canonical/models/front-shiny/0025-420-Pikachu-Belle.gif
diff --git a/src/canonical/models/front-shiny/0025--420--Pikachu--Cosplay.gif b/src/canonical/models/front-shiny/0025-420-Pikachu-Cosplay.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0025--420--Pikachu--Cosplay.gif
rename to src/canonical/models/front-shiny/0025-420-Pikachu-Cosplay.gif
diff --git a/src/canonical/models/front-shiny/0025--420--Pikachu--Gmax.gif b/src/canonical/models/front-shiny/0025-420-Pikachu-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0025--420--Pikachu--Gmax.gif
rename to src/canonical/models/front-shiny/0025-420-Pikachu-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0025-420-Pikachu-Hoenn.gif b/src/canonical/models/front-shiny/0025-420-Pikachu-Hoenn.gif
new file mode 120000
index 00000000..fdc267fb
--- /dev/null
+++ b/src/canonical/models/front-shiny/0025-420-Pikachu-Hoenn.gif
@@ -0,0 +1 @@
+../front/0025-420-Pikachu-Hoenn.gif
\ No newline at end of file
diff --git a/src/canonical/models/front-shiny/0025-420-Pikachu-Kalos.gif b/src/canonical/models/front-shiny/0025-420-Pikachu-Kalos.gif
new file mode 120000
index 00000000..f388f1af
--- /dev/null
+++ b/src/canonical/models/front-shiny/0025-420-Pikachu-Kalos.gif
@@ -0,0 +1 @@
+../front/0025-420-Pikachu-Kalos.gif
\ No newline at end of file
diff --git a/src/canonical/models/front-shiny/0025--420--Pikachu--Libre.gif b/src/canonical/models/front-shiny/0025-420-Pikachu-Libre.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0025--420--Pikachu--Libre.gif
rename to src/canonical/models/front-shiny/0025-420-Pikachu-Libre.gif
diff --git a/src/canonical/models/front-shiny/0025--420--Pikachu--Partner.gif b/src/canonical/models/front-shiny/0025-420-Pikachu-Partner.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0025--420--Pikachu--Partner.gif
rename to src/canonical/models/front-shiny/0025-420-Pikachu-Partner.gif
diff --git a/src/canonical/models/front-shiny/0025--420--Pikachu--PhD.gif b/src/canonical/models/front-shiny/0025-420-Pikachu-PhD.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0025--420--Pikachu--PhD.gif
rename to src/canonical/models/front-shiny/0025-420-Pikachu-PhD.gif
diff --git a/src/canonical/models/front-shiny/0025--420--Pikachu--Pop-Star.gif b/src/canonical/models/front-shiny/0025-420-Pikachu-Pop~Star.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0025--420--Pikachu--Pop-Star.gif
rename to src/canonical/models/front-shiny/0025-420-Pikachu-Pop~Star.gif
diff --git a/src/canonical/models/front-shiny/0025--420--Pikachu--Rock-Star.gif b/src/canonical/models/front-shiny/0025-420-Pikachu-Rock~Star.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0025--420--Pikachu--Rock-Star.gif
rename to src/canonical/models/front-shiny/0025-420-Pikachu-Rock~Star.gif
diff --git a/src/canonical/models/front-shiny/0025-420-Pikachu-Sinnoh.gif b/src/canonical/models/front-shiny/0025-420-Pikachu-Sinnoh.gif
new file mode 120000
index 00000000..ac26987c
--- /dev/null
+++ b/src/canonical/models/front-shiny/0025-420-Pikachu-Sinnoh.gif
@@ -0,0 +1 @@
+../front/0025-420-Pikachu-Sinnoh.gif
\ No newline at end of file
diff --git a/src/canonical/models/front-shiny/0025-420-Pikachu-Unova.gif b/src/canonical/models/front-shiny/0025-420-Pikachu-Unova.gif
new file mode 120000
index 00000000..611ae0a5
--- /dev/null
+++ b/src/canonical/models/front-shiny/0025-420-Pikachu-Unova.gif
@@ -0,0 +1 @@
+../front/0025-420-Pikachu-Unova.gif
\ No newline at end of file
diff --git a/src/canonical/models/front-shiny/0026--000--Raichu.gif b/src/canonical/models/front-shiny/0026-000-Raichu.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0026--000--Raichu.gif
rename to src/canonical/models/front-shiny/0026-000-Raichu.gif
diff --git a/src/canonical/models/front-shiny/0026--420--Raichu--Alola.gif b/src/canonical/models/front-shiny/0026-420-Raichu-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0026--420--Raichu--Alola.gif
rename to src/canonical/models/front-shiny/0026-420-Raichu-Alola.gif
diff --git a/src/canonical/models/front-shiny/0027--000--Sandshrew.gif b/src/canonical/models/front-shiny/0027-000-Sandshrew.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0027--000--Sandshrew.gif
rename to src/canonical/models/front-shiny/0027-000-Sandshrew.gif
diff --git a/src/canonical/models/front-shiny/0027--420--Sandshrew--Alola.gif b/src/canonical/models/front-shiny/0027-420-Sandshrew-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0027--420--Sandshrew--Alola.gif
rename to src/canonical/models/front-shiny/0027-420-Sandshrew-Alola.gif
diff --git a/src/canonical/models/front-shiny/0028--000--Sandslash.gif b/src/canonical/models/front-shiny/0028-000-Sandslash.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0028--000--Sandslash.gif
rename to src/canonical/models/front-shiny/0028-000-Sandslash.gif
diff --git a/src/canonical/models/front-shiny/0028--420--Sandslash--Alola.gif b/src/canonical/models/front-shiny/0028-420-Sandslash-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0028--420--Sandslash--Alola.gif
rename to src/canonical/models/front-shiny/0028-420-Sandslash-Alola.gif
diff --git a/src/canonical/models/front-shiny/0029--000--Nidoran-F.gif b/src/canonical/models/front-shiny/0029-000-Nidoran~F.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0029--000--Nidoran-F.gif
rename to src/canonical/models/front-shiny/0029-000-Nidoran~F.gif
diff --git a/src/canonical/models/front-shiny/0030--000--Nidorina.gif b/src/canonical/models/front-shiny/0030-000-Nidorina.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0030--000--Nidorina.gif
rename to src/canonical/models/front-shiny/0030-000-Nidorina.gif
diff --git a/src/canonical/models/front-shiny/0031--000--Nidoqueen.gif b/src/canonical/models/front-shiny/0031-000-Nidoqueen.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0031--000--Nidoqueen.gif
rename to src/canonical/models/front-shiny/0031-000-Nidoqueen.gif
diff --git a/src/canonical/models/front-shiny/0032--000--Nidoran-M.gif b/src/canonical/models/front-shiny/0032-000-Nidoran~M.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0032--000--Nidoran-M.gif
rename to src/canonical/models/front-shiny/0032-000-Nidoran~M.gif
diff --git a/src/canonical/models/front-shiny/0033--000--Nidorino.gif b/src/canonical/models/front-shiny/0033-000-Nidorino.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0033--000--Nidorino.gif
rename to src/canonical/models/front-shiny/0033-000-Nidorino.gif
diff --git a/src/canonical/models/front-shiny/0034--000--Nidoking.gif b/src/canonical/models/front-shiny/0034-000-Nidoking.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0034--000--Nidoking.gif
rename to src/canonical/models/front-shiny/0034-000-Nidoking.gif
diff --git a/src/canonical/models/front-shiny/0035--000--Clefairy.gif b/src/canonical/models/front-shiny/0035-000-Clefairy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0035--000--Clefairy.gif
rename to src/canonical/models/front-shiny/0035-000-Clefairy.gif
diff --git a/src/canonical/models/front-shiny/0036--000--Clefable.gif b/src/canonical/models/front-shiny/0036-000-Clefable.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0036--000--Clefable.gif
rename to src/canonical/models/front-shiny/0036-000-Clefable.gif
diff --git a/src/canonical/models/front-shiny/0037--000--Vulpix.gif b/src/canonical/models/front-shiny/0037-000-Vulpix.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0037--000--Vulpix.gif
rename to src/canonical/models/front-shiny/0037-000-Vulpix.gif
diff --git a/src/canonical/models/front-shiny/0037--420--Vulpix--Alola.gif b/src/canonical/models/front-shiny/0037-420-Vulpix-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0037--420--Vulpix--Alola.gif
rename to src/canonical/models/front-shiny/0037-420-Vulpix-Alola.gif
diff --git a/src/canonical/models/front-shiny/0038--000--Ninetales.gif b/src/canonical/models/front-shiny/0038-000-Ninetales.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0038--000--Ninetales.gif
rename to src/canonical/models/front-shiny/0038-000-Ninetales.gif
diff --git a/src/canonical/models/front-shiny/0038--420--Ninetales--Alola.gif b/src/canonical/models/front-shiny/0038-420-Ninetales-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0038--420--Ninetales--Alola.gif
rename to src/canonical/models/front-shiny/0038-420-Ninetales-Alola.gif
diff --git a/src/canonical/models/front-shiny/0039--000--Jigglypuff.gif b/src/canonical/models/front-shiny/0039-000-Jigglypuff.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0039--000--Jigglypuff.gif
rename to src/canonical/models/front-shiny/0039-000-Jigglypuff.gif
diff --git a/src/canonical/models/front-shiny/0040--000--Wigglytuff.gif b/src/canonical/models/front-shiny/0040-000-Wigglytuff.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0040--000--Wigglytuff.gif
rename to src/canonical/models/front-shiny/0040-000-Wigglytuff.gif
diff --git a/src/canonical/models/front-shiny/0041--000--Zubat.gif b/src/canonical/models/front-shiny/0041-000-Zubat.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0041--000--Zubat.gif
rename to src/canonical/models/front-shiny/0041-000-Zubat.gif
diff --git a/src/canonical/models/front-shiny/0042--000--Golbat.gif b/src/canonical/models/front-shiny/0042-000-Golbat.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0042--000--Golbat.gif
rename to src/canonical/models/front-shiny/0042-000-Golbat.gif
diff --git a/src/canonical/models/front-shiny/0043--000--Oddish.gif b/src/canonical/models/front-shiny/0043-000-Oddish.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0043--000--Oddish.gif
rename to src/canonical/models/front-shiny/0043-000-Oddish.gif
diff --git a/src/canonical/models/front-shiny/0044--000--Gloom.gif b/src/canonical/models/front-shiny/0044-000-Gloom.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0044--000--Gloom.gif
rename to src/canonical/models/front-shiny/0044-000-Gloom.gif
diff --git a/src/canonical/models/front-shiny/0045--000--Vileplume.gif b/src/canonical/models/front-shiny/0045-000-Vileplume.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0045--000--Vileplume.gif
rename to src/canonical/models/front-shiny/0045-000-Vileplume.gif
diff --git a/src/canonical/models/front-shiny/0046--000--Paras.gif b/src/canonical/models/front-shiny/0046-000-Paras.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0046--000--Paras.gif
rename to src/canonical/models/front-shiny/0046-000-Paras.gif
diff --git a/src/canonical/models/front-shiny/0047--000--Parasect.gif b/src/canonical/models/front-shiny/0047-000-Parasect.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0047--000--Parasect.gif
rename to src/canonical/models/front-shiny/0047-000-Parasect.gif
diff --git a/src/canonical/models/front-shiny/0048--000--Venonat.gif b/src/canonical/models/front-shiny/0048-000-Venonat.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0048--000--Venonat.gif
rename to src/canonical/models/front-shiny/0048-000-Venonat.gif
diff --git a/src/canonical/models/front-shiny/0049--000--Venomoth.gif b/src/canonical/models/front-shiny/0049-000-Venomoth.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0049--000--Venomoth.gif
rename to src/canonical/models/front-shiny/0049-000-Venomoth.gif
diff --git a/src/canonical/models/front-shiny/0050--000--Diglett.gif b/src/canonical/models/front-shiny/0050-000-Diglett.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0050--000--Diglett.gif
rename to src/canonical/models/front-shiny/0050-000-Diglett.gif
diff --git a/src/canonical/models/front-shiny/0050--420--Diglett--Alola.gif b/src/canonical/models/front-shiny/0050-420-Diglett-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0050--420--Diglett--Alola.gif
rename to src/canonical/models/front-shiny/0050-420-Diglett-Alola.gif
diff --git a/src/canonical/models/front-shiny/0051--000--Dugtrio.gif b/src/canonical/models/front-shiny/0051-000-Dugtrio.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0051--000--Dugtrio.gif
rename to src/canonical/models/front-shiny/0051-000-Dugtrio.gif
diff --git a/src/canonical/models/front-shiny/0051--420--Dugtrio--Alola.gif b/src/canonical/models/front-shiny/0051-420-Dugtrio-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0051--420--Dugtrio--Alola.gif
rename to src/canonical/models/front-shiny/0051-420-Dugtrio-Alola.gif
diff --git a/src/canonical/models/front-shiny/0052--000--Meowth.gif b/src/canonical/models/front-shiny/0052-000-Meowth.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0052--000--Meowth.gif
rename to src/canonical/models/front-shiny/0052-000-Meowth.gif
diff --git a/src/canonical/models/front-shiny/0052--420--Meowth--Alola.gif b/src/canonical/models/front-shiny/0052-420-Meowth-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0052--420--Meowth--Alola.gif
rename to src/canonical/models/front-shiny/0052-420-Meowth-Alola.gif
diff --git a/src/canonical/models/front-shiny/0052--420--Meowth--Galar.gif b/src/canonical/models/front-shiny/0052-420-Meowth-Galar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0052--420--Meowth--Galar.gif
rename to src/canonical/models/front-shiny/0052-420-Meowth-Galar.gif
diff --git a/src/canonical/models/front-shiny/0052--420--Meowth--Gmax.gif b/src/canonical/models/front-shiny/0052-420-Meowth-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0052--420--Meowth--Gmax.gif
rename to src/canonical/models/front-shiny/0052-420-Meowth-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0053--000--Persian.gif b/src/canonical/models/front-shiny/0053-000-Persian.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0053--000--Persian.gif
rename to src/canonical/models/front-shiny/0053-000-Persian.gif
diff --git a/src/canonical/models/front-shiny/0053--420--Persian--Alola.gif b/src/canonical/models/front-shiny/0053-420-Persian-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0053--420--Persian--Alola.gif
rename to src/canonical/models/front-shiny/0053-420-Persian-Alola.gif
diff --git a/src/canonical/models/front-shiny/0054--000--Psyduck.gif b/src/canonical/models/front-shiny/0054-000-Psyduck.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0054--000--Psyduck.gif
rename to src/canonical/models/front-shiny/0054-000-Psyduck.gif
diff --git a/src/canonical/models/front-shiny/0055--000--Golduck.gif b/src/canonical/models/front-shiny/0055-000-Golduck.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0055--000--Golduck.gif
rename to src/canonical/models/front-shiny/0055-000-Golduck.gif
diff --git a/src/canonical/models/front-shiny/0056--000--Mankey.gif b/src/canonical/models/front-shiny/0056-000-Mankey.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0056--000--Mankey.gif
rename to src/canonical/models/front-shiny/0056-000-Mankey.gif
diff --git a/src/canonical/models/front-shiny/0057--000--Primeape.gif b/src/canonical/models/front-shiny/0057-000-Primeape.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0057--000--Primeape.gif
rename to src/canonical/models/front-shiny/0057-000-Primeape.gif
diff --git a/src/canonical/models/front-shiny/0058--000--Growlithe.gif b/src/canonical/models/front-shiny/0058-000-Growlithe.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0058--000--Growlithe.gif
rename to src/canonical/models/front-shiny/0058-000-Growlithe.gif
diff --git a/src/canonical/models/front-shiny/0059--000--Arcanine.gif b/src/canonical/models/front-shiny/0059-000-Arcanine.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0059--000--Arcanine.gif
rename to src/canonical/models/front-shiny/0059-000-Arcanine.gif
diff --git a/src/canonical/models/front-shiny/0060--000--Poliwag.gif b/src/canonical/models/front-shiny/0060-000-Poliwag.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0060--000--Poliwag.gif
rename to src/canonical/models/front-shiny/0060-000-Poliwag.gif
diff --git a/src/canonical/models/front-shiny/0061--000--Poliwhirl.gif b/src/canonical/models/front-shiny/0061-000-Poliwhirl.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0061--000--Poliwhirl.gif
rename to src/canonical/models/front-shiny/0061-000-Poliwhirl.gif
diff --git a/src/canonical/models/front-shiny/0062--000--Poliwrath.gif b/src/canonical/models/front-shiny/0062-000-Poliwrath.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0062--000--Poliwrath.gif
rename to src/canonical/models/front-shiny/0062-000-Poliwrath.gif
diff --git a/src/canonical/models/front-shiny/0063--000--Abra.gif b/src/canonical/models/front-shiny/0063-000-Abra.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0063--000--Abra.gif
rename to src/canonical/models/front-shiny/0063-000-Abra.gif
diff --git a/src/canonical/models/front-shiny/0064--000--Kadabra.gif b/src/canonical/models/front-shiny/0064-000-Kadabra.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0064--000--Kadabra.gif
rename to src/canonical/models/front-shiny/0064-000-Kadabra.gif
diff --git a/src/canonical/models/front-shiny/0065--000--Alakazam.gif b/src/canonical/models/front-shiny/0065-000-Alakazam.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0065--000--Alakazam.gif
rename to src/canonical/models/front-shiny/0065-000-Alakazam.gif
diff --git a/src/canonical/models/front-shiny/0065--420--Alakazam--Mega.gif b/src/canonical/models/front-shiny/0065-420-Alakazam-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0065--420--Alakazam--Mega.gif
rename to src/canonical/models/front-shiny/0065-420-Alakazam-Mega.gif
diff --git a/src/canonical/models/front-shiny/0066--000--Machop.gif b/src/canonical/models/front-shiny/0066-000-Machop.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0066--000--Machop.gif
rename to src/canonical/models/front-shiny/0066-000-Machop.gif
diff --git a/src/canonical/models/front-shiny/0067--000--Machoke.gif b/src/canonical/models/front-shiny/0067-000-Machoke.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0067--000--Machoke.gif
rename to src/canonical/models/front-shiny/0067-000-Machoke.gif
diff --git a/src/canonical/models/front-shiny/0068--000--Machamp.gif b/src/canonical/models/front-shiny/0068-000-Machamp.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0068--000--Machamp.gif
rename to src/canonical/models/front-shiny/0068-000-Machamp.gif
diff --git a/src/canonical/models/front-shiny/0068--420--Machamp--Gmax.gif b/src/canonical/models/front-shiny/0068-420-Machamp-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0068--420--Machamp--Gmax.gif
rename to src/canonical/models/front-shiny/0068-420-Machamp-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0069--000--Bellsprout.gif b/src/canonical/models/front-shiny/0069-000-Bellsprout.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0069--000--Bellsprout.gif
rename to src/canonical/models/front-shiny/0069-000-Bellsprout.gif
diff --git a/src/canonical/models/front-shiny/0070--000--Weepinbell.gif b/src/canonical/models/front-shiny/0070-000-Weepinbell.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0070--000--Weepinbell.gif
rename to src/canonical/models/front-shiny/0070-000-Weepinbell.gif
diff --git a/src/canonical/models/front-shiny/0071--000--Victreebel.gif b/src/canonical/models/front-shiny/0071-000-Victreebel.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0071--000--Victreebel.gif
rename to src/canonical/models/front-shiny/0071-000-Victreebel.gif
diff --git a/src/canonical/models/front-shiny/0072--000--Tentacool.gif b/src/canonical/models/front-shiny/0072-000-Tentacool.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0072--000--Tentacool.gif
rename to src/canonical/models/front-shiny/0072-000-Tentacool.gif
diff --git a/src/canonical/models/front-shiny/0073--000--Tentacruel.gif b/src/canonical/models/front-shiny/0073-000-Tentacruel.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0073--000--Tentacruel.gif
rename to src/canonical/models/front-shiny/0073-000-Tentacruel.gif
diff --git a/src/canonical/models/front-shiny/0074--000--Geodude.gif b/src/canonical/models/front-shiny/0074-000-Geodude.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0074--000--Geodude.gif
rename to src/canonical/models/front-shiny/0074-000-Geodude.gif
diff --git a/src/canonical/models/front-shiny/0074--420--Geodude--Alola.gif b/src/canonical/models/front-shiny/0074-420-Geodude-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0074--420--Geodude--Alola.gif
rename to src/canonical/models/front-shiny/0074-420-Geodude-Alola.gif
diff --git a/src/canonical/models/front-shiny/0075--000--Graveler.gif b/src/canonical/models/front-shiny/0075-000-Graveler.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0075--000--Graveler.gif
rename to src/canonical/models/front-shiny/0075-000-Graveler.gif
diff --git a/src/canonical/models/front-shiny/0075--420--Graveler--Alola.gif b/src/canonical/models/front-shiny/0075-420-Graveler-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0075--420--Graveler--Alola.gif
rename to src/canonical/models/front-shiny/0075-420-Graveler-Alola.gif
diff --git a/src/canonical/models/front-shiny/0076--000--Golem.gif b/src/canonical/models/front-shiny/0076-000-Golem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0076--000--Golem.gif
rename to src/canonical/models/front-shiny/0076-000-Golem.gif
diff --git a/src/canonical/models/front-shiny/0076--420--Golem--Alola.gif b/src/canonical/models/front-shiny/0076-420-Golem-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0076--420--Golem--Alola.gif
rename to src/canonical/models/front-shiny/0076-420-Golem-Alola.gif
diff --git a/src/canonical/models/front-shiny/0077--000--Ponyta.gif b/src/canonical/models/front-shiny/0077-000-Ponyta.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0077--000--Ponyta.gif
rename to src/canonical/models/front-shiny/0077-000-Ponyta.gif
diff --git a/src/canonical/models/front-shiny/0077--420--Ponyta--Galar.gif b/src/canonical/models/front-shiny/0077-420-Ponyta-Galar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0077--420--Ponyta--Galar.gif
rename to src/canonical/models/front-shiny/0077-420-Ponyta-Galar.gif
diff --git a/src/canonical/models/front-shiny/0078--000--Rapidash.gif b/src/canonical/models/front-shiny/0078-000-Rapidash.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0078--000--Rapidash.gif
rename to src/canonical/models/front-shiny/0078-000-Rapidash.gif
diff --git a/src/canonical/models/front-shiny/0078--420--Rapidash--Galar.gif b/src/canonical/models/front-shiny/0078-420-Rapidash-Galar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0078--420--Rapidash--Galar.gif
rename to src/canonical/models/front-shiny/0078-420-Rapidash-Galar.gif
diff --git a/src/canonical/models/front-shiny/0079--000--Slowpoke.gif b/src/canonical/models/front-shiny/0079-000-Slowpoke.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0079--000--Slowpoke.gif
rename to src/canonical/models/front-shiny/0079-000-Slowpoke.gif
diff --git a/src/canonical/models/front-shiny/0079--420--Slowpoke--Galar.gif b/src/canonical/models/front-shiny/0079-420-Slowpoke-Galar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0079--420--Slowpoke--Galar.gif
rename to src/canonical/models/front-shiny/0079-420-Slowpoke-Galar.gif
diff --git a/src/canonical/models/front-shiny/0080--000--Slowbro.gif b/src/canonical/models/front-shiny/0080-000-Slowbro.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0080--000--Slowbro.gif
rename to src/canonical/models/front-shiny/0080-000-Slowbro.gif
diff --git a/src/canonical/models/front-shiny/0080--420--Slowbro--Mega.gif b/src/canonical/models/front-shiny/0080-420-Slowbro-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0080--420--Slowbro--Mega.gif
rename to src/canonical/models/front-shiny/0080-420-Slowbro-Mega.gif
diff --git a/src/canonical/models/front-shiny/0081--000--Magnemite.gif b/src/canonical/models/front-shiny/0081-000-Magnemite.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0081--000--Magnemite.gif
rename to src/canonical/models/front-shiny/0081-000-Magnemite.gif
diff --git a/src/canonical/models/front-shiny/0082--000--Magneton.gif b/src/canonical/models/front-shiny/0082-000-Magneton.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0082--000--Magneton.gif
rename to src/canonical/models/front-shiny/0082-000-Magneton.gif
diff --git a/src/canonical/models/front-shiny/0083--000--Farfetch__0027d.gif b/src/canonical/models/front-shiny/0083-000-Farfetch__0027d.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0083--000--Farfetch__0027d.gif
rename to src/canonical/models/front-shiny/0083-000-Farfetch__0027d.gif
diff --git a/src/canonical/models/front-shiny/0083--420--Farfetch__0027d--Galar.gif b/src/canonical/models/front-shiny/0083-420-Farfetch__0027d-Galar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0083--420--Farfetch__0027d--Galar.gif
rename to src/canonical/models/front-shiny/0083-420-Farfetch__0027d-Galar.gif
diff --git a/src/canonical/models/front-shiny/0084--000--Doduo.gif b/src/canonical/models/front-shiny/0084-000-Doduo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0084--000--Doduo.gif
rename to src/canonical/models/front-shiny/0084-000-Doduo.gif
diff --git a/src/canonical/models/front-shiny/0085--000--Dodrio.gif b/src/canonical/models/front-shiny/0085-000-Dodrio.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0085--000--Dodrio.gif
rename to src/canonical/models/front-shiny/0085-000-Dodrio.gif
diff --git a/src/canonical/models/front-shiny/0086--000--Seel.gif b/src/canonical/models/front-shiny/0086-000-Seel.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0086--000--Seel.gif
rename to src/canonical/models/front-shiny/0086-000-Seel.gif
diff --git a/src/canonical/models/front-shiny/0087--000--Dewgong.gif b/src/canonical/models/front-shiny/0087-000-Dewgong.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0087--000--Dewgong.gif
rename to src/canonical/models/front-shiny/0087-000-Dewgong.gif
diff --git a/src/canonical/models/front-shiny/0088--000--Grimer.gif b/src/canonical/models/front-shiny/0088-000-Grimer.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0088--000--Grimer.gif
rename to src/canonical/models/front-shiny/0088-000-Grimer.gif
diff --git a/src/canonical/models/front-shiny/0088--420--Grimer--Alola.gif b/src/canonical/models/front-shiny/0088-420-Grimer-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0088--420--Grimer--Alola.gif
rename to src/canonical/models/front-shiny/0088-420-Grimer-Alola.gif
diff --git a/src/canonical/models/front-shiny/0089--000--Muk.gif b/src/canonical/models/front-shiny/0089-000-Muk.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0089--000--Muk.gif
rename to src/canonical/models/front-shiny/0089-000-Muk.gif
diff --git a/src/canonical/models/front-shiny/0089--420--Muk--Alola.gif b/src/canonical/models/front-shiny/0089-420-Muk-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0089--420--Muk--Alola.gif
rename to src/canonical/models/front-shiny/0089-420-Muk-Alola.gif
diff --git a/src/canonical/models/front-shiny/0090--000--Shellder.gif b/src/canonical/models/front-shiny/0090-000-Shellder.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0090--000--Shellder.gif
rename to src/canonical/models/front-shiny/0090-000-Shellder.gif
diff --git a/src/canonical/models/front-shiny/0091--000--Cloyster.gif b/src/canonical/models/front-shiny/0091-000-Cloyster.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0091--000--Cloyster.gif
rename to src/canonical/models/front-shiny/0091-000-Cloyster.gif
diff --git a/src/canonical/models/front-shiny/0092--000--Gastly.gif b/src/canonical/models/front-shiny/0092-000-Gastly.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0092--000--Gastly.gif
rename to src/canonical/models/front-shiny/0092-000-Gastly.gif
diff --git a/src/canonical/models/front-shiny/0093--000--Haunter.gif b/src/canonical/models/front-shiny/0093-000-Haunter.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0093--000--Haunter.gif
rename to src/canonical/models/front-shiny/0093-000-Haunter.gif
diff --git a/src/canonical/models/front-shiny/0094--000--Gengar.gif b/src/canonical/models/front-shiny/0094-000-Gengar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0094--000--Gengar.gif
rename to src/canonical/models/front-shiny/0094-000-Gengar.gif
diff --git a/src/canonical/models/front-shiny/0094--420--Gengar--Gmax.gif b/src/canonical/models/front-shiny/0094-420-Gengar-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0094--420--Gengar--Gmax.gif
rename to src/canonical/models/front-shiny/0094-420-Gengar-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0094--420--Gengar--Mega.gif b/src/canonical/models/front-shiny/0094-420-Gengar-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0094--420--Gengar--Mega.gif
rename to src/canonical/models/front-shiny/0094-420-Gengar-Mega.gif
diff --git a/src/canonical/models/front-shiny/0095--000--Onix.gif b/src/canonical/models/front-shiny/0095-000-Onix.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0095--000--Onix.gif
rename to src/canonical/models/front-shiny/0095-000-Onix.gif
diff --git a/src/canonical/models/front-shiny/0096--000--Drowzee.gif b/src/canonical/models/front-shiny/0096-000-Drowzee.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0096--000--Drowzee.gif
rename to src/canonical/models/front-shiny/0096-000-Drowzee.gif
diff --git a/src/canonical/models/front-shiny/0097--000--Hypno.gif b/src/canonical/models/front-shiny/0097-000-Hypno.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0097--000--Hypno.gif
rename to src/canonical/models/front-shiny/0097-000-Hypno.gif
diff --git a/src/canonical/models/front-shiny/0098--000--Krabby.gif b/src/canonical/models/front-shiny/0098-000-Krabby.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0098--000--Krabby.gif
rename to src/canonical/models/front-shiny/0098-000-Krabby.gif
diff --git a/src/canonical/models/front-shiny/0099--000--Kingler.gif b/src/canonical/models/front-shiny/0099-000-Kingler.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0099--000--Kingler.gif
rename to src/canonical/models/front-shiny/0099-000-Kingler.gif
diff --git a/src/canonical/models/front-shiny/0099--420--Kingler--Gmax.gif b/src/canonical/models/front-shiny/0099-420-Kingler-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0099--420--Kingler--Gmax.gif
rename to src/canonical/models/front-shiny/0099-420-Kingler-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0100--000--Voltorb.gif b/src/canonical/models/front-shiny/0100-000-Voltorb.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0100--000--Voltorb.gif
rename to src/canonical/models/front-shiny/0100-000-Voltorb.gif
diff --git a/src/canonical/models/front-shiny/0101--000--Electrode.gif b/src/canonical/models/front-shiny/0101-000-Electrode.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0101--000--Electrode.gif
rename to src/canonical/models/front-shiny/0101-000-Electrode.gif
diff --git a/src/canonical/models/front-shiny/0102--000--Exeggcute.gif b/src/canonical/models/front-shiny/0102-000-Exeggcute.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0102--000--Exeggcute.gif
rename to src/canonical/models/front-shiny/0102-000-Exeggcute.gif
diff --git a/src/canonical/models/front-shiny/0103--000--Exeggutor.gif b/src/canonical/models/front-shiny/0103-000-Exeggutor.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0103--000--Exeggutor.gif
rename to src/canonical/models/front-shiny/0103-000-Exeggutor.gif
diff --git a/src/canonical/models/front-shiny/0103--420--Exeggutor--Alola.gif b/src/canonical/models/front-shiny/0103-420-Exeggutor-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0103--420--Exeggutor--Alola.gif
rename to src/canonical/models/front-shiny/0103-420-Exeggutor-Alola.gif
diff --git a/src/canonical/models/front-shiny/0104--000--Cubone.gif b/src/canonical/models/front-shiny/0104-000-Cubone.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0104--000--Cubone.gif
rename to src/canonical/models/front-shiny/0104-000-Cubone.gif
diff --git a/src/canonical/models/front-shiny/0105--000--Marowak.gif b/src/canonical/models/front-shiny/0105-000-Marowak.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0105--000--Marowak.gif
rename to src/canonical/models/front-shiny/0105-000-Marowak.gif
diff --git a/src/canonical/models/front-shiny/0105--420--Marowak--Alola.gif b/src/canonical/models/front-shiny/0105-420-Marowak-Alola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0105--420--Marowak--Alola.gif
rename to src/canonical/models/front-shiny/0105-420-Marowak-Alola.gif
diff --git a/src/canonical/models/front-shiny/0105--420--Marowak--Alola-Totem.gif b/src/canonical/models/front-shiny/0105-420-Marowak-Alola~Totem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0105--420--Marowak--Alola-Totem.gif
rename to src/canonical/models/front-shiny/0105-420-Marowak-Alola~Totem.gif
diff --git a/src/canonical/models/front-shiny/0106--000--Hitmonlee.gif b/src/canonical/models/front-shiny/0106-000-Hitmonlee.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0106--000--Hitmonlee.gif
rename to src/canonical/models/front-shiny/0106-000-Hitmonlee.gif
diff --git a/src/canonical/models/front-shiny/0107--000--Hitmonchan.gif b/src/canonical/models/front-shiny/0107-000-Hitmonchan.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0107--000--Hitmonchan.gif
rename to src/canonical/models/front-shiny/0107-000-Hitmonchan.gif
diff --git a/src/canonical/models/front-shiny/0108--000--Lickitung.gif b/src/canonical/models/front-shiny/0108-000-Lickitung.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0108--000--Lickitung.gif
rename to src/canonical/models/front-shiny/0108-000-Lickitung.gif
diff --git a/src/canonical/models/front-shiny/0109--000--Koffing.gif b/src/canonical/models/front-shiny/0109-000-Koffing.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0109--000--Koffing.gif
rename to src/canonical/models/front-shiny/0109-000-Koffing.gif
diff --git a/src/canonical/models/front-shiny/0110--000--Weezing.gif b/src/canonical/models/front-shiny/0110-000-Weezing.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0110--000--Weezing.gif
rename to src/canonical/models/front-shiny/0110-000-Weezing.gif
diff --git a/src/canonical/models/front-shiny/0110--420--Weezing--Galar.gif b/src/canonical/models/front-shiny/0110-420-Weezing-Galar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0110--420--Weezing--Galar.gif
rename to src/canonical/models/front-shiny/0110-420-Weezing-Galar.gif
diff --git a/src/canonical/models/front-shiny/0111--000--Rhyhorn.gif b/src/canonical/models/front-shiny/0111-000-Rhyhorn.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0111--000--Rhyhorn.gif
rename to src/canonical/models/front-shiny/0111-000-Rhyhorn.gif
diff --git a/src/canonical/models/front-shiny/0112--000--Rhydon.gif b/src/canonical/models/front-shiny/0112-000-Rhydon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0112--000--Rhydon.gif
rename to src/canonical/models/front-shiny/0112-000-Rhydon.gif
diff --git a/src/canonical/models/front-shiny/0113--000--Chansey.gif b/src/canonical/models/front-shiny/0113-000-Chansey.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0113--000--Chansey.gif
rename to src/canonical/models/front-shiny/0113-000-Chansey.gif
diff --git a/src/canonical/models/front-shiny/0114--000--Tangela.gif b/src/canonical/models/front-shiny/0114-000-Tangela.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0114--000--Tangela.gif
rename to src/canonical/models/front-shiny/0114-000-Tangela.gif
diff --git a/src/canonical/models/front-shiny/0115--000--Kangaskhan.gif b/src/canonical/models/front-shiny/0115-000-Kangaskhan.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0115--000--Kangaskhan.gif
rename to src/canonical/models/front-shiny/0115-000-Kangaskhan.gif
diff --git a/src/canonical/models/front-shiny/0115--420--Kangaskhan--Mega.gif b/src/canonical/models/front-shiny/0115-420-Kangaskhan-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0115--420--Kangaskhan--Mega.gif
rename to src/canonical/models/front-shiny/0115-420-Kangaskhan-Mega.gif
diff --git a/src/canonical/models/front-shiny/0116--000--Horsea.gif b/src/canonical/models/front-shiny/0116-000-Horsea.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0116--000--Horsea.gif
rename to src/canonical/models/front-shiny/0116-000-Horsea.gif
diff --git a/src/canonical/models/front-shiny/0117--000--Seadra.gif b/src/canonical/models/front-shiny/0117-000-Seadra.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0117--000--Seadra.gif
rename to src/canonical/models/front-shiny/0117-000-Seadra.gif
diff --git a/src/canonical/models/front-shiny/0118--000--Goldeen.gif b/src/canonical/models/front-shiny/0118-000-Goldeen.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0118--000--Goldeen.gif
rename to src/canonical/models/front-shiny/0118-000-Goldeen.gif
diff --git a/src/canonical/models/front-shiny/0119--000--Seaking.gif b/src/canonical/models/front-shiny/0119-000-Seaking.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0119--000--Seaking.gif
rename to src/canonical/models/front-shiny/0119-000-Seaking.gif
diff --git a/src/canonical/models/front-shiny/0120--000--Staryu.gif b/src/canonical/models/front-shiny/0120-000-Staryu.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0120--000--Staryu.gif
rename to src/canonical/models/front-shiny/0120-000-Staryu.gif
diff --git a/src/canonical/models/front-shiny/0121--000--Starmie.gif b/src/canonical/models/front-shiny/0121-000-Starmie.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0121--000--Starmie.gif
rename to src/canonical/models/front-shiny/0121-000-Starmie.gif
diff --git a/src/canonical/models/front-shiny/0122--000--Mr._Mime.gif b/src/canonical/models/front-shiny/0122-000-Mr._Mime.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0122--000--Mr._Mime.gif
rename to src/canonical/models/front-shiny/0122-000-Mr._Mime.gif
diff --git a/src/canonical/models/front-shiny/0122--420--Mr._Mime--Galar.gif b/src/canonical/models/front-shiny/0122-420-Mr._Mime-Galar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0122--420--Mr._Mime--Galar.gif
rename to src/canonical/models/front-shiny/0122-420-Mr._Mime-Galar.gif
diff --git a/src/canonical/models/front-shiny/0123--000--Scyther.gif b/src/canonical/models/front-shiny/0123-000-Scyther.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0123--000--Scyther.gif
rename to src/canonical/models/front-shiny/0123-000-Scyther.gif
diff --git a/src/canonical/models/front-shiny/0124--000--Jynx.gif b/src/canonical/models/front-shiny/0124-000-Jynx.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0124--000--Jynx.gif
rename to src/canonical/models/front-shiny/0124-000-Jynx.gif
diff --git a/src/canonical/models/front-shiny/0125--000--Electabuzz.gif b/src/canonical/models/front-shiny/0125-000-Electabuzz.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0125--000--Electabuzz.gif
rename to src/canonical/models/front-shiny/0125-000-Electabuzz.gif
diff --git a/src/canonical/models/front-shiny/0126--000--Magmar.gif b/src/canonical/models/front-shiny/0126-000-Magmar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0126--000--Magmar.gif
rename to src/canonical/models/front-shiny/0126-000-Magmar.gif
diff --git a/src/canonical/models/front-shiny/0127--000--Pinsir.gif b/src/canonical/models/front-shiny/0127-000-Pinsir.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0127--000--Pinsir.gif
rename to src/canonical/models/front-shiny/0127-000-Pinsir.gif
diff --git a/src/canonical/models/front-shiny/0127--420--Pinsir--Mega.gif b/src/canonical/models/front-shiny/0127-420-Pinsir-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0127--420--Pinsir--Mega.gif
rename to src/canonical/models/front-shiny/0127-420-Pinsir-Mega.gif
diff --git a/src/canonical/models/front-shiny/0128--000--Tauros.gif b/src/canonical/models/front-shiny/0128-000-Tauros.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0128--000--Tauros.gif
rename to src/canonical/models/front-shiny/0128-000-Tauros.gif
diff --git a/src/canonical/models/front-shiny/0129--000--Magikarp.gif b/src/canonical/models/front-shiny/0129-000-Magikarp.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0129--000--Magikarp.gif
rename to src/canonical/models/front-shiny/0129-000-Magikarp.gif
diff --git a/src/canonical/models/front-shiny/0130--000--Gyarados.gif b/src/canonical/models/front-shiny/0130-000-Gyarados.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0130--000--Gyarados.gif
rename to src/canonical/models/front-shiny/0130-000-Gyarados.gif
diff --git a/src/canonical/models/front-shiny/0130--420--Gyarados--Mega.gif b/src/canonical/models/front-shiny/0130-420-Gyarados-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0130--420--Gyarados--Mega.gif
rename to src/canonical/models/front-shiny/0130-420-Gyarados-Mega.gif
diff --git a/src/canonical/models/front-shiny/0131--000--Lapras.gif b/src/canonical/models/front-shiny/0131-000-Lapras.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0131--000--Lapras.gif
rename to src/canonical/models/front-shiny/0131-000-Lapras.gif
diff --git a/src/canonical/models/front-shiny/0131--420--Lapras--Gmax.gif b/src/canonical/models/front-shiny/0131-420-Lapras-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0131--420--Lapras--Gmax.gif
rename to src/canonical/models/front-shiny/0131-420-Lapras-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0132--000--Ditto.gif b/src/canonical/models/front-shiny/0132-000-Ditto.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0132--000--Ditto.gif
rename to src/canonical/models/front-shiny/0132-000-Ditto.gif
diff --git a/src/canonical/models/front-shiny/0133--000--Eevee.gif b/src/canonical/models/front-shiny/0133-000-Eevee.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0133--000--Eevee.gif
rename to src/canonical/models/front-shiny/0133-000-Eevee.gif
diff --git a/src/canonical/models/front-shiny/0133--420--Eevee--Gmax.gif b/src/canonical/models/front-shiny/0133-420-Eevee-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0133--420--Eevee--Gmax.gif
rename to src/canonical/models/front-shiny/0133-420-Eevee-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0134--000--Vaporeon.gif b/src/canonical/models/front-shiny/0134-000-Vaporeon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0134--000--Vaporeon.gif
rename to src/canonical/models/front-shiny/0134-000-Vaporeon.gif
diff --git a/src/canonical/models/front-shiny/0135--000--Jolteon.gif b/src/canonical/models/front-shiny/0135-000-Jolteon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0135--000--Jolteon.gif
rename to src/canonical/models/front-shiny/0135-000-Jolteon.gif
diff --git a/src/canonical/models/front-shiny/0136--000--Flareon.gif b/src/canonical/models/front-shiny/0136-000-Flareon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0136--000--Flareon.gif
rename to src/canonical/models/front-shiny/0136-000-Flareon.gif
diff --git a/src/canonical/models/front-shiny/0137--000--Porygon.gif b/src/canonical/models/front-shiny/0137-000-Porygon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0137--000--Porygon.gif
rename to src/canonical/models/front-shiny/0137-000-Porygon.gif
diff --git a/src/canonical/models/front-shiny/0138--000--Omanyte.gif b/src/canonical/models/front-shiny/0138-000-Omanyte.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0138--000--Omanyte.gif
rename to src/canonical/models/front-shiny/0138-000-Omanyte.gif
diff --git a/src/canonical/models/front-shiny/0139--000--Omastar.gif b/src/canonical/models/front-shiny/0139-000-Omastar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0139--000--Omastar.gif
rename to src/canonical/models/front-shiny/0139-000-Omastar.gif
diff --git a/src/canonical/models/front-shiny/0140--000--Kabuto.gif b/src/canonical/models/front-shiny/0140-000-Kabuto.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0140--000--Kabuto.gif
rename to src/canonical/models/front-shiny/0140-000-Kabuto.gif
diff --git a/src/canonical/models/front-shiny/0141--000--Kabutops.gif b/src/canonical/models/front-shiny/0141-000-Kabutops.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0141--000--Kabutops.gif
rename to src/canonical/models/front-shiny/0141-000-Kabutops.gif
diff --git a/src/canonical/models/front-shiny/0142--000--Aerodactyl.gif b/src/canonical/models/front-shiny/0142-000-Aerodactyl.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0142--000--Aerodactyl.gif
rename to src/canonical/models/front-shiny/0142-000-Aerodactyl.gif
diff --git a/src/canonical/models/front-shiny/0142--420--Aerodactyl--Mega.gif b/src/canonical/models/front-shiny/0142-420-Aerodactyl-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0142--420--Aerodactyl--Mega.gif
rename to src/canonical/models/front-shiny/0142-420-Aerodactyl-Mega.gif
diff --git a/src/canonical/models/front-shiny/0143--000--Snorlax.gif b/src/canonical/models/front-shiny/0143-000-Snorlax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0143--000--Snorlax.gif
rename to src/canonical/models/front-shiny/0143-000-Snorlax.gif
diff --git a/src/canonical/models/front-shiny/0143--420--Snorlax--Gmax.gif b/src/canonical/models/front-shiny/0143-420-Snorlax-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0143--420--Snorlax--Gmax.gif
rename to src/canonical/models/front-shiny/0143-420-Snorlax-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0144--000--Articuno.gif b/src/canonical/models/front-shiny/0144-000-Articuno.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0144--000--Articuno.gif
rename to src/canonical/models/front-shiny/0144-000-Articuno.gif
diff --git a/src/canonical/models/front-shiny/0145--000--Zapdos.gif b/src/canonical/models/front-shiny/0145-000-Zapdos.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0145--000--Zapdos.gif
rename to src/canonical/models/front-shiny/0145-000-Zapdos.gif
diff --git a/src/canonical/models/front-shiny/0146--000--Moltres.gif b/src/canonical/models/front-shiny/0146-000-Moltres.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0146--000--Moltres.gif
rename to src/canonical/models/front-shiny/0146-000-Moltres.gif
diff --git a/src/canonical/models/front-shiny/0147--000--Dratini.gif b/src/canonical/models/front-shiny/0147-000-Dratini.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0147--000--Dratini.gif
rename to src/canonical/models/front-shiny/0147-000-Dratini.gif
diff --git a/src/canonical/models/front-shiny/0148--000--Dragonair.gif b/src/canonical/models/front-shiny/0148-000-Dragonair.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0148--000--Dragonair.gif
rename to src/canonical/models/front-shiny/0148-000-Dragonair.gif
diff --git a/src/canonical/models/front-shiny/0149--000--Dragonite.gif b/src/canonical/models/front-shiny/0149-000-Dragonite.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0149--000--Dragonite.gif
rename to src/canonical/models/front-shiny/0149-000-Dragonite.gif
diff --git a/src/canonical/models/front-shiny/0150--000--Mewtwo.gif b/src/canonical/models/front-shiny/0150-000-Mewtwo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0150--000--Mewtwo.gif
rename to src/canonical/models/front-shiny/0150-000-Mewtwo.gif
diff --git a/src/canonical/models/front-shiny/0150--420--Mewtwo--Mega-X.gif b/src/canonical/models/front-shiny/0150-420-Mewtwo-Mega~X.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0150--420--Mewtwo--Mega-X.gif
rename to src/canonical/models/front-shiny/0150-420-Mewtwo-Mega~X.gif
diff --git a/src/canonical/models/front-shiny/0150--420--Mewtwo--Mega-Y.gif b/src/canonical/models/front-shiny/0150-420-Mewtwo-Mega~Y.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0150--420--Mewtwo--Mega-Y.gif
rename to src/canonical/models/front-shiny/0150-420-Mewtwo-Mega~Y.gif
diff --git a/src/canonical/models/front-shiny/0151--000--Mew.gif b/src/canonical/models/front-shiny/0151-000-Mew.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0151--000--Mew.gif
rename to src/canonical/models/front-shiny/0151-000-Mew.gif
diff --git a/src/canonical/models/front-shiny/0152--000--Chikorita.gif b/src/canonical/models/front-shiny/0152-000-Chikorita.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0152--000--Chikorita.gif
rename to src/canonical/models/front-shiny/0152-000-Chikorita.gif
diff --git a/src/canonical/models/front-shiny/0153--000--Bayleef.gif b/src/canonical/models/front-shiny/0153-000-Bayleef.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0153--000--Bayleef.gif
rename to src/canonical/models/front-shiny/0153-000-Bayleef.gif
diff --git a/src/canonical/models/front-shiny/0154--000--Meganium.gif b/src/canonical/models/front-shiny/0154-000-Meganium.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0154--000--Meganium.gif
rename to src/canonical/models/front-shiny/0154-000-Meganium.gif
diff --git a/src/canonical/models/front-shiny/0155--000--Cyndaquil.gif b/src/canonical/models/front-shiny/0155-000-Cyndaquil.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0155--000--Cyndaquil.gif
rename to src/canonical/models/front-shiny/0155-000-Cyndaquil.gif
diff --git a/src/canonical/models/front-shiny/0156--000--Quilava.gif b/src/canonical/models/front-shiny/0156-000-Quilava.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0156--000--Quilava.gif
rename to src/canonical/models/front-shiny/0156-000-Quilava.gif
diff --git a/src/canonical/models/front-shiny/0157--000--Typhlosion.gif b/src/canonical/models/front-shiny/0157-000-Typhlosion.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0157--000--Typhlosion.gif
rename to src/canonical/models/front-shiny/0157-000-Typhlosion.gif
diff --git a/src/canonical/models/front-shiny/0158--000--Totodile.gif b/src/canonical/models/front-shiny/0158-000-Totodile.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0158--000--Totodile.gif
rename to src/canonical/models/front-shiny/0158-000-Totodile.gif
diff --git a/src/canonical/models/front-shiny/0159--000--Croconaw.gif b/src/canonical/models/front-shiny/0159-000-Croconaw.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0159--000--Croconaw.gif
rename to src/canonical/models/front-shiny/0159-000-Croconaw.gif
diff --git a/src/canonical/models/front-shiny/0160--000--Feraligatr.gif b/src/canonical/models/front-shiny/0160-000-Feraligatr.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0160--000--Feraligatr.gif
rename to src/canonical/models/front-shiny/0160-000-Feraligatr.gif
diff --git a/src/canonical/models/front-shiny/0161--000--Sentret.gif b/src/canonical/models/front-shiny/0161-000-Sentret.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0161--000--Sentret.gif
rename to src/canonical/models/front-shiny/0161-000-Sentret.gif
diff --git a/src/canonical/models/front-shiny/0162--000--Furret.gif b/src/canonical/models/front-shiny/0162-000-Furret.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0162--000--Furret.gif
rename to src/canonical/models/front-shiny/0162-000-Furret.gif
diff --git a/src/canonical/models/front-shiny/0163--000--Hoothoot.gif b/src/canonical/models/front-shiny/0163-000-Hoothoot.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0163--000--Hoothoot.gif
rename to src/canonical/models/front-shiny/0163-000-Hoothoot.gif
diff --git a/src/canonical/models/front-shiny/0164--000--Noctowl.gif b/src/canonical/models/front-shiny/0164-000-Noctowl.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0164--000--Noctowl.gif
rename to src/canonical/models/front-shiny/0164-000-Noctowl.gif
diff --git a/src/canonical/models/front-shiny/0165--000--Ledyba.gif b/src/canonical/models/front-shiny/0165-000-Ledyba.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0165--000--Ledyba.gif
rename to src/canonical/models/front-shiny/0165-000-Ledyba.gif
diff --git a/src/canonical/models/front-shiny/0166--000--Ledian.gif b/src/canonical/models/front-shiny/0166-000-Ledian.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0166--000--Ledian.gif
rename to src/canonical/models/front-shiny/0166-000-Ledian.gif
diff --git a/src/canonical/models/front-shiny/0167--000--Spinarak.gif b/src/canonical/models/front-shiny/0167-000-Spinarak.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0167--000--Spinarak.gif
rename to src/canonical/models/front-shiny/0167-000-Spinarak.gif
diff --git a/src/canonical/models/front-shiny/0168--000--Ariados.gif b/src/canonical/models/front-shiny/0168-000-Ariados.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0168--000--Ariados.gif
rename to src/canonical/models/front-shiny/0168-000-Ariados.gif
diff --git a/src/canonical/models/front-shiny/0169--000--Crobat.gif b/src/canonical/models/front-shiny/0169-000-Crobat.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0169--000--Crobat.gif
rename to src/canonical/models/front-shiny/0169-000-Crobat.gif
diff --git a/src/canonical/models/front-shiny/0170--000--Chinchou.gif b/src/canonical/models/front-shiny/0170-000-Chinchou.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0170--000--Chinchou.gif
rename to src/canonical/models/front-shiny/0170-000-Chinchou.gif
diff --git a/src/canonical/models/front-shiny/0171--000--Lanturn.gif b/src/canonical/models/front-shiny/0171-000-Lanturn.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0171--000--Lanturn.gif
rename to src/canonical/models/front-shiny/0171-000-Lanturn.gif
diff --git a/src/canonical/models/front-shiny/0172--000--Pichu.gif b/src/canonical/models/front-shiny/0172-000-Pichu.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0172--000--Pichu.gif
rename to src/canonical/models/front-shiny/0172-000-Pichu.gif
diff --git a/src/canonical/models/front-shiny/0173--000--Cleffa.gif b/src/canonical/models/front-shiny/0173-000-Cleffa.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0173--000--Cleffa.gif
rename to src/canonical/models/front-shiny/0173-000-Cleffa.gif
diff --git a/src/canonical/models/front-shiny/0174--000--Igglybuff.gif b/src/canonical/models/front-shiny/0174-000-Igglybuff.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0174--000--Igglybuff.gif
rename to src/canonical/models/front-shiny/0174-000-Igglybuff.gif
diff --git a/src/canonical/models/front-shiny/0175--000--Togepi.gif b/src/canonical/models/front-shiny/0175-000-Togepi.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0175--000--Togepi.gif
rename to src/canonical/models/front-shiny/0175-000-Togepi.gif
diff --git a/src/canonical/models/front-shiny/0176--000--Togetic.gif b/src/canonical/models/front-shiny/0176-000-Togetic.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0176--000--Togetic.gif
rename to src/canonical/models/front-shiny/0176-000-Togetic.gif
diff --git a/src/canonical/models/front-shiny/0177--000--Natu.gif b/src/canonical/models/front-shiny/0177-000-Natu.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0177--000--Natu.gif
rename to src/canonical/models/front-shiny/0177-000-Natu.gif
diff --git a/src/canonical/models/front-shiny/0178--000--Xatu.gif b/src/canonical/models/front-shiny/0178-000-Xatu.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0178--000--Xatu.gif
rename to src/canonical/models/front-shiny/0178-000-Xatu.gif
diff --git a/src/canonical/models/front-shiny/0179--000--Mareep.gif b/src/canonical/models/front-shiny/0179-000-Mareep.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0179--000--Mareep.gif
rename to src/canonical/models/front-shiny/0179-000-Mareep.gif
diff --git a/src/canonical/models/front-shiny/0180--000--Flaaffy.gif b/src/canonical/models/front-shiny/0180-000-Flaaffy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0180--000--Flaaffy.gif
rename to src/canonical/models/front-shiny/0180-000-Flaaffy.gif
diff --git a/src/canonical/models/front-shiny/0181--000--Ampharos.gif b/src/canonical/models/front-shiny/0181-000-Ampharos.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0181--000--Ampharos.gif
rename to src/canonical/models/front-shiny/0181-000-Ampharos.gif
diff --git a/src/canonical/models/front-shiny/0181--420--Ampharos--Mega.gif b/src/canonical/models/front-shiny/0181-420-Ampharos-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0181--420--Ampharos--Mega.gif
rename to src/canonical/models/front-shiny/0181-420-Ampharos-Mega.gif
diff --git a/src/canonical/models/front-shiny/0182--000--Bellossom.gif b/src/canonical/models/front-shiny/0182-000-Bellossom.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0182--000--Bellossom.gif
rename to src/canonical/models/front-shiny/0182-000-Bellossom.gif
diff --git a/src/canonical/models/front-shiny/0183--000--Marill.gif b/src/canonical/models/front-shiny/0183-000-Marill.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0183--000--Marill.gif
rename to src/canonical/models/front-shiny/0183-000-Marill.gif
diff --git a/src/canonical/models/front-shiny/0184--000--Azumarill.gif b/src/canonical/models/front-shiny/0184-000-Azumarill.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0184--000--Azumarill.gif
rename to src/canonical/models/front-shiny/0184-000-Azumarill.gif
diff --git a/src/canonical/models/front-shiny/0185--000--Sudowoodo.gif b/src/canonical/models/front-shiny/0185-000-Sudowoodo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0185--000--Sudowoodo.gif
rename to src/canonical/models/front-shiny/0185-000-Sudowoodo.gif
diff --git a/src/canonical/models/front-shiny/0186--000--Politoed.gif b/src/canonical/models/front-shiny/0186-000-Politoed.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0186--000--Politoed.gif
rename to src/canonical/models/front-shiny/0186-000-Politoed.gif
diff --git a/src/canonical/models/front-shiny/0187--000--Hoppip.gif b/src/canonical/models/front-shiny/0187-000-Hoppip.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0187--000--Hoppip.gif
rename to src/canonical/models/front-shiny/0187-000-Hoppip.gif
diff --git a/src/canonical/models/front-shiny/0188--000--Skiploom.gif b/src/canonical/models/front-shiny/0188-000-Skiploom.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0188--000--Skiploom.gif
rename to src/canonical/models/front-shiny/0188-000-Skiploom.gif
diff --git a/src/canonical/models/front-shiny/0189--000--Jumpluff.gif b/src/canonical/models/front-shiny/0189-000-Jumpluff.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0189--000--Jumpluff.gif
rename to src/canonical/models/front-shiny/0189-000-Jumpluff.gif
diff --git a/src/canonical/models/front-shiny/0190--000--Aipom.gif b/src/canonical/models/front-shiny/0190-000-Aipom.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0190--000--Aipom.gif
rename to src/canonical/models/front-shiny/0190-000-Aipom.gif
diff --git a/src/canonical/models/front-shiny/0191--000--Sunkern.gif b/src/canonical/models/front-shiny/0191-000-Sunkern.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0191--000--Sunkern.gif
rename to src/canonical/models/front-shiny/0191-000-Sunkern.gif
diff --git a/src/canonical/models/front-shiny/0192--000--Sunflora.gif b/src/canonical/models/front-shiny/0192-000-Sunflora.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0192--000--Sunflora.gif
rename to src/canonical/models/front-shiny/0192-000-Sunflora.gif
diff --git a/src/canonical/models/front-shiny/0193--000--Yanma.gif b/src/canonical/models/front-shiny/0193-000-Yanma.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0193--000--Yanma.gif
rename to src/canonical/models/front-shiny/0193-000-Yanma.gif
diff --git a/src/canonical/models/front-shiny/0194--000--Wooper.gif b/src/canonical/models/front-shiny/0194-000-Wooper.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0194--000--Wooper.gif
rename to src/canonical/models/front-shiny/0194-000-Wooper.gif
diff --git a/src/canonical/models/front-shiny/0195--000--Quagsire.gif b/src/canonical/models/front-shiny/0195-000-Quagsire.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0195--000--Quagsire.gif
rename to src/canonical/models/front-shiny/0195-000-Quagsire.gif
diff --git a/src/canonical/models/front-shiny/0196--000--Espeon.gif b/src/canonical/models/front-shiny/0196-000-Espeon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0196--000--Espeon.gif
rename to src/canonical/models/front-shiny/0196-000-Espeon.gif
diff --git a/src/canonical/models/front-shiny/0197--000--Umbreon.gif b/src/canonical/models/front-shiny/0197-000-Umbreon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0197--000--Umbreon.gif
rename to src/canonical/models/front-shiny/0197-000-Umbreon.gif
diff --git a/src/canonical/models/front-shiny/0198--000--Murkrow.gif b/src/canonical/models/front-shiny/0198-000-Murkrow.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0198--000--Murkrow.gif
rename to src/canonical/models/front-shiny/0198-000-Murkrow.gif
diff --git a/src/canonical/models/front-shiny/0199--000--Slowking.gif b/src/canonical/models/front-shiny/0199-000-Slowking.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0199--000--Slowking.gif
rename to src/canonical/models/front-shiny/0199-000-Slowking.gif
diff --git a/src/canonical/models/front-shiny/0200--000--Misdreavus.gif b/src/canonical/models/front-shiny/0200-000-Misdreavus.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0200--000--Misdreavus.gif
rename to src/canonical/models/front-shiny/0200-000-Misdreavus.gif
diff --git a/src/canonical/models/front-shiny/0201--000--Unown.gif b/src/canonical/models/front-shiny/0201--000--Unown.gif
deleted file mode 120000
index 8f423ceb..00000000
--- a/src/canonical/models/front-shiny/0201--000--Unown.gif
+++ /dev/null
@@ -1 +0,0 @@
-../front-shiny-cosmetic/0201--420--Unown--A.gif
\ No newline at end of file
diff --git a/src/canonical/models/front-shiny/0201-000-Unown.gif b/src/canonical/models/front-shiny/0201-000-Unown.gif
new file mode 120000
index 00000000..1c9754ae
--- /dev/null
+++ b/src/canonical/models/front-shiny/0201-000-Unown.gif
@@ -0,0 +1 @@
+../front-shiny-cosmetic/0201-420-Unown-A.gif
\ No newline at end of file
diff --git a/src/canonical/models/front-shiny/0202--000--Wobbuffet.gif b/src/canonical/models/front-shiny/0202-000-Wobbuffet.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0202--000--Wobbuffet.gif
rename to src/canonical/models/front-shiny/0202-000-Wobbuffet.gif
diff --git a/src/canonical/models/front-shiny/0203--000--Girafarig.gif b/src/canonical/models/front-shiny/0203-000-Girafarig.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0203--000--Girafarig.gif
rename to src/canonical/models/front-shiny/0203-000-Girafarig.gif
diff --git a/src/canonical/models/front-shiny/0204--000--Pineco.gif b/src/canonical/models/front-shiny/0204-000-Pineco.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0204--000--Pineco.gif
rename to src/canonical/models/front-shiny/0204-000-Pineco.gif
diff --git a/src/canonical/models/front-shiny/0205--000--Forretress.gif b/src/canonical/models/front-shiny/0205-000-Forretress.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0205--000--Forretress.gif
rename to src/canonical/models/front-shiny/0205-000-Forretress.gif
diff --git a/src/canonical/models/front-shiny/0206--000--Dunsparce.gif b/src/canonical/models/front-shiny/0206-000-Dunsparce.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0206--000--Dunsparce.gif
rename to src/canonical/models/front-shiny/0206-000-Dunsparce.gif
diff --git a/src/canonical/models/front-shiny/0207--000--Gligar.gif b/src/canonical/models/front-shiny/0207-000-Gligar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0207--000--Gligar.gif
rename to src/canonical/models/front-shiny/0207-000-Gligar.gif
diff --git a/src/canonical/models/front-shiny/0208--000--Steelix.gif b/src/canonical/models/front-shiny/0208-000-Steelix.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0208--000--Steelix.gif
rename to src/canonical/models/front-shiny/0208-000-Steelix.gif
diff --git a/src/canonical/models/front-shiny/0208--420--Steelix--Mega.gif b/src/canonical/models/front-shiny/0208-420-Steelix-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0208--420--Steelix--Mega.gif
rename to src/canonical/models/front-shiny/0208-420-Steelix-Mega.gif
diff --git a/src/canonical/models/front-shiny/0209--000--Snubbull.gif b/src/canonical/models/front-shiny/0209-000-Snubbull.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0209--000--Snubbull.gif
rename to src/canonical/models/front-shiny/0209-000-Snubbull.gif
diff --git a/src/canonical/models/front-shiny/0210--000--Granbull.gif b/src/canonical/models/front-shiny/0210-000-Granbull.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0210--000--Granbull.gif
rename to src/canonical/models/front-shiny/0210-000-Granbull.gif
diff --git a/src/canonical/models/front-shiny/0211--000--Qwilfish.gif b/src/canonical/models/front-shiny/0211-000-Qwilfish.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0211--000--Qwilfish.gif
rename to src/canonical/models/front-shiny/0211-000-Qwilfish.gif
diff --git a/src/canonical/models/front-shiny/0212--000--Scizor.gif b/src/canonical/models/front-shiny/0212-000-Scizor.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0212--000--Scizor.gif
rename to src/canonical/models/front-shiny/0212-000-Scizor.gif
diff --git a/src/canonical/models/front-shiny/0212--420--Scizor--Mega.gif b/src/canonical/models/front-shiny/0212-420-Scizor-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0212--420--Scizor--Mega.gif
rename to src/canonical/models/front-shiny/0212-420-Scizor-Mega.gif
diff --git a/src/canonical/models/front-shiny/0213--000--Shuckle.gif b/src/canonical/models/front-shiny/0213-000-Shuckle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0213--000--Shuckle.gif
rename to src/canonical/models/front-shiny/0213-000-Shuckle.gif
diff --git a/src/canonical/models/front-shiny/0214--000--Heracross.gif b/src/canonical/models/front-shiny/0214-000-Heracross.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0214--000--Heracross.gif
rename to src/canonical/models/front-shiny/0214-000-Heracross.gif
diff --git a/src/canonical/models/front-shiny/0214--420--Heracross--Mega.gif b/src/canonical/models/front-shiny/0214-420-Heracross-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0214--420--Heracross--Mega.gif
rename to src/canonical/models/front-shiny/0214-420-Heracross-Mega.gif
diff --git a/src/canonical/models/front-shiny/0215--000--Sneasel.gif b/src/canonical/models/front-shiny/0215-000-Sneasel.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0215--000--Sneasel.gif
rename to src/canonical/models/front-shiny/0215-000-Sneasel.gif
diff --git a/src/canonical/models/front-shiny/0216--000--Teddiursa.gif b/src/canonical/models/front-shiny/0216-000-Teddiursa.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0216--000--Teddiursa.gif
rename to src/canonical/models/front-shiny/0216-000-Teddiursa.gif
diff --git a/src/canonical/models/front-shiny/0217--000--Ursaring.gif b/src/canonical/models/front-shiny/0217-000-Ursaring.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0217--000--Ursaring.gif
rename to src/canonical/models/front-shiny/0217-000-Ursaring.gif
diff --git a/src/canonical/models/front-shiny/0218--000--Slugma.gif b/src/canonical/models/front-shiny/0218-000-Slugma.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0218--000--Slugma.gif
rename to src/canonical/models/front-shiny/0218-000-Slugma.gif
diff --git a/src/canonical/models/front-shiny/0219--000--Magcargo.gif b/src/canonical/models/front-shiny/0219-000-Magcargo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0219--000--Magcargo.gif
rename to src/canonical/models/front-shiny/0219-000-Magcargo.gif
diff --git a/src/canonical/models/front-shiny/0220--000--Swinub.gif b/src/canonical/models/front-shiny/0220-000-Swinub.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0220--000--Swinub.gif
rename to src/canonical/models/front-shiny/0220-000-Swinub.gif
diff --git a/src/canonical/models/front-shiny/0221--000--Piloswine.gif b/src/canonical/models/front-shiny/0221-000-Piloswine.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0221--000--Piloswine.gif
rename to src/canonical/models/front-shiny/0221-000-Piloswine.gif
diff --git a/src/canonical/models/front-shiny/0222--000--Corsola.gif b/src/canonical/models/front-shiny/0222-000-Corsola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0222--000--Corsola.gif
rename to src/canonical/models/front-shiny/0222-000-Corsola.gif
diff --git a/src/canonical/models/front-shiny/0222--420--Corsola--Galar.gif b/src/canonical/models/front-shiny/0222-420-Corsola-Galar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0222--420--Corsola--Galar.gif
rename to src/canonical/models/front-shiny/0222-420-Corsola-Galar.gif
diff --git a/src/canonical/models/front-shiny/0223--000--Remoraid.gif b/src/canonical/models/front-shiny/0223-000-Remoraid.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0223--000--Remoraid.gif
rename to src/canonical/models/front-shiny/0223-000-Remoraid.gif
diff --git a/src/canonical/models/front-shiny/0224--000--Octillery.gif b/src/canonical/models/front-shiny/0224-000-Octillery.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0224--000--Octillery.gif
rename to src/canonical/models/front-shiny/0224-000-Octillery.gif
diff --git a/src/canonical/models/front-shiny/0225--000--Delibird.gif b/src/canonical/models/front-shiny/0225-000-Delibird.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0225--000--Delibird.gif
rename to src/canonical/models/front-shiny/0225-000-Delibird.gif
diff --git a/src/canonical/models/front-shiny/0226--000--Mantine.gif b/src/canonical/models/front-shiny/0226-000-Mantine.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0226--000--Mantine.gif
rename to src/canonical/models/front-shiny/0226-000-Mantine.gif
diff --git a/src/canonical/models/front-shiny/0227--000--Skarmory.gif b/src/canonical/models/front-shiny/0227-000-Skarmory.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0227--000--Skarmory.gif
rename to src/canonical/models/front-shiny/0227-000-Skarmory.gif
diff --git a/src/canonical/models/front-shiny/0228--000--Houndour.gif b/src/canonical/models/front-shiny/0228-000-Houndour.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0228--000--Houndour.gif
rename to src/canonical/models/front-shiny/0228-000-Houndour.gif
diff --git a/src/canonical/models/front-shiny/0229--000--Houndoom.gif b/src/canonical/models/front-shiny/0229-000-Houndoom.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0229--000--Houndoom.gif
rename to src/canonical/models/front-shiny/0229-000-Houndoom.gif
diff --git a/src/canonical/models/front-shiny/0229--420--Houndoom--Mega.gif b/src/canonical/models/front-shiny/0229-420-Houndoom-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0229--420--Houndoom--Mega.gif
rename to src/canonical/models/front-shiny/0229-420-Houndoom-Mega.gif
diff --git a/src/canonical/models/front-shiny/0230--000--Kingdra.gif b/src/canonical/models/front-shiny/0230-000-Kingdra.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0230--000--Kingdra.gif
rename to src/canonical/models/front-shiny/0230-000-Kingdra.gif
diff --git a/src/canonical/models/front-shiny/0231--000--Phanpy.gif b/src/canonical/models/front-shiny/0231-000-Phanpy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0231--000--Phanpy.gif
rename to src/canonical/models/front-shiny/0231-000-Phanpy.gif
diff --git a/src/canonical/models/front-shiny/0232--000--Donphan.gif b/src/canonical/models/front-shiny/0232-000-Donphan.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0232--000--Donphan.gif
rename to src/canonical/models/front-shiny/0232-000-Donphan.gif
diff --git a/src/canonical/models/front-shiny/0233--000--Porygon2.gif b/src/canonical/models/front-shiny/0233-000-Porygon2.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0233--000--Porygon2.gif
rename to src/canonical/models/front-shiny/0233-000-Porygon2.gif
diff --git a/src/canonical/models/front-shiny/0234--000--Stantler.gif b/src/canonical/models/front-shiny/0234-000-Stantler.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0234--000--Stantler.gif
rename to src/canonical/models/front-shiny/0234-000-Stantler.gif
diff --git a/src/canonical/models/front-shiny/0235--000--Smeargle.gif b/src/canonical/models/front-shiny/0235-000-Smeargle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0235--000--Smeargle.gif
rename to src/canonical/models/front-shiny/0235-000-Smeargle.gif
diff --git a/src/canonical/models/front-shiny/0236--000--Tyrogue.gif b/src/canonical/models/front-shiny/0236-000-Tyrogue.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0236--000--Tyrogue.gif
rename to src/canonical/models/front-shiny/0236-000-Tyrogue.gif
diff --git a/src/canonical/models/front-shiny/0237--000--Hitmontop.gif b/src/canonical/models/front-shiny/0237-000-Hitmontop.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0237--000--Hitmontop.gif
rename to src/canonical/models/front-shiny/0237-000-Hitmontop.gif
diff --git a/src/canonical/models/front-shiny/0238--000--Smoochum.gif b/src/canonical/models/front-shiny/0238-000-Smoochum.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0238--000--Smoochum.gif
rename to src/canonical/models/front-shiny/0238-000-Smoochum.gif
diff --git a/src/canonical/models/front-shiny/0239--000--Elekid.gif b/src/canonical/models/front-shiny/0239-000-Elekid.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0239--000--Elekid.gif
rename to src/canonical/models/front-shiny/0239-000-Elekid.gif
diff --git a/src/canonical/models/front-shiny/0240--000--Magby.gif b/src/canonical/models/front-shiny/0240-000-Magby.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0240--000--Magby.gif
rename to src/canonical/models/front-shiny/0240-000-Magby.gif
diff --git a/src/canonical/models/front-shiny/0241--000--Miltank.gif b/src/canonical/models/front-shiny/0241-000-Miltank.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0241--000--Miltank.gif
rename to src/canonical/models/front-shiny/0241-000-Miltank.gif
diff --git a/src/canonical/models/front-shiny/0242--000--Blissey.gif b/src/canonical/models/front-shiny/0242-000-Blissey.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0242--000--Blissey.gif
rename to src/canonical/models/front-shiny/0242-000-Blissey.gif
diff --git a/src/canonical/models/front-shiny/0243--000--Raikou.gif b/src/canonical/models/front-shiny/0243-000-Raikou.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0243--000--Raikou.gif
rename to src/canonical/models/front-shiny/0243-000-Raikou.gif
diff --git a/src/canonical/models/front-shiny/0244--000--Entei.gif b/src/canonical/models/front-shiny/0244-000-Entei.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0244--000--Entei.gif
rename to src/canonical/models/front-shiny/0244-000-Entei.gif
diff --git a/src/canonical/models/front-shiny/0245--000--Suicune.gif b/src/canonical/models/front-shiny/0245-000-Suicune.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0245--000--Suicune.gif
rename to src/canonical/models/front-shiny/0245-000-Suicune.gif
diff --git a/src/canonical/models/front-shiny/0246--000--Larvitar.gif b/src/canonical/models/front-shiny/0246-000-Larvitar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0246--000--Larvitar.gif
rename to src/canonical/models/front-shiny/0246-000-Larvitar.gif
diff --git a/src/canonical/models/front-shiny/0247--000--Pupitar.gif b/src/canonical/models/front-shiny/0247-000-Pupitar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0247--000--Pupitar.gif
rename to src/canonical/models/front-shiny/0247-000-Pupitar.gif
diff --git a/src/canonical/models/front-shiny/0248--000--Tyranitar.gif b/src/canonical/models/front-shiny/0248-000-Tyranitar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0248--000--Tyranitar.gif
rename to src/canonical/models/front-shiny/0248-000-Tyranitar.gif
diff --git a/src/canonical/models/front-shiny/0248--420--Tyranitar--Mega.gif b/src/canonical/models/front-shiny/0248-420-Tyranitar-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0248--420--Tyranitar--Mega.gif
rename to src/canonical/models/front-shiny/0248-420-Tyranitar-Mega.gif
diff --git a/src/canonical/models/front-shiny/0249--000--Lugia.gif b/src/canonical/models/front-shiny/0249-000-Lugia.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0249--000--Lugia.gif
rename to src/canonical/models/front-shiny/0249-000-Lugia.gif
diff --git a/src/canonical/models/front-shiny/0250--000--Ho-Oh.gif b/src/canonical/models/front-shiny/0250-000-Ho~Oh.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0250--000--Ho-Oh.gif
rename to src/canonical/models/front-shiny/0250-000-Ho~Oh.gif
diff --git a/src/canonical/models/front-shiny/0251--000--Celebi.gif b/src/canonical/models/front-shiny/0251-000-Celebi.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0251--000--Celebi.gif
rename to src/canonical/models/front-shiny/0251-000-Celebi.gif
diff --git a/src/canonical/models/front-shiny/0252--000--Treecko.gif b/src/canonical/models/front-shiny/0252-000-Treecko.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0252--000--Treecko.gif
rename to src/canonical/models/front-shiny/0252-000-Treecko.gif
diff --git a/src/canonical/models/front-shiny/0253--000--Grovyle.gif b/src/canonical/models/front-shiny/0253-000-Grovyle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0253--000--Grovyle.gif
rename to src/canonical/models/front-shiny/0253-000-Grovyle.gif
diff --git a/src/canonical/models/front-shiny/0254--000--Sceptile.gif b/src/canonical/models/front-shiny/0254-000-Sceptile.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0254--000--Sceptile.gif
rename to src/canonical/models/front-shiny/0254-000-Sceptile.gif
diff --git a/src/canonical/models/front-shiny/0254--420--Sceptile--Mega.gif b/src/canonical/models/front-shiny/0254-420-Sceptile-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0254--420--Sceptile--Mega.gif
rename to src/canonical/models/front-shiny/0254-420-Sceptile-Mega.gif
diff --git a/src/canonical/models/front-shiny/0255--000--Torchic.gif b/src/canonical/models/front-shiny/0255-000-Torchic.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0255--000--Torchic.gif
rename to src/canonical/models/front-shiny/0255-000-Torchic.gif
diff --git a/src/canonical/models/front-shiny/0256--000--Combusken.gif b/src/canonical/models/front-shiny/0256-000-Combusken.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0256--000--Combusken.gif
rename to src/canonical/models/front-shiny/0256-000-Combusken.gif
diff --git a/src/canonical/models/front-shiny/0257--000--Blaziken.gif b/src/canonical/models/front-shiny/0257-000-Blaziken.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0257--000--Blaziken.gif
rename to src/canonical/models/front-shiny/0257-000-Blaziken.gif
diff --git a/src/canonical/models/front-shiny/0257--420--Blaziken--Mega.gif b/src/canonical/models/front-shiny/0257-420-Blaziken-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0257--420--Blaziken--Mega.gif
rename to src/canonical/models/front-shiny/0257-420-Blaziken-Mega.gif
diff --git a/src/canonical/models/front-shiny/0258--000--Mudkip.gif b/src/canonical/models/front-shiny/0258-000-Mudkip.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0258--000--Mudkip.gif
rename to src/canonical/models/front-shiny/0258-000-Mudkip.gif
diff --git a/src/canonical/models/front-shiny/0259--000--Marshtomp.gif b/src/canonical/models/front-shiny/0259-000-Marshtomp.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0259--000--Marshtomp.gif
rename to src/canonical/models/front-shiny/0259-000-Marshtomp.gif
diff --git a/src/canonical/models/front-shiny/0260--000--Swampert.gif b/src/canonical/models/front-shiny/0260-000-Swampert.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0260--000--Swampert.gif
rename to src/canonical/models/front-shiny/0260-000-Swampert.gif
diff --git a/src/canonical/models/front-shiny/0260--420--Swampert--Mega.gif b/src/canonical/models/front-shiny/0260-420-Swampert-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0260--420--Swampert--Mega.gif
rename to src/canonical/models/front-shiny/0260-420-Swampert-Mega.gif
diff --git a/src/canonical/models/front-shiny/0261--000--Poochyena.gif b/src/canonical/models/front-shiny/0261-000-Poochyena.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0261--000--Poochyena.gif
rename to src/canonical/models/front-shiny/0261-000-Poochyena.gif
diff --git a/src/canonical/models/front-shiny/0262--000--Mightyena.gif b/src/canonical/models/front-shiny/0262-000-Mightyena.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0262--000--Mightyena.gif
rename to src/canonical/models/front-shiny/0262-000-Mightyena.gif
diff --git a/src/canonical/models/front-shiny/0263--000--Zigzagoon.gif b/src/canonical/models/front-shiny/0263-000-Zigzagoon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0263--000--Zigzagoon.gif
rename to src/canonical/models/front-shiny/0263-000-Zigzagoon.gif
diff --git a/src/canonical/models/front-shiny/0263--420--Zigzagoon--Galar.gif b/src/canonical/models/front-shiny/0263-420-Zigzagoon-Galar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0263--420--Zigzagoon--Galar.gif
rename to src/canonical/models/front-shiny/0263-420-Zigzagoon-Galar.gif
diff --git a/src/canonical/models/front-shiny/0264--000--Linoone.gif b/src/canonical/models/front-shiny/0264-000-Linoone.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0264--000--Linoone.gif
rename to src/canonical/models/front-shiny/0264-000-Linoone.gif
diff --git a/src/canonical/models/front-shiny/0264--420--Linoone--Galar.gif b/src/canonical/models/front-shiny/0264-420-Linoone-Galar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0264--420--Linoone--Galar.gif
rename to src/canonical/models/front-shiny/0264-420-Linoone-Galar.gif
diff --git a/src/canonical/models/front-shiny/0265--000--Wurmple.gif b/src/canonical/models/front-shiny/0265-000-Wurmple.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0265--000--Wurmple.gif
rename to src/canonical/models/front-shiny/0265-000-Wurmple.gif
diff --git a/src/canonical/models/front-shiny/0266--000--Silcoon.gif b/src/canonical/models/front-shiny/0266-000-Silcoon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0266--000--Silcoon.gif
rename to src/canonical/models/front-shiny/0266-000-Silcoon.gif
diff --git a/src/canonical/models/front-shiny/0267--000--Beautifly.gif b/src/canonical/models/front-shiny/0267-000-Beautifly.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0267--000--Beautifly.gif
rename to src/canonical/models/front-shiny/0267-000-Beautifly.gif
diff --git a/src/canonical/models/front-shiny/0268--000--Cascoon.gif b/src/canonical/models/front-shiny/0268-000-Cascoon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0268--000--Cascoon.gif
rename to src/canonical/models/front-shiny/0268-000-Cascoon.gif
diff --git a/src/canonical/models/front-shiny/0269--000--Dustox.gif b/src/canonical/models/front-shiny/0269-000-Dustox.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0269--000--Dustox.gif
rename to src/canonical/models/front-shiny/0269-000-Dustox.gif
diff --git a/src/canonical/models/front-shiny/0270--000--Lotad.gif b/src/canonical/models/front-shiny/0270-000-Lotad.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0270--000--Lotad.gif
rename to src/canonical/models/front-shiny/0270-000-Lotad.gif
diff --git a/src/canonical/models/front-shiny/0271--000--Lombre.gif b/src/canonical/models/front-shiny/0271-000-Lombre.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0271--000--Lombre.gif
rename to src/canonical/models/front-shiny/0271-000-Lombre.gif
diff --git a/src/canonical/models/front-shiny/0272--000--Ludicolo.gif b/src/canonical/models/front-shiny/0272-000-Ludicolo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0272--000--Ludicolo.gif
rename to src/canonical/models/front-shiny/0272-000-Ludicolo.gif
diff --git a/src/canonical/models/front-shiny/0273--000--Seedot.gif b/src/canonical/models/front-shiny/0273-000-Seedot.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0273--000--Seedot.gif
rename to src/canonical/models/front-shiny/0273-000-Seedot.gif
diff --git a/src/canonical/models/front-shiny/0274--000--Nuzleaf.gif b/src/canonical/models/front-shiny/0274-000-Nuzleaf.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0274--000--Nuzleaf.gif
rename to src/canonical/models/front-shiny/0274-000-Nuzleaf.gif
diff --git a/src/canonical/models/front-shiny/0275--000--Shiftry.gif b/src/canonical/models/front-shiny/0275-000-Shiftry.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0275--000--Shiftry.gif
rename to src/canonical/models/front-shiny/0275-000-Shiftry.gif
diff --git a/src/canonical/models/front-shiny/0276--000--Taillow.gif b/src/canonical/models/front-shiny/0276-000-Taillow.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0276--000--Taillow.gif
rename to src/canonical/models/front-shiny/0276-000-Taillow.gif
diff --git a/src/canonical/models/front-shiny/0277--000--Swellow.gif b/src/canonical/models/front-shiny/0277-000-Swellow.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0277--000--Swellow.gif
rename to src/canonical/models/front-shiny/0277-000-Swellow.gif
diff --git a/src/canonical/models/front-shiny/0278--000--Wingull.gif b/src/canonical/models/front-shiny/0278-000-Wingull.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0278--000--Wingull.gif
rename to src/canonical/models/front-shiny/0278-000-Wingull.gif
diff --git a/src/canonical/models/front-shiny/0279--000--Pelipper.gif b/src/canonical/models/front-shiny/0279-000-Pelipper.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0279--000--Pelipper.gif
rename to src/canonical/models/front-shiny/0279-000-Pelipper.gif
diff --git a/src/canonical/models/front-shiny/0280--000--Ralts.gif b/src/canonical/models/front-shiny/0280-000-Ralts.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0280--000--Ralts.gif
rename to src/canonical/models/front-shiny/0280-000-Ralts.gif
diff --git a/src/canonical/models/front-shiny/0281--000--Kirlia.gif b/src/canonical/models/front-shiny/0281-000-Kirlia.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0281--000--Kirlia.gif
rename to src/canonical/models/front-shiny/0281-000-Kirlia.gif
diff --git a/src/canonical/models/front-shiny/0282--000--Gardevoir.gif b/src/canonical/models/front-shiny/0282-000-Gardevoir.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0282--000--Gardevoir.gif
rename to src/canonical/models/front-shiny/0282-000-Gardevoir.gif
diff --git a/src/canonical/models/front-shiny/0282--420--Gardevoir--Mega.gif b/src/canonical/models/front-shiny/0282-420-Gardevoir-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0282--420--Gardevoir--Mega.gif
rename to src/canonical/models/front-shiny/0282-420-Gardevoir-Mega.gif
diff --git a/src/canonical/models/front-shiny/0283--000--Surskit.gif b/src/canonical/models/front-shiny/0283-000-Surskit.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0283--000--Surskit.gif
rename to src/canonical/models/front-shiny/0283-000-Surskit.gif
diff --git a/src/canonical/models/front-shiny/0284--000--Masquerain.gif b/src/canonical/models/front-shiny/0284-000-Masquerain.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0284--000--Masquerain.gif
rename to src/canonical/models/front-shiny/0284-000-Masquerain.gif
diff --git a/src/canonical/models/front-shiny/0285--000--Shroomish.gif b/src/canonical/models/front-shiny/0285-000-Shroomish.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0285--000--Shroomish.gif
rename to src/canonical/models/front-shiny/0285-000-Shroomish.gif
diff --git a/src/canonical/models/front-shiny/0286--000--Breloom.gif b/src/canonical/models/front-shiny/0286-000-Breloom.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0286--000--Breloom.gif
rename to src/canonical/models/front-shiny/0286-000-Breloom.gif
diff --git a/src/canonical/models/front-shiny/0287--000--Slakoth.gif b/src/canonical/models/front-shiny/0287-000-Slakoth.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0287--000--Slakoth.gif
rename to src/canonical/models/front-shiny/0287-000-Slakoth.gif
diff --git a/src/canonical/models/front-shiny/0288--000--Vigoroth.gif b/src/canonical/models/front-shiny/0288-000-Vigoroth.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0288--000--Vigoroth.gif
rename to src/canonical/models/front-shiny/0288-000-Vigoroth.gif
diff --git a/src/canonical/models/front-shiny/0289--000--Slaking.gif b/src/canonical/models/front-shiny/0289-000-Slaking.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0289--000--Slaking.gif
rename to src/canonical/models/front-shiny/0289-000-Slaking.gif
diff --git a/src/canonical/models/front-shiny/0290--000--Nincada.gif b/src/canonical/models/front-shiny/0290-000-Nincada.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0290--000--Nincada.gif
rename to src/canonical/models/front-shiny/0290-000-Nincada.gif
diff --git a/src/canonical/models/front-shiny/0291--000--Ninjask.gif b/src/canonical/models/front-shiny/0291-000-Ninjask.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0291--000--Ninjask.gif
rename to src/canonical/models/front-shiny/0291-000-Ninjask.gif
diff --git a/src/canonical/models/front-shiny/0292--000--Shedinja.gif b/src/canonical/models/front-shiny/0292-000-Shedinja.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0292--000--Shedinja.gif
rename to src/canonical/models/front-shiny/0292-000-Shedinja.gif
diff --git a/src/canonical/models/front-shiny/0293--000--Whismur.gif b/src/canonical/models/front-shiny/0293-000-Whismur.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0293--000--Whismur.gif
rename to src/canonical/models/front-shiny/0293-000-Whismur.gif
diff --git a/src/canonical/models/front-shiny/0294--000--Loudred.gif b/src/canonical/models/front-shiny/0294-000-Loudred.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0294--000--Loudred.gif
rename to src/canonical/models/front-shiny/0294-000-Loudred.gif
diff --git a/src/canonical/models/front-shiny/0295--000--Exploud.gif b/src/canonical/models/front-shiny/0295-000-Exploud.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0295--000--Exploud.gif
rename to src/canonical/models/front-shiny/0295-000-Exploud.gif
diff --git a/src/canonical/models/front-shiny/0296--000--Makuhita.gif b/src/canonical/models/front-shiny/0296-000-Makuhita.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0296--000--Makuhita.gif
rename to src/canonical/models/front-shiny/0296-000-Makuhita.gif
diff --git a/src/canonical/models/front-shiny/0297--000--Hariyama.gif b/src/canonical/models/front-shiny/0297-000-Hariyama.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0297--000--Hariyama.gif
rename to src/canonical/models/front-shiny/0297-000-Hariyama.gif
diff --git a/src/canonical/models/front-shiny/0298--000--Azurill.gif b/src/canonical/models/front-shiny/0298-000-Azurill.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0298--000--Azurill.gif
rename to src/canonical/models/front-shiny/0298-000-Azurill.gif
diff --git a/src/canonical/models/front-shiny/0299--000--Nosepass.gif b/src/canonical/models/front-shiny/0299-000-Nosepass.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0299--000--Nosepass.gif
rename to src/canonical/models/front-shiny/0299-000-Nosepass.gif
diff --git a/src/canonical/models/front-shiny/0300--000--Skitty.gif b/src/canonical/models/front-shiny/0300-000-Skitty.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0300--000--Skitty.gif
rename to src/canonical/models/front-shiny/0300-000-Skitty.gif
diff --git a/src/canonical/models/front-shiny/0301--000--Delcatty.gif b/src/canonical/models/front-shiny/0301-000-Delcatty.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0301--000--Delcatty.gif
rename to src/canonical/models/front-shiny/0301-000-Delcatty.gif
diff --git a/src/canonical/models/front-shiny/0302--000--Sableye.gif b/src/canonical/models/front-shiny/0302-000-Sableye.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0302--000--Sableye.gif
rename to src/canonical/models/front-shiny/0302-000-Sableye.gif
diff --git a/src/canonical/models/front-shiny/0302--420--Sableye--Mega.gif b/src/canonical/models/front-shiny/0302-420-Sableye-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0302--420--Sableye--Mega.gif
rename to src/canonical/models/front-shiny/0302-420-Sableye-Mega.gif
diff --git a/src/canonical/models/front-shiny/0303--000--Mawile.gif b/src/canonical/models/front-shiny/0303-000-Mawile.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0303--000--Mawile.gif
rename to src/canonical/models/front-shiny/0303-000-Mawile.gif
diff --git a/src/canonical/models/front-shiny/0303--420--Mawile--Mega.gif b/src/canonical/models/front-shiny/0303-420-Mawile-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0303--420--Mawile--Mega.gif
rename to src/canonical/models/front-shiny/0303-420-Mawile-Mega.gif
diff --git a/src/canonical/models/front-shiny/0304--000--Aron.gif b/src/canonical/models/front-shiny/0304-000-Aron.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0304--000--Aron.gif
rename to src/canonical/models/front-shiny/0304-000-Aron.gif
diff --git a/src/canonical/models/front-shiny/0305--000--Lairon.gif b/src/canonical/models/front-shiny/0305-000-Lairon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0305--000--Lairon.gif
rename to src/canonical/models/front-shiny/0305-000-Lairon.gif
diff --git a/src/canonical/models/front-shiny/0306--000--Aggron.gif b/src/canonical/models/front-shiny/0306-000-Aggron.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0306--000--Aggron.gif
rename to src/canonical/models/front-shiny/0306-000-Aggron.gif
diff --git a/src/canonical/models/front-shiny/0306--420--Aggron--Mega.gif b/src/canonical/models/front-shiny/0306-420-Aggron-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0306--420--Aggron--Mega.gif
rename to src/canonical/models/front-shiny/0306-420-Aggron-Mega.gif
diff --git a/src/canonical/models/front-shiny/0307--000--Meditite.gif b/src/canonical/models/front-shiny/0307-000-Meditite.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0307--000--Meditite.gif
rename to src/canonical/models/front-shiny/0307-000-Meditite.gif
diff --git a/src/canonical/models/front-shiny/0308--000--Medicham.gif b/src/canonical/models/front-shiny/0308-000-Medicham.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0308--000--Medicham.gif
rename to src/canonical/models/front-shiny/0308-000-Medicham.gif
diff --git a/src/canonical/models/front-shiny/0308--420--Medicham--Mega.gif b/src/canonical/models/front-shiny/0308-420-Medicham-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0308--420--Medicham--Mega.gif
rename to src/canonical/models/front-shiny/0308-420-Medicham-Mega.gif
diff --git a/src/canonical/models/front-shiny/0309--000--Electrike.gif b/src/canonical/models/front-shiny/0309-000-Electrike.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0309--000--Electrike.gif
rename to src/canonical/models/front-shiny/0309-000-Electrike.gif
diff --git a/src/canonical/models/front-shiny/0310--000--Manectric.gif b/src/canonical/models/front-shiny/0310-000-Manectric.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0310--000--Manectric.gif
rename to src/canonical/models/front-shiny/0310-000-Manectric.gif
diff --git a/src/canonical/models/front-shiny/0310--420--Manectric--Mega.gif b/src/canonical/models/front-shiny/0310-420-Manectric-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0310--420--Manectric--Mega.gif
rename to src/canonical/models/front-shiny/0310-420-Manectric-Mega.gif
diff --git a/src/canonical/models/front-shiny/0311--000--Plusle.gif b/src/canonical/models/front-shiny/0311-000-Plusle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0311--000--Plusle.gif
rename to src/canonical/models/front-shiny/0311-000-Plusle.gif
diff --git a/src/canonical/models/front-shiny/0312--000--Minun.gif b/src/canonical/models/front-shiny/0312-000-Minun.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0312--000--Minun.gif
rename to src/canonical/models/front-shiny/0312-000-Minun.gif
diff --git a/src/canonical/models/front-shiny/0313--000--Volbeat.gif b/src/canonical/models/front-shiny/0313-000-Volbeat.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0313--000--Volbeat.gif
rename to src/canonical/models/front-shiny/0313-000-Volbeat.gif
diff --git a/src/canonical/models/front-shiny/0314--000--Illumise.gif b/src/canonical/models/front-shiny/0314-000-Illumise.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0314--000--Illumise.gif
rename to src/canonical/models/front-shiny/0314-000-Illumise.gif
diff --git a/src/canonical/models/front-shiny/0315--000--Roselia.gif b/src/canonical/models/front-shiny/0315-000-Roselia.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0315--000--Roselia.gif
rename to src/canonical/models/front-shiny/0315-000-Roselia.gif
diff --git a/src/canonical/models/front-shiny/0316--000--Gulpin.gif b/src/canonical/models/front-shiny/0316-000-Gulpin.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0316--000--Gulpin.gif
rename to src/canonical/models/front-shiny/0316-000-Gulpin.gif
diff --git a/src/canonical/models/front-shiny/0317--000--Swalot.gif b/src/canonical/models/front-shiny/0317-000-Swalot.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0317--000--Swalot.gif
rename to src/canonical/models/front-shiny/0317-000-Swalot.gif
diff --git a/src/canonical/models/front-shiny/0318--000--Carvanha.gif b/src/canonical/models/front-shiny/0318-000-Carvanha.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0318--000--Carvanha.gif
rename to src/canonical/models/front-shiny/0318-000-Carvanha.gif
diff --git a/src/canonical/models/front-shiny/0319--000--Sharpedo.gif b/src/canonical/models/front-shiny/0319-000-Sharpedo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0319--000--Sharpedo.gif
rename to src/canonical/models/front-shiny/0319-000-Sharpedo.gif
diff --git a/src/canonical/models/front-shiny/0319--420--Sharpedo--Mega.gif b/src/canonical/models/front-shiny/0319-420-Sharpedo-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0319--420--Sharpedo--Mega.gif
rename to src/canonical/models/front-shiny/0319-420-Sharpedo-Mega.gif
diff --git a/src/canonical/models/front-shiny/0320--000--Wailmer.gif b/src/canonical/models/front-shiny/0320-000-Wailmer.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0320--000--Wailmer.gif
rename to src/canonical/models/front-shiny/0320-000-Wailmer.gif
diff --git a/src/canonical/models/front-shiny/0321--000--Wailord.gif b/src/canonical/models/front-shiny/0321-000-Wailord.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0321--000--Wailord.gif
rename to src/canonical/models/front-shiny/0321-000-Wailord.gif
diff --git a/src/canonical/models/front-shiny/0322--000--Numel.gif b/src/canonical/models/front-shiny/0322-000-Numel.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0322--000--Numel.gif
rename to src/canonical/models/front-shiny/0322-000-Numel.gif
diff --git a/src/canonical/models/front-shiny/0323--000--Camerupt.gif b/src/canonical/models/front-shiny/0323-000-Camerupt.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0323--000--Camerupt.gif
rename to src/canonical/models/front-shiny/0323-000-Camerupt.gif
diff --git a/src/canonical/models/front-shiny/0323--420--Camerupt--Mega.gif b/src/canonical/models/front-shiny/0323-420-Camerupt-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0323--420--Camerupt--Mega.gif
rename to src/canonical/models/front-shiny/0323-420-Camerupt-Mega.gif
diff --git a/src/canonical/models/front-shiny/0324--000--Torkoal.gif b/src/canonical/models/front-shiny/0324-000-Torkoal.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0324--000--Torkoal.gif
rename to src/canonical/models/front-shiny/0324-000-Torkoal.gif
diff --git a/src/canonical/models/front-shiny/0325--000--Spoink.gif b/src/canonical/models/front-shiny/0325-000-Spoink.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0325--000--Spoink.gif
rename to src/canonical/models/front-shiny/0325-000-Spoink.gif
diff --git a/src/canonical/models/front-shiny/0326--000--Grumpig.gif b/src/canonical/models/front-shiny/0326-000-Grumpig.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0326--000--Grumpig.gif
rename to src/canonical/models/front-shiny/0326-000-Grumpig.gif
diff --git a/src/canonical/models/front-shiny/0327--000--Spinda.gif b/src/canonical/models/front-shiny/0327-000-Spinda.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0327--000--Spinda.gif
rename to src/canonical/models/front-shiny/0327-000-Spinda.gif
diff --git a/src/canonical/models/front-shiny/0328--000--Trapinch.gif b/src/canonical/models/front-shiny/0328-000-Trapinch.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0328--000--Trapinch.gif
rename to src/canonical/models/front-shiny/0328-000-Trapinch.gif
diff --git a/src/canonical/models/front-shiny/0329--000--Vibrava.gif b/src/canonical/models/front-shiny/0329-000-Vibrava.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0329--000--Vibrava.gif
rename to src/canonical/models/front-shiny/0329-000-Vibrava.gif
diff --git a/src/canonical/models/front-shiny/0330--000--Flygon.gif b/src/canonical/models/front-shiny/0330-000-Flygon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0330--000--Flygon.gif
rename to src/canonical/models/front-shiny/0330-000-Flygon.gif
diff --git a/src/canonical/models/front-shiny/0331--000--Cacnea.gif b/src/canonical/models/front-shiny/0331-000-Cacnea.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0331--000--Cacnea.gif
rename to src/canonical/models/front-shiny/0331-000-Cacnea.gif
diff --git a/src/canonical/models/front-shiny/0332--000--Cacturne.gif b/src/canonical/models/front-shiny/0332-000-Cacturne.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0332--000--Cacturne.gif
rename to src/canonical/models/front-shiny/0332-000-Cacturne.gif
diff --git a/src/canonical/models/front-shiny/0333--000--Swablu.gif b/src/canonical/models/front-shiny/0333-000-Swablu.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0333--000--Swablu.gif
rename to src/canonical/models/front-shiny/0333-000-Swablu.gif
diff --git a/src/canonical/models/front-shiny/0334--000--Altaria.gif b/src/canonical/models/front-shiny/0334-000-Altaria.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0334--000--Altaria.gif
rename to src/canonical/models/front-shiny/0334-000-Altaria.gif
diff --git a/src/canonical/models/front-shiny/0334--420--Altaria--Mega.gif b/src/canonical/models/front-shiny/0334-420-Altaria-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0334--420--Altaria--Mega.gif
rename to src/canonical/models/front-shiny/0334-420-Altaria-Mega.gif
diff --git a/src/canonical/models/front-shiny/0335--000--Zangoose.gif b/src/canonical/models/front-shiny/0335-000-Zangoose.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0335--000--Zangoose.gif
rename to src/canonical/models/front-shiny/0335-000-Zangoose.gif
diff --git a/src/canonical/models/front-shiny/0336--000--Seviper.gif b/src/canonical/models/front-shiny/0336-000-Seviper.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0336--000--Seviper.gif
rename to src/canonical/models/front-shiny/0336-000-Seviper.gif
diff --git a/src/canonical/models/front-shiny/0337--000--Lunatone.gif b/src/canonical/models/front-shiny/0337-000-Lunatone.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0337--000--Lunatone.gif
rename to src/canonical/models/front-shiny/0337-000-Lunatone.gif
diff --git a/src/canonical/models/front-shiny/0338--000--Solrock.gif b/src/canonical/models/front-shiny/0338-000-Solrock.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0338--000--Solrock.gif
rename to src/canonical/models/front-shiny/0338-000-Solrock.gif
diff --git a/src/canonical/models/front-shiny/0339--000--Barboach.gif b/src/canonical/models/front-shiny/0339-000-Barboach.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0339--000--Barboach.gif
rename to src/canonical/models/front-shiny/0339-000-Barboach.gif
diff --git a/src/canonical/models/front-shiny/0340--000--Whiscash.gif b/src/canonical/models/front-shiny/0340-000-Whiscash.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0340--000--Whiscash.gif
rename to src/canonical/models/front-shiny/0340-000-Whiscash.gif
diff --git a/src/canonical/models/front-shiny/0341--000--Corphish.gif b/src/canonical/models/front-shiny/0341-000-Corphish.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0341--000--Corphish.gif
rename to src/canonical/models/front-shiny/0341-000-Corphish.gif
diff --git a/src/canonical/models/front-shiny/0342--000--Crawdaunt.gif b/src/canonical/models/front-shiny/0342-000-Crawdaunt.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0342--000--Crawdaunt.gif
rename to src/canonical/models/front-shiny/0342-000-Crawdaunt.gif
diff --git a/src/canonical/models/front-shiny/0343--000--Baltoy.gif b/src/canonical/models/front-shiny/0343-000-Baltoy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0343--000--Baltoy.gif
rename to src/canonical/models/front-shiny/0343-000-Baltoy.gif
diff --git a/src/canonical/models/front-shiny/0344--000--Claydol.gif b/src/canonical/models/front-shiny/0344-000-Claydol.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0344--000--Claydol.gif
rename to src/canonical/models/front-shiny/0344-000-Claydol.gif
diff --git a/src/canonical/models/front-shiny/0345--000--Lileep.gif b/src/canonical/models/front-shiny/0345-000-Lileep.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0345--000--Lileep.gif
rename to src/canonical/models/front-shiny/0345-000-Lileep.gif
diff --git a/src/canonical/models/front-shiny/0346--000--Cradily.gif b/src/canonical/models/front-shiny/0346-000-Cradily.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0346--000--Cradily.gif
rename to src/canonical/models/front-shiny/0346-000-Cradily.gif
diff --git a/src/canonical/models/front-shiny/0347--000--Anorith.gif b/src/canonical/models/front-shiny/0347-000-Anorith.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0347--000--Anorith.gif
rename to src/canonical/models/front-shiny/0347-000-Anorith.gif
diff --git a/src/canonical/models/front-shiny/0348--000--Armaldo.gif b/src/canonical/models/front-shiny/0348-000-Armaldo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0348--000--Armaldo.gif
rename to src/canonical/models/front-shiny/0348-000-Armaldo.gif
diff --git a/src/canonical/models/front-shiny/0349--000--Feebas.gif b/src/canonical/models/front-shiny/0349-000-Feebas.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0349--000--Feebas.gif
rename to src/canonical/models/front-shiny/0349-000-Feebas.gif
diff --git a/src/canonical/models/front-shiny/0350--000--Milotic.gif b/src/canonical/models/front-shiny/0350-000-Milotic.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0350--000--Milotic.gif
rename to src/canonical/models/front-shiny/0350-000-Milotic.gif
diff --git a/src/canonical/models/front-shiny/0351--000--Castform.gif b/src/canonical/models/front-shiny/0351-000-Castform.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0351--000--Castform.gif
rename to src/canonical/models/front-shiny/0351-000-Castform.gif
diff --git a/src/canonical/models/front-shiny/0351--420--Castform--Rainy.gif b/src/canonical/models/front-shiny/0351-420-Castform-Rainy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0351--420--Castform--Rainy.gif
rename to src/canonical/models/front-shiny/0351-420-Castform-Rainy.gif
diff --git a/src/canonical/models/front-shiny/0351--420--Castform--Snowy.gif b/src/canonical/models/front-shiny/0351-420-Castform-Snowy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0351--420--Castform--Snowy.gif
rename to src/canonical/models/front-shiny/0351-420-Castform-Snowy.gif
diff --git a/src/canonical/models/front-shiny/0351--420--Castform--Sunny.gif b/src/canonical/models/front-shiny/0351-420-Castform-Sunny.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0351--420--Castform--Sunny.gif
rename to src/canonical/models/front-shiny/0351-420-Castform-Sunny.gif
diff --git a/src/canonical/models/front-shiny/0352--000--Kecleon.gif b/src/canonical/models/front-shiny/0352-000-Kecleon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0352--000--Kecleon.gif
rename to src/canonical/models/front-shiny/0352-000-Kecleon.gif
diff --git a/src/canonical/models/front-shiny/0353--000--Shuppet.gif b/src/canonical/models/front-shiny/0353-000-Shuppet.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0353--000--Shuppet.gif
rename to src/canonical/models/front-shiny/0353-000-Shuppet.gif
diff --git a/src/canonical/models/front-shiny/0354--000--Banette.gif b/src/canonical/models/front-shiny/0354-000-Banette.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0354--000--Banette.gif
rename to src/canonical/models/front-shiny/0354-000-Banette.gif
diff --git a/src/canonical/models/front-shiny/0354--420--Banette--Mega.gif b/src/canonical/models/front-shiny/0354-420-Banette-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0354--420--Banette--Mega.gif
rename to src/canonical/models/front-shiny/0354-420-Banette-Mega.gif
diff --git a/src/canonical/models/front-shiny/0355--000--Duskull.gif b/src/canonical/models/front-shiny/0355-000-Duskull.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0355--000--Duskull.gif
rename to src/canonical/models/front-shiny/0355-000-Duskull.gif
diff --git a/src/canonical/models/front-shiny/0356--000--Dusclops.gif b/src/canonical/models/front-shiny/0356-000-Dusclops.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0356--000--Dusclops.gif
rename to src/canonical/models/front-shiny/0356-000-Dusclops.gif
diff --git a/src/canonical/models/front-shiny/0357--000--Tropius.gif b/src/canonical/models/front-shiny/0357-000-Tropius.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0357--000--Tropius.gif
rename to src/canonical/models/front-shiny/0357-000-Tropius.gif
diff --git a/src/canonical/models/front-shiny/0358--000--Chimecho.gif b/src/canonical/models/front-shiny/0358-000-Chimecho.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0358--000--Chimecho.gif
rename to src/canonical/models/front-shiny/0358-000-Chimecho.gif
diff --git a/src/canonical/models/front-shiny/0359--000--Absol.gif b/src/canonical/models/front-shiny/0359-000-Absol.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0359--000--Absol.gif
rename to src/canonical/models/front-shiny/0359-000-Absol.gif
diff --git a/src/canonical/models/front-shiny/0359--420--Absol--Mega.gif b/src/canonical/models/front-shiny/0359-420-Absol-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0359--420--Absol--Mega.gif
rename to src/canonical/models/front-shiny/0359-420-Absol-Mega.gif
diff --git a/src/canonical/models/front-shiny/0360--000--Wynaut.gif b/src/canonical/models/front-shiny/0360-000-Wynaut.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0360--000--Wynaut.gif
rename to src/canonical/models/front-shiny/0360-000-Wynaut.gif
diff --git a/src/canonical/models/front-shiny/0361--000--Snorunt.gif b/src/canonical/models/front-shiny/0361-000-Snorunt.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0361--000--Snorunt.gif
rename to src/canonical/models/front-shiny/0361-000-Snorunt.gif
diff --git a/src/canonical/models/front-shiny/0362--000--Glalie.gif b/src/canonical/models/front-shiny/0362-000-Glalie.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0362--000--Glalie.gif
rename to src/canonical/models/front-shiny/0362-000-Glalie.gif
diff --git a/src/canonical/models/front-shiny/0362--420--Glalie--Mega.gif b/src/canonical/models/front-shiny/0362-420-Glalie-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0362--420--Glalie--Mega.gif
rename to src/canonical/models/front-shiny/0362-420-Glalie-Mega.gif
diff --git a/src/canonical/models/front-shiny/0363--000--Spheal.gif b/src/canonical/models/front-shiny/0363-000-Spheal.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0363--000--Spheal.gif
rename to src/canonical/models/front-shiny/0363-000-Spheal.gif
diff --git a/src/canonical/models/front-shiny/0364--000--Sealeo.gif b/src/canonical/models/front-shiny/0364-000-Sealeo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0364--000--Sealeo.gif
rename to src/canonical/models/front-shiny/0364-000-Sealeo.gif
diff --git a/src/canonical/models/front-shiny/0365--000--Walrein.gif b/src/canonical/models/front-shiny/0365-000-Walrein.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0365--000--Walrein.gif
rename to src/canonical/models/front-shiny/0365-000-Walrein.gif
diff --git a/src/canonical/models/front-shiny/0366--000--Clamperl.gif b/src/canonical/models/front-shiny/0366-000-Clamperl.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0366--000--Clamperl.gif
rename to src/canonical/models/front-shiny/0366-000-Clamperl.gif
diff --git a/src/canonical/models/front-shiny/0367--000--Huntail.gif b/src/canonical/models/front-shiny/0367-000-Huntail.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0367--000--Huntail.gif
rename to src/canonical/models/front-shiny/0367-000-Huntail.gif
diff --git a/src/canonical/models/front-shiny/0368--000--Gorebyss.gif b/src/canonical/models/front-shiny/0368-000-Gorebyss.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0368--000--Gorebyss.gif
rename to src/canonical/models/front-shiny/0368-000-Gorebyss.gif
diff --git a/src/canonical/models/front-shiny/0369--000--Relicanth.gif b/src/canonical/models/front-shiny/0369-000-Relicanth.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0369--000--Relicanth.gif
rename to src/canonical/models/front-shiny/0369-000-Relicanth.gif
diff --git a/src/canonical/models/front-shiny/0370--000--Luvdisc.gif b/src/canonical/models/front-shiny/0370-000-Luvdisc.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0370--000--Luvdisc.gif
rename to src/canonical/models/front-shiny/0370-000-Luvdisc.gif
diff --git a/src/canonical/models/front-shiny/0371--000--Bagon.gif b/src/canonical/models/front-shiny/0371-000-Bagon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0371--000--Bagon.gif
rename to src/canonical/models/front-shiny/0371-000-Bagon.gif
diff --git a/src/canonical/models/front-shiny/0372--000--Shelgon.gif b/src/canonical/models/front-shiny/0372-000-Shelgon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0372--000--Shelgon.gif
rename to src/canonical/models/front-shiny/0372-000-Shelgon.gif
diff --git a/src/canonical/models/front-shiny/0373--000--Salamence.gif b/src/canonical/models/front-shiny/0373-000-Salamence.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0373--000--Salamence.gif
rename to src/canonical/models/front-shiny/0373-000-Salamence.gif
diff --git a/src/canonical/models/front-shiny/0373--420--Salamence--Mega.gif b/src/canonical/models/front-shiny/0373-420-Salamence-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0373--420--Salamence--Mega.gif
rename to src/canonical/models/front-shiny/0373-420-Salamence-Mega.gif
diff --git a/src/canonical/models/front-shiny/0374--000--Beldum.gif b/src/canonical/models/front-shiny/0374-000-Beldum.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0374--000--Beldum.gif
rename to src/canonical/models/front-shiny/0374-000-Beldum.gif
diff --git a/src/canonical/models/front-shiny/0375--000--Metang.gif b/src/canonical/models/front-shiny/0375-000-Metang.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0375--000--Metang.gif
rename to src/canonical/models/front-shiny/0375-000-Metang.gif
diff --git a/src/canonical/models/front-shiny/0376--000--Metagross.gif b/src/canonical/models/front-shiny/0376-000-Metagross.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0376--000--Metagross.gif
rename to src/canonical/models/front-shiny/0376-000-Metagross.gif
diff --git a/src/canonical/models/front-shiny/0376--420--Metagross--Mega.gif b/src/canonical/models/front-shiny/0376-420-Metagross-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0376--420--Metagross--Mega.gif
rename to src/canonical/models/front-shiny/0376-420-Metagross-Mega.gif
diff --git a/src/canonical/models/front-shiny/0377--000--Regirock.gif b/src/canonical/models/front-shiny/0377-000-Regirock.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0377--000--Regirock.gif
rename to src/canonical/models/front-shiny/0377-000-Regirock.gif
diff --git a/src/canonical/models/front-shiny/0378--000--Regice.gif b/src/canonical/models/front-shiny/0378-000-Regice.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0378--000--Regice.gif
rename to src/canonical/models/front-shiny/0378-000-Regice.gif
diff --git a/src/canonical/models/front-shiny/0379--000--Registeel.gif b/src/canonical/models/front-shiny/0379-000-Registeel.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0379--000--Registeel.gif
rename to src/canonical/models/front-shiny/0379-000-Registeel.gif
diff --git a/src/canonical/models/front-shiny/0380--000--Latias.gif b/src/canonical/models/front-shiny/0380-000-Latias.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0380--000--Latias.gif
rename to src/canonical/models/front-shiny/0380-000-Latias.gif
diff --git a/src/canonical/models/front-shiny/0380--420--Latias--Mega.gif b/src/canonical/models/front-shiny/0380-420-Latias-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0380--420--Latias--Mega.gif
rename to src/canonical/models/front-shiny/0380-420-Latias-Mega.gif
diff --git a/src/canonical/models/front-shiny/0381--000--Latios.gif b/src/canonical/models/front-shiny/0381-000-Latios.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0381--000--Latios.gif
rename to src/canonical/models/front-shiny/0381-000-Latios.gif
diff --git a/src/canonical/models/front-shiny/0381--420--Latios--Mega.gif b/src/canonical/models/front-shiny/0381-420-Latios-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0381--420--Latios--Mega.gif
rename to src/canonical/models/front-shiny/0381-420-Latios-Mega.gif
diff --git a/src/canonical/models/front-shiny/0382--000--Kyogre.gif b/src/canonical/models/front-shiny/0382-000-Kyogre.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0382--000--Kyogre.gif
rename to src/canonical/models/front-shiny/0382-000-Kyogre.gif
diff --git a/src/canonical/models/front-shiny/0382--420--Kyogre--Primal.gif b/src/canonical/models/front-shiny/0382-420-Kyogre-Primal.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0382--420--Kyogre--Primal.gif
rename to src/canonical/models/front-shiny/0382-420-Kyogre-Primal.gif
diff --git a/src/canonical/models/front-shiny/0383--000--Groudon.gif b/src/canonical/models/front-shiny/0383-000-Groudon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0383--000--Groudon.gif
rename to src/canonical/models/front-shiny/0383-000-Groudon.gif
diff --git a/src/canonical/models/front-shiny/0383--420--Groudon--Primal.gif b/src/canonical/models/front-shiny/0383-420-Groudon-Primal.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0383--420--Groudon--Primal.gif
rename to src/canonical/models/front-shiny/0383-420-Groudon-Primal.gif
diff --git a/src/canonical/models/front-shiny/0384--000--Rayquaza.gif b/src/canonical/models/front-shiny/0384-000-Rayquaza.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0384--000--Rayquaza.gif
rename to src/canonical/models/front-shiny/0384-000-Rayquaza.gif
diff --git a/src/canonical/models/front-shiny/0384--420--Rayquaza--Mega.gif b/src/canonical/models/front-shiny/0384-420-Rayquaza-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0384--420--Rayquaza--Mega.gif
rename to src/canonical/models/front-shiny/0384-420-Rayquaza-Mega.gif
diff --git a/src/canonical/models/front-shiny/0385--000--Jirachi.gif b/src/canonical/models/front-shiny/0385-000-Jirachi.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0385--000--Jirachi.gif
rename to src/canonical/models/front-shiny/0385-000-Jirachi.gif
diff --git a/src/canonical/models/front-shiny/0386--000--Deoxys.gif b/src/canonical/models/front-shiny/0386-000-Deoxys.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0386--000--Deoxys.gif
rename to src/canonical/models/front-shiny/0386-000-Deoxys.gif
diff --git a/src/canonical/models/front-shiny/0386--420--Deoxys--Attack.gif b/src/canonical/models/front-shiny/0386-420-Deoxys-Attack.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0386--420--Deoxys--Attack.gif
rename to src/canonical/models/front-shiny/0386-420-Deoxys-Attack.gif
diff --git a/src/canonical/models/front-shiny/0386--420--Deoxys--Defense.gif b/src/canonical/models/front-shiny/0386-420-Deoxys-Defense.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0386--420--Deoxys--Defense.gif
rename to src/canonical/models/front-shiny/0386-420-Deoxys-Defense.gif
diff --git a/src/canonical/models/front-shiny/0386--420--Deoxys--Speed.gif b/src/canonical/models/front-shiny/0386-420-Deoxys-Speed.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0386--420--Deoxys--Speed.gif
rename to src/canonical/models/front-shiny/0386-420-Deoxys-Speed.gif
diff --git a/src/canonical/models/front-shiny/0387--000--Turtwig.gif b/src/canonical/models/front-shiny/0387-000-Turtwig.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0387--000--Turtwig.gif
rename to src/canonical/models/front-shiny/0387-000-Turtwig.gif
diff --git a/src/canonical/models/front-shiny/0388--000--Grotle.gif b/src/canonical/models/front-shiny/0388-000-Grotle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0388--000--Grotle.gif
rename to src/canonical/models/front-shiny/0388-000-Grotle.gif
diff --git a/src/canonical/models/front-shiny/0389--000--Torterra.gif b/src/canonical/models/front-shiny/0389-000-Torterra.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0389--000--Torterra.gif
rename to src/canonical/models/front-shiny/0389-000-Torterra.gif
diff --git a/src/canonical/models/front-shiny/0390--000--Chimchar.gif b/src/canonical/models/front-shiny/0390-000-Chimchar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0390--000--Chimchar.gif
rename to src/canonical/models/front-shiny/0390-000-Chimchar.gif
diff --git a/src/canonical/models/front-shiny/0391--000--Monferno.gif b/src/canonical/models/front-shiny/0391-000-Monferno.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0391--000--Monferno.gif
rename to src/canonical/models/front-shiny/0391-000-Monferno.gif
diff --git a/src/canonical/models/front-shiny/0392--000--Infernape.gif b/src/canonical/models/front-shiny/0392-000-Infernape.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0392--000--Infernape.gif
rename to src/canonical/models/front-shiny/0392-000-Infernape.gif
diff --git a/src/canonical/models/front-shiny/0393--000--Piplup.gif b/src/canonical/models/front-shiny/0393-000-Piplup.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0393--000--Piplup.gif
rename to src/canonical/models/front-shiny/0393-000-Piplup.gif
diff --git a/src/canonical/models/front-shiny/0394--000--Prinplup.gif b/src/canonical/models/front-shiny/0394-000-Prinplup.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0394--000--Prinplup.gif
rename to src/canonical/models/front-shiny/0394-000-Prinplup.gif
diff --git a/src/canonical/models/front-shiny/0395--000--Empoleon.gif b/src/canonical/models/front-shiny/0395-000-Empoleon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0395--000--Empoleon.gif
rename to src/canonical/models/front-shiny/0395-000-Empoleon.gif
diff --git a/src/canonical/models/front-shiny/0396--000--Starly.gif b/src/canonical/models/front-shiny/0396-000-Starly.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0396--000--Starly.gif
rename to src/canonical/models/front-shiny/0396-000-Starly.gif
diff --git a/src/canonical/models/front-shiny/0397--000--Staravia.gif b/src/canonical/models/front-shiny/0397-000-Staravia.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0397--000--Staravia.gif
rename to src/canonical/models/front-shiny/0397-000-Staravia.gif
diff --git a/src/canonical/models/front-shiny/0398--000--Staraptor.gif b/src/canonical/models/front-shiny/0398-000-Staraptor.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0398--000--Staraptor.gif
rename to src/canonical/models/front-shiny/0398-000-Staraptor.gif
diff --git a/src/canonical/models/front-shiny/0399--000--Bidoof.gif b/src/canonical/models/front-shiny/0399-000-Bidoof.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0399--000--Bidoof.gif
rename to src/canonical/models/front-shiny/0399-000-Bidoof.gif
diff --git a/src/canonical/models/front-shiny/0400--000--Bibarel.gif b/src/canonical/models/front-shiny/0400-000-Bibarel.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0400--000--Bibarel.gif
rename to src/canonical/models/front-shiny/0400-000-Bibarel.gif
diff --git a/src/canonical/models/front-shiny/0401--000--Kricketot.gif b/src/canonical/models/front-shiny/0401-000-Kricketot.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0401--000--Kricketot.gif
rename to src/canonical/models/front-shiny/0401-000-Kricketot.gif
diff --git a/src/canonical/models/front-shiny/0402--000--Kricketune.gif b/src/canonical/models/front-shiny/0402-000-Kricketune.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0402--000--Kricketune.gif
rename to src/canonical/models/front-shiny/0402-000-Kricketune.gif
diff --git a/src/canonical/models/front-shiny/0403--000--Shinx.gif b/src/canonical/models/front-shiny/0403-000-Shinx.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0403--000--Shinx.gif
rename to src/canonical/models/front-shiny/0403-000-Shinx.gif
diff --git a/src/canonical/models/front-shiny/0404--000--Luxio.gif b/src/canonical/models/front-shiny/0404-000-Luxio.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0404--000--Luxio.gif
rename to src/canonical/models/front-shiny/0404-000-Luxio.gif
diff --git a/src/canonical/models/front-shiny/0405--000--Luxray.gif b/src/canonical/models/front-shiny/0405-000-Luxray.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0405--000--Luxray.gif
rename to src/canonical/models/front-shiny/0405-000-Luxray.gif
diff --git a/src/canonical/models/front-shiny/0406--000--Budew.gif b/src/canonical/models/front-shiny/0406-000-Budew.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0406--000--Budew.gif
rename to src/canonical/models/front-shiny/0406-000-Budew.gif
diff --git a/src/canonical/models/front-shiny/0407--000--Roserade.gif b/src/canonical/models/front-shiny/0407-000-Roserade.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0407--000--Roserade.gif
rename to src/canonical/models/front-shiny/0407-000-Roserade.gif
diff --git a/src/canonical/models/front-shiny/0408--000--Cranidos.gif b/src/canonical/models/front-shiny/0408-000-Cranidos.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0408--000--Cranidos.gif
rename to src/canonical/models/front-shiny/0408-000-Cranidos.gif
diff --git a/src/canonical/models/front-shiny/0409--000--Rampardos.gif b/src/canonical/models/front-shiny/0409-000-Rampardos.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0409--000--Rampardos.gif
rename to src/canonical/models/front-shiny/0409-000-Rampardos.gif
diff --git a/src/canonical/models/front-shiny/0410--000--Shieldon.gif b/src/canonical/models/front-shiny/0410-000-Shieldon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0410--000--Shieldon.gif
rename to src/canonical/models/front-shiny/0410-000-Shieldon.gif
diff --git a/src/canonical/models/front-shiny/0411--000--Bastiodon.gif b/src/canonical/models/front-shiny/0411-000-Bastiodon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0411--000--Bastiodon.gif
rename to src/canonical/models/front-shiny/0411-000-Bastiodon.gif
diff --git a/src/canonical/models/front-shiny/0412--000--Burmy.gif b/src/canonical/models/front-shiny/0412-000-Burmy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0412--000--Burmy.gif
rename to src/canonical/models/front-shiny/0412-000-Burmy.gif
diff --git a/src/canonical/models/front-shiny/0413--000--Wormadam.gif b/src/canonical/models/front-shiny/0413-000-Wormadam.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0413--000--Wormadam.gif
rename to src/canonical/models/front-shiny/0413-000-Wormadam.gif
diff --git a/src/canonical/models/front-shiny/0413--420--Wormadam--Sandy.gif b/src/canonical/models/front-shiny/0413-420-Wormadam-Sandy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0413--420--Wormadam--Sandy.gif
rename to src/canonical/models/front-shiny/0413-420-Wormadam-Sandy.gif
diff --git a/src/canonical/models/front-shiny/0413--420--Wormadam--Trash.gif b/src/canonical/models/front-shiny/0413-420-Wormadam-Trash.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0413--420--Wormadam--Trash.gif
rename to src/canonical/models/front-shiny/0413-420-Wormadam-Trash.gif
diff --git a/src/canonical/models/front-shiny/0414--000--Mothim.gif b/src/canonical/models/front-shiny/0414-000-Mothim.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0414--000--Mothim.gif
rename to src/canonical/models/front-shiny/0414-000-Mothim.gif
diff --git a/src/canonical/models/front-shiny/0415--000--Combee.gif b/src/canonical/models/front-shiny/0415-000-Combee.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0415--000--Combee.gif
rename to src/canonical/models/front-shiny/0415-000-Combee.gif
diff --git a/src/canonical/models/front-shiny/0416--000--Vespiquen.gif b/src/canonical/models/front-shiny/0416-000-Vespiquen.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0416--000--Vespiquen.gif
rename to src/canonical/models/front-shiny/0416-000-Vespiquen.gif
diff --git a/src/canonical/models/front-shiny/0417--000--Pachirisu.gif b/src/canonical/models/front-shiny/0417-000-Pachirisu.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0417--000--Pachirisu.gif
rename to src/canonical/models/front-shiny/0417-000-Pachirisu.gif
diff --git a/src/canonical/models/front-shiny/0418--000--Buizel.gif b/src/canonical/models/front-shiny/0418-000-Buizel.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0418--000--Buizel.gif
rename to src/canonical/models/front-shiny/0418-000-Buizel.gif
diff --git a/src/canonical/models/front-shiny/0419--000--Floatzel.gif b/src/canonical/models/front-shiny/0419-000-Floatzel.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0419--000--Floatzel.gif
rename to src/canonical/models/front-shiny/0419-000-Floatzel.gif
diff --git a/src/canonical/models/front-shiny/0420--000--Cherubi.gif b/src/canonical/models/front-shiny/0420-000-Cherubi.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0420--000--Cherubi.gif
rename to src/canonical/models/front-shiny/0420-000-Cherubi.gif
diff --git a/src/canonical/models/front-shiny/0421--000--Cherrim.gif b/src/canonical/models/front-shiny/0421-000-Cherrim.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0421--000--Cherrim.gif
rename to src/canonical/models/front-shiny/0421-000-Cherrim.gif
diff --git a/src/canonical/models/front-shiny/0421--420--Cherrim--Sunshine.gif b/src/canonical/models/front-shiny/0421-420-Cherrim-Sunshine.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0421--420--Cherrim--Sunshine.gif
rename to src/canonical/models/front-shiny/0421-420-Cherrim-Sunshine.gif
diff --git a/src/canonical/models/front-shiny/0422--000--Shellos.gif b/src/canonical/models/front-shiny/0422-000-Shellos.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0422--000--Shellos.gif
rename to src/canonical/models/front-shiny/0422-000-Shellos.gif
diff --git a/src/canonical/models/front-shiny/0423--000--Gastrodon.gif b/src/canonical/models/front-shiny/0423-000-Gastrodon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0423--000--Gastrodon.gif
rename to src/canonical/models/front-shiny/0423-000-Gastrodon.gif
diff --git a/src/canonical/models/front-shiny/0424--000--Ambipom.gif b/src/canonical/models/front-shiny/0424-000-Ambipom.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0424--000--Ambipom.gif
rename to src/canonical/models/front-shiny/0424-000-Ambipom.gif
diff --git a/src/canonical/models/front-shiny/0425--000--Drifloon.gif b/src/canonical/models/front-shiny/0425-000-Drifloon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0425--000--Drifloon.gif
rename to src/canonical/models/front-shiny/0425-000-Drifloon.gif
diff --git a/src/canonical/models/front-shiny/0426--000--Drifblim.gif b/src/canonical/models/front-shiny/0426-000-Drifblim.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0426--000--Drifblim.gif
rename to src/canonical/models/front-shiny/0426-000-Drifblim.gif
diff --git a/src/canonical/models/front-shiny/0427--000--Buneary.gif b/src/canonical/models/front-shiny/0427-000-Buneary.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0427--000--Buneary.gif
rename to src/canonical/models/front-shiny/0427-000-Buneary.gif
diff --git a/src/canonical/models/front-shiny/0428--000--Lopunny.gif b/src/canonical/models/front-shiny/0428-000-Lopunny.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0428--000--Lopunny.gif
rename to src/canonical/models/front-shiny/0428-000-Lopunny.gif
diff --git a/src/canonical/models/front-shiny/0428--420--Lopunny--Mega.gif b/src/canonical/models/front-shiny/0428-420-Lopunny-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0428--420--Lopunny--Mega.gif
rename to src/canonical/models/front-shiny/0428-420-Lopunny-Mega.gif
diff --git a/src/canonical/models/front-shiny/0429--000--Mismagius.gif b/src/canonical/models/front-shiny/0429-000-Mismagius.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0429--000--Mismagius.gif
rename to src/canonical/models/front-shiny/0429-000-Mismagius.gif
diff --git a/src/canonical/models/front-shiny/0430--000--Honchkrow.gif b/src/canonical/models/front-shiny/0430-000-Honchkrow.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0430--000--Honchkrow.gif
rename to src/canonical/models/front-shiny/0430-000-Honchkrow.gif
diff --git a/src/canonical/models/front-shiny/0431--000--Glameow.gif b/src/canonical/models/front-shiny/0431-000-Glameow.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0431--000--Glameow.gif
rename to src/canonical/models/front-shiny/0431-000-Glameow.gif
diff --git a/src/canonical/models/front-shiny/0432--000--Purugly.gif b/src/canonical/models/front-shiny/0432-000-Purugly.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0432--000--Purugly.gif
rename to src/canonical/models/front-shiny/0432-000-Purugly.gif
diff --git a/src/canonical/models/front-shiny/0433--000--Chingling.gif b/src/canonical/models/front-shiny/0433-000-Chingling.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0433--000--Chingling.gif
rename to src/canonical/models/front-shiny/0433-000-Chingling.gif
diff --git a/src/canonical/models/front-shiny/0434--000--Stunky.gif b/src/canonical/models/front-shiny/0434-000-Stunky.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0434--000--Stunky.gif
rename to src/canonical/models/front-shiny/0434-000-Stunky.gif
diff --git a/src/canonical/models/front-shiny/0435--000--Skuntank.gif b/src/canonical/models/front-shiny/0435-000-Skuntank.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0435--000--Skuntank.gif
rename to src/canonical/models/front-shiny/0435-000-Skuntank.gif
diff --git a/src/canonical/models/front-shiny/0436--000--Bronzor.gif b/src/canonical/models/front-shiny/0436-000-Bronzor.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0436--000--Bronzor.gif
rename to src/canonical/models/front-shiny/0436-000-Bronzor.gif
diff --git a/src/canonical/models/front-shiny/0437--000--Bronzong.gif b/src/canonical/models/front-shiny/0437-000-Bronzong.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0437--000--Bronzong.gif
rename to src/canonical/models/front-shiny/0437-000-Bronzong.gif
diff --git a/src/canonical/models/front-shiny/0438--000--Bonsly.gif b/src/canonical/models/front-shiny/0438-000-Bonsly.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0438--000--Bonsly.gif
rename to src/canonical/models/front-shiny/0438-000-Bonsly.gif
diff --git a/src/canonical/models/front-shiny/0439--000--Mime_Jr..gif b/src/canonical/models/front-shiny/0439-000-Mime_Jr..gif
similarity index 100%
rename from src/canonical/models/front-shiny/0439--000--Mime_Jr..gif
rename to src/canonical/models/front-shiny/0439-000-Mime_Jr..gif
diff --git a/src/canonical/models/front-shiny/0440--000--Happiny.gif b/src/canonical/models/front-shiny/0440-000-Happiny.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0440--000--Happiny.gif
rename to src/canonical/models/front-shiny/0440-000-Happiny.gif
diff --git a/src/canonical/models/front-shiny/0441--000--Chatot.gif b/src/canonical/models/front-shiny/0441-000-Chatot.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0441--000--Chatot.gif
rename to src/canonical/models/front-shiny/0441-000-Chatot.gif
diff --git a/src/canonical/models/front-shiny/0442--000--Spiritomb.gif b/src/canonical/models/front-shiny/0442-000-Spiritomb.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0442--000--Spiritomb.gif
rename to src/canonical/models/front-shiny/0442-000-Spiritomb.gif
diff --git a/src/canonical/models/front-shiny/0443--000--Gible.gif b/src/canonical/models/front-shiny/0443-000-Gible.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0443--000--Gible.gif
rename to src/canonical/models/front-shiny/0443-000-Gible.gif
diff --git a/src/canonical/models/front-shiny/0444--000--Gabite.gif b/src/canonical/models/front-shiny/0444-000-Gabite.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0444--000--Gabite.gif
rename to src/canonical/models/front-shiny/0444-000-Gabite.gif
diff --git a/src/canonical/models/front-shiny/0445--000--Garchomp.gif b/src/canonical/models/front-shiny/0445-000-Garchomp.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0445--000--Garchomp.gif
rename to src/canonical/models/front-shiny/0445-000-Garchomp.gif
diff --git a/src/canonical/models/front-shiny/0445--420--Garchomp--Mega.gif b/src/canonical/models/front-shiny/0445-420-Garchomp-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0445--420--Garchomp--Mega.gif
rename to src/canonical/models/front-shiny/0445-420-Garchomp-Mega.gif
diff --git a/src/canonical/models/front-shiny/0446--000--Munchlax.gif b/src/canonical/models/front-shiny/0446-000-Munchlax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0446--000--Munchlax.gif
rename to src/canonical/models/front-shiny/0446-000-Munchlax.gif
diff --git a/src/canonical/models/front-shiny/0447--000--Riolu.gif b/src/canonical/models/front-shiny/0447-000-Riolu.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0447--000--Riolu.gif
rename to src/canonical/models/front-shiny/0447-000-Riolu.gif
diff --git a/src/canonical/models/front-shiny/0448--000--Lucario.gif b/src/canonical/models/front-shiny/0448-000-Lucario.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0448--000--Lucario.gif
rename to src/canonical/models/front-shiny/0448-000-Lucario.gif
diff --git a/src/canonical/models/front-shiny/0448--420--Lucario--Mega.gif b/src/canonical/models/front-shiny/0448-420-Lucario-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0448--420--Lucario--Mega.gif
rename to src/canonical/models/front-shiny/0448-420-Lucario-Mega.gif
diff --git a/src/canonical/models/front-shiny/0449--000--Hippopotas.gif b/src/canonical/models/front-shiny/0449-000-Hippopotas.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0449--000--Hippopotas.gif
rename to src/canonical/models/front-shiny/0449-000-Hippopotas.gif
diff --git a/src/canonical/models/front-shiny/0450--000--Hippowdon.gif b/src/canonical/models/front-shiny/0450-000-Hippowdon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0450--000--Hippowdon.gif
rename to src/canonical/models/front-shiny/0450-000-Hippowdon.gif
diff --git a/src/canonical/models/front-shiny/0451--000--Skorupi.gif b/src/canonical/models/front-shiny/0451-000-Skorupi.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0451--000--Skorupi.gif
rename to src/canonical/models/front-shiny/0451-000-Skorupi.gif
diff --git a/src/canonical/models/front-shiny/0452--000--Drapion.gif b/src/canonical/models/front-shiny/0452-000-Drapion.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0452--000--Drapion.gif
rename to src/canonical/models/front-shiny/0452-000-Drapion.gif
diff --git a/src/canonical/models/front-shiny/0453--000--Croagunk.gif b/src/canonical/models/front-shiny/0453-000-Croagunk.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0453--000--Croagunk.gif
rename to src/canonical/models/front-shiny/0453-000-Croagunk.gif
diff --git a/src/canonical/models/front-shiny/0454--000--Toxicroak.gif b/src/canonical/models/front-shiny/0454-000-Toxicroak.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0454--000--Toxicroak.gif
rename to src/canonical/models/front-shiny/0454-000-Toxicroak.gif
diff --git a/src/canonical/models/front-shiny/0455--000--Carnivine.gif b/src/canonical/models/front-shiny/0455-000-Carnivine.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0455--000--Carnivine.gif
rename to src/canonical/models/front-shiny/0455-000-Carnivine.gif
diff --git a/src/canonical/models/front-shiny/0456--000--Finneon.gif b/src/canonical/models/front-shiny/0456-000-Finneon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0456--000--Finneon.gif
rename to src/canonical/models/front-shiny/0456-000-Finneon.gif
diff --git a/src/canonical/models/front-shiny/0457--000--Lumineon.gif b/src/canonical/models/front-shiny/0457-000-Lumineon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0457--000--Lumineon.gif
rename to src/canonical/models/front-shiny/0457-000-Lumineon.gif
diff --git a/src/canonical/models/front-shiny/0458--000--Mantyke.gif b/src/canonical/models/front-shiny/0458-000-Mantyke.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0458--000--Mantyke.gif
rename to src/canonical/models/front-shiny/0458-000-Mantyke.gif
diff --git a/src/canonical/models/front-shiny/0459--000--Snover.gif b/src/canonical/models/front-shiny/0459-000-Snover.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0459--000--Snover.gif
rename to src/canonical/models/front-shiny/0459-000-Snover.gif
diff --git a/src/canonical/models/front-shiny/0460--000--Abomasnow.gif b/src/canonical/models/front-shiny/0460-000-Abomasnow.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0460--000--Abomasnow.gif
rename to src/canonical/models/front-shiny/0460-000-Abomasnow.gif
diff --git a/src/canonical/models/front-shiny/0460--420--Abomasnow--Mega.gif b/src/canonical/models/front-shiny/0460-420-Abomasnow-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0460--420--Abomasnow--Mega.gif
rename to src/canonical/models/front-shiny/0460-420-Abomasnow-Mega.gif
diff --git a/src/canonical/models/front-shiny/0461--000--Weavile.gif b/src/canonical/models/front-shiny/0461-000-Weavile.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0461--000--Weavile.gif
rename to src/canonical/models/front-shiny/0461-000-Weavile.gif
diff --git a/src/canonical/models/front-shiny/0462--000--Magnezone.gif b/src/canonical/models/front-shiny/0462-000-Magnezone.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0462--000--Magnezone.gif
rename to src/canonical/models/front-shiny/0462-000-Magnezone.gif
diff --git a/src/canonical/models/front-shiny/0463--000--Lickilicky.gif b/src/canonical/models/front-shiny/0463-000-Lickilicky.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0463--000--Lickilicky.gif
rename to src/canonical/models/front-shiny/0463-000-Lickilicky.gif
diff --git a/src/canonical/models/front-shiny/0464--000--Rhyperior.gif b/src/canonical/models/front-shiny/0464-000-Rhyperior.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0464--000--Rhyperior.gif
rename to src/canonical/models/front-shiny/0464-000-Rhyperior.gif
diff --git a/src/canonical/models/front-shiny/0465--000--Tangrowth.gif b/src/canonical/models/front-shiny/0465-000-Tangrowth.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0465--000--Tangrowth.gif
rename to src/canonical/models/front-shiny/0465-000-Tangrowth.gif
diff --git a/src/canonical/models/front-shiny/0466--000--Electivire.gif b/src/canonical/models/front-shiny/0466-000-Electivire.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0466--000--Electivire.gif
rename to src/canonical/models/front-shiny/0466-000-Electivire.gif
diff --git a/src/canonical/models/front-shiny/0467--000--Magmortar.gif b/src/canonical/models/front-shiny/0467-000-Magmortar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0467--000--Magmortar.gif
rename to src/canonical/models/front-shiny/0467-000-Magmortar.gif
diff --git a/src/canonical/models/front-shiny/0468--000--Togekiss.gif b/src/canonical/models/front-shiny/0468-000-Togekiss.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0468--000--Togekiss.gif
rename to src/canonical/models/front-shiny/0468-000-Togekiss.gif
diff --git a/src/canonical/models/front-shiny/0469--000--Yanmega.gif b/src/canonical/models/front-shiny/0469-000-Yanmega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0469--000--Yanmega.gif
rename to src/canonical/models/front-shiny/0469-000-Yanmega.gif
diff --git a/src/canonical/models/front-shiny/0470--000--Leafeon.gif b/src/canonical/models/front-shiny/0470-000-Leafeon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0470--000--Leafeon.gif
rename to src/canonical/models/front-shiny/0470-000-Leafeon.gif
diff --git a/src/canonical/models/front-shiny/0471--000--Glaceon.gif b/src/canonical/models/front-shiny/0471-000-Glaceon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0471--000--Glaceon.gif
rename to src/canonical/models/front-shiny/0471-000-Glaceon.gif
diff --git a/src/canonical/models/front-shiny/0472--000--Gliscor.gif b/src/canonical/models/front-shiny/0472-000-Gliscor.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0472--000--Gliscor.gif
rename to src/canonical/models/front-shiny/0472-000-Gliscor.gif
diff --git a/src/canonical/models/front-shiny/0473--000--Mamoswine.gif b/src/canonical/models/front-shiny/0473-000-Mamoswine.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0473--000--Mamoswine.gif
rename to src/canonical/models/front-shiny/0473-000-Mamoswine.gif
diff --git a/src/canonical/models/front-shiny/0474--000--Porygon-Z.gif b/src/canonical/models/front-shiny/0474-000-Porygon~Z.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0474--000--Porygon-Z.gif
rename to src/canonical/models/front-shiny/0474-000-Porygon~Z.gif
diff --git a/src/canonical/models/front-shiny/0475--000--Gallade.gif b/src/canonical/models/front-shiny/0475-000-Gallade.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0475--000--Gallade.gif
rename to src/canonical/models/front-shiny/0475-000-Gallade.gif
diff --git a/src/canonical/models/front-shiny/0475--420--Gallade--Mega.gif b/src/canonical/models/front-shiny/0475-420-Gallade-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0475--420--Gallade--Mega.gif
rename to src/canonical/models/front-shiny/0475-420-Gallade-Mega.gif
diff --git a/src/canonical/models/front-shiny/0476--000--Probopass.gif b/src/canonical/models/front-shiny/0476-000-Probopass.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0476--000--Probopass.gif
rename to src/canonical/models/front-shiny/0476-000-Probopass.gif
diff --git a/src/canonical/models/front-shiny/0477--000--Dusknoir.gif b/src/canonical/models/front-shiny/0477-000-Dusknoir.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0477--000--Dusknoir.gif
rename to src/canonical/models/front-shiny/0477-000-Dusknoir.gif
diff --git a/src/canonical/models/front-shiny/0478--000--Froslass.gif b/src/canonical/models/front-shiny/0478-000-Froslass.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0478--000--Froslass.gif
rename to src/canonical/models/front-shiny/0478-000-Froslass.gif
diff --git a/src/canonical/models/front-shiny/0479--000--Rotom.gif b/src/canonical/models/front-shiny/0479-000-Rotom.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0479--000--Rotom.gif
rename to src/canonical/models/front-shiny/0479-000-Rotom.gif
diff --git a/src/canonical/models/front-shiny/0479--420--Rotom--Fan.gif b/src/canonical/models/front-shiny/0479-420-Rotom-Fan.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0479--420--Rotom--Fan.gif
rename to src/canonical/models/front-shiny/0479-420-Rotom-Fan.gif
diff --git a/src/canonical/models/front-shiny/0479--420--Rotom--Frost.gif b/src/canonical/models/front-shiny/0479-420-Rotom-Frost.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0479--420--Rotom--Frost.gif
rename to src/canonical/models/front-shiny/0479-420-Rotom-Frost.gif
diff --git a/src/canonical/models/front-shiny/0479--420--Rotom--Heat.gif b/src/canonical/models/front-shiny/0479-420-Rotom-Heat.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0479--420--Rotom--Heat.gif
rename to src/canonical/models/front-shiny/0479-420-Rotom-Heat.gif
diff --git a/src/canonical/models/front-shiny/0479--420--Rotom--Mow.gif b/src/canonical/models/front-shiny/0479-420-Rotom-Mow.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0479--420--Rotom--Mow.gif
rename to src/canonical/models/front-shiny/0479-420-Rotom-Mow.gif
diff --git a/src/canonical/models/front-shiny/0479--420--Rotom--Wash.gif b/src/canonical/models/front-shiny/0479-420-Rotom-Wash.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0479--420--Rotom--Wash.gif
rename to src/canonical/models/front-shiny/0479-420-Rotom-Wash.gif
diff --git a/src/canonical/models/front-shiny/0480--000--Uxie.gif b/src/canonical/models/front-shiny/0480-000-Uxie.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0480--000--Uxie.gif
rename to src/canonical/models/front-shiny/0480-000-Uxie.gif
diff --git a/src/canonical/models/front-shiny/0481--000--Mesprit.gif b/src/canonical/models/front-shiny/0481-000-Mesprit.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0481--000--Mesprit.gif
rename to src/canonical/models/front-shiny/0481-000-Mesprit.gif
diff --git a/src/canonical/models/front-shiny/0482--000--Azelf.gif b/src/canonical/models/front-shiny/0482-000-Azelf.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0482--000--Azelf.gif
rename to src/canonical/models/front-shiny/0482-000-Azelf.gif
diff --git a/src/canonical/models/front-shiny/0483--000--Dialga.gif b/src/canonical/models/front-shiny/0483-000-Dialga.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0483--000--Dialga.gif
rename to src/canonical/models/front-shiny/0483-000-Dialga.gif
diff --git a/src/canonical/models/front-shiny/0484--000--Palkia.gif b/src/canonical/models/front-shiny/0484-000-Palkia.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0484--000--Palkia.gif
rename to src/canonical/models/front-shiny/0484-000-Palkia.gif
diff --git a/src/canonical/models/front-shiny/0485--000--Heatran.gif b/src/canonical/models/front-shiny/0485-000-Heatran.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0485--000--Heatran.gif
rename to src/canonical/models/front-shiny/0485-000-Heatran.gif
diff --git a/src/canonical/models/front-shiny/0486--000--Regigigas.gif b/src/canonical/models/front-shiny/0486-000-Regigigas.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0486--000--Regigigas.gif
rename to src/canonical/models/front-shiny/0486-000-Regigigas.gif
diff --git a/src/canonical/models/front-shiny/0487--000--Giratina.gif b/src/canonical/models/front-shiny/0487-000-Giratina.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0487--000--Giratina.gif
rename to src/canonical/models/front-shiny/0487-000-Giratina.gif
diff --git a/src/canonical/models/front-shiny/0487--420--Giratina--Origin.gif b/src/canonical/models/front-shiny/0487-420-Giratina-Origin.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0487--420--Giratina--Origin.gif
rename to src/canonical/models/front-shiny/0487-420-Giratina-Origin.gif
diff --git a/src/canonical/models/front-shiny/0488--000--Cresselia.gif b/src/canonical/models/front-shiny/0488-000-Cresselia.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0488--000--Cresselia.gif
rename to src/canonical/models/front-shiny/0488-000-Cresselia.gif
diff --git a/src/canonical/models/front-shiny/0489--000--Phione.gif b/src/canonical/models/front-shiny/0489-000-Phione.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0489--000--Phione.gif
rename to src/canonical/models/front-shiny/0489-000-Phione.gif
diff --git a/src/canonical/models/front-shiny/0490--000--Manaphy.gif b/src/canonical/models/front-shiny/0490-000-Manaphy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0490--000--Manaphy.gif
rename to src/canonical/models/front-shiny/0490-000-Manaphy.gif
diff --git a/src/canonical/models/front-shiny/0491--000--Darkrai.gif b/src/canonical/models/front-shiny/0491-000-Darkrai.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0491--000--Darkrai.gif
rename to src/canonical/models/front-shiny/0491-000-Darkrai.gif
diff --git a/src/canonical/models/front-shiny/0492--000--Shaymin.gif b/src/canonical/models/front-shiny/0492-000-Shaymin.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0492--000--Shaymin.gif
rename to src/canonical/models/front-shiny/0492-000-Shaymin.gif
diff --git a/src/canonical/models/front-shiny/0492--420--Shaymin--Sky.gif b/src/canonical/models/front-shiny/0492-420-Shaymin-Sky.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0492--420--Shaymin--Sky.gif
rename to src/canonical/models/front-shiny/0492-420-Shaymin-Sky.gif
diff --git a/src/canonical/models/front-shiny/0493--000--Arceus.gif b/src/canonical/models/front-shiny/0493-000-Arceus.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--000--Arceus.gif
rename to src/canonical/models/front-shiny/0493-000-Arceus.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Bug.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Bug.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Bug.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Bug.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Dark.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Dark.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Dark.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Dark.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Dragon.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Dragon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Dragon.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Dragon.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Electric.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Electric.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Electric.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Electric.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Fairy.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Fairy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Fairy.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Fairy.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Fighting.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Fighting.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Fighting.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Fighting.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Fire.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Fire.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Fire.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Fire.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Flying.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Flying.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Flying.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Flying.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Ghost.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Ghost.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Ghost.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Ghost.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Grass.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Grass.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Grass.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Grass.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Ground.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Ground.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Ground.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Ground.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Ice.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Ice.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Ice.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Ice.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Poison.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Poison.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Poison.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Poison.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Psychic.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Psychic.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Psychic.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Psychic.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Rock.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Rock.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Rock.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Rock.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Steel.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Steel.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Steel.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Steel.gif
diff --git a/src/canonical/models/front-shiny/0493--420--Arceus--Water.gif b/src/canonical/models/front-shiny/0493-420-Arceus-Water.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0493--420--Arceus--Water.gif
rename to src/canonical/models/front-shiny/0493-420-Arceus-Water.gif
diff --git a/src/canonical/models/front-shiny/0494--000--Victini.gif b/src/canonical/models/front-shiny/0494-000-Victini.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0494--000--Victini.gif
rename to src/canonical/models/front-shiny/0494-000-Victini.gif
diff --git a/src/canonical/models/front-shiny/0495--000--Snivy.gif b/src/canonical/models/front-shiny/0495-000-Snivy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0495--000--Snivy.gif
rename to src/canonical/models/front-shiny/0495-000-Snivy.gif
diff --git a/src/canonical/models/front-shiny/0496--000--Servine.gif b/src/canonical/models/front-shiny/0496-000-Servine.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0496--000--Servine.gif
rename to src/canonical/models/front-shiny/0496-000-Servine.gif
diff --git a/src/canonical/models/front-shiny/0497--000--Serperior.gif b/src/canonical/models/front-shiny/0497-000-Serperior.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0497--000--Serperior.gif
rename to src/canonical/models/front-shiny/0497-000-Serperior.gif
diff --git a/src/canonical/models/front-shiny/0498--000--Tepig.gif b/src/canonical/models/front-shiny/0498-000-Tepig.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0498--000--Tepig.gif
rename to src/canonical/models/front-shiny/0498-000-Tepig.gif
diff --git a/src/canonical/models/front-shiny/0499--000--Pignite.gif b/src/canonical/models/front-shiny/0499-000-Pignite.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0499--000--Pignite.gif
rename to src/canonical/models/front-shiny/0499-000-Pignite.gif
diff --git a/src/canonical/models/front-shiny/0500--000--Emboar.gif b/src/canonical/models/front-shiny/0500-000-Emboar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0500--000--Emboar.gif
rename to src/canonical/models/front-shiny/0500-000-Emboar.gif
diff --git a/src/canonical/models/front-shiny/0501--000--Oshawott.gif b/src/canonical/models/front-shiny/0501-000-Oshawott.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0501--000--Oshawott.gif
rename to src/canonical/models/front-shiny/0501-000-Oshawott.gif
diff --git a/src/canonical/models/front-shiny/0502--000--Dewott.gif b/src/canonical/models/front-shiny/0502-000-Dewott.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0502--000--Dewott.gif
rename to src/canonical/models/front-shiny/0502-000-Dewott.gif
diff --git a/src/canonical/models/front-shiny/0503--000--Samurott.gif b/src/canonical/models/front-shiny/0503-000-Samurott.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0503--000--Samurott.gif
rename to src/canonical/models/front-shiny/0503-000-Samurott.gif
diff --git a/src/canonical/models/front-shiny/0504--000--Patrat.gif b/src/canonical/models/front-shiny/0504-000-Patrat.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0504--000--Patrat.gif
rename to src/canonical/models/front-shiny/0504-000-Patrat.gif
diff --git a/src/canonical/models/front-shiny/0505--000--Watchog.gif b/src/canonical/models/front-shiny/0505-000-Watchog.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0505--000--Watchog.gif
rename to src/canonical/models/front-shiny/0505-000-Watchog.gif
diff --git a/src/canonical/models/front-shiny/0506--000--Lillipup.gif b/src/canonical/models/front-shiny/0506-000-Lillipup.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0506--000--Lillipup.gif
rename to src/canonical/models/front-shiny/0506-000-Lillipup.gif
diff --git a/src/canonical/models/front-shiny/0507--000--Herdier.gif b/src/canonical/models/front-shiny/0507-000-Herdier.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0507--000--Herdier.gif
rename to src/canonical/models/front-shiny/0507-000-Herdier.gif
diff --git a/src/canonical/models/front-shiny/0508--000--Stoutland.gif b/src/canonical/models/front-shiny/0508-000-Stoutland.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0508--000--Stoutland.gif
rename to src/canonical/models/front-shiny/0508-000-Stoutland.gif
diff --git a/src/canonical/models/front-shiny/0509--000--Purrloin.gif b/src/canonical/models/front-shiny/0509-000-Purrloin.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0509--000--Purrloin.gif
rename to src/canonical/models/front-shiny/0509-000-Purrloin.gif
diff --git a/src/canonical/models/front-shiny/0510--000--Liepard.gif b/src/canonical/models/front-shiny/0510-000-Liepard.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0510--000--Liepard.gif
rename to src/canonical/models/front-shiny/0510-000-Liepard.gif
diff --git a/src/canonical/models/front-shiny/0511--000--Pansage.gif b/src/canonical/models/front-shiny/0511-000-Pansage.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0511--000--Pansage.gif
rename to src/canonical/models/front-shiny/0511-000-Pansage.gif
diff --git a/src/canonical/models/front-shiny/0512--000--Simisage.gif b/src/canonical/models/front-shiny/0512-000-Simisage.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0512--000--Simisage.gif
rename to src/canonical/models/front-shiny/0512-000-Simisage.gif
diff --git a/src/canonical/models/front-shiny/0513--000--Pansear.gif b/src/canonical/models/front-shiny/0513-000-Pansear.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0513--000--Pansear.gif
rename to src/canonical/models/front-shiny/0513-000-Pansear.gif
diff --git a/src/canonical/models/front-shiny/0514--000--Simisear.gif b/src/canonical/models/front-shiny/0514-000-Simisear.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0514--000--Simisear.gif
rename to src/canonical/models/front-shiny/0514-000-Simisear.gif
diff --git a/src/canonical/models/front-shiny/0515--000--Panpour.gif b/src/canonical/models/front-shiny/0515-000-Panpour.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0515--000--Panpour.gif
rename to src/canonical/models/front-shiny/0515-000-Panpour.gif
diff --git a/src/canonical/models/front-shiny/0516--000--Simipour.gif b/src/canonical/models/front-shiny/0516-000-Simipour.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0516--000--Simipour.gif
rename to src/canonical/models/front-shiny/0516-000-Simipour.gif
diff --git a/src/canonical/models/front-shiny/0517--000--Munna.gif b/src/canonical/models/front-shiny/0517-000-Munna.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0517--000--Munna.gif
rename to src/canonical/models/front-shiny/0517-000-Munna.gif
diff --git a/src/canonical/models/front-shiny/0518--000--Musharna.gif b/src/canonical/models/front-shiny/0518-000-Musharna.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0518--000--Musharna.gif
rename to src/canonical/models/front-shiny/0518-000-Musharna.gif
diff --git a/src/canonical/models/front-shiny/0519--000--Pidove.gif b/src/canonical/models/front-shiny/0519-000-Pidove.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0519--000--Pidove.gif
rename to src/canonical/models/front-shiny/0519-000-Pidove.gif
diff --git a/src/canonical/models/front-shiny/0520--000--Tranquill.gif b/src/canonical/models/front-shiny/0520-000-Tranquill.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0520--000--Tranquill.gif
rename to src/canonical/models/front-shiny/0520-000-Tranquill.gif
diff --git a/src/canonical/models/front-shiny/0521--000--Unfezant.gif b/src/canonical/models/front-shiny/0521-000-Unfezant.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0521--000--Unfezant.gif
rename to src/canonical/models/front-shiny/0521-000-Unfezant.gif
diff --git a/src/canonical/models/front-shiny/0522--000--Blitzle.gif b/src/canonical/models/front-shiny/0522-000-Blitzle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0522--000--Blitzle.gif
rename to src/canonical/models/front-shiny/0522-000-Blitzle.gif
diff --git a/src/canonical/models/front-shiny/0523--000--Zebstrika.gif b/src/canonical/models/front-shiny/0523-000-Zebstrika.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0523--000--Zebstrika.gif
rename to src/canonical/models/front-shiny/0523-000-Zebstrika.gif
diff --git a/src/canonical/models/front-shiny/0524--000--Roggenrola.gif b/src/canonical/models/front-shiny/0524-000-Roggenrola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0524--000--Roggenrola.gif
rename to src/canonical/models/front-shiny/0524-000-Roggenrola.gif
diff --git a/src/canonical/models/front-shiny/0525--000--Boldore.gif b/src/canonical/models/front-shiny/0525-000-Boldore.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0525--000--Boldore.gif
rename to src/canonical/models/front-shiny/0525-000-Boldore.gif
diff --git a/src/canonical/models/front-shiny/0526--000--Gigalith.gif b/src/canonical/models/front-shiny/0526-000-Gigalith.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0526--000--Gigalith.gif
rename to src/canonical/models/front-shiny/0526-000-Gigalith.gif
diff --git a/src/canonical/models/front-shiny/0527--000--Woobat.gif b/src/canonical/models/front-shiny/0527-000-Woobat.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0527--000--Woobat.gif
rename to src/canonical/models/front-shiny/0527-000-Woobat.gif
diff --git a/src/canonical/models/front-shiny/0528--000--Swoobat.gif b/src/canonical/models/front-shiny/0528-000-Swoobat.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0528--000--Swoobat.gif
rename to src/canonical/models/front-shiny/0528-000-Swoobat.gif
diff --git a/src/canonical/models/front-shiny/0529--000--Drilbur.gif b/src/canonical/models/front-shiny/0529-000-Drilbur.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0529--000--Drilbur.gif
rename to src/canonical/models/front-shiny/0529-000-Drilbur.gif
diff --git a/src/canonical/models/front-shiny/0530--000--Excadrill.gif b/src/canonical/models/front-shiny/0530-000-Excadrill.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0530--000--Excadrill.gif
rename to src/canonical/models/front-shiny/0530-000-Excadrill.gif
diff --git a/src/canonical/models/front-shiny/0531--000--Audino.gif b/src/canonical/models/front-shiny/0531-000-Audino.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0531--000--Audino.gif
rename to src/canonical/models/front-shiny/0531-000-Audino.gif
diff --git a/src/canonical/models/front-shiny/0531--420--Audino--Mega.gif b/src/canonical/models/front-shiny/0531-420-Audino-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0531--420--Audino--Mega.gif
rename to src/canonical/models/front-shiny/0531-420-Audino-Mega.gif
diff --git a/src/canonical/models/front-shiny/0532--000--Timburr.gif b/src/canonical/models/front-shiny/0532-000-Timburr.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0532--000--Timburr.gif
rename to src/canonical/models/front-shiny/0532-000-Timburr.gif
diff --git a/src/canonical/models/front-shiny/0533--000--Gurdurr.gif b/src/canonical/models/front-shiny/0533-000-Gurdurr.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0533--000--Gurdurr.gif
rename to src/canonical/models/front-shiny/0533-000-Gurdurr.gif
diff --git a/src/canonical/models/front-shiny/0534--000--Conkeldurr.gif b/src/canonical/models/front-shiny/0534-000-Conkeldurr.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0534--000--Conkeldurr.gif
rename to src/canonical/models/front-shiny/0534-000-Conkeldurr.gif
diff --git a/src/canonical/models/front-shiny/0535--000--Tympole.gif b/src/canonical/models/front-shiny/0535-000-Tympole.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0535--000--Tympole.gif
rename to src/canonical/models/front-shiny/0535-000-Tympole.gif
diff --git a/src/canonical/models/front-shiny/0536--000--Palpitoad.gif b/src/canonical/models/front-shiny/0536-000-Palpitoad.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0536--000--Palpitoad.gif
rename to src/canonical/models/front-shiny/0536-000-Palpitoad.gif
diff --git a/src/canonical/models/front-shiny/0537--000--Seismitoad.gif b/src/canonical/models/front-shiny/0537-000-Seismitoad.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0537--000--Seismitoad.gif
rename to src/canonical/models/front-shiny/0537-000-Seismitoad.gif
diff --git a/src/canonical/models/front-shiny/0538--000--Throh.gif b/src/canonical/models/front-shiny/0538-000-Throh.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0538--000--Throh.gif
rename to src/canonical/models/front-shiny/0538-000-Throh.gif
diff --git a/src/canonical/models/front-shiny/0539--000--Sawk.gif b/src/canonical/models/front-shiny/0539-000-Sawk.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0539--000--Sawk.gif
rename to src/canonical/models/front-shiny/0539-000-Sawk.gif
diff --git a/src/canonical/models/front-shiny/0540--000--Sewaddle.gif b/src/canonical/models/front-shiny/0540-000-Sewaddle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0540--000--Sewaddle.gif
rename to src/canonical/models/front-shiny/0540-000-Sewaddle.gif
diff --git a/src/canonical/models/front-shiny/0541--000--Swadloon.gif b/src/canonical/models/front-shiny/0541-000-Swadloon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0541--000--Swadloon.gif
rename to src/canonical/models/front-shiny/0541-000-Swadloon.gif
diff --git a/src/canonical/models/front-shiny/0542--000--Leavanny.gif b/src/canonical/models/front-shiny/0542-000-Leavanny.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0542--000--Leavanny.gif
rename to src/canonical/models/front-shiny/0542-000-Leavanny.gif
diff --git a/src/canonical/models/front-shiny/0543--000--Venipede.gif b/src/canonical/models/front-shiny/0543-000-Venipede.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0543--000--Venipede.gif
rename to src/canonical/models/front-shiny/0543-000-Venipede.gif
diff --git a/src/canonical/models/front-shiny/0544--000--Whirlipede.gif b/src/canonical/models/front-shiny/0544-000-Whirlipede.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0544--000--Whirlipede.gif
rename to src/canonical/models/front-shiny/0544-000-Whirlipede.gif
diff --git a/src/canonical/models/front-shiny/0545--000--Scolipede.gif b/src/canonical/models/front-shiny/0545-000-Scolipede.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0545--000--Scolipede.gif
rename to src/canonical/models/front-shiny/0545-000-Scolipede.gif
diff --git a/src/canonical/models/front-shiny/0546--000--Cottonee.gif b/src/canonical/models/front-shiny/0546-000-Cottonee.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0546--000--Cottonee.gif
rename to src/canonical/models/front-shiny/0546-000-Cottonee.gif
diff --git a/src/canonical/models/front-shiny/0547--000--Whimsicott.gif b/src/canonical/models/front-shiny/0547-000-Whimsicott.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0547--000--Whimsicott.gif
rename to src/canonical/models/front-shiny/0547-000-Whimsicott.gif
diff --git a/src/canonical/models/front-shiny/0548--000--Petilil.gif b/src/canonical/models/front-shiny/0548-000-Petilil.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0548--000--Petilil.gif
rename to src/canonical/models/front-shiny/0548-000-Petilil.gif
diff --git a/src/canonical/models/front-shiny/0549--000--Lilligant.gif b/src/canonical/models/front-shiny/0549-000-Lilligant.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0549--000--Lilligant.gif
rename to src/canonical/models/front-shiny/0549-000-Lilligant.gif
diff --git a/src/canonical/models/front-shiny/0550--000--Basculin.gif b/src/canonical/models/front-shiny/0550-000-Basculin.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0550--000--Basculin.gif
rename to src/canonical/models/front-shiny/0550-000-Basculin.gif
diff --git a/src/canonical/models/front-shiny/0550--420--Basculin--Blue-Striped.gif b/src/canonical/models/front-shiny/0550-420-Basculin-Blue~Striped.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0550--420--Basculin--Blue-Striped.gif
rename to src/canonical/models/front-shiny/0550-420-Basculin-Blue~Striped.gif
diff --git a/src/canonical/models/front-shiny/0551--000--Sandile.gif b/src/canonical/models/front-shiny/0551-000-Sandile.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0551--000--Sandile.gif
rename to src/canonical/models/front-shiny/0551-000-Sandile.gif
diff --git a/src/canonical/models/front-shiny/0552--000--Krokorok.gif b/src/canonical/models/front-shiny/0552-000-Krokorok.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0552--000--Krokorok.gif
rename to src/canonical/models/front-shiny/0552-000-Krokorok.gif
diff --git a/src/canonical/models/front-shiny/0553--000--Krookodile.gif b/src/canonical/models/front-shiny/0553-000-Krookodile.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0553--000--Krookodile.gif
rename to src/canonical/models/front-shiny/0553-000-Krookodile.gif
diff --git a/src/canonical/models/front-shiny/0554--000--Darumaka.gif b/src/canonical/models/front-shiny/0554-000-Darumaka.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0554--000--Darumaka.gif
rename to src/canonical/models/front-shiny/0554-000-Darumaka.gif
diff --git a/src/canonical/models/front-shiny/0554--420--Darumaka--Galar.gif b/src/canonical/models/front-shiny/0554-420-Darumaka-Galar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0554--420--Darumaka--Galar.gif
rename to src/canonical/models/front-shiny/0554-420-Darumaka-Galar.gif
diff --git a/src/canonical/models/front-shiny/0555--000--Darmanitan.gif b/src/canonical/models/front-shiny/0555-000-Darmanitan.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0555--000--Darmanitan.gif
rename to src/canonical/models/front-shiny/0555-000-Darmanitan.gif
diff --git a/src/canonical/models/front-shiny/0555--420--Darmanitan--Galar.gif b/src/canonical/models/front-shiny/0555-420-Darmanitan-Galar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0555--420--Darmanitan--Galar.gif
rename to src/canonical/models/front-shiny/0555-420-Darmanitan-Galar.gif
diff --git a/src/canonical/models/front-shiny/0555--420--Darmanitan--Galar-Zen.gif b/src/canonical/models/front-shiny/0555-420-Darmanitan-Galar~Zen.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0555--420--Darmanitan--Galar-Zen.gif
rename to src/canonical/models/front-shiny/0555-420-Darmanitan-Galar~Zen.gif
diff --git a/src/canonical/models/front-shiny/0555--420--Darmanitan--Zen.gif b/src/canonical/models/front-shiny/0555-420-Darmanitan-Zen.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0555--420--Darmanitan--Zen.gif
rename to src/canonical/models/front-shiny/0555-420-Darmanitan-Zen.gif
diff --git a/src/canonical/models/front-shiny/0556--000--Maractus.gif b/src/canonical/models/front-shiny/0556-000-Maractus.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0556--000--Maractus.gif
rename to src/canonical/models/front-shiny/0556-000-Maractus.gif
diff --git a/src/canonical/models/front-shiny/0557--000--Dwebble.gif b/src/canonical/models/front-shiny/0557-000-Dwebble.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0557--000--Dwebble.gif
rename to src/canonical/models/front-shiny/0557-000-Dwebble.gif
diff --git a/src/canonical/models/front-shiny/0558--000--Crustle.gif b/src/canonical/models/front-shiny/0558-000-Crustle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0558--000--Crustle.gif
rename to src/canonical/models/front-shiny/0558-000-Crustle.gif
diff --git a/src/canonical/models/front-shiny/0559--000--Scraggy.gif b/src/canonical/models/front-shiny/0559-000-Scraggy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0559--000--Scraggy.gif
rename to src/canonical/models/front-shiny/0559-000-Scraggy.gif
diff --git a/src/canonical/models/front-shiny/0560--000--Scrafty.gif b/src/canonical/models/front-shiny/0560-000-Scrafty.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0560--000--Scrafty.gif
rename to src/canonical/models/front-shiny/0560-000-Scrafty.gif
diff --git a/src/canonical/models/front-shiny/0561--000--Sigilyph.gif b/src/canonical/models/front-shiny/0561-000-Sigilyph.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0561--000--Sigilyph.gif
rename to src/canonical/models/front-shiny/0561-000-Sigilyph.gif
diff --git a/src/canonical/models/front-shiny/0562--000--Yamask.gif b/src/canonical/models/front-shiny/0562-000-Yamask.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0562--000--Yamask.gif
rename to src/canonical/models/front-shiny/0562-000-Yamask.gif
diff --git a/src/canonical/models/front-shiny/0562--420--Yamask--Galar.gif b/src/canonical/models/front-shiny/0562-420-Yamask-Galar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0562--420--Yamask--Galar.gif
rename to src/canonical/models/front-shiny/0562-420-Yamask-Galar.gif
diff --git a/src/canonical/models/front-shiny/0563--000--Cofagrigus.gif b/src/canonical/models/front-shiny/0563-000-Cofagrigus.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0563--000--Cofagrigus.gif
rename to src/canonical/models/front-shiny/0563-000-Cofagrigus.gif
diff --git a/src/canonical/models/front-shiny/0564--000--Tirtouga.gif b/src/canonical/models/front-shiny/0564-000-Tirtouga.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0564--000--Tirtouga.gif
rename to src/canonical/models/front-shiny/0564-000-Tirtouga.gif
diff --git a/src/canonical/models/front-shiny/0565--000--Carracosta.gif b/src/canonical/models/front-shiny/0565-000-Carracosta.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0565--000--Carracosta.gif
rename to src/canonical/models/front-shiny/0565-000-Carracosta.gif
diff --git a/src/canonical/models/front-shiny/0566--000--Archen.gif b/src/canonical/models/front-shiny/0566-000-Archen.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0566--000--Archen.gif
rename to src/canonical/models/front-shiny/0566-000-Archen.gif
diff --git a/src/canonical/models/front-shiny/0567--000--Archeops.gif b/src/canonical/models/front-shiny/0567-000-Archeops.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0567--000--Archeops.gif
rename to src/canonical/models/front-shiny/0567-000-Archeops.gif
diff --git a/src/canonical/models/front-shiny/0568--000--Trubbish.gif b/src/canonical/models/front-shiny/0568-000-Trubbish.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0568--000--Trubbish.gif
rename to src/canonical/models/front-shiny/0568-000-Trubbish.gif
diff --git a/src/canonical/models/front-shiny/0569--000--Garbodor.gif b/src/canonical/models/front-shiny/0569-000-Garbodor.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0569--000--Garbodor.gif
rename to src/canonical/models/front-shiny/0569-000-Garbodor.gif
diff --git a/src/canonical/models/front-shiny/0569--420--Garbodor--Gmax.gif b/src/canonical/models/front-shiny/0569-420-Garbodor-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0569--420--Garbodor--Gmax.gif
rename to src/canonical/models/front-shiny/0569-420-Garbodor-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0570--000--Zorua.gif b/src/canonical/models/front-shiny/0570-000-Zorua.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0570--000--Zorua.gif
rename to src/canonical/models/front-shiny/0570-000-Zorua.gif
diff --git a/src/canonical/models/front-shiny/0571--000--Zoroark.gif b/src/canonical/models/front-shiny/0571-000-Zoroark.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0571--000--Zoroark.gif
rename to src/canonical/models/front-shiny/0571-000-Zoroark.gif
diff --git a/src/canonical/models/front-shiny/0572--000--Minccino.gif b/src/canonical/models/front-shiny/0572-000-Minccino.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0572--000--Minccino.gif
rename to src/canonical/models/front-shiny/0572-000-Minccino.gif
diff --git a/src/canonical/models/front-shiny/0573--000--Cinccino.gif b/src/canonical/models/front-shiny/0573-000-Cinccino.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0573--000--Cinccino.gif
rename to src/canonical/models/front-shiny/0573-000-Cinccino.gif
diff --git a/src/canonical/models/front-shiny/0574--000--Gothita.gif b/src/canonical/models/front-shiny/0574-000-Gothita.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0574--000--Gothita.gif
rename to src/canonical/models/front-shiny/0574-000-Gothita.gif
diff --git a/src/canonical/models/front-shiny/0575--000--Gothorita.gif b/src/canonical/models/front-shiny/0575-000-Gothorita.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0575--000--Gothorita.gif
rename to src/canonical/models/front-shiny/0575-000-Gothorita.gif
diff --git a/src/canonical/models/front-shiny/0576--000--Gothitelle.gif b/src/canonical/models/front-shiny/0576-000-Gothitelle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0576--000--Gothitelle.gif
rename to src/canonical/models/front-shiny/0576-000-Gothitelle.gif
diff --git a/src/canonical/models/front-shiny/0577--000--Solosis.gif b/src/canonical/models/front-shiny/0577-000-Solosis.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0577--000--Solosis.gif
rename to src/canonical/models/front-shiny/0577-000-Solosis.gif
diff --git a/src/canonical/models/front-shiny/0578--000--Duosion.gif b/src/canonical/models/front-shiny/0578-000-Duosion.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0578--000--Duosion.gif
rename to src/canonical/models/front-shiny/0578-000-Duosion.gif
diff --git a/src/canonical/models/front-shiny/0579--000--Reuniclus.gif b/src/canonical/models/front-shiny/0579-000-Reuniclus.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0579--000--Reuniclus.gif
rename to src/canonical/models/front-shiny/0579-000-Reuniclus.gif
diff --git a/src/canonical/models/front-shiny/0580--000--Ducklett.gif b/src/canonical/models/front-shiny/0580-000-Ducklett.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0580--000--Ducklett.gif
rename to src/canonical/models/front-shiny/0580-000-Ducklett.gif
diff --git a/src/canonical/models/front-shiny/0581--000--Swanna.gif b/src/canonical/models/front-shiny/0581-000-Swanna.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0581--000--Swanna.gif
rename to src/canonical/models/front-shiny/0581-000-Swanna.gif
diff --git a/src/canonical/models/front-shiny/0582--000--Vanillite.gif b/src/canonical/models/front-shiny/0582-000-Vanillite.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0582--000--Vanillite.gif
rename to src/canonical/models/front-shiny/0582-000-Vanillite.gif
diff --git a/src/canonical/models/front-shiny/0583--000--Vanillish.gif b/src/canonical/models/front-shiny/0583-000-Vanillish.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0583--000--Vanillish.gif
rename to src/canonical/models/front-shiny/0583-000-Vanillish.gif
diff --git a/src/canonical/models/front-shiny/0584--000--Vanilluxe.gif b/src/canonical/models/front-shiny/0584-000-Vanilluxe.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0584--000--Vanilluxe.gif
rename to src/canonical/models/front-shiny/0584-000-Vanilluxe.gif
diff --git a/src/canonical/models/front-shiny/0585--000--Deerling.gif b/src/canonical/models/front-shiny/0585-000-Deerling.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0585--000--Deerling.gif
rename to src/canonical/models/front-shiny/0585-000-Deerling.gif
diff --git a/src/canonical/models/front-shiny/0586--000--Sawsbuck.gif b/src/canonical/models/front-shiny/0586-000-Sawsbuck.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0586--000--Sawsbuck.gif
rename to src/canonical/models/front-shiny/0586-000-Sawsbuck.gif
diff --git a/src/canonical/models/front-shiny/0587--000--Emolga.gif b/src/canonical/models/front-shiny/0587-000-Emolga.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0587--000--Emolga.gif
rename to src/canonical/models/front-shiny/0587-000-Emolga.gif
diff --git a/src/canonical/models/front-shiny/0588--000--Karrablast.gif b/src/canonical/models/front-shiny/0588-000-Karrablast.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0588--000--Karrablast.gif
rename to src/canonical/models/front-shiny/0588-000-Karrablast.gif
diff --git a/src/canonical/models/front-shiny/0589--000--Escavalier.gif b/src/canonical/models/front-shiny/0589-000-Escavalier.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0589--000--Escavalier.gif
rename to src/canonical/models/front-shiny/0589-000-Escavalier.gif
diff --git a/src/canonical/models/front-shiny/0590--000--Foongus.gif b/src/canonical/models/front-shiny/0590-000-Foongus.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0590--000--Foongus.gif
rename to src/canonical/models/front-shiny/0590-000-Foongus.gif
diff --git a/src/canonical/models/front-shiny/0591--000--Amoonguss.gif b/src/canonical/models/front-shiny/0591-000-Amoonguss.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0591--000--Amoonguss.gif
rename to src/canonical/models/front-shiny/0591-000-Amoonguss.gif
diff --git a/src/canonical/models/front-shiny/0592--000--Frillish.gif b/src/canonical/models/front-shiny/0592-000-Frillish.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0592--000--Frillish.gif
rename to src/canonical/models/front-shiny/0592-000-Frillish.gif
diff --git a/src/canonical/models/front-shiny/0593--000--Jellicent.gif b/src/canonical/models/front-shiny/0593-000-Jellicent.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0593--000--Jellicent.gif
rename to src/canonical/models/front-shiny/0593-000-Jellicent.gif
diff --git a/src/canonical/models/front-shiny/0594--000--Alomomola.gif b/src/canonical/models/front-shiny/0594-000-Alomomola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0594--000--Alomomola.gif
rename to src/canonical/models/front-shiny/0594-000-Alomomola.gif
diff --git a/src/canonical/models/front-shiny/0595--000--Joltik.gif b/src/canonical/models/front-shiny/0595-000-Joltik.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0595--000--Joltik.gif
rename to src/canonical/models/front-shiny/0595-000-Joltik.gif
diff --git a/src/canonical/models/front-shiny/0596--000--Galvantula.gif b/src/canonical/models/front-shiny/0596-000-Galvantula.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0596--000--Galvantula.gif
rename to src/canonical/models/front-shiny/0596-000-Galvantula.gif
diff --git a/src/canonical/models/front-shiny/0597--000--Ferroseed.gif b/src/canonical/models/front-shiny/0597-000-Ferroseed.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0597--000--Ferroseed.gif
rename to src/canonical/models/front-shiny/0597-000-Ferroseed.gif
diff --git a/src/canonical/models/front-shiny/0598--000--Ferrothorn.gif b/src/canonical/models/front-shiny/0598-000-Ferrothorn.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0598--000--Ferrothorn.gif
rename to src/canonical/models/front-shiny/0598-000-Ferrothorn.gif
diff --git a/src/canonical/models/front-shiny/0599--000--Klink.gif b/src/canonical/models/front-shiny/0599-000-Klink.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0599--000--Klink.gif
rename to src/canonical/models/front-shiny/0599-000-Klink.gif
diff --git a/src/canonical/models/front-shiny/0600--000--Klang.gif b/src/canonical/models/front-shiny/0600-000-Klang.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0600--000--Klang.gif
rename to src/canonical/models/front-shiny/0600-000-Klang.gif
diff --git a/src/canonical/models/front-shiny/0601--000--Klinklang.gif b/src/canonical/models/front-shiny/0601-000-Klinklang.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0601--000--Klinklang.gif
rename to src/canonical/models/front-shiny/0601-000-Klinklang.gif
diff --git a/src/canonical/models/front-shiny/0602--000--Tynamo.gif b/src/canonical/models/front-shiny/0602-000-Tynamo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0602--000--Tynamo.gif
rename to src/canonical/models/front-shiny/0602-000-Tynamo.gif
diff --git a/src/canonical/models/front-shiny/0603--000--Eelektrik.gif b/src/canonical/models/front-shiny/0603-000-Eelektrik.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0603--000--Eelektrik.gif
rename to src/canonical/models/front-shiny/0603-000-Eelektrik.gif
diff --git a/src/canonical/models/front-shiny/0604--000--Eelektross.gif b/src/canonical/models/front-shiny/0604-000-Eelektross.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0604--000--Eelektross.gif
rename to src/canonical/models/front-shiny/0604-000-Eelektross.gif
diff --git a/src/canonical/models/front-shiny/0605--000--Elgyem.gif b/src/canonical/models/front-shiny/0605-000-Elgyem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0605--000--Elgyem.gif
rename to src/canonical/models/front-shiny/0605-000-Elgyem.gif
diff --git a/src/canonical/models/front-shiny/0606--000--Beheeyem.gif b/src/canonical/models/front-shiny/0606-000-Beheeyem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0606--000--Beheeyem.gif
rename to src/canonical/models/front-shiny/0606-000-Beheeyem.gif
diff --git a/src/canonical/models/front-shiny/0607--000--Litwick.gif b/src/canonical/models/front-shiny/0607-000-Litwick.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0607--000--Litwick.gif
rename to src/canonical/models/front-shiny/0607-000-Litwick.gif
diff --git a/src/canonical/models/front-shiny/0608--000--Lampent.gif b/src/canonical/models/front-shiny/0608-000-Lampent.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0608--000--Lampent.gif
rename to src/canonical/models/front-shiny/0608-000-Lampent.gif
diff --git a/src/canonical/models/front-shiny/0609--000--Chandelure.gif b/src/canonical/models/front-shiny/0609-000-Chandelure.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0609--000--Chandelure.gif
rename to src/canonical/models/front-shiny/0609-000-Chandelure.gif
diff --git a/src/canonical/models/front-shiny/0610--000--Axew.gif b/src/canonical/models/front-shiny/0610-000-Axew.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0610--000--Axew.gif
rename to src/canonical/models/front-shiny/0610-000-Axew.gif
diff --git a/src/canonical/models/front-shiny/0611--000--Fraxure.gif b/src/canonical/models/front-shiny/0611-000-Fraxure.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0611--000--Fraxure.gif
rename to src/canonical/models/front-shiny/0611-000-Fraxure.gif
diff --git a/src/canonical/models/front-shiny/0612--000--Haxorus.gif b/src/canonical/models/front-shiny/0612-000-Haxorus.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0612--000--Haxorus.gif
rename to src/canonical/models/front-shiny/0612-000-Haxorus.gif
diff --git a/src/canonical/models/front-shiny/0613--000--Cubchoo.gif b/src/canonical/models/front-shiny/0613-000-Cubchoo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0613--000--Cubchoo.gif
rename to src/canonical/models/front-shiny/0613-000-Cubchoo.gif
diff --git a/src/canonical/models/front-shiny/0614--000--Beartic.gif b/src/canonical/models/front-shiny/0614-000-Beartic.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0614--000--Beartic.gif
rename to src/canonical/models/front-shiny/0614-000-Beartic.gif
diff --git a/src/canonical/models/front-shiny/0615--000--Cryogonal.gif b/src/canonical/models/front-shiny/0615-000-Cryogonal.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0615--000--Cryogonal.gif
rename to src/canonical/models/front-shiny/0615-000-Cryogonal.gif
diff --git a/src/canonical/models/front-shiny/0616--000--Shelmet.gif b/src/canonical/models/front-shiny/0616-000-Shelmet.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0616--000--Shelmet.gif
rename to src/canonical/models/front-shiny/0616-000-Shelmet.gif
diff --git a/src/canonical/models/front-shiny/0617--000--Accelgor.gif b/src/canonical/models/front-shiny/0617-000-Accelgor.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0617--000--Accelgor.gif
rename to src/canonical/models/front-shiny/0617-000-Accelgor.gif
diff --git a/src/canonical/models/front-shiny/0618--000--Stunfisk.gif b/src/canonical/models/front-shiny/0618-000-Stunfisk.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0618--000--Stunfisk.gif
rename to src/canonical/models/front-shiny/0618-000-Stunfisk.gif
diff --git a/src/canonical/models/front-shiny/0618--420--Stunfisk--Galar.gif b/src/canonical/models/front-shiny/0618-420-Stunfisk-Galar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0618--420--Stunfisk--Galar.gif
rename to src/canonical/models/front-shiny/0618-420-Stunfisk-Galar.gif
diff --git a/src/canonical/models/front-shiny/0619--000--Mienfoo.gif b/src/canonical/models/front-shiny/0619-000-Mienfoo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0619--000--Mienfoo.gif
rename to src/canonical/models/front-shiny/0619-000-Mienfoo.gif
diff --git a/src/canonical/models/front-shiny/0620--000--Mienshao.gif b/src/canonical/models/front-shiny/0620-000-Mienshao.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0620--000--Mienshao.gif
rename to src/canonical/models/front-shiny/0620-000-Mienshao.gif
diff --git a/src/canonical/models/front-shiny/0621--000--Druddigon.gif b/src/canonical/models/front-shiny/0621-000-Druddigon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0621--000--Druddigon.gif
rename to src/canonical/models/front-shiny/0621-000-Druddigon.gif
diff --git a/src/canonical/models/front-shiny/0622--000--Golett.gif b/src/canonical/models/front-shiny/0622-000-Golett.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0622--000--Golett.gif
rename to src/canonical/models/front-shiny/0622-000-Golett.gif
diff --git a/src/canonical/models/front-shiny/0623--000--Golurk.gif b/src/canonical/models/front-shiny/0623-000-Golurk.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0623--000--Golurk.gif
rename to src/canonical/models/front-shiny/0623-000-Golurk.gif
diff --git a/src/canonical/models/front-shiny/0624--000--Pawniard.gif b/src/canonical/models/front-shiny/0624-000-Pawniard.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0624--000--Pawniard.gif
rename to src/canonical/models/front-shiny/0624-000-Pawniard.gif
diff --git a/src/canonical/models/front-shiny/0625--000--Bisharp.gif b/src/canonical/models/front-shiny/0625-000-Bisharp.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0625--000--Bisharp.gif
rename to src/canonical/models/front-shiny/0625-000-Bisharp.gif
diff --git a/src/canonical/models/front-shiny/0626--000--Bouffalant.gif b/src/canonical/models/front-shiny/0626-000-Bouffalant.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0626--000--Bouffalant.gif
rename to src/canonical/models/front-shiny/0626-000-Bouffalant.gif
diff --git a/src/canonical/models/front-shiny/0627--000--Rufflet.gif b/src/canonical/models/front-shiny/0627-000-Rufflet.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0627--000--Rufflet.gif
rename to src/canonical/models/front-shiny/0627-000-Rufflet.gif
diff --git a/src/canonical/models/front-shiny/0628--000--Braviary.gif b/src/canonical/models/front-shiny/0628-000-Braviary.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0628--000--Braviary.gif
rename to src/canonical/models/front-shiny/0628-000-Braviary.gif
diff --git a/src/canonical/models/front-shiny/0629--000--Vullaby.gif b/src/canonical/models/front-shiny/0629-000-Vullaby.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0629--000--Vullaby.gif
rename to src/canonical/models/front-shiny/0629-000-Vullaby.gif
diff --git a/src/canonical/models/front-shiny/0630--000--Mandibuzz.gif b/src/canonical/models/front-shiny/0630-000-Mandibuzz.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0630--000--Mandibuzz.gif
rename to src/canonical/models/front-shiny/0630-000-Mandibuzz.gif
diff --git a/src/canonical/models/front-shiny/0631--000--Heatmor.gif b/src/canonical/models/front-shiny/0631-000-Heatmor.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0631--000--Heatmor.gif
rename to src/canonical/models/front-shiny/0631-000-Heatmor.gif
diff --git a/src/canonical/models/front-shiny/0632--000--Durant.gif b/src/canonical/models/front-shiny/0632-000-Durant.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0632--000--Durant.gif
rename to src/canonical/models/front-shiny/0632-000-Durant.gif
diff --git a/src/canonical/models/front-shiny/0633--000--Deino.gif b/src/canonical/models/front-shiny/0633-000-Deino.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0633--000--Deino.gif
rename to src/canonical/models/front-shiny/0633-000-Deino.gif
diff --git a/src/canonical/models/front-shiny/0634--000--Zweilous.gif b/src/canonical/models/front-shiny/0634-000-Zweilous.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0634--000--Zweilous.gif
rename to src/canonical/models/front-shiny/0634-000-Zweilous.gif
diff --git a/src/canonical/models/front-shiny/0635--000--Hydreigon.gif b/src/canonical/models/front-shiny/0635-000-Hydreigon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0635--000--Hydreigon.gif
rename to src/canonical/models/front-shiny/0635-000-Hydreigon.gif
diff --git a/src/canonical/models/front-shiny/0636--000--Larvesta.gif b/src/canonical/models/front-shiny/0636-000-Larvesta.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0636--000--Larvesta.gif
rename to src/canonical/models/front-shiny/0636-000-Larvesta.gif
diff --git a/src/canonical/models/front-shiny/0637--000--Volcarona.gif b/src/canonical/models/front-shiny/0637-000-Volcarona.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0637--000--Volcarona.gif
rename to src/canonical/models/front-shiny/0637-000-Volcarona.gif
diff --git a/src/canonical/models/front-shiny/0638--000--Cobalion.gif b/src/canonical/models/front-shiny/0638-000-Cobalion.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0638--000--Cobalion.gif
rename to src/canonical/models/front-shiny/0638-000-Cobalion.gif
diff --git a/src/canonical/models/front-shiny/0639--000--Terrakion.gif b/src/canonical/models/front-shiny/0639-000-Terrakion.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0639--000--Terrakion.gif
rename to src/canonical/models/front-shiny/0639-000-Terrakion.gif
diff --git a/src/canonical/models/front-shiny/0640--000--Virizion.gif b/src/canonical/models/front-shiny/0640-000-Virizion.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0640--000--Virizion.gif
rename to src/canonical/models/front-shiny/0640-000-Virizion.gif
diff --git a/src/canonical/models/front-shiny/0641--000--Tornadus.gif b/src/canonical/models/front-shiny/0641-000-Tornadus.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0641--000--Tornadus.gif
rename to src/canonical/models/front-shiny/0641-000-Tornadus.gif
diff --git a/src/canonical/models/front-shiny/0641--420--Tornadus--Therian.gif b/src/canonical/models/front-shiny/0641-420-Tornadus-Therian.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0641--420--Tornadus--Therian.gif
rename to src/canonical/models/front-shiny/0641-420-Tornadus-Therian.gif
diff --git a/src/canonical/models/front-shiny/0642--000--Thundurus.gif b/src/canonical/models/front-shiny/0642-000-Thundurus.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0642--000--Thundurus.gif
rename to src/canonical/models/front-shiny/0642-000-Thundurus.gif
diff --git a/src/canonical/models/front-shiny/0642--420--Thundurus--Therian.gif b/src/canonical/models/front-shiny/0642-420-Thundurus-Therian.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0642--420--Thundurus--Therian.gif
rename to src/canonical/models/front-shiny/0642-420-Thundurus-Therian.gif
diff --git a/src/canonical/models/front-shiny/0643--000--Reshiram.gif b/src/canonical/models/front-shiny/0643-000-Reshiram.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0643--000--Reshiram.gif
rename to src/canonical/models/front-shiny/0643-000-Reshiram.gif
diff --git a/src/canonical/models/front-shiny/0644--000--Zekrom.gif b/src/canonical/models/front-shiny/0644-000-Zekrom.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0644--000--Zekrom.gif
rename to src/canonical/models/front-shiny/0644-000-Zekrom.gif
diff --git a/src/canonical/models/front-shiny/0645--000--Landorus.gif b/src/canonical/models/front-shiny/0645-000-Landorus.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0645--000--Landorus.gif
rename to src/canonical/models/front-shiny/0645-000-Landorus.gif
diff --git a/src/canonical/models/front-shiny/0645--420--Landorus--Therian.gif b/src/canonical/models/front-shiny/0645-420-Landorus-Therian.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0645--420--Landorus--Therian.gif
rename to src/canonical/models/front-shiny/0645-420-Landorus-Therian.gif
diff --git a/src/canonical/models/front-shiny/0646--000--Kyurem.gif b/src/canonical/models/front-shiny/0646-000-Kyurem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0646--000--Kyurem.gif
rename to src/canonical/models/front-shiny/0646-000-Kyurem.gif
diff --git a/src/canonical/models/front-shiny/0646--420--Kyurem--Black.gif b/src/canonical/models/front-shiny/0646-420-Kyurem-Black.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0646--420--Kyurem--Black.gif
rename to src/canonical/models/front-shiny/0646-420-Kyurem-Black.gif
diff --git a/src/canonical/models/front-shiny/0646--420--Kyurem--White.gif b/src/canonical/models/front-shiny/0646-420-Kyurem-White.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0646--420--Kyurem--White.gif
rename to src/canonical/models/front-shiny/0646-420-Kyurem-White.gif
diff --git a/src/canonical/models/front-shiny/0647--000--Keldeo.gif b/src/canonical/models/front-shiny/0647-000-Keldeo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0647--000--Keldeo.gif
rename to src/canonical/models/front-shiny/0647-000-Keldeo.gif
diff --git a/src/canonical/models/front-shiny/0647--420--Keldeo--Resolute.gif b/src/canonical/models/front-shiny/0647-420-Keldeo-Resolute.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0647--420--Keldeo--Resolute.gif
rename to src/canonical/models/front-shiny/0647-420-Keldeo-Resolute.gif
diff --git a/src/canonical/models/front-shiny/0648--000--Meloetta.gif b/src/canonical/models/front-shiny/0648-000-Meloetta.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0648--000--Meloetta.gif
rename to src/canonical/models/front-shiny/0648-000-Meloetta.gif
diff --git a/src/canonical/models/front-shiny/0648--420--Meloetta--Pirouette.gif b/src/canonical/models/front-shiny/0648-420-Meloetta-Pirouette.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0648--420--Meloetta--Pirouette.gif
rename to src/canonical/models/front-shiny/0648-420-Meloetta-Pirouette.gif
diff --git a/src/canonical/models/front-shiny/0649--000--Genesect.gif b/src/canonical/models/front-shiny/0649-000-Genesect.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0649--000--Genesect.gif
rename to src/canonical/models/front-shiny/0649-000-Genesect.gif
diff --git a/src/canonical/models/front-shiny/0649--420--Genesect--Burn.gif b/src/canonical/models/front-shiny/0649-420-Genesect-Burn.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0649--420--Genesect--Burn.gif
rename to src/canonical/models/front-shiny/0649-420-Genesect-Burn.gif
diff --git a/src/canonical/models/front-shiny/0649--420--Genesect--Chill.gif b/src/canonical/models/front-shiny/0649-420-Genesect-Chill.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0649--420--Genesect--Chill.gif
rename to src/canonical/models/front-shiny/0649-420-Genesect-Chill.gif
diff --git a/src/canonical/models/front-shiny/0649--420--Genesect--Douse.gif b/src/canonical/models/front-shiny/0649-420-Genesect-Douse.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0649--420--Genesect--Douse.gif
rename to src/canonical/models/front-shiny/0649-420-Genesect-Douse.gif
diff --git a/src/canonical/models/front-shiny/0649--420--Genesect--Shock.gif b/src/canonical/models/front-shiny/0649-420-Genesect-Shock.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0649--420--Genesect--Shock.gif
rename to src/canonical/models/front-shiny/0649-420-Genesect-Shock.gif
diff --git a/src/canonical/models/front-shiny/0650--000--Chespin.gif b/src/canonical/models/front-shiny/0650-000-Chespin.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0650--000--Chespin.gif
rename to src/canonical/models/front-shiny/0650-000-Chespin.gif
diff --git a/src/canonical/models/front-shiny/0651--000--Quilladin.gif b/src/canonical/models/front-shiny/0651-000-Quilladin.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0651--000--Quilladin.gif
rename to src/canonical/models/front-shiny/0651-000-Quilladin.gif
diff --git a/src/canonical/models/front-shiny/0652--000--Chesnaught.gif b/src/canonical/models/front-shiny/0652-000-Chesnaught.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0652--000--Chesnaught.gif
rename to src/canonical/models/front-shiny/0652-000-Chesnaught.gif
diff --git a/src/canonical/models/front-shiny/0653--000--Fennekin.gif b/src/canonical/models/front-shiny/0653-000-Fennekin.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0653--000--Fennekin.gif
rename to src/canonical/models/front-shiny/0653-000-Fennekin.gif
diff --git a/src/canonical/models/front-shiny/0654--000--Braixen.gif b/src/canonical/models/front-shiny/0654-000-Braixen.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0654--000--Braixen.gif
rename to src/canonical/models/front-shiny/0654-000-Braixen.gif
diff --git a/src/canonical/models/front-shiny/0655--000--Delphox.gif b/src/canonical/models/front-shiny/0655-000-Delphox.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0655--000--Delphox.gif
rename to src/canonical/models/front-shiny/0655-000-Delphox.gif
diff --git a/src/canonical/models/front-shiny/0656--000--Froakie.gif b/src/canonical/models/front-shiny/0656-000-Froakie.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0656--000--Froakie.gif
rename to src/canonical/models/front-shiny/0656-000-Froakie.gif
diff --git a/src/canonical/models/front-shiny/0657--000--Frogadier.gif b/src/canonical/models/front-shiny/0657-000-Frogadier.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0657--000--Frogadier.gif
rename to src/canonical/models/front-shiny/0657-000-Frogadier.gif
diff --git a/src/canonical/models/front-shiny/0658--000--Greninja.gif b/src/canonical/models/front-shiny/0658-000-Greninja.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0658--000--Greninja.gif
rename to src/canonical/models/front-shiny/0658-000-Greninja.gif
diff --git a/src/canonical/models/front-shiny/0658--420--Greninja--Ash.gif b/src/canonical/models/front-shiny/0658-420-Greninja-Ash.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0658--420--Greninja--Ash.gif
rename to src/canonical/models/front-shiny/0658-420-Greninja-Ash.gif
diff --git a/src/canonical/models/front-shiny/0659--000--Bunnelby.gif b/src/canonical/models/front-shiny/0659-000-Bunnelby.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0659--000--Bunnelby.gif
rename to src/canonical/models/front-shiny/0659-000-Bunnelby.gif
diff --git a/src/canonical/models/front-shiny/0660--000--Diggersby.gif b/src/canonical/models/front-shiny/0660-000-Diggersby.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0660--000--Diggersby.gif
rename to src/canonical/models/front-shiny/0660-000-Diggersby.gif
diff --git a/src/canonical/models/front-shiny/0661--000--Fletchling.gif b/src/canonical/models/front-shiny/0661-000-Fletchling.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0661--000--Fletchling.gif
rename to src/canonical/models/front-shiny/0661-000-Fletchling.gif
diff --git a/src/canonical/models/front-shiny/0662--000--Fletchinder.gif b/src/canonical/models/front-shiny/0662-000-Fletchinder.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0662--000--Fletchinder.gif
rename to src/canonical/models/front-shiny/0662-000-Fletchinder.gif
diff --git a/src/canonical/models/front-shiny/0663--000--Talonflame.gif b/src/canonical/models/front-shiny/0663-000-Talonflame.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0663--000--Talonflame.gif
rename to src/canonical/models/front-shiny/0663-000-Talonflame.gif
diff --git a/src/canonical/models/front-shiny/0664--000--Scatterbug.gif b/src/canonical/models/front-shiny/0664-000-Scatterbug.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0664--000--Scatterbug.gif
rename to src/canonical/models/front-shiny/0664-000-Scatterbug.gif
diff --git a/src/canonical/models/front-shiny/0665--000--Spewpa.gif b/src/canonical/models/front-shiny/0665-000-Spewpa.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0665--000--Spewpa.gif
rename to src/canonical/models/front-shiny/0665-000-Spewpa.gif
diff --git a/src/canonical/models/front-shiny/0666--000--Vivillon.gif b/src/canonical/models/front-shiny/0666-000-Vivillon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0666--000--Vivillon.gif
rename to src/canonical/models/front-shiny/0666-000-Vivillon.gif
diff --git a/src/canonical/models/front-shiny/0666--420--Vivillon--Fancy.gif b/src/canonical/models/front-shiny/0666-420-Vivillon-Fancy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0666--420--Vivillon--Fancy.gif
rename to src/canonical/models/front-shiny/0666-420-Vivillon-Fancy.gif
diff --git a/src/canonical/models/front-shiny/0666--420--Vivillon--Pokeball.gif b/src/canonical/models/front-shiny/0666-420-Vivillon-Pokeball.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0666--420--Vivillon--Pokeball.gif
rename to src/canonical/models/front-shiny/0666-420-Vivillon-Pokeball.gif
diff --git a/src/canonical/models/front-shiny/0667--000--Litleo.gif b/src/canonical/models/front-shiny/0667-000-Litleo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0667--000--Litleo.gif
rename to src/canonical/models/front-shiny/0667-000-Litleo.gif
diff --git a/src/canonical/models/front-shiny/0668--000--Pyroar.gif b/src/canonical/models/front-shiny/0668-000-Pyroar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0668--000--Pyroar.gif
rename to src/canonical/models/front-shiny/0668-000-Pyroar.gif
diff --git a/src/canonical/models/front-shiny/0669--000--Flabe__0301be__0301.gif b/src/canonical/models/front-shiny/0669-000-Flabe__0301be__0301.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0669--000--Flabe__0301be__0301.gif
rename to src/canonical/models/front-shiny/0669-000-Flabe__0301be__0301.gif
diff --git a/src/canonical/models/front-shiny/0670--000--Floette.gif b/src/canonical/models/front-shiny/0670-000-Floette.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0670--000--Floette.gif
rename to src/canonical/models/front-shiny/0670-000-Floette.gif
diff --git a/src/canonical/models/front-shiny/0670--420--Floette--Eternal.gif b/src/canonical/models/front-shiny/0670-420-Floette-Eternal.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0670--420--Floette--Eternal.gif
rename to src/canonical/models/front-shiny/0670-420-Floette-Eternal.gif
diff --git a/src/canonical/models/front-shiny/0671--000--Florges.gif b/src/canonical/models/front-shiny/0671-000-Florges.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0671--000--Florges.gif
rename to src/canonical/models/front-shiny/0671-000-Florges.gif
diff --git a/src/canonical/models/front-shiny/0672--000--Skiddo.gif b/src/canonical/models/front-shiny/0672-000-Skiddo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0672--000--Skiddo.gif
rename to src/canonical/models/front-shiny/0672-000-Skiddo.gif
diff --git a/src/canonical/models/front-shiny/0673--000--Gogoat.gif b/src/canonical/models/front-shiny/0673-000-Gogoat.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0673--000--Gogoat.gif
rename to src/canonical/models/front-shiny/0673-000-Gogoat.gif
diff --git a/src/canonical/models/front-shiny/0674--000--Pancham.gif b/src/canonical/models/front-shiny/0674-000-Pancham.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0674--000--Pancham.gif
rename to src/canonical/models/front-shiny/0674-000-Pancham.gif
diff --git a/src/canonical/models/front-shiny/0675--000--Pangoro.gif b/src/canonical/models/front-shiny/0675-000-Pangoro.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0675--000--Pangoro.gif
rename to src/canonical/models/front-shiny/0675-000-Pangoro.gif
diff --git a/src/canonical/models/front-shiny/0676--000--Furfrou.gif b/src/canonical/models/front-shiny/0676-000-Furfrou.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0676--000--Furfrou.gif
rename to src/canonical/models/front-shiny/0676-000-Furfrou.gif
diff --git a/src/canonical/models/front-shiny/0677--000--Espurr.gif b/src/canonical/models/front-shiny/0677-000-Espurr.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0677--000--Espurr.gif
rename to src/canonical/models/front-shiny/0677-000-Espurr.gif
diff --git a/src/canonical/models/front-shiny/0678--000--Meowstic.gif b/src/canonical/models/front-shiny/0678-000-Meowstic.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0678--000--Meowstic.gif
rename to src/canonical/models/front-shiny/0678-000-Meowstic.gif
diff --git a/src/canonical/models/front-shiny/0678--420--Meowstic--F.gif b/src/canonical/models/front-shiny/0678-420-Meowstic-F.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0678--420--Meowstic--F.gif
rename to src/canonical/models/front-shiny/0678-420-Meowstic-F.gif
diff --git a/src/canonical/models/front-shiny/0679--000--Honedge.gif b/src/canonical/models/front-shiny/0679-000-Honedge.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0679--000--Honedge.gif
rename to src/canonical/models/front-shiny/0679-000-Honedge.gif
diff --git a/src/canonical/models/front-shiny/0680--000--Doublade.gif b/src/canonical/models/front-shiny/0680-000-Doublade.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0680--000--Doublade.gif
rename to src/canonical/models/front-shiny/0680-000-Doublade.gif
diff --git a/src/canonical/models/front-shiny/0681--000--Aegislash.gif b/src/canonical/models/front-shiny/0681-000-Aegislash.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0681--000--Aegislash.gif
rename to src/canonical/models/front-shiny/0681-000-Aegislash.gif
diff --git a/src/canonical/models/front-shiny/0681--420--Aegislash--Blade.gif b/src/canonical/models/front-shiny/0681-420-Aegislash-Blade.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0681--420--Aegislash--Blade.gif
rename to src/canonical/models/front-shiny/0681-420-Aegislash-Blade.gif
diff --git a/src/canonical/models/front-shiny/0682--000--Spritzee.gif b/src/canonical/models/front-shiny/0682-000-Spritzee.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0682--000--Spritzee.gif
rename to src/canonical/models/front-shiny/0682-000-Spritzee.gif
diff --git a/src/canonical/models/front-shiny/0683--000--Aromatisse.gif b/src/canonical/models/front-shiny/0683-000-Aromatisse.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0683--000--Aromatisse.gif
rename to src/canonical/models/front-shiny/0683-000-Aromatisse.gif
diff --git a/src/canonical/models/front-shiny/0684--000--Swirlix.gif b/src/canonical/models/front-shiny/0684-000-Swirlix.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0684--000--Swirlix.gif
rename to src/canonical/models/front-shiny/0684-000-Swirlix.gif
diff --git a/src/canonical/models/front-shiny/0685--000--Slurpuff.gif b/src/canonical/models/front-shiny/0685-000-Slurpuff.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0685--000--Slurpuff.gif
rename to src/canonical/models/front-shiny/0685-000-Slurpuff.gif
diff --git a/src/canonical/models/front-shiny/0686--000--Inkay.gif b/src/canonical/models/front-shiny/0686-000-Inkay.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0686--000--Inkay.gif
rename to src/canonical/models/front-shiny/0686-000-Inkay.gif
diff --git a/src/canonical/models/front-shiny/0687--000--Malamar.gif b/src/canonical/models/front-shiny/0687-000-Malamar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0687--000--Malamar.gif
rename to src/canonical/models/front-shiny/0687-000-Malamar.gif
diff --git a/src/canonical/models/front-shiny/0688--000--Binacle.gif b/src/canonical/models/front-shiny/0688-000-Binacle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0688--000--Binacle.gif
rename to src/canonical/models/front-shiny/0688-000-Binacle.gif
diff --git a/src/canonical/models/front-shiny/0689--000--Barbaracle.gif b/src/canonical/models/front-shiny/0689-000-Barbaracle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0689--000--Barbaracle.gif
rename to src/canonical/models/front-shiny/0689-000-Barbaracle.gif
diff --git a/src/canonical/models/front-shiny/0690--000--Skrelp.gif b/src/canonical/models/front-shiny/0690-000-Skrelp.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0690--000--Skrelp.gif
rename to src/canonical/models/front-shiny/0690-000-Skrelp.gif
diff --git a/src/canonical/models/front-shiny/0691--000--Dragalge.gif b/src/canonical/models/front-shiny/0691-000-Dragalge.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0691--000--Dragalge.gif
rename to src/canonical/models/front-shiny/0691-000-Dragalge.gif
diff --git a/src/canonical/models/front-shiny/0692--000--Clauncher.gif b/src/canonical/models/front-shiny/0692-000-Clauncher.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0692--000--Clauncher.gif
rename to src/canonical/models/front-shiny/0692-000-Clauncher.gif
diff --git a/src/canonical/models/front-shiny/0693--000--Clawitzer.gif b/src/canonical/models/front-shiny/0693-000-Clawitzer.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0693--000--Clawitzer.gif
rename to src/canonical/models/front-shiny/0693-000-Clawitzer.gif
diff --git a/src/canonical/models/front-shiny/0694--000--Helioptile.gif b/src/canonical/models/front-shiny/0694-000-Helioptile.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0694--000--Helioptile.gif
rename to src/canonical/models/front-shiny/0694-000-Helioptile.gif
diff --git a/src/canonical/models/front-shiny/0695--000--Heliolisk.gif b/src/canonical/models/front-shiny/0695-000-Heliolisk.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0695--000--Heliolisk.gif
rename to src/canonical/models/front-shiny/0695-000-Heliolisk.gif
diff --git a/src/canonical/models/front-shiny/0696--000--Tyrunt.gif b/src/canonical/models/front-shiny/0696-000-Tyrunt.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0696--000--Tyrunt.gif
rename to src/canonical/models/front-shiny/0696-000-Tyrunt.gif
diff --git a/src/canonical/models/front-shiny/0697--000--Tyrantrum.gif b/src/canonical/models/front-shiny/0697-000-Tyrantrum.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0697--000--Tyrantrum.gif
rename to src/canonical/models/front-shiny/0697-000-Tyrantrum.gif
diff --git a/src/canonical/models/front-shiny/0698--000--Amaura.gif b/src/canonical/models/front-shiny/0698-000-Amaura.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0698--000--Amaura.gif
rename to src/canonical/models/front-shiny/0698-000-Amaura.gif
diff --git a/src/canonical/models/front-shiny/0699--000--Aurorus.gif b/src/canonical/models/front-shiny/0699-000-Aurorus.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0699--000--Aurorus.gif
rename to src/canonical/models/front-shiny/0699-000-Aurorus.gif
diff --git a/src/canonical/models/front-shiny/0700--000--Sylveon.gif b/src/canonical/models/front-shiny/0700-000-Sylveon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0700--000--Sylveon.gif
rename to src/canonical/models/front-shiny/0700-000-Sylveon.gif
diff --git a/src/canonical/models/front-shiny/0701--000--Hawlucha.gif b/src/canonical/models/front-shiny/0701-000-Hawlucha.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0701--000--Hawlucha.gif
rename to src/canonical/models/front-shiny/0701-000-Hawlucha.gif
diff --git a/src/canonical/models/front-shiny/0702--000--Dedenne.gif b/src/canonical/models/front-shiny/0702-000-Dedenne.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0702--000--Dedenne.gif
rename to src/canonical/models/front-shiny/0702-000-Dedenne.gif
diff --git a/src/canonical/models/front-shiny/0703--000--Carbink.gif b/src/canonical/models/front-shiny/0703-000-Carbink.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0703--000--Carbink.gif
rename to src/canonical/models/front-shiny/0703-000-Carbink.gif
diff --git a/src/canonical/models/front-shiny/0704--000--Goomy.gif b/src/canonical/models/front-shiny/0704-000-Goomy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0704--000--Goomy.gif
rename to src/canonical/models/front-shiny/0704-000-Goomy.gif
diff --git a/src/canonical/models/front-shiny/0705--000--Sliggoo.gif b/src/canonical/models/front-shiny/0705-000-Sliggoo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0705--000--Sliggoo.gif
rename to src/canonical/models/front-shiny/0705-000-Sliggoo.gif
diff --git a/src/canonical/models/front-shiny/0706--000--Goodra.gif b/src/canonical/models/front-shiny/0706-000-Goodra.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0706--000--Goodra.gif
rename to src/canonical/models/front-shiny/0706-000-Goodra.gif
diff --git a/src/canonical/models/front-shiny/0707--000--Klefki.gif b/src/canonical/models/front-shiny/0707-000-Klefki.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0707--000--Klefki.gif
rename to src/canonical/models/front-shiny/0707-000-Klefki.gif
diff --git a/src/canonical/models/front-shiny/0708--000--Phantump.gif b/src/canonical/models/front-shiny/0708-000-Phantump.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0708--000--Phantump.gif
rename to src/canonical/models/front-shiny/0708-000-Phantump.gif
diff --git a/src/canonical/models/front-shiny/0709--000--Trevenant.gif b/src/canonical/models/front-shiny/0709-000-Trevenant.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0709--000--Trevenant.gif
rename to src/canonical/models/front-shiny/0709-000-Trevenant.gif
diff --git a/src/canonical/models/front-shiny/0710--000--Pumpkaboo.gif b/src/canonical/models/front-shiny/0710-000-Pumpkaboo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0710--000--Pumpkaboo.gif
rename to src/canonical/models/front-shiny/0710-000-Pumpkaboo.gif
diff --git a/src/canonical/models/front-shiny/0710--420--Pumpkaboo--Large.gif b/src/canonical/models/front-shiny/0710-420-Pumpkaboo-Large.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0710--420--Pumpkaboo--Large.gif
rename to src/canonical/models/front-shiny/0710-420-Pumpkaboo-Large.gif
diff --git a/src/canonical/models/front-shiny/0710--420--Pumpkaboo--Small.gif b/src/canonical/models/front-shiny/0710-420-Pumpkaboo-Small.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0710--420--Pumpkaboo--Small.gif
rename to src/canonical/models/front-shiny/0710-420-Pumpkaboo-Small.gif
diff --git a/src/canonical/models/front-shiny/0710--420--Pumpkaboo--Super.gif b/src/canonical/models/front-shiny/0710-420-Pumpkaboo-Super.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0710--420--Pumpkaboo--Super.gif
rename to src/canonical/models/front-shiny/0710-420-Pumpkaboo-Super.gif
diff --git a/src/canonical/models/front-shiny/0711--000--Gourgeist.gif b/src/canonical/models/front-shiny/0711-000-Gourgeist.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0711--000--Gourgeist.gif
rename to src/canonical/models/front-shiny/0711-000-Gourgeist.gif
diff --git a/src/canonical/models/front-shiny/0711--420--Gourgeist--Large.gif b/src/canonical/models/front-shiny/0711-420-Gourgeist-Large.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0711--420--Gourgeist--Large.gif
rename to src/canonical/models/front-shiny/0711-420-Gourgeist-Large.gif
diff --git a/src/canonical/models/front-shiny/0711--420--Gourgeist--Small.gif b/src/canonical/models/front-shiny/0711-420-Gourgeist-Small.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0711--420--Gourgeist--Small.gif
rename to src/canonical/models/front-shiny/0711-420-Gourgeist-Small.gif
diff --git a/src/canonical/models/front-shiny/0711--420--Gourgeist--Super.gif b/src/canonical/models/front-shiny/0711-420-Gourgeist-Super.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0711--420--Gourgeist--Super.gif
rename to src/canonical/models/front-shiny/0711-420-Gourgeist-Super.gif
diff --git a/src/canonical/models/front-shiny/0712--000--Bergmite.gif b/src/canonical/models/front-shiny/0712-000-Bergmite.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0712--000--Bergmite.gif
rename to src/canonical/models/front-shiny/0712-000-Bergmite.gif
diff --git a/src/canonical/models/front-shiny/0713--000--Avalugg.gif b/src/canonical/models/front-shiny/0713-000-Avalugg.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0713--000--Avalugg.gif
rename to src/canonical/models/front-shiny/0713-000-Avalugg.gif
diff --git a/src/canonical/models/front-shiny/0714--000--Noibat.gif b/src/canonical/models/front-shiny/0714-000-Noibat.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0714--000--Noibat.gif
rename to src/canonical/models/front-shiny/0714-000-Noibat.gif
diff --git a/src/canonical/models/front-shiny/0715--000--Noivern.gif b/src/canonical/models/front-shiny/0715-000-Noivern.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0715--000--Noivern.gif
rename to src/canonical/models/front-shiny/0715-000-Noivern.gif
diff --git a/src/canonical/models/front-shiny/0716--000--Xerneas.gif b/src/canonical/models/front-shiny/0716-000-Xerneas.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0716--000--Xerneas.gif
rename to src/canonical/models/front-shiny/0716-000-Xerneas.gif
diff --git a/src/canonical/models/front-shiny/0717--000--Yveltal.gif b/src/canonical/models/front-shiny/0717-000-Yveltal.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0717--000--Yveltal.gif
rename to src/canonical/models/front-shiny/0717-000-Yveltal.gif
diff --git a/src/canonical/models/front-shiny/0718--000--Zygarde.gif b/src/canonical/models/front-shiny/0718-000-Zygarde.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0718--000--Zygarde.gif
rename to src/canonical/models/front-shiny/0718-000-Zygarde.gif
diff --git a/src/canonical/models/front-shiny/0718--420--Zygarde--10__0025.gif b/src/canonical/models/front-shiny/0718-420-Zygarde-10__0025.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0718--420--Zygarde--10__0025.gif
rename to src/canonical/models/front-shiny/0718-420-Zygarde-10__0025.gif
diff --git a/src/canonical/models/front-shiny/0718--420--Zygarde--Complete.gif b/src/canonical/models/front-shiny/0718-420-Zygarde-Complete.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0718--420--Zygarde--Complete.gif
rename to src/canonical/models/front-shiny/0718-420-Zygarde-Complete.gif
diff --git a/src/canonical/models/front-shiny/0719--000--Diancie.gif b/src/canonical/models/front-shiny/0719-000-Diancie.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0719--000--Diancie.gif
rename to src/canonical/models/front-shiny/0719-000-Diancie.gif
diff --git a/src/canonical/models/front-shiny/0719--420--Diancie--Mega.gif b/src/canonical/models/front-shiny/0719-420-Diancie-Mega.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0719--420--Diancie--Mega.gif
rename to src/canonical/models/front-shiny/0719-420-Diancie-Mega.gif
diff --git a/src/canonical/models/front-shiny/0720--000--Hoopa.gif b/src/canonical/models/front-shiny/0720-000-Hoopa.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0720--000--Hoopa.gif
rename to src/canonical/models/front-shiny/0720-000-Hoopa.gif
diff --git a/src/canonical/models/front-shiny/0720--420--Hoopa--Unbound.gif b/src/canonical/models/front-shiny/0720-420-Hoopa-Unbound.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0720--420--Hoopa--Unbound.gif
rename to src/canonical/models/front-shiny/0720-420-Hoopa-Unbound.gif
diff --git a/src/canonical/models/front-shiny/0721--000--Volcanion.gif b/src/canonical/models/front-shiny/0721-000-Volcanion.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0721--000--Volcanion.gif
rename to src/canonical/models/front-shiny/0721-000-Volcanion.gif
diff --git a/src/canonical/models/front-shiny/0722--000--Rowlet.gif b/src/canonical/models/front-shiny/0722-000-Rowlet.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0722--000--Rowlet.gif
rename to src/canonical/models/front-shiny/0722-000-Rowlet.gif
diff --git a/src/canonical/models/front-shiny/0723--000--Dartrix.gif b/src/canonical/models/front-shiny/0723-000-Dartrix.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0723--000--Dartrix.gif
rename to src/canonical/models/front-shiny/0723-000-Dartrix.gif
diff --git a/src/canonical/models/front-shiny/0724--000--Decidueye.gif b/src/canonical/models/front-shiny/0724-000-Decidueye.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0724--000--Decidueye.gif
rename to src/canonical/models/front-shiny/0724-000-Decidueye.gif
diff --git a/src/canonical/models/front-shiny/0725--000--Litten.gif b/src/canonical/models/front-shiny/0725-000-Litten.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0725--000--Litten.gif
rename to src/canonical/models/front-shiny/0725-000-Litten.gif
diff --git a/src/canonical/models/front-shiny/0726--000--Torracat.gif b/src/canonical/models/front-shiny/0726-000-Torracat.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0726--000--Torracat.gif
rename to src/canonical/models/front-shiny/0726-000-Torracat.gif
diff --git a/src/canonical/models/front-shiny/0727--000--Incineroar.gif b/src/canonical/models/front-shiny/0727-000-Incineroar.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0727--000--Incineroar.gif
rename to src/canonical/models/front-shiny/0727-000-Incineroar.gif
diff --git a/src/canonical/models/front-shiny/0728--000--Popplio.gif b/src/canonical/models/front-shiny/0728-000-Popplio.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0728--000--Popplio.gif
rename to src/canonical/models/front-shiny/0728-000-Popplio.gif
diff --git a/src/canonical/models/front-shiny/0729--000--Brionne.gif b/src/canonical/models/front-shiny/0729-000-Brionne.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0729--000--Brionne.gif
rename to src/canonical/models/front-shiny/0729-000-Brionne.gif
diff --git a/src/canonical/models/front-shiny/0730--000--Primarina.gif b/src/canonical/models/front-shiny/0730-000-Primarina.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0730--000--Primarina.gif
rename to src/canonical/models/front-shiny/0730-000-Primarina.gif
diff --git a/src/canonical/models/front-shiny/0731--000--Pikipek.gif b/src/canonical/models/front-shiny/0731-000-Pikipek.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0731--000--Pikipek.gif
rename to src/canonical/models/front-shiny/0731-000-Pikipek.gif
diff --git a/src/canonical/models/front-shiny/0732--000--Trumbeak.gif b/src/canonical/models/front-shiny/0732-000-Trumbeak.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0732--000--Trumbeak.gif
rename to src/canonical/models/front-shiny/0732-000-Trumbeak.gif
diff --git a/src/canonical/models/front-shiny/0733--000--Toucannon.gif b/src/canonical/models/front-shiny/0733-000-Toucannon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0733--000--Toucannon.gif
rename to src/canonical/models/front-shiny/0733-000-Toucannon.gif
diff --git a/src/canonical/models/front-shiny/0734--000--Yungoos.gif b/src/canonical/models/front-shiny/0734-000-Yungoos.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0734--000--Yungoos.gif
rename to src/canonical/models/front-shiny/0734-000-Yungoos.gif
diff --git a/src/canonical/models/front-shiny/0735--000--Gumshoos.gif b/src/canonical/models/front-shiny/0735-000-Gumshoos.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0735--000--Gumshoos.gif
rename to src/canonical/models/front-shiny/0735-000-Gumshoos.gif
diff --git a/src/canonical/models/front-shiny/0735--420--Gumshoos--Totem.gif b/src/canonical/models/front-shiny/0735-420-Gumshoos-Totem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0735--420--Gumshoos--Totem.gif
rename to src/canonical/models/front-shiny/0735-420-Gumshoos-Totem.gif
diff --git a/src/canonical/models/front-shiny/0736--000--Grubbin.gif b/src/canonical/models/front-shiny/0736-000-Grubbin.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0736--000--Grubbin.gif
rename to src/canonical/models/front-shiny/0736-000-Grubbin.gif
diff --git a/src/canonical/models/front-shiny/0737--000--Charjabug.gif b/src/canonical/models/front-shiny/0737-000-Charjabug.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0737--000--Charjabug.gif
rename to src/canonical/models/front-shiny/0737-000-Charjabug.gif
diff --git a/src/canonical/models/front-shiny/0738--000--Vikavolt.gif b/src/canonical/models/front-shiny/0738-000-Vikavolt.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0738--000--Vikavolt.gif
rename to src/canonical/models/front-shiny/0738-000-Vikavolt.gif
diff --git a/src/canonical/models/front-shiny/0738--420--Vikavolt--Totem.gif b/src/canonical/models/front-shiny/0738-420-Vikavolt-Totem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0738--420--Vikavolt--Totem.gif
rename to src/canonical/models/front-shiny/0738-420-Vikavolt-Totem.gif
diff --git a/src/canonical/models/front-shiny/0739--000--Crabrawler.gif b/src/canonical/models/front-shiny/0739-000-Crabrawler.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0739--000--Crabrawler.gif
rename to src/canonical/models/front-shiny/0739-000-Crabrawler.gif
diff --git a/src/canonical/models/front-shiny/0740--000--Crabominable.gif b/src/canonical/models/front-shiny/0740-000-Crabominable.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0740--000--Crabominable.gif
rename to src/canonical/models/front-shiny/0740-000-Crabominable.gif
diff --git a/src/canonical/models/front-shiny/0741--000--Oricorio.gif b/src/canonical/models/front-shiny/0741-000-Oricorio.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0741--000--Oricorio.gif
rename to src/canonical/models/front-shiny/0741-000-Oricorio.gif
diff --git a/src/canonical/models/front-shiny/0741--420--Oricorio--Pa__0027u.gif b/src/canonical/models/front-shiny/0741-420-Oricorio-Pa__0027u.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0741--420--Oricorio--Pa__0027u.gif
rename to src/canonical/models/front-shiny/0741-420-Oricorio-Pa__0027u.gif
diff --git a/src/canonical/models/front-shiny/0741--420--Oricorio--Pom-Pom.gif b/src/canonical/models/front-shiny/0741-420-Oricorio-Pom~Pom.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0741--420--Oricorio--Pom-Pom.gif
rename to src/canonical/models/front-shiny/0741-420-Oricorio-Pom~Pom.gif
diff --git a/src/canonical/models/front-shiny/0741--420--Oricorio--Sensu.gif b/src/canonical/models/front-shiny/0741-420-Oricorio-Sensu.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0741--420--Oricorio--Sensu.gif
rename to src/canonical/models/front-shiny/0741-420-Oricorio-Sensu.gif
diff --git a/src/canonical/models/front-shiny/0742--000--Cutiefly.gif b/src/canonical/models/front-shiny/0742-000-Cutiefly.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0742--000--Cutiefly.gif
rename to src/canonical/models/front-shiny/0742-000-Cutiefly.gif
diff --git a/src/canonical/models/front-shiny/0743--000--Ribombee.gif b/src/canonical/models/front-shiny/0743-000-Ribombee.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0743--000--Ribombee.gif
rename to src/canonical/models/front-shiny/0743-000-Ribombee.gif
diff --git a/src/canonical/models/front-shiny/0743--420--Ribombee--Totem.gif b/src/canonical/models/front-shiny/0743-420-Ribombee-Totem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0743--420--Ribombee--Totem.gif
rename to src/canonical/models/front-shiny/0743-420-Ribombee-Totem.gif
diff --git a/src/canonical/models/front-shiny/0744--000--Rockruff.gif b/src/canonical/models/front-shiny/0744-000-Rockruff.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0744--000--Rockruff.gif
rename to src/canonical/models/front-shiny/0744-000-Rockruff.gif
diff --git a/src/canonical/models/front-shiny/0745--000--Lycanroc.gif b/src/canonical/models/front-shiny/0745-000-Lycanroc.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0745--000--Lycanroc.gif
rename to src/canonical/models/front-shiny/0745-000-Lycanroc.gif
diff --git a/src/canonical/models/front-shiny/0745--420--Lycanroc--Dusk.gif b/src/canonical/models/front-shiny/0745-420-Lycanroc-Dusk.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0745--420--Lycanroc--Dusk.gif
rename to src/canonical/models/front-shiny/0745-420-Lycanroc-Dusk.gif
diff --git a/src/canonical/models/front-shiny/0745--420--Lycanroc--Midnight.gif b/src/canonical/models/front-shiny/0745-420-Lycanroc-Midnight.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0745--420--Lycanroc--Midnight.gif
rename to src/canonical/models/front-shiny/0745-420-Lycanroc-Midnight.gif
diff --git a/src/canonical/models/front-shiny/0746--000--Wishiwashi.gif b/src/canonical/models/front-shiny/0746-000-Wishiwashi.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0746--000--Wishiwashi.gif
rename to src/canonical/models/front-shiny/0746-000-Wishiwashi.gif
diff --git a/src/canonical/models/front-shiny/0746--420--Wishiwashi--School.gif b/src/canonical/models/front-shiny/0746-420-Wishiwashi-School.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0746--420--Wishiwashi--School.gif
rename to src/canonical/models/front-shiny/0746-420-Wishiwashi-School.gif
diff --git a/src/canonical/models/front-shiny/0747--000--Mareanie.gif b/src/canonical/models/front-shiny/0747-000-Mareanie.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0747--000--Mareanie.gif
rename to src/canonical/models/front-shiny/0747-000-Mareanie.gif
diff --git a/src/canonical/models/front-shiny/0748--000--Toxapex.gif b/src/canonical/models/front-shiny/0748-000-Toxapex.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0748--000--Toxapex.gif
rename to src/canonical/models/front-shiny/0748-000-Toxapex.gif
diff --git a/src/canonical/models/front-shiny/0749--000--Mudbray.gif b/src/canonical/models/front-shiny/0749-000-Mudbray.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0749--000--Mudbray.gif
rename to src/canonical/models/front-shiny/0749-000-Mudbray.gif
diff --git a/src/canonical/models/front-shiny/0750--000--Mudsdale.gif b/src/canonical/models/front-shiny/0750-000-Mudsdale.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0750--000--Mudsdale.gif
rename to src/canonical/models/front-shiny/0750-000-Mudsdale.gif
diff --git a/src/canonical/models/front-shiny/0751--000--Dewpider.gif b/src/canonical/models/front-shiny/0751-000-Dewpider.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0751--000--Dewpider.gif
rename to src/canonical/models/front-shiny/0751-000-Dewpider.gif
diff --git a/src/canonical/models/front-shiny/0752--000--Araquanid.gif b/src/canonical/models/front-shiny/0752-000-Araquanid.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0752--000--Araquanid.gif
rename to src/canonical/models/front-shiny/0752-000-Araquanid.gif
diff --git a/src/canonical/models/front-shiny/0752--420--Araquanid--Totem.gif b/src/canonical/models/front-shiny/0752-420-Araquanid-Totem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0752--420--Araquanid--Totem.gif
rename to src/canonical/models/front-shiny/0752-420-Araquanid-Totem.gif
diff --git a/src/canonical/models/front-shiny/0753--000--Fomantis.gif b/src/canonical/models/front-shiny/0753-000-Fomantis.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0753--000--Fomantis.gif
rename to src/canonical/models/front-shiny/0753-000-Fomantis.gif
diff --git a/src/canonical/models/front-shiny/0754--000--Lurantis.gif b/src/canonical/models/front-shiny/0754-000-Lurantis.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0754--000--Lurantis.gif
rename to src/canonical/models/front-shiny/0754-000-Lurantis.gif
diff --git a/src/canonical/models/front-shiny/0754--420--Lurantis--Totem.gif b/src/canonical/models/front-shiny/0754-420-Lurantis-Totem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0754--420--Lurantis--Totem.gif
rename to src/canonical/models/front-shiny/0754-420-Lurantis-Totem.gif
diff --git a/src/canonical/models/front-shiny/0755--000--Morelull.gif b/src/canonical/models/front-shiny/0755-000-Morelull.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0755--000--Morelull.gif
rename to src/canonical/models/front-shiny/0755-000-Morelull.gif
diff --git a/src/canonical/models/front-shiny/0756--000--Shiinotic.gif b/src/canonical/models/front-shiny/0756-000-Shiinotic.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0756--000--Shiinotic.gif
rename to src/canonical/models/front-shiny/0756-000-Shiinotic.gif
diff --git a/src/canonical/models/front-shiny/0757--000--Salandit.gif b/src/canonical/models/front-shiny/0757-000-Salandit.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0757--000--Salandit.gif
rename to src/canonical/models/front-shiny/0757-000-Salandit.gif
diff --git a/src/canonical/models/front-shiny/0758--000--Salazzle.gif b/src/canonical/models/front-shiny/0758-000-Salazzle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0758--000--Salazzle.gif
rename to src/canonical/models/front-shiny/0758-000-Salazzle.gif
diff --git a/src/canonical/models/front-shiny/0758--420--Salazzle--Totem.gif b/src/canonical/models/front-shiny/0758-420-Salazzle-Totem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0758--420--Salazzle--Totem.gif
rename to src/canonical/models/front-shiny/0758-420-Salazzle-Totem.gif
diff --git a/src/canonical/models/front-shiny/0759--000--Stufful.gif b/src/canonical/models/front-shiny/0759-000-Stufful.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0759--000--Stufful.gif
rename to src/canonical/models/front-shiny/0759-000-Stufful.gif
diff --git a/src/canonical/models/front-shiny/0760--000--Bewear.gif b/src/canonical/models/front-shiny/0760-000-Bewear.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0760--000--Bewear.gif
rename to src/canonical/models/front-shiny/0760-000-Bewear.gif
diff --git a/src/canonical/models/front-shiny/0761--000--Bounsweet.gif b/src/canonical/models/front-shiny/0761-000-Bounsweet.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0761--000--Bounsweet.gif
rename to src/canonical/models/front-shiny/0761-000-Bounsweet.gif
diff --git a/src/canonical/models/front-shiny/0762--000--Steenee.gif b/src/canonical/models/front-shiny/0762-000-Steenee.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0762--000--Steenee.gif
rename to src/canonical/models/front-shiny/0762-000-Steenee.gif
diff --git a/src/canonical/models/front-shiny/0763--000--Tsareena.gif b/src/canonical/models/front-shiny/0763-000-Tsareena.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0763--000--Tsareena.gif
rename to src/canonical/models/front-shiny/0763-000-Tsareena.gif
diff --git a/src/canonical/models/front-shiny/0764--000--Comfey.gif b/src/canonical/models/front-shiny/0764-000-Comfey.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0764--000--Comfey.gif
rename to src/canonical/models/front-shiny/0764-000-Comfey.gif
diff --git a/src/canonical/models/front-shiny/0765--000--Oranguru.gif b/src/canonical/models/front-shiny/0765-000-Oranguru.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0765--000--Oranguru.gif
rename to src/canonical/models/front-shiny/0765-000-Oranguru.gif
diff --git a/src/canonical/models/front-shiny/0766--000--Passimian.gif b/src/canonical/models/front-shiny/0766-000-Passimian.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0766--000--Passimian.gif
rename to src/canonical/models/front-shiny/0766-000-Passimian.gif
diff --git a/src/canonical/models/front-shiny/0767--000--Wimpod.gif b/src/canonical/models/front-shiny/0767-000-Wimpod.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0767--000--Wimpod.gif
rename to src/canonical/models/front-shiny/0767-000-Wimpod.gif
diff --git a/src/canonical/models/front-shiny/0768--000--Golisopod.gif b/src/canonical/models/front-shiny/0768-000-Golisopod.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0768--000--Golisopod.gif
rename to src/canonical/models/front-shiny/0768-000-Golisopod.gif
diff --git a/src/canonical/models/front-shiny/0769--000--Sandygast.gif b/src/canonical/models/front-shiny/0769-000-Sandygast.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0769--000--Sandygast.gif
rename to src/canonical/models/front-shiny/0769-000-Sandygast.gif
diff --git a/src/canonical/models/front-shiny/0770--000--Palossand.gif b/src/canonical/models/front-shiny/0770-000-Palossand.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0770--000--Palossand.gif
rename to src/canonical/models/front-shiny/0770-000-Palossand.gif
diff --git a/src/canonical/models/front-shiny/0771--000--Pyukumuku.gif b/src/canonical/models/front-shiny/0771-000-Pyukumuku.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0771--000--Pyukumuku.gif
rename to src/canonical/models/front-shiny/0771-000-Pyukumuku.gif
diff --git a/src/canonical/models/front-shiny/0772--000--Type__003a_Null.gif b/src/canonical/models/front-shiny/0772-000-Type__003a_Null.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0772--000--Type__003a_Null.gif
rename to src/canonical/models/front-shiny/0772-000-Type__003a_Null.gif
diff --git a/src/canonical/models/front-shiny/0773--000--Silvally.gif b/src/canonical/models/front-shiny/0773-000-Silvally.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--000--Silvally.gif
rename to src/canonical/models/front-shiny/0773-000-Silvally.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Bug.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Bug.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Bug.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Bug.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Dark.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Dark.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Dark.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Dark.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Dragon.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Dragon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Dragon.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Dragon.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Electric.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Electric.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Electric.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Electric.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Fairy.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Fairy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Fairy.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Fairy.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Fighting.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Fighting.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Fighting.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Fighting.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Fire.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Fire.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Fire.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Fire.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Flying.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Flying.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Flying.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Flying.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Ghost.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Ghost.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Ghost.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Ghost.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Grass.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Grass.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Grass.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Grass.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Ground.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Ground.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Ground.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Ground.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Ice.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Ice.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Ice.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Ice.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Poison.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Poison.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Poison.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Poison.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Psychic.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Psychic.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Psychic.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Psychic.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Rock.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Rock.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Rock.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Rock.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Steel.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Steel.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Steel.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Steel.gif
diff --git a/src/canonical/models/front-shiny/0773--420--Silvally--Water.gif b/src/canonical/models/front-shiny/0773-420-Silvally-Water.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0773--420--Silvally--Water.gif
rename to src/canonical/models/front-shiny/0773-420-Silvally-Water.gif
diff --git a/src/canonical/models/front-shiny/0774--000--Minior.gif b/src/canonical/models/front-shiny/0774-000-Minior.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0774--000--Minior.gif
rename to src/canonical/models/front-shiny/0774-000-Minior.gif
diff --git a/src/canonical/models/front-shiny/0775--000--Komala.gif b/src/canonical/models/front-shiny/0775-000-Komala.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0775--000--Komala.gif
rename to src/canonical/models/front-shiny/0775-000-Komala.gif
diff --git a/src/canonical/models/front-shiny/0776--000--Turtonator.gif b/src/canonical/models/front-shiny/0776-000-Turtonator.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0776--000--Turtonator.gif
rename to src/canonical/models/front-shiny/0776-000-Turtonator.gif
diff --git a/src/canonical/models/front-shiny/0777--000--Togedemaru.gif b/src/canonical/models/front-shiny/0777-000-Togedemaru.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0777--000--Togedemaru.gif
rename to src/canonical/models/front-shiny/0777-000-Togedemaru.gif
diff --git a/src/canonical/models/front-shiny/0777--420--Togedemaru--Totem.gif b/src/canonical/models/front-shiny/0777-420-Togedemaru-Totem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0777--420--Togedemaru--Totem.gif
rename to src/canonical/models/front-shiny/0777-420-Togedemaru-Totem.gif
diff --git a/src/canonical/models/front-shiny/0778--000--Mimikyu.gif b/src/canonical/models/front-shiny/0778-000-Mimikyu.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0778--000--Mimikyu.gif
rename to src/canonical/models/front-shiny/0778-000-Mimikyu.gif
diff --git a/src/canonical/models/front-shiny/0778--420--Mimikyu--Busted.gif b/src/canonical/models/front-shiny/0778-420-Mimikyu-Busted.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0778--420--Mimikyu--Busted.gif
rename to src/canonical/models/front-shiny/0778-420-Mimikyu-Busted.gif
diff --git a/src/canonical/models/front-shiny/0778--420--Mimikyu--Busted-Totem.gif b/src/canonical/models/front-shiny/0778-420-Mimikyu-Busted~Totem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0778--420--Mimikyu--Busted-Totem.gif
rename to src/canonical/models/front-shiny/0778-420-Mimikyu-Busted~Totem.gif
diff --git a/src/canonical/models/front-shiny/0778--420--Mimikyu--Totem.gif b/src/canonical/models/front-shiny/0778-420-Mimikyu-Totem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0778--420--Mimikyu--Totem.gif
rename to src/canonical/models/front-shiny/0778-420-Mimikyu-Totem.gif
diff --git a/src/canonical/models/front-shiny/0779--000--Bruxish.gif b/src/canonical/models/front-shiny/0779-000-Bruxish.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0779--000--Bruxish.gif
rename to src/canonical/models/front-shiny/0779-000-Bruxish.gif
diff --git a/src/canonical/models/front-shiny/0780--000--Drampa.gif b/src/canonical/models/front-shiny/0780-000-Drampa.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0780--000--Drampa.gif
rename to src/canonical/models/front-shiny/0780-000-Drampa.gif
diff --git a/src/canonical/models/front-shiny/0781--000--Dhelmise.gif b/src/canonical/models/front-shiny/0781-000-Dhelmise.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0781--000--Dhelmise.gif
rename to src/canonical/models/front-shiny/0781-000-Dhelmise.gif
diff --git a/src/canonical/models/front-shiny/0782--000--Jangmo-o.gif b/src/canonical/models/front-shiny/0782-000-Jangmo~o.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0782--000--Jangmo-o.gif
rename to src/canonical/models/front-shiny/0782-000-Jangmo~o.gif
diff --git a/src/canonical/models/front-shiny/0783--000--Hakamo-o.gif b/src/canonical/models/front-shiny/0783-000-Hakamo~o.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0783--000--Hakamo-o.gif
rename to src/canonical/models/front-shiny/0783-000-Hakamo~o.gif
diff --git a/src/canonical/models/front-shiny/0784--000--Kommo-o.gif b/src/canonical/models/front-shiny/0784-000-Kommo~o.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0784--000--Kommo-o.gif
rename to src/canonical/models/front-shiny/0784-000-Kommo~o.gif
diff --git a/src/canonical/models/front-shiny/0784--420--Kommo-o--Totem.gif b/src/canonical/models/front-shiny/0784-420-Kommo~o-Totem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0784--420--Kommo-o--Totem.gif
rename to src/canonical/models/front-shiny/0784-420-Kommo~o-Totem.gif
diff --git a/src/canonical/models/front-shiny/0785--000--Tapu_Koko.gif b/src/canonical/models/front-shiny/0785-000-Tapu_Koko.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0785--000--Tapu_Koko.gif
rename to src/canonical/models/front-shiny/0785-000-Tapu_Koko.gif
diff --git a/src/canonical/models/front-shiny/0786--000--Tapu_Lele.gif b/src/canonical/models/front-shiny/0786-000-Tapu_Lele.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0786--000--Tapu_Lele.gif
rename to src/canonical/models/front-shiny/0786-000-Tapu_Lele.gif
diff --git a/src/canonical/models/front-shiny/0787--000--Tapu_Bulu.gif b/src/canonical/models/front-shiny/0787-000-Tapu_Bulu.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0787--000--Tapu_Bulu.gif
rename to src/canonical/models/front-shiny/0787-000-Tapu_Bulu.gif
diff --git a/src/canonical/models/front-shiny/0788--000--Tapu_Fini.gif b/src/canonical/models/front-shiny/0788-000-Tapu_Fini.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0788--000--Tapu_Fini.gif
rename to src/canonical/models/front-shiny/0788-000-Tapu_Fini.gif
diff --git a/src/canonical/models/front-shiny/0789--000--Cosmog.gif b/src/canonical/models/front-shiny/0789-000-Cosmog.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0789--000--Cosmog.gif
rename to src/canonical/models/front-shiny/0789-000-Cosmog.gif
diff --git a/src/canonical/models/front-shiny/0790--000--Cosmoem.gif b/src/canonical/models/front-shiny/0790-000-Cosmoem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0790--000--Cosmoem.gif
rename to src/canonical/models/front-shiny/0790-000-Cosmoem.gif
diff --git a/src/canonical/models/front-shiny/0791--000--Solgaleo.gif b/src/canonical/models/front-shiny/0791-000-Solgaleo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0791--000--Solgaleo.gif
rename to src/canonical/models/front-shiny/0791-000-Solgaleo.gif
diff --git a/src/canonical/models/front-shiny/0792--000--Lunala.gif b/src/canonical/models/front-shiny/0792-000-Lunala.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0792--000--Lunala.gif
rename to src/canonical/models/front-shiny/0792-000-Lunala.gif
diff --git a/src/canonical/models/front-shiny/0793--000--Nihilego.gif b/src/canonical/models/front-shiny/0793-000-Nihilego.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0793--000--Nihilego.gif
rename to src/canonical/models/front-shiny/0793-000-Nihilego.gif
diff --git a/src/canonical/models/front-shiny/0794--000--Buzzwole.gif b/src/canonical/models/front-shiny/0794-000-Buzzwole.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0794--000--Buzzwole.gif
rename to src/canonical/models/front-shiny/0794-000-Buzzwole.gif
diff --git a/src/canonical/models/front-shiny/0795--000--Pheromosa.gif b/src/canonical/models/front-shiny/0795-000-Pheromosa.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0795--000--Pheromosa.gif
rename to src/canonical/models/front-shiny/0795-000-Pheromosa.gif
diff --git a/src/canonical/models/front-shiny/0796--000--Xurkitree.gif b/src/canonical/models/front-shiny/0796-000-Xurkitree.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0796--000--Xurkitree.gif
rename to src/canonical/models/front-shiny/0796-000-Xurkitree.gif
diff --git a/src/canonical/models/front-shiny/0797--000--Celesteela.gif b/src/canonical/models/front-shiny/0797-000-Celesteela.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0797--000--Celesteela.gif
rename to src/canonical/models/front-shiny/0797-000-Celesteela.gif
diff --git a/src/canonical/models/front-shiny/0798--000--Kartana.gif b/src/canonical/models/front-shiny/0798-000-Kartana.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0798--000--Kartana.gif
rename to src/canonical/models/front-shiny/0798-000-Kartana.gif
diff --git a/src/canonical/models/front-shiny/0799--000--Guzzlord.gif b/src/canonical/models/front-shiny/0799-000-Guzzlord.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0799--000--Guzzlord.gif
rename to src/canonical/models/front-shiny/0799-000-Guzzlord.gif
diff --git a/src/canonical/models/front-shiny/0800--000--Necrozma.gif b/src/canonical/models/front-shiny/0800-000-Necrozma.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0800--000--Necrozma.gif
rename to src/canonical/models/front-shiny/0800-000-Necrozma.gif
diff --git a/src/canonical/models/front-shiny/0800--420--Necrozma--Dawn_Wings.gif b/src/canonical/models/front-shiny/0800-420-Necrozma-Dawn_Wings.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0800--420--Necrozma--Dawn_Wings.gif
rename to src/canonical/models/front-shiny/0800-420-Necrozma-Dawn_Wings.gif
diff --git a/src/canonical/models/front-shiny/0800--420--Necrozma--Dusk_Mane.gif b/src/canonical/models/front-shiny/0800-420-Necrozma-Dusk_Mane.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0800--420--Necrozma--Dusk_Mane.gif
rename to src/canonical/models/front-shiny/0800-420-Necrozma-Dusk_Mane.gif
diff --git a/src/canonical/models/front-shiny/0800--420--Necrozma--Ultra.gif b/src/canonical/models/front-shiny/0800-420-Necrozma-Ultra.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0800--420--Necrozma--Ultra.gif
rename to src/canonical/models/front-shiny/0800-420-Necrozma-Ultra.gif
diff --git a/src/canonical/models/front-shiny/0801--000--Magearna.gif b/src/canonical/models/front-shiny/0801-000-Magearna.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0801--000--Magearna.gif
rename to src/canonical/models/front-shiny/0801-000-Magearna.gif
diff --git a/src/canonical/models/front-shiny/0802--000--Marshadow.gif b/src/canonical/models/front-shiny/0802-000-Marshadow.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0802--000--Marshadow.gif
rename to src/canonical/models/front-shiny/0802-000-Marshadow.gif
diff --git a/src/canonical/models/front-shiny/0803--000--Poipole.gif b/src/canonical/models/front-shiny/0803-000-Poipole.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0803--000--Poipole.gif
rename to src/canonical/models/front-shiny/0803-000-Poipole.gif
diff --git a/src/canonical/models/front-shiny/0804--000--Naganadel.gif b/src/canonical/models/front-shiny/0804-000-Naganadel.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0804--000--Naganadel.gif
rename to src/canonical/models/front-shiny/0804-000-Naganadel.gif
diff --git a/src/canonical/models/front-shiny/0805--000--Stakataka.gif b/src/canonical/models/front-shiny/0805-000-Stakataka.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0805--000--Stakataka.gif
rename to src/canonical/models/front-shiny/0805-000-Stakataka.gif
diff --git a/src/canonical/models/front-shiny/0806--000--Blacephalon.gif b/src/canonical/models/front-shiny/0806-000-Blacephalon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0806--000--Blacephalon.gif
rename to src/canonical/models/front-shiny/0806-000-Blacephalon.gif
diff --git a/src/canonical/models/front-shiny/0807--000--Zeraora.gif b/src/canonical/models/front-shiny/0807-000-Zeraora.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0807--000--Zeraora.gif
rename to src/canonical/models/front-shiny/0807-000-Zeraora.gif
diff --git a/src/canonical/models/front-shiny/0808--000--Meltan.gif b/src/canonical/models/front-shiny/0808-000-Meltan.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0808--000--Meltan.gif
rename to src/canonical/models/front-shiny/0808-000-Meltan.gif
diff --git a/src/canonical/models/front-shiny/0809--000--Melmetal.gif b/src/canonical/models/front-shiny/0809-000-Melmetal.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0809--000--Melmetal.gif
rename to src/canonical/models/front-shiny/0809-000-Melmetal.gif
diff --git a/src/canonical/models/front-shiny/0809--420--Melmetal--Gmax.gif b/src/canonical/models/front-shiny/0809-420-Melmetal-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0809--420--Melmetal--Gmax.gif
rename to src/canonical/models/front-shiny/0809-420-Melmetal-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0810--000--Grookey.gif b/src/canonical/models/front-shiny/0810-000-Grookey.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0810--000--Grookey.gif
rename to src/canonical/models/front-shiny/0810-000-Grookey.gif
diff --git a/src/canonical/models/front-shiny/0811--000--Thwackey.gif b/src/canonical/models/front-shiny/0811-000-Thwackey.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0811--000--Thwackey.gif
rename to src/canonical/models/front-shiny/0811-000-Thwackey.gif
diff --git a/src/canonical/models/front-shiny/0812--000--Rillaboom.gif b/src/canonical/models/front-shiny/0812-000-Rillaboom.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0812--000--Rillaboom.gif
rename to src/canonical/models/front-shiny/0812-000-Rillaboom.gif
diff --git a/src/canonical/models/front-shiny/0813--000--Scorbunny.gif b/src/canonical/models/front-shiny/0813-000-Scorbunny.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0813--000--Scorbunny.gif
rename to src/canonical/models/front-shiny/0813-000-Scorbunny.gif
diff --git a/src/canonical/models/front-shiny/0814--000--Raboot.gif b/src/canonical/models/front-shiny/0814-000-Raboot.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0814--000--Raboot.gif
rename to src/canonical/models/front-shiny/0814-000-Raboot.gif
diff --git a/src/canonical/models/front-shiny/0815--000--Cinderace.gif b/src/canonical/models/front-shiny/0815-000-Cinderace.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0815--000--Cinderace.gif
rename to src/canonical/models/front-shiny/0815-000-Cinderace.gif
diff --git a/src/canonical/models/front-shiny/0816--000--Sobble.gif b/src/canonical/models/front-shiny/0816-000-Sobble.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0816--000--Sobble.gif
rename to src/canonical/models/front-shiny/0816-000-Sobble.gif
diff --git a/src/canonical/models/front-shiny/0817--000--Drizzile.gif b/src/canonical/models/front-shiny/0817-000-Drizzile.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0817--000--Drizzile.gif
rename to src/canonical/models/front-shiny/0817-000-Drizzile.gif
diff --git a/src/canonical/models/front-shiny/0818--000--Inteleon.gif b/src/canonical/models/front-shiny/0818-000-Inteleon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0818--000--Inteleon.gif
rename to src/canonical/models/front-shiny/0818-000-Inteleon.gif
diff --git a/src/canonical/models/front-shiny/0819--000--Skwovet.gif b/src/canonical/models/front-shiny/0819-000-Skwovet.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0819--000--Skwovet.gif
rename to src/canonical/models/front-shiny/0819-000-Skwovet.gif
diff --git a/src/canonical/models/front-shiny/0820--000--Greedent.gif b/src/canonical/models/front-shiny/0820-000-Greedent.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0820--000--Greedent.gif
rename to src/canonical/models/front-shiny/0820-000-Greedent.gif
diff --git a/src/canonical/models/front-shiny/0821--000--Rookidee.gif b/src/canonical/models/front-shiny/0821-000-Rookidee.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0821--000--Rookidee.gif
rename to src/canonical/models/front-shiny/0821-000-Rookidee.gif
diff --git a/src/canonical/models/front-shiny/0822--000--Corvisquire.gif b/src/canonical/models/front-shiny/0822-000-Corvisquire.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0822--000--Corvisquire.gif
rename to src/canonical/models/front-shiny/0822-000-Corvisquire.gif
diff --git a/src/canonical/models/front-shiny/0823--000--Corviknight.gif b/src/canonical/models/front-shiny/0823-000-Corviknight.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0823--000--Corviknight.gif
rename to src/canonical/models/front-shiny/0823-000-Corviknight.gif
diff --git a/src/canonical/models/front-shiny/0823--420--Corviknight--Gmax.gif b/src/canonical/models/front-shiny/0823-420-Corviknight-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0823--420--Corviknight--Gmax.gif
rename to src/canonical/models/front-shiny/0823-420-Corviknight-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0824--000--Blipbug.gif b/src/canonical/models/front-shiny/0824-000-Blipbug.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0824--000--Blipbug.gif
rename to src/canonical/models/front-shiny/0824-000-Blipbug.gif
diff --git a/src/canonical/models/front-shiny/0825--000--Dottler.gif b/src/canonical/models/front-shiny/0825-000-Dottler.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0825--000--Dottler.gif
rename to src/canonical/models/front-shiny/0825-000-Dottler.gif
diff --git a/src/canonical/models/front-shiny/0826--000--Orbeetle.gif b/src/canonical/models/front-shiny/0826-000-Orbeetle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0826--000--Orbeetle.gif
rename to src/canonical/models/front-shiny/0826-000-Orbeetle.gif
diff --git a/src/canonical/models/front-shiny/0826--420--Orbeetle--Gmax.gif b/src/canonical/models/front-shiny/0826-420-Orbeetle-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0826--420--Orbeetle--Gmax.gif
rename to src/canonical/models/front-shiny/0826-420-Orbeetle-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0827--000--Nickit.gif b/src/canonical/models/front-shiny/0827-000-Nickit.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0827--000--Nickit.gif
rename to src/canonical/models/front-shiny/0827-000-Nickit.gif
diff --git a/src/canonical/models/front-shiny/0828--000--Thievul.gif b/src/canonical/models/front-shiny/0828-000-Thievul.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0828--000--Thievul.gif
rename to src/canonical/models/front-shiny/0828-000-Thievul.gif
diff --git a/src/canonical/models/front-shiny/0829--000--Gossifleur.gif b/src/canonical/models/front-shiny/0829-000-Gossifleur.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0829--000--Gossifleur.gif
rename to src/canonical/models/front-shiny/0829-000-Gossifleur.gif
diff --git a/src/canonical/models/front-shiny/0830--000--Eldegoss.gif b/src/canonical/models/front-shiny/0830-000-Eldegoss.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0830--000--Eldegoss.gif
rename to src/canonical/models/front-shiny/0830-000-Eldegoss.gif
diff --git a/src/canonical/models/front-shiny/0831--000--Wooloo.gif b/src/canonical/models/front-shiny/0831-000-Wooloo.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0831--000--Wooloo.gif
rename to src/canonical/models/front-shiny/0831-000-Wooloo.gif
diff --git a/src/canonical/models/front-shiny/0832--000--Dubwool.gif b/src/canonical/models/front-shiny/0832-000-Dubwool.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0832--000--Dubwool.gif
rename to src/canonical/models/front-shiny/0832-000-Dubwool.gif
diff --git a/src/canonical/models/front-shiny/0833--000--Chewtle.gif b/src/canonical/models/front-shiny/0833-000-Chewtle.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0833--000--Chewtle.gif
rename to src/canonical/models/front-shiny/0833-000-Chewtle.gif
diff --git a/src/canonical/models/front-shiny/0834--000--Drednaw.gif b/src/canonical/models/front-shiny/0834-000-Drednaw.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0834--000--Drednaw.gif
rename to src/canonical/models/front-shiny/0834-000-Drednaw.gif
diff --git a/src/canonical/models/front-shiny/0834--420--Drednaw--Gmax.gif b/src/canonical/models/front-shiny/0834-420-Drednaw-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0834--420--Drednaw--Gmax.gif
rename to src/canonical/models/front-shiny/0834-420-Drednaw-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0835--000--Yamper.gif b/src/canonical/models/front-shiny/0835-000-Yamper.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0835--000--Yamper.gif
rename to src/canonical/models/front-shiny/0835-000-Yamper.gif
diff --git a/src/canonical/models/front-shiny/0836--000--Boltund.gif b/src/canonical/models/front-shiny/0836-000-Boltund.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0836--000--Boltund.gif
rename to src/canonical/models/front-shiny/0836-000-Boltund.gif
diff --git a/src/canonical/models/front-shiny/0837--000--Rolycoly.gif b/src/canonical/models/front-shiny/0837-000-Rolycoly.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0837--000--Rolycoly.gif
rename to src/canonical/models/front-shiny/0837-000-Rolycoly.gif
diff --git a/src/canonical/models/front-shiny/0838--000--Carkol.gif b/src/canonical/models/front-shiny/0838-000-Carkol.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0838--000--Carkol.gif
rename to src/canonical/models/front-shiny/0838-000-Carkol.gif
diff --git a/src/canonical/models/front-shiny/0839--000--Coalossal.gif b/src/canonical/models/front-shiny/0839-000-Coalossal.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0839--000--Coalossal.gif
rename to src/canonical/models/front-shiny/0839-000-Coalossal.gif
diff --git a/src/canonical/models/front-shiny/0839--420--Coalossal--Gmax.gif b/src/canonical/models/front-shiny/0839-420-Coalossal-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0839--420--Coalossal--Gmax.gif
rename to src/canonical/models/front-shiny/0839-420-Coalossal-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0840--000--Applin.gif b/src/canonical/models/front-shiny/0840-000-Applin.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0840--000--Applin.gif
rename to src/canonical/models/front-shiny/0840-000-Applin.gif
diff --git a/src/canonical/models/front-shiny/0841--000--Flapple.gif b/src/canonical/models/front-shiny/0841-000-Flapple.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0841--000--Flapple.gif
rename to src/canonical/models/front-shiny/0841-000-Flapple.gif
diff --git a/src/canonical/models/front-shiny/0841--420--Flapple--Gmax.gif b/src/canonical/models/front-shiny/0841-420-Flapple-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0841--420--Flapple--Gmax.gif
rename to src/canonical/models/front-shiny/0841-420-Flapple-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0842--000--Appletun.gif b/src/canonical/models/front-shiny/0842-000-Appletun.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0842--000--Appletun.gif
rename to src/canonical/models/front-shiny/0842-000-Appletun.gif
diff --git a/src/canonical/models/front-shiny/0842--420--Appletun--Gmax.gif b/src/canonical/models/front-shiny/0842-420-Appletun-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0842--420--Appletun--Gmax.gif
rename to src/canonical/models/front-shiny/0842-420-Appletun-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0843--000--Silicobra.gif b/src/canonical/models/front-shiny/0843-000-Silicobra.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0843--000--Silicobra.gif
rename to src/canonical/models/front-shiny/0843-000-Silicobra.gif
diff --git a/src/canonical/models/front-shiny/0844--000--Sandaconda.gif b/src/canonical/models/front-shiny/0844-000-Sandaconda.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0844--000--Sandaconda.gif
rename to src/canonical/models/front-shiny/0844-000-Sandaconda.gif
diff --git a/src/canonical/models/front-shiny/0844--420--Sandaconda--Gmax.gif b/src/canonical/models/front-shiny/0844-420-Sandaconda-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0844--420--Sandaconda--Gmax.gif
rename to src/canonical/models/front-shiny/0844-420-Sandaconda-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0845--000--Cramorant.gif b/src/canonical/models/front-shiny/0845-000-Cramorant.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0845--000--Cramorant.gif
rename to src/canonical/models/front-shiny/0845-000-Cramorant.gif
diff --git a/src/canonical/models/front-shiny/0845--420--Cramorant--Gorging.gif b/src/canonical/models/front-shiny/0845-420-Cramorant-Gorging.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0845--420--Cramorant--Gorging.gif
rename to src/canonical/models/front-shiny/0845-420-Cramorant-Gorging.gif
diff --git a/src/canonical/models/front-shiny/0845--420--Cramorant--Gulping.gif b/src/canonical/models/front-shiny/0845-420-Cramorant-Gulping.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0845--420--Cramorant--Gulping.gif
rename to src/canonical/models/front-shiny/0845-420-Cramorant-Gulping.gif
diff --git a/src/canonical/models/front-shiny/0846--000--Arrokuda.gif b/src/canonical/models/front-shiny/0846-000-Arrokuda.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0846--000--Arrokuda.gif
rename to src/canonical/models/front-shiny/0846-000-Arrokuda.gif
diff --git a/src/canonical/models/front-shiny/0847--000--Barraskewda.gif b/src/canonical/models/front-shiny/0847-000-Barraskewda.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0847--000--Barraskewda.gif
rename to src/canonical/models/front-shiny/0847-000-Barraskewda.gif
diff --git a/src/canonical/models/front-shiny/0848--000--Toxel.gif b/src/canonical/models/front-shiny/0848-000-Toxel.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0848--000--Toxel.gif
rename to src/canonical/models/front-shiny/0848-000-Toxel.gif
diff --git a/src/canonical/models/front-shiny/0849--000--Toxtricity.gif b/src/canonical/models/front-shiny/0849-000-Toxtricity.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0849--000--Toxtricity.gif
rename to src/canonical/models/front-shiny/0849-000-Toxtricity.gif
diff --git a/src/canonical/models/front-shiny/0849--420--Toxtricity--Gmax.gif b/src/canonical/models/front-shiny/0849-420-Toxtricity-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0849--420--Toxtricity--Gmax.gif
rename to src/canonical/models/front-shiny/0849-420-Toxtricity-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0849--420--Toxtricity--Low-Key.gif b/src/canonical/models/front-shiny/0849-420-Toxtricity-Low~Key.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0849--420--Toxtricity--Low-Key.gif
rename to src/canonical/models/front-shiny/0849-420-Toxtricity-Low~Key.gif
diff --git a/src/canonical/models/front-shiny/0850--000--Sizzlipede.gif b/src/canonical/models/front-shiny/0850-000-Sizzlipede.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0850--000--Sizzlipede.gif
rename to src/canonical/models/front-shiny/0850-000-Sizzlipede.gif
diff --git a/src/canonical/models/front-shiny/0851--000--Centiskorch.gif b/src/canonical/models/front-shiny/0851-000-Centiskorch.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0851--000--Centiskorch.gif
rename to src/canonical/models/front-shiny/0851-000-Centiskorch.gif
diff --git a/src/canonical/models/front-shiny/0851--420--Centiskorch--Gmax.gif b/src/canonical/models/front-shiny/0851-420-Centiskorch-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0851--420--Centiskorch--Gmax.gif
rename to src/canonical/models/front-shiny/0851-420-Centiskorch-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0852--000--Clobbopus.gif b/src/canonical/models/front-shiny/0852-000-Clobbopus.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0852--000--Clobbopus.gif
rename to src/canonical/models/front-shiny/0852-000-Clobbopus.gif
diff --git a/src/canonical/models/front-shiny/0853--000--Grapploct.gif b/src/canonical/models/front-shiny/0853-000-Grapploct.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0853--000--Grapploct.gif
rename to src/canonical/models/front-shiny/0853-000-Grapploct.gif
diff --git a/src/canonical/models/front-shiny/0854--000--Sinistea.gif b/src/canonical/models/front-shiny/0854-000-Sinistea.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0854--000--Sinistea.gif
rename to src/canonical/models/front-shiny/0854-000-Sinistea.gif
diff --git a/src/canonical/models/front-shiny/0854--420--Sinistea--Antique.gif b/src/canonical/models/front-shiny/0854-420-Sinistea-Antique.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0854--420--Sinistea--Antique.gif
rename to src/canonical/models/front-shiny/0854-420-Sinistea-Antique.gif
diff --git a/src/canonical/models/front-shiny/0855--000--Polteageist.gif b/src/canonical/models/front-shiny/0855-000-Polteageist.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0855--000--Polteageist.gif
rename to src/canonical/models/front-shiny/0855-000-Polteageist.gif
diff --git a/src/canonical/models/front-shiny/0855--420--Polteageist--Antique.gif b/src/canonical/models/front-shiny/0855-420-Polteageist-Antique.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0855--420--Polteageist--Antique.gif
rename to src/canonical/models/front-shiny/0855-420-Polteageist-Antique.gif
diff --git a/src/canonical/models/front-shiny/0856--000--Hatenna.gif b/src/canonical/models/front-shiny/0856-000-Hatenna.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0856--000--Hatenna.gif
rename to src/canonical/models/front-shiny/0856-000-Hatenna.gif
diff --git a/src/canonical/models/front-shiny/0857--000--Hattrem.gif b/src/canonical/models/front-shiny/0857-000-Hattrem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0857--000--Hattrem.gif
rename to src/canonical/models/front-shiny/0857-000-Hattrem.gif
diff --git a/src/canonical/models/front-shiny/0858--000--Hatterene.gif b/src/canonical/models/front-shiny/0858-000-Hatterene.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0858--000--Hatterene.gif
rename to src/canonical/models/front-shiny/0858-000-Hatterene.gif
diff --git a/src/canonical/models/front-shiny/0858--420--Hatterene--Gmax.gif b/src/canonical/models/front-shiny/0858-420-Hatterene-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0858--420--Hatterene--Gmax.gif
rename to src/canonical/models/front-shiny/0858-420-Hatterene-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0859--000--Impidimp.gif b/src/canonical/models/front-shiny/0859-000-Impidimp.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0859--000--Impidimp.gif
rename to src/canonical/models/front-shiny/0859-000-Impidimp.gif
diff --git a/src/canonical/models/front-shiny/0860--000--Morgrem.gif b/src/canonical/models/front-shiny/0860-000-Morgrem.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0860--000--Morgrem.gif
rename to src/canonical/models/front-shiny/0860-000-Morgrem.gif
diff --git a/src/canonical/models/front-shiny/0861--000--Grimmsnarl.gif b/src/canonical/models/front-shiny/0861-000-Grimmsnarl.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0861--000--Grimmsnarl.gif
rename to src/canonical/models/front-shiny/0861-000-Grimmsnarl.gif
diff --git a/src/canonical/models/front-shiny/0861--420--Grimmsnarl--Gmax.gif b/src/canonical/models/front-shiny/0861-420-Grimmsnarl-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0861--420--Grimmsnarl--Gmax.gif
rename to src/canonical/models/front-shiny/0861-420-Grimmsnarl-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0862--000--Obstagoon.gif b/src/canonical/models/front-shiny/0862-000-Obstagoon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0862--000--Obstagoon.gif
rename to src/canonical/models/front-shiny/0862-000-Obstagoon.gif
diff --git a/src/canonical/models/front-shiny/0863--000--Perrserker.gif b/src/canonical/models/front-shiny/0863-000-Perrserker.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0863--000--Perrserker.gif
rename to src/canonical/models/front-shiny/0863-000-Perrserker.gif
diff --git a/src/canonical/models/front-shiny/0864--000--Cursola.gif b/src/canonical/models/front-shiny/0864-000-Cursola.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0864--000--Cursola.gif
rename to src/canonical/models/front-shiny/0864-000-Cursola.gif
diff --git a/src/canonical/models/front-shiny/0865--000--Sirfetch__0027d.gif b/src/canonical/models/front-shiny/0865-000-Sirfetch__0027d.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0865--000--Sirfetch__0027d.gif
rename to src/canonical/models/front-shiny/0865-000-Sirfetch__0027d.gif
diff --git a/src/canonical/models/front-shiny/0866--000--Mr._Rime.gif b/src/canonical/models/front-shiny/0866-000-Mr._Rime.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0866--000--Mr._Rime.gif
rename to src/canonical/models/front-shiny/0866-000-Mr._Rime.gif
diff --git a/src/canonical/models/front-shiny/0867--000--Runerigus.gif b/src/canonical/models/front-shiny/0867-000-Runerigus.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0867--000--Runerigus.gif
rename to src/canonical/models/front-shiny/0867-000-Runerigus.gif
diff --git a/src/canonical/models/front-shiny/0868--000--Milcery.gif b/src/canonical/models/front-shiny/0868-000-Milcery.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0868--000--Milcery.gif
rename to src/canonical/models/front-shiny/0868-000-Milcery.gif
diff --git a/src/canonical/models/front-shiny/0869--000--Alcremie.gif b/src/canonical/models/front-shiny/0869-000-Alcremie.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0869--000--Alcremie.gif
rename to src/canonical/models/front-shiny/0869-000-Alcremie.gif
diff --git a/src/canonical/models/front-shiny/0869--420--Alcremie--Gmax.gif b/src/canonical/models/front-shiny/0869-420-Alcremie-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0869--420--Alcremie--Gmax.gif
rename to src/canonical/models/front-shiny/0869-420-Alcremie-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0870--000--Falinks.gif b/src/canonical/models/front-shiny/0870-000-Falinks.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0870--000--Falinks.gif
rename to src/canonical/models/front-shiny/0870-000-Falinks.gif
diff --git a/src/canonical/models/front-shiny/0871--000--Pincurchin.gif b/src/canonical/models/front-shiny/0871-000-Pincurchin.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0871--000--Pincurchin.gif
rename to src/canonical/models/front-shiny/0871-000-Pincurchin.gif
diff --git a/src/canonical/models/front-shiny/0872--000--Snom.gif b/src/canonical/models/front-shiny/0872-000-Snom.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0872--000--Snom.gif
rename to src/canonical/models/front-shiny/0872-000-Snom.gif
diff --git a/src/canonical/models/front-shiny/0873--000--Frosmoth.gif b/src/canonical/models/front-shiny/0873-000-Frosmoth.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0873--000--Frosmoth.gif
rename to src/canonical/models/front-shiny/0873-000-Frosmoth.gif
diff --git a/src/canonical/models/front-shiny/0874--000--Stonjourner.gif b/src/canonical/models/front-shiny/0874-000-Stonjourner.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0874--000--Stonjourner.gif
rename to src/canonical/models/front-shiny/0874-000-Stonjourner.gif
diff --git a/src/canonical/models/front-shiny/0875--000--Eiscue.gif b/src/canonical/models/front-shiny/0875-000-Eiscue.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0875--000--Eiscue.gif
rename to src/canonical/models/front-shiny/0875-000-Eiscue.gif
diff --git a/src/canonical/models/front-shiny/0875--420--Eiscue--Noice.gif b/src/canonical/models/front-shiny/0875-420-Eiscue-Noice.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0875--420--Eiscue--Noice.gif
rename to src/canonical/models/front-shiny/0875-420-Eiscue-Noice.gif
diff --git a/src/canonical/models/front-shiny/0876--000--Indeedee.gif b/src/canonical/models/front-shiny/0876-000-Indeedee.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0876--000--Indeedee.gif
rename to src/canonical/models/front-shiny/0876-000-Indeedee.gif
diff --git a/src/canonical/models/front-shiny/0876--420--Indeedee--F.gif b/src/canonical/models/front-shiny/0876-420-Indeedee-F.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0876--420--Indeedee--F.gif
rename to src/canonical/models/front-shiny/0876-420-Indeedee-F.gif
diff --git a/src/canonical/models/front-shiny/0877--000--Morpeko.gif b/src/canonical/models/front-shiny/0877-000-Morpeko.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0877--000--Morpeko.gif
rename to src/canonical/models/front-shiny/0877-000-Morpeko.gif
diff --git a/src/canonical/models/front-shiny/0877--420--Morpeko--Hangry.gif b/src/canonical/models/front-shiny/0877-420-Morpeko-Hangry.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0877--420--Morpeko--Hangry.gif
rename to src/canonical/models/front-shiny/0877-420-Morpeko-Hangry.gif
diff --git a/src/canonical/models/front-shiny/0878--000--Cufant.gif b/src/canonical/models/front-shiny/0878-000-Cufant.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0878--000--Cufant.gif
rename to src/canonical/models/front-shiny/0878-000-Cufant.gif
diff --git a/src/canonical/models/front-shiny/0879--000--Copperajah.gif b/src/canonical/models/front-shiny/0879-000-Copperajah.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0879--000--Copperajah.gif
rename to src/canonical/models/front-shiny/0879-000-Copperajah.gif
diff --git a/src/canonical/models/front-shiny/0879--420--Copperajah--Gmax.gif b/src/canonical/models/front-shiny/0879-420-Copperajah-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0879--420--Copperajah--Gmax.gif
rename to src/canonical/models/front-shiny/0879-420-Copperajah-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0880--000--Dracozolt.gif b/src/canonical/models/front-shiny/0880-000-Dracozolt.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0880--000--Dracozolt.gif
rename to src/canonical/models/front-shiny/0880-000-Dracozolt.gif
diff --git a/src/canonical/models/front-shiny/0881--000--Arctozolt.gif b/src/canonical/models/front-shiny/0881-000-Arctozolt.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0881--000--Arctozolt.gif
rename to src/canonical/models/front-shiny/0881-000-Arctozolt.gif
diff --git a/src/canonical/models/front-shiny/0882--000--Dracovish.gif b/src/canonical/models/front-shiny/0882-000-Dracovish.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0882--000--Dracovish.gif
rename to src/canonical/models/front-shiny/0882-000-Dracovish.gif
diff --git a/src/canonical/models/front-shiny/0883--000--Arctovish.gif b/src/canonical/models/front-shiny/0883-000-Arctovish.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0883--000--Arctovish.gif
rename to src/canonical/models/front-shiny/0883-000-Arctovish.gif
diff --git a/src/canonical/models/front-shiny/0884--000--Duraludon.gif b/src/canonical/models/front-shiny/0884-000-Duraludon.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0884--000--Duraludon.gif
rename to src/canonical/models/front-shiny/0884-000-Duraludon.gif
diff --git a/src/canonical/models/front-shiny/0884--420--Duraludon--Gmax.gif b/src/canonical/models/front-shiny/0884-420-Duraludon-Gmax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0884--420--Duraludon--Gmax.gif
rename to src/canonical/models/front-shiny/0884-420-Duraludon-Gmax.gif
diff --git a/src/canonical/models/front-shiny/0885--000--Dreepy.gif b/src/canonical/models/front-shiny/0885-000-Dreepy.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0885--000--Dreepy.gif
rename to src/canonical/models/front-shiny/0885-000-Dreepy.gif
diff --git a/src/canonical/models/front-shiny/0886--000--Drakloak.gif b/src/canonical/models/front-shiny/0886-000-Drakloak.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0886--000--Drakloak.gif
rename to src/canonical/models/front-shiny/0886-000-Drakloak.gif
diff --git a/src/canonical/models/front-shiny/0887--000--Dragapult.gif b/src/canonical/models/front-shiny/0887-000-Dragapult.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0887--000--Dragapult.gif
rename to src/canonical/models/front-shiny/0887-000-Dragapult.gif
diff --git a/src/canonical/models/front-shiny/0888--000--Zacian.gif b/src/canonical/models/front-shiny/0888-000-Zacian.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0888--000--Zacian.gif
rename to src/canonical/models/front-shiny/0888-000-Zacian.gif
diff --git a/src/canonical/models/front-shiny/0888--420--Zacian--Crowned.gif b/src/canonical/models/front-shiny/0888-420-Zacian-Crowned.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0888--420--Zacian--Crowned.gif
rename to src/canonical/models/front-shiny/0888-420-Zacian-Crowned.gif
diff --git a/src/canonical/models/front-shiny/0889--000--Zamazenta.gif b/src/canonical/models/front-shiny/0889-000-Zamazenta.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0889--000--Zamazenta.gif
rename to src/canonical/models/front-shiny/0889-000-Zamazenta.gif
diff --git a/src/canonical/models/front-shiny/0889--420--Zamazenta--Crowned.gif b/src/canonical/models/front-shiny/0889-420-Zamazenta-Crowned.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0889--420--Zamazenta--Crowned.gif
rename to src/canonical/models/front-shiny/0889-420-Zamazenta-Crowned.gif
diff --git a/src/canonical/models/front-shiny/0890--000--Eternatus.gif b/src/canonical/models/front-shiny/0890-000-Eternatus.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0890--000--Eternatus.gif
rename to src/canonical/models/front-shiny/0890-000-Eternatus.gif
diff --git a/src/canonical/models/front-shiny/0890--420--Eternatus--Eternamax.gif b/src/canonical/models/front-shiny/0890-420-Eternatus-Eternamax.gif
similarity index 100%
rename from src/canonical/models/front-shiny/0890--420--Eternatus--Eternamax.gif
rename to src/canonical/models/front-shiny/0890-420-Eternatus-Eternamax.gif
diff --git a/src/canonical/models/front/0001--000--Bulbasaur.gif b/src/canonical/models/front/0001-000-Bulbasaur.gif
similarity index 100%
rename from src/canonical/models/front/0001--000--Bulbasaur.gif
rename to src/canonical/models/front/0001-000-Bulbasaur.gif
diff --git a/src/canonical/models/front/0002--000--Ivysaur.gif b/src/canonical/models/front/0002-000-Ivysaur.gif
similarity index 100%
rename from src/canonical/models/front/0002--000--Ivysaur.gif
rename to src/canonical/models/front/0002-000-Ivysaur.gif
diff --git a/src/canonical/models/front/0003--000--Venusaur.gif b/src/canonical/models/front/0003-000-Venusaur.gif
similarity index 100%
rename from src/canonical/models/front/0003--000--Venusaur.gif
rename to src/canonical/models/front/0003-000-Venusaur.gif
diff --git a/src/canonical/models/front/0003--420--Venusaur--Mega.gif b/src/canonical/models/front/0003-420-Venusaur-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0003--420--Venusaur--Mega.gif
rename to src/canonical/models/front/0003-420-Venusaur-Mega.gif
diff --git a/src/canonical/models/front/0004--000--Charmander.gif b/src/canonical/models/front/0004-000-Charmander.gif
similarity index 100%
rename from src/canonical/models/front/0004--000--Charmander.gif
rename to src/canonical/models/front/0004-000-Charmander.gif
diff --git a/src/canonical/models/front/0005--000--Charmeleon.gif b/src/canonical/models/front/0005-000-Charmeleon.gif
similarity index 100%
rename from src/canonical/models/front/0005--000--Charmeleon.gif
rename to src/canonical/models/front/0005-000-Charmeleon.gif
diff --git a/src/canonical/models/front/0006--000--Charizard.gif b/src/canonical/models/front/0006-000-Charizard.gif
similarity index 100%
rename from src/canonical/models/front/0006--000--Charizard.gif
rename to src/canonical/models/front/0006-000-Charizard.gif
diff --git a/src/canonical/models/front/0006--420--Charizard--Gmax.gif b/src/canonical/models/front/0006-420-Charizard-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0006--420--Charizard--Gmax.gif
rename to src/canonical/models/front/0006-420-Charizard-Gmax.gif
diff --git a/src/canonical/models/front/0006--420--Charizard--Mega-X.gif b/src/canonical/models/front/0006-420-Charizard-Mega~X.gif
similarity index 100%
rename from src/canonical/models/front/0006--420--Charizard--Mega-X.gif
rename to src/canonical/models/front/0006-420-Charizard-Mega~X.gif
diff --git a/src/canonical/models/front/0006--420--Charizard--Mega-Y.gif b/src/canonical/models/front/0006-420-Charizard-Mega~Y.gif
similarity index 100%
rename from src/canonical/models/front/0006--420--Charizard--Mega-Y.gif
rename to src/canonical/models/front/0006-420-Charizard-Mega~Y.gif
diff --git a/src/canonical/models/front/0007--000--Squirtle.gif b/src/canonical/models/front/0007-000-Squirtle.gif
similarity index 100%
rename from src/canonical/models/front/0007--000--Squirtle.gif
rename to src/canonical/models/front/0007-000-Squirtle.gif
diff --git a/src/canonical/models/front/0008--000--Wartortle.gif b/src/canonical/models/front/0008-000-Wartortle.gif
similarity index 100%
rename from src/canonical/models/front/0008--000--Wartortle.gif
rename to src/canonical/models/front/0008-000-Wartortle.gif
diff --git a/src/canonical/models/front/0009--000--Blastoise.gif b/src/canonical/models/front/0009-000-Blastoise.gif
similarity index 100%
rename from src/canonical/models/front/0009--000--Blastoise.gif
rename to src/canonical/models/front/0009-000-Blastoise.gif
diff --git a/src/canonical/models/front/0009--420--Blastoise--Mega.gif b/src/canonical/models/front/0009-420-Blastoise-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0009--420--Blastoise--Mega.gif
rename to src/canonical/models/front/0009-420-Blastoise-Mega.gif
diff --git a/src/canonical/models/front/0010--000--Caterpie.gif b/src/canonical/models/front/0010-000-Caterpie.gif
similarity index 100%
rename from src/canonical/models/front/0010--000--Caterpie.gif
rename to src/canonical/models/front/0010-000-Caterpie.gif
diff --git a/src/canonical/models/front/0011--000--Metapod.gif b/src/canonical/models/front/0011-000-Metapod.gif
similarity index 100%
rename from src/canonical/models/front/0011--000--Metapod.gif
rename to src/canonical/models/front/0011-000-Metapod.gif
diff --git a/src/canonical/models/front/0012--000--Butterfree.gif b/src/canonical/models/front/0012-000-Butterfree.gif
similarity index 100%
rename from src/canonical/models/front/0012--000--Butterfree.gif
rename to src/canonical/models/front/0012-000-Butterfree.gif
diff --git a/src/canonical/models/front/0012--420--Butterfree--Gmax.gif b/src/canonical/models/front/0012-420-Butterfree-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0012--420--Butterfree--Gmax.gif
rename to src/canonical/models/front/0012-420-Butterfree-Gmax.gif
diff --git a/src/canonical/models/front/0013--000--Weedle.gif b/src/canonical/models/front/0013-000-Weedle.gif
similarity index 100%
rename from src/canonical/models/front/0013--000--Weedle.gif
rename to src/canonical/models/front/0013-000-Weedle.gif
diff --git a/src/canonical/models/front/0014--000--Kakuna.gif b/src/canonical/models/front/0014-000-Kakuna.gif
similarity index 100%
rename from src/canonical/models/front/0014--000--Kakuna.gif
rename to src/canonical/models/front/0014-000-Kakuna.gif
diff --git a/src/canonical/models/front/0015--000--Beedrill.gif b/src/canonical/models/front/0015-000-Beedrill.gif
similarity index 100%
rename from src/canonical/models/front/0015--000--Beedrill.gif
rename to src/canonical/models/front/0015-000-Beedrill.gif
diff --git a/src/canonical/models/front/0015--420--Beedrill--Mega.gif b/src/canonical/models/front/0015-420-Beedrill-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0015--420--Beedrill--Mega.gif
rename to src/canonical/models/front/0015-420-Beedrill-Mega.gif
diff --git a/src/canonical/models/front/0016--000--Pidgey.gif b/src/canonical/models/front/0016-000-Pidgey.gif
similarity index 100%
rename from src/canonical/models/front/0016--000--Pidgey.gif
rename to src/canonical/models/front/0016-000-Pidgey.gif
diff --git a/src/canonical/models/front/0017--000--Pidgeotto.gif b/src/canonical/models/front/0017-000-Pidgeotto.gif
similarity index 100%
rename from src/canonical/models/front/0017--000--Pidgeotto.gif
rename to src/canonical/models/front/0017-000-Pidgeotto.gif
diff --git a/src/canonical/models/front/0018--000--Pidgeot.gif b/src/canonical/models/front/0018-000-Pidgeot.gif
similarity index 100%
rename from src/canonical/models/front/0018--000--Pidgeot.gif
rename to src/canonical/models/front/0018-000-Pidgeot.gif
diff --git a/src/canonical/models/front/0018--420--Pidgeot--Mega.gif b/src/canonical/models/front/0018-420-Pidgeot-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0018--420--Pidgeot--Mega.gif
rename to src/canonical/models/front/0018-420-Pidgeot-Mega.gif
diff --git a/src/canonical/models/front/0019--000--Rattata.gif b/src/canonical/models/front/0019-000-Rattata.gif
similarity index 100%
rename from src/canonical/models/front/0019--000--Rattata.gif
rename to src/canonical/models/front/0019-000-Rattata.gif
diff --git a/src/canonical/models/front/0019--420--Rattata--Alola.gif b/src/canonical/models/front/0019-420-Rattata-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0019--420--Rattata--Alola.gif
rename to src/canonical/models/front/0019-420-Rattata-Alola.gif
diff --git a/src/canonical/models/front/0020--000--Raticate.gif b/src/canonical/models/front/0020-000-Raticate.gif
similarity index 100%
rename from src/canonical/models/front/0020--000--Raticate.gif
rename to src/canonical/models/front/0020-000-Raticate.gif
diff --git a/src/canonical/models/front/0020--420--Raticate--Alola.gif b/src/canonical/models/front/0020-420-Raticate-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0020--420--Raticate--Alola.gif
rename to src/canonical/models/front/0020-420-Raticate-Alola.gif
diff --git a/src/canonical/models/front/0020--420--Raticate--Alola-Totem.gif b/src/canonical/models/front/0020-420-Raticate-Alola~Totem.gif
similarity index 100%
rename from src/canonical/models/front/0020--420--Raticate--Alola-Totem.gif
rename to src/canonical/models/front/0020-420-Raticate-Alola~Totem.gif
diff --git a/src/canonical/models/front/0021--000--Spearow.gif b/src/canonical/models/front/0021-000-Spearow.gif
similarity index 100%
rename from src/canonical/models/front/0021--000--Spearow.gif
rename to src/canonical/models/front/0021-000-Spearow.gif
diff --git a/src/canonical/models/front/0022--000--Fearow.gif b/src/canonical/models/front/0022-000-Fearow.gif
similarity index 100%
rename from src/canonical/models/front/0022--000--Fearow.gif
rename to src/canonical/models/front/0022-000-Fearow.gif
diff --git a/src/canonical/models/front/0023--000--Ekans.gif b/src/canonical/models/front/0023-000-Ekans.gif
similarity index 100%
rename from src/canonical/models/front/0023--000--Ekans.gif
rename to src/canonical/models/front/0023-000-Ekans.gif
diff --git a/src/canonical/models/front/0024--000--Arbok.gif b/src/canonical/models/front/0024-000-Arbok.gif
similarity index 100%
rename from src/canonical/models/front/0024--000--Arbok.gif
rename to src/canonical/models/front/0024-000-Arbok.gif
diff --git a/src/canonical/models/front/0025--000--Pikachu.gif b/src/canonical/models/front/0025-000-Pikachu.gif
similarity index 100%
rename from src/canonical/models/front/0025--000--Pikachu.gif
rename to src/canonical/models/front/0025-000-Pikachu.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--Alola.gif b/src/canonical/models/front/0025-420-Pikachu-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--Alola.gif
rename to src/canonical/models/front/0025-420-Pikachu-Alola.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--Belle.gif b/src/canonical/models/front/0025-420-Pikachu-Belle.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--Belle.gif
rename to src/canonical/models/front/0025-420-Pikachu-Belle.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--Cosplay.gif b/src/canonical/models/front/0025-420-Pikachu-Cosplay.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--Cosplay.gif
rename to src/canonical/models/front/0025-420-Pikachu-Cosplay.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--Gmax.gif b/src/canonical/models/front/0025-420-Pikachu-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--Gmax.gif
rename to src/canonical/models/front/0025-420-Pikachu-Gmax.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--Hoenn.gif b/src/canonical/models/front/0025-420-Pikachu-Hoenn.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--Hoenn.gif
rename to src/canonical/models/front/0025-420-Pikachu-Hoenn.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--Kalos.gif b/src/canonical/models/front/0025-420-Pikachu-Kalos.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--Kalos.gif
rename to src/canonical/models/front/0025-420-Pikachu-Kalos.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--Libre.gif b/src/canonical/models/front/0025-420-Pikachu-Libre.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--Libre.gif
rename to src/canonical/models/front/0025-420-Pikachu-Libre.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--Original.gif b/src/canonical/models/front/0025-420-Pikachu-Original.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--Original.gif
rename to src/canonical/models/front/0025-420-Pikachu-Original.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--Partner.gif b/src/canonical/models/front/0025-420-Pikachu-Partner.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--Partner.gif
rename to src/canonical/models/front/0025-420-Pikachu-Partner.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--PhD.gif b/src/canonical/models/front/0025-420-Pikachu-PhD.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--PhD.gif
rename to src/canonical/models/front/0025-420-Pikachu-PhD.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--Pop-Star.gif b/src/canonical/models/front/0025-420-Pikachu-Pop~Star.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--Pop-Star.gif
rename to src/canonical/models/front/0025-420-Pikachu-Pop~Star.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--Rock-Star.gif b/src/canonical/models/front/0025-420-Pikachu-Rock~Star.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--Rock-Star.gif
rename to src/canonical/models/front/0025-420-Pikachu-Rock~Star.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--Sinnoh.gif b/src/canonical/models/front/0025-420-Pikachu-Sinnoh.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--Sinnoh.gif
rename to src/canonical/models/front/0025-420-Pikachu-Sinnoh.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--Starter.gif b/src/canonical/models/front/0025-420-Pikachu-Starter.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--Starter.gif
rename to src/canonical/models/front/0025-420-Pikachu-Starter.gif
diff --git a/src/canonical/models/front/0025--420--Pikachu--Unova.gif b/src/canonical/models/front/0025-420-Pikachu-Unova.gif
similarity index 100%
rename from src/canonical/models/front/0025--420--Pikachu--Unova.gif
rename to src/canonical/models/front/0025-420-Pikachu-Unova.gif
diff --git a/src/canonical/models/front/0026--000--Raichu.gif b/src/canonical/models/front/0026-000-Raichu.gif
similarity index 100%
rename from src/canonical/models/front/0026--000--Raichu.gif
rename to src/canonical/models/front/0026-000-Raichu.gif
diff --git a/src/canonical/models/front/0026--420--Raichu--Alola.gif b/src/canonical/models/front/0026-420-Raichu-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0026--420--Raichu--Alola.gif
rename to src/canonical/models/front/0026-420-Raichu-Alola.gif
diff --git a/src/canonical/models/front/0027--000--Sandshrew.gif b/src/canonical/models/front/0027-000-Sandshrew.gif
similarity index 100%
rename from src/canonical/models/front/0027--000--Sandshrew.gif
rename to src/canonical/models/front/0027-000-Sandshrew.gif
diff --git a/src/canonical/models/front/0027--420--Sandshrew--Alola.gif b/src/canonical/models/front/0027-420-Sandshrew-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0027--420--Sandshrew--Alola.gif
rename to src/canonical/models/front/0027-420-Sandshrew-Alola.gif
diff --git a/src/canonical/models/front/0028--000--Sandslash.gif b/src/canonical/models/front/0028-000-Sandslash.gif
similarity index 100%
rename from src/canonical/models/front/0028--000--Sandslash.gif
rename to src/canonical/models/front/0028-000-Sandslash.gif
diff --git a/src/canonical/models/front/0028--420--Sandslash--Alola.gif b/src/canonical/models/front/0028-420-Sandslash-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0028--420--Sandslash--Alola.gif
rename to src/canonical/models/front/0028-420-Sandslash-Alola.gif
diff --git a/src/canonical/models/front/0029--000--Nidoran-F.gif b/src/canonical/models/front/0029-000-Nidoran~F.gif
similarity index 100%
rename from src/canonical/models/front/0029--000--Nidoran-F.gif
rename to src/canonical/models/front/0029-000-Nidoran~F.gif
diff --git a/src/canonical/models/front/0030--000--Nidorina.gif b/src/canonical/models/front/0030-000-Nidorina.gif
similarity index 100%
rename from src/canonical/models/front/0030--000--Nidorina.gif
rename to src/canonical/models/front/0030-000-Nidorina.gif
diff --git a/src/canonical/models/front/0031--000--Nidoqueen.gif b/src/canonical/models/front/0031-000-Nidoqueen.gif
similarity index 100%
rename from src/canonical/models/front/0031--000--Nidoqueen.gif
rename to src/canonical/models/front/0031-000-Nidoqueen.gif
diff --git a/src/canonical/models/front/0032--000--Nidoran-M.gif b/src/canonical/models/front/0032-000-Nidoran~M.gif
similarity index 100%
rename from src/canonical/models/front/0032--000--Nidoran-M.gif
rename to src/canonical/models/front/0032-000-Nidoran~M.gif
diff --git a/src/canonical/models/front/0033--000--Nidorino.gif b/src/canonical/models/front/0033-000-Nidorino.gif
similarity index 100%
rename from src/canonical/models/front/0033--000--Nidorino.gif
rename to src/canonical/models/front/0033-000-Nidorino.gif
diff --git a/src/canonical/models/front/0034--000--Nidoking.gif b/src/canonical/models/front/0034-000-Nidoking.gif
similarity index 100%
rename from src/canonical/models/front/0034--000--Nidoking.gif
rename to src/canonical/models/front/0034-000-Nidoking.gif
diff --git a/src/canonical/models/front/0035--000--Clefairy.gif b/src/canonical/models/front/0035-000-Clefairy.gif
similarity index 100%
rename from src/canonical/models/front/0035--000--Clefairy.gif
rename to src/canonical/models/front/0035-000-Clefairy.gif
diff --git a/src/canonical/models/front/0036--000--Clefable.gif b/src/canonical/models/front/0036-000-Clefable.gif
similarity index 100%
rename from src/canonical/models/front/0036--000--Clefable.gif
rename to src/canonical/models/front/0036-000-Clefable.gif
diff --git a/src/canonical/models/front/0037--000--Vulpix.gif b/src/canonical/models/front/0037-000-Vulpix.gif
similarity index 100%
rename from src/canonical/models/front/0037--000--Vulpix.gif
rename to src/canonical/models/front/0037-000-Vulpix.gif
diff --git a/src/canonical/models/front/0037--420--Vulpix--Alola.gif b/src/canonical/models/front/0037-420-Vulpix-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0037--420--Vulpix--Alola.gif
rename to src/canonical/models/front/0037-420-Vulpix-Alola.gif
diff --git a/src/canonical/models/front/0038--000--Ninetales.gif b/src/canonical/models/front/0038-000-Ninetales.gif
similarity index 100%
rename from src/canonical/models/front/0038--000--Ninetales.gif
rename to src/canonical/models/front/0038-000-Ninetales.gif
diff --git a/src/canonical/models/front/0038--420--Ninetales--Alola.gif b/src/canonical/models/front/0038-420-Ninetales-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0038--420--Ninetales--Alola.gif
rename to src/canonical/models/front/0038-420-Ninetales-Alola.gif
diff --git a/src/canonical/models/front/0039--000--Jigglypuff.gif b/src/canonical/models/front/0039-000-Jigglypuff.gif
similarity index 100%
rename from src/canonical/models/front/0039--000--Jigglypuff.gif
rename to src/canonical/models/front/0039-000-Jigglypuff.gif
diff --git a/src/canonical/models/front/0040--000--Wigglytuff.gif b/src/canonical/models/front/0040-000-Wigglytuff.gif
similarity index 100%
rename from src/canonical/models/front/0040--000--Wigglytuff.gif
rename to src/canonical/models/front/0040-000-Wigglytuff.gif
diff --git a/src/canonical/models/front/0041--000--Zubat.gif b/src/canonical/models/front/0041-000-Zubat.gif
similarity index 100%
rename from src/canonical/models/front/0041--000--Zubat.gif
rename to src/canonical/models/front/0041-000-Zubat.gif
diff --git a/src/canonical/models/front/0042--000--Golbat.gif b/src/canonical/models/front/0042-000-Golbat.gif
similarity index 100%
rename from src/canonical/models/front/0042--000--Golbat.gif
rename to src/canonical/models/front/0042-000-Golbat.gif
diff --git a/src/canonical/models/front/0043--000--Oddish.gif b/src/canonical/models/front/0043-000-Oddish.gif
similarity index 100%
rename from src/canonical/models/front/0043--000--Oddish.gif
rename to src/canonical/models/front/0043-000-Oddish.gif
diff --git a/src/canonical/models/front/0044--000--Gloom.gif b/src/canonical/models/front/0044-000-Gloom.gif
similarity index 100%
rename from src/canonical/models/front/0044--000--Gloom.gif
rename to src/canonical/models/front/0044-000-Gloom.gif
diff --git a/src/canonical/models/front/0045--000--Vileplume.gif b/src/canonical/models/front/0045-000-Vileplume.gif
similarity index 100%
rename from src/canonical/models/front/0045--000--Vileplume.gif
rename to src/canonical/models/front/0045-000-Vileplume.gif
diff --git a/src/canonical/models/front/0046--000--Paras.gif b/src/canonical/models/front/0046-000-Paras.gif
similarity index 100%
rename from src/canonical/models/front/0046--000--Paras.gif
rename to src/canonical/models/front/0046-000-Paras.gif
diff --git a/src/canonical/models/front/0047--000--Parasect.gif b/src/canonical/models/front/0047-000-Parasect.gif
similarity index 100%
rename from src/canonical/models/front/0047--000--Parasect.gif
rename to src/canonical/models/front/0047-000-Parasect.gif
diff --git a/src/canonical/models/front/0048--000--Venonat.gif b/src/canonical/models/front/0048-000-Venonat.gif
similarity index 100%
rename from src/canonical/models/front/0048--000--Venonat.gif
rename to src/canonical/models/front/0048-000-Venonat.gif
diff --git a/src/canonical/models/front/0049--000--Venomoth.gif b/src/canonical/models/front/0049-000-Venomoth.gif
similarity index 100%
rename from src/canonical/models/front/0049--000--Venomoth.gif
rename to src/canonical/models/front/0049-000-Venomoth.gif
diff --git a/src/canonical/models/front/0050--000--Diglett.gif b/src/canonical/models/front/0050-000-Diglett.gif
similarity index 100%
rename from src/canonical/models/front/0050--000--Diglett.gif
rename to src/canonical/models/front/0050-000-Diglett.gif
diff --git a/src/canonical/models/front/0050--420--Diglett--Alola.gif b/src/canonical/models/front/0050-420-Diglett-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0050--420--Diglett--Alola.gif
rename to src/canonical/models/front/0050-420-Diglett-Alola.gif
diff --git a/src/canonical/models/front/0051--000--Dugtrio.gif b/src/canonical/models/front/0051-000-Dugtrio.gif
similarity index 100%
rename from src/canonical/models/front/0051--000--Dugtrio.gif
rename to src/canonical/models/front/0051-000-Dugtrio.gif
diff --git a/src/canonical/models/front/0051--420--Dugtrio--Alola.gif b/src/canonical/models/front/0051-420-Dugtrio-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0051--420--Dugtrio--Alola.gif
rename to src/canonical/models/front/0051-420-Dugtrio-Alola.gif
diff --git a/src/canonical/models/front/0052--000--Meowth.gif b/src/canonical/models/front/0052-000-Meowth.gif
similarity index 100%
rename from src/canonical/models/front/0052--000--Meowth.gif
rename to src/canonical/models/front/0052-000-Meowth.gif
diff --git a/src/canonical/models/front/0052--420--Meowth--Alola.gif b/src/canonical/models/front/0052-420-Meowth-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0052--420--Meowth--Alola.gif
rename to src/canonical/models/front/0052-420-Meowth-Alola.gif
diff --git a/src/canonical/models/front/0052--420--Meowth--Galar.gif b/src/canonical/models/front/0052-420-Meowth-Galar.gif
similarity index 100%
rename from src/canonical/models/front/0052--420--Meowth--Galar.gif
rename to src/canonical/models/front/0052-420-Meowth-Galar.gif
diff --git a/src/canonical/models/front/0052--420--Meowth--Gmax.gif b/src/canonical/models/front/0052-420-Meowth-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0052--420--Meowth--Gmax.gif
rename to src/canonical/models/front/0052-420-Meowth-Gmax.gif
diff --git a/src/canonical/models/front/0053--000--Persian.gif b/src/canonical/models/front/0053-000-Persian.gif
similarity index 100%
rename from src/canonical/models/front/0053--000--Persian.gif
rename to src/canonical/models/front/0053-000-Persian.gif
diff --git a/src/canonical/models/front/0053--420--Persian--Alola.gif b/src/canonical/models/front/0053-420-Persian-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0053--420--Persian--Alola.gif
rename to src/canonical/models/front/0053-420-Persian-Alola.gif
diff --git a/src/canonical/models/front/0054--000--Psyduck.gif b/src/canonical/models/front/0054-000-Psyduck.gif
similarity index 100%
rename from src/canonical/models/front/0054--000--Psyduck.gif
rename to src/canonical/models/front/0054-000-Psyduck.gif
diff --git a/src/canonical/models/front/0055--000--Golduck.gif b/src/canonical/models/front/0055-000-Golduck.gif
similarity index 100%
rename from src/canonical/models/front/0055--000--Golduck.gif
rename to src/canonical/models/front/0055-000-Golduck.gif
diff --git a/src/canonical/models/front/0056--000--Mankey.gif b/src/canonical/models/front/0056-000-Mankey.gif
similarity index 100%
rename from src/canonical/models/front/0056--000--Mankey.gif
rename to src/canonical/models/front/0056-000-Mankey.gif
diff --git a/src/canonical/models/front/0057--000--Primeape.gif b/src/canonical/models/front/0057-000-Primeape.gif
similarity index 100%
rename from src/canonical/models/front/0057--000--Primeape.gif
rename to src/canonical/models/front/0057-000-Primeape.gif
diff --git a/src/canonical/models/front/0058--000--Growlithe.gif b/src/canonical/models/front/0058-000-Growlithe.gif
similarity index 100%
rename from src/canonical/models/front/0058--000--Growlithe.gif
rename to src/canonical/models/front/0058-000-Growlithe.gif
diff --git a/src/canonical/models/front/0059--000--Arcanine.gif b/src/canonical/models/front/0059-000-Arcanine.gif
similarity index 100%
rename from src/canonical/models/front/0059--000--Arcanine.gif
rename to src/canonical/models/front/0059-000-Arcanine.gif
diff --git a/src/canonical/models/front/0060--000--Poliwag.gif b/src/canonical/models/front/0060-000-Poliwag.gif
similarity index 100%
rename from src/canonical/models/front/0060--000--Poliwag.gif
rename to src/canonical/models/front/0060-000-Poliwag.gif
diff --git a/src/canonical/models/front/0061--000--Poliwhirl.gif b/src/canonical/models/front/0061-000-Poliwhirl.gif
similarity index 100%
rename from src/canonical/models/front/0061--000--Poliwhirl.gif
rename to src/canonical/models/front/0061-000-Poliwhirl.gif
diff --git a/src/canonical/models/front/0062--000--Poliwrath.gif b/src/canonical/models/front/0062-000-Poliwrath.gif
similarity index 100%
rename from src/canonical/models/front/0062--000--Poliwrath.gif
rename to src/canonical/models/front/0062-000-Poliwrath.gif
diff --git a/src/canonical/models/front/0063--000--Abra.gif b/src/canonical/models/front/0063-000-Abra.gif
similarity index 100%
rename from src/canonical/models/front/0063--000--Abra.gif
rename to src/canonical/models/front/0063-000-Abra.gif
diff --git a/src/canonical/models/front/0064--000--Kadabra.gif b/src/canonical/models/front/0064-000-Kadabra.gif
similarity index 100%
rename from src/canonical/models/front/0064--000--Kadabra.gif
rename to src/canonical/models/front/0064-000-Kadabra.gif
diff --git a/src/canonical/models/front/0065--000--Alakazam.gif b/src/canonical/models/front/0065-000-Alakazam.gif
similarity index 100%
rename from src/canonical/models/front/0065--000--Alakazam.gif
rename to src/canonical/models/front/0065-000-Alakazam.gif
diff --git a/src/canonical/models/front/0065--420--Alakazam--Mega.gif b/src/canonical/models/front/0065-420-Alakazam-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0065--420--Alakazam--Mega.gif
rename to src/canonical/models/front/0065-420-Alakazam-Mega.gif
diff --git a/src/canonical/models/front/0066--000--Machop.gif b/src/canonical/models/front/0066-000-Machop.gif
similarity index 100%
rename from src/canonical/models/front/0066--000--Machop.gif
rename to src/canonical/models/front/0066-000-Machop.gif
diff --git a/src/canonical/models/front/0067--000--Machoke.gif b/src/canonical/models/front/0067-000-Machoke.gif
similarity index 100%
rename from src/canonical/models/front/0067--000--Machoke.gif
rename to src/canonical/models/front/0067-000-Machoke.gif
diff --git a/src/canonical/models/front/0068--000--Machamp.gif b/src/canonical/models/front/0068-000-Machamp.gif
similarity index 100%
rename from src/canonical/models/front/0068--000--Machamp.gif
rename to src/canonical/models/front/0068-000-Machamp.gif
diff --git a/src/canonical/models/front/0068--420--Machamp--Gmax.gif b/src/canonical/models/front/0068-420-Machamp-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0068--420--Machamp--Gmax.gif
rename to src/canonical/models/front/0068-420-Machamp-Gmax.gif
diff --git a/src/canonical/models/front/0069--000--Bellsprout.gif b/src/canonical/models/front/0069-000-Bellsprout.gif
similarity index 100%
rename from src/canonical/models/front/0069--000--Bellsprout.gif
rename to src/canonical/models/front/0069-000-Bellsprout.gif
diff --git a/src/canonical/models/front/0070--000--Weepinbell.gif b/src/canonical/models/front/0070-000-Weepinbell.gif
similarity index 100%
rename from src/canonical/models/front/0070--000--Weepinbell.gif
rename to src/canonical/models/front/0070-000-Weepinbell.gif
diff --git a/src/canonical/models/front/0071--000--Victreebel.gif b/src/canonical/models/front/0071-000-Victreebel.gif
similarity index 100%
rename from src/canonical/models/front/0071--000--Victreebel.gif
rename to src/canonical/models/front/0071-000-Victreebel.gif
diff --git a/src/canonical/models/front/0072--000--Tentacool.gif b/src/canonical/models/front/0072-000-Tentacool.gif
similarity index 100%
rename from src/canonical/models/front/0072--000--Tentacool.gif
rename to src/canonical/models/front/0072-000-Tentacool.gif
diff --git a/src/canonical/models/front/0073--000--Tentacruel.gif b/src/canonical/models/front/0073-000-Tentacruel.gif
similarity index 100%
rename from src/canonical/models/front/0073--000--Tentacruel.gif
rename to src/canonical/models/front/0073-000-Tentacruel.gif
diff --git a/src/canonical/models/front/0074--000--Geodude.gif b/src/canonical/models/front/0074-000-Geodude.gif
similarity index 100%
rename from src/canonical/models/front/0074--000--Geodude.gif
rename to src/canonical/models/front/0074-000-Geodude.gif
diff --git a/src/canonical/models/front/0074--420--Geodude--Alola.gif b/src/canonical/models/front/0074-420-Geodude-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0074--420--Geodude--Alola.gif
rename to src/canonical/models/front/0074-420-Geodude-Alola.gif
diff --git a/src/canonical/models/front/0075--000--Graveler.gif b/src/canonical/models/front/0075-000-Graveler.gif
similarity index 100%
rename from src/canonical/models/front/0075--000--Graveler.gif
rename to src/canonical/models/front/0075-000-Graveler.gif
diff --git a/src/canonical/models/front/0075--420--Graveler--Alola.gif b/src/canonical/models/front/0075-420-Graveler-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0075--420--Graveler--Alola.gif
rename to src/canonical/models/front/0075-420-Graveler-Alola.gif
diff --git a/src/canonical/models/front/0076--000--Golem.gif b/src/canonical/models/front/0076-000-Golem.gif
similarity index 100%
rename from src/canonical/models/front/0076--000--Golem.gif
rename to src/canonical/models/front/0076-000-Golem.gif
diff --git a/src/canonical/models/front/0076--420--Golem--Alola.gif b/src/canonical/models/front/0076-420-Golem-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0076--420--Golem--Alola.gif
rename to src/canonical/models/front/0076-420-Golem-Alola.gif
diff --git a/src/canonical/models/front/0077--000--Ponyta.gif b/src/canonical/models/front/0077-000-Ponyta.gif
similarity index 100%
rename from src/canonical/models/front/0077--000--Ponyta.gif
rename to src/canonical/models/front/0077-000-Ponyta.gif
diff --git a/src/canonical/models/front/0077--420--Ponyta--Galar.gif b/src/canonical/models/front/0077-420-Ponyta-Galar.gif
similarity index 100%
rename from src/canonical/models/front/0077--420--Ponyta--Galar.gif
rename to src/canonical/models/front/0077-420-Ponyta-Galar.gif
diff --git a/src/canonical/models/front/0078--000--Rapidash.gif b/src/canonical/models/front/0078-000-Rapidash.gif
similarity index 100%
rename from src/canonical/models/front/0078--000--Rapidash.gif
rename to src/canonical/models/front/0078-000-Rapidash.gif
diff --git a/src/canonical/models/front/0078--420--Rapidash--Galar.gif b/src/canonical/models/front/0078-420-Rapidash-Galar.gif
similarity index 100%
rename from src/canonical/models/front/0078--420--Rapidash--Galar.gif
rename to src/canonical/models/front/0078-420-Rapidash-Galar.gif
diff --git a/src/canonical/models/front/0079--000--Slowpoke.gif b/src/canonical/models/front/0079-000-Slowpoke.gif
similarity index 100%
rename from src/canonical/models/front/0079--000--Slowpoke.gif
rename to src/canonical/models/front/0079-000-Slowpoke.gif
diff --git a/src/canonical/models/front/0079--420--Slowpoke--Galar.gif b/src/canonical/models/front/0079-420-Slowpoke-Galar.gif
similarity index 100%
rename from src/canonical/models/front/0079--420--Slowpoke--Galar.gif
rename to src/canonical/models/front/0079-420-Slowpoke-Galar.gif
diff --git a/src/canonical/models/front/0080--000--Slowbro.gif b/src/canonical/models/front/0080-000-Slowbro.gif
similarity index 100%
rename from src/canonical/models/front/0080--000--Slowbro.gif
rename to src/canonical/models/front/0080-000-Slowbro.gif
diff --git a/src/canonical/models/front/0080--420--Slowbro--Mega.gif b/src/canonical/models/front/0080-420-Slowbro-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0080--420--Slowbro--Mega.gif
rename to src/canonical/models/front/0080-420-Slowbro-Mega.gif
diff --git a/src/canonical/models/front/0081--000--Magnemite.gif b/src/canonical/models/front/0081-000-Magnemite.gif
similarity index 100%
rename from src/canonical/models/front/0081--000--Magnemite.gif
rename to src/canonical/models/front/0081-000-Magnemite.gif
diff --git a/src/canonical/models/front/0082--000--Magneton.gif b/src/canonical/models/front/0082-000-Magneton.gif
similarity index 100%
rename from src/canonical/models/front/0082--000--Magneton.gif
rename to src/canonical/models/front/0082-000-Magneton.gif
diff --git a/src/canonical/models/front/0083--000--Farfetch__0027d.gif b/src/canonical/models/front/0083-000-Farfetch__0027d.gif
similarity index 100%
rename from src/canonical/models/front/0083--000--Farfetch__0027d.gif
rename to src/canonical/models/front/0083-000-Farfetch__0027d.gif
diff --git a/src/canonical/models/front/0083--420--Farfetch__0027d--Galar.gif b/src/canonical/models/front/0083-420-Farfetch__0027d-Galar.gif
similarity index 100%
rename from src/canonical/models/front/0083--420--Farfetch__0027d--Galar.gif
rename to src/canonical/models/front/0083-420-Farfetch__0027d-Galar.gif
diff --git a/src/canonical/models/front/0084--000--Doduo.gif b/src/canonical/models/front/0084-000-Doduo.gif
similarity index 100%
rename from src/canonical/models/front/0084--000--Doduo.gif
rename to src/canonical/models/front/0084-000-Doduo.gif
diff --git a/src/canonical/models/front/0085--000--Dodrio.gif b/src/canonical/models/front/0085-000-Dodrio.gif
similarity index 100%
rename from src/canonical/models/front/0085--000--Dodrio.gif
rename to src/canonical/models/front/0085-000-Dodrio.gif
diff --git a/src/canonical/models/front/0086--000--Seel.gif b/src/canonical/models/front/0086-000-Seel.gif
similarity index 100%
rename from src/canonical/models/front/0086--000--Seel.gif
rename to src/canonical/models/front/0086-000-Seel.gif
diff --git a/src/canonical/models/front/0087--000--Dewgong.gif b/src/canonical/models/front/0087-000-Dewgong.gif
similarity index 100%
rename from src/canonical/models/front/0087--000--Dewgong.gif
rename to src/canonical/models/front/0087-000-Dewgong.gif
diff --git a/src/canonical/models/front/0088--000--Grimer.gif b/src/canonical/models/front/0088-000-Grimer.gif
similarity index 100%
rename from src/canonical/models/front/0088--000--Grimer.gif
rename to src/canonical/models/front/0088-000-Grimer.gif
diff --git a/src/canonical/models/front/0088--420--Grimer--Alola.gif b/src/canonical/models/front/0088-420-Grimer-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0088--420--Grimer--Alola.gif
rename to src/canonical/models/front/0088-420-Grimer-Alola.gif
diff --git a/src/canonical/models/front/0089--000--Muk.gif b/src/canonical/models/front/0089-000-Muk.gif
similarity index 100%
rename from src/canonical/models/front/0089--000--Muk.gif
rename to src/canonical/models/front/0089-000-Muk.gif
diff --git a/src/canonical/models/front/0089--420--Muk--Alola.gif b/src/canonical/models/front/0089-420-Muk-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0089--420--Muk--Alola.gif
rename to src/canonical/models/front/0089-420-Muk-Alola.gif
diff --git a/src/canonical/models/front/0090--000--Shellder.gif b/src/canonical/models/front/0090-000-Shellder.gif
similarity index 100%
rename from src/canonical/models/front/0090--000--Shellder.gif
rename to src/canonical/models/front/0090-000-Shellder.gif
diff --git a/src/canonical/models/front/0091--000--Cloyster.gif b/src/canonical/models/front/0091-000-Cloyster.gif
similarity index 100%
rename from src/canonical/models/front/0091--000--Cloyster.gif
rename to src/canonical/models/front/0091-000-Cloyster.gif
diff --git a/src/canonical/models/front/0092--000--Gastly.gif b/src/canonical/models/front/0092-000-Gastly.gif
similarity index 100%
rename from src/canonical/models/front/0092--000--Gastly.gif
rename to src/canonical/models/front/0092-000-Gastly.gif
diff --git a/src/canonical/models/front/0093--000--Haunter.gif b/src/canonical/models/front/0093-000-Haunter.gif
similarity index 100%
rename from src/canonical/models/front/0093--000--Haunter.gif
rename to src/canonical/models/front/0093-000-Haunter.gif
diff --git a/src/canonical/models/front/0094--000--Gengar.gif b/src/canonical/models/front/0094-000-Gengar.gif
similarity index 100%
rename from src/canonical/models/front/0094--000--Gengar.gif
rename to src/canonical/models/front/0094-000-Gengar.gif
diff --git a/src/canonical/models/front/0094--420--Gengar--Gmax.gif b/src/canonical/models/front/0094-420-Gengar-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0094--420--Gengar--Gmax.gif
rename to src/canonical/models/front/0094-420-Gengar-Gmax.gif
diff --git a/src/canonical/models/front/0094--420--Gengar--Mega.gif b/src/canonical/models/front/0094-420-Gengar-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0094--420--Gengar--Mega.gif
rename to src/canonical/models/front/0094-420-Gengar-Mega.gif
diff --git a/src/canonical/models/front/0095--000--Onix.gif b/src/canonical/models/front/0095-000-Onix.gif
similarity index 100%
rename from src/canonical/models/front/0095--000--Onix.gif
rename to src/canonical/models/front/0095-000-Onix.gif
diff --git a/src/canonical/models/front/0096--000--Drowzee.gif b/src/canonical/models/front/0096-000-Drowzee.gif
similarity index 100%
rename from src/canonical/models/front/0096--000--Drowzee.gif
rename to src/canonical/models/front/0096-000-Drowzee.gif
diff --git a/src/canonical/models/front/0097--000--Hypno.gif b/src/canonical/models/front/0097-000-Hypno.gif
similarity index 100%
rename from src/canonical/models/front/0097--000--Hypno.gif
rename to src/canonical/models/front/0097-000-Hypno.gif
diff --git a/src/canonical/models/front/0098--000--Krabby.gif b/src/canonical/models/front/0098-000-Krabby.gif
similarity index 100%
rename from src/canonical/models/front/0098--000--Krabby.gif
rename to src/canonical/models/front/0098-000-Krabby.gif
diff --git a/src/canonical/models/front/0099--000--Kingler.gif b/src/canonical/models/front/0099-000-Kingler.gif
similarity index 100%
rename from src/canonical/models/front/0099--000--Kingler.gif
rename to src/canonical/models/front/0099-000-Kingler.gif
diff --git a/src/canonical/models/front/0099--420--Kingler--Gmax.gif b/src/canonical/models/front/0099-420-Kingler-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0099--420--Kingler--Gmax.gif
rename to src/canonical/models/front/0099-420-Kingler-Gmax.gif
diff --git a/src/canonical/models/front/0100--000--Voltorb.gif b/src/canonical/models/front/0100-000-Voltorb.gif
similarity index 100%
rename from src/canonical/models/front/0100--000--Voltorb.gif
rename to src/canonical/models/front/0100-000-Voltorb.gif
diff --git a/src/canonical/models/front/0101--000--Electrode.gif b/src/canonical/models/front/0101-000-Electrode.gif
similarity index 100%
rename from src/canonical/models/front/0101--000--Electrode.gif
rename to src/canonical/models/front/0101-000-Electrode.gif
diff --git a/src/canonical/models/front/0102--000--Exeggcute.gif b/src/canonical/models/front/0102-000-Exeggcute.gif
similarity index 100%
rename from src/canonical/models/front/0102--000--Exeggcute.gif
rename to src/canonical/models/front/0102-000-Exeggcute.gif
diff --git a/src/canonical/models/front/0103--000--Exeggutor.gif b/src/canonical/models/front/0103-000-Exeggutor.gif
similarity index 100%
rename from src/canonical/models/front/0103--000--Exeggutor.gif
rename to src/canonical/models/front/0103-000-Exeggutor.gif
diff --git a/src/canonical/models/front/0103--420--Exeggutor--Alola.gif b/src/canonical/models/front/0103-420-Exeggutor-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0103--420--Exeggutor--Alola.gif
rename to src/canonical/models/front/0103-420-Exeggutor-Alola.gif
diff --git a/src/canonical/models/front/0104--000--Cubone.gif b/src/canonical/models/front/0104-000-Cubone.gif
similarity index 100%
rename from src/canonical/models/front/0104--000--Cubone.gif
rename to src/canonical/models/front/0104-000-Cubone.gif
diff --git a/src/canonical/models/front/0105--000--Marowak.gif b/src/canonical/models/front/0105-000-Marowak.gif
similarity index 100%
rename from src/canonical/models/front/0105--000--Marowak.gif
rename to src/canonical/models/front/0105-000-Marowak.gif
diff --git a/src/canonical/models/front/0105--420--Marowak--Alola.gif b/src/canonical/models/front/0105-420-Marowak-Alola.gif
similarity index 100%
rename from src/canonical/models/front/0105--420--Marowak--Alola.gif
rename to src/canonical/models/front/0105-420-Marowak-Alola.gif
diff --git a/src/canonical/models/front/0105--420--Marowak--Alola-Totem.gif b/src/canonical/models/front/0105-420-Marowak-Alola~Totem.gif
similarity index 100%
rename from src/canonical/models/front/0105--420--Marowak--Alola-Totem.gif
rename to src/canonical/models/front/0105-420-Marowak-Alola~Totem.gif
diff --git a/src/canonical/models/front/0106--000--Hitmonlee.gif b/src/canonical/models/front/0106-000-Hitmonlee.gif
similarity index 100%
rename from src/canonical/models/front/0106--000--Hitmonlee.gif
rename to src/canonical/models/front/0106-000-Hitmonlee.gif
diff --git a/src/canonical/models/front/0107--000--Hitmonchan.gif b/src/canonical/models/front/0107-000-Hitmonchan.gif
similarity index 100%
rename from src/canonical/models/front/0107--000--Hitmonchan.gif
rename to src/canonical/models/front/0107-000-Hitmonchan.gif
diff --git a/src/canonical/models/front/0108--000--Lickitung.gif b/src/canonical/models/front/0108-000-Lickitung.gif
similarity index 100%
rename from src/canonical/models/front/0108--000--Lickitung.gif
rename to src/canonical/models/front/0108-000-Lickitung.gif
diff --git a/src/canonical/models/front/0109--000--Koffing.gif b/src/canonical/models/front/0109-000-Koffing.gif
similarity index 100%
rename from src/canonical/models/front/0109--000--Koffing.gif
rename to src/canonical/models/front/0109-000-Koffing.gif
diff --git a/src/canonical/models/front/0110--000--Weezing.gif b/src/canonical/models/front/0110-000-Weezing.gif
similarity index 100%
rename from src/canonical/models/front/0110--000--Weezing.gif
rename to src/canonical/models/front/0110-000-Weezing.gif
diff --git a/src/canonical/models/front/0110--420--Weezing--Galar.gif b/src/canonical/models/front/0110-420-Weezing-Galar.gif
similarity index 100%
rename from src/canonical/models/front/0110--420--Weezing--Galar.gif
rename to src/canonical/models/front/0110-420-Weezing-Galar.gif
diff --git a/src/canonical/models/front/0111--000--Rhyhorn.gif b/src/canonical/models/front/0111-000-Rhyhorn.gif
similarity index 100%
rename from src/canonical/models/front/0111--000--Rhyhorn.gif
rename to src/canonical/models/front/0111-000-Rhyhorn.gif
diff --git a/src/canonical/models/front/0112--000--Rhydon.gif b/src/canonical/models/front/0112-000-Rhydon.gif
similarity index 100%
rename from src/canonical/models/front/0112--000--Rhydon.gif
rename to src/canonical/models/front/0112-000-Rhydon.gif
diff --git a/src/canonical/models/front/0113--000--Chansey.gif b/src/canonical/models/front/0113-000-Chansey.gif
similarity index 100%
rename from src/canonical/models/front/0113--000--Chansey.gif
rename to src/canonical/models/front/0113-000-Chansey.gif
diff --git a/src/canonical/models/front/0114--000--Tangela.gif b/src/canonical/models/front/0114-000-Tangela.gif
similarity index 100%
rename from src/canonical/models/front/0114--000--Tangela.gif
rename to src/canonical/models/front/0114-000-Tangela.gif
diff --git a/src/canonical/models/front/0115--000--Kangaskhan.gif b/src/canonical/models/front/0115-000-Kangaskhan.gif
similarity index 100%
rename from src/canonical/models/front/0115--000--Kangaskhan.gif
rename to src/canonical/models/front/0115-000-Kangaskhan.gif
diff --git a/src/canonical/models/front/0115--420--Kangaskhan--Mega.gif b/src/canonical/models/front/0115-420-Kangaskhan-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0115--420--Kangaskhan--Mega.gif
rename to src/canonical/models/front/0115-420-Kangaskhan-Mega.gif
diff --git a/src/canonical/models/front/0116--000--Horsea.gif b/src/canonical/models/front/0116-000-Horsea.gif
similarity index 100%
rename from src/canonical/models/front/0116--000--Horsea.gif
rename to src/canonical/models/front/0116-000-Horsea.gif
diff --git a/src/canonical/models/front/0117--000--Seadra.gif b/src/canonical/models/front/0117-000-Seadra.gif
similarity index 100%
rename from src/canonical/models/front/0117--000--Seadra.gif
rename to src/canonical/models/front/0117-000-Seadra.gif
diff --git a/src/canonical/models/front/0118--000--Goldeen.gif b/src/canonical/models/front/0118-000-Goldeen.gif
similarity index 100%
rename from src/canonical/models/front/0118--000--Goldeen.gif
rename to src/canonical/models/front/0118-000-Goldeen.gif
diff --git a/src/canonical/models/front/0119--000--Seaking.gif b/src/canonical/models/front/0119-000-Seaking.gif
similarity index 100%
rename from src/canonical/models/front/0119--000--Seaking.gif
rename to src/canonical/models/front/0119-000-Seaking.gif
diff --git a/src/canonical/models/front/0120--000--Staryu.gif b/src/canonical/models/front/0120-000-Staryu.gif
similarity index 100%
rename from src/canonical/models/front/0120--000--Staryu.gif
rename to src/canonical/models/front/0120-000-Staryu.gif
diff --git a/src/canonical/models/front/0121--000--Starmie.gif b/src/canonical/models/front/0121-000-Starmie.gif
similarity index 100%
rename from src/canonical/models/front/0121--000--Starmie.gif
rename to src/canonical/models/front/0121-000-Starmie.gif
diff --git a/src/canonical/models/front/0122--000--Mr._Mime.gif b/src/canonical/models/front/0122-000-Mr._Mime.gif
similarity index 100%
rename from src/canonical/models/front/0122--000--Mr._Mime.gif
rename to src/canonical/models/front/0122-000-Mr._Mime.gif
diff --git a/src/canonical/models/front/0122--420--Mr._Mime--Galar.gif b/src/canonical/models/front/0122-420-Mr._Mime-Galar.gif
similarity index 100%
rename from src/canonical/models/front/0122--420--Mr._Mime--Galar.gif
rename to src/canonical/models/front/0122-420-Mr._Mime-Galar.gif
diff --git a/src/canonical/models/front/0123--000--Scyther.gif b/src/canonical/models/front/0123-000-Scyther.gif
similarity index 100%
rename from src/canonical/models/front/0123--000--Scyther.gif
rename to src/canonical/models/front/0123-000-Scyther.gif
diff --git a/src/canonical/models/front/0124--000--Jynx.gif b/src/canonical/models/front/0124-000-Jynx.gif
similarity index 100%
rename from src/canonical/models/front/0124--000--Jynx.gif
rename to src/canonical/models/front/0124-000-Jynx.gif
diff --git a/src/canonical/models/front/0125--000--Electabuzz.gif b/src/canonical/models/front/0125-000-Electabuzz.gif
similarity index 100%
rename from src/canonical/models/front/0125--000--Electabuzz.gif
rename to src/canonical/models/front/0125-000-Electabuzz.gif
diff --git a/src/canonical/models/front/0126--000--Magmar.gif b/src/canonical/models/front/0126-000-Magmar.gif
similarity index 100%
rename from src/canonical/models/front/0126--000--Magmar.gif
rename to src/canonical/models/front/0126-000-Magmar.gif
diff --git a/src/canonical/models/front/0127--000--Pinsir.gif b/src/canonical/models/front/0127-000-Pinsir.gif
similarity index 100%
rename from src/canonical/models/front/0127--000--Pinsir.gif
rename to src/canonical/models/front/0127-000-Pinsir.gif
diff --git a/src/canonical/models/front/0127--420--Pinsir--Mega.gif b/src/canonical/models/front/0127-420-Pinsir-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0127--420--Pinsir--Mega.gif
rename to src/canonical/models/front/0127-420-Pinsir-Mega.gif
diff --git a/src/canonical/models/front/0128--000--Tauros.gif b/src/canonical/models/front/0128-000-Tauros.gif
similarity index 100%
rename from src/canonical/models/front/0128--000--Tauros.gif
rename to src/canonical/models/front/0128-000-Tauros.gif
diff --git a/src/canonical/models/front/0129--000--Magikarp.gif b/src/canonical/models/front/0129-000-Magikarp.gif
similarity index 100%
rename from src/canonical/models/front/0129--000--Magikarp.gif
rename to src/canonical/models/front/0129-000-Magikarp.gif
diff --git a/src/canonical/models/front/0130--000--Gyarados.gif b/src/canonical/models/front/0130-000-Gyarados.gif
similarity index 100%
rename from src/canonical/models/front/0130--000--Gyarados.gif
rename to src/canonical/models/front/0130-000-Gyarados.gif
diff --git a/src/canonical/models/front/0130--420--Gyarados--Mega.gif b/src/canonical/models/front/0130-420-Gyarados-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0130--420--Gyarados--Mega.gif
rename to src/canonical/models/front/0130-420-Gyarados-Mega.gif
diff --git a/src/canonical/models/front/0131--000--Lapras.gif b/src/canonical/models/front/0131-000-Lapras.gif
similarity index 100%
rename from src/canonical/models/front/0131--000--Lapras.gif
rename to src/canonical/models/front/0131-000-Lapras.gif
diff --git a/src/canonical/models/front/0131--420--Lapras--Gmax.gif b/src/canonical/models/front/0131-420-Lapras-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0131--420--Lapras--Gmax.gif
rename to src/canonical/models/front/0131-420-Lapras-Gmax.gif
diff --git a/src/canonical/models/front/0132--000--Ditto.gif b/src/canonical/models/front/0132-000-Ditto.gif
similarity index 100%
rename from src/canonical/models/front/0132--000--Ditto.gif
rename to src/canonical/models/front/0132-000-Ditto.gif
diff --git a/src/canonical/models/front/0133--000--Eevee.gif b/src/canonical/models/front/0133-000-Eevee.gif
similarity index 100%
rename from src/canonical/models/front/0133--000--Eevee.gif
rename to src/canonical/models/front/0133-000-Eevee.gif
diff --git a/src/canonical/models/front/0133--420--Eevee--Gmax.gif b/src/canonical/models/front/0133-420-Eevee-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0133--420--Eevee--Gmax.gif
rename to src/canonical/models/front/0133-420-Eevee-Gmax.gif
diff --git a/src/canonical/models/front/0133--420--Eevee--Starter.gif b/src/canonical/models/front/0133-420-Eevee-Starter.gif
similarity index 100%
rename from src/canonical/models/front/0133--420--Eevee--Starter.gif
rename to src/canonical/models/front/0133-420-Eevee-Starter.gif
diff --git a/src/canonical/models/front/0134--000--Vaporeon.gif b/src/canonical/models/front/0134-000-Vaporeon.gif
similarity index 100%
rename from src/canonical/models/front/0134--000--Vaporeon.gif
rename to src/canonical/models/front/0134-000-Vaporeon.gif
diff --git a/src/canonical/models/front/0135--000--Jolteon.gif b/src/canonical/models/front/0135-000-Jolteon.gif
similarity index 100%
rename from src/canonical/models/front/0135--000--Jolteon.gif
rename to src/canonical/models/front/0135-000-Jolteon.gif
diff --git a/src/canonical/models/front/0136--000--Flareon.gif b/src/canonical/models/front/0136-000-Flareon.gif
similarity index 100%
rename from src/canonical/models/front/0136--000--Flareon.gif
rename to src/canonical/models/front/0136-000-Flareon.gif
diff --git a/src/canonical/models/front/0137--000--Porygon.gif b/src/canonical/models/front/0137-000-Porygon.gif
similarity index 100%
rename from src/canonical/models/front/0137--000--Porygon.gif
rename to src/canonical/models/front/0137-000-Porygon.gif
diff --git a/src/canonical/models/front/0138--000--Omanyte.gif b/src/canonical/models/front/0138-000-Omanyte.gif
similarity index 100%
rename from src/canonical/models/front/0138--000--Omanyte.gif
rename to src/canonical/models/front/0138-000-Omanyte.gif
diff --git a/src/canonical/models/front/0139--000--Omastar.gif b/src/canonical/models/front/0139-000-Omastar.gif
similarity index 100%
rename from src/canonical/models/front/0139--000--Omastar.gif
rename to src/canonical/models/front/0139-000-Omastar.gif
diff --git a/src/canonical/models/front/0140--000--Kabuto.gif b/src/canonical/models/front/0140-000-Kabuto.gif
similarity index 100%
rename from src/canonical/models/front/0140--000--Kabuto.gif
rename to src/canonical/models/front/0140-000-Kabuto.gif
diff --git a/src/canonical/models/front/0141--000--Kabutops.gif b/src/canonical/models/front/0141-000-Kabutops.gif
similarity index 100%
rename from src/canonical/models/front/0141--000--Kabutops.gif
rename to src/canonical/models/front/0141-000-Kabutops.gif
diff --git a/src/canonical/models/front/0142--000--Aerodactyl.gif b/src/canonical/models/front/0142-000-Aerodactyl.gif
similarity index 100%
rename from src/canonical/models/front/0142--000--Aerodactyl.gif
rename to src/canonical/models/front/0142-000-Aerodactyl.gif
diff --git a/src/canonical/models/front/0142--420--Aerodactyl--Mega.gif b/src/canonical/models/front/0142-420-Aerodactyl-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0142--420--Aerodactyl--Mega.gif
rename to src/canonical/models/front/0142-420-Aerodactyl-Mega.gif
diff --git a/src/canonical/models/front/0143--000--Snorlax.gif b/src/canonical/models/front/0143-000-Snorlax.gif
similarity index 100%
rename from src/canonical/models/front/0143--000--Snorlax.gif
rename to src/canonical/models/front/0143-000-Snorlax.gif
diff --git a/src/canonical/models/front/0143--420--Snorlax--Gmax.gif b/src/canonical/models/front/0143-420-Snorlax-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0143--420--Snorlax--Gmax.gif
rename to src/canonical/models/front/0143-420-Snorlax-Gmax.gif
diff --git a/src/canonical/models/front/0144--000--Articuno.gif b/src/canonical/models/front/0144-000-Articuno.gif
similarity index 100%
rename from src/canonical/models/front/0144--000--Articuno.gif
rename to src/canonical/models/front/0144-000-Articuno.gif
diff --git a/src/canonical/models/front/0145--000--Zapdos.gif b/src/canonical/models/front/0145-000-Zapdos.gif
similarity index 100%
rename from src/canonical/models/front/0145--000--Zapdos.gif
rename to src/canonical/models/front/0145-000-Zapdos.gif
diff --git a/src/canonical/models/front/0146--000--Moltres.gif b/src/canonical/models/front/0146-000-Moltres.gif
similarity index 100%
rename from src/canonical/models/front/0146--000--Moltres.gif
rename to src/canonical/models/front/0146-000-Moltres.gif
diff --git a/src/canonical/models/front/0147--000--Dratini.gif b/src/canonical/models/front/0147-000-Dratini.gif
similarity index 100%
rename from src/canonical/models/front/0147--000--Dratini.gif
rename to src/canonical/models/front/0147-000-Dratini.gif
diff --git a/src/canonical/models/front/0148--000--Dragonair.gif b/src/canonical/models/front/0148-000-Dragonair.gif
similarity index 100%
rename from src/canonical/models/front/0148--000--Dragonair.gif
rename to src/canonical/models/front/0148-000-Dragonair.gif
diff --git a/src/canonical/models/front/0149--000--Dragonite.gif b/src/canonical/models/front/0149-000-Dragonite.gif
similarity index 100%
rename from src/canonical/models/front/0149--000--Dragonite.gif
rename to src/canonical/models/front/0149-000-Dragonite.gif
diff --git a/src/canonical/models/front/0150--000--Mewtwo.gif b/src/canonical/models/front/0150-000-Mewtwo.gif
similarity index 100%
rename from src/canonical/models/front/0150--000--Mewtwo.gif
rename to src/canonical/models/front/0150-000-Mewtwo.gif
diff --git a/src/canonical/models/front/0150--420--Mewtwo--Mega-X.gif b/src/canonical/models/front/0150-420-Mewtwo-Mega~X.gif
similarity index 100%
rename from src/canonical/models/front/0150--420--Mewtwo--Mega-X.gif
rename to src/canonical/models/front/0150-420-Mewtwo-Mega~X.gif
diff --git a/src/canonical/models/front/0150--420--Mewtwo--Mega-Y.gif b/src/canonical/models/front/0150-420-Mewtwo-Mega~Y.gif
similarity index 100%
rename from src/canonical/models/front/0150--420--Mewtwo--Mega-Y.gif
rename to src/canonical/models/front/0150-420-Mewtwo-Mega~Y.gif
diff --git a/src/canonical/models/front/0151--000--Mew.gif b/src/canonical/models/front/0151-000-Mew.gif
similarity index 100%
rename from src/canonical/models/front/0151--000--Mew.gif
rename to src/canonical/models/front/0151-000-Mew.gif
diff --git a/src/canonical/models/front/0152--000--Chikorita.gif b/src/canonical/models/front/0152-000-Chikorita.gif
similarity index 100%
rename from src/canonical/models/front/0152--000--Chikorita.gif
rename to src/canonical/models/front/0152-000-Chikorita.gif
diff --git a/src/canonical/models/front/0153--000--Bayleef.gif b/src/canonical/models/front/0153-000-Bayleef.gif
similarity index 100%
rename from src/canonical/models/front/0153--000--Bayleef.gif
rename to src/canonical/models/front/0153-000-Bayleef.gif
diff --git a/src/canonical/models/front/0154--000--Meganium.gif b/src/canonical/models/front/0154-000-Meganium.gif
similarity index 100%
rename from src/canonical/models/front/0154--000--Meganium.gif
rename to src/canonical/models/front/0154-000-Meganium.gif
diff --git a/src/canonical/models/front/0155--000--Cyndaquil.gif b/src/canonical/models/front/0155-000-Cyndaquil.gif
similarity index 100%
rename from src/canonical/models/front/0155--000--Cyndaquil.gif
rename to src/canonical/models/front/0155-000-Cyndaquil.gif
diff --git a/src/canonical/models/front/0156--000--Quilava.gif b/src/canonical/models/front/0156-000-Quilava.gif
similarity index 100%
rename from src/canonical/models/front/0156--000--Quilava.gif
rename to src/canonical/models/front/0156-000-Quilava.gif
diff --git a/src/canonical/models/front/0157--000--Typhlosion.gif b/src/canonical/models/front/0157-000-Typhlosion.gif
similarity index 100%
rename from src/canonical/models/front/0157--000--Typhlosion.gif
rename to src/canonical/models/front/0157-000-Typhlosion.gif
diff --git a/src/canonical/models/front/0158--000--Totodile.gif b/src/canonical/models/front/0158-000-Totodile.gif
similarity index 100%
rename from src/canonical/models/front/0158--000--Totodile.gif
rename to src/canonical/models/front/0158-000-Totodile.gif
diff --git a/src/canonical/models/front/0159--000--Croconaw.gif b/src/canonical/models/front/0159-000-Croconaw.gif
similarity index 100%
rename from src/canonical/models/front/0159--000--Croconaw.gif
rename to src/canonical/models/front/0159-000-Croconaw.gif
diff --git a/src/canonical/models/front/0160--000--Feraligatr.gif b/src/canonical/models/front/0160-000-Feraligatr.gif
similarity index 100%
rename from src/canonical/models/front/0160--000--Feraligatr.gif
rename to src/canonical/models/front/0160-000-Feraligatr.gif
diff --git a/src/canonical/models/front/0161--000--Sentret.gif b/src/canonical/models/front/0161-000-Sentret.gif
similarity index 100%
rename from src/canonical/models/front/0161--000--Sentret.gif
rename to src/canonical/models/front/0161-000-Sentret.gif
diff --git a/src/canonical/models/front/0162--000--Furret.gif b/src/canonical/models/front/0162-000-Furret.gif
similarity index 100%
rename from src/canonical/models/front/0162--000--Furret.gif
rename to src/canonical/models/front/0162-000-Furret.gif
diff --git a/src/canonical/models/front/0163--000--Hoothoot.gif b/src/canonical/models/front/0163-000-Hoothoot.gif
similarity index 100%
rename from src/canonical/models/front/0163--000--Hoothoot.gif
rename to src/canonical/models/front/0163-000-Hoothoot.gif
diff --git a/src/canonical/models/front/0164--000--Noctowl.gif b/src/canonical/models/front/0164-000-Noctowl.gif
similarity index 100%
rename from src/canonical/models/front/0164--000--Noctowl.gif
rename to src/canonical/models/front/0164-000-Noctowl.gif
diff --git a/src/canonical/models/front/0165--000--Ledyba.gif b/src/canonical/models/front/0165-000-Ledyba.gif
similarity index 100%
rename from src/canonical/models/front/0165--000--Ledyba.gif
rename to src/canonical/models/front/0165-000-Ledyba.gif
diff --git a/src/canonical/models/front/0166--000--Ledian.gif b/src/canonical/models/front/0166-000-Ledian.gif
similarity index 100%
rename from src/canonical/models/front/0166--000--Ledian.gif
rename to src/canonical/models/front/0166-000-Ledian.gif
diff --git a/src/canonical/models/front/0167--000--Spinarak.gif b/src/canonical/models/front/0167-000-Spinarak.gif
similarity index 100%
rename from src/canonical/models/front/0167--000--Spinarak.gif
rename to src/canonical/models/front/0167-000-Spinarak.gif
diff --git a/src/canonical/models/front/0168--000--Ariados.gif b/src/canonical/models/front/0168-000-Ariados.gif
similarity index 100%
rename from src/canonical/models/front/0168--000--Ariados.gif
rename to src/canonical/models/front/0168-000-Ariados.gif
diff --git a/src/canonical/models/front/0169--000--Crobat.gif b/src/canonical/models/front/0169-000-Crobat.gif
similarity index 100%
rename from src/canonical/models/front/0169--000--Crobat.gif
rename to src/canonical/models/front/0169-000-Crobat.gif
diff --git a/src/canonical/models/front/0170--000--Chinchou.gif b/src/canonical/models/front/0170-000-Chinchou.gif
similarity index 100%
rename from src/canonical/models/front/0170--000--Chinchou.gif
rename to src/canonical/models/front/0170-000-Chinchou.gif
diff --git a/src/canonical/models/front/0171--000--Lanturn.gif b/src/canonical/models/front/0171-000-Lanturn.gif
similarity index 100%
rename from src/canonical/models/front/0171--000--Lanturn.gif
rename to src/canonical/models/front/0171-000-Lanturn.gif
diff --git a/src/canonical/models/front/0172--000--Pichu.gif b/src/canonical/models/front/0172-000-Pichu.gif
similarity index 100%
rename from src/canonical/models/front/0172--000--Pichu.gif
rename to src/canonical/models/front/0172-000-Pichu.gif
diff --git a/src/canonical/models/front/0173--000--Cleffa.gif b/src/canonical/models/front/0173-000-Cleffa.gif
similarity index 100%
rename from src/canonical/models/front/0173--000--Cleffa.gif
rename to src/canonical/models/front/0173-000-Cleffa.gif
diff --git a/src/canonical/models/front/0174--000--Igglybuff.gif b/src/canonical/models/front/0174-000-Igglybuff.gif
similarity index 100%
rename from src/canonical/models/front/0174--000--Igglybuff.gif
rename to src/canonical/models/front/0174-000-Igglybuff.gif
diff --git a/src/canonical/models/front/0175--000--Togepi.gif b/src/canonical/models/front/0175-000-Togepi.gif
similarity index 100%
rename from src/canonical/models/front/0175--000--Togepi.gif
rename to src/canonical/models/front/0175-000-Togepi.gif
diff --git a/src/canonical/models/front/0176--000--Togetic.gif b/src/canonical/models/front/0176-000-Togetic.gif
similarity index 100%
rename from src/canonical/models/front/0176--000--Togetic.gif
rename to src/canonical/models/front/0176-000-Togetic.gif
diff --git a/src/canonical/models/front/0177--000--Natu.gif b/src/canonical/models/front/0177-000-Natu.gif
similarity index 100%
rename from src/canonical/models/front/0177--000--Natu.gif
rename to src/canonical/models/front/0177-000-Natu.gif
diff --git a/src/canonical/models/front/0178--000--Xatu.gif b/src/canonical/models/front/0178-000-Xatu.gif
similarity index 100%
rename from src/canonical/models/front/0178--000--Xatu.gif
rename to src/canonical/models/front/0178-000-Xatu.gif
diff --git a/src/canonical/models/front/0179--000--Mareep.gif b/src/canonical/models/front/0179-000-Mareep.gif
similarity index 100%
rename from src/canonical/models/front/0179--000--Mareep.gif
rename to src/canonical/models/front/0179-000-Mareep.gif
diff --git a/src/canonical/models/front/0180--000--Flaaffy.gif b/src/canonical/models/front/0180-000-Flaaffy.gif
similarity index 100%
rename from src/canonical/models/front/0180--000--Flaaffy.gif
rename to src/canonical/models/front/0180-000-Flaaffy.gif
diff --git a/src/canonical/models/front/0181--000--Ampharos.gif b/src/canonical/models/front/0181-000-Ampharos.gif
similarity index 100%
rename from src/canonical/models/front/0181--000--Ampharos.gif
rename to src/canonical/models/front/0181-000-Ampharos.gif
diff --git a/src/canonical/models/front/0181--420--Ampharos--Mega.gif b/src/canonical/models/front/0181-420-Ampharos-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0181--420--Ampharos--Mega.gif
rename to src/canonical/models/front/0181-420-Ampharos-Mega.gif
diff --git a/src/canonical/models/front/0182--000--Bellossom.gif b/src/canonical/models/front/0182-000-Bellossom.gif
similarity index 100%
rename from src/canonical/models/front/0182--000--Bellossom.gif
rename to src/canonical/models/front/0182-000-Bellossom.gif
diff --git a/src/canonical/models/front/0183--000--Marill.gif b/src/canonical/models/front/0183-000-Marill.gif
similarity index 100%
rename from src/canonical/models/front/0183--000--Marill.gif
rename to src/canonical/models/front/0183-000-Marill.gif
diff --git a/src/canonical/models/front/0184--000--Azumarill.gif b/src/canonical/models/front/0184-000-Azumarill.gif
similarity index 100%
rename from src/canonical/models/front/0184--000--Azumarill.gif
rename to src/canonical/models/front/0184-000-Azumarill.gif
diff --git a/src/canonical/models/front/0185--000--Sudowoodo.gif b/src/canonical/models/front/0185-000-Sudowoodo.gif
similarity index 100%
rename from src/canonical/models/front/0185--000--Sudowoodo.gif
rename to src/canonical/models/front/0185-000-Sudowoodo.gif
diff --git a/src/canonical/models/front/0186--000--Politoed.gif b/src/canonical/models/front/0186-000-Politoed.gif
similarity index 100%
rename from src/canonical/models/front/0186--000--Politoed.gif
rename to src/canonical/models/front/0186-000-Politoed.gif
diff --git a/src/canonical/models/front/0187--000--Hoppip.gif b/src/canonical/models/front/0187-000-Hoppip.gif
similarity index 100%
rename from src/canonical/models/front/0187--000--Hoppip.gif
rename to src/canonical/models/front/0187-000-Hoppip.gif
diff --git a/src/canonical/models/front/0188--000--Skiploom.gif b/src/canonical/models/front/0188-000-Skiploom.gif
similarity index 100%
rename from src/canonical/models/front/0188--000--Skiploom.gif
rename to src/canonical/models/front/0188-000-Skiploom.gif
diff --git a/src/canonical/models/front/0189--000--Jumpluff.gif b/src/canonical/models/front/0189-000-Jumpluff.gif
similarity index 100%
rename from src/canonical/models/front/0189--000--Jumpluff.gif
rename to src/canonical/models/front/0189-000-Jumpluff.gif
diff --git a/src/canonical/models/front/0190--000--Aipom.gif b/src/canonical/models/front/0190-000-Aipom.gif
similarity index 100%
rename from src/canonical/models/front/0190--000--Aipom.gif
rename to src/canonical/models/front/0190-000-Aipom.gif
diff --git a/src/canonical/models/front/0191--000--Sunkern.gif b/src/canonical/models/front/0191-000-Sunkern.gif
similarity index 100%
rename from src/canonical/models/front/0191--000--Sunkern.gif
rename to src/canonical/models/front/0191-000-Sunkern.gif
diff --git a/src/canonical/models/front/0192--000--Sunflora.gif b/src/canonical/models/front/0192-000-Sunflora.gif
similarity index 100%
rename from src/canonical/models/front/0192--000--Sunflora.gif
rename to src/canonical/models/front/0192-000-Sunflora.gif
diff --git a/src/canonical/models/front/0193--000--Yanma.gif b/src/canonical/models/front/0193-000-Yanma.gif
similarity index 100%
rename from src/canonical/models/front/0193--000--Yanma.gif
rename to src/canonical/models/front/0193-000-Yanma.gif
diff --git a/src/canonical/models/front/0194--000--Wooper.gif b/src/canonical/models/front/0194-000-Wooper.gif
similarity index 100%
rename from src/canonical/models/front/0194--000--Wooper.gif
rename to src/canonical/models/front/0194-000-Wooper.gif
diff --git a/src/canonical/models/front/0195--000--Quagsire.gif b/src/canonical/models/front/0195-000-Quagsire.gif
similarity index 100%
rename from src/canonical/models/front/0195--000--Quagsire.gif
rename to src/canonical/models/front/0195-000-Quagsire.gif
diff --git a/src/canonical/models/front/0196--000--Espeon.gif b/src/canonical/models/front/0196-000-Espeon.gif
similarity index 100%
rename from src/canonical/models/front/0196--000--Espeon.gif
rename to src/canonical/models/front/0196-000-Espeon.gif
diff --git a/src/canonical/models/front/0197--000--Umbreon.gif b/src/canonical/models/front/0197-000-Umbreon.gif
similarity index 100%
rename from src/canonical/models/front/0197--000--Umbreon.gif
rename to src/canonical/models/front/0197-000-Umbreon.gif
diff --git a/src/canonical/models/front/0198--000--Murkrow.gif b/src/canonical/models/front/0198-000-Murkrow.gif
similarity index 100%
rename from src/canonical/models/front/0198--000--Murkrow.gif
rename to src/canonical/models/front/0198-000-Murkrow.gif
diff --git a/src/canonical/models/front/0199--000--Slowking.gif b/src/canonical/models/front/0199-000-Slowking.gif
similarity index 100%
rename from src/canonical/models/front/0199--000--Slowking.gif
rename to src/canonical/models/front/0199-000-Slowking.gif
diff --git a/src/canonical/models/front/0200--000--Misdreavus.gif b/src/canonical/models/front/0200-000-Misdreavus.gif
similarity index 100%
rename from src/canonical/models/front/0200--000--Misdreavus.gif
rename to src/canonical/models/front/0200-000-Misdreavus.gif
diff --git a/src/canonical/models/front/0201--000--Unown.gif b/src/canonical/models/front/0201--000--Unown.gif
deleted file mode 120000
index e533f642..00000000
--- a/src/canonical/models/front/0201--000--Unown.gif
+++ /dev/null
@@ -1 +0,0 @@
-../front-cosmetic/0201--420--Unown--A.gif
\ No newline at end of file
diff --git a/src/canonical/models/front/0201-000-Unown.gif b/src/canonical/models/front/0201-000-Unown.gif
new file mode 120000
index 00000000..b4567a2c
--- /dev/null
+++ b/src/canonical/models/front/0201-000-Unown.gif
@@ -0,0 +1 @@
+../front-cosmetic/0201-420-Unown-A.gif
\ No newline at end of file
diff --git a/src/canonical/models/front/0202--000--Wobbuffet.gif b/src/canonical/models/front/0202-000-Wobbuffet.gif
similarity index 100%
rename from src/canonical/models/front/0202--000--Wobbuffet.gif
rename to src/canonical/models/front/0202-000-Wobbuffet.gif
diff --git a/src/canonical/models/front/0203--000--Girafarig.gif b/src/canonical/models/front/0203-000-Girafarig.gif
similarity index 100%
rename from src/canonical/models/front/0203--000--Girafarig.gif
rename to src/canonical/models/front/0203-000-Girafarig.gif
diff --git a/src/canonical/models/front/0204--000--Pineco.gif b/src/canonical/models/front/0204-000-Pineco.gif
similarity index 100%
rename from src/canonical/models/front/0204--000--Pineco.gif
rename to src/canonical/models/front/0204-000-Pineco.gif
diff --git a/src/canonical/models/front/0205--000--Forretress.gif b/src/canonical/models/front/0205-000-Forretress.gif
similarity index 100%
rename from src/canonical/models/front/0205--000--Forretress.gif
rename to src/canonical/models/front/0205-000-Forretress.gif
diff --git a/src/canonical/models/front/0206--000--Dunsparce.gif b/src/canonical/models/front/0206-000-Dunsparce.gif
similarity index 100%
rename from src/canonical/models/front/0206--000--Dunsparce.gif
rename to src/canonical/models/front/0206-000-Dunsparce.gif
diff --git a/src/canonical/models/front/0207--000--Gligar.gif b/src/canonical/models/front/0207-000-Gligar.gif
similarity index 100%
rename from src/canonical/models/front/0207--000--Gligar.gif
rename to src/canonical/models/front/0207-000-Gligar.gif
diff --git a/src/canonical/models/front/0208--000--Steelix.gif b/src/canonical/models/front/0208-000-Steelix.gif
similarity index 100%
rename from src/canonical/models/front/0208--000--Steelix.gif
rename to src/canonical/models/front/0208-000-Steelix.gif
diff --git a/src/canonical/models/front/0208--420--Steelix--Mega.gif b/src/canonical/models/front/0208-420-Steelix-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0208--420--Steelix--Mega.gif
rename to src/canonical/models/front/0208-420-Steelix-Mega.gif
diff --git a/src/canonical/models/front/0209--000--Snubbull.gif b/src/canonical/models/front/0209-000-Snubbull.gif
similarity index 100%
rename from src/canonical/models/front/0209--000--Snubbull.gif
rename to src/canonical/models/front/0209-000-Snubbull.gif
diff --git a/src/canonical/models/front/0210--000--Granbull.gif b/src/canonical/models/front/0210-000-Granbull.gif
similarity index 100%
rename from src/canonical/models/front/0210--000--Granbull.gif
rename to src/canonical/models/front/0210-000-Granbull.gif
diff --git a/src/canonical/models/front/0211--000--Qwilfish.gif b/src/canonical/models/front/0211-000-Qwilfish.gif
similarity index 100%
rename from src/canonical/models/front/0211--000--Qwilfish.gif
rename to src/canonical/models/front/0211-000-Qwilfish.gif
diff --git a/src/canonical/models/front/0212--000--Scizor.gif b/src/canonical/models/front/0212-000-Scizor.gif
similarity index 100%
rename from src/canonical/models/front/0212--000--Scizor.gif
rename to src/canonical/models/front/0212-000-Scizor.gif
diff --git a/src/canonical/models/front/0212--420--Scizor--Mega.gif b/src/canonical/models/front/0212-420-Scizor-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0212--420--Scizor--Mega.gif
rename to src/canonical/models/front/0212-420-Scizor-Mega.gif
diff --git a/src/canonical/models/front/0213--000--Shuckle.gif b/src/canonical/models/front/0213-000-Shuckle.gif
similarity index 100%
rename from src/canonical/models/front/0213--000--Shuckle.gif
rename to src/canonical/models/front/0213-000-Shuckle.gif
diff --git a/src/canonical/models/front/0214--000--Heracross.gif b/src/canonical/models/front/0214-000-Heracross.gif
similarity index 100%
rename from src/canonical/models/front/0214--000--Heracross.gif
rename to src/canonical/models/front/0214-000-Heracross.gif
diff --git a/src/canonical/models/front/0214--420--Heracross--Mega.gif b/src/canonical/models/front/0214-420-Heracross-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0214--420--Heracross--Mega.gif
rename to src/canonical/models/front/0214-420-Heracross-Mega.gif
diff --git a/src/canonical/models/front/0215--000--Sneasel.gif b/src/canonical/models/front/0215-000-Sneasel.gif
similarity index 100%
rename from src/canonical/models/front/0215--000--Sneasel.gif
rename to src/canonical/models/front/0215-000-Sneasel.gif
diff --git a/src/canonical/models/front/0216--000--Teddiursa.gif b/src/canonical/models/front/0216-000-Teddiursa.gif
similarity index 100%
rename from src/canonical/models/front/0216--000--Teddiursa.gif
rename to src/canonical/models/front/0216-000-Teddiursa.gif
diff --git a/src/canonical/models/front/0217--000--Ursaring.gif b/src/canonical/models/front/0217-000-Ursaring.gif
similarity index 100%
rename from src/canonical/models/front/0217--000--Ursaring.gif
rename to src/canonical/models/front/0217-000-Ursaring.gif
diff --git a/src/canonical/models/front/0218--000--Slugma.gif b/src/canonical/models/front/0218-000-Slugma.gif
similarity index 100%
rename from src/canonical/models/front/0218--000--Slugma.gif
rename to src/canonical/models/front/0218-000-Slugma.gif
diff --git a/src/canonical/models/front/0219--000--Magcargo.gif b/src/canonical/models/front/0219-000-Magcargo.gif
similarity index 100%
rename from src/canonical/models/front/0219--000--Magcargo.gif
rename to src/canonical/models/front/0219-000-Magcargo.gif
diff --git a/src/canonical/models/front/0220--000--Swinub.gif b/src/canonical/models/front/0220-000-Swinub.gif
similarity index 100%
rename from src/canonical/models/front/0220--000--Swinub.gif
rename to src/canonical/models/front/0220-000-Swinub.gif
diff --git a/src/canonical/models/front/0221--000--Piloswine.gif b/src/canonical/models/front/0221-000-Piloswine.gif
similarity index 100%
rename from src/canonical/models/front/0221--000--Piloswine.gif
rename to src/canonical/models/front/0221-000-Piloswine.gif
diff --git a/src/canonical/models/front/0222--000--Corsola.gif b/src/canonical/models/front/0222-000-Corsola.gif
similarity index 100%
rename from src/canonical/models/front/0222--000--Corsola.gif
rename to src/canonical/models/front/0222-000-Corsola.gif
diff --git a/src/canonical/models/front/0222--420--Corsola--Galar.gif b/src/canonical/models/front/0222-420-Corsola-Galar.gif
similarity index 100%
rename from src/canonical/models/front/0222--420--Corsola--Galar.gif
rename to src/canonical/models/front/0222-420-Corsola-Galar.gif
diff --git a/src/canonical/models/front/0223--000--Remoraid.gif b/src/canonical/models/front/0223-000-Remoraid.gif
similarity index 100%
rename from src/canonical/models/front/0223--000--Remoraid.gif
rename to src/canonical/models/front/0223-000-Remoraid.gif
diff --git a/src/canonical/models/front/0224--000--Octillery.gif b/src/canonical/models/front/0224-000-Octillery.gif
similarity index 100%
rename from src/canonical/models/front/0224--000--Octillery.gif
rename to src/canonical/models/front/0224-000-Octillery.gif
diff --git a/src/canonical/models/front/0225--000--Delibird.gif b/src/canonical/models/front/0225-000-Delibird.gif
similarity index 100%
rename from src/canonical/models/front/0225--000--Delibird.gif
rename to src/canonical/models/front/0225-000-Delibird.gif
diff --git a/src/canonical/models/front/0226--000--Mantine.gif b/src/canonical/models/front/0226-000-Mantine.gif
similarity index 100%
rename from src/canonical/models/front/0226--000--Mantine.gif
rename to src/canonical/models/front/0226-000-Mantine.gif
diff --git a/src/canonical/models/front/0227--000--Skarmory.gif b/src/canonical/models/front/0227-000-Skarmory.gif
similarity index 100%
rename from src/canonical/models/front/0227--000--Skarmory.gif
rename to src/canonical/models/front/0227-000-Skarmory.gif
diff --git a/src/canonical/models/front/0228--000--Houndour.gif b/src/canonical/models/front/0228-000-Houndour.gif
similarity index 100%
rename from src/canonical/models/front/0228--000--Houndour.gif
rename to src/canonical/models/front/0228-000-Houndour.gif
diff --git a/src/canonical/models/front/0229--000--Houndoom.gif b/src/canonical/models/front/0229-000-Houndoom.gif
similarity index 100%
rename from src/canonical/models/front/0229--000--Houndoom.gif
rename to src/canonical/models/front/0229-000-Houndoom.gif
diff --git a/src/canonical/models/front/0229--420--Houndoom--Mega.gif b/src/canonical/models/front/0229-420-Houndoom-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0229--420--Houndoom--Mega.gif
rename to src/canonical/models/front/0229-420-Houndoom-Mega.gif
diff --git a/src/canonical/models/front/0230--000--Kingdra.gif b/src/canonical/models/front/0230-000-Kingdra.gif
similarity index 100%
rename from src/canonical/models/front/0230--000--Kingdra.gif
rename to src/canonical/models/front/0230-000-Kingdra.gif
diff --git a/src/canonical/models/front/0231--000--Phanpy.gif b/src/canonical/models/front/0231-000-Phanpy.gif
similarity index 100%
rename from src/canonical/models/front/0231--000--Phanpy.gif
rename to src/canonical/models/front/0231-000-Phanpy.gif
diff --git a/src/canonical/models/front/0232--000--Donphan.gif b/src/canonical/models/front/0232-000-Donphan.gif
similarity index 100%
rename from src/canonical/models/front/0232--000--Donphan.gif
rename to src/canonical/models/front/0232-000-Donphan.gif
diff --git a/src/canonical/models/front/0233--000--Porygon2.gif b/src/canonical/models/front/0233-000-Porygon2.gif
similarity index 100%
rename from src/canonical/models/front/0233--000--Porygon2.gif
rename to src/canonical/models/front/0233-000-Porygon2.gif
diff --git a/src/canonical/models/front/0234--000--Stantler.gif b/src/canonical/models/front/0234-000-Stantler.gif
similarity index 100%
rename from src/canonical/models/front/0234--000--Stantler.gif
rename to src/canonical/models/front/0234-000-Stantler.gif
diff --git a/src/canonical/models/front/0235--000--Smeargle.gif b/src/canonical/models/front/0235-000-Smeargle.gif
similarity index 100%
rename from src/canonical/models/front/0235--000--Smeargle.gif
rename to src/canonical/models/front/0235-000-Smeargle.gif
diff --git a/src/canonical/models/front/0236--000--Tyrogue.gif b/src/canonical/models/front/0236-000-Tyrogue.gif
similarity index 100%
rename from src/canonical/models/front/0236--000--Tyrogue.gif
rename to src/canonical/models/front/0236-000-Tyrogue.gif
diff --git a/src/canonical/models/front/0237--000--Hitmontop.gif b/src/canonical/models/front/0237-000-Hitmontop.gif
similarity index 100%
rename from src/canonical/models/front/0237--000--Hitmontop.gif
rename to src/canonical/models/front/0237-000-Hitmontop.gif
diff --git a/src/canonical/models/front/0238--000--Smoochum.gif b/src/canonical/models/front/0238-000-Smoochum.gif
similarity index 100%
rename from src/canonical/models/front/0238--000--Smoochum.gif
rename to src/canonical/models/front/0238-000-Smoochum.gif
diff --git a/src/canonical/models/front/0239--000--Elekid.gif b/src/canonical/models/front/0239-000-Elekid.gif
similarity index 100%
rename from src/canonical/models/front/0239--000--Elekid.gif
rename to src/canonical/models/front/0239-000-Elekid.gif
diff --git a/src/canonical/models/front/0240--000--Magby.gif b/src/canonical/models/front/0240-000-Magby.gif
similarity index 100%
rename from src/canonical/models/front/0240--000--Magby.gif
rename to src/canonical/models/front/0240-000-Magby.gif
diff --git a/src/canonical/models/front/0241--000--Miltank.gif b/src/canonical/models/front/0241-000-Miltank.gif
similarity index 100%
rename from src/canonical/models/front/0241--000--Miltank.gif
rename to src/canonical/models/front/0241-000-Miltank.gif
diff --git a/src/canonical/models/front/0242--000--Blissey.gif b/src/canonical/models/front/0242-000-Blissey.gif
similarity index 100%
rename from src/canonical/models/front/0242--000--Blissey.gif
rename to src/canonical/models/front/0242-000-Blissey.gif
diff --git a/src/canonical/models/front/0243--000--Raikou.gif b/src/canonical/models/front/0243-000-Raikou.gif
similarity index 100%
rename from src/canonical/models/front/0243--000--Raikou.gif
rename to src/canonical/models/front/0243-000-Raikou.gif
diff --git a/src/canonical/models/front/0244--000--Entei.gif b/src/canonical/models/front/0244-000-Entei.gif
similarity index 100%
rename from src/canonical/models/front/0244--000--Entei.gif
rename to src/canonical/models/front/0244-000-Entei.gif
diff --git a/src/canonical/models/front/0245--000--Suicune.gif b/src/canonical/models/front/0245-000-Suicune.gif
similarity index 100%
rename from src/canonical/models/front/0245--000--Suicune.gif
rename to src/canonical/models/front/0245-000-Suicune.gif
diff --git a/src/canonical/models/front/0246--000--Larvitar.gif b/src/canonical/models/front/0246-000-Larvitar.gif
similarity index 100%
rename from src/canonical/models/front/0246--000--Larvitar.gif
rename to src/canonical/models/front/0246-000-Larvitar.gif
diff --git a/src/canonical/models/front/0247--000--Pupitar.gif b/src/canonical/models/front/0247-000-Pupitar.gif
similarity index 100%
rename from src/canonical/models/front/0247--000--Pupitar.gif
rename to src/canonical/models/front/0247-000-Pupitar.gif
diff --git a/src/canonical/models/front/0248--000--Tyranitar.gif b/src/canonical/models/front/0248-000-Tyranitar.gif
similarity index 100%
rename from src/canonical/models/front/0248--000--Tyranitar.gif
rename to src/canonical/models/front/0248-000-Tyranitar.gif
diff --git a/src/canonical/models/front/0248--420--Tyranitar--Mega.gif b/src/canonical/models/front/0248-420-Tyranitar-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0248--420--Tyranitar--Mega.gif
rename to src/canonical/models/front/0248-420-Tyranitar-Mega.gif
diff --git a/src/canonical/models/front/0249--000--Lugia.gif b/src/canonical/models/front/0249-000-Lugia.gif
similarity index 100%
rename from src/canonical/models/front/0249--000--Lugia.gif
rename to src/canonical/models/front/0249-000-Lugia.gif
diff --git a/src/canonical/models/front/0250--000--Ho-Oh.gif b/src/canonical/models/front/0250-000-Ho~Oh.gif
similarity index 100%
rename from src/canonical/models/front/0250--000--Ho-Oh.gif
rename to src/canonical/models/front/0250-000-Ho~Oh.gif
diff --git a/src/canonical/models/front/0251--000--Celebi.gif b/src/canonical/models/front/0251-000-Celebi.gif
similarity index 100%
rename from src/canonical/models/front/0251--000--Celebi.gif
rename to src/canonical/models/front/0251-000-Celebi.gif
diff --git a/src/canonical/models/front/0252--000--Treecko.gif b/src/canonical/models/front/0252-000-Treecko.gif
similarity index 100%
rename from src/canonical/models/front/0252--000--Treecko.gif
rename to src/canonical/models/front/0252-000-Treecko.gif
diff --git a/src/canonical/models/front/0253--000--Grovyle.gif b/src/canonical/models/front/0253-000-Grovyle.gif
similarity index 100%
rename from src/canonical/models/front/0253--000--Grovyle.gif
rename to src/canonical/models/front/0253-000-Grovyle.gif
diff --git a/src/canonical/models/front/0254--000--Sceptile.gif b/src/canonical/models/front/0254-000-Sceptile.gif
similarity index 100%
rename from src/canonical/models/front/0254--000--Sceptile.gif
rename to src/canonical/models/front/0254-000-Sceptile.gif
diff --git a/src/canonical/models/front/0254--420--Sceptile--Mega.gif b/src/canonical/models/front/0254-420-Sceptile-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0254--420--Sceptile--Mega.gif
rename to src/canonical/models/front/0254-420-Sceptile-Mega.gif
diff --git a/src/canonical/models/front/0255--000--Torchic.gif b/src/canonical/models/front/0255-000-Torchic.gif
similarity index 100%
rename from src/canonical/models/front/0255--000--Torchic.gif
rename to src/canonical/models/front/0255-000-Torchic.gif
diff --git a/src/canonical/models/front/0256--000--Combusken.gif b/src/canonical/models/front/0256-000-Combusken.gif
similarity index 100%
rename from src/canonical/models/front/0256--000--Combusken.gif
rename to src/canonical/models/front/0256-000-Combusken.gif
diff --git a/src/canonical/models/front/0257--000--Blaziken.gif b/src/canonical/models/front/0257-000-Blaziken.gif
similarity index 100%
rename from src/canonical/models/front/0257--000--Blaziken.gif
rename to src/canonical/models/front/0257-000-Blaziken.gif
diff --git a/src/canonical/models/front/0257--420--Blaziken--Mega.gif b/src/canonical/models/front/0257-420-Blaziken-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0257--420--Blaziken--Mega.gif
rename to src/canonical/models/front/0257-420-Blaziken-Mega.gif
diff --git a/src/canonical/models/front/0258--000--Mudkip.gif b/src/canonical/models/front/0258-000-Mudkip.gif
similarity index 100%
rename from src/canonical/models/front/0258--000--Mudkip.gif
rename to src/canonical/models/front/0258-000-Mudkip.gif
diff --git a/src/canonical/models/front/0259--000--Marshtomp.gif b/src/canonical/models/front/0259-000-Marshtomp.gif
similarity index 100%
rename from src/canonical/models/front/0259--000--Marshtomp.gif
rename to src/canonical/models/front/0259-000-Marshtomp.gif
diff --git a/src/canonical/models/front/0260--000--Swampert.gif b/src/canonical/models/front/0260-000-Swampert.gif
similarity index 100%
rename from src/canonical/models/front/0260--000--Swampert.gif
rename to src/canonical/models/front/0260-000-Swampert.gif
diff --git a/src/canonical/models/front/0260--420--Swampert--Mega.gif b/src/canonical/models/front/0260-420-Swampert-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0260--420--Swampert--Mega.gif
rename to src/canonical/models/front/0260-420-Swampert-Mega.gif
diff --git a/src/canonical/models/front/0261--000--Poochyena.gif b/src/canonical/models/front/0261-000-Poochyena.gif
similarity index 100%
rename from src/canonical/models/front/0261--000--Poochyena.gif
rename to src/canonical/models/front/0261-000-Poochyena.gif
diff --git a/src/canonical/models/front/0262--000--Mightyena.gif b/src/canonical/models/front/0262-000-Mightyena.gif
similarity index 100%
rename from src/canonical/models/front/0262--000--Mightyena.gif
rename to src/canonical/models/front/0262-000-Mightyena.gif
diff --git a/src/canonical/models/front/0263--000--Zigzagoon.gif b/src/canonical/models/front/0263-000-Zigzagoon.gif
similarity index 100%
rename from src/canonical/models/front/0263--000--Zigzagoon.gif
rename to src/canonical/models/front/0263-000-Zigzagoon.gif
diff --git a/src/canonical/models/front/0263--420--Zigzagoon--Galar.gif b/src/canonical/models/front/0263-420-Zigzagoon-Galar.gif
similarity index 100%
rename from src/canonical/models/front/0263--420--Zigzagoon--Galar.gif
rename to src/canonical/models/front/0263-420-Zigzagoon-Galar.gif
diff --git a/src/canonical/models/front/0264--000--Linoone.gif b/src/canonical/models/front/0264-000-Linoone.gif
similarity index 100%
rename from src/canonical/models/front/0264--000--Linoone.gif
rename to src/canonical/models/front/0264-000-Linoone.gif
diff --git a/src/canonical/models/front/0264--420--Linoone--Galar.gif b/src/canonical/models/front/0264-420-Linoone-Galar.gif
similarity index 100%
rename from src/canonical/models/front/0264--420--Linoone--Galar.gif
rename to src/canonical/models/front/0264-420-Linoone-Galar.gif
diff --git a/src/canonical/models/front/0265--000--Wurmple.gif b/src/canonical/models/front/0265-000-Wurmple.gif
similarity index 100%
rename from src/canonical/models/front/0265--000--Wurmple.gif
rename to src/canonical/models/front/0265-000-Wurmple.gif
diff --git a/src/canonical/models/front/0266--000--Silcoon.gif b/src/canonical/models/front/0266-000-Silcoon.gif
similarity index 100%
rename from src/canonical/models/front/0266--000--Silcoon.gif
rename to src/canonical/models/front/0266-000-Silcoon.gif
diff --git a/src/canonical/models/front/0267--000--Beautifly.gif b/src/canonical/models/front/0267-000-Beautifly.gif
similarity index 100%
rename from src/canonical/models/front/0267--000--Beautifly.gif
rename to src/canonical/models/front/0267-000-Beautifly.gif
diff --git a/src/canonical/models/front/0268--000--Cascoon.gif b/src/canonical/models/front/0268-000-Cascoon.gif
similarity index 100%
rename from src/canonical/models/front/0268--000--Cascoon.gif
rename to src/canonical/models/front/0268-000-Cascoon.gif
diff --git a/src/canonical/models/front/0269--000--Dustox.gif b/src/canonical/models/front/0269-000-Dustox.gif
similarity index 100%
rename from src/canonical/models/front/0269--000--Dustox.gif
rename to src/canonical/models/front/0269-000-Dustox.gif
diff --git a/src/canonical/models/front/0270--000--Lotad.gif b/src/canonical/models/front/0270-000-Lotad.gif
similarity index 100%
rename from src/canonical/models/front/0270--000--Lotad.gif
rename to src/canonical/models/front/0270-000-Lotad.gif
diff --git a/src/canonical/models/front/0271--000--Lombre.gif b/src/canonical/models/front/0271-000-Lombre.gif
similarity index 100%
rename from src/canonical/models/front/0271--000--Lombre.gif
rename to src/canonical/models/front/0271-000-Lombre.gif
diff --git a/src/canonical/models/front/0272--000--Ludicolo.gif b/src/canonical/models/front/0272-000-Ludicolo.gif
similarity index 100%
rename from src/canonical/models/front/0272--000--Ludicolo.gif
rename to src/canonical/models/front/0272-000-Ludicolo.gif
diff --git a/src/canonical/models/front/0273--000--Seedot.gif b/src/canonical/models/front/0273-000-Seedot.gif
similarity index 100%
rename from src/canonical/models/front/0273--000--Seedot.gif
rename to src/canonical/models/front/0273-000-Seedot.gif
diff --git a/src/canonical/models/front/0274--000--Nuzleaf.gif b/src/canonical/models/front/0274-000-Nuzleaf.gif
similarity index 100%
rename from src/canonical/models/front/0274--000--Nuzleaf.gif
rename to src/canonical/models/front/0274-000-Nuzleaf.gif
diff --git a/src/canonical/models/front/0275--000--Shiftry.gif b/src/canonical/models/front/0275-000-Shiftry.gif
similarity index 100%
rename from src/canonical/models/front/0275--000--Shiftry.gif
rename to src/canonical/models/front/0275-000-Shiftry.gif
diff --git a/src/canonical/models/front/0276--000--Taillow.gif b/src/canonical/models/front/0276-000-Taillow.gif
similarity index 100%
rename from src/canonical/models/front/0276--000--Taillow.gif
rename to src/canonical/models/front/0276-000-Taillow.gif
diff --git a/src/canonical/models/front/0277--000--Swellow.gif b/src/canonical/models/front/0277-000-Swellow.gif
similarity index 100%
rename from src/canonical/models/front/0277--000--Swellow.gif
rename to src/canonical/models/front/0277-000-Swellow.gif
diff --git a/src/canonical/models/front/0278--000--Wingull.gif b/src/canonical/models/front/0278-000-Wingull.gif
similarity index 100%
rename from src/canonical/models/front/0278--000--Wingull.gif
rename to src/canonical/models/front/0278-000-Wingull.gif
diff --git a/src/canonical/models/front/0279--000--Pelipper.gif b/src/canonical/models/front/0279-000-Pelipper.gif
similarity index 100%
rename from src/canonical/models/front/0279--000--Pelipper.gif
rename to src/canonical/models/front/0279-000-Pelipper.gif
diff --git a/src/canonical/models/front/0280--000--Ralts.gif b/src/canonical/models/front/0280-000-Ralts.gif
similarity index 100%
rename from src/canonical/models/front/0280--000--Ralts.gif
rename to src/canonical/models/front/0280-000-Ralts.gif
diff --git a/src/canonical/models/front/0281--000--Kirlia.gif b/src/canonical/models/front/0281-000-Kirlia.gif
similarity index 100%
rename from src/canonical/models/front/0281--000--Kirlia.gif
rename to src/canonical/models/front/0281-000-Kirlia.gif
diff --git a/src/canonical/models/front/0282--000--Gardevoir.gif b/src/canonical/models/front/0282-000-Gardevoir.gif
similarity index 100%
rename from src/canonical/models/front/0282--000--Gardevoir.gif
rename to src/canonical/models/front/0282-000-Gardevoir.gif
diff --git a/src/canonical/models/front/0282--420--Gardevoir--Mega.gif b/src/canonical/models/front/0282-420-Gardevoir-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0282--420--Gardevoir--Mega.gif
rename to src/canonical/models/front/0282-420-Gardevoir-Mega.gif
diff --git a/src/canonical/models/front/0283--000--Surskit.gif b/src/canonical/models/front/0283-000-Surskit.gif
similarity index 100%
rename from src/canonical/models/front/0283--000--Surskit.gif
rename to src/canonical/models/front/0283-000-Surskit.gif
diff --git a/src/canonical/models/front/0284--000--Masquerain.gif b/src/canonical/models/front/0284-000-Masquerain.gif
similarity index 100%
rename from src/canonical/models/front/0284--000--Masquerain.gif
rename to src/canonical/models/front/0284-000-Masquerain.gif
diff --git a/src/canonical/models/front/0285--000--Shroomish.gif b/src/canonical/models/front/0285-000-Shroomish.gif
similarity index 100%
rename from src/canonical/models/front/0285--000--Shroomish.gif
rename to src/canonical/models/front/0285-000-Shroomish.gif
diff --git a/src/canonical/models/front/0286--000--Breloom.gif b/src/canonical/models/front/0286-000-Breloom.gif
similarity index 100%
rename from src/canonical/models/front/0286--000--Breloom.gif
rename to src/canonical/models/front/0286-000-Breloom.gif
diff --git a/src/canonical/models/front/0287--000--Slakoth.gif b/src/canonical/models/front/0287-000-Slakoth.gif
similarity index 100%
rename from src/canonical/models/front/0287--000--Slakoth.gif
rename to src/canonical/models/front/0287-000-Slakoth.gif
diff --git a/src/canonical/models/front/0288--000--Vigoroth.gif b/src/canonical/models/front/0288-000-Vigoroth.gif
similarity index 100%
rename from src/canonical/models/front/0288--000--Vigoroth.gif
rename to src/canonical/models/front/0288-000-Vigoroth.gif
diff --git a/src/canonical/models/front/0289--000--Slaking.gif b/src/canonical/models/front/0289-000-Slaking.gif
similarity index 100%
rename from src/canonical/models/front/0289--000--Slaking.gif
rename to src/canonical/models/front/0289-000-Slaking.gif
diff --git a/src/canonical/models/front/0290--000--Nincada.gif b/src/canonical/models/front/0290-000-Nincada.gif
similarity index 100%
rename from src/canonical/models/front/0290--000--Nincada.gif
rename to src/canonical/models/front/0290-000-Nincada.gif
diff --git a/src/canonical/models/front/0291--000--Ninjask.gif b/src/canonical/models/front/0291-000-Ninjask.gif
similarity index 100%
rename from src/canonical/models/front/0291--000--Ninjask.gif
rename to src/canonical/models/front/0291-000-Ninjask.gif
diff --git a/src/canonical/models/front/0292--000--Shedinja.gif b/src/canonical/models/front/0292-000-Shedinja.gif
similarity index 100%
rename from src/canonical/models/front/0292--000--Shedinja.gif
rename to src/canonical/models/front/0292-000-Shedinja.gif
diff --git a/src/canonical/models/front/0293--000--Whismur.gif b/src/canonical/models/front/0293-000-Whismur.gif
similarity index 100%
rename from src/canonical/models/front/0293--000--Whismur.gif
rename to src/canonical/models/front/0293-000-Whismur.gif
diff --git a/src/canonical/models/front/0294--000--Loudred.gif b/src/canonical/models/front/0294-000-Loudred.gif
similarity index 100%
rename from src/canonical/models/front/0294--000--Loudred.gif
rename to src/canonical/models/front/0294-000-Loudred.gif
diff --git a/src/canonical/models/front/0295--000--Exploud.gif b/src/canonical/models/front/0295-000-Exploud.gif
similarity index 100%
rename from src/canonical/models/front/0295--000--Exploud.gif
rename to src/canonical/models/front/0295-000-Exploud.gif
diff --git a/src/canonical/models/front/0296--000--Makuhita.gif b/src/canonical/models/front/0296-000-Makuhita.gif
similarity index 100%
rename from src/canonical/models/front/0296--000--Makuhita.gif
rename to src/canonical/models/front/0296-000-Makuhita.gif
diff --git a/src/canonical/models/front/0297--000--Hariyama.gif b/src/canonical/models/front/0297-000-Hariyama.gif
similarity index 100%
rename from src/canonical/models/front/0297--000--Hariyama.gif
rename to src/canonical/models/front/0297-000-Hariyama.gif
diff --git a/src/canonical/models/front/0298--000--Azurill.gif b/src/canonical/models/front/0298-000-Azurill.gif
similarity index 100%
rename from src/canonical/models/front/0298--000--Azurill.gif
rename to src/canonical/models/front/0298-000-Azurill.gif
diff --git a/src/canonical/models/front/0299--000--Nosepass.gif b/src/canonical/models/front/0299-000-Nosepass.gif
similarity index 100%
rename from src/canonical/models/front/0299--000--Nosepass.gif
rename to src/canonical/models/front/0299-000-Nosepass.gif
diff --git a/src/canonical/models/front/0300--000--Skitty.gif b/src/canonical/models/front/0300-000-Skitty.gif
similarity index 100%
rename from src/canonical/models/front/0300--000--Skitty.gif
rename to src/canonical/models/front/0300-000-Skitty.gif
diff --git a/src/canonical/models/front/0301--000--Delcatty.gif b/src/canonical/models/front/0301-000-Delcatty.gif
similarity index 100%
rename from src/canonical/models/front/0301--000--Delcatty.gif
rename to src/canonical/models/front/0301-000-Delcatty.gif
diff --git a/src/canonical/models/front/0302--000--Sableye.gif b/src/canonical/models/front/0302-000-Sableye.gif
similarity index 100%
rename from src/canonical/models/front/0302--000--Sableye.gif
rename to src/canonical/models/front/0302-000-Sableye.gif
diff --git a/src/canonical/models/front/0302--420--Sableye--Mega.gif b/src/canonical/models/front/0302-420-Sableye-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0302--420--Sableye--Mega.gif
rename to src/canonical/models/front/0302-420-Sableye-Mega.gif
diff --git a/src/canonical/models/front/0303--000--Mawile.gif b/src/canonical/models/front/0303-000-Mawile.gif
similarity index 100%
rename from src/canonical/models/front/0303--000--Mawile.gif
rename to src/canonical/models/front/0303-000-Mawile.gif
diff --git a/src/canonical/models/front/0303--420--Mawile--Mega.gif b/src/canonical/models/front/0303-420-Mawile-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0303--420--Mawile--Mega.gif
rename to src/canonical/models/front/0303-420-Mawile-Mega.gif
diff --git a/src/canonical/models/front/0304--000--Aron.gif b/src/canonical/models/front/0304-000-Aron.gif
similarity index 100%
rename from src/canonical/models/front/0304--000--Aron.gif
rename to src/canonical/models/front/0304-000-Aron.gif
diff --git a/src/canonical/models/front/0305--000--Lairon.gif b/src/canonical/models/front/0305-000-Lairon.gif
similarity index 100%
rename from src/canonical/models/front/0305--000--Lairon.gif
rename to src/canonical/models/front/0305-000-Lairon.gif
diff --git a/src/canonical/models/front/0306--000--Aggron.gif b/src/canonical/models/front/0306-000-Aggron.gif
similarity index 100%
rename from src/canonical/models/front/0306--000--Aggron.gif
rename to src/canonical/models/front/0306-000-Aggron.gif
diff --git a/src/canonical/models/front/0306--420--Aggron--Mega.gif b/src/canonical/models/front/0306-420-Aggron-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0306--420--Aggron--Mega.gif
rename to src/canonical/models/front/0306-420-Aggron-Mega.gif
diff --git a/src/canonical/models/front/0307--000--Meditite.gif b/src/canonical/models/front/0307-000-Meditite.gif
similarity index 100%
rename from src/canonical/models/front/0307--000--Meditite.gif
rename to src/canonical/models/front/0307-000-Meditite.gif
diff --git a/src/canonical/models/front/0308--000--Medicham.gif b/src/canonical/models/front/0308-000-Medicham.gif
similarity index 100%
rename from src/canonical/models/front/0308--000--Medicham.gif
rename to src/canonical/models/front/0308-000-Medicham.gif
diff --git a/src/canonical/models/front/0308--420--Medicham--Mega.gif b/src/canonical/models/front/0308-420-Medicham-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0308--420--Medicham--Mega.gif
rename to src/canonical/models/front/0308-420-Medicham-Mega.gif
diff --git a/src/canonical/models/front/0309--000--Electrike.gif b/src/canonical/models/front/0309-000-Electrike.gif
similarity index 100%
rename from src/canonical/models/front/0309--000--Electrike.gif
rename to src/canonical/models/front/0309-000-Electrike.gif
diff --git a/src/canonical/models/front/0310--000--Manectric.gif b/src/canonical/models/front/0310-000-Manectric.gif
similarity index 100%
rename from src/canonical/models/front/0310--000--Manectric.gif
rename to src/canonical/models/front/0310-000-Manectric.gif
diff --git a/src/canonical/models/front/0310--420--Manectric--Mega.gif b/src/canonical/models/front/0310-420-Manectric-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0310--420--Manectric--Mega.gif
rename to src/canonical/models/front/0310-420-Manectric-Mega.gif
diff --git a/src/canonical/models/front/0311--000--Plusle.gif b/src/canonical/models/front/0311-000-Plusle.gif
similarity index 100%
rename from src/canonical/models/front/0311--000--Plusle.gif
rename to src/canonical/models/front/0311-000-Plusle.gif
diff --git a/src/canonical/models/front/0312--000--Minun.gif b/src/canonical/models/front/0312-000-Minun.gif
similarity index 100%
rename from src/canonical/models/front/0312--000--Minun.gif
rename to src/canonical/models/front/0312-000-Minun.gif
diff --git a/src/canonical/models/front/0313--000--Volbeat.gif b/src/canonical/models/front/0313-000-Volbeat.gif
similarity index 100%
rename from src/canonical/models/front/0313--000--Volbeat.gif
rename to src/canonical/models/front/0313-000-Volbeat.gif
diff --git a/src/canonical/models/front/0314--000--Illumise.gif b/src/canonical/models/front/0314-000-Illumise.gif
similarity index 100%
rename from src/canonical/models/front/0314--000--Illumise.gif
rename to src/canonical/models/front/0314-000-Illumise.gif
diff --git a/src/canonical/models/front/0315--000--Roselia.gif b/src/canonical/models/front/0315-000-Roselia.gif
similarity index 100%
rename from src/canonical/models/front/0315--000--Roselia.gif
rename to src/canonical/models/front/0315-000-Roselia.gif
diff --git a/src/canonical/models/front/0316--000--Gulpin.gif b/src/canonical/models/front/0316-000-Gulpin.gif
similarity index 100%
rename from src/canonical/models/front/0316--000--Gulpin.gif
rename to src/canonical/models/front/0316-000-Gulpin.gif
diff --git a/src/canonical/models/front/0317--000--Swalot.gif b/src/canonical/models/front/0317-000-Swalot.gif
similarity index 100%
rename from src/canonical/models/front/0317--000--Swalot.gif
rename to src/canonical/models/front/0317-000-Swalot.gif
diff --git a/src/canonical/models/front/0318--000--Carvanha.gif b/src/canonical/models/front/0318-000-Carvanha.gif
similarity index 100%
rename from src/canonical/models/front/0318--000--Carvanha.gif
rename to src/canonical/models/front/0318-000-Carvanha.gif
diff --git a/src/canonical/models/front/0319--000--Sharpedo.gif b/src/canonical/models/front/0319-000-Sharpedo.gif
similarity index 100%
rename from src/canonical/models/front/0319--000--Sharpedo.gif
rename to src/canonical/models/front/0319-000-Sharpedo.gif
diff --git a/src/canonical/models/front/0319--420--Sharpedo--Mega.gif b/src/canonical/models/front/0319-420-Sharpedo-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0319--420--Sharpedo--Mega.gif
rename to src/canonical/models/front/0319-420-Sharpedo-Mega.gif
diff --git a/src/canonical/models/front/0320--000--Wailmer.gif b/src/canonical/models/front/0320-000-Wailmer.gif
similarity index 100%
rename from src/canonical/models/front/0320--000--Wailmer.gif
rename to src/canonical/models/front/0320-000-Wailmer.gif
diff --git a/src/canonical/models/front/0321--000--Wailord.gif b/src/canonical/models/front/0321-000-Wailord.gif
similarity index 100%
rename from src/canonical/models/front/0321--000--Wailord.gif
rename to src/canonical/models/front/0321-000-Wailord.gif
diff --git a/src/canonical/models/front/0322--000--Numel.gif b/src/canonical/models/front/0322-000-Numel.gif
similarity index 100%
rename from src/canonical/models/front/0322--000--Numel.gif
rename to src/canonical/models/front/0322-000-Numel.gif
diff --git a/src/canonical/models/front/0323--000--Camerupt.gif b/src/canonical/models/front/0323-000-Camerupt.gif
similarity index 100%
rename from src/canonical/models/front/0323--000--Camerupt.gif
rename to src/canonical/models/front/0323-000-Camerupt.gif
diff --git a/src/canonical/models/front/0323--420--Camerupt--Mega.gif b/src/canonical/models/front/0323-420-Camerupt-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0323--420--Camerupt--Mega.gif
rename to src/canonical/models/front/0323-420-Camerupt-Mega.gif
diff --git a/src/canonical/models/front/0324--000--Torkoal.gif b/src/canonical/models/front/0324-000-Torkoal.gif
similarity index 100%
rename from src/canonical/models/front/0324--000--Torkoal.gif
rename to src/canonical/models/front/0324-000-Torkoal.gif
diff --git a/src/canonical/models/front/0325--000--Spoink.gif b/src/canonical/models/front/0325-000-Spoink.gif
similarity index 100%
rename from src/canonical/models/front/0325--000--Spoink.gif
rename to src/canonical/models/front/0325-000-Spoink.gif
diff --git a/src/canonical/models/front/0326--000--Grumpig.gif b/src/canonical/models/front/0326-000-Grumpig.gif
similarity index 100%
rename from src/canonical/models/front/0326--000--Grumpig.gif
rename to src/canonical/models/front/0326-000-Grumpig.gif
diff --git a/src/canonical/models/front/0327--000--Spinda.gif b/src/canonical/models/front/0327-000-Spinda.gif
similarity index 100%
rename from src/canonical/models/front/0327--000--Spinda.gif
rename to src/canonical/models/front/0327-000-Spinda.gif
diff --git a/src/canonical/models/front/0328--000--Trapinch.gif b/src/canonical/models/front/0328-000-Trapinch.gif
similarity index 100%
rename from src/canonical/models/front/0328--000--Trapinch.gif
rename to src/canonical/models/front/0328-000-Trapinch.gif
diff --git a/src/canonical/models/front/0329--000--Vibrava.gif b/src/canonical/models/front/0329-000-Vibrava.gif
similarity index 100%
rename from src/canonical/models/front/0329--000--Vibrava.gif
rename to src/canonical/models/front/0329-000-Vibrava.gif
diff --git a/src/canonical/models/front/0330--000--Flygon.gif b/src/canonical/models/front/0330-000-Flygon.gif
similarity index 100%
rename from src/canonical/models/front/0330--000--Flygon.gif
rename to src/canonical/models/front/0330-000-Flygon.gif
diff --git a/src/canonical/models/front/0331--000--Cacnea.gif b/src/canonical/models/front/0331-000-Cacnea.gif
similarity index 100%
rename from src/canonical/models/front/0331--000--Cacnea.gif
rename to src/canonical/models/front/0331-000-Cacnea.gif
diff --git a/src/canonical/models/front/0332--000--Cacturne.gif b/src/canonical/models/front/0332-000-Cacturne.gif
similarity index 100%
rename from src/canonical/models/front/0332--000--Cacturne.gif
rename to src/canonical/models/front/0332-000-Cacturne.gif
diff --git a/src/canonical/models/front/0333--000--Swablu.gif b/src/canonical/models/front/0333-000-Swablu.gif
similarity index 100%
rename from src/canonical/models/front/0333--000--Swablu.gif
rename to src/canonical/models/front/0333-000-Swablu.gif
diff --git a/src/canonical/models/front/0334--000--Altaria.gif b/src/canonical/models/front/0334-000-Altaria.gif
similarity index 100%
rename from src/canonical/models/front/0334--000--Altaria.gif
rename to src/canonical/models/front/0334-000-Altaria.gif
diff --git a/src/canonical/models/front/0334--420--Altaria--Mega.gif b/src/canonical/models/front/0334-420-Altaria-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0334--420--Altaria--Mega.gif
rename to src/canonical/models/front/0334-420-Altaria-Mega.gif
diff --git a/src/canonical/models/front/0335--000--Zangoose.gif b/src/canonical/models/front/0335-000-Zangoose.gif
similarity index 100%
rename from src/canonical/models/front/0335--000--Zangoose.gif
rename to src/canonical/models/front/0335-000-Zangoose.gif
diff --git a/src/canonical/models/front/0336--000--Seviper.gif b/src/canonical/models/front/0336-000-Seviper.gif
similarity index 100%
rename from src/canonical/models/front/0336--000--Seviper.gif
rename to src/canonical/models/front/0336-000-Seviper.gif
diff --git a/src/canonical/models/front/0337--000--Lunatone.gif b/src/canonical/models/front/0337-000-Lunatone.gif
similarity index 100%
rename from src/canonical/models/front/0337--000--Lunatone.gif
rename to src/canonical/models/front/0337-000-Lunatone.gif
diff --git a/src/canonical/models/front/0338--000--Solrock.gif b/src/canonical/models/front/0338-000-Solrock.gif
similarity index 100%
rename from src/canonical/models/front/0338--000--Solrock.gif
rename to src/canonical/models/front/0338-000-Solrock.gif
diff --git a/src/canonical/models/front/0339--000--Barboach.gif b/src/canonical/models/front/0339-000-Barboach.gif
similarity index 100%
rename from src/canonical/models/front/0339--000--Barboach.gif
rename to src/canonical/models/front/0339-000-Barboach.gif
diff --git a/src/canonical/models/front/0340--000--Whiscash.gif b/src/canonical/models/front/0340-000-Whiscash.gif
similarity index 100%
rename from src/canonical/models/front/0340--000--Whiscash.gif
rename to src/canonical/models/front/0340-000-Whiscash.gif
diff --git a/src/canonical/models/front/0341--000--Corphish.gif b/src/canonical/models/front/0341-000-Corphish.gif
similarity index 100%
rename from src/canonical/models/front/0341--000--Corphish.gif
rename to src/canonical/models/front/0341-000-Corphish.gif
diff --git a/src/canonical/models/front/0342--000--Crawdaunt.gif b/src/canonical/models/front/0342-000-Crawdaunt.gif
similarity index 100%
rename from src/canonical/models/front/0342--000--Crawdaunt.gif
rename to src/canonical/models/front/0342-000-Crawdaunt.gif
diff --git a/src/canonical/models/front/0343--000--Baltoy.gif b/src/canonical/models/front/0343-000-Baltoy.gif
similarity index 100%
rename from src/canonical/models/front/0343--000--Baltoy.gif
rename to src/canonical/models/front/0343-000-Baltoy.gif
diff --git a/src/canonical/models/front/0344--000--Claydol.gif b/src/canonical/models/front/0344-000-Claydol.gif
similarity index 100%
rename from src/canonical/models/front/0344--000--Claydol.gif
rename to src/canonical/models/front/0344-000-Claydol.gif
diff --git a/src/canonical/models/front/0345--000--Lileep.gif b/src/canonical/models/front/0345-000-Lileep.gif
similarity index 100%
rename from src/canonical/models/front/0345--000--Lileep.gif
rename to src/canonical/models/front/0345-000-Lileep.gif
diff --git a/src/canonical/models/front/0346--000--Cradily.gif b/src/canonical/models/front/0346-000-Cradily.gif
similarity index 100%
rename from src/canonical/models/front/0346--000--Cradily.gif
rename to src/canonical/models/front/0346-000-Cradily.gif
diff --git a/src/canonical/models/front/0347--000--Anorith.gif b/src/canonical/models/front/0347-000-Anorith.gif
similarity index 100%
rename from src/canonical/models/front/0347--000--Anorith.gif
rename to src/canonical/models/front/0347-000-Anorith.gif
diff --git a/src/canonical/models/front/0348--000--Armaldo.gif b/src/canonical/models/front/0348-000-Armaldo.gif
similarity index 100%
rename from src/canonical/models/front/0348--000--Armaldo.gif
rename to src/canonical/models/front/0348-000-Armaldo.gif
diff --git a/src/canonical/models/front/0349--000--Feebas.gif b/src/canonical/models/front/0349-000-Feebas.gif
similarity index 100%
rename from src/canonical/models/front/0349--000--Feebas.gif
rename to src/canonical/models/front/0349-000-Feebas.gif
diff --git a/src/canonical/models/front/0350--000--Milotic.gif b/src/canonical/models/front/0350-000-Milotic.gif
similarity index 100%
rename from src/canonical/models/front/0350--000--Milotic.gif
rename to src/canonical/models/front/0350-000-Milotic.gif
diff --git a/src/canonical/models/front/0351--000--Castform.gif b/src/canonical/models/front/0351-000-Castform.gif
similarity index 100%
rename from src/canonical/models/front/0351--000--Castform.gif
rename to src/canonical/models/front/0351-000-Castform.gif
diff --git a/src/canonical/models/front/0351--420--Castform--Rainy.gif b/src/canonical/models/front/0351-420-Castform-Rainy.gif
similarity index 100%
rename from src/canonical/models/front/0351--420--Castform--Rainy.gif
rename to src/canonical/models/front/0351-420-Castform-Rainy.gif
diff --git a/src/canonical/models/front/0351--420--Castform--Snowy.gif b/src/canonical/models/front/0351-420-Castform-Snowy.gif
similarity index 100%
rename from src/canonical/models/front/0351--420--Castform--Snowy.gif
rename to src/canonical/models/front/0351-420-Castform-Snowy.gif
diff --git a/src/canonical/models/front/0351--420--Castform--Sunny.gif b/src/canonical/models/front/0351-420-Castform-Sunny.gif
similarity index 100%
rename from src/canonical/models/front/0351--420--Castform--Sunny.gif
rename to src/canonical/models/front/0351-420-Castform-Sunny.gif
diff --git a/src/canonical/models/front/0352--000--Kecleon.gif b/src/canonical/models/front/0352-000-Kecleon.gif
similarity index 100%
rename from src/canonical/models/front/0352--000--Kecleon.gif
rename to src/canonical/models/front/0352-000-Kecleon.gif
diff --git a/src/canonical/models/front/0353--000--Shuppet.gif b/src/canonical/models/front/0353-000-Shuppet.gif
similarity index 100%
rename from src/canonical/models/front/0353--000--Shuppet.gif
rename to src/canonical/models/front/0353-000-Shuppet.gif
diff --git a/src/canonical/models/front/0354--000--Banette.gif b/src/canonical/models/front/0354-000-Banette.gif
similarity index 100%
rename from src/canonical/models/front/0354--000--Banette.gif
rename to src/canonical/models/front/0354-000-Banette.gif
diff --git a/src/canonical/models/front/0354--420--Banette--Mega.gif b/src/canonical/models/front/0354-420-Banette-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0354--420--Banette--Mega.gif
rename to src/canonical/models/front/0354-420-Banette-Mega.gif
diff --git a/src/canonical/models/front/0355--000--Duskull.gif b/src/canonical/models/front/0355-000-Duskull.gif
similarity index 100%
rename from src/canonical/models/front/0355--000--Duskull.gif
rename to src/canonical/models/front/0355-000-Duskull.gif
diff --git a/src/canonical/models/front/0356--000--Dusclops.gif b/src/canonical/models/front/0356-000-Dusclops.gif
similarity index 100%
rename from src/canonical/models/front/0356--000--Dusclops.gif
rename to src/canonical/models/front/0356-000-Dusclops.gif
diff --git a/src/canonical/models/front/0357--000--Tropius.gif b/src/canonical/models/front/0357-000-Tropius.gif
similarity index 100%
rename from src/canonical/models/front/0357--000--Tropius.gif
rename to src/canonical/models/front/0357-000-Tropius.gif
diff --git a/src/canonical/models/front/0358--000--Chimecho.gif b/src/canonical/models/front/0358-000-Chimecho.gif
similarity index 100%
rename from src/canonical/models/front/0358--000--Chimecho.gif
rename to src/canonical/models/front/0358-000-Chimecho.gif
diff --git a/src/canonical/models/front/0359--000--Absol.gif b/src/canonical/models/front/0359-000-Absol.gif
similarity index 100%
rename from src/canonical/models/front/0359--000--Absol.gif
rename to src/canonical/models/front/0359-000-Absol.gif
diff --git a/src/canonical/models/front/0359--420--Absol--Mega.gif b/src/canonical/models/front/0359-420-Absol-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0359--420--Absol--Mega.gif
rename to src/canonical/models/front/0359-420-Absol-Mega.gif
diff --git a/src/canonical/models/front/0360--000--Wynaut.gif b/src/canonical/models/front/0360-000-Wynaut.gif
similarity index 100%
rename from src/canonical/models/front/0360--000--Wynaut.gif
rename to src/canonical/models/front/0360-000-Wynaut.gif
diff --git a/src/canonical/models/front/0361--000--Snorunt.gif b/src/canonical/models/front/0361-000-Snorunt.gif
similarity index 100%
rename from src/canonical/models/front/0361--000--Snorunt.gif
rename to src/canonical/models/front/0361-000-Snorunt.gif
diff --git a/src/canonical/models/front/0362--000--Glalie.gif b/src/canonical/models/front/0362-000-Glalie.gif
similarity index 100%
rename from src/canonical/models/front/0362--000--Glalie.gif
rename to src/canonical/models/front/0362-000-Glalie.gif
diff --git a/src/canonical/models/front/0362--420--Glalie--Mega.gif b/src/canonical/models/front/0362-420-Glalie-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0362--420--Glalie--Mega.gif
rename to src/canonical/models/front/0362-420-Glalie-Mega.gif
diff --git a/src/canonical/models/front/0363--000--Spheal.gif b/src/canonical/models/front/0363-000-Spheal.gif
similarity index 100%
rename from src/canonical/models/front/0363--000--Spheal.gif
rename to src/canonical/models/front/0363-000-Spheal.gif
diff --git a/src/canonical/models/front/0364--000--Sealeo.gif b/src/canonical/models/front/0364-000-Sealeo.gif
similarity index 100%
rename from src/canonical/models/front/0364--000--Sealeo.gif
rename to src/canonical/models/front/0364-000-Sealeo.gif
diff --git a/src/canonical/models/front/0365--000--Walrein.gif b/src/canonical/models/front/0365-000-Walrein.gif
similarity index 100%
rename from src/canonical/models/front/0365--000--Walrein.gif
rename to src/canonical/models/front/0365-000-Walrein.gif
diff --git a/src/canonical/models/front/0366--000--Clamperl.gif b/src/canonical/models/front/0366-000-Clamperl.gif
similarity index 100%
rename from src/canonical/models/front/0366--000--Clamperl.gif
rename to src/canonical/models/front/0366-000-Clamperl.gif
diff --git a/src/canonical/models/front/0367--000--Huntail.gif b/src/canonical/models/front/0367-000-Huntail.gif
similarity index 100%
rename from src/canonical/models/front/0367--000--Huntail.gif
rename to src/canonical/models/front/0367-000-Huntail.gif
diff --git a/src/canonical/models/front/0368--000--Gorebyss.gif b/src/canonical/models/front/0368-000-Gorebyss.gif
similarity index 100%
rename from src/canonical/models/front/0368--000--Gorebyss.gif
rename to src/canonical/models/front/0368-000-Gorebyss.gif
diff --git a/src/canonical/models/front/0369--000--Relicanth.gif b/src/canonical/models/front/0369-000-Relicanth.gif
similarity index 100%
rename from src/canonical/models/front/0369--000--Relicanth.gif
rename to src/canonical/models/front/0369-000-Relicanth.gif
diff --git a/src/canonical/models/front/0370--000--Luvdisc.gif b/src/canonical/models/front/0370-000-Luvdisc.gif
similarity index 100%
rename from src/canonical/models/front/0370--000--Luvdisc.gif
rename to src/canonical/models/front/0370-000-Luvdisc.gif
diff --git a/src/canonical/models/front/0371--000--Bagon.gif b/src/canonical/models/front/0371-000-Bagon.gif
similarity index 100%
rename from src/canonical/models/front/0371--000--Bagon.gif
rename to src/canonical/models/front/0371-000-Bagon.gif
diff --git a/src/canonical/models/front/0372--000--Shelgon.gif b/src/canonical/models/front/0372-000-Shelgon.gif
similarity index 100%
rename from src/canonical/models/front/0372--000--Shelgon.gif
rename to src/canonical/models/front/0372-000-Shelgon.gif
diff --git a/src/canonical/models/front/0373--000--Salamence.gif b/src/canonical/models/front/0373-000-Salamence.gif
similarity index 100%
rename from src/canonical/models/front/0373--000--Salamence.gif
rename to src/canonical/models/front/0373-000-Salamence.gif
diff --git a/src/canonical/models/front/0373--420--Salamence--Mega.gif b/src/canonical/models/front/0373-420-Salamence-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0373--420--Salamence--Mega.gif
rename to src/canonical/models/front/0373-420-Salamence-Mega.gif
diff --git a/src/canonical/models/front/0374--000--Beldum.gif b/src/canonical/models/front/0374-000-Beldum.gif
similarity index 100%
rename from src/canonical/models/front/0374--000--Beldum.gif
rename to src/canonical/models/front/0374-000-Beldum.gif
diff --git a/src/canonical/models/front/0375--000--Metang.gif b/src/canonical/models/front/0375-000-Metang.gif
similarity index 100%
rename from src/canonical/models/front/0375--000--Metang.gif
rename to src/canonical/models/front/0375-000-Metang.gif
diff --git a/src/canonical/models/front/0376--000--Metagross.gif b/src/canonical/models/front/0376-000-Metagross.gif
similarity index 100%
rename from src/canonical/models/front/0376--000--Metagross.gif
rename to src/canonical/models/front/0376-000-Metagross.gif
diff --git a/src/canonical/models/front/0376--420--Metagross--Mega.gif b/src/canonical/models/front/0376-420-Metagross-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0376--420--Metagross--Mega.gif
rename to src/canonical/models/front/0376-420-Metagross-Mega.gif
diff --git a/src/canonical/models/front/0377--000--Regirock.gif b/src/canonical/models/front/0377-000-Regirock.gif
similarity index 100%
rename from src/canonical/models/front/0377--000--Regirock.gif
rename to src/canonical/models/front/0377-000-Regirock.gif
diff --git a/src/canonical/models/front/0378--000--Regice.gif b/src/canonical/models/front/0378-000-Regice.gif
similarity index 100%
rename from src/canonical/models/front/0378--000--Regice.gif
rename to src/canonical/models/front/0378-000-Regice.gif
diff --git a/src/canonical/models/front/0379--000--Registeel.gif b/src/canonical/models/front/0379-000-Registeel.gif
similarity index 100%
rename from src/canonical/models/front/0379--000--Registeel.gif
rename to src/canonical/models/front/0379-000-Registeel.gif
diff --git a/src/canonical/models/front/0380--000--Latias.gif b/src/canonical/models/front/0380-000-Latias.gif
similarity index 100%
rename from src/canonical/models/front/0380--000--Latias.gif
rename to src/canonical/models/front/0380-000-Latias.gif
diff --git a/src/canonical/models/front/0380--420--Latias--Mega.gif b/src/canonical/models/front/0380-420-Latias-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0380--420--Latias--Mega.gif
rename to src/canonical/models/front/0380-420-Latias-Mega.gif
diff --git a/src/canonical/models/front/0381--000--Latios.gif b/src/canonical/models/front/0381-000-Latios.gif
similarity index 100%
rename from src/canonical/models/front/0381--000--Latios.gif
rename to src/canonical/models/front/0381-000-Latios.gif
diff --git a/src/canonical/models/front/0381--420--Latios--Mega.gif b/src/canonical/models/front/0381-420-Latios-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0381--420--Latios--Mega.gif
rename to src/canonical/models/front/0381-420-Latios-Mega.gif
diff --git a/src/canonical/models/front/0382--000--Kyogre.gif b/src/canonical/models/front/0382-000-Kyogre.gif
similarity index 100%
rename from src/canonical/models/front/0382--000--Kyogre.gif
rename to src/canonical/models/front/0382-000-Kyogre.gif
diff --git a/src/canonical/models/front/0382--420--Kyogre--Primal.gif b/src/canonical/models/front/0382-420-Kyogre-Primal.gif
similarity index 100%
rename from src/canonical/models/front/0382--420--Kyogre--Primal.gif
rename to src/canonical/models/front/0382-420-Kyogre-Primal.gif
diff --git a/src/canonical/models/front/0383--000--Groudon.gif b/src/canonical/models/front/0383-000-Groudon.gif
similarity index 100%
rename from src/canonical/models/front/0383--000--Groudon.gif
rename to src/canonical/models/front/0383-000-Groudon.gif
diff --git a/src/canonical/models/front/0383--420--Groudon--Primal.gif b/src/canonical/models/front/0383-420-Groudon-Primal.gif
similarity index 100%
rename from src/canonical/models/front/0383--420--Groudon--Primal.gif
rename to src/canonical/models/front/0383-420-Groudon-Primal.gif
diff --git a/src/canonical/models/front/0384--000--Rayquaza.gif b/src/canonical/models/front/0384-000-Rayquaza.gif
similarity index 100%
rename from src/canonical/models/front/0384--000--Rayquaza.gif
rename to src/canonical/models/front/0384-000-Rayquaza.gif
diff --git a/src/canonical/models/front/0384--420--Rayquaza--Mega.gif b/src/canonical/models/front/0384-420-Rayquaza-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0384--420--Rayquaza--Mega.gif
rename to src/canonical/models/front/0384-420-Rayquaza-Mega.gif
diff --git a/src/canonical/models/front/0385--000--Jirachi.gif b/src/canonical/models/front/0385-000-Jirachi.gif
similarity index 100%
rename from src/canonical/models/front/0385--000--Jirachi.gif
rename to src/canonical/models/front/0385-000-Jirachi.gif
diff --git a/src/canonical/models/front/0386--000--Deoxys.gif b/src/canonical/models/front/0386-000-Deoxys.gif
similarity index 100%
rename from src/canonical/models/front/0386--000--Deoxys.gif
rename to src/canonical/models/front/0386-000-Deoxys.gif
diff --git a/src/canonical/models/front/0386--420--Deoxys--Attack.gif b/src/canonical/models/front/0386-420-Deoxys-Attack.gif
similarity index 100%
rename from src/canonical/models/front/0386--420--Deoxys--Attack.gif
rename to src/canonical/models/front/0386-420-Deoxys-Attack.gif
diff --git a/src/canonical/models/front/0386--420--Deoxys--Defense.gif b/src/canonical/models/front/0386-420-Deoxys-Defense.gif
similarity index 100%
rename from src/canonical/models/front/0386--420--Deoxys--Defense.gif
rename to src/canonical/models/front/0386-420-Deoxys-Defense.gif
diff --git a/src/canonical/models/front/0386--420--Deoxys--Speed.gif b/src/canonical/models/front/0386-420-Deoxys-Speed.gif
similarity index 100%
rename from src/canonical/models/front/0386--420--Deoxys--Speed.gif
rename to src/canonical/models/front/0386-420-Deoxys-Speed.gif
diff --git a/src/canonical/models/front/0387--000--Turtwig.gif b/src/canonical/models/front/0387-000-Turtwig.gif
similarity index 100%
rename from src/canonical/models/front/0387--000--Turtwig.gif
rename to src/canonical/models/front/0387-000-Turtwig.gif
diff --git a/src/canonical/models/front/0388--000--Grotle.gif b/src/canonical/models/front/0388-000-Grotle.gif
similarity index 100%
rename from src/canonical/models/front/0388--000--Grotle.gif
rename to src/canonical/models/front/0388-000-Grotle.gif
diff --git a/src/canonical/models/front/0389--000--Torterra.gif b/src/canonical/models/front/0389-000-Torterra.gif
similarity index 100%
rename from src/canonical/models/front/0389--000--Torterra.gif
rename to src/canonical/models/front/0389-000-Torterra.gif
diff --git a/src/canonical/models/front/0390--000--Chimchar.gif b/src/canonical/models/front/0390-000-Chimchar.gif
similarity index 100%
rename from src/canonical/models/front/0390--000--Chimchar.gif
rename to src/canonical/models/front/0390-000-Chimchar.gif
diff --git a/src/canonical/models/front/0391--000--Monferno.gif b/src/canonical/models/front/0391-000-Monferno.gif
similarity index 100%
rename from src/canonical/models/front/0391--000--Monferno.gif
rename to src/canonical/models/front/0391-000-Monferno.gif
diff --git a/src/canonical/models/front/0392--000--Infernape.gif b/src/canonical/models/front/0392-000-Infernape.gif
similarity index 100%
rename from src/canonical/models/front/0392--000--Infernape.gif
rename to src/canonical/models/front/0392-000-Infernape.gif
diff --git a/src/canonical/models/front/0393--000--Piplup.gif b/src/canonical/models/front/0393-000-Piplup.gif
similarity index 100%
rename from src/canonical/models/front/0393--000--Piplup.gif
rename to src/canonical/models/front/0393-000-Piplup.gif
diff --git a/src/canonical/models/front/0394--000--Prinplup.gif b/src/canonical/models/front/0394-000-Prinplup.gif
similarity index 100%
rename from src/canonical/models/front/0394--000--Prinplup.gif
rename to src/canonical/models/front/0394-000-Prinplup.gif
diff --git a/src/canonical/models/front/0395--000--Empoleon.gif b/src/canonical/models/front/0395-000-Empoleon.gif
similarity index 100%
rename from src/canonical/models/front/0395--000--Empoleon.gif
rename to src/canonical/models/front/0395-000-Empoleon.gif
diff --git a/src/canonical/models/front/0396--000--Starly.gif b/src/canonical/models/front/0396-000-Starly.gif
similarity index 100%
rename from src/canonical/models/front/0396--000--Starly.gif
rename to src/canonical/models/front/0396-000-Starly.gif
diff --git a/src/canonical/models/front/0397--000--Staravia.gif b/src/canonical/models/front/0397-000-Staravia.gif
similarity index 100%
rename from src/canonical/models/front/0397--000--Staravia.gif
rename to src/canonical/models/front/0397-000-Staravia.gif
diff --git a/src/canonical/models/front/0398--000--Staraptor.gif b/src/canonical/models/front/0398-000-Staraptor.gif
similarity index 100%
rename from src/canonical/models/front/0398--000--Staraptor.gif
rename to src/canonical/models/front/0398-000-Staraptor.gif
diff --git a/src/canonical/models/front/0399--000--Bidoof.gif b/src/canonical/models/front/0399-000-Bidoof.gif
similarity index 100%
rename from src/canonical/models/front/0399--000--Bidoof.gif
rename to src/canonical/models/front/0399-000-Bidoof.gif
diff --git a/src/canonical/models/front/0400--000--Bibarel.gif b/src/canonical/models/front/0400-000-Bibarel.gif
similarity index 100%
rename from src/canonical/models/front/0400--000--Bibarel.gif
rename to src/canonical/models/front/0400-000-Bibarel.gif
diff --git a/src/canonical/models/front/0401--000--Kricketot.gif b/src/canonical/models/front/0401-000-Kricketot.gif
similarity index 100%
rename from src/canonical/models/front/0401--000--Kricketot.gif
rename to src/canonical/models/front/0401-000-Kricketot.gif
diff --git a/src/canonical/models/front/0402--000--Kricketune.gif b/src/canonical/models/front/0402-000-Kricketune.gif
similarity index 100%
rename from src/canonical/models/front/0402--000--Kricketune.gif
rename to src/canonical/models/front/0402-000-Kricketune.gif
diff --git a/src/canonical/models/front/0403--000--Shinx.gif b/src/canonical/models/front/0403-000-Shinx.gif
similarity index 100%
rename from src/canonical/models/front/0403--000--Shinx.gif
rename to src/canonical/models/front/0403-000-Shinx.gif
diff --git a/src/canonical/models/front/0404--000--Luxio.gif b/src/canonical/models/front/0404-000-Luxio.gif
similarity index 100%
rename from src/canonical/models/front/0404--000--Luxio.gif
rename to src/canonical/models/front/0404-000-Luxio.gif
diff --git a/src/canonical/models/front/0405--000--Luxray.gif b/src/canonical/models/front/0405-000-Luxray.gif
similarity index 100%
rename from src/canonical/models/front/0405--000--Luxray.gif
rename to src/canonical/models/front/0405-000-Luxray.gif
diff --git a/src/canonical/models/front/0406--000--Budew.gif b/src/canonical/models/front/0406-000-Budew.gif
similarity index 100%
rename from src/canonical/models/front/0406--000--Budew.gif
rename to src/canonical/models/front/0406-000-Budew.gif
diff --git a/src/canonical/models/front/0407--000--Roserade.gif b/src/canonical/models/front/0407-000-Roserade.gif
similarity index 100%
rename from src/canonical/models/front/0407--000--Roserade.gif
rename to src/canonical/models/front/0407-000-Roserade.gif
diff --git a/src/canonical/models/front/0408--000--Cranidos.gif b/src/canonical/models/front/0408-000-Cranidos.gif
similarity index 100%
rename from src/canonical/models/front/0408--000--Cranidos.gif
rename to src/canonical/models/front/0408-000-Cranidos.gif
diff --git a/src/canonical/models/front/0409--000--Rampardos.gif b/src/canonical/models/front/0409-000-Rampardos.gif
similarity index 100%
rename from src/canonical/models/front/0409--000--Rampardos.gif
rename to src/canonical/models/front/0409-000-Rampardos.gif
diff --git a/src/canonical/models/front/0410--000--Shieldon.gif b/src/canonical/models/front/0410-000-Shieldon.gif
similarity index 100%
rename from src/canonical/models/front/0410--000--Shieldon.gif
rename to src/canonical/models/front/0410-000-Shieldon.gif
diff --git a/src/canonical/models/front/0411--000--Bastiodon.gif b/src/canonical/models/front/0411-000-Bastiodon.gif
similarity index 100%
rename from src/canonical/models/front/0411--000--Bastiodon.gif
rename to src/canonical/models/front/0411-000-Bastiodon.gif
diff --git a/src/canonical/models/front/0412--000--Burmy.gif b/src/canonical/models/front/0412-000-Burmy.gif
similarity index 100%
rename from src/canonical/models/front/0412--000--Burmy.gif
rename to src/canonical/models/front/0412-000-Burmy.gif
diff --git a/src/canonical/models/front/0413--000--Wormadam.gif b/src/canonical/models/front/0413-000-Wormadam.gif
similarity index 100%
rename from src/canonical/models/front/0413--000--Wormadam.gif
rename to src/canonical/models/front/0413-000-Wormadam.gif
diff --git a/src/canonical/models/front/0413--420--Wormadam--Sandy.gif b/src/canonical/models/front/0413-420-Wormadam-Sandy.gif
similarity index 100%
rename from src/canonical/models/front/0413--420--Wormadam--Sandy.gif
rename to src/canonical/models/front/0413-420-Wormadam-Sandy.gif
diff --git a/src/canonical/models/front/0413--420--Wormadam--Trash.gif b/src/canonical/models/front/0413-420-Wormadam-Trash.gif
similarity index 100%
rename from src/canonical/models/front/0413--420--Wormadam--Trash.gif
rename to src/canonical/models/front/0413-420-Wormadam-Trash.gif
diff --git a/src/canonical/models/front/0414--000--Mothim.gif b/src/canonical/models/front/0414-000-Mothim.gif
similarity index 100%
rename from src/canonical/models/front/0414--000--Mothim.gif
rename to src/canonical/models/front/0414-000-Mothim.gif
diff --git a/src/canonical/models/front/0415--000--Combee.gif b/src/canonical/models/front/0415-000-Combee.gif
similarity index 100%
rename from src/canonical/models/front/0415--000--Combee.gif
rename to src/canonical/models/front/0415-000-Combee.gif
diff --git a/src/canonical/models/front/0416--000--Vespiquen.gif b/src/canonical/models/front/0416-000-Vespiquen.gif
similarity index 100%
rename from src/canonical/models/front/0416--000--Vespiquen.gif
rename to src/canonical/models/front/0416-000-Vespiquen.gif
diff --git a/src/canonical/models/front/0417--000--Pachirisu.gif b/src/canonical/models/front/0417-000-Pachirisu.gif
similarity index 100%
rename from src/canonical/models/front/0417--000--Pachirisu.gif
rename to src/canonical/models/front/0417-000-Pachirisu.gif
diff --git a/src/canonical/models/front/0418--000--Buizel.gif b/src/canonical/models/front/0418-000-Buizel.gif
similarity index 100%
rename from src/canonical/models/front/0418--000--Buizel.gif
rename to src/canonical/models/front/0418-000-Buizel.gif
diff --git a/src/canonical/models/front/0419--000--Floatzel.gif b/src/canonical/models/front/0419-000-Floatzel.gif
similarity index 100%
rename from src/canonical/models/front/0419--000--Floatzel.gif
rename to src/canonical/models/front/0419-000-Floatzel.gif
diff --git a/src/canonical/models/front/0420--000--Cherubi.gif b/src/canonical/models/front/0420-000-Cherubi.gif
similarity index 100%
rename from src/canonical/models/front/0420--000--Cherubi.gif
rename to src/canonical/models/front/0420-000-Cherubi.gif
diff --git a/src/canonical/models/front/0421--000--Cherrim.gif b/src/canonical/models/front/0421-000-Cherrim.gif
similarity index 100%
rename from src/canonical/models/front/0421--000--Cherrim.gif
rename to src/canonical/models/front/0421-000-Cherrim.gif
diff --git a/src/canonical/models/front/0421--420--Cherrim--Sunshine.gif b/src/canonical/models/front/0421-420-Cherrim-Sunshine.gif
similarity index 100%
rename from src/canonical/models/front/0421--420--Cherrim--Sunshine.gif
rename to src/canonical/models/front/0421-420-Cherrim-Sunshine.gif
diff --git a/src/canonical/models/front/0422--000--Shellos.gif b/src/canonical/models/front/0422-000-Shellos.gif
similarity index 100%
rename from src/canonical/models/front/0422--000--Shellos.gif
rename to src/canonical/models/front/0422-000-Shellos.gif
diff --git a/src/canonical/models/front/0423--000--Gastrodon.gif b/src/canonical/models/front/0423-000-Gastrodon.gif
similarity index 100%
rename from src/canonical/models/front/0423--000--Gastrodon.gif
rename to src/canonical/models/front/0423-000-Gastrodon.gif
diff --git a/src/canonical/models/front/0424--000--Ambipom.gif b/src/canonical/models/front/0424-000-Ambipom.gif
similarity index 100%
rename from src/canonical/models/front/0424--000--Ambipom.gif
rename to src/canonical/models/front/0424-000-Ambipom.gif
diff --git a/src/canonical/models/front/0425--000--Drifloon.gif b/src/canonical/models/front/0425-000-Drifloon.gif
similarity index 100%
rename from src/canonical/models/front/0425--000--Drifloon.gif
rename to src/canonical/models/front/0425-000-Drifloon.gif
diff --git a/src/canonical/models/front/0426--000--Drifblim.gif b/src/canonical/models/front/0426-000-Drifblim.gif
similarity index 100%
rename from src/canonical/models/front/0426--000--Drifblim.gif
rename to src/canonical/models/front/0426-000-Drifblim.gif
diff --git a/src/canonical/models/front/0427--000--Buneary.gif b/src/canonical/models/front/0427-000-Buneary.gif
similarity index 100%
rename from src/canonical/models/front/0427--000--Buneary.gif
rename to src/canonical/models/front/0427-000-Buneary.gif
diff --git a/src/canonical/models/front/0428--000--Lopunny.gif b/src/canonical/models/front/0428-000-Lopunny.gif
similarity index 100%
rename from src/canonical/models/front/0428--000--Lopunny.gif
rename to src/canonical/models/front/0428-000-Lopunny.gif
diff --git a/src/canonical/models/front/0428--420--Lopunny--Mega.gif b/src/canonical/models/front/0428-420-Lopunny-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0428--420--Lopunny--Mega.gif
rename to src/canonical/models/front/0428-420-Lopunny-Mega.gif
diff --git a/src/canonical/models/front/0429--000--Mismagius.gif b/src/canonical/models/front/0429-000-Mismagius.gif
similarity index 100%
rename from src/canonical/models/front/0429--000--Mismagius.gif
rename to src/canonical/models/front/0429-000-Mismagius.gif
diff --git a/src/canonical/models/front/0430--000--Honchkrow.gif b/src/canonical/models/front/0430-000-Honchkrow.gif
similarity index 100%
rename from src/canonical/models/front/0430--000--Honchkrow.gif
rename to src/canonical/models/front/0430-000-Honchkrow.gif
diff --git a/src/canonical/models/front/0431--000--Glameow.gif b/src/canonical/models/front/0431-000-Glameow.gif
similarity index 100%
rename from src/canonical/models/front/0431--000--Glameow.gif
rename to src/canonical/models/front/0431-000-Glameow.gif
diff --git a/src/canonical/models/front/0432--000--Purugly.gif b/src/canonical/models/front/0432-000-Purugly.gif
similarity index 100%
rename from src/canonical/models/front/0432--000--Purugly.gif
rename to src/canonical/models/front/0432-000-Purugly.gif
diff --git a/src/canonical/models/front/0433--000--Chingling.gif b/src/canonical/models/front/0433-000-Chingling.gif
similarity index 100%
rename from src/canonical/models/front/0433--000--Chingling.gif
rename to src/canonical/models/front/0433-000-Chingling.gif
diff --git a/src/canonical/models/front/0434--000--Stunky.gif b/src/canonical/models/front/0434-000-Stunky.gif
similarity index 100%
rename from src/canonical/models/front/0434--000--Stunky.gif
rename to src/canonical/models/front/0434-000-Stunky.gif
diff --git a/src/canonical/models/front/0435--000--Skuntank.gif b/src/canonical/models/front/0435-000-Skuntank.gif
similarity index 100%
rename from src/canonical/models/front/0435--000--Skuntank.gif
rename to src/canonical/models/front/0435-000-Skuntank.gif
diff --git a/src/canonical/models/front/0436--000--Bronzor.gif b/src/canonical/models/front/0436-000-Bronzor.gif
similarity index 100%
rename from src/canonical/models/front/0436--000--Bronzor.gif
rename to src/canonical/models/front/0436-000-Bronzor.gif
diff --git a/src/canonical/models/front/0437--000--Bronzong.gif b/src/canonical/models/front/0437-000-Bronzong.gif
similarity index 100%
rename from src/canonical/models/front/0437--000--Bronzong.gif
rename to src/canonical/models/front/0437-000-Bronzong.gif
diff --git a/src/canonical/models/front/0438--000--Bonsly.gif b/src/canonical/models/front/0438-000-Bonsly.gif
similarity index 100%
rename from src/canonical/models/front/0438--000--Bonsly.gif
rename to src/canonical/models/front/0438-000-Bonsly.gif
diff --git a/src/canonical/models/front/0439--000--Mime_Jr..gif b/src/canonical/models/front/0439-000-Mime_Jr..gif
similarity index 100%
rename from src/canonical/models/front/0439--000--Mime_Jr..gif
rename to src/canonical/models/front/0439-000-Mime_Jr..gif
diff --git a/src/canonical/models/front/0440--000--Happiny.gif b/src/canonical/models/front/0440-000-Happiny.gif
similarity index 100%
rename from src/canonical/models/front/0440--000--Happiny.gif
rename to src/canonical/models/front/0440-000-Happiny.gif
diff --git a/src/canonical/models/front/0441--000--Chatot.gif b/src/canonical/models/front/0441-000-Chatot.gif
similarity index 100%
rename from src/canonical/models/front/0441--000--Chatot.gif
rename to src/canonical/models/front/0441-000-Chatot.gif
diff --git a/src/canonical/models/front/0442--000--Spiritomb.gif b/src/canonical/models/front/0442-000-Spiritomb.gif
similarity index 100%
rename from src/canonical/models/front/0442--000--Spiritomb.gif
rename to src/canonical/models/front/0442-000-Spiritomb.gif
diff --git a/src/canonical/models/front/0443--000--Gible.gif b/src/canonical/models/front/0443-000-Gible.gif
similarity index 100%
rename from src/canonical/models/front/0443--000--Gible.gif
rename to src/canonical/models/front/0443-000-Gible.gif
diff --git a/src/canonical/models/front/0444--000--Gabite.gif b/src/canonical/models/front/0444-000-Gabite.gif
similarity index 100%
rename from src/canonical/models/front/0444--000--Gabite.gif
rename to src/canonical/models/front/0444-000-Gabite.gif
diff --git a/src/canonical/models/front/0445--000--Garchomp.gif b/src/canonical/models/front/0445-000-Garchomp.gif
similarity index 100%
rename from src/canonical/models/front/0445--000--Garchomp.gif
rename to src/canonical/models/front/0445-000-Garchomp.gif
diff --git a/src/canonical/models/front/0445--420--Garchomp--Mega.gif b/src/canonical/models/front/0445-420-Garchomp-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0445--420--Garchomp--Mega.gif
rename to src/canonical/models/front/0445-420-Garchomp-Mega.gif
diff --git a/src/canonical/models/front/0446--000--Munchlax.gif b/src/canonical/models/front/0446-000-Munchlax.gif
similarity index 100%
rename from src/canonical/models/front/0446--000--Munchlax.gif
rename to src/canonical/models/front/0446-000-Munchlax.gif
diff --git a/src/canonical/models/front/0447--000--Riolu.gif b/src/canonical/models/front/0447-000-Riolu.gif
similarity index 100%
rename from src/canonical/models/front/0447--000--Riolu.gif
rename to src/canonical/models/front/0447-000-Riolu.gif
diff --git a/src/canonical/models/front/0448--000--Lucario.gif b/src/canonical/models/front/0448-000-Lucario.gif
similarity index 100%
rename from src/canonical/models/front/0448--000--Lucario.gif
rename to src/canonical/models/front/0448-000-Lucario.gif
diff --git a/src/canonical/models/front/0448--420--Lucario--Mega.gif b/src/canonical/models/front/0448-420-Lucario-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0448--420--Lucario--Mega.gif
rename to src/canonical/models/front/0448-420-Lucario-Mega.gif
diff --git a/src/canonical/models/front/0449--000--Hippopotas.gif b/src/canonical/models/front/0449-000-Hippopotas.gif
similarity index 100%
rename from src/canonical/models/front/0449--000--Hippopotas.gif
rename to src/canonical/models/front/0449-000-Hippopotas.gif
diff --git a/src/canonical/models/front/0450--000--Hippowdon.gif b/src/canonical/models/front/0450-000-Hippowdon.gif
similarity index 100%
rename from src/canonical/models/front/0450--000--Hippowdon.gif
rename to src/canonical/models/front/0450-000-Hippowdon.gif
diff --git a/src/canonical/models/front/0451--000--Skorupi.gif b/src/canonical/models/front/0451-000-Skorupi.gif
similarity index 100%
rename from src/canonical/models/front/0451--000--Skorupi.gif
rename to src/canonical/models/front/0451-000-Skorupi.gif
diff --git a/src/canonical/models/front/0452--000--Drapion.gif b/src/canonical/models/front/0452-000-Drapion.gif
similarity index 100%
rename from src/canonical/models/front/0452--000--Drapion.gif
rename to src/canonical/models/front/0452-000-Drapion.gif
diff --git a/src/canonical/models/front/0453--000--Croagunk.gif b/src/canonical/models/front/0453-000-Croagunk.gif
similarity index 100%
rename from src/canonical/models/front/0453--000--Croagunk.gif
rename to src/canonical/models/front/0453-000-Croagunk.gif
diff --git a/src/canonical/models/front/0454--000--Toxicroak.gif b/src/canonical/models/front/0454-000-Toxicroak.gif
similarity index 100%
rename from src/canonical/models/front/0454--000--Toxicroak.gif
rename to src/canonical/models/front/0454-000-Toxicroak.gif
diff --git a/src/canonical/models/front/0455--000--Carnivine.gif b/src/canonical/models/front/0455-000-Carnivine.gif
similarity index 100%
rename from src/canonical/models/front/0455--000--Carnivine.gif
rename to src/canonical/models/front/0455-000-Carnivine.gif
diff --git a/src/canonical/models/front/0456--000--Finneon.gif b/src/canonical/models/front/0456-000-Finneon.gif
similarity index 100%
rename from src/canonical/models/front/0456--000--Finneon.gif
rename to src/canonical/models/front/0456-000-Finneon.gif
diff --git a/src/canonical/models/front/0457--000--Lumineon.gif b/src/canonical/models/front/0457-000-Lumineon.gif
similarity index 100%
rename from src/canonical/models/front/0457--000--Lumineon.gif
rename to src/canonical/models/front/0457-000-Lumineon.gif
diff --git a/src/canonical/models/front/0458--000--Mantyke.gif b/src/canonical/models/front/0458-000-Mantyke.gif
similarity index 100%
rename from src/canonical/models/front/0458--000--Mantyke.gif
rename to src/canonical/models/front/0458-000-Mantyke.gif
diff --git a/src/canonical/models/front/0459--000--Snover.gif b/src/canonical/models/front/0459-000-Snover.gif
similarity index 100%
rename from src/canonical/models/front/0459--000--Snover.gif
rename to src/canonical/models/front/0459-000-Snover.gif
diff --git a/src/canonical/models/front/0460--000--Abomasnow.gif b/src/canonical/models/front/0460-000-Abomasnow.gif
similarity index 100%
rename from src/canonical/models/front/0460--000--Abomasnow.gif
rename to src/canonical/models/front/0460-000-Abomasnow.gif
diff --git a/src/canonical/models/front/0460--420--Abomasnow--Mega.gif b/src/canonical/models/front/0460-420-Abomasnow-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0460--420--Abomasnow--Mega.gif
rename to src/canonical/models/front/0460-420-Abomasnow-Mega.gif
diff --git a/src/canonical/models/front/0461--000--Weavile.gif b/src/canonical/models/front/0461-000-Weavile.gif
similarity index 100%
rename from src/canonical/models/front/0461--000--Weavile.gif
rename to src/canonical/models/front/0461-000-Weavile.gif
diff --git a/src/canonical/models/front/0462--000--Magnezone.gif b/src/canonical/models/front/0462-000-Magnezone.gif
similarity index 100%
rename from src/canonical/models/front/0462--000--Magnezone.gif
rename to src/canonical/models/front/0462-000-Magnezone.gif
diff --git a/src/canonical/models/front/0463--000--Lickilicky.gif b/src/canonical/models/front/0463-000-Lickilicky.gif
similarity index 100%
rename from src/canonical/models/front/0463--000--Lickilicky.gif
rename to src/canonical/models/front/0463-000-Lickilicky.gif
diff --git a/src/canonical/models/front/0464--000--Rhyperior.gif b/src/canonical/models/front/0464-000-Rhyperior.gif
similarity index 100%
rename from src/canonical/models/front/0464--000--Rhyperior.gif
rename to src/canonical/models/front/0464-000-Rhyperior.gif
diff --git a/src/canonical/models/front/0465--000--Tangrowth.gif b/src/canonical/models/front/0465-000-Tangrowth.gif
similarity index 100%
rename from src/canonical/models/front/0465--000--Tangrowth.gif
rename to src/canonical/models/front/0465-000-Tangrowth.gif
diff --git a/src/canonical/models/front/0466--000--Electivire.gif b/src/canonical/models/front/0466-000-Electivire.gif
similarity index 100%
rename from src/canonical/models/front/0466--000--Electivire.gif
rename to src/canonical/models/front/0466-000-Electivire.gif
diff --git a/src/canonical/models/front/0467--000--Magmortar.gif b/src/canonical/models/front/0467-000-Magmortar.gif
similarity index 100%
rename from src/canonical/models/front/0467--000--Magmortar.gif
rename to src/canonical/models/front/0467-000-Magmortar.gif
diff --git a/src/canonical/models/front/0468--000--Togekiss.gif b/src/canonical/models/front/0468-000-Togekiss.gif
similarity index 100%
rename from src/canonical/models/front/0468--000--Togekiss.gif
rename to src/canonical/models/front/0468-000-Togekiss.gif
diff --git a/src/canonical/models/front/0469--000--Yanmega.gif b/src/canonical/models/front/0469-000-Yanmega.gif
similarity index 100%
rename from src/canonical/models/front/0469--000--Yanmega.gif
rename to src/canonical/models/front/0469-000-Yanmega.gif
diff --git a/src/canonical/models/front/0470--000--Leafeon.gif b/src/canonical/models/front/0470-000-Leafeon.gif
similarity index 100%
rename from src/canonical/models/front/0470--000--Leafeon.gif
rename to src/canonical/models/front/0470-000-Leafeon.gif
diff --git a/src/canonical/models/front/0471--000--Glaceon.gif b/src/canonical/models/front/0471-000-Glaceon.gif
similarity index 100%
rename from src/canonical/models/front/0471--000--Glaceon.gif
rename to src/canonical/models/front/0471-000-Glaceon.gif
diff --git a/src/canonical/models/front/0472--000--Gliscor.gif b/src/canonical/models/front/0472-000-Gliscor.gif
similarity index 100%
rename from src/canonical/models/front/0472--000--Gliscor.gif
rename to src/canonical/models/front/0472-000-Gliscor.gif
diff --git a/src/canonical/models/front/0473--000--Mamoswine.gif b/src/canonical/models/front/0473-000-Mamoswine.gif
similarity index 100%
rename from src/canonical/models/front/0473--000--Mamoswine.gif
rename to src/canonical/models/front/0473-000-Mamoswine.gif
diff --git a/src/canonical/models/front/0474--000--Porygon-Z.gif b/src/canonical/models/front/0474-000-Porygon~Z.gif
similarity index 100%
rename from src/canonical/models/front/0474--000--Porygon-Z.gif
rename to src/canonical/models/front/0474-000-Porygon~Z.gif
diff --git a/src/canonical/models/front/0475--000--Gallade.gif b/src/canonical/models/front/0475-000-Gallade.gif
similarity index 100%
rename from src/canonical/models/front/0475--000--Gallade.gif
rename to src/canonical/models/front/0475-000-Gallade.gif
diff --git a/src/canonical/models/front/0475--420--Gallade--Mega.gif b/src/canonical/models/front/0475-420-Gallade-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0475--420--Gallade--Mega.gif
rename to src/canonical/models/front/0475-420-Gallade-Mega.gif
diff --git a/src/canonical/models/front/0476--000--Probopass.gif b/src/canonical/models/front/0476-000-Probopass.gif
similarity index 100%
rename from src/canonical/models/front/0476--000--Probopass.gif
rename to src/canonical/models/front/0476-000-Probopass.gif
diff --git a/src/canonical/models/front/0477--000--Dusknoir.gif b/src/canonical/models/front/0477-000-Dusknoir.gif
similarity index 100%
rename from src/canonical/models/front/0477--000--Dusknoir.gif
rename to src/canonical/models/front/0477-000-Dusknoir.gif
diff --git a/src/canonical/models/front/0478--000--Froslass.gif b/src/canonical/models/front/0478-000-Froslass.gif
similarity index 100%
rename from src/canonical/models/front/0478--000--Froslass.gif
rename to src/canonical/models/front/0478-000-Froslass.gif
diff --git a/src/canonical/models/front/0479--000--Rotom.gif b/src/canonical/models/front/0479-000-Rotom.gif
similarity index 100%
rename from src/canonical/models/front/0479--000--Rotom.gif
rename to src/canonical/models/front/0479-000-Rotom.gif
diff --git a/src/canonical/models/front/0479--420--Rotom--Fan.gif b/src/canonical/models/front/0479-420-Rotom-Fan.gif
similarity index 100%
rename from src/canonical/models/front/0479--420--Rotom--Fan.gif
rename to src/canonical/models/front/0479-420-Rotom-Fan.gif
diff --git a/src/canonical/models/front/0479--420--Rotom--Frost.gif b/src/canonical/models/front/0479-420-Rotom-Frost.gif
similarity index 100%
rename from src/canonical/models/front/0479--420--Rotom--Frost.gif
rename to src/canonical/models/front/0479-420-Rotom-Frost.gif
diff --git a/src/canonical/models/front/0479--420--Rotom--Heat.gif b/src/canonical/models/front/0479-420-Rotom-Heat.gif
similarity index 100%
rename from src/canonical/models/front/0479--420--Rotom--Heat.gif
rename to src/canonical/models/front/0479-420-Rotom-Heat.gif
diff --git a/src/canonical/models/front/0479--420--Rotom--Mow.gif b/src/canonical/models/front/0479-420-Rotom-Mow.gif
similarity index 100%
rename from src/canonical/models/front/0479--420--Rotom--Mow.gif
rename to src/canonical/models/front/0479-420-Rotom-Mow.gif
diff --git a/src/canonical/models/front/0479--420--Rotom--Wash.gif b/src/canonical/models/front/0479-420-Rotom-Wash.gif
similarity index 100%
rename from src/canonical/models/front/0479--420--Rotom--Wash.gif
rename to src/canonical/models/front/0479-420-Rotom-Wash.gif
diff --git a/src/canonical/models/front/0480--000--Uxie.gif b/src/canonical/models/front/0480-000-Uxie.gif
similarity index 100%
rename from src/canonical/models/front/0480--000--Uxie.gif
rename to src/canonical/models/front/0480-000-Uxie.gif
diff --git a/src/canonical/models/front/0481--000--Mesprit.gif b/src/canonical/models/front/0481-000-Mesprit.gif
similarity index 100%
rename from src/canonical/models/front/0481--000--Mesprit.gif
rename to src/canonical/models/front/0481-000-Mesprit.gif
diff --git a/src/canonical/models/front/0482--000--Azelf.gif b/src/canonical/models/front/0482-000-Azelf.gif
similarity index 100%
rename from src/canonical/models/front/0482--000--Azelf.gif
rename to src/canonical/models/front/0482-000-Azelf.gif
diff --git a/src/canonical/models/front/0483--000--Dialga.gif b/src/canonical/models/front/0483-000-Dialga.gif
similarity index 100%
rename from src/canonical/models/front/0483--000--Dialga.gif
rename to src/canonical/models/front/0483-000-Dialga.gif
diff --git a/src/canonical/models/front/0484--000--Palkia.gif b/src/canonical/models/front/0484-000-Palkia.gif
similarity index 100%
rename from src/canonical/models/front/0484--000--Palkia.gif
rename to src/canonical/models/front/0484-000-Palkia.gif
diff --git a/src/canonical/models/front/0485--000--Heatran.gif b/src/canonical/models/front/0485-000-Heatran.gif
similarity index 100%
rename from src/canonical/models/front/0485--000--Heatran.gif
rename to src/canonical/models/front/0485-000-Heatran.gif
diff --git a/src/canonical/models/front/0486--000--Regigigas.gif b/src/canonical/models/front/0486-000-Regigigas.gif
similarity index 100%
rename from src/canonical/models/front/0486--000--Regigigas.gif
rename to src/canonical/models/front/0486-000-Regigigas.gif
diff --git a/src/canonical/models/front/0487--000--Giratina.gif b/src/canonical/models/front/0487-000-Giratina.gif
similarity index 100%
rename from src/canonical/models/front/0487--000--Giratina.gif
rename to src/canonical/models/front/0487-000-Giratina.gif
diff --git a/src/canonical/models/front/0487--420--Giratina--Origin.gif b/src/canonical/models/front/0487-420-Giratina-Origin.gif
similarity index 100%
rename from src/canonical/models/front/0487--420--Giratina--Origin.gif
rename to src/canonical/models/front/0487-420-Giratina-Origin.gif
diff --git a/src/canonical/models/front/0488--000--Cresselia.gif b/src/canonical/models/front/0488-000-Cresselia.gif
similarity index 100%
rename from src/canonical/models/front/0488--000--Cresselia.gif
rename to src/canonical/models/front/0488-000-Cresselia.gif
diff --git a/src/canonical/models/front/0489--000--Phione.gif b/src/canonical/models/front/0489-000-Phione.gif
similarity index 100%
rename from src/canonical/models/front/0489--000--Phione.gif
rename to src/canonical/models/front/0489-000-Phione.gif
diff --git a/src/canonical/models/front/0490--000--Manaphy.gif b/src/canonical/models/front/0490-000-Manaphy.gif
similarity index 100%
rename from src/canonical/models/front/0490--000--Manaphy.gif
rename to src/canonical/models/front/0490-000-Manaphy.gif
diff --git a/src/canonical/models/front/0491--000--Darkrai.gif b/src/canonical/models/front/0491-000-Darkrai.gif
similarity index 100%
rename from src/canonical/models/front/0491--000--Darkrai.gif
rename to src/canonical/models/front/0491-000-Darkrai.gif
diff --git a/src/canonical/models/front/0492--000--Shaymin.gif b/src/canonical/models/front/0492-000-Shaymin.gif
similarity index 100%
rename from src/canonical/models/front/0492--000--Shaymin.gif
rename to src/canonical/models/front/0492-000-Shaymin.gif
diff --git a/src/canonical/models/front/0492--420--Shaymin--Sky.gif b/src/canonical/models/front/0492-420-Shaymin-Sky.gif
similarity index 100%
rename from src/canonical/models/front/0492--420--Shaymin--Sky.gif
rename to src/canonical/models/front/0492-420-Shaymin-Sky.gif
diff --git a/src/canonical/models/front/0493--000--Arceus.gif b/src/canonical/models/front/0493-000-Arceus.gif
similarity index 100%
rename from src/canonical/models/front/0493--000--Arceus.gif
rename to src/canonical/models/front/0493-000-Arceus.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Bug.gif b/src/canonical/models/front/0493-420-Arceus-Bug.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Bug.gif
rename to src/canonical/models/front/0493-420-Arceus-Bug.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Dark.gif b/src/canonical/models/front/0493-420-Arceus-Dark.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Dark.gif
rename to src/canonical/models/front/0493-420-Arceus-Dark.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Dragon.gif b/src/canonical/models/front/0493-420-Arceus-Dragon.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Dragon.gif
rename to src/canonical/models/front/0493-420-Arceus-Dragon.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Electric.gif b/src/canonical/models/front/0493-420-Arceus-Electric.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Electric.gif
rename to src/canonical/models/front/0493-420-Arceus-Electric.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Fairy.gif b/src/canonical/models/front/0493-420-Arceus-Fairy.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Fairy.gif
rename to src/canonical/models/front/0493-420-Arceus-Fairy.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Fighting.gif b/src/canonical/models/front/0493-420-Arceus-Fighting.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Fighting.gif
rename to src/canonical/models/front/0493-420-Arceus-Fighting.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Fire.gif b/src/canonical/models/front/0493-420-Arceus-Fire.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Fire.gif
rename to src/canonical/models/front/0493-420-Arceus-Fire.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Flying.gif b/src/canonical/models/front/0493-420-Arceus-Flying.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Flying.gif
rename to src/canonical/models/front/0493-420-Arceus-Flying.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Ghost.gif b/src/canonical/models/front/0493-420-Arceus-Ghost.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Ghost.gif
rename to src/canonical/models/front/0493-420-Arceus-Ghost.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Grass.gif b/src/canonical/models/front/0493-420-Arceus-Grass.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Grass.gif
rename to src/canonical/models/front/0493-420-Arceus-Grass.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Ground.gif b/src/canonical/models/front/0493-420-Arceus-Ground.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Ground.gif
rename to src/canonical/models/front/0493-420-Arceus-Ground.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Ice.gif b/src/canonical/models/front/0493-420-Arceus-Ice.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Ice.gif
rename to src/canonical/models/front/0493-420-Arceus-Ice.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Poison.gif b/src/canonical/models/front/0493-420-Arceus-Poison.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Poison.gif
rename to src/canonical/models/front/0493-420-Arceus-Poison.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Psychic.gif b/src/canonical/models/front/0493-420-Arceus-Psychic.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Psychic.gif
rename to src/canonical/models/front/0493-420-Arceus-Psychic.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Rock.gif b/src/canonical/models/front/0493-420-Arceus-Rock.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Rock.gif
rename to src/canonical/models/front/0493-420-Arceus-Rock.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Steel.gif b/src/canonical/models/front/0493-420-Arceus-Steel.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Steel.gif
rename to src/canonical/models/front/0493-420-Arceus-Steel.gif
diff --git a/src/canonical/models/front/0493--420--Arceus--Water.gif b/src/canonical/models/front/0493-420-Arceus-Water.gif
similarity index 100%
rename from src/canonical/models/front/0493--420--Arceus--Water.gif
rename to src/canonical/models/front/0493-420-Arceus-Water.gif
diff --git a/src/canonical/models/front/0494--000--Victini.gif b/src/canonical/models/front/0494-000-Victini.gif
similarity index 100%
rename from src/canonical/models/front/0494--000--Victini.gif
rename to src/canonical/models/front/0494-000-Victini.gif
diff --git a/src/canonical/models/front/0495--000--Snivy.gif b/src/canonical/models/front/0495-000-Snivy.gif
similarity index 100%
rename from src/canonical/models/front/0495--000--Snivy.gif
rename to src/canonical/models/front/0495-000-Snivy.gif
diff --git a/src/canonical/models/front/0496--000--Servine.gif b/src/canonical/models/front/0496-000-Servine.gif
similarity index 100%
rename from src/canonical/models/front/0496--000--Servine.gif
rename to src/canonical/models/front/0496-000-Servine.gif
diff --git a/src/canonical/models/front/0497--000--Serperior.gif b/src/canonical/models/front/0497-000-Serperior.gif
similarity index 100%
rename from src/canonical/models/front/0497--000--Serperior.gif
rename to src/canonical/models/front/0497-000-Serperior.gif
diff --git a/src/canonical/models/front/0498--000--Tepig.gif b/src/canonical/models/front/0498-000-Tepig.gif
similarity index 100%
rename from src/canonical/models/front/0498--000--Tepig.gif
rename to src/canonical/models/front/0498-000-Tepig.gif
diff --git a/src/canonical/models/front/0499--000--Pignite.gif b/src/canonical/models/front/0499-000-Pignite.gif
similarity index 100%
rename from src/canonical/models/front/0499--000--Pignite.gif
rename to src/canonical/models/front/0499-000-Pignite.gif
diff --git a/src/canonical/models/front/0500--000--Emboar.gif b/src/canonical/models/front/0500-000-Emboar.gif
similarity index 100%
rename from src/canonical/models/front/0500--000--Emboar.gif
rename to src/canonical/models/front/0500-000-Emboar.gif
diff --git a/src/canonical/models/front/0501--000--Oshawott.gif b/src/canonical/models/front/0501-000-Oshawott.gif
similarity index 100%
rename from src/canonical/models/front/0501--000--Oshawott.gif
rename to src/canonical/models/front/0501-000-Oshawott.gif
diff --git a/src/canonical/models/front/0502--000--Dewott.gif b/src/canonical/models/front/0502-000-Dewott.gif
similarity index 100%
rename from src/canonical/models/front/0502--000--Dewott.gif
rename to src/canonical/models/front/0502-000-Dewott.gif
diff --git a/src/canonical/models/front/0503--000--Samurott.gif b/src/canonical/models/front/0503-000-Samurott.gif
similarity index 100%
rename from src/canonical/models/front/0503--000--Samurott.gif
rename to src/canonical/models/front/0503-000-Samurott.gif
diff --git a/src/canonical/models/front/0504--000--Patrat.gif b/src/canonical/models/front/0504-000-Patrat.gif
similarity index 100%
rename from src/canonical/models/front/0504--000--Patrat.gif
rename to src/canonical/models/front/0504-000-Patrat.gif
diff --git a/src/canonical/models/front/0505--000--Watchog.gif b/src/canonical/models/front/0505-000-Watchog.gif
similarity index 100%
rename from src/canonical/models/front/0505--000--Watchog.gif
rename to src/canonical/models/front/0505-000-Watchog.gif
diff --git a/src/canonical/models/front/0506--000--Lillipup.gif b/src/canonical/models/front/0506-000-Lillipup.gif
similarity index 100%
rename from src/canonical/models/front/0506--000--Lillipup.gif
rename to src/canonical/models/front/0506-000-Lillipup.gif
diff --git a/src/canonical/models/front/0507--000--Herdier.gif b/src/canonical/models/front/0507-000-Herdier.gif
similarity index 100%
rename from src/canonical/models/front/0507--000--Herdier.gif
rename to src/canonical/models/front/0507-000-Herdier.gif
diff --git a/src/canonical/models/front/0508--000--Stoutland.gif b/src/canonical/models/front/0508-000-Stoutland.gif
similarity index 100%
rename from src/canonical/models/front/0508--000--Stoutland.gif
rename to src/canonical/models/front/0508-000-Stoutland.gif
diff --git a/src/canonical/models/front/0509--000--Purrloin.gif b/src/canonical/models/front/0509-000-Purrloin.gif
similarity index 100%
rename from src/canonical/models/front/0509--000--Purrloin.gif
rename to src/canonical/models/front/0509-000-Purrloin.gif
diff --git a/src/canonical/models/front/0510--000--Liepard.gif b/src/canonical/models/front/0510-000-Liepard.gif
similarity index 100%
rename from src/canonical/models/front/0510--000--Liepard.gif
rename to src/canonical/models/front/0510-000-Liepard.gif
diff --git a/src/canonical/models/front/0511--000--Pansage.gif b/src/canonical/models/front/0511-000-Pansage.gif
similarity index 100%
rename from src/canonical/models/front/0511--000--Pansage.gif
rename to src/canonical/models/front/0511-000-Pansage.gif
diff --git a/src/canonical/models/front/0512--000--Simisage.gif b/src/canonical/models/front/0512-000-Simisage.gif
similarity index 100%
rename from src/canonical/models/front/0512--000--Simisage.gif
rename to src/canonical/models/front/0512-000-Simisage.gif
diff --git a/src/canonical/models/front/0513--000--Pansear.gif b/src/canonical/models/front/0513-000-Pansear.gif
similarity index 100%
rename from src/canonical/models/front/0513--000--Pansear.gif
rename to src/canonical/models/front/0513-000-Pansear.gif
diff --git a/src/canonical/models/front/0514--000--Simisear.gif b/src/canonical/models/front/0514-000-Simisear.gif
similarity index 100%
rename from src/canonical/models/front/0514--000--Simisear.gif
rename to src/canonical/models/front/0514-000-Simisear.gif
diff --git a/src/canonical/models/front/0515--000--Panpour.gif b/src/canonical/models/front/0515-000-Panpour.gif
similarity index 100%
rename from src/canonical/models/front/0515--000--Panpour.gif
rename to src/canonical/models/front/0515-000-Panpour.gif
diff --git a/src/canonical/models/front/0516--000--Simipour.gif b/src/canonical/models/front/0516-000-Simipour.gif
similarity index 100%
rename from src/canonical/models/front/0516--000--Simipour.gif
rename to src/canonical/models/front/0516-000-Simipour.gif
diff --git a/src/canonical/models/front/0517--000--Munna.gif b/src/canonical/models/front/0517-000-Munna.gif
similarity index 100%
rename from src/canonical/models/front/0517--000--Munna.gif
rename to src/canonical/models/front/0517-000-Munna.gif
diff --git a/src/canonical/models/front/0518--000--Musharna.gif b/src/canonical/models/front/0518-000-Musharna.gif
similarity index 100%
rename from src/canonical/models/front/0518--000--Musharna.gif
rename to src/canonical/models/front/0518-000-Musharna.gif
diff --git a/src/canonical/models/front/0519--000--Pidove.gif b/src/canonical/models/front/0519-000-Pidove.gif
similarity index 100%
rename from src/canonical/models/front/0519--000--Pidove.gif
rename to src/canonical/models/front/0519-000-Pidove.gif
diff --git a/src/canonical/models/front/0520--000--Tranquill.gif b/src/canonical/models/front/0520-000-Tranquill.gif
similarity index 100%
rename from src/canonical/models/front/0520--000--Tranquill.gif
rename to src/canonical/models/front/0520-000-Tranquill.gif
diff --git a/src/canonical/models/front/0521--000--Unfezant.gif b/src/canonical/models/front/0521-000-Unfezant.gif
similarity index 100%
rename from src/canonical/models/front/0521--000--Unfezant.gif
rename to src/canonical/models/front/0521-000-Unfezant.gif
diff --git a/src/canonical/models/front/0522--000--Blitzle.gif b/src/canonical/models/front/0522-000-Blitzle.gif
similarity index 100%
rename from src/canonical/models/front/0522--000--Blitzle.gif
rename to src/canonical/models/front/0522-000-Blitzle.gif
diff --git a/src/canonical/models/front/0523--000--Zebstrika.gif b/src/canonical/models/front/0523-000-Zebstrika.gif
similarity index 100%
rename from src/canonical/models/front/0523--000--Zebstrika.gif
rename to src/canonical/models/front/0523-000-Zebstrika.gif
diff --git a/src/canonical/models/front/0524--000--Roggenrola.gif b/src/canonical/models/front/0524-000-Roggenrola.gif
similarity index 100%
rename from src/canonical/models/front/0524--000--Roggenrola.gif
rename to src/canonical/models/front/0524-000-Roggenrola.gif
diff --git a/src/canonical/models/front/0525--000--Boldore.gif b/src/canonical/models/front/0525-000-Boldore.gif
similarity index 100%
rename from src/canonical/models/front/0525--000--Boldore.gif
rename to src/canonical/models/front/0525-000-Boldore.gif
diff --git a/src/canonical/models/front/0526--000--Gigalith.gif b/src/canonical/models/front/0526-000-Gigalith.gif
similarity index 100%
rename from src/canonical/models/front/0526--000--Gigalith.gif
rename to src/canonical/models/front/0526-000-Gigalith.gif
diff --git a/src/canonical/models/front/0527--000--Woobat.gif b/src/canonical/models/front/0527-000-Woobat.gif
similarity index 100%
rename from src/canonical/models/front/0527--000--Woobat.gif
rename to src/canonical/models/front/0527-000-Woobat.gif
diff --git a/src/canonical/models/front/0528--000--Swoobat.gif b/src/canonical/models/front/0528-000-Swoobat.gif
similarity index 100%
rename from src/canonical/models/front/0528--000--Swoobat.gif
rename to src/canonical/models/front/0528-000-Swoobat.gif
diff --git a/src/canonical/models/front/0529--000--Drilbur.gif b/src/canonical/models/front/0529-000-Drilbur.gif
similarity index 100%
rename from src/canonical/models/front/0529--000--Drilbur.gif
rename to src/canonical/models/front/0529-000-Drilbur.gif
diff --git a/src/canonical/models/front/0530--000--Excadrill.gif b/src/canonical/models/front/0530-000-Excadrill.gif
similarity index 100%
rename from src/canonical/models/front/0530--000--Excadrill.gif
rename to src/canonical/models/front/0530-000-Excadrill.gif
diff --git a/src/canonical/models/front/0531--000--Audino.gif b/src/canonical/models/front/0531-000-Audino.gif
similarity index 100%
rename from src/canonical/models/front/0531--000--Audino.gif
rename to src/canonical/models/front/0531-000-Audino.gif
diff --git a/src/canonical/models/front/0531--420--Audino--Mega.gif b/src/canonical/models/front/0531-420-Audino-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0531--420--Audino--Mega.gif
rename to src/canonical/models/front/0531-420-Audino-Mega.gif
diff --git a/src/canonical/models/front/0532--000--Timburr.gif b/src/canonical/models/front/0532-000-Timburr.gif
similarity index 100%
rename from src/canonical/models/front/0532--000--Timburr.gif
rename to src/canonical/models/front/0532-000-Timburr.gif
diff --git a/src/canonical/models/front/0533--000--Gurdurr.gif b/src/canonical/models/front/0533-000-Gurdurr.gif
similarity index 100%
rename from src/canonical/models/front/0533--000--Gurdurr.gif
rename to src/canonical/models/front/0533-000-Gurdurr.gif
diff --git a/src/canonical/models/front/0534--000--Conkeldurr.gif b/src/canonical/models/front/0534-000-Conkeldurr.gif
similarity index 100%
rename from src/canonical/models/front/0534--000--Conkeldurr.gif
rename to src/canonical/models/front/0534-000-Conkeldurr.gif
diff --git a/src/canonical/models/front/0535--000--Tympole.gif b/src/canonical/models/front/0535-000-Tympole.gif
similarity index 100%
rename from src/canonical/models/front/0535--000--Tympole.gif
rename to src/canonical/models/front/0535-000-Tympole.gif
diff --git a/src/canonical/models/front/0536--000--Palpitoad.gif b/src/canonical/models/front/0536-000-Palpitoad.gif
similarity index 100%
rename from src/canonical/models/front/0536--000--Palpitoad.gif
rename to src/canonical/models/front/0536-000-Palpitoad.gif
diff --git a/src/canonical/models/front/0537--000--Seismitoad.gif b/src/canonical/models/front/0537-000-Seismitoad.gif
similarity index 100%
rename from src/canonical/models/front/0537--000--Seismitoad.gif
rename to src/canonical/models/front/0537-000-Seismitoad.gif
diff --git a/src/canonical/models/front/0538--000--Throh.gif b/src/canonical/models/front/0538-000-Throh.gif
similarity index 100%
rename from src/canonical/models/front/0538--000--Throh.gif
rename to src/canonical/models/front/0538-000-Throh.gif
diff --git a/src/canonical/models/front/0539--000--Sawk.gif b/src/canonical/models/front/0539-000-Sawk.gif
similarity index 100%
rename from src/canonical/models/front/0539--000--Sawk.gif
rename to src/canonical/models/front/0539-000-Sawk.gif
diff --git a/src/canonical/models/front/0540--000--Sewaddle.gif b/src/canonical/models/front/0540-000-Sewaddle.gif
similarity index 100%
rename from src/canonical/models/front/0540--000--Sewaddle.gif
rename to src/canonical/models/front/0540-000-Sewaddle.gif
diff --git a/src/canonical/models/front/0541--000--Swadloon.gif b/src/canonical/models/front/0541-000-Swadloon.gif
similarity index 100%
rename from src/canonical/models/front/0541--000--Swadloon.gif
rename to src/canonical/models/front/0541-000-Swadloon.gif
diff --git a/src/canonical/models/front/0542--000--Leavanny.gif b/src/canonical/models/front/0542-000-Leavanny.gif
similarity index 100%
rename from src/canonical/models/front/0542--000--Leavanny.gif
rename to src/canonical/models/front/0542-000-Leavanny.gif
diff --git a/src/canonical/models/front/0543--000--Venipede.gif b/src/canonical/models/front/0543-000-Venipede.gif
similarity index 100%
rename from src/canonical/models/front/0543--000--Venipede.gif
rename to src/canonical/models/front/0543-000-Venipede.gif
diff --git a/src/canonical/models/front/0544--000--Whirlipede.gif b/src/canonical/models/front/0544-000-Whirlipede.gif
similarity index 100%
rename from src/canonical/models/front/0544--000--Whirlipede.gif
rename to src/canonical/models/front/0544-000-Whirlipede.gif
diff --git a/src/canonical/models/front/0545--000--Scolipede.gif b/src/canonical/models/front/0545-000-Scolipede.gif
similarity index 100%
rename from src/canonical/models/front/0545--000--Scolipede.gif
rename to src/canonical/models/front/0545-000-Scolipede.gif
diff --git a/src/canonical/models/front/0546--000--Cottonee.gif b/src/canonical/models/front/0546-000-Cottonee.gif
similarity index 100%
rename from src/canonical/models/front/0546--000--Cottonee.gif
rename to src/canonical/models/front/0546-000-Cottonee.gif
diff --git a/src/canonical/models/front/0547--000--Whimsicott.gif b/src/canonical/models/front/0547-000-Whimsicott.gif
similarity index 100%
rename from src/canonical/models/front/0547--000--Whimsicott.gif
rename to src/canonical/models/front/0547-000-Whimsicott.gif
diff --git a/src/canonical/models/front/0548--000--Petilil.gif b/src/canonical/models/front/0548-000-Petilil.gif
similarity index 100%
rename from src/canonical/models/front/0548--000--Petilil.gif
rename to src/canonical/models/front/0548-000-Petilil.gif
diff --git a/src/canonical/models/front/0549--000--Lilligant.gif b/src/canonical/models/front/0549-000-Lilligant.gif
similarity index 100%
rename from src/canonical/models/front/0549--000--Lilligant.gif
rename to src/canonical/models/front/0549-000-Lilligant.gif
diff --git a/src/canonical/models/front/0550--000--Basculin.gif b/src/canonical/models/front/0550-000-Basculin.gif
similarity index 100%
rename from src/canonical/models/front/0550--000--Basculin.gif
rename to src/canonical/models/front/0550-000-Basculin.gif
diff --git a/src/canonical/models/front/0550--420--Basculin--Blue-Striped.gif b/src/canonical/models/front/0550-420-Basculin-Blue~Striped.gif
similarity index 100%
rename from src/canonical/models/front/0550--420--Basculin--Blue-Striped.gif
rename to src/canonical/models/front/0550-420-Basculin-Blue~Striped.gif
diff --git a/src/canonical/models/front/0551--000--Sandile.gif b/src/canonical/models/front/0551-000-Sandile.gif
similarity index 100%
rename from src/canonical/models/front/0551--000--Sandile.gif
rename to src/canonical/models/front/0551-000-Sandile.gif
diff --git a/src/canonical/models/front/0552--000--Krokorok.gif b/src/canonical/models/front/0552-000-Krokorok.gif
similarity index 100%
rename from src/canonical/models/front/0552--000--Krokorok.gif
rename to src/canonical/models/front/0552-000-Krokorok.gif
diff --git a/src/canonical/models/front/0553--000--Krookodile.gif b/src/canonical/models/front/0553-000-Krookodile.gif
similarity index 100%
rename from src/canonical/models/front/0553--000--Krookodile.gif
rename to src/canonical/models/front/0553-000-Krookodile.gif
diff --git a/src/canonical/models/front/0554--000--Darumaka.gif b/src/canonical/models/front/0554-000-Darumaka.gif
similarity index 100%
rename from src/canonical/models/front/0554--000--Darumaka.gif
rename to src/canonical/models/front/0554-000-Darumaka.gif
diff --git a/src/canonical/models/front/0554--420--Darumaka--Galar.gif b/src/canonical/models/front/0554-420-Darumaka-Galar.gif
similarity index 100%
rename from src/canonical/models/front/0554--420--Darumaka--Galar.gif
rename to src/canonical/models/front/0554-420-Darumaka-Galar.gif
diff --git a/src/canonical/models/front/0555--000--Darmanitan.gif b/src/canonical/models/front/0555-000-Darmanitan.gif
similarity index 100%
rename from src/canonical/models/front/0555--000--Darmanitan.gif
rename to src/canonical/models/front/0555-000-Darmanitan.gif
diff --git a/src/canonical/models/front/0555--420--Darmanitan--Galar.gif b/src/canonical/models/front/0555-420-Darmanitan-Galar.gif
similarity index 100%
rename from src/canonical/models/front/0555--420--Darmanitan--Galar.gif
rename to src/canonical/models/front/0555-420-Darmanitan-Galar.gif
diff --git a/src/canonical/models/front/0555--420--Darmanitan--Galar-Zen.gif b/src/canonical/models/front/0555-420-Darmanitan-Galar~Zen.gif
similarity index 100%
rename from src/canonical/models/front/0555--420--Darmanitan--Galar-Zen.gif
rename to src/canonical/models/front/0555-420-Darmanitan-Galar~Zen.gif
diff --git a/src/canonical/models/front/0555--420--Darmanitan--Zen.gif b/src/canonical/models/front/0555-420-Darmanitan-Zen.gif
similarity index 100%
rename from src/canonical/models/front/0555--420--Darmanitan--Zen.gif
rename to src/canonical/models/front/0555-420-Darmanitan-Zen.gif
diff --git a/src/canonical/models/front/0556--000--Maractus.gif b/src/canonical/models/front/0556-000-Maractus.gif
similarity index 100%
rename from src/canonical/models/front/0556--000--Maractus.gif
rename to src/canonical/models/front/0556-000-Maractus.gif
diff --git a/src/canonical/models/front/0557--000--Dwebble.gif b/src/canonical/models/front/0557-000-Dwebble.gif
similarity index 100%
rename from src/canonical/models/front/0557--000--Dwebble.gif
rename to src/canonical/models/front/0557-000-Dwebble.gif
diff --git a/src/canonical/models/front/0558--000--Crustle.gif b/src/canonical/models/front/0558-000-Crustle.gif
similarity index 100%
rename from src/canonical/models/front/0558--000--Crustle.gif
rename to src/canonical/models/front/0558-000-Crustle.gif
diff --git a/src/canonical/models/front/0559--000--Scraggy.gif b/src/canonical/models/front/0559-000-Scraggy.gif
similarity index 100%
rename from src/canonical/models/front/0559--000--Scraggy.gif
rename to src/canonical/models/front/0559-000-Scraggy.gif
diff --git a/src/canonical/models/front/0560--000--Scrafty.gif b/src/canonical/models/front/0560-000-Scrafty.gif
similarity index 100%
rename from src/canonical/models/front/0560--000--Scrafty.gif
rename to src/canonical/models/front/0560-000-Scrafty.gif
diff --git a/src/canonical/models/front/0561--000--Sigilyph.gif b/src/canonical/models/front/0561-000-Sigilyph.gif
similarity index 100%
rename from src/canonical/models/front/0561--000--Sigilyph.gif
rename to src/canonical/models/front/0561-000-Sigilyph.gif
diff --git a/src/canonical/models/front/0562--000--Yamask.gif b/src/canonical/models/front/0562-000-Yamask.gif
similarity index 100%
rename from src/canonical/models/front/0562--000--Yamask.gif
rename to src/canonical/models/front/0562-000-Yamask.gif
diff --git a/src/canonical/models/front/0562--420--Yamask--Galar.gif b/src/canonical/models/front/0562-420-Yamask-Galar.gif
similarity index 100%
rename from src/canonical/models/front/0562--420--Yamask--Galar.gif
rename to src/canonical/models/front/0562-420-Yamask-Galar.gif
diff --git a/src/canonical/models/front/0563--000--Cofagrigus.gif b/src/canonical/models/front/0563-000-Cofagrigus.gif
similarity index 100%
rename from src/canonical/models/front/0563--000--Cofagrigus.gif
rename to src/canonical/models/front/0563-000-Cofagrigus.gif
diff --git a/src/canonical/models/front/0564--000--Tirtouga.gif b/src/canonical/models/front/0564-000-Tirtouga.gif
similarity index 100%
rename from src/canonical/models/front/0564--000--Tirtouga.gif
rename to src/canonical/models/front/0564-000-Tirtouga.gif
diff --git a/src/canonical/models/front/0565--000--Carracosta.gif b/src/canonical/models/front/0565-000-Carracosta.gif
similarity index 100%
rename from src/canonical/models/front/0565--000--Carracosta.gif
rename to src/canonical/models/front/0565-000-Carracosta.gif
diff --git a/src/canonical/models/front/0566--000--Archen.gif b/src/canonical/models/front/0566-000-Archen.gif
similarity index 100%
rename from src/canonical/models/front/0566--000--Archen.gif
rename to src/canonical/models/front/0566-000-Archen.gif
diff --git a/src/canonical/models/front/0567--000--Archeops.gif b/src/canonical/models/front/0567-000-Archeops.gif
similarity index 100%
rename from src/canonical/models/front/0567--000--Archeops.gif
rename to src/canonical/models/front/0567-000-Archeops.gif
diff --git a/src/canonical/models/front/0568--000--Trubbish.gif b/src/canonical/models/front/0568-000-Trubbish.gif
similarity index 100%
rename from src/canonical/models/front/0568--000--Trubbish.gif
rename to src/canonical/models/front/0568-000-Trubbish.gif
diff --git a/src/canonical/models/front/0569--000--Garbodor.gif b/src/canonical/models/front/0569-000-Garbodor.gif
similarity index 100%
rename from src/canonical/models/front/0569--000--Garbodor.gif
rename to src/canonical/models/front/0569-000-Garbodor.gif
diff --git a/src/canonical/models/front/0569--420--Garbodor--Gmax.gif b/src/canonical/models/front/0569-420-Garbodor-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0569--420--Garbodor--Gmax.gif
rename to src/canonical/models/front/0569-420-Garbodor-Gmax.gif
diff --git a/src/canonical/models/front/0570--000--Zorua.gif b/src/canonical/models/front/0570-000-Zorua.gif
similarity index 100%
rename from src/canonical/models/front/0570--000--Zorua.gif
rename to src/canonical/models/front/0570-000-Zorua.gif
diff --git a/src/canonical/models/front/0571--000--Zoroark.gif b/src/canonical/models/front/0571-000-Zoroark.gif
similarity index 100%
rename from src/canonical/models/front/0571--000--Zoroark.gif
rename to src/canonical/models/front/0571-000-Zoroark.gif
diff --git a/src/canonical/models/front/0572--000--Minccino.gif b/src/canonical/models/front/0572-000-Minccino.gif
similarity index 100%
rename from src/canonical/models/front/0572--000--Minccino.gif
rename to src/canonical/models/front/0572-000-Minccino.gif
diff --git a/src/canonical/models/front/0573--000--Cinccino.gif b/src/canonical/models/front/0573-000-Cinccino.gif
similarity index 100%
rename from src/canonical/models/front/0573--000--Cinccino.gif
rename to src/canonical/models/front/0573-000-Cinccino.gif
diff --git a/src/canonical/models/front/0574--000--Gothita.gif b/src/canonical/models/front/0574-000-Gothita.gif
similarity index 100%
rename from src/canonical/models/front/0574--000--Gothita.gif
rename to src/canonical/models/front/0574-000-Gothita.gif
diff --git a/src/canonical/models/front/0575--000--Gothorita.gif b/src/canonical/models/front/0575-000-Gothorita.gif
similarity index 100%
rename from src/canonical/models/front/0575--000--Gothorita.gif
rename to src/canonical/models/front/0575-000-Gothorita.gif
diff --git a/src/canonical/models/front/0576--000--Gothitelle.gif b/src/canonical/models/front/0576-000-Gothitelle.gif
similarity index 100%
rename from src/canonical/models/front/0576--000--Gothitelle.gif
rename to src/canonical/models/front/0576-000-Gothitelle.gif
diff --git a/src/canonical/models/front/0577--000--Solosis.gif b/src/canonical/models/front/0577-000-Solosis.gif
similarity index 100%
rename from src/canonical/models/front/0577--000--Solosis.gif
rename to src/canonical/models/front/0577-000-Solosis.gif
diff --git a/src/canonical/models/front/0578--000--Duosion.gif b/src/canonical/models/front/0578-000-Duosion.gif
similarity index 100%
rename from src/canonical/models/front/0578--000--Duosion.gif
rename to src/canonical/models/front/0578-000-Duosion.gif
diff --git a/src/canonical/models/front/0579--000--Reuniclus.gif b/src/canonical/models/front/0579-000-Reuniclus.gif
similarity index 100%
rename from src/canonical/models/front/0579--000--Reuniclus.gif
rename to src/canonical/models/front/0579-000-Reuniclus.gif
diff --git a/src/canonical/models/front/0580--000--Ducklett.gif b/src/canonical/models/front/0580-000-Ducklett.gif
similarity index 100%
rename from src/canonical/models/front/0580--000--Ducklett.gif
rename to src/canonical/models/front/0580-000-Ducklett.gif
diff --git a/src/canonical/models/front/0581--000--Swanna.gif b/src/canonical/models/front/0581-000-Swanna.gif
similarity index 100%
rename from src/canonical/models/front/0581--000--Swanna.gif
rename to src/canonical/models/front/0581-000-Swanna.gif
diff --git a/src/canonical/models/front/0582--000--Vanillite.gif b/src/canonical/models/front/0582-000-Vanillite.gif
similarity index 100%
rename from src/canonical/models/front/0582--000--Vanillite.gif
rename to src/canonical/models/front/0582-000-Vanillite.gif
diff --git a/src/canonical/models/front/0583--000--Vanillish.gif b/src/canonical/models/front/0583-000-Vanillish.gif
similarity index 100%
rename from src/canonical/models/front/0583--000--Vanillish.gif
rename to src/canonical/models/front/0583-000-Vanillish.gif
diff --git a/src/canonical/models/front/0584--000--Vanilluxe.gif b/src/canonical/models/front/0584-000-Vanilluxe.gif
similarity index 100%
rename from src/canonical/models/front/0584--000--Vanilluxe.gif
rename to src/canonical/models/front/0584-000-Vanilluxe.gif
diff --git a/src/canonical/models/front/0585--000--Deerling.gif b/src/canonical/models/front/0585-000-Deerling.gif
similarity index 100%
rename from src/canonical/models/front/0585--000--Deerling.gif
rename to src/canonical/models/front/0585-000-Deerling.gif
diff --git a/src/canonical/models/front/0586--000--Sawsbuck.gif b/src/canonical/models/front/0586-000-Sawsbuck.gif
similarity index 100%
rename from src/canonical/models/front/0586--000--Sawsbuck.gif
rename to src/canonical/models/front/0586-000-Sawsbuck.gif
diff --git a/src/canonical/models/front/0587--000--Emolga.gif b/src/canonical/models/front/0587-000-Emolga.gif
similarity index 100%
rename from src/canonical/models/front/0587--000--Emolga.gif
rename to src/canonical/models/front/0587-000-Emolga.gif
diff --git a/src/canonical/models/front/0588--000--Karrablast.gif b/src/canonical/models/front/0588-000-Karrablast.gif
similarity index 100%
rename from src/canonical/models/front/0588--000--Karrablast.gif
rename to src/canonical/models/front/0588-000-Karrablast.gif
diff --git a/src/canonical/models/front/0589--000--Escavalier.gif b/src/canonical/models/front/0589-000-Escavalier.gif
similarity index 100%
rename from src/canonical/models/front/0589--000--Escavalier.gif
rename to src/canonical/models/front/0589-000-Escavalier.gif
diff --git a/src/canonical/models/front/0590--000--Foongus.gif b/src/canonical/models/front/0590-000-Foongus.gif
similarity index 100%
rename from src/canonical/models/front/0590--000--Foongus.gif
rename to src/canonical/models/front/0590-000-Foongus.gif
diff --git a/src/canonical/models/front/0591--000--Amoonguss.gif b/src/canonical/models/front/0591-000-Amoonguss.gif
similarity index 100%
rename from src/canonical/models/front/0591--000--Amoonguss.gif
rename to src/canonical/models/front/0591-000-Amoonguss.gif
diff --git a/src/canonical/models/front/0592--000--Frillish.gif b/src/canonical/models/front/0592-000-Frillish.gif
similarity index 100%
rename from src/canonical/models/front/0592--000--Frillish.gif
rename to src/canonical/models/front/0592-000-Frillish.gif
diff --git a/src/canonical/models/front/0593--000--Jellicent.gif b/src/canonical/models/front/0593-000-Jellicent.gif
similarity index 100%
rename from src/canonical/models/front/0593--000--Jellicent.gif
rename to src/canonical/models/front/0593-000-Jellicent.gif
diff --git a/src/canonical/models/front/0594--000--Alomomola.gif b/src/canonical/models/front/0594-000-Alomomola.gif
similarity index 100%
rename from src/canonical/models/front/0594--000--Alomomola.gif
rename to src/canonical/models/front/0594-000-Alomomola.gif
diff --git a/src/canonical/models/front/0595--000--Joltik.gif b/src/canonical/models/front/0595-000-Joltik.gif
similarity index 100%
rename from src/canonical/models/front/0595--000--Joltik.gif
rename to src/canonical/models/front/0595-000-Joltik.gif
diff --git a/src/canonical/models/front/0596--000--Galvantula.gif b/src/canonical/models/front/0596-000-Galvantula.gif
similarity index 100%
rename from src/canonical/models/front/0596--000--Galvantula.gif
rename to src/canonical/models/front/0596-000-Galvantula.gif
diff --git a/src/canonical/models/front/0597--000--Ferroseed.gif b/src/canonical/models/front/0597-000-Ferroseed.gif
similarity index 100%
rename from src/canonical/models/front/0597--000--Ferroseed.gif
rename to src/canonical/models/front/0597-000-Ferroseed.gif
diff --git a/src/canonical/models/front/0598--000--Ferrothorn.gif b/src/canonical/models/front/0598-000-Ferrothorn.gif
similarity index 100%
rename from src/canonical/models/front/0598--000--Ferrothorn.gif
rename to src/canonical/models/front/0598-000-Ferrothorn.gif
diff --git a/src/canonical/models/front/0599--000--Klink.gif b/src/canonical/models/front/0599-000-Klink.gif
similarity index 100%
rename from src/canonical/models/front/0599--000--Klink.gif
rename to src/canonical/models/front/0599-000-Klink.gif
diff --git a/src/canonical/models/front/0600--000--Klang.gif b/src/canonical/models/front/0600-000-Klang.gif
similarity index 100%
rename from src/canonical/models/front/0600--000--Klang.gif
rename to src/canonical/models/front/0600-000-Klang.gif
diff --git a/src/canonical/models/front/0601--000--Klinklang.gif b/src/canonical/models/front/0601-000-Klinklang.gif
similarity index 100%
rename from src/canonical/models/front/0601--000--Klinklang.gif
rename to src/canonical/models/front/0601-000-Klinklang.gif
diff --git a/src/canonical/models/front/0602--000--Tynamo.gif b/src/canonical/models/front/0602-000-Tynamo.gif
similarity index 100%
rename from src/canonical/models/front/0602--000--Tynamo.gif
rename to src/canonical/models/front/0602-000-Tynamo.gif
diff --git a/src/canonical/models/front/0603--000--Eelektrik.gif b/src/canonical/models/front/0603-000-Eelektrik.gif
similarity index 100%
rename from src/canonical/models/front/0603--000--Eelektrik.gif
rename to src/canonical/models/front/0603-000-Eelektrik.gif
diff --git a/src/canonical/models/front/0604--000--Eelektross.gif b/src/canonical/models/front/0604-000-Eelektross.gif
similarity index 100%
rename from src/canonical/models/front/0604--000--Eelektross.gif
rename to src/canonical/models/front/0604-000-Eelektross.gif
diff --git a/src/canonical/models/front/0605--000--Elgyem.gif b/src/canonical/models/front/0605-000-Elgyem.gif
similarity index 100%
rename from src/canonical/models/front/0605--000--Elgyem.gif
rename to src/canonical/models/front/0605-000-Elgyem.gif
diff --git a/src/canonical/models/front/0606--000--Beheeyem.gif b/src/canonical/models/front/0606-000-Beheeyem.gif
similarity index 100%
rename from src/canonical/models/front/0606--000--Beheeyem.gif
rename to src/canonical/models/front/0606-000-Beheeyem.gif
diff --git a/src/canonical/models/front/0607--000--Litwick.gif b/src/canonical/models/front/0607-000-Litwick.gif
similarity index 100%
rename from src/canonical/models/front/0607--000--Litwick.gif
rename to src/canonical/models/front/0607-000-Litwick.gif
diff --git a/src/canonical/models/front/0608--000--Lampent.gif b/src/canonical/models/front/0608-000-Lampent.gif
similarity index 100%
rename from src/canonical/models/front/0608--000--Lampent.gif
rename to src/canonical/models/front/0608-000-Lampent.gif
diff --git a/src/canonical/models/front/0609--000--Chandelure.gif b/src/canonical/models/front/0609-000-Chandelure.gif
similarity index 100%
rename from src/canonical/models/front/0609--000--Chandelure.gif
rename to src/canonical/models/front/0609-000-Chandelure.gif
diff --git a/src/canonical/models/front/0610--000--Axew.gif b/src/canonical/models/front/0610-000-Axew.gif
similarity index 100%
rename from src/canonical/models/front/0610--000--Axew.gif
rename to src/canonical/models/front/0610-000-Axew.gif
diff --git a/src/canonical/models/front/0611--000--Fraxure.gif b/src/canonical/models/front/0611-000-Fraxure.gif
similarity index 100%
rename from src/canonical/models/front/0611--000--Fraxure.gif
rename to src/canonical/models/front/0611-000-Fraxure.gif
diff --git a/src/canonical/models/front/0612--000--Haxorus.gif b/src/canonical/models/front/0612-000-Haxorus.gif
similarity index 100%
rename from src/canonical/models/front/0612--000--Haxorus.gif
rename to src/canonical/models/front/0612-000-Haxorus.gif
diff --git a/src/canonical/models/front/0613--000--Cubchoo.gif b/src/canonical/models/front/0613-000-Cubchoo.gif
similarity index 100%
rename from src/canonical/models/front/0613--000--Cubchoo.gif
rename to src/canonical/models/front/0613-000-Cubchoo.gif
diff --git a/src/canonical/models/front/0614--000--Beartic.gif b/src/canonical/models/front/0614-000-Beartic.gif
similarity index 100%
rename from src/canonical/models/front/0614--000--Beartic.gif
rename to src/canonical/models/front/0614-000-Beartic.gif
diff --git a/src/canonical/models/front/0615--000--Cryogonal.gif b/src/canonical/models/front/0615-000-Cryogonal.gif
similarity index 100%
rename from src/canonical/models/front/0615--000--Cryogonal.gif
rename to src/canonical/models/front/0615-000-Cryogonal.gif
diff --git a/src/canonical/models/front/0616--000--Shelmet.gif b/src/canonical/models/front/0616-000-Shelmet.gif
similarity index 100%
rename from src/canonical/models/front/0616--000--Shelmet.gif
rename to src/canonical/models/front/0616-000-Shelmet.gif
diff --git a/src/canonical/models/front/0617--000--Accelgor.gif b/src/canonical/models/front/0617-000-Accelgor.gif
similarity index 100%
rename from src/canonical/models/front/0617--000--Accelgor.gif
rename to src/canonical/models/front/0617-000-Accelgor.gif
diff --git a/src/canonical/models/front/0618--000--Stunfisk.gif b/src/canonical/models/front/0618-000-Stunfisk.gif
similarity index 100%
rename from src/canonical/models/front/0618--000--Stunfisk.gif
rename to src/canonical/models/front/0618-000-Stunfisk.gif
diff --git a/src/canonical/models/front/0618--420--Stunfisk--Galar.gif b/src/canonical/models/front/0618-420-Stunfisk-Galar.gif
similarity index 100%
rename from src/canonical/models/front/0618--420--Stunfisk--Galar.gif
rename to src/canonical/models/front/0618-420-Stunfisk-Galar.gif
diff --git a/src/canonical/models/front/0619--000--Mienfoo.gif b/src/canonical/models/front/0619-000-Mienfoo.gif
similarity index 100%
rename from src/canonical/models/front/0619--000--Mienfoo.gif
rename to src/canonical/models/front/0619-000-Mienfoo.gif
diff --git a/src/canonical/models/front/0620--000--Mienshao.gif b/src/canonical/models/front/0620-000-Mienshao.gif
similarity index 100%
rename from src/canonical/models/front/0620--000--Mienshao.gif
rename to src/canonical/models/front/0620-000-Mienshao.gif
diff --git a/src/canonical/models/front/0621--000--Druddigon.gif b/src/canonical/models/front/0621-000-Druddigon.gif
similarity index 100%
rename from src/canonical/models/front/0621--000--Druddigon.gif
rename to src/canonical/models/front/0621-000-Druddigon.gif
diff --git a/src/canonical/models/front/0622--000--Golett.gif b/src/canonical/models/front/0622-000-Golett.gif
similarity index 100%
rename from src/canonical/models/front/0622--000--Golett.gif
rename to src/canonical/models/front/0622-000-Golett.gif
diff --git a/src/canonical/models/front/0623--000--Golurk.gif b/src/canonical/models/front/0623-000-Golurk.gif
similarity index 100%
rename from src/canonical/models/front/0623--000--Golurk.gif
rename to src/canonical/models/front/0623-000-Golurk.gif
diff --git a/src/canonical/models/front/0624--000--Pawniard.gif b/src/canonical/models/front/0624-000-Pawniard.gif
similarity index 100%
rename from src/canonical/models/front/0624--000--Pawniard.gif
rename to src/canonical/models/front/0624-000-Pawniard.gif
diff --git a/src/canonical/models/front/0625--000--Bisharp.gif b/src/canonical/models/front/0625-000-Bisharp.gif
similarity index 100%
rename from src/canonical/models/front/0625--000--Bisharp.gif
rename to src/canonical/models/front/0625-000-Bisharp.gif
diff --git a/src/canonical/models/front/0626--000--Bouffalant.gif b/src/canonical/models/front/0626-000-Bouffalant.gif
similarity index 100%
rename from src/canonical/models/front/0626--000--Bouffalant.gif
rename to src/canonical/models/front/0626-000-Bouffalant.gif
diff --git a/src/canonical/models/front/0627--000--Rufflet.gif b/src/canonical/models/front/0627-000-Rufflet.gif
similarity index 100%
rename from src/canonical/models/front/0627--000--Rufflet.gif
rename to src/canonical/models/front/0627-000-Rufflet.gif
diff --git a/src/canonical/models/front/0628--000--Braviary.gif b/src/canonical/models/front/0628-000-Braviary.gif
similarity index 100%
rename from src/canonical/models/front/0628--000--Braviary.gif
rename to src/canonical/models/front/0628-000-Braviary.gif
diff --git a/src/canonical/models/front/0629--000--Vullaby.gif b/src/canonical/models/front/0629-000-Vullaby.gif
similarity index 100%
rename from src/canonical/models/front/0629--000--Vullaby.gif
rename to src/canonical/models/front/0629-000-Vullaby.gif
diff --git a/src/canonical/models/front/0630--000--Mandibuzz.gif b/src/canonical/models/front/0630-000-Mandibuzz.gif
similarity index 100%
rename from src/canonical/models/front/0630--000--Mandibuzz.gif
rename to src/canonical/models/front/0630-000-Mandibuzz.gif
diff --git a/src/canonical/models/front/0631--000--Heatmor.gif b/src/canonical/models/front/0631-000-Heatmor.gif
similarity index 100%
rename from src/canonical/models/front/0631--000--Heatmor.gif
rename to src/canonical/models/front/0631-000-Heatmor.gif
diff --git a/src/canonical/models/front/0632--000--Durant.gif b/src/canonical/models/front/0632-000-Durant.gif
similarity index 100%
rename from src/canonical/models/front/0632--000--Durant.gif
rename to src/canonical/models/front/0632-000-Durant.gif
diff --git a/src/canonical/models/front/0633--000--Deino.gif b/src/canonical/models/front/0633-000-Deino.gif
similarity index 100%
rename from src/canonical/models/front/0633--000--Deino.gif
rename to src/canonical/models/front/0633-000-Deino.gif
diff --git a/src/canonical/models/front/0634--000--Zweilous.gif b/src/canonical/models/front/0634-000-Zweilous.gif
similarity index 100%
rename from src/canonical/models/front/0634--000--Zweilous.gif
rename to src/canonical/models/front/0634-000-Zweilous.gif
diff --git a/src/canonical/models/front/0635--000--Hydreigon.gif b/src/canonical/models/front/0635-000-Hydreigon.gif
similarity index 100%
rename from src/canonical/models/front/0635--000--Hydreigon.gif
rename to src/canonical/models/front/0635-000-Hydreigon.gif
diff --git a/src/canonical/models/front/0636--000--Larvesta.gif b/src/canonical/models/front/0636-000-Larvesta.gif
similarity index 100%
rename from src/canonical/models/front/0636--000--Larvesta.gif
rename to src/canonical/models/front/0636-000-Larvesta.gif
diff --git a/src/canonical/models/front/0637--000--Volcarona.gif b/src/canonical/models/front/0637-000-Volcarona.gif
similarity index 100%
rename from src/canonical/models/front/0637--000--Volcarona.gif
rename to src/canonical/models/front/0637-000-Volcarona.gif
diff --git a/src/canonical/models/front/0638--000--Cobalion.gif b/src/canonical/models/front/0638-000-Cobalion.gif
similarity index 100%
rename from src/canonical/models/front/0638--000--Cobalion.gif
rename to src/canonical/models/front/0638-000-Cobalion.gif
diff --git a/src/canonical/models/front/0639--000--Terrakion.gif b/src/canonical/models/front/0639-000-Terrakion.gif
similarity index 100%
rename from src/canonical/models/front/0639--000--Terrakion.gif
rename to src/canonical/models/front/0639-000-Terrakion.gif
diff --git a/src/canonical/models/front/0640--000--Virizion.gif b/src/canonical/models/front/0640-000-Virizion.gif
similarity index 100%
rename from src/canonical/models/front/0640--000--Virizion.gif
rename to src/canonical/models/front/0640-000-Virizion.gif
diff --git a/src/canonical/models/front/0641--000--Tornadus.gif b/src/canonical/models/front/0641-000-Tornadus.gif
similarity index 100%
rename from src/canonical/models/front/0641--000--Tornadus.gif
rename to src/canonical/models/front/0641-000-Tornadus.gif
diff --git a/src/canonical/models/front/0641--420--Tornadus--Therian.gif b/src/canonical/models/front/0641-420-Tornadus-Therian.gif
similarity index 100%
rename from src/canonical/models/front/0641--420--Tornadus--Therian.gif
rename to src/canonical/models/front/0641-420-Tornadus-Therian.gif
diff --git a/src/canonical/models/front/0642--000--Thundurus.gif b/src/canonical/models/front/0642-000-Thundurus.gif
similarity index 100%
rename from src/canonical/models/front/0642--000--Thundurus.gif
rename to src/canonical/models/front/0642-000-Thundurus.gif
diff --git a/src/canonical/models/front/0642--420--Thundurus--Therian.gif b/src/canonical/models/front/0642-420-Thundurus-Therian.gif
similarity index 100%
rename from src/canonical/models/front/0642--420--Thundurus--Therian.gif
rename to src/canonical/models/front/0642-420-Thundurus-Therian.gif
diff --git a/src/canonical/models/front/0643--000--Reshiram.gif b/src/canonical/models/front/0643-000-Reshiram.gif
similarity index 100%
rename from src/canonical/models/front/0643--000--Reshiram.gif
rename to src/canonical/models/front/0643-000-Reshiram.gif
diff --git a/src/canonical/models/front/0644--000--Zekrom.gif b/src/canonical/models/front/0644-000-Zekrom.gif
similarity index 100%
rename from src/canonical/models/front/0644--000--Zekrom.gif
rename to src/canonical/models/front/0644-000-Zekrom.gif
diff --git a/src/canonical/models/front/0645--000--Landorus.gif b/src/canonical/models/front/0645-000-Landorus.gif
similarity index 100%
rename from src/canonical/models/front/0645--000--Landorus.gif
rename to src/canonical/models/front/0645-000-Landorus.gif
diff --git a/src/canonical/models/front/0645--420--Landorus--Therian.gif b/src/canonical/models/front/0645-420-Landorus-Therian.gif
similarity index 100%
rename from src/canonical/models/front/0645--420--Landorus--Therian.gif
rename to src/canonical/models/front/0645-420-Landorus-Therian.gif
diff --git a/src/canonical/models/front/0646--000--Kyurem.gif b/src/canonical/models/front/0646-000-Kyurem.gif
similarity index 100%
rename from src/canonical/models/front/0646--000--Kyurem.gif
rename to src/canonical/models/front/0646-000-Kyurem.gif
diff --git a/src/canonical/models/front/0646--420--Kyurem--Black.gif b/src/canonical/models/front/0646-420-Kyurem-Black.gif
similarity index 100%
rename from src/canonical/models/front/0646--420--Kyurem--Black.gif
rename to src/canonical/models/front/0646-420-Kyurem-Black.gif
diff --git a/src/canonical/models/front/0646--420--Kyurem--White.gif b/src/canonical/models/front/0646-420-Kyurem-White.gif
similarity index 100%
rename from src/canonical/models/front/0646--420--Kyurem--White.gif
rename to src/canonical/models/front/0646-420-Kyurem-White.gif
diff --git a/src/canonical/models/front/0647--000--Keldeo.gif b/src/canonical/models/front/0647-000-Keldeo.gif
similarity index 100%
rename from src/canonical/models/front/0647--000--Keldeo.gif
rename to src/canonical/models/front/0647-000-Keldeo.gif
diff --git a/src/canonical/models/front/0647--420--Keldeo--Resolute.gif b/src/canonical/models/front/0647-420-Keldeo-Resolute.gif
similarity index 100%
rename from src/canonical/models/front/0647--420--Keldeo--Resolute.gif
rename to src/canonical/models/front/0647-420-Keldeo-Resolute.gif
diff --git a/src/canonical/models/front/0648--000--Meloetta.gif b/src/canonical/models/front/0648-000-Meloetta.gif
similarity index 100%
rename from src/canonical/models/front/0648--000--Meloetta.gif
rename to src/canonical/models/front/0648-000-Meloetta.gif
diff --git a/src/canonical/models/front/0648--420--Meloetta--Pirouette.gif b/src/canonical/models/front/0648-420-Meloetta-Pirouette.gif
similarity index 100%
rename from src/canonical/models/front/0648--420--Meloetta--Pirouette.gif
rename to src/canonical/models/front/0648-420-Meloetta-Pirouette.gif
diff --git a/src/canonical/models/front/0649--000--Genesect.gif b/src/canonical/models/front/0649-000-Genesect.gif
similarity index 100%
rename from src/canonical/models/front/0649--000--Genesect.gif
rename to src/canonical/models/front/0649-000-Genesect.gif
diff --git a/src/canonical/models/front/0649--420--Genesect--Burn.gif b/src/canonical/models/front/0649-420-Genesect-Burn.gif
similarity index 100%
rename from src/canonical/models/front/0649--420--Genesect--Burn.gif
rename to src/canonical/models/front/0649-420-Genesect-Burn.gif
diff --git a/src/canonical/models/front/0649--420--Genesect--Chill.gif b/src/canonical/models/front/0649-420-Genesect-Chill.gif
similarity index 100%
rename from src/canonical/models/front/0649--420--Genesect--Chill.gif
rename to src/canonical/models/front/0649-420-Genesect-Chill.gif
diff --git a/src/canonical/models/front/0649--420--Genesect--Douse.gif b/src/canonical/models/front/0649-420-Genesect-Douse.gif
similarity index 100%
rename from src/canonical/models/front/0649--420--Genesect--Douse.gif
rename to src/canonical/models/front/0649-420-Genesect-Douse.gif
diff --git a/src/canonical/models/front/0649--420--Genesect--Shock.gif b/src/canonical/models/front/0649-420-Genesect-Shock.gif
similarity index 100%
rename from src/canonical/models/front/0649--420--Genesect--Shock.gif
rename to src/canonical/models/front/0649-420-Genesect-Shock.gif
diff --git a/src/canonical/models/front/0650--000--Chespin.gif b/src/canonical/models/front/0650-000-Chespin.gif
similarity index 100%
rename from src/canonical/models/front/0650--000--Chespin.gif
rename to src/canonical/models/front/0650-000-Chespin.gif
diff --git a/src/canonical/models/front/0651--000--Quilladin.gif b/src/canonical/models/front/0651-000-Quilladin.gif
similarity index 100%
rename from src/canonical/models/front/0651--000--Quilladin.gif
rename to src/canonical/models/front/0651-000-Quilladin.gif
diff --git a/src/canonical/models/front/0652--000--Chesnaught.gif b/src/canonical/models/front/0652-000-Chesnaught.gif
similarity index 100%
rename from src/canonical/models/front/0652--000--Chesnaught.gif
rename to src/canonical/models/front/0652-000-Chesnaught.gif
diff --git a/src/canonical/models/front/0653--000--Fennekin.gif b/src/canonical/models/front/0653-000-Fennekin.gif
similarity index 100%
rename from src/canonical/models/front/0653--000--Fennekin.gif
rename to src/canonical/models/front/0653-000-Fennekin.gif
diff --git a/src/canonical/models/front/0654--000--Braixen.gif b/src/canonical/models/front/0654-000-Braixen.gif
similarity index 100%
rename from src/canonical/models/front/0654--000--Braixen.gif
rename to src/canonical/models/front/0654-000-Braixen.gif
diff --git a/src/canonical/models/front/0655--000--Delphox.gif b/src/canonical/models/front/0655-000-Delphox.gif
similarity index 100%
rename from src/canonical/models/front/0655--000--Delphox.gif
rename to src/canonical/models/front/0655-000-Delphox.gif
diff --git a/src/canonical/models/front/0656--000--Froakie.gif b/src/canonical/models/front/0656-000-Froakie.gif
similarity index 100%
rename from src/canonical/models/front/0656--000--Froakie.gif
rename to src/canonical/models/front/0656-000-Froakie.gif
diff --git a/src/canonical/models/front/0657--000--Frogadier.gif b/src/canonical/models/front/0657-000-Frogadier.gif
similarity index 100%
rename from src/canonical/models/front/0657--000--Frogadier.gif
rename to src/canonical/models/front/0657-000-Frogadier.gif
diff --git a/src/canonical/models/front/0658--000--Greninja.gif b/src/canonical/models/front/0658-000-Greninja.gif
similarity index 100%
rename from src/canonical/models/front/0658--000--Greninja.gif
rename to src/canonical/models/front/0658-000-Greninja.gif
diff --git a/src/canonical/models/front/0658--420--Greninja--Ash.gif b/src/canonical/models/front/0658-420-Greninja-Ash.gif
similarity index 100%
rename from src/canonical/models/front/0658--420--Greninja--Ash.gif
rename to src/canonical/models/front/0658-420-Greninja-Ash.gif
diff --git a/src/canonical/models/front/0659--000--Bunnelby.gif b/src/canonical/models/front/0659-000-Bunnelby.gif
similarity index 100%
rename from src/canonical/models/front/0659--000--Bunnelby.gif
rename to src/canonical/models/front/0659-000-Bunnelby.gif
diff --git a/src/canonical/models/front/0660--000--Diggersby.gif b/src/canonical/models/front/0660-000-Diggersby.gif
similarity index 100%
rename from src/canonical/models/front/0660--000--Diggersby.gif
rename to src/canonical/models/front/0660-000-Diggersby.gif
diff --git a/src/canonical/models/front/0661--000--Fletchling.gif b/src/canonical/models/front/0661-000-Fletchling.gif
similarity index 100%
rename from src/canonical/models/front/0661--000--Fletchling.gif
rename to src/canonical/models/front/0661-000-Fletchling.gif
diff --git a/src/canonical/models/front/0662--000--Fletchinder.gif b/src/canonical/models/front/0662-000-Fletchinder.gif
similarity index 100%
rename from src/canonical/models/front/0662--000--Fletchinder.gif
rename to src/canonical/models/front/0662-000-Fletchinder.gif
diff --git a/src/canonical/models/front/0663--000--Talonflame.gif b/src/canonical/models/front/0663-000-Talonflame.gif
similarity index 100%
rename from src/canonical/models/front/0663--000--Talonflame.gif
rename to src/canonical/models/front/0663-000-Talonflame.gif
diff --git a/src/canonical/models/front/0664--000--Scatterbug.gif b/src/canonical/models/front/0664-000-Scatterbug.gif
similarity index 100%
rename from src/canonical/models/front/0664--000--Scatterbug.gif
rename to src/canonical/models/front/0664-000-Scatterbug.gif
diff --git a/src/canonical/models/front/0665--000--Spewpa.gif b/src/canonical/models/front/0665-000-Spewpa.gif
similarity index 100%
rename from src/canonical/models/front/0665--000--Spewpa.gif
rename to src/canonical/models/front/0665-000-Spewpa.gif
diff --git a/src/canonical/models/front/0666--000--Vivillon.gif b/src/canonical/models/front/0666-000-Vivillon.gif
similarity index 100%
rename from src/canonical/models/front/0666--000--Vivillon.gif
rename to src/canonical/models/front/0666-000-Vivillon.gif
diff --git a/src/canonical/models/front/0666--420--Vivillon--Fancy.gif b/src/canonical/models/front/0666-420-Vivillon-Fancy.gif
similarity index 100%
rename from src/canonical/models/front/0666--420--Vivillon--Fancy.gif
rename to src/canonical/models/front/0666-420-Vivillon-Fancy.gif
diff --git a/src/canonical/models/front/0666--420--Vivillon--Pokeball.gif b/src/canonical/models/front/0666-420-Vivillon-Pokeball.gif
similarity index 100%
rename from src/canonical/models/front/0666--420--Vivillon--Pokeball.gif
rename to src/canonical/models/front/0666-420-Vivillon-Pokeball.gif
diff --git a/src/canonical/models/front/0667--000--Litleo.gif b/src/canonical/models/front/0667-000-Litleo.gif
similarity index 100%
rename from src/canonical/models/front/0667--000--Litleo.gif
rename to src/canonical/models/front/0667-000-Litleo.gif
diff --git a/src/canonical/models/front/0668--000--Pyroar.gif b/src/canonical/models/front/0668-000-Pyroar.gif
similarity index 100%
rename from src/canonical/models/front/0668--000--Pyroar.gif
rename to src/canonical/models/front/0668-000-Pyroar.gif
diff --git a/src/canonical/models/front/0669--000--Flabe__0301be__0301.gif b/src/canonical/models/front/0669-000-Flabe__0301be__0301.gif
similarity index 100%
rename from src/canonical/models/front/0669--000--Flabe__0301be__0301.gif
rename to src/canonical/models/front/0669-000-Flabe__0301be__0301.gif
diff --git a/src/canonical/models/front/0670--000--Floette.gif b/src/canonical/models/front/0670-000-Floette.gif
similarity index 100%
rename from src/canonical/models/front/0670--000--Floette.gif
rename to src/canonical/models/front/0670-000-Floette.gif
diff --git a/src/canonical/models/front/0670--420--Floette--Eternal.gif b/src/canonical/models/front/0670-420-Floette-Eternal.gif
similarity index 100%
rename from src/canonical/models/front/0670--420--Floette--Eternal.gif
rename to src/canonical/models/front/0670-420-Floette-Eternal.gif
diff --git a/src/canonical/models/front/0671--000--Florges.gif b/src/canonical/models/front/0671-000-Florges.gif
similarity index 100%
rename from src/canonical/models/front/0671--000--Florges.gif
rename to src/canonical/models/front/0671-000-Florges.gif
diff --git a/src/canonical/models/front/0672--000--Skiddo.gif b/src/canonical/models/front/0672-000-Skiddo.gif
similarity index 100%
rename from src/canonical/models/front/0672--000--Skiddo.gif
rename to src/canonical/models/front/0672-000-Skiddo.gif
diff --git a/src/canonical/models/front/0673--000--Gogoat.gif b/src/canonical/models/front/0673-000-Gogoat.gif
similarity index 100%
rename from src/canonical/models/front/0673--000--Gogoat.gif
rename to src/canonical/models/front/0673-000-Gogoat.gif
diff --git a/src/canonical/models/front/0674--000--Pancham.gif b/src/canonical/models/front/0674-000-Pancham.gif
similarity index 100%
rename from src/canonical/models/front/0674--000--Pancham.gif
rename to src/canonical/models/front/0674-000-Pancham.gif
diff --git a/src/canonical/models/front/0675--000--Pangoro.gif b/src/canonical/models/front/0675-000-Pangoro.gif
similarity index 100%
rename from src/canonical/models/front/0675--000--Pangoro.gif
rename to src/canonical/models/front/0675-000-Pangoro.gif
diff --git a/src/canonical/models/front/0676--000--Furfrou.gif b/src/canonical/models/front/0676-000-Furfrou.gif
similarity index 100%
rename from src/canonical/models/front/0676--000--Furfrou.gif
rename to src/canonical/models/front/0676-000-Furfrou.gif
diff --git a/src/canonical/models/front/0677--000--Espurr.gif b/src/canonical/models/front/0677-000-Espurr.gif
similarity index 100%
rename from src/canonical/models/front/0677--000--Espurr.gif
rename to src/canonical/models/front/0677-000-Espurr.gif
diff --git a/src/canonical/models/front/0678--000--Meowstic.gif b/src/canonical/models/front/0678-000-Meowstic.gif
similarity index 100%
rename from src/canonical/models/front/0678--000--Meowstic.gif
rename to src/canonical/models/front/0678-000-Meowstic.gif
diff --git a/src/canonical/models/front/0678--420--Meowstic--F.gif b/src/canonical/models/front/0678-420-Meowstic-F.gif
similarity index 100%
rename from src/canonical/models/front/0678--420--Meowstic--F.gif
rename to src/canonical/models/front/0678-420-Meowstic-F.gif
diff --git a/src/canonical/models/front/0679--000--Honedge.gif b/src/canonical/models/front/0679-000-Honedge.gif
similarity index 100%
rename from src/canonical/models/front/0679--000--Honedge.gif
rename to src/canonical/models/front/0679-000-Honedge.gif
diff --git a/src/canonical/models/front/0680--000--Doublade.gif b/src/canonical/models/front/0680-000-Doublade.gif
similarity index 100%
rename from src/canonical/models/front/0680--000--Doublade.gif
rename to src/canonical/models/front/0680-000-Doublade.gif
diff --git a/src/canonical/models/front/0681--000--Aegislash.gif b/src/canonical/models/front/0681-000-Aegislash.gif
similarity index 100%
rename from src/canonical/models/front/0681--000--Aegislash.gif
rename to src/canonical/models/front/0681-000-Aegislash.gif
diff --git a/src/canonical/models/front/0681--420--Aegislash--Blade.gif b/src/canonical/models/front/0681-420-Aegislash-Blade.gif
similarity index 100%
rename from src/canonical/models/front/0681--420--Aegislash--Blade.gif
rename to src/canonical/models/front/0681-420-Aegislash-Blade.gif
diff --git a/src/canonical/models/front/0682--000--Spritzee.gif b/src/canonical/models/front/0682-000-Spritzee.gif
similarity index 100%
rename from src/canonical/models/front/0682--000--Spritzee.gif
rename to src/canonical/models/front/0682-000-Spritzee.gif
diff --git a/src/canonical/models/front/0683--000--Aromatisse.gif b/src/canonical/models/front/0683-000-Aromatisse.gif
similarity index 100%
rename from src/canonical/models/front/0683--000--Aromatisse.gif
rename to src/canonical/models/front/0683-000-Aromatisse.gif
diff --git a/src/canonical/models/front/0684--000--Swirlix.gif b/src/canonical/models/front/0684-000-Swirlix.gif
similarity index 100%
rename from src/canonical/models/front/0684--000--Swirlix.gif
rename to src/canonical/models/front/0684-000-Swirlix.gif
diff --git a/src/canonical/models/front/0685--000--Slurpuff.gif b/src/canonical/models/front/0685-000-Slurpuff.gif
similarity index 100%
rename from src/canonical/models/front/0685--000--Slurpuff.gif
rename to src/canonical/models/front/0685-000-Slurpuff.gif
diff --git a/src/canonical/models/front/0686--000--Inkay.gif b/src/canonical/models/front/0686-000-Inkay.gif
similarity index 100%
rename from src/canonical/models/front/0686--000--Inkay.gif
rename to src/canonical/models/front/0686-000-Inkay.gif
diff --git a/src/canonical/models/front/0687--000--Malamar.gif b/src/canonical/models/front/0687-000-Malamar.gif
similarity index 100%
rename from src/canonical/models/front/0687--000--Malamar.gif
rename to src/canonical/models/front/0687-000-Malamar.gif
diff --git a/src/canonical/models/front/0688--000--Binacle.gif b/src/canonical/models/front/0688-000-Binacle.gif
similarity index 100%
rename from src/canonical/models/front/0688--000--Binacle.gif
rename to src/canonical/models/front/0688-000-Binacle.gif
diff --git a/src/canonical/models/front/0689--000--Barbaracle.gif b/src/canonical/models/front/0689-000-Barbaracle.gif
similarity index 100%
rename from src/canonical/models/front/0689--000--Barbaracle.gif
rename to src/canonical/models/front/0689-000-Barbaracle.gif
diff --git a/src/canonical/models/front/0690--000--Skrelp.gif b/src/canonical/models/front/0690-000-Skrelp.gif
similarity index 100%
rename from src/canonical/models/front/0690--000--Skrelp.gif
rename to src/canonical/models/front/0690-000-Skrelp.gif
diff --git a/src/canonical/models/front/0691--000--Dragalge.gif b/src/canonical/models/front/0691-000-Dragalge.gif
similarity index 100%
rename from src/canonical/models/front/0691--000--Dragalge.gif
rename to src/canonical/models/front/0691-000-Dragalge.gif
diff --git a/src/canonical/models/front/0692--000--Clauncher.gif b/src/canonical/models/front/0692-000-Clauncher.gif
similarity index 100%
rename from src/canonical/models/front/0692--000--Clauncher.gif
rename to src/canonical/models/front/0692-000-Clauncher.gif
diff --git a/src/canonical/models/front/0693--000--Clawitzer.gif b/src/canonical/models/front/0693-000-Clawitzer.gif
similarity index 100%
rename from src/canonical/models/front/0693--000--Clawitzer.gif
rename to src/canonical/models/front/0693-000-Clawitzer.gif
diff --git a/src/canonical/models/front/0694--000--Helioptile.gif b/src/canonical/models/front/0694-000-Helioptile.gif
similarity index 100%
rename from src/canonical/models/front/0694--000--Helioptile.gif
rename to src/canonical/models/front/0694-000-Helioptile.gif
diff --git a/src/canonical/models/front/0695--000--Heliolisk.gif b/src/canonical/models/front/0695-000-Heliolisk.gif
similarity index 100%
rename from src/canonical/models/front/0695--000--Heliolisk.gif
rename to src/canonical/models/front/0695-000-Heliolisk.gif
diff --git a/src/canonical/models/front/0696--000--Tyrunt.gif b/src/canonical/models/front/0696-000-Tyrunt.gif
similarity index 100%
rename from src/canonical/models/front/0696--000--Tyrunt.gif
rename to src/canonical/models/front/0696-000-Tyrunt.gif
diff --git a/src/canonical/models/front/0697--000--Tyrantrum.gif b/src/canonical/models/front/0697-000-Tyrantrum.gif
similarity index 100%
rename from src/canonical/models/front/0697--000--Tyrantrum.gif
rename to src/canonical/models/front/0697-000-Tyrantrum.gif
diff --git a/src/canonical/models/front/0698--000--Amaura.gif b/src/canonical/models/front/0698-000-Amaura.gif
similarity index 100%
rename from src/canonical/models/front/0698--000--Amaura.gif
rename to src/canonical/models/front/0698-000-Amaura.gif
diff --git a/src/canonical/models/front/0699--000--Aurorus.gif b/src/canonical/models/front/0699-000-Aurorus.gif
similarity index 100%
rename from src/canonical/models/front/0699--000--Aurorus.gif
rename to src/canonical/models/front/0699-000-Aurorus.gif
diff --git a/src/canonical/models/front/0700--000--Sylveon.gif b/src/canonical/models/front/0700-000-Sylveon.gif
similarity index 100%
rename from src/canonical/models/front/0700--000--Sylveon.gif
rename to src/canonical/models/front/0700-000-Sylveon.gif
diff --git a/src/canonical/models/front/0701--000--Hawlucha.gif b/src/canonical/models/front/0701-000-Hawlucha.gif
similarity index 100%
rename from src/canonical/models/front/0701--000--Hawlucha.gif
rename to src/canonical/models/front/0701-000-Hawlucha.gif
diff --git a/src/canonical/models/front/0702--000--Dedenne.gif b/src/canonical/models/front/0702-000-Dedenne.gif
similarity index 100%
rename from src/canonical/models/front/0702--000--Dedenne.gif
rename to src/canonical/models/front/0702-000-Dedenne.gif
diff --git a/src/canonical/models/front/0703--000--Carbink.gif b/src/canonical/models/front/0703-000-Carbink.gif
similarity index 100%
rename from src/canonical/models/front/0703--000--Carbink.gif
rename to src/canonical/models/front/0703-000-Carbink.gif
diff --git a/src/canonical/models/front/0704--000--Goomy.gif b/src/canonical/models/front/0704-000-Goomy.gif
similarity index 100%
rename from src/canonical/models/front/0704--000--Goomy.gif
rename to src/canonical/models/front/0704-000-Goomy.gif
diff --git a/src/canonical/models/front/0705--000--Sliggoo.gif b/src/canonical/models/front/0705-000-Sliggoo.gif
similarity index 100%
rename from src/canonical/models/front/0705--000--Sliggoo.gif
rename to src/canonical/models/front/0705-000-Sliggoo.gif
diff --git a/src/canonical/models/front/0706--000--Goodra.gif b/src/canonical/models/front/0706-000-Goodra.gif
similarity index 100%
rename from src/canonical/models/front/0706--000--Goodra.gif
rename to src/canonical/models/front/0706-000-Goodra.gif
diff --git a/src/canonical/models/front/0707--000--Klefki.gif b/src/canonical/models/front/0707-000-Klefki.gif
similarity index 100%
rename from src/canonical/models/front/0707--000--Klefki.gif
rename to src/canonical/models/front/0707-000-Klefki.gif
diff --git a/src/canonical/models/front/0708--000--Phantump.gif b/src/canonical/models/front/0708-000-Phantump.gif
similarity index 100%
rename from src/canonical/models/front/0708--000--Phantump.gif
rename to src/canonical/models/front/0708-000-Phantump.gif
diff --git a/src/canonical/models/front/0709--000--Trevenant.gif b/src/canonical/models/front/0709-000-Trevenant.gif
similarity index 100%
rename from src/canonical/models/front/0709--000--Trevenant.gif
rename to src/canonical/models/front/0709-000-Trevenant.gif
diff --git a/src/canonical/models/front/0710--000--Pumpkaboo.gif b/src/canonical/models/front/0710-000-Pumpkaboo.gif
similarity index 100%
rename from src/canonical/models/front/0710--000--Pumpkaboo.gif
rename to src/canonical/models/front/0710-000-Pumpkaboo.gif
diff --git a/src/canonical/models/front/0710--420--Pumpkaboo--Large.gif b/src/canonical/models/front/0710-420-Pumpkaboo-Large.gif
similarity index 100%
rename from src/canonical/models/front/0710--420--Pumpkaboo--Large.gif
rename to src/canonical/models/front/0710-420-Pumpkaboo-Large.gif
diff --git a/src/canonical/models/front/0710--420--Pumpkaboo--Small.gif b/src/canonical/models/front/0710-420-Pumpkaboo-Small.gif
similarity index 100%
rename from src/canonical/models/front/0710--420--Pumpkaboo--Small.gif
rename to src/canonical/models/front/0710-420-Pumpkaboo-Small.gif
diff --git a/src/canonical/models/front/0710--420--Pumpkaboo--Super.gif b/src/canonical/models/front/0710-420-Pumpkaboo-Super.gif
similarity index 100%
rename from src/canonical/models/front/0710--420--Pumpkaboo--Super.gif
rename to src/canonical/models/front/0710-420-Pumpkaboo-Super.gif
diff --git a/src/canonical/models/front/0711--000--Gourgeist.gif b/src/canonical/models/front/0711-000-Gourgeist.gif
similarity index 100%
rename from src/canonical/models/front/0711--000--Gourgeist.gif
rename to src/canonical/models/front/0711-000-Gourgeist.gif
diff --git a/src/canonical/models/front/0711--420--Gourgeist--Large.gif b/src/canonical/models/front/0711-420-Gourgeist-Large.gif
similarity index 100%
rename from src/canonical/models/front/0711--420--Gourgeist--Large.gif
rename to src/canonical/models/front/0711-420-Gourgeist-Large.gif
diff --git a/src/canonical/models/front/0711--420--Gourgeist--Small.gif b/src/canonical/models/front/0711-420-Gourgeist-Small.gif
similarity index 100%
rename from src/canonical/models/front/0711--420--Gourgeist--Small.gif
rename to src/canonical/models/front/0711-420-Gourgeist-Small.gif
diff --git a/src/canonical/models/front/0711--420--Gourgeist--Super.gif b/src/canonical/models/front/0711-420-Gourgeist-Super.gif
similarity index 100%
rename from src/canonical/models/front/0711--420--Gourgeist--Super.gif
rename to src/canonical/models/front/0711-420-Gourgeist-Super.gif
diff --git a/src/canonical/models/front/0712--000--Bergmite.gif b/src/canonical/models/front/0712-000-Bergmite.gif
similarity index 100%
rename from src/canonical/models/front/0712--000--Bergmite.gif
rename to src/canonical/models/front/0712-000-Bergmite.gif
diff --git a/src/canonical/models/front/0713--000--Avalugg.gif b/src/canonical/models/front/0713-000-Avalugg.gif
similarity index 100%
rename from src/canonical/models/front/0713--000--Avalugg.gif
rename to src/canonical/models/front/0713-000-Avalugg.gif
diff --git a/src/canonical/models/front/0714--000--Noibat.gif b/src/canonical/models/front/0714-000-Noibat.gif
similarity index 100%
rename from src/canonical/models/front/0714--000--Noibat.gif
rename to src/canonical/models/front/0714-000-Noibat.gif
diff --git a/src/canonical/models/front/0715--000--Noivern.gif b/src/canonical/models/front/0715-000-Noivern.gif
similarity index 100%
rename from src/canonical/models/front/0715--000--Noivern.gif
rename to src/canonical/models/front/0715-000-Noivern.gif
diff --git a/src/canonical/models/front/0716--000--Xerneas.gif b/src/canonical/models/front/0716-000-Xerneas.gif
similarity index 100%
rename from src/canonical/models/front/0716--000--Xerneas.gif
rename to src/canonical/models/front/0716-000-Xerneas.gif
diff --git a/src/canonical/models/front/0717--000--Yveltal.gif b/src/canonical/models/front/0717-000-Yveltal.gif
similarity index 100%
rename from src/canonical/models/front/0717--000--Yveltal.gif
rename to src/canonical/models/front/0717-000-Yveltal.gif
diff --git a/src/canonical/models/front/0718--000--Zygarde.gif b/src/canonical/models/front/0718-000-Zygarde.gif
similarity index 100%
rename from src/canonical/models/front/0718--000--Zygarde.gif
rename to src/canonical/models/front/0718-000-Zygarde.gif
diff --git a/src/canonical/models/front/0718--420--Zygarde--10__0025.gif b/src/canonical/models/front/0718-420-Zygarde-10__0025.gif
similarity index 100%
rename from src/canonical/models/front/0718--420--Zygarde--10__0025.gif
rename to src/canonical/models/front/0718-420-Zygarde-10__0025.gif
diff --git a/src/canonical/models/front/0718--420--Zygarde--Complete.gif b/src/canonical/models/front/0718-420-Zygarde-Complete.gif
similarity index 100%
rename from src/canonical/models/front/0718--420--Zygarde--Complete.gif
rename to src/canonical/models/front/0718-420-Zygarde-Complete.gif
diff --git a/src/canonical/models/front/0719--000--Diancie.gif b/src/canonical/models/front/0719-000-Diancie.gif
similarity index 100%
rename from src/canonical/models/front/0719--000--Diancie.gif
rename to src/canonical/models/front/0719-000-Diancie.gif
diff --git a/src/canonical/models/front/0719--420--Diancie--Mega.gif b/src/canonical/models/front/0719-420-Diancie-Mega.gif
similarity index 100%
rename from src/canonical/models/front/0719--420--Diancie--Mega.gif
rename to src/canonical/models/front/0719-420-Diancie-Mega.gif
diff --git a/src/canonical/models/front/0720--000--Hoopa.gif b/src/canonical/models/front/0720-000-Hoopa.gif
similarity index 100%
rename from src/canonical/models/front/0720--000--Hoopa.gif
rename to src/canonical/models/front/0720-000-Hoopa.gif
diff --git a/src/canonical/models/front/0720--420--Hoopa--Unbound.gif b/src/canonical/models/front/0720-420-Hoopa-Unbound.gif
similarity index 100%
rename from src/canonical/models/front/0720--420--Hoopa--Unbound.gif
rename to src/canonical/models/front/0720-420-Hoopa-Unbound.gif
diff --git a/src/canonical/models/front/0721--000--Volcanion.gif b/src/canonical/models/front/0721-000-Volcanion.gif
similarity index 100%
rename from src/canonical/models/front/0721--000--Volcanion.gif
rename to src/canonical/models/front/0721-000-Volcanion.gif
diff --git a/src/canonical/models/front/0722--000--Rowlet.gif b/src/canonical/models/front/0722-000-Rowlet.gif
similarity index 100%
rename from src/canonical/models/front/0722--000--Rowlet.gif
rename to src/canonical/models/front/0722-000-Rowlet.gif
diff --git a/src/canonical/models/front/0723--000--Dartrix.gif b/src/canonical/models/front/0723-000-Dartrix.gif
similarity index 100%
rename from src/canonical/models/front/0723--000--Dartrix.gif
rename to src/canonical/models/front/0723-000-Dartrix.gif
diff --git a/src/canonical/models/front/0724--000--Decidueye.gif b/src/canonical/models/front/0724-000-Decidueye.gif
similarity index 100%
rename from src/canonical/models/front/0724--000--Decidueye.gif
rename to src/canonical/models/front/0724-000-Decidueye.gif
diff --git a/src/canonical/models/front/0725--000--Litten.gif b/src/canonical/models/front/0725-000-Litten.gif
similarity index 100%
rename from src/canonical/models/front/0725--000--Litten.gif
rename to src/canonical/models/front/0725-000-Litten.gif
diff --git a/src/canonical/models/front/0726--000--Torracat.gif b/src/canonical/models/front/0726-000-Torracat.gif
similarity index 100%
rename from src/canonical/models/front/0726--000--Torracat.gif
rename to src/canonical/models/front/0726-000-Torracat.gif
diff --git a/src/canonical/models/front/0727--000--Incineroar.gif b/src/canonical/models/front/0727-000-Incineroar.gif
similarity index 100%
rename from src/canonical/models/front/0727--000--Incineroar.gif
rename to src/canonical/models/front/0727-000-Incineroar.gif
diff --git a/src/canonical/models/front/0728--000--Popplio.gif b/src/canonical/models/front/0728-000-Popplio.gif
similarity index 100%
rename from src/canonical/models/front/0728--000--Popplio.gif
rename to src/canonical/models/front/0728-000-Popplio.gif
diff --git a/src/canonical/models/front/0729--000--Brionne.gif b/src/canonical/models/front/0729-000-Brionne.gif
similarity index 100%
rename from src/canonical/models/front/0729--000--Brionne.gif
rename to src/canonical/models/front/0729-000-Brionne.gif
diff --git a/src/canonical/models/front/0730--000--Primarina.gif b/src/canonical/models/front/0730-000-Primarina.gif
similarity index 100%
rename from src/canonical/models/front/0730--000--Primarina.gif
rename to src/canonical/models/front/0730-000-Primarina.gif
diff --git a/src/canonical/models/front/0731--000--Pikipek.gif b/src/canonical/models/front/0731-000-Pikipek.gif
similarity index 100%
rename from src/canonical/models/front/0731--000--Pikipek.gif
rename to src/canonical/models/front/0731-000-Pikipek.gif
diff --git a/src/canonical/models/front/0732--000--Trumbeak.gif b/src/canonical/models/front/0732-000-Trumbeak.gif
similarity index 100%
rename from src/canonical/models/front/0732--000--Trumbeak.gif
rename to src/canonical/models/front/0732-000-Trumbeak.gif
diff --git a/src/canonical/models/front/0733--000--Toucannon.gif b/src/canonical/models/front/0733-000-Toucannon.gif
similarity index 100%
rename from src/canonical/models/front/0733--000--Toucannon.gif
rename to src/canonical/models/front/0733-000-Toucannon.gif
diff --git a/src/canonical/models/front/0734--000--Yungoos.gif b/src/canonical/models/front/0734-000-Yungoos.gif
similarity index 100%
rename from src/canonical/models/front/0734--000--Yungoos.gif
rename to src/canonical/models/front/0734-000-Yungoos.gif
diff --git a/src/canonical/models/front/0735--000--Gumshoos.gif b/src/canonical/models/front/0735-000-Gumshoos.gif
similarity index 100%
rename from src/canonical/models/front/0735--000--Gumshoos.gif
rename to src/canonical/models/front/0735-000-Gumshoos.gif
diff --git a/src/canonical/models/front/0735--420--Gumshoos--Totem.gif b/src/canonical/models/front/0735-420-Gumshoos-Totem.gif
similarity index 100%
rename from src/canonical/models/front/0735--420--Gumshoos--Totem.gif
rename to src/canonical/models/front/0735-420-Gumshoos-Totem.gif
diff --git a/src/canonical/models/front/0736--000--Grubbin.gif b/src/canonical/models/front/0736-000-Grubbin.gif
similarity index 100%
rename from src/canonical/models/front/0736--000--Grubbin.gif
rename to src/canonical/models/front/0736-000-Grubbin.gif
diff --git a/src/canonical/models/front/0737--000--Charjabug.gif b/src/canonical/models/front/0737-000-Charjabug.gif
similarity index 100%
rename from src/canonical/models/front/0737--000--Charjabug.gif
rename to src/canonical/models/front/0737-000-Charjabug.gif
diff --git a/src/canonical/models/front/0738--000--Vikavolt.gif b/src/canonical/models/front/0738-000-Vikavolt.gif
similarity index 100%
rename from src/canonical/models/front/0738--000--Vikavolt.gif
rename to src/canonical/models/front/0738-000-Vikavolt.gif
diff --git a/src/canonical/models/front/0738--420--Vikavolt--Totem.gif b/src/canonical/models/front/0738-420-Vikavolt-Totem.gif
similarity index 100%
rename from src/canonical/models/front/0738--420--Vikavolt--Totem.gif
rename to src/canonical/models/front/0738-420-Vikavolt-Totem.gif
diff --git a/src/canonical/models/front/0739--000--Crabrawler.gif b/src/canonical/models/front/0739-000-Crabrawler.gif
similarity index 100%
rename from src/canonical/models/front/0739--000--Crabrawler.gif
rename to src/canonical/models/front/0739-000-Crabrawler.gif
diff --git a/src/canonical/models/front/0740--000--Crabominable.gif b/src/canonical/models/front/0740-000-Crabominable.gif
similarity index 100%
rename from src/canonical/models/front/0740--000--Crabominable.gif
rename to src/canonical/models/front/0740-000-Crabominable.gif
diff --git a/src/canonical/models/front/0741--000--Oricorio.gif b/src/canonical/models/front/0741-000-Oricorio.gif
similarity index 100%
rename from src/canonical/models/front/0741--000--Oricorio.gif
rename to src/canonical/models/front/0741-000-Oricorio.gif
diff --git a/src/canonical/models/front/0741--420--Oricorio--Pa__0027u.gif b/src/canonical/models/front/0741-420-Oricorio-Pa__0027u.gif
similarity index 100%
rename from src/canonical/models/front/0741--420--Oricorio--Pa__0027u.gif
rename to src/canonical/models/front/0741-420-Oricorio-Pa__0027u.gif
diff --git a/src/canonical/models/front/0741--420--Oricorio--Pom-Pom.gif b/src/canonical/models/front/0741-420-Oricorio-Pom~Pom.gif
similarity index 100%
rename from src/canonical/models/front/0741--420--Oricorio--Pom-Pom.gif
rename to src/canonical/models/front/0741-420-Oricorio-Pom~Pom.gif
diff --git a/src/canonical/models/front/0741--420--Oricorio--Sensu.gif b/src/canonical/models/front/0741-420-Oricorio-Sensu.gif
similarity index 100%
rename from src/canonical/models/front/0741--420--Oricorio--Sensu.gif
rename to src/canonical/models/front/0741-420-Oricorio-Sensu.gif
diff --git a/src/canonical/models/front/0742--000--Cutiefly.gif b/src/canonical/models/front/0742-000-Cutiefly.gif
similarity index 100%
rename from src/canonical/models/front/0742--000--Cutiefly.gif
rename to src/canonical/models/front/0742-000-Cutiefly.gif
diff --git a/src/canonical/models/front/0743--000--Ribombee.gif b/src/canonical/models/front/0743-000-Ribombee.gif
similarity index 100%
rename from src/canonical/models/front/0743--000--Ribombee.gif
rename to src/canonical/models/front/0743-000-Ribombee.gif
diff --git a/src/canonical/models/front/0744--000--Rockruff.gif b/src/canonical/models/front/0744-000-Rockruff.gif
similarity index 100%
rename from src/canonical/models/front/0744--000--Rockruff.gif
rename to src/canonical/models/front/0744-000-Rockruff.gif
diff --git a/src/canonical/models/front/0745--000--Lycanroc.gif b/src/canonical/models/front/0745-000-Lycanroc.gif
similarity index 100%
rename from src/canonical/models/front/0745--000--Lycanroc.gif
rename to src/canonical/models/front/0745-000-Lycanroc.gif
diff --git a/src/canonical/models/front/0745--420--Lycanroc--Dusk.gif b/src/canonical/models/front/0745-420-Lycanroc-Dusk.gif
similarity index 100%
rename from src/canonical/models/front/0745--420--Lycanroc--Dusk.gif
rename to src/canonical/models/front/0745-420-Lycanroc-Dusk.gif
diff --git a/src/canonical/models/front/0745--420--Lycanroc--Midnight.gif b/src/canonical/models/front/0745-420-Lycanroc-Midnight.gif
similarity index 100%
rename from src/canonical/models/front/0745--420--Lycanroc--Midnight.gif
rename to src/canonical/models/front/0745-420-Lycanroc-Midnight.gif
diff --git a/src/canonical/models/front/0746--000--Wishiwashi.gif b/src/canonical/models/front/0746-000-Wishiwashi.gif
similarity index 100%
rename from src/canonical/models/front/0746--000--Wishiwashi.gif
rename to src/canonical/models/front/0746-000-Wishiwashi.gif
diff --git a/src/canonical/models/front/0746--420--Wishiwashi--School.gif b/src/canonical/models/front/0746-420-Wishiwashi-School.gif
similarity index 100%
rename from src/canonical/models/front/0746--420--Wishiwashi--School.gif
rename to src/canonical/models/front/0746-420-Wishiwashi-School.gif
diff --git a/src/canonical/models/front/0747--000--Mareanie.gif b/src/canonical/models/front/0747-000-Mareanie.gif
similarity index 100%
rename from src/canonical/models/front/0747--000--Mareanie.gif
rename to src/canonical/models/front/0747-000-Mareanie.gif
diff --git a/src/canonical/models/front/0748--000--Toxapex.gif b/src/canonical/models/front/0748-000-Toxapex.gif
similarity index 100%
rename from src/canonical/models/front/0748--000--Toxapex.gif
rename to src/canonical/models/front/0748-000-Toxapex.gif
diff --git a/src/canonical/models/front/0749--000--Mudbray.gif b/src/canonical/models/front/0749-000-Mudbray.gif
similarity index 100%
rename from src/canonical/models/front/0749--000--Mudbray.gif
rename to src/canonical/models/front/0749-000-Mudbray.gif
diff --git a/src/canonical/models/front/0750--000--Mudsdale.gif b/src/canonical/models/front/0750-000-Mudsdale.gif
similarity index 100%
rename from src/canonical/models/front/0750--000--Mudsdale.gif
rename to src/canonical/models/front/0750-000-Mudsdale.gif
diff --git a/src/canonical/models/front/0751--000--Dewpider.gif b/src/canonical/models/front/0751-000-Dewpider.gif
similarity index 100%
rename from src/canonical/models/front/0751--000--Dewpider.gif
rename to src/canonical/models/front/0751-000-Dewpider.gif
diff --git a/src/canonical/models/front/0752--000--Araquanid.gif b/src/canonical/models/front/0752-000-Araquanid.gif
similarity index 100%
rename from src/canonical/models/front/0752--000--Araquanid.gif
rename to src/canonical/models/front/0752-000-Araquanid.gif
diff --git a/src/canonical/models/front/0752--420--Araquanid--Totem.gif b/src/canonical/models/front/0752-420-Araquanid-Totem.gif
similarity index 100%
rename from src/canonical/models/front/0752--420--Araquanid--Totem.gif
rename to src/canonical/models/front/0752-420-Araquanid-Totem.gif
diff --git a/src/canonical/models/front/0753--000--Fomantis.gif b/src/canonical/models/front/0753-000-Fomantis.gif
similarity index 100%
rename from src/canonical/models/front/0753--000--Fomantis.gif
rename to src/canonical/models/front/0753-000-Fomantis.gif
diff --git a/src/canonical/models/front/0754--000--Lurantis.gif b/src/canonical/models/front/0754-000-Lurantis.gif
similarity index 100%
rename from src/canonical/models/front/0754--000--Lurantis.gif
rename to src/canonical/models/front/0754-000-Lurantis.gif
diff --git a/src/canonical/models/front/0754--420--Lurantis--Totem.gif b/src/canonical/models/front/0754-420-Lurantis-Totem.gif
similarity index 100%
rename from src/canonical/models/front/0754--420--Lurantis--Totem.gif
rename to src/canonical/models/front/0754-420-Lurantis-Totem.gif
diff --git a/src/canonical/models/front/0755--000--Morelull.gif b/src/canonical/models/front/0755-000-Morelull.gif
similarity index 100%
rename from src/canonical/models/front/0755--000--Morelull.gif
rename to src/canonical/models/front/0755-000-Morelull.gif
diff --git a/src/canonical/models/front/0756--000--Shiinotic.gif b/src/canonical/models/front/0756-000-Shiinotic.gif
similarity index 100%
rename from src/canonical/models/front/0756--000--Shiinotic.gif
rename to src/canonical/models/front/0756-000-Shiinotic.gif
diff --git a/src/canonical/models/front/0757--000--Salandit.gif b/src/canonical/models/front/0757-000-Salandit.gif
similarity index 100%
rename from src/canonical/models/front/0757--000--Salandit.gif
rename to src/canonical/models/front/0757-000-Salandit.gif
diff --git a/src/canonical/models/front/0758--000--Salazzle.gif b/src/canonical/models/front/0758-000-Salazzle.gif
similarity index 100%
rename from src/canonical/models/front/0758--000--Salazzle.gif
rename to src/canonical/models/front/0758-000-Salazzle.gif
diff --git a/src/canonical/models/front/0758--420--Salazzle--Totem.gif b/src/canonical/models/front/0758-420-Salazzle-Totem.gif
similarity index 100%
rename from src/canonical/models/front/0758--420--Salazzle--Totem.gif
rename to src/canonical/models/front/0758-420-Salazzle-Totem.gif
diff --git a/src/canonical/models/front/0759--000--Stufful.gif b/src/canonical/models/front/0759-000-Stufful.gif
similarity index 100%
rename from src/canonical/models/front/0759--000--Stufful.gif
rename to src/canonical/models/front/0759-000-Stufful.gif
diff --git a/src/canonical/models/front/0760--000--Bewear.gif b/src/canonical/models/front/0760-000-Bewear.gif
similarity index 100%
rename from src/canonical/models/front/0760--000--Bewear.gif
rename to src/canonical/models/front/0760-000-Bewear.gif
diff --git a/src/canonical/models/front/0761--000--Bounsweet.gif b/src/canonical/models/front/0761-000-Bounsweet.gif
similarity index 100%
rename from src/canonical/models/front/0761--000--Bounsweet.gif
rename to src/canonical/models/front/0761-000-Bounsweet.gif
diff --git a/src/canonical/models/front/0762--000--Steenee.gif b/src/canonical/models/front/0762-000-Steenee.gif
similarity index 100%
rename from src/canonical/models/front/0762--000--Steenee.gif
rename to src/canonical/models/front/0762-000-Steenee.gif
diff --git a/src/canonical/models/front/0763--000--Tsareena.gif b/src/canonical/models/front/0763-000-Tsareena.gif
similarity index 100%
rename from src/canonical/models/front/0763--000--Tsareena.gif
rename to src/canonical/models/front/0763-000-Tsareena.gif
diff --git a/src/canonical/models/front/0764--000--Comfey.gif b/src/canonical/models/front/0764-000-Comfey.gif
similarity index 100%
rename from src/canonical/models/front/0764--000--Comfey.gif
rename to src/canonical/models/front/0764-000-Comfey.gif
diff --git a/src/canonical/models/front/0765--000--Oranguru.gif b/src/canonical/models/front/0765-000-Oranguru.gif
similarity index 100%
rename from src/canonical/models/front/0765--000--Oranguru.gif
rename to src/canonical/models/front/0765-000-Oranguru.gif
diff --git a/src/canonical/models/front/0766--000--Passimian.gif b/src/canonical/models/front/0766-000-Passimian.gif
similarity index 100%
rename from src/canonical/models/front/0766--000--Passimian.gif
rename to src/canonical/models/front/0766-000-Passimian.gif
diff --git a/src/canonical/models/front/0767--000--Wimpod.gif b/src/canonical/models/front/0767-000-Wimpod.gif
similarity index 100%
rename from src/canonical/models/front/0767--000--Wimpod.gif
rename to src/canonical/models/front/0767-000-Wimpod.gif
diff --git a/src/canonical/models/front/0768--000--Golisopod.gif b/src/canonical/models/front/0768-000-Golisopod.gif
similarity index 100%
rename from src/canonical/models/front/0768--000--Golisopod.gif
rename to src/canonical/models/front/0768-000-Golisopod.gif
diff --git a/src/canonical/models/front/0769--000--Sandygast.gif b/src/canonical/models/front/0769-000-Sandygast.gif
similarity index 100%
rename from src/canonical/models/front/0769--000--Sandygast.gif
rename to src/canonical/models/front/0769-000-Sandygast.gif
diff --git a/src/canonical/models/front/0770--000--Palossand.gif b/src/canonical/models/front/0770-000-Palossand.gif
similarity index 100%
rename from src/canonical/models/front/0770--000--Palossand.gif
rename to src/canonical/models/front/0770-000-Palossand.gif
diff --git a/src/canonical/models/front/0771--000--Pyukumuku.gif b/src/canonical/models/front/0771-000-Pyukumuku.gif
similarity index 100%
rename from src/canonical/models/front/0771--000--Pyukumuku.gif
rename to src/canonical/models/front/0771-000-Pyukumuku.gif
diff --git a/src/canonical/models/front/0772--000--Type__003a_Null.gif b/src/canonical/models/front/0772-000-Type__003a_Null.gif
similarity index 100%
rename from src/canonical/models/front/0772--000--Type__003a_Null.gif
rename to src/canonical/models/front/0772-000-Type__003a_Null.gif
diff --git a/src/canonical/models/front/0773--000--Silvally.gif b/src/canonical/models/front/0773-000-Silvally.gif
similarity index 100%
rename from src/canonical/models/front/0773--000--Silvally.gif
rename to src/canonical/models/front/0773-000-Silvally.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Bug.gif b/src/canonical/models/front/0773-420-Silvally-Bug.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Bug.gif
rename to src/canonical/models/front/0773-420-Silvally-Bug.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Dark.gif b/src/canonical/models/front/0773-420-Silvally-Dark.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Dark.gif
rename to src/canonical/models/front/0773-420-Silvally-Dark.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Dragon.gif b/src/canonical/models/front/0773-420-Silvally-Dragon.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Dragon.gif
rename to src/canonical/models/front/0773-420-Silvally-Dragon.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Electric.gif b/src/canonical/models/front/0773-420-Silvally-Electric.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Electric.gif
rename to src/canonical/models/front/0773-420-Silvally-Electric.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Fairy.gif b/src/canonical/models/front/0773-420-Silvally-Fairy.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Fairy.gif
rename to src/canonical/models/front/0773-420-Silvally-Fairy.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Fighting.gif b/src/canonical/models/front/0773-420-Silvally-Fighting.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Fighting.gif
rename to src/canonical/models/front/0773-420-Silvally-Fighting.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Fire.gif b/src/canonical/models/front/0773-420-Silvally-Fire.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Fire.gif
rename to src/canonical/models/front/0773-420-Silvally-Fire.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Flying.gif b/src/canonical/models/front/0773-420-Silvally-Flying.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Flying.gif
rename to src/canonical/models/front/0773-420-Silvally-Flying.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Ghost.gif b/src/canonical/models/front/0773-420-Silvally-Ghost.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Ghost.gif
rename to src/canonical/models/front/0773-420-Silvally-Ghost.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Grass.gif b/src/canonical/models/front/0773-420-Silvally-Grass.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Grass.gif
rename to src/canonical/models/front/0773-420-Silvally-Grass.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Ground.gif b/src/canonical/models/front/0773-420-Silvally-Ground.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Ground.gif
rename to src/canonical/models/front/0773-420-Silvally-Ground.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Ice.gif b/src/canonical/models/front/0773-420-Silvally-Ice.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Ice.gif
rename to src/canonical/models/front/0773-420-Silvally-Ice.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Poison.gif b/src/canonical/models/front/0773-420-Silvally-Poison.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Poison.gif
rename to src/canonical/models/front/0773-420-Silvally-Poison.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Psychic.gif b/src/canonical/models/front/0773-420-Silvally-Psychic.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Psychic.gif
rename to src/canonical/models/front/0773-420-Silvally-Psychic.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Rock.gif b/src/canonical/models/front/0773-420-Silvally-Rock.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Rock.gif
rename to src/canonical/models/front/0773-420-Silvally-Rock.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Steel.gif b/src/canonical/models/front/0773-420-Silvally-Steel.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Steel.gif
rename to src/canonical/models/front/0773-420-Silvally-Steel.gif
diff --git a/src/canonical/models/front/0773--420--Silvally--Water.gif b/src/canonical/models/front/0773-420-Silvally-Water.gif
similarity index 100%
rename from src/canonical/models/front/0773--420--Silvally--Water.gif
rename to src/canonical/models/front/0773-420-Silvally-Water.gif
diff --git a/src/canonical/models/front/0774--000--Minior.gif b/src/canonical/models/front/0774-000-Minior.gif
similarity index 100%
rename from src/canonical/models/front/0774--000--Minior.gif
rename to src/canonical/models/front/0774-000-Minior.gif
diff --git a/src/canonical/models/front/0775--000--Komala.gif b/src/canonical/models/front/0775-000-Komala.gif
similarity index 100%
rename from src/canonical/models/front/0775--000--Komala.gif
rename to src/canonical/models/front/0775-000-Komala.gif
diff --git a/src/canonical/models/front/0776--000--Turtonator.gif b/src/canonical/models/front/0776-000-Turtonator.gif
similarity index 100%
rename from src/canonical/models/front/0776--000--Turtonator.gif
rename to src/canonical/models/front/0776-000-Turtonator.gif
diff --git a/src/canonical/models/front/0777--000--Togedemaru.gif b/src/canonical/models/front/0777-000-Togedemaru.gif
similarity index 100%
rename from src/canonical/models/front/0777--000--Togedemaru.gif
rename to src/canonical/models/front/0777-000-Togedemaru.gif
diff --git a/src/canonical/models/front/0777--420--Togedemaru--Totem.gif b/src/canonical/models/front/0777-420-Togedemaru-Totem.gif
similarity index 100%
rename from src/canonical/models/front/0777--420--Togedemaru--Totem.gif
rename to src/canonical/models/front/0777-420-Togedemaru-Totem.gif
diff --git a/src/canonical/models/front/0778--000--Mimikyu.gif b/src/canonical/models/front/0778-000-Mimikyu.gif
similarity index 100%
rename from src/canonical/models/front/0778--000--Mimikyu.gif
rename to src/canonical/models/front/0778-000-Mimikyu.gif
diff --git a/src/canonical/models/front/0778--420--Mimikyu--Busted.gif b/src/canonical/models/front/0778-420-Mimikyu-Busted.gif
similarity index 100%
rename from src/canonical/models/front/0778--420--Mimikyu--Busted.gif
rename to src/canonical/models/front/0778-420-Mimikyu-Busted.gif
diff --git a/src/canonical/models/front/0778--420--Mimikyu--Busted-Totem.gif b/src/canonical/models/front/0778-420-Mimikyu-Busted~Totem.gif
similarity index 100%
rename from src/canonical/models/front/0778--420--Mimikyu--Busted-Totem.gif
rename to src/canonical/models/front/0778-420-Mimikyu-Busted~Totem.gif
diff --git a/src/canonical/models/front/0778--420--Mimikyu--Totem.gif b/src/canonical/models/front/0778-420-Mimikyu-Totem.gif
similarity index 100%
rename from src/canonical/models/front/0778--420--Mimikyu--Totem.gif
rename to src/canonical/models/front/0778-420-Mimikyu-Totem.gif
diff --git a/src/canonical/models/front/0779--000--Bruxish.gif b/src/canonical/models/front/0779-000-Bruxish.gif
similarity index 100%
rename from src/canonical/models/front/0779--000--Bruxish.gif
rename to src/canonical/models/front/0779-000-Bruxish.gif
diff --git a/src/canonical/models/front/0780--000--Drampa.gif b/src/canonical/models/front/0780-000-Drampa.gif
similarity index 100%
rename from src/canonical/models/front/0780--000--Drampa.gif
rename to src/canonical/models/front/0780-000-Drampa.gif
diff --git a/src/canonical/models/front/0781--000--Dhelmise.gif b/src/canonical/models/front/0781-000-Dhelmise.gif
similarity index 100%
rename from src/canonical/models/front/0781--000--Dhelmise.gif
rename to src/canonical/models/front/0781-000-Dhelmise.gif
diff --git a/src/canonical/models/front/0782--000--Jangmo-o.gif b/src/canonical/models/front/0782-000-Jangmo~o.gif
similarity index 100%
rename from src/canonical/models/front/0782--000--Jangmo-o.gif
rename to src/canonical/models/front/0782-000-Jangmo~o.gif
diff --git a/src/canonical/models/front/0783--000--Hakamo-o.gif b/src/canonical/models/front/0783-000-Hakamo~o.gif
similarity index 100%
rename from src/canonical/models/front/0783--000--Hakamo-o.gif
rename to src/canonical/models/front/0783-000-Hakamo~o.gif
diff --git a/src/canonical/models/front/0784--000--Kommo-o.gif b/src/canonical/models/front/0784-000-Kommo~o.gif
similarity index 100%
rename from src/canonical/models/front/0784--000--Kommo-o.gif
rename to src/canonical/models/front/0784-000-Kommo~o.gif
diff --git a/src/canonical/models/front/0784--420--Kommo-o--Totem.gif b/src/canonical/models/front/0784-420-Kommo~o-Totem.gif
similarity index 100%
rename from src/canonical/models/front/0784--420--Kommo-o--Totem.gif
rename to src/canonical/models/front/0784-420-Kommo~o-Totem.gif
diff --git a/src/canonical/models/front/0785--000--Tapu_Koko.gif b/src/canonical/models/front/0785-000-Tapu_Koko.gif
similarity index 100%
rename from src/canonical/models/front/0785--000--Tapu_Koko.gif
rename to src/canonical/models/front/0785-000-Tapu_Koko.gif
diff --git a/src/canonical/models/front/0786--000--Tapu_Lele.gif b/src/canonical/models/front/0786-000-Tapu_Lele.gif
similarity index 100%
rename from src/canonical/models/front/0786--000--Tapu_Lele.gif
rename to src/canonical/models/front/0786-000-Tapu_Lele.gif
diff --git a/src/canonical/models/front/0787--000--Tapu_Bulu.gif b/src/canonical/models/front/0787-000-Tapu_Bulu.gif
similarity index 100%
rename from src/canonical/models/front/0787--000--Tapu_Bulu.gif
rename to src/canonical/models/front/0787-000-Tapu_Bulu.gif
diff --git a/src/canonical/models/front/0788--000--Tapu_Fini.gif b/src/canonical/models/front/0788-000-Tapu_Fini.gif
similarity index 100%
rename from src/canonical/models/front/0788--000--Tapu_Fini.gif
rename to src/canonical/models/front/0788-000-Tapu_Fini.gif
diff --git a/src/canonical/models/front/0789--000--Cosmog.gif b/src/canonical/models/front/0789-000-Cosmog.gif
similarity index 100%
rename from src/canonical/models/front/0789--000--Cosmog.gif
rename to src/canonical/models/front/0789-000-Cosmog.gif
diff --git a/src/canonical/models/front/0790--000--Cosmoem.gif b/src/canonical/models/front/0790-000-Cosmoem.gif
similarity index 100%
rename from src/canonical/models/front/0790--000--Cosmoem.gif
rename to src/canonical/models/front/0790-000-Cosmoem.gif
diff --git a/src/canonical/models/front/0791--000--Solgaleo.gif b/src/canonical/models/front/0791-000-Solgaleo.gif
similarity index 100%
rename from src/canonical/models/front/0791--000--Solgaleo.gif
rename to src/canonical/models/front/0791-000-Solgaleo.gif
diff --git a/src/canonical/models/front/0792--000--Lunala.gif b/src/canonical/models/front/0792-000-Lunala.gif
similarity index 100%
rename from src/canonical/models/front/0792--000--Lunala.gif
rename to src/canonical/models/front/0792-000-Lunala.gif
diff --git a/src/canonical/models/front/0793--000--Nihilego.gif b/src/canonical/models/front/0793-000-Nihilego.gif
similarity index 100%
rename from src/canonical/models/front/0793--000--Nihilego.gif
rename to src/canonical/models/front/0793-000-Nihilego.gif
diff --git a/src/canonical/models/front/0794--000--Buzzwole.gif b/src/canonical/models/front/0794-000-Buzzwole.gif
similarity index 100%
rename from src/canonical/models/front/0794--000--Buzzwole.gif
rename to src/canonical/models/front/0794-000-Buzzwole.gif
diff --git a/src/canonical/models/front/0795--000--Pheromosa.gif b/src/canonical/models/front/0795-000-Pheromosa.gif
similarity index 100%
rename from src/canonical/models/front/0795--000--Pheromosa.gif
rename to src/canonical/models/front/0795-000-Pheromosa.gif
diff --git a/src/canonical/models/front/0796--000--Xurkitree.gif b/src/canonical/models/front/0796-000-Xurkitree.gif
similarity index 100%
rename from src/canonical/models/front/0796--000--Xurkitree.gif
rename to src/canonical/models/front/0796-000-Xurkitree.gif
diff --git a/src/canonical/models/front/0797--000--Celesteela.gif b/src/canonical/models/front/0797-000-Celesteela.gif
similarity index 100%
rename from src/canonical/models/front/0797--000--Celesteela.gif
rename to src/canonical/models/front/0797-000-Celesteela.gif
diff --git a/src/canonical/models/front/0798--000--Kartana.gif b/src/canonical/models/front/0798-000-Kartana.gif
similarity index 100%
rename from src/canonical/models/front/0798--000--Kartana.gif
rename to src/canonical/models/front/0798-000-Kartana.gif
diff --git a/src/canonical/models/front/0799--000--Guzzlord.gif b/src/canonical/models/front/0799-000-Guzzlord.gif
similarity index 100%
rename from src/canonical/models/front/0799--000--Guzzlord.gif
rename to src/canonical/models/front/0799-000-Guzzlord.gif
diff --git a/src/canonical/models/front/0800--000--Necrozma.gif b/src/canonical/models/front/0800-000-Necrozma.gif
similarity index 100%
rename from src/canonical/models/front/0800--000--Necrozma.gif
rename to src/canonical/models/front/0800-000-Necrozma.gif
diff --git a/src/canonical/models/front/0800--420--Necrozma--Dawn_Wings.gif b/src/canonical/models/front/0800-420-Necrozma-Dawn_Wings.gif
similarity index 100%
rename from src/canonical/models/front/0800--420--Necrozma--Dawn_Wings.gif
rename to src/canonical/models/front/0800-420-Necrozma-Dawn_Wings.gif
diff --git a/src/canonical/models/front/0800--420--Necrozma--Dusk_Mane.gif b/src/canonical/models/front/0800-420-Necrozma-Dusk_Mane.gif
similarity index 100%
rename from src/canonical/models/front/0800--420--Necrozma--Dusk_Mane.gif
rename to src/canonical/models/front/0800-420-Necrozma-Dusk_Mane.gif
diff --git a/src/canonical/models/front/0800--420--Necrozma--Ultra.gif b/src/canonical/models/front/0800-420-Necrozma-Ultra.gif
similarity index 100%
rename from src/canonical/models/front/0800--420--Necrozma--Ultra.gif
rename to src/canonical/models/front/0800-420-Necrozma-Ultra.gif
diff --git a/src/canonical/models/front/0801--000--Magearna.gif b/src/canonical/models/front/0801-000-Magearna.gif
similarity index 100%
rename from src/canonical/models/front/0801--000--Magearna.gif
rename to src/canonical/models/front/0801-000-Magearna.gif
diff --git a/src/canonical/models/front/0802--000--Marshadow.gif b/src/canonical/models/front/0802-000-Marshadow.gif
similarity index 100%
rename from src/canonical/models/front/0802--000--Marshadow.gif
rename to src/canonical/models/front/0802-000-Marshadow.gif
diff --git a/src/canonical/models/front/0803--000--Poipole.gif b/src/canonical/models/front/0803-000-Poipole.gif
similarity index 100%
rename from src/canonical/models/front/0803--000--Poipole.gif
rename to src/canonical/models/front/0803-000-Poipole.gif
diff --git a/src/canonical/models/front/0804--000--Naganadel.gif b/src/canonical/models/front/0804-000-Naganadel.gif
similarity index 100%
rename from src/canonical/models/front/0804--000--Naganadel.gif
rename to src/canonical/models/front/0804-000-Naganadel.gif
diff --git a/src/canonical/models/front/0805--000--Stakataka.gif b/src/canonical/models/front/0805-000-Stakataka.gif
similarity index 100%
rename from src/canonical/models/front/0805--000--Stakataka.gif
rename to src/canonical/models/front/0805-000-Stakataka.gif
diff --git a/src/canonical/models/front/0806--000--Blacephalon.gif b/src/canonical/models/front/0806-000-Blacephalon.gif
similarity index 100%
rename from src/canonical/models/front/0806--000--Blacephalon.gif
rename to src/canonical/models/front/0806-000-Blacephalon.gif
diff --git a/src/canonical/models/front/0807--000--Zeraora.gif b/src/canonical/models/front/0807-000-Zeraora.gif
similarity index 100%
rename from src/canonical/models/front/0807--000--Zeraora.gif
rename to src/canonical/models/front/0807-000-Zeraora.gif
diff --git a/src/canonical/models/front/0808--000--Meltan.gif b/src/canonical/models/front/0808-000-Meltan.gif
similarity index 100%
rename from src/canonical/models/front/0808--000--Meltan.gif
rename to src/canonical/models/front/0808-000-Meltan.gif
diff --git a/src/canonical/models/front/0809--000--Melmetal.gif b/src/canonical/models/front/0809-000-Melmetal.gif
similarity index 100%
rename from src/canonical/models/front/0809--000--Melmetal.gif
rename to src/canonical/models/front/0809-000-Melmetal.gif
diff --git a/src/canonical/models/front/0809--420--Melmetal--Gmax.gif b/src/canonical/models/front/0809-420-Melmetal-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0809--420--Melmetal--Gmax.gif
rename to src/canonical/models/front/0809-420-Melmetal-Gmax.gif
diff --git a/src/canonical/models/front/0810--000--Grookey.gif b/src/canonical/models/front/0810-000-Grookey.gif
similarity index 100%
rename from src/canonical/models/front/0810--000--Grookey.gif
rename to src/canonical/models/front/0810-000-Grookey.gif
diff --git a/src/canonical/models/front/0811--000--Thwackey.gif b/src/canonical/models/front/0811-000-Thwackey.gif
similarity index 100%
rename from src/canonical/models/front/0811--000--Thwackey.gif
rename to src/canonical/models/front/0811-000-Thwackey.gif
diff --git a/src/canonical/models/front/0812--000--Rillaboom.gif b/src/canonical/models/front/0812-000-Rillaboom.gif
similarity index 100%
rename from src/canonical/models/front/0812--000--Rillaboom.gif
rename to src/canonical/models/front/0812-000-Rillaboom.gif
diff --git a/src/canonical/models/front/0813--000--Scorbunny.gif b/src/canonical/models/front/0813-000-Scorbunny.gif
similarity index 100%
rename from src/canonical/models/front/0813--000--Scorbunny.gif
rename to src/canonical/models/front/0813-000-Scorbunny.gif
diff --git a/src/canonical/models/front/0814--000--Raboot.gif b/src/canonical/models/front/0814-000-Raboot.gif
similarity index 100%
rename from src/canonical/models/front/0814--000--Raboot.gif
rename to src/canonical/models/front/0814-000-Raboot.gif
diff --git a/src/canonical/models/front/0815--000--Cinderace.gif b/src/canonical/models/front/0815-000-Cinderace.gif
similarity index 100%
rename from src/canonical/models/front/0815--000--Cinderace.gif
rename to src/canonical/models/front/0815-000-Cinderace.gif
diff --git a/src/canonical/models/front/0816--000--Sobble.gif b/src/canonical/models/front/0816-000-Sobble.gif
similarity index 100%
rename from src/canonical/models/front/0816--000--Sobble.gif
rename to src/canonical/models/front/0816-000-Sobble.gif
diff --git a/src/canonical/models/front/0817--000--Drizzile.gif b/src/canonical/models/front/0817-000-Drizzile.gif
similarity index 100%
rename from src/canonical/models/front/0817--000--Drizzile.gif
rename to src/canonical/models/front/0817-000-Drizzile.gif
diff --git a/src/canonical/models/front/0818--000--Inteleon.gif b/src/canonical/models/front/0818-000-Inteleon.gif
similarity index 100%
rename from src/canonical/models/front/0818--000--Inteleon.gif
rename to src/canonical/models/front/0818-000-Inteleon.gif
diff --git a/src/canonical/models/front/0819--000--Skwovet.gif b/src/canonical/models/front/0819-000-Skwovet.gif
similarity index 100%
rename from src/canonical/models/front/0819--000--Skwovet.gif
rename to src/canonical/models/front/0819-000-Skwovet.gif
diff --git a/src/canonical/models/front/0820--000--Greedent.gif b/src/canonical/models/front/0820-000-Greedent.gif
similarity index 100%
rename from src/canonical/models/front/0820--000--Greedent.gif
rename to src/canonical/models/front/0820-000-Greedent.gif
diff --git a/src/canonical/models/front/0821--000--Rookidee.gif b/src/canonical/models/front/0821-000-Rookidee.gif
similarity index 100%
rename from src/canonical/models/front/0821--000--Rookidee.gif
rename to src/canonical/models/front/0821-000-Rookidee.gif
diff --git a/src/canonical/models/front/0822--000--Corvisquire.gif b/src/canonical/models/front/0822-000-Corvisquire.gif
similarity index 100%
rename from src/canonical/models/front/0822--000--Corvisquire.gif
rename to src/canonical/models/front/0822-000-Corvisquire.gif
diff --git a/src/canonical/models/front/0823--000--Corviknight.gif b/src/canonical/models/front/0823-000-Corviknight.gif
similarity index 100%
rename from src/canonical/models/front/0823--000--Corviknight.gif
rename to src/canonical/models/front/0823-000-Corviknight.gif
diff --git a/src/canonical/models/front/0823--420--Corviknight--Gmax.gif b/src/canonical/models/front/0823-420-Corviknight-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0823--420--Corviknight--Gmax.gif
rename to src/canonical/models/front/0823-420-Corviknight-Gmax.gif
diff --git a/src/canonical/models/front/0824--000--Blipbug.gif b/src/canonical/models/front/0824-000-Blipbug.gif
similarity index 100%
rename from src/canonical/models/front/0824--000--Blipbug.gif
rename to src/canonical/models/front/0824-000-Blipbug.gif
diff --git a/src/canonical/models/front/0825--000--Dottler.gif b/src/canonical/models/front/0825-000-Dottler.gif
similarity index 100%
rename from src/canonical/models/front/0825--000--Dottler.gif
rename to src/canonical/models/front/0825-000-Dottler.gif
diff --git a/src/canonical/models/front/0826--000--Orbeetle.gif b/src/canonical/models/front/0826-000-Orbeetle.gif
similarity index 100%
rename from src/canonical/models/front/0826--000--Orbeetle.gif
rename to src/canonical/models/front/0826-000-Orbeetle.gif
diff --git a/src/canonical/models/front/0826--420--Orbeetle--Gmax.gif b/src/canonical/models/front/0826-420-Orbeetle-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0826--420--Orbeetle--Gmax.gif
rename to src/canonical/models/front/0826-420-Orbeetle-Gmax.gif
diff --git a/src/canonical/models/front/0827--000--Nickit.gif b/src/canonical/models/front/0827-000-Nickit.gif
similarity index 100%
rename from src/canonical/models/front/0827--000--Nickit.gif
rename to src/canonical/models/front/0827-000-Nickit.gif
diff --git a/src/canonical/models/front/0828--000--Thievul.gif b/src/canonical/models/front/0828-000-Thievul.gif
similarity index 100%
rename from src/canonical/models/front/0828--000--Thievul.gif
rename to src/canonical/models/front/0828-000-Thievul.gif
diff --git a/src/canonical/models/front/0829--000--Gossifleur.gif b/src/canonical/models/front/0829-000-Gossifleur.gif
similarity index 100%
rename from src/canonical/models/front/0829--000--Gossifleur.gif
rename to src/canonical/models/front/0829-000-Gossifleur.gif
diff --git a/src/canonical/models/front/0830--000--Eldegoss.gif b/src/canonical/models/front/0830-000-Eldegoss.gif
similarity index 100%
rename from src/canonical/models/front/0830--000--Eldegoss.gif
rename to src/canonical/models/front/0830-000-Eldegoss.gif
diff --git a/src/canonical/models/front/0831--000--Wooloo.gif b/src/canonical/models/front/0831-000-Wooloo.gif
similarity index 100%
rename from src/canonical/models/front/0831--000--Wooloo.gif
rename to src/canonical/models/front/0831-000-Wooloo.gif
diff --git a/src/canonical/models/front/0832--000--Dubwool.gif b/src/canonical/models/front/0832-000-Dubwool.gif
similarity index 100%
rename from src/canonical/models/front/0832--000--Dubwool.gif
rename to src/canonical/models/front/0832-000-Dubwool.gif
diff --git a/src/canonical/models/front/0833--000--Chewtle.gif b/src/canonical/models/front/0833-000-Chewtle.gif
similarity index 100%
rename from src/canonical/models/front/0833--000--Chewtle.gif
rename to src/canonical/models/front/0833-000-Chewtle.gif
diff --git a/src/canonical/models/front/0834--000--Drednaw.gif b/src/canonical/models/front/0834-000-Drednaw.gif
similarity index 100%
rename from src/canonical/models/front/0834--000--Drednaw.gif
rename to src/canonical/models/front/0834-000-Drednaw.gif
diff --git a/src/canonical/models/front/0834--420--Drednaw--Gmax.gif b/src/canonical/models/front/0834-420-Drednaw-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0834--420--Drednaw--Gmax.gif
rename to src/canonical/models/front/0834-420-Drednaw-Gmax.gif
diff --git a/src/canonical/models/front/0835--000--Yamper.gif b/src/canonical/models/front/0835-000-Yamper.gif
similarity index 100%
rename from src/canonical/models/front/0835--000--Yamper.gif
rename to src/canonical/models/front/0835-000-Yamper.gif
diff --git a/src/canonical/models/front/0836--000--Boltund.gif b/src/canonical/models/front/0836-000-Boltund.gif
similarity index 100%
rename from src/canonical/models/front/0836--000--Boltund.gif
rename to src/canonical/models/front/0836-000-Boltund.gif
diff --git a/src/canonical/models/front/0837--000--Rolycoly.gif b/src/canonical/models/front/0837-000-Rolycoly.gif
similarity index 100%
rename from src/canonical/models/front/0837--000--Rolycoly.gif
rename to src/canonical/models/front/0837-000-Rolycoly.gif
diff --git a/src/canonical/models/front/0838--000--Carkol.gif b/src/canonical/models/front/0838-000-Carkol.gif
similarity index 100%
rename from src/canonical/models/front/0838--000--Carkol.gif
rename to src/canonical/models/front/0838-000-Carkol.gif
diff --git a/src/canonical/models/front/0839--000--Coalossal.gif b/src/canonical/models/front/0839-000-Coalossal.gif
similarity index 100%
rename from src/canonical/models/front/0839--000--Coalossal.gif
rename to src/canonical/models/front/0839-000-Coalossal.gif
diff --git a/src/canonical/models/front/0839--420--Coalossal--Gmax.gif b/src/canonical/models/front/0839-420-Coalossal-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0839--420--Coalossal--Gmax.gif
rename to src/canonical/models/front/0839-420-Coalossal-Gmax.gif
diff --git a/src/canonical/models/front/0840--000--Applin.gif b/src/canonical/models/front/0840-000-Applin.gif
similarity index 100%
rename from src/canonical/models/front/0840--000--Applin.gif
rename to src/canonical/models/front/0840-000-Applin.gif
diff --git a/src/canonical/models/front/0841--000--Flapple.gif b/src/canonical/models/front/0841-000-Flapple.gif
similarity index 100%
rename from src/canonical/models/front/0841--000--Flapple.gif
rename to src/canonical/models/front/0841-000-Flapple.gif
diff --git a/src/canonical/models/front/0841--420--Flapple--Gmax.gif b/src/canonical/models/front/0841-420-Flapple-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0841--420--Flapple--Gmax.gif
rename to src/canonical/models/front/0841-420-Flapple-Gmax.gif
diff --git a/src/canonical/models/front/0842--000--Appletun.gif b/src/canonical/models/front/0842-000-Appletun.gif
similarity index 100%
rename from src/canonical/models/front/0842--000--Appletun.gif
rename to src/canonical/models/front/0842-000-Appletun.gif
diff --git a/src/canonical/models/front/0842--420--Appletun--Gmax.gif b/src/canonical/models/front/0842-420-Appletun-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0842--420--Appletun--Gmax.gif
rename to src/canonical/models/front/0842-420-Appletun-Gmax.gif
diff --git a/src/canonical/models/front/0843--000--Silicobra.gif b/src/canonical/models/front/0843-000-Silicobra.gif
similarity index 100%
rename from src/canonical/models/front/0843--000--Silicobra.gif
rename to src/canonical/models/front/0843-000-Silicobra.gif
diff --git a/src/canonical/models/front/0844--000--Sandaconda.gif b/src/canonical/models/front/0844-000-Sandaconda.gif
similarity index 100%
rename from src/canonical/models/front/0844--000--Sandaconda.gif
rename to src/canonical/models/front/0844-000-Sandaconda.gif
diff --git a/src/canonical/models/front/0844--420--Sandaconda--Gmax.gif b/src/canonical/models/front/0844-420-Sandaconda-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0844--420--Sandaconda--Gmax.gif
rename to src/canonical/models/front/0844-420-Sandaconda-Gmax.gif
diff --git a/src/canonical/models/front/0845--000--Cramorant.gif b/src/canonical/models/front/0845-000-Cramorant.gif
similarity index 100%
rename from src/canonical/models/front/0845--000--Cramorant.gif
rename to src/canonical/models/front/0845-000-Cramorant.gif
diff --git a/src/canonical/models/front/0845--420--Cramorant--Gorging.gif b/src/canonical/models/front/0845-420-Cramorant-Gorging.gif
similarity index 100%
rename from src/canonical/models/front/0845--420--Cramorant--Gorging.gif
rename to src/canonical/models/front/0845-420-Cramorant-Gorging.gif
diff --git a/src/canonical/models/front/0845--420--Cramorant--Gulping.gif b/src/canonical/models/front/0845-420-Cramorant-Gulping.gif
similarity index 100%
rename from src/canonical/models/front/0845--420--Cramorant--Gulping.gif
rename to src/canonical/models/front/0845-420-Cramorant-Gulping.gif
diff --git a/src/canonical/models/front/0846--000--Arrokuda.gif b/src/canonical/models/front/0846-000-Arrokuda.gif
similarity index 100%
rename from src/canonical/models/front/0846--000--Arrokuda.gif
rename to src/canonical/models/front/0846-000-Arrokuda.gif
diff --git a/src/canonical/models/front/0847--000--Barraskewda.gif b/src/canonical/models/front/0847-000-Barraskewda.gif
similarity index 100%
rename from src/canonical/models/front/0847--000--Barraskewda.gif
rename to src/canonical/models/front/0847-000-Barraskewda.gif
diff --git a/src/canonical/models/front/0848--000--Toxel.gif b/src/canonical/models/front/0848-000-Toxel.gif
similarity index 100%
rename from src/canonical/models/front/0848--000--Toxel.gif
rename to src/canonical/models/front/0848-000-Toxel.gif
diff --git a/src/canonical/models/front/0849--000--Toxtricity.gif b/src/canonical/models/front/0849-000-Toxtricity.gif
similarity index 100%
rename from src/canonical/models/front/0849--000--Toxtricity.gif
rename to src/canonical/models/front/0849-000-Toxtricity.gif
diff --git a/src/canonical/models/front/0849--420--Toxtricity--Gmax.gif b/src/canonical/models/front/0849-420-Toxtricity-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0849--420--Toxtricity--Gmax.gif
rename to src/canonical/models/front/0849-420-Toxtricity-Gmax.gif
diff --git a/src/canonical/models/front/0849--420--Toxtricity--Low-Key.gif b/src/canonical/models/front/0849-420-Toxtricity-Low~Key.gif
similarity index 100%
rename from src/canonical/models/front/0849--420--Toxtricity--Low-Key.gif
rename to src/canonical/models/front/0849-420-Toxtricity-Low~Key.gif
diff --git a/src/canonical/models/front/0850--000--Sizzlipede.gif b/src/canonical/models/front/0850-000-Sizzlipede.gif
similarity index 100%
rename from src/canonical/models/front/0850--000--Sizzlipede.gif
rename to src/canonical/models/front/0850-000-Sizzlipede.gif
diff --git a/src/canonical/models/front/0851--000--Centiskorch.gif b/src/canonical/models/front/0851-000-Centiskorch.gif
similarity index 100%
rename from src/canonical/models/front/0851--000--Centiskorch.gif
rename to src/canonical/models/front/0851-000-Centiskorch.gif
diff --git a/src/canonical/models/front/0851--420--Centiskorch--Gmax.gif b/src/canonical/models/front/0851-420-Centiskorch-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0851--420--Centiskorch--Gmax.gif
rename to src/canonical/models/front/0851-420-Centiskorch-Gmax.gif
diff --git a/src/canonical/models/front/0852--000--Clobbopus.gif b/src/canonical/models/front/0852-000-Clobbopus.gif
similarity index 100%
rename from src/canonical/models/front/0852--000--Clobbopus.gif
rename to src/canonical/models/front/0852-000-Clobbopus.gif
diff --git a/src/canonical/models/front/0853--000--Grapploct.gif b/src/canonical/models/front/0853-000-Grapploct.gif
similarity index 100%
rename from src/canonical/models/front/0853--000--Grapploct.gif
rename to src/canonical/models/front/0853-000-Grapploct.gif
diff --git a/src/canonical/models/front/0854--000--Sinistea.gif b/src/canonical/models/front/0854-000-Sinistea.gif
similarity index 100%
rename from src/canonical/models/front/0854--000--Sinistea.gif
rename to src/canonical/models/front/0854-000-Sinistea.gif
diff --git a/src/canonical/models/front/0854--420--Sinistea--Antique.gif b/src/canonical/models/front/0854-420-Sinistea-Antique.gif
similarity index 100%
rename from src/canonical/models/front/0854--420--Sinistea--Antique.gif
rename to src/canonical/models/front/0854-420-Sinistea-Antique.gif
diff --git a/src/canonical/models/front/0855--000--Polteageist.gif b/src/canonical/models/front/0855-000-Polteageist.gif
similarity index 100%
rename from src/canonical/models/front/0855--000--Polteageist.gif
rename to src/canonical/models/front/0855-000-Polteageist.gif
diff --git a/src/canonical/models/front/0855--420--Polteageist--Antique.gif b/src/canonical/models/front/0855-420-Polteageist-Antique.gif
similarity index 100%
rename from src/canonical/models/front/0855--420--Polteageist--Antique.gif
rename to src/canonical/models/front/0855-420-Polteageist-Antique.gif
diff --git a/src/canonical/models/front/0856--000--Hatenna.gif b/src/canonical/models/front/0856-000-Hatenna.gif
similarity index 100%
rename from src/canonical/models/front/0856--000--Hatenna.gif
rename to src/canonical/models/front/0856-000-Hatenna.gif
diff --git a/src/canonical/models/front/0857--000--Hattrem.gif b/src/canonical/models/front/0857-000-Hattrem.gif
similarity index 100%
rename from src/canonical/models/front/0857--000--Hattrem.gif
rename to src/canonical/models/front/0857-000-Hattrem.gif
diff --git a/src/canonical/models/front/0858--000--Hatterene.gif b/src/canonical/models/front/0858-000-Hatterene.gif
similarity index 100%
rename from src/canonical/models/front/0858--000--Hatterene.gif
rename to src/canonical/models/front/0858-000-Hatterene.gif
diff --git a/src/canonical/models/front/0858--420--Hatterene--Gmax.gif b/src/canonical/models/front/0858-420-Hatterene-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0858--420--Hatterene--Gmax.gif
rename to src/canonical/models/front/0858-420-Hatterene-Gmax.gif
diff --git a/src/canonical/models/front/0859--000--Impidimp.gif b/src/canonical/models/front/0859-000-Impidimp.gif
similarity index 100%
rename from src/canonical/models/front/0859--000--Impidimp.gif
rename to src/canonical/models/front/0859-000-Impidimp.gif
diff --git a/src/canonical/models/front/0860--000--Morgrem.gif b/src/canonical/models/front/0860-000-Morgrem.gif
similarity index 100%
rename from src/canonical/models/front/0860--000--Morgrem.gif
rename to src/canonical/models/front/0860-000-Morgrem.gif
diff --git a/src/canonical/models/front/0861--000--Grimmsnarl.gif b/src/canonical/models/front/0861-000-Grimmsnarl.gif
similarity index 100%
rename from src/canonical/models/front/0861--000--Grimmsnarl.gif
rename to src/canonical/models/front/0861-000-Grimmsnarl.gif
diff --git a/src/canonical/models/front/0861--420--Grimmsnarl--Gmax.gif b/src/canonical/models/front/0861-420-Grimmsnarl-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0861--420--Grimmsnarl--Gmax.gif
rename to src/canonical/models/front/0861-420-Grimmsnarl-Gmax.gif
diff --git a/src/canonical/models/front/0862--000--Obstagoon.gif b/src/canonical/models/front/0862-000-Obstagoon.gif
similarity index 100%
rename from src/canonical/models/front/0862--000--Obstagoon.gif
rename to src/canonical/models/front/0862-000-Obstagoon.gif
diff --git a/src/canonical/models/front/0863--000--Perrserker.gif b/src/canonical/models/front/0863-000-Perrserker.gif
similarity index 100%
rename from src/canonical/models/front/0863--000--Perrserker.gif
rename to src/canonical/models/front/0863-000-Perrserker.gif
diff --git a/src/canonical/models/front/0864--000--Cursola.gif b/src/canonical/models/front/0864-000-Cursola.gif
similarity index 100%
rename from src/canonical/models/front/0864--000--Cursola.gif
rename to src/canonical/models/front/0864-000-Cursola.gif
diff --git a/src/canonical/models/front/0865--000--Sirfetch__0027d.gif b/src/canonical/models/front/0865-000-Sirfetch__0027d.gif
similarity index 100%
rename from src/canonical/models/front/0865--000--Sirfetch__0027d.gif
rename to src/canonical/models/front/0865-000-Sirfetch__0027d.gif
diff --git a/src/canonical/models/front/0866--000--Mr._Rime.gif b/src/canonical/models/front/0866-000-Mr._Rime.gif
similarity index 100%
rename from src/canonical/models/front/0866--000--Mr._Rime.gif
rename to src/canonical/models/front/0866-000-Mr._Rime.gif
diff --git a/src/canonical/models/front/0867--000--Runerigus.gif b/src/canonical/models/front/0867-000-Runerigus.gif
similarity index 100%
rename from src/canonical/models/front/0867--000--Runerigus.gif
rename to src/canonical/models/front/0867-000-Runerigus.gif
diff --git a/src/canonical/models/front/0868--000--Milcery.gif b/src/canonical/models/front/0868-000-Milcery.gif
similarity index 100%
rename from src/canonical/models/front/0868--000--Milcery.gif
rename to src/canonical/models/front/0868-000-Milcery.gif
diff --git a/src/canonical/models/front/0869--000--Alcremie.gif b/src/canonical/models/front/0869-000-Alcremie.gif
similarity index 100%
rename from src/canonical/models/front/0869--000--Alcremie.gif
rename to src/canonical/models/front/0869-000-Alcremie.gif
diff --git a/src/canonical/models/front/0869--420--Alcremie--Gmax.gif b/src/canonical/models/front/0869-420-Alcremie-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0869--420--Alcremie--Gmax.gif
rename to src/canonical/models/front/0869-420-Alcremie-Gmax.gif
diff --git a/src/canonical/models/front/0870--000--Falinks.gif b/src/canonical/models/front/0870-000-Falinks.gif
similarity index 100%
rename from src/canonical/models/front/0870--000--Falinks.gif
rename to src/canonical/models/front/0870-000-Falinks.gif
diff --git a/src/canonical/models/front/0871--000--Pincurchin.gif b/src/canonical/models/front/0871-000-Pincurchin.gif
similarity index 100%
rename from src/canonical/models/front/0871--000--Pincurchin.gif
rename to src/canonical/models/front/0871-000-Pincurchin.gif
diff --git a/src/canonical/models/front/0872--000--Snom.gif b/src/canonical/models/front/0872-000-Snom.gif
similarity index 100%
rename from src/canonical/models/front/0872--000--Snom.gif
rename to src/canonical/models/front/0872-000-Snom.gif
diff --git a/src/canonical/models/front/0873--000--Frosmoth.gif b/src/canonical/models/front/0873-000-Frosmoth.gif
similarity index 100%
rename from src/canonical/models/front/0873--000--Frosmoth.gif
rename to src/canonical/models/front/0873-000-Frosmoth.gif
diff --git a/src/canonical/models/front/0874--000--Stonjourner.gif b/src/canonical/models/front/0874-000-Stonjourner.gif
similarity index 100%
rename from src/canonical/models/front/0874--000--Stonjourner.gif
rename to src/canonical/models/front/0874-000-Stonjourner.gif
diff --git a/src/canonical/models/front/0875--000--Eiscue.gif b/src/canonical/models/front/0875-000-Eiscue.gif
similarity index 100%
rename from src/canonical/models/front/0875--000--Eiscue.gif
rename to src/canonical/models/front/0875-000-Eiscue.gif
diff --git a/src/canonical/models/front/0875--420--Eiscue--Noice.gif b/src/canonical/models/front/0875-420-Eiscue-Noice.gif
similarity index 100%
rename from src/canonical/models/front/0875--420--Eiscue--Noice.gif
rename to src/canonical/models/front/0875-420-Eiscue-Noice.gif
diff --git a/src/canonical/models/front/0876--000--Indeedee.gif b/src/canonical/models/front/0876-000-Indeedee.gif
similarity index 100%
rename from src/canonical/models/front/0876--000--Indeedee.gif
rename to src/canonical/models/front/0876-000-Indeedee.gif
diff --git a/src/canonical/models/front/0876--420--Indeedee--F.gif b/src/canonical/models/front/0876-420-Indeedee-F.gif
similarity index 100%
rename from src/canonical/models/front/0876--420--Indeedee--F.gif
rename to src/canonical/models/front/0876-420-Indeedee-F.gif
diff --git a/src/canonical/models/front/0877--000--Morpeko.gif b/src/canonical/models/front/0877-000-Morpeko.gif
similarity index 100%
rename from src/canonical/models/front/0877--000--Morpeko.gif
rename to src/canonical/models/front/0877-000-Morpeko.gif
diff --git a/src/canonical/models/front/0877--420--Morpeko--Hangry.gif b/src/canonical/models/front/0877-420-Morpeko-Hangry.gif
similarity index 100%
rename from src/canonical/models/front/0877--420--Morpeko--Hangry.gif
rename to src/canonical/models/front/0877-420-Morpeko-Hangry.gif
diff --git a/src/canonical/models/front/0878--000--Cufant.gif b/src/canonical/models/front/0878-000-Cufant.gif
similarity index 100%
rename from src/canonical/models/front/0878--000--Cufant.gif
rename to src/canonical/models/front/0878-000-Cufant.gif
diff --git a/src/canonical/models/front/0879--000--Copperajah.gif b/src/canonical/models/front/0879-000-Copperajah.gif
similarity index 100%
rename from src/canonical/models/front/0879--000--Copperajah.gif
rename to src/canonical/models/front/0879-000-Copperajah.gif
diff --git a/src/canonical/models/front/0879--420--Copperajah--Gmax.gif b/src/canonical/models/front/0879-420-Copperajah-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0879--420--Copperajah--Gmax.gif
rename to src/canonical/models/front/0879-420-Copperajah-Gmax.gif
diff --git a/src/canonical/models/front/0880--000--Dracozolt.gif b/src/canonical/models/front/0880-000-Dracozolt.gif
similarity index 100%
rename from src/canonical/models/front/0880--000--Dracozolt.gif
rename to src/canonical/models/front/0880-000-Dracozolt.gif
diff --git a/src/canonical/models/front/0881--000--Arctozolt.gif b/src/canonical/models/front/0881-000-Arctozolt.gif
similarity index 100%
rename from src/canonical/models/front/0881--000--Arctozolt.gif
rename to src/canonical/models/front/0881-000-Arctozolt.gif
diff --git a/src/canonical/models/front/0882--000--Dracovish.gif b/src/canonical/models/front/0882-000-Dracovish.gif
similarity index 100%
rename from src/canonical/models/front/0882--000--Dracovish.gif
rename to src/canonical/models/front/0882-000-Dracovish.gif
diff --git a/src/canonical/models/front/0883--000--Arctovish.gif b/src/canonical/models/front/0883-000-Arctovish.gif
similarity index 100%
rename from src/canonical/models/front/0883--000--Arctovish.gif
rename to src/canonical/models/front/0883-000-Arctovish.gif
diff --git a/src/canonical/models/front/0884--000--Duraludon.gif b/src/canonical/models/front/0884-000-Duraludon.gif
similarity index 100%
rename from src/canonical/models/front/0884--000--Duraludon.gif
rename to src/canonical/models/front/0884-000-Duraludon.gif
diff --git a/src/canonical/models/front/0884--420--Duraludon--Gmax.gif b/src/canonical/models/front/0884-420-Duraludon-Gmax.gif
similarity index 100%
rename from src/canonical/models/front/0884--420--Duraludon--Gmax.gif
rename to src/canonical/models/front/0884-420-Duraludon-Gmax.gif
diff --git a/src/canonical/models/front/0885--000--Dreepy.gif b/src/canonical/models/front/0885-000-Dreepy.gif
similarity index 100%
rename from src/canonical/models/front/0885--000--Dreepy.gif
rename to src/canonical/models/front/0885-000-Dreepy.gif
diff --git a/src/canonical/models/front/0886--000--Drakloak.gif b/src/canonical/models/front/0886-000-Drakloak.gif
similarity index 100%
rename from src/canonical/models/front/0886--000--Drakloak.gif
rename to src/canonical/models/front/0886-000-Drakloak.gif
diff --git a/src/canonical/models/front/0887--000--Dragapult.gif b/src/canonical/models/front/0887-000-Dragapult.gif
similarity index 100%
rename from src/canonical/models/front/0887--000--Dragapult.gif
rename to src/canonical/models/front/0887-000-Dragapult.gif
diff --git a/src/canonical/models/front/0888--000--Zacian.gif b/src/canonical/models/front/0888-000-Zacian.gif
similarity index 100%
rename from src/canonical/models/front/0888--000--Zacian.gif
rename to src/canonical/models/front/0888-000-Zacian.gif
diff --git a/src/canonical/models/front/0888--420--Zacian--Crowned.gif b/src/canonical/models/front/0888-420-Zacian-Crowned.gif
similarity index 100%
rename from src/canonical/models/front/0888--420--Zacian--Crowned.gif
rename to src/canonical/models/front/0888-420-Zacian-Crowned.gif
diff --git a/src/canonical/models/front/0889--000--Zamazenta.gif b/src/canonical/models/front/0889-000-Zamazenta.gif
similarity index 100%
rename from src/canonical/models/front/0889--000--Zamazenta.gif
rename to src/canonical/models/front/0889-000-Zamazenta.gif
diff --git a/src/canonical/models/front/0889--420--Zamazenta--Crowned.gif b/src/canonical/models/front/0889-420-Zamazenta-Crowned.gif
similarity index 100%
rename from src/canonical/models/front/0889--420--Zamazenta--Crowned.gif
rename to src/canonical/models/front/0889-420-Zamazenta-Crowned.gif
diff --git a/src/canonical/models/front/0890--000--Eternatus.gif b/src/canonical/models/front/0890-000-Eternatus.gif
similarity index 100%
rename from src/canonical/models/front/0890--000--Eternatus.gif
rename to src/canonical/models/front/0890-000-Eternatus.gif
diff --git a/src/canonical/models/front/0890--420--Eternatus--Eternamax.gif b/src/canonical/models/front/0890-420-Eternatus-Eternamax.gif
similarity index 100%
rename from src/canonical/models/front/0890--420--Eternatus--Eternamax.gif
rename to src/canonical/models/front/0890-420-Eternatus-Eternamax.gif
diff --git a/src/cap/dex/front-cosmetic/0006--000--Pyroak--Female.png b/src/cap/dex/front-cosmetic/0006-000-Pyroak-Female.png
similarity index 100%
rename from src/cap/dex/front-cosmetic/0006--000--Pyroak--Female.png
rename to src/cap/dex/front-cosmetic/0006-000-Pyroak-Female.png
diff --git a/src/cap/dex/front-cosmetic/0014--000--Kitsunoh--Female.png b/src/cap/dex/front-cosmetic/0014-000-Kitsunoh-Female.png
similarity index 100%
rename from src/cap/dex/front-cosmetic/0014--000--Kitsunoh--Female.png
rename to src/cap/dex/front-cosmetic/0014-000-Kitsunoh-Female.png
diff --git a/src/cap/dex/front-cosmetic/0041--000--Kerfluffle--Female.png b/src/cap/dex/front-cosmetic/0041-000-Kerfluffle-Female.png
similarity index 100%
rename from src/cap/dex/front-cosmetic/0041--000--Kerfluffle--Female.png
rename to src/cap/dex/front-cosmetic/0041-000-Kerfluffle-Female.png
diff --git a/src/cap/dex/front-shiny-cosmetic/0006--000--Pyroak--Female.png b/src/cap/dex/front-shiny-cosmetic/0006-000-Pyroak-Female.png
similarity index 100%
rename from src/cap/dex/front-shiny-cosmetic/0006--000--Pyroak--Female.png
rename to src/cap/dex/front-shiny-cosmetic/0006-000-Pyroak-Female.png
diff --git a/src/cap/dex/front-shiny-cosmetic/0014--000--Kitsunoh--Female.png b/src/cap/dex/front-shiny-cosmetic/0014-000-Kitsunoh-Female.png
similarity index 100%
rename from src/cap/dex/front-shiny-cosmetic/0014--000--Kitsunoh--Female.png
rename to src/cap/dex/front-shiny-cosmetic/0014-000-Kitsunoh-Female.png
diff --git a/src/cap/dex/front-shiny-cosmetic/0041--000--Kerfluffle--Female.png b/src/cap/dex/front-shiny-cosmetic/0041-000-Kerfluffle-Female.png
similarity index 100%
rename from src/cap/dex/front-shiny-cosmetic/0041--000--Kerfluffle--Female.png
rename to src/cap/dex/front-shiny-cosmetic/0041-000-Kerfluffle-Female.png
diff --git a/src/cap/dex/front-shiny/0006--000--Pyroak.png b/src/cap/dex/front-shiny/0006-000-Pyroak.png
similarity index 100%
rename from src/cap/dex/front-shiny/0006--000--Pyroak.png
rename to src/cap/dex/front-shiny/0006-000-Pyroak.png
diff --git a/src/cap/dex/front-shiny/0008--000--Fidgit.png b/src/cap/dex/front-shiny/0008-000-Fidgit.png
similarity index 100%
rename from src/cap/dex/front-shiny/0008--000--Fidgit.png
rename to src/cap/dex/front-shiny/0008-000-Fidgit.png
diff --git a/src/cap/dex/front-shiny/0011--000--Stratagem.png b/src/cap/dex/front-shiny/0011-000-Stratagem.png
similarity index 100%
rename from src/cap/dex/front-shiny/0011--000--Stratagem.png
rename to src/cap/dex/front-shiny/0011-000-Stratagem.png
diff --git a/src/cap/dex/front-shiny/0014--000--Kitsunoh.png b/src/cap/dex/front-shiny/0014-000-Kitsunoh.png
similarity index 100%
rename from src/cap/dex/front-shiny/0014--000--Kitsunoh.png
rename to src/cap/dex/front-shiny/0014-000-Kitsunoh.png
diff --git a/src/cap/dex/front-shiny/0020--000--Scratchet.png b/src/cap/dex/front-shiny/0020-000-Scratchet.png
similarity index 100%
rename from src/cap/dex/front-shiny/0020--000--Scratchet.png
rename to src/cap/dex/front-shiny/0020-000-Scratchet.png
diff --git a/src/cap/dex/front-shiny/0021--000--Tomohawk.png b/src/cap/dex/front-shiny/0021-000-Tomohawk.png
similarity index 100%
rename from src/cap/dex/front-shiny/0021--000--Tomohawk.png
rename to src/cap/dex/front-shiny/0021-000-Tomohawk.png
diff --git a/src/cap/dex/front-shiny/0024--000--Mollux.png b/src/cap/dex/front-shiny/0024-000-Mollux.png
similarity index 100%
rename from src/cap/dex/front-shiny/0024--000--Mollux.png
rename to src/cap/dex/front-shiny/0024-000-Mollux.png
diff --git a/src/cap/dex/front-shiny/0039--000--Crucibelle.png b/src/cap/dex/front-shiny/0039-000-Crucibelle.png
similarity index 100%
rename from src/cap/dex/front-shiny/0039--000--Crucibelle.png
rename to src/cap/dex/front-shiny/0039-000-Crucibelle.png
diff --git a/src/cap/dex/front-shiny/0039--420--Crucibelle--Mega.png b/src/cap/dex/front-shiny/0039-420-Crucibelle-Mega.png
similarity index 100%
rename from src/cap/dex/front-shiny/0039--420--Crucibelle--Mega.png
rename to src/cap/dex/front-shiny/0039-420-Crucibelle-Mega.png
diff --git a/src/cap/dex/front-shiny/0040--000--Pluffle.png b/src/cap/dex/front-shiny/0040-000-Pluffle.png
similarity index 100%
rename from src/cap/dex/front-shiny/0040--000--Pluffle.png
rename to src/cap/dex/front-shiny/0040-000-Pluffle.png
diff --git a/src/cap/dex/front-shiny/0041--000--Kerfluffle.png b/src/cap/dex/front-shiny/0041-000-Kerfluffle.png
similarity index 100%
rename from src/cap/dex/front-shiny/0041--000--Kerfluffle.png
rename to src/cap/dex/front-shiny/0041-000-Kerfluffle.png
diff --git a/src/cap/dex/front-shiny/0042--000--Pajantom.png b/src/cap/dex/front-shiny/0042-000-Pajantom.png
similarity index 100%
rename from src/cap/dex/front-shiny/0042--000--Pajantom.png
rename to src/cap/dex/front-shiny/0042-000-Pajantom.png
diff --git a/src/cap/dex/front-shiny/0044--000--Jumbao.png b/src/cap/dex/front-shiny/0044-000-Jumbao.png
similarity index 100%
rename from src/cap/dex/front-shiny/0044--000--Jumbao.png
rename to src/cap/dex/front-shiny/0044-000-Jumbao.png
diff --git a/src/cap/dex/front-shiny/0047--000--Caribolt.png b/src/cap/dex/front-shiny/0047-000-Caribolt.png
similarity index 100%
rename from src/cap/dex/front-shiny/0047--000--Caribolt.png
rename to src/cap/dex/front-shiny/0047-000-Caribolt.png
diff --git a/src/cap/dex/front-shiny/0048--000--Smogecko.png b/src/cap/dex/front-shiny/0048-000-Smogecko.png
similarity index 100%
rename from src/cap/dex/front-shiny/0048--000--Smogecko.png
rename to src/cap/dex/front-shiny/0048-000-Smogecko.png
diff --git a/src/cap/dex/front-shiny/0049--000--Smoguana.png b/src/cap/dex/front-shiny/0049-000-Smoguana.png
similarity index 100%
rename from src/cap/dex/front-shiny/0049--000--Smoguana.png
rename to src/cap/dex/front-shiny/0049-000-Smoguana.png
diff --git a/src/cap/dex/front-shiny/0050--000--Smokomodo.png b/src/cap/dex/front-shiny/0050-000-Smokomodo.png
similarity index 100%
rename from src/cap/dex/front-shiny/0050--000--Smokomodo.png
rename to src/cap/dex/front-shiny/0050-000-Smokomodo.png
diff --git a/src/cap/dex/front-shiny/0053--000--Snaelstrom.png b/src/cap/dex/front-shiny/0053-000-Snaelstrom.png
similarity index 100%
rename from src/cap/dex/front-shiny/0053--000--Snaelstrom.png
rename to src/cap/dex/front-shiny/0053-000-Snaelstrom.png
diff --git a/src/cap/dex/front-shiny/0054--000--Equilibra.png b/src/cap/dex/front-shiny/0054-000-Equilibra.png
similarity index 100%
rename from src/cap/dex/front-shiny/0054--000--Equilibra.png
rename to src/cap/dex/front-shiny/0054-000-Equilibra.png
diff --git a/src/cap/dex/front/0006--000--Pyroak.png b/src/cap/dex/front/0006-000-Pyroak.png
similarity index 100%
rename from src/cap/dex/front/0006--000--Pyroak.png
rename to src/cap/dex/front/0006-000-Pyroak.png
diff --git a/src/cap/dex/front/0008--000--Fidgit.png b/src/cap/dex/front/0008-000-Fidgit.png
similarity index 100%
rename from src/cap/dex/front/0008--000--Fidgit.png
rename to src/cap/dex/front/0008-000-Fidgit.png
diff --git a/src/cap/dex/front/0011--000--Stratagem.png b/src/cap/dex/front/0011-000-Stratagem.png
similarity index 100%
rename from src/cap/dex/front/0011--000--Stratagem.png
rename to src/cap/dex/front/0011-000-Stratagem.png
diff --git a/src/cap/dex/front/0014--000--Kitsunoh.png b/src/cap/dex/front/0014-000-Kitsunoh.png
similarity index 100%
rename from src/cap/dex/front/0014--000--Kitsunoh.png
rename to src/cap/dex/front/0014-000-Kitsunoh.png
diff --git a/src/cap/dex/front/0020--000--Scratchet.png b/src/cap/dex/front/0020-000-Scratchet.png
similarity index 100%
rename from src/cap/dex/front/0020--000--Scratchet.png
rename to src/cap/dex/front/0020-000-Scratchet.png
diff --git a/src/cap/dex/front/0021--000--Tomohawk.png b/src/cap/dex/front/0021-000-Tomohawk.png
similarity index 100%
rename from src/cap/dex/front/0021--000--Tomohawk.png
rename to src/cap/dex/front/0021-000-Tomohawk.png
diff --git a/src/cap/dex/front/0024--000--Mollux.png b/src/cap/dex/front/0024-000-Mollux.png
similarity index 100%
rename from src/cap/dex/front/0024--000--Mollux.png
rename to src/cap/dex/front/0024-000-Mollux.png
diff --git a/src/cap/dex/front/0039--000--Crucibelle.png b/src/cap/dex/front/0039-000-Crucibelle.png
similarity index 100%
rename from src/cap/dex/front/0039--000--Crucibelle.png
rename to src/cap/dex/front/0039-000-Crucibelle.png
diff --git a/src/cap/dex/front/0039--420--Crucibelle--Mega.png b/src/cap/dex/front/0039-420-Crucibelle-Mega.png
similarity index 100%
rename from src/cap/dex/front/0039--420--Crucibelle--Mega.png
rename to src/cap/dex/front/0039-420-Crucibelle-Mega.png
diff --git a/src/cap/dex/front/0040--000--Pluffle.png b/src/cap/dex/front/0040-000-Pluffle.png
similarity index 100%
rename from src/cap/dex/front/0040--000--Pluffle.png
rename to src/cap/dex/front/0040-000-Pluffle.png
diff --git a/src/cap/dex/front/0041--000--Kerfluffle.png b/src/cap/dex/front/0041-000-Kerfluffle.png
similarity index 100%
rename from src/cap/dex/front/0041--000--Kerfluffle.png
rename to src/cap/dex/front/0041-000-Kerfluffle.png
diff --git a/src/cap/dex/front/0042--000--Pajantom.png b/src/cap/dex/front/0042-000-Pajantom.png
similarity index 100%
rename from src/cap/dex/front/0042--000--Pajantom.png
rename to src/cap/dex/front/0042-000-Pajantom.png
diff --git a/src/cap/dex/front/0044--000--Jumbao.png b/src/cap/dex/front/0044-000-Jumbao.png
similarity index 100%
rename from src/cap/dex/front/0044--000--Jumbao.png
rename to src/cap/dex/front/0044-000-Jumbao.png
diff --git a/src/cap/dex/front/0047--000--Caribolt.png b/src/cap/dex/front/0047-000-Caribolt.png
similarity index 100%
rename from src/cap/dex/front/0047--000--Caribolt.png
rename to src/cap/dex/front/0047-000-Caribolt.png
diff --git a/src/cap/dex/front/0048--000--Smogecko.png b/src/cap/dex/front/0048-000-Smogecko.png
similarity index 100%
rename from src/cap/dex/front/0048--000--Smogecko.png
rename to src/cap/dex/front/0048-000-Smogecko.png
diff --git a/src/cap/dex/front/0049--000--Smoguana.png b/src/cap/dex/front/0049-000-Smoguana.png
similarity index 100%
rename from src/cap/dex/front/0049--000--Smoguana.png
rename to src/cap/dex/front/0049-000-Smoguana.png
diff --git a/src/cap/dex/front/0050--000--Smokomodo.png b/src/cap/dex/front/0050-000-Smokomodo.png
similarity index 100%
rename from src/cap/dex/front/0050--000--Smokomodo.png
rename to src/cap/dex/front/0050-000-Smokomodo.png
diff --git a/src/cap/dex/front/0053--000--Snaelstrom.png b/src/cap/dex/front/0053-000-Snaelstrom.png
similarity index 100%
rename from src/cap/dex/front/0053--000--Snaelstrom.png
rename to src/cap/dex/front/0053-000-Snaelstrom.png
diff --git a/src/cap/dex/front/0054--000--Equilibra.png b/src/cap/dex/front/0054-000-Equilibra.png
similarity index 100%
rename from src/cap/dex/front/0054--000--Equilibra.png
rename to src/cap/dex/front/0054-000-Equilibra.png
diff --git a/src/cap/minisprites/gen5/pokemon/0002--000--Syclant.png b/src/cap/minisprites/gen5/pokemon/0002-000-Syclant.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0002--000--Syclant.png
rename to src/cap/minisprites/gen5/pokemon/0002-000-Syclant.png
diff --git a/src/cap/minisprites/gen5/pokemon/0003--000--Revenankh.png b/src/cap/minisprites/gen5/pokemon/0003-000-Revenankh.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0003--000--Revenankh.png
rename to src/cap/minisprites/gen5/pokemon/0003-000-Revenankh.png
diff --git a/src/cap/minisprites/gen5/pokemon/0006--000--Pyroak.png b/src/cap/minisprites/gen5/pokemon/0006-000-Pyroak.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0006--000--Pyroak.png
rename to src/cap/minisprites/gen5/pokemon/0006-000-Pyroak.png
diff --git a/src/cap/minisprites/gen5/pokemon/0008--000--Fidgit.png b/src/cap/minisprites/gen5/pokemon/0008-000-Fidgit.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0008--000--Fidgit.png
rename to src/cap/minisprites/gen5/pokemon/0008-000-Fidgit.png
diff --git a/src/cap/minisprites/gen5/pokemon/0011--000--Stratagem.png b/src/cap/minisprites/gen5/pokemon/0011-000-Stratagem.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0011--000--Stratagem.png
rename to src/cap/minisprites/gen5/pokemon/0011-000-Stratagem.png
diff --git a/src/cap/minisprites/gen5/pokemon/0013--000--Arghonaut.png b/src/cap/minisprites/gen5/pokemon/0013-000-Arghonaut.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0013--000--Arghonaut.png
rename to src/cap/minisprites/gen5/pokemon/0013-000-Arghonaut.png
diff --git a/src/cap/minisprites/gen5/pokemon/0014--000--Kitsunoh.png b/src/cap/minisprites/gen5/pokemon/0014-000-Kitsunoh.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0014--000--Kitsunoh.png
rename to src/cap/minisprites/gen5/pokemon/0014-000-Kitsunoh.png
diff --git a/src/cap/minisprites/gen5/pokemon/0015--000--Cyclohm.png b/src/cap/minisprites/gen5/pokemon/0015-000-Cyclohm.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0015--000--Cyclohm.png
rename to src/cap/minisprites/gen5/pokemon/0015-000-Cyclohm.png
diff --git a/src/cap/minisprites/gen5/pokemon/0016--000--Colossoil.png b/src/cap/minisprites/gen5/pokemon/0016-000-Colossoil.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0016--000--Colossoil.png
rename to src/cap/minisprites/gen5/pokemon/0016-000-Colossoil.png
diff --git a/src/cap/minisprites/gen5/pokemon/0017--000--Krilowatt.png b/src/cap/minisprites/gen5/pokemon/0017-000-Krilowatt.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0017--000--Krilowatt.png
rename to src/cap/minisprites/gen5/pokemon/0017-000-Krilowatt.png
diff --git a/src/cap/minisprites/gen5/pokemon/0019--000--Voodoom.png b/src/cap/minisprites/gen5/pokemon/0019-000-Voodoom.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0019--000--Voodoom.png
rename to src/cap/minisprites/gen5/pokemon/0019-000-Voodoom.png
diff --git a/src/cap/minisprites/gen5/pokemon/0021--000--Tomohawk.png b/src/cap/minisprites/gen5/pokemon/0021-000-Tomohawk.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0021--000--Tomohawk.png
rename to src/cap/minisprites/gen5/pokemon/0021-000-Tomohawk.png
diff --git a/src/cap/minisprites/gen5/pokemon/0023--000--Necturna.png b/src/cap/minisprites/gen5/pokemon/0023-000-Necturna.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0023--000--Necturna.png
rename to src/cap/minisprites/gen5/pokemon/0023-000-Necturna.png
diff --git a/src/cap/minisprites/gen5/pokemon/0024--000--Mollux.png b/src/cap/minisprites/gen5/pokemon/0024-000-Mollux.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0024--000--Mollux.png
rename to src/cap/minisprites/gen5/pokemon/0024-000-Mollux.png
diff --git a/src/cap/minisprites/gen5/pokemon/0027--000--Aurumoth.png b/src/cap/minisprites/gen5/pokemon/0027-000-Aurumoth.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0027--000--Aurumoth.png
rename to src/cap/minisprites/gen5/pokemon/0027-000-Aurumoth.png
diff --git a/src/cap/minisprites/gen5/pokemon/0029--000--Malaconda.png b/src/cap/minisprites/gen5/pokemon/0029-000-Malaconda.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0029--000--Malaconda.png
rename to src/cap/minisprites/gen5/pokemon/0029-000-Malaconda.png
diff --git a/src/cap/minisprites/gen5/pokemon/0031--000--Cawmodore.png b/src/cap/minisprites/gen5/pokemon/0031-000-Cawmodore.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0031--000--Cawmodore.png
rename to src/cap/minisprites/gen5/pokemon/0031-000-Cawmodore.png
diff --git a/src/cap/minisprites/gen5/pokemon/0033--000--Volkraken.png b/src/cap/minisprites/gen5/pokemon/0033-000-Volkraken.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0033--000--Volkraken.png
rename to src/cap/minisprites/gen5/pokemon/0033-000-Volkraken.png
diff --git a/src/cap/minisprites/gen5/pokemon/0035--000--Plasmanta.png b/src/cap/minisprites/gen5/pokemon/0035-000-Plasmanta.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0035--000--Plasmanta.png
rename to src/cap/minisprites/gen5/pokemon/0035-000-Plasmanta.png
diff --git a/src/cap/minisprites/gen5/pokemon/0038--000--Naviathan.png b/src/cap/minisprites/gen5/pokemon/0038-000-Naviathan.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0038--000--Naviathan.png
rename to src/cap/minisprites/gen5/pokemon/0038-000-Naviathan.png
diff --git a/src/cap/minisprites/gen5/pokemon/0039--000--Crucibelle.png b/src/cap/minisprites/gen5/pokemon/0039-000-Crucibelle.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0039--000--Crucibelle.png
rename to src/cap/minisprites/gen5/pokemon/0039-000-Crucibelle.png
diff --git a/src/cap/minisprites/gen5/pokemon/0039--420--Crucibelle--Mega.png b/src/cap/minisprites/gen5/pokemon/0039-420-Crucibelle-Mega.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0039--420--Crucibelle--Mega.png
rename to src/cap/minisprites/gen5/pokemon/0039-420-Crucibelle-Mega.png
diff --git a/src/cap/minisprites/gen5/pokemon/0041--000--Kerfluffle.png b/src/cap/minisprites/gen5/pokemon/0041-000-Kerfluffle.png
similarity index 100%
rename from src/cap/minisprites/gen5/pokemon/0041--000--Kerfluffle.png
rename to src/cap/minisprites/gen5/pokemon/0041-000-Kerfluffle.png
diff --git a/src/cap/minisprites/gen6/pokemon/0001--000--Syclar.png b/src/cap/minisprites/gen6/pokemon/0001-000-Syclar.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0001--000--Syclar.png
rename to src/cap/minisprites/gen6/pokemon/0001-000-Syclar.png
diff --git a/src/cap/minisprites/gen6/pokemon/0002--000--Syclant.png b/src/cap/minisprites/gen6/pokemon/0002-000-Syclant.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0002--000--Syclant.png
rename to src/cap/minisprites/gen6/pokemon/0002-000-Syclant.png
diff --git a/src/cap/minisprites/gen6/pokemon/0003--000--Revenankh.png b/src/cap/minisprites/gen6/pokemon/0003-000-Revenankh.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0003--000--Revenankh.png
rename to src/cap/minisprites/gen6/pokemon/0003-000-Revenankh.png
diff --git a/src/cap/minisprites/gen6/pokemon/0004--000--Embirch.png b/src/cap/minisprites/gen6/pokemon/0004-000-Embirch.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0004--000--Embirch.png
rename to src/cap/minisprites/gen6/pokemon/0004-000-Embirch.png
diff --git a/src/cap/minisprites/gen6/pokemon/0005--000--Flarelm.png b/src/cap/minisprites/gen6/pokemon/0005-000-Flarelm.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0005--000--Flarelm.png
rename to src/cap/minisprites/gen6/pokemon/0005-000-Flarelm.png
diff --git a/src/cap/minisprites/gen6/pokemon/0006--000--Pyroak.png b/src/cap/minisprites/gen6/pokemon/0006-000-Pyroak.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0006--000--Pyroak.png
rename to src/cap/minisprites/gen6/pokemon/0006-000-Pyroak.png
diff --git a/src/cap/minisprites/gen6/pokemon/0007--000--Breezi.png b/src/cap/minisprites/gen6/pokemon/0007-000-Breezi.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0007--000--Breezi.png
rename to src/cap/minisprites/gen6/pokemon/0007-000-Breezi.png
diff --git a/src/cap/minisprites/gen6/pokemon/0008--000--Fidgit.png b/src/cap/minisprites/gen6/pokemon/0008-000-Fidgit.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0008--000--Fidgit.png
rename to src/cap/minisprites/gen6/pokemon/0008-000-Fidgit.png
diff --git a/src/cap/minisprites/gen6/pokemon/0009--000--Rebble.png b/src/cap/minisprites/gen6/pokemon/0009-000-Rebble.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0009--000--Rebble.png
rename to src/cap/minisprites/gen6/pokemon/0009-000-Rebble.png
diff --git a/src/cap/minisprites/gen6/pokemon/0010--000--Tactite.png b/src/cap/minisprites/gen6/pokemon/0010-000-Tactite.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0010--000--Tactite.png
rename to src/cap/minisprites/gen6/pokemon/0010-000-Tactite.png
diff --git a/src/cap/minisprites/gen6/pokemon/0011--000--Stratagem.png b/src/cap/minisprites/gen6/pokemon/0011-000-Stratagem.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0011--000--Stratagem.png
rename to src/cap/minisprites/gen6/pokemon/0011-000-Stratagem.png
diff --git a/src/cap/minisprites/gen6/pokemon/0012--000--Privatyke.png b/src/cap/minisprites/gen6/pokemon/0012-000-Privatyke.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0012--000--Privatyke.png
rename to src/cap/minisprites/gen6/pokemon/0012-000-Privatyke.png
diff --git a/src/cap/minisprites/gen6/pokemon/0013--000--Arghonaut.png b/src/cap/minisprites/gen6/pokemon/0013-000-Arghonaut.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0013--000--Arghonaut.png
rename to src/cap/minisprites/gen6/pokemon/0013-000-Arghonaut.png
diff --git a/src/cap/minisprites/gen6/pokemon/0014--000--Kitsunoh.png b/src/cap/minisprites/gen6/pokemon/0014-000-Kitsunoh.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0014--000--Kitsunoh.png
rename to src/cap/minisprites/gen6/pokemon/0014-000-Kitsunoh.png
diff --git a/src/cap/minisprites/gen6/pokemon/0015--000--Cyclohm.png b/src/cap/minisprites/gen6/pokemon/0015-000-Cyclohm.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0015--000--Cyclohm.png
rename to src/cap/minisprites/gen6/pokemon/0015-000-Cyclohm.png
diff --git a/src/cap/minisprites/gen6/pokemon/0016--000--Colossoil.png b/src/cap/minisprites/gen6/pokemon/0016-000-Colossoil.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0016--000--Colossoil.png
rename to src/cap/minisprites/gen6/pokemon/0016-000-Colossoil.png
diff --git a/src/cap/minisprites/gen6/pokemon/0017--000--Krilowatt.png b/src/cap/minisprites/gen6/pokemon/0017-000-Krilowatt.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0017--000--Krilowatt.png
rename to src/cap/minisprites/gen6/pokemon/0017-000-Krilowatt.png
diff --git a/src/cap/minisprites/gen6/pokemon/0018--000--Voodoll.png b/src/cap/minisprites/gen6/pokemon/0018-000-Voodoll.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0018--000--Voodoll.png
rename to src/cap/minisprites/gen6/pokemon/0018-000-Voodoll.png
diff --git a/src/cap/minisprites/gen6/pokemon/0019--000--Voodoom.png b/src/cap/minisprites/gen6/pokemon/0019-000-Voodoom.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0019--000--Voodoom.png
rename to src/cap/minisprites/gen6/pokemon/0019-000-Voodoom.png
diff --git a/src/cap/minisprites/gen6/pokemon/0020--000--Scratchet.png b/src/cap/minisprites/gen6/pokemon/0020-000-Scratchet.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0020--000--Scratchet.png
rename to src/cap/minisprites/gen6/pokemon/0020-000-Scratchet.png
diff --git a/src/cap/minisprites/gen6/pokemon/0021--000--Tomohawk.png b/src/cap/minisprites/gen6/pokemon/0021-000-Tomohawk.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0021--000--Tomohawk.png
rename to src/cap/minisprites/gen6/pokemon/0021-000-Tomohawk.png
diff --git a/src/cap/minisprites/gen6/pokemon/0022--000--Necturine.png b/src/cap/minisprites/gen6/pokemon/0022-000-Necturine.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0022--000--Necturine.png
rename to src/cap/minisprites/gen6/pokemon/0022-000-Necturine.png
diff --git a/src/cap/minisprites/gen6/pokemon/0023--000--Necturna.png b/src/cap/minisprites/gen6/pokemon/0023-000-Necturna.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0023--000--Necturna.png
rename to src/cap/minisprites/gen6/pokemon/0023-000-Necturna.png
diff --git a/src/cap/minisprites/gen6/pokemon/0024--000--Mollux.png b/src/cap/minisprites/gen6/pokemon/0024-000-Mollux.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0024--000--Mollux.png
rename to src/cap/minisprites/gen6/pokemon/0024-000-Mollux.png
diff --git a/src/cap/minisprites/gen6/pokemon/0025--000--Cupra.png b/src/cap/minisprites/gen6/pokemon/0025-000-Cupra.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0025--000--Cupra.png
rename to src/cap/minisprites/gen6/pokemon/0025-000-Cupra.png
diff --git a/src/cap/minisprites/gen6/pokemon/0026--000--Argalis.png b/src/cap/minisprites/gen6/pokemon/0026-000-Argalis.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0026--000--Argalis.png
rename to src/cap/minisprites/gen6/pokemon/0026-000-Argalis.png
diff --git a/src/cap/minisprites/gen6/pokemon/0027--000--Aurumoth.png b/src/cap/minisprites/gen6/pokemon/0027-000-Aurumoth.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0027--000--Aurumoth.png
rename to src/cap/minisprites/gen6/pokemon/0027-000-Aurumoth.png
diff --git a/src/cap/minisprites/gen6/pokemon/0028--000--Brattler.png b/src/cap/minisprites/gen6/pokemon/0028-000-Brattler.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0028--000--Brattler.png
rename to src/cap/minisprites/gen6/pokemon/0028-000-Brattler.png
diff --git a/src/cap/minisprites/gen6/pokemon/0029--000--Malaconda.png b/src/cap/minisprites/gen6/pokemon/0029-000-Malaconda.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0029--000--Malaconda.png
rename to src/cap/minisprites/gen6/pokemon/0029-000-Malaconda.png
diff --git a/src/cap/minisprites/gen6/pokemon/0030--000--Cawdet.png b/src/cap/minisprites/gen6/pokemon/0030-000-Cawdet.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0030--000--Cawdet.png
rename to src/cap/minisprites/gen6/pokemon/0030-000-Cawdet.png
diff --git a/src/cap/minisprites/gen6/pokemon/0031--000--Cawmodore.png b/src/cap/minisprites/gen6/pokemon/0031-000-Cawmodore.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0031--000--Cawmodore.png
rename to src/cap/minisprites/gen6/pokemon/0031-000-Cawmodore.png
diff --git a/src/cap/minisprites/gen6/pokemon/0032--000--Volkritter.png b/src/cap/minisprites/gen6/pokemon/0032-000-Volkritter.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0032--000--Volkritter.png
rename to src/cap/minisprites/gen6/pokemon/0032-000-Volkritter.png
diff --git a/src/cap/minisprites/gen6/pokemon/0033--000--Volkraken.png b/src/cap/minisprites/gen6/pokemon/0033-000-Volkraken.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0033--000--Volkraken.png
rename to src/cap/minisprites/gen6/pokemon/0033-000-Volkraken.png
diff --git a/src/cap/minisprites/gen6/pokemon/0034--000--Snugglow.png b/src/cap/minisprites/gen6/pokemon/0034-000-Snugglow.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0034--000--Snugglow.png
rename to src/cap/minisprites/gen6/pokemon/0034-000-Snugglow.png
diff --git a/src/cap/minisprites/gen6/pokemon/0035--000--Plasmanta.png b/src/cap/minisprites/gen6/pokemon/0035-000-Plasmanta.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0035--000--Plasmanta.png
rename to src/cap/minisprites/gen6/pokemon/0035-000-Plasmanta.png
diff --git a/src/cap/minisprites/gen6/pokemon/0036--000--Floatoy.png b/src/cap/minisprites/gen6/pokemon/0036-000-Floatoy.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0036--000--Floatoy.png
rename to src/cap/minisprites/gen6/pokemon/0036-000-Floatoy.png
diff --git a/src/cap/minisprites/gen6/pokemon/0037--000--Caimanoe.png b/src/cap/minisprites/gen6/pokemon/0037-000-Caimanoe.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0037--000--Caimanoe.png
rename to src/cap/minisprites/gen6/pokemon/0037-000-Caimanoe.png
diff --git a/src/cap/minisprites/gen6/pokemon/0038--000--Naviathan.png b/src/cap/minisprites/gen6/pokemon/0038-000-Naviathan.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0038--000--Naviathan.png
rename to src/cap/minisprites/gen6/pokemon/0038-000-Naviathan.png
diff --git a/src/cap/minisprites/gen6/pokemon/0039--000--Crucibelle.png b/src/cap/minisprites/gen6/pokemon/0039-000-Crucibelle.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0039--000--Crucibelle.png
rename to src/cap/minisprites/gen6/pokemon/0039-000-Crucibelle.png
diff --git a/src/cap/minisprites/gen6/pokemon/0039--420--Crucibelle--Mega.png b/src/cap/minisprites/gen6/pokemon/0039-420-Crucibelle-Mega.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0039--420--Crucibelle--Mega.png
rename to src/cap/minisprites/gen6/pokemon/0039-420-Crucibelle-Mega.png
diff --git a/src/cap/minisprites/gen6/pokemon/0040--000--Pluffle.png b/src/cap/minisprites/gen6/pokemon/0040-000-Pluffle.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0040--000--Pluffle.png
rename to src/cap/minisprites/gen6/pokemon/0040-000-Pluffle.png
diff --git a/src/cap/minisprites/gen6/pokemon/0041--000--Kerfluffle.png b/src/cap/minisprites/gen6/pokemon/0041-000-Kerfluffle.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0041--000--Kerfluffle.png
rename to src/cap/minisprites/gen6/pokemon/0041-000-Kerfluffle.png
diff --git a/src/cap/minisprites/gen6/pokemon/0042--000--Pajantom.png b/src/cap/minisprites/gen6/pokemon/0042-000-Pajantom.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0042--000--Pajantom.png
rename to src/cap/minisprites/gen6/pokemon/0042-000-Pajantom.png
diff --git a/src/cap/minisprites/gen6/pokemon/0043--000--Mumbao.png b/src/cap/minisprites/gen6/pokemon/0043-000-Mumbao.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0043--000--Mumbao.png
rename to src/cap/minisprites/gen6/pokemon/0043-000-Mumbao.png
diff --git a/src/cap/minisprites/gen6/pokemon/0044--000--Jumbao.png b/src/cap/minisprites/gen6/pokemon/0044-000-Jumbao.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0044--000--Jumbao.png
rename to src/cap/minisprites/gen6/pokemon/0044-000-Jumbao.png
diff --git a/src/cap/minisprites/gen6/pokemon/0045--000--Fawnifer.png b/src/cap/minisprites/gen6/pokemon/0045-000-Fawnifer.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0045--000--Fawnifer.png
rename to src/cap/minisprites/gen6/pokemon/0045-000-Fawnifer.png
diff --git a/src/cap/minisprites/gen6/pokemon/0046--000--Electrelk.png b/src/cap/minisprites/gen6/pokemon/0046-000-Electrelk.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0046--000--Electrelk.png
rename to src/cap/minisprites/gen6/pokemon/0046-000-Electrelk.png
diff --git a/src/cap/minisprites/gen6/pokemon/0047--000--Caribolt.png b/src/cap/minisprites/gen6/pokemon/0047-000-Caribolt.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0047--000--Caribolt.png
rename to src/cap/minisprites/gen6/pokemon/0047-000-Caribolt.png
diff --git a/src/cap/minisprites/gen6/pokemon/0048--000--Smogecko.png b/src/cap/minisprites/gen6/pokemon/0048-000-Smogecko.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0048--000--Smogecko.png
rename to src/cap/minisprites/gen6/pokemon/0048-000-Smogecko.png
diff --git a/src/cap/minisprites/gen6/pokemon/0049--000--Smoguana.png b/src/cap/minisprites/gen6/pokemon/0049-000-Smoguana.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0049--000--Smoguana.png
rename to src/cap/minisprites/gen6/pokemon/0049-000-Smoguana.png
diff --git a/src/cap/minisprites/gen6/pokemon/0050--000--Smokomodo.png b/src/cap/minisprites/gen6/pokemon/0050-000-Smokomodo.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0050--000--Smokomodo.png
rename to src/cap/minisprites/gen6/pokemon/0050-000-Smokomodo.png
diff --git a/src/cap/minisprites/gen6/pokemon/0051--000--Swirlpool.png b/src/cap/minisprites/gen6/pokemon/0051-000-Swirlpool.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0051--000--Swirlpool.png
rename to src/cap/minisprites/gen6/pokemon/0051-000-Swirlpool.png
diff --git a/src/cap/minisprites/gen6/pokemon/0052--000--Coribalis.png b/src/cap/minisprites/gen6/pokemon/0052-000-Coribalis.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0052--000--Coribalis.png
rename to src/cap/minisprites/gen6/pokemon/0052-000-Coribalis.png
diff --git a/src/cap/minisprites/gen6/pokemon/0053--000--Snaelstrom.png b/src/cap/minisprites/gen6/pokemon/0053-000-Snaelstrom.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0053--000--Snaelstrom.png
rename to src/cap/minisprites/gen6/pokemon/0053-000-Snaelstrom.png
diff --git a/src/cap/minisprites/gen6/pokemon/0054--000--Equilibra.png b/src/cap/minisprites/gen6/pokemon/0054-000-Equilibra.png
similarity index 100%
rename from src/cap/minisprites/gen6/pokemon/0054--000--Equilibra.png
rename to src/cap/minisprites/gen6/pokemon/0054-000-Equilibra.png
diff --git a/src/cap/models/back-cosmetic/0014--000--Kitsunoh--Female.gif b/src/cap/models/back-cosmetic/0014-000-Kitsunoh-Female.gif
similarity index 100%
rename from src/cap/models/back-cosmetic/0014--000--Kitsunoh--Female.gif
rename to src/cap/models/back-cosmetic/0014-000-Kitsunoh-Female.gif
diff --git a/src/cap/models/back-shiny-cosmetic/0014--000--Kitsunoh--Female.gif b/src/cap/models/back-shiny-cosmetic/0014-000-Kitsunoh-Female.gif
similarity index 100%
rename from src/cap/models/back-shiny-cosmetic/0014--000--Kitsunoh--Female.gif
rename to src/cap/models/back-shiny-cosmetic/0014-000-Kitsunoh-Female.gif
diff --git a/src/cap/models/back-shiny/0008--000--Fidgit.gif b/src/cap/models/back-shiny/0008-000-Fidgit.gif
similarity index 100%
rename from src/cap/models/back-shiny/0008--000--Fidgit.gif
rename to src/cap/models/back-shiny/0008-000-Fidgit.gif
diff --git a/src/cap/models/back-shiny/0011--000--Stratagem.gif b/src/cap/models/back-shiny/0011-000-Stratagem.gif
similarity index 100%
rename from src/cap/models/back-shiny/0011--000--Stratagem.gif
rename to src/cap/models/back-shiny/0011-000-Stratagem.gif
diff --git a/src/cap/models/back-shiny/0014--000--Kitsunoh.gif b/src/cap/models/back-shiny/0014-000-Kitsunoh.gif
similarity index 100%
rename from src/cap/models/back-shiny/0014--000--Kitsunoh.gif
rename to src/cap/models/back-shiny/0014-000-Kitsunoh.gif
diff --git a/src/cap/models/back-shiny/0017--000--Krilowatt.gif b/src/cap/models/back-shiny/0017-000-Krilowatt.gif
similarity index 100%
rename from src/cap/models/back-shiny/0017--000--Krilowatt.gif
rename to src/cap/models/back-shiny/0017-000-Krilowatt.gif
diff --git a/src/cap/models/back-shiny/0020--000--Scratchet.gif b/src/cap/models/back-shiny/0020-000-Scratchet.gif
similarity index 100%
rename from src/cap/models/back-shiny/0020--000--Scratchet.gif
rename to src/cap/models/back-shiny/0020-000-Scratchet.gif
diff --git a/src/cap/models/back-shiny/0021--000--Tomohawk.gif b/src/cap/models/back-shiny/0021-000-Tomohawk.gif
similarity index 100%
rename from src/cap/models/back-shiny/0021--000--Tomohawk.gif
rename to src/cap/models/back-shiny/0021-000-Tomohawk.gif
diff --git a/src/cap/models/back-shiny/0024--000--Mollux.gif b/src/cap/models/back-shiny/0024-000-Mollux.gif
similarity index 100%
rename from src/cap/models/back-shiny/0024--000--Mollux.gif
rename to src/cap/models/back-shiny/0024-000-Mollux.gif
diff --git a/src/cap/models/back-shiny/0027--000--Aurumoth.gif b/src/cap/models/back-shiny/0027-000-Aurumoth.gif
similarity index 100%
rename from src/cap/models/back-shiny/0027--000--Aurumoth.gif
rename to src/cap/models/back-shiny/0027-000-Aurumoth.gif
diff --git a/src/cap/models/back-shiny/0031--000--Cawmodore.gif b/src/cap/models/back-shiny/0031-000-Cawmodore.gif
similarity index 100%
rename from src/cap/models/back-shiny/0031--000--Cawmodore.gif
rename to src/cap/models/back-shiny/0031-000-Cawmodore.gif
diff --git a/src/cap/models/back-shiny/0033--000--Volkraken.gif b/src/cap/models/back-shiny/0033-000-Volkraken.gif
similarity index 100%
rename from src/cap/models/back-shiny/0033--000--Volkraken.gif
rename to src/cap/models/back-shiny/0033-000-Volkraken.gif
diff --git a/src/cap/models/back-shiny/0035--000--Plasmanta.gif b/src/cap/models/back-shiny/0035-000-Plasmanta.gif
similarity index 100%
rename from src/cap/models/back-shiny/0035--000--Plasmanta.gif
rename to src/cap/models/back-shiny/0035-000-Plasmanta.gif
diff --git a/src/cap/models/back-shiny/0038--000--Naviathan.gif b/src/cap/models/back-shiny/0038-000-Naviathan.gif
similarity index 100%
rename from src/cap/models/back-shiny/0038--000--Naviathan.gif
rename to src/cap/models/back-shiny/0038-000-Naviathan.gif
diff --git a/src/cap/models/back-shiny/0039--000--Crucibelle.gif b/src/cap/models/back-shiny/0039-000-Crucibelle.gif
similarity index 100%
rename from src/cap/models/back-shiny/0039--000--Crucibelle.gif
rename to src/cap/models/back-shiny/0039-000-Crucibelle.gif
diff --git a/src/cap/models/back-shiny/0039--420--Crucibelle--Mega.gif b/src/cap/models/back-shiny/0039-420-Crucibelle-Mega.gif
similarity index 100%
rename from src/cap/models/back-shiny/0039--420--Crucibelle--Mega.gif
rename to src/cap/models/back-shiny/0039-420-Crucibelle-Mega.gif
diff --git a/src/cap/models/back-shiny/0040--000--Pluffle.gif b/src/cap/models/back-shiny/0040-000-Pluffle.gif
similarity index 100%
rename from src/cap/models/back-shiny/0040--000--Pluffle.gif
rename to src/cap/models/back-shiny/0040-000-Pluffle.gif
diff --git a/src/cap/models/back-shiny/0041--000--Kerfluffle.gif b/src/cap/models/back-shiny/0041-000-Kerfluffle.gif
similarity index 100%
rename from src/cap/models/back-shiny/0041--000--Kerfluffle.gif
rename to src/cap/models/back-shiny/0041-000-Kerfluffle.gif
diff --git a/src/cap/models/back-shiny/0042--000--Pajantom.gif b/src/cap/models/back-shiny/0042-000-Pajantom.gif
similarity index 100%
rename from src/cap/models/back-shiny/0042--000--Pajantom.gif
rename to src/cap/models/back-shiny/0042-000-Pajantom.gif
diff --git a/src/cap/models/back-shiny/0044--000--Jumbao.gif b/src/cap/models/back-shiny/0044-000-Jumbao.gif
similarity index 100%
rename from src/cap/models/back-shiny/0044--000--Jumbao.gif
rename to src/cap/models/back-shiny/0044-000-Jumbao.gif
diff --git a/src/cap/models/back-shiny/0047--000--Caribolt.gif b/src/cap/models/back-shiny/0047-000-Caribolt.gif
similarity index 100%
rename from src/cap/models/back-shiny/0047--000--Caribolt.gif
rename to src/cap/models/back-shiny/0047-000-Caribolt.gif
diff --git a/src/cap/models/back-shiny/0048--000--Smogecko.gif b/src/cap/models/back-shiny/0048-000-Smogecko.gif
similarity index 100%
rename from src/cap/models/back-shiny/0048--000--Smogecko.gif
rename to src/cap/models/back-shiny/0048-000-Smogecko.gif
diff --git a/src/cap/models/back-shiny/0049--000--Smoguana.gif b/src/cap/models/back-shiny/0049-000-Smoguana.gif
similarity index 100%
rename from src/cap/models/back-shiny/0049--000--Smoguana.gif
rename to src/cap/models/back-shiny/0049-000-Smoguana.gif
diff --git a/src/cap/models/back-shiny/0050--000--Smokomodo.gif b/src/cap/models/back-shiny/0050-000-Smokomodo.gif
similarity index 100%
rename from src/cap/models/back-shiny/0050--000--Smokomodo.gif
rename to src/cap/models/back-shiny/0050-000-Smokomodo.gif
diff --git a/src/cap/models/back-shiny/0053--000--Snaelstrom.gif b/src/cap/models/back-shiny/0053-000-Snaelstrom.gif
similarity index 100%
rename from src/cap/models/back-shiny/0053--000--Snaelstrom.gif
rename to src/cap/models/back-shiny/0053-000-Snaelstrom.gif
diff --git a/src/cap/models/back-shiny/0054--000--Equilibra.gif b/src/cap/models/back-shiny/0054-000-Equilibra.gif
similarity index 100%
rename from src/cap/models/back-shiny/0054--000--Equilibra.gif
rename to src/cap/models/back-shiny/0054-000-Equilibra.gif
diff --git a/src/cap/models/back/0008--000--Fidgit.gif b/src/cap/models/back/0008-000-Fidgit.gif
similarity index 100%
rename from src/cap/models/back/0008--000--Fidgit.gif
rename to src/cap/models/back/0008-000-Fidgit.gif
diff --git a/src/cap/models/back/0011--000--Stratagem.gif b/src/cap/models/back/0011-000-Stratagem.gif
similarity index 100%
rename from src/cap/models/back/0011--000--Stratagem.gif
rename to src/cap/models/back/0011-000-Stratagem.gif
diff --git a/src/cap/models/back/0014--000--Kitsunoh.gif b/src/cap/models/back/0014-000-Kitsunoh.gif
similarity index 100%
rename from src/cap/models/back/0014--000--Kitsunoh.gif
rename to src/cap/models/back/0014-000-Kitsunoh.gif
diff --git a/src/cap/models/back/0017--000--Krilowatt.gif b/src/cap/models/back/0017-000-Krilowatt.gif
similarity index 100%
rename from src/cap/models/back/0017--000--Krilowatt.gif
rename to src/cap/models/back/0017-000-Krilowatt.gif
diff --git a/src/cap/models/back/0020--000--Scratchet.gif b/src/cap/models/back/0020-000-Scratchet.gif
similarity index 100%
rename from src/cap/models/back/0020--000--Scratchet.gif
rename to src/cap/models/back/0020-000-Scratchet.gif
diff --git a/src/cap/models/back/0021--000--Tomohawk.gif b/src/cap/models/back/0021-000-Tomohawk.gif
similarity index 100%
rename from src/cap/models/back/0021--000--Tomohawk.gif
rename to src/cap/models/back/0021-000-Tomohawk.gif
diff --git a/src/cap/models/back/0024--000--Mollux.gif b/src/cap/models/back/0024-000-Mollux.gif
similarity index 100%
rename from src/cap/models/back/0024--000--Mollux.gif
rename to src/cap/models/back/0024-000-Mollux.gif
diff --git a/src/cap/models/back/0027--000--Aurumoth.gif b/src/cap/models/back/0027-000-Aurumoth.gif
similarity index 100%
rename from src/cap/models/back/0027--000--Aurumoth.gif
rename to src/cap/models/back/0027-000-Aurumoth.gif
diff --git a/src/cap/models/back/0031--000--Cawmodore.gif b/src/cap/models/back/0031-000-Cawmodore.gif
similarity index 100%
rename from src/cap/models/back/0031--000--Cawmodore.gif
rename to src/cap/models/back/0031-000-Cawmodore.gif
diff --git a/src/cap/models/back/0033--000--Volkraken.gif b/src/cap/models/back/0033-000-Volkraken.gif
similarity index 100%
rename from src/cap/models/back/0033--000--Volkraken.gif
rename to src/cap/models/back/0033-000-Volkraken.gif
diff --git a/src/cap/models/back/0035--000--Plasmanta.gif b/src/cap/models/back/0035-000-Plasmanta.gif
similarity index 100%
rename from src/cap/models/back/0035--000--Plasmanta.gif
rename to src/cap/models/back/0035-000-Plasmanta.gif
diff --git a/src/cap/models/back/0038--000--Naviathan.gif b/src/cap/models/back/0038-000-Naviathan.gif
similarity index 100%
rename from src/cap/models/back/0038--000--Naviathan.gif
rename to src/cap/models/back/0038-000-Naviathan.gif
diff --git a/src/cap/models/back/0039--000--Crucibelle.gif b/src/cap/models/back/0039-000-Crucibelle.gif
similarity index 100%
rename from src/cap/models/back/0039--000--Crucibelle.gif
rename to src/cap/models/back/0039-000-Crucibelle.gif
diff --git a/src/cap/models/back/0039--420--Crucibelle--Mega.gif b/src/cap/models/back/0039-420-Crucibelle-Mega.gif
similarity index 100%
rename from src/cap/models/back/0039--420--Crucibelle--Mega.gif
rename to src/cap/models/back/0039-420-Crucibelle-Mega.gif
diff --git a/src/cap/models/back/0040--000--Pluffle.gif b/src/cap/models/back/0040-000-Pluffle.gif
similarity index 100%
rename from src/cap/models/back/0040--000--Pluffle.gif
rename to src/cap/models/back/0040-000-Pluffle.gif
diff --git a/src/cap/models/back/0041--000--Kerfluffle.gif b/src/cap/models/back/0041-000-Kerfluffle.gif
similarity index 100%
rename from src/cap/models/back/0041--000--Kerfluffle.gif
rename to src/cap/models/back/0041-000-Kerfluffle.gif
diff --git a/src/cap/models/back/0042--000--Pajantom.gif b/src/cap/models/back/0042-000-Pajantom.gif
similarity index 100%
rename from src/cap/models/back/0042--000--Pajantom.gif
rename to src/cap/models/back/0042-000-Pajantom.gif
diff --git a/src/cap/models/back/0044--000--Jumbao.gif b/src/cap/models/back/0044-000-Jumbao.gif
similarity index 100%
rename from src/cap/models/back/0044--000--Jumbao.gif
rename to src/cap/models/back/0044-000-Jumbao.gif
diff --git a/src/cap/models/back/0047--000--Caribolt.gif b/src/cap/models/back/0047-000-Caribolt.gif
similarity index 100%
rename from src/cap/models/back/0047--000--Caribolt.gif
rename to src/cap/models/back/0047-000-Caribolt.gif
diff --git a/src/cap/models/back/0048--000--Smogecko.gif b/src/cap/models/back/0048-000-Smogecko.gif
similarity index 100%
rename from src/cap/models/back/0048--000--Smogecko.gif
rename to src/cap/models/back/0048-000-Smogecko.gif
diff --git a/src/cap/models/back/0049--000--Smoguana.gif b/src/cap/models/back/0049-000-Smoguana.gif
similarity index 100%
rename from src/cap/models/back/0049--000--Smoguana.gif
rename to src/cap/models/back/0049-000-Smoguana.gif
diff --git a/src/cap/models/back/0050--000--Smokomodo.gif b/src/cap/models/back/0050-000-Smokomodo.gif
similarity index 100%
rename from src/cap/models/back/0050--000--Smokomodo.gif
rename to src/cap/models/back/0050-000-Smokomodo.gif
diff --git a/src/cap/models/back/0053--000--Snaelstrom.gif b/src/cap/models/back/0053-000-Snaelstrom.gif
similarity index 100%
rename from src/cap/models/back/0053--000--Snaelstrom.gif
rename to src/cap/models/back/0053-000-Snaelstrom.gif
diff --git a/src/cap/models/back/0054--000--Equilibra.gif b/src/cap/models/back/0054-000-Equilibra.gif
similarity index 100%
rename from src/cap/models/back/0054--000--Equilibra.gif
rename to src/cap/models/back/0054-000-Equilibra.gif
diff --git a/src/cap/models/front-cosmetic/0014--000--Kitsunoh--Female.gif b/src/cap/models/front-cosmetic/0014-000-Kitsunoh-Female.gif
similarity index 100%
rename from src/cap/models/front-cosmetic/0014--000--Kitsunoh--Female.gif
rename to src/cap/models/front-cosmetic/0014-000-Kitsunoh-Female.gif
diff --git a/src/cap/models/front-shiny-cosmetic/0014--000--Kitsunoh--Female.gif b/src/cap/models/front-shiny-cosmetic/0014-000-Kitsunoh-Female.gif
similarity index 100%
rename from src/cap/models/front-shiny-cosmetic/0014--000--Kitsunoh--Female.gif
rename to src/cap/models/front-shiny-cosmetic/0014-000-Kitsunoh-Female.gif
diff --git a/src/cap/models/front-shiny/0006--000--Pyroak.gif b/src/cap/models/front-shiny/0006-000-Pyroak.gif
similarity index 100%
rename from src/cap/models/front-shiny/0006--000--Pyroak.gif
rename to src/cap/models/front-shiny/0006-000-Pyroak.gif
diff --git a/src/cap/models/front-shiny/0008--000--Fidgit.gif b/src/cap/models/front-shiny/0008-000-Fidgit.gif
similarity index 100%
rename from src/cap/models/front-shiny/0008--000--Fidgit.gif
rename to src/cap/models/front-shiny/0008-000-Fidgit.gif
diff --git a/src/cap/models/front-shiny/0011--000--Stratagem.gif b/src/cap/models/front-shiny/0011-000-Stratagem.gif
similarity index 100%
rename from src/cap/models/front-shiny/0011--000--Stratagem.gif
rename to src/cap/models/front-shiny/0011-000-Stratagem.gif
diff --git a/src/cap/models/front-shiny/0014--000--Kitsunoh.gif b/src/cap/models/front-shiny/0014-000-Kitsunoh.gif
similarity index 100%
rename from src/cap/models/front-shiny/0014--000--Kitsunoh.gif
rename to src/cap/models/front-shiny/0014-000-Kitsunoh.gif
diff --git a/src/cap/models/front-shiny/0017--000--Krilowatt.gif b/src/cap/models/front-shiny/0017-000-Krilowatt.gif
similarity index 100%
rename from src/cap/models/front-shiny/0017--000--Krilowatt.gif
rename to src/cap/models/front-shiny/0017-000-Krilowatt.gif
diff --git a/src/cap/models/front-shiny/0020--000--Scratchet.gif b/src/cap/models/front-shiny/0020-000-Scratchet.gif
similarity index 100%
rename from src/cap/models/front-shiny/0020--000--Scratchet.gif
rename to src/cap/models/front-shiny/0020-000-Scratchet.gif
diff --git a/src/cap/models/front-shiny/0021--000--Tomohawk.gif b/src/cap/models/front-shiny/0021-000-Tomohawk.gif
similarity index 100%
rename from src/cap/models/front-shiny/0021--000--Tomohawk.gif
rename to src/cap/models/front-shiny/0021-000-Tomohawk.gif
diff --git a/src/cap/models/front-shiny/0024--000--Mollux.gif b/src/cap/models/front-shiny/0024-000-Mollux.gif
similarity index 100%
rename from src/cap/models/front-shiny/0024--000--Mollux.gif
rename to src/cap/models/front-shiny/0024-000-Mollux.gif
diff --git a/src/cap/models/front-shiny/0027--000--Aurumoth.gif b/src/cap/models/front-shiny/0027-000-Aurumoth.gif
similarity index 100%
rename from src/cap/models/front-shiny/0027--000--Aurumoth.gif
rename to src/cap/models/front-shiny/0027-000-Aurumoth.gif
diff --git a/src/cap/models/front-shiny/0031--000--Cawmodore.gif b/src/cap/models/front-shiny/0031-000-Cawmodore.gif
similarity index 100%
rename from src/cap/models/front-shiny/0031--000--Cawmodore.gif
rename to src/cap/models/front-shiny/0031-000-Cawmodore.gif
diff --git a/src/cap/models/front-shiny/0033--000--Volkraken.gif b/src/cap/models/front-shiny/0033-000-Volkraken.gif
similarity index 100%
rename from src/cap/models/front-shiny/0033--000--Volkraken.gif
rename to src/cap/models/front-shiny/0033-000-Volkraken.gif
diff --git a/src/cap/models/front-shiny/0035--000--Plasmanta.gif b/src/cap/models/front-shiny/0035-000-Plasmanta.gif
similarity index 100%
rename from src/cap/models/front-shiny/0035--000--Plasmanta.gif
rename to src/cap/models/front-shiny/0035-000-Plasmanta.gif
diff --git a/src/cap/models/front-shiny/0038--000--Naviathan.gif b/src/cap/models/front-shiny/0038-000-Naviathan.gif
similarity index 100%
rename from src/cap/models/front-shiny/0038--000--Naviathan.gif
rename to src/cap/models/front-shiny/0038-000-Naviathan.gif
diff --git a/src/cap/models/front-shiny/0039--000--Crucibelle.gif b/src/cap/models/front-shiny/0039-000-Crucibelle.gif
similarity index 100%
rename from src/cap/models/front-shiny/0039--000--Crucibelle.gif
rename to src/cap/models/front-shiny/0039-000-Crucibelle.gif
diff --git a/src/cap/models/front-shiny/0039--420--Crucibelle--Mega.gif b/src/cap/models/front-shiny/0039-420-Crucibelle-Mega.gif
similarity index 100%
rename from src/cap/models/front-shiny/0039--420--Crucibelle--Mega.gif
rename to src/cap/models/front-shiny/0039-420-Crucibelle-Mega.gif
diff --git a/src/cap/models/front-shiny/0040--000--Pluffle.gif b/src/cap/models/front-shiny/0040-000-Pluffle.gif
similarity index 100%
rename from src/cap/models/front-shiny/0040--000--Pluffle.gif
rename to src/cap/models/front-shiny/0040-000-Pluffle.gif
diff --git a/src/cap/models/front-shiny/0041--000--Kerfluffle.gif b/src/cap/models/front-shiny/0041-000-Kerfluffle.gif
similarity index 100%
rename from src/cap/models/front-shiny/0041--000--Kerfluffle.gif
rename to src/cap/models/front-shiny/0041-000-Kerfluffle.gif
diff --git a/src/cap/models/front-shiny/0042--000--Pajantom.gif b/src/cap/models/front-shiny/0042-000-Pajantom.gif
similarity index 100%
rename from src/cap/models/front-shiny/0042--000--Pajantom.gif
rename to src/cap/models/front-shiny/0042-000-Pajantom.gif
diff --git a/src/cap/models/front-shiny/0044--000--Jumbao.gif b/src/cap/models/front-shiny/0044-000-Jumbao.gif
similarity index 100%
rename from src/cap/models/front-shiny/0044--000--Jumbao.gif
rename to src/cap/models/front-shiny/0044-000-Jumbao.gif
diff --git a/src/cap/models/front-shiny/0047--000--Caribolt.gif b/src/cap/models/front-shiny/0047-000-Caribolt.gif
similarity index 100%
rename from src/cap/models/front-shiny/0047--000--Caribolt.gif
rename to src/cap/models/front-shiny/0047-000-Caribolt.gif
diff --git a/src/cap/models/front-shiny/0048--000--Smogecko.gif b/src/cap/models/front-shiny/0048-000-Smogecko.gif
similarity index 100%
rename from src/cap/models/front-shiny/0048--000--Smogecko.gif
rename to src/cap/models/front-shiny/0048-000-Smogecko.gif
diff --git a/src/cap/models/front-shiny/0049--000--Smoguana.gif b/src/cap/models/front-shiny/0049-000-Smoguana.gif
similarity index 100%
rename from src/cap/models/front-shiny/0049--000--Smoguana.gif
rename to src/cap/models/front-shiny/0049-000-Smoguana.gif
diff --git a/src/cap/models/front-shiny/0050--000--Smokomodo.gif b/src/cap/models/front-shiny/0050-000-Smokomodo.gif
similarity index 100%
rename from src/cap/models/front-shiny/0050--000--Smokomodo.gif
rename to src/cap/models/front-shiny/0050-000-Smokomodo.gif
diff --git a/src/cap/models/front-shiny/0053--000--Snaelstrom.gif b/src/cap/models/front-shiny/0053-000-Snaelstrom.gif
similarity index 100%
rename from src/cap/models/front-shiny/0053--000--Snaelstrom.gif
rename to src/cap/models/front-shiny/0053-000-Snaelstrom.gif
diff --git a/src/cap/models/front-shiny/0054--000--Equilibra.gif b/src/cap/models/front-shiny/0054-000-Equilibra.gif
similarity index 100%
rename from src/cap/models/front-shiny/0054--000--Equilibra.gif
rename to src/cap/models/front-shiny/0054-000-Equilibra.gif
diff --git a/src/cap/models/front/0006--000--Pyroak.gif b/src/cap/models/front/0006-000-Pyroak.gif
similarity index 100%
rename from src/cap/models/front/0006--000--Pyroak.gif
rename to src/cap/models/front/0006-000-Pyroak.gif
diff --git a/src/cap/models/front/0008--000--Fidgit.gif b/src/cap/models/front/0008-000-Fidgit.gif
similarity index 100%
rename from src/cap/models/front/0008--000--Fidgit.gif
rename to src/cap/models/front/0008-000-Fidgit.gif
diff --git a/src/cap/models/front/0011--000--Stratagem.gif b/src/cap/models/front/0011-000-Stratagem.gif
similarity index 100%
rename from src/cap/models/front/0011--000--Stratagem.gif
rename to src/cap/models/front/0011-000-Stratagem.gif
diff --git a/src/cap/models/front/0014--000--Kitsunoh.gif b/src/cap/models/front/0014-000-Kitsunoh.gif
similarity index 100%
rename from src/cap/models/front/0014--000--Kitsunoh.gif
rename to src/cap/models/front/0014-000-Kitsunoh.gif
diff --git a/src/cap/models/front/0017--000--Krilowatt.gif b/src/cap/models/front/0017-000-Krilowatt.gif
similarity index 100%
rename from src/cap/models/front/0017--000--Krilowatt.gif
rename to src/cap/models/front/0017-000-Krilowatt.gif
diff --git a/src/cap/models/front/0020--000--Scratchet.gif b/src/cap/models/front/0020-000-Scratchet.gif
similarity index 100%
rename from src/cap/models/front/0020--000--Scratchet.gif
rename to src/cap/models/front/0020-000-Scratchet.gif
diff --git a/src/cap/models/front/0021--000--Tomohawk.gif b/src/cap/models/front/0021-000-Tomohawk.gif
similarity index 100%
rename from src/cap/models/front/0021--000--Tomohawk.gif
rename to src/cap/models/front/0021-000-Tomohawk.gif
diff --git a/src/cap/models/front/0024--000--Mollux.gif b/src/cap/models/front/0024-000-Mollux.gif
similarity index 100%
rename from src/cap/models/front/0024--000--Mollux.gif
rename to src/cap/models/front/0024-000-Mollux.gif
diff --git a/src/cap/models/front/0027--000--Aurumoth.gif b/src/cap/models/front/0027-000-Aurumoth.gif
similarity index 100%
rename from src/cap/models/front/0027--000--Aurumoth.gif
rename to src/cap/models/front/0027-000-Aurumoth.gif
diff --git a/src/cap/models/front/0031--000--Cawmodore.gif b/src/cap/models/front/0031-000-Cawmodore.gif
similarity index 100%
rename from src/cap/models/front/0031--000--Cawmodore.gif
rename to src/cap/models/front/0031-000-Cawmodore.gif
diff --git a/src/cap/models/front/0033--000--Volkraken.gif b/src/cap/models/front/0033-000-Volkraken.gif
similarity index 100%
rename from src/cap/models/front/0033--000--Volkraken.gif
rename to src/cap/models/front/0033-000-Volkraken.gif
diff --git a/src/cap/models/front/0035--000--Plasmanta.gif b/src/cap/models/front/0035-000-Plasmanta.gif
similarity index 100%
rename from src/cap/models/front/0035--000--Plasmanta.gif
rename to src/cap/models/front/0035-000-Plasmanta.gif
diff --git a/src/cap/models/front/0038--000--Naviathan.gif b/src/cap/models/front/0038-000-Naviathan.gif
similarity index 100%
rename from src/cap/models/front/0038--000--Naviathan.gif
rename to src/cap/models/front/0038-000-Naviathan.gif
diff --git a/src/cap/models/front/0039--000--Crucibelle.gif b/src/cap/models/front/0039-000-Crucibelle.gif
similarity index 100%
rename from src/cap/models/front/0039--000--Crucibelle.gif
rename to src/cap/models/front/0039-000-Crucibelle.gif
diff --git a/src/cap/models/front/0039--420--Crucibelle--Mega.gif b/src/cap/models/front/0039-420-Crucibelle-Mega.gif
similarity index 100%
rename from src/cap/models/front/0039--420--Crucibelle--Mega.gif
rename to src/cap/models/front/0039-420-Crucibelle-Mega.gif
diff --git a/src/cap/models/front/0040--000--Pluffle.gif b/src/cap/models/front/0040-000-Pluffle.gif
similarity index 100%
rename from src/cap/models/front/0040--000--Pluffle.gif
rename to src/cap/models/front/0040-000-Pluffle.gif
diff --git a/src/cap/models/front/0041--000--Kerfluffle.gif b/src/cap/models/front/0041-000-Kerfluffle.gif
similarity index 100%
rename from src/cap/models/front/0041--000--Kerfluffle.gif
rename to src/cap/models/front/0041-000-Kerfluffle.gif
diff --git a/src/cap/models/front/0042--000--Pajantom.gif b/src/cap/models/front/0042-000-Pajantom.gif
similarity index 100%
rename from src/cap/models/front/0042--000--Pajantom.gif
rename to src/cap/models/front/0042-000-Pajantom.gif
diff --git a/src/cap/models/front/0044--000--Jumbao.gif b/src/cap/models/front/0044-000-Jumbao.gif
similarity index 100%
rename from src/cap/models/front/0044--000--Jumbao.gif
rename to src/cap/models/front/0044-000-Jumbao.gif
diff --git a/src/cap/models/front/0047--000--Caribolt.gif b/src/cap/models/front/0047-000-Caribolt.gif
similarity index 100%
rename from src/cap/models/front/0047--000--Caribolt.gif
rename to src/cap/models/front/0047-000-Caribolt.gif
diff --git a/src/cap/models/front/0048--000--Smogecko.gif b/src/cap/models/front/0048-000-Smogecko.gif
similarity index 100%
rename from src/cap/models/front/0048--000--Smogecko.gif
rename to src/cap/models/front/0048-000-Smogecko.gif
diff --git a/src/cap/models/front/0049--000--Smoguana.gif b/src/cap/models/front/0049-000-Smoguana.gif
similarity index 100%
rename from src/cap/models/front/0049--000--Smoguana.gif
rename to src/cap/models/front/0049-000-Smoguana.gif
diff --git a/src/cap/models/front/0050--000--Smokomodo.gif b/src/cap/models/front/0050-000-Smokomodo.gif
similarity index 100%
rename from src/cap/models/front/0050--000--Smokomodo.gif
rename to src/cap/models/front/0050-000-Smokomodo.gif
diff --git a/src/cap/models/front/0053--000--Snaelstrom.gif b/src/cap/models/front/0053-000-Snaelstrom.gif
similarity index 100%
rename from src/cap/models/front/0053--000--Snaelstrom.gif
rename to src/cap/models/front/0053-000-Snaelstrom.gif
diff --git a/src/cap/models/front/0054--000--Equilibra.gif b/src/cap/models/front/0054-000-Equilibra.gif
similarity index 100%
rename from src/cap/models/front/0054--000--Equilibra.gif
rename to src/cap/models/front/0054-000-Equilibra.gif
diff --git a/src/cap/sprites/gen5/back-shiny/0021--000--Tomohawk.gif b/src/cap/sprites/gen5/back-shiny/0021-000-Tomohawk.gif
similarity index 100%
rename from src/cap/sprites/gen5/back-shiny/0021--000--Tomohawk.gif
rename to src/cap/sprites/gen5/back-shiny/0021-000-Tomohawk.gif
diff --git a/src/cap/sprites/gen5/back-shiny/0023--000--Necturna.gif b/src/cap/sprites/gen5/back-shiny/0023-000-Necturna.gif
similarity index 100%
rename from src/cap/sprites/gen5/back-shiny/0023--000--Necturna.gif
rename to src/cap/sprites/gen5/back-shiny/0023-000-Necturna.gif
diff --git a/src/cap/sprites/gen5/back-shiny/0024--000--Mollux.gif b/src/cap/sprites/gen5/back-shiny/0024-000-Mollux.gif
similarity index 100%
rename from src/cap/sprites/gen5/back-shiny/0024--000--Mollux.gif
rename to src/cap/sprites/gen5/back-shiny/0024-000-Mollux.gif
diff --git a/src/cap/sprites/gen5/back-shiny/0027--000--Aurumoth.gif b/src/cap/sprites/gen5/back-shiny/0027-000-Aurumoth.gif
similarity index 100%
rename from src/cap/sprites/gen5/back-shiny/0027--000--Aurumoth.gif
rename to src/cap/sprites/gen5/back-shiny/0027-000-Aurumoth.gif
diff --git a/src/cap/sprites/gen5/back-shiny/0029--000--Malaconda.gif b/src/cap/sprites/gen5/back-shiny/0029-000-Malaconda.gif
similarity index 100%
rename from src/cap/sprites/gen5/back-shiny/0029--000--Malaconda.gif
rename to src/cap/sprites/gen5/back-shiny/0029-000-Malaconda.gif
diff --git a/src/cap/sprites/gen5/back-shiny/0031--000--Cawmodore.gif b/src/cap/sprites/gen5/back-shiny/0031-000-Cawmodore.gif
similarity index 100%
rename from src/cap/sprites/gen5/back-shiny/0031--000--Cawmodore.gif
rename to src/cap/sprites/gen5/back-shiny/0031-000-Cawmodore.gif
diff --git a/src/cap/sprites/gen5/back-shiny/0033--000--Volkraken.gif b/src/cap/sprites/gen5/back-shiny/0033-000-Volkraken.gif
similarity index 100%
rename from src/cap/sprites/gen5/back-shiny/0033--000--Volkraken.gif
rename to src/cap/sprites/gen5/back-shiny/0033-000-Volkraken.gif
diff --git a/src/cap/sprites/gen5/back-shiny/0035--000--Plasmanta.gif b/src/cap/sprites/gen5/back-shiny/0035-000-Plasmanta.gif
similarity index 100%
rename from src/cap/sprites/gen5/back-shiny/0035--000--Plasmanta.gif
rename to src/cap/sprites/gen5/back-shiny/0035-000-Plasmanta.gif
diff --git a/src/cap/sprites/gen5/back/0021--000--Tomohawk.gif b/src/cap/sprites/gen5/back/0021-000-Tomohawk.gif
similarity index 100%
rename from src/cap/sprites/gen5/back/0021--000--Tomohawk.gif
rename to src/cap/sprites/gen5/back/0021-000-Tomohawk.gif
diff --git a/src/cap/sprites/gen5/back/0023--000--Necturna.gif b/src/cap/sprites/gen5/back/0023-000-Necturna.gif
similarity index 100%
rename from src/cap/sprites/gen5/back/0023--000--Necturna.gif
rename to src/cap/sprites/gen5/back/0023-000-Necturna.gif
diff --git a/src/cap/sprites/gen5/back/0024--000--Mollux.gif b/src/cap/sprites/gen5/back/0024-000-Mollux.gif
similarity index 100%
rename from src/cap/sprites/gen5/back/0024--000--Mollux.gif
rename to src/cap/sprites/gen5/back/0024-000-Mollux.gif
diff --git a/src/cap/sprites/gen5/back/0027--000--Aurumoth.gif b/src/cap/sprites/gen5/back/0027-000-Aurumoth.gif
similarity index 100%
rename from src/cap/sprites/gen5/back/0027--000--Aurumoth.gif
rename to src/cap/sprites/gen5/back/0027-000-Aurumoth.gif
diff --git a/src/cap/sprites/gen5/back/0029--000--Malaconda.gif b/src/cap/sprites/gen5/back/0029-000-Malaconda.gif
similarity index 100%
rename from src/cap/sprites/gen5/back/0029--000--Malaconda.gif
rename to src/cap/sprites/gen5/back/0029-000-Malaconda.gif
diff --git a/src/cap/sprites/gen5/back/0031--000--Cawmodore.gif b/src/cap/sprites/gen5/back/0031-000-Cawmodore.gif
similarity index 100%
rename from src/cap/sprites/gen5/back/0031--000--Cawmodore.gif
rename to src/cap/sprites/gen5/back/0031-000-Cawmodore.gif
diff --git a/src/cap/sprites/gen5/back/0033--000--Volkraken.gif b/src/cap/sprites/gen5/back/0033-000-Volkraken.gif
similarity index 100%
rename from src/cap/sprites/gen5/back/0033--000--Volkraken.gif
rename to src/cap/sprites/gen5/back/0033-000-Volkraken.gif
diff --git a/src/cap/sprites/gen5/back/0035--000--Plasmanta.gif b/src/cap/sprites/gen5/back/0035-000-Plasmanta.gif
similarity index 100%
rename from src/cap/sprites/gen5/back/0035--000--Plasmanta.gif
rename to src/cap/sprites/gen5/back/0035-000-Plasmanta.gif
diff --git a/src/cap/sprites/gen5/front-shiny/0021--000--Tomohawk.gif b/src/cap/sprites/gen5/front-shiny/0021-000-Tomohawk.gif
similarity index 100%
rename from src/cap/sprites/gen5/front-shiny/0021--000--Tomohawk.gif
rename to src/cap/sprites/gen5/front-shiny/0021-000-Tomohawk.gif
diff --git a/src/cap/sprites/gen5/front-shiny/0023--000--Necturna.gif b/src/cap/sprites/gen5/front-shiny/0023-000-Necturna.gif
similarity index 100%
rename from src/cap/sprites/gen5/front-shiny/0023--000--Necturna.gif
rename to src/cap/sprites/gen5/front-shiny/0023-000-Necturna.gif
diff --git a/src/cap/sprites/gen5/front-shiny/0024--000--Mollux.gif b/src/cap/sprites/gen5/front-shiny/0024-000-Mollux.gif
similarity index 100%
rename from src/cap/sprites/gen5/front-shiny/0024--000--Mollux.gif
rename to src/cap/sprites/gen5/front-shiny/0024-000-Mollux.gif
diff --git a/src/cap/sprites/gen5/front-shiny/0027--000--Aurumoth.gif b/src/cap/sprites/gen5/front-shiny/0027-000-Aurumoth.gif
similarity index 100%
rename from src/cap/sprites/gen5/front-shiny/0027--000--Aurumoth.gif
rename to src/cap/sprites/gen5/front-shiny/0027-000-Aurumoth.gif
diff --git a/src/cap/sprites/gen5/front-shiny/0029--000--Malaconda.gif b/src/cap/sprites/gen5/front-shiny/0029-000-Malaconda.gif
similarity index 100%
rename from src/cap/sprites/gen5/front-shiny/0029--000--Malaconda.gif
rename to src/cap/sprites/gen5/front-shiny/0029-000-Malaconda.gif
diff --git a/src/cap/sprites/gen5/front-shiny/0031--000--Cawmodore.gif b/src/cap/sprites/gen5/front-shiny/0031-000-Cawmodore.gif
similarity index 100%
rename from src/cap/sprites/gen5/front-shiny/0031--000--Cawmodore.gif
rename to src/cap/sprites/gen5/front-shiny/0031-000-Cawmodore.gif
diff --git a/src/cap/sprites/gen5/front-shiny/0033--000--Volkraken.gif b/src/cap/sprites/gen5/front-shiny/0033-000-Volkraken.gif
similarity index 100%
rename from src/cap/sprites/gen5/front-shiny/0033--000--Volkraken.gif
rename to src/cap/sprites/gen5/front-shiny/0033-000-Volkraken.gif
diff --git a/src/cap/sprites/gen5/front-shiny/0035--000--Plasmanta.gif b/src/cap/sprites/gen5/front-shiny/0035-000-Plasmanta.gif
similarity index 100%
rename from src/cap/sprites/gen5/front-shiny/0035--000--Plasmanta.gif
rename to src/cap/sprites/gen5/front-shiny/0035-000-Plasmanta.gif
diff --git a/src/cap/sprites/gen5/front/0021--000--Tomohawk.gif b/src/cap/sprites/gen5/front/0021-000-Tomohawk.gif
similarity index 100%
rename from src/cap/sprites/gen5/front/0021--000--Tomohawk.gif
rename to src/cap/sprites/gen5/front/0021-000-Tomohawk.gif
diff --git a/src/cap/sprites/gen5/front/0023--000--Necturna.gif b/src/cap/sprites/gen5/front/0023-000-Necturna.gif
similarity index 100%
rename from src/cap/sprites/gen5/front/0023--000--Necturna.gif
rename to src/cap/sprites/gen5/front/0023-000-Necturna.gif
diff --git a/src/cap/sprites/gen5/front/0024--000--Mollux.gif b/src/cap/sprites/gen5/front/0024-000-Mollux.gif
similarity index 100%
rename from src/cap/sprites/gen5/front/0024--000--Mollux.gif
rename to src/cap/sprites/gen5/front/0024-000-Mollux.gif
diff --git a/src/cap/sprites/gen5/front/0027--000--Aurumoth.gif b/src/cap/sprites/gen5/front/0027-000-Aurumoth.gif
similarity index 100%
rename from src/cap/sprites/gen5/front/0027--000--Aurumoth.gif
rename to src/cap/sprites/gen5/front/0027-000-Aurumoth.gif
diff --git a/src/cap/sprites/gen5/front/0029--000--Malaconda.gif b/src/cap/sprites/gen5/front/0029-000-Malaconda.gif
similarity index 100%
rename from src/cap/sprites/gen5/front/0029--000--Malaconda.gif
rename to src/cap/sprites/gen5/front/0029-000-Malaconda.gif
diff --git a/src/cap/sprites/gen5/front/0031--000--Cawmodore.gif b/src/cap/sprites/gen5/front/0031-000-Cawmodore.gif
similarity index 100%
rename from src/cap/sprites/gen5/front/0031--000--Cawmodore.gif
rename to src/cap/sprites/gen5/front/0031-000-Cawmodore.gif
diff --git a/src/cap/sprites/gen5/front/0033--000--Volkraken.gif b/src/cap/sprites/gen5/front/0033-000-Volkraken.gif
similarity index 100%
rename from src/cap/sprites/gen5/front/0033--000--Volkraken.gif
rename to src/cap/sprites/gen5/front/0033-000-Volkraken.gif
diff --git a/src/cap/sprites/gen5/front/0035--000--Plasmanta.gif b/src/cap/sprites/gen5/front/0035-000-Plasmanta.gif
similarity index 100%
rename from src/cap/sprites/gen5/front/0035--000--Plasmanta.gif
rename to src/cap/sprites/gen5/front/0035-000-Plasmanta.gif